From 395e3880c061ad598ff511a161a45e0f24e70f62 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Tue, 7 Jan 2025 09:58:46 +0000
Subject: [PATCH] fix(@angular/build): add asset tracking to application
 builder watch files

This commit updates the application builder to include assets in the watch process, triggering file re-copying when changes are detected.

Closes #28415
---
 .../src/builders/application/execute-build.ts |  4 +-
 .../tests/behavior/rebuild-assets_spec.ts     | 65 +++++++++++++++++++
 2 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 packages/angular/build/src/builders/application/tests/behavior/rebuild-assets_spec.ts

diff --git a/packages/angular/build/src/builders/application/execute-build.ts b/packages/angular/build/src/builders/application/execute-build.ts
index 43cbf41d52a6..657a29c25dea 100644
--- a/packages/angular/build/src/builders/application/execute-build.ts
+++ b/packages/angular/build/src/builders/application/execute-build.ts
@@ -212,7 +212,9 @@ export async function executeBuild(
 
   // Copy assets
   if (assets) {
-    executionResult.addAssets(await resolveAssets(assets, workspaceRoot));
+    const resolvedAssets = await resolveAssets(assets, workspaceRoot);
+    executionResult.addAssets(resolvedAssets);
+    executionResult.extraWatchFiles.push(...resolvedAssets.map(({ source }) => source));
   }
 
   // Extract and write licenses for used packages
diff --git a/packages/angular/build/src/builders/application/tests/behavior/rebuild-assets_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/rebuild-assets_spec.ts
new file mode 100644
index 000000000000..6bf7763d2e4b
--- /dev/null
+++ b/packages/angular/build/src/builders/application/tests/behavior/rebuild-assets_spec.ts
@@ -0,0 +1,65 @@
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.dev/license
+ */
+
+import { concatMap, count, take, timeout } from 'rxjs';
+import { buildApplication } from '../../index';
+import { APPLICATION_BUILDER_INFO, BASE_OPTIONS, describeBuilder } from '../setup';
+
+/**
+ * Maximum time in milliseconds for single build/rebuild
+ * This accounts for CI variability.
+ */
+const BUILD_TIMEOUT = 10_000;
+
+describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
+  describe('Behavior: "Rebuilds when input asset changes"', () => {
+    beforeEach(async () => {
+      // Application code is not needed for styles tests
+      await harness.writeFile('src/main.ts', 'console.log("TEST");');
+      await harness.writeFile('public/asset.txt', 'foo');
+    });
+
+    it('emits updated asset', async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        assets: [
+          {
+            glob: '**/*',
+            input: 'public',
+          },
+        ],
+        watch: true,
+      });
+
+      const buildCount = await harness
+        .execute({ outputLogsOnFailure: false })
+        .pipe(
+          timeout(BUILD_TIMEOUT),
+          concatMap(async ({ result }, index) => {
+            switch (index) {
+              case 0:
+                expect(result?.success).toBeTrue();
+                harness.expectFile('dist/browser/asset.txt').content.toContain('foo');
+
+                await harness.writeFile('public/asset.txt', 'bar');
+                break;
+              case 1:
+                expect(result?.success).toBeTrue();
+                harness.expectFile('dist/browser/asset.txt').content.toContain('bar');
+                break;
+            }
+          }),
+          take(2),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(2);
+    });
+  });
+});