Skip to content

Commit a0e2a2e

Browse files
simonihmigsimonihmig
authored
Merge pull request ember-bootstrap#964 from jelhan/upgrade-ember-to-3.15
upgrade ember to 3.15
2 parents 1bf39f0 + df48e49 commit a0e2a2e

File tree

8 files changed

+1166
-1801
lines changed

8 files changed

+1166
-1801
lines changed

‎.npmignore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
# misc
99
/.bowerrc
1010
/.editorconfig
11-
/.ember-cli.js
11+
/.ember-cli
1212
/.env*
1313
/.eslintignore
1414
/.eslintrc.js

‎.travis.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,17 @@ jobs:
7171
env: EMBER_TRY_SCENARIO=ember-default BABELPOLYFILL=true BEFORE_SCRIPT="ember browserstack:connect" AFTER_SCRIPT="ember browserstack:disconnect" TEST_COMMAND="ember test --filter !FastBoot --config-file testem.browserstack.js"
7272
- env: EMBER_TRY_SCENARIO=ember-lts-2.18
7373
- env: EMBER_TRY_SCENARIO=ember-lts-3.4
74+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8
75+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12
7476
- env: EMBER_TRY_SCENARIO=ember-release
7577
- env: EMBER_TRY_SCENARIO=ember-beta
7678
- env: EMBER_TRY_SCENARIO=ember-canary
7779
- env: EMBER_TRY_SCENARIO=ember-default-with-jquery
7880
- env: EMBER_TRY_SCENARIO=ember-classic
7981
- env: EMBER_TRY_SCENARIO=ember-lts-2.18 BOOTSTRAPVERSION=3
8082
- env: EMBER_TRY_SCENARIO=ember-lts-3.4 BOOTSTRAPVERSION=3
83+
- env: EMBER_TRY_SCENARIO=ember-lts-3.8 BOOTSTRAPVERSION=3
84+
- env: EMBER_TRY_SCENARIO=ember-lts-3.12 BOOTSTRAPVERSION=3
8185
- env: EMBER_TRY_SCENARIO=ember-release BOOTSTRAPVERSION=3
8286
- env: EMBER_TRY_SCENARIO=ember-beta BOOTSTRAPVERSION=3
8387
- env: EMBER_TRY_SCENARIO=ember-classic BOOTSTRAPVERSION=3

‎config/ember-try.js

Lines changed: 123 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -3,127 +3,142 @@
33
const getChannelURL = require('ember-source-channel-url');
44
const bootstrapVersion = process.env.BOOTSTRAPVERSION === '3' ? '^3.4.1' : '^4.3.1';
55

