Upgrade ember - work in progress

.eslintignore

@@ -0,0 +1,16 @@
+# unconventional js
+/blueprints/*/files/
+/vendor/
+
+# compiled output
+/dist/
+/tmp/
+
+# dependencies
+/bower_components/
+
+# misc
+/coverage/
+
+# ember-try
+/.node_modules.ember-try/

.eslintrc.js

@@ -1,14 +1,39 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-    'semi': 2
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        'ember-cli-build.js',
+        'testem.js',
+        'blueprints/*/index.js',
+        'config/**/*.js',
+        'lib/*/index.js'
+      ],
+      parserOptions: {
+        sourceType: 'script',
+        ecmaVersion: 2015
+      },
+      env: {
+        browser: false,
+        node: true
+      }
+    }
+  ]
 };

.gitignore

@@ -1,17 +1,23 @@
 # See https://help.github.com/ignore-files/ for more about ignoring files.
 
 # compiled output
-/dist
-/tmp
+/dist/
+/tmp/
 
 # dependencies
-/node_modules
-/bower_components
+/bower_components/
+/node_modules/
 
 # misc
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-testem.log
+/npm-debug.log*
+/testem.log
+/yarn-error.log
+
+# ember-try
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.travis.yml

@@ -1,25 +1,27 @@
 ---
 language: node_js
 node_js:
-  - "7"
+  - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
   directories:
     - $HOME/.npm
-    - $HOME/.cache # includes bowers cache
+
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
 
 before_install:
   - npm config set spin false
-  - npm install -g bower phantomjs-prebuilt
-  - bower --version
-  - phantomjs --version
-
-install:
-  - npm install
-  - bower install
 
 script:
+  - npm run lint:js
   - npm test

app/app.js

@@ -1,15 +1,15 @@
 import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
-
 import './utils/component-debug';
 
 let App;
 
 Ember.MODEL_FACTORY_INJECTIONS = true;
 
-App = Ember.Application.extend({
+App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver

app/components/current-route.js

@@ -1,20 +1,13 @@
-import Ember from 'ember';
+import Component from '@ember/component';
+import { readOnly } from '@ember/object/computed';
+import { inject as service } from '@ember/service';
 
-const {
-  computed: {
-    readOnly
-  },
-  inject: {
-    service
-  }
-} = Ember;
-
-export default Ember.Component.extend({
+export default Component.extend({
   storage: service('shared-storage'),
 
   init() {
     this._super(...arguments);
-    this.set('appController', this.get('storage').get('application-controller'));
+    this.set('appController', this.storage.get('application-controller'));
   },
 
   currentRoute: readOnly('appController.currentPath')

app/components/list-view.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 
-export default Ember.Component.extend({
+export default Component.extend({
   didInsertElement() {
-    if (this.get('onScroll')) {
-      window.addEventListener('scroll', (...args) => this.get('onScroll')(...args));
+    if (this.onScroll) {
+      window.addEventListener('scroll', (...args) => this.onScroll(...args));
     }
   }
 });

app/controllers/application.js

@@ -1,18 +1,13 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
+import { inject as service } from '@ember/service';
 
-const {
-  inject: {
-    service
-  }
-} = Ember;
-
-export default Ember.Controller.extend({
+export default Controller.extend({
   storage: service('shared-storage'),
 
   init() {
     this._super(...arguments);
 
     // Save the application controller for use with other things
-    this.get('storage').set('application-controller', this);
+    this.storage.set('application-controller', this);
   }
 });

app/controllers/index.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Controller from '@ember/controller';
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   actions: {
     onScroll() {
       if (!this.isDestroyed) {

app/helpers/capitalize.js

@@ -1,13 +1,5 @@
-import Ember from 'ember';
-
-const {
-  String: {
-    capitalize
-  },
-  Helper: {
-    helper
-  }
-} = Ember;
+import { capitalize } from '@ember/string';
+import { helper } from '@ember/component/helper';
 
 export function capitalizeHelper([str]) {
   return capitalize(str);

app/helpers/format-name.js

@@ -1,12 +1,5 @@
-import Ember from 'ember';
-
-const {
-  get,
-  Map,
-  Helper: {
-    helper
-  }
-} = Ember;
+import { get } from '@ember/object';
+import { helper } from '@ember/component/helper';
 const cache = new Map();
 
 export function formatName([user]) {

app/index.html

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

app/instance-initializers/link-tracking.js

@@ -1,8 +1,4 @@
-import Ember from 'ember';
-
-const {
-  LinkComponent
-} = Ember;
+import LinkComponent from '@ember/routing/link-component';
 
 export function initialize(instance) {
   LinkComponent.reopen({

app/router.js

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

app/routes/application.js

@@ -1,9 +1,9 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 import populateStore from '../mock-data';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model() {
-    let store = this.get('store');
+    let store = this.store;
     populateStore(store);
 
     let user = store.peekRecord('user', '1337');

app/routes/profile.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import Route from '@ember/routing/route';
 
-export default Ember.Route.extend({
+export default Route.extend({
   model(params) {
-    return this.get('store').peekRecord('user', params.id);
+    return this.store.peekRecord('user', params.id);
   }
 });

app/services/shared-storage.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import Service from '@ember/service';
 
-export default Ember.Service.extend({
+export default Service.extend({
   _data: Object.create(null),
 
   set(key, value) {

app/templates/application.hbs

@@ -33,4 +33,3 @@
     {{outlet}}
   </div>
 </div>
-

app/utils/component-debug.js

@@ -1,10 +1,10 @@
-import Ember from 'ember';
+import Component from '@ember/component';
 import config from '../config/environment';
 
-Ember.Component.reopen({
+Component.reopen({
   init() {
     let component = this;
-    component._super(...arguments);
+    this._super(...arguments);
 
     if (config.environment !== 'production') {
       let id = component.toString();

config/environment.js

@@ -1,9 +1,9 @@
-/* jshint node: true */
+'use strict';
 
 module.exports = function(environment) {
-  var ENV = {
+  let ENV = {
     modulePrefix: 'memory-leak-examples',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
@@ -40,10 +40,11 @@ module.exports = function(environment) {
     ENV.APP.LOG_VIEW_LOOKUPS = false;
 
     ENV.APP.rootElement = '#ember-testing';
+    ENV.APP.autoboot = false;
   }
 
   if (environment === 'production') {
-
+    // here you can enable a production-specific feature
   }
 
   return ENV;

config/targets.js

@@ -0,0 +1,18 @@
+'use strict';
+
+const browsers = [
+  'last 1 Chrome versions',
+  'last 1 Firefox versions',
+  'last 1 Safari versions'
+];
+
+const isCI = !!process.env.CI;
+const isProduction = process.env.EMBER_ENV === 'production';
+
+if (isCI || isProduction) {
+  browsers.push('ie 11');
+}
+
+module.exports = {
+  browsers
+};

ember-cli-build.js

@@ -1,9 +1,9 @@
-/*jshint node:true*/
-/* global require, module */
-var EmberApp = require('ember-cli/lib/broccoli/ember-app');
+'use strict';
+
+const EmberApp = require('ember-cli/lib/broccoli/ember-app');
 
 module.exports = function(defaults) {
-  var app = new EmberApp(defaults, {
+  let app = new EmberApp(defaults, {
     trees: {
       vendor: 'node_modules/bulma'
     }