Update to lastest version of ember-cli

.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

addon/-private/promise.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { RSVP: { Promise } } = Ember;
+import { Promise } from 'rsvp';
 
 /**
  * AJAX Promise

addon/-private/utils/get-header.js

@@ -1,6 +1,5 @@
-import Ember from 'ember';
-
-const { A, isNone } = Ember;
+import { A } from '@ember/array';
+import { isNone } from '@ember/utils';
 
 /**
  * Do a case-insensitive lookup of an HTTP header

addon/ajax-request.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import EmberObject from '@ember/object';
 import AjaxRequestMixin from './mixins/ajax-request';
 
-const { Object: EmberObject } = Ember;
-
 export default EmberObject.extend(AjaxRequestMixin);

addon/errors.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Error: EmberError } = Ember;
+import EmberError from '@ember/error';
 
 /**
  * @class AjaxError

addon/mixins/ajax-request.js

@@ -1,3 +1,11 @@
+import { A } from '@ember/array';
+import EmberError from '@ember/error';
+import Mixin from '@ember/object/mixin';
+import { get } from '@ember/object';
+import { isEmpty } from '@ember/utils';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
+import { warn, runInDebug } from '@ember/debug';
 import Ember from 'ember';
 import {
   AjaxError,
@@ -29,18 +37,9 @@ import isString from 'ember-ajax/-private/utils/is-string';
 import AJAXPromise from 'ember-ajax/-private/promise';
 
 const {
-  A,
-  Error: EmberError,
   Logger,
-  Mixin,
   Test,
-  get,
-  isEmpty,
-  merge,
-  run,
-  runInDebug,
-  testing,
-  warn
+  testing
 } = Ember;
 const JSONContentType = /^application\/(?:vnd\.api\+)?json/i;
 
@@ -213,9 +212,9 @@ export default Mixin.create({
       internalPromise.then(({ response }) => {
         resolve(response);
       })
-      .catch(({ response }) => {
-        reject(response);
-      });
+        .catch(({ response }) => {
+          reject(response);
+        });
     }, `ember-ajax: ${hash.type} ${hash.url} response`);
 
     ajaxPromise.xhr = internalPromise.xhr;
@@ -262,11 +261,11 @@ export default Mixin.create({
       jqXHR
         .done((payload, textStatus, jqXHR) => {
           const response = this.handleResponse(
-                    jqXHR.status,
-                    parseResponseHeaders(jqXHR.getAllResponseHeaders()),
-                    payload,
-                    requestData
-                  );
+            jqXHR.status,
+            parseResponseHeaders(jqXHR.getAllResponseHeaders()),
+            payload,
+            requestData
+          );
 
           if (isAjaxError(response)) {
             run.join(null, reject, { payload, textStatus, jqXHR, response });
@@ -295,10 +294,10 @@ export default Mixin.create({
             response = new AbortError();
           } else {
             response = this.handleResponse(
-               jqXHR.status,
-               parseResponseHeaders(jqXHR.getAllResponseHeaders()),
-               payload,
-               requestData
+              jqXHR.status,
+              parseResponseHeaders(jqXHR.getAllResponseHeaders()),
+              payload,
+              requestData
             );
           }
 
@@ -484,7 +483,7 @@ export default Mixin.create({
     }
 
     // If the URL has already been constructed (presumably, by Ember Data), then we should just leave it alone
-    const hasNamespaceRegex = new RegExp(`^(\/)?${namespace}`);
+    const hasNamespaceRegex = new RegExp(`^(/)?${namespace}`);
     if (hasNamespaceRegex.test(url)) {
       return url;
     }

addon/mixins/ajax-support.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
-
-const {
-  Mixin,
-  inject: { service },
-  computed: { alias }
-} = Ember;
+import Mixin from '@ember/object/mixin';
+import { inject as service } from '@ember/service';
+import { alias } from '@ember/object/computed';
 
 export default Mixin.create({
 

addon/mixins/legacy/normalize-error-response.js

@@ -1,13 +1,9 @@
-import Ember from 'ember';
+import Mixin from '@ember/object/mixin';
+import { isArray } from '@ember/array';
+import { isNone } from '@ember/utils';
+import { merge } from '@ember/polyfills';
 import isString from 'ember-ajax/-private/utils/is-string';
 
-const {
-  Mixin,
-  isArray,
-  isNone,
-  merge
-} = Ember;
-
 function isObject(object) {
   return typeof object === 'object';
 }

addon/services/ajax.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
+import Service from '@ember/service';
 import AjaxRequestMixin from '../mixins/ajax-request';
 
-const { Service } = Ember;
-
 export default Service.extend(AjaxRequestMixin);

addon/utils/ajax.js

@@ -1,9 +1,6 @@
 /* global najax */
-import Ember from 'ember';
-import isFastBoot from 'ember-ajax/-private/utils/is-fastboot';
+import $ from 'jquery';
 
-const {
-  $
-} = Ember;
+import isFastBoot from 'ember-ajax/-private/utils/is-fastboot';
 
 export default isFastBoot ? najax : $.ajax;

ember-cli-build.js

