Skip to content

Commit b9326fc

Browse files
authored
[internal] Merge pull request #583 from SergeAstapov/main
Expand @ember/test-waiters dependency range to allow v4
2 parents 6a7ed5a + 045201e commit b9326fc

File tree

2 files changed

+82
-3
lines changed

2 files changed

+82
-3
lines changed

package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"postpublish": "ember ts:clean"
6363
},
6464
"dependencies": {
65-
"@ember/test-waiters": "^2.4.3 || ^3.0.0",
65+
"@ember/test-waiters": "^2.4.3 || ^3.0.0 || ^4.0.0",
6666
"@scalvert/ember-setup-middleware-reporter": "^0.1.1",
6767
"axe-core": "^4.6.3",
6868
"broccoli-persistent-filter": "^3.1.2",

yarn.lock

Lines changed: 81 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1231,7 +1231,15 @@
12311231
ember-cli-babel "^7.26.11"
12321232
ember-cli-htmlbars "^6.2.0"
12331233

1234-
"@ember/test-waiters@^2.4.3 || ^3.0.0", "@ember/test-waiters@^3.0.2":
1234+
"@ember/test-waiters@^2.4.3 || ^3.0.0 || ^4.0.0":
1235+
version "4.0.0"
1236+
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-4.0.0.tgz#3f8665e27216a9d126a54ef4d2bc0d77d6cd275c"
1237+
integrity sha512-anqtvTCQvQh8VlHcKPJC0Fxz3aMmc7L+mZLOqvoH7+k86TUikZ/CxhytgMvgLk0x53fqOPEL1uykl2C9Ez65OA==
1238+
dependencies:
1239+
"@embroider/addon-shim" "^1.9.0"
1240+
"@embroider/macros" "^1.16.9"
1241+
1242+
"@ember/test-waiters@^3.0.2":
12351243
version "3.0.2"
12361244
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f"
12371245
integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ==
@@ -1241,6 +1249,16 @@
12411249
ember-cli-version-checker "^5.1.2"
12421250
semver "^7.3.5"
12431251

1252+
"@embroider/addon-shim@^1.9.0":
1253+
version "1.9.0"
1254+
resolved "https://registry.yarnpkg.com/@embroider/addon-shim/-/addon-shim-1.9.0.tgz#f729cfaf0f2d5f3c178808a546251743335c62f4"
1255+
integrity sha512-fMzayl/licUL8VRAy4qXROKcYvHwUbV8aTh4m97L5/MRuVpxbcAy92DGGTqx5OBKCSQN3gMg+sUKeE6AviefpQ==
1256+
dependencies:
1257+
"@embroider/shared-internals" "^2.8.1"
1258+
broccoli-funnel "^3.0.8"
1259+
common-ancestor-path "^1.0.1"
1260+
semver "^7.3.8"
1261+
12441262
"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0":
12451263
version "1.11.0"
12461264
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.11.0.tgz#d6c1f1c1325e8253971483c20059edd08ef5a353"
@@ -1255,6 +1273,20 @@
12551273
resolve "^1.20.0"
12561274
semver "^7.3.2"
12571275

1276+
"@embroider/macros@^1.16.9":
1277+
version "1.16.11"
1278+
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.16.11.tgz#c8c8c58dac21dd911379ae31fe4f5a53a5cc5a69"
1279+
integrity sha512-TUm/74oBr+tWto0IPAht1g6zjpP7UK0aQdnFHHqGvDPc+tAROQb9jKI/ePEuKAdBCV3L7XvvC4Rlf0DNvT4qmw==
1280+
dependencies:
1281+
"@embroider/shared-internals" "2.9.0"
1282+
assert-never "^1.2.1"
1283+
babel-import-util "^2.0.0"
1284+
ember-cli-babel "^7.26.6"
1285+
find-up "^5.0.0"
1286+
lodash "^4.17.21"
1287+
resolve "^1.20.0"
1288+
semver "^7.3.2"
1289+
12581290
"@embroider/[email protected]", "@embroider/shared-internals@^2.0.0":
12591291
version "2.1.0"
12601292
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.1.0.tgz#4da79fe8b26e4b94819b8313c51b5b24a68c617b"
@@ -1269,6 +1301,24 @@
12691301
semver "^7.3.5"
12701302
typescript-memoize "^1.0.1"
12711303

1304+
"@embroider/[email protected]", "@embroider/shared-internals@^2.8.1":
1305+
version "2.9.0"
1306+
resolved "https://registry.yarnpkg.com/@embroider/shared-internals/-/shared-internals-2.9.0.tgz#5d945b92e08db163de60d82f7c388e2b7260f0cc"
1307+
integrity sha512-8untWEvGy6av/oYibqZWMz/yB+LHsKxEOoUZiLvcpFwWj2Sipc0DcXeTJQZQZ++otNkLCWyDrDhOLrOkgjOPSg==
1308+
dependencies:
1309+
babel-import-util "^2.0.0"
1310+
debug "^4.3.2"
1311+
ember-rfc176-data "^0.3.17"
1312+
fs-extra "^9.1.0"
1313+
is-subdir "^1.2.0"
1314+
js-string-escape "^1.0.1"
1315+
lodash "^4.17.21"
1316+
minimatch "^3.0.4"
1317+
pkg-entry-points "^1.1.0"
1318+
resolve-package-path "^4.0.1"
1319+
semver "^7.3.5"
1320+
typescript-memoize "^1.0.1"
1321+
12721322
"@embroider/test-setup@^4.0.0":
12731323
version "4.0.0"
12741324
resolved "https://registry.yarnpkg.com/@embroider/test-setup/-/test-setup-4.0.0.tgz#080dd40314a53cc6f6fcffed41cd24ee0cb48b3d"
@@ -2929,6 +2979,11 @@ babel-import-util@^1.1.0, babel-import-util@^1.3.0:
29292979
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-1.3.0.tgz#dc9251ea39a7747bd586c1c13b8d785a42797f8e"
29302980
integrity sha512-PPzUT17eAI18zn6ek1R3sB4Krc/MbnmT1MkZQFmyhjoaEGBVwNABhfVU9+EKcDSKrrOm9OIpGhjxukx1GCiy1g==
29312981

2982+
babel-import-util@^2.0.0:
2983+
version "2.1.1"
2984+
resolved "https://registry.yarnpkg.com/babel-import-util/-/babel-import-util-2.1.1.tgz#0f4905fe899abfb8cd835dd52f3df1966d1ffbb0"
2985+
integrity sha512-3qBQWRjzP9NreSH/YrOEU1Lj5F60+pWSLP0kIdCWxjFHH7pX2YPHIxQ67el4gnMNfYoDxSDGcT0zpVlZ+gVtQA==
2986+
29322987
babel-loader@^8.0.6:
29332988
version "8.3.0"
29342989
resolved "https://registry.yarnpkg.com/babel-loader/-/babel-loader-8.3.0.tgz#124936e841ba4fe8176786d6ff28add1f134d6a8"
@@ -3091,6 +3146,13 @@ before-after-hook@^2.2.0:
30913146
resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.3.tgz#c51e809c81a4e354084422b9b26bad88249c517c"
30923147
integrity sha512-NzUnlZexiaH/46WDhANlyR2bXRopNg4F/zuSA3OpZnllCUgRaOF2znDioDWrmbNVsuZk6l9pMquQB38cfBZwkQ==
30933148

3149+
3150+
version "1.0.0"
3151+
resolved "https://registry.yarnpkg.com/better-path-resolve/-/better-path-resolve-1.0.0.tgz#13a35a1104cdd48a7b74bf8758f96a1ee613f99d"
3152+
integrity sha512-pbnl5XzGBdrFU/wT4jqmJVPn2B6UHPBOhzMQkY/SPUPB6QtUXtmBHBIwCbXJol93mOpGMnQyP/+BB19q04xj7g==
3153+
dependencies:
3154+
is-windows "^1.0.0"
3155+
30943156
big.js@^5.2.2:
30953157
version "5.2.2"
30963158
resolved "https://registry.yarnpkg.com/big.js/-/big.js-5.2.2.tgz#65f0af382f578bcdc742bd9c281e9cb2d7768328"
@@ -4180,6 +4242,11 @@ commander@^8.3.0:
41804242
resolved "https://registry.yarnpkg.com/commander/-/commander-8.3.0.tgz#4837ea1b2da67b9c616a67afbb0fafee567bca66"
41814243
integrity sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==
41824244

4245+
common-ancestor-path@^1.0.1:
4246+
version "1.0.1"
4247+
resolved "https://registry.yarnpkg.com/common-ancestor-path/-/common-ancestor-path-1.0.1.tgz#4f7d2d1394d91b7abdf51871c62f71eadb0182a7"
4248+
integrity sha512-L3sHRo1pXXEqX8VU28kfgUY+YGsk09hPqZiZmLacNib6XNTCM8ubYeT7ryXQw8asB1sKgcU5lkB7ONug08aB8w==
4249+
41834250
common-tags@^1.8.0:
41844251
version "1.8.2"
41854252
resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.2.tgz#94ebb3c076d26032745fd54face7f688ef5ac9c6"
@@ -7673,6 +7740,13 @@ is-string@^1.0.5, is-string@^1.0.7:
76737740
dependencies:
76747741
has-tostringtag "^1.0.0"
76757742

7743+
is-subdir@^1.2.0:
7744+
version "1.2.0"
7745+
resolved "https://registry.yarnpkg.com/is-subdir/-/is-subdir-1.2.0.tgz#b791cd28fab5202e91a08280d51d9d7254fd20d4"
7746+
integrity sha512-2AT6j+gXe/1ueqbW6fLZJiIw3F8iXGJtt0yDrZaBhAZEG1raiTxKWU+IPqMCzQAXOUCKdA4UDMgacKH25XG2Cw==
7747+
dependencies:
7748+
better-path-resolve "1.0.0"
7749+
76767750
is-symbol@^1.0.2, is-symbol@^1.0.3:
76777751
version "1.0.4"
76787752
resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
@@ -7728,7 +7802,7 @@ is-weakset@^2.0.1:
77287802
call-bind "^1.0.2"
77297803
get-intrinsic "^1.1.1"
77307804

7731-
is-windows@^1.0.1, is-windows@^1.0.2:
7805+
is-windows@^1.0.0, is-windows@^1.0.1, is-windows@^1.0.2:
77327806
version "1.0.2"
77337807
resolved "https://registry.yarnpkg.com/is-windows/-/is-windows-1.0.2.tgz#d1850eb9791ecd18e6182ce12a30f396634bb19d"
77347808
integrity sha512-eXK1UInq2bPmjyX6e3VHIzMLobc4J94i4AWn+Hpq3OU5KkrRC96OAcR3PRJ/pGu6m8TRnBHP9dkXQVsT/COVIA==
@@ -9787,6 +9861,11 @@ pkg-dir@^4.1.0:
97879861
dependencies:
97889862
find-up "^4.0.0"
97899863

9864+
pkg-entry-points@^1.1.0:
9865+
version "1.1.1"
9866+
resolved "https://registry.yarnpkg.com/pkg-entry-points/-/pkg-entry-points-1.1.1.tgz#d5cd87f934e873bf73143ed1d0baf637e5f8fda4"
9867+
integrity sha512-BhZa7iaPmB4b3vKIACoppyUoYn8/sFs17VJJtzrzPZvEnN2nqrgg911tdL65lA2m1ml6UI3iPeYbZQ4VXpn1mA==
9868+
97909869
pkg-up@^2.0.0:
97919870
version "2.0.0"
97929871
resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"

0 commit comments

Comments
 (0)