now, please

jestjs · Dec 25, 2018 · e8ba1ba · e8ba1ba
1 parent 39514d9
commit e8ba1ba
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 8 deletions.
diff --git a/packages/jest-repl/bin/jest-repl.js b/packages/jest-repl/bin/jest-repl.js
@@ -10,4 +10,4 @@ if (process.env.NODE_ENV == null) {
   process.env.NODE_ENV = 'test';
 }
 
-require('../build/cli')();
+require('../build/cli').default();
diff --git a/packages/jest-repl/package.json b/packages/jest-repl/package.json
@@ -10,6 +10,7 @@
   "dependencies": {
     "jest-config": "^23.6.0",
     "jest-runtime": "^23.6.0",
+    "jest-util": "^23.4.0",
     "jest-validate": "^23.6.0",
     "repl": "^0.1.3",
     "yargs": "^12.0.2"

diff --git a/packages/jest-repl/src/__tests__/jest_repl.test.js b/packages/jest-repl/src/__tests__/jest_repl.test.js
@@ -8,10 +8,9 @@
 'use strict';
 
 import {spawnSync} from 'child_process';
-import path from 'path';
 import {skipSuiteOnWindows} from '../../../../scripts/ConditionalTest';
 
-const JEST_RUNTIME = path.resolve(__dirname, '../../bin/jest-repl.js');
+const JEST_RUNTIME = require.resolve('../../bin/jest-repl.js');
 
 describe('Repl', () => {
   skipSuiteOnWindows();
@@ -23,6 +22,7 @@ describe('Repl', () => {
         encoding: 'utf8',
         env: process.env,
       });
+      expect(output.stderr.trim()).toBe('');
       expect(output.stdout.trim()).toMatch(/›/);
     });
   });

diff --git a/packages/jest-repl/src/cli/repl.js b/packages/jest-repl/src/cli/repl.js
@@ -17,6 +17,7 @@ declare var jest: Object;
 import path from 'path';
 import repl from 'repl';
 import vm from 'vm';
+import {interopRequireDefault} from 'jest-util';
 
 let transformer;
 
@@ -59,8 +60,8 @@ if (jestProjectConfig.transform) {
     }
   }
   if (transformerPath) {
-    /* $FlowFixMe */
-    transformer = require(transformerPath);
+    // $FlowFixMe
+    transformer = interopRequireDefault(require(transformerPath)).default;
     if (typeof transformer.process !== 'function') {
       throw new TypeError(
         'Jest: a transformer must export a `process` function.',

diff --git a/packages/jest-runtime/src/cli/index.js b/packages/jest-runtime/src/cli/index.js
@@ -14,7 +14,7 @@ import chalk from 'chalk';
 import os from 'os';
 import path from 'path';
 import yargs from 'yargs';
-import {Console, setGlobal} from 'jest-util';
+import {Console, interopRequireDefault, setGlobal} from 'jest-util';
 import {validateCLIOptions} from 'jest-validate';
 import {readConfig, deprecationEntries} from 'jest-config';
 import Runtime from '../';
@@ -79,8 +79,10 @@ export function run(cliArgv?: Argv, cliInfo?: Array<string>) {
     watchman: globalConfig.watchman,
   })
     .then(hasteMap => {
-      /* $FlowFixMe */
-      const Environment = (require(config.testEnvironment): EnvironmentClass);
+      const Environment = (interopRequireDefault(
+        // $FlowFixMe
+        require(config.testEnvironment),
+      ).default: EnvironmentClass);
       const environment = new Environment(config);
       setGlobal(
         environment.global,