@parcel/workers 2.0.0-beta.3.1 → 2.0.0-dev.1510

package/lib/backend.js

@@ -5,31 +5,29 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.detectBackend = detectBackend;
 exports.getWorkerBackend = getWorkerBackend;
-
 function detectBackend() {
+  // $FlowFixMe
+  if (process.browser) return 'web';
   switch (process.env.PARCEL_WORKER_BACKEND) {
     case 'threads':
     case 'process':
       return process.env.PARCEL_WORKER_BACKEND;
   }
-
   try {
     require('worker_threads');
-
     return 'threads';
   } catch (err) {
     return 'process';
   }
 }
-
 function getWorkerBackend(backend) {
   switch (backend) {
     case 'threads':
       return require('./threads/ThreadsWorker').default;
-
     case 'process':
       return require('./process/ProcessWorker').default;
-
+    case 'web':
+      return require('./web/WebWorker').default;
     default:
       throw new Error(`Invalid backend: ${backend}`);
   }

package/lib/bus.js

@@ -4,46 +4,28 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _events() {
   const data = _interopRequireDefault(require("events"));
-
   _events = function () {
     return data;
   };
-
-  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({
-        location: __filename,
+    if (_childState.child) {
+      _childState.child.workerApi.callMaster({
+        // $FlowFixMe
+        location: process.browser ? '@parcel/workers/src/bus.js' : __filename,
         method: 'emit',
         args: [event, ...args]
       }, false);
-
       return true;
     } else {
       return super.emit(event, ...args);
     }
   }
-
 }
-
-var _default = new Bus();
-
-exports.default = _default;
+var _default = exports.default = new Bus();

package/lib/child.js

@@ -4,145 +4,89 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Child = void 0;
-
+var coreWorker = _interopRequireWildcard(require("./core-worker"));
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _assert = function () {
     return data;
   };
-
   return data;
 }
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
   return data;
 }
-
 function _logger() {
   const data = _interopRequireWildcard(require("@parcel/logger"));
-
   _logger = function () {
     return data;
   };
-
   return data;
 }
-
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@parcel/diagnostic"));
-
   _diagnostic = function () {
     return data;
   };
-
   return data;
 }
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
-  return data;
-}
-
-function _bus() {
-  const data = _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 () {
+var _bus = _interopRequireDefault(require("./bus"));
+function _profiler() {
+  const data = require("@parcel/profiler");
+  _profiler = function () {
     return data;
   };
-
   return data;
 }
-
-function _getRequireWildcardCache() { if (typeof WeakMap !== "function") return null; var cache = new WeakMap(); _getRequireWildcardCache = function () { return cache; }; return cache; }
-
-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; }
-
+var _Handle2 = _interopRequireDefault(require("./Handle"));
 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; }
-
+function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
+function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
 // 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 {
+  callQueue = [];
+  maxConcurrentCalls = 10;
+  responseId = 0;
+  responseQueue = new Map();
+  handles = new Map();
+  sharedReferences = new Map();
+  sharedReferencesByValue = new Map();
   constructor(ChildBackend) {
-    _defineProperty(this, "callQueue", []);
-
-    _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);
+    this.child = new ChildBackend(m => {
+      this.messageListener(m);
+    }, () => this.handleEnd());
 
