Skip to content

Commit 1154e65

Browse files
committed
Update Ember
1 parent fcaca00 commit 1154e65

File tree

5 files changed

+291
-78
lines changed

5 files changed

+291
-78
lines changed

.eslintignore

+2
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,11 @@
88

99
# dependencies
1010
/bower_components/
11+
/node_modules/
1112

1213
# misc
1314
/coverage/
15+
!.*
1416

1517
# ember-try
1618
/.node_modules.ember-try/

.npmignore

+2-1
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,9 @@
1212
/.eslintignore
1313
/.eslintrc.js
1414
/.gitignore
15-
/.watchmanconfig
15+
/.template-lintrc.js
1616
/.travis.yml
17+
/.watchmanconfig
1718
/bower.json
1819
/config/ember-try.js
1920
/ember-cli-build.js

config/ember-try.js

+8-8
Original file line numberDiff line numberDiff line change
@@ -11,26 +11,26 @@ module.exports = function() {
1111
return {
1212
useYarn: true,
1313
scenarios: [
14-
{
15-
name: 'ember-lts-2.12',
16-
npm: {
17-
devDependencies: {
18-
'ember-source': '~2.12.0'
19-
}
20-
}
21-
},
2214
{
2315
name: 'ember-lts-2.16',
16+
env: {
17+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18+
},
2419
npm: {
2520
devDependencies: {
21+
'@ember/jquery': '^0.5.1',
2622
'ember-source': '~2.16.0'
2723
}
2824
}
2925
},
3026
{
3127
name: 'ember-lts-2.18',
28+
env: {
29+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
30+
},
3231
npm: {
3332
devDependencies: {
33+
'@ember/jquery': '^0.5.1',
3434
'ember-source': '~2.18.0'
3535
}
3636
}

package.json

+8-8
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
"brotli-size": "^0.0.3",
2424
"bytes": "^3.0.0",
2525
"chalk": "^2.4.1",
26-
"ember-cli-babel": "^6.6.0",
26+
"ember-cli-babel": "^6.16.0",
2727
"execa": "^1.0.0",
2828
"fast-glob": "^2.2.2",
2929
"gzip-size": "^5.0.0",
@@ -34,25 +34,25 @@
3434
"devDependencies": {
3535
"chai": "^4.1.2",
3636
"console-ui": "^2.2.2",
37-
"ember-cli": "~3.4.0-beta.2",
37+
"ember-cli": "~3.5.1",
3838
"ember-cli-blueprint-test-helpers": "^0.18.3",
3939
"ember-cli-dependency-checker": "^3.0.0",
4040
"ember-cli-htmlbars": "^3.0.0",
4141
"ember-cli-htmlbars-inline-precompile": "^1.0.3",
4242
"ember-cli-inject-live-reload": "^1.8.2",
43-
"ember-cli-qunit": "^4.3.2",
44-
"ember-cli-sri": "^2.1.0",
43+
"ember-cli-sri": "^2.1.1",
4544
"ember-export-application-global": "^2.0.0",
4645
"ember-load-initializers": "^1.1.0",
46+
"ember-qunit": "^3.4.1",
4747
"ember-resolver": "^5.0.1",
48-
"ember-source": "~3.4.0-beta.1",
49-
"ember-source-channel-url": "^1.0.1",
48+
"ember-source": "~3.5.1",
49+
"ember-source-channel-url": "^1.1.0",
5050
"eslint": "^5.6.0",
5151
"eslint-plugin-chai-expect": "^1.1.1",
5252
"eslint-plugin-mocha": "^5.2.0",
53-
"eslint-plugin-node": "^6.0.1",
53+
"eslint-plugin-node": "^7.0.1",
5454
"fs-extra": "^7.0.0",
55-
"loader.js": "^4.2.3",
55+
"loader.js": "^4.7.0",
5656
"mocha": "^4.0.1",
5757
"tmp": "^0.0.33"
5858
},

0 commit comments

Comments
 (0)