@atlaspack/workers 2.12.1-dev.3450 → 2.12.1-dev.3460

package/lib/WorkerFarm.js

@@ -112,7 +112,7 @@ class WorkerFarm extends _events().default {
 
     // $FlowFixMe
     if (process.browser) {
-      if (this.options.workerPath === '@atlaspack/core/src/worker.js') {
+      if (this.options.workerPath === '@atlaspack/core/worker') {
         this.localWorker = coreWorker;
       } else {
         throw new Error('No dynamic require possible: ' + this.options.workerPath);
@@ -299,7 +299,7 @@ class WorkerFarm extends _events().default {
     } else if (location) {
       // $FlowFixMe
       if (process.browser) {
-        if (location === '@atlaspack/workers/src/bus.js') {
+        if (location === '@atlaspack/workers/bus') {
           mod = bus;
         } else {
           throw new Error('No dynamic require possible: ' + location);

package/lib/bus.js

@@ -18,7 +18,7 @@ class Bus extends _events().default {
     if (_childState.child) {
       _childState.child.workerApi.callMaster({
         // $FlowFixMe
-        location: process.browser ? '@atlaspack/workers/src/bus.js' : __filename,
+        location: process.browser ? '@atlaspack/workers/bus' : __filename,
         method: 'emit',
         args: [event, ...args]
       }, false);

package/lib/child.js

@@ -100,7 +100,7 @@ class Child {
   async childInit(module, childId) {
     // $FlowFixMe
     if (process.browser) {
-      if (module === '@atlaspack/core/src/worker.js') {
+      if (module === '@atlaspack/core/worker') {
         this.module = coreWorker;
       } else {
         throw new Error('No dynamic require possible: ' + module);

package/lib/core-worker.browser.js

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

package/lib/process/ProcessWorker.js

@@ -11,13 +11,6 @@ function _child_process() {
   };
   return data;
 }
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _core() {
   const data = require("@atlaspack/core");
   _core = function () {
@@ -26,7 +19,7 @@ function _core() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const WORKER_PATH = _path().default.join(__dirname, 'ProcessChild.js');
+const WORKER_PATH = require.resolve('./ProcessChild');
 class ProcessWorker {
   processQueue = true;
   sendQueue = [];

package/lib/threads/ThreadsWorker.js

@@ -11,13 +11,6 @@ function _worker_threads() {
   };
   return data;
 }
-function _path() {
-  const data = _interopRequireDefault(require("path"));
-  _path = function () {
-    return data;
-  };
-  return data;
-}
 function _core() {
   const data = require("@atlaspack/core");
   _core = function () {
@@ -25,8 +18,7 @@ function _core() {
   };
   return data;
 }
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const WORKER_PATH = _path().default.join(__dirname, 'ThreadsChild.js');
+const WORKER_PATH = require.resolve('./ThreadsChild');
 class ThreadsWorker {
   constructor(execArgv, onMessage, onError, onExit) {
     this.execArgv = execArgv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/workers",
-  "version": "2.12.1-dev.3450+58845ef87",
+  "version": "2.12.1-dev.3460+340817991",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -17,20 +17,20 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/logger": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/profiler": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/types-internal": "2.12.1-dev.3450+58845ef87",
-    "@atlaspack/utils": "2.12.1-dev.3450+58845ef87",
+    "@atlaspack/diagnostic": "2.12.1-dev.3460+340817991",
+    "@atlaspack/logger": "2.12.1-dev.3460+340817991",
+    "@atlaspack/profiler": "2.12.1-dev.3460+340817991",
+    "@atlaspack/types-internal": "2.12.1-dev.3460+340817991",
+    "@atlaspack/utils": "2.12.1-dev.3460+340817991",
     "nullthrows": "^1.1.1"
   },
   "peerDependencies": {
-    "@atlaspack/core": "^2.12.1-dev.3450+58845ef87"
+    "@atlaspack/core": "^2.12.1-dev.3460+340817991"
   },
   "browser": {
     "./src/process/ProcessWorker.js": false,
     "./src/threads/ThreadsWorker.js": false,
     "./src/core-worker.js": "./src/core-worker.browser.js"
   },
-  "gitHead": "58845ef87446fcedb7d7d8876440c64184645cbb"
+  "gitHead": "3408179911d6c67e2bdad99e545dd7a0a9a6782c"
 }

package/src/Worker.js

@@ -51,7 +51,7 @@ export default class Worker extends EventEmitter {
     let filteredArgs = [];
     if (process.execArgv) {
       filteredArgs = process.execArgv.filter(
-        v =>
+        (v) =>
           !/^--(debug|inspect|no-opt|max-old-space-size=|max-semi-space-size=|expose-gc)/.test(
             v,
           ),
@@ -94,13 +94,13 @@ export default class Worker extends EventEmitter {
       }
     }
 
-    let onMessage = data => this.receive(data);
-    let onExit = code => {
+    let onMessage = (data) => this.receive(data);
+    let onExit = (code) => {
       this.exitCode = code;
       this.emit('exit', code);
     };
 
-    let onError = err => {
+    let onError = (err) => {
       this.emit('error', err);
     };
 

package/src/WorkerFarm.js

@@ -105,7 +105,7 @@ export default class WorkerFarm extends EventEmitter {
 
     // $FlowFixMe
     if (process.browser) {
-      if (this.options.workerPath === '@atlaspack/core/src/worker.js') {
+      if (this.options.workerPath === '@atlaspack/core/worker') {
         this.localWorker = coreWorker;
       } else {
         throw new Error(
@@ -266,7 +266,7 @@ export default class WorkerFarm extends EventEmitter {
 
     worker.fork(nullthrows(this.options.workerPath));
 
-    worker.on('request', data => this.processRequest(data, worker));
+    worker.on('request', (data) => this.processRequest(data, worker));
 
     worker.on('ready', () => {
       this.readyWorkers++;
@@ -277,7 +277,7 @@ export default class WorkerFarm extends EventEmitter {
     });
     worker.on('response', () => this.processQueue());
 
-    worker.on('error', err => this.onError(err, worker));
+    worker.on('error', (err) => this.onError(err, worker));
     worker.once('exit', () => this.stopWorker(worker));
 
     this.workers.set(worker.id, worker);
@@ -357,7 +357,7 @@ export default class WorkerFarm extends EventEmitter {
     } else if (location) {
       // $FlowFixMe
       if (process.browser) {
-        if (location === '@atlaspack/workers/src/bus.js') {
+        if (location === '@atlaspack/workers/bus') {
           mod = (bus: any);
         } else {
           throw new Error('No dynamic require possible: ' + location);
@@ -438,7 +438,9 @@ export default class WorkerFarm extends EventEmitter {
     this.ending = true;
 
     await Promise.all(
-      Array.from(this.workers.values()).map(worker => this.stopWorker(worker)),
+      Array.from(this.workers.values()).map((worker) =>
+        this.stopWorker(worker),
+      ),
     );
 
     for (let handle of this.handles.values()) {
@@ -593,7 +595,7 @@ export default class WorkerFarm extends EventEmitter {
     }
 
     trace.flush();
-    await new Promise(resolve => {
+    await new Promise((resolve) => {
       stream.once('finish', resolve);
     });
 
@@ -629,7 +631,7 @@ export default class WorkerFarm extends EventEmitter {
     try {
       let snapshotPaths = await Promise.all(
         [...this.workers.values()].map(
-          worker =>
+          (worker) =>
             new Promise((resolve, reject) => {
               worker.call({
                 method: 'takeHeapSnapshot',

package/src/bus.js

@@ -8,9 +8,7 @@ class Bus extends EventEmitter {
       child.workerApi.callMaster(
         {
           // $FlowFixMe
-          location: process.browser
-            ? '@atlaspack/workers/src/bus.js'
-            : __filename,
+          location: process.browser ? '@atlaspack/workers/bus' : __filename,
           method: 'emit',
           args: [event, ...args],
         },

package/src/child.js

@@ -47,7 +47,7 @@ export class Child {
 
   constructor(ChildBackend: Class<ChildImpl>) {
     this.child = new ChildBackend(
-      m => {
+      (m) => {
         this.messageListener(m);
       },
       () => this.handleEnd(),
@@ -55,11 +55,11 @@ export class Child {
 
     // Monitior all logging events inside this child process and forward to
     // the main process via the bus.
-    this.loggerDisposable = Logger.onLog(event => {
+    this.loggerDisposable = Logger.onLog((event) => {
       bus.emit('logEvent', event);
     });
     // .. and do the same for trace events
-    this.tracerDisposable = tracer.onTrace(event => {
+    this.tracerDisposable = tracer.onTrace((event) => {
       bus.emit('traceEvent', event);
     });
   }
@@ -103,7 +103,7 @@ export class Child {
   async childInit(module: string, childId: number): Promise<void> {
     // $FlowFixMe
     if (process.browser) {
-      if (module === '@atlaspack/core/src/worker.js') {
+      if (module === '@atlaspack/core/worker') {
         this.module = coreWorker;
       } else {
         throw new Error('No dynamic require possible: ' + module);

package/src/core-worker.browser.js

@@ -1,3 +1,4 @@
 // @flow
-// eslint-disable-next-line monorepo/no-internal-import
-module.exports = require('@atlaspack/core/src/worker.js');
+
+// $FlowFixMe
+module.exports = require('@atlaspack/core/worker');

package/src/cpuCount.js

@@ -29,7 +29,7 @@ export function detectRealCores(): number {
   } 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);
+      amount = parseInt(str.filter((n) => n !== '')[0], 10);
     }
   }
 

package/src/process/ProcessChild.js

@@ -22,7 +22,7 @@ export default class ProcessChild implements ChildImpl {
 
     this.onMessage = onMessage;
     this.onExit = onExit;
-    process.on('message', data => this.handleMessage(data));
+    process.on('message', (data) => this.handleMessage(data));
   }
 
   handleMessage(data: string): void {
@@ -35,7 +35,7 @@ export default class ProcessChild implements ChildImpl {
 
   send(data: WorkerMessage) {
     let processSend = nullthrows(process.send).bind(process);
-    processSend(serialize(data).toString('base64'), err => {
+    processSend(serialize(data).toString('base64'), (err) => {
       if (err && err instanceof Error) {
         // $FlowFixMe[prop-missing]
         if (err.code === 'ERR_IPC_CHANNEL_CLOSED') {

package/src/process/ProcessWorker.js

@@ -8,10 +8,9 @@ import type {
   WorkerMessage,
 } from '../types';
 import childProcess, {type ChildProcess} from 'child_process';
-import path from 'path';
 import {serialize, deserialize} from '@atlaspack/core';
 
-const WORKER_PATH = path.join(__dirname, 'ProcessChild.js');
+const WORKER_PATH = require.resolve('./ProcessChild');
 
 export default class ProcessWorker implements WorkerImpl {
   execArgv: Object;
@@ -55,7 +54,7 @@ export default class ProcessWorker implements WorkerImpl {
     this.child.send('die');
 
     let forceKill = setTimeout(() => this.child.kill('SIGINT'), 500);
-    await new Promise(resolve => {
+    await new Promise((resolve) => {
       this.child.once('exit', resolve);
     });
 
@@ -68,20 +67,23 @@ export default class ProcessWorker implements WorkerImpl {
       return;
     }
 
-    let result = this.child.send(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));
-      }
-    });
+    let result = this.child.send(
+      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

package/src/threads/ThreadsChild.js

@@ -26,7 +26,7 @@ export default class ThreadsChild implements ChildImpl {
 
     this.onMessage = onMessage;
     this.onExit = onExit;
-    parentPort.on('message', data => this.handleMessage(data));
+    parentPort.on('message', (data) => this.handleMessage(data));
     parentPort.on('close', this.onExit);
   }
 

package/src/threads/ThreadsWorker.js

@@ -8,13 +8,12 @@ import type {
   WorkerMessage,
 } from '../types';
 import {Worker} from 'worker_threads';
-import path from 'path';
 import {
   prepareForSerialization,
   restoreDeserializedObject,
 } from '@atlaspack/core';
 
-const WORKER_PATH = path.join(__dirname, 'ThreadsChild.js');
+const WORKER_PATH = require.resolve('./ThreadsChild');
 
 export default class ThreadsWorker implements WorkerImpl {
   execArgv: Object;
@@ -41,11 +40,11 @@ export default class ThreadsWorker implements WorkerImpl {
       env: process.env,
     });
 
-    this.worker.on('message', data => this.handleMessage(data));
+    this.worker.on('message', (data) => this.handleMessage(data));
     this.worker.on('error', this.onError);
     this.worker.on('exit', this.onExit);
 
-    return new Promise<void>(resolve => {
+    return new Promise<void>((resolve) => {
       this.worker.on('online', resolve);
     });
   }

package/test/workerfarm.js

@@ -44,7 +44,7 @@ describe('WorkerFarm', function () {
       assert.equal(await workerfarm.run(i), i);
     }
 
-    await new Promise(resolve => workerfarm.once('warmedup', resolve));
+    await new Promise((resolve) => workerfarm.once('warmedup', resolve));
 
     assert(workerfarm.workers.size > 0, 'Should have spawned workers.');
     assert(
@@ -134,7 +134,7 @@ describe('WorkerFarm', function () {
 
   it('Forwards stdio from the child process and levels event source if shouldPatchConsole is true', async () => {
     let events = [];
-    let logDisposable = Logger.onLog(event => events.push(event));
+    let logDisposable = Logger.onLog((event) => events.push(event));
 
     let workerfarm = new WorkerFarm({
       warmWorkers: true,
@@ -209,7 +209,7 @@ describe('WorkerFarm', function () {
 
   it('Forwards logger events to the main process', async () => {
     let events = [];
-    let logDisposable = Logger.onLog(event => events.push(event));
+    let logDisposable = Logger.onLog((event) => events.push(event));
 
     let workerfarm = new WorkerFarm({
       warmWorkers: true,