@atlaspack/core 2.14.1-dev.55 → 2.14.1-dev.82

package/lib/Atlaspack.js

@@ -118,6 +118,7 @@ function _featureFlags() {
 var _atlaspackV = require("./atlaspack-v3");
 var _AssetGraphRequest = _interopRequireDefault(require("./requests/AssetGraphRequest"));
 var _AssetGraphRequestRust = require("./requests/AssetGraphRequestRust");
+var _rustWorkerThreadDylibHack = require("./rustWorkerThreadDylibHack");
 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 }; }
@@ -165,6 +166,9 @@ class Atlaspack {
       ...this.#initialOptions.featureFlags
     };
     (0, _featureFlags().setFeatureFlags)(featureFlags);
+    if ((0, _featureFlags().getFeatureFlag)('enableRustWorkerThreadDylibHack')) {
+      (0, _rustWorkerThreadDylibHack.loadRustWorkerThreadDylibHack)();
+    }
     await _sourceMap().init;
     await (_rust().init === null || _rust().init === void 0 ? void 0 : (0, _rust().init)());
     this.#disposable = new (_events().Disposable)();

package/lib/public/BundleGraph.js

@@ -262,12 +262,13 @@ class BundleGraph {
         ifFalseBundles.push(...depToBundles(cond.ifFalseDependency));
       }
       for (let bundle of bundles) {
-        const conditions = bundleConditions.get(bundle) ?? new Map();
+        const conditions = bundleConditions.get(bundle.id) ?? new Map();
         conditions.set(cond.key, {
+          bundle,
           ifTrueBundles,
           ifFalseBundles
         });
-        bundleConditions.set(bundle, conditions);
+        bundleConditions.set(bundle.id, conditions);
       }
     }
     return bundleConditions;

package/lib/resolveOptions.js

@@ -139,7 +139,8 @@ async function resolveOptions(initialOptions) {
   // where symlinked dependencies outside the project root need to trigger HMR
   // updates. Default to the project root if not provided.
   let watchDir = initialOptions.watchDir != null ? _path().default.resolve(initialOptions.watchDir) : projectRoot;
-  let cache = outputFS instanceof _fs().NodeFS ? new (_cache().LMDBLiteCache)(cacheDir) : new (_cache().FSCache)(outputFS, cacheDir);
+  const needsRustLmdbCache = (0, _featureFlags().getFeatureFlag)('useLmdbJsLite') || (0, _featureFlags().getFeatureFlag)('atlaspackV3');
+  let cache = needsRustLmdbCache ? new (_cache().LMDBLiteCache)(cacheDir) : outputFS instanceof _fs().NodeFS ? new (_cache().LMDBCache)(cacheDir) : new (_cache().FSCache)(outputFS, cacheDir);
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau = initialOptions.defaultTargetOptions) === null || _initialOptions$defau === void 0 ? void 0 : _initialOptions$defau.shouldOptimize) ?? mode === 'production';
   let publicUrl = (initialOptions === null || initialOptions === void 0 || (_initialOptions$defau2 = initialOptions.defaultTargetOptions) === null || _initialOptions$defau2 === void 0 ? void 0 : _initialOptions$defau2.publicUrl) ?? '/';

package/lib/rustWorkerThreadDylibHack.js

