fix(router): handle unhandled promise rejections with ErrorHandler

packages/router/src/navigation_transition.ts

@@ -6,7 +6,7 @@
  * found in the LICENSE file at https://angular.io/license
  */
 
-import {EnvironmentInjector, inject, Injectable, Type} from '@angular/core';
+import {EnvironmentInjector, ErrorHandler as ErrorHandlerClass, inject, Injectable, Type} from '@angular/core';
 import {BehaviorSubject, combineLatest, EMPTY, Observable, of, Subject} from 'rxjs';
 import {catchError, defaultIfEmpty, filter, finalize, map, switchMap, take, tap} from 'rxjs/operators';
 
@@ -293,6 +293,8 @@ export class NavigationTransitions {
   private readonly urlSerializer = inject(UrlSerializer);
   private readonly rootContexts = inject(ChildrenOutletContexts);
   private readonly inputBindingEnabled = inject(INPUT_BINDER, {optional: true}) !== null;
+
+  private readonly errorHandler = inject(ErrorHandlerClass);
   navigationId = 0;
   get hasRequestedNavigation() {
     return this.navigationId !== 0;
@@ -727,11 +729,15 @@ export class NavigationTransitions {
                                      isBrowserTriggeredNavigation(overallTransitionState.source)
                                };
 
-                               router.scheduleNavigation(
-                                   mergedTree, IMPERATIVE_NAVIGATION, null, extras, {
-                                     resolve: overallTransitionState.resolve,
-                                     reject: overallTransitionState.reject,
-                                     promise: overallTransitionState.promise
+                               router
+                                   .scheduleNavigation(
+                                       mergedTree, IMPERATIVE_NAVIGATION, null, extras, {
+                                         resolve: overallTransitionState.resolve,
+                                         reject: overallTransitionState.reject,
+                                         promise: overallTransitionState.promise
+                                       })
+                                   .catch(e => {
+                                     this.errorHandler.handleError(e);
                                    });
                              }
 

packages/router/src/router.ts

@@ -7,7 +7,7 @@
  */
 
 import {Location} from '@angular/common';
-import {inject, Injectable, NgZone, Type, ɵConsole as Console, ɵInitialRenderPendingTasks as InitialRenderPendingTasks, ɵRuntimeError as RuntimeError} from '@angular/core';
+import {ErrorHandler, inject, Injectable, NgZone, Type, ɵConsole as Console, ɵInitialRenderPendingTasks as InitialRenderPendingTasks, ɵRuntimeError as RuntimeError} from '@angular/core';
 import {Observable, of, SubscriptionLike} from 'rxjs';
 
 import {createSegmentGroupFromRoute, createUrlTreeFromSegmentGroup} from './create_url_tree';
@@ -159,6 +159,8 @@ export class Router {
     return (this.location.getState() as RestoredState | null)?.ɵrouterPageId;
   }
   private console = inject(Console);
+
+  private errorHandlerInstance = inject(ErrorHandler);
   private isNgZoneEnabled: boolean = false;
 
   /**
@@ -389,7 +391,7 @@ export class Router {
    * the Router needs to respond to ensure its internal state matches.
    */
   private navigateToSyncWithBrowser(
-      url: string, source: NavigationTrigger, state: RestoredState|undefined) {
+      url: string, source: NavigationTrigger, state: RestoredState|undefined): void {
     const extras: NavigationExtras = {replaceUrl: true};
 
     // TODO: restoredState should always include the entire state, regardless
@@ -414,7 +416,9 @@ export class Router {
     }
 
     const urlTree = this.parseUrl(url);
-    this.scheduleNavigation(urlTree, source, restoredState, extras);
+    this.scheduleNavigation(urlTree, source, restoredState, extras).catch(e => {
+      this.errorHandlerInstance.handleError(e);
+    });
   }
 
   /** The current URL. */

packages/router/test/computed_state_restoration.spec.ts

@@ -431,10 +431,9 @@ describe('`restoredState#ɵrouterPageId`', () => {
 
          TestBed.inject(ThrowingCanActivateGuard).throw = true;
 
-         expect(() => {
-           location.back();
-           advance(fixture);
-         }).toThrow();
+         location.back();
+         advance(fixture);
+
          expect(location.path()).toEqual('/second');
          expect(location.getState()).toEqual(jasmine.objectContaining({ɵrouterPageId: 2}));