Skip to content

Commit 1de0ae7

Browse files
sdo-1Afpaul-1A
sdo-1A
authored and
fpaul-1A
committed
feat: migrate Jest from v29 to v30
1 parent 8a5cfe0 commit 1de0ae7

File tree

80 files changed

+1320
-1342
lines changed

Some content is hidden

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

80 files changed

+1320
-1342
lines changed

‎.yarnrc.yml‎

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

2424
yarnPath: .yarn/releases/yarn-4.9.4.cjs
25+
26+
logFilters:
27+
# Filter of logs for jest and jest-environment-jsdom which don't satisfy what @angular-devkit/build-angular requests
28+
# TODO: remove this filter once @angular-devkit/build-angular updates to jest v30
29+
# see https://github.com/angular/angular-cli/issues/30760
30+
- pattern: (jest|jest-environment-jsdom) is listed by your project with version 30*, which doesn't satisfy what @angular-devkit/build-angular *
31+
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.2.0",
4949
"@stylistic/eslint-plugin": "~5.3.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.42.0",
5454
"angular-eslint": "~20.2.0",
@@ -69,11 +69,12 @@
6969
"eslint-plugin-unused-imports": "~4.2.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.3.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.0.0",
4747
"@types/semver": "^7.3.13",
4848
"@typescript-eslint/parser": "~8.42.0",
@@ -61,10 +61,10 @@
6161
"eslint-plugin-unused-imports": "~4.2.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.4.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.2.0",
3030
"@stylistic/eslint-plugin": "~5.3.0",
31-
"@types/jest": "~29.5.2",
31+
"@types/jest": "~30.0.0",
3232
"@types/node": "^22.0.0",
3333
"@typescript-eslint/parser": "~8.42.0",
3434
"angular-eslint": "~20.2.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.52.0",
9193
"ngx-markdown": "^20.0.0",
@@ -124,7 +126,7 @@
124126
"@schematics/angular": "~20.2.0",
125127
"@stylistic/eslint-plugin": "~5.3.0",
126128
"@types/bootstrap": "^5.2.10",
127-
"@types/jest": "~29.5.2",
129+
"@types/jest": "~30.0.0",
128130
"@types/node": "^22.0.0",
129131
"@typescript-eslint/parser": "~8.42.0",
130132
"@webcontainer/api": "~1.6.0",
@@ -142,11 +144,12 @@
142144
"eslint-plugin-unused-imports": "~4.2.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
@@ -396,7 +396,7 @@
396396
"@schematics/angular": "~20.2.0",
397397
"@stylistic/eslint-plugin": "~5.3.0",
398398
"@types/eslint": "~9.6.0",
399-
"@types/jest": "~29.5.2",
399+
"@types/jest": "~30.0.0",
400400
"@types/node": "^22.0.0",
401401
"@types/vscode": "~1.103.0",
402402
"@typescript-eslint/parser": "~8.42.0",
@@ -415,10 +415,10 @@
415415
"eslint-plugin-unicorn": "~60.0.0",
416416
"eslint-plugin-unused-imports": "~4.2.0",
417417
"globals": "^16.0.0",
418-
"jest": "~29.7.0",
419-
"jest-environment-jsdom": "~29.7.0",
418+
"jest": "~30.0.0",
419+
"jest-environment-jsdom": "~30.0.0",
420420
"jest-junit": "~16.0.0",
421-
"jest-util": "~29.7.0",
421+
"jest-util": "~30.0.0",
422422
"jiti": "^2.4.0",
423423
"jsonc-eslint-parser": "~2.4.0",
424424
"nx": "~21.4.0",

‎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.0.0",
132+
"jest": "~30.0.0",
132133
"form-data": "^4.0.4",
133134
"koa": "~3.0.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.0.0",
211212
"@types/semver": "^7.3.13",
212213
"@typescript-eslint/parser": "~8.42.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-mfe/messages/package.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@
5252
"@stylistic/eslint-plugin": "~5.3.0",
5353
"@swc/cli": "~0.7.7",
5454
"@swc/core": "~1.13.0",
55-
"@types/jest": "~29.5.2",
55+
"@types/jest": "~30.0.0",
5656
"@types/node": "^22.0.0",
5757
"@typescript-eslint/parser": "~8.42.0",
5858
"cpy-cli": "^6.0.0",
@@ -66,9 +66,9 @@
6666
"eslint-plugin-prefer-arrow": "~1.2.3",
6767
"eslint-plugin-unicorn": "~60.0.0",
6868
"eslint-plugin-unused-imports": "~4.2.0",
69-
"jest": "~29.7.0",
69+
"jest": "~30.0.0",
7070
"jest-junit": "~16.0.0",
71-
"jest-util": "~29.7.0",
71+
"jest-util": "~30.0.0",
7272
"jsonc-eslint-parser": "~2.4.0",
7373
"minimist": "^1.2.6",
7474
"pid-from-port": "^1.1.3",

