From 56858d6c1bac5c5f5db007f2151bf29d62dca201 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Fri, 9 Jun 2017 17:27:45 +0200
Subject: [PATCH 1/2] [squash] package up #3780

---
 packages/babel-jest/src/index.js              | 14 +++++-------
 packages/babel-preset-jest/index.js           |  1 +
 packages/eslint-config-fb-strict/index.js     |  2 +-
 packages/eslint-plugin-jest/src/index.js      | 13 +++++++----
 packages/jest-changed-files/src/index.js      |  7 ++++--
 .../jest-cli/src/TestNamePatternPrompt.js     |  3 ++-
 packages/jest-cli/src/TestRunner.js           |  4 +---
 packages/jest-cli/src/cli/getJest.js          |  1 +
 .../src/reporters/CoverageReporter.js         |  3 ++-
 packages/jest-config/src/deprecated.js        |  3 ++-
 packages/jest-environment-jsdom/src/index.js  |  5 +++--
 packages/jest-resolve/src/index.js            |  7 ++++--
 .../jest-runtime/src/ScriptTransformer.js     | 13 +++++------
 packages/jest-runtime/src/cli/index.js        |  3 ++-
 packages/jest-runtime/src/index.js            |  4 +++-
 packages/jest-validate/src/index.js           | 14 +++++++-----
 packages/jest-validate/src/utils.js           |  5 +++--
 packages/jest/src/jest.js                     |  4 +++-
 packages/pretty-format/src/index.js           | 19 +++++++++++-----
 .../pretty-format/src/plugins/ConvertAnsi.js  |  2 +-
 .../src/plugins/ImmutablePlugins.js           | 22 +++++++++++++------
 .../src/plugins/ImmutableRecord.js            |  2 +-
 22 files changed, 92 insertions(+), 59 deletions(-)

diff --git a/packages/babel-jest/src/index.js b/packages/babel-jest/src/index.js
index f56b01ca8cbb..a1d894f956bd 100644
--- a/packages/babel-jest/src/index.js
+++ b/packages/babel-jest/src/index.js
@@ -15,6 +15,8 @@ import crypto from 'crypto';
 import fs from 'fs';
 import path from 'path';
 import jestPreset from 'babel-preset-jest';
+import {transform as babelTransform, util as babelUtil} from 'babel-core';
+import babelIstanbulPlugin from 'babel-plugin-istanbul';
 
 const BABELRC_FILENAME = '.babelrc';
 const BABELRC_JS_FILENAME = '.babelrc.js';
@@ -22,8 +24,6 @@ const BABEL_CONFIG_KEY = 'babel';
 const PACKAGE_JSON = 'package.json';
 const THIS_FILE = fs.readFileSync(__filename);
 
