fix(@angular/build): handle redirects from guards during prerendering

alan-agius4 · alan-agius4 · commit 45e498f9576f · 2025-10-28T19:48:12.000Z
During prerendering, if a route returns a redirect, a static HTML page with a meta refresh tag is generated to redirect the user to the specified URL. This now includes support for redirects returned from route guards. Closes #31618 (cherry picked from commit cc16b10)
diff --git a/packages/angular/build/src/utils/server-rendering/prerender.ts b/packages/angular/build/src/utils/server-rendering/prerender.ts
@@ -26,6 +26,7 @@ import {
   WritableSerializableRouteTreeNode,
 } from './models';
 import type { RenderWorkerData } from './render-worker';
+import { generateRedirectStaticPage } from './utils';
 
 type PrerenderOptions = NormalizedApplicationBuildOptions['prerenderOptions'];
 type AppShellOptions = NormalizedApplicationBuildOptions['appShellOptions'];
@@ -380,28 +381,3 @@ function addTrailingSlash(url: string): string {
 function removeLeadingSlash(value: string): string {
   return value[0] === '/' ? value.slice(1) : value;
 }
-
-/**
- * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
- *
- * This function creates a simple HTML page that performs a redirect using a meta tag.
- * It includes a fallback link in case the meta-refresh doesn't work.
- *
- * @param url - The URL to which the page should redirect.
- * @returns The HTML content of the static redirect page.
- */
-function generateRedirectStaticPage(url: string): string {
-  return `
-<!DOCTYPE html>
-<html>
-  <head>
-    <meta charset="utf-8">
-    <title>Redirecting</title>
-    <meta http-equiv="refresh" content="0; url=${url}">
-  </head>
-  <body>
-    <pre>Redirecting to <a href="${url}">${url}</a></pre>
-  </body>
-</html>
-`.trim();
-}
diff --git a/packages/angular/build/src/utils/server-rendering/render-worker.ts b/packages/angular/build/src/utils/server-rendering/render-worker.ts
@@ -12,6 +12,7 @@ import type { ESMInMemoryFileLoaderWorkerData } from './esm-in-memory-loader/loa
 import { patchFetchToLoadInMemoryAssets } from './fetch-patch';
 import { DEFAULT_URL, launchServer } from './launch-server';
 import { loadEsmModuleFromMemory } from './load-esm-from-memory';
+import { generateRedirectStaticPage } from './utils';
 
 export interface RenderWorkerData extends ESMInMemoryFileLoaderWorkerData {
   assetFiles: Record</** Destination */ string, /** Source */ string>;
@@ -48,7 +49,13 @@ async function renderPage({ url }: RenderOptions): Promise<string | null> {
     new Request(new URL(url, serverURL), { signal: AbortSignal.timeout(30_000) }),
   );
 
-  return response ? response.text() : null;
+  if (!response) {
+    return null;
+  }
+
+  const location = response.headers.get('Location');
+
+  return location ? generateRedirectStaticPage(location) : response.text();
 }
 
 async function initialize() {
diff --git a/packages/angular/build/src/utils/server-rendering/utils.ts b/packages/angular/build/src/utils/server-rendering/utils.ts
@@ -19,3 +19,28 @@ export function isSsrRequestHandler(
 ): value is ReturnType<typeof createRequestHandler> {
   return typeof value === 'function' && '__ng_request_handler__' in value;
 }
+
+/**
+ * Generates a static HTML page with a meta refresh tag to redirect the user to a specified URL.
+ *
+ * This function creates a simple HTML page that performs a redirect using a meta tag.
+ * It includes a fallback link in case the meta-refresh doesn't work.
+ *
+ * @param url - The URL to which the page should redirect.
+ * @returns The HTML content of the static redirect page.
+ */
+export function generateRedirectStaticPage(url: string): string {
+  return `
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8">
+    <title>Redirecting</title>
+    <meta http-equiv="refresh" content="0; url=${url}">
+  </head>
+  <body>
+    <pre>Redirecting to <a href="${url}">${url}</a></pre>
+  </body>
+</html>
+`.trim();
+}
diff --git a/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts b/tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts
@@ -29,7 +29,8 @@ export default async function () {
   await writeFile(
     'src/app/app.routes.ts',
     `
-  import { Routes } from '@angular/router';
+  import { inject } from '@angular/core';
+  import { Routes, Router } from '@angular/router';
   import { Home } from './home/home';
   import { Ssg } from './ssg/ssg';
   import { SsgWithParams } from './ssg-with-params/ssg-with-params';
@@ -47,6 +48,12 @@ export default async function () {
       path: 'ssg-redirect',
       redirectTo: 'ssg'
     },
+    {
+      path: 'ssg-redirect-via-guard',
+      canActivate: [() => {
+        return inject(Router).createUrlTree(['ssg'], { queryParams: { foo: 'bar' }})
+      }],
+    },
     {
       path: 'ssg/:id',
       component: SsgWithParams,
@@ -106,8 +113,10 @@ export default async function () {
     'ssg/index.html': /ng-server-context="ssg".+ssg works!/,
     'ssg/one/index.html': /ng-server-context="ssg".+ssg-with-params works!/,
     'ssg/two/index.html': /ng-server-context="ssg".+ssg-with-params works!/,
-    // When static redirects as generated as meta tags.
+    // When static redirects are generated as meta tags.
     'ssg-redirect/index.html': '<meta http-equiv="refresh" content="0; url=/ssg">',
+    'ssg-redirect-via-guard/index.html':
+      '<meta http-equiv="refresh" content="0; url=/ssg?foo=bar">',
   };
 
   for (const [filePath, fileMatch] of Object.entries(expects)) {
