@atlaspack/core 2.12.1-canary.3468 → 2.12.1-canary.3470

package/lib/Atlaspack.js

@@ -603,7 +603,6 @@ exports.BuildError = BuildError;
 function createWorkerFarm(options = {}) {
   return new (_workers().default)({
     ...options,
-    // $FlowFixMe
-    workerPath: process.browser ? '@atlaspack/core/worker' : require.resolve('./worker')
+    workerPath: require.resolve('./worker')
   });
 }

package/lib/CommittedAsset.js

@@ -11,6 +11,13 @@ function _stream() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _sourceMap() {
   const data = _interopRequireDefault(require("@parcel/source-map"));
   _sourceMap = function () {
@@ -26,7 +33,6 @@ function _utils() {
   return data;
 }
 var _assetUtils = require("./assetUtils");
-var _serializer = require("./serializer");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class CommittedAsset {
   constructor(value, options) {
@@ -122,7 +128,7 @@ class CommittedAsset {
       return Promise.resolve(null);
     }
     if (this.ast == null) {
-      this.ast = this.options.cache.getBlob(this.value.astKey).then(serializedAst => (0, _serializer.deserializeRaw)(serializedAst));
+      this.ast = this.options.cache.getBlob(this.value.astKey).then(serializedAst => (0, _buildCache().deserializeRaw)(serializedAst));
     }
     return this.ast;
   }

package/lib/PackagerRunner.js

@@ -11,6 +11,13 @@ function _assert() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -76,7 +83,6 @@ var _projectPath = require("./projectPath");
 var _InternalConfig = require("./InternalConfig");
 var _ConfigRequest = require("./requests/ConfigRequest");
 var _DevDepRequest = require("./requests/DevDepRequest");
-var _buildCache = require("./buildCache");
 var _assetUtils = require("./assetUtils");
 var _utils2 = require("./utils");
 function _profiler() {
@@ -93,7 +99,7 @@ const BOUNDARY_LENGTH = _constants.HASH_REF_PREFIX.length + 32 - 1;
 
 // Packager/optimizer configs are not bundle-specific, so we only need to
 // load them once per build.
-const pluginConfigs = (0, _buildCache.createBuildCache)();
+const pluginConfigs = (0, _buildCache().createBuildCache)();
 class PackagerRunner {
   constructor({
     config,

package/lib/RequestTracker.js

@@ -23,6 +23,13 @@ function _path2() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _featureFlags() {
   const data = require("@atlaspack/feature-flags");
   _featureFlags = function () {
@@ -69,7 +76,6 @@ var _constants = require("./constants");
 var _projectPath = require("./projectPath");
 var _ReporterRunner = require("./ReporterRunner");
 var _ConfigRequest = require("./requests/ConfigRequest");
-var _serializer = require("./serializer");
 var _utils2 = require("./utils");
 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); }
@@ -749,7 +755,7 @@ class RequestTracker {
     } else if (node.resultCacheKey != null && ifMatch == null) {
       let key = node.resultCacheKey;
       (0, _assert().default)(this.options.cache.hasLargeBlob(key));
-      let cachedResult = (0, _serializer.deserialize)(await this.options.cache.getLargeBlob(key));
+      let cachedResult = (0, _buildCache().deserialize)(await this.options.cache.getLargeBlob(key));
       node.result = cachedResult;
       return cachedResult;
     }
@@ -927,7 +933,7 @@ class RequestTracker {
       if (signal !== null && signal !== void 0 && signal.aborted) {
         throw new Error('Serialization was aborted');
       }
-      await this.options.cache.setLargeBlob(key, (0, _serializer.serialize)(contents), signal ? {
+      await this.options.cache.setLargeBlob(key, (0, _buildCache().serialize)(contents), signal ? {
         signal: signal
       } : undefined);
       total += 1;
@@ -1046,7 +1052,7 @@ async function readAndDeserializeRequestGraph(cache, requestGraphKey, cacheKey)
   const getAndDeserialize = async key => {
     let buffer = await cache.getLargeBlob(key);
     bufferLength += Buffer.byteLength(buffer);
-    return (0, _serializer.deserialize)(buffer);
+    return (0, _buildCache().deserialize)(buffer);
   };
   let serializedRequestGraph = await getAndDeserialize(requestGraphKey);
   let nodePromises = serializedRequestGraph.nodeCountsPerBlob.map(async (nodesCount, i) => {

package/lib/UncommittedAsset.js

@@ -25,6 +25,13 @@ function _sourceMap() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -39,7 +46,6 @@ function _rust() {
   };
   return data;
 }
-var _serializer = require("./serializer");
 var _Dependency = require("./Dependency");
 var _Environment = require("./Environment");
 var _constants = require("./constants");
@@ -88,7 +94,7 @@ class UncommittedAsset {
 
     // Since we can only read from the stream once, compute the content length
     // and hash while it's being written to the cache.
-    await Promise.all([contentKey != null && this.commitContent(contentKey).then(s => (size = s.size, outputHash = s.hash)), this.mapBuffer != null && mapKey != null && this.options.cache.setBlob(mapKey, this.mapBuffer), astKey != null && this.options.cache.setBlob(astKey, (0, _serializer.serializeRaw)(this.ast))]);
+    await Promise.all([contentKey != null && this.commitContent(contentKey).then(s => (size = s.size, outputHash = s.hash)), this.mapBuffer != null && mapKey != null && this.options.cache.setBlob(mapKey, this.mapBuffer), astKey != null && this.options.cache.setBlob(astKey, (0, _buildCache().serializeRaw)(this.ast))]);
     this.value.contentKey = contentKey;
     this.value.mapKey = mapKey;
     this.value.astKey = astKey;

package/lib/assetUtils.js

@@ -15,6 +15,13 @@ function _stream() {
   };
   return data;
 }
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = require("@atlaspack/logger");
   _logger = function () {
@@ -42,7 +49,6 @@ function _utils() {
   return data;
 }
 var _utils2 = require("./utils");
-var _buildCache = require("./buildCache");
 var _projectPath = require("./projectPath");
 function _rust() {
   const data = require("@atlaspack/rust");
@@ -161,7 +167,7 @@ function getInvalidationId(invalidation) {
       throw new Error('Unknown invalidation type: ' + invalidation.type);
   }
 }
-const hashCache = (0, _buildCache.createBuildCache)();
+const hashCache = (0, _buildCache().createBuildCache)();
 async function getInvalidationHash(invalidations, options) {
   if (invalidations.length === 0) {
     return '';

package/lib/index.js

@@ -4,12 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 var _exportNames = {
-  registerSerializableClass: true,
-  unregisterSerializableClass: true,
-  prepareForSerialization: true,
-  restoreDeserializedObject: true,
-  serialize: true,
-  deserialize: true,
   Atlaspack: true,
   Parcel: true,
   BuildError: true,
@@ -59,43 +53,6 @@ Object.defineProperty(exports, "default", {
     return _Atlaspack.default;
   }
 });
-Object.defineProperty(exports, "deserialize", {
-  enumerable: true,
-  get: function () {
-    return _serializer.deserialize;
-  }
-});
-Object.defineProperty(exports, "prepareForSerialization", {
-  enumerable: true,
-  get: function () {
-    return _serializer.prepareForSerialization;
-  }
-});
-Object.defineProperty(exports, "registerSerializableClass", {
-  enumerable: true,
-  get: function () {
-    return _serializer.registerSerializableClass;
-  }
-});
-Object.defineProperty(exports, "restoreDeserializedObject", {
-  enumerable: true,
-  get: function () {
-    return _serializer.restoreDeserializedObject;
-  }
-});
-Object.defineProperty(exports, "serialize", {
-  enumerable: true,
-  get: function () {
-    return _serializer.serialize;
-  }
-});
-Object.defineProperty(exports, "unregisterSerializableClass", {
-  enumerable: true,
-  get: function () {
-    return _serializer.unregisterSerializableClass;
-  }
-});
-var _serializer = require("./serializer");
 var _Atlaspack = _interopRequireWildcard(require("./Atlaspack"));
 var _atlaspackV = require("./atlaspack-v3");
 Object.keys(_atlaspackV).forEach(function (key) {

package/lib/registerCoreWithSerializer.js

@@ -4,6 +4,13 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.registerCoreWithSerializer = registerCoreWithSerializer;
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _graph() {
   const data = require("@atlaspack/graph");
   _graph = function () {
@@ -11,13 +18,12 @@ function _graph() {
   };
   return data;
 }
-var _serializer = require("./serializer");
+var _package = _interopRequireDefault(require("../package.json"));
+var _AtlaspackConfig = require("./AtlaspackConfig");
 var _AssetGraph = _interopRequireDefault(require("./AssetGraph"));
 var _BundleGraph = _interopRequireDefault(require("./BundleGraph"));
-var _AtlaspackConfig = require("./AtlaspackConfig");
-var _RequestTracker = require("./RequestTracker");
 var _Config = _interopRequireDefault(require("./public/Config"));
-var _package = _interopRequireDefault(require("../package.json"));
+var _RequestTracker = require("./RequestTracker");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 let coreRegistered;
 function registerCoreWithSerializer() {
@@ -39,7 +45,7 @@ function registerCoreWithSerializer() {
     RequestGraph: _RequestTracker.RequestGraph
     // $FlowFixMe[unclear-type]
   })) {
-    (0, _serializer.registerSerializableClass)(packageVersion + ':' + name, ctor);
+    (0, _buildCache().registerSerializableClass)(packageVersion + ':' + name, ctor);
   }
   coreRegistered = true;
 }

package/lib/requests/AtlaspackConfigRequest.js

@@ -18,6 +18,13 @@ exports.resolveAtlaspackConfig = resolveAtlaspackConfig;
 exports.resolveExtends = resolveExtends;
 exports.validateConfigFile = validateConfigFile;
 exports.validateNotEmpty = validateNotEmpty;
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _utils() {
   const data = require("@atlaspack/utils");
   _utils = function () {
@@ -55,7 +62,6 @@ function _assert() {
 }
 var _AtlaspackConfig = require("../AtlaspackConfig");
 var _AtlaspackConfig2 = _interopRequireDefault(require("../AtlaspackConfig.schema"));
-var _buildCache = require("../buildCache");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
 var _utils2 = require("../utils");
@@ -103,7 +109,7 @@ function createAtlaspackConfigRequest() {
     input: null
   };
 }
-const atlaspackConfigCache = (0, _buildCache.createBuildCache)();
+const atlaspackConfigCache = (0, _buildCache().createBuildCache)();
 function getCachedAtlaspackConfig(result, options) {
   let {
     config: processedConfig,

package/lib/requests/ConfigRequest.js

@@ -15,7 +15,13 @@ function _utils() {
   };
   return data;
 }
-var _serializer = require("../serializer");
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _logger() {
   const data = require("@atlaspack/logger");
   _logger = function () {
@@ -50,7 +56,6 @@ function _profiler() {
 }
 var _RequestTracker = require("../RequestTracker");
 var _projectPath = require("../projectPath");
-var _buildCache = require("../buildCache");
 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 }; }
@@ -81,7 +86,7 @@ async function loadPluginConfig(loadedPlugin, config, options) {
     });
   }
 }
-const configKeyCache = (0, _buildCache.createBuildCache)();
+const configKeyCache = (0, _buildCache().createBuildCache)();
 async function getConfigKeyContentHash(filePath, configKey, options) {
   let cacheKey = `${(0, _projectPath.fromProjectPathRelative)(filePath)}:${configKey}`;
   let cachedValue = configKeyCache.get(cacheKey);
@@ -166,7 +171,7 @@ async function getConfigHash(config, pluginName, options) {
       })), options));
     } else if (config.result != null) {
       try {
-        hash.writeBuffer((0, _serializer.serializeRaw)(config.result));
+        hash.writeBuffer((0, _buildCache().serializeRaw)(config.result));
       } catch (err) {
         throw new (_diagnostic().default)({
           diagnostic: {

package/lib/requests/DevDepRequest.js

@@ -8,6 +8,13 @@ exports.getDevDepRequests = getDevDepRequests;
 exports.getWorkerDevDepRequests = getWorkerDevDepRequests;
 exports.invalidateDevDeps = invalidateDevDeps;
 exports.runDevDepRequest = runDevDepRequest;
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _nullthrows() {
   const data = _interopRequireDefault(require("nullthrows"));
   _nullthrows = function () {
@@ -16,7 +23,6 @@ function _nullthrows() {
   return data;
 }
 var _assetUtils = require("../assetUtils");
-var _buildCache = require("../buildCache");
 var _utils = require("../utils");
 var _projectPath = require("../projectPath");
 var _RequestTracker = require("../RequestTracker");
@@ -98,7 +104,7 @@ async function getDevDepRequests(api) {
 
 // Tracks dev deps that have been invalidated during this build
 // so we don't invalidate the require cache more than once.
-const invalidatedDevDeps = (0, _buildCache.createBuildCache)();
+const invalidatedDevDeps = (0, _buildCache().createBuildCache)();
 function invalidateDevDeps(invalidDevDeps, options, config) {
   for (let {
     specifier,
@@ -142,7 +148,7 @@ async function runDevDepRequest(api, devDepRequest) {
 
 // A cache of plugin dependency hashes that we've already sent to the main thread.
 // Automatically cleared before each build.
-const pluginCache = (0, _buildCache.createBuildCache)();
+const pluginCache = (0, _buildCache().createBuildCache)();
 function getWorkerDevDepRequests(devDepRequests) {
   return devDepRequests.map(devDepRequest => {
     // If we've already sent a matching transformer + hash to the main thread during this build,

package/lib/requests/PathRequest.js

@@ -5,6 +5,13 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ResolverRunner = void 0;
 exports.default = createPathRequest;
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _diagnostic() {
   const data = _interopRequireWildcard(require("@atlaspack/diagnostic"));
   _diagnostic = function () {
@@ -48,7 +55,6 @@ var _AtlaspackConfigRequest = _interopRequireWildcard(require("./AtlaspackConfig
 var _utils2 = require("../utils");
 var _projectPath = require("../projectPath");
 var _types = require("../types");
-var _buildCache = require("../buildCache");
 var _InternalConfig = require("../InternalConfig");
 var _ConfigRequest = require("./ConfigRequest");
 var _DevDepRequest = require("./DevDepRequest");
@@ -126,7 +132,7 @@ async function run({
     throw err;
   }
 }
-const configCache = (0, _buildCache.createBuildCache)();
+const configCache = (0, _buildCache().createBuildCache)();
 class ResolverRunner {
   constructor({
     config,

package/lib/worker.js

@@ -37,7 +37,13 @@ var _PackagerRunner = _interopRequireDefault(require("./PackagerRunner"));
 var _Validation = _interopRequireDefault(require("./Validation"));
 var _AtlaspackConfig = require("./AtlaspackConfig");
 var _registerCoreWithSerializer = require("./registerCoreWithSerializer");
-var _buildCache = require("./buildCache");
+function _buildCache() {
+  const data = require("@atlaspack/build-cache");
+  _buildCache = function () {
+    return data;
+  };
+  return data;
+}
 function _sourceMap() {
   const data = require("@parcel/source-map");
   _sourceMap = function () {
@@ -105,7 +111,7 @@ async function loadConfig(cachePath, options) {
 }
 function clearConfigCache() {
   _utils().loadConfig.clear();
-  (0, _buildCache.clearBuildCaches)();
+  (0, _buildCache().clearBuildCaches)();
 }
 async function runTransform(workerApi, opts) {
   let {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3468+895ce5022",
+  "version": "2.12.1-canary.3470+5c9edeedc",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,20 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/cache": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/diagnostic": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/events": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/feature-flags": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/fs": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/graph": "3.2.1-canary.3468+895ce5022",
-    "@atlaspack/logger": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/package-manager": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/plugin": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/profiler": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/rust": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/types": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/utils": "2.12.1-canary.3468+895ce5022",
-    "@atlaspack/workers": "2.12.1-canary.3468+895ce5022",
+    "@atlaspack/build-cache": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/cache": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/diagnostic": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/events": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/feature-flags": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/fs": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/graph": "3.2.1-canary.3470+5c9edeedc",
+    "@atlaspack/logger": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/package-manager": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/plugin": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/profiler": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/rust": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/types": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/utils": "2.12.1-canary.3470+5c9edeedc",
+    "@atlaspack/workers": "2.12.1-canary.3470+5c9edeedc",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -64,5 +65,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "895ce502277dc44997129af501742089a06b1023"
+  "gitHead": "5c9edeedc43e0a68fa1e7cdf72d6d6616432cbd9"
 }

package/src/Atlaspack.js

@@ -645,9 +645,6 @@ export function createWorkerFarm(
 ): WorkerFarm {
   return new WorkerFarm({
     ...options,
-    // $FlowFixMe
-    workerPath: process.browser
-      ? '@atlaspack/core/worker'
-      : require.resolve('./worker'),
+    workerPath: require.resolve('./worker'),
   });
 }

package/src/CommittedAsset.js

@@ -4,10 +4,12 @@ import type {AST, Blob} from '@atlaspack/types';
 import type {Asset, Dependency, AtlaspackOptions} from './types';
 
 import {Readable} from 'stream';
+
+import {deserializeRaw} from '@atlaspack/build-cache';
 import SourceMap from '@parcel/source-map';
 import {bufferStream, blobToStream, streamFromPromise} from '@atlaspack/utils';
+
 import {generateFromAST} from './assetUtils';
-import {deserializeRaw} from './serializer';
 
 export default class CommittedAsset {
   key: ?string;

package/src/PackagerRunner.js

@@ -24,6 +24,7 @@ import type {ConfigRequest} from './requests/ConfigRequest';
 import type {DevDepSpecifier} from './requests/DevDepRequest';
 
 import invariant from 'assert';
+import {createBuildCache} from '@atlaspack/build-cache';
 import {blobToStream, TapStream} from '@atlaspack/utils';
 import {PluginLogger} from '@atlaspack/logger';
 import ThrowableDiagnostic, {errorToDiagnostic} from '@atlaspack/diagnostic';
@@ -57,7 +58,6 @@ import {
   createDevDependency,
   getWorkerDevDepRequests,
 } from './requests/DevDepRequest';
-import {createBuildCache} from './buildCache';
 import {getInvalidationId, getInvalidationHash} from './assetUtils';
 import {optionsProxy} from './utils';
 import {invalidateDevDeps} from './requests/DevDepRequest';

package/src/RequestTracker.js

@@ -3,6 +3,7 @@
 import invariant, {AssertionError} from 'assert';
 import path from 'path';
 
+import {deserialize, serialize} from '@atlaspack/build-cache';
 import type {Cache} from '@atlaspack/cache';
 import {getFeatureFlag} from '@atlaspack/feature-flags';
 import {ContentGraph} from '@atlaspack/graph';
@@ -60,7 +61,6 @@ import type {AtlaspackConfigRequestResult} from './requests/AtlaspackConfigReque
 import type {AtlaspackBuildRequestResult} from './requests/AtlaspackBuildRequest';
 import type {EntryRequestResult} from './requests/EntryRequest';
 import type {BundleGraphResult} from './requests/BundleGraphRequest';
-import {deserialize, serialize} from './serializer';
 import type {
   AssetRequestResult,
   AtlaspackOptions,

package/src/UncommittedAsset.js

@@ -14,6 +14,7 @@ import type {Asset, Dependency, AtlaspackOptions, Invalidations} from './types';
 import invariant from 'assert';
 import {Readable} from 'stream';
 import SourceMap from '@parcel/source-map';
+import {serializeRaw} from '@atlaspack/build-cache';
 import {
   blobToStream,
   bufferStream,
@@ -23,7 +24,6 @@ import {
   SOURCEMAP_RE,
 } from '@atlaspack/utils';
 import {hashString, hashBuffer, Hash} from '@atlaspack/rust';
-import {serializeRaw} from './serializer';
 import {createDependency, mergeDependencies} from './Dependency';
 import {mergeEnvironments} from './Environment';
 import {ATLASPACK_VERSION} from './constants';

package/src/assetUtils.js

@@ -21,6 +21,7 @@ import type {
 } from './types';
 
 import {Readable} from 'stream';
+import {createBuildCache} from '@atlaspack/build-cache';
 import {PluginLogger} from '@atlaspack/logger';
 import nullthrows from 'nullthrows';
 import CommittedAsset from './CommittedAsset';
@@ -30,7 +31,6 @@ import {Asset as PublicAsset} from './public/Asset';
 import PluginOptions from './public/PluginOptions';
 import {blobToStream, hashFile} from '@atlaspack/utils';
 import {hashFromOption, toInternalSourceLocation} from './utils';
-import {createBuildCache} from './buildCache';
 import {
   type ProjectPath,
   fromProjectPath,

package/src/index.js

@@ -1,15 +1,5 @@
 // @flow
 
-// Needs to be exported first because of circular imports
-export {
-  registerSerializableClass,
-  unregisterSerializableClass,
-  prepareForSerialization,
-  restoreDeserializedObject,
-  serialize,
-  deserialize,
-} from './serializer';
-
 export {
   default,
   default as Atlaspack,

package/src/registerCoreWithSerializer.js

@@ -1,12 +1,15 @@
 // @flow
+
+import {registerSerializableClass} from '@atlaspack/build-cache';
 import {Graph} from '@atlaspack/graph';
-import {registerSerializableClass} from './serializer';
+
+import packageJson from '../package.json';
+
+import {AtlaspackConfig} from './AtlaspackConfig';
 import AssetGraph from './AssetGraph';
 import BundleGraph from './BundleGraph';
-import {AtlaspackConfig} from './AtlaspackConfig';
-import {RequestGraph} from './RequestTracker';
 import Config from './public/Config';
-import packageJson from '../package.json';
+import {RequestGraph} from './RequestTracker';
 
 let coreRegistered;
 export function registerCoreWithSerializer() {

package/src/requests/AtlaspackConfigRequest.js

@@ -15,6 +15,7 @@ import type {
   ProcessedAtlaspackConfig,
 } from '../types';
 
+import {createBuildCache} from '@atlaspack/build-cache';
 import {
   isDirectoryInside,
   hashObject,
@@ -35,7 +36,6 @@ import invariant from 'assert';
 
 import {AtlaspackConfig} from '../AtlaspackConfig';
 import AtlaspackConfigSchema from '../AtlaspackConfig.schema';
-import {createBuildCache} from '../buildCache';
 import {toProjectPath} from '../projectPath';
 import {requestTypes} from '../RequestTracker';
 import {optionsProxy} from '../utils';