Skip to content

Commit fc5f73f

Browse files
committed
upgrades
1 parent 9e3ca14 commit fc5f73f

33 files changed

+19124
-154
lines changed

.eslintignore

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# unconventional js
2+
/blueprints/*/files/
3+
/vendor/
4+
5+
# compiled output
6+
/dist/
7+
/tmp/
8+
9+
# dependencies
10+
/bower_components/
11+
/node_modules/
12+
13+
# misc
14+
/coverage/
15+
!.*
16+
17+
# ember-try
18+
/.node_modules.ember-try/
19+
/bower.json.ember-try
20+
/package.json.ember-try

.eslintrc.js

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,38 @@ module.exports = {
44
ecmaVersion: 2017,
55
sourceType: 'module'
66
},
7-
extends: 'eslint:recommended',
7+
plugins: [
8+
'ember'
9+
],
10+
extends: [
11+
'eslint:recommended',
12+
'plugin:ember/recommended'
13+
],
814
env: {
915
browser: true
1016
},
1117
rules: {
12-
}
18+
},
19+
overrides: [
20+
// node files
21+
{
22+
files: [
23+
'.eslintrc.js',
24+
'.template-lintrc.js',
25+
'ember-cli-build.js',
26+
'testem.js',
27+
'blueprints/*/index.js',
28+
'config/**/*.js',
29+
'lib/*/index.js'
30+
],
31+
parserOptions: {
32+
sourceType: 'script',
33+
ecmaVersion: 2015
34+
},
35+
env: {
36+
browser: false,
37+
node: true
38+
}
39+
}
40+
]
1341
};

.gitignore

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,24 @@
11
# See https://help.github.com/ignore-files/ for more about ignoring files.
22

33
# compiled output
4-
/dist
5-
/tmp
4+
/dist/
5+
/tmp/
66

77
# dependencies
8-
/node_modules
9-
/bower_components
8+
/bower_components/
9+
/node_modules/
1010

1111
# misc
12+
/.env*
1213
/.sass-cache
1314
/connect.lock
14-
/coverage/*
15+
/coverage/
1516
/libpeerconnection.log
16-
npm-debug.log*
17-
yarn-error.log
18-
testem.log
17+
/npm-debug.log*
18+
/testem.log
19+
/yarn-error.log
1920

2021
# ember-try
21-
.node_modules.ember-try/
22-
bower.json.ember-try
23-
package.json.ember-try
22+
/.node_modules.ember-try/
23+
/bower.json.ember-try
24+
/package.json.ember-try

.template-lintrc.js

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
'use strict';
2+
3+
module.exports = {
4+
extends: 'recommended'
5+
};

.travis.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,4 +25,6 @@ install:
2525
- yarn install --non-interactive
2626

2727
script:
28+
- yarn lint:hbs
29+
- yarn lint:js
2830
- yarn test

app/components/basic-tree.js

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,16 @@ import Ember from 'ember';
22

33
const {
44
select,
5-
partition,
65
hierarchy,
7-
min,
8-
max,
9-
range,
10-
scaleLinear,
11-
scaleQuantize,
126
cluster,
137
zoom,
148
zoomIdentity
159
} = self.d3;
1610

17-
const { run, get, inject } = Ember;
11+
const { inject } = Ember;
12+
import { run } from '@ember/runloop';
13+
import { get } from '@ember/object';
14+
import Component from '@ember/component';
1815

1916
const DURATION = 500;
2017

@@ -26,7 +23,7 @@ const NODE_OFFSET_SIZE = 50;
2623
// copied these functions temporarily from `broccoli-viz` here:
2724
// https://github.com/ember-cli/broccoli-viz/blob/master/lib/node-by-id.js
2825

29-
export default Ember.Component.extend({
26+
export default Component.extend({
3027
classNames: ['basic-tree'],
3128

3229
graph: inject.service(),
@@ -281,7 +278,7 @@ export default Ember.Component.extend({
281278
.attr("d", function(d) {
282279
let sourceExitY = d.source.y + d.source.computedWidth + NODE_OFFSET_SIZE;
283280
let targetEntranceY = d.target.y - NODE_OFFSET_SIZE;
284-
281+
285282
return "M" + d.target.y + "," + d.target.x
286283
+ "L" + targetEntranceY + "," + d.target.x
287284
+ " " + sourceExitY + "," + d.target.x

app/components/flame-graph.js

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,18 @@
11
import Ember from 'ember';
22
import FlameGraph from '../utils/d3-flame-graphs-v4/d3-flame-graph';
33

4-
const { run, get, inject } = Ember;
4+
import { run } from '@ember/runloop';
5+
import { get } from '@ember/object';
6+
import Component from '@ember/component';
7+
import { readOnly } from '@ember/object/computed';
58

6-
export default Ember.Component.extend({
9+
const { inject } = Ember;
10+
11+
export default Component.extend({
712
classNames: ['flame-graph'],
813
graph: inject.service(),
914
flameGraph: null,
10-
totalTime: Ember.computed.alias('graph.data.summary.totalTime'),
15+
totalTime: readOnly('graph.data.summary.totalTime'),
1116

1217
init() {
1318
this._super(...arguments);

app/components/slow-node-times.js

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import Ember from 'ember';
2+
import { get, set } from '@ember/object';
3+
import { computed } from '@ember/object';
4+
import Component from '@ember/component';
25

36
const {
4-
get,
5-
set,
6-
computed,
77
inject
88
} = Ember;
99

@@ -32,13 +32,13 @@ function computeNodeTimes(node) {
3232
}
3333
}
3434

35-
Ember.set(node._stats.time, 'plugin', total);
35+
set(node._stats.time, 'plugin', total);
3636

3737
return total;
3838
}
3939

4040

41-
export default Ember.Component.extend({
41+
export default Component.extend({
4242
graph: inject.service(),
4343

4444
init() {

app/controllers/application.js

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
import Ember from 'ember';
22
import fetch from "fetch";
3+
import Controller from '@ember/controller';
34

45
const {
56
inject
67
} = Ember;
78

8-
export default Ember.Controller.extend({
9+
export default Controller.extend({
910
graph: inject.service(),
1011

1112
actions: {

app/controllers/flame.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import Ember from 'ember';
2+
import Controller from '@ember/controller';
23

34
const {
4-
Controller,
55
inject
66
} = Ember;
77

0 commit comments

Comments
 (0)