@@ -1,8 +1,10 @@
-/* global require, module */
-var EmberAddon = 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) {
-  var app = new EmberAddon(defaults, {
+  const app = new EmberAddon(defaults, {
     // Add options here
   });
 

package.json

@@ -20,16 +20,16 @@
     "test": "ember try:each"
   },
   "dependencies": {
-    "ember-cli-babel": "^6.1.0"
+    "ember-cli-babel": "^6.6.0"
   },
   "devDependencies": {
     "broccoli-asset-rev": "^2.4.5",
-    "ember-cli": "^2.13.1",
+    "ember-cli": "~2.16.2",
     "ember-cli-chai": "0.4.3",
-    "ember-cli-dependency-checker": "^1.4.0",
-    "ember-cli-eslint": "^3.1.0",
+    "ember-cli-dependency-checker": "^2.0.0",
+    "ember-cli-eslint": "^4.0.0",
     "ember-cli-htmlbars": "^2.0.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.2",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.0",
     "ember-cli-inject-live-reload": "^1.4.1",
     "ember-cli-mocha": "^0.14.3",
     "ember-cli-pretender": "^1.0.1",
@@ -38,21 +38,21 @@
     "ember-cli-sri": "^2.1.0",
     "ember-cli-test-loader": "^2.1.0",
     "ember-cli-testdouble": "^0.1.2",
-    "ember-cli-uglify": "^1.2.0",
+    "ember-cli-uglify": "^2.0.0",
     "ember-cli-update": "^0.10.1",
     "ember-data": "^2.13.1",
     "ember-export-application-global": "2.0.0",
     "ember-load-initializers": "1.0.0",
     "ember-resolver": "4.1.0",
-    "ember-source": "^2.13.0",
+    "ember-source": "~2.16.0",
     "eslint": "^4.1.0",
     "eslint-plugin-ember-suave": "^1.0.0",
     "loader.js": "^4.4.0",
     "testdouble": "3.2.6",
     "testdouble-chai": "^0.5.0"
   },
   "engines": {
-    "node": ">= 4"
+    "node": "^4.5 || 6.* || >= 7.*"
   },
   "ember-addon": {
     "configPath": "tests/dummy/config"

testem.js

@@ -1,13 +1,23 @@
 /* eslint-disable */
 
 module.exports = {
-  "framework": "qunit",
-  "test_page": "tests/index.html?hidepassed&nocontainer",
-  "disable_watching": true,
-  "launch_in_ci": [
-    "Chrome"
+  test_page: "tests/index.html?hidepassed&nocontainer",
+  disable_watching: true,
+  launch_in_ci: [
+    'Chrome'
   ],
-  "launch_in_dev": [
-    "Chrome"
-  ]
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=9222',
+        '--window-size=1440,900'
+      ]
+    },
+  }
 };

tests/acceptance/ajax-get-test.js

@@ -1,4 +1,9 @@
-import { describe, beforeEach, afterEach, it } from 'mocha';
+import {
+  describe,
+  beforeEach,
+  afterEach,
+  it
+} from 'mocha';
 import { expect } from 'chai';
 
 import destroyApp from 'dummy/tests/helpers/destroy-app';

tests/acceptance/ember-data-integration-test.js

@@ -1,4 +1,9 @@
-import { describe, beforeEach, afterEach, it } from 'mocha';
+import {
+  describe,
+  beforeEach,
+  afterEach,
+  it
+} from 'mocha';
 import { assert } from 'chai';
 
 const { equal } = assert;

tests/dummy/app/app.js

@@ -1,12 +1,8 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-const { Application } = Ember;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
 const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,

tests/dummy/app/components/ajax-get.js

@@ -1,10 +1,9 @@
-import Ember from 'ember';
-
-const { Component, inject } = Ember;
+import { inject as service } from '@ember/service';
+import Component from '@ember/component';
 
 export default Component.extend({
   classNames: 'ajax-get',
-  ajax: inject.service(),
+  ajax: service(),
 
   // Error message
   error: null,

tests/dummy/app/index.html

@@ -9,8 +9,8 @@
 
     {{content-for "head"}}
 
-    <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-    <link rel="stylesheet" href="{{rootURL}}assets/dummy.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/dummy.css">
 
     {{content-for "head-footer"}}
   </head>

tests/dummy/app/router.js

@@ -1,10 +1,6 @@
-import Ember from 'ember';
+import EmberRouter from '@ember/routing/router';
 import config from './config/environment';
 
-const {
-  Router: EmberRouter
-} = Ember;
-
 const Router = EmberRouter.extend({
   location: config.locationType,
   rootURL: config.rootURL

tests/dummy/app/routes/ember-data-test.js

@@ -1,6 +1,4 @@
-import Ember from 'ember';
-
-const { Route } = Ember;
+import Route from '@ember/routing/route';
 
 export default Route.extend({
   model() {

tests/dummy/config/environment.js

@@ -1,9 +1,10 @@
-/* eslint-disable */
+/* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  const ENV = {
     modulePrefix: 'dummy',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
@@ -43,7 +44,7 @@ module.exports = function(environment) {
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

tests/dummy/config/targets.js

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

tests/helpers/destroy-app.js

@@ -1,8 +1,4 @@
-import Ember from 'ember';
-
-const {
-  run
-} = Ember;
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
   run(application, 'destroy');