Extract workerfarm into seperate package (#2162)

packages/core/babel-register/package.json

@@ -0,0 +1,18 @@
+{
+  "name": "@parcel/babel-register",
+  "version": "1.10.3",
+  "description": "Blazing fast, zero configuration web application bundler",
+  "main": "index.js",
+  "license": "MIT",
+  "private": true,
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/parcel-bundler/parcel.git"
+  },
+  "peerDependencies": {
+    "@babel/core": "^7.0.0"
+  },
+  "dependencies": {
+    "@babel/register": "^7.0.0"
+  }
+}

packages/core/parcel-bundler/package.json

@@ -55,7 +55,6 @@
     "node-libs-browser": "^2.0.0",
     "opn": "^5.1.0",
     "ora": "^2.1.0",
-    "physical-cpu-count": "^2.0.0",
     "postcss": "^6.0.19",
     "postcss-value-parser": "^3.3.0",
     "posthtml": "^0.11.2",
@@ -71,15 +70,15 @@
     "toml": "^2.3.3",
     "tomlify-j0.4": "^3.0.0",
     "v8-compile-cache": "^2.0.0",
-    "ws": "^5.1.1"
+    "ws": "^5.1.1",
+    "@parcel/workers": "^1.10.3"
   },
   "devDependencies": {
     "@babel/cli": "^7.0.0",
     "@babel/plugin-syntax-export-default-from": "^7.0.0",
     "@babel/plugin-syntax-export-namespace-from": "^7.0.0",
     "@babel/plugin-transform-runtime": "^7.0.0",
     "@babel/preset-flow": "^7.0.0",
-    "@babel/register": "^7.0.0",
     "@vue/component-compiler-utils": "^2.0.0",
     "babel-core": "^6.26.3",
     "babel-preset-env": "^1.7.0",
@@ -115,7 +114,8 @@
     "sugarss": "^2.0.0",
     "typescript": "^3.0.0",
     "vue": "^2.5.16",
-    "vue-template-compiler": "^2.5.16"
+    "vue-template-compiler": "^2.5.16",
+    "@parcel/babel-register": "^1.10.3"
   },
   "scripts": {
     "test": "cross-env NODE_ENV=test mocha",

packages/core/parcel-bundler/src/Bundler.js

@@ -1,7 +1,7 @@
 const fs = require('./utils/fs');
 const Resolver = require('./Resolver');
 const Parser = require('./Parser');
-const WorkerFarm = require('./workerfarm/WorkerFarm');
+const WorkerFarm = require('@parcel/workers');
 const Path = require('path');
 const Bundle = require('./Bundle');
 const Watcher = require('./Watcher');
@@ -379,7 +379,9 @@ class Bundler extends EventEmitter {
       this.options.hmrPort = await this.hmr.start(this.options);
     }
 
-    this.farm = WorkerFarm.getShared(this.options);
+    this.farm = await WorkerFarm.getShared(this.options, {
+      workerPath: require.resolve('./worker.js')
+    });
   }
 
   async stop() {

packages/core/parcel-bundler/src/Logger.js

@@ -5,7 +5,7 @@ const emoji = require('./utils/emoji');
 const {countBreaks} = require('grapheme-breaker');
 const stripAnsi = require('strip-ansi');
 const ora = require('ora');
-const WorkerFarm = require('./workerfarm/WorkerFarm');
+const WorkerFarm = require('@parcel/workers');
 const path = require('path');
 const fs = require('fs');
 

packages/core/parcel-bundler/src/utils/installPackage.js

@@ -7,7 +7,7 @@ const pipeSpawn = require('./pipeSpawn');
 const PromiseQueue = require('./PromiseQueue');
 const path = require('path');
 const fs = require('./fs');
-const WorkerFarm = require('../workerfarm/WorkerFarm');
+const WorkerFarm = require('@parcel/workers');
 
 const YARN_LOCK = 'yarn.lock';
 

packages/core/parcel-bundler/test/mocha.opts

@@ -1,3 +1,3 @@
 --timeout 50000
---require ./test/babel-register
+--require @parcel/babel-register
 --exit

packages/core/workers/.gitignore

@@ -0,0 +1 @@
+lib

packages/core/workers/index.js

@@ -0,0 +1,5 @@
+// Node 8 supports native async functions - no need to use compiled code!
+module.exports =
+  parseInt(process.versions.node, 10) < 8
+    ? require('./lib/WorkerFarm')
+    : require('./src/WorkerFarm');

packages/core/workers/package.json

@@ -0,0 +1,28 @@
+{
+  "name": "@parcel/workers",
+  "version": "1.10.3",
+  "description": "Blazing fast, zero configuration web application bundler",
+  "main": "index.js",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/parcel-bundler/parcel.git"
+  },
+  "engines": {
+    "node": ">= 6.0.0"
+  },
+  "scripts": {
+    "test": "cross-env NODE_ENV=test mocha",
+    "test-ci": "yarn build && yarn test",
+    "format": "prettier --write \"./{src,bin,test}/**/*.{js,json,md}\"",
+    "lint": "eslint . && prettier \"./{src,bin,test}/**/*.{js,json,md}\" --list-different",
+    "build": "babel src -d lib",
+    "prepublish": "yarn build"
+  },
+  "devDependencies": {
+    "mocha": "^5.2.0"
+  },
+  "dependencies": {
+    "physical-cpu-count": "^2.0.0"
+  }
+}

