Upgrade packages

.travis.yml

@@ -9,6 +9,11 @@ cache:
   directories:
     - $HOME/.npm
 
+dist: trusty
+
+addons:
+  chrome: stable
+
 env:
   # we recommend testing LTS's and latest stable release (bonus points to beta/canary)
   - EMBER_TRY_SCENARIO=ember-lts-2.8
@@ -24,8 +29,6 @@ matrix:
 
 before_install:
   - npm config set spin false
-  - npm install -g phantomjs-prebuilt
-  - phantomjs --version
 
 install:
   - npm install

addon/mixins/gravatar.js

@@ -18,19 +18,15 @@ export default Ember.Mixin.create({
   height: Ember.computed.reads('size'),
   width: Ember.computed.reads('size'),
 
-  src: Ember.computed('email', 'size', 'image', 'defaultImage', 'fastboot.isFastBoot', function() {
-    return this.get('fastboot.isFastBoot') || this.get('image') ? this.get('image') : this.generateGravatarUrl();
+  src: Ember.computed('email', 'size', 'image', 'defaultImage', function() {
+    return this.get('image') ? this.get('image') : this.generateGravatarUrl();
   }),
 
   config: Ember.computed(function() {
     let appSettings = Ember.getOwner(this).resolveRegistration('config:environment').emberInitials || {};
     return Ember.assign({}, Config, appSettings);
   }),
 
-  fastboot: Ember.computed(function() {
-    return Ember.getOwner(this).lookup('service:fastboot');
-  }),
-
   generateGravatarUrl() {
     let hash = md5(this.get('email'));
     let size = this.get('size');

index.js

@@ -12,14 +12,10 @@ module.exports = {
     this._super.included(app);
 
     app.import('vendor/ember-initials/md5.js');
-    app.import('vendor/shims/md5/' + shimFor('md5'), {
-      type: 'vendor'
-    });
+    app.import('vendor/shims/md5.js', { type: 'vendor' });
 
     app.import('vendor/ember-initials/object_hash.js');
-    app.import('vendor/shims/object-hash/' + shimFor('object-hash'), {
-      type: 'vendor'
-    });
+    app.import('vendor/shims/object-hash.js', { type: 'vendor' });
   },
 
   md5Path() {
@@ -46,14 +42,3 @@ module.exports = {
     return mergeTrees(trees);
   }
 }
-
-function shimFor(name) {
-  return isFastBoot() ? `${name}-fastboot.js` : `${name}.js`;
-}
-
-// 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

@@ -29,46 +29,46 @@
     "deploy_page": "ember github-pages:commit --message \"Deploy gh-pages from commit $(git rev-parse HEAD)\" && git push origin gh-pages:gh-pages"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "devDependencies": {
     "bootstrap-sass": "^3.3.7",
     "broccoli-asset-rev": "2.5.0",
     "ember-ajax": "^3.0.0",
-    "ember-bootstrap": "1.0.0-alpha.12",
-    "ember-cli": "2.13.0",
+    "ember-bootstrap": "1.0.0-beta.2",
+    "ember-cli": "2.13.3",
     "ember-cli-app-version": "3.0.0",
     "ember-cli-code-coverage": "^0.3.12",
-    "ember-cli-dependency-checker": "^1.3.0",
-    "ember-cli-eslint": "^3.0.0",
-    "ember-cli-fastboot": "1.0.0-beta.18",
+    "ember-cli-dependency-checker": "^2.0.1",
+    "ember-cli-eslint": "^4.0.0",
+    "ember-cli-fastboot": "1.0.0-rc.4",
     "ember-cli-favicon": "1.0.0-beta.4",
     "ember-cli-github-pages": "0.1.2",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.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-qunit": "^4.0.0",
     "ember-cli-release": "^1.0.0-beta.2",
-    "ember-cli-sass": "6.1.3",
+    "ember-cli-sass": "6.2.0",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^2.1.0",
     "ember-cli-uglify": "^1.2.0",
-    "ember-data": "^2.11.0",
-    "ember-disable-prototype-extensions": "^1.1.0",
+    "ember-data": "~2.14.0",
+    "ember-disable-prototype-extensions": "^1.1.2",
     "ember-export-application-global": "^2.0.0",
     "ember-font-awesome": "3.0.5",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.1.0",
     "ember-scroll-to": "0.6.4",
-    "ember-source": "~2.13.0",
-    "loader.js": "4.3.0"
+    "ember-source": "~2.13.3",
+    "loader.js": "4.5.1"
   },
   "dependencies": {
     "blueimp-md5": "^2.7.0",
     "broccoli-funnel": "1.2.0",
     "broccoli-merge-trees": "2.0.0",
-    "ember-cli-babel": "^6.1.0",
+    "ember-cli-babel": "^6.3.0",
     "object-hash": "^1.1.8"
   },
   "fastbootDependencies": [

testem.js

@@ -1,13 +1,15 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  framework: 'qunit',
-  test_page: 'tests/index.html?hidepassed',
-  disable_watching: true,
-  launch_in_ci: [
-    'PhantomJS',
+  'framework': 'qunit',
+  'test_page': 'tests/index.html?hidepassed',
+  'disable_watching': true,
+  'launch_in_ci': [
+    'Chrome'
   ],
-  launch_in_dev: [
-    'PhantomJS',
-    'Chrome',
+  'launch_in_dev': [
+    '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,

vendor/shims/md5.js

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

vendor/shims/object-hash.js

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