From 847c898c7a1bbf3e102434bf554e6be26191eb76 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 10:26:36 +0100 Subject: [PATCH 1/4] fix: remove defensive code marked for removal --- packages/jest-config/src/index.ts | 3 --- packages/jest-resolve/src/utils.ts | 20 ++++++++------------ packages/jest-runner/src/index.ts | 3 --- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/packages/jest-config/src/index.ts b/packages/jest-config/src/index.ts index e22cd5dfb754..dc3d063fc257 100644 --- a/packages/jest-config/src/index.ts +++ b/packages/jest-config/src/index.ts @@ -16,9 +16,6 @@ import readConfigFileAndSetRootDir from './readConfigFileAndSetRootDir'; import resolveConfigPath from './resolveConfigPath'; import {isJSONString, replaceRootDirInPath} from './utils'; -// TODO: remove export in Jest 28 -export {resolveTestEnvironment as getTestEnvironment} from 'jest-resolve'; - export {isJSONString} from './utils'; export {default as normalize} from './normalize'; export {default as deprecationEntries} from './Deprecated'; diff --git a/packages/jest-resolve/src/utils.ts b/packages/jest-resolve/src/utils.ts index f0fcef054fb0..3c05694c4ef8 100644 --- a/packages/jest-resolve/src/utils.ts +++ b/packages/jest-resolve/src/utils.ts @@ -96,12 +96,11 @@ const resolveWithPrefix = ( export const resolveTestEnvironment = ({ rootDir, testEnvironment: filePath, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction }: { rootDir: Config.Path; testEnvironment: string; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }): string => resolveWithPrefix(undefined, { filePath, @@ -125,12 +124,11 @@ export const resolveWatchPlugin = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { @@ -155,12 +153,11 @@ export const resolveRunner = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { @@ -177,12 +174,11 @@ export const resolveSequencer = ( { filePath, rootDir, - // TODO: remove default in Jest 28 - requireResolveFunction = require.resolve, + requireResolveFunction, }: { filePath: string; rootDir: Config.Path; - requireResolveFunction?: (moduleName: string) => string; + requireResolveFunction: (moduleName: string) => string; }, ): string => resolveWithPrefix(resolver, { diff --git a/packages/jest-runner/src/index.ts b/packages/jest-runner/src/index.ts index 2a471a35c493..88785a096342 100644 --- a/packages/jest-runner/src/index.ts +++ b/packages/jest-runner/src/index.ts @@ -28,9 +28,6 @@ import type { TestWatcher, } from './types'; -// TODO: remove re-export in Jest 28 -export type {Test, TestFileEvent, TestEvents} from '@jest/test-result'; - const TEST_WORKER_PATH = require.resolve('./testWorker'); interface WorkerInterface extends Worker { From c006a30a1b335064b9590ce72bddd07131d4292f Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 10:29:22 +0100 Subject: [PATCH 2/4] changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index f7da446a4d95..f39dcd27b895 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -22,7 +22,10 @@ - `[*]` [**BREAKING**] Drop support for `typescript@3.8`, minimum version is now `4.2` ([#11142](https://github.com/facebook/jest/pull/11142)) - `[*]` Bundle all `.d.ts` files into a single `index.d.ts` per module ([#12345](https://github.com/facebook/jest/pull/12345)) - `[expect]` [**BREAKING**] Remove support for importing `build/utils` ([#12323](https://github.com/facebook/jest/pull/12323)) +- `[jest-config]` [**BREAKING**] Remove `getTestEnvironment` export ([#12353](https://github.com/facebook/jest/pull/12353)) - `[@jest/core]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) +- `[jest-resolve]` [**BREAKING**] Make `requireResolveFunction` argument mandatory ([#12353](https://github.com/facebook/jest/pull/12353)) +- `[jest-runner]` [**BREAKING**] Remove some type exports from `@jest/test-result` ([#12353](https://github.com/facebook/jest/pull/12353)) - `[jest]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) ### Performance From ca3782218baba46fcb05490627f2b3103141a653 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 10:52:35 +0100 Subject: [PATCH 3/4] prettier --- packages/jest-resolve/src/utils.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/jest-resolve/src/utils.ts b/packages/jest-resolve/src/utils.ts index 3c05694c4ef8..045356edbe2c 100644 --- a/packages/jest-resolve/src/utils.ts +++ b/packages/jest-resolve/src/utils.ts @@ -96,7 +96,7 @@ const resolveWithPrefix = ( export const resolveTestEnvironment = ({ rootDir, testEnvironment: filePath, - requireResolveFunction + requireResolveFunction, }: { rootDir: Config.Path; testEnvironment: string; From c34c736ad66f52be9499747a04ed46f58b02f1a7 Mon Sep 17 00:00:00 2001 From: Simen Bekkhus Date: Thu, 10 Feb 2022 11:04:24 +0100 Subject: [PATCH 4/4] bah --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index f39dcd27b895..86c41bff777f 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -25,7 +25,7 @@ - `[jest-config]` [**BREAKING**] Remove `getTestEnvironment` export ([#12353](https://github.com/facebook/jest/pull/12353)) - `[@jest/core]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) - `[jest-resolve]` [**BREAKING**] Make `requireResolveFunction` argument mandatory ([#12353](https://github.com/facebook/jest/pull/12353)) -- `[jest-runner]` [**BREAKING**] Remove some type exports from `@jest/test-result` ([#12353](https://github.com/facebook/jest/pull/12353)) +- `[jest-runner]` [**BREAKING**] Remove some type exports from `@jest/test-result` ([#12353](https://github.com/facebook/jest/pull/12353)) - `[jest]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329)) ### Performance