@atlaspack/workers 2.14.1-dev.15 → 2.14.1-dev.36

package/lib/WorkerFarm.js

@@ -287,8 +287,11 @@ class WorkerFarm extends _events().default {
       var _this$handles$get;
       mod = (0, _nullthrows().default)((_this$handles$get = this.handles.get(handleId)) === null || _this$handles$get === void 0 ? void 0 : _this$handles$get.fn);
     } else if (location) {
-      // $FlowFixMe
-      if (process.browser) {
+      // Fix for super package builds
+      if (location.endsWith('core/workers/bus.js')) {
+        mod = bus;
+        // $FlowFixMe
+      } else if (process.browser) {
         if (location === '@atlaspack/workers/bus') {
           mod = bus;
         } else {

package/lib/backend.js

@@ -14,7 +14,6 @@ function detectBackend() {
       return process.env.ATLASPACK_WORKER_BACKEND;
   }
   try {
-    require('worker_threads');
     return 'threads';
   } catch (err) {
     return 'process';
@@ -27,7 +26,12 @@ function getWorkerBackend(backend) {
     case 'process':
       return require('./process/ProcessWorker').default;
     case 'web':
-      return require('./web/WebWorker').default;
+      {
+        if (!!process.env.ATLASPACK_SUPER_BUILD) {
+          throw new Error('Web worker not supported');
+        } // return require('./web/WebWorker').default;
+      }
+
     default:
       throw new Error(`Invalid backend: ${backend}`);
   }

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/bus' : __filename,
+        location: process.browser ? '@atlaspack/workers/bus' : /*#__ATLASPACK_IGNORE__*/__filename,
         method: 'emit',
         args: [event, ...args]
       }, false);

package/lib/process/ProcessWorker.js

@@ -26,7 +26,7 @@ function _buildCache() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const WORKER_PATH = _path().default.join(__dirname, './ProcessChild.js');
+const WORKER_PATH = _path().default.join( /*#__ATLASPACK_IGNORE__*/__dirname, './ProcessChild.js');
 class ProcessWorker {
   processQueue = true;
   sendQueue = [];

package/lib/threads/ThreadsWorker.js

@@ -26,7 +26,7 @@ function _buildCache() {
   return data;
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-const WORKER_PATH = _path().default.join(__dirname, './ThreadsChild.js');
+const WORKER_PATH = _path().default.join( /*#__ATLASPACK_IGNORE__*/__dirname, './ThreadsChild.js');
 class ThreadsWorker {
   constructor(execArgv, onMessage, onError, onExit) {
     this.execArgv = execArgv;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/workers",
-  "version": "2.14.1-dev.15+30b65feb9",
+  "version": "2.14.1-dev.36+b98b1df81",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -24,12 +24,12 @@
     }
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.15+30b65feb9",
-    "@atlaspack/diagnostic": "2.14.1-dev.15+30b65feb9",
-    "@atlaspack/logger": "2.14.1-dev.15+30b65feb9",
-    "@atlaspack/profiler": "2.14.1-dev.15+30b65feb9",
-    "@atlaspack/types-internal": "2.14.1-dev.15+30b65feb9",
-    "@atlaspack/utils": "2.14.1-dev.15+30b65feb9",
+    "@atlaspack/build-cache": "2.13.3-dev.36+b98b1df81",
+    "@atlaspack/diagnostic": "2.14.1-dev.36+b98b1df81",
+    "@atlaspack/logger": "2.14.1-dev.36+b98b1df81",
+    "@atlaspack/profiler": "2.14.1-dev.36+b98b1df81",
+    "@atlaspack/types-internal": "2.14.1-dev.36+b98b1df81",
+    "@atlaspack/utils": "2.14.1-dev.36+b98b1df81",
     "nullthrows": "^1.1.1"
   },
   "browser": {
@@ -37,5 +37,5 @@
     "./src/threads/ThreadsWorker.js": false
   },
   "type": "commonjs",
-  "gitHead": "30b65feb98113722e721c7cdee547765d195b65a"
+  "gitHead": "b98b1df81bc5ca2c1f977d250c958c137bd0b4ee"
 }

package/src/WorkerFarm.js

@@ -343,8 +343,11 @@ export default class WorkerFarm extends EventEmitter {
     if (handleId != null) {
       mod = nullthrows(this.handles.get(handleId)?.fn);
     } else if (location) {
-      // $FlowFixMe
-      if (process.browser) {
+      // Fix for super package builds
+      if (location.endsWith('core/workers/bus.js')) {
+        mod = (bus: any);
+        // $FlowFixMe
+      } else if (process.browser) {
         if (location === '@atlaspack/workers/bus') {
           mod = (bus: any);
         } else {

package/src/backend.js

@@ -12,7 +12,7 @@ export function detectBackend(): BackendType {
   }
 
   try {
-    require('worker_threads');
+    () => require('worker_threads')();
     return 'threads';
   } catch (err) {
     return 'process';
@@ -25,8 +25,13 @@ export function getWorkerBackend(backend: BackendType): Class<WorkerImpl> {
       return require('./threads/ThreadsWorker').default;
     case 'process':
       return require('./process/ProcessWorker').default;
-    case 'web':
-      return require('./web/WebWorker').default;
+    case 'web': {
+      if (!process.env.ATLASPACK_SUPER_BUILD) {
+        // return require('./web/WebWorker').default;
+      } else {
+        throw new Error('Web worker not supported');
+      }
+    }
     default:
       throw new Error(`Invalid backend: ${backend}`);
   }

package/src/bus.js

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

package/src/process/ProcessWorker.js

@@ -13,7 +13,10 @@ import path from 'path';
 
 import {serialize, deserialize} from '@atlaspack/build-cache';
 
-const WORKER_PATH = path.join(__dirname, './ProcessChild.js');
+const WORKER_PATH = path.join(
+  /*#__ATLASPACK_IGNORE__*/ __dirname,
+  './ProcessChild.js',
+);
 
 export default class ProcessWorker implements WorkerImpl {
   execArgv: Object;

package/src/threads/ThreadsWorker.js

@@ -16,7 +16,10 @@ import {
   restoreDeserializedObject,
 } from '@atlaspack/build-cache';
 
-const WORKER_PATH = path.join(__dirname, './ThreadsChild.js');
+const WORKER_PATH = path.join(
+  /*#__ATLASPACK_IGNORE__*/ __dirname,
+  './ThreadsChild.js',
+);
 
 export default class ThreadsWorker implements WorkerImpl {
   execArgv: Object;