@angular/router 22.0.0-next.1 → 22.0.0-next.10

package/fesm2022/_router-chunk.mjs

@@ -1,12 +1,12 @@
 /**
- * @license Angular v22.0.0-next.1
+ * @license Angular v22.0.0-next.10
  * (c) 2010-2026 Google LLC. https://angular.dev/
  * License: MIT
  */
 
 import { DOCUMENT, Location } from '@angular/common';
 import * as i0 from '@angular/core';
-import { ɵisPromise as _isPromise, computed, ɵRuntimeError as _RuntimeError, Injectable, InjectionToken, EventEmitter, input, inject, ViewContainerRef, ChangeDetectorRef, Directive, Input, Output, reflectComponentType, Component, runInInjectionContext, ɵisInjectable as _isInjectable, ɵisNgModule as _isNgModule, isStandalone, createEnvironmentInjector, Compiler, NgModuleFactory, ɵresolveComponentResources as _resolveComponentResources, afterNextRender, signal, EnvironmentInjector, DestroyRef, untracked, ɵConsole as _Console, ɵPendingTasksInternal as _PendingTasksInternal, ɵINTERNAL_APPLICATION_ERROR_HANDLER as _INTERNAL_APPLICATION_ERROR_HANDLER, ɵformatRuntimeError as _formatRuntimeError } from '@angular/core';
+import { ɵisPromise as _isPromise, ɵRuntimeError as _RuntimeError, computed, Injectable, InjectionToken, EventEmitter, input, inject, ViewContainerRef, ChangeDetectorRef, Output, Input, Directive, reflectComponentType, ChangeDetectionStrategy, Component, runInInjectionContext, ɵisInjectable as _isInjectable, ɵisNgModule as _isNgModule, isStandalone, createEnvironmentInjector, Compiler, NgModuleFactory, ɵresolveComponentResources as _resolveComponentResources, afterNextRender, signal, EnvironmentInjector, DestroyRef, untracked, ɵConsole as _Console, ɵPendingTasksInternal as _PendingTasksInternal, ɵINTERNAL_APPLICATION_ERROR_HANDLER as _INTERNAL_APPLICATION_ERROR_HANDLER, ɵformatRuntimeError as _formatRuntimeError } from '@angular/core';
 import { isObservable, from, of, BehaviorSubject, combineLatest, EmptyError, Observable, concat, defer, pipe, EMPTY, throwError, Subject, Subscription } from 'rxjs';
 import { first, map, switchMap, take, startWith, filter, takeUntil, mergeMap, concatMap, tap, takeLast, catchError, finalize } from 'rxjs/operators';
 import * as i1 from '@angular/platform-browser';
