@angular/router 22.0.0-next.8 → 22.0.0-rc.0

package/fesm2022/_router-chunk.mjs

@@ -1,12 +1,12 @@
 /**
- * @license Angular v22.0.0-next.8
+ * @license Angular v22.0.0-rc.0
  * (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, ɵ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 { ɵisPromise as _isPromise, ɵRuntimeError as _RuntimeError, computed, Service, Injectable, InjectionToken, EventEmitter, input, inject, ViewContainerRef, ChangeDetectorRef, Output, Input, Directive, reflectComponentType, ChangeDetectionStrategy, Component, runInInjectionContext, ɵisInjectable as _isInjectable, ɵisNgModule as _isNgModule, isStandalone, createEnvironmentInjector, Compiler, ɵmaybeUnwrapDefaultExport as _maybeUnwrapDefaultExport, 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,31 +327,29 @@ function mapChildrenIntoArray(segment, fn) {
 class UrlSerializer {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: UrlSerializer,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: UrlSerializer,
-    providedIn: 'root',
-    useFactory: () => new DefaultUrlSerializer()
+    factory: () => new DefaultUrlSerializer()
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: UrlSerializer,
   decorators: [{
-    type: Injectable,
+    type: Service,
     args: [{
-      providedIn: 'root',
-      useFactory: () => new DefaultUrlSerializer()
+      factory: () => new DefaultUrlSerializer()
     }]
   }]
 });
@@ -1301,7 +1299,7 @@ class ChildrenOutletContexts {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: ChildrenOutletContexts,
     deps: [{
@@ -1311,7 +1309,7 @@ class ChildrenOutletContexts {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: ChildrenOutletContexts,
     providedIn: 'root'
@@ -1319,7 +1317,7 @@ class ChildrenOutletContexts {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: ChildrenOutletContexts,
   decorators: [{
@@ -1496,7 +1494,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 +1775,7 @@ class RouterOutlet {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RouterOutlet,
     deps: [],
@@ -1784,7 +1783,7 @@ class RouterOutlet {
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
     minVersion: "17.1.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     type: RouterOutlet,
     isStandalone: true,
     selector: "router-outlet",
@@ -1817,7 +1816,7 @@ class RouterOutlet {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: RouterOutlet,
   decorators: [{
@@ -1885,6 +1884,7 @@ const INPUT_BINDER = new InjectionToken(typeof ngDevMode !== 'undefined' && ngDe
 class RoutedComponentInputBinder {
   options;
   outletDataSubscriptions = new Map();
+  outletSeenKeys = new Map();
   constructor(options) {
     this.options = options;
     this.options.queryParams ??= true;
@@ -1896,6 +1896,7 @@ class RoutedComponentInputBinder {
   unsubscribeFromRouteData(outlet) {
     this.outletDataSubscriptions.get(outlet)?.unsubscribe();
     this.outletDataSubscriptions.delete(outlet);
+    this.outletSeenKeys.delete(outlet);
   }
   subscribeToRouteData(outlet) {
     const {
@@ -1921,17 +1922,29 @@ class RoutedComponentInputBinder {
         this.unsubscribeFromRouteData(outlet);
         return;
       }
+      let seenKeys = this.outletSeenKeys.get(outlet);
+      if (!seenKeys) {
+        seenKeys = new Set();
+        this.outletSeenKeys.set(outlet, seenKeys);
+      }
+      for (const key of Object.keys(data)) {
+        seenKeys.add(key);
+      }
+      const behavior = this.options.unmatchedInputBehavior ?? 'alwaysUndefined';
       for (const {
         templateName
       } of mirror.inputs) {
-        outlet.activatedComponentRef.setInput(templateName, data[templateName]);
+        const value = data[templateName];
+        if (value !== undefined || behavior === 'alwaysUndefined' || seenKeys.has(templateName)) {
+          outlet.activatedComponentRef.setInput(templateName, value);
+        }
       }
     });
     this.outletDataSubscriptions.set(outlet, dataSubscription);
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RoutedComponentInputBinder,
     deps: "invalid",
@@ -1939,14 +1952,14 @@ class RoutedComponentInputBinder {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RoutedComponentInputBinder
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: RoutedComponentInputBinder,
   decorators: [{
@@ -1960,7 +1973,7 @@ i0.ɵɵngDeclareClassMetadata({
 class ɵEmptyOutletComponent {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: ɵEmptyOutletComponent,
     deps: [],
@@ -1968,7 +1981,7 @@ class ɵEmptyOutletComponent {
   });
   static ɵcmp = i0.ɵɵngDeclareComponent({
     minVersion: "14.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     type: ɵEmptyOutletComponent,
     isStandalone: true,
     selector: "ng-component",
@@ -1989,7 +2002,7 @@ class ɵEmptyOutletComponent {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: ɵEmptyOutletComponent,
   decorators: [{
@@ -2900,7 +2913,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;
@@ -3300,31 +3313,29 @@ class TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: TitleStrategy,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: TitleStrategy,
-    providedIn: 'root',
-    useFactory: () => inject(DefaultTitleStrategy)
+    factory: () => inject(DefaultTitleStrategy)
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: TitleStrategy,
   decorators: [{
-    type: Injectable,
+    type: Service,
     args: [{
-      providedIn: 'root',
-      useFactory: () => inject(DefaultTitleStrategy)
+      factory: () => inject(DefaultTitleStrategy)
     }]
   }]
 });
@@ -3342,7 +3353,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: DefaultTitleStrategy,
     deps: [{
@@ -3352,7 +3363,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: DefaultTitleStrategy,
     providedIn: 'root'
@@ -3360,7 +3371,7 @@ class DefaultTitleStrategy extends TitleStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: DefaultTitleStrategy,
   decorators: [{
@@ -3397,7 +3408,7 @@ class RouterConfigLoader {
     const loader = (async () => {
       try {
         const loaded = await wrapIntoPromise(runInInjectionContext(injector, () => route.loadComponent()));
-        const component = await maybeResolveResources(maybeUnwrapDefaultExport(loaded));
+        const component = await maybeResolveResources(_maybeUnwrapDefaultExport(loaded));
         if (this.onLoadEndListener) {
           this.onLoadEndListener(route);
         }
@@ -3439,35 +3450,31 @@ class RouterConfigLoader {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RouterConfigLoader,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: RouterConfigLoader,
-    providedIn: 'root'
+    type: RouterConfigLoader
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: RouterConfigLoader,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }]
 });
 async function loadChildren(route, compiler, parentInjector, onLoadEndListener) {
   const loaded = await wrapIntoPromise(runInInjectionContext(parentInjector, () => route.loadChildren()));
-  const t = await maybeResolveResources(maybeUnwrapDefaultExport(loaded));
+  const t = await maybeResolveResources(_maybeUnwrapDefaultExport(loaded));
   let factoryOrRoutes;
   if (t instanceof NgModuleFactory || Array.isArray(t)) {
     factoryOrRoutes = t;
@@ -3500,12 +3507,6 @@ async function loadChildren(route, compiler, parentInjector, onLoadEndListener)
     factory
   };
 }
-function isWrappedDefaultExport(value) {
-  return value && typeof value === 'object' && 'default' in value;
-}
-function maybeUnwrapDefaultExport(input) {
-  return isWrappedDefaultExport(input) ? input['default'] : input;
-}
 async function maybeResolveResources(value) {
   if ((typeof ngJitMode === 'undefined' || ngJitMode) && typeof fetch === 'function') {
     try {
@@ -3520,31 +3521,29 @@ async function maybeResolveResources(value) {
 class UrlHandlingStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: UrlHandlingStrategy,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: UrlHandlingStrategy,
-    providedIn: 'root',
-    useFactory: () => inject(DefaultUrlHandlingStrategy)
+    factory: () => inject(DefaultUrlHandlingStrategy)
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: UrlHandlingStrategy,
   decorators: [{
-    type: Injectable,
+    type: Service,
     args: [{
-      providedIn: 'root',
-      useFactory: () => inject(DefaultUrlHandlingStrategy)
+      factory: () => inject(DefaultUrlHandlingStrategy)
     }]
   }]
 });
@@ -3560,30 +3559,26 @@ class DefaultUrlHandlingStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: DefaultUrlHandlingStrategy,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: DefaultUrlHandlingStrategy,
-    providedIn: 'root'
+    type: DefaultUrlHandlingStrategy
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: DefaultUrlHandlingStrategy,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }]
 });
 
@@ -3669,7 +3664,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
@@ -3719,6 +3714,7 @@ class NavigationTransitions {
   setupNavigations(router) {
     this.transitions = new BehaviorSubject(null);
     return this.transitions.pipe(filter(t => t !== null), switchMap(overallTransitionState => {
+      let abortable = true;
       let completedOrAborted = false;
       const abortController = new AbortController();
       const shouldContinueNavigation = () => {
@@ -3867,14 +3863,7 @@ class NavigationTransitions {
         };
         const loaders = loadComponents(t.targetSnapshot.root);
         return loaders.length === 0 ? of(t) : from(Promise.all(loaders).then(() => t));
-      }), switchTap(() => this.afterPreactivation()), switchMap(() => {
-        const {
-          currentSnapshot,
-          targetSnapshot
-        } = overallTransitionState;
-        const viewTransitionStarted = this.createViewTransition?.(this.environmentInjector, currentSnapshot.root, targetSnapshot.root);
-        return viewTransitionStarted ? from(viewTransitionStarted).pipe(map(() => overallTransitionState)) : of(overallTransitionState);
-      }), take(1), switchMap(t => {
+      }), switchMap(t => {
         const targetRouterState = createRouterState(router.routeReuseStrategy, t.targetSnapshot, t.currentRouterState);
         this.currentTransition = overallTransitionState = t = {
           ...t,
@@ -3884,6 +3873,16 @@ class NavigationTransitions {
           nav.targetRouterState = targetRouterState;
           return nav;
         });
+        return of(t);
+      }), switchTap(() => this.afterPreactivation()), switchMap(() => {
+        const {
+          currentSnapshot,
+          targetSnapshot
+        } = overallTransitionState;
+        const viewTransitionStarted = this.createViewTransition?.(this.environmentInjector, currentSnapshot.root, targetSnapshot.root);
+        return viewTransitionStarted ? from(viewTransitionStarted).pipe(map(() => overallTransitionState)) : of(overallTransitionState);
+      }), take(1), switchMap(t => {
+        abortable = false;
         this.events.next(new BeforeActivateRoutes());
         const deferred = overallTransitionState.beforeActivateHandler.deferredHandle;
         return deferred ? from(deferred.then(() => t)) : of(t);
@@ -3901,7 +3900,7 @@ class NavigationTransitions {
         this.events.next(new NavigationEnd(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects)));
         this.titleStrategy?.updateTitle(t.targetRouterState.snapshot);
         t.resolve(true);
-      }), takeUntil(abortSignalToObservable(abortController.signal).pipe(filter(() => !completedOrAborted && !overallTransitionState.targetRouterState), tap(() => {
+      }), takeUntil(abortSignalToObservable(abortController.signal).pipe(filter(() => !completedOrAborted && abortable), tap(() => {
         this.cancelNavigationTransition(overallTransitionState, abortController.signal.reason + '', NavigationCancellationCode.Aborted);
       }))), tap({
         complete: () => {
@@ -3975,30 +3974,26 @@ class NavigationTransitions {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: NavigationTransitions,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: NavigationTransitions,
-    providedIn: 'root'
+    type: NavigationTransitions
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: NavigationTransitions,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }],
   ctorParameters: () => []
 });
@@ -4064,31 +4059,29 @@ function destroyDetachedRouteHandle(handle) {
 class RouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RouteReuseStrategy,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: RouteReuseStrategy,
-    providedIn: 'root',
-    useFactory: () => inject(DefaultRouteReuseStrategy)
+    factory: () => inject(DefaultRouteReuseStrategy)
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: RouteReuseStrategy,
   decorators: [{
-    type: Injectable,
+    type: Service,
     args: [{
-      providedIn: 'root',
-      useFactory: () => inject(DefaultRouteReuseStrategy)
+      factory: () => inject(DefaultRouteReuseStrategy)
     }]
   }]
 });
@@ -4113,30 +4106,26 @@ class BaseRouteReuseStrategy {
 class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: DefaultRouteReuseStrategy,
-    deps: null,
-    target: i0.ɵɵFactoryTarget.Injectable
+    deps: [],
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: DefaultRouteReuseStrategy,
-    providedIn: 'root'
+    type: DefaultRouteReuseStrategy
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: DefaultRouteReuseStrategy,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }]
 });
 
@@ -4167,6 +4156,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,
@@ -4203,31 +4200,29 @@ class StateManager {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: StateManager,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: StateManager,
-    providedIn: 'root',
-    useFactory: () => inject(HistoryStateManager)
+    factory: () => inject(HistoryStateManager)
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: StateManager,
   decorators: [{
-    type: Injectable,
+    type: Service,
     args: [{
-      providedIn: 'root',
-      useFactory: () => inject(HistoryStateManager)
+      factory: () => inject(HistoryStateManager)
     }]
   }]
 });
@@ -4276,10 +4271,11 @@ class HistoryStateManager extends StateManager {
       this.currentPageId = this.browserPageId;
     }
   }
-  setBrowserUrl(path, {
-    extras,
-    id
-  }) {
+  setBrowserUrl(path, navigation) {
+    const {
+      extras,
+      id
+    } = navigation;
     const {
       replaceUrl,
       state
@@ -4288,13 +4284,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);
     }
@@ -4326,43 +4322,41 @@ 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.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: HistoryStateManager,
-    deps: null,
-    target: i0.ɵɵFactoryTarget.Injectable
+    deps: [],
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: HistoryStateManager,
-    providedIn: 'root'
+    type: HistoryStateManager
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: HistoryStateManager,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }]
 });
 
@@ -4485,17 +4479,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;
@@ -4658,30 +4660,26 @@ class Router {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+    version: "22.0.0-rc.0",
     ngImport: i0,
     type: Router,
     deps: [],
-    target: i0.ɵɵFactoryTarget.Injectable
+    target: i0.ɵɵFactoryTarget.Service
   });
-  static ɵprov = i0.ɵɵngDeclareInjectable({
-    minVersion: "12.0.0",
-    version: "22.0.0-next.8",
+  static ɵprov = i0.ɵɵngDeclareService({
+    minVersion: "22.0.0",
+    version: "22.0.0-rc.0",
     ngImport: i0,
-    type: Router,
-    providedIn: 'root'
+    type: Router
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "22.0.0-next.8",
+  version: "22.0.0-rc.0",
   ngImport: i0,
   type: Router,
   decorators: [{
-    type: Injectable,
-    args: [{
-      providedIn: 'root'
-    }]
+    type: Service
   }],
   ctorParameters: () => []
 });