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

package/lib/index.js

@@ -6,100 +6,70 @@ 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;
-
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
-
   _assert = function () {
     return data;
   };
-
-  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"));
-
   _logger = function () {
     return data;
   };
-
   return data;
 }
-
-function _bus() {
-  const data = _interopRequireDefault(require("./bus"));
-
-  _bus = 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; }
-
+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; }
 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);
-
         break;
-
       case 'progress':
         (0, _assert().default)(typeof e.message === 'string');
-
         _logger().default.progress(e.message);
-
         break;
-
       case 'verbose':
         _logger().default.verbose(e.diagnostics);
-
         break;
-
       case 'warn':
         _logger().default.warn(e.diagnostics);
-
         break;
-
       case 'error':
         _logger().default.error(e.diagnostics);
-
         break;
-
       default:
         throw new Error('Unknown log level');
     }
   });
-}
-
-var _default = _WorkerFarm().default;
 
-exports.default = _default;
+  // Forward all trace events originating from workers into the main process
+  _bus.default.on('traceEvent', e => {
+    _profiler().tracer.trace(e);
+  });
+}
+var _default = exports.default = _WorkerFarm.default;

package/lib/process/ProcessChild.js

@@ -4,78 +4,43 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
-  return data;
-}
-
-function _childState() {
-  const data = require("../childState");
-
-  _childState = function () {
-    return data;
-  };
-
-  return data;
-}
-
-function _child() {
-  const data = require("../child");
-
-  _child = function () {
-    return data;
-  };
-
   return data;
 }
-
+var _childState = require("../childState");
+var _child = require("../child");
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 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!');
     }
-
     this.onMessage = onMessage;
     this.onExit = onExit;
     process.on('message', data => this.handleMessage(data));
   }
-
   handleMessage(data) {
     if (data === 'die') {
       return this.stop();
     }
-
     this.onMessage((0, _core().deserialize)(Buffer.from(data, 'base64')));
   }
-
   send(data) {
     let processSend = (0, _nullthrows().default)(process.send).bind(process);
     processSend((0, _core().serialize)(data).toString('base64'), err => {
       if (err && err instanceof Error) {
+        // $FlowFixMe[prop-missing]
         if (err.code === 'ERR_IPC_CHANNEL_CLOSED') {
           // IPC connection closed
           // no need to keep the worker running if it can't send or receive data
@@ -84,13 +49,10 @@ class ProcessChild {
       }
     });
   }
-
   stop() {
     this.onExit(0);
     process.exit();
   }
-
 }
-
 exports.default = ProcessChild;
-(0, _childState().setChild)(new (_child().Child)(ProcessChild));
+(0, _childState.setChild)(new _child.Child(ProcessChild));

package/lib/process/ProcessWorker.js

@@ -4,65 +4,38 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _child_process() {
   const data = _interopRequireDefault(require("child_process"));
-
   _child_process = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 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 {
+  processQueue = true;
+  sendQueue = [];
   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", []);
-
     this.execArgv = execArgv;
     this.onMessage = onMessage;
     this.onError = onError;
     this.onExit = onExit;
   }
-
   start() {
     this.child = _child_process().default.fork(WORKER_PATH, process.argv, {
       execArgv: this.execArgv,
@@ -76,7 +49,6 @@ class ProcessWorker {
     this.child.on('error', this.onError);
     return Promise.resolve();
   }
-
   async stop() {
     this.child.send('die');
     let forceKill = setTimeout(() => this.child.kill('SIGINT'), 500);
@@ -85,34 +57,27 @@ class ProcessWorker {
     });
     clearTimeout(forceKill);
   }
-
   send(data) {
     if (!this.processQueue) {
       this.sendQueue.push(data);
       return;
     }
-
     let result = this.child.send((0, _core().serialize)(data).toString('base64'), error => {
       if (error && error instanceof Error) {
         // Ignore this, the workerfarm handles child errors
         return;
       }
-
       this.processQueue = true;
-
       if (this.sendQueue.length > 0) {
         let queueCopy = this.sendQueue.slice(0);
         this.sendQueue = [];
         queueCopy.forEach(entry => this.send(entry));
       }
     });
-
     if (!result || /^win/.test(process.platform)) {
       // Queue is handling too much messages throttle it
       this.processQueue = false;
     }
   }
-
 }
-
 exports.default = ProcessWorker;

package/lib/threads/ThreadsChild.js

@@ -4,88 +4,46 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _worker_threads() {
   const data = require("worker_threads");
-
   _worker_threads = function () {
     return data;
   };
-
   return data;
 }
-
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
-
   _nullthrows = function () {
     return data;
   };
-
-  return data;
-}
-
-function _childState() {
-  const data = require("../childState");
-
-  _childState = function () {
-    return data;
-  };
-
   return data;
 }
-
-function _child() {
-  const data = require("../child");
-
-  _child = function () {
-    return data;
-  };
-
-  return data;
-}
-
+var _childState = require("../childState");
+var _child = require("../child");
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 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!');
     }
-
     this.onMessage = onMessage;
     this.onExit = onExit;
-
     _worker_threads().parentPort.on('message', data => this.handleMessage(data));
-
     _worker_threads().parentPort.on('close', this.onExit);
   }
-
   handleMessage(data) {
     this.onMessage((0, _core().restoreDeserializedObject)(data));
   }
-
   send(data) {
     (0, _nullthrows().default)(_worker_threads().parentPort).postMessage((0, _core().prepareForSerialization)(data));
   }
-
 }
-
 exports.default = ThreadsChild;
