fixup! fix(@angular/build): support incremental asset updates and output cleanup in library watch mode

Author: alan-agius4

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

@@ -276,9 +276,7 @@ export async function buildAction(actionContext: BuildActionContext): Promise<Bu
 
     if (filesToDelete.size > 0) {
       await Promise.allSettled(
-        [...filesToDelete].map((file) =>
-          rm(path.join(options.outputPath, file), { force: true, maxRetries: 3 }),
-        ),
+        [...filesToDelete].map((file) => rm(path.join(options.outputPath, file), { force: true })),
       );
     }
 

packages/angular/build/src/builders/library/pipeline/entry-points_spec.ts

@@ -6,8 +6,7 @@
  * found in the LICENSE file at https://angular.dev/license
  */
 
-import { posix, resolve } from 'node:path';
-import { toPosixPath } from '../../../utils/path';
+import { join, resolve } from 'node:path';
 import type {
   BundleResult,
   NormalizedEntryPoint,
@@ -23,8 +22,8 @@ import {
 } from './entry-points';
 
 describe('entry-points pipeline', () => {
-  const projectRoot = toPosixPath(resolve('/workspace/projects/my-lib'));
-  const packageJsonPath = posix.join(projectRoot, 'package.json');
+  const projectRoot = resolve('/workspace/projects/my-lib');
+  const packageJsonPath = join(projectRoot, 'package.json');
   const packageName = '@my-scope/my-lib';
 
   describe('getEntryPointBundleName', () => {
@@ -77,7 +76,7 @@ describe('entry-points pipeline', () => {
         name: '.',
         displayName: packageName,
         bundleName: 'my-scope-my-lib',
-        entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'src/public-api.ts'),
         isPrimary: true,
       });
     });
@@ -97,7 +96,7 @@ describe('entry-points pipeline', () => {
         name: '.',
         displayName: packageName,
         bundleName: 'my-scope-my-lib',
-        entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'src/public-api.ts'),
         isPrimary: true,
       });
     });
@@ -117,7 +116,7 @@ describe('entry-points pipeline', () => {
         name: '.',
         displayName: packageName,
         bundleName: 'my-scope-my-lib',
-        entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'src/public-api.ts'),
         isPrimary: true,
       });
     });
@@ -137,7 +136,7 @@ describe('entry-points pipeline', () => {
         name: '.',
         displayName: packageName,
         bundleName: 'my-scope-my-lib',
-        entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'src/public-api.ts'),
         isPrimary: true,
       });
     });
@@ -156,11 +155,9 @@ describe('entry-points pipeline', () => {
       );
 
       expect(entryPoints).toHaveSize(2);
-      expect(entryPoints.get('.')?.entryFilePath).toBe(
-        posix.join(projectRoot, 'src/public-api.ts'),
-      );
+      expect(entryPoints.get('.')?.entryFilePath).toBe(join(projectRoot, 'src/public-api.ts'));
       expect(entryPoints.get('testing')?.entryFilePath).toBe(
-        posix.join(projectRoot, 'testing/src/public-api.ts'),
+        join(projectRoot, 'testing/src/public-api.ts'),
       );
     });
 
@@ -186,7 +183,7 @@ describe('entry-points pipeline', () => {
         name: '.',
         displayName: packageName,
         bundleName: 'my-scope-my-lib',
-        entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'src/public-api.ts'),
         isPrimary: true,
       });
 
@@ -196,7 +193,7 @@ describe('entry-points pipeline', () => {
         name: 'testing',
         displayName: `${packageName}/testing`,
         bundleName: 'my-scope-my-lib-testing',
-        entryFilePath: posix.join(projectRoot, 'testing/src/public-api.ts'),
+        entryFilePath: join(projectRoot, 'testing/src/public-api.ts'),
         isPrimary: false,
       });
 
@@ -206,7 +203,7 @@ describe('entry-points pipeline', () => {
         name: 'testing/sub',
         displayName: `${packageName}/testing/sub`,
         bundleName: 'my-scope-my-lib-testing-sub',
-        entryFilePath: posix.join(projectRoot, 'testing/sub/src/public-api.mts'),
+        entryFilePath: join(projectRoot, 'testing/sub/src/public-api.mts'),
         isPrimary: false,
       });
     });
