Package upgrades

.travis.yml

@@ -5,6 +5,11 @@ node_js:
 
 sudo: false
 
+dist: trusty
+
+addons:
+  chrome: stable
+
 cache:
   directories:
     - $HOME/.npm
@@ -26,12 +31,9 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
 
 install:
   - npm install
-  - bower install
 
 script:
   - npm test

index.js

@@ -11,12 +11,10 @@ module.exports = {
   included: function(app) {
     this._super.included(app);
 
-    var shim = isFastBoot() ? 'intro-js-fastboot.js' : 'intro-js.js';
-
     app.import('vendor/ember-introjs/intro.js');
     app.import('vendor/ember-introjs/introjs.css');
 
-    app.import('vendor/ember-introjs/shims/' + shim);
+    app.import('vendor/ember-introjs/shims/intro-js.js');
   },
 
   introJsPath() {
@@ -34,10 +32,3 @@ module.exports = {
     return mergeTrees(trees);
   },
 };
-
-// Checks to see whether this build is targeting FastBoot. Note that we cannot
-// check this at boot time--the environment variable is only set once the build
-// has started, which happens after this file is evaluated.
-function isFastBoot() {
-  return process.env.EMBER_CLI_FASTBOOT === 'true';
-}

package.json

@@ -22,39 +22,39 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "broccoli-funnel": "^1.1.0",
+    "broccoli-funnel": "^1.2.0",
     "broccoli-merge-trees": "^2.0.0",
-    "ember-cli-babel": "^5.1.7",
+    "ember-cli-babel": "^6.3.0",
     "intro.js": "~2.5.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-ajax": "^2.4.1",
-    "ember-cli": "2.12.1",
-    "ember-cli-chai": "^0.3.2",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.3.6",
+    "ember-ajax": "^3.0.0",
+    "ember-cli": "2.13.3",
+    "ember-cli-chai": "^0.4.2",
+    "ember-cli-dependency-checker": "^2.0.1",
+    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-htmlbars": "^2.0.2",
+    "ember-cli-htmlbars-inline-precompile": "^0.4.3",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-mocha": "^0.13.2",
+    "ember-cli-mocha": "^0.14.4",
     "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",
-    "ember-export-application-global": "^1.0.5",
-    "ember-load-initializers": "^0.6.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
+    "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^2.0.3",
     "ember-sinon": "^0.7.0",
-    "ember-source": "~2.12.0",
-    "loader.js": "^4.2.3",
-    "sinon-chai": "^2.9.0"
+    "ember-source": "~2.13.3",
+    "loader.js": "^4.3.3",
+    "sinon-chai": "^2.11.0"
   },
   "fastbootDependencies": [
     "introJs"
   ],
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -3,10 +3,12 @@ module.exports = {
   "test_page": "tests/index.html?hidepassed",
   "disable_watching": true,
   "launch_in_ci": [
-    "PhantomJS"
+    "Chrome"
   ],
   "launch_in_dev": [
-    "PhantomJS",
     "Chrome"
-  ]
+  ],
+  browser_args: {
+    'Chrome': ['--headless', '--disable-gpu', '--remote-debugging-port=9222']
+  }
 };

tests/dummy/app/app.js

@@ -5,8 +5,6 @@ import config from './config/environment';
 
 let App;
 
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
 App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,

tests/dummy/config/targets.js

@@ -0,0 +1,10 @@
+/* eslint-env node */
+
+module.exports = {
+  browsers: [
+    'ie 9',
+    'last 1 Chrome versions',
+    'last 1 Firefox versions',
+    'last 1 Safari versions'
+  ]
+};

vendor/ember-introjs/shims/intro-js.js

@@ -1,12 +1,17 @@
-(function() {
-  function vendorModule() {
-    'use strict';
+/* eslint-env node */
+define('intro-js', [], function() {
+  'use strict';
 
-    var intro = self.introJs;
-    delete self.introJs;
+  var introJs;
 
-    return { 'default': intro };
+  if (typeof FastBoot != 'undefined') {
+    introJs = FastBoot.require('introJs');
+  } else {
+    introJs = self.introJs;
+    delete self.introJs;
   }
 
-  define('intro-js', [], vendorModule);
-})();
+  return {
+    'default': introJs
+  };
+});