@@ -0,0 +1,22 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.loadRustWorkerThreadDylibHack = loadRustWorkerThreadDylibHack;
+/**
+ * This is a workaround for https://github.com/rust-lang/rust/issues/91979
+ * when running atlaspack with parcel bindings, it is possible that the parcel
+ * dylib will be loaded from a node worker thread, which causes a crash on exit.
+ *
+ * This is a workaround to ensure that the parcel dylib is loaded in the main
+ * thread, which fixes the crash.
+ */
+function loadRustWorkerThreadDylibHack() {
+  try {
+    // $FlowFixMe
+    require('@parcel/rust'); // eslint-disable-line
+  } catch (err) {
+    /* ignore */
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.14.1-dev.55+f298b7f5c",
+  "version": "2.14.1-dev.82+5e3ca3e0c",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -20,21 +20,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-dev.55+f298b7f5c",
-    "@atlaspack/cache": "2.13.3-dev.55+f298b7f5c",
-    "@atlaspack/diagnostic": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/events": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/feature-flags": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/fs": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/graph": "3.4.1-dev.55+f298b7f5c",
-    "@atlaspack/logger": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/package-manager": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/plugin": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/profiler": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/rust": "3.0.1-dev.55+f298b7f5c",
-    "@atlaspack/types": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/utils": "2.14.1-dev.55+f298b7f5c",
-    "@atlaspack/workers": "2.14.1-dev.55+f298b7f5c",
+    "@atlaspack/build-cache": "2.13.3-dev.82+5e3ca3e0c",
+    "@atlaspack/cache": "2.13.3-dev.82+5e3ca3e0c",
+    "@atlaspack/diagnostic": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/events": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/feature-flags": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/fs": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/graph": "3.4.1-dev.82+5e3ca3e0c",
+    "@atlaspack/logger": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/package-manager": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/plugin": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/profiler": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/rust": "3.0.1-dev.82+5e3ca3e0c",
+    "@atlaspack/types": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/utils": "2.14.1-dev.82+5e3ca3e0c",
+    "@atlaspack/workers": "2.14.1-dev.82+5e3ca3e0c",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -67,5 +67,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "f298b7f5cac438d5150790475bde0cb959b3f6a5"
+  "gitHead": "5e3ca3e0cbbd49f4e67ac8d9b8aeebba1c3e76ef"
 }

package/src/Atlaspack.js

@@ -58,11 +58,16 @@ import {
   fromProjectPathRelative,
 } from './projectPath';
 import {tracer} from '@atlaspack/profiler';
-import {setFeatureFlags, DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
+import {
+  getFeatureFlag,
+  setFeatureFlags,
+  DEFAULT_FEATURE_FLAGS,
+} from '@atlaspack/feature-flags';
 import {AtlaspackV3, FileSystemV3} from './atlaspack-v3';
 import createAssetGraphRequestJS from './requests/AssetGraphRequest';
 import {createAssetGraphRequestRust} from './requests/AssetGraphRequestRust';
 import type {AssetGraphRequestResult} from './requests/AssetGraphRequest';
+import {loadRustWorkerThreadDylibHack} from './rustWorkerThreadDylibHack';
 
 registerCoreWithSerializer();
 
@@ -120,6 +125,10 @@ export default class Atlaspack {
     };
     setFeatureFlags(featureFlags);
 
+    if (getFeatureFlag('enableRustWorkerThreadDylibHack')) {
+      loadRustWorkerThreadDylibHack();
+    }
+
     await initSourcemaps;
     await initRust?.();
 

package/src/public/BundleGraph.js

@@ -444,10 +444,11 @@ export default class BundleGraph<TBundle: IBundle>
   // be used by a webserver to understand which conditions are used by which bundles,
   // and which bundles those conditions require depending on what they evaluate to.
   getConditionalBundleMapping(): Map<
-    TBundle,
+    string,
     Map<
       string,
       {|
+        bundle: TBundle,
         ifTrueBundles: Array<TBundle>,
         ifFalseBundles: Array<TBundle>,
       |},
@@ -486,14 +487,15 @@ export default class BundleGraph<TBundle: IBundle>
       }
 
       for (let bundle of bundles) {
-        const conditions = bundleConditions.get(bundle) ?? new Map();
+        const conditions = bundleConditions.get(bundle.id) ?? new Map();
 
         conditions.set(cond.key, {
+          bundle,
           ifTrueBundles,
           ifFalseBundles,
         });
 
-        bundleConditions.set(bundle, conditions);
+        bundleConditions.set(bundle.id, conditions);
       }
     }
 

package/src/resolveOptions.js

@@ -12,7 +12,7 @@ import type {AtlaspackOptions} from './types';
 import path from 'path';
 import {hashString} from '@atlaspack/rust';
 import {NodeFS, NodeVCSAwareFS} from '@atlaspack/fs';
-import {LMDBLiteCache, FSCache} from '@atlaspack/cache';
+import {LMDBCache, LMDBLiteCache, FSCache} from '@atlaspack/cache';
 import {getFeatureFlag, getFeatureFlagValue} from '@atlaspack/feature-flags';
 import {NodePackageManager} from '@atlaspack/package-manager';
 import {
@@ -146,10 +146,14 @@ export default async function resolveOptions(
       ? path.resolve(initialOptions.watchDir)
       : projectRoot;
 
-  let cache =
-    outputFS instanceof NodeFS
-      ? new LMDBLiteCache(cacheDir)
-      : new FSCache(outputFS, cacheDir);
+  const needsRustLmdbCache =
+    getFeatureFlag('useLmdbJsLite') || getFeatureFlag('atlaspackV3');
+
+  let cache = needsRustLmdbCache
+    ? new LMDBLiteCache(cacheDir)
+    : outputFS instanceof NodeFS
+    ? new LMDBCache(cacheDir)
+    : new FSCache(outputFS, cacheDir);
 
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize =

package/src/rustWorkerThreadDylibHack.js

@@ -0,0 +1,18 @@
+// @flow strict-local
+
+/**
+ * This is a workaround for https://github.com/rust-lang/rust/issues/91979
+ * when running atlaspack with parcel bindings, it is possible that the parcel
+ * dylib will be loaded from a node worker thread, which causes a crash on exit.
+ *
+ * This is a workaround to ensure that the parcel dylib is loaded in the main
+ * thread, which fixes the crash.
+ */
+export function loadRustWorkerThreadDylibHack() {
+  try {
+    // $FlowFixMe
+    require('@parcel/rust'); // eslint-disable-line
+  } catch (err) {
+    /* ignore */
+  }
+}