@parcel/workers 2.0.0-beta.1 → 2.0.0-nightly.1002

package/lib/threads/ThreadsWorker.js

@@ -5,30 +5,42 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 
-var _worker_threads = require("worker_threads");
+function _worker_threads() {
+  const data = require("worker_threads");
 
-var _path = _interopRequireDefault(require("path"));
+  _worker_threads = function () {
+    return data;
+  };
 
-var _core = require("@parcel/core");
+  return data;
+}
 
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+function _path() {
+  const data = _interopRequireDefault(require("path"));
 
-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; }
+  _path = function () {
+    return data;
+  };
 
-const WORKER_PATH = _path.default.join(__dirname, 'ThreadsChild.js');
+  return data;
+}
 
-class ThreadsWorker {
-  constructor(execArgv, onMessage, onError, onExit) {
-    _defineProperty(this, "execArgv", void 0);
+function _core() {
+  const data = require("@parcel/core");
 
-    _defineProperty(this, "onMessage", void 0);
+  _core = function () {
+    return data;
+  };
 
-    _defineProperty(this, "onError", void 0);
+  return data;
+}
 
-    _defineProperty(this, "onExit", void 0);
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-    _defineProperty(this, "worker", void 0);
+const WORKER_PATH = _path().default.join(__dirname, 'ThreadsChild.js');
 
+class ThreadsWorker {
+  constructor(execArgv, onMessage, onError, onExit) {
     this.execArgv = execArgv;
     this.onMessage = onMessage;
     this.onError = onError;
@@ -36,7 +48,7 @@ class ThreadsWorker {
   }
 
   start() {
-    this.worker = new _worker_threads.Worker(WORKER_PATH, {
+    this.worker = new (_worker_threads().Worker)(WORKER_PATH, {
       execArgv: this.execArgv,
       env: process.env
     });
@@ -55,11 +67,11 @@ class ThreadsWorker {
   }
 
   handleMessage(data) {
-    this.onMessage((0, _core.restoreDeserializedObject)(data));
+    this.onMessage((0, _core().restoreDeserializedObject)(data));
   }
 
   send(data) {
-    this.worker.postMessage((0, _core.prepareForSerialization)(data));
+    this.worker.postMessage((0, _core().prepareForSerialization)(data));
   }
 
 }

package/package.json

@@ -1,29 +1,40 @@
 {
   "name": "@parcel/workers",
-  "version": "2.0.0-beta.1",
+  "version": "2.0.0-nightly.1002+5530a6ef",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "MIT",
   "publishConfig": {
     "access": "public"
   },
+  "funding": {
+    "type": "opencollective",
+    "url": "https://opencollective.com/parcel"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/parcel-bundler/parcel.git"
   },
   "main": "lib/index.js",
   "source": "src/index.js",
+  "types": "index.d.ts",
   "engines": {
-    "node": ">= 10.0.0"
+    "node": ">= 12.0.0"
   },
   "dependencies": {
-    "@parcel/diagnostic": "2.0.0-beta.1",
-    "@parcel/logger": "2.0.0-beta.1",
-    "@parcel/utils": "2.0.0-beta.1",
+    "@parcel/diagnostic": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/logger": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/types": "2.0.0-nightly.1002+5530a6ef",
+    "@parcel/utils": "2.0.0-nightly.1002+5530a6ef",
     "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.1000+5530a6ef"
+  },
+  "browser": {
+    "./src/cpuCount.js": false,
+    "./src/process/ProcessWorker.js": false,
+    "./src/threads/ThreadsWorker.js": false
   },
-  "gitHead": "74335525be92e23bac4ed1bf30595443cfb238e3"
+  "gitHead": "5530a6eff8b619873353baeb0457ae4ec591e9fa"
 }

package/src/Handle.js

@@ -1,20 +1,16 @@
-// @flow
-
-import type {WorkerApi} from './';
-
+// @flow strict-local
 import {registerSerializableClass} from '@parcel/core';
-
-import {child} from './childState';
+// $FlowFixMe
 import packageJson from '../package.json';
 
 let HANDLE_ID = 0;
-
+// $FlowFixMe
 export type HandleFunction = (...args: Array<any>) => any;
 
 type HandleOpts = {|
-  fn: HandleFunction,
+  fn?: HandleFunction,
   childId?: ?number,
-  workerApi: WorkerApi,
+  id?: number,
 |};
 
 const handleById: Map<number, Handle> = new Map();
@@ -22,14 +18,12 @@ const handleById: Map<number, Handle> = new Map();
 export default class Handle {
   id: number;
   childId: ?number;
-  fn: HandleFunction;
-  workerApi: WorkerApi;
+  fn: ?HandleFunction;
 
   constructor(opts: HandleOpts) {
-    this.id = ++HANDLE_ID;
+    this.id = opts.id ?? ++HANDLE_ID;
     this.fn = opts.fn;
     this.childId = opts.childId;
-    this.workerApi = opts.workerApi;
     handleById.set(this.id, this);
   }
 
@@ -37,38 +31,15 @@ export default class Handle {
     handleById.delete(this.id);
   }
 
-  serialize() {
+  serialize(): {|childId: ?number, id: number|} {
     return {
       id: this.id,
       childId: this.childId,
     };
   }
 
-  static deserialize(opts: {|id: number, childId?: number|}) {
-    return function(...args: Array<mixed>) {
-      let workerApi;
-      if (child) {
-        workerApi = child.workerApi;
-      } else {
-        let handle = handleById.get(opts.id);
-        if (!handle) {
-          throw new Error(
-            'Corresponding Handle was not found. It may have been disposed.',
-          );
-        }
-        workerApi = handle.workerApi;
-      }
-
-      if (opts.childId != null && child) {
-        throw new Error('Cannot call another child from a child');
-      }
-
-      if (opts.childId != null && workerApi.callChild) {
-        return workerApi.callChild(opts.childId, {handle: opts.id, args});
-      }
-
-      return workerApi.callMaster({handle: opts.id, args}, true);
-    };
+  static deserialize(opts: HandleOpts): Handle {
+    return new Handle(opts);
   }
 }
 

package/src/Profiler.js

@@ -40,7 +40,7 @@ type PositionTickInfo = {|
 export default class Profiler {
   session: Session;
 
-  startProfiling() {
+  startProfiling(): Promise<mixed> {
     let inspector;
     try {
       inspector = require('inspector');

package/src/Trace.js

@@ -12,17 +12,17 @@ export default class Trace {
     this.tracer = new Tracer();
     this.tid = 0;
     this.eventId = 0;
-    this.init();
   }
 
-  getEventId() {
+  getEventId(): number {
     return this.eventId++;
   }
 
-  init() {
+  init(ts: number) {
     this.tracer.instantEvent({
       name: 'TracingStartedInPage',
       id: this.getEventId(),
+      ts,
       cat: ['disabled-by-default-devtools.timeline'],
       args: {
         data: {
@@ -42,6 +42,7 @@ export default class Trace {
     this.tracer.instantEvent({
       name: 'TracingStartedInBrowser',
       id: this.getEventId(),
+      ts,
       cat: ['disabled-by-default-devtools.timeline'],
       args: {
         data: {
@@ -52,6 +53,9 @@ export default class Trace {
   }
 
   addCPUProfile(name: string, profile: Profile) {
+    if (this.eventId === 0) {
+      this.init(profile.startTime);
+    }
     const trace = this.tracer;
     const tid = this.tid;
     this.tid++;
@@ -111,7 +115,7 @@ export default class Trace {
     });
   }
 
-  pipe(writable: Writable) {
+  pipe(writable: Writable): stream$Writable {
     return this.tracer.pipe(writable);
   }
 

package/src/Worker.js

@@ -1,8 +1,10 @@
 // @flow
 
 import type {FilePath} from '@parcel/types';
-import type {WorkerMessage, WorkerImpl, BackendType} from './types';
+import type {BackendType, WorkerImpl, WorkerMessage} from './types';
+import type {SharedReference} from './WorkerFarm';
 
+import nullthrows from 'nullthrows';
 import EventEmitter from 'events';
 import ThrowableDiagnostic from '@parcel/diagnostic';
 import {getWorkerBackend} from './backend';
@@ -12,6 +14,7 @@ export type WorkerCall = {|
   handle?: number,
   args: $ReadOnlyArray<any>,
   retries: number,
+  skipReadyCheck?: boolean,
   resolve: (result: Promise<any> | any) => void,
   reject: (error: any) => void,
 |};
@@ -19,8 +22,8 @@ export type WorkerCall = {|
 type WorkerOpts = {|
   forcedKillTime: number,
   backend: BackendType,
-  patchConsole?: boolean,
-  sharedReferences: Map<number, mixed>,
+  shouldPatchConsole?: boolean,
+  sharedReferences: $ReadOnlyMap<SharedReference, mixed>,
 |};
 
 let WORKER_ID = 0;
@@ -28,15 +31,15 @@ export default class Worker extends EventEmitter {
   +options: WorkerOpts;
   worker: WorkerImpl;
   id: number = WORKER_ID++;
-  sharedReferences: Map<number, mixed> = new Map();
+  sharedReferences: $ReadOnlyMap<SharedReference, mixed> = new Map();
 
   calls: Map<number, WorkerCall> = new Map();
-  exitCode = null;
-  callId = 0;
+  exitCode: ?number = null;
+  callId: number = 0;
 
-  ready = false;
-  stopped = false;
-  isStopping = false;
+  ready: boolean = false;
+  stopped: boolean = false;
+  isStopping: boolean = false;
 
   constructor(options: WorkerOpts) {
     super();
@@ -45,7 +48,7 @@ export default class Worker extends EventEmitter {
 
   async fork(forkModule: FilePath) {
     let filteredArgs = process.execArgv.filter(
-      v => !/^--(debug|inspect)/.test(v),
+      v => !/^--(debug|inspect|max-old-space-size=)/.test(v),
     );
 
     for (let i = 0; i < filteredArgs.length; i++) {
@@ -61,7 +64,19 @@ export default class Worker extends EventEmitter {
 
     // Workaround for https://github.com/nodejs/node/issues/29117
     if (process.env.NODE_OPTIONS) {
-      let opts = process.env.NODE_OPTIONS.split(' ');
+      // 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))) {
+        if (c === '"') {
+          quote = !quote;
+        } else if (!quote && c === ' ') {
+          opts.push('');
+        } else {
+          opts[opts.length - 1] += c.replace(/\\(.)/, '$1');
+        }
+      }
+
       for (let i = 0; i < opts.length; i++) {
         let opt = opts[i];
         if (opt === '-r' || opt === '--require') {
@@ -91,10 +106,11 @@ export default class Worker extends EventEmitter {
         args: [
           forkModule,
           {
-            patchConsole: !!this.options.patchConsole,
+            shouldPatchConsole: !!this.options.shouldPatchConsole,
           },
         ],
         retries: 0,
+        skipReadyCheck: true,
         resolve,
         reject,
       });
@@ -118,14 +134,15 @@ export default class Worker extends EventEmitter {
     this.emit('ready');
   }
 
-  sendSharedReference(ref: number, value: mixed) {
-    new Promise((resolve, reject) => {
+  sendSharedReference(ref: SharedReference, value: mixed): Promise<any> {
+    return new Promise((resolve, reject) => {
       this.call({
         method: 'createSharedReference',
         args: [ref, value],
         resolve,
         reject,
         retries: 0,
+        skipReadyCheck: true,
       });
     });
   }
@@ -142,14 +159,20 @@ export default class Worker extends EventEmitter {
     let idx = this.callId++;
     this.calls.set(idx, call);
 
-    this.send({
+    let msg = {
       type: 'request',
       idx: idx,
       child: this.id,
       handle: call.handle,
       method: call.method,
       args: call.args,
-    });
+    };
+
+    if (this.ready || call.skipReadyCheck === true) {
+      this.send(msg);
+    } else {
+      this.once('ready', () => this.send(msg));
+    }
   }
 
   receive(message: WorkerMessage): void {