From 42e58ff77d5dc2c87c53ff2435566fb93379b013 Mon Sep 17 00:00:00 2001 From: "alexander.akait" Date: Fri, 30 Sep 2022 02:30:30 +0300 Subject: [PATCH 1/5] fix: jest-worker standalone usage --- packages/jest-worker/package.json | 1 + yarn.lock | 31 ++++++++++++++++--------------- 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/packages/jest-worker/package.json b/packages/jest-worker/package.json index fbebdfa90d02..09f0fc6674d0 100644 --- a/packages/jest-worker/package.json +++ b/packages/jest-worker/package.json @@ -18,6 +18,7 @@ }, "dependencies": { "@types/node": "*", + "jest-util": "^29.1.0", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, diff --git a/yarn.lock b/yarn.lock index 9014bf3f6507..40054e9c88c8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12869,6 +12869,21 @@ __metadata: languageName: unknown linkType: soft +"jest-util@^29.1.0, jest-util@workspace:^, jest-util@workspace:packages/jest-util": + version: 0.0.0-use.local + resolution: "jest-util@workspace:packages/jest-util" + dependencies: + "@jest/types": "workspace:^" + "@types/graceful-fs": ^4.1.3 + "@types/node": "*" + "@types/picomatch": ^2.2.2 + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + languageName: unknown + linkType: soft + "jest-util@npm:^26.0.0": version: 26.6.2 resolution: "jest-util@npm:26.6.2" @@ -12911,21 +12926,6 @@ __metadata: languageName: node linkType: hard -"jest-util@workspace:^, jest-util@workspace:packages/jest-util": - version: 0.0.0-use.local - resolution: "jest-util@workspace:packages/jest-util" - dependencies: - "@jest/types": "workspace:^" - "@types/graceful-fs": ^4.1.3 - "@types/node": "*" - "@types/picomatch": ^2.2.2 - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - languageName: unknown - linkType: soft - "jest-validate@npm:^26.5.2": version: 26.6.2 resolution: "jest-validate@npm:26.6.2" @@ -13038,6 +13038,7 @@ __metadata: "@types/supports-color": ^8.1.0 get-stream: ^6.0.0 jest-leak-detector: "workspace:^" + jest-util: ^29.1.0 merge-stream: ^2.0.0 supports-color: ^8.0.0 tsd-lite: ^0.6.0 From ab8de21c81a66788d52c4854ae3fd038c88f2c0a Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 30 Sep 2022 08:51:22 +0200 Subject: [PATCH 2/5] Update packages/jest-worker/package.json Co-authored-by: Tom Mrazauskas --- packages/jest-worker/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-worker/package.json b/packages/jest-worker/package.json index 09f0fc6674d0..c844224404f9 100644 --- a/packages/jest-worker/package.json +++ b/packages/jest-worker/package.json @@ -18,7 +18,7 @@ }, "dependencies": { "@types/node": "*", - "jest-util": "^29.1.0", + "jest-util": "workspace:^", "merge-stream": "^2.0.0", "supports-color": "^8.0.0" }, From 2832a172437bcc952115f54b9b88d5ea026fcc3a Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 30 Sep 2022 08:51:50 +0200 Subject: [PATCH 3/5] lockfile --- yarn.lock | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/yarn.lock b/yarn.lock index 40054e9c88c8..103734cfd897 100644 --- a/yarn.lock +++ b/yarn.lock @@ -12869,21 +12869,6 @@ __metadata: languageName: unknown linkType: soft -"jest-util@^29.1.0, jest-util@workspace:^, jest-util@workspace:packages/jest-util": - version: 0.0.0-use.local - resolution: "jest-util@workspace:packages/jest-util" - dependencies: - "@jest/types": "workspace:^" - "@types/graceful-fs": ^4.1.3 - "@types/node": "*" - "@types/picomatch": ^2.2.2 - chalk: ^4.0.0 - ci-info: ^3.2.0 - graceful-fs: ^4.2.9 - picomatch: ^2.2.3 - languageName: unknown - linkType: soft - "jest-util@npm:^26.0.0": version: 26.6.2 resolution: "jest-util@npm:26.6.2" @@ -12926,6 +12911,21 @@ __metadata: languageName: node linkType: hard +"jest-util@workspace:^, jest-util@workspace:packages/jest-util": + version: 0.0.0-use.local + resolution: "jest-util@workspace:packages/jest-util" + dependencies: + "@jest/types": "workspace:^" + "@types/graceful-fs": ^4.1.3 + "@types/node": "*" + "@types/picomatch": ^2.2.2 + chalk: ^4.0.0 + ci-info: ^3.2.0 + graceful-fs: ^4.2.9 + picomatch: ^2.2.3 + languageName: unknown + linkType: soft + "jest-validate@npm:^26.5.2": version: 26.6.2 resolution: "jest-validate@npm:26.6.2" @@ -13038,7 +13038,7 @@ __metadata: "@types/supports-color": ^8.1.0 get-stream: ^6.0.0 jest-leak-detector: "workspace:^" - jest-util: ^29.1.0 + jest-util: "workspace:^" merge-stream: ^2.0.0 supports-color: ^8.0.0 tsd-lite: ^0.6.0 From b070fbad0dfaf62bc4baaa5a67ac13a87d2871c4 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 30 Sep 2022 08:52:32 +0200 Subject: [PATCH 4/5] tsconfig --- packages/jest-worker/tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-worker/tsconfig.json b/packages/jest-worker/tsconfig.json index 8f5708f84441..079c1dfca81e 100644 --- a/packages/jest-worker/tsconfig.json +++ b/packages/jest-worker/tsconfig.json @@ -6,5 +6,5 @@ }, "include": ["./src/**/*"], "exclude": ["./**/__tests__/**/*"], - "references": [{"path": "../jest-leak-detector"}] + "references": [{"path": "../jest-leak-detector"}, {"path": "../jest-util"}] } From 38322f335f379f2d949fe88e02054694ca37b024 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Fri, 30 Sep 2022 08:54:26 +0200 Subject: [PATCH 5/5] changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index e6feea165a2b..8725fae1c77d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -5,6 +5,7 @@ ### Fixes - `[expect, @jest/expect]` Revert buggy inference of argument types for `*CalledWith` and `*ReturnedWith` matchers introduced in 29.1.0 ([#13339](https://github.com/facebook/jest/pull/13339)) +- `[jest-worker]` Add missing dependency on `jest-util` ([#13341](https://github.com/facebook/jest/pull/13341)) ### Chore & Maintenance