@@ -327,7 +327,7 @@ function mapChildrenIntoArray(segment, fn) {
 class UrlSerializer {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: UrlSerializer,
     deps: [],
@@ -335,7 +335,7 @@ class UrlSerializer {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: UrlSerializer,
     providedIn: 'root',
@@ -344,7 +344,7 @@ class UrlSerializer {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: UrlSerializer,
   decorators: [{
@@ -455,7 +455,7 @@ class UrlParser {
     this.remaining = url;
   }
   parseRootSegment() {
-    this.consumeOptional('/');
+    while (this.consumeOptional('/')) {}
     if (this.remaining === '' || this.peekStartsWith('?') || this.peekStartsWith('#')) {
       return new UrlSegmentGroup([], {});
     }
@@ -1301,7 +1301,7 @@ class ChildrenOutletContexts {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: ChildrenOutletContexts,
     deps: [{
@@ -1311,7 +1311,7 @@ class ChildrenOutletContexts {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: ChildrenOutletContexts,
     providedIn: 'root'
@@ -1319,7 +1319,7 @@ class ChildrenOutletContexts {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: ChildrenOutletContexts,
   decorators: [{
@@ -1496,7 +1496,8 @@ class ActivatedRoute {
     return this.snapshot ? this.snapshot.toString() : `Future(${this._futureSnapshot})`;
   }
 }
-function getInherited(route, parent, paramsInheritanceStrategy = 'emptyOnly') {
+const DEFAULT_PARAMS_INHERITANCE_STRATEGY = 'always';
+function getInherited(route, parent, paramsInheritanceStrategy) {
   let inherited;
   const {
     routeConfig
@@ -1776,7 +1777,7 @@ class RouterOutlet {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RouterOutlet,
     deps: [],
@@ -1784,7 +1785,7 @@ class RouterOutlet {
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
     minVersion: "17.1.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     type: RouterOutlet,
     isStandalone: true,
     selector: "router-outlet",
@@ -1817,7 +1818,7 @@ class RouterOutlet {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: RouterOutlet,
   decorators: [{
@@ -1883,7 +1884,12 @@ class OutletInjector {
 }
 const INPUT_BINDER = new InjectionToken(typeof ngDevMode !== 'undefined' && ngDevMode ? 'Router Input Binder' : '');
 class RoutedComponentInputBinder {
+  options;
   outletDataSubscriptions = new Map();
+  constructor(options) {
+    this.options = options;
+    this.options.queryParams ??= true;
+  }
   bindActivatedRouteToOutletComponent(outlet) {
     this.unsubscribeFromRouteData(outlet);
     this.subscribeToRouteData(outlet);
@@ -1896,7 +1902,7 @@ class RoutedComponentInputBinder {
     const {
       activatedRoute
     } = outlet;
-    const dataSubscription = combineLatest([activatedRoute.queryParams, activatedRoute.params, activatedRoute.data]).pipe(switchMap(([queryParams, params, data], index) => {
+    const dataSubscription = combineLatest([this.options.queryParams ? activatedRoute.queryParams : of({}), activatedRoute.params, activatedRoute.data]).pipe(switchMap(([queryParams, params, data], index) => {
       data = {
         ...queryParams,
         ...params,
@@ -1926,33 +1932,36 @@ class RoutedComponentInputBinder {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RoutedComponentInputBinder,
-    deps: [],
+    deps: "invalid",
     target: i0.ɵɵFactoryTarget.Injectable
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RoutedComponentInputBinder
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: RoutedComponentInputBinder,
   decorators: [{
     type: Injectable
+  }],
+  ctorParameters: () => [{
+    type: undefined
   }]
 });
 
 class ɵEmptyOutletComponent {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: ɵEmptyOutletComponent,
     deps: [],
@@ -1960,7 +1969,7 @@ class ɵEmptyOutletComponent {
   });
   static ɵcmp = i0.ɵɵngDeclareComponent({
     minVersion: "14.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     type: ɵEmptyOutletComponent,
     isStandalone: true,
     selector: "ng-component",
@@ -1975,12 +1984,13 @@ class ɵEmptyOutletComponent {
       inputs: ["name", "routerOutletData"],
       outputs: ["activate", "deactivate", "attach", "detach"],
       exportAs: ["outlet"]
-    }]
+    }],
+    changeDetection: i0.ChangeDetectionStrategy.Eager
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: ɵEmptyOutletComponent,
   decorators: [{
@@ -1988,7 +1998,8 @@ i0.ɵɵngDeclareClassMetadata({
     args: [{
       template: `<router-outlet />`,
       imports: [RouterOutlet],
-      exportAs: 'emptyRouterOutlet'
+      exportAs: 'emptyRouterOutlet',
+      changeDetection: ChangeDetectionStrategy.Eager
     }]
   }]
 });
@@ -2821,8 +2832,8 @@ function match(segmentGroup, route, segments) {
     positionalParamSegments: res.posParams ?? {}
   };
 }
-function split(segmentGroup, consumedSegments, slicedSegments, config) {
-  if (slicedSegments.length > 0 && containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, config)) {
+function split(segmentGroup, consumedSegments, slicedSegments, config, outlet) {
+  if (slicedSegments.length > 0 && containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, config, outlet)) {
     const s = new UrlSegmentGroup(consumedSegments, createChildrenForEmptyPaths(config, new UrlSegmentGroup(slicedSegments, segmentGroup.children)));
     return {
       segmentGroup: s,
@@ -2866,8 +2877,15 @@ function createChildrenForEmptyPaths(routes, primarySegment) {
   }
   return res;
 }
-function containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, routes) {
-  return routes.some(r => emptyPathMatch(segmentGroup, slicedSegments, r) && getOutlet(r) !== PRIMARY_OUTLET);
+function containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, routes, outlet) {
+  return routes.some(r => {
+    const matchesEmpty = emptyPathMatch(segmentGroup, slicedSegments, r);
+    if (!matchesEmpty) return false;
+    const isNamedOutlet = getOutlet(r) !== PRIMARY_OUTLET;
+    if (!isNamedOutlet) return false;
+    const isSelfEvaluating = outlet !== undefined && getOutlet(r) === outlet;
+    return !isSelfEvaluating;
+  });
 }
 function containsEmptyPathMatches(segmentGroup, slicedSegments, routes) {
   return routes.some(r => emptyPathMatch(segmentGroup, slicedSegments, r));
@@ -2883,7 +2901,7 @@ function noLeftoversInUrl(segmentGroup, segments, outlet) {
 }
 
 class NoLeftoversInUrl {}
-async function recognize$1(injector, configLoader, rootComponentType, config, urlTree, urlSerializer, paramsInheritanceStrategy = 'emptyOnly', abortSignal) {
+async function recognize$1(injector, configLoader, rootComponentType, config, urlTree, urlSerializer, paramsInheritanceStrategy, abortSignal) {
   return new Recognizer(injector, configLoader, rootComponentType, config, urlTree, paramsInheritanceStrategy, urlSerializer, abortSignal).recognize();
 }
 const MAX_ALLOWED_REDIRECTS = 31;
@@ -3069,7 +3087,7 @@ class Recognizer {
     const {
       segmentGroup,
       slicedSegments
-    } = split(rawSegment, consumedSegments, remainingSegments, childConfig);
+    } = split(rawSegment, consumedSegments, remainingSegments, childConfig, outlet);
     if (slicedSegments.length === 0 && segmentGroup.hasChildren()) {
       const children = await this.processChildren(childInjector, childConfig, segmentGroup, snapshot);
       return new TreeNode(snapshot, children);
@@ -3283,7 +3301,7 @@ class TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: TitleStrategy,
     deps: [],
@@ -3291,7 +3309,7 @@ class TitleStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: TitleStrategy,
     providedIn: 'root',
@@ -3300,7 +3318,7 @@ class TitleStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: TitleStrategy,
   decorators: [{
@@ -3325,7 +3343,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultTitleStrategy,
     deps: [{
@@ -3335,7 +3353,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultTitleStrategy,
     providedIn: 'root'
@@ -3343,7 +3361,7 @@ class DefaultTitleStrategy extends TitleStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: DefaultTitleStrategy,
   decorators: [{
@@ -3422,7 +3440,7 @@ class RouterConfigLoader {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RouterConfigLoader,
     deps: [],
@@ -3430,7 +3448,7 @@ class RouterConfigLoader {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RouterConfigLoader,
     providedIn: 'root'
@@ -3438,7 +3456,7 @@ class RouterConfigLoader {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: RouterConfigLoader,
   decorators: [{
@@ -3503,7 +3521,7 @@ async function maybeResolveResources(value) {
 class UrlHandlingStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: UrlHandlingStrategy,
     deps: [],
@@ -3511,7 +3529,7 @@ class UrlHandlingStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: UrlHandlingStrategy,
     providedIn: 'root',
@@ -3520,7 +3538,7 @@ class UrlHandlingStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: UrlHandlingStrategy,
   decorators: [{
@@ -3543,7 +3561,7 @@ class DefaultUrlHandlingStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultUrlHandlingStrategy,
     deps: [],
@@ -3551,7 +3569,7 @@ class DefaultUrlHandlingStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultUrlHandlingStrategy,
     providedIn: 'root'
@@ -3559,7 +3577,7 @@ class DefaultUrlHandlingStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: DefaultUrlHandlingStrategy,
   decorators: [{
@@ -3652,7 +3670,7 @@ class NavigationTransitions {
   options = inject(ROUTER_CONFIGURATION, {
     optional: true
   }) || {};
-  paramsInheritanceStrategy = this.options.paramsInheritanceStrategy || 'emptyOnly';
+  paramsInheritanceStrategy = this.options.paramsInheritanceStrategy || DEFAULT_PARAMS_INHERITANCE_STRATEGY;
   urlHandlingStrategy = inject(UrlHandlingStrategy);
   createViewTransition = inject(CREATE_VIEW_TRANSITION, {
     optional: true
@@ -3958,7 +3976,7 @@ class NavigationTransitions {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: NavigationTransitions,
     deps: [],
@@ -3966,7 +3984,7 @@ class NavigationTransitions {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: NavigationTransitions,
     providedIn: 'root'
@@ -3974,7 +3992,7 @@ class NavigationTransitions {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: NavigationTransitions,
   decorators: [{
@@ -4047,7 +4065,7 @@ function destroyDetachedRouteHandle(handle) {
 class RouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RouteReuseStrategy,
     deps: [],
@@ -4055,7 +4073,7 @@ class RouteReuseStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: RouteReuseStrategy,
     providedIn: 'root',
@@ -4064,7 +4082,7 @@ class RouteReuseStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: RouteReuseStrategy,
   decorators: [{
@@ -4096,7 +4114,7 @@ class BaseRouteReuseStrategy {
 class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultRouteReuseStrategy,
     deps: null,
@@ -4104,7 +4122,7 @@ class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: DefaultRouteReuseStrategy,
     providedIn: 'root'
@@ -4112,7 +4130,7 @@ class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: DefaultRouteReuseStrategy,
   decorators: [{
@@ -4150,6 +4168,14 @@ class StateManager {
     const path = url instanceof UrlTree ? this.urlSerializer.serialize(url) : url;
     return path;
   }
+  routerUrlState(navigation) {
+    if (navigation?.targetBrowserUrl === undefined || navigation?.finalUrl === undefined) {
+      return {};
+    }
+    return {
+      ɵrouterUrl: this.urlSerializer.serialize(navigation.finalUrl)
+    };
+  }
   commitTransition({
     targetRouterState,
     finalUrl,
@@ -4186,7 +4212,7 @@ class StateManager {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: StateManager,
     deps: [],
@@ -4194,7 +4220,7 @@ class StateManager {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: StateManager,
     providedIn: 'root',
@@ -4203,7 +4229,7 @@ class StateManager {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: StateManager,
   decorators: [{
@@ -4259,10 +4285,11 @@ class HistoryStateManager extends StateManager {
       this.currentPageId = this.browserPageId;
     }
   }
-  setBrowserUrl(path, {
-    extras,
-    id
-  }) {
+  setBrowserUrl(path, navigation) {
+    const {
+      extras,
+      id
+    } = navigation;
     const {
       replaceUrl,
       state
@@ -4271,13 +4298,13 @@ class HistoryStateManager extends StateManager {
       const currentBrowserPageId = this.browserPageId;
       const newState = {
         ...state,
-        ...this.generateNgRouterState(id, currentBrowserPageId)
+        ...this.generateNgRouterState(id, currentBrowserPageId, navigation)
       };
       this.location.replaceState(path, '', newState);
     } else {
       const newState = {
         ...state,
-        ...this.generateNgRouterState(id, this.browserPageId + 1)
+        ...this.generateNgRouterState(id, this.browserPageId + 1, navigation)
       };
       this.location.go(path, '', newState);
     }
@@ -4309,20 +4336,22 @@ class HistoryStateManager extends StateManager {
   resetUrlToCurrentUrlTree() {
     this.location.replaceState(this.urlSerializer.serialize(this.getRawUrlTree()), '', this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));
   }
-  generateNgRouterState(navigationId, routerPageId) {
+  generateNgRouterState(navigationId, routerPageId, navigation) {
     if (this.canceledNavigationResolution === 'computed') {
       return {
         navigationId,
-        ɵrouterPageId: routerPageId
+        ɵrouterPageId: routerPageId,
+        ...this.routerUrlState(navigation)
       };
     }
     return {
-      navigationId
+      navigationId,
+      ...this.routerUrlState(navigation)
     };
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: HistoryStateManager,
     deps: null,
@@ -4330,7 +4359,7 @@ class HistoryStateManager extends StateManager {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: HistoryStateManager,
     providedIn: 'root'
@@ -4338,7 +4367,7 @@ class HistoryStateManager extends StateManager {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: HistoryStateManager,
   decorators: [{
@@ -4468,17 +4497,25 @@ class Router {
   }
   navigateToSyncWithBrowser(url, source, state, extras) {
     const restoredState = state?.navigationId ? state : null;
+    const routerUrl = state?.ɵrouterUrl ?? url;
+    if (state?.ɵrouterUrl) {
+      extras = {
+        ...extras,
+        browserUrl: url
+      };
+    }
     if (state) {
       const stateCopy = {
         ...state
       };
       delete stateCopy.navigationId;
       delete stateCopy.ɵrouterPageId;
+      delete stateCopy.ɵrouterUrl;
       if (Object.keys(stateCopy).length !== 0) {
         extras.state = stateCopy;
       }
     }
-    const urlTree = this.parseUrl(url);
+    const urlTree = this.parseUrl(routerUrl);
     this.scheduleNavigation(urlTree, source, restoredState, extras).catch(e => {
       if (this.disposed) {
         return;
@@ -4641,7 +4678,7 @@ class Router {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: Router,
     deps: [],
@@ -4649,7 +4686,7 @@ class Router {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.1",
+    version: "22.0.0-next.10",
     ngImport: i0,
     type: Router,
     providedIn: 'root'
@@ -4657,7 +4694,7 @@ class Router {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.1",
+  version: "22.0.0-next.10",
   ngImport: i0,
   type: Router,
   decorators: [{