@atlaspack/workers 2.12.1-canary.3468 → 2.12.1-canary.3469

package/lib/Handle.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -42,4 +42,4 @@ class Handle {
 // Register the Handle as a serializable class so that it will properly be deserialized
 // by anything that uses WorkerFarm.
 exports.default = Handle;
-(0, _core().registerSerializableClass)(`${_package.default.version}:Handle`, Handle);
+(0, _buildCache().registerSerializableClass)(`${_package.default.version}:Handle`, Handle);

package/lib/WorkerFarm.js

@@ -10,7 +10,6 @@ Object.defineProperty(exports, "Handle", {
   }
 });
 exports.default = void 0;
-var coreWorker = _interopRequireWildcard(require("./core-worker"));
 var bus = _interopRequireWildcard(require("./bus"));
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
@@ -33,9 +32,9 @@ function _events() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -111,16 +110,7 @@ class WorkerFarm extends _events().default {
     }
 
     // $FlowFixMe
-    if (process.browser) {
-      if (this.options.workerPath === '@atlaspack/core/worker') {
-        this.localWorker = coreWorker;
-      } else {
-        throw new Error('No dynamic require possible: ' + this.options.workerPath);
-      }
-    } else {
-      // $FlowFixMe this must be dynamic
-      this.localWorker = require(this.options.workerPath);
-    }
+    this.localWorker = require(this.options.workerPath);
     this.localWorkerInit = this.localWorker.childInit != null ? this.localWorker.childInit() : null;
     this.run = this.createHandle('run');
 
@@ -142,7 +132,7 @@ class WorkerFarm extends _events().default {
         ...request,
         awaitResponse
       });
