Skip to content

Commit 32ca686

Browse files
committed
Migrate back to CommonJS export for jest-runtime
1 parent 6a066c6 commit 32ca686

File tree

6 files changed

+9
-7
lines changed

6 files changed

+9
-7
lines changed

packages/jest-cli/src/__tests__/SearchSource.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ describe('SearchSource', () => {
3131
let searchSource;
3232

3333
beforeEach(() => {
34-
Runtime = require('jest-runtime').default;
34+
Runtime = require('jest-runtime');
3535
SearchSource = require('../SearchSource').default;
3636
normalize = require('jest-config').normalize;
3737
});

packages/jest-resolve-dependencies/src/__tests__/dependency_resolver.test.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ const cases = {
2323
const filter = path => Object.keys(cases).every(key => cases[key](path));
2424

2525
beforeEach(() => {
26-
Runtime = require('jest-runtime').default;
26+
Runtime = require('jest-runtime');
2727
config = normalize(
2828
{
2929
rootDir: '.',

packages/jest-runner/src/runTest.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ async function runTestInternal(
7373
const Runtime = ((config.moduleLoader
7474
? /* $FlowFixMe */
7575
require(config.moduleLoader)
76-
: require('jest-runtime').default): Class<RuntimeClass>);
76+
: require('jest-runtime')): Class<RuntimeClass>);
7777

7878
let runtime = undefined;
7979

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ import path from 'path';
99

1010
module.exports = function createRuntime(filename, config) {
1111
const NodeEnvironment = require('jest-environment-node');
12-
const Runtime = require('../').default;
12+
const Runtime = require('../');
1313

1414
const {normalize} = require('jest-config');
1515

packages/jest-runtime/src/cli/index.js

+4-2
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ import yargs from 'yargs';
1717
import {Console, setGlobal} from 'jest-util';
1818
import {validateCLIOptions} from 'jest-validate';
1919
import {readConfig, deprecationEntries} from 'jest-config';
20-
// eslint-disable-next-line import/default
21-
import Runtime from '../';
2220
import * as args from './args';
2321

2422
const VERSION = (require('../../package.json').version: string);
@@ -75,6 +73,10 @@ export function run(cliArgv?: Argv, cliInfo?: Array<string>) {
7573
automock: false,
7674
unmockedModulePathPatterns: null,
7775
});
76+
77+
// Break circular dependency
78+
const Runtime = require('..');
79+
7880
Runtime.createContext(config, {
7981
maxWorkers: Math.max(os.cpus().length - 1, 1),
8082
watchman: globalConfig.watchman,

packages/jest-runtime/src/index.js

+1-1
Original file line numberDiff line numberDiff line change
@@ -1017,4 +1017,4 @@ class Runtime {
10171017

10181018
Runtime.ScriptTransformer = ScriptTransformer;
10191019

1020-
export default Runtime;
1020+
module.exports = Runtime;

0 commit comments

Comments
 (0)