Skip to content

Commit a937b6c

Browse files
committed
Update ember-cli and dependencies
1 parent 1ebd012 commit a937b6c

File tree

6 files changed

+563
-719
lines changed

6 files changed

+563
-719
lines changed

.eslintrc.js

+1-2
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,7 @@ module.exports = {
3636
'tests/dummy/app/**'
3737
],
3838
parserOptions: {
39-
sourceType: 'script',
40-
ecmaVersion: 2015
39+
sourceType: 'script'
4140
},
4241
env: {
4342
browser: false,

.travis.yml

+2-2
Original file line numberDiff line numberDiff line change
@@ -49,8 +49,8 @@ jobs:
4949
# we recommend new addons test the current and previous LTS
5050
# as well as latest stable release (bonus points to beta/canary)
5151
- stage: "Additional Tests"
52-
env: EMBER_TRY_SCENARIO=ember-lts-2.18
53-
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
52+
env: EMBER_TRY_SCENARIO=ember-lts-3.4
53+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
5454
- env: EMBER_TRY_SCENARIO=ember-release
5555
- env: EMBER_TRY_SCENARIO=ember-beta
5656
- env: EMBER_TRY_SCENARIO=ember-canary

blueprints/ember-cli-bootstrap-datetimepicker/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ module.exports = {
88
return this.addPackagesToProject([
99
{ name: 'ember-cli-moment-shim', target: '3.7.1' },
1010
{ name: 'moment', target: '^2.24.0' },
11-
{ name: 'moment-timezone', target: '^0.5.25' }
11+
{ name: 'moment-timezone', target: '^0.5.26' }
1212
]);
1313
}
1414
};

config/ember-try.js

+60-71
Original file line numberDiff line numberDiff line change
@@ -2,83 +2,72 @@
22

33
const getChannelURL = require('ember-source-channel-url');
44

5-
module.exports = function() {
6-
return Promise.all([
7-
getChannelURL('release'),
8-
getChannelURL('beta'),
9-
getChannelURL('canary')
10-
]).then((urls) => {
11-
return {
12-
useYarn: true,
13-
scenarios: [
14-
{
15-
name: 'ember-lts-2.18',
16-
env: {
17-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
18-
},
19-
npm: {
20-
devDependencies: {
21-
'@ember/jquery': '^0.5.1',
22-
'ember-source': '~2.18.0'
23-
}
5+
module.exports = async function() {
6+
return {
7+
scenarios: [
8+
{
9+
name: 'ember-lts-3.4',
10+
npm: {
11+
devDependencies: {
12+
'ember-source': '~3.4.0'
2413
}
25-
},
26-
{
27-
name: 'ember-lts-3.4',
28-
npm: {
29-
devDependencies: {
30-
'ember-source': '~3.4.0'
31-
}
32-
}
33-
},
34-
{
35-
name: 'ember-release',
36-
npm: {
37-
devDependencies: {
38-
'ember-source': urls[0]
39-
}
14+
}
15+
},
16+
{
17+
name: 'ember-lts-3.8',
18+
npm: {
19+
devDependencies: {
20+
'ember-source': '~3.8.0'
4021
}
41-
},
42-
{
43-
name: 'ember-beta',
44-
npm: {
45-
devDependencies: {
46-
'ember-source': urls[1]
47-
}
22+
}
23+
},
24+
{
25+
name: 'ember-release',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': await getChannelURL('release')
4829
}
49-
},
50-
{
51-
name: 'ember-canary',
52-
npm: {
53-
devDependencies: {
54-
'ember-source': urls[2]
55-
}
30+
}
31+
},
32+
{
33+
name: 'ember-beta',
34+
npm: {
35+
devDependencies: {
36+
'ember-source': await getChannelURL('beta')
5637
}
57-
},
58-
// The default `.travis.yml` runs this scenario via `yarn test`,
59-
// not via `ember try`. It's still included here so that running
60-
// `ember try:each` manually or from a customized CI config will run it
61-
// along with all the other scenarios.
62-
{
63-
name: 'ember-default',
64-
npm: {
65-
devDependencies: {}
38+
}
39+
},
40+
{
41+
name: 'ember-canary',
42+
npm: {
43+
devDependencies: {
44+
'ember-source': await getChannelURL('canary')
6645
}
46+
}
47+
},
48+
// The default `.travis.yml` runs this scenario via `npm test`,
49+
// not via `ember try`. It's still included here so that running
50+
// `ember try:each` manually or from a customized CI config will run it
51+
// along with all the other scenarios.
52+
{
53+
name: 'ember-default',
54+
npm: {
55+
devDependencies: {}
56+
}
57+
},
58+
{
59+
name: 'ember-default-with-jquery',
60+
env: {
61+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
62+
'jquery-integration': true
63+
})
6764
},
68-
{
69-
name: 'ember-default-with-jquery',
70-
env: {
71-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
72-
'jquery-integration': true
73-
})
74-
},
75-
npm: {
76-
devDependencies: {
77-
'@ember/jquery': '^0.5.1'
78-
}
65+
npm: {
66+
devDependencies: {
67+
'@ember/jquery': '^0.5.1'
7968
}
8069
}
81-
]
82-
};
83-
});
70+
}
71+
]
72+
};
8473
};

package.json

+7-7
Original file line numberDiff line numberDiff line change
@@ -33,14 +33,14 @@
3333
},
3434
"dependencies": {
3535
"btecu-eonasdan-bootstrap-datetimepicker": "4.17.50",
36-
"ember-cli-babel": "^7.7.3",
37-
"ember-cli-htmlbars": "^3.0.1"
36+
"ember-cli-babel": "^7.8.0",
37+
"ember-cli-htmlbars": "^3.1.0"
3838
},
3939
"devDependencies": {
4040
"@ember/jquery": "^0.6.1",
4141
"@ember/optional-features": "^0.7.0",
4242
"broccoli-asset-rev": "^3.0.0",
43-
"ember-cli": "~3.10.1",
43+
"ember-cli": "~3.11.0",
4444
"ember-cli-dependency-checker": "^3.2.0",
4545
"ember-cli-eslint": "^5.1.0",
4646
"ember-cli-htmlbars-inline-precompile": "^2.1.0",
@@ -54,18 +54,18 @@
5454
"ember-maybe-import-regenerator": "^0.1.6",
5555
"ember-qunit": "4.4.1",
5656
"ember-resolver": "^5.1.3",
57-
"ember-source": "~3.10.1",
57+
"ember-source": "~3.11.1",
5858
"ember-source-channel-url": "^2.0.1",
5959
"ember-try": "^1.2.1",
60-
"eslint-plugin-ember": "^6.5.1",
60+
"eslint-plugin-ember": "^6.7.1",
6161
"eslint-plugin-node": "^9.1.0",
6262
"loader.js": "^4.7.0",
6363
"moment": "^2.24.0",
64-
"moment-timezone": "^0.5.25",
64+
"moment-timezone": "^0.5.26",
6565
"qunit-dom": "^0.9.0"
6666
},
6767
"engines": {
68-
"node": "8.* || >= 10.*"
68+
"node": "8.* || 10.* || 12.*"
6969
},
7070
"ember-addon": {
7171
"after": [

0 commit comments

Comments
 (0)