Skip to content

Commit a4d87e2

Browse files
committed
Fix Conflict
2 parents 149502d + def3b01 commit a4d87e2

12 files changed

Lines changed: 18 additions & 16 deletions

File tree

CHANGELOG.md

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
- `[jest-transform]` [**BREAKING**] Refactor API to pass an options bag around rather than multiple boolean options ([#10753](https://github.com/facebook/jest/pull/10753))
3131
- `[jest-transform]` [**BREAKING**] Refactor API of transformers to pass an options bag rather than separate `config` and other options
3232
- `[pretty-format]` [**BREAKING**] Convert to ES Modules ([#10515](https://github.com/facebook/jest/pull/10515))
33+
- `[jest-worker, jest-haste-map, jest-runner, jest-reporters]` Fix: jest-worker: should not expose `.default` babel interop ([#10623] (https://github.com/facebook/jest/pull/10623))
34+
3335

3436
### Chore & Maintenance
3537

packages/jest-haste-map/src/__tests__/index.test.js

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@ jest.mock('child_process', () => ({
1919
execSync() {},
2020
}));
2121

22-
jest.mock('jest-worker', () =>
23-
jest.fn(worker => {
22+
jest.mock('jest-worker', () => ({
23+
Worker: jest.fn(worker => {
2424
mockWorker = jest.fn((...args) => require(worker).worker(...args));
2525
mockEnd = jest.fn();
2626

@@ -29,7 +29,7 @@ jest.mock('jest-worker', () =>
2929
worker: mockWorker,
3030
};
3131
}),
32-
);
32+
}));
3333

3434
jest.mock('../crawlers/node');
3535
jest.mock('../crawlers/watchman', () =>
@@ -1201,7 +1201,7 @@ describe('HasteMap', () => {
12011201
});
12021202

12031203
it('distributes work across workers', () => {
1204-
const jestWorker = require('jest-worker');
1204+
const jestWorker = require('jest-worker').Worker;
12051205
const path = require('path');
12061206
const dependencyExtractor = path.join(__dirname, 'dependencyExtractor.js');
12071207
return new HasteMap({

packages/jest-haste-map/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import {NodeWatcher, Watcher as SaneWatcher} from 'sane';
1717
import type {Config} from '@jest/types';
1818
import {escapePathForRegex} from 'jest-regex-util';
1919
import serializer from 'jest-serializer';
20-
import Worker from 'jest-worker';
20+
import {Worker} from 'jest-worker';
2121
import HasteFS from './HasteFS';
2222
import HasteModuleMap from './ModuleMap';
2323
import H from './constants';

packages/jest-reporters/src/CoverageReporter.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import type {
2424
} from '@jest/test-result';
2525
import type {Config} from '@jest/types';
2626
import {clearLine, isInteractive} from 'jest-util';
27-
import Worker from 'jest-worker';
27+
import {Worker} from 'jest-worker';
2828
import BaseReporter from './BaseReporter';
2929
import getWatermarks from './getWatermarks';
3030
import type {

packages/jest-runner/src/__tests__/testRunner.test.ts

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import TestRunner from '../index';
1111

1212
let mockWorkerFarm;
1313

14-
jest.mock('jest-worker', () =>
15-
jest.fn(
14+
jest.mock('jest-worker', () => ({
15+
Worker: jest.fn(
1616
worker =>
1717
(mockWorkerFarm = {
1818
end: jest.fn().mockResolvedValue({forceExited: false}),
@@ -21,7 +21,7 @@ jest.mock('jest-worker', () =>
2121
worker: jest.fn((data, callback) => require(worker)(data, callback)),
2222
}),
2323
),
24-
);
24+
}));
2525

2626
jest.mock('../testWorker', () => {});
2727

packages/jest-runner/src/index.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import throat from 'throat';
1212
import type {SerializableError, TestResult} from '@jest/test-result';
1313
import type {Config} from '@jest/types';
1414
import {deepCyclicCopy} from 'jest-util';
15-
import Worker, {PromiseWithCustomMessage} from 'jest-worker';
15+
import {PromiseWithCustomMessage, Worker} from 'jest-worker';
1616
import runTest from './runTest';
1717
import type {SerializableResolver, worker} from './testWorker';
1818
import type {

packages/jest-worker/README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ This example covers the usage with a `computeWorkerKey` method:
181181
### File `parent.js`
182182

183183
```javascript
184-
import JestWorker from 'jest-worker';
184+
import {Worker as JestWorker} from 'jest-worker';
185185

186186
async function main() {
187187
const myWorker = new JestWorker(require.resolve('./Worker'), {

packages/jest-worker/src/__performance_tests__/test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
const assert = require('assert');
1111
// eslint-disable-next-line import/no-extraneous-dependencies
1212
const workerFarm = require('worker-farm');
13-
const JestWorker = require('../../build').default;
13+
const JestWorker = require('../../build').Worker;
1414

1515
// Typical tests: node --expose-gc test.js empty 100000
1616
// node --expose-gc test.js loadTest 10000

packages/jest-worker/src/__tests__/index.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ beforeEach(() => {
5252
virtual: true,
5353
});
5454

55-
Farm = require('..').default;
55+
Farm = require('..').Worker;
5656
Queue = require('../Farm').default;
5757
WorkerPool = require('../WorkerPool').default;
5858
});

packages/jest-worker/src/__tests__/process-integration.test.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ describe('Jest Worker Integration', () => {
5555
},
5656
}));
5757

58-
Farm = require('../index').default;
58+
Farm = require('../index').Worker;
5959
});
6060

6161
afterEach(() => {

0 commit comments

Comments
 (0)