Skip to content

Commit fcffc7a

Browse files
committed
chore: upgrade ember v3.21.x
1 parent 43dcfdb commit fcffc7a

File tree

6 files changed

+188
-154
lines changed

6 files changed

+188
-154
lines changed

.travis.yml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,7 @@ jobs:
4747
# we recommend new addons test the current and previous LTS
4848
# as well as latest stable release (bonus points to beta/canary)
4949
- env: EMBER_TRY_SCENARIO=ember-lts-3.16
50+
- env: EMBER_TRY_SCENARIO=ember-lts-3.20
5051
- env: EMBER_TRY_SCENARIO=ember-release
5152
- env: EMBER_TRY_SCENARIO=ember-beta
5253
- env: EMBER_TRY_SCENARIO=ember-canary
@@ -56,8 +57,5 @@ before_install:
5657
- curl -o- -L https://yarnpkg.com/install.sh | bash
5758
- export PATH=$HOME/.yarn/bin:$PATH
5859

59-
install:
60-
- yarn install --non-interactive
61-
6260
script:
6361
- node_modules/.bin/ember try:one $EMBER_TRY_SCENARIO

config/ember-try.js

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,18 @@ module.exports = async function () {
66
return {
77
scenarios: [
88
{
9-
name: 'ember-3.15', // First Octane release
9+
name: 'ember-lts-3.16',
1010
npm: {
1111
devDependencies: {
12-
'ember-source': '~3.15.0',
12+
'ember-source': '~3.16.0',
1313
},
1414
},
1515
},
1616
{
17-
name: 'ember-lts-3.16',
17+
name: 'ember-lts-3.20',
1818
npm: {
1919
devDependencies: {
20-
'ember-source': '~3.16.0',
20+
'ember-source': '~3.20.5',
2121
},
2222
},
2323
},
@@ -54,10 +54,20 @@ module.exports = async function () {
5454
},
5555
npm: {
5656
devDependencies: {
57-
'@ember/jquery': '^0.5.1',
57+
'@ember/jquery': '^1.1.0',
5858
},
5959
},
6060
},
61+
{
62+
name: 'ember-classic',
63+
env: {
64+
EMBER_OPTIONAL_FEATURES: JSON.stringify({
65+
'application-template-wrapper': true,
66+
'default-async-observers': false,
67+
'template-only-glimmer-components': false,
68+
}),
69+
},
70+
},
6171
],
6272
};
6373
};

ember-cli-build.js

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,6 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
55
module.exports = function (defaults) {
66
let app = new EmberAddon(defaults, {
77
// Add options here
8-
9-
// Workaround for https://github.com/ember-cli/ember-cli/issues/8075
10-
'ember-cli-uglify': {
11-
uglify: {
12-
compress: {
13-
collapse_vars: false,
14-
},
15-
},
16-
},
178
});
189

1910
/*

package.json

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -27,16 +27,16 @@
2727
"postpublish": "ember ts:clean"
2828
},
2929
"dependencies": {
30-
"@glimmer/tracking": "^1.0.0",
30+
"@glimmer/tracking": "^1.0.1",
3131
"ember-auto-import": "^1.6.0",
32-
"ember-cli-babel": "^7.21.0",
33-
"ember-cli-htmlbars": "^5.2.0",
32+
"ember-cli-babel": "^7.22.1",
33+
"ember-cli-htmlbars": "^5.3.1",
3434
"ember-cli-typescript": "^3.1.4",
3535
"ember-usable": "https://github.com/pzuraq/ember-usable#0d03a50",
3636
"xstate": "^4.12.0"
3737
},
3838
"devDependencies": {
39-
"@ember/optional-features": "^1.3.0",
39+
"@ember/optional-features": "^2.0.0",
4040
"@ember/render-modifiers": "^1.0.2",
4141
"@glimmer/component": "^1.0.1",
4242
"@release-it/conventional-changelog": "^1.1.4",
@@ -50,7 +50,7 @@
5050
"babel-eslint": "^10.1.0",
5151
"broccoli-asset-rev": "^3.0.0",
5252
"ember-angle-bracket-invocation-polyfill": "^2.0.2",
53-
"ember-cli": "~3.20.0",
53+
"ember-cli": "~3.21.1",
5454
"ember-cli-addon-docs": "^0.6.16",
5555
"ember-cli-addon-docs-esdoc": "^0.2.3",
5656
"ember-cli-dependency-checker": "^3.2.0",
@@ -60,8 +60,8 @@
6060
"ember-cli-deploy-git-ci": "^1.0.1",
6161
"ember-cli-inject-live-reload": "^2.0.2",
6262
"ember-cli-sri": "^2.1.1",
63+
"ember-cli-terser": "^4.0.0",
6364
"ember-cli-typescript-blueprints": "^3.0.0",
64-
"ember-cli-uglify": "^3.0.0",
6565
"ember-concurrency": "^1.2.1",
6666
"ember-concurrency-async": "^0.3.1",
6767
"ember-concurrency-decorators": "^2.0.1",
@@ -72,20 +72,20 @@
7272
"ember-maybe-import-regenerator": "^0.1.6",
7373
"ember-qunit": "^4.6.0",
7474
"ember-qunit-assert-helpers": "^0.2.2",
75-
"ember-resolver": "^8.0.0",
76-
"ember-source": "~3.20.2",
77-
"ember-source-channel-url": "^2.0.1",
78-
"ember-template-lint": "^2.9.1",
75+
"ember-resolver": "^8.0.2",
76+
"ember-source": "~3.21.1",
77+
"ember-source-channel-url": "^3.0.0",
78+
"ember-template-lint": "^2.11.0",
7979
"ember-try": "^1.4.0",
80-
"eslint": "^7.5.0",
80+
"eslint": "^7.8.0",
8181
"eslint-config-prettier": "^6.10.1",
82-
"eslint-plugin-ember": "^8.9.1",
82+
"eslint-plugin-ember": "^8.13.0",
8383
"eslint-plugin-node": "^11.1.0",
8484
"eslint-plugin-prettier": "3.1.2",
8585
"loader.js": "^4.7.0",
8686
"npm-run-all": "^4.1.5",
8787
"prettier": "^2.0.2",
88-
"qunit-dom": "^1.2.0",
88+
"qunit-dom": "^1.4.0",
8989
"release-it": "^13.6.2",
9090
"typescript": "^4.0.2"
9191
},

tests/dummy/config/ember-cli-update.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.20.0",
6+
"version": "3.21.1",
77
"blueprints": [
88
{
99
"name": "addon",

0 commit comments

Comments
 (0)