fixup! perf(@angular/build): overlap library asset resolution and deduplicate output mkdir calls

Author: alan-agius4

packages/angular/build/src/builders/library/pipeline/build-action.ts

@@ -71,8 +71,7 @@ export async function buildAction(actionContext: BuildActionContext): Promise<Ex
       return result;
     }
 
-    let collectedAssetsPromise: CollectedAssets | Promise<CollectedAssets> | undefined =
-      actionContext.collectedAssets;
+    let collectedAssets = actionContext.collectedAssets;
     const filesToEmit: OutputFile[] = [];
 
     if (shouldCompileEntryPoints) {
@@ -101,17 +100,10 @@ export async function buildAction(actionContext: BuildActionContext): Promise<Ex
         return result;
       }
 
-      if (!collectedAssetsPromise) {
-        const promise = buildState.collectAssets(options, modifiedFiles);
-        // Prevent unhandled promise rejections if bundling returns early.
-        promise.catch(() => {});
-        collectedAssetsPromise = promise;
-      }
-
       const itemsToBundle = collectEntryPointsToBundle(options, buildState);
       let bundleOutput: BundleEntryPointsOutput;
       try {
-        [bundleOutput] = await Promise.all([
+        [bundleOutput, , collectedAssets] = await Promise.all([
           bundleEntryPoints(
             itemsToBundle,
             esmFiles,
@@ -124,6 +116,7 @@ export async function buildAction(actionContext: BuildActionContext): Promise<Ex
             buildState.previousBundleResults,
           ),
           diagnosePromise,
+          collectedAssets ?? buildState.collectAssets(options, modifiedFiles),
         ]);
       } catch (error) {
         assertIsError(error);
@@ -160,26 +153,17 @@ export async function buildAction(actionContext: BuildActionContext): Promise<Ex
       filesToEmit.push(...manifestFiles);
     }
 
-    const collectedAssets = await (collectedAssetsPromise ??
-      buildState.collectAssets(options, modifiedFiles));
+    collectedAssets ??= await buildState.collectAssets(options, modifiedFiles);
     filesToEmit.push(...collectedAssets.filesToEmit);
 
-    const emitPromise = emitFilesToDisk(filesToEmit, (file) =>
-      path.posix.join(options.outputPath, file.path),
-    );
-
     const filesToDelete = buildState.recordEmittedOutputs(collectedAssets, manifestFiles);
-
     if (filesToDelete.size) {
-      await Promise.all([
-        emitPromise,
-        deleteFilesFromDisk(
-          Array.from(filesToDelete, (file) => path.posix.join(options.outputPath, file)),
-        ),
-      ]);
-    } else {
-      await emitPromise;
+      await deleteFilesFromDisk(
+        Array.from(filesToDelete, (file) => path.posix.join(options.outputPath, file)),
+      );
     }
+
+    await emitFilesToDisk(filesToEmit, (file) => path.posix.join(options.outputPath, file.path));
   } catch (error) {
     assertIsError(error);
     result.addError(error.message);