-(0, _childState().setChild)(new (_child().Child)(ThreadsChild));
+(0, _childState.setChild)(new _child.Child(ThreadsChild));

package/lib/threads/ThreadsWorker.js

@@ -4,61 +4,36 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-
 function _worker_threads() {
   const data = require("worker_threads");
-
   _worker_threads = function () {
     return data;
   };
-
   return data;
 }
-
 function _path() {
   const data = _interopRequireDefault(require("path"));
-
   _path = function () {
     return data;
   };
-
   return data;
 }
-
 function _core() {
   const data = require("@parcel/core");
-
   _core = function () {
     return data;
   };
-
   return data;
 }
-
 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;
     this.onExit = onExit;
   }
-
   start() {
     this.worker = new (_worker_threads().Worker)(WORKER_PATH, {
       execArgv: this.execArgv,
@@ -71,21 +46,16 @@ class ThreadsWorker {
       this.worker.on('online', resolve);
     });
   }
-
   stop() {
     // In node 12, this returns a promise, but previously it accepted a callback
     // TODO: Pass a callback in earlier versions of Node
     return Promise.resolve(this.worker.terminate());
   }
-
   handleMessage(data) {
     this.onMessage((0, _core().restoreDeserializedObject)(data));
   }
-
   send(data) {
     this.worker.postMessage((0, _core().prepareForSerialization)(data));
   }
-
 }
-
 exports.default = ThreadsWorker;

package/lib/web/WebChild.js

@@ -0,0 +1,44 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _childState = require("../childState");
+var _child = require("../child");
+function _core() {
+  const data = require("@parcel/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
+/* eslint-env worker*/
+class WebChild {
+  constructor(onMessage, onExit) {
+    if (!(typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope)) {
+      throw new Error('Only create WebChild instances in a worker!');
+    }
+    this.onMessage = onMessage;
+    this.onExit = onExit;
+    self.addEventListener('message', ({
+      data
+    }) => {
+      if (data === 'stop') {
+        this.onExit(0);
+        self.postMessage('stopped');
+      }
+      // $FlowFixMe assume WorkerMessage as data
+      this.handleMessage(data);
+    });
+    self.postMessage('online');
+  }
+  handleMessage(data) {
+    this.onMessage((0, _core().restoreDeserializedObject)(data));
+  }
+  send(data) {
+    self.postMessage((0, _core().prepareForSerialization)(data));
+  }
+}
+exports.default = WebChild;
+(0, _childState.setChild)(new _child.Child(WebChild));

package/lib/web/WebWorker.js

@@ -0,0 +1,85 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+function _core() {
+  const data = require("@parcel/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
+function _utils() {
+  const data = require("@parcel/utils");
+  _utils = function () {
+    return data;
+  };
+  return data;
+}
+let id = 0;
+class WebWorker {
+  constructor(execArgv, onMessage, onError, onExit) {
+    this.execArgv = execArgv;
+    this.onMessage = onMessage;
+    this.onError = onError;
+    this.onExit = onExit;
+  }
+  start() {
+    // $FlowFixMe[incompatible-call]
+    this.worker = new Worker(new URL('./WebChild.js', import.meta.url), {
+      name: `Parcel Worker ${id++}`,
+      type: 'module'
+    });
+    let {
+      deferred,
+      promise
+    } = (0, _utils().makeDeferredWithPromise)();
+    this.worker.onmessage = ({
+      data
+    }) => {
+      if (data === 'online') {
+        deferred.resolve();
+        return;
+      }
+
+      // $FlowFixMe assume WorkerMessage as data
+      this.handleMessage(data);
+    };
+    this.worker.onerror = this.onError;
+    // Web workers can't crash or intentionally stop on their own, apart from stop() below
+    // this.worker.on('exit', this.onExit);
+
+    return promise;
+  }
+  stop() {
+    if (!this.stopping) {
+      this.stopping = (async () => {
+        this.worker.postMessage('stop');
+        let {
+          deferred,
+          promise
+        } = (0, _utils().makeDeferredWithPromise)();
+        this.worker.addEventListener('message', ({
+          data
+        }) => {
+          if (data === 'stopped') {
+            deferred.resolve();
+          }
+        });
+        await promise;
+        this.worker.terminate();
+        this.onExit(0);
+      })();
+    }
+    return this.stopping;
+  }
+  handleMessage(data) {
+    this.onMessage((0, _core().restoreDeserializedObject)(data));
+  }
+  send(data) {
+    this.worker.postMessage((0, _core().prepareForSerialization)(data));
+  }
+}
+exports.default = WebWorker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@parcel/workers",
-  "version": "2.0.0-beta.3.1",
+  "version": "2.0.0-dev.1510+a9bb85adf",
   "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",
-    "chrome-trace-event": "^1.0.2",
+    "@parcel/diagnostic": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/logger": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/profiler": "2.11.1-dev.3133+a9bb85adf",
+    "@parcel/types": "2.0.0-dev.1510+a9bb85adf",
+    "@parcel/utils": "2.0.0-dev.1510+a9bb85adf",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "@parcel/core": "^2.0.0-alpha.3.1"
+    "@parcel/core": "^2.0.0-dev.1508+a9bb85adf"
   },
-  "gitHead": "daece49d003ba804bbdaa3a7ed3d6aaf446f166d"
+  "browser": {
+    "./src/process/ProcessWorker.js": false,
+    "./src/threads/ThreadsWorker.js": false,
+    "./src/core-worker.js": "./src/core-worker.browser.js"
+  },
+  "gitHead": "a9bb85adf8f3b38631e178b3aacaa30c78696e36"
 }