Skip to content

Commit 5f4dd18

Browse files
SimenBSimenB
authored
chore: remove jest-config dependency from jest-runner (#11466)
1 parent ae3fc94 commit 5f4dd18

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+788
-727
lines changed

‎.eslintrc.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ module.exports = {
7777
'packages/jest-jasmine2/src/jasmine/Suite.ts',
7878
'packages/jest-jasmine2/src/jasmine/jasmineLight.ts',
7979
'packages/jest-jasmine2/src/jestExpect.ts',
80-
'packages/jest-resolve/src/index.ts',
80+
'packages/jest-resolve/src/resolver.ts',
8181
],
8282
rules: {
8383
'local/prefer-spread-eventually': 'warn',

‎CHANGELOG.md

+4
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,13 @@
33
### Features
44

55
- `[jest-reporters]` Expose the `getResultHeader` util ([#11460](https://github.com/facebook/jest/pull/11460))
6+
- `[jest-resolver]` Export `resolve*` utils for different Jest modules ([#11466](https://github.com/facebook/jest/pull/11466))
7+
- `[@jest/test-result]` Export `Test`, `TestEvents` and `TestFileEvent` ([#11466](https://github.com/facebook/jest/pull/11466))
68

79
### Fixes
810

11+
- `[jest-circus, @jest/test-sequencer]` Remove dependency on `jest-runner` ([#11466](https://github.com/facebook/jest/pull/11466))
12+
- `[jest-runner]` Remove dependency on `jest-config` ([#11466](https://github.com/facebook/jest/pull/11466))
913
- `[jest-worker]` Loosen engine requirement to `>= 10.13.0` ([#11451](https://github.com/facebook/jest/pull/11451))
1014

1115
### Chore & Maintenance

‎e2e/__tests__/__snapshots__/moduleNameMapper.test.ts.snap

+2-2
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ FAIL __tests__/index.js
4141
12 | module.exports = () => 'test';
4242
13 |
4343
44-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:558:17)
44+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/resolver.js:558:17)
4545
at Object.require (index.js:10:1)
4646
`;
4747

@@ -70,6 +70,6 @@ FAIL __tests__/index.js
7070
12 | module.exports = () => 'test';
7171
13 |
7272
73-
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/index.js:558:17)
73+
at createNoMappedModuleFoundError (../../packages/jest-resolve/build/resolver.js:558:17)
7474
at Object.require (index.js:10:1)
7575
`;

‎e2e/__tests__/__snapshots__/resolveNoFileExtensions.test.ts.snap

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,6 @@ FAIL __tests__/test.js
3737
| ^
3838
9 |
3939
40-
at Resolver.resolveModule (../../packages/jest-resolve/build/index.js:311:11)
40+
at Resolver.resolveModule (../../packages/jest-resolve/build/resolver.js:311:11)
4141
at Object.require (index.js:8:18)
4242
`;

‎e2e/__tests__/stackTrace.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ describe('Stack Trace', () => {
8282
);
8383

8484
expect(stderr).toMatch(
85-
/\s+at\s(?:.+?)\s\((?:.+?)jest-resolve\/build\/index\.js/,
85+
/\s+at\s(?:.+?)\s\((?:.+?)jest-resolve\/build\/resolver\.js/,
8686
);
8787
});
8888

‎e2e/async-regenerator/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"testEnvironment": "node",
1010
"transformIgnorePatterns": [
1111
"jest-circus",
12-
"jest-jasmine2"
12+
"jest-jasmine2",
13+
"jest-runner"
1314
]
1415
}
1516
}

‎e2e/babel-plugin-jest-hoist/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,8 @@
1111
"transformIgnorePatterns": [
1212
"jest-circus",
1313
"jest-environment-node",
14-
"jest-jasmine2"
14+
"jest-jasmine2",
15+
"jest-runner"
1516
]
1617
}
1718
}

‎e2e/coverage-transform-instrumented/package.json

+3-2
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,9 @@
99
"transformIgnorePatterns": [
1010
"jest-circus",
1111
"jest-each",
12-
"jest-environment-node/",
13-
"jest-jasmine2"
12+
"jest-environment-node",
13+
"jest-jasmine2",
14+
"jest-runner"
1415
],
1516
"moduleFileExtensions": [
1617
"js"

‎e2e/transform-linked-modules/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,8 @@
88
"jest-circus",
99
"jest-each",
1010
"jest-environment-node",
11-
"jest-jasmine2"
11+
"jest-jasmine2",
12+
"jest-runner"
1213
],
1314
"transform": {
1415
"\\.js$": "<rootDir>/preprocessor.js"

‎e2e/transform/babel-jest-ignored/package.json

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
{
22
"jest": {
3-
"testEnvironment": "node"
3+
"testEnvironment": "node",
4+
"transformIgnorePatterns": [
5+
"node_modules",
6+
"jest-runner"
7+
]
48
}
59
}

‎e2e/transform/multiple-transformers/package.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,8 @@
99
"transformIgnorePatterns": [
1010
"jest-circus",
1111
"jest-environment-node",
12-
"jest-jasmine2"
12+
"jest-jasmine2",
13+
"jest-runner"
1314
]
1415
},
1516
"dependencies": {

‎e2e/transform/transform-runner/runner.ts

+2-3
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,12 @@
66
*/
77

88
import throat from 'throat';
9-
import {TestResult, createEmptyTestResult} from '@jest/test-result';
9+
import {Test, TestResult, createEmptyTestResult} from '@jest/test-result';
1010
import type {Config} from '@jest/types';
11-
import {
11+
import type {
1212
OnTestFailure,
1313
OnTestStart,
1414
OnTestSuccess,
15-
Test,
1615
TestRunnerContext,
1716
TestWatcher,
1817
} from 'jest-runner';

‎packages/jest-circus/package.json

-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
"jest-each": "^27.0.1",
2828
"jest-matcher-utils": "^27.0.1",
2929
"jest-message-util": "^27.0.1",
30-
"jest-runner": "^27.0.1",
3130
"jest-runtime": "^27.0.1",
3231
"jest-snapshot": "^27.0.1",
3332
"jest-util": "^27.0.1",

‎packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts

+1-2
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,8 @@
66
*/
77

88
import type {JestEnvironment} from '@jest/environment';
9-
import type {TestResult} from '@jest/test-result';
9+
import type {TestFileEvent, TestResult} from '@jest/test-result';
1010
import type {Config} from '@jest/types';
11-
import type {TestFileEvent} from 'jest-runner';
1211
import type Runtime from 'jest-runtime';
1312
import type {SnapshotStateType} from 'jest-snapshot';
1413
import {deepCyclicCopy} from 'jest-util';

‎packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapterInit.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@ import type {JestEnvironment} from '@jest/environment';
1010
import {
1111
AssertionResult,
1212
Status,
13+
TestFileEvent,
1314
TestResult,
1415
createEmptyTestResult,
1516
} from '@jest/test-result';
1617
import type {Circus, Config, Global} from '@jest/types';
1718
import {extractExpectedAssertionsErrors, getState, setState} from 'expect';
1819
import {bind} from 'jest-each';
1920
import {formatExecError, formatResultsErrors} from 'jest-message-util';
20-
import type {TestFileEvent} from 'jest-runner';
2121
import {
2222
SnapshotState,
2323
SnapshotStateType,

‎packages/jest-circus/src/testCaseReportHandler.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
* LICENSE file in the root directory of this source tree.
66
*/
77

8+
import type {TestFileEvent} from '@jest/test-result';
89
import type {Circus} from '@jest/types';
9-
import type {TestFileEvent} from 'jest-runner';
1010
import {makeSingleTestResult, parseSingleTestResult} from './utils';
1111

1212
const testCaseReportHandler =

‎packages/jest-circus/tsconfig.json

-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,6 @@
1010
{"path": "../jest-environment"},
1111
{"path": "../jest-matcher-utils"},
1212
{"path": "../jest-message-util"},
13-
{"path": "../jest-runner"},
1413
{"path": "../jest-runtime"},
1514
{"path": "../jest-snapshot"},
1615
{"path": "../jest-test-result"},

‎packages/jest-config/src/index.ts

+5-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,11 @@ import normalize from './normalize';
1515
import readConfigFileAndSetRootDir from './readConfigFileAndSetRootDir';
1616
import resolveConfigPath from './resolveConfigPath';
1717
import {isJSONString, replaceRootDirInPath} from './utils';
18-
export {getTestEnvironment, isJSONString} from './utils';
18+
19+
// TODO: remove export in Jest 28
20+
export {resolveTestEnvironment as getTestEnvironment} from 'jest-resolve';
21+
22+
export {isJSONString} from './utils';
1923
export {default as normalize} from './normalize';
2024
export {default as deprecationEntries} from './Deprecated';
2125
export {replaceRootDirInPath} from './utils';

‎packages/jest-config/src/normalize.ts

+12-10
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,12 @@ import {statSync} from 'graceful-fs';
1414
import micromatch = require('micromatch');
1515
import type {Config} from '@jest/types';
1616
import {replacePathSepForRegex} from 'jest-regex-util';
17-
import Resolver from 'jest-resolve';
17+
import Resolver, {
18+
resolveRunner,
19+
resolveSequencer,
20+
resolveTestEnvironment,
21+
resolveWatchPlugin,
22+
} from 'jest-resolve';
1823
import {
1924
clearLine,
2025
replacePathSepForGlob,
@@ -35,14 +40,11 @@ import {
3540
DOCUMENTATION_NOTE,
3641
_replaceRootDirTags,
3742
escapeGlobCharacters,
38-
getRunner,
39-
getSequencer,
40-
getTestEnvironment,
41-
getWatchPlugin,
4243
replaceRootDirInPath,
4344
resolve,
4445
} from './utils';
4546
import validatePattern from './validatePattern';
47+
4648
const ERROR = `${BULLET}Validation Error`;
4749
const PRESET_EXTENSIONS = ['.json', '.js', '.cjs', '.mjs'];
4850
const PRESET_NAME = 'jest-preset';
@@ -604,7 +606,7 @@ export default async function normalize(
604606
options.setupFilesAfterEnv.push(options.setupTestFrameworkScriptFile);
605607
}
606608

607-
options.testEnvironment = getTestEnvironment({
609+
options.testEnvironment = resolveTestEnvironment({
608610
rootDir: options.rootDir,
609611
testEnvironment: options.testEnvironment || DEFAULT_CONFIG.testEnvironment,
610612
});
@@ -739,7 +741,7 @@ export default async function normalize(
739741
const option = oldOptions[key];
740742
value =
741743
option &&
742-
getRunner(newOptions.resolver, {
744+
resolveRunner(newOptions.resolver, {
743745
filePath: option,
744746
rootDir: options.rootDir,
745747
});
@@ -1010,15 +1012,15 @@ export default async function normalize(
10101012
if (typeof watchPlugin === 'string') {
10111013
return {
10121014
config: {},
1013-
path: getWatchPlugin(newOptions.resolver, {
1015+
path: resolveWatchPlugin(newOptions.resolver, {
10141016
filePath: watchPlugin,
10151017
rootDir: options.rootDir,
10161018
}),
10171019
};
10181020
} else {
10191021
return {
10201022
config: watchPlugin[1] || {},
1021-
path: getWatchPlugin(newOptions.resolver, {
1023+
path: resolveWatchPlugin(newOptions.resolver, {
10221024
filePath: watchPlugin[0],
10231025
rootDir: options.rootDir,
10241026
}),
@@ -1051,7 +1053,7 @@ export default async function normalize(
10511053
// ignored
10521054
}
10531055

1054-
newOptions.testSequencer = getSequencer(newOptions.resolver, {
1056+
newOptions.testSequencer = resolveSequencer(newOptions.resolver, {
10551057
filePath: options.testSequencer || DEFAULT_CONFIG.testSequencer,
10561058
rootDir: options.rootDir,
10571059
});

0 commit comments

Comments
 (0)