Skip to content

Commit 7ffb156

Browse files
committed
runtime already has the config
1 parent 944f0cf commit 7ffb156

File tree

6 files changed

+15
-37
lines changed

6 files changed

+15
-37
lines changed

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -72,21 +72,15 @@ const jestAdapter = async (
7272
});
7373

7474
for (const path of config.setupFilesAfterEnv) {
75-
const esm = runtime.unstable_shouldLoadAsEsm(
76-
path,
77-
config.extensionsToTreatAsEsm,
78-
);
75+
const esm = runtime.unstable_shouldLoadAsEsm(path);
7976

8077
if (esm) {
8178
await runtime.unstable_importModule(path);
8279
} else {
8380
runtime.requireModule(path);
8481
}
8582
}
86-
const esm = runtime.unstable_shouldLoadAsEsm(
87-
testPath,
88-
config.extensionsToTreatAsEsm,
89-
);
83+
const esm = runtime.unstable_shouldLoadAsEsm(testPath);
9084

9185
if (esm) {
9286
await runtime.unstable_importModule(testPath);

packages/jest-jasmine2/src/index.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -149,10 +149,7 @@ export default async function jasmine2(
149149
});
150150

151151
for (const path of config.setupFilesAfterEnv) {
152-
const esm = runtime.unstable_shouldLoadAsEsm(
153-
path,
154-
config.extensionsToTreatAsEsm,
155-
);
152+
const esm = runtime.unstable_shouldLoadAsEsm(path);
156153

157154
if (esm) {
158155
await runtime.unstable_importModule(path);
@@ -165,10 +162,7 @@ export default async function jasmine2(
165162
const testNameRegex = new RegExp(globalConfig.testNamePattern, 'i');
166163
env.specFilter = (spec: Spec) => testNameRegex.test(spec.getFullName());
167164
}
168-
const esm = runtime.unstable_shouldLoadAsEsm(
169-
testPath,
170-
config.extensionsToTreatAsEsm,
171-
);
165+
const esm = runtime.unstable_shouldLoadAsEsm(testPath);
172166

173167
if (esm) {
174168
await runtime.unstable_importModule(testPath);

packages/jest-repl/src/cli/runtime-cli.ts

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -97,21 +97,15 @@ export async function run(
9797
);
9898

9999
for (const path of config.setupFiles) {
100-
const esm = runtime.unstable_shouldLoadAsEsm(
101-
path,
102-
config.extensionsToTreatAsEsm,
103-
);
100+
const esm = runtime.unstable_shouldLoadAsEsm(path);
104101

105102
if (esm) {
106103
await runtime.unstable_importModule(path);
107104
} else {
108105
runtime.requireModule(path);
109106
}
110107
}
111-
const esm = runtime.unstable_shouldLoadAsEsm(
112-
filePath,
113-
config.extensionsToTreatAsEsm,
114-
);
108+
const esm = runtime.unstable_shouldLoadAsEsm(filePath);
115109

116110
if (esm) {
117111
await runtime.unstable_importModule(filePath);

packages/jest-runner/src/runTest.ts

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -169,10 +169,7 @@ async function runTestInternal(
169169
const start = Date.now();
170170

171171
for (const path of config.setupFiles) {
172-
const esm = runtime.unstable_shouldLoadAsEsm(
173-
path,
174-
config.extensionsToTreatAsEsm,
175-
);
172+
const esm = runtime.unstable_shouldLoadAsEsm(path);
176173

177174
if (esm) {
178175
await runtime.unstable_importModule(path);

packages/jest-runtime/src/__mocks__/createRuntime.js

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -116,10 +116,7 @@ module.exports = async function createRuntime(filename, config) {
116116
);
117117

118118
for (const path of config.setupFiles) {
119-
const esm = runtime.unstable_shouldLoadAsEsm(
120-
path,
121-
config.extensionsToTreatAsEsm,
122-
);
119+
const esm = runtime.unstable_shouldLoadAsEsm(path);
123120

124121
if (esm) {
125122
await runtime.unstable_importModule(path);

packages/jest-runtime/src/index.ts

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,12 @@ export default class Runtime {
363363
}
364364

365365
// unstable as it should be replaced by https://github.com/nodejs/modules/issues/393, and we don't want people to use it
366-
unstable_shouldLoadAsEsm = Resolver.unstable_shouldLoadAsEsm;
366+
unstable_shouldLoadAsEsm(path: Config.Path): boolean {
367+
return Resolver.unstable_shouldLoadAsEsm(
368+
path,
369+
this._config.extensionsToTreatAsEsm,
370+
);
371+
}
367372

368373
private async loadEsmModule(
369374
modulePath: Config.Path,
@@ -499,10 +504,7 @@ export default class Runtime {
499504

500505
if (
501506
this._resolver.isCoreModule(resolved) ||
502-
this.unstable_shouldLoadAsEsm(
503-
resolved,
504-
this._config.extensionsToTreatAsEsm,
505-
)
507+
this.unstable_shouldLoadAsEsm(resolved)
506508
) {
507509
return this.loadEsmModule(resolved, query, isStaticImport);
508510
}

0 commit comments

Comments
 (0)