Skip to content

Commit 5ca1576

Browse files
mkszepprunspired
mkszepp
and
runspired
authored
Allow @ember/test-helpers v4 as peerDependency (#9525)
* chore: bump test-helpers to v4 Co-Authored-By: Markus Sanin <markus.sanin@zeppelin-group.com> * restore patch for 3.28 scenario * bump all the embroider deps --------- Co-authored-by: Chris Thoburn <runspired@users.noreply.github.com>
1 parent a8404d0 commit 5ca1576

File tree

45 files changed

+1092
-409
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+1092
-409
lines changed

‎package.json

+9-8
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,22 @@
3333
},
3434
"devDependencies": {
3535
"@babel/core": "^7.24.5",
36+
"@ember/test-helpers": "3.3.0",
37+
"@glimmer/component": "^1.1.2",
3638
"@glint/core": "^1.4.0",
3739
"@glint/environment-ember-loose": "^1.4.0",
3840
"@glint/environment-ember-template-imports": "^1.4.0",
3941
"@glint/template": "^1.4.0",
40-
"@glimmer/component": "^1.1.2",
4142
"@types/semver": "^7.5.8",
4243
"bun-types": "^1.1.30",
4344
"chalk": "^4.1.2",
4445
"co": "^4.6.0",
4546
"command-line-args": "^5.2.1",
47+
"comment-json": "^4.2.3",
4648
"common-tags": "^1.8.2",
4749
"debug": "^4.3.4",
50+
"ember-source": "~5.8.0",
4851
"execa": "^9.1.0",
49-
"comment-json": "^4.2.3",
5052
"git-repo-version": "^1.0.2",
5153
"globby": "^14.0.1",
5254
"lerna-changelog": "^2.2.0",
@@ -109,8 +111,7 @@
109111
"peerDependencies": {
110112
"ember-cli": "*",
111113
"ember-cli-fastboot": "*",
112-
"ember-source": "*",
113-
"@ember/test-helpers": "*"
114+
"ember-source": "*"
114115
}
115116
},
116117
"ember-auto-import": {
@@ -130,13 +131,12 @@
130131
}
131132
},
132133
"overrides": {
133-
"ember-auto-import": "^2.7.4",
134-
"@embroider/macros": "^1.16.1",
134+
"ember-auto-import": "^2.8.1",
135+
"@embroider/macros": "^1.16.6",
135136
"broccoli-funnel": "^3.0.8",
136137
"broccoli-merge-trees": "^4.2.0",
137138
"@glimmer/validator": "^0.92.3",
138139
"@glint/template": "^1.4.0",
139-
"@ember/test-helpers": "3.3.0",
140140
"ember-cli-babel": "^8.2.0",
141141
"ember-cli-htmlbars": "^6.3.0",
142142
"ember-cli-typescript": "^5.3.0",
@@ -157,7 +157,8 @@
157157
"patchedDependencies": {
158158
"qunit@2.19.4": "patches/qunit@2.19.4.patch",
159159
"testem@3.11.0": "patches/testem@3.11.0.patch",
160-
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch"
160+
"@ember/test-helpers@3.3.0": "patches/@ember__test-helpers@3.3.0.patch",
161+
"@ember/test-helpers@4.0.4": "patches/@ember__test-helpers@4.0.4.patch"
161162
}
162163
}
163164
}

‎packages/-ember-data/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -120,12 +120,12 @@
120120
"@ember-data/store": "workspace:5.4.0-alpha.112",
121121
"@ember-data/tracking": "workspace:5.4.0-alpha.112",
122122
"@ember/edition-utils": "^1.2.0",
123-
"@embroider/macros": "^1.16.1",
123+
"@embroider/macros": "^1.16.6",
124124
"@warp-drive/core-types": "workspace:0.0.0-alpha.98",
125125
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
126126
},
127127
"peerDependencies": {
128-
"@ember/test-helpers": "^3.3.0",
128+
"@ember/test-helpers": "^3.3.0 || ^4.0.4",
129129
"@ember/test-waiters": "^3.1.0",
130130
"qunit": "^2.18.0"
131131
},
@@ -149,7 +149,7 @@
149149
"@glimmer/component": "^1.1.2",
150150
"@glimmer/tracking": "^1.1.2",
151151
"@types/qunit": "^2.19.10",
152-
"@ember/test-helpers": "^3.3.0",
152+
"@ember/test-helpers": "4.0.4",
153153
"@warp-drive/internal-config": "workspace:5.4.0-alpha.112",
154154
"ember-source": "~5.12.0",
155155
"eslint": "^9.12.0",

