Skip to content

fix(@angular/ssr): handle baseHref that start with ./ #28907

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 21, 2024
Merged

fix(@angular/ssr): handle baseHref that start with ./ #28907

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: 5 additions & 2 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 @@ -421,12 +421,15 @@ export async function getRoutesFromAngularRouterConfig(
const routesResults: RouteTreeNodeMetadata[] = [];
const errors: string[] = [];

const baseHref =
let baseHref =
injector.get(APP_BASE_HREF, null, { optional: true }) ??
injector.get(PlatformLocation).getBaseHrefFromDOM();

const compiler = injector.get(Compiler);
if (baseHref.startsWith('./')) {
baseHref = baseHref.slice(2);
}

const compiler = injector.get(Compiler);
const serverRoutesConfig = injector.get(SERVER_ROUTES_CONFIG, null, { optional: true });
let serverConfigRouteTree: RouteTree<ServerConfigRouteTreeAdditionalMetadata> | undefined;

Expand Down
2 changes: 1 addition & 1 deletion packages/angular/ssr/test/app-engine_spec.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ describe('AngularAppEngine', () => {
setAngularAppTestingManifest(
[{ path: 'home', component: HomeComponent }],
[{ path: '**', renderMode: RenderMode.Server }],
locale,
'/' + locale,
);

return {
Expand Down
20 changes: 20 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 @@ -355,4 +355,24 @@ describe('extractRoutesAndCreateRouteTree', () => {
{ route: '/', renderMode: RenderMode.Server, status: 201 },
]);
});

it(`handles a baseHref starting with a "./" path`, async () => {
setAngularAppTestingManifest(
[{ path: 'home', component: DummyComponent }],
[{ path: '**', renderMode: RenderMode.Server }],
/** baseHref*/ './example',
);

const { routeTree, errors } = await extractRoutesAndCreateRouteTree(
url,
/** manifest */ undefined,
/** invokeGetPrerenderParams */ true,
/** includePrerenderFallbackRoutes */ true,
);

expect(errors).toHaveSize(0);
expect(routeTree.toObject()).toEqual([
{ route: '/example/home', renderMode: RenderMode.Server },
]);
});
});
8 changes: 4 additions & 4 deletions packages/angular/ssr/test/testing-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,12 +21,12 @@ import { ServerRoute, provideServerRoutesConfig } from '../src/routes/route-conf
*
* @param routes - An array of route definitions to be used by the Angular Router.
* @param serverRoutes - An array of ServerRoute definitions to be used for server-side rendering.
* @param [baseHref=''] - An optional base href to be used in the HTML template.
* @param [baseHref='/'] - An optional base href to be used in the HTML template.
*/
export function setAngularAppTestingManifest(
routes: Routes,
serverRoutes: ServerRoute[],
baseHref = '',
baseHref = '/',
additionalServerAssets: Record<string, ServerAsset> = {},
): void {
setAngularAppManifest({
Expand All @@ -40,7 +40,7 @@ export function setAngularAppTestingManifest(
text: async () => `<html>
<head>
<title>SSR page</title>
<base href="/${baseHref}" />
<base href="${baseHref}" />
</head>
<body>
<app-root></app-root>
Expand All @@ -55,7 +55,7 @@ export function setAngularAppTestingManifest(
`<html>
<head>
<title>CSR page</title>
<base href="/${baseHref}" />
<base href="${baseHref}" />
</head>
<body>
<app-root></app-root>
Expand Down