ember-cli 2.14.0 upgrade + eslint

.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

@@ -24,7 +24,7 @@ before_install:
   - phantomjs --version
 
 install:
-  - yarn install --no-lockfile
+  - yarn install --no-lockfile --non-interactive
 
 script:
   - yarn run test

ember-cli-build.js

@@ -1,11 +1,13 @@
-/* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+'use strict';
+
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
   /* hack so that we can test ourselves, only really and ember-cli-babel thing */
-  var super$addonInstalled = EmberApp.prototype._addonInstalled;
+  var super$addonInstalled = EmberAddon.prototype._addonInstalled;
 
-  EmberApp.prototype._addonInstalled = function(addonName) {
+  EmberAddon.prototype._addonInstalled = function(addonName) {
     if (addonName === 'ember-cli-babel') {
       return true;
     } else{
@@ -14,14 +16,14 @@ module.exports = function(defaults) {
   };
   /* end hack */
 
-  var app = new EmberApp(defaults, {
+  let app = new EmberAddon(defaults, {
     'ember-cli-babel': {
       includePolyfill: true
     }
   });
 
   /*
-    This build file specifes the options for the dummy test app of this
+    This build file specifies the options for the dummy test app of this
     addon, located in `/tests/dummy`
     This build file does *not* influence how the addon or the app using it
     behave. You most likely want to be modifying `./index.js` or app's build file

index.js

@@ -1,4 +1,4 @@
-/* jshint node: true */
+/* eslint-env node */
 'use strict';
 
 const VersionChecker = require('ember-cli-version-checker');

package.json

@@ -28,7 +28,6 @@
   },
   "scripts": {
     "build": "ember build",
-    "jshint": "jshint",
     "start": "ember server",
     "test:node": "mocha node-tests",
     "test:debug": "mocha debug node-tests",
@@ -55,23 +54,23 @@
     "common-tags": "^1.4.0",
     "console-ui": "^1.0.2",
     "core-object": "^3.1.3",
-    "ember-cli": "2.13.2",
+    "ember-cli": "~2.14.0",
     "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-eslint": "^3.0.0",
     "ember-cli-htmlbars": "^2.0.1",
     "ember-cli-htmlbars-inline-precompile": "^0.4.3",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-qunit": "^4.0.0",
     "ember-cli-shims": "^1.1.0",
-    "ember-export-application-global": "^2.0.0",
     "ember-load-initializers": "^1.0.0",
     "ember-resolver": "^4.0.0",
-    "ember-source": "^2.13.0",
+    "ember-source": "~2.14.0",
     "loader.js": "^4.4.0",
     "mocha": "^3.4.1",
     "resolve": "^1.3.3"
   },
   "engines": {
-    "node": "4.x || 6.x || >= 7"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

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

tests/.eslintrc.js

@@ -1,5 +1,6 @@
 module.exports = {
   env: {
-    embertest: true
+    embertest: true,
+    es6: true
   }
 };

tests/dummy/app/app.js

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

tests/dummy/app/controllers/application.js

@@ -2,8 +2,8 @@ import Ember from 'ember';
 
 export default Ember.Controller.extend({
   // Just a very roundabout way of using some ES6 features
-  value: ((test = 'Test') => `${test} ${'Value'}`)(), // jshint ignore:line
+  value: ((test = 'Test') => `${test} ${'Value'}`)(),
 
   // Test a generator (needs the regenerator runtime) and some ES6 constructs (requires the corejs polyfill)
-  values: Ember.A(Array.from({ *[Symbol.iterator]() { yield 'one'; yield 'two'; } })) // jshint ignore:line
+  values: Ember.A(Array.from({ *[Symbol.iterator]() { yield 'one'; yield 'two'; } }))
 });

tests/dummy/config/environment.js

@@ -1,9 +1,10 @@
 /* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {

tests/dummy/config/targets.js

@@ -1,5 +1,4 @@
 /* eslint-env node */
-
 module.exports = {
   browsers: [
     'ie 9',

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));
     }
   });
 }