Skip to content

Commit d4cd66f

Browse files
authored
Revert @ember/test-helpers update and pin to 2.7.0 (#885)
Temporary measure. Don't really want to release while this dependency is pinned with a ~ as this is a declared dependency of the included test helpers. But also uncomfortable with the CI failing for ember 3.28. Reference: emberjs/ember-test-helpers/issues/1232
1 parent 5c85ce5 commit d4cd66f

File tree

4 files changed

+43
-13
lines changed

4 files changed

+43
-13
lines changed

ember-file-upload/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
"prepare": "yarn build"
4747
},
4848
"dependencies": {
49-
"@ember/test-helpers": "^2.9.3",
49+
"@ember/test-helpers": "~2.7.0",
5050
"@ember/test-waiters": "^3.0.0",
5151
"@embroider/addon-shim": "^1.5.0",
5252
"@embroider/macros": "^1.0.0",
@@ -74,6 +74,7 @@
7474
"@types/ember__string": "^3.16.3",
7575
"@types/ember__template": "^4.0.0",
7676
"@types/ember__test": "^4.0.0",
77+
"@types/ember__test-helpers": "~2.6.0",
7778
"@types/ember__utils": "^4.0.0",
7879
"@types/rsvp": "^4.0.4",
7980
"@typescript-eslint/eslint-plugin": "^5.6.0",

test-app/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
"devDependencies": {
2626
"@babel/core": "^7.19.6",
2727
"@ember/optional-features": "^2.0.0",
28-
"@ember/test-helpers": "^2.9.3",
28+
"@ember/test-helpers": "~2.7.0",
2929
"@embroider/test-setup": "^2.0.0",
3030
"@glimmer/component": "^1.1.2",
3131
"@glimmer/tracking": "^1.1.2",

website/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"@babel/eslint-parser": "^7.16.5",
2828
"@docfy/ember": "^0.5.0",
2929
"@ember/optional-features": "^2.0.0",
30-
"@ember/test-helpers": "^2.9.3",
30+
"@ember/test-helpers": "~2.7.0",
3131
"@embroider/macros": "^1.0.0",
3232
"@glimmer/component": "^1.1.2",
3333
"@glimmer/tracking": "^1.1.2",

yarn.lock

+39-10
Original file line numberDiff line numberDiff line change
@@ -1089,18 +1089,16 @@
10891089
mkdirp "^1.0.4"
10901090
silent-error "^1.1.1"
10911091

1092-
"@ember/test-helpers@^2.9.3":
1093-
version "2.9.3"
1094-
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.9.3.tgz#c2a9d6ab1c367af92cf1a334f97eb19b8e06e6e1"
1095-
integrity sha512-ejVg4Dj+G/6zyLvQsYOvmGiOLU6AS94tY4ClaO1E2oVvjjtVJIRmVLFN61I+DuyBg9hS3cFoPjQRTZB9MRIbxQ==
1092+
"@ember/test-helpers@~2.7.0":
1093+
version "2.7.0"
1094+
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-2.7.0.tgz#d8e08b614cdd5eac647689d655e78e1de725f474"
1095+
integrity sha512-eWFtw5+sbci1Fw+E+HoyaMxY126LvK7jul6i8tad48zlWoxrOalbhJhz1mKqIo4daHbqIZWuFgQhOib4QfTKCQ==
10961096
dependencies:
10971097
"@ember/test-waiters" "^3.0.0"
1098-
"@embroider/macros" "^1.10.0"
1099-
"@embroider/util" "^1.9.0"
11001098
broccoli-debug "^0.6.5"
11011099
broccoli-funnel "^3.0.8"
1102-
ember-cli-babel "^7.26.11"
1103-
ember-cli-htmlbars "^6.1.1"
1100+
ember-cli-babel "^7.26.6"
1101+
ember-cli-htmlbars "^5.7.1"
11041102
ember-destroyable-polyfill "^2.0.3"
11051103

11061104
"@ember/test-waiters@^3.0.0":
@@ -1172,7 +1170,7 @@
11721170
typescript-memoize "^1.0.1"
11731171
walk-sync "^3.0.0"
11741172

1175-
"@embroider/[email protected]", "@embroider/macros@^0.41.0", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.5.0", "@embroider/macros@^1.9.0":
1173+
"@embroider/[email protected]", "@embroider/macros@^0.41.0", "@embroider/macros@^0.50.0 || ^1.0.0", "@embroider/macros@^1.0.0", "@embroider/macros@^1.5.0", "@embroider/macros@^1.9.0":
11761174
version "1.10.0"
11771175
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.10.0.tgz#af3844d5db48f001b85cfb096c76727c72ad6c1e"
11781176
integrity sha512-LMbfQGk/a+f6xtvAv5fq/wf2LRxETnbgSCLUf/z6ebzmuskOUxrke+uP55chF/loWrARi9g6erFQ7RDOUoBMSg==
@@ -1208,7 +1206,7 @@
12081206
lodash "^4.17.21"
12091207
resolve "^1.20.0"
12101208

1211-
"@embroider/util@^1.5.0", "@embroider/util@^1.9.0":
1209+
"@embroider/util@^1.5.0":
12121210
version "1.9.0"
12131211
resolved "https://registry.yarnpkg.com/@embroider/util/-/util-1.9.0.tgz#331c46bdf106c44cb1dd6baaa9030d322c13cfca"
12141212
integrity sha512-9I63iJK6N01OHJafmS/BX0msUkTlmhFMIEmDl/SRNACVi0nS6QfNyTgTTeji1P/DALf6eobg/9t/N4VhS9G9QA==
@@ -1779,6 +1777,14 @@
17791777
dependencies:
17801778
"@types/ms" "*"
17811779

1780+
"@types/ember-resolver@*":
1781+
version "5.0.13"
1782+
resolved "https://registry.yarnpkg.com/@types/ember-resolver/-/ember-resolver-5.0.13.tgz#db66678076ca625ed80b629c09619ae85c1c1f7a"
1783+
integrity sha512-pO964cAPhAaFJoS28M8+b5MzAhQ/tVuNM4GDUIAexheQat36axG2WTG8LQ5ea07MSFPesrRFk2T3z88pfvdYKA==
1784+
dependencies:
1785+
"@types/ember__object" "*"
1786+
"@types/ember__owner" "*"
1787+
17821788
"@types/ember@*":
17831789
version "4.0.3"
17841790
resolved "https://registry.yarnpkg.com/@types/ember/-/ember-4.0.3.tgz#dde52a88e3b41eb73c80063ddfad35f751893e32"
@@ -1926,6 +1932,29 @@
19261932
resolved "https://registry.yarnpkg.com/@types/ember__template/-/ember__template-4.0.1.tgz#aba59c22fbd1fcfc731eaf97ee8ee784e8c5e9db"
19271933
integrity sha512-hAxzdJa0zNvZSoHoCbtd0KGt6Dls4Aph9EwdtbUcdnlMiSUtEDUdKTtDbUrysqJjxGBr4vWIdJEqWtZ0/Y8KBw==
19281934

1935+
"@types/ember__test-helpers@*":
1936+
version "2.8.2"
1937+
resolved "https://registry.yarnpkg.com/@types/ember__test-helpers/-/ember__test-helpers-2.8.2.tgz#59ca672c152ff9044b4f4b9eeb66fc847e0f853a"
1938+
integrity sha512-Ho3TTcnbjdQO9UvLwoswRMpCR2j7X6T8qSOaKehnST9s15ACb4MXHwec1NhmpCOhdvBRREYfG3YbduNeXoITMg==
1939+
dependencies:
1940+
"@types/ember-resolver" "*"
1941+
"@types/ember__application" "*"
1942+
"@types/ember__error" "*"
1943+
"@types/ember__owner" "*"
1944+
"@types/ember__test-helpers" "*"
1945+
"@types/htmlbars-inline-precompile" "*"
1946+
1947+
"@types/ember__test-helpers@~2.6.0":
1948+
version "2.6.1"
1949+
resolved "https://registry.yarnpkg.com/@types/ember__test-helpers/-/ember__test-helpers-2.6.1.tgz#2835bc60fd7daa93292d669fa9b61706836fe2e7"
1950+
integrity sha512-d2RShuBSaBzp04nt8ad+mNE1F6rbIcIIud8WFUVQqGSUGHuZQUq1051Jza12ksCUnXduyE/J9UDjyZvNKOHeBQ==
1951+
dependencies:
1952+
"@types/ember-resolver" "*"
1953+
"@types/ember__application" "*"
1954+
"@types/ember__error" "*"
1955+
"@types/ember__test-helpers" "*"
1956+
"@types/htmlbars-inline-precompile" "*"
1957+
19291958
"@types/ember__test@*", "@types/ember__test@^4.0.0":
19301959
version "4.0.1"
19311960
resolved "https://registry.yarnpkg.com/@types/ember__test/-/ember__test-4.0.1.tgz#9ef25c8ebda6921daa3a16b7265be025eadfaa7b"

0 commit comments

Comments
 (0)