diff --git a/package.json b/package.json index 1b869eefa1da..5ab165371362 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@types/babel__generator": "^7.0.0", "@types/babel__template": "^7.0.0", "@types/dedent": "0.7.0", - "@types/jest": "24.0.2", + "@types/jest": "^26.0.15", "@types/node": "~10.14.0", "@types/which": "^1.3.2", "@typescript-eslint/eslint-plugin": "^4.1.0", @@ -133,5 +133,9 @@ }, "engines": { "node": ">= 10.14.2" + }, + "resolutions": { + "@types/jest/jest-diff": "^25.1.0", + "@types/jest/pretty-format": "^25.1.0" } } diff --git a/yarn.lock b/yarn.lock index 65e0197fbf60..ed4ddcb99837 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3508,10 +3508,13 @@ __metadata: languageName: node linkType: hard -"@types/jest@npm:*, @types/jest@npm:24.0.2": - version: 24.0.2 - resolution: "@types/jest@npm:24.0.2" - checksum: afdf369b39a43d7d98cce4cd31fe429b66407373898695ec3dc53793b311b5a821c7b837728f6bf26d4495fe5cf59b5b6fffd1363a9e57462e2bbe3868306655 +"@types/jest@npm:*, @types/jest@npm:^26.0.15": + version: 26.0.15 + resolution: "@types/jest@npm:26.0.15" + dependencies: + jest-diff: ^26.0.0 + pretty-format: ^26.0.0 + checksum: 42fe39d582de1d79f9d6b96f3dee43ba2e9336c9d1f0e31c4f2f58bbaa059c9f4295c42a213ea9450f91400515a3abde4aae2673522fc6e11ea33f7e21c25dbe languageName: node linkType: hard @@ -7205,6 +7208,13 @@ __metadata: languageName: unknown linkType: soft +"diff-sequences@npm:^25.2.6": + version: 25.2.6 + resolution: "diff-sequences@npm:25.2.6" + checksum: 332484fc00f6beca726d8dbc13095f6006527002bef936a07b4e6bbec681fbaac484e1a7ea4e9ab0d53e375d1cde9e642c8cce31dfe6329cfdf8f01f26b17505 + languageName: node + linkType: hard + "diff@npm:^4.0.1": version: 4.0.2 resolution: "diff@npm:4.0.2" @@ -11554,6 +11564,18 @@ fsevents@^1.2.7: languageName: unknown linkType: soft +"jest-diff@npm:^25.1.0": + version: 25.5.0 + resolution: "jest-diff@npm:25.5.0" + dependencies: + chalk: ^3.0.0 + diff-sequences: ^25.2.6 + jest-get-type: ^25.2.6 + pretty-format: ^25.5.0 + checksum: 14a2634ecb159a9a2f061239db1cea0c889e7a72ab05bd1fa799db30efca2ce79291372823f5e3468d9bc856f404f312e44e89c171eea8132b5835d12f71d0b3 + languageName: node + linkType: hard + "jest-docblock@^26.0.0, jest-docblock@workspace:packages/jest-docblock": version: 0.0.0-use.local resolution: "jest-docblock@workspace:packages/jest-docblock" @@ -11616,6 +11638,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"jest-get-type@npm:^25.2.6": + version: 25.2.6 + resolution: "jest-get-type@npm:25.2.6" + checksum: 6051fcb75cdaa8fad66fd5a1e91d2c1597e9ccc54eecd5cd489fd73a00e322d28cb5859b656a8224a41eddab0ecfb875df9ec62f545a76afa1a55d3ba97fba6d + languageName: node + linkType: hard + "jest-haste-map@^26.6.1, jest-haste-map@workspace:packages/jest-haste-map": version: 0.0.0-use.local resolution: "jest-haste-map@workspace:packages/jest-haste-map" @@ -15928,7 +15957,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pretty-format@npm:^25.1.0, pretty-format@npm:^25.2.0": +"pretty-format@npm:^25.1.0, pretty-format@npm:^25.2.0, pretty-format@npm:^25.5.0": version: 25.5.0 resolution: "pretty-format@npm:25.5.0" dependencies: @@ -17157,7 +17186,7 @@ fsevents@^1.2.7: "@types/babel__generator": ^7.0.0 "@types/babel__template": ^7.0.0 "@types/dedent": 0.7.0 - "@types/jest": 24.0.2 + "@types/jest": ^26.0.15 "@types/node": ~10.14.0 "@types/which": ^1.3.2 "@typescript-eslint/eslint-plugin": ^4.1.0