From f8b092711481a5754ea93bce65d706d261873810 Mon Sep 17 00:00:00 2001
From: Charles Lyding <19598772+clydin@users.noreply.github.com>
Date: Mon, 5 Aug 2024 12:16:46 -0400
Subject: [PATCH] fix(@angular/build): allow explicitly disabling TypeScript
 incremental mode

If the TypeScript `incremental` option is explicitly set to `false`, the
`application` builder will no longer attempt to enable and use incremental
compilation mode via stored TypeScript build file information. This prevents
an potential build time error that would otherwise occur due to the `tsBuildInfoFile`
option being set without the `incremental` option.
Behavior remains the same if the option is not present or set to `true`.

(cherry picked from commit 182ecbd18817679b27441ffef2431f92910b592f)
---
 .../behavior/typescript-incremental_spec.ts   | 32 +++++++++++++++++++
 .../tools/esbuild/angular/compiler-plugin.ts  | 13 +++++---
 2 files changed, 40 insertions(+), 5 deletions(-)
 create mode 100644 packages/angular/build/src/builders/application/tests/behavior/typescript-incremental_spec.ts

diff --git a/packages/angular/build/src/builders/application/tests/behavior/typescript-incremental_spec.ts b/packages/angular/build/src/builders/application/tests/behavior/typescript-incremental_spec.ts
new file mode 100644
index 000000000000..2c73e66d9f8b
--- /dev/null
+++ b/packages/angular/build/src/builders/application/tests/behavior/typescript-incremental_spec.ts
@@ -0,0 +1,32 @@
+/**
+ * @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.io/license
+ */
+
+import { buildApplication } from '../../index';
+import { APPLICATION_BUILDER_INFO, BASE_OPTIONS, describeBuilder } from '../setup';
+
+describeBuilder(buildApplication, APPLICATION_BUILDER_INFO, (harness) => {
+  describe('Behavior: "TypeScript explicit incremental option usage"', () => {
+    it('should successfully build with incremental disabled', async () => {
+      // Disable tsconfig incremental option in tsconfig
+      await harness.modifyFile('tsconfig.json', (content) => {
+        const tsconfig = JSON.parse(content);
+        tsconfig.compilerOptions.incremental = false;
+
+        return JSON.stringify(tsconfig);
+      });
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+    });
+  });
+});
diff --git a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
index ec76cc2c7a8e..a992a199c1cb 100644
--- a/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
+++ b/packages/angular/build/src/tools/esbuild/angular/compiler-plugin.ts
@@ -284,7 +284,7 @@ export function createCompilerPlugin(
             location: null,
             notes: [
               {
-                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
                 location: null,
               },
             ],
@@ -315,7 +315,7 @@ export function createCompilerPlugin(
             location: null,
             notes: [
               {
-                text: error instanceof Error ? error.stack ?? error.message : `${error}`,
+                text: error instanceof Error ? (error.stack ?? error.message) : `${error}`,
                 location: null,
               },
             ],
@@ -537,9 +537,12 @@ function createCompilerOptionsTransformer(
       compilerOptions.compilationMode = 'full';
     }
 
-    // Enable incremental compilation by default if caching is enabled
-    if (pluginOptions.sourceFileCache?.persistentCachePath) {
-      compilerOptions.incremental ??= true;
+    // Enable incremental compilation by default if caching is enabled and incremental is not explicitly disabled
+    if (
+      compilerOptions.incremental !== false &&
+      pluginOptions.sourceFileCache?.persistentCachePath
+    ) {
+      compilerOptions.incremental = true;
       // Set the build info file location to the configured cache directory
       compilerOptions.tsBuildInfoFile = path.join(
         pluginOptions.sourceFileCache?.persistentCachePath,