Merge pull request #45 from mydea/engines

Refactor instance-initializer

Author: rwjblue

.bowerrc

@@ -4,37 +4,42 @@ node_js:
   - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
 
 env:
-  # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
-  - EMBER_TRY_SCENARIO=ember-lts-2.12
-  - EMBER_TRY_SCENARIO=ember-release
-  - EMBER_TRY_SCENARIO=ember-beta
-  - EMBER_TRY_SCENARIO=ember-canary
-  - EMBER_TRY_SCENARIO=ember-default
-  - EMBER_TRY_SCENARIO=fastboot
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+  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-lts-2.12
+    - EMBER_TRY_SCENARIO=ember-lts-2.16
+    - EMBER_TRY_SCENARIO=ember-release
+    - EMBER_TRY_SCENARIO=ember-beta
+    - EMBER_TRY_SCENARIO=ember-canary
+    - EMBER_TRY_SCENARIO=ember-default
+    - EMBER_TRY_SCENARIO=fastboot
 
 matrix:
   fast_finish: true
   allow_failures:
     - env: EMBER_TRY_SCENARIO=ember-canary
 
 before_install:
-  - npm config set spin false
+  - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt bower
-  - npm --version
-  - yarn --version
-  - bower --version
-  - phantomjs --version
 
 install:
-  - yarn install --no-lockfile
+  - yarn install --no-lockfile --non-interactive
 
 script:
   # Usually, it's ok to finish the test scenario without reverting
   #  to the addon's original dependency state, skipping "cleanup".
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

.jscsrc

@@ -0,0 +1 @@
+registry "https://registry.yarnpkg.com"

.travis.yml

@@ -0,0 +1,58 @@
+import Component from '@ember/component';
+import { get, computed } from '@ember/object';
+import { getOwner } from '@ember/application';
+import layout from '../templates/components/head-layout';
+
+export default Component.extend({
+  tagName: '',
+  layout,
+
+  /**
+   * If true, this will tear down any existing head on init of this component.
+   * This is useful if there is a head built with fastboot - it will then be torn down when this is initialized in the browser.
+   * If you do not want this behavior, you can set this to false.
+   * @public
+   */
+  shouldTearDownOnInit: true,
+
+  headElement: computed(function() {
+    let documentService = getOwner(this).lookup('service:-document');
+    return documentService.head;
+  }),
+
+  init() {
+    this._super(...arguments);
+
+    if (get(this, 'shouldTearDownOnInit')) {
+      this._tearDownHead();
+    }
+  },
+
+  /**
+   * Tear down any previous head, if there was one.
+   * @private
+   */
+  _tearDownHead() {
+    if (this._isFastboot()) {
+      return;
+    }
+
+    // clear fast booted head (if any)
+    let startMeta = document.querySelector('meta[name="ember-cli-head-start"]');
+    let endMeta = document.querySelector('meta[name="ember-cli-head-end"]');
+    if (startMeta && endMeta) {
+      let el = startMeta.nextSibling;
+      while (el && el !== endMeta) {
+        document.head.removeChild(el);
+        el = startMeta.nextSibling;
+      }
+      document.head.removeChild(startMeta);
+      document.head.removeChild(endMeta);
+    }
+  },
+
+  _isFastboot() {
+    return typeof FastBoot !== 'undefined'
+  }
+
+});

.yarnrc

@@ -1,11 +1 @@
-import Ember from 'ember';
-import layout from 'ember-cli-head/templates/components/head-layout';
-
-export default Ember.Component.extend({
-  tagName: '',
-  headElement: Ember.computed(function() {
-    let documentService = Ember.getOwner(this).lookup('service:-document');
-    return documentService.head;
-  }),
-  layout
-});
+export { default } from 'ember-cli-head/components/head-layout';

addon/components/head-layout.js

@@ -1,27 +1,8 @@
-import ENV from '../config/environment';
-
-export function initialize() {
-  if (ENV['ember-cli-head'] && ENV['ember-cli-head']['suppressBrowserRender']) { return true; }
-
-  // clear fast booted head (if any)
-  let startMeta = document.querySelector('meta[name="ember-cli-head-start"]')
-  let endMeta = document.querySelector('meta[name="ember-cli-head-end"]')
-  if (startMeta && endMeta) {
-    let el = startMeta.nextSibling
-    while(el && el !== endMeta) {
-      document.head.removeChild(el);
-      el = startMeta.nextSibling;
-    }
-    document.head.removeChild(startMeta);
-    document.head.removeChild(endMeta);
-  }
-}
-
 export default {
   name: 'head-browser',
   initialize() {
-    if (typeof FastBoot === 'undefined') {
-      initialize(...arguments);
-    }
+    // do nothing!
+    // this functionality has been moved into addon/components/head-layout.js
+    // This is only here in order to not break existing addons relying on this, e.g. ember-page-title.
   }
 };

app/components/head-layout.js

@@ -1,5 +1,5 @@
-/* eslint-env node */
 module.exports = {
+  useYarn: true,
   scenarios: [
     {
       name: 'ember-lts-2.12',
@@ -9,6 +9,14 @@ module.exports = {
         }
       }
     },
+    {
+      name: 'ember-lts-2.16',
+      npm: {
+        devDependencies: {
+          'ember-source': '~2.16.0'
+        }
+      }
+    },
     {
       name: 'ember-release',
       bower: {

app/instance-initializers/head-browser.js

@@ -19,37 +19,37 @@
   "author": "",
   "license": "MIT",
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.5",
-    "chai": "^3.5.0",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.12.2",
-    "ember-cli-app-version": "^1.0.0",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-fastboot": "^1.0.2",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-release": "0.2.8",
-    "ember-cli-shims": "^1.0.2",
-    "ember-cli-sri": "^2.1.0",
-    "ember-cli-uglify": "^1.2.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
+    "broccoli-asset-rev": "^2.6.0",
+    "chai": "^4.1.2",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "^2.18.0",
+    "ember-cli-app-version": "^3.1.3",
+    "ember-cli-dependency-checker": "^2.1.0",
+    "ember-cli-eslint": "^4.2.3",
+    "ember-cli-fastboot": "^1.1.1",
+    "ember-cli-htmlbars": "^2.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
+    "ember-cli-inject-live-reload": "^1.7.0",
+    "ember-cli-qunit": "^4.2.1",
+    "ember-cli-release": "^0.2.9",
+    "ember-cli-shims": "^1.2.0",
+    "ember-cli-sri": "^2.1.1",
+    "ember-cli-uglify": "^2.0.0",
+    "ember-disable-prototype-extensions": "^1.1.3",
     "ember-disable-proxy-controllers": "^1.0.1",
     "ember-export-application-global": "^1.0.5",
     "ember-fastboot-addon-tests": "^0.4.0",
     "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "~2.12.0",
-    "loader.js": "^4.2.3"
+    "ember-resolver": "^4.5.0",
+    "ember-source": "^2.18.0",
+    "loader.js": "^4.6.0"
   },
   "keywords": [
     "ember-addon"
   ],
   "dependencies": {
-    "ember-cli-babel": "^6.1.0",
-    "ember-cli-htmlbars": "^2.0.1"
+    "ember-cli-babel": "^6.11.0",
+    "ember-cli-htmlbars": "^2.0.3"
   },
   "engines": {
     "node": ">= 4"