From 9c9895e370dba4c7c09105515a77058969628bb7 Mon Sep 17 00:00:00 2001 From: Tayeeb Hasan Date: Sun, 11 Oct 2020 16:11:18 +0530 Subject: [PATCH 1/8] default export to named export - JestWorker --- packages/jest-haste-map/src/index.ts | 2 +- packages/jest-reporters/src/CoverageReporter.ts | 6 ++---- packages/jest-runner/src/index.ts | 2 +- packages/jest-worker/src/index.ts | 2 +- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/packages/jest-haste-map/src/index.ts b/packages/jest-haste-map/src/index.ts index 6f5acf9582d0..416c44d162e5 100644 --- a/packages/jest-haste-map/src/index.ts +++ b/packages/jest-haste-map/src/index.ts @@ -17,7 +17,7 @@ import {NodeWatcher, Watcher as SaneWatcher} from 'sane'; import type {Config} from '@jest/types'; import {escapePathForRegex} from 'jest-regex-util'; import serializer from 'jest-serializer'; -import Worker from 'jest-worker'; +import {Worker} from 'jest-worker'; import HasteFS from './HasteFS'; import HasteModuleMap from './ModuleMap'; import H from './constants'; diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index 73687e1f77b5..3ad2ab8b89a9 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -9,7 +9,6 @@ import * as path from 'path'; import {mergeProcessCovs} from '@bcoe/v8-coverage'; import chalk = require('chalk'); import glob = require('glob'); -import * as fs from 'graceful-fs'; import istanbulCoverage = require('istanbul-lib-coverage'); import istanbulReport = require('istanbul-lib-report'); import libSourceMaps = require('istanbul-lib-source-maps'); @@ -24,9 +23,8 @@ import type { } from '@jest/test-result'; import type {Config} from '@jest/types'; import {clearLine, isInteractive} from 'jest-util'; -import Worker from 'jest-worker'; -import BaseReporter from './BaseReporter'; -import getWatermarks from './getWatermarks'; +import {Worker} from 'jest-worker'; +import BaseReporter from './base_reporter'; import type { Context, CoverageReporterOptions, diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index da911414832a..ea74f863566c 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -12,7 +12,7 @@ import throat from 'throat'; import type {SerializableError, TestResult} from '@jest/test-result'; import type {Config} from '@jest/types'; import {deepCyclicCopy} from 'jest-util'; -import Worker, {PromiseWithCustomMessage} from 'jest-worker'; +import {PromiseWithCustomMessage, Worker} from 'jest-worker'; import runTest from './runTest'; import type {SerializableResolver, worker} from './testWorker'; import type { diff --git a/packages/jest-worker/src/index.ts b/packages/jest-worker/src/index.ts index 5b2613acda37..19ee73b156cc 100644 --- a/packages/jest-worker/src/index.ts +++ b/packages/jest-worker/src/index.ts @@ -67,7 +67,7 @@ function getExposedMethods( * processed by the same worker. This is specially useful if your workers * are caching results. */ -export default class JestWorker { +export class Worker { private _ending: boolean; private _farm: Farm; private _options: FarmOptions; From f7743bdac12e5aed7012dfbf2200fa2d30cfbe90 Mon Sep 17 00:00:00 2001 From: Olufemi Anjorin Date: Sun, 11 Oct 2020 16:36:01 +0100 Subject: [PATCH 2/8] Fix-export-default-worker --- packages/jest-worker/src/__tests__/index.test.js | 2 +- packages/jest-worker/src/__tests__/process-integration.test.js | 2 +- packages/jest-worker/src/__tests__/thread-integration.test.js | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/jest-worker/src/__tests__/index.test.js b/packages/jest-worker/src/__tests__/index.test.js index 5fbd5293fef5..ec6f091289d5 100644 --- a/packages/jest-worker/src/__tests__/index.test.js +++ b/packages/jest-worker/src/__tests__/index.test.js @@ -52,7 +52,7 @@ beforeEach(() => { virtual: true, }); - Farm = require('..').default; + Farm = require('..').Worker; Queue = require('../Farm').default; WorkerPool = require('../WorkerPool').default; }); diff --git a/packages/jest-worker/src/__tests__/process-integration.test.js b/packages/jest-worker/src/__tests__/process-integration.test.js index b2d716669915..efc19257e57f 100644 --- a/packages/jest-worker/src/__tests__/process-integration.test.js +++ b/packages/jest-worker/src/__tests__/process-integration.test.js @@ -55,7 +55,7 @@ describe('Jest Worker Integration', () => { }, })); - Farm = require('../index').default; + Farm = require('../index').Worker; }); afterEach(() => { diff --git a/packages/jest-worker/src/__tests__/thread-integration.test.js b/packages/jest-worker/src/__tests__/thread-integration.test.js index fb97ecf24b30..206871f00940 100644 --- a/packages/jest-worker/src/__tests__/thread-integration.test.js +++ b/packages/jest-worker/src/__tests__/thread-integration.test.js @@ -56,7 +56,7 @@ describe('Jest Worker Process Integration', () => { }; }); - Farm = require('../index').default; + Farm = require('../index').Worker; }); afterEach(() => { From 9b35d6c45869bd09dfb636440a137d3dfb46433c Mon Sep 17 00:00:00 2001 From: Olufemi Anjorin Date: Mon, 12 Oct 2020 00:09:24 +0100 Subject: [PATCH 3/8] Fix:jest-worker:should-not-expose--babel-interop --- CHANGELOG.md | 1 + packages/jest-haste-map/src/__tests__/index.test.js | 8 ++++---- packages/jest-runner/src/__tests__/testRunner.test.ts | 6 +++--- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 56a87a6ec150..5595825edba4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -30,6 +30,7 @@ - `[jest-transform]` [**BREAKING**] Refactor API to pass an options bag around rather than multiple boolean options ([#10753](https://github.com/facebook/jest/pull/10753)) - `[jest-transform]` [**BREAKING**] Refactor API of transformers to pass an options bag rather than separate `config` and other options - `[pretty-format]` [**BREAKING**] Convert to ES Modules ([#10515](https://github.com/facebook/jest/pull/10515)) +- `[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)) ### Chore & Maintenance diff --git a/packages/jest-haste-map/src/__tests__/index.test.js b/packages/jest-haste-map/src/__tests__/index.test.js index 19702655fdc3..650069b81785 100644 --- a/packages/jest-haste-map/src/__tests__/index.test.js +++ b/packages/jest-haste-map/src/__tests__/index.test.js @@ -19,8 +19,8 @@ jest.mock('child_process', () => ({ execSync() {}, })); -jest.mock('jest-worker', () => - jest.fn(worker => { +jest.mock('jest-worker', () => ({ + Worker: jest.fn(worker => { mockWorker = jest.fn((...args) => require(worker).worker(...args)); mockEnd = jest.fn(); @@ -29,7 +29,7 @@ jest.mock('jest-worker', () => worker: mockWorker, }; }), -); +})); jest.mock('../crawlers/node'); jest.mock('../crawlers/watchman', () => @@ -1201,7 +1201,7 @@ describe('HasteMap', () => { }); it('distributes work across workers', () => { - const jestWorker = require('jest-worker'); + const jestWorker = require('jest-worker').Worker; const path = require('path'); const dependencyExtractor = path.join(__dirname, 'dependencyExtractor.js'); return new HasteMap({ diff --git a/packages/jest-runner/src/__tests__/testRunner.test.ts b/packages/jest-runner/src/__tests__/testRunner.test.ts index df266697abaf..16fd75e183ad 100644 --- a/packages/jest-runner/src/__tests__/testRunner.test.ts +++ b/packages/jest-runner/src/__tests__/testRunner.test.ts @@ -11,8 +11,8 @@ import TestRunner from '../index'; let mockWorkerFarm; -jest.mock('jest-worker', () => - jest.fn( +jest.mock('jest-worker', () => ({ + Worker: jest.fn( worker => (mockWorkerFarm = { end: jest.fn().mockResolvedValue({forceExited: false}), @@ -21,7 +21,7 @@ jest.mock('jest-worker', () => worker: jest.fn((data, callback) => require(worker)(data, callback)), }), ), -); +})); jest.mock('../testWorker', () => {}); From eb16d3f6d16ecccbf2c329e6602c308739481a38 Mon Sep 17 00:00:00 2001 From: Olufemi Anjorin Date: Mon, 12 Oct 2020 07:04:13 +0100 Subject: [PATCH 4/8] Fix:jest-worker:should-not-expose--babel-interop --- packages/jest-worker/src/__performance_tests__/test.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-worker/src/__performance_tests__/test.js b/packages/jest-worker/src/__performance_tests__/test.js index 3a688eae05e4..53dbc688b76f 100644 --- a/packages/jest-worker/src/__performance_tests__/test.js +++ b/packages/jest-worker/src/__performance_tests__/test.js @@ -10,7 +10,7 @@ const assert = require('assert'); // eslint-disable-next-line import/no-extraneous-dependencies const workerFarm = require('worker-farm'); -const JestWorker = require('../../build').default; +const JestWorker = require('../../build').Worker; // Typical tests: node --expose-gc test.js empty 100000 // node --expose-gc test.js loadTest 10000 From ea3968484c92ea1ee81e821a7bc0363ddf454590 Mon Sep 17 00:00:00 2001 From: Olufemi Anjorin Date: Mon, 12 Oct 2020 10:03:41 +0100 Subject: [PATCH 5/8] Fix:jest-worker:should-not-expose--babel-interop --- packages/jest-worker/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-worker/README.md b/packages/jest-worker/README.md index d0523c940040..38b7dd60b89b 100644 --- a/packages/jest-worker/README.md +++ b/packages/jest-worker/README.md @@ -181,7 +181,7 @@ This example covers the usage with a `computeWorkerKey` method: ### File `parent.js` ```javascript -import JestWorker from 'jest-worker'; +import {Worker as JestWorker} from 'jest-worker'; async function main() { const myWorker = new JestWorker(require.resolve('./Worker'), { From c93aa469eb052c061e76054f5eb43ba665fea0c9 Mon Sep 17 00:00:00 2001 From: Olufemi Anjorin Date: Sat, 5 Dec 2020 19:05:12 +0100 Subject: [PATCH 6/8] fix --- packages/jest-reporters/src/CoverageReporter.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/jest-reporters/src/CoverageReporter.ts b/packages/jest-reporters/src/CoverageReporter.ts index 3ad2ab8b89a9..034ab6ae9802 100644 --- a/packages/jest-reporters/src/CoverageReporter.ts +++ b/packages/jest-reporters/src/CoverageReporter.ts @@ -9,6 +9,7 @@ import * as path from 'path'; import {mergeProcessCovs} from '@bcoe/v8-coverage'; import chalk = require('chalk'); import glob = require('glob'); +import * as fs from 'graceful-fs'; import istanbulCoverage = require('istanbul-lib-coverage'); import istanbulReport = require('istanbul-lib-report'); import libSourceMaps = require('istanbul-lib-source-maps'); @@ -24,7 +25,8 @@ import type { import type {Config} from '@jest/types'; import {clearLine, isInteractive} from 'jest-util'; import {Worker} from 'jest-worker'; -import BaseReporter from './base_reporter'; +import BaseReporter from './BaseReporter'; +import getWatermarks from './getWatermarks'; import type { Context, CoverageReporterOptions, From 9d481dbb4b3048496f0cd7d5e1fe1cb716c31e70 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 5 Dec 2020 19:32:35 +0100 Subject: [PATCH 7/8] Update CHANGELOG.md --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5595825edba4..5a8b8a6e4a41 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -29,8 +29,8 @@ - `[jest-transform]` Show enhanced `SyntaxError` message for all `SyntaxError`s ([#10749](https://github.com/facebook/jest/pull/10749)) - `[jest-transform]` [**BREAKING**] Refactor API to pass an options bag around rather than multiple boolean options ([#10753](https://github.com/facebook/jest/pull/10753)) - `[jest-transform]` [**BREAKING**] Refactor API of transformers to pass an options bag rather than separate `config` and other options +- `[jest-worker]` [**BREAKING**] Use named exports ([#10623] (https://github.com/facebook/jest/pull/10623)) - `[pretty-format]` [**BREAKING**] Convert to ES Modules ([#10515](https://github.com/facebook/jest/pull/10515)) -- `[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)) ### Chore & Maintenance From 34e3bddc96c9de02845be1e60d47ffb5f1e532eb Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Sat, 5 Dec 2020 19:34:01 +0100 Subject: [PATCH 8/8] Update CHANGELOG.md --- CHANGELOG.md | 1 - 1 file changed, 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index de5a7c6b3455..692ac1876000 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,7 +36,6 @@ - `[jest-runtime]` Fix stack overflow and promise deadlock when importing mutual dependant ES module ([#10892](https://github.com/facebook/jest/pull/10892)) - `[jest-transform]` Show enhanced `SyntaxError` message for all `SyntaxError`s ([#10749](https://github.com/facebook/jest/pull/10749)) - `[jest-transform]` [**BREAKING**] Refactor API to pass an options bag around rather than multiple boolean options ([#10753](https://github.com/facebook/jest/pull/10753)) -- `[jest-transform]` [**BREAKING**] Refactor API of transformers to pass an options bag rather than separate `config` and other options - `[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)) - `[jest-worker]` [**BREAKING**] Use named exports ([#10623] (https://github.com/facebook/jest/pull/10623)) - `[pretty-format]` [**BREAKING**] Convert to ES Modules ([#10515](https://github.com/facebook/jest/pull/10515))