‎packages/@ama-mfe/ng-utils/package.json‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -51,12 +51,13 @@
5151
"@angular/platform-browser-dynamic": "~20.2.0",
5252
"@angular/router": "~20.2.0",
5353
"@compodoc/compodoc": "^1.1.19",
54+
"@jest/environment-jsdom-abstract": "~30.0.0",
5455
"@o3r/build-helpers": "workspace:^",
5556
"@o3r/eslint-config": "workspace:^",
5657
"@o3r/eslint-plugin": "workspace:^",
5758
"@o3r/test-helpers": "workspace:^",
5859
"@schematics/angular": "~20.2.0",
59-
"@types/jest": "~29.5.2",
60+
"@types/jest": "~30.0.0",
6061
"@types/jsdom": "^21.1.7",
6162
"@types/node": "^22.0.0",
6263
"cpy-cli": "^6.0.0",
@@ -72,11 +73,11 @@
7273
"eslint-plugin-unused-imports": "~4.2.0",
7374
"globals": "^16.0.0",
7475
"globby": "^11.1.0",
75-
"jest": "~29.7.0",
76-
"jest-environment-jsdom": "~29.7.0",
76+
"jest": "~30.0.0",
77+
"jest-environment-jsdom": "~30.0.0",
7778
"jest-junit": "~16.0.0",
78-
"jest-preset-angular": "~14.6.0",
79-
"jest-util": "~29.7.0",
79+
"jest-preset-angular": "~15.0.0",
80+
"jest-util": "~30.0.0",
8081
"jsdom": "^26.1.0",
8182
"jsonc-eslint-parser": "~2.4.0",
8283
"rxjs": "^7.8.1",

‎packages/@ama-mfe/ng-utils/src/host-info/host-info.spec.ts‎

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,13 @@ describe('HostInfo', () => {
1212
hostApplicationId: 'expected-application-id',
1313
moduleApplicationId: 'expected-module-application-id'
1414
} as const satisfies MFEHostInformation;
15+
let mockLocation: any;
1516

1617
beforeEach(() => {
17-
Object.defineProperty(globalThis, 'location', { value: {
18+
mockLocation = {
1819
search: '',
1920
ancestorOrigins: ['unexpected-url']
20-
}, writable: true });
21+
};
2122
Object.defineProperty(globalThis.document, 'referrer', { value: 'unexpected-url', writable: true });
2223
});
2324
afterEach(() => {
@@ -26,12 +27,12 @@ describe('HostInfo', () => {
2627

2728
describe('getHostInfo', () => {
2829
it('should get host info from search parameters', () => {
29-
globalThis.location.search = new URLSearchParams({
30+
mockLocation.search = new URLSearchParams({
3031
[MFE_HOST_APPLICATION_ID_PARAM]: expectedHostInfo.hostApplicationId,
3132
[MFE_HOST_URL_PARAM]: expectedHostInfo.hostURL,
3233
[MFE_MODULE_APPLICATION_ID_PARAM]: expectedHostInfo.moduleApplicationId
3334
}).toString();
34-
const hostInfo = getHostInfo();
35+
const hostInfo = getHostInfo(mockLocation);
3536
expect(hostInfo.hostApplicationId).toBe(expectedHostInfo.hostApplicationId);
3637
expect(hostInfo.moduleApplicationId).toBe(expectedHostInfo.moduleApplicationId);
3738
expect(hostInfo.hostURL).toBe(expectedHostInfo.hostURL);
@@ -47,21 +48,21 @@ describe('HostInfo', () => {
4748
});
4849

4950
it('should get host url from location ancestorOrigins', () => {
50-
Object.defineProperty(globalThis, 'location', { value: {
51+
mockLocation = {
5152
search: '',
5253
ancestorOrigins: [expectedHostInfo.hostURL]
53-
} });
54-
const hostInfo = getHostInfo();
54+
};
55+
const hostInfo = getHostInfo(mockLocation);
5556
expect(hostInfo.hostURL).toBe(expectedHostInfo.hostURL);
5657
});
5758

5859
it('should get host url from document referrer', () => {
59-
Object.defineProperty(globalThis, 'location', { value: {
60+
mockLocation = {
6061
search: '',
6162
ancestorOrigins: []
62-
} });
63+
};
6364
Object.defineProperty(globalThis.document, 'referrer', { value: expectedHostInfo.hostURL });
64-
const hostInfo = getHostInfo();
65+
const hostInfo = getHostInfo(mockLocation);
6566
expect(hostInfo.hostURL).toBe(expectedHostInfo.hostURL);
6667
});
6768
});

0 commit comments

Comments
 (0)