fix(platform-server): less aggressive ngServerMode cleanup (#61106)

hybrist · AndrewKushnir · commit 06d6da345f4b · 2025-05-06T09:08:47.000-07:00
Other code may depend on `ngServerMode` and it might have been set globally / via a bundler. Forcing it to `undefined` in those situations can lead to hard debug issues where the only symptom is that "suddenly" browser-specific code paths run on the server and (obviously) break. PR Close #61106
diff --git a/packages/platform-server/src/server.ts b/packages/platform-server/src/server.ts
@@ -116,7 +116,8 @@ function _document(injector: Injector) {
  * @publicApi
  */
 export function platformServer(extraProviders?: StaticProvider[] | undefined): PlatformRef {
-  if (typeof ngServerMode === 'undefined') {
+  const noServerModeSet = typeof ngServerMode === 'undefined';
+  if (noServerModeSet) {
     globalThis['ngServerMode'] = true;
   }
 
@@ -126,9 +127,11 @@ export function platformServer(extraProviders?: StaticProvider[] | undefined): P
     INTERNAL_SERVER_PLATFORM_PROVIDERS,
   )(extraProviders);
 
-  platform.onDestroy(() => {
-    globalThis['ngServerMode'] = undefined;
-  });
+  if (noServerModeSet) {
+    platform.onDestroy(() => {
+      globalThis['ngServerMode'] = undefined;
+    });
+  }
 
   return platform;
 }
diff --git a/packages/platform-server/test/hydration_utils.ts b/packages/platform-server/test/hydration_utils.ts
@@ -253,19 +253,27 @@ export async function ssr(
     enableHydration?: boolean;
   } = {},
 ): Promise<string> {
-  const defaultHtml = DEFAULT_DOCUMENT;
-  const {enableHydration = true, envProviders = [], hydrationFeatures = () => []} = options;
-  const providers = [
-    ...envProviders,
-    provideServerRendering(),
-    enableHydration ? provideClientHydration(...hydrationFeatures()) : [],
-  ];
-
-  const bootstrap = () => bootstrapApplication(component, {providers});
-
-  return renderApplication(bootstrap, {
-    document: options?.doc ?? defaultHtml,
-  });
+  try {
+    // Enter server mode for the duration of this function.
+    globalThis['ngServerMode'] = true;
+
+    const defaultHtml = DEFAULT_DOCUMENT;
+    const {enableHydration = true, envProviders = [], hydrationFeatures = () => []} = options;
+    const providers = [
+      ...envProviders,
+      provideServerRendering(),
+      enableHydration ? provideClientHydration(...hydrationFeatures()) : [],
+    ];
+
+    const bootstrap = () => bootstrapApplication(component, {providers});
+
+    return await renderApplication(bootstrap, {
+      document: options?.doc ?? defaultHtml,
+    });
+  } finally {
+    // Leave server mode so the remaining test is back in "client mode".
+    globalThis['ngServerMode'] = undefined;
+  }
 }
 
 /**
