From 3afeb9d141e382311d9d634e6e1e20b78622b480 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Sat, 27 Feb 2016 15:56:21 -0800 Subject: [PATCH 1/4] load template-compiler from ember-source MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * fallback to old * don’t append ‘.js’ as require already does this --- ember-addon-main.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/ember-addon-main.js b/ember-addon-main.js index bf6c5919..eff11270 100644 --- a/ember-addon-main.js +++ b/ember-addon-main.js @@ -60,7 +60,10 @@ 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-source'); + if (ember) { + return ember.absolutePaths.templateCompiler; + } else if (!templateCompilerPath) { templateCompilerPath = this.project.bowerDirectory + '/ember/ember-template-compiler'; } @@ -70,7 +73,7 @@ module.exports = { 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 = { From dbe5bf17e856b3f33be370f79ce695a4b9949530 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Mon, 29 Feb 2016 08:53:29 -0800 Subject: [PATCH 2/4] ensure '.js' extension if no extension was provided --- ember-addon-main.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/ember-addon-main.js b/ember-addon-main.js index eff11270..8643263a 100644 --- a/ember-addon-main.js +++ b/ember-addon-main.js @@ -67,7 +67,13 @@ module.exports = { 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'; + } + + return absolutePath; }, htmlbarsOptions: function() { From 59b27d8be20e2ada24a43c86156fe83393c6f5b2 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Sun, 22 May 2016 13:23:39 -0700 Subject: [PATCH 3/4] switch to ember-core not ember-source --- ember-addon-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-addon-main.js b/ember-addon-main.js index 8643263a..b214514f 100644 --- a/ember-addon-main.js +++ b/ember-addon-main.js @@ -60,7 +60,7 @@ module.exports = { var config = this.projectConfig(); var templateCompilerPath = config['ember-cli-htmlbars'] && config['ember-cli-htmlbars'].templateCompilerPath; - var ember = this.project.findAddonByName('ember-source'); + var ember = this.project.findAddonByName('ember-core'); if (ember) { return ember.absolutePaths.templateCompiler; } else if (!templateCompilerPath) { From 524754225df910400029b7de58e1a9e3e2f87033 Mon Sep 17 00:00:00 2001 From: Stefan Penner Date: Sun, 22 May 2016 14:44:06 -0700 Subject: [PATCH 4/4] fix jshint --- ember-addon-main.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ember-addon-main.js b/ember-addon-main.js index b214514f..1f54090a 100644 --- a/ember-addon-main.js +++ b/ember-addon-main.js @@ -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'); },