Skip to content

Commit f21c434

Browse files
authored
Update Ember and Ember CLI from v3.27.0 to v3.28.0 (emberjs#46)
1 parent 56dd70e commit f21c434

File tree

6 files changed

+60
-89
lines changed

6 files changed

+60
-89
lines changed

.eslintrc.js

+9-10
Original file line numberDiff line numberDiff line change
@@ -20,17 +20,16 @@ module.exports = {
2020
// node files
2121
{
2222
files: [
23-
'.eslintrc.js',
24-
'.prettierrc.js',
25-
'.template-lintrc.js',
26-
'ember-cli-build.js',
27-
'index.js',
28-
'testem.js',
29-
'blueprints/*/index.js',
30-
'config/**/*.js',
31-
'tests/dummy/config/**/*.js',
23+
'./.eslintrc.js',
24+
'./.prettierrc.js',
25+
'./.template-lintrc.js',
26+
'./ember-cli-build.js',
27+
'./index.js',
28+
'./testem.js',
29+
'./blueprints/*/index.js',
30+
'./config/**/*.js',
31+
'./tests/dummy/config/**/*.js',
3232
],
33-
excludedFiles: ['addon/**', 'addon-test-support/**', 'app/**', 'tests/dummy/app/**'],
3433
parserOptions: {
3534
sourceType: 'script',
3635
},

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ most use-cases where you might want to reach for this package.
2727

2828
- Ember.js v3.20 or above
2929
- Ember CLI v3.20 or above
30-
- Node.js v10 or above
30+
- Node.js v12 or above
3131

3232
## Installation
3333

ember-cli-build.js

+7-1
Original file line numberDiff line numberDiff line change
@@ -15,5 +15,11 @@ module.exports = function (defaults) {
1515
*/
1616

1717
const { maybeEmbroider } = require('@embroider/test-setup');
18-
return maybeEmbroider(app);
18+
return maybeEmbroider(app, {
19+
skipBabel: [
20+
{
21+
package: 'qunit',
22+
},
23+
],
24+
});
1925
};

package.json

+5-5
Original file line numberDiff line numberDiff line change
@@ -33,13 +33,13 @@
3333
},
3434
"devDependencies": {
3535
"@ember/optional-features": "^2.0.0",
36-
"@ember/test-helpers": "^2.4.0",
36+
"@ember/test-helpers": "^2.4.2",
3737
"@embroider/test-setup": "^0.43.5",
3838
"@glimmer/component": "^1.0.4",
3939
"@glimmer/tracking": "^1.0.4",
4040
"babel-eslint": "^10.1.0",
4141
"ember-auto-import": "^2.2.0",
42-
"ember-cli": "~3.27.0",
42+
"ember-cli": "~3.28.0",
4343
"ember-cli-dependency-checker": "^3.2.0",
4444
"ember-cli-htmlbars": "^5.7.1",
4545
"ember-cli-inject-live-reload": "^2.1.0",
@@ -56,9 +56,9 @@
5656
"ember-try": "^1.4.0",
5757
"eslint": "^7.32.0",
5858
"eslint-config-prettier": "^8.3.0",
59-
"eslint-plugin-ember": "^10.5.1",
59+
"eslint-plugin-ember": "^10.5.4",
6060
"eslint-plugin-node": "^11.1.0",
61-
"eslint-plugin-prettier": "^3.4.0",
61+
"eslint-plugin-prettier": "^3.4.1",
6262
"eslint-plugin-qunit": "^6.2.0",
6363
"loader.js": "^4.7.0",
6464
"npm-run-all": "^4.1.5",
@@ -70,7 +70,7 @@
7070
"webpack": "^5.55.1"
7171
},
7272
"engines": {
73-
"node": "10.* || >= 12"
73+
"node": "12.* || 14.* || >= 16"
7474
},
7575
"publishConfig": {
7676
"access": "public",

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

+5-2
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,17 @@
33
"packages": [
44
{
55
"name": "ember-cli",
6-
"version": "3.27.0",
6+
"version": "3.28.0",
77
"blueprints": [
88
{
99
"name": "addon",
1010
"outputRepo": "https://github.com/ember-cli/ember-addon-output",
1111
"codemodsSource": "ember-addon-codemods-manifest@1",
1212
"isBaseBlueprint": true,
13-
"options": ["--yarn", "--no-welcome"]
13+
"options": [
14+
"--yarn",
15+
"--no-welcome"
16+
]
1417
}
1518
]
1619
}

yarn.lock

+33-70
Original file line numberDiff line numberDiff line change
@@ -1758,26 +1758,25 @@
17581758
mkdirp "^1.0.4"
17591759
silent-error "^1.1.1"
17601760

1761-
"@ember/test-helpers@^2.4.0":
1762-
version "2.4.0"
1763-
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.4.0.tgz#4680783cfad9c474de8a47dd30cc63f4bf8d70ef"
1764-
integrity sha512-tNYc7rsgr6vWfwSD7dkGZzCovrbdPdPwdqs1Q3m38rCGry00PUNadFGM4LL8T/4YmJMghAri3FpVv685ZPVBUA==
1761+
"@ember/test-helpers@^2.4.2":
1762+
version "2.4.2"
1763+
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.4.2.tgz#e5be97e316dc502d7da933461135fbcb9254726e"
1764+
integrity sha512-++k/dXZ0IeOQLSm0Yu5QuCRe9UoptuckMhaXHY37VLb1varLHRuP8908kigVNt9c5waiocaK4jPjDBkKYRLlfA==
17651765
dependencies:
1766-
"@ember/test-waiters" "^2.4.5"
1766+
"@ember/test-waiters" "^3.0.0"
17671767
broccoli-debug "^0.6.5"
17681768
broccoli-funnel "^3.0.8"
17691769
ember-cli-babel "^7.26.6"
17701770
ember-cli-htmlbars "^5.7.1"
17711771
ember-destroyable-polyfill "^2.0.3"
17721772

1773-
"@ember/test-waiters@^2.4.5":
1774-
version "2.4.5"
1775-
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-2.4.5.tgz#6e8e34d1bc46a9b0cc22cb11cc5936046e926031"
1776-
integrity sha512-833JvHtHdEfBfKXgvmw+6oziFOpVfD4NQrc04Ztj59A11K9FPNfZ3P8YydL7LFTtdd7UfJ/cYCLAm+OwUxbotQ==
1773+
"@ember/test-waiters@^3.0.0":
1774+
version "3.0.0"
1775+
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.0.tgz#b66a35cd5b78ec3c296a6f5f5fb3852780a5d3c8"
1776+
integrity sha512-z6+gIlq/rXLKroWv2wxAoiiLtgSOGQFCw6nUufERausV+jLnA7CYbWwzEo5R7XaOejSDpgA5d6haXIBsD5j0oQ==
17771777
dependencies:
17781778
calculate-cache-key-for-tree "^2.0.0"
17791779
ember-cli-babel "^7.26.6"
1780-
ember-cli-typescript "^4.1.0"
17811780
ember-cli-version-checker "^5.1.2"
17821781
semver "^7.3.5"
17831782

@@ -2862,7 +2861,7 @@ ansi-styles@^4.0.0, ansi-styles@^4.1.0:
28622861
dependencies:
28632862
color-convert "^2.0.1"
28642863

2865-
ansi-to-html@^0.6.15, ansi-to-html@^0.6.6:
2864+
ansi-to-html@^0.6.6:
28662865
version "0.6.15"
28672866
resolved "https://registry.yarnpkg.com/ansi-to-html/-/ansi-to-html-0.6.15.tgz#ac6ad4798a00f6aa045535d7f6a9cb9294eebea7"
28682867
integrity sha512-28ijx2aHJGdzbs+O5SNQF65r6rrKYnkuwTYm8lZlChuoJ9P1vVzIpWO20sQTqTPDXYp6NFwk326vApTtLVFXpQ==
@@ -4239,7 +4238,7 @@ broccoli-funnel@^2.0.2:
42394238
symlink-or-copy "^1.0.0"
42404239
walk-sync "^0.3.1"
42414240

4242-
broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.8:
4241+
broccoli-funnel@^3.0.3, broccoli-funnel@^3.0.5, broccoli-funnel@^3.0.8:
42434242
version "3.0.8"
42444243
resolved "https://registry.yarnpkg.com/broccoli-funnel/-/broccoli-funnel-3.0.8.tgz#f5b62e2763c3918026a15a3c833edc889971279b"
42454244
integrity sha512-ng4eIhPYiXqMw6SyGoxPHR3YAwEd2lr9FgBI1CyTbspl4txZovOsmzFkMkGAlu88xyvYXJqHiM2crfLa65T1BQ==
@@ -6280,22 +6279,6 @@ ember-cli-typescript@^2.0.2:
62806279
stagehand "^1.0.0"
62816280
walk-sync "^1.0.0"
62826281

6283-
ember-cli-typescript@^4.1.0:
6284-
version "4.2.1"
6285-
resolved "https://registry.yarnpkg.com/ember-cli-typescript/-/ember-cli-typescript-4.2.1.tgz#54d08fc90318cc986f3ea562f93ce58a6cc4c24d"
6286-
integrity sha512-0iKTZ+/wH6UB/VTWKvGuXlmwiE8HSIGcxHamwNhEC5x1mN3z8RfvsFZdQWYUzIWFN2Tek0gmepGRPTwWdBYl/A==
6287-
dependencies:
6288-
ansi-to-html "^0.6.15"
6289-
broccoli-stew "^3.0.0"
6290-
debug "^4.0.0"
6291-
execa "^4.0.0"
6292-
fs-extra "^9.0.1"
6293-
resolve "^1.5.0"
6294-
rsvp "^4.8.1"
6295-
semver "^7.3.2"
6296-
stagehand "^1.0.0"
6297-
walk-sync "^2.2.0"
6298-
62996282
ember-cli-version-checker@^2.1.1, ember-cli-version-checker@^2.1.2:
63006283
version "2.2.0"
63016284
resolved "https://registry.yarnpkg.com/ember-cli-version-checker/-/ember-cli-version-checker-2.2.0.tgz#47771b731fe0962705e27c8199a9e3825709f3b3"
@@ -6330,10 +6313,10 @@ ember-cli-version-checker@^5.1.1, ember-cli-version-checker@^5.1.2:
63306313
semver "^7.3.4"
63316314
silent-error "^1.1.1"
63326315

6333-
ember-cli@~3.27.0:
6334-
version "3.27.0"
6335-
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.27.0.tgz#8ccf9db51d7b462f86210b853d086a4543605c34"
6336-
integrity sha512-vFLPFkplXn5v005fattHdOcs5AbSp7RG4w1wpHDWHzOSYpl2Dr+5zzZtqLS7V5IVaLf3XK4l24XwhSW9HpMfsQ==
6316+
ember-cli@~3.28.0:
6317+
version "3.28.0"
6318+
resolved "https://registry.yarnpkg.com/ember-cli/-/ember-cli-3.28.0.tgz#0a0374c9a1d08386ddf56e8098a38b71dd4453bc"
6319+
integrity sha512-CrMs5edFQ2ingO2xfT33T4nUEl8SlvBQ7q+XO9L/GFTvFU07slHxYSvGur0cwgQfOiLnkSTnIaVF1oqBnEmfPQ==
63376320
dependencies:
63386321
"@babel/core" "^7.13.8"
63396322
"@babel/plugin-transform-modules-amd" "^7.12.1"
@@ -6349,7 +6332,7 @@ ember-cli@~3.27.0:
63496332
broccoli-config-loader "^1.0.1"
63506333
broccoli-config-replace "^1.1.2"
63516334
broccoli-debug "^0.6.5"
6352-
broccoli-funnel "^2.0.2"
6335+
broccoli-funnel "^3.0.5"
63536336
broccoli-funnel-reducer "^1.0.0"
63546337
broccoli-merge-trees "^3.0.2"
63556338
broccoli-middleware "^2.1.1"
@@ -6415,7 +6398,7 @@ ember-cli@~3.27.0:
64156398
sane "^4.1.0"
64166399
semver "^7.3.4"
64176400
silent-error "^1.1.1"
6418-
sort-package-json "^1.48.0"
6401+
sort-package-json "^1.49.0"
64196402
symlink-or-copy "^1.3.1"
64206403
temp "0.9.4"
64216404
testem "^3.2.0"
@@ -6424,7 +6407,7 @@ ember-cli@~3.27.0:
64246407
uuid "^8.3.2"
64256408
walk-sync "^2.2.0"
64266409
watch-detector "^1.0.0"
6427-
workerpool "^6.0.3"
6410+
workerpool "^6.1.4"
64286411
yam "^1.0.0"
64296412

64306413
ember-compatibility-helpers@^1.1.2, ember-compatibility-helpers@^1.2.1, ember-compatibility-helpers@^1.2.5:
@@ -6906,10 +6889,10 @@ eslint-config-prettier@^8.3.0:
69066889
resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
69076890
integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
69086891

6909-
eslint-plugin-ember@^10.5.1:
6910-
version "10.5.1"
6911-
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.1.tgz#3ec65cb562b438c64aa28d772606dbb55705e037"
6912-
integrity sha512-6cubCQdsybN2DtuXnlkhqi3SemBk4ktjq2k4vcjFG8QLmrpmiS6sDwIZMM/TLI8f9QwZIjmewhwS4zB/77E47w==
6892+
eslint-plugin-ember@^10.5.4:
6893+
version "10.5.5"
6894+
resolved "https://registry.yarnpkg.com/eslint-plugin-ember/-/eslint-plugin-ember-10.5.5.tgz#fbd292f24ea9ea4d32979d42039dbb878b6cf545"
6895+
integrity sha512-yuNiGyOT2pRaGcifJo9H5RU5XlHiVUXvNuAlLBXrTQyZtsOYFBsXgEhMCCq4BVV/0Q79SqXG+03ceB1YtoJHEQ==
69136896
dependencies:
69146897
"@ember-data/rfc395-data" "^0.0.4"
69156898
css-tree "^1.0.0-alpha.39"
@@ -6939,10 +6922,10 @@ eslint-plugin-node@^11.1.0:
69396922
resolve "^1.10.1"
69406923
semver "^6.1.0"
69416924

6942-
eslint-plugin-prettier@^3.4.0:
6943-
version "3.4.0"
6944-
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
6945-
integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==
6925+
eslint-plugin-prettier@^3.4.1:
6926+
version "3.4.1"
6927+
resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.1.tgz#e9ddb200efb6f3d05ffe83b1665a716af4a387e5"
6928+
integrity sha512-htg25EUYUeIhKHXjOinK4BgCcDwtLHjqaxCDsMy5nbnUMkKFvIhMVCp+5GFUXQ4Nr8lBsPqtGAqBenbpFqAA2g==
69466929
dependencies:
69476930
prettier-linter-helpers "^1.0.0"
69486931

@@ -7204,21 +7187,6 @@ execa@^2.0.0:
72047187
signal-exit "^3.0.2"
72057188
strip-final-newline "^2.0.0"
72067189

7207-
execa@^4.0.0:
7208-
version "4.1.0"
7209-
resolved "https://registry.yarnpkg.com/execa/-/execa-4.1.0.tgz#4e5491ad1572f2f17a77d388c6c857135b22847a"
7210-
integrity sha512-j5W0//W7f8UxAn8hXVnwG8tLwdiUy4FJLcSupCg6maBYZDpyBvTApK7KyuI4bKj8KOh1r2YH+6ucuYtJv1bTZA==
7211-
dependencies:
7212-
cross-spawn "^7.0.0"
7213-
get-stream "^5.0.0"
7214-
human-signals "^1.1.1"
7215-
is-stream "^2.0.0"
7216-
merge-stream "^2.0.0"
7217-
npm-run-path "^4.0.0"
7218-
onetime "^5.1.0"
7219-
signal-exit "^3.0.2"
7220-
strip-final-newline "^2.0.0"
7221-
72227190
execa@^5.0.0:
72237191
version "5.1.1"
72247192
resolved "https://registry.yarnpkg.com/execa/-/execa-5.1.1.tgz#f80ad9cbf4298f7bd1d4c9555c21e93741c411dd"
@@ -7868,7 +7836,7 @@ fs-extra@^8.0.0, fs-extra@^8.0.1, fs-extra@^8.1.0:
78687836
jsonfile "^4.0.0"
78697837
universalify "^0.1.0"
78707838

7871-
fs-extra@^9.0.1, fs-extra@^9.1.0:
7839+
fs-extra@^9.1.0:
78727840
version "9.1.0"
78737841
resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-9.1.0.tgz#5954460c764a8da2094ba3554bf839e6b9a7c86d"
78747842
integrity sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==
@@ -8718,11 +8686,6 @@ https@^1.0.0:
87188686
resolved "https://registry.yarnpkg.com/https/-/https-1.0.0.tgz#3c37c7ae1a8eeb966904a2ad1e975a194b7ed3a4"
87198687
integrity sha1-PDfHrhqO65ZpBKKtHpdaGUt+06Q=
87208688

8721-
human-signals@^1.1.1:
8722-
version "1.1.1"
8723-
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-1.1.1.tgz#c5b1cd14f50aeae09ab6c59fe63ba3395fe4dfa3"
8724-
integrity sha512-SEQu7vl8KjNL2eoGBLF3+wAjpsNfA9XMlXAYj/3EdaNfAlxKthD1xjEQfGOUhllCGGJVNY34bRr6lPINhNjyZw==
8725-
87268689
human-signals@^2.1.0:
87278690
version "2.1.0"
87288691
resolved "https://registry.yarnpkg.com/human-signals/-/human-signals-2.1.0.tgz#dc91fcba42e4d06e4abaed33b3e7a3c02f514ea0"
@@ -11088,7 +11051,7 @@ npm-run-path@^3.0.0:
1108811051
dependencies:
1108911052
path-key "^3.0.0"
1109011053

11091-
npm-run-path@^4.0.0, npm-run-path@^4.0.1:
11054+
npm-run-path@^4.0.1:
1109211055
version "4.0.1"
1109311056
resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-4.0.1.tgz#b7ecd1e5ed53da8e37a55e1c2269e0b97ed748ea"
1109411057
integrity sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==
@@ -13111,10 +13074,10 @@ sort-object-keys@^1.1.3:
1311113074
resolved "https://registry.yarnpkg.com/sort-object-keys/-/sort-object-keys-1.1.3.tgz#bff833fe85cab147b34742e45863453c1e190b45"
1311213075
integrity sha512-855pvK+VkU7PaKYPc+Jjnmt4EzejQHyhhF33q31qG8x7maDzkeFhAAThdCYay11CISO+qAMwjOBP+fPZe0IPyg==
1311313076

13114-
sort-package-json@^1.48.0:
13115-
version "1.50.0"
13116-
resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.50.0.tgz#19fc109fe23bd157bd03c8e572fa3251a52467d8"
13117-
integrity sha512-qZpqhMU9XTntebgAgc4hv/D6Fzhh7kFnwvV6a7+q8y8J5JoaDqPYQnvXPf7BBqG95tdE8X6JVNo7/jDzcbdfUg==
13077+
sort-package-json@^1.49.0:
13078+
version "1.52.0"
13079+
resolved "https://registry.yarnpkg.com/sort-package-json/-/sort-package-json-1.52.0.tgz#f960fe7cfae3120a4ce1b9eed7e010ac4bec998e"
13080+
integrity sha512-TsKDXgH3kPsaSrjAszQgg+n2/FDYdPrBrXD4YxMxExpogsi8LCek0YzK/jZ70i5Gi53WcpV+mVzvb5CHB5LpZw==
1311813081
dependencies:
1311913082
detect-indent "^6.0.0"
1312013083
detect-newline "3.1.0"
@@ -14654,7 +14617,7 @@ workerpool@^3.1.1:
1465414617
object-assign "4.1.1"
1465514618
rsvp "^4.8.4"
1465614619

14657-
workerpool@^6.0.0, workerpool@^6.0.3, workerpool@^6.1.4:
14620+
workerpool@^6.0.0, workerpool@^6.1.4:
1465814621
version "6.1.5"
1465914622
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.1.5.tgz#0f7cf076b6215fd7e1da903ff6f22ddd1886b581"
1466014623
integrity sha512-XdKkCK0Zqc6w3iTxLckiuJ81tiD/o5rBE/m+nXpRCB+/Sq4DqkfXZ/x0jW02DG1tGsfUGXbTJyZDP+eu67haSw==

0 commit comments

Comments
 (0)