Skip to content

fix(@angular/build): prevent prerendering of catch-all routes #28476

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
merged 1 commit into from
Sep 24, 2024
Merged

fix(@angular/build): prevent prerendering of catch-all routes #28476

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
7 changes: 6 additions & 1 deletion 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 @@ -121,6 +121,12 @@ export async function prerenderPages(
const serializableRouteTreeNodeForPrerender: WritableSerializableRouteTreeNode = [];
for (const metadata of serializableRouteTreeNode) {
if (outputMode !== OutputMode.Static && metadata.redirectTo) {
// Skip redirects if output mode is not static.
continue;
}

if (metadata.route.includes('*')) {
// Skip catch all routes from prerender.
continue;
}

Expand All @@ -129,7 +135,6 @@ export async function prerenderPages(
case RouteRenderMode.Prerender:
case RouteRenderMode.AppShell:
serializableRouteTreeNodeForPrerender.push(metadata);

break;
case RouteRenderMode.Server:
if (outputMode === OutputMode.Static) {
Expand Down
9 changes: 8 additions & 1 deletion tests/legacy-cli/e2e/tests/server-rendering/server-routes-output-mode-static.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { join } from 'node:path';
import { expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
import { expectFileNotToExist, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
import { noSilentNg, silentNg } from '../../utils/process';
import { setupProjectWithSSRAppEngine } from './setup';
import { existsSync } from 'node:fs';
Expand Down Expand Up @@ -36,6 +36,10 @@ export default async function () {
path: 'ssg/:id',
component: SsgWithParamsComponent,
},
{
path: '**',
component: HomeComponent,
},
];
`,
);
Expand Down Expand Up @@ -100,4 +104,7 @@ export default async function () {
!existsSync('dist/test-project/server'),
'Server directory should not exist when output-mode is static',
);

// Should not prerender the catch all
await expectFileNotToExist(join('dist/test-project/browser/**/index.html'));
}