Some cleanup

Author: rogeliog

Untitled-1

@@ -1,10 +1,4 @@
-require('babel-polyfill');
-const throat = require('throat');
-const pify = require('pify');
-const workerFarm = require('worker-farm');
-const path = require('path');
-
-const runPath = path.resolve(__dirname, 'run.js');
+const Worker = require('jest-worker');
 
 class CancelRun extends Error {
   constructor(message) {
@@ -13,53 +7,36 @@ class CancelRun extends Error {
   }
 }
 
-const createRunner = (fn, { extraOptions } = {}) => {
+const createRunner = runPath => {
   class BaseTestRunner {
     constructor(globalConfig) {
       this._globalConfig = globalConfig;
     }
 
     // eslint-disable-next-line
     async runTests(tests, watcher, onStart, onResult, onFailure, options) {
-      const farm = workerFarm(
-        {
-          autoStart: true,
-          maxConcurrentCallsPerWorker: 1,
-          maxConcurrentWorkers: this._globalConfig.maxWorkers,
-          maxRetries: 2, // Allow for a couple of transient errors.
-        },
-        runPath,
-      );
-
-      const mutex = throat(this._globalConfig.maxWorkers);
-      const worker = pify(farm);
-
-      const runTestInWorker = test =>
-        mutex(async () => {
-          if (watcher.isInterrupted()) {
-            throw new CancelRun();
-          }
-          await onStart(test);
-          const baseOptions = {
-            config: test.context.config,
-            globalConfig: this._globalConfig,
-            testPath: test.path,
-            rawModuleMap: watcher.isWatchMode()
-              ? test.context.moduleMap.getRawModuleMap()
-              : null,
-            options,
-          };
+      const worker = new Worker(runPath, {
+        exposedMethods: ['default'],
+        numWorkers: this._globalConfig.maxWorkers,
+      });
 
-          if (extraOptions) {
-            return Object.assign(
-              {},
-              baseOptions,
-              extraOptions(baseOptions, tests),
-            );
-          }
+      const runTestInWorker = async test => {
+        if (watcher.isInterrupted()) {
+          throw new CancelRun();
+        }
+        await onStart(test);
+        const baseOptions = {
+          config: test.context.config,
+          globalConfig: this._globalConfig,
+          testPath: test.path,
+          rawModuleMap: watcher.isWatchMode()
+            ? test.context.moduleMap.getRawModuleMap()
+            : null,
+          options,
+        };
 
-          return worker(baseOptions);
-        });
+        return worker.default(baseOptions);
+      };
 
       const onError = async (err, test) => {
         await onFailure(test, err);
@@ -89,7 +66,7 @@ const createRunner = (fn, { extraOptions } = {}) => {
         ),
       );
 
-      const cleanup = () => workerFarm.end(farm);
+      const cleanup = () => worker.end();
 
       return Promise.race([runAllTests, onInterrupt]).then(cleanup, cleanup);
     }

a.js

@@ -7,7 +7,9 @@
   "license": "MIT",
   "repository": "https://github.com/rogeliog/create-jest-runner.git",
   "homepage": "https://github.com/rogeliog/create-jest-runner",
-  "files": ["build/"],
+  "files": [
+    "build/"
+  ],
   "scripts": {
     "test": "jest",
     "lint": "eslint .",
@@ -20,6 +22,7 @@
     "babel-plugin-istanbul": "4.1.4",
     "babel-polyfill": "^6.26.0",
     "babel-register": "6.26.0",
+    "jest-worker": "21.3.0-beta.2",
     "lodash": "4.17.4",
     "minimatch": "3.0.4",
     "mocha": "3.5.0",

lib/index.js

@@ -2130,6 +2130,12 @@ jest-validate@^21.0.2:
     leven "^2.1.0"
     pretty-format "^21.0.2"
 
+[email protected]:
+  version "21.3.0-beta.2"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-21.3.0-beta.2.tgz#05eba2afe4bffffdba6fb0a49016b628382b8234"
+  dependencies:
+    merge-stream "^1.0.1"
+
 jest@^21.0.2:
   version "21.0.2"
   resolved "https://registry.yarnpkg.com/jest/-/jest-21.0.2.tgz#a5c9bdc9d4322ae672fe8cb3eaf25c268c5f04b2"
@@ -2369,6 +2375,12 @@ mem@^1.1.0:
   dependencies:
     mimic-fn "^1.0.0"
 
+merge-stream@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/merge-stream/-/merge-stream-1.0.1.tgz#4041202d508a342ba00174008df0c251b8c135e1"
+  dependencies:
+    readable-stream "^2.0.1"
+
 merge@^1.1.3:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/merge/-/merge-1.2.0.tgz#7531e39d4949c281a66b8c5a6e0265e8b05894da"
@@ -2811,7 +2823,7 @@ read-pkg@^2.0.0:
     normalize-package-data "^2.3.2"
     path-type "^2.0.0"
 
-readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.1.4, readable-stream@^2.2.2:
   version "2.3.3"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.3.tgz#368f2512d79f9d46fdfc71349ae7878bbc1eb95c"
   dependencies: