chore: move execution of setupFiles to jest-runner

CHANGELOG.md

@@ -33,6 +33,7 @@
 
 - `[docs]` Warn about unexpected behavior / bug of node-notifier when using the `notify` options.
 - `[jest-resolver]` Use `resolve` package to implement custom module resolution ([#9520](https://github.com/facebook/jest/pull/9520))
+- `[jest-runtime]` Move execution of `setupFiles` to `jest-runner`
 - `[@jest/reporters]` Remove unused dependencies and type exports ([#9462](https://github.com/facebook/jest/pull/9462))
 - `[website]` Update pictures of reports when matchers fail ([#9214](https://github.com/facebook/jest/pull/9214))
 

packages/jest-jasmine2/src/index.ts

@@ -155,9 +155,7 @@ async function jasmine2(
       testPath,
     });
 
-  config.setupFilesAfterEnv.forEach((path: Config.Path) =>
-    runtime.requireModule(path),
-  );
+  config.setupFilesAfterEnv.forEach(path => runtime.requireModule(path));
 
   if (globalConfig.enabledTestsMap) {
     env.specFilter = (spec: Spec) => {

packages/jest-runner/src/runTest.ts

@@ -163,6 +163,8 @@ async function runTestInternal(
 
   const start = Date.now();
 
+  config.setupFiles.forEach(path => runtime!.requireModule(path));
+
   const sourcemapOptions: sourcemapSupport.Options = {
     environment: 'node',
     handleUncaughtExceptions: false,

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

@@ -7,7 +7,7 @@
 
 import path from 'path';
 
-module.exports = function createRuntime(filename, config) {
+module.exports = async function createRuntime(filename, config) {
   const NodeEnvironment = require('jest-environment-node');
   const Runtime = require('../');
 
@@ -37,22 +37,26 @@ module.exports = function createRuntime(filename, config) {
 
   const environment = new NodeEnvironment(config);
   environment.global.console = console;
-  return Runtime.createHasteMap(config, {maxWorkers: 1, resetCache: false})
-    .build()
-    .then(hasteMap => {
-      const runtime = new Runtime(
-        config,
-        environment,
-        Runtime.createResolver(config, hasteMap.moduleMap),
-      );
-
-      runtime.__mockRootPath = path.join(config.rootDir, 'root.js');
-      runtime.__mockSubdirPath = path.join(
-        config.rootDir,
-        'subdir2',
-        'module_dir',
-        'module_dir_module.js',
-      );
-      return runtime;
-    });
+
+  const hasteMap = await Runtime.createHasteMap(config, {
+    maxWorkers: 1,
+    resetCache: false,
+  }).build();
+
+  const runtime = new Runtime(
+    config,
+    environment,
+    Runtime.createResolver(config, hasteMap.moduleMap),
+  );
+
+  config.setupFiles.forEach(path => runtime.requireModule(path));
+
+  runtime.__mockRootPath = path.join(config.rootDir, 'root.js');
+  runtime.__mockSubdirPath = path.join(
+    config.rootDir,
+    'subdir2',
+    'module_dir',
+    'module_dir_module.js',
+  );
+  return runtime;
 };

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

@@ -93,6 +93,9 @@ export async function run(
     setGlobal(environment.global, 'jestGlobalConfig', globalConfig);
 
     const runtime = new Runtime(config, environment, hasteMap.resolver);
+
+    config.setupFiles.forEach(path => runtime.requireModule(path));
+
     runtime.requireModule(filePath);
   } catch (e) {
     console.error(chalk.red(e.stack || e));

packages/jest-runtime/src/index.ts

@@ -185,12 +185,6 @@ class Runtime {
     }
 
     this.resetModules();
-
-    if (config.setupFiles.length) {
-      for (let i = 0; i < config.setupFiles.length; i++) {
-        this.requireModule(config.setupFiles[i]);
-      }
-    }
   }
 
   static shouldInstrument = shouldInstrument;

packages/jest-util/src/index.ts

@@ -5,36 +5,20 @@
  * LICENSE file in the root directory of this source tree.
  */
 
-import clearLine from './clearLine';
-import createDirectory from './createDirectory';
-import ErrorWithStack from './ErrorWithStack';
-import installCommonGlobals from './installCommonGlobals';
-import interopRequireDefault from './interopRequireDefault';
-import isInteractive from './isInteractive';
-import isPromise from './isPromise';
-import setGlobal from './setGlobal';
-import deepCyclicCopy from './deepCyclicCopy';
-import convertDescriptorToString from './convertDescriptorToString';
+export {default as clearLine} from './clearLine';
+export {default as createDirectory} from './createDirectory';
+export {default as ErrorWithStack} from './ErrorWithStack';
+export {default as installCommonGlobals} from './installCommonGlobals';
+export {default as interopRequireDefault} from './interopRequireDefault';
+export {default as isInteractive} from './isInteractive';
+export {default as isPromise} from './isPromise';
+export {default as setGlobal} from './setGlobal';
+export {default as deepCyclicCopy} from './deepCyclicCopy';
+export {default as convertDescriptorToString} from './convertDescriptorToString';
 import * as specialChars from './specialChars';
-import replacePathSepForGlob from './replacePathSepForGlob';
-import testPathPatternToRegExp from './testPathPatternToRegExp';
+export {default as replacePathSepForGlob} from './replacePathSepForGlob';
+export {default as testPathPatternToRegExp} from './testPathPatternToRegExp';
 import * as preRunMessage from './preRunMessage';
-import pluralize from './pluralize';
+export {default as pluralize} from './pluralize';
 
-export {
-  ErrorWithStack,
-  clearLine,
-  convertDescriptorToString,
-  createDirectory,
-  deepCyclicCopy,
-  installCommonGlobals,
-  interopRequireDefault,
-  isInteractive,
-  isPromise,
-  pluralize,
-  preRunMessage,
-  replacePathSepForGlob,
-  setGlobal,
-  specialChars,
-  testPathPatternToRegExp,
-};
+export {preRunMessage, specialChars};