diff --git a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts index 51e6621e1347..79da4ab6f3ce 100644 --- a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts +++ b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts @@ -72,10 +72,7 @@ const jestAdapter = async ( }); for (const path of config.setupFilesAfterEnv) { - const esm = runtime.unstable_shouldLoadAsEsm( - path, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(path); if (esm) { await runtime.unstable_importModule(path); @@ -83,10 +80,7 @@ const jestAdapter = async ( runtime.requireModule(path); } } - const esm = runtime.unstable_shouldLoadAsEsm( - testPath, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(testPath); if (esm) { await runtime.unstable_importModule(testPath); diff --git a/packages/jest-jasmine2/src/index.ts b/packages/jest-jasmine2/src/index.ts index 0ff9f58646f2..7352ba8bbc56 100644 --- a/packages/jest-jasmine2/src/index.ts +++ b/packages/jest-jasmine2/src/index.ts @@ -149,10 +149,7 @@ export default async function jasmine2( }); for (const path of config.setupFilesAfterEnv) { - const esm = runtime.unstable_shouldLoadAsEsm( - path, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(path); if (esm) { await runtime.unstable_importModule(path); @@ -165,10 +162,7 @@ export default async function jasmine2( const testNameRegex = new RegExp(globalConfig.testNamePattern, 'i'); env.specFilter = (spec: Spec) => testNameRegex.test(spec.getFullName()); } - const esm = runtime.unstable_shouldLoadAsEsm( - testPath, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(testPath); if (esm) { await runtime.unstable_importModule(testPath); diff --git a/packages/jest-repl/src/cli/runtime-cli.ts b/packages/jest-repl/src/cli/runtime-cli.ts index dc8557da20cf..104b58f90c63 100644 --- a/packages/jest-repl/src/cli/runtime-cli.ts +++ b/packages/jest-repl/src/cli/runtime-cli.ts @@ -97,10 +97,7 @@ export async function run( ); for (const path of config.setupFiles) { - const esm = runtime.unstable_shouldLoadAsEsm( - path, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(path); if (esm) { await runtime.unstable_importModule(path); @@ -108,10 +105,7 @@ export async function run( runtime.requireModule(path); } } - const esm = runtime.unstable_shouldLoadAsEsm( - filePath, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(filePath); if (esm) { await runtime.unstable_importModule(filePath); diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts index 4d1351f3691a..ab7d90a96d35 100644 --- a/packages/jest-runner/src/runTest.ts +++ b/packages/jest-runner/src/runTest.ts @@ -169,10 +169,7 @@ async function runTestInternal( const start = Date.now(); for (const path of config.setupFiles) { - const esm = runtime.unstable_shouldLoadAsEsm( - path, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(path); if (esm) { await runtime.unstable_importModule(path); diff --git a/packages/jest-runtime/src/__mocks__/createRuntime.js b/packages/jest-runtime/src/__mocks__/createRuntime.js index 3e371b859671..478359de5c2c 100644 --- a/packages/jest-runtime/src/__mocks__/createRuntime.js +++ b/packages/jest-runtime/src/__mocks__/createRuntime.js @@ -116,10 +116,7 @@ module.exports = async function createRuntime(filename, config) { ); for (const path of config.setupFiles) { - const esm = runtime.unstable_shouldLoadAsEsm( - path, - config.extensionsToTreatAsEsm, - ); + const esm = runtime.unstable_shouldLoadAsEsm(path); if (esm) { await runtime.unstable_importModule(path); diff --git a/packages/jest-runtime/src/index.ts b/packages/jest-runtime/src/index.ts index 1ea475c10406..5a03bd290b1a 100644 --- a/packages/jest-runtime/src/index.ts +++ b/packages/jest-runtime/src/index.ts @@ -363,7 +363,12 @@ export default class Runtime { } // unstable as it should be replaced by https://github.com/nodejs/modules/issues/393, and we don't want people to use it - unstable_shouldLoadAsEsm = Resolver.unstable_shouldLoadAsEsm; + unstable_shouldLoadAsEsm(path: Config.Path): boolean { + return Resolver.unstable_shouldLoadAsEsm( + path, + this._config.extensionsToTreatAsEsm, + ); + } private async loadEsmModule( modulePath: Config.Path, @@ -499,10 +504,7 @@ export default class Runtime { if ( this._resolver.isCoreModule(resolved) || - this.unstable_shouldLoadAsEsm( - resolved, - this._config.extensionsToTreatAsEsm, - ) + this.unstable_shouldLoadAsEsm(resolved) ) { return this.loadEsmModule(resolved, query, isStaticImport); }