@atlaspack/core 2.12.1-canary.3489 → 2.12.1-canary.3491

package/lib/Atlaspack.js

@@ -94,6 +94,13 @@ function _rust() {
   return data;
 }
 var _projectPath = require("./projectPath");
+function _cache() {
+  const data = require("@atlaspack/cache");
+  _cache = function () {
+    return data;
+  };
+  return data;
+}
 function _profiler() {
   const data = require("@atlaspack/profiler");
   _profiler = function () {
@@ -181,6 +188,11 @@ class Atlaspack {
         outputFS,
         ...options
       } = this.#initialOptions;
+      const lmdb = resolvedOptions.cache instanceof _cache().LMDBLiteCache ? resolvedOptions.cache.getNativeRef() : null;
+
+      // $FlowFixMe
+      const version = require('../package.json').version;
+      await (lmdb === null || lmdb === void 0 ? void 0 : lmdb.put('current_session_version', Buffer.from(version)));
       rustAtlaspack = new _atlaspackV.AtlaspackV3({
         ...options,
         corePath: _path().default.join(__dirname, '..'),
@@ -197,7 +209,8 @@ class Atlaspack {
           sourceMaps: resolvedOptions.defaultTargetOptions.sourceMaps,
           shouldOptimize: resolvedOptions.defaultTargetOptions.shouldOptimize,
           shouldScopeHoist: resolvedOptions.defaultTargetOptions.shouldScopeHoist
-        }
+        },
+        lmdb: lmdb ?? null
       });
     }
     let {

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -4,7 +4,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AtlaspackV3 = void 0;
-var _WorkerPool = require("./WorkerPool");
 function _rust() {
   const data = require("@atlaspack/rust");
   _rust = function () {
@@ -12,12 +11,14 @@ function _rust() {
   };
   return data;
 }
+var _WorkerPool = require("./WorkerPool");
 class AtlaspackV3 {
   constructor({
     fs,
     nodeWorkers,
     packageManager,
     threads,
+    lmdb,
     ...options
   }) {
     options.logLevel = options.logLevel || 'error';
@@ -26,13 +27,13 @@ class AtlaspackV3 {
     options.defaultTargetOptions.engines = options.defaultTargetOptions.engines || {
       browsers: []
     };
-    this._internal = new (_rust().AtlaspackNapi)({
+    this._internal = _rust().AtlaspackNapi.create({
       fs,
       nodeWorkers,
       packageManager,
       threads,
       options
-    });
+    }, lmdb);
   }
   async buildAssetGraph() {
     const workerIds = [];

package/lib/resolveOptions.js

@@ -111,12 +111,13 @@ 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 = initialOptions.cache ?? (outputFS instanceof _fs().NodeFS ? (() => {
-    if ((0, _featureFlags().getFeatureFlag)('useLmdbJsLite')) {
+  const needsRustLmdbCache = (0, _featureFlags().getFeatureFlag)('useLmdbJsLite') || (0, _featureFlags().getFeatureFlag)('atlaspackV3');
+  let cache = outputFS instanceof _fs().NodeFS ? (() => {
+    if (needsRustLmdbCache) {
       return new (_cache().LMDBLiteCache)(cacheDir);
     }
     return new (_cache().LMDBCache)(cacheDir);
-  })() : new (_cache().FSCache)(outputFS, 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/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.12.1-canary.3489+4f4afe411",
+  "version": "2.12.1-canary.3491+a99ff5d2c",
   "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.12.1-canary.3489+4f4afe411",
-    "@atlaspack/cache": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/diagnostic": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/events": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/feature-flags": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/fs": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/graph": "3.2.1-canary.3489+4f4afe411",
-    "@atlaspack/logger": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/package-manager": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/plugin": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/profiler": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/rust": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/types": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/utils": "2.12.1-canary.3489+4f4afe411",
-    "@atlaspack/workers": "2.12.1-canary.3489+4f4afe411",
+    "@atlaspack/build-cache": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/cache": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/diagnostic": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/events": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/feature-flags": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/fs": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/graph": "3.2.1-canary.3491+a99ff5d2c",
+    "@atlaspack/logger": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/package-manager": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/plugin": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/profiler": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/rust": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/types": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/utils": "2.12.1-canary.3491+a99ff5d2c",
+    "@atlaspack/workers": "2.12.1-canary.3491+a99ff5d2c",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -65,5 +65,5 @@
   "browser": {
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
-  "gitHead": "4f4afe411f74d3a3b3c2d74ef77f4e5c2fc40dcf"
+  "gitHead": "a99ff5d2c9aaeea8d96463c920ab0e86059dfbe7"
 }

package/src/Atlaspack.js

@@ -55,6 +55,7 @@ import {
   toProjectPath,
   fromProjectPathRelative,
 } from './projectPath';
+import {LMDBLiteCache} from '@atlaspack/cache';
 import {tracer} from '@atlaspack/profiler';
 import {setFeatureFlags, DEFAULT_FEATURE_FLAGS} from '@atlaspack/feature-flags';
 import {AtlaspackV3, FileSystemV3} from './atlaspack-v3';
@@ -133,6 +134,15 @@ export default class Atlaspack {
       // eslint-disable-next-line no-unused-vars
       let {entries, inputFS, outputFS, ...options} = this.#initialOptions;
 
+      const lmdb =
+        resolvedOptions.cache instanceof LMDBLiteCache
+          ? resolvedOptions.cache.getNativeRef()
+          : null;
+
+      // $FlowFixMe
+      const version = require('../package.json').version;
+      await lmdb?.put('current_session_version', Buffer.from(version));
+
       rustAtlaspack = new AtlaspackV3({
         ...options,
         corePath: path.join(__dirname, '..'),
@@ -155,6 +165,7 @@ export default class Atlaspack {
           shouldScopeHoist:
             resolvedOptions.defaultTargetOptions.shouldScopeHoist,
         },
+        lmdb: lmdb ?? null,
       });
     }
 

package/src/atlaspack-v3/AtlaspackV3.js

@@ -1,13 +1,21 @@
 // @flow
 
+import {
+  AtlaspackNapi,
+  type Lmdb,
+  type AtlaspackNapiOptions,
+} from '@atlaspack/rust';
 import {workerPool} from './WorkerPool';
-import {AtlaspackNapi, type AtlaspackNapiOptions} from '@atlaspack/rust';
 
 export type AtlaspackV3Options = {|
   fs?: AtlaspackNapiOptions['fs'],
   nodeWorkers?: number,
   packageManager?: AtlaspackNapiOptions['packageManager'],
   threads?: number,
+  /**
+   * A reference to LMDB lite's rust object
+   */
+  lmdb: Lmdb | null,
   ...AtlaspackNapiOptions['options'],
 |};
 
@@ -19,6 +27,7 @@ export class AtlaspackV3 {
     nodeWorkers,
     packageManager,
     threads,
+    lmdb,
     ...options
   }: AtlaspackV3Options) {
     options.logLevel = options.logLevel || 'error';
@@ -29,13 +38,16 @@ export class AtlaspackV3 {
       browsers: [],
     };
 
-    this._internal = new AtlaspackNapi({
-      fs,
-      nodeWorkers,
-      packageManager,
-      threads,
-      options,
-    });
+    this._internal = AtlaspackNapi.create(
+      {
+        fs,
+        nodeWorkers,
+        packageManager,
+        threads,
+        options,
+      },
+      lmdb,
+    );
   }
 
   async buildAssetGraph(): Promise<any> {

package/src/resolveOptions.js

@@ -109,18 +109,19 @@ export default async function resolveOptions(
       ? path.resolve(initialOptions.watchDir)
       : projectRoot;
 
+  const needsRustLmdbCache =
+    getFeatureFlag('useLmdbJsLite') || getFeatureFlag('atlaspackV3');
   const makeLMDBCache = () => {
-    if (getFeatureFlag('useLmdbJsLite')) {
+    if (needsRustLmdbCache) {
       return new LMDBLiteCache(cacheDir);
     }
     return new LMDBCache(cacheDir);
   };
 
   let cache =
-    initialOptions.cache ??
-    (outputFS instanceof NodeFS
+    outputFS instanceof NodeFS
       ? makeLMDBCache()
-      : new FSCache(outputFS, cacheDir));
+      : new FSCache(outputFS, cacheDir);
 
   let mode = initialOptions.mode ?? 'development';
   let shouldOptimize =