@parcel/workers 2.0.0-beta.3.1 → 2.0.0-nightly.1006

package/index.d.ts

@@ -0,0 +1,22 @@
+import {FilePath} from '@parcel/types';
+
+type BackendType = 'process' | 'threads';
+
+export type FarmOptions = {
+  maxConcurrentWorkers: number,
+  maxConcurrentCallsPerWorker: number,
+  forcedKillTime: number,
+  useLocalWorker: boolean,
+  warmWorkers: boolean,
+  workerPath?: FilePath,
+  backend: BackendType,
+  shouldPatchConsole?: boolean,
+};
+
+declare class WorkerFarm {
+  constructor(options: FarmOptions);
+
+  end(): Promise<void>;
+}
+
+export default WorkerFarm; 

package/lib/Handle.js

@@ -15,20 +15,11 @@ function _core() {
   return data;
 }
 
-function _package() {
-  const data = _interopRequireDefault(require("../package.json"));
-
-  _package = function () {
-    return data;
-  };
-
-  return data;
-}
+var _package = _interopRequireDefault(require("../package.json"));
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+// $FlowFixMe
 let HANDLE_ID = 0; // $FlowFixMe
 
 const handleById = new Map();
@@ -37,12 +28,6 @@ class Handle {
   constructor(opts) {
     var _opts$id;
 
-    _defineProperty(this, "id", void 0);
-
-    _defineProperty(this, "childId", void 0);
-
-    _defineProperty(this, "fn", void 0);
-
     this.id = (_opts$id = opts.id) !== null && _opts$id !== void 0 ? _opts$id : ++HANDLE_ID;
     this.fn = opts.fn;
     this.childId = opts.childId;
@@ -69,4 +54,4 @@ class Handle {
 
 
 exports.default = Handle;
-(0, _core().registerSerializableClass)(`${_package().default.version}:Handle`, Handle);
+(0, _core().registerSerializableClass)(`${_package.default.version}:Handle`, Handle);

package/lib/Profiler.js

@@ -27,13 +27,7 @@ function _diagnostic() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class Profiler {
-  constructor() {
-    _defineProperty(this, "session", void 0);
-  }
-
   startProfiling() {
     let inspector;
 

package/lib/Trace.js

@@ -15,16 +15,8 @@ function _chromeTraceEvent() {
   return data;
 }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class Trace {
   constructor() {
-    _defineProperty(this, "tracer", void 0);
-
-    _defineProperty(this, "tid", void 0);
-
-    _defineProperty(this, "eventId", void 0);
-
     this.tracer = new (_chromeTraceEvent().Tracer)();
     this.tid = 0;
     this.eventId = 0;

package/lib/Worker.js

@@ -35,46 +35,24 @@ function _diagnostic() {
   return data;
 }
 
-function _backend() {
-  const data = require("./backend");
-
-  _backend = function () {
-    return data;
-  };
-
-  return data;
-}
+var _backend = require("./backend");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 let WORKER_ID = 0;
 
 class Worker extends _events().default {
+  id = WORKER_ID++;
+  sharedReferences = new Map();
+  calls = new Map();
+  exitCode = null;
+  callId = 0;
+  ready = false;
+  stopped = false;
+  isStopping = false;
+
   constructor(options) {
     super();
-
-    _defineProperty(this, "options", void 0);
-
-    _defineProperty(this, "worker", void 0);
-
-    _defineProperty(this, "id", WORKER_ID++);
-
-    _defineProperty(this, "sharedReferences", new Map());
-
-    _defineProperty(this, "calls", new Map());
-
-    _defineProperty(this, "exitCode", null);
-
-    _defineProperty(this, "callId", 0);
-
-    _defineProperty(this, "ready", false);
-
-    _defineProperty(this, "stopped", false);
-
-    _defineProperty(this, "isStopping", false);
-
     this.options = options;
   }
 
@@ -96,7 +74,7 @@ class Worker extends _events().default {
       let opts = [''];
       let quote = false;
 
-      for (let c of (0, _nullthrows().default)(process.env.NODE_OPTIONS.match(/\\?.|^$/g))) {
+      for (let c of (0, _nullthrows().default)(process.env.NODE_OPTIONS.match(/.|^$/g))) {
         if (c === '"') {
           quote = !quote;
         } else if (!quote && c === ' ') {
@@ -116,7 +94,7 @@ class Worker extends _events().default {
       }
     }
 
-    let WorkerBackend = (0, _backend().getWorkerBackend)(this.options.backend);
+    let WorkerBackend = (0, _backend.getWorkerBackend)(this.options.backend);
     this.worker = new WorkerBackend(filteredArgs, data => this.receive(data), err => {
       this.emit('error', err);
     }, code => {

package/lib/WorkerFarm.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "Handle", {
   enumerable: true,
   get: function () {
-    return _Handle().default;
+    return _Handle.default;
   }
 });
 exports.default = void 0;
@@ -61,75 +61,19 @@ function _diagnostic() {
   return data;
 }
 
-function _Worker() {
-  const data = _interopRequireDefault(require("./Worker"));
+var _Worker = _interopRequireDefault(require("./Worker"));
 
-  _Worker = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _cpuCount() {
-  const data = _interopRequireDefault(require("./cpuCount"));
-
-  _cpuCount = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _Handle() {
-  const data = _interopRequireDefault(require("./Handle"));
-
-  _Handle = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _childState() {
-  const data = require("./childState");
-
-  _childState = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _backend() {
-  const data = require("./backend");
+var _cpuCount = _interopRequireDefault(require("./cpuCount"));
 
-  _backend = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _Profiler() {
-  const data = _interopRequireDefault(require("./Profiler"));
-
-  _Profiler = function () {
-    return data;
-  };
+var _Handle = _interopRequireDefault(require("./Handle"));
 
-  return data;
-}
+var _childState = require("./childState");
 
-function _Trace() {
-  const data = _interopRequireDefault(require("./Trace"));
+var _backend = require("./backend");
 
-  _Trace = function () {
-    return data;
-  };
+var _Profiler = _interopRequireDefault(require("./Profiler"));
 
-  return data;
-}
+var _Trace = _interopRequireDefault(require("./Trace"));
 
 function _fs() {
   const data = _interopRequireDefault(require("fs"));
@@ -151,69 +95,28 @@ function _logger() {
   return data;
 }
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 let referenceId = 1;
 
 /**
  * workerPath should always be defined inside farmOptions
  */
 class WorkerFarm extends _events().default {
+  callQueue = [];
+  ending = false;
+  warmWorkers = 0;
+  workers = new Map();
+  handles = new Map();
+  sharedReferences = new Map();
+  sharedReferencesByValue = new Map();
+
   constructor(farmOptions = {}) {
     super();
-
-    _defineProperty(this, "callQueue", []);
-
-    _defineProperty(this, "ending", false);
-
-    _defineProperty(this, "localWorker", void 0);
-
-    _defineProperty(this, "options", void 0);
-
-    _defineProperty(this, "run", void 0);
-
-    _defineProperty(this, "warmWorkers", 0);
-
-    _defineProperty(this, "workers", new Map());
-
-    _defineProperty(this, "handles", new Map());
-
-    _defineProperty(this, "sharedReferences", new Map());
-
-    _defineProperty(this, "sharedReferencesByValue", new Map());
-
-    _defineProperty(this, "profiler", void 0);
-
-    _defineProperty(this, "workerApi", {
-      callMaster: async (request, awaitResponse = true) => {
-        // $FlowFixMe
-        let result = await this.processRequest({ ...request,
-          awaitResponse
-        });
-        return (0, _core().deserialize)((0, _core().serialize)(result));
-      },
-      createReverseHandle: fn => this.createReverseHandle(fn),
-      callChild: (childId, request) => new Promise((resolve, reject) => {
-        (0, _nullthrows().default)(this.workers.get(childId)).call({ ...request,
-          resolve,
-          reject,
-          retries: 0
-        });
-      }),
-      runHandle: (handle, args) => this.workerApi.callChild((0, _nullthrows().default)(handle.childId), {
-        handle: handle.id,
-        args
-      }),
-      getSharedReference: ref => this.sharedReferences.get(ref),
-      resolveSharedReference: value => this.sharedReferencesByValue.get(value)
-    });
-
     this.options = {
       maxConcurrentWorkers: WorkerFarm.getNumWorkers(),
       maxConcurrentCallsPerWorker: WorkerFarm.getConcurrentCallsPerWorker(),
@@ -221,7 +124,7 @@ class WorkerFarm extends _events().default {
       warmWorkers: false,
       useLocalWorker: true,
       // TODO: setting this to false makes some tests fail, figure out why
-      backend: (0, _backend().detectBackend)(),
+      backend: (0, _backend.detectBackend)(),
       ...farmOptions
     };
 
@@ -231,10 +134,35 @@ class WorkerFarm extends _events().default {
 
 
     this.localWorker = require(this.options.workerPath);
+    this.localWorkerInit = this.localWorker.childInit != null ? this.localWorker.childInit() : null;
     this.run = this.createHandle('run');
     this.startMaxWorkers();
   }
 
+  workerApi = {
+    callMaster: async (request, awaitResponse = true) => {
+      // $FlowFixMe
+      let result = await this.processRequest({ ...request,
+        awaitResponse
+      });
+      return (0, _core().deserialize)((0, _core().serialize)(result));
+    },
+    createReverseHandle: fn => this.createReverseHandle(fn),
+    callChild: (childId, request) => new Promise((resolve, reject) => {
+      (0, _nullthrows().default)(this.workers.get(childId)).call({ ...request,
+        resolve,
+        reject,
+        retries: 0
+      });
+    }),
+    runHandle: (handle, args) => this.workerApi.callChild((0, _nullthrows().default)(handle.childId), {
+      handle: handle.id,
+      args
+    }),
+    getSharedReference: ref => this.sharedReferences.get(ref),
+    resolveSharedReference: value => this.sharedReferencesByValue.get(value)
+  };
+
   warmupWorker(method, args) {
     // Workers are already stopping
     if (this.ending) {
@@ -262,7 +190,7 @@ class WorkerFarm extends _events().default {
   }
 
   createHandle(method) {
-    return (...args) => {
+    return async (...args) => {
       // Child process workers are slow to start (~600ms).
       // While we're waiting, just run on the main thread.
       // This significantly speeds up startup time.
@@ -274,6 +202,12 @@ class WorkerFarm extends _events().default {
         }
 
         let processedArgs = (0, _core().restoreDeserializedObject)((0, _core().prepareForSerialization)([...args, false]));
+
+        if (this.localWorkerInit != null) {
+          await this.localWorkerInit;
+          this.localWorkerInit = null;
+        }
+
         return this.localWorker[method](this.workerApi, ...processedArgs);
       }
     };
@@ -289,7 +223,7 @@ class WorkerFarm extends _events().default {
   }
 
   startChild() {
-    let worker = new (_Worker().default)({
+    let worker = new _Worker.default({
       forcedKillTime: this.options.forcedKillTime,
       backend: this.options.backend,
       shouldPatchConsole: this.options.shouldPatchConsole,
@@ -467,7 +401,7 @@ class WorkerFarm extends _events().default {
   }
 
   createReverseHandle(fn) {
-    let handle = new (_Handle().default)({
+    let handle = new _Handle.default({
       fn
     });
     this.handles.set(handle.id, handle);
@@ -531,7 +465,7 @@ class WorkerFarm extends _events().default {
       }));
     }
 
-    this.profiler = new (_Profiler().default)();
+    this.profiler = new _Profiler.default();
     promises.push(this.profiler.startProfiling());
     await Promise.all(promises);
   }
@@ -559,7 +493,7 @@ class WorkerFarm extends _events().default {
     }
 
     var profiles = await Promise.all(promises);
-    let trace = new (_Trace().default)();
+    let trace = new _Trace.default();
     let filename = `profile-${getTimeId()}.trace`;
     let stream = trace.pipe(_fs().default.createWriteStream(filename));
 
@@ -625,16 +559,16 @@ class WorkerFarm extends _events().default {
   }
 
   static getNumWorkers() {
-    return process.env.PARCEL_WORKERS ? parseInt(process.env.PARCEL_WORKERS, 10) : Math.ceil((0, _cpuCount().default)() / 2);
+    return process.env.PARCEL_WORKERS ? parseInt(process.env.PARCEL_WORKERS, 10) : Math.ceil((0, _cpuCount.default)() / 2);
   }
 
   static isWorker() {
-    return !!_childState().child;
+    return !!_childState.child;
   }
 
   static getWorkerApi() {
-    (0, _assert().default)(_childState().child != null, 'WorkerFarm.getWorkerApi can only be called within workers');
-    return _childState().child.workerApi;
+    (0, _assert().default)(_childState.child != null, 'WorkerFarm.getWorkerApi can only be called within workers');
+    return _childState.child.workerApi;
   }
 
   static getConcurrentCallsPerWorker() {

package/lib/bus.js

@@ -15,22 +15,14 @@ function _events() {
   return data;
 }
 
-function _childState() {
-  const data = require("./childState");
-
-  _childState = function () {
-    return data;
-  };
-
-  return data;
-}
+var _childState = require("./childState");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 class Bus extends _events().default {
   emit(event, ...args) {
-    if (_childState().child) {
-      _childState().child.workerApi.callMaster({
+    if (_childState.child) {
+      _childState.child.workerApi.callMaster({
         location: __filename,
         method: 'emit',
         args: [event, ...args]

package/lib/child.js

@@ -55,94 +55,52 @@ function _core() {
   return data;
 }
 
-function _bus() {
-  const data = _interopRequireDefault(require("./bus"));
+var _bus = _interopRequireDefault(require("./bus"));
 
-  _bus = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _Profiler() {
-  const data = _interopRequireDefault(require("./Profiler"));
-
-  _Profiler = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _Handle2() {
-  const data = _interopRequireDefault(require("./Handle"));
-
-  _Handle2 = function () {
-    return data;
-  };
+var _Profiler = _interopRequireDefault(require("./Profiler"));
 
-  return data;
-}
+var _Handle2 = _interopRequireDefault(require("./Handle"));
 
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 // The import of './Handle' should really be imported eagerly (with @babel/plugin-transform-modules-commonjs's lazy mode).
-const Handle = _Handle2().default;
+const Handle = _Handle2.default;
 
 class Child {
-  constructor(ChildBackend) {
-    _defineProperty(this, "callQueue", []);
+  callQueue = [];
+  maxConcurrentCalls = 10;
+  responseId = 0;
+  responseQueue = new Map();
+  handles = new Map();
+  sharedReferences = new Map();
+  sharedReferencesByValue = new Map();
 
-    _defineProperty(this, "childId", void 0);
-
-    _defineProperty(this, "maxConcurrentCalls", 10);
-
-    _defineProperty(this, "module", void 0);
-
-    _defineProperty(this, "responseId", 0);
-
-    _defineProperty(this, "responseQueue", new Map());
-
-    _defineProperty(this, "loggerDisposable", void 0);
-
-    _defineProperty(this, "child", void 0);
-
-    _defineProperty(this, "profiler", void 0);
-
-    _defineProperty(this, "workerApi", void 0);
-
-    _defineProperty(this, "handles", new Map());
-
-    _defineProperty(this, "sharedReferences", new Map());
-
-    _defineProperty(this, "sharedReferencesByValue", new Map());
-
-    _defineProperty(this, "workerApi", {
-      callMaster: (request, awaitResponse = true) => this.addCall(request, awaitResponse),
-      createReverseHandle: fn => this.createReverseHandle(fn),
-      runHandle: (handle, args) => this.workerApi.callMaster({
-        handle: handle.id,
-        args
-      }, true),
-      getSharedReference: ref => this.sharedReferences.get(ref),
-      resolveSharedReference: value => this.sharedReferencesByValue.get(value)
-    });
-
-    this.child = new ChildBackend(this.messageListener.bind(this), this.handleEnd.bind(this)); // Monitior all logging events inside this child process and forward to
+  constructor(ChildBackend) {
+    this.child = new ChildBackend(m => {
+      this.messageListener(m);
+    }, () => this.handleEnd()); // Monitior all logging events inside this child process and forward to
     // the main process via the bus.
 
     this.loggerDisposable = _logger().default.onLog(event => {
-      _bus().default.emit('logEvent', event);
+      _bus.default.emit('logEvent', event);
     });
   }
 
+  workerApi = {
+    callMaster: (request, awaitResponse = true) => this.addCall(request, awaitResponse),
+    createReverseHandle: fn => this.createReverseHandle(fn),
+    runHandle: (handle, args) => this.workerApi.callMaster({
+      handle: handle.id,
+      args
+    }, true),
+    getSharedReference: ref => this.sharedReferences.get(ref),
+    resolveSharedReference: value => this.sharedReferencesByValue.get(value)
+  };
+
   messageListener(message) {
     if (message.type === 'response') {
       return this.handleResponse(message);
@@ -155,10 +113,14 @@ class Child {
     this.child.send(data);
   }
 
-  childInit(module, childId) {
+  async childInit(module, childId) {
     // $FlowFixMe this must be dynamic
     this.module = require(module);
     this.childId = childId;
+
+    if (this.module.childInit != null) {
+      await this.module.childInit();
+    }
   }
 
   async handleRequest(data) {
@@ -207,12 +169,12 @@ class Child {
           (0, _logger().unpatchConsole)();
         }
 
-        result = responseFromContent(this.childInit(moduleName, child));
+        result = responseFromContent(await this.childInit(moduleName, child));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'startProfile') {
-      this.profiler = new (_Profiler().default)();
+      this.profiler = new _Profiler.default();
 
       try {
         result = responseFromContent(await this.profiler.startProfiling());

package/lib/childState.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setChild = setChild;
 exports.child = void 0;
+exports.setChild = setChild;
 // This file is imported by both the WorkerFarm and child implementation.
 // When a worker is inited, it sets the state in this file.
 // This way, WorkerFarm can access the state without directly importing the child code.

package/lib/cpuCount.js

@@ -3,8 +3,8 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.detectRealCores = detectRealCores;
 exports.default = getCores;
+exports.detectRealCores = detectRealCores;
 
 function _os() {
   const data = _interopRequireDefault(require("os"));

package/lib/index.js

@@ -6,13 +6,13 @@ Object.defineProperty(exports, "__esModule", {
 Object.defineProperty(exports, "Handle", {
   enumerable: true,
   get: function () {
-    return _WorkerFarm().Handle;
+    return _WorkerFarm.Handle;
   }
 });
 Object.defineProperty(exports, "bus", {
   enumerable: true,
   get: function () {
-    return _bus().default;
+    return _bus.default;
   }
 });
 exports.default = void 0;
@@ -27,15 +27,7 @@ function _assert() {
   return data;
 }
 
-function _WorkerFarm() {
-  const data = _interopRequireWildcard(require("./WorkerFarm"));
-
-  _WorkerFarm = function () {
-    return data;
-  };
-
-  return data;
-}
+var _WorkerFarm = _interopRequireWildcard(require("./WorkerFarm"));
 
 function _logger() {
   const data = _interopRequireDefault(require("@parcel/logger"));
@@ -47,25 +39,17 @@ function _logger() {
   return data;
 }
 
-function _bus() {
-  const data = _interopRequireDefault(require("./bus"));
+var _bus = _interopRequireDefault(require("./bus"));
 
-  _bus = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
-function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || typeof obj !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-if (!_WorkerFarm().default.isWorker()) {
+if (!_WorkerFarm.default.isWorker()) {
   // Forward all logger events originating from workers into the main process
-  _bus().default.on('logEvent', e => {
+  _bus.default.on('logEvent', e => {
     switch (e.level) {
       case 'info':
         _logger().default.info(e.diagnostics);
@@ -100,6 +84,5 @@ if (!_WorkerFarm().default.isWorker()) {
   });
 }
 
-var _default = _WorkerFarm().default;
-
+var _default = _WorkerFarm.default;
 exports.default = _default;

package/lib/process/ProcessChild.js

@@ -15,25 +15,9 @@ function _nullthrows() {
   return data;
 }
 
-function _childState() {
-  const data = require("../childState");
+var _childState = require("../childState");
 
-  _childState = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _child() {
-  const data = require("../child");
-
-  _child = function () {
-    return data;
-  };
-
-  return data;
-}
+var _child = require("../child");
 
 function _core() {
   const data = require("@parcel/core");
@@ -47,14 +31,8 @@ function _core() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class ProcessChild {
   constructor(onMessage, onExit) {
-    _defineProperty(this, "onMessage", void 0);
-
-    _defineProperty(this, "onExit", void 0);
-
     if (!process.send) {
       throw new Error('Only create ProcessChild instances in a worker!');
     }
@@ -93,4 +71,4 @@ class ProcessChild {
 }
 
 exports.default = ProcessChild;
-(0, _childState().setChild)(new (_child().Child)(ProcessChild));
+(0, _childState.setChild)(new _child.Child(ProcessChild));

package/lib/process/ProcessWorker.js

@@ -37,26 +37,13 @@ function _core() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const WORKER_PATH = _path().default.join(__dirname, 'ProcessChild.js');
 
 class ProcessWorker {
-  constructor(execArgv, onMessage, onError, onExit) {
-    _defineProperty(this, "execArgv", void 0);
-
-    _defineProperty(this, "onMessage", void 0);
-
-    _defineProperty(this, "onError", void 0);
-
-    _defineProperty(this, "onExit", void 0);
-
-    _defineProperty(this, "child", void 0);
-
-    _defineProperty(this, "processQueue", true);
-
-    _defineProperty(this, "sendQueue", []);
+  processQueue = true;
+  sendQueue = [];
 
+  constructor(execArgv, onMessage, onError, onExit) {
     this.execArgv = execArgv;
     this.onMessage = onMessage;
     this.onError = onError;

package/lib/threads/ThreadsChild.js

@@ -25,25 +25,9 @@ function _nullthrows() {
   return data;
 }
 
-function _childState() {
-  const data = require("../childState");
+var _childState = require("../childState");
 
-  _childState = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _child() {
-  const data = require("../child");
-
-  _child = function () {
-    return data;
-  };
-
-  return data;
-}
+var _child = require("../child");
 
 function _core() {
   const data = require("@parcel/core");
@@ -57,14 +41,8 @@ function _core() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 class ThreadsChild {
   constructor(onMessage, onExit) {
-    _defineProperty(this, "onMessage", void 0);
-
-    _defineProperty(this, "onExit", void 0);
-
     if (_worker_threads().isMainThread || !_worker_threads().parentPort) {
       throw new Error('Only create ThreadsChild instances in a worker!');
     }
@@ -88,4 +66,4 @@ class ThreadsChild {
 }
 
 exports.default = ThreadsChild;
-(0, _childState().setChild)(new (_child().Child)(ThreadsChild));
+(0, _childState.setChild)(new _child.Child(ThreadsChild));

package/lib/threads/ThreadsWorker.js

@@ -37,22 +37,10 @@ function _core() {
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
 const WORKER_PATH = _path().default.join(__dirname, 'ThreadsChild.js');
 
 class ThreadsWorker {
   constructor(execArgv, onMessage, onError, onExit) {
-    _defineProperty(this, "execArgv", void 0);
-
-    _defineProperty(this, "onMessage", void 0);
-
-    _defineProperty(this, "onError", void 0);
-
-    _defineProperty(this, "onExit", void 0);
-
-    _defineProperty(this, "worker", void 0);
-
     this.execArgv = execArgv;
     this.onMessage = onMessage;
     this.onError = onError;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/workers",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-nightly.1006+18b038d5",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
@@ -16,18 +16,25 @@
   },
   "main": "lib/index.js",
   "source": "src/index.js",
+  "types": "index.d.ts",
   "engines": {
     "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.3.1",
-    "@parcel/logger": "2.0.0-beta.3.1",
-    "@parcel/utils": "2.0.0-beta.3.1",
+    "@parcel/diagnostic": "2.0.0-nightly.1006+18b038d5",
+    "@parcel/logger": "2.0.0-nightly.1006+18b038d5",
+    "@parcel/types": "2.0.0-nightly.1006+18b038d5",
+    "@parcel/utils": "2.0.0-nightly.1006+18b038d5",
     "chrome-trace-event": "^1.0.2",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "@parcel/core": "^2.0.0-alpha.3.1"
+    "@parcel/core": "2.0.0-nightly.1004+18b038d5"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "browser": {
+    "./src/cpuCount.js": false,
+    "./src/process/ProcessWorker.js": false,
+    "./src/threads/ThreadsWorker.js": false
+  },
+  "gitHead": "18b038d57043965afb31077db1f46dadb11a6a78"
 }

package/src/Worker.js

@@ -67,7 +67,7 @@ export default class Worker extends EventEmitter {
       // arg parsing logic adapted from https://stackoverflow.com/a/46946420/2352201
       let opts = [''];
       let quote = false;
-      for (let c of nullthrows(process.env.NODE_OPTIONS.match(/\\?.|^$/g))) {
+      for (let c of nullthrows(process.env.NODE_OPTIONS.match(/.|^$/g))) {
         if (c === '"') {
           quote = !quote;
         } else if (!quote && c === ' ') {

package/src/WorkerFarm.js

@@ -68,6 +68,7 @@ export default class WorkerFarm extends EventEmitter {
   callQueue: Array<WorkerCall> = [];
   ending: boolean = false;
   localWorker: WorkerModule;
+  localWorkerInit: ?Promise<void>;
   options: FarmOptions;
   run: HandleFunction;
   warmWorkers: number = 0;
@@ -95,6 +96,8 @@ export default class WorkerFarm extends EventEmitter {
 
     // $FlowFixMe this must be dynamic
     this.localWorker = require(this.options.workerPath);
+    this.localWorkerInit =
+      this.localWorker.childInit != null ? this.localWorker.childInit() : null;
     this.run = this.createHandle('run');
 
     this.startMaxWorkers();
@@ -173,7 +176,7 @@ export default class WorkerFarm extends EventEmitter {
   }
 
   createHandle(method: string): HandleFunction {
-    return (...args) => {
+    return async (...args) => {
       // Child process workers are slow to start (~600ms).
       // While we're waiting, just run on the main thread.
       // This significantly speeds up startup time.
@@ -187,6 +190,11 @@ export default class WorkerFarm extends EventEmitter {
         let processedArgs = restoreDeserializedObject(
           prepareForSerialization([...args, false]),
         );
+
+        if (this.localWorkerInit != null) {
+          await this.localWorkerInit;
+          this.localWorkerInit = null;
+        }
         return this.localWorker[method](this.workerApi, ...processedArgs);
       }
     };

package/src/child.js

@@ -10,7 +10,7 @@ import type {
   ChildImpl,
 } from './types';
 import type {Async, IDisposable} from '@parcel/types';
-import type {SharedReference, WorkerApi} from './WorkerFarm';
+import type {SharedReference} from './WorkerFarm';
 
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
@@ -39,15 +39,16 @@ export class Child {
   loggerDisposable: IDisposable;
   child: ChildImpl;
   profiler: ?Profiler;
-  workerApi: WorkerApi;
   handles: Map<number, Handle> = new Map();
   sharedReferences: Map<SharedReference, mixed> = new Map();
   sharedReferencesByValue: Map<mixed, SharedReference> = new Map();
 
   constructor(ChildBackend: Class<ChildImpl>) {
     this.child = new ChildBackend(
-      this.messageListener.bind(this),
-      this.handleEnd.bind(this),
+      m => {
+        this.messageListener(m);
+      },
+      () => this.handleEnd(),
     );
 
     // Monitior all logging events inside this child process and forward to
@@ -93,10 +94,14 @@ export class Child {
     this.child.send(data);
   }
 
-  childInit(module: string, childId: number): void {
+  async childInit(module: string, childId: number): Promise<void> {
     // $FlowFixMe this must be dynamic
     this.module = require(module);
     this.childId = childId;
+
+    if (this.module.childInit != null) {
+      await this.module.childInit();
+    }
   }
 
   async handleRequest(data: WorkerRequest): Promise<void> {
@@ -136,7 +141,7 @@ export class Child {
           unpatchConsole();
         }
 
-        result = responseFromContent(this.childInit(moduleName, child));
+        result = responseFromContent(await this.childInit(moduleName, child));
       } catch (e) {
         result = errorResponseFromError(e);
       }

package/src/cpuCount.js

@@ -53,8 +53,9 @@ export default function getCores(bypassCache?: boolean = false): number {
     // Guess the amount of real cores
     cores = os
       .cpus()
-      .filter((cpu, index) => !cpu.model.includes('Intel') || index % 2 === 1)
-      .length;
+      .filter(
+        (cpu, index) => !cpu.model.includes('Intel') || index % 2 === 1,
+      ).length;
   }
 
   // Another fallback

package/test/cpuCount.test.js

@@ -3,7 +3,7 @@ import os from 'os';
 
 import getCores, {detectRealCores} from '../src/cpuCount';
 
-describe('cpuCount', function() {
+describe('cpuCount', function () {
   it('Should be able to detect real cpu count', () => {
     // Windows not supported as getting the cpu count takes a couple seconds...
     if (os.platform() === 'win32') return;

package/test/workerfarm.js

@@ -2,7 +2,7 @@ import Logger from '@parcel/logger';
 import assert from 'assert';
 import WorkerFarm from '../src';
 
-describe('WorkerFarm', function() {
+describe('WorkerFarm', function () {
   this.timeout(30000);
 
   it('Should start up workers', async () => {