-      return (0, _core().deserialize)((0, _core().serialize)(result));
+      return (0, _buildCache().deserialize)((0, _buildCache().serialize)(result));
     },
     createReverseHandle: fn => this.createReverseHandle(fn),
     callChild: (childId, request) => new Promise((resolve, reject) => {
@@ -198,7 +188,7 @@ class WorkerFarm extends _events().default {
         }
         let processedArgs;
         if (!useMainThread) {
-          processedArgs = (0, _core().restoreDeserializedObject)((0, _core().prepareForSerialization)([...args, false]));
+          processedArgs = (0, _buildCache().restoreDeserializedObject)((0, _buildCache().prepareForSerialization)([...args, false]));
         } else {
           processedArgs = args;
         }
@@ -440,7 +430,7 @@ class WorkerFarm extends _events().default {
       return cached;
     }
     let value = this.sharedReferences.get(ref);
-    let buf = (0, _core().serialize)(value).buffer;
+    let buf = (0, _buildCache().serialize)(value).buffer;
 
     // If the reference was created with the isCacheable option set to false,
     // serializedSharedReferences will contain `null` as the value.

package/lib/child.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.Child = void 0;
-var coreWorker = _interopRequireWildcard(require("./core-worker"));
 function _assert() {
   const data = _interopRequireDefault(require("assert"));
   _assert = function () {
@@ -19,6 +18,13 @@ function _nullthrows() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = _interopRequireWildcard(require("@atlaspack/logger"));
   _logger = function () {
@@ -33,13 +39,6 @@ function _diagnostic() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
-    return data;
-  };
-  return data;
-}
 var _bus = _interopRequireDefault(require("./bus"));
 function _profiler() {
   const data = require("@atlaspack/profiler");
@@ -49,9 +48,9 @@ function _profiler() {
   return data;
 }
 var _Handle2 = _interopRequireDefault(require("./Handle"));
-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; }
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 // The import of './Handle' should really be imported eagerly (with @babel/plugin-transform-modules-commonjs's lazy mode).
 const Handle = _Handle2.default;
 class Child {
@@ -99,16 +98,7 @@ class Child {
   }
   async childInit(module, childId) {
     // $FlowFixMe
-    if (process.browser) {
-      if (module === '@atlaspack/core/worker') {
-        this.module = coreWorker;
-      } else {
-        throw new Error('No dynamic require possible: ' + module);
-      }
-    } else {
-      // $FlowFixMe this must be dynamic
-      this.module = require(module);
-    }
+    this.module = require(module);
     this.childId = childId;
     if (this.module.childInit != null) {
       await this.module.childInit();
@@ -186,7 +176,7 @@ class Child {
       let value = _value instanceof ArrayBuffer ?
       // In the case the value is pre-serialized as a buffer,
       // deserialize it.
-      (0, _core().deserialize)(Buffer.from(_value)) : _value;
+      (0, _buildCache().deserialize)(Buffer.from(_value)) : _value;
       this.sharedReferences.set(ref, value);
       this.sharedReferencesByValue.set(value, ref);
       result = responseFromContent(null);

package/lib/process/ProcessChild.js

@@ -4,22 +4,22 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _nullthrows() {
-  const data = _interopRequireDefault(require("nullthrows"));
-  _nullthrows = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
 }
-var _childState = require("../childState");
-var _child = require("../child");
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+  _nullthrows = function () {
     return data;
   };
   return data;
 }
+var _child = require("../child");
+var _childState = require("../childState");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class ProcessChild {
   constructor(onMessage, onExit) {
@@ -34,11 +34,11 @@ class ProcessChild {
     if (data === 'die') {
       return this.stop();
     }
-    this.onMessage((0, _core().deserialize)(Buffer.from(data, 'base64')));
+    this.onMessage((0, _buildCache().deserialize)(Buffer.from(data, 'base64')));
   }
   send(data) {
     let processSend = (0, _nullthrows().default)(process.send).bind(process);
-    processSend((0, _core().serialize)(data).toString('base64'), err => {
+    processSend((0, _buildCache().serialize)(data).toString('base64'), err => {
       if (err && err instanceof Error) {
         // $FlowFixMe[prop-missing]
         if (err.code === 'ERR_IPC_CHANNEL_CLOSED') {

package/lib/process/ProcessWorker.js

@@ -11,9 +11,9 @@ function _child_process() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -36,7 +36,7 @@ class ProcessWorker {
       cwd: process.cwd()
     });
     this.child.on('message', data => {
-      this.onMessage((0, _core().deserialize)(Buffer.from(data, 'base64')));
+      this.onMessage((0, _buildCache().deserialize)(Buffer.from(data, 'base64')));
     });
     this.child.once('exit', this.onExit);
     this.child.on('error', this.onError);
@@ -55,7 +55,7 @@ class ProcessWorker {
       this.sendQueue.push(data);
       return;
     }
-    let result = this.child.send((0, _core().serialize)(data).toString('base64'), error => {
+    let result = this.child.send((0, _buildCache().serialize)(data).toString('base64'), error => {
       if (error && error instanceof Error) {
         // Ignore this, the workerfarm handles child errors
         return;

package/lib/threads/ThreadsChild.js

@@ -11,22 +11,22 @@ function _worker_threads() {
   };
   return data;
 }
-function _nullthrows() {
-  const data = _interopRequireDefault(require("nullthrows"));
-  _nullthrows = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
 }
-var _childState = require("../childState");
-var _child = require("../child");
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _nullthrows() {
+  const data = _interopRequireDefault(require("nullthrows"));
+  _nullthrows = function () {
     return data;
   };
   return data;
 }
+var _child = require("../child");
+var _childState = require("../childState");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class ThreadsChild {
   constructor(onMessage, onExit) {
@@ -39,10 +39,10 @@ class ThreadsChild {
     _worker_threads().parentPort.on('close', this.onExit);
   }
   handleMessage(data) {
-    this.onMessage((0, _core().restoreDeserializedObject)(data));
+    this.onMessage((0, _buildCache().restoreDeserializedObject)(data));
   }
   send(data) {
-    (0, _nullthrows().default)(_worker_threads().parentPort).postMessage((0, _core().prepareForSerialization)(data));
+    (0, _nullthrows().default)(_worker_threads().parentPort).postMessage((0, _buildCache().prepareForSerialization)(data));
   }
 }
 exports.default = ThreadsChild;

package/lib/threads/ThreadsWorker.js

@@ -11,9 +11,9 @@ function _worker_threads() {
   };
   return data;
 }
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -44,10 +44,10 @@ class ThreadsWorker {
     return Promise.resolve(this.worker.terminate());
   }
   handleMessage(data) {
-    this.onMessage((0, _core().restoreDeserializedObject)(data));
+    this.onMessage((0, _buildCache().restoreDeserializedObject)(data));
   }
   send(data) {
-    this.worker.postMessage((0, _core().prepareForSerialization)(data));
+    this.worker.postMessage((0, _buildCache().prepareForSerialization)(data));
   }
 }
 exports.default = ThreadsWorker;

package/lib/web/WebChild.js

@@ -4,15 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _childState = require("../childState");
-var _child = require("../child");
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
 }
+var _child = require("../child");
+var _childState = require("../childState");
 /* eslint-env worker*/
 class WebChild {
   constructor(onMessage, onExit) {
@@ -34,10 +34,10 @@ class WebChild {
     self.postMessage('online');
   }
   handleMessage(data) {
-    this.onMessage((0, _core().restoreDeserializedObject)(data));
+    this.onMessage((0, _buildCache().restoreDeserializedObject)(data));
   }
   send(data) {
-    self.postMessage((0, _core().prepareForSerialization)(data));
+    self.postMessage((0, _buildCache().prepareForSerialization)(data));
   }
 }
 exports.default = WebChild;

package/lib/web/WebWorker.js

@@ -4,9 +4,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-function _core() {
-  const data = require("@atlaspack/core");
-  _core = function () {
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
     return data;
   };
   return data;
@@ -76,10 +76,10 @@ class WebWorker {
     return this.stopping;
   }
   handleMessage(data) {
-    this.onMessage((0, _core().restoreDeserializedObject)(data));
+    this.onMessage((0, _buildCache().restoreDeserializedObject)(data));
   }
   send(data) {
-    this.worker.postMessage((0, _core().prepareForSerialization)(data));
+    this.worker.postMessage((0, _buildCache().prepareForSerialization)(data));
   }
 }
 exports.default = WebWorker;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/workers",
-  "version": "2.12.1-canary.3468+895ce5022",
+  "version": "2.12.1-canary.3469+a750fb28c",
   "description": "Blazing fast, zero configuration web application bundler",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
@@ -17,20 +17,17 @@
     "node": ">= 16.0.0"
   },
   "dependencies": {
-    "@atlaspack/diagnostic": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/logger": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/profiler": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/types-internal": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/utils": "2.12.1-canary.3468+895ce5022",
+    "@atlaspack/build-cache": "2.12.1-canary.3469+a750fb28c",
+    "@atlaspack/diagnostic": "2.12.1-canary.3469+a750fb28c",
+    "@atlaspack/logger": "2.12.1-canary.3469+a750fb28c",
+    "@atlaspack/profiler": "2.12.1-canary.3469+a750fb28c",
+    "@atlaspack/types-internal": "2.12.1-canary.3469+a750fb28c",
+    "@atlaspack/utils": "2.12.1-canary.3469+a750fb28c",
     "nullthrows": "^1.1.1"
   },
-  "peerDependencies": {
-    "@atlaspack/core": "2.12.1-canary.3468+895ce5022"
-  },
   "browser": {
     "./src/process/ProcessWorker.js": false,
-    "./src/threads/ThreadsWorker.js": false,
-    "./src/core-worker.js": "./src/core-worker.browser.js"
+    "./src/threads/ThreadsWorker.js": false
   },
-  "gitHead": "895ce502277dc44997129af501742089a06b1023"
+  "gitHead": "a750fb28cf1d4c46b67bf08692a5d91fea0ecbfc"
 }

package/src/Handle.js

@@ -1,5 +1,5 @@
 // @flow strict-local
-import {registerSerializableClass} from '@atlaspack/core';
+import {registerSerializableClass} from '@atlaspack/build-cache';
 // $FlowFixMe
 import packageJson from '../package.json';
 

package/src/WorkerFarm.js

@@ -11,7 +11,6 @@ import type {
 } from './types';
 import type {HandleFunction} from './Handle';
 
-import * as coreWorker from './core-worker';
 import * as bus from './bus';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
@@ -21,7 +20,7 @@ import {
   prepareForSerialization,
   restoreDeserializedObject,
   serialize,
-} from '@atlaspack/core';
+} from '@atlaspack/build-cache';
 import ThrowableDiagnostic, {anyToDiagnostic, md} from '@atlaspack/diagnostic';
 import Worker, {type WorkerCall} from './Worker';
 import cpuCount from './cpuCount';
@@ -104,18 +103,7 @@ export default class WorkerFarm extends EventEmitter {
     }
 
     // $FlowFixMe
-    if (process.browser) {
-      if (this.options.workerPath === '@atlaspack/core/worker') {
-        this.localWorker = coreWorker;
-      } else {
-        throw new Error(
-          'No dynamic require possible: ' + this.options.workerPath,
-        );
-      }
-    } else {
-      // $FlowFixMe this must be dynamic
-      this.localWorker = require(this.options.workerPath);
-    }
+    this.localWorker = require(this.options.workerPath);
 
     this.localWorkerInit =
       this.localWorker.childInit != null ? this.localWorker.childInit() : null;

package/src/child.js

@@ -12,12 +12,11 @@ import type {
 import type {Async, IDisposable} from '@atlaspack/types-internal';
 import type {SharedReference} from './WorkerFarm';
 
-import * as coreWorker from './core-worker';
 import invariant from 'assert';
 import nullthrows from 'nullthrows';
+import {deserialize} from '@atlaspack/build-cache';
 import Logger, {patchConsole, unpatchConsole} from '@atlaspack/logger';
 import ThrowableDiagnostic, {anyToDiagnostic} from '@atlaspack/diagnostic';
-import {deserialize} from '@atlaspack/core';
 import bus from './bus';
 import {SamplingProfiler, tracer} from '@atlaspack/profiler';
 import _Handle from './Handle';
@@ -102,16 +101,7 @@ export class Child {
 
   async childInit(module: string, childId: number): Promise<void> {
     // $FlowFixMe
-    if (process.browser) {
-      if (module === '@atlaspack/core/worker') {
-        this.module = coreWorker;
-      } else {
-        throw new Error('No dynamic require possible: ' + module);
-      }
-    } else {
-      // $FlowFixMe this must be dynamic
-      this.module = require(module);
-    }
+    this.module = require(module);
     this.childId = childId;
 
     if (this.module.childInit != null) {

package/src/process/ProcessChild.js

@@ -6,10 +6,12 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
+
+import {serialize, deserialize} from '@atlaspack/build-cache';
 import nullthrows from 'nullthrows';
-import {setChild} from '../childState';
+
 import {Child} from '../child';
-import {serialize, deserialize} from '@atlaspack/core';
+import {setChild} from '../childState';
 
 export default class ProcessChild implements ChildImpl {
   onMessage: MessageHandler;

package/src/process/ProcessWorker.js

@@ -7,8 +7,10 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
+
 import childProcess, {type ChildProcess} from 'child_process';
-import {serialize, deserialize} from '@atlaspack/core';
+
+import {serialize, deserialize} from '@atlaspack/build-cache';
 
 const WORKER_PATH = require.resolve('./ProcessChild');
 

package/src/threads/ThreadsChild.js

@@ -6,14 +6,17 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
+
 import {isMainThread, parentPort} from 'worker_threads';
-import nullthrows from 'nullthrows';
-import {setChild} from '../childState';
-import {Child} from '../child';
+
 import {
   prepareForSerialization,
   restoreDeserializedObject,
-} from '@atlaspack/core';
+} from '@atlaspack/build-cache';
+import nullthrows from 'nullthrows';
+
+import {Child} from '../child';
+import {setChild} from '../childState';
 
 export default class ThreadsChild implements ChildImpl {
   onMessage: MessageHandler;

package/src/threads/ThreadsWorker.js

@@ -7,11 +7,13 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
+
 import {Worker} from 'worker_threads';
+
 import {
   prepareForSerialization,
   restoreDeserializedObject,
-} from '@atlaspack/core';
+} from '@atlaspack/build-cache';
 
 const WORKER_PATH = require.resolve('./ThreadsChild');
 

package/src/web/WebChild.js

@@ -7,12 +7,14 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
-import {setChild} from '../childState';
-import {Child} from '../child';
+
 import {
   prepareForSerialization,
   restoreDeserializedObject,
-} from '@atlaspack/core';
+} from '@atlaspack/build-cache';
+
+import {Child} from '../child';
+import {setChild} from '../childState';
 
 export default class WebChild implements ChildImpl {
   onMessage: MessageHandler;

package/src/web/WebWorker.js

@@ -7,10 +7,11 @@ import type {
   ExitHandler,
   WorkerMessage,
 } from '../types';
+
 import {
   prepareForSerialization,
   restoreDeserializedObject,
-} from '@atlaspack/core';
+} from '@atlaspack/build-cache';
 import {makeDeferredWithPromise} from '@atlaspack/utils';
 
 let id = 0;

package/lib/core-worker.browser.js

@@ -1,4 +0,0 @@
-"use strict";
-
-// $FlowFixMe
-module.exports = require('@atlaspack/core/worker');

package/lib/core-worker.js

@@ -1,4 +0,0 @@
-"use strict";
-
-// This is used only in browser builds
-module.exports = {};

package/src/core-worker.browser.js

@@ -1,4 +0,0 @@
-// @flow
-
-// $FlowFixMe
-module.exports = require('@atlaspack/core/worker');

package/src/core-worker.js

@@ -1,2 +0,0 @@
-// This is used only in browser builds
-module.exports = {};