Skip to content

Commit 992090f

Browse files
committed
Update ember-cli
1 parent d0b8846 commit 992090f

File tree

8 files changed

+381
-198
lines changed

8 files changed

+381
-198
lines changed

.bowerrc

Lines changed: 0 additions & 4 deletions
This file was deleted.

.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: [

.travis.yml

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,7 @@ node_js:
66
sudo: false
77

88
cache:
9-
directories:
10-
- $HOME/.npm
11-
- $HOME/.cache # includes bowers cache
9+
yarn: true
1210

1311
env:
1412
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
@@ -25,14 +23,13 @@ matrix:
2523
- env: EMBER_TRY_SCENARIO=ember-canary
2624

2725
before_install:
28-
- npm config set spin false
29-
- npm install -g bower phantomjs-prebuilt
30-
- bower --version
26+
- curl -o- -L https://yarnpkg.com/install.sh | bash
27+
- export PATH=$HOME/.yarn/bin:$PATH
28+
- yarn global add phantomjs-prebuilt
3129
- phantomjs --version
3230

3331
install:
34-
- npm install
35-
- bower install
32+
- yarn install --no-lockfile
3633

3734
script:
3835
# Usually, it's ok to finish the test scenario without reverting

bower.json

Lines changed: 0 additions & 4 deletions
This file was deleted.

package.json

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -21,25 +21,25 @@
2121
"test": "ember try:each"
2222
},
2323
"dependencies": {
24-
"ember-cli-babel": "^5.1.7",
24+
"ember-cli-babel": "^6.0.0",
2525
"ember-cli-htmlbars": "^1.1.1"
2626
},
2727
"devDependencies": {
2828
"broccoli-asset-rev": "^2.4.5",
29-
"ember-cli": "2.12.0",
29+
"ember-cli": "2.13.2",
3030
"ember-cli-dependency-checker": "^1.3.0",
31-
"ember-cli-eslint": "^3.0.0",
32-
"ember-cli-htmlbars-inline-precompile": "^0.3.6",
31+
"ember-cli-eslint": "^3.1.0",
32+
"ember-cli-htmlbars-inline-precompile": "^0.4.0",
3333
"ember-cli-inject-live-reload": "^1.4.1",
34-
"ember-cli-qunit": "^3.1.0",
35-
"ember-cli-shims": "^1.0.2",
34+
"ember-cli-qunit": "^4.0.0",
35+
"ember-cli-shims": "^1.1.0",
3636
"ember-cli-sri": "^2.1.0",
3737
"ember-cli-uglify": "^1.2.0",
3838
"ember-disable-prototype-extensions": "^1.1.0",
39-
"ember-export-application-global": "^1.0.5",
40-
"ember-load-initializers": "^0.6.0",
41-
"ember-resolver": "^2.0.3",
42-
"ember-source": "~2.12.0",
39+
"ember-export-application-global": "^2.0.0",
40+
"ember-load-initializers": "^1.0.0",
41+
"ember-resolver": "^4.0.0",
42+
"ember-source": "~2.13.0",
4343
"eslint-plugin-ember-suave": "^1.0.0",
4444
"loader.js": "^4.2.3"
4545
},

tests/dummy/config/targets.js

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
/* eslint-env node */
2+
3+
module.exports = {
4+
browsers: [
5+
'ie 9',
6+
'last 1 Chrome versions',
7+
'last 1 Firefox versions',
8+
'last 1 Safari versions'
9+
]
10+
};

tests/test-helper.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,7 @@ import resolver from './helpers/resolver';
22
import {
33
setResolver
44
} from 'ember-qunit';
5+
import { start } from 'ember-cli-qunit';
56

67
setResolver(resolver);
8+
start();

0 commit comments

Comments
 (0)