Merge pull request #11 from rwjblue/fixes

rwjblue · web-flow · commit f0dd8fd0aa64 · 2017-11-09T13:46:37.000-05:00
upgrades
diff --git a/.eslintrc.js b/.eslintrc.js
@@ -1,7 +1,7 @@
 module.exports = {
   root: true,
   parserOptions: {
-    ecmaVersion: 6,
+    ecmaVersion: 2017,
     sourceType: 'module'
   },
   extends: 'eslint:recommended',
diff --git a/.gitignore b/.gitignore
@@ -14,6 +14,10 @@
 /coverage/*
 /libpeerconnection.log
 npm-debug.log*
+yarn-error.log
 testem.log
-/.idea
-/*.iml
+
+# ember-try
+.node_modules.ember-try/
+bower.json.ember-try
+package.json.ember-try
diff --git a/.travis.yml b/.travis.yml
@@ -4,18 +4,25 @@ node_js:
   - "6"
 
 sudo: false
+dist: trusty
+
+addons:
+  chrome: stable
 
 cache:
   yarn: true
 
+env:
+  global:
+    # See https://git.io/vdao3 for details.
+    - JOBS=1
+
 before_install:
   - curl -o- -L https://yarnpkg.com/install.sh | bash
   - export PATH=$HOME/.yarn/bin:$PATH
-  - yarn global add phantomjs-prebuilt
-  - phantomjs --version
 
 install:
-  - yarn install
+  - yarn install --non-interactive
 
 script:
   - yarn test
diff --git a/app/app.js b/app/app.js
@@ -1,13 +1,9 @@
-import Ember from 'ember';
+import Application from '@ember/application';
 import Resolver from './resolver';
 import loadInitializers from 'ember-load-initializers';
 import config from './config/environment';
 
-let App;
-
-Ember.MODEL_FACTORY_INJECTIONS = true;
-
-App = Ember.Application.extend({
+const App = Application.extend({
   modulePrefix: config.modulePrefix,
   podModulePrefix: config.podModulePrefix,
   Resolver
diff --git a/app/index.html b/app/index.html
@@ -1,26 +1,25 @@
 <!DOCTYPE html>
 <html>
-<head>
-  <meta charset="utf-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <title>HeimdalljsVisualizer</title>
-  <meta name="description" content="">
-  <meta name="viewport" content="width=device-width, initial-scale=1">
+  <head>
+    <meta charset="utf-8">
+    <meta http-equiv="X-UA-Compatible" content="IE=edge">
+    <title>HeimdalljsVisualizer</title>
+    <meta name="description" content="">
+    <meta name="viewport" content="width=device-width, initial-scale=1">
 
-  {{content-for "head"}}
+    {{content-for "head"}}
 
-  <link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
-  <link rel="stylesheet" href="{{rootURL}}assets/heimdalljs-visualizer.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
+    <link integrity="" rel="stylesheet" href="{{rootURL}}assets/heimdalljs-visualizer.css">
 
-  {{content-for "head-footer"}}
-</head>
-<body>
-{{content-for "body"}}
+    {{content-for "head-footer"}}
+  </head>
+  <body>
+    {{content-for "body"}}
 
-<script src="{{rootURL}}assets/vendor.js"></script>
-<script src="{{rootURL}}assets/heimdalljs-visualizer.js"></script>
+    <script src="{{rootURL}}assets/vendor.js"></script>
+    <script src="{{rootURL}}assets/heimdalljs-visualizer.js"></script>
 
-
-{{content-for "body-footer"}}
-</body>
+    {{content-for "body-footer"}}
+  </body>
 </html>
diff --git a/app/router.js b/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
 });
diff --git a/app/utils/d3-flame-graphs-v4/d3-flame-graph.js b/app/utils/d3-flame-graphs-v4/d3-flame-graph.js
@@ -3,6 +3,7 @@ import { scaleLinear, scaleQuantize } from 'd3-scale';
 import { min, max, range } from 'd3-array';
 import d3Tip from 'd3-tip';
 import { partition, hierarchy } from 'd3-hierarchy';
+import 'd3-transition';
 
 let indexOf = [].indexOf || function(item) {
     for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; }
diff --git a/config/environment.js b/config/environment.js
@@ -1,9 +1,10 @@
-/* jshint node: true */
+/* eslint-env node */
+'use strict';
 
 module.exports = function(environment) {
   var ENV = {
     modulePrefix: 'heimdalljs-visualizer',
-    environment: environment,
+    environment,
     rootURL: '/',
     locationType: 'auto',
     EmberENV: {
diff --git a/package.json b/package.json
@@ -17,29 +17,28 @@
     "test": "ember test"
   },
   "devDependencies": {
-    "broccoli-asset-rev": "^2.4.5",
+    "broccoli-asset-rev": "^2.6.0",
     "d3": "^4.9.0",
     "d3-tip": "github:vlascik/d3-tip#fix-offscreen-tooltips",
-    "ember-cli": "^2.13.0-beta.3",
-    "ember-cli-app-version": "^3.0.0",
-    "ember-cli-babel": "^6.0.0-beta.3",
-    "ember-cli-dependency-checker": "^1.3.0",
+    "ember-cli": "^2.16.2",
+    "ember-cli-app-version": "^3.1.0",
+    "ember-cli-babel": "^6.9.0",
+    "ember-cli-dependency-checker": "^2.0.1",
     "ember-cli-deploy": "^1.0.0-beta.2",
     "ember-cli-deploy-build": "^1.0.0",
     "ember-cli-deploy-git": "^1.0.0",
     "ember-cli-eslint": "^3.0.2",
-    "ember-cli-htmlbars": "^1.1.1",
-    "ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
-    "ember-cli-inject-live-reload": "^1.4.1",
-    "ember-cli-qunit": "^4.0.0-beta.1",
+    "ember-cli-htmlbars": "^2.0.3",
+    "ember-cli-htmlbars-inline-precompile": "^1.0.2",
+    "ember-cli-inject-live-reload": "^1.7.0",
+    "ember-cli-qunit": "^4.0.2",
     "ember-cli-shims": "^1.1.0",
     "ember-cli-sri": "^2.1.0",
-    "ember-cli-test-loader": "^2.1.0",
+    "ember-cli-test-loader": "^2.2.0",
     "ember-load-initializers": "^1.0.0",
-    "ember-resolver": "^4.1.0",
-    "ember-source": "~2.13.0-beta.2",
-    "ember-welcome-page": "^3.0.0",
-    "loader.js": "^4.2.3"
+    "ember-resolver": "^4.5.0",
+    "ember-source": "^2.16.2",
+    "loader.js": "^4.6.0"
   },
   "engines": {
     "node": ">= 4"
@@ -49,12 +48,12 @@
     "broccoli-merge-trees": "^2.0.0",
     "bulma": "^0.3.1",
     "d3-flame-graphs": "^3.1.0",
-    "ember-cli-babili": "^0.1.1",
+    "ember-cli-babili": "^0.2.0",
     "ember-d3": "^0.3.2",
-    "ember-fetch": "^1.4.2",
-    "ember-font-awesome": "^3.0.1",
-    "ember-native-dom-event-dispatcher": "^0.6.0",
-    "ember-truth-helpers": "^1.2.0",
+    "ember-fetch": "^3.4.3",
+    "ember-font-awesome": "^4.0.0-alpha.14",
+    "ember-native-dom-event-dispatcher": "^0.6.3",
+    "ember-truth-helpers": "^2.0.0",
     "heimdalljs-graph": "^0.3.3"
   },
   "bugs": {
diff --git a/testem.js b/testem.js
@@ -1,12 +1,22 @@
 /* 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: [
+    'Chrome'
   ],
-  "launch_in_dev": [
-    "PhantomJS",
-    "Chrome"
-  ]
+  launch_in_dev: [
+    'Chrome'
+  ],
+  browser_args: {
+    Chrome: {
+      mode: 'ci',
+      args: [
+        '--disable-gpu',
+        '--headless',
+        '--remote-debugging-port=9222',
+        '--window-size=1440,900'
+      ]
+    },
+  }
 };
diff --git a/tests/helpers/destroy-app.js b/tests/helpers/destroy-app.js
@@ -1,5 +1,5 @@
-import Ember from 'ember';
+import { run } from '@ember/runloop';
 
 export default function destroyApp(application) {
-  Ember.run(application, 'destroy');
+  run(application, 'destroy');
 }
diff --git a/tests/helpers/module-for-acceptance.js b/tests/helpers/module-for-acceptance.js
@@ -1,10 +1,8 @@
 import { module } from 'qunit';
-import Ember from 'ember';
+import { resolve } from 'rsvp';
 import startApp from '../helpers/start-app';
 import destroyApp from '../helpers/destroy-app';
 
-const { RSVP: { Promise } } = Ember;
-
 export default function(name, options = {}) {
   module(name, {
     beforeEach() {
@@ -17,7 +15,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));
     }
   });
 }
diff --git a/tests/helpers/start-app.js b/tests/helpers/start-app.js
@@ -1,12 +1,13 @@
-import Ember from 'ember';
 import Application from '../../app';
 import config from '../../config/environment';
+import { merge } from '@ember/polyfills';
+import { run } from '@ember/runloop';
 
 export default function startApp(attrs) {
-  let attributes = Ember.merge({}, config.APP);
-  attributes = Ember.merge(attributes, attrs); // use defaults, but you can override;
+  let attributes = merge({}, config.APP);
+  attributes = merge(attributes, attrs); // use defaults, but you can override;
 
-  return Ember.run(() => {
+  return run(() => {
     let application = Application.create(attributes);
     application.setupForTesting();
     application.injectTestHelpers();
diff --git a/yarn.lock b/yarn.lock
