Merge pull request #32 from cibernox/unify-second-attempt

Make addon more idiomatic at the expense of making it 2.10+ & fastboot 1.0rc+
ember-fastboot · Jun 6, 2017 · fc53a01 · fc53a01
2 parents 55e180d + b004393
commit fc53a01
Show file tree

Hide file tree

Showing 16 changed files with 311 additions and 453 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -17,7 +17,6 @@ env:
  - EMBER_TRY_SCENARIO=ember-canary
  - EMBER_TRY_SCENARIO=ember-default
  - EMBER_TRY_SCENARIO=fastboot
- - EMBER_TRY_SCENARIO=fastboot-ember-2.9
 
 matrix:
  fast_finish: true

diff --git a/README.md b/README.md
@@ -17,6 +17,10 @@ Install by running
 ember install ember-cli-head
 ```
 
+#### Version
+Take into account that version >= 0.3 of this addon require Ember 2.10+ and fastboot >=1.0.rc1
+Please use 0.2.X if you don't fulfull both requirements.
+
 ## Usage
 
 #### Template
@@ -82,11 +86,11 @@ This will result in a document along the lines of:
 
  <link rel="stylesheet" href="assets/vendor.css">
  <link rel="stylesheet" href="assets/my-app.css">
- 
+
  <meta property="og:title" content="Demo App">
  </head>
  <body class="ember-application">
- 
+
 
  <script src="assets/vendor.js"></script>
  <script src="assets/my-app.js"></script>

diff --git a/app-lt-2-10/instance-initializers/head.js b/app-lt-2-10/instance-initializers/head.js
diff --git a/config/ember-try.js b/config/ember-try.js
@@ -95,15 +95,6 @@ module.exports = {
  'ember-source': null
  }
  }
- },
- {
- name: 'fastboot-ember-2.9',
- command: 'ember fastboot:test --ember-version 2.9.0',
- npm: {
- devDependencies: {
- 'ember-source': null
- }
- }
  }
  ]
 };
diff --git a/fastboot-lt-2-10/instance-initializers/fastboot/head.js b/fastboot-lt-2-10/instance-initializers/fastboot/head.js
diff --git a/fastboot-tests/fastboot-1.0-beta-test.js b/fastboot-tests/fastboot-1.0-beta-test.js
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/router.js b/fastboot-tests/fixtures/fastboot-beta/app/router.js
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/routes/application.js b/fastboot-tests/fixtures/fastboot-beta/app/routes/application.js
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/routes/other-page.js b/fastboot-tests/fixtures/fastboot-beta/app/routes/other-page.js
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/templates/head.hbs b/fastboot-tests/fixtures/fastboot-beta/app/templates/head.hbs
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/templates/index.hbs b/fastboot-tests/fixtures/fastboot-beta/app/templates/index.hbs
diff --git a/fastboot-tests/fixtures/fastboot-beta/app/templates/other-page.hbs b/fastboot-tests/fixtures/fastboot-beta/app/templates/other-page.hbs
diff --git a/app/instance-initializers/fastboot/head.js → fastboot/instance-initializers/head.js b/app/instance-initializers/fastboot/head.js → fastboot/instance-initializers/head.js
diff --git a/index.js b/index.js
@@ -1,55 +1,6 @@
 /* eslint-env node */
 'use strict';
 
-const path = require('path');
-const filterInitializers = require('fastboot-filter-initializers');
-const VersionChecker = require('ember-cli-version-checker');
-const mergeTrees = require('broccoli-merge-trees');
-
 module.exports = {
- name: 'ember-cli-head',
-
- treeForApp(defaultTree) {
- if (!process.env.FASTBOOT_NEW_BUILD) {
- let trees = [defaultTree];
-
- if (!this.hasGlimmer2()) {
- trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
- trees.push(this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10')));
- }
-
- let tree = mergeTrees(trees, { overwrite: true });
-
- return filterInitializers(tree);
- } else {
- let trees = [defaultTree];
- if (!this.hasGlimmer2()) {
- trees.push(this.treeGenerator(path.resolve(this.root, 'app-lt-2-10')));
- }
-
- return mergeTrees(trees, { overwrite: true });
- }
- },
-
- treeForFastBoot(tree) {
- // this hook will be invoked in post FastBoot 1.0
- if (!this.hasGlimmer2) {
- let fastBootHtmlBarsTree = this.treeGenerator(path.resolve(this.root, 'fastboot-lt-2-10'));
- return tree ? mergeTrees([tree, fastBootHtmlBarsTree], { overwrite: true }) : fastBootHtmlBarsTree;
- }
- return tree;
- },
-
- hasGlimmer2() {
- let checker = new VersionChecker(this);
- let emberVersion = checker.for('ember-source', 'npm');
-
- if (!emberVersion.version) {
- emberVersion = checker.for('ember', 'bower');
- }
-
- // 2.9.0-beta.1 - 2.9.0-beta.5 used glimmer2 (but 2.9.0 did not)
- // 2.10.0-beta.1+ includes glimmer2
- return (emberVersion.gt('2.9.0-beta') && emberVersion.lt('2.9.0')) || emberVersion.gt('2.10.0-beta');
- }
+ name: 'ember-cli-head'
 };
diff --git a/package.json b/package.json
@@ -47,11 +47,8 @@
  "ember-addon"
  ],
  "dependencies": {
- "broccoli-merge-trees": "^1.1.4",
- "ember-cli-babel": "^6.0.0",
- "ember-cli-htmlbars": "^1.3.0",
- "ember-cli-version-checker": "^1.1.6",
- "fastboot-filter-initializers": "^0.0.2"
+ "ember-cli-babel": "^6.1.0",
+ "ember-cli-htmlbars": "^2.0.1"
  },
  "engines": {
  "node": ">= 4"