Skip to content

Commit d4600f5

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

6 files changed

Lines changed: 9 additions & 19 deletions

File tree

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: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,6 @@ export default async function jasmine2(
151151
for (const path of config.setupFilesAfterEnv) {
152152
const esm = runtime.unstable_shouldLoadAsEsm(
153153
path,
154-
config.extensionsToTreatAsEsm,
155154
);
156155

157156
if (esm) {
@@ -167,7 +166,6 @@ export default async function jasmine2(
167166
}
168167
const esm = runtime.unstable_shouldLoadAsEsm(
169168
testPath,
170-
config.extensionsToTreatAsEsm,
171169
);
172170

173171
if (esm) {

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

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -99,7 +99,6 @@ export async function run(
9999
for (const path of config.setupFiles) {
100100
const esm = runtime.unstable_shouldLoadAsEsm(
101101
path,
102-
config.extensionsToTreatAsEsm,
103102
);
104103

105104
if (esm) {
@@ -110,7 +109,6 @@ export async function run(
110109
}
111110
const esm = runtime.unstable_shouldLoadAsEsm(
112111
filePath,
113-
config.extensionsToTreatAsEsm,
114112
);
115113

116114
if (esm) {

packages/jest-runner/src/runTest.ts

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,6 @@ async function runTestInternal(
171171
for (const path of config.setupFiles) {
172172
const esm = runtime.unstable_shouldLoadAsEsm(
173173
path,
174-
config.extensionsToTreatAsEsm,
175174
);
176175

177176
if (esm) {

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,6 @@ module.exports = async function createRuntime(filename, config) {
118118
for (const path of config.setupFiles) {
119119
const esm = runtime.unstable_shouldLoadAsEsm(
120120
path,
121-
config.extensionsToTreatAsEsm,
122121
);
123122

124123
if (esm) {

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)