Update to Ember-cli 2.14 family

.eslintrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',

.gitignore

@@ -14,4 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try

.travis.yml

@@ -32,12 +32,11 @@ before_install:
   - bower --version
 
 install:
-  - yarn install
-  - npm rebuild node-sass
+  - yarn install --no-lockfile --non-interactive
   - bower install
 
 before_script:
   - export DISPLAY=:99; sh -e /etc/init.d/xvfb start; sleep 3
 
 script:
-  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO test --skip-cleanup
+  - node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO --skip-cleanup

ember-cli-build.js

@@ -1,11 +1,12 @@
-/* global require, module */
+/* eslint-env node */
+'use strict';
 
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
-var fs = require('fs');
-var path = require('path');
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+const fs = require('fs');
+const path = require('path');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     snippetPaths: ['tests/dummy/snippets'],
     snippetSearchPaths: ['app', 'tests/dummy/app', 'addon'],
     trees: {
@@ -14,7 +15,7 @@ module.exports = function(defaults) {
   });
   app.import('bower_components/moment/moment.js');
 
-  var bootstrap = 'bower_components/bootstrap-sass-official/assets/fonts/bootstrap';
+  let bootstrap = 'bower_components/bootstrap-sass-official/assets/fonts/bootstrap';
   fs.readdirSync(bootstrap).forEach(function(font){
     app.import(path.join(bootstrap, font), { destDir: '/fonts/bootstrap'});
   });

package.json

@@ -14,16 +14,16 @@
   },
   "repository": "https://github.com/ember-animation/liquid-fire",
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "author": "Edward Faulkner <ef@alum.mit.edu>",
   "license": "MIT",
   "dependencies": {
     "broccoli-funnel": "^1.0.1",
     "broccoli-merge-trees": "^1.0.0",
     "broccoli-stew": "^1.4.2",
-    "ember-cli-babel": "^6.1.0",
-    "ember-cli-htmlbars": "^1.1.1",
+    "ember-cli-babel": "^6.3.0",
+    "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-version-checker": "^1.2.0",
     "ember-getowner-polyfill": "^2.0.1",
     "ember-hash-helper-polyfill": "^0.1.2",
@@ -35,29 +35,27 @@
     "chai": "^3.5.0",
     "command": "0.0.5",
     "commander": "^2.3.0",
-    "ember-cli": "2.12.0",
-    "ember-cli-app-version": "^2.0.0",
+    "ember-cli": "2.14.2",
     "ember-cli-dependency-checker": "^1.3.0",
     "ember-cli-deploy": "0.6.4",
     "ember-cli-deploy-build": "0.1.1",
     "ember-cli-deploy-git": "1.0.0",
     "ember-cli-eslint": "^3.0.0",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.0",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^3.1.0",
-    "ember-cli-sass": "^5.2.1",
-    "ember-cli-shims": "^1.0.2",
+    "ember-cli-qunit": "^4.0.0",
+    "ember-cli-sass": "^7.0.0",
+    "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^1.1.0",
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "^1.8.1",
-    "ember-disable-prototype-extensions": "^1.1.0",
-    "ember-export-application-global": "^1.0.5",
+    "ember-disable-prototype-extensions": "^1.1.2",
+    "ember-export-application-global": "^2.0.0",
     "ember-fastboot-addon-tests": "^0.4.0",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.0.0",
     "ember-sinon": "^0.5.1",
-    "ember-source": "~2.12.0",
+    "ember-source": "~2.14.1",
     "git-repo-info": "^1.0.4",
     "github": "git://github.com/mikedeboer/node-github#ca90bf27d5820812c3b76908189d666446ed97cd",
     "loader.js": "^4.2.3",

testem.js

@@ -1,13 +1,12 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Firefox"
+  test_page: 'tests/index.html?hidepassed',
+  disable_watching: true,
+  launch_in_ci: [
+    'Firefox'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+  launch_in_dev: [
+    'PhantomJS',
+    'Chrome'
   ]
 };

tests/dummy/app/app.js

@@ -3,9 +3,7 @@ import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-App = Ember.Application.extend({
+const App = Ember.Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

tests/dummy/config/environment.js

@@ -1,9 +1,10 @@
-/* jshint node: true */
+/* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
 
     // Personally, hash is nicer for test work. The browser knows not

tests/dummy/config/targets.js

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

tests/helpers/module-for-acceptance.js

@@ -3,7 +3,7 @@ import Ember from 'ember';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
+const { RSVP: { resolve } } = Ember;
 
 export default function(name, options = {}) {
   module(name, {
@@ -17,7 +17,7 @@ export default function(name, options = {}) {
 
     afterEach() {
       let afterEach = options.afterEach && options.afterEach.apply(this, arguments);
-      return Promise.resolve(afterEach).then(() => destroyApp(this.application));
+      return resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
 }

tests/test-helper.js

@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
 import {
   setResolver
 } from 'ember-qunit';
+import { start } from 'ember-cli-qunit';
 
 setResolver(resolver);
+start();