Skip to content

Commit 602f995

Browse files
SimenBSimenB
committed
revert worker changes
1 parent 01ab943 commit 602f995

9 files changed

Lines changed: 12 additions & 140 deletions

File tree

‎CHANGELOG.md‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
- `[jest-transform]` [**BREAKING**] Refactor API of transformers to pass an options bag rather than separate `config` and other options ([#10834](https://github.com/facebook/jest/pull/10834))
5050
- `[jest-worker]` [**BREAKING**] Use named exports ([#10623] (https://github.com/facebook/jest/pull/10623))
5151
- `[jest-worker]` Do not swallow errors during serialization ([#10984] (https://github.com/facebook/jest/pull/10984))
52-
- `[jest-worker]` Handle passing messages with circular data ([#10981] (https://github.com/facebook/jest/pull/10981))
5352
- `[pretty-format]` [**BREAKING**] Convert to ES Modules ([#10515](https://github.com/facebook/jest/pull/10515))
5453

5554
### Chore & Maintenance

‎packages/jest-worker/package.json‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,7 @@
1616
"dependencies": {
1717
"@types/node": "*",
1818
"merge-stream": "^2.0.0",
19-
"supports-color": "^8.0.0",
20-
"telejson": "^5.1.0"
19+
"supports-color": "^8.0.0"
2120
},
2221
"devDependencies": {
2322
"@types/merge-stream": "^1.1.2",

‎packages/jest-worker/src/workers/ChildProcessWorker.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
WorkerInterface,
2424
WorkerOptions,
2525
} from '../types';
26-
import {parse} from './utils';
2726

2827
const SIGNAL_BASE_EXIT_CODE = 128;
2928
const SIGKILL_EXIT_CODE = SIGNAL_BASE_EXIT_CODE + 9;
@@ -163,7 +162,7 @@ export default class ChildProcessWorker implements WorkerInterface {
163162

164163
switch (response[0]) {
165164
case PARENT_MESSAGE_OK:
166-
this._onProcessEnd(null, parse(response[1]));
165+
this._onProcessEnd(null, response[1]);
167166
break;
168167

169168
case PARENT_MESSAGE_CLIENT_ERROR:
@@ -196,7 +195,7 @@ export default class ChildProcessWorker implements WorkerInterface {
196195
this._onProcessEnd(error, null);
197196
break;
198197
case PARENT_MESSAGE_CUSTOM:
199-
this._onCustomMessage(parse(response[1]));
198+
this._onCustomMessage(response[1]);
200199
break;
201200
default:
202201
throw new TypeError('Unexpected response from worker: ' + response[0]);

‎packages/jest-worker/src/workers/NodeThreadsWorker.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import {
2323
WorkerInterface,
2424
WorkerOptions,
2525
} from '../types';
26-
import {parse} from './utils';
2726

2827
export default class ExperimentalWorker implements WorkerInterface {
2928
private _worker!: Worker;
@@ -142,7 +141,7 @@ export default class ExperimentalWorker implements WorkerInterface {
142141

143142
switch (response[0]) {
144143
case PARENT_MESSAGE_OK:
145-
this._onProcessEnd(null, parse(response[1]));
144+
this._onProcessEnd(null, response[1]);
146145
break;
147146

148147
case PARENT_MESSAGE_CLIENT_ERROR:
@@ -176,7 +175,7 @@ export default class ExperimentalWorker implements WorkerInterface {
176175
this._onProcessEnd(error, null);
177176
break;
178177
case PARENT_MESSAGE_CUSTOM:
179-
this._onCustomMessage(parse(response[1]));
178+
this._onCustomMessage(response[1]);
180179
break;
181180
default:
182181
throw new TypeError('Unexpected response from worker: ' + response[0]);

‎packages/jest-worker/src/workers/messageParent.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
*/
77

88
import {PARENT_MESSAGE_CUSTOM} from '../types';
9-
import {serialize} from './utils';
109

1110
const isWorkerThread: boolean = (() => {
1211
try {
@@ -31,9 +30,9 @@ export default function messageParent(
3130
parentPort,
3231
} = require('worker_threads') as typeof import('worker_threads');
3332
// ! is safe due to `null` check in `isWorkerThread`
34-
parentPort!.postMessage([PARENT_MESSAGE_CUSTOM, serialize(message)]);
33+
parentPort!.postMessage([PARENT_MESSAGE_CUSTOM, message]);
3534
} else if (typeof parentProcess.send === 'function') {
36-
parentProcess.send([PARENT_MESSAGE_CUSTOM, serialize(message)]);
35+
parentProcess.send([PARENT_MESSAGE_CUSTOM, message]);
3736
} else {
3837
throw new Error('"messageParent" can only be used inside a worker');
3938
}

‎packages/jest-worker/src/workers/processChild.ts‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import {
1616
PARENT_MESSAGE_OK,
1717
PARENT_MESSAGE_SETUP_ERROR,
1818
} from '../types';
19-
import {serialize} from './utils';
2019

2120
let file: string | null = null;
2221
let setupArgs: Array<unknown> = [];
@@ -65,7 +64,7 @@ function reportSuccess(result: unknown) {
6564
throw new Error('Child can only be used on a forked process');
6665
}
6766

68-
process.send([PARENT_MESSAGE_OK, serialize(result)]);
67+
process.send([PARENT_MESSAGE_OK, result]);
6968
}
7069

7170
function reportClientError(error: Error) {
@@ -87,7 +86,7 @@ function reportError(error: Error, type: PARENT_MESSAGE_ERROR) {
8786

8887
process.send([
8988
type,
90-
error.constructor?.name,
89+
error.constructor && error.constructor.name,
9190
error.message,
9291
error.stack,
9392
typeof error === 'object' ? {...error} : error,

‎packages/jest-worker/src/workers/threadChild.ts‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ import {
1717
PARENT_MESSAGE_OK,
1818
PARENT_MESSAGE_SETUP_ERROR,
1919
} from '../types';
20-
import {serialize} from './utils';
2120

2221
let file: string | null = null;
2322
let setupArgs: Array<unknown> = [];
@@ -66,7 +65,7 @@ function reportSuccess(result: unknown) {
6665
throw new Error('Child can only be used on a forked process');
6766
}
6867

69-
parentPort!.postMessage([PARENT_MESSAGE_OK, serialize(result)]);
68+
parentPort!.postMessage([PARENT_MESSAGE_OK, result]);
7069
}
7170

7271
function reportClientError(error: Error) {

‎packages/jest-worker/src/workers/utils.ts‎

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎yarn.lock‎

Lines changed: 2 additions & 89 deletions
Original file line numberDiff line numberDiff line change
@@ -3605,13 +3605,6 @@ __metadata:
36053605
languageName: node
36063606
linkType: hard
36073607

3608-
"@types/is-function@npm:^1.0.0":
3609-
version: 1.0.0
3610-
resolution: "@types/is-function@npm:1.0.0"
3611-
checksum: 6cfa84eac88803fc3fcff37f452fa9fd029f434d6fee75db265b0e67603c781c8fa646b8a1f5056c307ac16313ead1c7f06c884ddee27bba7ec6c0362ce4f516
3612-
languageName: node
3613-
linkType: hard
3614-
36153608
"@types/istanbul-lib-coverage@npm:*, @types/istanbul-lib-coverage@npm:^2.0.0, @types/istanbul-lib-coverage@npm:^2.0.1":
36163609
version: 2.0.3
36173610
resolution: "@types/istanbul-lib-coverage@npm:2.0.3"
@@ -7519,13 +7512,6 @@ __metadata:
75197512
languageName: node
75207513
linkType: hard
75217514

7522-
"dom-walk@npm:^0.1.0":
7523-
version: 0.1.2
7524-
resolution: "dom-walk@npm:0.1.2"
7525-
checksum: 948c7527f3798cae9d7039cc0e5dc9f013ebd701d7d99478bac79d7d9eb8b81e7b6e836526e21ed9b156466b268e30ea0f2d5b72df955fabec3ce2aa7dc0086e
7526-
languageName: node
7527-
linkType: hard
7528-
75297515
"domelementtype@npm:1, domelementtype@npm:^1.3.0, domelementtype@npm:^1.3.1":
75307516
version: 1.3.1
75317517
resolution: "domelementtype@npm:1.3.1"
@@ -9816,16 +9802,6 @@ fsevents@^1.2.7:
98169802
languageName: node
98179803
linkType: hard
98189804

9819-
"global@npm:^4.4.0":
9820-
version: 4.4.0
9821-
resolution: "global@npm:4.4.0"
9822-
dependencies:
9823-
min-document: ^2.19.0
9824-
process: ^0.11.10
9825-
checksum: da0cf92ef034b63cf4d0fe5e14cb71bc4c748b8c1bbeabe4061443562ba8e9027774f8074e66543fa98f0d965da6d11e0861e3bf8c628b7ab19220e8ee18cc71
9826-
languageName: node
9827-
linkType: hard
9828-
98299805
"globals@npm:^11.1.0":
98309806
version: 11.12.0
98319807
resolution: "globals@npm:11.12.0"
@@ -11069,13 +11045,6 @@ fsevents@^1.2.7:
1106911045
languageName: node
1107011046
linkType: hard
1107111047

11072-
"is-function@npm:^1.0.2":
11073-
version: 1.0.2
11074-
resolution: "is-function@npm:1.0.2"
11075-
checksum: 894562b5e4dcf3544eb0b5c26ba94e08c99007728059782f5e863296e865af9b7d2bcad06057d20bb862943dcfc9bb1387fedb4cdc953af93bd0a70ad61a3ba1
11076-
languageName: node
11077-
linkType: hard
11078-
1107911048
"is-generator-fn@npm:^2.0.0":
1108011049
version: 2.1.0
1108111050
resolution: "is-generator-fn@npm:2.1.0"
@@ -11351,7 +11320,7 @@ fsevents@^1.2.7:
1135111320
languageName: node
1135211321
linkType: hard
1135311322

11354-
"is-symbol@npm:^1.0.2, is-symbol@npm:^1.0.3":
11323+
"is-symbol@npm:^1.0.2":
1135511324
version: 1.0.3
1135611325
resolution: "is-symbol@npm:1.0.3"
1135711326
dependencies:
@@ -11482,13 +11451,6 @@ fsevents@^1.2.7:
1148211451
languageName: node
1148311452
linkType: hard
1148411453

11485-
"isobject@npm:^4.0.0":
11486-
version: 4.0.0
11487-
resolution: "isobject@npm:4.0.0"
11488-
checksum: bfc8e8f6e2bebf7d85e4bec91497e24f87e6b33576d03e223ff6ce1679f5a7dc6f357fdb3e1c6c6d85fc6f0feac26acca9e9e7b0ab473ea60fa3f838c203ee01
11489-
languageName: node
11490-
linkType: hard
11491-
1149211454
"isomorphic-fetch@npm:^2.1.1":
1149311455
version: 2.2.1
1149411456
resolution: "isomorphic-fetch@npm:2.2.1"
@@ -12372,7 +12334,6 @@ fsevents@^1.2.7:
1237212334
get-stream: ^6.0.0
1237312335
merge-stream: ^2.0.0
1237412336
supports-color: ^8.0.0
12375-
telejson: ^5.1.0
1237612337
worker-farm: ^1.6.0
1237712338
languageName: unknown
1237812339
linkType: soft
@@ -13170,7 +13131,7 @@ fsevents@^1.2.7:
1317013131
languageName: node
1317113132
linkType: hard
1317213133

13173-
"lodash@npm:^4.15.0, lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.20, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.3.0, lodash@npm:~4.17.10":
13134+
"lodash@npm:^4.15.0, lodash@npm:^4.17.12, lodash@npm:^4.17.14, lodash@npm:^4.17.15, lodash@npm:^4.17.19, lodash@npm:^4.17.4, lodash@npm:^4.2.1, lodash@npm:^4.3.0, lodash@npm:~4.17.10":
1317413135
version: 4.17.20
1317513136
resolution: "lodash@npm:4.17.20"
1317613137
checksum: c62101d2500c383b5f174a7e9e6fe8098149ddd6e9ccfa85f36d4789446195f5c4afd3cfba433026bcaf3da271256566b04a2bf2618e5a39f6e67f8c12030cb6
@@ -13416,13 +13377,6 @@ fsevents@^1.2.7:
1341613377
languageName: node
1341713378
linkType: hard
1341813379

13419-
"map-or-similar@npm:^1.5.0":
13420-
version: 1.5.0
13421-
resolution: "map-or-similar@npm:1.5.0"
13422-
checksum: 3d759eff8025ad5d1e96acc618379f4664be56abdcca1d4f08a8e8df7c3ca6359acbc117611279d972405c0b4347ab28a6724c666dd25006f745bf487dc261d7
13423-
languageName: node
13424-
linkType: hard
13425-
1342613380
"map-visit@npm:^1.0.0":
1342713381
version: 1.0.0
1342813382
resolution: "map-visit@npm:1.0.0"
@@ -13505,15 +13459,6 @@ fsevents@^1.2.7:
1350513459
languageName: node
1350613460
linkType: hard
1350713461

13508-
"memoizerific@npm:^1.11.3":
13509-
version: 1.11.3
13510-
resolution: "memoizerific@npm:1.11.3"
13511-
dependencies:
13512-
map-or-similar: ^1.5.0
13513-
checksum: 6601aab4719d269884882b24fc94d33da054817b6472b586dc9117773661abf838f838f5b80d202b8d84f942bcac63421a3044ef31f1af9790eed3f32e33eac6
13514-
languageName: node
13515-
linkType: hard
13516-
1351713462
"memory-pager@npm:^1.0.2":
1351813463
version: 1.5.0
1351913464
resolution: "memory-pager@npm:1.5.0"
@@ -14123,15 +14068,6 @@ fsevents@^1.2.7:
1412314068
languageName: node
1412414069
linkType: hard
1412514070

14126-
"min-document@npm:^2.19.0":
14127-
version: 2.19.0
14128-
resolution: "min-document@npm:2.19.0"
14129-
dependencies:
14130-
dom-walk: ^0.1.0
14131-
checksum: 8da883996e00a53729e867dad45a358c6d8b3b55f2473a20768c1a2b4642d0983bc61827cf29eb98c53d7290c2a1a74a5cba60873857da416bdfae09bf73bb21
14132-
languageName: node
14133-
linkType: hard
14134-
1413514071
"min-indent@npm:^1.0.0":
1413614072
version: 1.0.1
1413714073
resolution: "min-indent@npm:1.0.1"
@@ -16299,13 +16235,6 @@ fsevents@^1.2.7:
1629916235
languageName: node
1630016236
linkType: hard
1630116237

16302-
"process@npm:^0.11.10":
16303-
version: 0.11.10
16304-
resolution: "process@npm:0.11.10"
16305-
checksum: ed93a85e9185b40fb01788c588a87c1a9da0eb925ef7cebebbe1b8bbf0eba1802130366603a29e3b689c116969d4fe018de6aed3474bbeb5aefb3716b85d6449
16306-
languageName: node
16307-
linkType: hard
16308-
1630916238
"progress@npm:^2.0.0":
1631016239
version: 2.0.3
1631116240
resolution: "progress@npm:2.0.3"
@@ -18888,22 +18817,6 @@ react-native@0.63.2:
1888818817
languageName: node
1888918818
linkType: hard
1889018819

18891-
"telejson@npm:^5.1.0":
18892-
version: 5.1.0
18893-
resolution: "telejson@npm:5.1.0"
18894-
dependencies:
18895-
"@types/is-function": ^1.0.0
18896-
global: ^4.4.0
18897-
is-function: ^1.0.2
18898-
is-regex: ^1.1.1
18899-
is-symbol: ^1.0.3
18900-
isobject: ^4.0.0
18901-
lodash: ^4.17.20
18902-
memoizerific: ^1.11.3
18903-
checksum: 6e74253262887cfc85098ded1f6cda053a8183fb3885ceda9b56e18a35736aa81ce73204d783a474a0457b1f1b5b1ebd0dd54abb8731de49f4df6515bba4638c
18904-
languageName: node
18905-
linkType: hard
18906-
1890718820
"temp-dir@npm:^1.0.0":
1890818821
version: 1.0.0
1890918822
resolution: "temp-dir@npm:1.0.0"

0 commit comments

Comments
 (0)
⚡