Skip to content

fix(@angular/ssr): do not throw when router provider is missing #33806

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

Closed
alan-agius4 wants to merge 1 commit into from
+5 −6
Closed

fix(@angular/ssr): do not throw when router provider is missing #33806

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
11 changes: 5 additions & 6 deletions packages/angular/ssr/src/utils/ng.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,7 @@ import { addTrailingSlash, joinUrlParts, stripIndexHtmlFromURL, stripTrailingSla
* - A function that returns a `Promise<ApplicationRef>`, which resolves with the root application reference.
*/
export type AngularBootstrap =
| Type<unknown>
| ((context: BootstrapContext) => Promise<ApplicationRef>);
Type<unknown> | ((context: BootstrapContext) => Promise<ApplicationRef>);

/**
* Renders an Angular application or module to an HTML string.
Expand Down Expand Up @@ -111,13 +110,13 @@ export async function renderAngular(

// TODO(alanagius): Find a way to avoid rendering here especially for redirects as any output will be discarded.
const envInjector = applicationRef.injector;
const routerIsProvided = !!envInjector.get(ActivatedRoute, null);
const router = envInjector.get(Router);
const lastSuccessfulNavigation = router.lastSuccessfulNavigation();
const router = envInjector.get(Router, null, { optional: true });
const routerIsProvided = router !== null && !!envInjector.get(ActivatedRoute, null);
const lastSuccessfulNavigation = router?.lastSuccessfulNavigation();

if (!routerIsProvided) {
hasNavigationError = false;
} else if (lastSuccessfulNavigation?.finalUrl) {
} else if (router && lastSuccessfulNavigation?.finalUrl) {
hasNavigationError = false;

const requestPrefix =
Expand Down