Skip to content

Commit 5cbb557

Browse files
sdo-1Acpaulve-1A
sdo-1A
authored and
cpaulve-1A
committed
feat: migrate Jest from v29 to v30
1 parent 08c1e0c commit 5cbb557

File tree

86 files changed

+1719
-1655
lines changed

Some content is hidden

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

86 files changed

+1719
-1655
lines changed

‎.yarnrc.yml‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,10 @@ packageExtensions:
3131
"ioredis": ^5.3.2
3232

3333
yarnPath: .yarn/releases/yarn-4.10.3.cjs
34+
35+
logFilters:
36+
# Filter of logs for jest and jest-environment-jsdom which don't satisfy what @angular-devkit/build-angular requests
37+
# TODO: remove this filter once @angular-devkit/build-angular updates to jest v30
38+
# see https://github.com/angular/angular-cli/issues/30760
39+
- pattern: (jest|jest-environment-jsdom) is listed by your project with version 30*, which doesn't satisfy what @angular-devkit/build-angular *
40+
level: discard

‎apps/chrome-devtools/package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
"@schematics/angular": "~20.3.0",
4949
"@stylistic/eslint-plugin": "~5.5.0",
5050
"@types/chrome": "^0.1.0",
51-
"@types/jest": "~29.5.2",
51+
"@types/jest": "~30.0.0",
5252
"@types/tinycolor2": "^1.4.6",
5353
"@typescript-eslint/parser": "~8.46.0",
5454
"angular-eslint": "~20.5.0",
@@ -69,11 +69,12 @@
6969
"eslint-plugin-unused-imports": "~4.3.0",
7070
"globals": "^16.0.0",
7171
"globby": "^11.1.0",
72-
"jest": "~29.7.0",
73-
"jest-environment-jsdom": "~29.7.0",
72+
"jest": "~30.0.0",
73+
"jest-environment-jsdom": "~30.0.0",
7474
"jest-junit": "~16.0.0",
75-
"jest-preset-angular": "~14.6.0",
76-
"jest-util": "~29.7.0",
75+
"jest-preset-angular": "~15.0.0",
76+
"jest-util": "~30.0.0",
77+
"jsdom": "^26.1.0",
7778
"jsonc-eslint-parser": "~2.4.0",
7879
"lighthouse": "~12.8.0",
7980
"minimist": "^1.2.6",

‎apps/github-cascading-app/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
"@stylistic/eslint-plugin": "~5.5.0",
4343
"@types/ejs": "^3.1.2",
4444
"@types/express-serve-static-core": "^5.0.0",
45-
"@types/jest": "~29.5.2",
45+
"@types/jest": "~30.0.0",
4646
"@types/node": "~22.18.0",
4747
"@types/semver": "^7.3.13",
4848
"@typescript-eslint/parser": "~8.46.0",
@@ -61,10 +61,10 @@
6161
"eslint-plugin-unused-imports": "~4.3.0",
6262
"globals": "^16.0.0",
6363
"ioredis": "^5.3.2",
64-
"jest": "~29.7.0",
65-
"jest-environment-jsdom": "~29.7.0",
64+
"jest": "~30.0.0",
65+
"jest-environment-jsdom": "~30.0.0",
6666
"jest-junit": "~16.0.0",
67-
"jest-util": "~29.7.0",
67+
"jest-util": "~30.0.0",
6868
"jsonc-eslint-parser": "~2.4.0",
6969
"nock": "^14.0.0",
7070
"nx": "~21.6.0",

‎apps/palette-generator/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828
"@o3r/test-helpers": "workspace:~",
2929
"@schematics/angular": "~20.3.0",
3030
"@stylistic/eslint-plugin": "~5.5.0",
31-
"@types/jest": "~29.5.2",
31+
"@types/jest": "~30.0.0",
3232
"@types/node": "~22.18.0",
3333
"@typescript-eslint/parser": "~8.46.0",
3434
"angular-eslint": "~20.5.0",
@@ -47,10 +47,10 @@
4747
"globals": "^16.0.0",
4848
"html-inline-script-webpack-plugin": "^3.1.0",
4949
"html-webpack-plugin": "^5.3.2",
50-
"jest": "~29.7.0",
51-
"jest-environment-jsdom": "~29.7.0",
50+
"jest": "~30.0.0",
51+
"jest-environment-jsdom": "~30.0.0",
5252
"jest-junit": "~16.0.0",
53-
"jest-util": "~29.7.0",
53+
"jest-util": "~30.0.0",
5454
"jsonc-eslint-parser": "~2.4.0",
5555
"style-loader": "^4.0.0",
5656
"ts-jest": "~29.4.0",

