Skip to content

Commit f117027

Browse files
authored
Upgrade to Ember CLI v2.9.1 (#116)
1 parent b3a5dd3 commit f117027

File tree

8 files changed

+539
-335
lines changed

8 files changed

+539
-335
lines changed

.gitignore

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
# misc
1212
/.sass-cache
1313
/connect.lock
14+
/coverage/*
1415
/libpeerconnection.log
15-
npm-debug.log
16+
npm-debug.log*
1617
testem.log

.travis.yml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,19 +10,21 @@ cache:
1010
- node_modules
1111

1212
env:
13-
- EMBER_TRY_SCENARIO=default
13+
# - EMBER_TRY_SCENARIO=default
14+
# we recommend testing LTS's and latest stable release (bonus points to beta/canary)
1415
- EMBER_TRY_SCENARIO=ember-1.13
16+
- EMBER_TRY_SCENARIO=ember-lts-2.4
1517
- EMBER_TRY_SCENARIO=ember-release
1618
- EMBER_TRY_SCENARIO=ember-beta
1719
- EMBER_TRY_SCENARIO=ember-canary
1820
- EMBER_TRY_SCENARIO=ember-2.0.3
1921
- EMBER_TRY_SCENARIO=ember-2.1.2
2022
- EMBER_TRY_SCENARIO=ember-2.2.2
2123
- EMBER_TRY_SCENARIO=ember-2.3.1
22-
- EMBER_TRY_SCENARIO=ember-2.4.6-LTS
2324
- EMBER_TRY_SCENARIO=ember-2.5.1
2425
- EMBER_TRY_SCENARIO=ember-2.6.2
2526
- EMBER_TRY_SCENARIO=ember-2.7.3
27+
- EMBER_TRY_SCENARIO=ember-2.8.2
2628

2729
matrix:
2830
fast_finish: true

bower.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
{
22
"name": "ember-jsonapi-resources",
33
"dependencies": {
4-
"ember": "~2.8.1",
5-
"ember-cli-shims": "0.1.1",
4+
"ember": "~2.9.0",
5+
"ember-cli-shims": "0.1.3",
66
"fetch": "~0.10.1",
77
"es6-promise": "^4.0.5"
88
},

config/ember-try.js

Lines changed: 21 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,24 @@
11
module.exports = {
22
scenarios: [
33
{
4-
name: 'default',
4+
name: 'ember-1.13',
55
bower: {
6-
dependencies: { }
6+
dependencies: {
7+
'ember': '~1.13.0'
8+
},
9+
resolutions: {
10+
'ember': '~1.13.0'
11+
}
712
}
813
},
914
{
10-
name: 'ember-1.13',
15+
name: 'ember-lts-2.4',
1116
bower: {
1217
dependencies: {
13-
'ember': '~1.13.0'
18+
'ember': 'components/ember#lts-2-4'
1419
},
1520
resolutions: {
16-
'ember': '~1.13.0'
21+
'ember': 'lts-2-4'
1722
}
1823
}
1924
},
@@ -89,17 +94,6 @@ module.exports = {
8994
}
9095
}
9196
},
92-
{
93-
name: 'ember-2.4.6-LTS',
94-
bower: {
95-
dependencies: {
96-
'ember': '2.4.6'
97-
},
98-
resolutions: {
99-
'ember': '2.4.6'
100-
}
101-
}
102-
},
10397
{
10498
name: 'ember-2.5.1',
10599
bower: {
@@ -132,6 +126,17 @@ module.exports = {
132126
'ember': '2.7.3'
133127
}
134128
}
129+
},
130+
{
131+
name: 'ember-2.8.2',
132+
bower: {
133+
dependencies: {
134+
'ember': '2.8.2'
135+
},
136+
resolutions: {
137+
'ember': '2.8.2'
138+
}
139+
}
135140
}
136141
]
137142
};

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@
1919
"author": "Bill Heaton <[email protected]>",
2020
"license": "MIT",
2121
"devDependencies": {
22-
"broccoli-asset-rev": "^2.4.2",
22+
"broccoli-asset-rev": "^2.4.5",
2323
"broccoli-es6-concatenator": "^0.1.11",
2424
"broccoli-filter": "^0.1.14",
2525
"broccoli-static-compiler": "^0.2.1",
26-
"ember-ajax": "^2.0.1",
26+
"ember-ajax": "^2.4.1",
2727
"ember-buffered-proxy": "^0.5.1",
28-
"ember-cli": "2.8.0",
29-
"ember-cli-app-version": "^1.0.0",
28+
"ember-cli": "2.9.1",
29+
"ember-cli-app-version": "^2.0.0",
3030
"ember-cli-blueprint-test-helpers": "^0.13.0",
3131
"ember-cli-content-security-policy": "0.4.0",
32-
"ember-cli-dependency-checker": "^1.2.0",
32+
"ember-cli-dependency-checker": "^1.3.0",
3333
"ember-cli-get-dependency-depth": "^1.0.0",
34-
"ember-cli-htmlbars": "^1.0.3",
35-
"ember-cli-htmlbars-inline-precompile": "^0.3.1",
36-
"ember-cli-inject-live-reload": "^1.4.0",
37-
"ember-cli-jshint": "^1.0.0",
34+
"ember-cli-htmlbars": "^1.0.10",
35+
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
36+
"ember-cli-inject-live-reload": "^1.4.1",
37+
"ember-cli-jshint": "^1.0.4",
3838
"ember-cli-path-utils": "^1.0.0",
39-
"ember-cli-qunit": "^2.1.0",
39+
"ember-cli-qunit": "^3.0.1",
4040
"ember-cli-release": "^0.2.9",
4141
"ember-cli-sri": "^2.1.0",
4242
"ember-cli-string-utils": "^1.0.0",
@@ -47,10 +47,10 @@
4747
"ember-export-application-global": "^1.0.5",
4848
"ember-load-initializers": "^0.5.1",
4949
"ember-resolver": "^2.0.3",
50-
"ember-welcome-page": "^1.0.1",
50+
"ember-welcome-page": "^1.0.3",
5151
"glob": "^4.5.3",
5252
"http-proxy": "^1.12.0",
53-
"loader.js": "^4.0.1",
53+
"loader.js": "^4.0.10",
5454
"mocha": "^2.5.3",
5555
"morgan": "^1.6.1",
5656
"silent-error": "^1.0.0",
@@ -63,7 +63,7 @@
6363
"jsonapi"
6464
],
6565
"dependencies": {
66-
"ember-cli-babel": "^5.1.6",
66+
"ember-cli-babel": "^5.1.7",
6767
"ember-inflector": "^1.9.1",
6868
"inflection": "~1.7.1",
6969
"lodash": "~3.10.1"

tests/dummy/config/environment.js

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,11 @@ module.exports = function(environment) {
1111
// Here you can enable experimental features on an ember canary build
1212
// e.g. 'with-controller': true
1313
},
14-
MODEL_FACTORY_INJECTIONS: true
14+
MODEL_FACTORY_INJECTIONS: true,
15+
EXTEND_PROTOTYPES: {
16+
// Prevent Ember Data from overriding Date.parse.
17+
Date: false
18+
}
1519
},
1620

1721
APP: {

tests/index.html

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,10 @@
1818
{{content-for "test-head-footer"}}
1919
</head>
2020
<body>
21-
2221
{{content-for "body"}}
2322
{{content-for "test-body"}}
24-
<script src="{{rootURL}}testem.js" integrity=""></script>
23+
24+
<script src="/testem.js" integrity=""></script>
2525
<script src="{{rootURL}}assets/vendor.js"></script>
2626
<script src="{{rootURL}}assets/test-support.js"></script>
2727
<script src="{{rootURL}}assets/dummy.js"></script>

0 commit comments

Comments
 (0)