Minor fixes for jest-runtime. (#1202)

Author: cpojer

lerna.json

@@ -1,6 +1,6 @@
 {
   "lerna": "2.0.0-beta.20",
-  "version": "12.1.3",
+  "version": "12.1.4",
   "linkedFiles": {
     "prefix": "/**\n * @flow\n */\n"
   }

packages/jest-cli/src/Test.js

@@ -45,19 +45,13 @@ class Test {
       process.stderr,
     );
     env.testFilePath = path;
-    const moduleLoader = new ModuleLoader(config, env, resolver);
-    if (config.setupFiles.length) {
-      for (let i = 0; i < config.setupFiles.length; i++) {
-        moduleLoader.requireModule(config.setupFiles[i]);
-      }
-    }
-
+    const runtime = new ModuleLoader(config, env, resolver);
     const start = Date.now();
-    return TestRunner(config, env, moduleLoader, path)
+    return TestRunner(config, env, runtime, path)
       .then(result => {
         result.perfStats = {start, end: Date.now()};
         result.testFilePath = path;
-        result.coverage = moduleLoader.getAllCoverageInfo();
+        result.coverage = runtime.getAllCoverageInfo();
         return result;
       })
       .then(

packages/jest-repl/package.json

@@ -8,7 +8,6 @@
   "license": "BSD-3-Clause",
   "main": "build/index.js",
   "dependencies": {
-    "chalk": "^1.1.1",
     "jest-runtime": "^12.1.0",
     "jest-util": "^12.1.0",
     "repl": "^0.1.3",

packages/jest-repl/src/cli/args.js

@@ -10,16 +10,13 @@
 
 'use strict';
 
+const Runtime = require('jest-runtime');
+
 const wrap = require('jest-util').wrap;
 
 const usage = 'Usage: $0 [--config=<pathToConfigFile>] [TestPathRegExp]';
 
-const options = {
-  config: {
-    alias: 'c',
-    description: wrap('The path to a Jest config file.'),
-    type: 'string',
-  },
+const options = Object.assign({}, Runtime.getCLIOptions(), {
   replname: {
     alias: 'r',
     description: wrap(
@@ -28,12 +25,7 @@ const options = {
     ),
     type: 'string',
   },
-  version: {
-    alias: 'v',
-    description: wrap('Print the version and exit'),
-    type: 'boolean',
-  },
-};
+});
 
 module.exports = {
   options,

packages/jest-repl/src/cli/repl.js

@@ -16,7 +16,6 @@ declare var jest: Object;
 
 jest.disableAutomock();
 
-const chalk = require('chalk');
 const path = require('path');
 const repl = require('repl');
 const vm = require('vm');
@@ -64,7 +63,7 @@ if (jestConfig.scriptPreprocessor) {
 }
 
 const replInstance = repl.start({
-  prompt: chalk.green('\u203A') + ' ',
+  prompt: '\u203A ',
   useGlobal: true,
   eval: evalCommand,
 });

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

@@ -15,6 +15,14 @@ const wrap = require('jest-util').wrap;
 const usage = 'Usage: $0 [--config=<pathToConfigFile>] [TestPathRegExp]';
 
 const options = {
+  cache: {
+    default: true,
+    description: wrap(
+      'Whether to use the preprocessor cache. Disable the cache using ' +
+      '--no-cache.',
+    ),
+    type: 'boolean',
+  },
   config: {
     alias: 'c',
     description: wrap('The path to a Jest config file.'),
@@ -25,6 +33,14 @@ const options = {
     description: wrap('Print the version and exit'),
     type: 'boolean',
   },
+  watchman: {
+    default: true,
+    description: wrap(
+      'Whether to use watchman for file crawling. Disable using ' +
+      '--no-watchman.',
+    ),
+    type: 'boolean',
+  },
 };
 
 module.exports = {

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

@@ -11,6 +11,7 @@
 'use strict';
 
 const args = require('./args');
+const os = require('os');
 const path = require('path');
 const yargs = require('yargs');
 
@@ -54,13 +55,14 @@ function run(cliArgv?: Object, cliInfo?: Array<string>) {
 
   const root = getPackageRoot();
   const testFilePath = path.resolve(process.cwd(), argv._[0]);
-  const info = cliInfo ? cliInfo.join(', ') : '';
-
-  console.log(`Using Jest Runtime v${VERSION}, ${info}`);
+  const info = cliInfo ? ', ' + cliInfo.join(', ') : '';
 
+  console.log(`Using Jest Runtime v${VERSION}${info}`);
   readConfig(argv, root)
     .then(config => {
-      Runtime.buildHasteMap(config, {maxWorkers: 1})
+      Runtime.buildHasteMap(config, {
+        maxWorkers: os.cpus().length - 1,
+      })
         .then(hasteMap => {
           /* $FlowFixMe */
           const TestEnvironment = require(config.testEnvironment);
@@ -69,8 +71,8 @@ function run(cliArgv?: Object, cliInfo?: Array<string>) {
           env.global.console = new Console(process.stdout, process.stderr);
           env.global.jestConfig = config;
 
-          const moduleLoader = new Runtime(config, env, hasteMap.resolver);
-          moduleLoader.requireModule(testFilePath);
+          const runtime = new Runtime(config, env, hasteMap.resolver);
+          runtime.requireModule(testFilePath);
         })
         .catch(e => {
           console.error(e);

packages/jest-runtime/src/index.js

@@ -116,16 +116,22 @@ class Runtime {
     config.setupFiles.forEach(unmockPath);
 
     this.resetModuleRegistry();
+
+    if (config.setupFiles.length) {
+      for (let i = 0; i < config.setupFiles.length; i++) {
+        this.requireModule(config.setupFiles[i]);
+      }
+    }
   }
 
   static buildHasteMap(
     config: Config,
-    options: BuildHasteMapOptions,
+    options: {maxWorkers: number},
   ): Promise<HasteResolverContext> {
     utils.createDirectory(config.cacheDirectory);
     const instance = createHasteMap(config, {
-      resetCache: !config.cache,
       maxWorkers: options.maxWorkers,
+      resetCache: !config.cache,
     });
     return instance.build().then(
       moduleMap => ({
@@ -143,6 +149,10 @@ class Runtime {
     return require('./cli').run(args, info);
   }
 
+  static getCLIOptions() {
+    return require('./cli/args').options;
+  }
+
   requireModule(from: Path, moduleName?: string) {
     const moduleID = this._getNormalizedModuleID(from, moduleName);
     let modulePath;