Skip to content

Commit f0dd8fd

Browse files
rwjbluerwjblue
authored
Merge pull request #11 from rwjblue/fixes
upgrades
2 parents a52df59 + 9d2cae1 commit f0dd8fd

File tree

14 files changed

+1049
-624
lines changed

14 files changed

+1049
-624
lines changed

‎.eslintrc.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
module.exports = {
22
root: true,
33
parserOptions: {
4-
ecmaVersion: 6,
4+
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
77
extends: 'eslint:recommended',

‎.gitignore‎

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,10 @@
1414
/coverage/*
1515
/libpeerconnection.log
1616
npm-debug.log*
17+
yarn-error.log
1718
testem.log
18-
/.idea
19-
/*.iml
19+
20+
# ember-try
21+
.node_modules.ember-try/
22+
bower.json.ember-try
23+
package.json.ember-try

‎.travis.yml‎

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,18 +4,25 @@ node_js:
44
- "6"
55

66
sudo: false
7+
dist: trusty
8+
9+
addons:
10+
chrome: stable
711

812
cache:
913
yarn: true
1014

15+
env:
16+
global:
17+
# See https://git.io/vdao3 for details.
18+
- JOBS=1
19+
1120
before_install:
1221
- curl -o- -L https://yarnpkg.com/install.sh | bash
1322
- export PATH=$HOME/.yarn/bin:$PATH
14-
- yarn global add phantomjs-prebuilt
15-
- phantomjs --version
1623

1724
install:
18-
- yarn install
25+
- yarn install --non-interactive
1926

2027
script:
2128
- yarn test

‎app/app.js‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,9 @@
1-
import Ember from 'ember';
1+
import Application from '@ember/application';
22
import Resolver from './resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

6-
let App;
7-
8-
Ember.MODEL_FACTORY_INJECTIONS = true;
9-
10-
App = Ember.Application.extend({
6+
const App = Application.extend({
117
modulePrefix: config.modulePrefix,
128
podModulePrefix: config.podModulePrefix,
139
Resolver

‎app/index.html‎

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,25 @@
11
<!DOCTYPE html>
22
<html>
3-
<head>
4-
<meta charset="utf-8">
5-
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6-
<title>HeimdalljsVisualizer</title>
7-
<meta name="description" content="">
8-
<meta name="viewport" content="width=device-width, initial-scale=1">
3+
<head>
4+
<meta charset="utf-8">
5+
<meta http-equiv="X-UA-Compatible" content="IE=edge">
6+
<title>HeimdalljsVisualizer</title>
7+
<meta name="description" content="">
8+
<meta name="viewport" content="width=device-width, initial-scale=1">
99

10-
{{content-for "head"}}
10+
{{content-for "head"}}
1111

12-
<link rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13-
<link rel="stylesheet" href="{{rootURL}}assets/heimdalljs-visualizer.css">
12+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/vendor.css">
13+
<link integrity="" rel="stylesheet" href="{{rootURL}}assets/heimdalljs-visualizer.css">
1414

15-
{{content-for "head-footer"}}
16-
</head>
17-
<body>
18-
{{content-for "body"}}
15+
{{content-for "head-footer"}}
16+
</head>
17+
<body>
18+
{{content-for "body"}}
1919

20-
<script src="{{rootURL}}assets/vendor.js"></script>
21-
<script src="{{rootURL}}assets/heimdalljs-visualizer.js"></script>
20+
<script src="{{rootURL}}assets/vendor.js"></script>
21+
<script src="{{rootURL}}assets/heimdalljs-visualizer.js"></script>
2222

23-
24-
{{content-for "body-footer"}}
25-
</body>
23+
{{content-for "body-footer"}}
24+
</body>
2625
</html>

‎app/router.js‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
import Ember from 'ember';
1+
import EmberRouter from '@ember/routing/router';
22
import config from './config/environment';
33

4-
const Router = Ember.Router.extend({
4+
const Router = EmberRouter.extend({
55
location: config.locationType,
66
rootURL: config.rootURL
77
});

‎app/utils/d3-flame-graphs-v4/d3-flame-graph.js‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ import { scaleLinear, scaleQuantize } from 'd3-scale';
33
import { min, max, range } from 'd3-array';
44
import d3Tip from 'd3-tip';
55
import { partition, hierarchy } from 'd3-hierarchy';
6+
import 'd3-transition';
67

78
let indexOf = [].indexOf || function(item) {
89
for (var i = 0, l = this.length; i < l; i++) { if (i in this && this[i] === item) return i; }

‎config/environment.js‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
/* jshint node: true */
1+
/* eslint-env node */
2+
'use strict';
23

34
module.exports = function(environment) {
45
var ENV = {
56
modulePrefix: 'heimdalljs-visualizer',
6-
environment: environment,
7+
environment,
78
rootURL: '/',
89
locationType: 'auto',
910
EmberENV: {

‎package.json‎

Lines changed: 18 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -17,29 +17,28 @@
1717
"test": "ember test"
1818
},
1919
"devDependencies": {
20-
"broccoli-asset-rev": "^2.4.5",
20+
"broccoli-asset-rev": "^2.6.0",
2121
"d3": "^4.9.0",
2222
"d3-tip": "github:vlascik/d3-tip#fix-offscreen-tooltips",
23-
"ember-cli": "^2.13.0-beta.3",
24-
"ember-cli-app-version": "^3.0.0",
25-
"ember-cli-babel": "^6.0.0-beta.3",
26-
"ember-cli-dependency-checker": "^1.3.0",
23+
"ember-cli": "^2.16.2",
24+
"ember-cli-app-version": "^3.1.0",
25+
"ember-cli-babel": "^6.9.0",
26+
"ember-cli-dependency-checker": "^2.0.1",
2727
"ember-cli-deploy": "^1.0.0-beta.2",
2828
"ember-cli-deploy-build": "^1.0.0",
2929
"ember-cli-deploy-git": "^1.0.0",
3030
"ember-cli-eslint": "^3.0.2",
31-
"ember-cli-htmlbars": "^1.1.1",
32-
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
33-
"ember-cli-inject-live-reload": "^1.4.1",
34-
"ember-cli-qunit": "^4.0.0-beta.1",
31+
"ember-cli-htmlbars": "^2.0.3",
32+
"ember-cli-htmlbars-inline-precompile": "^1.0.2",
33+
"ember-cli-inject-live-reload": "^1.7.0",
34+
"ember-cli-qunit": "^4.0.2",
3535
"ember-cli-shims": "^1.1.0",
3636
"ember-cli-sri": "^2.1.0",
37-
"ember-cli-test-loader": "^2.1.0",
37+
"ember-cli-test-loader": "^2.2.0",
3838
"ember-load-initializers": "^1.0.0",
39-
"ember-resolver": "^4.1.0",
40-
"ember-source": "~2.13.0-beta.2",
41-
"ember-welcome-page": "^3.0.0",
42-
"loader.js": "^4.2.3"
39+
"ember-resolver": "^4.5.0",
40+
"ember-source": "^2.16.2",
41+
"loader.js": "^4.6.0"
4342
},
4443
"engines": {
4544
"node": ">= 4"
@@ -49,12 +48,12 @@
4948
"broccoli-merge-trees": "^2.0.0",
5049
"bulma": "^0.3.1",
5150
"d3-flame-graphs": "^3.1.0",
52-
"ember-cli-babili": "^0.1.1",
51+
"ember-cli-babili": "^0.2.0",
5352
"ember-d3": "^0.3.2",
54-
"ember-fetch": "^1.4.2",
55-
"ember-font-awesome": "^3.0.1",
56-
"ember-native-dom-event-dispatcher": "^0.6.0",
57-
"ember-truth-helpers": "^1.2.0",
53+
"ember-fetch": "^3.4.3",
54+
"ember-font-awesome": "^4.0.0-alpha.14",
55+
"ember-native-dom-event-dispatcher": "^0.6.3",
56+
"ember-truth-helpers": "^2.0.0",
5857
"heimdalljs-graph": "^0.3.3"
5958
},
6059
"bugs": {

‎testem.js‎

Lines changed: 18 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,22 @@
11
/* eslint-env node */
22
module.exports = {
3-
"test_page": "tests/index.html?hidepassed",
4-
"disable_watching": true,
5-
"launch_in_ci": [
6-
"PhantomJS"
3+
test_page: 'tests/index.html?hidepassed',
4+
disable_watching: true,
5+
launch_in_ci: [
6+
'Chrome'
77
],
8-
"launch_in_dev": [
9-
"PhantomJS",
10-
"Chrome"
11-
]
8+
launch_in_dev: [
9+
'Chrome'
10+
],
11+
browser_args: {
12+
Chrome: {
13+
mode: 'ci',
14+
args: [
15+
'--disable-gpu',
16+
'--headless',
17+
'--remote-debugging-port=9222',
18+
'--window-size=1440,900'
19+
]
20+
},
21+
}
1222
};

0 commit comments

Comments
 (0)