fixup! fix(@angular/build): scope cache directory by project and builder name

Author: alan-agius4

packages/angular/build/src/builders/dev-server/vite/server.ts

@@ -165,7 +165,10 @@ export async function setupServer(
    */
   const preTransformRequests =
     externalMetadata.explicitBrowser.length === 0 && ssrMode === ServerSsrMode.NoSsr;
-  const cacheDir = serverOptions.cacheOptions.localPath ?? serverOptions.cacheOptions.path;
+  const cacheDir = join(
+    serverOptions.cacheOptions.localPath ?? serverOptions.cacheOptions.path,
+    'vite',
+  );
 
   const configuration: Vite.InlineConfig = {
     configFile: false,

packages/angular/build/src/builders/ng-packagr/builder.ts

@@ -73,7 +73,7 @@ export async function* execute(
   const ngPackagrOptions: NgPackagrOptions = {
     cacheEnabled,
     poll: options.poll,
-    cacheDirectory: join(cacheDirectory, 'ng-packagr'),
+    cacheDirectory: cacheDirectory,
   };
 
   try {

packages/angular/build/src/builders/unit-test/builder.ts

@@ -340,7 +340,7 @@ export async function* execute(
     } satisfies ApplicationBuilderInternalOptions;
 
     const dumpDirectory = normalizedOptions.dumpVirtualFiles
-      ? path.join(normalizedOptions.cacheOptions.path, 'unit-test', 'output-files')
+      ? path.join(normalizedOptions.cacheOptions.path, 'output-files')
       : undefined;
 
     yield* runBuildAndTest(

packages/angular/build/src/utils/normalize-cache.ts

@@ -140,12 +140,13 @@ export function normalizeCacheOptions(
 
   const cacheBasePath = getCacheBasePath(workspaceRoot, path);
   const localCacheBasePath = isAbsolute(path) ? path : resolve(workspaceRoot, path);
+  const normalizedBuilderName = builderName.replaceAll(':', '-');
 
   return {
     enabled: cacheEnabled,
     basePath: cacheBasePath,
-    path: join(cacheBasePath, VERSION, projectName, builderName),
+    path: join(cacheBasePath, VERSION, projectName, normalizedBuilderName),
     localBasePath: localCacheBasePath,
-    localPath: join(localCacheBasePath, VERSION, projectName, builderName),
+    localPath: join(localCacheBasePath, VERSION, projectName, normalizedBuilderName),
   };
 }

packages/angular/build/src/utils/normalize-cache_spec.ts

@@ -275,4 +275,18 @@ describe('normalizeCacheOptions', () => {
       resolve(worktreeRoot, '.angular/cache/0.0.0-PLACEHOLDER/my-app/vite'),
     );
   });
+
+  it('should normalize builderName to avoid invalid path characters', async () => {
+    const workspaceRoot = join(tempDir, 'project');
+    await mkdir(join(workspaceRoot, '.git'), { recursive: true });
+
+    const options = normalizeCacheOptions({}, workspaceRoot, 'my-app', '@angular/build:unit-test');
+
+    expect(options.path).toBe(
+      resolve(workspaceRoot, '.angular/cache/0.0.0-PLACEHOLDER/my-app/@angular/build-unit-test'),
+    );
+    expect(options.localPath).toBe(
+      resolve(workspaceRoot, '.angular/cache/0.0.0-PLACEHOLDER/my-app/@angular/build-unit-test'),
+    );
+  });
 });