fixup! fix(@angular/build): scope BundlerContext invalidation and cache one-shot bundle results

Author: alan-agius4

packages/angular/build/src/tools/esbuild/bundler-context.ts

@@ -450,11 +450,11 @@ export class BundlerContext {
         ? entryPoints.map((entry) => (typeof entry === 'string' ? entry : entry.in))
         : Object.values(entryPoints);
       for (const entry of entries) {
-        if (!isInternalAngularFile(entry) && !isInternalBundlerFile(entry)) {
-          this.watchFiles.add(
-            isAbsolute(entry) ? normalize(entry) : join(this.workspaceRoot, entry),
-          );
+        if (isInternalAngularFile(entry) || isInternalBundlerFile(entry)) {
+          continue;
         }
+
+        this.watchFiles.add(isAbsolute(entry) ? normalize(entry) : join(this.workspaceRoot, entry));
       }
     }
 
@@ -474,20 +474,22 @@ export class BundlerContext {
 
   async #addLoadCacheFilesToWatch(): Promise<void> {
     const loadCache = this.#loadCache;
-    if (this.incremental && loadCache && this.#loadCacheKeys) {
-      const results = await Promise.all(
-        Array.from(this.#loadCacheKeys, (key) => loadCache.get(key)),
-      );
-      for (const cachedResult of results) {
-        if (cachedResult?.watchFiles) {
-          for (const file of cachedResult.watchFiles) {
-            if (!isInternalAngularFile(file)) {
-              this.watchFiles.add(
-                isAbsolute(file) ? normalize(file) : join(this.workspaceRoot, file),
-              );
-            }
-          }
+    if (!this.incremental || !loadCache || !this.#loadCacheKeys) {
+      return;
+    }
+
+    const results = await Promise.all(Array.from(this.#loadCacheKeys, (key) => loadCache.get(key)));
+    for (const cachedResult of results) {
+      if (!cachedResult?.watchFiles) {
+        continue;
+      }
+
+      for (const file of cachedResult.watchFiles) {
+        if (isInternalAngularFile(file)) {
+          continue;
         }
+
+        this.watchFiles.add(isAbsolute(file) ? normalize(file) : join(this.workspaceRoot, file));
       }
     }
   }

packages/angular/build/src/tools/esbuild/bundler-context_spec.ts

@@ -159,9 +159,8 @@ describe('BundlerContext', () => {
       const resultA2 = await contextA.bundle();
       expect(resultB2).toBe(resultB1);
       expect(resultA2).not.toBe(resultA1);
-      if (!resultA2.errors) {
-        expect(resultA2.outputFiles[0].text).toContain('green');
-      }
+      assert(!resultA2.errors);
+      expect(resultA2.outputFiles[0].text).toContain('green');
     });
 
     it('should work when watchFiles is smaller than changed files', () => {
@@ -217,10 +216,8 @@ describe('BundlerContext', () => {
       expect(context.invalidate([subCssPath])).toBeTrue();
 
       const recoveredResult = await context.bundle();
-      expect(recoveredResult.errors).toBeUndefined();
-      if (!recoveredResult.errors) {
-        expect(recoveredResult.outputFiles[0].text).toContain('purple');
-      }
+      assert(!recoveredResult.errors);
+      expect(recoveredResult.outputFiles[0].text).toContain('purple');
     });
   });
 });