-    _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
+    // 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);
+    });
+    // .. and do the same for trace events
+    this.tracerDisposable = _profiler().tracer.onTrace(event => {
+      _bus.default.emit('traceEvent', 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);
@@ -150,17 +94,26 @@ class Child {
       return this.handleRequest(message);
     }
   }
-
   send(data) {
     this.child.send(data);
   }
-
-  childInit(module, childId) {
-    // $FlowFixMe this must be dynamic
-    this.module = require(module);
+  async childInit(module, childId) {
+    // $FlowFixMe
+    if (process.browser) {
+      if (module === '@parcel/core/src/worker.js') {
+        this.module = coreWorker;
+      } else {
+        throw new Error('No dynamic require possible: ' + module);
+      }
+    } else {
+      // $FlowFixMe this must be dynamic
+      this.module = require(module);
+    }
     this.childId = childId;
+    if (this.module.childInit != null) {
+      await this.module.childInit();
+    }
   }
-
   async handleRequest(data) {
     let {
       idx,
@@ -169,7 +122,6 @@ class Child {
       handle: handleId
     } = data;
     let child = (0, _nullthrows().default)(data.child);
-
     const responseFromContent = content => ({
       idx,
       child,
@@ -177,7 +129,6 @@ class Child {
       contentType: 'data',
       content
     });
-
     const errorResponseFromError = e => ({
       idx,
       child,
@@ -185,13 +136,10 @@ class Child {
       contentType: 'error',
       content: (0, _diagnostic().anyToDiagnostic)(e)
     });
-
     let result;
-
     if (handleId != null) {
       try {
         var _this$handles$get;
-
         let fn = (0, _nullthrows().default)((_this$handles$get = this.handles.get(handleId)) === null || _this$handles$get === void 0 ? void 0 : _this$handles$get.fn);
         result = responseFromContent(fn(...args));
       } catch (e) {
@@ -200,20 +148,20 @@ class Child {
     } else if (method === 'childInit') {
       try {
         let [moduleName, childOptions] = args;
-
         if (childOptions.shouldPatchConsole) {
           (0, _logger().patchConsole)();
         } else {
           (0, _logger().unpatchConsole)();
         }
-
-        result = responseFromContent(this.childInit(moduleName, child));
+        if (childOptions.shouldTrace) {
+          _profiler().tracer.enable();
+        }
+        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().SamplingProfiler)();
       try {
         result = responseFromContent(await this.profiler.startProfiling());
       } catch (e) {
@@ -229,15 +177,14 @@ class Child {
     } else if (method === 'takeHeapSnapshot') {
       try {
         let v8 = require('v8');
-
-        result = responseFromContent( // $FlowFixMe
-        v8.writeHeapSnapshot('heap-' + args[0] + '-' + (this.childId ? 'worker' + this.childId : 'main') + '.heapsnapshot'));
+        result = responseFromContent(v8.writeHeapSnapshot('heap-' + args[0] + '-' + (this.childId ? 'worker' + this.childId : 'main') + '.heapsnapshot'));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     } else if (method === 'createSharedReference') {
       let [ref, _value] = args;
-      let value = _value instanceof ArrayBuffer ? // In the case the value is pre-serialized as a buffer,
+      let value = _value instanceof ArrayBuffer ?
+      // In the case the value is pre-serialized as a buffer,
       // deserialize it.
       (0, _core().deserialize)(Buffer.from(_value)) : _value;
       this.sharedReferences.set(ref, value);
@@ -251,26 +198,24 @@ class Child {
       result = responseFromContent(null);
     } else {
       try {
-        result = responseFromContent( // $FlowFixMe
+        result = responseFromContent(
+        // $FlowFixMe
         await this.module[method](this.workerApi, ...args));
       } catch (e) {
         result = errorResponseFromError(e);
       }
     }
-
     try {
       this.send(result);
     } catch (e) {
       result = this.send(errorResponseFromError(e));
     }
   }
-
   handleResponse(data) {
     let idx = (0, _nullthrows().default)(data.idx);
     let contentType = data.contentType;
     let content = data.content;
     let call = (0, _nullthrows().default)(this.responseQueue.get(idx));
-
     if (contentType === 'error') {
       (0, _assert().default)(typeof content !== 'string');
       call.reject(new (_diagnostic().default)({
@@ -279,18 +224,18 @@ class Child {
     } else {
       call.resolve(content);
     }
+    this.responseQueue.delete(idx);
 
-    this.responseQueue.delete(idx); // Process the next call
-
+    // Process the next call
     this.processQueue();
-  } // Keep in mind to make sure responses to these calls are JSON.Stringify safe
-
+  }
 
+  // Keep in mind to make sure responses to these calls are JSON.Stringify safe
   addCall(request, awaitResponse = true) {
     var _promise;
-
     // $FlowFixMe
-    let call = { ...request,
+    let call = {
+      ...request,
       type: 'request',
       child: this.childId,
       // $FlowFixMe Added in Flow 0.121.0 upgrade in #4381
@@ -299,27 +244,22 @@ class Child {
       reject: () => {}
     };
     let promise;
-
     if (awaitResponse) {
       promise = new Promise((resolve, reject) => {
         call.resolve = resolve;
         call.reject = reject;
       });
     }
-
     this.callQueue.push(call);
     this.processQueue();
     return (_promise = promise) !== null && _promise !== void 0 ? _promise : Promise.resolve();
   }
-
   sendRequest(call) {
     let idx;
-
     if (call.awaitResponse) {
       idx = this.responseId++;
       this.responseQueue.set(idx, call);
     }
-
     this.send({
       idx,
       child: call.child,
@@ -331,21 +271,18 @@ class Child {
       awaitResponse: call.awaitResponse
     });
   }
-
   processQueue() {
     if (!this.callQueue.length) {
       return;
     }
-
     if (this.responseQueue.size < this.maxConcurrentCalls) {
       this.sendRequest(this.callQueue.shift());
     }
   }
-
   handleEnd() {
     this.loggerDisposable.dispose();
+    this.tracerDisposable.dispose();
   }
-
   createReverseHandle(fn) {
     let handle = new Handle({
       fn,
@@ -354,7 +291,5 @@ class Child {
     this.handles.set(handle.id, handle);
     return handle;
   }
-
 }
-
 exports.Child = Child;

package/lib/childState.js

@@ -3,14 +3,12 @@
 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.
-let child = null;
-exports.child = child;
-
+let child = exports.child = null;
 function setChild(c) {
   exports.child = child = c;
 }

package/lib/core-worker.browser.js

@@ -0,0 +1,4 @@
+"use strict";
+
+// eslint-disable-next-line monorepo/no-internal-import
+module.exports = require('@parcel/core/src/worker.js');

package/lib/core-worker.js

@@ -0,0 +1,4 @@
+"use strict";
+
+// This is used only in browser builds
+module.exports = {};

package/lib/cpuCount.js

@@ -3,31 +3,23 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.detectRealCores = detectRealCores;
 exports.default = getCores;
-
+exports.detectRealCores = detectRealCores;
 function _os() {
   const data = _interopRequireDefault(require("os"));
-
   _os = function () {
     return data;
   };
-
   return data;
 }
-
 function _child_process() {
   const data = require("child_process");
-
   _child_process = function () {
     return data;
   };
-
   return data;
 }
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const exec = command => {
   try {
     let stdout = (0, _child_process().execSync)(command, {
@@ -40,50 +32,48 @@ const exec = command => {
     return '';
   }
 };
-
 function detectRealCores() {
   let platform = _os().default.platform();
-
   let amount = 0;
-
   if (platform === 'linux') {
     amount = parseInt(exec('lscpu -p | egrep -v "^#" | sort -u -t, -k 2,4 | wc -l'), 10);
   } else if (platform === 'darwin') {
     amount = parseInt(exec('sysctl -n hw.physicalcpu_max'), 10);
   } else if (platform === 'win32') {
     const str = exec('wmic cpu get NumberOfCores').match(/\d+/g);
-
     if (str !== null) {
       amount = parseInt(str.filter(n => n !== '')[0], 10);
     }
   }
-
   if (!amount || amount <= 0) {
     throw new Error('Could not detect cpu count!');
   }
-
   return amount;
 }
-
 let cores;
-
 function getCores(bypassCache = false) {
   // Do not re-run commands if we already have the count...
   if (cores && !bypassCache) {
     return cores;
   }
 
-  try {
-    cores = detectRealCores();
-  } catch (e) {
-    // Guess the amount of real cores
-    cores = _os().default.cpus().filter((cpu, index) => !cpu.model.includes('Intel') || index % 2 === 1).length;
-  } // Another fallback
-
+  // $FlowFixMe
+  if (process.browser) {
+    // eslint-disable-next-line no-undef
+    cores = navigator.hardwareConcurrency / 2;
+  }
+  if (!cores) {
+    try {
+      cores = detectRealCores();
+    } catch (e) {
+      // Guess the amount of real cores
+      cores = _os().default.cpus().filter((cpu, index) => !cpu.model.includes('Intel') || index % 2 === 1).length;
+    }
+  }
 
+  // Another fallback
   if (!cores) {
     cores = 1;
   }
-
   return cores;
 }