From d345e3218eaa53233fde8ea433143e8e4b43edb6 Mon Sep 17 00:00:00 2001
From: Alan Agius <17563226+alan-agius4@users.noreply.github.com>
Date: Tue, 13 Oct 2026 13:28:36 +0000
Subject: [PATCH] refactor(@angular/build): flatten builderName in cache
 directory path

Strip '@' and replace '/' in addition to ':' when normalizing builderName in normalizeCacheOptions so scoped builder names produce a single flat cache directory instead of nested subdirectories.
---
 packages/angular/build/src/utils/normalize-cache.ts      | 2 +-
 packages/angular/build/src/utils/normalize-cache_spec.ts | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/angular/build/src/utils/normalize-cache.ts b/packages/angular/build/src/utils/normalize-cache.ts
index e24eaf8627c8..bb24f774f79b 100644
--- a/packages/angular/build/src/utils/normalize-cache.ts
+++ b/packages/angular/build/src/utils/normalize-cache.ts
@@ -140,7 +140,7 @@ export function normalizeCacheOptions(
 
   const cacheBasePath = getCacheBasePath(workspaceRoot, path);
   const localCacheBasePath = isAbsolute(path) ? path : resolve(workspaceRoot, path);
-  const normalizedBuilderName = builderName.replaceAll(':', '-');
+  const normalizedBuilderName = builderName.replace('@', '').replaceAll(/[:/]/g, '-');
 
   return {
     enabled: cacheEnabled,
diff --git a/packages/angular/build/src/utils/normalize-cache_spec.ts b/packages/angular/build/src/utils/normalize-cache_spec.ts
index 18e75403756d..1a0520c96a96 100644
--- a/packages/angular/build/src/utils/normalize-cache_spec.ts
+++ b/packages/angular/build/src/utils/normalize-cache_spec.ts
@@ -283,10 +283,10 @@ describe('normalizeCacheOptions', () => {
     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'),
+      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'),
+      resolve(workspaceRoot, '.angular/cache/0.0.0-PLACEHOLDER/my-app/angular-build-unit-test'),
     );
   });
 });