Skip to content

Commit 3a314c0

Browse files
author
Robert Jackson
committed
Update to latest ember-cli and associated packages.
1 parent 5c690b4 commit 3a314c0

File tree

6 files changed

+1011
-1176
lines changed

6 files changed

+1011
-1176
lines changed

.travis.yml

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

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

1311
before_install:
14-
- npm config set spin false
15-
- npm install -g bower phantomjs-prebuilt
16-
- bower --version
12+
- curl -o- -L https://yarnpkg.com/install.sh | bash
13+
- export PATH=$HOME/.yarn/bin:$PATH
14+
- yarn global add phantomjs-prebuilt
1715
- phantomjs --version
1816

1917
install:
20-
- npm install
21-
- bower install
18+
- yarn install
2219

2320
script:
24-
- npm test
21+
- yarn test

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+
'last 1 Edge versions',
6+
'last 1 Chrome versions',
7+
'last 1 Firefox versions',
8+
'last 1 Safari versions'
9+
]
10+
};

package.json

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,31 +18,27 @@
1818
},
1919
"devDependencies": {
2020
"broccoli-asset-rev": "^2.4.5",
21-
"ember-cli": "^2.11.1",
21+
"ember-cli": "^2.13.0-beta.1",
2222
"ember-cli-app-version": "^2.0.0",
23-
"ember-cli-babel": "^5.1.7",
23+
"ember-cli-babel": "^6.0.0-beta.3",
2424
"ember-cli-dependency-checker": "^1.3.0",
2525
"ember-cli-deploy": "^1.0.0-beta.2",
2626
"ember-cli-deploy-build": "^0.1.1",
2727
"ember-cli-deploy-git": "^1.0.0",
2828
"ember-cli-eslint": "^3.0.2",
2929
"ember-cli-htmlbars": "^1.1.1",
30-
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
30+
"ember-cli-htmlbars-inline-precompile": "^0.4.0-beta.2",
3131
"ember-cli-inject-live-reload": "^1.4.1",
32-
"ember-cli-qunit": "^3.0.4",
32+
"ember-cli-qunit": "^4.0.0-beta.1",
33+
"ember-cli-shims": "^1.1.0",
3334
"ember-cli-sri": "^2.1.0",
3435
"ember-cli-test-loader": "^1.1.0",
3536
"ember-cli-uglify": "^1.2.0",
36-
"ember-data": "^2.11.0-beta.1",
37-
"ember-export-application-global": "^1.0.5",
38-
"ember-load-initializers": "^0.6.0",
37+
"ember-load-initializers": "^1.0.0",
3938
"ember-resolver": "^2.0.3",
40-
"ember-source": "^2.11.2",
41-
"ember-welcome-page": "^2.0.2",
42-
"express": "^4.14.0",
43-
"glob": "^4.5.3",
44-
"loader.js": "^4.1.0",
45-
"morgan": "^1.7.0"
39+
"ember-source": "~2.13.0-beta.2",
40+
"ember-welcome-page": "^3.0.0",
41+
"loader.js": "^4.2.3"
4642
},
4743
"engines": {
4844
"node": ">= 0.12.0"
@@ -51,11 +47,10 @@
5147
"dependencies": {
5248
"broccoli-merge-trees": "^1.2.1",
5349
"bulma": "^0.3.1",
54-
"ember-cli-shims": "^1.0.2",
5550
"ember-d3": "^0.3.1",
5651
"ember-font-awesome": "^3.0.1",
57-
"ember-native-dom-event-dispatcher": "0.5.4",
58-
"ember-network": "^0.3.1",
52+
"ember-native-dom-event-dispatcher": "^0.5.4",
53+
"ember-fetch": "^1.4.2",
5954
"ember-truth-helpers": "^1.2.0",
6055
"heimdalljs-graph": "^0.3.3"
6156
},

testem.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
/*jshint node:true*/
1+
/* eslint-env node */
22
module.exports = {
33
"test_page": "tests/index.html?hidepassed",
44
"disable_watching": true,

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)