Skip to content

Commit a651b65

Browse files
authored
fix: remove defensive code marked for removal (#12353)
1 parent 45f5a43 commit a651b65

File tree

4 files changed

+11
-18
lines changed

4 files changed

+11
-18
lines changed

CHANGELOG.md

+3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,10 @@
2323
- `[*]` [**BREAKING**] Drop support for `[email protected]`, minimum version is now `4.2` ([#11142](https://github.com/facebook/jest/pull/11142))
2424
- `[*]` Bundle all `.d.ts` files into a single `index.d.ts` per module ([#12345](https://github.com/facebook/jest/pull/12345))
2525
- `[expect]` [**BREAKING**] Remove support for importing `build/utils` ([#12323](https://github.com/facebook/jest/pull/12323))
26+
- `[jest-config]` [**BREAKING**] Remove `getTestEnvironment` export ([#12353](https://github.com/facebook/jest/pull/12353))
2627
- `[@jest/core]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329))
28+
- `[jest-resolve]` [**BREAKING**] Make `requireResolveFunction` argument mandatory ([#12353](https://github.com/facebook/jest/pull/12353))
29+
- `[jest-runner]` [**BREAKING**] Remove some type exports from `@jest/test-result` ([#12353](https://github.com/facebook/jest/pull/12353))
2730
- `[jest]` Use `index.ts` instead of `jest.ts` as main export ([#12329](https://github.com/facebook/jest/pull/12329))
2831

2932
### Performance

packages/jest-config/src/index.ts

-3
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,6 @@ import readConfigFileAndSetRootDir from './readConfigFileAndSetRootDir';
1616
import resolveConfigPath from './resolveConfigPath';
1717
import {isJSONString, replaceRootDirInPath} from './utils';
1818

19-
// TODO: remove export in Jest 28
20-
export {resolveTestEnvironment as getTestEnvironment} from 'jest-resolve';
21-
2219
export {isJSONString} from './utils';
2320
export {default as normalize} from './normalize';
2421
export {default as deprecationEntries} from './Deprecated';

packages/jest-resolve/src/utils.ts

+8-12
Original file line numberDiff line numberDiff line change
@@ -96,12 +96,11 @@ const resolveWithPrefix = (
9696
export const resolveTestEnvironment = ({
9797
rootDir,
9898
testEnvironment: filePath,
99-
// TODO: remove default in Jest 28
100-
requireResolveFunction = require.resolve,
99+
requireResolveFunction,
101100
}: {
102101
rootDir: Config.Path;
103102
testEnvironment: string;
104-
requireResolveFunction?: (moduleName: string) => string;
103+
requireResolveFunction: (moduleName: string) => string;
105104
}): string =>
106105
resolveWithPrefix(undefined, {
107106
filePath,
@@ -125,12 +124,11 @@ export const resolveWatchPlugin = (
125124
{
126125
filePath,
127126
rootDir,
128-
// TODO: remove default in Jest 28
129-
requireResolveFunction = require.resolve,
127+
requireResolveFunction,
130128
}: {
131129
filePath: string;
132130
rootDir: Config.Path;
133-
requireResolveFunction?: (moduleName: string) => string;
131+
requireResolveFunction: (moduleName: string) => string;
134132
},
135133
): string =>
136134
resolveWithPrefix(resolver, {
@@ -155,12 +153,11 @@ export const resolveRunner = (
155153
{
156154
filePath,
157155
rootDir,
158-
// TODO: remove default in Jest 28
159-
requireResolveFunction = require.resolve,
156+
requireResolveFunction,
160157
}: {
161158
filePath: string;
162159
rootDir: Config.Path;
163-
requireResolveFunction?: (moduleName: string) => string;
160+
requireResolveFunction: (moduleName: string) => string;
164161
},
165162
): string =>
166163
resolveWithPrefix(resolver, {
@@ -177,12 +174,11 @@ export const resolveSequencer = (
177174
{
178175
filePath,
179176
rootDir,
180-
// TODO: remove default in Jest 28
181-
requireResolveFunction = require.resolve,
177+
requireResolveFunction,
182178
}: {
183179
filePath: string;
184180
rootDir: Config.Path;
185-
requireResolveFunction?: (moduleName: string) => string;
181+
requireResolveFunction: (moduleName: string) => string;
186182
},
187183
): string =>
188184
resolveWithPrefix(resolver, {

packages/jest-runner/src/index.ts

-3
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,6 @@ import type {
2828
TestWatcher,
2929
} from './types';
3030

31-
// TODO: remove re-export in Jest 28
32-
export type {Test, TestFileEvent, TestEvents} from '@jest/test-result';
33-
3431
const TEST_WORKER_PATH = require.resolve('./testWorker');
3532

3633
interface WorkerInterface extends Worker {

0 commit comments

Comments
 (0)