More upgrades

Author: stefanpenner

.eslintignore

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

.eslintrc.js

@@ -4,10 +4,38 @@ module.exports = {
     ecmaVersion: 2017,
     sourceType: 'module'
   },
-  extends: 'eslint:recommended',
+  plugins: [
+    'ember'
+  ],
+  extends: [
+    'eslint:recommended',
+    'plugin:ember/recommended'
+  ],
   env: {
     browser: true
   },
   rules: {
-  }
+  },
+  overrides: [
+    // node files
+    {
+      files: [
+        '.eslintrc.js',
+        '.template-lintrc.js',
+        '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,23 +1,24 @@
 # 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
+/.env*
 /.sass-cache
 /connect.lock
-/coverage/*
+/coverage/
 /libpeerconnection.log
-npm-debug.log*
-yarn-error.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
+/.node_modules.ember-try/
+/bower.json.ember-try
+/package.json.ember-try

.template-lintrc.js

@@ -0,0 +1,5 @@
+'use strict';
+
+module.exports = {
+  extends: 'recommended'
+};

.travis.yml

@@ -25,4 +25,6 @@ install:
   - yarn install --non-interactive
 
 script:
+  - yarn lint:hbs
+  - yarn lint:js
   - yarn test

app/components/basic-tree.js

@@ -1,23 +1,29 @@
 import Ember from 'ember';
 
-// Import the D3 packages we want to use
-import { select, event } from 'd3-selection';
-import { cluster, hierarchy } from 'd3-hierarchy';
-import { zoom, zoomIdentity } from 'd3-zoom';
-
-const { run, get, inject } = Ember;
+const {
+  select,
+  hierarchy,
+  cluster,
+  zoom,
+  zoomIdentity
+} = self.d3;
+
+const { inject } = Ember;
+import { run } from '@ember/runloop';
+import { get } from '@ember/object';
+import Component from '@ember/component';
 
 const DURATION = 500;
 
 // The offset amount (in px) from the left or right side of a node
 // box to offset lines between nodes, so the lines don't come right
 // up to the edge of the box.
-const NODE_OFFSET_SIZE = 50; 
+const NODE_OFFSET_SIZE = 50;
 
 // copied these functions temporarily from `broccoli-viz` here:
 // https://github.com/ember-cli/broccoli-viz/blob/master/lib/node-by-id.js
 
-export default Ember.Component.extend({
+export default Component.extend({
   classNames: ['basic-tree'],
 
   graph: inject.service(),
@@ -120,7 +126,7 @@ export default Ember.Component.extend({
     // for debugging
     self.root = root;
 
-    // Create the graph. The nodeSize() is [8,280] (width, height) because we 
+    // Create the graph. The nodeSize() is [8,280] (width, height) because we
     // want to change the orientation of the graph from top-down to left-right.
     // To do that we reverse X and Y for calculations and translations.
     let graph = cluster()
@@ -177,7 +183,7 @@ export default Ember.Component.extend({
          .style('fill', "#fff");
 
       // Draw a box in a separate color for the first line as
-      // a 'title'. 
+      // a 'title'.
       nodeEnter.append("rect")
          .attr('x', 0)
          .attr('y', '-2em')
@@ -258,7 +264,7 @@ export default Ember.Component.extend({
         .attr("d", function(d) {
           let sourceExitY = d.source.y + d.source.computedWidth + NODE_OFFSET_SIZE;
           let targetEntranceY = d.target.y - NODE_OFFSET_SIZE;
-          
+
           return "M" + d.target.y + "," + d.target.x
             + "L" + targetEntranceY + "," + d.target.x
             + " " + sourceExitY + "," + d.target.x
@@ -272,7 +278,7 @@ export default Ember.Component.extend({
         .attr("d", function(d) {
           let sourceExitY = d.source.y + d.source.computedWidth + NODE_OFFSET_SIZE;
           let targetEntranceY = d.target.y - NODE_OFFSET_SIZE;
-          
+
           return "M" + d.target.y + "," + d.target.x
             + "L" + targetEntranceY + "," + d.target.x
             + " " + sourceExitY + "," + d.target.x

app/components/flame-graph.js

@@ -1,13 +1,18 @@
 import Ember from 'ember';
 import FlameGraph from '../utils/d3-flame-graphs-v4/d3-flame-graph';
 
-const { run, get, inject } = Ember;
+import { run } from '@ember/runloop';
+import { get } from '@ember/object';
+import Component from '@ember/component';
+import { readOnly } from '@ember/object/computed';
 
-export default Ember.Component.extend({
+const { inject } = Ember;
+
+export default Component.extend({
   classNames: ['flame-graph'],
   graph: inject.service(),
   flameGraph: null,
-  totalTime: Ember.computed.alias('graph.data.summary.totalTime'),
+  totalTime: readOnly('graph.data.summary.totalTime'),
 
   init() {
     this._super(...arguments);

app/components/slow-node-times.js

@@ -1,9 +1,9 @@
 import Ember from 'ember';
+import { get, set } from '@ember/object';
+import { computed } from '@ember/object';
+import Component from '@ember/component';
 
 const {
-  get,
-  set,
-  computed,
   inject
 } = Ember;
 
@@ -32,13 +32,13 @@ function computeNodeTimes(node) {
     }
   }
 
-  Ember.set(node._stats.time, 'plugin', total);
+  set(node._stats.time, 'plugin', total);
 
   return total;
 }
 
 
-export default Ember.Component.extend({
+export default Component.extend({
   graph: inject.service(),
 
   init() {
@@ -85,7 +85,7 @@ export default Ember.Component.extend({
       }, {});
 
       nodes = [];
-      
+
       for (let pluginName in pluginNameMap) {
         nodes.push({
           groupedByPluginName: true,
@@ -112,7 +112,7 @@ export default Ember.Component.extend({
     // off the label as the plugin name. If not, we need
     // to create a map of the plugin names and return that.
     let pluginNames = [];
-    
+
     if (nodes[0].groupedByPluginName === true) {
       pluginNames = nodes.map(node => node.label.name);
     } else {

app/controllers/application.js

@@ -1,11 +1,12 @@
 import Ember from 'ember';
 import fetch from "fetch";
+import Controller from '@ember/controller';
 
 const {
   inject
 } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   graph: inject.service(),
 
   actions: {

app/controllers/flame.js

@@ -1,7 +1,7 @@
 import Ember from 'ember';
+import Controller from '@ember/controller';
 
 const {
-  Controller,
   inject
 } = Ember;
 

app/controllers/graph.js

@@ -1,9 +1,9 @@
 import Ember from 'ember';
+import Controller from '@ember/controller';
+import { getOwner } from '@ember/application';
+import { computed } from '@ember/object';
 
 const {
-  Controller,
-  getOwner,
-  computed,
   inject
 } = Ember;
 

app/controllers/graph/index.js

@@ -1,9 +1,10 @@
 import Ember from 'ember';
+import Controller from '@ember/controller';
 
 const {
   inject
 } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   graph: inject.service()
 });

app/controllers/graph/node.js

@@ -1,9 +1,10 @@
+import Controller from '@ember/controller';
 import Ember from 'ember';
 
 const {
   inject
 } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   graph: inject.service()
 });

app/controllers/selected-node.js

@@ -1,9 +1,10 @@
 import Ember from 'ember';
+import Controller from '@ember/controller';
 
 const {
   inject
 } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   graph: inject.service()
 })

app/controllers/slow-nodes.js

@@ -1,10 +1,11 @@
+import Controller from '@ember/controller';
 import Ember from 'ember';
 
 const {
   inject
 } = Ember;
 
-export default Ember.Controller.extend({
+export default Controller.extend({
   graph: inject.service(),
 
   actions: {

app/helpers/includes.js

@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
-export default Ember.Helper.helper(function([haystack, needle]) {
+export default buildHelper(function([haystack, needle]) {
   return haystack && haystack.includes && haystack.includes(needle);
 });

app/helpers/ns-to-ms.js

@@ -1,7 +1,7 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
 export function nsToMs([time]) {
   return (time / 1000000).toFixed(2);
 }
 
-export default Ember.Helper.helper(nsToMs);
+export default buildHelper(nsToMs);

app/helpers/stats-iterator.js

@@ -1,6 +1,6 @@
-import Ember from 'ember';
+import { helper as buildHelper } from '@ember/component/helper';
 
-export default Ember.Helper.helper(function([node]) {
+export default buildHelper(function([node]) {
   let stats = {};
 
   for (let [name, value] of node.statsIterator()) {

app/services/graph.js

@@ -1,15 +1,12 @@
-import Ember from 'ember';
 import config from '../config/environment';
 import heimdallGraph from 'heimdalljs-graph';
-
-const {
-  getOwner
-} = Ember;
+import { getOwner } from '@ember/application';
+import Service from '@ember/service';
 
 const DATA_STORAGE_KEY = `${config.storageVersion}_graph-data`;
 const SELECTED_NODE_STORAGE_KEY = `${config.storageVersion}_selected-node-id`;
 
-export default Ember.Service.extend({
+export default Service.extend({
   init() {
     this._super(...arguments);