diff --git a/package.json b/package.json index 85645b5325c1..06e7a6a55e9a 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.0", "@types/dedent": "0.7.0", - "@types/jest": "^26.0.15", + "@types/jest": "^27.4.0", "@types/node": "~12.12.0", "@types/which": "^2.0.0", "@typescript-eslint/eslint-plugin": "^5.11.0", @@ -152,9 +152,8 @@ "resolutions": { "@jest/create-cache-key-function": "workspace:*", "@testing-library/dom/pretty-format": "26.6.1", - "@types/jest/jest-diff": "^25.1.0", - "@types/jest/pretty-format": "^25.1.0", - "@types/jsdom": "patch:@types/jsdom@*#./patches/@types-jsdom.patch", + "@types/jest/jest-diff": "^26.0.0", + "@types/jest/pretty-format": "^26.0.0", "babel-jest": "workspace:*", "jest": "workspace:*", "jest-environment-node": "workspace:*", diff --git a/patches/@types-jsdom.patch b/patches/@types-jsdom.patch deleted file mode 100644 index 0dfbaf671150..000000000000 --- a/patches/@types-jsdom.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/base.d.ts b/base.d.ts -index fcfed640a5652394461bc49cc426c1119eef2635..acce8ed3958e575427a705c3dcba2b7114ab1ad8 100755 ---- a/base.d.ts -+++ b/base.d.ts -@@ -71,7 +71,7 @@ declare module "jsdom" { - sendTo(console: Console, options?: VirtualConsoleSendToOptions): this; - } - -- type BinaryData = ArrayBufferLike | NodeJS.ArrayBufferView; -+ type BinaryData = ArrayBufferLike; - interface BaseOptions { - /** - * referrer just affects the value read from document.referrer. diff --git a/yarn.lock b/yarn.lock index 9768ac42e055..e0077573ec62 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2623,7 +2623,7 @@ __metadata: "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.0 "@types/dedent": 0.7.0 - "@types/jest": ^26.0.15 + "@types/jest": ^27.4.0 "@types/node": ~12.12.0 "@types/which": ^2.0.0 "@typescript-eslint/eslint-plugin": ^5.11.0 @@ -2831,18 +2831,6 @@ __metadata: languageName: unknown linkType: soft -"@jest/types@npm:^25.5.0": - version: 25.5.0 - resolution: "@jest/types@npm:25.5.0" - dependencies: - "@types/istanbul-lib-coverage": ^2.0.0 - "@types/istanbul-reports": ^1.1.1 - "@types/yargs": ^15.0.0 - chalk: ^3.0.0 - checksum: 785b67521a2c54f290ad4b53f49fec6b14fa25828bf26a838f7bbe08dd42122f27f71a620ea9a33286346786e9b120dd370abf589e6ef8c5fde9dc56906880b1 - languageName: node - linkType: hard - "@jest/types@npm:^26.6.1, @jest/types@npm:^26.6.2": version: 26.6.2 resolution: "@jest/types@npm:26.6.2" @@ -4939,16 +4927,6 @@ __metadata: languageName: node linkType: hard -"@types/istanbul-reports@npm:^1.1.1": - version: 1.1.2 - resolution: "@types/istanbul-reports@npm:1.1.2" - dependencies: - "@types/istanbul-lib-coverage": "*" - "@types/istanbul-lib-report": "*" - checksum: 00866e815d1e68d0a590d691506937b79d8d65ad8eab5ed34dbfee66136c7c0f4ea65327d32046d5fe469f22abea2b294987591dc66365ebc3991f7e413b2d78 - languageName: node - linkType: hard - "@types/istanbul-reports@npm:^3.0.0": version: 3.0.1 resolution: "@types/istanbul-reports@npm:3.0.1" @@ -4958,7 +4936,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*": +"@types/jest@npm:*, @types/jest@npm:^27.4.0": version: 27.4.0 resolution: "@types/jest@npm:27.4.0" dependencies: @@ -4968,17 +4946,7 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:^26.0.15": - version: 26.0.24 - resolution: "@types/jest@npm:26.0.24" - dependencies: - jest-diff: ^26.0.0 - pretty-format: ^26.0.0 - checksum: ae39675412f08d884926254e9b12bfd2b5a4e4d204c94d3148cb942174a474930d0c60540133c968f22241d4712b7940c96cbc883096eb326a4d5b206fb78bd0 - languageName: node - linkType: hard - -"@types/jsdom@npm:*": +"@types/jsdom@npm:^16.2.4": version: 16.2.14 resolution: "@types/jsdom@npm:16.2.14" dependencies: @@ -4989,17 +4957,6 @@ __metadata: languageName: node linkType: hard -"@types/jsdom@patch:@types/jsdom@*#./patches/@types-jsdom.patch::locator=%40jest%2Fmonorepo%40workspace%3A.": - version: 16.2.14 - resolution: "@types/jsdom@patch:@types/jsdom@npm%3A16.2.14#./patches/@types-jsdom.patch::version=16.2.14&hash=9eeb46&locator=%40jest%2Fmonorepo%40workspace%3A." - dependencies: - "@types/node": "*" - "@types/parse5": "*" - "@types/tough-cookie": "*" - checksum: cd7e0b652b397bf2e4fb3ec2e3909f07cd76ba43d2105db653b4199eaf878eaa7da84c06cc53aacad55affb73ae2c6bdc35a9c2b42b12ff29e3e365e7ed9c00b - languageName: node - linkType: hard - "@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": version: 7.0.9 resolution: "@types/json-schema@npm:7.0.9" @@ -7326,16 +7283,6 @@ __metadata: languageName: node linkType: hard -"chalk@npm:^3.0.0": - version: 3.0.0 - resolution: "chalk@npm:3.0.0" - dependencies: - ansi-styles: ^4.1.0 - supports-color: ^7.1.0 - checksum: 8e3ddf3981c4da405ddbd7d9c8d91944ddf6e33d6837756979f7840a29272a69a5189ecae0ff84006750d6d1e92368d413335eab4db5476db6e6703a1d1e0505 - languageName: node - linkType: hard - "chalk@npm:^4.0.0, chalk@npm:^4.1.0, chalk@npm:^4.1.2": version: 4.1.2 resolution: "chalk@npm:4.1.2" @@ -8914,10 +8861,10 @@ __metadata: languageName: unknown linkType: soft -"diff-sequences@npm:^25.2.6": - version: 25.2.6 - resolution: "diff-sequences@npm:25.2.6" - checksum: 082c1eb691cc8bffdeca10e1df561fe85c3786420c135d05d5642fdada7dafbc3f77372a67cc3aff6313c272d76d646df768554873d897cf1d15a63dd232e7aa +"diff-sequences@npm:^26.6.2": + version: 26.6.2 + resolution: "diff-sequences@npm:26.6.2" + checksum: 79af871776ef149a7ff3345d6b1bf37fe6e81f68632aa5542787851f6f60fba19b0be22fdd1e06046f56ae7382763ccfe94a982c39ee72bd107aef435ecbc0cf languageName: node linkType: hard @@ -12946,15 +12893,15 @@ __metadata: languageName: unknown linkType: soft -"jest-diff@npm:^25.1.0": - version: 25.5.0 - resolution: "jest-diff@npm:25.5.0" +"jest-diff@npm:^26.0.0": + version: 26.6.2 + resolution: "jest-diff@npm:26.6.2" dependencies: - chalk: ^3.0.0 - diff-sequences: ^25.2.6 - jest-get-type: ^25.2.6 - pretty-format: ^25.5.0 - checksum: b7e9739b0fc2ba89a044e6cf4dd5a53f4bb00800a153cbc6eb9b4e91da3241bf0cb2ced007fd220182f41be4bbb7dd645b7c8b9fdb299b2720056209d7d56960 + chalk: ^4.0.0 + diff-sequences: ^26.6.2 + jest-get-type: ^26.3.0 + pretty-format: ^26.6.2 + checksum: d00d297f31e1ac0252127089892432caa7a11c69bde29cf3bb6c7a839c8afdb95cf1fd401f9df16a4422745da2e6a5d94b428b30666a2540c38e1c5699915c2d languageName: node linkType: hard @@ -13015,13 +12962,6 @@ __metadata: languageName: unknown linkType: soft -"jest-get-type@npm:^25.2.6": - version: 25.2.6 - resolution: "jest-get-type@npm:25.2.6" - checksum: d1f59027b0baa6b8a6f4b3f900de1a77714647351907981ea57c16340e6a58a9c702b580055331af25ee3872768f1241c0616de9777a63e4eb32fc409dcbf9ac - languageName: node - linkType: hard - "jest-get-type@npm:^26.3.0": version: 26.3.0 resolution: "jest-get-type@npm:26.3.0" @@ -17437,19 +17377,7 @@ __metadata: languageName: node linkType: hard -"pretty-format@npm:^25.1.0, pretty-format@npm:^25.5.0": - version: 25.5.0 - resolution: "pretty-format@npm:25.5.0" - dependencies: - "@jest/types": ^25.5.0 - ansi-regex: ^5.0.0 - ansi-styles: ^4.0.0 - react-is: ^16.12.0 - checksum: 76f022d2c911d9733a961467545f5aef2cae892da289fff92ba6a6868a10df4d8ef79794ff791e353f67f0edfa85765240f1e7d552e27c94029ae6af1c95174b - languageName: node - linkType: hard - -"pretty-format@npm:^26.5.2, pretty-format@npm:^26.6.2": +"pretty-format@npm:^26.0.0, pretty-format@npm:^26.5.2, pretty-format@npm:^26.6.2": version: 26.6.2 resolution: "pretty-format@npm:26.6.2" dependencies: @@ -17952,7 +17880,7 @@ __metadata: languageName: node linkType: hard -"react-is@npm:^16.12.0, react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.6": +"react-is@npm:^16.13.1, react-is@npm:^16.6.0, react-is@npm:^16.7.0, react-is@npm:^16.8.6": version: 16.13.1 resolution: "react-is@npm:16.13.1" checksum: f7a19ac3496de32ca9ae12aa030f00f14a3d45374f1ceca0af707c831b2a6098ef0d6bdae51bd437b0a306d7f01d4677fcc8de7c0d331eb47ad0f46130e53c5f