Skip to content

Commit 3434bca

Browse files
Update Ember
1 parent 464ba83 commit 3434bca

File tree

4 files changed

+44
-5
lines changed

4 files changed

+44
-5
lines changed

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ env:
1717
- EMBER_TRY_SCENARIO=ember-release
1818
- EMBER_TRY_SCENARIO=ember-beta
1919
- EMBER_TRY_SCENARIO=ember-canary
20+
- EMBER_TRY_SCENARIO=ember-default
2021

2122
matrix:
2223
fast_finish: true

config/ember-try.js

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,11 @@ module.exports = {
1010
resolutions: {
1111
'ember': 'lts-2-4'
1212
}
13+
},
14+
npm: {
15+
devDependencies: {
16+
'ember-source': null
17+
}
1318
}
1419
},
1520
{
@@ -21,6 +26,11 @@ module.exports = {
2126
resolutions: {
2227
'ember': 'lts-2-8'
2328
}
29+
},
30+
npm: {
31+
devDependencies: {
32+
'ember-source': null
33+
}
2434
}
2535
},
2636
{
@@ -32,6 +42,11 @@ module.exports = {
3242
resolutions: {
3343
'ember': 'release'
3444
}
45+
},
46+
npm: {
47+
devDependencies: {
48+
'ember-source': null
49+
}
3550
}
3651
},
3752
{
@@ -43,6 +58,11 @@ module.exports = {
4358
resolutions: {
4459
'ember': 'beta'
4560
}
61+
},
62+
npm: {
63+
devDependencies: {
64+
'ember-source': null
65+
}
4666
}
4767
},
4868
{
@@ -54,6 +74,17 @@ module.exports = {
5474
resolutions: {
5575
'ember': 'canary'
5676
}
77+
},
78+
npm: {
79+
devDependencies: {
80+
'ember-source': null
81+
}
82+
}
83+
},
84+
{
85+
name: 'ember-default',
86+
npm: {
87+
devDependencies: {}
5788
}
5889
}
5990
]

package.json

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,26 @@
2323
"devDependencies": {
2424
"broccoli-asset-rev": "^2.4.5",
2525
"ember-ajax": "^2.4.1",
26-
"ember-cli": "2.10.1",
26+
"ember-cli": "2.11.0",
2727
"ember-cli-app-version": "^2.0.0",
2828
"ember-cli-dependency-checker": "^1.3.0",
29-
"ember-cli-htmlbars": "^1.0.10",
29+
"ember-cli-htmlbars": "^1.1.1",
3030
"ember-cli-htmlbars-inline-precompile": "^0.3.3",
3131
"ember-cli-inject-live-reload": "^1.4.1",
3232
"ember-cli-jshint": "^2.0.1",
3333
"ember-cli-qunit": "^3.0.1",
3434
"ember-cli-release": "^0.2.9",
35+
"ember-cli-shims": "^1.0.2",
3536
"ember-cli-sri": "^2.1.0",
3637
"ember-cli-test-loader": "^1.1.0",
3738
"ember-cli-uglify": "^1.2.0",
38-
"ember-data": "^2.10.0",
39+
"ember-data": "^2.11.0",
3940
"ember-disable-prototype-extensions": "^1.1.0",
4041
"ember-export-application-global": "^1.0.5",
41-
"ember-load-initializers": "^0.5.1",
42+
"ember-load-initializers": "^0.6.0",
4243
"ember-resolver": "^2.0.3",
43-
"ember-welcome-page": "^1.0.3",
44+
"ember-source": "^2.11.0",
45+
"ember-welcome-page": "^2.0.2",
4446
"loader.js": "^4.0.10"
4547
},
4648
"engines": {
Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
{{!-- The following component displays Ember's default welcome message. --}}
2+
{{welcome-page}}
3+
{{!-- Feel free to remove this! --}}
4+
5+
{{outlet}}

0 commit comments

Comments
 (0)