Skip to content

Commit 2cece44

Browse files
committed
Update ember-cli and dependencies.
Use module imports. Use latest `ember-cli-babel`.
1 parent 7ba246d commit 2cece44

File tree

14 files changed

+382
-323
lines changed

14 files changed

+382
-323
lines changed

.travis.yml

Lines changed: 16 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,19 +6,27 @@ node_js:
66
- "4"
77

88
sudo: false
9+
dist: trusty
10+
11+
addons:
12+
chrome: stable
913

1014
cache:
1115
yarn: true
1216

1317
env:
14-
# we recommend new addons test the current and previous LTS
15-
# as well as latest stable release (bonus points to beta/canary)
16-
- EMBER_TRY_SCENARIO=ember-lts-2.8
17-
- EMBER_TRY_SCENARIO=ember-lts-2.12
18-
- EMBER_TRY_SCENARIO=ember-release
19-
- EMBER_TRY_SCENARIO=ember-beta
20-
- EMBER_TRY_SCENARIO=ember-canary
21-
- EMBER_TRY_SCENARIO=ember-default
18+
global:
19+
# See https://git.io/vdao3 for details.
20+
- JOBS=1
21+
matrix:
22+
# we recommend new addons test the current and previous LTS
23+
# as well as latest stable release (bonus points to beta/canary)
24+
- EMBER_TRY_SCENARIO=ember-lts-2.8
25+
- EMBER_TRY_SCENARIO=ember-lts-2.12
26+
- EMBER_TRY_SCENARIO=ember-release
27+
- EMBER_TRY_SCENARIO=ember-beta
28+
- EMBER_TRY_SCENARIO=ember-canary
29+
- EMBER_TRY_SCENARIO=ember-default
2230

2331
matrix:
2432
fast_finish: true
@@ -28,8 +36,6 @@ matrix:
2836
before_install:
2937
- curl -o- -L https://yarnpkg.com/install.sh | bash
3038
- export PATH=$HOME/.yarn/bin:$PATH
31-
- yarn global add phantomjs-prebuilt
32-
- phantomjs --version
3339

3440
install:
3541
- yarn install --no-lockfile --non-interactive

addon/components/x-tree-children.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22
import layout from '../templates/components/x-tree-children';
33

4-
const {
5-
Component
6-
} = Ember;
7-
84
export default Component.extend({
95
layout,
106
tagName: 'li',

addon/components/x-tree-node.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22
import layout from '../templates/components/x-tree-node';
33

4-
const {
5-
Component
6-
} = Ember;
7-
84
export default Component.extend({
95
layout,
106
classNameBindings: ['model.isSelected:tree-highlight'],

addon/components/x-tree.js

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
1-
import Ember from 'ember';
1+
import Component from '@ember/component';
22
import layout from '../templates/components/x-tree';
33

4-
const {
5-
Component
6-
} = Ember;
7-
84
export default Component.extend({
95
layout,
106
tagName: 'ul',

package.json

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,23 @@
2121
"test": "ember try:each"
2222
},
2323
"dependencies": {
24-
"ember-cli-babel": "^6.3.0",
24+
"ember-cli-babel": "^6.8.2",
2525
"ember-cli-htmlbars": "^2.0.1"
2626
},
2727
"devDependencies": {
2828
"broccoli-asset-rev": "^2.4.5",
29-
"ember-cli": "2.14.1",
30-
"ember-cli-dependency-checker": "^1.3.0",
29+
"ember-cli": "~2.16.2",
30+
"ember-cli-dependency-checker": "^2.0.0",
3131
"ember-cli-eslint": "^4.0.0",
32-
"ember-cli-htmlbars-inline-precompile": "^0.4.3",
32+
"ember-cli-htmlbars-inline-precompile": "^1.0.0",
3333
"ember-cli-inject-live-reload": "^1.4.1",
3434
"ember-cli-qunit": "^4.0.0",
35-
"ember-cli-shims": "^1.1.0",
36-
"ember-cli-sri": "^2.1.0",
37-
"ember-cli-uglify": "^1.2.0",
35+
"ember-cli-uglify": "^2.0.0",
3836
"ember-disable-prototype-extensions": "^1.1.2",
3937
"ember-export-application-global": "^2.0.0",
4038
"ember-load-initializers": "^1.0.0",
4139
"ember-resolver": "^4.0.0",
42-
"ember-source": "~2.14.1",
40+
"ember-source": "~2.16.0",
4341
"eslint-plugin-ember-suave": "^1.0.0",
4442
"loader.js": "^4.2.3"
4543
},

testem.js

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,20 @@ module.exports = {
33
test_page: 'tests/index.html?hidepassed',
44
disable_watching: true,
55
launch_in_ci: [
6-
'PhantomJS'
6+
'Chrome'
77
],
88
launch_in_dev: [
9-
'PhantomJS',
109
'Chrome'
11-
]
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
};

tests/dummy/app/app.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +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-
const App = Ember.Application.extend({
6+
const App = Application.extend({
77
modulePrefix: config.modulePrefix,
88
podModulePrefix: config.podModulePrefix,
99
Resolver

tests/dummy/app/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99

1010
{{content-for "head"}}
1111

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

1515
{{content-for "head-footer"}}
1616
</head>

tests/dummy/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
});

tests/dummy/config/environment.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ module.exports = function(environment) {
4444
}
4545

4646
if (environment === 'production') {
47-
47+
// here you can enable a production-specific feature
4848
}
4949

5050
return ENV;

0 commit comments

Comments
 (0)