Skip to content

load template-compiler from ember-source #68

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stefanpenner merged 4 commits into from
May 22, 2016
Merged

load template-compiler from ember-source #68

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3afeb9d
load template-compiler from ember-source
stefanpenner Feb 27, 2016
dbe5bf1
ensure '.js' extension if no extension was provided
stefanpenner Feb 29, 2016
59b27d8
switch to ember-core not ember-source
stefanpenner May 22, 2016
5247542
fix jshint
stefanpenner May 22, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 13 additions & 4 deletions ember-addon-main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ module.exports = {
name: 'ember-cli-htmlbars',

init: function() {
this._super.init && this._super.init.apply(this, arguments);
if (this._super.init) { this._super.init.apply(this, arguments); }
checker.assertAbove(this, '0.1.2');
},

Expand Down Expand Up @@ -60,17 +60,26 @@ module.exports = {
var config = this.projectConfig();
var templateCompilerPath = config['ember-cli-htmlbars'] && config['ember-cli-htmlbars'].templateCompilerPath;

if (!templateCompilerPath) {
var ember = this.project.findAddonByName('ember-core');
if (ember) {
return ember.absolutePaths.templateCompiler;
} else if (!templateCompilerPath) {
templateCompilerPath = this.project.bowerDirectory + '/ember/ember-template-compiler';
}

return path.resolve(this.project.root, templateCompilerPath);
var absolutePath = path.resolve(this.project.root, templateCompilerPath);

if (path.extname(absolutePath) === '') {
absolutePath += '.js';
Copy link
Member

@rwjblue rwjblue Feb 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this is required to properly clear the cache below (because the path is stored with its extension in the cache)

Copy link
Contributor Author

@stefanpenner stefanpenner Feb 29, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

hmm this.templateCompilerPath() now returns (sometimes with '.js')

I can add a ensureEndsInJs() or something

Copy link
Contributor Author

@stefanpenner stefanpenner May 22, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@rwjblue i think https://github.com/ember-cli/ember-cli-htmlbars/pull/68/files#diff-fc695117845e9b76dfb1841d2221ac7cR72 handles this already?

Copy link
Contributor Author

@stefanpenner stefanpenner May 22, 2016 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

ah, we already had this conversation :P #68 (comment)

}

return absolutePath;
},

htmlbarsOptions: function() {
var projectConfig = this.projectConfig() || {};
var EmberENV = projectConfig.EmberENV || {};
var templateCompilerPath = this.templateCompilerPath() + '.js';
var templateCompilerPath = this.templateCompilerPath();

global.EmberENV = EmberENV; // Needed for eval time feature flag checks
var htmlbarsOptions = {
Expand Down