@atlaspack/core 2.16.2-canary.103 → 2.16.2-canary.105

package/lib/Atlaspack.js

@@ -226,6 +226,11 @@ class Atlaspack {
       });
     }
     this.rustAtlaspack = rustAtlaspack;
+    if (featureFlags.atlaspackV3CleanShutdown) {
+      this.#disposable.add(() => {
+        rustAtlaspack.end();
+      });
+    }
     let {
       config
     } = await (0, _AtlaspackConfigRequest.loadAtlaspackConfig)(resolvedOptions);

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -21,21 +21,28 @@ function _diagnostic() {
 }
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 class AtlaspackV3 {
-  constructor(atlaspack_napi) {
+  constructor(atlaspack_napi, napiWorkerPool, isDefaultNapiWorkerPool) {
     this._atlaspack_napi = atlaspack_napi;
+    this._napiWorkerPool = napiWorkerPool;
+    this._isDefaultNapiWorkerPool = isDefaultNapiWorkerPool;
   }
   static async create({
     fs,
     packageManager,
     threads,
     lmdb,
-    napiWorkerPool = new _NapiWorkerPool.NapiWorkerPool(),
+    napiWorkerPool,
     ...options
   }) {
     options.logLevel = options.logLevel || 'error';
     options.defaultTargetOptions = options.defaultTargetOptions || {};
     // $FlowFixMe "engines" are readonly
     options.defaultTargetOptions.engines = options.defaultTargetOptions.engines || {};
+    let isDefaultNapiWorkerPool = false;
+    if (!napiWorkerPool) {
+      napiWorkerPool = new _NapiWorkerPool.NapiWorkerPool();
+      isDefaultNapiWorkerPool = true;
+    }
     const [internal, error] = await (0, _rust().atlaspackNapiCreate)({
       fs,
       packageManager,
@@ -48,7 +55,13 @@ class AtlaspackV3 {
         diagnostic: error
       });
     }
-    return new AtlaspackV3(internal);
+    return new AtlaspackV3(internal, napiWorkerPool, isDefaultNapiWorkerPool);
+  }
+  end() {
+    // If the worker pool was provided to us, don't shut it down, it's up to the provider.
+    if (this._isDefaultNapiWorkerPool) {
+      this._napiWorkerPool.shutdown();
+    }
   }
   async buildAssetGraph() {
     let [graph, error] = await (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.16.2-canary.103+1ff31f103",
+  "version": "2.16.2-canary.105+e8a60ffbe",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -21,21 +21,21 @@
     "check-ts": "tsc --noEmit index.d.ts"
   },
   "dependencies": {
-    "@atlaspack/build-cache": "2.13.3-canary.171+1ff31f103",
-    "@atlaspack/cache": "3.1.1-canary.103+1ff31f103",
-    "@atlaspack/diagnostic": "2.14.1-canary.171+1ff31f103",
-    "@atlaspack/events": "2.14.1-canary.171+1ff31f103",
-    "@atlaspack/feature-flags": "2.14.1-canary.171+1ff31f103",
-    "@atlaspack/fs": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/graph": "3.4.1-canary.171+1ff31f103",
-    "@atlaspack/logger": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/package-manager": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/plugin": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/profiler": "2.14.1-canary.171+1ff31f103",
-    "@atlaspack/rust": "3.2.1-canary.103+1ff31f103",
-    "@atlaspack/types": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/utils": "2.14.5-canary.103+1ff31f103",
-    "@atlaspack/workers": "2.14.5-canary.103+1ff31f103",
+    "@atlaspack/build-cache": "2.13.3-canary.173+e8a60ffbe",
+    "@atlaspack/cache": "3.1.1-canary.105+e8a60ffbe",
+    "@atlaspack/diagnostic": "2.14.1-canary.173+e8a60ffbe",
+    "@atlaspack/events": "2.14.1-canary.173+e8a60ffbe",
+    "@atlaspack/feature-flags": "2.14.1-canary.173+e8a60ffbe",
+    "@atlaspack/fs": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/graph": "3.4.1-canary.173+e8a60ffbe",
+    "@atlaspack/logger": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/package-manager": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/plugin": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/profiler": "2.14.1-canary.173+e8a60ffbe",
+    "@atlaspack/rust": "3.2.1-canary.105+e8a60ffbe",
+    "@atlaspack/types": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/utils": "2.14.5-canary.105+e8a60ffbe",
+    "@atlaspack/workers": "2.14.5-canary.105+e8a60ffbe",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -60,5 +60,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "1ff31f10391c48780c9fcfc243b4e828a1b285e0"
+  "gitHead": "e8a60ffbea41caef265786bbf73349771760081c"
 }

package/src/Atlaspack.js

@@ -190,6 +190,12 @@ export default class Atlaspack {
     }
     this.rustAtlaspack = rustAtlaspack;
 
+    if (featureFlags.atlaspackV3CleanShutdown) {
+      this.#disposable.add(() => {
+        rustAtlaspack.end();
+      });
+    }
+
     let {config} = await loadAtlaspackConfig(resolvedOptions);
     this.#config = new AtlaspackConfig(config, resolvedOptions);
 

package/src/atlaspack-v3/AtlaspackV3.js

@@ -28,9 +28,17 @@ export type AtlaspackV3Options = {|
 
 export class AtlaspackV3 {
   _atlaspack_napi: AtlaspackNapi;
+  _napiWorkerPool: INapiWorkerPool;
+  _isDefaultNapiWorkerPool: boolean;
 
-  constructor(atlaspack_napi: AtlaspackNapi) {
+  constructor(
+    atlaspack_napi: AtlaspackNapi,
+    napiWorkerPool: INapiWorkerPool,
+    isDefaultNapiWorkerPool: boolean,
+  ) {
     this._atlaspack_napi = atlaspack_napi;
+    this._napiWorkerPool = napiWorkerPool;
+    this._isDefaultNapiWorkerPool = isDefaultNapiWorkerPool;
   }
 
   static async create({
@@ -38,7 +46,7 @@ export class AtlaspackV3 {
     packageManager,
     threads,
     lmdb,
-    napiWorkerPool = new NapiWorkerPool(),
+    napiWorkerPool,
     ...options
   }: AtlaspackV3Options): Promise<AtlaspackV3> {
     options.logLevel = options.logLevel || 'error';
@@ -47,6 +55,12 @@ export class AtlaspackV3 {
     options.defaultTargetOptions.engines =
       options.defaultTargetOptions.engines || {};
 
+    let isDefaultNapiWorkerPool = false;
+    if (!napiWorkerPool) {
+      napiWorkerPool = new NapiWorkerPool();
+      isDefaultNapiWorkerPool = true;
+    }
+
     const [internal, error] = await atlaspackNapiCreate(
       {
         fs,
@@ -64,7 +78,14 @@ export class AtlaspackV3 {
       });
     }
 
-    return new AtlaspackV3(internal);
+    return new AtlaspackV3(internal, napiWorkerPool, isDefaultNapiWorkerPool);
+  }
+
+  end(): void {
+    // If the worker pool was provided to us, don't shut it down, it's up to the provider.
+    if (this._isDefaultNapiWorkerPool) {
+      this._napiWorkerPool.shutdown();
+    }
   }
 
   async buildAssetGraph(): Promise<any> {