Skip to content

fix(@angular/ssr): improve route matching for wildcard routes #31685

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
Nov 4, 2025
Merged

fix(@angular/ssr): improve route matching for wildcard routes #31685

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
19 changes: 13 additions & 6 deletions packages/angular/ssr/src/routes/ng-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -251,15 +251,22 @@ async function* traverseRoutesConfig(options: {
const currentRoutePath = joinUrlParts(parentRoute, path);

if (matcher && serverConfigRouteTree) {
let foundMatch = false;
const matches: (RouteTreeNodeMetadata & ServerConfigRouteTreeAdditionalMetadata)[] = [];
for (const matchedMetaData of serverConfigRouteTree.traverse()) {
if (!matchedMetaData.route.startsWith(currentRoutePath)) {
continue;
if (matchedMetaData.route.startsWith(currentRoutePath)) {
matches.push(matchedMetaData);
}
}

foundMatch = true;
matchedMetaData.presentInClientRouter = true;
if (!matches.length) {
const matchedMetaData = serverConfigRouteTree.match(currentRoutePath);
if (matchedMetaData) {
matches.push(matchedMetaData);
}
}

for (const matchedMetaData of matches) {
matchedMetaData.presentInClientRouter = true;
if (matchedMetaData.renderMode === RenderMode.Prerender) {
yield {
error:
Expand All @@ -282,7 +289,7 @@ async function* traverseRoutesConfig(options: {
});
}

if (!foundMatch) {
if (!matches.length) {
yield {
error:
`The route '${stripLeadingSlash(currentRoutePath)}' has a defined matcher but does not ` +
Expand Down
39 changes: 39 additions & 0 deletions packages/angular/ssr/test/routes/ng-routes_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -428,6 +428,45 @@ describe('extractRoutesAndCreateRouteTree', () => {
]);
});

it('should extract routes with a route level matcher captured by "**"', async () => {
setAngularAppTestingManifest(
[
{
path: '',
component: DummyComponent,
},
{
path: 'list',
component: DummyComponent,
},
{
path: 'product',
component: DummyComponent,
children: [
{
matcher: () => null,
component: DummyComponent,
},
],
},
],
[
{ path: 'list', renderMode: RenderMode.Client },
{ path: '', renderMode: RenderMode.Client },
{ path: '**', renderMode: RenderMode.Server },
],
);

const { routeTree, errors } = await extractRoutesAndCreateRouteTree({ url });
expect(errors).toHaveSize(0);
expect(routeTree.toObject()).toEqual([
{ route: '/', renderMode: RenderMode.Client },
{ route: '/list', renderMode: RenderMode.Client },
{ route: '/product', renderMode: RenderMode.Server },
{ route: '/**', renderMode: RenderMode.Server },
]);
});

it('should extract nested redirects that are not explicitly defined.', async () => {
setAngularAppTestingManifest(
[
Expand Down