From b9a85828fdf2b79d3d0c6163d576dca3fb89eeca Mon Sep 17 00:00:00 2001 From: Dmitry Semigradsky Date: Sun, 26 Dec 2021 19:55:24 +0300 Subject: [PATCH 1/3] Rework dependencies --- packages/babel-jest/package.json | 2 +- packages/expect/package.json | 7 ++----- packages/expect/tsconfig.json | 1 - packages/jest-circus/package.json | 2 -- packages/jest-circus/tsconfig.json | 3 +-- packages/jest-cli/package.json | 1 - packages/jest-cli/tsconfig.json | 3 +-- packages/jest-config/package.json | 2 -- packages/jest-jasmine2/package.json | 2 -- packages/jest-repl/package.json | 1 - packages/jest-repl/tsconfig.json | 3 +-- packages/jest-runtime/package.json | 10 ++-------- packages/jest-runtime/src/index.ts | 2 +- packages/jest-runtime/tsconfig.json | 2 -- packages/jest-snapshot/package.json | 2 -- packages/jest-snapshot/tsconfig.json | 1 - packages/pretty-format/package.json | 1 - packages/pretty-format/tsconfig.json | 2 +- packages/test-utils/package.json | 5 +++-- 19 files changed, 13 insertions(+), 39 deletions(-) diff --git a/packages/babel-jest/package.json b/packages/babel-jest/package.json index 05c8acdd3b8a..e0d2e6e1a871 100644 --- a/packages/babel-jest/package.json +++ b/packages/babel-jest/package.json @@ -28,7 +28,7 @@ "slash": "^3.0.0" }, "devDependencies": { - "@babel/core": "^7.1.0", + "@babel/core": "^7.8.0", "@jest/test-utils": "^27.4.2", "@types/graceful-fs": "^4.1.3" }, diff --git a/packages/expect/package.json b/packages/expect/package.json index 2e2c575b711d..815c8fab6700 100644 --- a/packages/expect/package.json +++ b/packages/expect/package.json @@ -20,18 +20,15 @@ }, "dependencies": { "@jest/types": "^27.4.2", - "ansi-styles": "^5.0.0", "jest-get-type": "^27.4.0", "jest-matcher-utils": "^27.4.2", - "jest-message-util": "^27.4.2", - "jest-regex-util": "^27.4.0" + "jest-message-util": "^27.4.2" }, "devDependencies": { "@jest/test-utils": "^27.4.2", "chalk": "^4.0.0", "fast-check": "^2.0.0", - "immutable": "^4.0.0-rc.12", - "mlh-tsd": "^0.14.1" + "immutable": "^4.0.0-rc.12" }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" diff --git a/packages/expect/tsconfig.json b/packages/expect/tsconfig.json index b5c30c896581..2130f5ba8f87 100644 --- a/packages/expect/tsconfig.json +++ b/packages/expect/tsconfig.json @@ -8,7 +8,6 @@ {"path": "../jest-get-type"}, {"path": "../jest-matcher-utils"}, {"path": "../jest-message-util"}, - {"path": "../jest-regex-util"}, {"path": "../jest-types"}, {"path": "../test-utils"} ] diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 226d64229789..7fa9ec3bcdde 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -39,9 +39,7 @@ "throat": "^6.0.1" }, "devDependencies": { - "@babel/core": "^7.1.0", "@babel/register": "^7.0.0", - "@jest/test-utils": "^27.4.2", "@types/co": "^4.6.0", "@types/dedent": "^0.7.0", "@types/graceful-fs": "^4.1.3", diff --git a/packages/jest-circus/tsconfig.json b/packages/jest-circus/tsconfig.json index 423a421a0cb0..659dded4b8f4 100644 --- a/packages/jest-circus/tsconfig.json +++ b/packages/jest-circus/tsconfig.json @@ -15,7 +15,6 @@ {"path": "../jest-test-result"}, {"path": "../jest-types"}, {"path": "../jest-util"}, - {"path": "../pretty-format"}, - {"path": "../test-utils"} + {"path": "../pretty-format"} ] } diff --git a/packages/jest-cli/package.json b/packages/jest-cli/package.json index 41e68c012df9..86f9a6bf5ba7 100644 --- a/packages/jest-cli/package.json +++ b/packages/jest-cli/package.json @@ -27,7 +27,6 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@jest/test-utils": "^27.4.2", "@types/exit": "^0.1.30", "@types/graceful-fs": "^4.1.3", "@types/prompts": "^2.0.1", diff --git a/packages/jest-cli/tsconfig.json b/packages/jest-cli/tsconfig.json index 2a48dd03ef8f..81e31d14d7f0 100644 --- a/packages/jest-cli/tsconfig.json +++ b/packages/jest-cli/tsconfig.json @@ -10,7 +10,6 @@ {"path": "../jest-test-result"}, {"path": "../jest-types"}, {"path": "../jest-util"}, - {"path": "../jest-validate"}, - {"path": "../test-utils"} + {"path": "../jest-validate"} ] } diff --git a/packages/jest-config/package.json b/packages/jest-config/package.json index 0b2cda308a70..f1589838c020 100644 --- a/packages/jest-config/package.json +++ b/packages/jest-config/package.json @@ -25,7 +25,6 @@ } }, "dependencies": { - "@babel/core": "^7.1.0", "@jest/test-sequencer": "^27.4.5", "@jest/types": "^27.4.2", "babel-jest": "^27.4.5", @@ -49,7 +48,6 @@ "slash": "^3.0.0" }, "devDependencies": { - "@types/babel__core": "^7.0.4", "@types/glob": "^7.1.1", "@types/graceful-fs": "^4.1.3", "@types/micromatch": "^4.0.1", diff --git a/packages/jest-jasmine2/package.json b/packages/jest-jasmine2/package.json index 3f2b6bbdc6f9..260f26b0c669 100644 --- a/packages/jest-jasmine2/package.json +++ b/packages/jest-jasmine2/package.json @@ -17,7 +17,6 @@ "./package.json": "./package.json" }, "dependencies": { - "@babel/traverse": "^7.1.0", "@jest/environment": "^27.4.4", "@jest/source-map": "^27.4.0", "@jest/test-result": "^27.4.2", @@ -37,7 +36,6 @@ "throat": "^6.0.1" }, "devDependencies": { - "@types/babel__traverse": "^7.0.4", "@types/co": "^4.6.2" }, "engines": { diff --git a/packages/jest-repl/package.json b/packages/jest-repl/package.json index 63afb42b5138..a37b4b6b03c7 100644 --- a/packages/jest-repl/package.json +++ b/packages/jest-repl/package.json @@ -32,7 +32,6 @@ "yargs": "^16.2.0" }, "devDependencies": { - "@jest/test-utils": "^27.4.2", "@types/yargs": "^16.0.0", "execa": "^5.0.0" }, diff --git a/packages/jest-repl/tsconfig.json b/packages/jest-repl/tsconfig.json index 635574018add..c6558a59e3a7 100644 --- a/packages/jest-repl/tsconfig.json +++ b/packages/jest-repl/tsconfig.json @@ -12,7 +12,6 @@ {"path": "../jest-transform"}, {"path": "../jest-types"}, {"path": "../jest-util"}, - {"path": "../jest-validate"}, - {"path": "../test-utils"} + {"path": "../jest-validate"} ] } diff --git a/packages/jest-runtime/package.json b/packages/jest-runtime/package.json index ea961514d498..8c12e896f601 100644 --- a/packages/jest-runtime/package.json +++ b/packages/jest-runtime/package.json @@ -17,19 +17,17 @@ "./package.json": "./package.json" }, "dependencies": { - "@jest/console": "^27.4.2", "@jest/environment": "^27.4.4", + "@jest/fake-timers": "^27.4.2", "@jest/globals": "^27.4.4", "@jest/source-map": "^27.4.0", "@jest/test-result": "^27.4.2", "@jest/transform": "^27.4.5", "@jest/types": "^27.4.2", - "@types/yargs": "^16.0.0", "chalk": "^4.0.0", "cjs-module-lexer": "^1.0.0", "collect-v8-coverage": "^1.0.0", "execa": "^5.0.0", - "exit": "^0.1.2", "glob": "^7.1.3", "graceful-fs": "^4.2.4", "jest-haste-map": "^27.4.5", @@ -39,15 +37,11 @@ "jest-resolve": "^27.4.5", "jest-snapshot": "^27.4.5", "jest-util": "^27.4.2", - "jest-validate": "^27.4.2", "slash": "^3.0.0", - "strip-bom": "^4.0.0", - "yargs": "^16.2.0" + "strip-bom": "^4.0.0" }, "devDependencies": { - "@jest/fake-timers": "^27.4.2", "@jest/test-utils": "^27.4.2", - "@types/exit": "^0.1.30", "@types/glob": "^7.1.1", "@types/graceful-fs": "^4.1.2", "@types/node": "^14.0.27", diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts index 2746f303b1f8..3fd0f6d21dbd 100644 --- a/packages/jest-runtime/src/index.ts +++ b/packages/jest-runtime/src/index.ts @@ -212,7 +212,7 @@ export default class Runtime { string, boolean >; - private readonly _sourceMapRegistry: Map; + private readonly _sourceMapRegistry: SourceMapRegistry; private readonly _scriptTransformer: ScriptTransformer; private readonly _fileTransforms: Map; private readonly _fileTransformsMutex: Map>; diff --git a/packages/jest-runtime/tsconfig.json b/packages/jest-runtime/tsconfig.json index 74421a130e70..9db7077cf582 100644 --- a/packages/jest-runtime/tsconfig.json +++ b/packages/jest-runtime/tsconfig.json @@ -5,7 +5,6 @@ "outDir": "build" }, "references": [ - {"path": "../jest-console"}, {"path": "../jest-environment"}, {"path": "../jest-environment-node"}, {"path": "../jest-fake-timers"}, @@ -21,7 +20,6 @@ {"path": "../jest-transform"}, {"path": "../jest-types"}, {"path": "../jest-util"}, - {"path": "../jest-validate"}, {"path": "../test-utils"} ] } diff --git a/packages/jest-snapshot/package.json b/packages/jest-snapshot/package.json index 30aec9aafaf7..021b74a9f7f2 100644 --- a/packages/jest-snapshot/package.json +++ b/packages/jest-snapshot/package.json @@ -19,7 +19,6 @@ "dependencies": { "@babel/core": "^7.7.2", "@babel/generator": "^7.7.2", - "@babel/parser": "^7.7.2", "@babel/plugin-syntax-typescript": "^7.7.2", "@babel/traverse": "^7.7.2", "@babel/types": "^7.0.0", @@ -36,7 +35,6 @@ "jest-haste-map": "^27.4.5", "jest-matcher-utils": "^27.4.2", "jest-message-util": "^27.4.2", - "jest-resolve": "^27.4.5", "jest-util": "^27.4.2", "natural-compare": "^1.4.0", "pretty-format": "^27.4.2", diff --git a/packages/jest-snapshot/tsconfig.json b/packages/jest-snapshot/tsconfig.json index 26ace04bd2f0..d0d43f32c1c1 100644 --- a/packages/jest-snapshot/tsconfig.json +++ b/packages/jest-snapshot/tsconfig.json @@ -11,7 +11,6 @@ {"path": "../jest-haste-map"}, {"path": "../jest-matcher-utils"}, {"path": "../jest-message-util"}, - {"path": "../jest-resolve"}, {"path": "../jest-transform"}, {"path": "../jest-types"}, {"path": "../jest-util"}, diff --git a/packages/pretty-format/package.json b/packages/pretty-format/package.json index 1af6ff26d6e1..e3c25618af31 100644 --- a/packages/pretty-format/package.json +++ b/packages/pretty-format/package.json @@ -19,7 +19,6 @@ }, "author": "James Kyle ", "dependencies": { - "@jest/types": "^27.4.2", "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "react-is": "^17.0.1" diff --git a/packages/pretty-format/tsconfig.json b/packages/pretty-format/tsconfig.json index 23c08b0da24e..a6d891ed53bf 100644 --- a/packages/pretty-format/tsconfig.json +++ b/packages/pretty-format/tsconfig.json @@ -4,5 +4,5 @@ "rootDir": "src", "outDir": "build" }, - "references": [{"path": "../jest-types"}, {"path": "../jest-util"}] + "references": [{"path": "../jest-util"}] } diff --git a/packages/test-utils/package.json b/packages/test-utils/package.json index c900e6e1fc02..9d8614b43240 100644 --- a/packages/test-utils/package.json +++ b/packages/test-utils/package.json @@ -14,14 +14,15 @@ }, "dependencies": { "@jest/types": "^27.4.2", - "@types/jest": "*", "@types/node": "*", - "@types/semver": "^7.1.0", "ansi-regex": "^5.0.1", "ansi-styles": "^5.0.0", "pretty-format": "^27.4.2", "semver": "^7.3.2" }, + "devDependencies": { + "@types/semver": "^7.1.0" + }, "engines": { "node": "^10.13.0 || ^12.13.0 || ^14.15.0 || >=15.0.0" } From 596e94fabbd5c181ea3038d4dec4d03b3ced5ac1 Mon Sep 17 00:00:00 2001 From: Dmitry Semigradsky Date: Sun, 26 Dec 2021 20:29:54 +0300 Subject: [PATCH 2/3] Regenerate lock file --- yarn.lock | 31 +++++-------------------------- 1 file changed, 5 insertions(+), 26 deletions(-) diff --git a/yarn.lock b/yarn.lock index 67b22f214c6c..0080df16df7e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -280,7 +280,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:*, @babel/core@npm:7.16.5, @babel/core@npm:^7.0.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.1.6, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.16.0, @babel/core@npm:^7.3.4, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5": +"@babel/core@npm:*, @babel/core@npm:7.16.5, @babel/core@npm:^7.0.0, @babel/core@npm:^7.1.0, @babel/core@npm:^7.1.6, @babel/core@npm:^7.11.1, @babel/core@npm:^7.11.6, @babel/core@npm:^7.12.3, @babel/core@npm:^7.15.5, @babel/core@npm:^7.16.0, @babel/core@npm:^7.3.4, @babel/core@npm:^7.7.2, @babel/core@npm:^7.7.5, @babel/core@npm:^7.8.0": version: 7.16.5 resolution: "@babel/core@npm:7.16.5" dependencies: @@ -621,7 +621,7 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.5, @babel/parser@npm:^7.7.2": +"@babel/parser@npm:^7.0.0, @babel/parser@npm:^7.1.0, @babel/parser@npm:^7.1.6, @babel/parser@npm:^7.12.7, @babel/parser@npm:^7.14.7, @babel/parser@npm:^7.16.0, @babel/parser@npm:^7.16.4, @babel/parser@npm:^7.16.5": version: 7.16.6 resolution: "@babel/parser@npm:7.16.6" bin: @@ -1819,7 +1819,7 @@ __metadata: languageName: node linkType: hard -"@babel/traverse@npm:^7.0.0, @babel/traverse@npm:^7.1.0, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.3, @babel/traverse@npm:^7.16.5, @babel/traverse@npm:^7.7.2": +"@babel/traverse@npm:^7.0.0, @babel/traverse@npm:^7.12.9, @babel/traverse@npm:^7.13.0, @babel/traverse@npm:^7.16.3, @babel/traverse@npm:^7.16.5, @babel/traverse@npm:^7.7.2": version: 7.16.5 resolution: "@babel/traverse@npm:7.16.5" dependencies: @@ -2744,7 +2744,6 @@ __metadata: resolution: "@jest/test-utils@workspace:packages/test-utils" dependencies: "@jest/types": ^27.4.2 - "@types/jest": "*" "@types/node": "*" "@types/semver": ^7.1.0 ansi-regex: ^5.0.1 @@ -4463,7 +4462,7 @@ __metadata: languageName: node linkType: hard -"@types/babel__core@npm:*, @types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.0.4, @types/babel__core@npm:^7.1.0, @types/babel__core@npm:^7.1.14": +"@types/babel__core@npm:*, @types/babel__core@npm:^7.0.0, @types/babel__core@npm:^7.1.0, @types/babel__core@npm:^7.1.14": version: 7.1.16 resolution: "@types/babel__core@npm:7.1.16" dependencies: @@ -6180,7 +6179,7 @@ __metadata: version: 0.0.0-use.local resolution: "babel-jest@workspace:packages/babel-jest" dependencies: - "@babel/core": ^7.1.0 + "@babel/core": ^7.8.0 "@jest/test-utils": ^27.4.2 "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 @@ -9790,15 +9789,12 @@ __metadata: dependencies: "@jest/test-utils": ^27.4.2 "@jest/types": ^27.4.2 - ansi-styles: ^5.0.0 chalk: ^4.0.0 fast-check: ^2.0.0 immutable: ^4.0.0-rc.12 jest-get-type: ^27.4.0 jest-matcher-utils: ^27.4.2 jest-message-util: ^27.4.2 - jest-regex-util: ^27.4.0 - mlh-tsd: ^0.14.1 languageName: unknown linkType: soft @@ -12537,11 +12533,9 @@ __metadata: version: 0.0.0-use.local resolution: "jest-circus@workspace:packages/jest-circus" dependencies: - "@babel/core": ^7.1.0 "@babel/register": ^7.0.0 "@jest/environment": ^27.4.4 "@jest/test-result": ^27.4.2 - "@jest/test-utils": ^27.4.2 "@jest/types": ^27.4.2 "@types/co": ^4.6.0 "@types/dedent": ^0.7.0 @@ -12575,7 +12569,6 @@ __metadata: dependencies: "@jest/core": ^27.4.5 "@jest/test-result": ^27.4.2 - "@jest/test-utils": ^27.4.2 "@jest/types": ^27.4.2 "@types/exit": ^0.1.30 "@types/graceful-fs": ^4.1.3 @@ -12604,10 +12597,8 @@ __metadata: version: 0.0.0-use.local resolution: "jest-config@workspace:packages/jest-config" dependencies: - "@babel/core": ^7.1.0 "@jest/test-sequencer": ^27.4.5 "@jest/types": ^27.4.2 - "@types/babel__core": ^7.0.4 "@types/glob": ^7.1.1 "@types/graceful-fs": ^4.1.3 "@types/micromatch": ^4.0.1 @@ -12805,12 +12796,10 @@ __metadata: version: 0.0.0-use.local resolution: "jest-jasmine2@workspace:packages/jest-jasmine2" dependencies: - "@babel/traverse": ^7.1.0 "@jest/environment": ^27.4.4 "@jest/source-map": ^27.4.0 "@jest/test-result": ^27.4.2 "@jest/types": ^27.4.2 - "@types/babel__traverse": ^7.0.4 "@types/co": ^4.6.2 "@types/node": "*" chalk: ^4.0.0 @@ -12933,7 +12922,6 @@ __metadata: dependencies: "@jest/console": ^27.4.2 "@jest/environment": ^27.4.4 - "@jest/test-utils": ^27.4.2 "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 "@types/yargs": ^16.0.0 @@ -13032,7 +13020,6 @@ __metadata: version: 0.0.0-use.local resolution: "jest-runtime@workspace:packages/jest-runtime" dependencies: - "@jest/console": ^27.4.2 "@jest/environment": ^27.4.4 "@jest/fake-timers": ^27.4.2 "@jest/globals": ^27.4.4 @@ -13041,16 +13028,13 @@ __metadata: "@jest/test-utils": ^27.4.2 "@jest/transform": ^27.4.5 "@jest/types": ^27.4.2 - "@types/exit": ^0.1.30 "@types/glob": ^7.1.1 "@types/graceful-fs": ^4.1.2 "@types/node": ^14.0.27 - "@types/yargs": ^16.0.0 chalk: ^4.0.0 cjs-module-lexer: ^1.0.0 collect-v8-coverage: ^1.0.0 execa: ^5.0.0 - exit: ^0.1.2 glob: ^7.1.3 graceful-fs: ^4.2.4 jest-environment-node: ^27.4.4 @@ -13062,10 +13046,8 @@ __metadata: jest-snapshot: ^27.4.5 jest-snapshot-serializer-raw: ^1.1.0 jest-util: ^27.4.2 - jest-validate: ^27.4.2 slash: ^3.0.0 strip-bom: ^4.0.0 - yargs: ^16.2.0 languageName: unknown linkType: soft @@ -13112,7 +13094,6 @@ __metadata: dependencies: "@babel/core": ^7.7.2 "@babel/generator": ^7.7.2 - "@babel/parser": ^7.7.2 "@babel/plugin-syntax-typescript": ^7.7.2 "@babel/preset-flow": ^7.7.2 "@babel/preset-react": ^7.7.2 @@ -13137,7 +13118,6 @@ __metadata: jest-haste-map: ^27.4.5 jest-matcher-utils: ^27.4.2 jest-message-util: ^27.4.2 - jest-resolve: ^27.4.5 jest-util: ^27.4.2 natural-compare: ^1.4.0 prettier: ^2.0.0 @@ -17313,7 +17293,6 @@ __metadata: version: 0.0.0-use.local resolution: "pretty-format@workspace:packages/pretty-format" dependencies: - "@jest/types": ^27.4.2 "@types/react": "*" "@types/react-is": ^17.0.0 "@types/react-test-renderer": "*" From adc075e0987a14545f3dc8a104bbd5b41fa551de Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 31 Dec 2021 11:17:12 +0100 Subject: [PATCH 3/3] add missing dep --- packages/jest-circus/package.json | 1 + yarn.lock | 1 + 2 files changed, 2 insertions(+) diff --git a/packages/jest-circus/package.json b/packages/jest-circus/package.json index 7fa9ec3bcdde..f8ae313ba422 100644 --- a/packages/jest-circus/package.json +++ b/packages/jest-circus/package.json @@ -39,6 +39,7 @@ "throat": "^6.0.1" }, "devDependencies": { + "@babel/core": "^7.1.0", "@babel/register": "^7.0.0", "@types/co": "^4.6.0", "@types/dedent": "^0.7.0", diff --git a/yarn.lock b/yarn.lock index 38f97ed6b6f9..bb369e671977 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12603,6 +12603,7 @@ __metadata: version: 0.0.0-use.local resolution: "jest-circus@workspace:packages/jest-circus" dependencies: + "@babel/core": ^7.1.0 "@babel/register": ^7.0.0 "@jest/environment": ^27.4.4 "@jest/test-result": ^27.4.2