Upgrade Ember

.npmignore

@@ -8,7 +8,7 @@
 .editorconfig
 .ember-cli
 .gitignore
-.jshintrc
+.eslintrc.js
 .watchmanconfig
 .travis.yml
 bower.json

config/ember-try.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 module.exports = {
   scenarios: [
     {

config/environment.js

@@ -1,4 +1,4 @@
-/*jshint node:true*/
+/* eslint-env node */
 'use strict';
 
 module.exports = function(/* environment, appConfig */) {

ember-cli-build.js

@@ -1,9 +1,8 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
+/* eslint-env node */
+const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 
 module.exports = function(defaults) {
-  var app = new EmberAddon(defaults, {
+  let app = new EmberAddon(defaults, {
     // Add options here
     snippetPaths: ['tests/dummy/snippets'],
     snippetSearchPaths: ['tests/dummy/app']

package.json

@@ -23,7 +23,7 @@
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
     "ember-ajax": "^2.4.1",
-    "ember-cli": "2.11.0",
+    "ember-cli": "2.12.1",
     "ember-cli-app-version": "^3.0.0",
     "ember-cli-dependency-checker": "^1.4.0",
     "ember-cli-eslint": "^3.0.3",
@@ -40,14 +40,14 @@
     "ember-cli-uglify": "^1.2.0",
     "ember-code-snippet": "1.8.1",
     "ember-cp-validations": "3.3.0",
-    "ember-data": "^2.11.0",
+    "ember-data": "^2.12.2",
     "ember-deferred-content": "0.2.0",
     "ember-disable-prototype-extensions": "^1.1.0",
     "ember-export-application-global": "^2.0.0",
     "ember-inflector": "1.11.0",
-    "ember-load-initializers": "^0.6.0",
-    "ember-resolver": "^2.0.3",
-    "ember-source": "^2.11.0",
+    "ember-load-initializers": "^1.0.0",
+    "ember-resolver": "^4.1.0",
+    "ember-source": "^2.12.1",
     "ember-transition-helper": "0.0.6",
     "eslint-plugin-ember-suave": "^1.0.0",
     "liquid-fire": "0.27.2",

testem.js

@@ -1,13 +1,13 @@
-/*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': [
+    'PhantomJS'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
+  'launch_in_dev': [
+    'PhantomJS',
+    'Chrome'
   ]
 };

tests/dummy/config/environment.js

@@ -1,11 +1,11 @@
-/* jshint node: true */
+/* eslint-env node */
 
 module.exports = function(environment) {
   // jscs:disable requireEnhancedObjectLiterals, validateQuoteMarks, disallowEmptyBlocks, disallowVar
 
-  var ENV = {
+  let ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'hash',
     EmberENV: {
@@ -24,7 +24,7 @@ module.exports = function(environment) {
       // when it is created
       rootElement: 'body'
     },
-    
+
     contentSecurityPolicy: {
       'default-src': "'none'",
       'script-src': "'self' 'unsafe-inline' 'unsafe-eval' https://buttons.github.io https://api.github.com",

tests/helpers/module-for-acceptance.js

@@ -1,5 +1,3 @@
-// https://github.com/DockYard/ember-suave/issues/109
-// jscs:disable
 import { module } from 'qunit';
 import Ember from 'ember';
 import startApp from '../helpers/start-app';
@@ -22,5 +20,4 @@ export default function(name, options = {}) {
       return Promise.resolve(afterEach).then(() => destroyApp(this.application));
     }
   });
-}
-// jscs:enable
+}