@atlaspack/core 2.18.6-dev.0 → 2.18.7-dev-eae8c193d.0

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @atlaspack/core
 
+## 2.18.6
+
+### Patch Changes
+
+- [#655](https://github.com/atlassian-labs/atlaspack/pull/655) [`5ded263`](https://github.com/atlassian-labs/atlaspack/commit/5ded263c7f11b866e8885b81c73e20dd060b25be) Thanks [@yamadapc](https://github.com/yamadapc)! - Clean-up inline requires multi-threading feature-flag
+
+- [#658](https://github.com/atlassian-labs/atlaspack/pull/658) [`74fd942`](https://github.com/atlassian-labs/atlaspack/commit/74fd94236ac697207082c4b755b079e56f5564fb) Thanks [@yamadapc](https://github.com/yamadapc)! - Fix environment deduplication issues
+
+- Updated dependencies [[`5ded263`](https://github.com/atlassian-labs/atlaspack/commit/5ded263c7f11b866e8885b81c73e20dd060b25be)]:
+  - @atlaspack/feature-flags@2.18.3
+  - @atlaspack/cache@3.2.10
+  - @atlaspack/fs@2.15.10
+  - @atlaspack/graph@3.5.5
+  - @atlaspack/utils@2.15.3
+  - @atlaspack/package-manager@2.14.15
+  - @atlaspack/profiler@2.14.13
+  - @atlaspack/types@2.15.5
+  - @atlaspack/workers@2.14.15
+  - @atlaspack/plugin@2.14.15
+
 ## 2.18.5
 
 ### Patch Changes

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);
@@ -395,6 +400,11 @@ class Atlaspack {
       }
       if (options.shouldTrace) {
         _profiler().tracer.enable();
+        // We need to ensure the tracer is disabled when Atlaspack is disposed as it is a module level object.
+        // While rare (except for tests), if another instance is created later it should not have tracing enabled.
+        this.#disposable.add(() => {
+          _profiler().tracer.disable();
+        });
       }
       await this.#reporterRunner.report({
         type: 'buildStart'

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.18.6-dev.0",
+  "version": "2.18.7-dev-eae8c193d.0",
   "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.4-dev.0",
-    "@atlaspack/cache": "3.2.10-dev.0",
-    "@atlaspack/diagnostic": "2.14.2-dev.0",
-    "@atlaspack/events": "2.14.2-dev.0",
-    "@atlaspack/feature-flags": "2.18.3-dev.0",
-    "@atlaspack/fs": "2.15.10-dev.0",
-    "@atlaspack/graph": "3.5.5-dev.0",
-    "@atlaspack/logger": "2.14.12-dev.0",
-    "@atlaspack/package-manager": "2.14.15-dev.0",
-    "@atlaspack/plugin": "2.14.15-dev.0",
-    "@atlaspack/profiler": "2.14.13-dev.0",
-    "@atlaspack/rust": "3.3.6-dev.0",
-    "@atlaspack/types": "2.15.5-dev.0",
-    "@atlaspack/utils": "2.15.3-dev.0",
-    "@atlaspack/workers": "2.14.15-dev.0",
+    "@atlaspack/build-cache": "2.13.4-dev-eae8c193d.0",
+    "@atlaspack/cache": "3.2.11-dev-eae8c193d.0",
+    "@atlaspack/diagnostic": "2.14.2-dev-eae8c193d.0",
+    "@atlaspack/events": "2.14.2-dev-eae8c193d.0",
+    "@atlaspack/feature-flags": "2.18.4-dev-eae8c193d.0",
+    "@atlaspack/fs": "2.15.11-dev-eae8c193d.0",
+    "@atlaspack/graph": "3.5.6-dev-eae8c193d.0",
+    "@atlaspack/logger": "2.14.12-dev-eae8c193d.0",
+    "@atlaspack/package-manager": "2.14.16-dev-eae8c193d.0",
+    "@atlaspack/plugin": "2.14.16-dev-eae8c193d.0",
+    "@atlaspack/profiler": "2.14.14-dev-eae8c193d.0",
+    "@atlaspack/rust": "3.3.6-dev-eae8c193d.0",
+    "@atlaspack/types": "2.15.6-dev-eae8c193d.0",
+    "@atlaspack/utils": "2.15.4-dev-eae8c193d.0",
+    "@atlaspack/workers": "2.14.16-dev-eae8c193d.0",
     "@mischnic/json-sourcemap": "^0.1.0",
     "@parcel/source-map": "^2.1.1",
     "base-x": "^3.0.8",
@@ -49,7 +49,7 @@
     "semver": "^7.5.2"
   },
   "devDependencies": {
-    "@atlaspack/babel-register": "2.14.2-dev.0",
+    "@atlaspack/babel-register": "2.14.2-dev-eae8c193d.0",
     "@types/node": ">= 18",
     "graphviz": "^0.0.9",
     "jest-diff": "*",
@@ -60,5 +60,5 @@
     "./src/serializerCore.js": "./src/serializerCore.browser.js"
   },
   "type": "commonjs",
-  "gitHead": "6ce3565fe038caf52c09fad4e48175829b174571"
+  "gitHead": "eae8c193d1b12309f6377859a2da6a352b329f3d"
 }

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);
 
@@ -386,6 +392,11 @@ export default class Atlaspack {
       }
       if (options.shouldTrace) {
         tracer.enable();
+        // We need to ensure the tracer is disabled when Atlaspack is disposed as it is a module level object.
+        // While rare (except for tests), if another instance is created later it should not have tracing enabled.
+        this.#disposable.add(() => {
+          tracer.disable();
+        });
       }
       await this.#reporterRunner.report({
         type: 'buildStart',

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> {

package/test/RequestTracker.test.js

@@ -24,9 +24,13 @@ const options = {
   ...DEFAULT_OPTIONS,
   cache: new LMDBLiteCache(DEFAULT_OPTIONS.cacheDir),
 };
-const farm = new WorkerFarm({workerPath: require.resolve('../src/worker')});
 
 describe('RequestTracker', () => {
+  let farm;
+  before(() => {
+    farm = new WorkerFarm({workerPath: require.resolve('../src/worker')});
+  });
+
   beforeEach(async () => {
     await options.cache.ensure();
 
@@ -35,6 +39,10 @@ describe('RequestTracker', () => {
     }
   });
 
+  after(() => {
+    farm.end();
+  });
+
   it('should not run requests that have not been invalidated', async () => {
     let tracker = new RequestTracker({farm, options});
     await tracker.runRequest({

package/test/requests/ConfigRequest.test.js

@@ -23,15 +23,23 @@ const mockCast = (f: any): any => f;
 
 describe('ConfigRequest tests', () => {
   const projectRoot = 'project_root';
-  const farm = new WorkerFarm({
-    workerPath: require.resolve('../../src/worker'),
-    maxConcurrentWorkers: 1,
+  let farm;
+  let fs;
+  before(() => {
+    farm = new WorkerFarm({
+      workerPath: require.resolve('../../src/worker'),
+      maxConcurrentWorkers: 1,
+    });
   });
-  let fs = new MemoryFS(farm);
+
   beforeEach(() => {
     fs = new MemoryFS(farm);
   });
 
+  after(() => {
+    farm.end();
+  });
+
   const getMockRunApi = (
     options: mixed = {projectRoot, inputFS: fs},
   ): RunAPI<ConfigRequestResult> => {