@atlaspack/core 2.28.0 → 2.29.1

package/CHANGELOG.md

@@ -1,5 +1,57 @@
 # @atlaspack/core
 
+## 2.29.1
+
+### Patch Changes
+
+- [#911](https://github.com/atlassian-labs/atlaspack/pull/911) [`d98c992`](https://github.com/atlassian-labs/atlaspack/commit/d98c992a56121a4f9f6a011ced5e103f96fe3999) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix dist dir when using V3 in dev mode
+
+- Updated dependencies [[`96f1d7f`](https://github.com/atlassian-labs/atlaspack/commit/96f1d7f3efef12ce4f5966e34d00b299fcefb4dd), [`f6fc5e2`](https://github.com/atlassian-labs/atlaspack/commit/f6fc5e2acc30720f9a9676dfbc02bf780066653b), [`91738fd`](https://github.com/atlassian-labs/atlaspack/commit/91738fd77cb6b3b7acc93e799327ec283d27f7c0), [`38f3569`](https://github.com/atlassian-labs/atlaspack/commit/38f3569a7024357c43274666312bc6d024bfe5f9), [`3f6a3b8`](https://github.com/atlassian-labs/atlaspack/commit/3f6a3b8df4589fd4d65c072281c7f33bd37341d6), [`96f1d7f`](https://github.com/atlassian-labs/atlaspack/commit/96f1d7f3efef12ce4f5966e34d00b299fcefb4dd), [`d8024ce`](https://github.com/atlassian-labs/atlaspack/commit/d8024ce5c9ced1a9bc39144c979138be3a12b2fb), [`308e7ff`](https://github.com/atlassian-labs/atlaspack/commit/308e7ff979c05c1ae97fe6b08a65666b53d86cc7), [`d98c992`](https://github.com/atlassian-labs/atlaspack/commit/d98c992a56121a4f9f6a011ced5e103f96fe3999)]:
+  - @atlaspack/rust@3.13.0
+  - @atlaspack/source-map@3.1.2
+  - @atlaspack/feature-flags@2.27.2
+  - @atlaspack/cache@3.2.36
+  - @atlaspack/fs@2.15.36
+  - @atlaspack/logger@2.14.33
+  - @atlaspack/utils@3.2.2
+  - @atlaspack/graph@3.6.3
+  - @atlaspack/package-manager@2.14.41
+  - @atlaspack/profiler@2.15.2
+  - @atlaspack/workers@2.14.41
+  - @atlaspack/plugin@2.14.41
+  - @atlaspack/types@2.15.31
+
+## 2.29.0
+
+### Minor Changes
+
+- [#898](https://github.com/atlassian-labs/atlaspack/pull/898) [`a884bd2`](https://github.com/atlassian-labs/atlaspack/commit/a884bd2a6bd6f37d088fb886dd9b88e85328501b) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add `unstable_alias` feature to .parcelrc V3 builds for configuring build specific aliases
+
+### Patch Changes
+
+- [#899](https://github.com/atlassian-labs/atlaspack/pull/899) [`5710532`](https://github.com/atlassian-labs/atlaspack/commit/57105322b26ce42af2cbfcc0506cff929e50b630) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Fix v3 environment ids not being consistent with v2
+
+- [#901](https://github.com/atlassian-labs/atlaspack/pull/901) [`6fac01d`](https://github.com/atlassian-labs/atlaspack/commit/6fac01dbb1bfc5b971176c1a1c008297bf4b8f91) Thanks [@benjervis](https://github.com/benjervis)! - Makes the serialization and LMDB write steps into separate Promises, so that we can return them separately and parallelise some work.
+
+- [#905](https://github.com/atlassian-labs/atlaspack/pull/905) [`432d571`](https://github.com/atlassian-labs/atlaspack/commit/432d571ea4e9fc67be12304fcafe8c445e844174) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Decrease max V3 JS workers to 4
+
+- [#899](https://github.com/atlassian-labs/atlaspack/pull/899) [`5710532`](https://github.com/atlassian-labs/atlaspack/commit/57105322b26ce42af2cbfcc0506cff929e50b630) Thanks [@mattcompiles](https://github.com/mattcompiles)! - Add HMR and react-refresh support to v3
+
+- Updated dependencies [[`a884bd2`](https://github.com/atlassian-labs/atlaspack/commit/a884bd2a6bd6f37d088fb886dd9b88e85328501b), [`25fee72`](https://github.com/atlassian-labs/atlaspack/commit/25fee723d2228d0482ec8a8f1b8379ccd2977ce7), [`6fac01d`](https://github.com/atlassian-labs/atlaspack/commit/6fac01dbb1bfc5b971176c1a1c008297bf4b8f91), [`2f3af93`](https://github.com/atlassian-labs/atlaspack/commit/2f3af9374bcc082e6f4835f6f5a2b98e32ea45b4), [`432d571`](https://github.com/atlassian-labs/atlaspack/commit/432d571ea4e9fc67be12304fcafe8c445e844174), [`042cd95`](https://github.com/atlassian-labs/atlaspack/commit/042cd95a32ad38cd02d57aa3344c36d4e7ab8f9c), [`28f5424`](https://github.com/atlassian-labs/atlaspack/commit/28f5424f7e2080dd4fbbeb1bc5314a530197a23e), [`a884bd2`](https://github.com/atlassian-labs/atlaspack/commit/a884bd2a6bd6f37d088fb886dd9b88e85328501b), [`5710532`](https://github.com/atlassian-labs/atlaspack/commit/57105322b26ce42af2cbfcc0506cff929e50b630), [`44eb8c3`](https://github.com/atlassian-labs/atlaspack/commit/44eb8c388d3e63f1ef5d835aee7aee5d1bb0620f)]:
+  - @atlaspack/rust@3.12.0
+  - @atlaspack/feature-flags@2.27.1
+  - @atlaspack/cache@3.2.35
+  - @atlaspack/fs@2.15.35
+  - @atlaspack/logger@2.14.32
+  - @atlaspack/source-map@3.1.1
+  - @atlaspack/utils@3.2.1
+  - @atlaspack/graph@3.6.2
+  - @atlaspack/package-manager@2.14.40
+  - @atlaspack/profiler@2.15.1
+  - @atlaspack/workers@2.14.40
+  - @atlaspack/plugin@2.14.40
+  - @atlaspack/types@2.15.30
+
 ## 2.28.0
 
 ### Minor Changes

package/dist/Atlaspack.js

@@ -186,6 +186,7 @@ class Atlaspack {
                 env: resolvedOptions.env,
                 fs: inputFS && new atlaspack_v3_1.FileSystemV3(inputFS),
                 defaultTargetOptions: resolvedOptions.defaultTargetOptions,
+                serveOptions: resolvedOptions.serveOptions,
                 lmdb,
                 featureFlags: resolvedOptions.featureFlags,
             });

package/dist/AtlaspackConfig.schema.js

@@ -97,6 +97,15 @@ exports.default = {
         compressors: mapPipelineSchema('compressor', 'compressors'),
         reporters: pipelineSchema('reporter', 'reporters'),
         runtimes: pipelineSchema('runtime', 'runtimes'),
+        // This isn't currently supported in V2, however we need to allow it to
+        // parse as even V3 builds need the AtlaspackConfigRequest
+        unstable_alias: {
+            type: 'object',
+            properties: {},
+            additionalProperties: {
+                type: 'string',
+            },
+        },
         filePath: {
             type: 'string',
         },

package/dist/atlaspack-v3/AtlaspackV3.js

@@ -48,15 +48,8 @@ class AtlaspackV3 {
             this._napiWorkerPool.shutdown();
         }
     }
-    async buildAssetGraph() {
-        // @ts-expect-error TS2488
-        let [graph, error] = await (0, rust_1.atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
-        if (error !== null) {
-            throw new diagnostic_1.default({
-                diagnostic: error,
-            });
-        }
-        return graph;
+    buildAssetGraph() {
+        return (0, rust_1.atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
     }
     async respondToFsEvents(events) {
         // @ts-expect-error TS2488

package/dist/atlaspack-v3/NapiWorkerPool.js

@@ -29,7 +29,11 @@ class NapiWorkerPool {
         _NapiWorkerPool_napiWorkers.set(this, void 0);
         _NapiWorkerPool_workerCount.set(this, void 0);
         // @ts-expect-error TS2322
-        __classPrivateFieldSet(this, _NapiWorkerPool_workerCount, workerCount ?? ATLASPACK_NAPI_WORKERS ?? (0, rust_1.getAvailableThreads)(), "f");
+        __classPrivateFieldSet(this, _NapiWorkerPool_workerCount, workerCount ??
+            ATLASPACK_NAPI_WORKERS ??
+            // Default to a maximum of 4 workers as performance worsens beyond that
+            // point in most cases
+            Math.min((0, rust_1.getAvailableThreads)(), 4), "f");
         if (!__classPrivateFieldGet(this, _NapiWorkerPool_workerCount, "f")) {
             // TODO use main thread if workerCount is 0
         }

package/dist/requests/AssetGraphRequestRust.js

@@ -22,11 +22,13 @@ function createAssetGraphRequestRust(rustAtlaspack) {
         id: input.name,
         run: async (input) => {
             let options = input.options;
-            let serializedAssetGraph = (await rustAtlaspack.buildAssetGraph());
-            // Newly created nodes
-            serializedAssetGraph.nodes = serializedAssetGraph.nodes.map((node) => JSON.parse(node));
-            // Updated existing nodes
-            serializedAssetGraph.updates = serializedAssetGraph.updates.map((node) => JSON.parse(node));
+            let { assetGraphPromise, commitPromise } = await rustAtlaspack.buildAssetGraph();
+            let [serializedAssetGraph, assetGraphError] = (await assetGraphPromise);
+            if (assetGraphError) {
+                throw new diagnostic_1.default({
+                    diagnostic: assetGraphError,
+                });
+            }
             // Don't reuse a previous asset graph result if Rust didn't have one too
             let prevResult = null;
             if (serializedAssetGraph.hadPreviousGraph) {
@@ -58,6 +60,14 @@ function createAssetGraphRequestRust(rustAtlaspack) {
                 changedAssetsPropagation,
                 previousSymbolPropagationErrors: undefined,
             };
+            let [_commitResult, commitError] = await commitPromise;
+            if (commitError) {
+                throw new diagnostic_1.default({
+                    diagnostic: {
+                        message: 'Error committing asset graph in Rust: ' + commitError.message,
+                    },
+                });
+            }
             await input.api.storeResult(result);
             input.api.invalidateOnBuild();
             return result;
@@ -146,7 +156,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
         ].join(':');
         let envId = envs.get(envKey);
         if (envId == null) {
-            envId = envs.size.toString();
+            envId = (0, Environment_1.getEnvironmentHash)(env);
             envs.set(envKey, envId);
         }
         return envId;
@@ -168,6 +178,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
         let node = isUpdateNode
             ? serializedGraph.updates[index - nodeTypeSwitchoverIndex]
             : serializedGraph.nodes[index];
+        node = JSON.parse(node);
         if (node.type === 'entry') {
             let id = 'entry:' + ++entry;
             graph.addNodeByContentKey(id, {

package/lib/Atlaspack.js

@@ -226,6 +226,7 @@ class Atlaspack {
         env: resolvedOptions.env,
         fs: inputFS && new _atlaspackV.FileSystemV3(inputFS),
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
+        serveOptions: resolvedOptions.serveOptions,
         lmdb,
         featureFlags: resolvedOptions.featureFlags
       });

package/lib/AtlaspackConfig.schema.js

@@ -94,6 +94,15 @@ var _default = exports.default = {
     compressors: mapPipelineSchema('compressor', 'compressors'),
     reporters: pipelineSchema('reporter', 'reporters'),
     runtimes: pipelineSchema('runtime', 'runtimes'),
+    // This isn't currently supported in V2, however we need to allow it to
+    // parse as even V3 builds need the AtlaspackConfigRequest
+    unstable_alias: {
+      type: 'object',
+      properties: {},
+      additionalProperties: {
+        type: 'string'
+      }
+    },
     filePath: {
       type: 'string'
     },

package/lib/atlaspack-v3/AtlaspackV3.js

@@ -69,15 +69,8 @@ class AtlaspackV3 {
       this._napiWorkerPool.shutdown();
     }
   }
-  async buildAssetGraph() {
-    // @ts-expect-error TS2488
-    let [graph, error] = await (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
-    if (error !== null) {
-      throw new (_diagnostic().default)({
-        diagnostic: error
-      });
-    }
-    return graph;
+  buildAssetGraph() {
+    return (0, _rust().atlaspackNapiBuildAssetGraph)(this._atlaspack_napi);
   }
   async respondToFsEvents(events) {
     // @ts-expect-error TS2488

package/lib/atlaspack-v3/NapiWorkerPool.js

@@ -47,7 +47,10 @@ class NapiWorkerPool {
     workerCount: undefined
   }) {
     // @ts-expect-error TS2322
-    this.#workerCount = workerCount ?? ATLASPACK_NAPI_WORKERS ?? (0, _rust().getAvailableThreads)();
+    this.#workerCount = workerCount ?? ATLASPACK_NAPI_WORKERS ??
+    // Default to a maximum of 4 workers as performance worsens beyond that
+    // point in most cases
+    Math.min((0, _rust().getAvailableThreads)(), 4);
     if (!this.#workerCount) {
       // TODO use main thread if workerCount is 0
     }

package/lib/requests/AssetGraphRequestRust.js

@@ -46,13 +46,16 @@ function createAssetGraphRequestRust(rustAtlaspack) {
     id: input.name,
     run: async input => {
       let options = input.options;
-      let serializedAssetGraph = await rustAtlaspack.buildAssetGraph();
-
-      // Newly created nodes
-      serializedAssetGraph.nodes = serializedAssetGraph.nodes.map(node => JSON.parse(node));
-
-      // Updated existing nodes
-      serializedAssetGraph.updates = serializedAssetGraph.updates.map(node => JSON.parse(node));
+      let {
+        assetGraphPromise,
+        commitPromise
+      } = await rustAtlaspack.buildAssetGraph();
+      let [serializedAssetGraph, assetGraphError] = await assetGraphPromise;
+      if (assetGraphError) {
+        throw new (_diagnostic().default)({
+          diagnostic: assetGraphError
+        });
+      }
 
       // Don't reuse a previous asset graph result if Rust didn't have one too
       let prevResult = null;
@@ -91,6 +94,14 @@ function createAssetGraphRequestRust(rustAtlaspack) {
         changedAssetsPropagation,
         previousSymbolPropagationErrors: undefined
       };
+      let [_commitResult, commitError] = await commitPromise;
+      if (commitError) {
+        throw new (_diagnostic().default)({
+          diagnostic: {
+            message: 'Error committing asset graph in Rust: ' + commitError.message
+          }
+        });
+      }
       await input.api.storeResult(result);
       input.api.invalidateOnBuild();
       return result;
@@ -169,7 +180,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
     let envKey = [env.context, env.engines.atlaspack, env.engines.browsers, env.engines.electron, env.engines.node, env.includeNodeModules, env.isLibrary, env.outputFormat, env.shouldScopeHoist, env.shouldOptimize, env.sourceType].join(':');
     let envId = envs.get(envKey);
     if (envId == null) {
-      envId = envs.size.toString();
+      envId = (0, _Environment.getEnvironmentHash)(env);
       envs.set(envKey, envId);
     }
     return envId;
@@ -188,6 +199,7 @@ function getAssetGraph(serializedGraph, prevAssetGraph) {
   for (let index = 0; index < nodesCount; index++) {
     let isUpdateNode = index >= nodeTypeSwitchoverIndex;
     let node = isUpdateNode ? serializedGraph.updates[index - nodeTypeSwitchoverIndex] : serializedGraph.nodes[index];
+    node = JSON.parse(node);
     if (node.type === 'entry') {
       let id = 'entry:' + ++entry;
       graph.addNodeByContentKey(id, {

package/lib/types/AtlaspackConfig.schema.d.ts

@@ -34,6 +34,13 @@ declare const _default: {
         compressors: SchemaEntity;
         reporters: SchemaEntity;
         runtimes: SchemaEntity;
+        unstable_alias: {
+            type: string;
+            properties: {};
+            additionalProperties: {
+                type: string;
+            };
+        };
         filePath: {
             type: string;
         };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atlaspack/core",
-  "version": "2.28.0",
+  "version": "2.29.1",
   "license": "(MIT OR Apache-2.0)",
   "publishConfig": {
     "access": "public"
@@ -24,21 +24,21 @@
   "dependencies": {
     "@mischnic/json-sourcemap": "^0.1.0",
     "@atlaspack/build-cache": "2.13.6",
-    "@atlaspack/cache": "3.2.34",
+    "@atlaspack/cache": "3.2.36",
     "@atlaspack/diagnostic": "2.14.4",
     "@atlaspack/events": "2.14.4",
-    "@atlaspack/feature-flags": "2.27.0",
-    "@atlaspack/fs": "2.15.34",
-    "@atlaspack/graph": "3.6.1",
-    "@atlaspack/logger": "2.14.31",
-    "@atlaspack/package-manager": "2.14.39",
-    "@atlaspack/plugin": "2.14.39",
-    "@atlaspack/profiler": "2.15.0",
-    "@atlaspack/rust": "3.11.0",
-    "@atlaspack/types": "2.15.29",
-    "@atlaspack/utils": "3.2.0",
-    "@atlaspack/workers": "2.14.39",
-    "@atlaspack/source-map": "3.1.0",
+    "@atlaspack/feature-flags": "2.27.2",
+    "@atlaspack/fs": "2.15.36",
+    "@atlaspack/graph": "3.6.3",
+    "@atlaspack/logger": "2.14.33",
+    "@atlaspack/package-manager": "2.14.41",
+    "@atlaspack/plugin": "2.14.41",
+    "@atlaspack/profiler": "2.15.2",
+    "@atlaspack/rust": "3.13.0",
+    "@atlaspack/types": "2.15.31",
+    "@atlaspack/utils": "3.2.2",
+    "@atlaspack/workers": "2.14.41",
+    "@atlaspack/source-map": "3.1.2",
     "base-x": "^3.0.8",
     "browserslist": "^4.6.6",
     "clone": "^2.1.1",

package/src/Atlaspack.ts

@@ -198,6 +198,7 @@ export default class Atlaspack {
         env: resolvedOptions.env,
         fs: inputFS && new FileSystemV3(inputFS),
         defaultTargetOptions: resolvedOptions.defaultTargetOptions,
+        serveOptions: resolvedOptions.serveOptions,
         lmdb,
         featureFlags: resolvedOptions.featureFlags,
       });

package/src/AtlaspackConfig.schema.ts

@@ -107,6 +107,15 @@ export default {
     compressors: mapPipelineSchema('compressor', 'compressors') as SchemaEntity,
     reporters: pipelineSchema('reporter', 'reporters') as SchemaEntity,
     runtimes: pipelineSchema('runtime', 'runtimes') as SchemaEntity,
+    // This isn't currently supported in V2, however we need to allow it to
+    // parse as even V3 builds need the AtlaspackConfigRequest
+    unstable_alias: {
+      type: 'object',
+      properties: {},
+      additionalProperties: {
+        type: 'string',
+      },
+    },
     filePath: {
       type: 'string',
     },

package/src/atlaspack-v3/AtlaspackV3.ts

@@ -91,19 +91,8 @@ export class AtlaspackV3 {
     }
   }
 
-  async buildAssetGraph(): Promise<any> {
-    // @ts-expect-error TS2488
-    let [graph, error] = await atlaspackNapiBuildAssetGraph(
-      this._atlaspack_napi,
-    );
-
-    if (error !== null) {
-      throw new ThrowableDiagnostic({
-        diagnostic: error,
-      });
-    }
-
-    return graph;
+  buildAssetGraph(): Promise<any> {
+    return atlaspackNapiBuildAssetGraph(this._atlaspack_napi) as Promise<any>;
   }
 
   async respondToFsEvents(events: Array<Event>): Promise<boolean> {

package/src/atlaspack-v3/NapiWorkerPool.ts

@@ -23,7 +23,11 @@ export class NapiWorkerPool implements INapiWorkerPool {
   constructor({workerCount}: NapiWorkerPoolOptions = {workerCount: undefined}) {
     // @ts-expect-error TS2322
     this.#workerCount =
-      workerCount ?? ATLASPACK_NAPI_WORKERS ?? getAvailableThreads();
+      workerCount ??
+      ATLASPACK_NAPI_WORKERS ??
+      // Default to a maximum of 4 workers as performance worsens beyond that
+      // point in most cases
+      Math.min(getAvailableThreads(), 4);
     if (!this.#workerCount) {
       // TODO use main thread if workerCount is 0
     }

package/src/requests/AssetGraphRequestRust.ts

@@ -53,18 +53,17 @@ export function createAssetGraphRequestRust(
     id: input.name,
     run: async (input) => {
       let options = input.options;
-      let serializedAssetGraph =
-        (await rustAtlaspack.buildAssetGraph()) as SerializedAssetGraphDelta;
+      let {assetGraphPromise, commitPromise} =
+        await rustAtlaspack.buildAssetGraph();
 
-      // Newly created nodes
-      serializedAssetGraph.nodes = serializedAssetGraph.nodes.map((node) =>
-        JSON.parse(node),
-      );
+      let [serializedAssetGraph, assetGraphError] =
+        (await assetGraphPromise) as [SerializedAssetGraphDelta, Error | null];
 
-      // Updated existing nodes
-      serializedAssetGraph.updates = serializedAssetGraph.updates.map((node) =>
-        JSON.parse(node),
-      );
+      if (assetGraphError) {
+        throw new ThrowableDiagnostic({
+          diagnostic: assetGraphError,
+        });
+      }
 
       // Don't reuse a previous asset graph result if Rust didn't have one too
       let prevResult = null;
@@ -106,6 +105,17 @@ export function createAssetGraphRequestRust(
         previousSymbolPropagationErrors: undefined,
       };
 
+      let [_commitResult, commitError] = await commitPromise;
+
+      if (commitError) {
+        throw new ThrowableDiagnostic({
+          diagnostic: {
+            message:
+              'Error committing asset graph in Rust: ' + commitError.message,
+          },
+        });
+      }
+
       await input.api.storeResult(result);
       input.api.invalidateOnBuild();
 
@@ -213,7 +223,7 @@ export function getAssetGraph(
 
     let envId = envs.get(envKey);
     if (envId == null) {
-      envId = envs.size.toString();
+      envId = getEnvironmentHash(env);
       envs.set(envKey, envId);
     }
 
@@ -242,6 +252,8 @@ export function getAssetGraph(
       ? serializedGraph.updates[index - nodeTypeSwitchoverIndex]
       : serializedGraph.nodes[index];
 
+    node = JSON.parse(node);
+
     if (node.type === 'entry') {
       let id = 'entry:' + ++entry;
 

package/test/AtlaspackConfigRequest.test.ts

@@ -133,7 +133,7 @@ describe('AtlaspackConfigRequest', () => {
         (e: any) => {
           assert.strictEqual(
             e.diagnostics[0].codeFrames[0].codeHighlights[0].message,
-            `Possible values: "$schema", "bundler", "resolvers", "transformers", "validators", "namers", "packagers", "optimizers", "compressors", "reporters", "runtimes", "filePath", "resolveFrom"`,
+            `Possible values: "$schema", "bundler", "resolvers", "transformers", "validators", "namers", "packagers", "optimizers", "compressors", "reporters", "runtimes", "unstable\\_alias", "filePath", "resolveFrom"`,
           );
           return true;
         },