‎packages/-warp-drive/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@
5050
}
5151
},
5252
"dependencies": {
53-
"@embroider/macros": "^1.16.1",
53+
"@embroider/macros": "^1.16.6",
5454
"@manypkg/get-packages": "^2.2.1",
5555
"@warp-drive/build-config": "workspace:0.0.0-alpha.49",
5656
"semver": "^7.6.2",

‎packages/active-record/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
"version": 2
4646
},
4747
"dependencies": {
48-
"@embroider/macros": "^1.16.1",
48+
"@embroider/macros": "^1.16.6",
4949
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
5050
},
5151
"peerDependencies": {

‎packages/adapter/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@
8383
}
8484
},
8585
"dependencies": {
86-
"@embroider/macros": "^1.16.1",
86+
"@embroider/macros": "^1.16.6",
8787
"ember-cli-test-info": "^1.0.0",
8888
"ember-cli-string-utils": "^1.1.0",
8989
"ember-cli-path-utils": "^1.0.0",

‎packages/build-config/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
}
4242
},
4343
"dependencies": {
44-
"@embroider/macros": "^1.16.1",
44+
"@embroider/macros": "^1.16.6",
4545
"@embroider/addon-shim": "^1.8.9",
4646
"babel-import-util": "^2.1.1",
4747
"broccoli-funnel": "^3.0.8",

‎packages/core-types/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
}
3939
},
4040
"dependencies": {
41-
"@embroider/macros": "^1.16.1",
41+
"@embroider/macros": "^1.16.6",
4242
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
4343
},
4444
"devDependencies": {

‎packages/debug/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
},
7474
"dependencies": {
7575
"@ember/edition-utils": "^1.2.0",
76-
"@embroider/macros": "^1.16.1",
76+
"@embroider/macros": "^1.16.6",
7777
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
7878
},
7979
"devDependencies": {

‎packages/diagnostic/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ module('My Module', function(hooks) {
452452
1. Add the following peer-deps to your app:
453453

454454
```diff
455-
+ "@ember/test-helpers": ">= 3.3.0",
455+
+ "@ember/test-helpers": "^3.3.0 || ^4.0.4",
456456
+ "ember-cli-test-loader": ">= 3.1.0",
457457
+ "@embroider/addon-shim": ">= 1.8.6"
458458
```

‎packages/diagnostic/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@
7373
"sync-hardlinks": "bun run sync-dependencies-meta-injected"
7474
},
7575
"peerDependencies": {
76-
"@ember/test-helpers": "^3.3.0",
76+
"@ember/test-helpers": "4.0.4",
7777
"ember-cli-test-loader": ">= 3.1.0"
7878
},
7979
"peerDependenciesMeta": {
@@ -99,7 +99,7 @@
9999
"@babel/runtime": "^7.24.5",
100100
"@warp-drive/internal-config": "workspace:5.4.0-alpha.112",
101101
"bun-types": "^1.1.30",
102-
"@ember/test-helpers": "^3.3.0",
102+
"@ember/test-helpers": "4.0.4",
103103
"ember-source": "~5.12.0",
104104
"@glimmer/component": "^1.1.2",
105105
"ember-cli-test-loader": "^3.1.0",

‎packages/ember/package.json

+4-4
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@
4545
"@ember-data/request": "^4.12.7 || > 5.3.3",
4646
"@ember-data/request-utils": "^4.12.7 || > 5.3.3",
4747
"@warp-drive/core-types": "workspace:0.0.0-alpha.98",
48-
"ember-provide-consume-context": "^0.3.2",
48+
"ember-provide-consume-context": "^0.4.0",
4949
"@ember-data/tracking": "^4.12.7 || > 5.3.3"
5050
},
5151
"dependencies": {
5252
"@ember/test-waiters": "^3.1.0",
53-
"@embroider/macros": "^1.16.1",
53+
"@embroider/macros": "^1.16.6",
5454
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
5555
},
5656
"dependenciesMeta": {
@@ -97,7 +97,7 @@
9797
"@ember-data/request-utils": "workspace:5.4.0-alpha.112",
9898
"@ember-data/store": "workspace:5.4.0-alpha.112",
9999
"@ember-data/tracking": "workspace:5.4.0-alpha.112",
100-
"@ember/test-helpers": "^3.3.0",
100+
"@ember/test-helpers": "4.0.4",
101101
"@warp-drive/core-types": "workspace:0.0.0-alpha.98",
102102
"@warp-drive/internal-config": "workspace:5.4.0-alpha.112",
103103
"babel-plugin-ember-template-compilation": "^2.2.5",
@@ -107,7 +107,7 @@
107107
"rollup": "^4.17.2",
108108
"typescript": "^5.4.5",
109109
"vite": "^5.2.11",
110-
"ember-provide-consume-context": "^0.3.2"
110+
"ember-provide-consume-context": "^0.4.0"
111111
},
112112
"engines": {
113113
"node": ">= 18.20.4"

‎packages/experiments/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
},
6767
"dependencies": {
68-
"@embroider/macros": "^1.16.1",
68+
"@embroider/macros": "^1.16.6",
6969
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
7070
},
7171
"devDependencies": {

‎packages/graph/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -62,7 +62,7 @@
6262
"@warp-drive/core-types": "workspace:0.0.0-alpha.98"
6363
},
6464
"dependencies": {
65-
"@embroider/macros": "^1.16.1",
65+
"@embroider/macros": "^1.16.6",
6666
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
6767
},
6868
"devDependencies": {

‎packages/json-api/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
"@warp-drive/core-types": "workspace:0.0.0-alpha.98"
7373
},
7474
"dependencies": {
75-
"@embroider/macros": "^1.16.1",
75+
"@embroider/macros": "^1.16.6",
7676
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
7777
},
7878
"devDependencies": {

‎packages/legacy-compat/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@
8585
}
8686
},
8787
"dependencies": {
88-
"@embroider/macros": "^1.16.1",
88+
"@embroider/macros": "^1.16.6",
8989
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
9090
},
9191
"peerDependencies": {

‎packages/model/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@
9595
},
9696
"dependencies": {
9797
"@ember/edition-utils": "^1.2.0",
98-
"@embroider/macros": "^1.16.1",
98+
"@embroider/macros": "^1.16.6",
9999
"ember-cli-string-utils": "^1.1.0",
100100
"ember-cli-test-info": "^1.0.0",
101101
"inflection": "~3.0.0",

‎packages/request-utils/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@
6565
}
6666
},
6767
"dependencies": {
68-
"@embroider/macros": "^1.16.1",
68+
"@embroider/macros": "^1.16.6",
6969
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
7070
},
7171
"devDependencies": {

‎packages/request/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
},
4545
"dependencies": {
4646
"@ember/test-waiters": "^3.1.0",
47-
"@embroider/macros": "^1.16.1",
47+
"@embroider/macros": "^1.16.6",
4848
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
4949
},
5050
"devDependencies": {

‎packages/rest/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
"extends": "../../package.json"
2323
},
2424
"dependencies": {
25-
"@embroider/macros": "^1.16.1",
25+
"@embroider/macros": "^1.16.6",
2626
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
2727
},
2828
"peerDependencies": {

‎packages/schema-record/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
},
7979
"dependencies": {
80-
"@embroider/macros": "^1.16.1",
80+
"@embroider/macros": "^1.16.6",
8181
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
8282
},
8383
"devDependencies": {

‎packages/serializer/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@
7777
}
7878
},
7979
"dependencies": {
80-
"@embroider/macros": "^1.16.1",
80+
"@embroider/macros": "^1.16.6",
8181
"ember-cli-test-info": "^1.0.0",
8282
"ember-cli-string-utils": "^1.1.0",
8383
"ember-cli-path-utils": "^1.0.0",

‎packages/store/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
}
5656
},
5757
"dependencies": {
58-
"@embroider/macros": "^1.16.1",
58+
"@embroider/macros": "^1.16.6",
5959
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
6060
},
6161
"peerDependencies": {

‎packages/tracking/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
}
3131
},
3232
"dependencies": {
33-
"@embroider/macros": "^1.16.1",
33+
"@embroider/macros": "^1.16.6",
3434
"@warp-drive/build-config": "workspace:0.0.0-alpha.49"
3535
},
3636
"peerDependencies": {

‎packages/unpublished-test-infra/package.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"@ember-data/tracking": "workspace:5.4.0-alpha.112",
7676
"@warp-drive/diagnostic": "workspace:0.0.0-alpha.98",
7777
"@warp-drive/core-types": "workspace:0.0.0-alpha.98",
78-
"@ember/test-helpers": "^3.3.0"
78+
"@ember/test-helpers": "3.3.0 || ^4.0.4"
7979
},
8080
"peerDependenciesMeta": {
8181
"qunit": {
@@ -89,7 +89,7 @@
8989
}
9090
},
9191
"dependencies": {
92-
"@embroider/macros": "^1.16.1",
92+
"@embroider/macros": "^1.16.6",
9393
"chalk": "^4.1.2",
9494
"qunit": "^2.20.1",
9595
"semver": "^7.6.2",
@@ -100,7 +100,7 @@
100100
"@babel/plugin-transform-typescript": "^7.24.5",
101101
"@babel/preset-env": "^7.24.5",
102102
"@babel/preset-typescript": "^7.24.1",
103-
"@ember/test-helpers": "^3.3.0",
103+
"@ember/test-helpers": "4.0.4",
104104
"@glimmer/component": "^1.1.2",
105105
"@types/semver": "^7.5.8",
106106
"@types/qunit": "^2.19.10",

0 commit comments

Comments
 (0)