Skip to content

Commit 7cc8991

Browse files
authored
Merge pull request #1106 from elwayman02/dependabot/npm_and_yarn/ember/test-helpers-4.0.2
2 parents b29e552 + 47ece62 commit 7cc8991

File tree

4 files changed

+30
-28
lines changed

4 files changed

+30
-28
lines changed

.github/workflows/ci.yml

+1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ jobs:
5656
- ember-lts-4.8
5757
- ember-lts-4.12
5858
- ember-lts-5.4
59+
- ember-test-helpers-v3
5960
- ember-release
6061
- embroider-safe
6162
experimental: [false]

package.json

+10-4
Original file line numberDiff line numberDiff line change
@@ -37,13 +37,22 @@
3737
"ember-modifier": "^3.0.0 || ^4.0.0",
3838
"intersection-observer-admin": "^0.3.4"
3939
},
40+
"peerDependencies": {
41+
"@ember/test-helpers": ">=3.0.0",
42+
"ember-source": "^4.0.0 || ^5.0.0"
43+
},
44+
"peerDependenciesMeta": {
45+
"@ember/test-helpers": {
46+
"optional": true
47+
}
48+
},
4049
"devDependencies": {
4150
"@babel/eslint-parser": "^7.25.1",
4251
"@babel/plugin-proposal-decorators": "^7.24.7",
4352
"@babel/plugin-transform-class-static-block": "^7.24.7",
4453
"@ember/optional-features": "^2.1.0",
4554
"@ember/string": "^3.0.1",
46-
"@ember/test-helpers": "^3.3.1",
55+
"@ember/test-helpers": "^4.0.2",
4756
"@embroider/test-setup": "^4.0.0",
4857
"@glimmer/component": "^1.1.2",
4958
"@glimmer/tracking": "^1.1.2",
@@ -93,9 +102,6 @@
93102
"fastbootDependencies": [
94103
"crypto"
95104
],
96-
"peerDependencies": {
97-
"ember-source": "^4.0.0 || ^5.0.0"
98-
},
99105
"engines": {
100106
"node": "16.* || >= 18"
101107
},

tests/dummy/config/ember-try.js

+8
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,14 @@ module.exports = async function () {
3939
},
4040
},
4141
},
42+
{
43+
name: 'ember-test-helpers-v3',
44+
npm: {
45+
devDependencies: {
46+
'@ember/test-helpers': '^3.3.1',
47+
},
48+
},
49+
},
4250
{
4351
name: 'ember-release',
4452
npm: {

yarn.lock

+11-24
Original file line numberDiff line numberDiff line change
@@ -2199,30 +2199,17 @@
21992199
dependencies:
22002200
ember-cli-babel "^7.26.6"
22012201

2202-
"@ember/test-helpers@^3.3.1":
2203-
version "3.3.1"
2204-
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-3.3.1.tgz#b19287dbb7ba169a2033574bb5021c0490b199b9"
2205-
integrity sha512-h4uFBy4pquBtHsHI+tx9S0wtMmn1L+8dkXiDiyoqG1+3e0Awk6GBujiFM9s4ANq6wC8uIhC3wEFyts10h2OAoQ==
2202+
"@ember/test-helpers@^4.0.2":
2203+
version "4.0.2"
2204+
resolved "https://registry.yarnpkg.com/@ember/test-helpers/-/test-helpers-4.0.2.tgz#728fab314280381b04f70a1fd1014f5db6c24aca"
2205+
integrity sha512-9vV5nDx1ZzmTmexzTudRk9M04JY6mqB3NxJB116vkjGQWIRTgiAVUgBkFIudRXvX1QiOGTo6IPxQRXZRS+v28w==
22062206
dependencies:
2207-
"@ember/test-waiters" "^3.0.2"
2208-
"@embroider/macros" "^1.10.0"
2207+
"@ember/test-waiters" "^3.1.0"
2208+
"@embroider/addon-shim" "^1.8.7"
2209+
"@embroider/macros" "^1.16.5"
22092210
"@simple-dom/interface" "^1.4.0"
2210-
broccoli-debug "^0.6.5"
2211-
broccoli-funnel "^3.0.8"
2211+
decorator-transforms "^2.0.0"
22122212
dom-element-descriptors "^0.5.0"
2213-
ember-auto-import "^2.6.0"
2214-
ember-cli-babel "^8.2.0"
2215-
ember-cli-htmlbars "^6.2.0"
2216-
2217-
"@ember/test-waiters@^3.0.2":
2218-
version "3.0.2"
2219-
resolved "https://registry.yarnpkg.com/@ember/test-waiters/-/test-waiters-3.0.2.tgz#5b950c580a1891ed1d4ee64f9c6bacf49a15ea6f"
2220-
integrity sha512-H8Q3Xy9rlqhDKnQpwt2pzAYDouww4TZIGSI1pZJhM7mQIGufQKuB0ijzn/yugA6Z+bNdjYp1HioP8Y4hn2zazQ==
2221-
dependencies:
2222-
calculate-cache-key-for-tree "^2.0.0"
2223-
ember-cli-babel "^7.26.6"
2224-
ember-cli-version-checker "^5.1.2"
2225-
semver "^7.3.5"
22262213

22272214
"@ember/test-waiters@^3.1.0":
22282215
version "3.1.0"
@@ -2257,7 +2244,7 @@
22572244
resolve "^1.20.0"
22582245
semver "^7.3.2"
22592246

2260-
"@embroider/macros@^1.0.0", "@embroider/macros@^1.10.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.16.1":
2247+
"@embroider/macros@^1.0.0", "@embroider/macros@^1.13.1", "@embroider/macros@^1.16.1", "@embroider/macros@^1.16.5":
22612248
version "1.16.5"
22622249
resolved "https://registry.yarnpkg.com/@embroider/macros/-/macros-1.16.5.tgz#871addab2103b554c6b6a3a337c00e3f0a0462ac"
22632250
integrity sha512-Oz8bUZvZzOV1Gk3qSgIzZJJzs6acclSTcEFyB+KdKbKqjTC3uebn53aU2gAlLU7/YdTRZrg2gNbQuwAp+tGkGg==
@@ -6945,7 +6932,7 @@ ember-auto-import@^1.10.1, ember-auto-import@^1.11.3:
69456932
walk-sync "^0.3.3"
69466933
webpack "^4.43.0"
69476934

6948-
"ember-auto-import@^1.11.3 || ^2.0.0", ember-auto-import@^2.6.0, ember-auto-import@^2.6.3:
6935+
"ember-auto-import@^1.11.3 || ^2.0.0", ember-auto-import@^2.6.3:
69496936
version "2.6.3"
69506937
resolved "https://registry.yarnpkg.com/ember-auto-import/-/ember-auto-import-2.6.3.tgz#f18d1b93dd10b08ba5496518436f9d56dd4e000a"
69516938
integrity sha512-uLhrRDJYWCRvQ4JQ1e64XlSrqAKSd6PXaJ9ZsZI6Tlms9T4DtQFxNXasqji2ZRJBVrxEoLCRYX3RTldsQ0vNGQ==
@@ -7186,7 +7173,7 @@ ember-cli-htmlbars@^5.3.1, ember-cli-htmlbars@^5.3.2, ember-cli-htmlbars@^5.7.1:
71867173
strip-bom "^4.0.0"
71877174
walk-sync "^2.2.0"
71887175

7189-
ember-cli-htmlbars@^6.2.0, ember-cli-htmlbars@^6.3.0:
7176+
ember-cli-htmlbars@^6.3.0:
71907177
version "6.3.0"
71917178
resolved "https://registry.yarnpkg.com/ember-cli-htmlbars/-/ember-cli-htmlbars-6.3.0.tgz#ac85f2bbd09788992ab7f9ca832cd044fb8e5798"
71927179
integrity sha512-N9Y80oZfcfWLsqickMfRd9YByVcTGyhYRnYQ2XVPVrp6jyUyOeRWmEAPh7ERSXpp8Ws4hr/JB9QVQrn/yZa+Ag==

0 commit comments

Comments
 (0)