packages/core/workers/src/.babelrc

@@ -0,0 +1,8 @@
+{
+  "presets": [["@babel/preset-env", {
+    "targets": {
+      "node": "6"
+    }
+  }]],
+  "plugins": ["@babel/plugin-transform-runtime"]
+}

packages/core/workers/src/.eslintrc.json

@@ -0,0 +1,3 @@
+{
+  "extends": "../../../../.eslintrc.json"
+}

packages/core/parcel-bundler/src/workerfarm/Worker.js → packages/core/workers/src/Worker.js

@@ -2,13 +2,9 @@ const childProcess = require('child_process');
 const {EventEmitter} = require('events');
 const errorUtils = require('./errorUtils');
 
-const childModule =
-  parseInt(process.versions.node, 10) < 8
-    ? require.resolve('../../lib/workerfarm/child')
-    : require.resolve('../../src/workerfarm/child');
+const childModule = require.resolve('./child');
 
 let WORKER_ID = 0;
-
 class Worker extends EventEmitter {
   constructor(options) {
     super();

packages/core/parcel-bundler/src/workerfarm/WorkerFarm.js → packages/core/workers/src/WorkerFarm.js

@@ -1,28 +1,37 @@
 const {EventEmitter} = require('events');
 const errorUtils = require('./errorUtils');
 const Worker = require('./Worker');
-const cpuCount = require('../utils/cpuCount');
+const cpuCount = require('./cpuCount');
 
 let shared = null;
+
+/**
+ * workerPath should always be defined inside farmOptions
+ */
+
 class WorkerFarm extends EventEmitter {
   constructor(options, farmOptions = {}) {
     super();
-    this.options = Object.assign(
-      {
-        maxConcurrentWorkers: WorkerFarm.getNumWorkers(),
-        maxConcurrentCallsPerWorker: WorkerFarm.getConcurrentCallsPerWorker(),
-        forcedKillTime: 500,
-        warmWorkers: true,
-        useLocalWorker: true,
-        workerPath: '../worker'
-      },
-      farmOptions
-    );
+    this.options = {
+      maxConcurrentWorkers: WorkerFarm.getNumWorkers(),
+      maxConcurrentCallsPerWorker: WorkerFarm.getConcurrentCallsPerWorker(),
+      forcedKillTime: 500,
+      warmWorkers: true,
+      useLocalWorker: true
+    };
+
+    if (farmOptions) {
+      this.options = Object.assign(this.options, farmOptions);
+    }
 
     this.warmWorkers = 0;
     this.workers = new Map();
     this.callQueue = [];
 
+    if (!this.options.workerPath) {
+      throw new Error('Please provide a worker path!');
+    }
+
     this.localWorker = require(this.options.workerPath);
     this.run = this.mkhandle('run');
 
@@ -243,9 +252,16 @@ class WorkerFarm extends EventEmitter {
     );
   }
 
-  static getShared(options) {
+  static async getShared(options, farmOptions) {
+    // Farm options shouldn't be considered safe to overwrite
+    // and require an entire new instance to be created
+    if (shared && farmOptions) {
+      await shared.end();
+      shared = null;
+    }
+
     if (!shared) {
-      shared = new WorkerFarm(options);
+      shared = new WorkerFarm(options, farmOptions);
     } else if (options) {
       shared.init(options);
     }
@@ -263,12 +279,12 @@ class WorkerFarm extends EventEmitter {
       : cpuCount();
   }
 
-  static callMaster(request, awaitResponse = true) {
+  static async callMaster(request, awaitResponse = true) {
     if (WorkerFarm.isWorker()) {
       const child = require('./child');
       return child.addCall(request, awaitResponse);
     } else {
-      return WorkerFarm.getShared().processRequest(request);
+      return (await WorkerFarm.getShared()).processRequest(request);
     }
   }
 

packages/core/workers/test/.babelrc

@@ -0,0 +1,9 @@
+{
+  "presets": [["@babel/preset-env", {
+    "targets": {
+      "node": "current"
+    }
+  }]],
+  "plugins": ["@babel/plugin-transform-runtime"],
+  "ignore": ["integration"]
+}

packages/core/workers/test/.eslintrc.json

@@ -0,0 +1,6 @@
+{
+  "extends": "../../../../.eslintrc.json",
+  "env": {
+    "mocha": true
+  }
+}

packages/core/parcel-bundler/test/integration/workerfarm/echo.js → packages/core/workers/test/integration/workerfarm/echo.js

@@ -7,4 +7,4 @@ function init() {
 }
 
 exports.run = run;
-exports.init = init;
+exports.init = init;

packages/core/parcel-bundler/test/integration/workerfarm/init.js → packages/core/workers/test/integration/workerfarm/init.js

@@ -9,4 +9,4 @@ function init(opt) {
 }
 
 exports.run = run;
-exports.init = init;
+exports.init = init;

packages/core/parcel-bundler/test/integration/workerfarm/ipc-pid.js → packages/core/workers/test/integration/workerfarm/ipc-pid.js

@@ -1,15 +1,19 @@
-const WorkerFarm = require(`../../../${parseInt(process.versions.node, 10) < 8 ? 'lib' : 'src'}/workerfarm/WorkerFarm`);
+const WorkerFarm = require(`../../../${
+  parseInt(process.versions.node, 10) < 8 ? 'lib' : 'src'
+}/WorkerFarm`);
 
 function run() {
   let result = [process.pid];
   return new Promise((resolve, reject) => {
     WorkerFarm.callMaster({
       location: require.resolve('./master-process-id.js'),
       args: []
-    }).then((pid) => {
-      result.push(pid)
-      resolve(result);
-    }).catch(reject);
+    })
+      .then(pid => {
+        result.push(pid);
+        resolve(result);
+      })
+      .catch(reject);
   });
 }
 
@@ -18,4 +22,4 @@ function init() {
 }
 
 exports.run = run;
-exports.init = init;
+exports.init = init;

packages/core/parcel-bundler/test/integration/workerfarm/ipc.js → packages/core/workers/test/integration/workerfarm/ipc.js

@@ -1,4 +1,6 @@
-const WorkerFarm = require(`../../../${parseInt(process.versions.node, 10) < 8 ? 'lib' : 'src'}/workerfarm/WorkerFarm`);
+const WorkerFarm = require(`../../../${
+  parseInt(process.versions.node, 10) < 8 ? 'lib' : 'src'
+}/WorkerFarm`);
 
 function run(a, b) {
   return WorkerFarm.callMaster({
@@ -12,4 +14,4 @@ function init() {
 }
 
 exports.run = run;
-exports.init = init;
+exports.init = init;

packages/core/parcel-bundler/test/integration/workerfarm/master-process-id.js → packages/core/workers/test/integration/workerfarm/master-process-id.js

@@ -1,3 +1,3 @@
 module.exports = function() {
   return process.pid;
-}
+};

packages/core/parcel-bundler/test/integration/workerfarm/master-sum.js → packages/core/workers/test/integration/workerfarm/master-sum.js

@@ -1,3 +1,3 @@
 module.exports = function(a, b) {
   return a + b;
-}
+};

packages/core/parcel-bundler/test/integration/workerfarm/ping.js → packages/core/workers/test/integration/workerfarm/ping.js

@@ -7,4 +7,4 @@ function init() {
 }
 
 exports.run = run;
-exports.init = init;
+exports.init = init;

packages/core/workers/test/mocha.opts

@@ -0,0 +1,2 @@
+--require @parcel/babel-register
+--exit

packages/core/parcel-bundler/test/workerfarm.js → packages/core/workers/test/workerfarm.js

@@ -1,5 +1,5 @@
 const assert = require('assert');
-const WorkerFarm = require('../src/workerfarm/WorkerFarm');
+const WorkerFarm = require('../index');
 
 describe('WorkerFarm', () => {
   it('Should start up workers', async () => {