‎apps/showcase/package.json‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,9 @@
8585
"globals": "^16.0.0",
8686
"globby": "^11.1.0",
8787
"intl-messageformat": "~10.7.0",
88-
"jest-preset-angular": "~14.6.0",
88+
"jest-preset-angular": "~15.0.0",
89+
"jest-util": "~30.0.0",
90+
"jsdom": "^26.1.0",
8991
"marked": "^15.0.0",
9092
"monaco-editor": "~0.54.0",
9193
"ngx-markdown": "^20.0.0",
@@ -124,7 +126,7 @@
124126
"@schematics/angular": "~20.3.0",
125127
"@stylistic/eslint-plugin": "~5.5.0",
126128
"@types/bootstrap": "^5.2.10",
127-
"@types/jest": "~29.5.2",
129+
"@types/jest": "~30.0.0",
128130
"@types/node": "~22.18.0",
129131
"@typescript-eslint/parser": "~8.46.0",
130132
"@webcontainer/api": "~1.6.0",
@@ -142,11 +144,12 @@
142144
"eslint-plugin-unused-imports": "~4.3.0",
143145
"globals": "^16.0.0",
144146
"globby": "^11.1.0",
145-
"jest": "~29.7.0",
146-
"jest-environment-jsdom": "~29.7.0",
147+
"jest": "~30.0.0",
148+
"jest-environment-jsdom": "~30.0.0",
147149
"jest-junit": "~16.0.0",
148-
"jest-preset-angular": "~14.6.0",
149-
"jest-util": "~29.7.0",
150+
"jest-preset-angular": "~15.0.0",
151+
"jest-util": "~30.0.0",
152+
"jsdom": "^26.1.0",
150153
"jsonc-eslint-parser": "~2.4.0",
151154
"lighthouse": "~12.8.0",
152155
"minimist": "^1.2.6",

‎apps/vscode-extension/package.json‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -433,7 +433,7 @@
433433
"@schematics/angular": "~20.3.0",
434434
"@stylistic/eslint-plugin": "~5.5.0",
435435
"@types/eslint": "~9.6.0",
436-
"@types/jest": "~29.5.2",
436+
"@types/jest": "~30.0.0",
437437
"@types/node": "~22.18.0",
438438
"@types/vscode": "~1.105.0",
439439
"@typescript-eslint/parser": "~8.46.0",
@@ -452,10 +452,10 @@
452452
"eslint-plugin-unicorn": "~60.0.0",
453453
"eslint-plugin-unused-imports": "~4.3.0",
454454
"globals": "^16.0.0",
455-
"jest": "~29.7.0",
456-
"jest-environment-jsdom": "~29.7.0",
455+
"jest": "~30.0.0",
456+
"jest-environment-jsdom": "~30.0.0",
457457
"jest-junit": "~16.0.0",
458-
"jest-util": "~29.7.0",
458+
"jest-util": "~30.0.0",
459459
"jiti": "^2.4.0",
460460
"jsonc-eslint-parser": "~2.4.0",
461461
"nx": "~21.6.0",

‎nx.json‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -191,6 +191,10 @@
191191
"source",
192192
"specs"
193193
],
194+
"dependsOn": [{
195+
"projects": ["test-helpers"],
196+
"target": "build"
197+
}],
194198
"outputs": [
195199
"{projectRoot}/dist-test/junit.xml",
196200
"{projectRoot}/coverage/cobertura-coverage.xml"
@@ -212,6 +216,10 @@
212216
},
213217
"test-int": {
214218
"executor": "@nx/jest:jest",
219+
"dependsOn": [{
220+
"projects": ["test-helpers"],
221+
"target": "build"
222+
}],
215223
"inputs": [
216224
{
217225
"env": "RUNNER_OS"

‎package.json‎

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -129,6 +129,7 @@
129129
"resolutions": {
130130
"@sinonjs/fake-timers": "^14.0.0",
131131
"@types/node": "~22.18.0",
132+
"jest": "~30.0.0",
132133
"form-data": "^4.0.4",
133134
"koa": "~3.1.0",
134135
"rxjs": "^7.8.1",
@@ -206,7 +207,7 @@
206207
"@types/css-tree": "~2.3.0",
207208
"@types/eslint": "~9.6.0",
208209
"@types/estree": "^1.0.5",
209-
"@types/jest": "~29.5.2",
210+
"@types/jest": "~30.0.0",
210211
"@types/node": "~22.18.0",
211212
"@types/semver": "^7.3.13",
212213
"@typescript-eslint/parser": "~8.46.0",
@@ -244,11 +245,12 @@
244245
"husky": "~9.1.0",
245246
"intl-messageformat": "~10.7.0",
246247
"isomorphic-fetch": "~3.0.0",
247-
"jest": "~29.7.0",
248-
"jest-environment-jsdom": "~29.7.0",
249-
"jest-preset-angular": "~14.6.0",
250-
"jest-util": "~29.7.0",
248+
"jest": "~30.0.0",
249+
"jest-environment-jsdom": "~30.0.0",
250+
"jest-preset-angular": "~15.0.0",
251+
"jest-util": "~30.0.0",
251252
"js-yaml": "^4.1.0",
253+
"jsdom": "^26.1.0",
252254
"jsonc-eslint-parser": "~2.4.0",
253255
"jsonpath-plus": "~10.3.0",
254256
"lighthouse": "~12.8.0",

‎packages/@ama-mcp/angular/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@
5656
"@o3r/eslint-plugin": "workspace:^",
5757
"@o3r/test-helpers": "workspace:^",
5858
"@stylistic/eslint-plugin": "~5.5.0",
59-
"@types/jest": "~29.5.2",
59+
"@types/jest": "~30.0.0",
6060
"@types/node": "~22.18.0",
6161
"@typescript-eslint/parser": "~8.46.0",
6262
"angular-eslint": "~20.5.0",
@@ -72,11 +72,11 @@
7272
"eslint-plugin-unicorn": "~60.0.0",
7373
"eslint-plugin-unused-imports": "~4.3.0",
7474
"globals": "^16.0.0",
75-
"jest": "~29.7.0",
76-
"jest-environment-jsdom": "~29.7.0",
75+
"jest": "~30.0.0",
76+
"jest-environment-jsdom": "~30.0.0",
7777
"jest-junit": "~16.0.0",
78-
"jest-preset-angular": "~14.6.0",
79-
"jest-util": "~29.7.0",
78+
"jest-preset-angular": "~15.0.0",
79+
"jest-util": "~30.0.0",
8080
"jsonc-eslint-parser": "~2.4.0",
8181
"nx": "~21.6.0",
8282
"rxjs": "^7.8.1",

‎packages/@ama-mcp/core/package.json‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@o3r/eslint-plugin": "workspace:^",
5353
"@o3r/test-helpers": "workspace:^",
5454
"@stylistic/eslint-plugin": "~5.5.0",
55-
"@types/jest": "~29.5.2",
55+
"@types/jest": "~30.0.0",
5656
"@types/node": "~22.18.0",
5757
"@typescript-eslint/parser": "~8.46.0",
5858
"angular-eslint": "~20.5.0",
@@ -68,11 +68,11 @@
6868
"eslint-plugin-unicorn": "~60.0.0",
6969
"eslint-plugin-unused-imports": "~4.3.0",
7070
"globals": "^16.0.0",
71-
"jest": "~29.7.0",
72-
"jest-environment-jsdom": "~29.7.0",
71+
"jest": "~30.0.0",
72+
"jest-environment-jsdom": "~30.0.0",
7373
"jest-junit": "~16.0.0",
74-
"jest-preset-angular": "~14.6.0",
75-
"jest-util": "~29.7.0",
74+
"jest-preset-angular": "~15.0.0",
75+
"jest-util": "~30.0.0",
7676
"jsonc-eslint-parser": "~2.4.0",
7777
"nx": "~21.6.0",
7878
"rxjs": "^7.8.1",

0 commit comments

Comments
 (0)