Merge pull request #156 from rwjblue/bring-back-bower-support

Bring back Ember < 2.12 support.

Author: rwjblue

.gitignore

@@ -19,3 +19,5 @@
 # ember-try
 /.node_modules.ember-try/
 /package.json.ember-try
+/bower.json
+/bower_components/

.npmignore

@@ -17,6 +17,8 @@
 /tests/
 /yarn.lock
 .gitkeep
+bower.json
+/bower_components/
 
 # ember-try
 /.node_modules.ember-try/

.travis.yml

@@ -19,6 +19,9 @@ env:
   matrix:
     # we recommend new addons test the current and previous LTS
     # as well as latest stable release (bonus points to beta/canary)
+    - EMBER_TRY_SCENARIO=ember-1.13
+    - EMBER_TRY_SCENARIO=ember-lts-2.4
+    - EMBER_TRY_SCENARIO=ember-lts-2.8
     - EMBER_TRY_SCENARIO=ember-lts-2.12
     - EMBER_TRY_SCENARIO=ember-lts-2.16
     - EMBER_TRY_SCENARIO=ember-lts-2.18

config/ember-try.js

@@ -11,6 +11,65 @@ module.exports = function() {
     return {
       useYarn: true,
       scenarios: [
+        {
+          name: 'ember-1.13',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
+          bower: {
+            dependencies: {
+              ember: '~1.13.0',
+            },
+          },
+          npm: {
+            devDependencies: {
+              '@ember/jquery': '^0.5.1',
+              'ember-source': null,
+              'jquery': '^2.2.4',
+            },
+          },
+        },
+        {
+          name: 'ember-lts-2.4',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
+          bower: {
+            dependencies: {
+              ember: 'components/ember#lts-2-4',
+            },
+            resolutions: {
+              ember: 'lts-2-4',
+            },
+          },
+          npm: {
+            devDependencies: {
+              '@ember/jquery': '^0.5.1',
+              'ember-source': null,
+              'jquery': '^2.2.4',
+            },
+          },
+        },
+        {
+          name: 'ember-lts-2.8',
+          env: {
+            EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true }),
+          },
+          bower: {
+            dependencies: {
+              ember: 'components/ember#lts-2-8',
+            },
+            resolutions: {
+              ember: 'lts-2-8',
+            },
+          },
+          npm: {
+            devDependencies: {
+              '@ember/jquery': '^0.5.1',
+              'ember-source': null,
+            },
+          },
+        },
         {
           name: 'ember-lts-2.12',
           env: {

index.js

@@ -142,6 +142,8 @@ module.exports = {
     let ember = this.project.findAddonByName('ember-source');
     if (ember) {
       return ember.absolutePaths.templateCompiler;
+    } else if (!templateCompilerPath) {
+      templateCompilerPath = this.project.bowerDirectory + '/ember/ember-template-compiler';
     }
 
     return path.resolve(this.project.root, templateCompilerPath);

node-tests/test.js

@@ -69,6 +69,9 @@ describe('included()', function() {
   let registry;
   let expectedRequireFilePath = path.resolve(__dirname, '../lib/require-from-worker');
   let expectedTemplateCompilerPath = path.resolve(__dirname, '../node_modules/ember-source/dist/ember-template-compiler.js');
+  if (!fs.existsSync(expectedTemplateCompilerPath)) {
+    expectedTemplateCompilerPath = path.resolve(__dirname, '../bower_components/ember/ember-template-compiler.js');
+  }
   let templateCompilerContents = fs.readFileSync(`${expectedTemplateCompilerPath}`, { encoding: 'utf-8' });
   let testBaseDir = () => path.resolve(__dirname, '..');
   let FixtureBaseDir = () => path.resolve(__dirname, './fixtures');

package.json

@@ -71,7 +71,8 @@
   },
   "resolutions": {
     "ember-cli-qunit/qunit": "~2.6.0",
-    "ember-cli-broccoli-sane-watcher": "~2.1.0"
+    "ember-cli-broccoli-sane-watcher": "~2.1.0",
+    "**/ember-cli-htmlbars-inline-precompile": "^1.0.5"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config",