6-
module.exports = function() {
7-
return Promise.all([
8-
getChannelURL('release'),
9-
getChannelURL('beta'),
10-
getChannelURL('canary')
11-
]).then((urls) => {
12-
return {
13-
useYarn: true,
14-
command: 'ember test --filter !FastBoot',
15-
scenarios: [
16-
{
17-
name: 'ember-lts-2.18',
18-
env: {
19-
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
20-
},
21-
npm: {
22-
devDependencies: {
23-
'@ember/jquery': '^0.5.1',
24-
'ember-source': '~2.18.0',
25-
'bootstrap': bootstrapVersion
26-
}
27-
}
6+
module.exports = async function() {
7+
return {
8+
useYarn: true,
9+
command: 'ember test --filter !FastBoot',
10+
scenarios: [
11+
{
12+
name: 'ember-lts-2.18',
13+
env: {
14+
EMBER_OPTIONAL_FEATURES: JSON.stringify({ 'jquery-integration': true })
2815
},
29-
{
30-
name: 'ember-lts-3.4',
31-
npm: {
32-
devDependencies: {
33-
'ember-source': '~3.4.0',
34-
'bootstrap': bootstrapVersion
35-
}
16+
npm: {
17+
devDependencies: {
18+
'@ember/jquery': '^0.5.1',
19+
'ember-source': '~2.18.0',
20+
'bootstrap': bootstrapVersion
3621
}
37-
},
38-
{
39-
name: 'ember-release',
40-
npm: {
41-
devDependencies: {
42-
'ember-source': urls[0],
43-
'bootstrap': bootstrapVersion
44-
}
45-
},
46-
env: {
47-
FAIL_ON_DEPRECATION: true
22+
}
23+
},
24+
{
25+
name: 'ember-lts-3.4',
26+
npm: {
27+
devDependencies: {
28+
'ember-source': '~3.4.0',
29+
'bootstrap': bootstrapVersion
4830
}
49-
},
50-
{
51-
name: 'ember-beta',
52-
npm: {
53-
devDependencies: {
54-
'ember-source': urls[1],
55-
'bootstrap': bootstrapVersion
56-
}
31+
}
32+
},
33+
{
34+
name: 'ember-lts-3.8',
35+
npm: {
36+
devDependencies: {
37+
'ember-source': '~3.8.0',
38+
'bootstrap': bootstrapVersion
39+
}
40+
}
41+
},
42+
{
43+
name: 'ember-lts-3.12',
44+
npm: {
45+
devDependencies: {
46+
'ember-source': '~3.12.0',
47+
'bootstrap': bootstrapVersion
48+
}
49+
}
50+
},
51+
{
52+
name: 'ember-release',
53+
npm: {
54+
devDependencies: {
55+
'ember-source': await getChannelURL('release'),
56+
'bootstrap': bootstrapVersion
5757
}
5858
},
59-
{
60-
name: 'ember-canary',
61-
npm: {
62-
devDependencies: {
63-
'ember-source': urls[2],
64-
'bootstrap': bootstrapVersion
65-
}
66-
},
67-
env: {
68-
FAIL_ON_DEPRECATION: true
59+
env: {
60+
FAIL_ON_DEPRECATION: true
61+
}
62+
},
63+
{
64+
name: 'ember-beta',
65+
npm: {
66+
devDependencies: {
67+
'ember-source': await getChannelURL('beta'),
68+
'bootstrap': bootstrapVersion
69+
}
70+
}
71+
},
72+
{
73+
name: 'ember-canary',
74+
npm: {
75+
devDependencies: {
76+
'ember-source': await getChannelURL('canary'),
77+
'bootstrap': bootstrapVersion
6978
}
7079
},
71-
// The default `.travis.yml` runs this scenario via `npm test`,
72-
// not via `ember try`. It's still included here so that running
73-
// `ember try:each` manually or from a customized CI config will run it
74-
// along with all the other scenarios.
75-
{
76-
name: 'ember-default',
77-
npm: {
78-
devDependencies: {
79-
'bootstrap': bootstrapVersion
80-
}
80+
env: {
81+
FAIL_ON_DEPRECATION: true
82+
}
83+
},
84+
// The default `.travis.yml` runs this scenario via `npm test`,
85+
// not via `ember try`. It's still included here so that running
86+
// `ember try:each` manually or from a customized CI config will run it
87+
// along with all the other scenarios.
88+
{
89+
name: 'ember-default',
90+
npm: {
91+
devDependencies: {
92+
'bootstrap': bootstrapVersion
8193
}
94+
}
95+
},
96+
{
97+
name: 'ember-default-with-jquery',
98+
env: {
99+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
100+
'jquery-integration': true
101+
})
82102
},
83-
{
84-
name: 'ember-default-with-jquery',
85-
env: {
86-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
87-
'jquery-integration': true
88-
})
89-
},
90-
npm: {
91-
devDependencies: {
92-
'@ember/jquery': '^0.5.1',
93-
'bootstrap': bootstrapVersion
94-
}
103+
npm: {
104+
devDependencies: {
105+
'@ember/jquery': '^0.5.1',
106+
'bootstrap': bootstrapVersion
95107
}
108+
}
109+
},
110+
{
111+
name: 'ember-classic',
112+
env: {
113+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
114+
// TODO: tests fail if optional feature application-template-wrapper is enabled
115+
// 'application-template-wrapper': true,
116+
'default-async-observers': false,
117+
'template-only-glimmer-components': false
118+
})
96119
},
97-
{
98-
name: 'ember-classic',
99-
env: {
100-
EMBER_OPTIONAL_FEATURES: JSON.stringify({
101-
// TODO: tests fail if optional feature application-template-wrapper is enabled
102-
// 'application-template-wrapper': true,
103-
'default-async-observers': false,
104-
'template-only-glimmer-components': false
105-
})
120+
npm: {
121+
devDependencies: {
122+
'bootstrap': bootstrapVersion
106123
},
107-
npm: {
108-
devDependencies: {
109-
'bootstrap': bootstrapVersion
110-
}
124+
ember: {
125+
edition: 'classic'
111126
}
112-
},
113-
{
114-
name: 'fastboot-tests',
115-
command: 'ember test --filter FastBoot',
116-
npm: {
117-
devDependencies: {
118-
'bootstrap': bootstrapVersion
119-
}
127+
}
128+
},
129+
{
130+
name: 'fastboot-tests',
131+
command: 'ember test --filter FastBoot',
132+
npm: {
133+
devDependencies: {
134+
'bootstrap': bootstrapVersion
120135
}
121-
},
122-
{
123-
name: 'node-tests',
124-
command: 'yarn run nodetest'
125136
}
126-
]
127-
};
128-
});
137+
},
138+
{
139+
name: 'node-tests',
140+
command: 'yarn run nodetest'
141+
}
142+
]
143+
};
129144
};

‎package.json

Lines changed: 19 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -16,20 +16,21 @@
1616
"node": "8.* || >= 10.*"
1717
},
1818
"devDependencies": {
19-
"@ember/optional-features": "^1.0.0",
19+
"@ember/optional-features": "^1.1.0",
20+
"@glimmer/component": "^1.0.0",
2021
"babel-eslint": "^10.0.3",
2122
"bootstrap": "^4.0.0",
2223
"bootstrap-sass": "^3.3.7",
2324
"broccoli-asset-rev": "^3.0.0",
2425
"chai": "^4.0.0",
2526
"chai-things": "^0.2.0",
2627
"ember-a11y-testing": "^1.1.1",
27-
"ember-cli": "~3.14.0",
28+
"ember-cli": "~3.15.1",
2829
"ember-cli-app-version": "^3.0.0",
2930
"ember-cli-blueprint-test-helpers": "^0.19.1",
3031
"ember-cli-browserstack": "^0.0.7",
3132
"ember-cli-content-security-policy": "^1.0.0",
32-
"ember-cli-dependency-checker": "^3.1.0",
33+
"ember-cli-dependency-checker": "^3.2.0",
3334
"ember-cli-eslint": "^5.1.0",
3435
"ember-cli-fastboot": "^2.0.0",
3536
"ember-cli-fastboot-testing": "^0.2.0",
@@ -42,17 +43,17 @@
4243
"ember-cli-yuidoc": "^0.8.8",
4344
"ember-compatibility-helpers": "^1.2.0",
4445
"ember-disable-prototype-extensions": "^1.1.3",
45-
"ember-export-application-global": "^2.0.0",
46-
"ember-load-initializers": "^2.1.0",
46+
"ember-export-application-global": "^2.0.1",
47+
"ember-load-initializers": "^2.1.1",
4748
"ember-maybe-import-regenerator": "^0.1.6",
48-
"ember-qunit": "^4.5.1",
49-
"ember-resolver": "^5.3.0",
49+
"ember-qunit": "^4.6.0",
50+
"ember-resolver": "^7.0.0",
5051
"ember-sinon": "^4.0.0",
5152
"ember-sinon-qunit": "^3.4.0",
52-
"ember-source": "~3.14.3",
53+
"ember-source": "~3.15.0",
5354
"ember-source-channel-url": "^2.0.1",
54-
"ember-try": "^1.2.1",
55-
"eslint-plugin-ember": "^7.1.0",
55+
"ember-try": "^1.4.0",
56+
"eslint-plugin-ember": "^7.7.1",
5657
"eslint-plugin-node": "^10.0.0",
5758
"execa": "^2.0.0",
5859
"glob": "^7.1.1",
@@ -65,7 +66,7 @@
6566
"loader.js": "^4.7.0",
6667
"merge-stream": "^1.0.1",
6768
"mocha": "^6.1.4",
68-
"qunit-dom": "^0.9.0",
69+
"qunit-dom": "^0.9.2",
6970
"striptags": "^3.0.0"
7071
},
7172
"description": "Bootstrap components for Ember.js",
@@ -90,9 +91,9 @@
9091
"broccoli-stew": "^2.0.0",
9192
"chalk": "^2.1.0",
9293
"ember-angle-bracket-invocation-polyfill": "^2.0.1",
93-
"ember-cli-babel": "^7.11.1",
94+
"ember-cli-babel": "^7.13.0",
9495
"ember-cli-build-config-editor": "0.5.0",
95-
"ember-cli-htmlbars": "^4.0.5",
96+
"ember-cli-htmlbars": "^4.2.0",
9697
"ember-cli-version-checker": "^3.0.0",
9798
"ember-concurrency": "^1.0.0",
9899
"ember-decorators": "^6.1.0",
@@ -109,6 +110,9 @@
109110
"rsvp": "^4.0.1",
110111
"silent-error": "^1.0.1"
111112
},
113+
"ember": {
114+
"edition": "octane"
115+
},
112116
"ember-addon": {
113117
"configPath": "tests/dummy/config",
114118
"versionCompatibility": {
@@ -131,6 +135,7 @@
131135
},
132136
"resolutions": {
133137
"ip-regex": "^2.1.0",
134-
"ember-concurrency": "^1.0.0"
138+
"ember-concurrency": "^1.0.0",
139+
"ember-cli-htmlbars/semver": "~7.0.0"
135140
}
136141
}

‎tests/dummy/app/app.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Application from '@ember/application';
2-
import Resolver from './resolver';
2+
import Resolver from 'ember-resolver';
33
import loadInitializers from 'ember-load-initializers';
44
import config from './config/environment';
55

‎tests/dummy/app/resolver.js

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎tests/dummy/app/templates/components/.gitkeep

Whitespace-only changes.

0 commit comments

Comments
 (0)