@@ -225,11 +222,9 @@ describe('entry-points pipeline', () => {
       );
 
       expect(entryPoints).toHaveSize(2);
-      expect(entryPoints.get('.')?.entryFilePath).toBe(
-        posix.join(projectRoot, 'src/public-api.ts'),
-      );
+      expect(entryPoints.get('.')?.entryFilePath).toBe(join(projectRoot, 'src/public-api.ts'));
       expect(entryPoints.get('testing')?.entryFilePath).toBe(
-        posix.join(projectRoot, 'testing/src/public-api.ts'),
+        join(projectRoot, 'testing/src/public-api.ts'),
       );
     });
 
@@ -419,7 +414,7 @@ describe('entry-points pipeline', () => {
       name: '.',
       displayName: 'my-lib',
       bundleName: 'my-lib',
-      entryFilePath: posix.join(projectRoot, 'src/public-api.ts'),
+      entryFilePath: join(projectRoot, 'src/public-api.ts'),
       isPrimary: true,
     };
 
@@ -428,7 +423,7 @@ describe('entry-points pipeline', () => {
       name: 'testing',
       displayName: 'my-lib/testing',
       bundleName: 'my-lib-testing',
-      entryFilePath: posix.join(projectRoot, 'testing/src/public-api.ts'),
+      entryFilePath: join(projectRoot, 'testing/src/public-api.ts'),
       isPrimary: false,
     };
 
@@ -452,7 +447,7 @@ describe('entry-points pipeline', () => {
       const mapB = createMap([
         {
           ...primaryEp,
-          entryFilePath: posix.join(projectRoot, 'src/other.ts'),
+          entryFilePath: join(projectRoot, 'src/other.ts'),
         },
       ]);
 
@@ -535,8 +530,8 @@ describe('entry-points pipeline', () => {
       } as unknown as SingleBuildState;
 
       const watchedCompilationFiles = new Set<string>([
-        posix.join(projectRoot, 'src/public-api.ts'),
-        posix.join(projectRoot, 'old-feature/src/public-api.ts'),
+        join(projectRoot, 'src/public-api.ts'),
+        join(projectRoot, 'old-feature/src/public-api.ts'),
       ]);
 
       const newPackageJson: PackageJsonData = {
@@ -560,12 +555,12 @@ describe('entry-points pipeline', () => {
       expect(options.entryPoints.has('old-feature')).toBeFalse();
       expect(buildState.previousBundleResults.has('old-feature')).toBeFalse();
       expect(buildState.previousBundleResults.has('.')).toBeTrue();
-      expect(watchedCompilationFiles.has(posix.join(projectRoot, 'src/public-api.ts'))).toBeTrue();
+      expect(watchedCompilationFiles.has(join(projectRoot, 'src/public-api.ts'))).toBeTrue();
       expect(
-        watchedCompilationFiles.has(posix.join(projectRoot, 'old-feature/src/public-api.ts')),
+        watchedCompilationFiles.has(join(projectRoot, 'old-feature/src/public-api.ts')),
       ).toBeFalse();
       expect(
-        watchedCompilationFiles.has(posix.join(projectRoot, 'new-feature/src/public-api.ts')),
+        watchedCompilationFiles.has(join(projectRoot, 'new-feature/src/public-api.ts')),
       ).toBeTrue();
     });
 
@@ -661,9 +656,9 @@ describe('entry-points pipeline', () => {
       expect(buildState.hasEntryPointsChanges).toBeTrue();
       expect(buildState.previousBundleResults.has('.')).toBeFalse();
       expect(options.entryPoints.get('.')?.entryFilePath).toBe(
-        posix.join(projectRoot, 'src/other-api.ts'),
+        join(projectRoot, 'src/other-api.ts'),
       );
-      expect(watchedCompilationFiles.has(posix.join(projectRoot, 'src/other-api.ts'))).toBeTrue();
+      expect(watchedCompilationFiles.has(join(projectRoot, 'src/other-api.ts'))).toBeTrue();
     });
 
     it('should prune previousBundleResults when an entry point bundleName changes', () => {