Skip to content

fix(@angular/build): include extracted routes in the manifest during prerendering #29428

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alan-agius4 merged 1 commit into from
Jan 21, 2025
Merged

fix(@angular/build): include extracted routes in the manifest during prerendering #29428

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion packages/angular/build/src/builders/application/execute-post-bundle.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,7 +184,6 @@ export async function executePostBundleSteps(
}

const serializableRouteTreeNodeForManifest: WritableSerializableRouteTreeNode = [];

for (const metadata of serializableRouteTreeNode) {
serializableRouteTreeNodeForManifest.push(metadata);

Expand Down
11 changes: 11 additions & 0 deletions packages/angular/build/src/utils/server-rendering/prerender.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { assertIsError } from '../error';
import { urlJoin } from '../url';
import { WorkerPool } from '../worker-pool';
import { IMPORT_EXEC_ARGV } from './esm-in-memory-loader/utils';
import { SERVER_APP_MANIFEST_FILENAME } from './manifest';
import {
RouteRenderMode,
RoutersExtractorWorkerResult,
Expand Down Expand Up @@ -156,6 +157,16 @@ export async function prerenderPages(
};
}

// Add the extracted routes to the manifest file.
// We could re-generate it from the start, but that would require a number of options to be passed down.
const manifest = outputFilesForWorker[SERVER_APP_MANIFEST_FILENAME];
if (manifest) {
outputFilesForWorker[SERVER_APP_MANIFEST_FILENAME] = manifest.replace(
'routes: undefined,',
`routes: ${JSON.stringify(serializableRouteTreeNodeForPrerender, undefined, 2)},`,
);
}

// Render routes
const { errors: renderingErrors, output } = await renderPages(
baseHref,
Expand Down
10 changes: 5 additions & 5 deletions tests/legacy-cli/e2e/tests/build/server-rendering/server-routes-output-mode-static.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,11 +101,11 @@ export default async function () {
await replaceInFile('src/app/app.routes.server.ts', 'RenderMode.Server', 'RenderMode.Prerender');
await noSilentNg('build', '--output-mode=static');

const expects: Record<string, string> = {
'index.html': 'home works!',
'ssg/index.html': 'ssg works!',
'ssg/one/index.html': 'ssg-with-params works!',
'ssg/two/index.html': 'ssg-with-params works!',
const expects: Record<string, RegExp | string> = {
'index.html': /ng-server-context="ssg".+home works!/,
'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.
'ssg-redirect/index.html': '<meta http-equiv="refresh" content="0; url=/ssg">',
};
Expand Down
Loading