fix(runner): handle module loaders with default exports (#10541)

jestjs · Sep 21, 2020 · 6499deb · 6499deb
1 parent d955dc0
commit 6499deb
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 14 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,6 +4,7 @@
 
 - `[jest-circus, jest-config, jest-runtime]` Add new `injectGlobals` config and CLI option to disable injecting global variables into the runtime ([#10484](https://github.com/facebook/jest/pull/10484))
 - `[jest-each]` Fixes `.each` type to always be callable ([#10447](https://github.com/facebook/jest/pull/10447))
+- `[jest-runner]` Add support for `moduleLoader`s with `default` exports ([#10541](https://github.com/facebook/jest/pull/10541))
 
 ### Fixes
 

diff --git a/packages/jest-runner/src/runTest.ts b/packages/jest-runner/src/runTest.ts
@@ -106,13 +106,17 @@ async function runTestInternal(
   const TestEnvironment: typeof JestEnvironment = interopRequireDefault(
     require(testEnvironment),
   ).default;
-  const testFramework: TestFramework =
+  const testFramework: TestFramework = interopRequireDefault(
     process.env.JEST_CIRCUS === '1'
-      ? require('jest-circus/runner') // eslint-disable-line import/no-extraneous-dependencies
-      : require(config.testRunner);
-  const Runtime: typeof RuntimeClass = config.moduleLoader
-    ? require(config.moduleLoader)
-    : require('jest-runtime');
+      ? // eslint-disable-next-line import/no-extraneous-dependencies
+        require('jest-circus/runner')
+      : require(config.testRunner),
+  ).default;
+  const Runtime: typeof RuntimeClass = interopRequireDefault(
+    config.moduleLoader
+      ? require(config.moduleLoader)
+      : require('jest-runtime'),
+  ).default;
 
   const consoleOut = globalConfig.useStderr ? process.stderr : process.stdout;
   const consoleFormatter = (type: LogType, message: LogMessage) =>

diff --git a/packages/jest-runtime/src/__mocks__/createRuntime.js b/packages/jest-runtime/src/__mocks__/createRuntime.js
@@ -8,10 +8,10 @@
 import path from 'path';
 
 module.exports = async function createRuntime(filename, config) {
-  const NodeEnvironment = require('jest-environment-node');
-  const Runtime = require('../');
+  const {default: NodeEnvironment} = await import('jest-environment-node');
+  const {default: Runtime} = await import('../');
 
-  const {normalize} = require('jest-config');
+  const {normalize} = await import('jest-config');
 
   config = normalize(
     {

diff --git a/packages/jest-runtime/src/__tests__/Runtime-statics.test.js b/packages/jest-runtime/src/__tests__/Runtime-statics.test.js
@@ -7,7 +7,7 @@
  */
 
 import HasteMap from 'jest-haste-map';
-const Runtime = require('../');
+import Runtime from '../';
 
 jest.mock('jest-haste-map');
 

diff --git a/packages/jest-runtime/src/cli/index.ts b/packages/jest-runtime/src/cli/index.ts
@@ -16,7 +16,6 @@ import {setGlobal, tryRealpath} from 'jest-util';
 import {validateCLIOptions} from 'jest-validate';
 import {deprecationEntries, readConfig} from 'jest-config';
 import {VERSION} from '../version';
-import type {Context} from '../types';
 import * as args from './args';
 
 export async function run(
@@ -67,11 +66,10 @@ export async function run(
     automock: false,
   };
 
-  // Break circular dependency
-  const Runtime: any = require('..');
+  const Runtime: typeof import('..') = require('..');
 
   try {
-    const hasteMap: Context = await Runtime.createContext(config, {
+    const hasteMap = await Runtime.createContext(config, {
       maxWorkers: Math.max(cpus().length - 1, 1),
       watchman: globalConfig.watchman,
     });