-let babel;
-
 const createTransformer = (options: any) => {
   const cache = Object.create(null);
 
@@ -102,11 +102,7 @@ const createTransformer = (options: any) => {
       config: ProjectConfig,
       transformOptions: TransformOptions,
     ): string {
-      if (!babel) {
-        babel = require('babel-core');
-      }
-
-      if (babel.util && !babel.util.canCompile(filename)) {
+      if (babelUtil && !babelUtil.canCompile(filename)) {
         return src;
       }
 
@@ -116,7 +112,7 @@ const createTransformer = (options: any) => {
         // Copied from jest-runtime transform.js
         theseOptions.plugins = theseOptions.plugins.concat([
           [
-            require('babel-plugin-istanbul').default,
+            babelIstanbulPlugin,
             {
               // files outside `cwd` will not be instrumented
               cwd: config.rootDir,
@@ -126,7 +122,7 @@ const createTransformer = (options: any) => {
         ]);
       }
 
-      return babel.transform(src, theseOptions).code;
+      return babelTransform(src, theseOptions).code;
     },
   };
 };
diff --git a/packages/babel-preset-jest/index.js b/packages/babel-preset-jest/index.js
index b86522ff0771..8199bf3928f0 100644
--- a/packages/babel-preset-jest/index.js
+++ b/packages/babel-preset-jest/index.js
@@ -8,6 +8,7 @@
 
 module.exports = {
   plugins: [
+    // Cannot be `import` as this file is not compiled
     require('babel-plugin-jest-hoist'),
   ],
 };
diff --git a/packages/eslint-config-fb-strict/index.js b/packages/eslint-config-fb-strict/index.js
index b803d818043e..15f9678a812e 100644
--- a/packages/eslint-config-fb-strict/index.js
+++ b/packages/eslint-config-fb-strict/index.js
@@ -7,7 +7,7 @@
  *
  */
 
-// Can't be ESModules as this is not transpiled
+// Can't be ESModules as this is not compiled
 const fbjsConfig = require('eslint-config-fbjs');
 
 const variableNamePattern = String.raw`\s*[a-zA-Z_$][a-zA-Z_$\d]*\s*`;
diff --git a/packages/eslint-plugin-jest/src/index.js b/packages/eslint-plugin-jest/src/index.js
index c5ff88c12c50..e3899b0c70ba 100644
--- a/packages/eslint-plugin-jest/src/index.js
+++ b/packages/eslint-plugin-jest/src/index.js
@@ -8,6 +8,11 @@
  * @flow
  */
 
+import noDisabledTests from './rules/no-disabled-tests';
+import noFocusedTests from './rules/no-focused-tests';
+import noIdenticalTitle from './rules/no-identical-title';
+import validExpect from './rules/valid-expect';
+
 module.exports = {
   configs: {
     recommended: {
@@ -42,9 +47,9 @@ module.exports = {
     },
   },
   rules: {
-    'no-disabled-tests': require('./rules/no-disabled-tests'),
-    'no-focused-tests': require('./rules/no-focused-tests'),
-    'no-identical-title': require('./rules/no-identical-title'),
-    'valid-expect': require('./rules/valid-expect'),
+    'no-disabled-tests': noDisabledTests,
+    'no-focused-tests': noFocusedTests,
+    'no-identical-title': noIdenticalTitle,
+    'valid-expect': validExpect,
   },
 };
diff --git a/packages/jest-changed-files/src/index.js b/packages/jest-changed-files/src/index.js
index 23d6fdeb3093..fb9197084ca0 100644
--- a/packages/jest-changed-files/src/index.js
+++ b/packages/jest-changed-files/src/index.js
@@ -8,7 +8,10 @@
  * @flow
  */
 
+import git from './git';
+import hg from './hg';
+
 module.exports = {
-  git: require('./git'),
-  hg: require('./hg'),
+  git,
+  hg,
 };
diff --git a/packages/jest-cli/src/TestNamePatternPrompt.js b/packages/jest-cli/src/TestNamePatternPrompt.js
index 40e2afcfd9a7..4a9c7b01fd98 100644
--- a/packages/jest-cli/src/TestNamePatternPrompt.js
+++ b/packages/jest-cli/src/TestNamePatternPrompt.js
@@ -9,6 +9,7 @@
  */
 
 import type {TestResult} from 'types/TestResult';
+import chalk from 'chalk';
 import type {ScrollOptions} from './lib/scrollList';
 
 import scroll from './lib/scrollList';
@@ -53,7 +54,7 @@ module.exports = class TestNamePatternPrompt extends PatternPrompt {
         total,
         'test',
         pipe,
-        ` from ${require('chalk').yellow('cached')} test suites`,
+        ` from ${chalk.yellow('cached')} test suites`,
       );
 
       const width = getTerminalWidth();
diff --git a/packages/jest-cli/src/TestRunner.js b/packages/jest-cli/src/TestRunner.js
index f9e8ed29d9cc..83fd074eb3dc 100644
--- a/packages/jest-cli/src/TestRunner.js
+++ b/packages/jest-cli/src/TestRunner.js
@@ -29,6 +29,7 @@ import SummaryReporter from './reporters/SummaryReporter';
 import VerboseReporter from './reporters/VerboseReporter';
 import runTest from './runTest';
 import TestWatcher from './TestWatcher';
+import CoverageReporter from './reporters/CoverageReporter';
 import ReporterDispatcher from './ReporterDispatcher';
 
 const SLOW_TEST_TIME = 3000;
@@ -295,9 +296,6 @@ class TestRunner {
     }
 
     if (collectCoverage) {
-      // coverage reporter dependency graph is pretty big and we don't
-      // want to require it if we're not in the `--coverage` mode
-      const CoverageReporter = require('./reporters/CoverageReporter');
       this.addReporter(
         new CoverageReporter(this._globalConfig, {
           maxWorkers: this._options.maxWorkers,
diff --git a/packages/jest-cli/src/cli/getJest.js b/packages/jest-cli/src/cli/getJest.js
index 5562a3d968d9..830ed090a7da 100644
--- a/packages/jest-cli/src/cli/getJest.js
+++ b/packages/jest-cli/src/cli/getJest.js
@@ -21,6 +21,7 @@ function getJest(packageRoot: Path) {
     /* $FlowFixMe */
     return require(binPath);
   } else {
+    // TODO: Because of a dependency cycle, this can only be inlined once the babel plugin for inlining is merged
     const jest = require('../jest');
     // Check if Jest is specified in `package.json` but not installed.
     if (fs.existsSync(packageJSONPath)) {
diff --git a/packages/jest-cli/src/reporters/CoverageReporter.js b/packages/jest-cli/src/reporters/CoverageReporter.js
index a2c827866526..b9077f0c8ca0 100644
--- a/packages/jest-cli/src/reporters/CoverageReporter.js
+++ b/packages/jest-cli/src/reporters/CoverageReporter.js
@@ -31,6 +31,7 @@ import libSourceMaps from 'istanbul-lib-source-maps';
 import pify from 'pify';
 import workerFarm from 'worker-farm';
 import BaseReporter from './BaseReporter';
+import CoverageWorker from './CoverageWorker';
 
 const FAIL_COLOR = chalk.bold.red;
 const RUNNING_TEST_COLOR = chalk.bold.dim;
@@ -143,7 +144,7 @@ class CoverageReporter extends BaseReporter {
     let worker;
     let farm;
     if (this._maxWorkers <= 1) {
-      worker = pify(require('./CoverageWorker'));
+      worker = pify(CoverageWorker);
     } else {
       farm = workerFarm(
         {
diff --git a/packages/jest-config/src/deprecated.js b/packages/jest-config/src/deprecated.js
index a9065b09808e..36f1f8f8fd1c 100644
--- a/packages/jest-config/src/deprecated.js
+++ b/packages/jest-config/src/deprecated.js
@@ -9,8 +9,9 @@
  */
 
 import chalk from 'chalk';
+import prettyFormat from 'pretty-format';
 
-const format = (value: mixed) => require('pretty-format')(value, {min: true});
+const format = (value: mixed) => prettyFormat(value, {min: true});
 
 const deprecatedOptions = {
   preprocessorIgnorePatterns: (options: {
diff --git a/packages/jest-environment-jsdom/src/index.js b/packages/jest-environment-jsdom/src/index.js
index 8b495bc4d457..09b35f8ff02c 100644
--- a/packages/jest-environment-jsdom/src/index.js
+++ b/packages/jest-environment-jsdom/src/index.js
@@ -14,6 +14,7 @@ import type {ModuleMocker} from 'jest-mock';
 
 import {FakeTimers, installCommonGlobals} from 'jest-util';
 import mock from 'jest-mock';
+import JSDom from 'jsdom';
 
 class JSDOMEnvironment {
   document: ?Object;
@@ -23,7 +24,7 @@ class JSDOMEnvironment {
 
   constructor(config: ProjectConfig): void {
     // lazy require
-    this.document = require('jsdom').jsdom(/* markup */ undefined, {
+    this.document = JSDom.jsdom(/* markup */ undefined, {
       url: config.testURL,
     });
     const global = (this.global = this.document.defaultView);
@@ -50,7 +51,7 @@ class JSDOMEnvironment {
 
   runScript(script: Script): ?any {
     if (this.global) {
-      return require('jsdom').evalVMScript(this.global, script);
+      return JSDom.evalVMScript(this.global, script);
     }
     return null;
   }
diff --git a/packages/jest-resolve/src/index.js b/packages/jest-resolve/src/index.js
index 74a3fd7290ce..45d232f1e1bd 100644
--- a/packages/jest-resolve/src/index.js
+++ b/packages/jest-resolve/src/index.js
@@ -15,6 +15,7 @@ import fs from 'fs';
 import path from 'path';
 import nodeModulesPaths from 'resolve/lib/node-modules-paths';
 import isBuiltinModule from 'is-builtin-module';
+import defaultResolver from './defaultResolver.js';
 
 type ResolverConfig = {|
   browser?: boolean,
@@ -89,8 +90,10 @@ class Resolver {
   }
 
   static findNodeModule(path: Path, options: FindNodeModuleConfig): ?Path {
-    /* $FlowFixMe */
-    const resolver = require(options.resolver || './defaultResolver.js');
+    const resolver = options.resolver
+      ? /* $FlowFixMe */
+        require(options.resolver)
+      : defaultResolver;
     const paths = options.paths;
 
     try {
diff --git a/packages/jest-runtime/src/ScriptTransformer.js b/packages/jest-runtime/src/ScriptTransformer.js
index 46b94d97cb1a..e6da9330959d 100644
--- a/packages/jest-runtime/src/ScriptTransformer.js
+++ b/packages/jest-runtime/src/ScriptTransformer.js
@@ -20,6 +20,9 @@ import path from 'path';
 import vm from 'vm';
 import {createDirectory} from 'jest-util';
 import fs from 'graceful-fs';
+import {transform as babelTransform} from 'babel-core';
+import babelPluginIstanbul from 'babel-plugin-istanbul';
+import convertSourceMap from 'convert-source-map';
 // $FlowFixMe: Missing ESM export
 import {getCacheFilePath} from 'jest-haste-map';
 import stableStringify from 'json-stable-stringify';
@@ -148,12 +151,7 @@ class ScriptTransformer {
   }
 
   _instrumentFile(filename: Path, content: string): string {
-    // Keeping these requires inside this function reduces a single run
-    // time by 2sec if not running in `--coverage` mode
-    const babel = require('babel-core');
-    const babelPluginIstanbul = require('babel-plugin-istanbul').default;
-
-    return babel.transform(content, {
+    return babelTransform(content, {
       auxiliaryCommentBefore: ' istanbul ignore next ',
       babelrc: false,
       filename,
@@ -217,8 +215,7 @@ class ScriptTransformer {
 
     if (mapCoverage) {
       if (!transformed.map) {
-        const convert = require('convert-source-map');
-        const inlineSourceMap = convert.fromSource(transformed.code);
+        const inlineSourceMap = convertSourceMap.fromSource(transformed.code);
         if (inlineSourceMap) {
           transformed.map = inlineSourceMap.toJSON();
         }
diff --git a/packages/jest-runtime/src/cli/index.js b/packages/jest-runtime/src/cli/index.js
index 7a8d2808448b..8825991c50a7 100644
--- a/packages/jest-runtime/src/cli/index.js
+++ b/packages/jest-runtime/src/cli/index.js
@@ -17,10 +17,11 @@ import chalk from 'chalk';
 import yargs from 'yargs';
 import {Console, setGlobal, validateCLIOptions} from 'jest-util';
 import {readConfig} from 'jest-config';
-const VERSION = (require('../../package.json').version: string);
 import Runtime from '../';
 import args from './args';
 
+const VERSION = (require('../../package.json').version: string);
+
 function run(cliArgv?: Argv, cliInfo?: Array<string>) {
   let argv;
   if (cliArgv) {
diff --git a/packages/jest-runtime/src/index.js b/packages/jest-runtime/src/index.js
index 07233b4bbae9..e0024e0100e2 100644
--- a/packages/jest-runtime/src/index.js
+++ b/packages/jest-runtime/src/index.js
@@ -25,6 +25,7 @@ import fs from 'graceful-fs';
 import stripBOM from 'strip-bom';
 import ScriptTransformer from './ScriptTransformer';
 import shouldInstrument from './shouldInstrument';
+import cliArgs from './cli/args';
 
 type Module = {|
   children?: Array<any>,
@@ -260,11 +261,12 @@ class Runtime {
   }
 
   static runCLI(args?: Argv, info?: Array<string>) {
+    // TODO: If this is not inline, the repl test fails
     return require('./cli').run(args, info);
   }
 
   static getCLIOptions() {
-    return require('./cli/args').options;
+    return cliArgs.options;
   }
 
   requireModule(
diff --git a/packages/jest-validate/src/index.js b/packages/jest-validate/src/index.js
index 664b8cd270db..d4d5eeb0c04d 100644
--- a/packages/jest-validate/src/index.js
+++ b/packages/jest-validate/src/index.js
@@ -8,10 +8,14 @@
  * @flow
  */
 
+import {createDidYouMeanMessage, format, logValidationWarning} from './utils';
+import {ValidationError} from './errors';
+import validate from './validate';
+
 module.exports = {
-  ValidationError: require('./errors').ValidationError,
-  createDidYouMeanMessage: require('./utils').createDidYouMeanMessage,
-  format: require('./utils').format,
-  logValidationWarning: require('./utils').logValidationWarning,
-  validate: require('./validate'),
+  ValidationError,
+  createDidYouMeanMessage,
+  format,
+  logValidationWarning,
+  validate,
 };
diff --git a/packages/jest-validate/src/utils.js b/packages/jest-validate/src/utils.js
index ffdd4ac8a7d5..28cf24cae481 100644
--- a/packages/jest-validate/src/utils.js
+++ b/packages/jest-validate/src/utils.js
@@ -9,6 +9,8 @@
  */
 
 import chalk from 'chalk';
+import prettyFormat from 'pretty-format';
+import leven from 'leven';
 
 const BULLET: string = chalk.bold('\u25cf');
 const DEPRECATION = `${BULLET} Deprecation Warning`;
@@ -18,7 +20,7 @@ const WARNING = `${BULLET} Validation Warning`;
 const format = (value: any): string =>
   typeof value === 'function'
     ? value.toString()
-    : require('pretty-format')(value, {min: true});
+    : prettyFormat(value, {min: true});
 
 class ValidationError extends Error {
   name: string;
@@ -46,7 +48,6 @@ const createDidYouMeanMessage = (
   unrecognized: string,
   allowedOptions: Array<string>,
 ) => {
-  const leven = require('leven');
   const suggestion = allowedOptions.find(option => {
     const steps: number = leven(option, unrecognized);
     return steps < 3;
diff --git a/packages/jest/src/jest.js b/packages/jest/src/jest.js
index 741905ea8140..b1680c3e98b8 100644
--- a/packages/jest/src/jest.js
+++ b/packages/jest/src/jest.js
@@ -8,4 +8,6 @@
  * @flow
  */
 
-module.exports = require('jest-cli');
+import cli from 'jest-cli';
+
+module.exports = cli;
diff --git a/packages/pretty-format/src/index.js b/packages/pretty-format/src/index.js
index f01fdba64168..5f6e04c2c608 100644
--- a/packages/pretty-format/src/index.js
+++ b/packages/pretty-format/src/index.js
@@ -18,6 +18,13 @@ import type {
 
 import style from 'ansi-styles';
 
+import AsymmetricMatcher from './plugins/AsymmetricMatcher';
+import ConvertAnsi from './plugins/ConvertAnsi';
+import HTMLElement from './plugins/HTMLElement';
+import Immutable from './plugins/ImmutablePlugins';
+import ReactElement from './plugins/ReactElement';
+import ReactTestComponent from './plugins/ReactTestComponent';
+
 type Theme = {|
   comment?: string,
   content?: string,
@@ -959,12 +966,12 @@ function prettyFormat(val: any, initialOptions?: InitialOptions): string {
 }
 
 prettyFormat.plugins = {
-  AsymmetricMatcher: require('./plugins/AsymmetricMatcher'),
-  ConvertAnsi: require('./plugins/ConvertAnsi'),
-  HTMLElement: require('./plugins/HTMLElement'),
-  Immutable: require('./plugins/ImmutablePlugins'),
-  ReactElement: require('./plugins/ReactElement'),
-  ReactTestComponent: require('./plugins/ReactTestComponent'),
+  AsymmetricMatcher,
+  ConvertAnsi,
+  HTMLElement,
+  Immutable,
+  ReactElement,
+  ReactTestComponent,
 };
 
 module.exports = prettyFormat;
diff --git a/packages/pretty-format/src/plugins/ConvertAnsi.js b/packages/pretty-format/src/plugins/ConvertAnsi.js
index 27011715c574..b3bccc2e0859 100644
--- a/packages/pretty-format/src/plugins/ConvertAnsi.js
+++ b/packages/pretty-format/src/plugins/ConvertAnsi.js
@@ -11,9 +11,9 @@
 import type {Colors, Indent, Options, Print, Plugin} from 'types/PrettyFormat';
 
 import ansiRegex from 'ansi-regex';
+import style from 'ansi-styles';
 
 const toHumanReadableAnsi = text => {
-  const style = require('ansi-styles');
   return text.replace(ansiRegex(), (match, offset, string) => {
     switch (match) {
       case style.red.close:
diff --git a/packages/pretty-format/src/plugins/ImmutablePlugins.js b/packages/pretty-format/src/plugins/ImmutablePlugins.js
index 35af5baafa42..1ad73ce2839b 100644
--- a/packages/pretty-format/src/plugins/ImmutablePlugins.js
+++ b/packages/pretty-format/src/plugins/ImmutablePlugins.js
@@ -8,12 +8,20 @@
  * @flow
  */
 
+import ImmutableList from './ImmutableList';
+import ImmutableSet from './ImmutableSet';
+import ImmutableMap from './ImmutableMap';
+import ImmutableStack from './ImmutableStack';
+import ImmutableOrderedSet from './ImmutableOrderedSet';
+import ImmutableOrderedMap from './ImmutableOrderedMap';
+import ImmutableRecord from './ImmutableRecord';
+
 module.exports = [
-  require('./ImmutableList'),
-  require('./ImmutableSet'),
-  require('./ImmutableMap'),
-  require('./ImmutableStack'),
-  require('./ImmutableOrderedSet'),
-  require('./ImmutableOrderedMap'),
-  require('./ImmutableRecord'),
+  ImmutableList,
+  ImmutableSet,
+  ImmutableMap,
+  ImmutableStack,
+  ImmutableOrderedSet,
+  ImmutableOrderedMap,
+  ImmutableRecord,
 ];
diff --git a/packages/pretty-format/src/plugins/ImmutableRecord.js b/packages/pretty-format/src/plugins/ImmutableRecord.js
index f57cae9d21fa..1b8656b9ae76 100644
--- a/packages/pretty-format/src/plugins/ImmutableRecord.js
+++ b/packages/pretty-format/src/plugins/ImmutableRecord.js
@@ -10,7 +10,7 @@
 
 import type {Colors, Indent, Options, Print, Plugin} from 'types/PrettyFormat';
 
-const printImmutable = require('./lib/printImmutable');
+import printImmutable from './lib/printImmutable';
 
 const IS_RECORD = '@@__IMMUTABLE_RECORD__@@';
 const test = (maybeRecord: any) => !!(maybeRecord && maybeRecord[IS_RECORD]);

From e1f7cfa6a3ad80c68ccd7e2ae634235daf5bc111 Mon Sep 17 00:00:00 2001
From: Simen Bekkhus <sbekkhus91@gmail.com>
Date: Sun, 14 May 2017 15:13:38 +0200
Subject: [PATCH 2/2] Use babel transform to inline all requires

Improving startup time, and avoiding unused modules in the tree
---
 .babelrc                             | 2 +-
 package.json                         | 2 +-
 packages/jest-cli/src/cli/getJest.js | 3 +--
 packages/jest-runtime/src/index.js   | 4 ++--
 yarn.lock                            | 9 ++++++++-
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/.babelrc b/.babelrc
index d3202c6557ea..54c65a8e065c 100644
--- a/.babelrc
+++ b/.babelrc
@@ -6,7 +6,7 @@
     "transform-es2015-parameters",
     "transform-async-to-generator",
     "transform-strict-mode",
-    ["transform-es2015-modules-commonjs", {"allowTopLevelThis": true}]
+    ["transform-inline-imports-commonjs", {"allowTopLevelThis": true}]
   ],
   "retainLines": true
 }
diff --git a/package.json b/package.json
index 78f706f9574b..f42d56b8bea8 100644
--- a/package.json
+++ b/package.json
@@ -8,9 +8,9 @@
     "babel-plugin-syntax-trailing-function-commas": "^6.13.0",
     "babel-plugin-transform-async-to-generator": "^6.16.0",
     "babel-plugin-transform-es2015-destructuring": "^6.23.0",
-    "babel-plugin-transform-es2015-modules-commonjs": "^6.24.1",
     "babel-plugin-transform-es2015-parameters": "^6.23.0",
     "babel-plugin-transform-flow-strip-types": "^6.18.0",
+    "babel-plugin-transform-inline-imports-commonjs": "^1.2.0",
     "babel-plugin-transform-runtime": "^6.23.0",
     "babel-plugin-transform-strict-mode": "^6.24.1",
     "babel-preset-env": "^1.4.0",
diff --git a/packages/jest-cli/src/cli/getJest.js b/packages/jest-cli/src/cli/getJest.js
index 830ed090a7da..9f47395d59fe 100644
--- a/packages/jest-cli/src/cli/getJest.js
+++ b/packages/jest-cli/src/cli/getJest.js
@@ -13,6 +13,7 @@ import type {Path} from 'types/Config';
 import path from 'path';
 import chalk from 'chalk';
 import fs from 'graceful-fs';
+import jest from '../jest';
 
 function getJest(packageRoot: Path) {
   const packageJSONPath = path.join(packageRoot, 'package.json');
@@ -21,8 +22,6 @@ function getJest(packageRoot: Path) {
     /* $FlowFixMe */
     return require(binPath);
   } else {
-    // TODO: Because of a dependency cycle, this can only be inlined once the babel plugin for inlining is merged
-    const jest = require('../jest');
     // Check if Jest is specified in `package.json` but not installed.
     if (fs.existsSync(packageJSONPath)) {
       /* $FlowFixMe */
diff --git a/packages/jest-runtime/src/index.js b/packages/jest-runtime/src/index.js
index e0024e0100e2..c4fca6d079c5 100644
--- a/packages/jest-runtime/src/index.js
+++ b/packages/jest-runtime/src/index.js
@@ -25,6 +25,7 @@ import fs from 'graceful-fs';
 import stripBOM from 'strip-bom';
 import ScriptTransformer from './ScriptTransformer';
 import shouldInstrument from './shouldInstrument';
+import cli from './cli';
 import cliArgs from './cli/args';
 
 type Module = {|
@@ -261,8 +262,7 @@ class Runtime {
   }
 
   static runCLI(args?: Argv, info?: Array<string>) {
-    // TODO: If this is not inline, the repl test fails
-    return require('./cli').run(args, info);
+    return cli.run(args, info);
   }
 
   static getCLIOptions() {
diff --git a/yarn.lock b/yarn.lock
index cb4621e295ac..41f0bdecf7e3 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -611,6 +611,13 @@ babel-plugin-transform-flow-strip-types@^6.18.0, babel-plugin-transform-flow-str
     babel-plugin-syntax-flow "^6.18.0"
     babel-runtime "^6.22.0"
 
+babel-plugin-transform-inline-imports-commonjs@^1.2.0:
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/babel-plugin-transform-inline-imports-commonjs/-/babel-plugin-transform-inline-imports-commonjs-1.2.0.tgz#20c7d192bafc54c8727386e3387d8ee4ef19e6a5"
+  dependencies:
+    babel-plugin-transform-strict-mode "^6.8.0"
+    builtin-modules "^1.1.1"
+
 babel-plugin-transform-object-assign@^6.5.0:
   version "6.22.0"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-object-assign/-/babel-plugin-transform-object-assign-6.22.0.tgz#f99d2f66f1a0b0d498e346c5359684740caa20ba"
@@ -664,7 +671,7 @@ babel-plugin-transform-runtime@^6.23.0:
   dependencies:
     babel-runtime "^6.22.0"
 
-babel-plugin-transform-strict-mode@^6.24.1:
+babel-plugin-transform-strict-mode@^6.24.1, babel-plugin-transform-strict-mode@^6.8.0:
   version "6.24.1"
   resolved "https://registry.yarnpkg.com/babel-plugin-transform-strict-mode/-/babel-plugin-transform-strict-mode-6.24.1.tgz#d5faf7aa578a65bbe591cf5edae04a0c67020758"
   dependencies: