From 715fea08c73f9e03ce8273ddf000d02d92e61df9 Mon Sep 17 00:00:00 2001
From: Alan Agius <alanagius@google.com>
Date: Mon, 28 Oct 2024 11:03:59 +0000
Subject: [PATCH] refactor(@angular/build): add handling for `ngServerMode`

Configure esbuild to add `ngServerMode` as define.
---
 .../build/src/tools/esbuild/application-code-bundle.ts     | 7 ++++++-
 .../build_angular/src/tools/webpack/configs/common.ts      | 5 ++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/packages/angular/build/src/tools/esbuild/application-code-bundle.ts b/packages/angular/build/src/tools/esbuild/application-code-bundle.ts
index 05b61a819fa0..6c6eba9ae06a 100644
--- a/packages/angular/build/src/tools/esbuild/application-code-bundle.ts
+++ b/packages/angular/build/src/tools/esbuild/application-code-bundle.ts
@@ -507,8 +507,12 @@ export function createSsrEntryCodeBundleOptions(
 function getEsBuildServerCommonOptions(options: NormalizedApplicationBuildOptions): BuildOptions {
   const isNodePlatform = options.ssrOptions?.platform !== ExperimentalPlatform.Neutral;
 
+  const commonOptons = getEsBuildCommonOptions(options);
+  commonOptons.define ??= {};
+  commonOptons.define['ngServerMode'] = 'true';
+
   return {
-    ...getEsBuildCommonOptions(options),
+    ...commonOptons,
     platform: isNodePlatform ? 'node' : 'neutral',
     outExtension: { '.js': '.mjs' },
     // Note: `es2015` is needed for RxJS v6. If not specified, `module` would
@@ -587,6 +591,7 @@ function getEsBuildCommonOptions(options: NormalizedApplicationBuildOptions): Bu
       // which a constant true value would break.
       ...(optimizationOptions.scripts ? { 'ngDevMode': 'false' } : undefined),
       'ngJitMode': jit ? 'true' : 'false',
+      'ngServerMode': 'false',
     },
     loader: loaderExtensions,
     footer,
diff --git a/packages/angular_devkit/build_angular/src/tools/webpack/configs/common.ts b/packages/angular_devkit/build_angular/src/tools/webpack/configs/common.ts
index 38c4109b0dca..87f6603e06e2 100644
--- a/packages/angular_devkit/build_angular/src/tools/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/tools/webpack/configs/common.ts
@@ -299,7 +299,10 @@ export async function getCommonConfig(wco: WebpackConfigOptions): Promise<Config
   if (scriptsOptimization) {
     extraMinimizers.push(
       new JavaScriptOptimizerPlugin({
-        define: buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER,
+        define: {
+          ...(buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER),
+          'ngServerMode': isPlatformServer,
+        },
         sourcemap: scriptsSourceMap,
         supportedBrowsers: buildOptions.supportedBrowsers,
         keepIdentifierNames: !allowMangle || isPlatformServer,