@atlaspack/workers 2.14.5-dev.1c70d50f9.99 → 2.14.5-dev.69

package/CHANGELOG.md

@@ -1,44 +1,5 @@
 # @atlaspack/workers
 
-## 2.14.14
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @atlaspack/types-internal@2.14.12
-  - @atlaspack/utils@2.15.2
-  - @atlaspack/profiler@2.14.12
-
-## 2.14.13
-
-### Patch Changes
-
-- [#650](https://github.com/atlassian-labs/atlaspack/pull/650) [`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb) Thanks [@alshdavid](https://github.com/alshdavid)! - Remove package.json#exports
-
-- Updated dependencies [[`ef3d622`](https://github.com/atlassian-labs/atlaspack/commit/ef3d6228f4e006702198a19c61e051d194d325cb)]:
-  - @atlaspack/logger@2.14.11
-  - @atlaspack/utils@2.15.1
-  - @atlaspack/types-internal@2.14.11
-  - @atlaspack/profiler@2.14.11
-
-## 2.14.12
-
-### Patch Changes
-
-- Updated dependencies [[`e39c6cf`](https://github.com/atlassian-labs/atlaspack/commit/e39c6cf05f7e95ce5420dbcea66f401b1cbd397c)]:
-  - @atlaspack/utils@2.15.0
-  - @atlaspack/types-internal@2.14.10
-  - @atlaspack/profiler@2.14.10
-
-## 2.14.11
-
-### Patch Changes
-
-- Updated dependencies []:
-  - @atlaspack/types-internal@2.14.9
-  - @atlaspack/utils@2.14.11
-  - @atlaspack/profiler@2.14.9
-
 ## 2.14.10
 
 ### Patch Changes

package/lib/WorkerFarm.js

@@ -72,6 +72,13 @@ function _logger() {
   };
   return data;
 }
+function _core() {
+  const data = require("@atlaspack/core");
+  _core = function () {
+    return data;
+  };
+  return data;
+}
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: 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; }
@@ -287,8 +294,15 @@ 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) {
+      if ((0, _core().isSuperPackage)()) {
+        // Fixes for super package builds as they require static requires
+        if (location.endsWith('core/workers/bus.js')) {
+          mod = bus;
+        } else {
+          throw new Error('No dynamic require possible: ' + location);
+        }
+        // $FlowFixMe
+      } else if (process.browser) {
         if (location === '@atlaspack/workers/bus') {
           mod = bus;
         } else {

package/lib/backend.js

@@ -13,12 +13,9 @@ function detectBackend() {
     case 'process':
       return process.env.ATLASPACK_WORKER_BACKEND;
   }
-  try {
-    require('worker_threads');
-    return 'threads';
-  } catch (err) {
-    return 'process';
-  }
+
+  // default to threads if no explicit option has been passed
+  return 'threads';
 }
 function getWorkerBackend(backend) {
   switch (backend) {
@@ -26,8 +23,6 @@ function getWorkerBackend(backend) {
       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

@@ -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.5-dev.1c70d50f9.99+1c70d50f9",
+  "version": "2.14.5-dev.69+67cb517ae",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -16,13 +16,20 @@
   "engines": {
     "node": ">= 16.0.0"
   },
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "@atlaspack::sources": "./src/index.js",
+      "default": "./lib/index.js"
+    }
+  },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/diagnostic": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/logger": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
-    "@atlaspack/profiler": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/types-internal": "2.14.1-dev.1c70d50f9.167+1c70d50f9",
-    "@atlaspack/utils": "2.14.5-dev.1c70d50f9.99+1c70d50f9",
+    "@atlaspack/build-cache": "2.13.3-dev.137+67cb517ae",
+    "@atlaspack/diagnostic": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/logger": "2.14.5-dev.69+67cb517ae",
+    "@atlaspack/profiler": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/types-internal": "2.14.1-dev.137+67cb517ae",
+    "@atlaspack/utils": "2.14.5-dev.69+67cb517ae",
     "nullthrows": "^1.1.1"
   },
   "browser": {
@@ -30,5 +37,5 @@
     "./src/threads/ThreadsWorker.js": false
   },
   "type": "commonjs",
-  "gitHead": "1c70d50f914cb662515b0b61053e51a06f3af234"
+  "gitHead": "67cb517ae793046fb5a0d2ef02ba74510fefccf3"
 }

package/src/WorkerFarm.js

@@ -30,6 +30,7 @@ import {detectBackend} from './backend';
 import {SamplingProfiler, Trace} from '@atlaspack/profiler';
 import fs from 'fs';
 import logger from '@atlaspack/logger';
+import {isSuperPackage} from '@atlaspack/core';
 
 let referenceId = 1;
 
@@ -343,8 +344,15 @@ export default class WorkerFarm extends EventEmitter {
     if (handleId != null) {
       mod = nullthrows(this.handles.get(handleId)?.fn);
     } else if (location) {
-      // $FlowFixMe
-      if (process.browser) {
+      if (isSuperPackage()) {
+        // Fixes for super package builds as they require static requires
+        if (location.endsWith('core/workers/bus.js')) {
+          mod = (bus: any);
+        } else {
+          throw new Error('No dynamic require possible: ' + location);
+        }
+        // $FlowFixMe
+      } else if (process.browser) {
         if (location === '@atlaspack/workers/bus') {
           mod = (bus: any);
         } else {

package/src/backend.js

@@ -11,12 +11,8 @@ export function detectBackend(): BackendType {
       return process.env.ATLASPACK_WORKER_BACKEND;
   }
 
-  try {
-    require('worker_threads');
-    return 'threads';
-  } catch (err) {
-    return 'process';
-  }
+  // default to threads if no explicit option has been passed
+  return 'threads';
 }
 
 export function getWorkerBackend(backend: BackendType): Class<WorkerImpl> {
@@ -25,8 +21,6 @@ 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;
     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;