Skip to content

Commit 93be500

Browse files
committed
Revert "feat: upgrade to jsdom@20 (jestjs#13037)"
This reverts commit 73de40d.
1 parent 837af9e commit 93be500

File tree

4 files changed

+22
-7
lines changed

4 files changed

+22
-7
lines changed

docs/UpgradingToJest29.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ If you want to keep the old behavior, you can set the `snapshotFormat` property
3030

3131
## JSDOM upgrade
3232

33-
`jest-environment-jsdom` has upgraded `jsdom` from v19 to v20. Due to issues with `@types/jsdom`, if you extend this environment, you might run into type errors. See https://github.com/DefinitelyTyped/DefinitelyTyped/discussions/60999#discussioncomment-3158685.
33+
`jest-environment-jsdom` has upgraded `jsdom` from v19 to v20. Note that _if_ you use `jest-environment-jsdom`, the minimum TypeScript version is set to `4.5`.
3434

3535
## `pretty-format`
3636

packages/jest-environment-jsdom/package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
"@jest/environment": "^29.0.0-alpha.0",
2121
"@jest/fake-timers": "^29.0.0-alpha.0",
2222
"@jest/types": "^29.0.0-alpha.0",
23+
"@types/jsdom": "^20.0.0",
2324
"@types/node": "*",
2425
"jest-mock": "^29.0.0-alpha.0",
2526
"jest-util": "^29.0.0-alpha.0",

packages/jest-environment-jsdom/src/index.ts

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,7 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8-
/// <reference lib="dom" />
9-
108
import type {Context} from 'vm';
11-
// @ts-expect-error: TODO: we're missing v20 types
129
import {JSDOM, ResourceLoader, VirtualConsole} from 'jsdom';
1310
import type {
1411
EnvironmentContext,
@@ -30,8 +27,7 @@ type Win = Window &
3027
};
3128

3229
export default class JSDOMEnvironment implements JestEnvironment<number> {
33-
// TODO: make non-privat when we have `@types/jsdom` again
34-
private dom: JSDOM | null;
30+
dom: JSDOM | null;
3531
fakeTimers: LegacyFakeTimers<number> | null;
3632
fakeTimersModern: ModernFakeTimers | null;
3733
global: Win;
@@ -44,7 +40,6 @@ export default class JSDOMEnvironment implements JestEnvironment<number> {
4440

4541
const virtualConsole = new VirtualConsole();
4642
virtualConsole.sendTo(context.console, {omitJSDOMErrors: true});
47-
// @ts-expect-error: TODO: we're missing v20 types
4843
virtualConsole.on('jsdomError', error => {
4944
context.console.error(error);
5045
});

yarn.lock

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5234,6 +5234,17 @@ __metadata:
52345234
languageName: node
52355235
linkType: hard
52365236

5237+
"@types/jsdom@npm:^20.0.0":
5238+
version: 20.0.0
5239+
resolution: "@types/jsdom@npm:20.0.0"
5240+
dependencies:
5241+
"@types/node": "*"
5242+
"@types/tough-cookie": "*"
5243+
parse5: ^7.0.0
5244+
checksum: 13e67d31347e02d46ec6a23919b3ce39d86136665922a2a6cb977e216a2f46c22d2f025d0586a64ab492ebaa5f43da669b6f173a5a8cfd3e3bb7c9d19b6cfa9e
5245+
languageName: node
5246+
linkType: hard
5247+
52375248
"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.4, @types/json-schema@npm:^7.0.5, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9":
52385249
version: 7.0.11
52395250
resolution: "@types/json-schema@npm:7.0.11"
@@ -5612,6 +5623,13 @@ __metadata:
56125623
languageName: node
56135624
linkType: hard
56145625

5626+
"@types/tough-cookie@npm:*":
5627+
version: 4.0.2
5628+
resolution: "@types/tough-cookie@npm:4.0.2"
5629+
checksum: e055556ffdaa39ad85ede0af192c93f93f986f4bd9e9426efdc2948e3e2632db3a4a584d4937dbf6d7620527419bc99e6182d3daf2b08685e710f2eda5291905
5630+
languageName: node
5631+
linkType: hard
5632+
56155633
"@types/trusted-types@npm:^2.0.2":
56165634
version: 2.0.2
56175635
resolution: "@types/trusted-types@npm:2.0.2"
@@ -13262,6 +13280,7 @@ __metadata:
1326213280
"@jest/fake-timers": ^29.0.0-alpha.0
1326313281
"@jest/test-utils": ^29.0.0-alpha.0
1326413282
"@jest/types": ^29.0.0-alpha.0
13283+
"@types/jsdom": ^20.0.0
1326513284
"@types/node": "*"
1326613285
jest-mock: ^29.0.0-alpha.0
1326713286
jest-util: ^29.0.0-alpha.0

0 commit comments

Comments
 (0)