runtime already has the config

jestjs · Dec 4, 2020 · 7ffb156 · 7ffb156
1 parent 944f0cf
commit 7ffb156
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 37 deletions.
diff --git a/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts b/packages/jest-circus/src/legacy-code-todo-rewrite/jestAdapter.ts
@@ -72,21 +72,15 @@ 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);
     } else {
       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
@@ -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
@@ -97,21 +97,15 @@ 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);
       } else {
         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
@@ -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
@@ -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
@@ -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);
     }