@angular/router 21.0.0 → 21.1.0-next.0

package/fesm2022/_router-chunk.mjs

@@ -1,12 +1,12 @@
 /**
- * @license Angular v21.0.0
+ * @license Angular v21.1.0-next.0
  * (c) 2010-2025 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, Injectable, ɵisNgModule as _isNgModule, isStandalone, createEnvironmentInjector, InjectionToken, EventEmitter, input, inject, ViewContainerRef, ChangeDetectorRef, Directive, Input, Output, reflectComponentType, Component, ɵisInjectable as _isInjectable, runInInjectionContext, makeEnvironmentProviders, 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, Injectable, InjectionToken, EventEmitter, input, inject, ViewContainerRef, ChangeDetectorRef, Directive, Input, Output, reflectComponentType, Component, runInInjectionContext, ɵisInjectable as _isInjectable, ɵisNgModule as _isNgModule, isStandalone, createEnvironmentInjector, makeEnvironmentProviders, 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, throwError, EMPTY, Subject, Subscription } from 'rxjs';
 import { first, map, switchMap, take, startWith, filter, takeUntil, mergeMap, concatMap, tap, catchError, scan, defaultIfEmpty, last as last$1, takeLast, finalize } from 'rxjs/operators';
 import * as i1 from '@angular/platform-browser';
@@ -42,27 +42,59 @@ class ParamsAsMap {
 function convertToParamMap(params) {
   return new ParamsAsMap(params);
 }
+function matchParts(routeParts, urlSegments, posParams) {
+  for (let i = 0; i < routeParts.length; i++) {
+    const part = routeParts[i];
+    const segment = urlSegments[i];
+    const isParameter = part[0] === ':';
+    if (isParameter) {
+      posParams[part.substring(1)] = segment;
+    } else if (part !== segment.path) {
+      return false;
+    }
+  }
+  return true;
+}
 function defaultUrlMatcher(segments, segmentGroup, route) {
   const parts = route.path.split('/');
-  if (parts.length > segments.length) {
+  const wildcardIndex = parts.indexOf('**');
+  if (wildcardIndex === -1) {
+    if (parts.length > segments.length) {
+      return null;
+    }
+    if (route.pathMatch === 'full' && (segmentGroup.hasChildren() || parts.length < segments.length)) {
+      return null;
+    }
+    const posParams = {};
+    const consumed = segments.slice(0, parts.length);
+    if (!matchParts(parts, consumed, posParams)) {
+      return null;
+    }
+    return {
+      consumed,
+      posParams
+    };
+  }
+  if (wildcardIndex !== parts.lastIndexOf('**')) {
     return null;
   }
-  if (route.pathMatch === 'full' && (segmentGroup.hasChildren() || parts.length < segments.length)) {
+  const pre = parts.slice(0, wildcardIndex);
+  const post = parts.slice(wildcardIndex + 1);
+  if (pre.length + post.length > segments.length) {
+    return null;
+  }
+  if (route.pathMatch === 'full' && segmentGroup.hasChildren() && route.path !== '**') {
     return null;
   }
   const posParams = {};
-  for (let index = 0; index < parts.length; index++) {
-    const part = parts[index];
-    const segment = segments[index];
-    const isParameter = part[0] === ':';
-    if (isParameter) {
-      posParams[part.substring(1)] = segment;
-    } else if (part !== segment.path) {
-      return null;
-    }
+  if (!matchParts(pre, segments.slice(0, pre.length), posParams)) {
+    return null;
+  }
+  if (!matchParts(post, segments.slice(segments.length - post.length), posParams)) {
+    return null;
   }
   return {
-    consumed: segments.slice(0, parts.length),
+    consumed: segments,
     posParams
   };
 }
@@ -276,7 +308,7 @@ function mapChildrenIntoArray(segment, fn) {
 class UrlSerializer {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: UrlSerializer,
     deps: [],
@@ -284,7 +316,7 @@ class UrlSerializer {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: UrlSerializer,
     providedIn: 'root',
@@ -293,7 +325,7 @@ class UrlSerializer {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: UrlSerializer,
   decorators: [{
@@ -1125,11 +1157,13 @@ class Scroll {
   routerEvent;
   position;
   anchor;
+  scrollBehavior;
   type = EventType.Scroll;
-  constructor(routerEvent, position, anchor) {
+  constructor(routerEvent, position, anchor, scrollBehavior) {
     this.routerEvent = routerEvent;
     this.position = position;
     this.anchor = anchor;
+    this.scrollBehavior = scrollBehavior;
   }
   toString() {
     const pos = this.position ? `${this.position[0]}, ${this.position[1]}` : null;
@@ -1188,126 +1222,6 @@ function stringifyEvent(routerEvent) {
   }
 }
 
-function getOrCreateRouteInjectorIfNeeded(route, currentInjector) {
-  if (route.providers && !route._injector) {
-    route._injector = createEnvironmentInjector(route.providers, currentInjector, `Route: ${route.path}`);
-  }
-  return route._injector ?? currentInjector;
-}
-function validateConfig(config, parentPath = '', requireStandaloneComponents = false) {
-  for (let i = 0; i < config.length; i++) {
-    const route = config[i];
-    const fullPath = getFullPath(parentPath, route);
-    validateNode(route, fullPath, requireStandaloneComponents);
-  }
-}
-function assertStandalone(fullPath, component) {
-  if (component && _isNgModule(component)) {
-    throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. You are using 'loadComponent' with a module, ` + `but it must be used with standalone components. Use 'loadChildren' instead.`);
-  } else if (component && !isStandalone(component)) {
-    throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. The component must be standalone.`);
-  }
-}
-function validateNode(route, fullPath, requireStandaloneComponents) {
-  if (typeof ngDevMode === 'undefined' || ngDevMode) {
-    if (!route) {
-      throw new _RuntimeError(4014, `
-      Invalid configuration of route '${fullPath}': Encountered undefined route.
-      The reason might be an extra comma.
-
-      Example:
-      const routes: Routes = [
-        { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
-        { path: 'dashboard',  component: DashboardComponent },, << two commas
-        { path: 'detail/:id', component: HeroDetailComponent }
-      ];
-    `);
-    }
-    if (Array.isArray(route)) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': Array cannot be specified`);
-    }
-    if (!route.redirectTo && !route.component && !route.loadComponent && !route.children && !route.loadChildren && route.outlet && route.outlet !== PRIMARY_OUTLET) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': a componentless route without children or loadChildren cannot have a named outlet set`);
-    }
-    if (route.redirectTo && route.children) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and children cannot be used together`);
-    }
-    if (route.redirectTo && route.loadChildren) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and loadChildren cannot be used together`);
-    }
-    if (route.children && route.loadChildren) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': children and loadChildren cannot be used together`);
-    }
-    if (route.component && route.loadComponent) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': component and loadComponent cannot be used together`);
-    }
-    if (route.redirectTo) {
-      if (route.component || route.loadComponent) {
-        throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and component/loadComponent cannot be used together`);
-      }
-      if (route.canMatch || route.canActivate) {
-        throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and ${route.canMatch ? 'canMatch' : 'canActivate'} cannot be used together.` + `Redirects happen before guards are executed.`);
-      }
-    }
-    if (route.path && route.matcher) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': path and matcher cannot be used together`);
-    }
-    if (route.redirectTo === void 0 && !route.component && !route.loadComponent && !route.children && !route.loadChildren) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. One of the following must be provided: component, loadComponent, redirectTo, children or loadChildren`);
-    }
-    if (route.path === void 0 && route.matcher === void 0) {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': routes must have either a path or a matcher specified`);
-    }
-    if (typeof route.path === 'string' && route.path.charAt(0) === '/') {
-      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': path cannot start with a slash`);
-    }
-    if (route.path === '' && route.redirectTo !== void 0 && route.pathMatch === void 0) {
-      const exp = `The default value of 'pathMatch' is 'prefix', but often the intent is to use 'full'.`;
-      throw new _RuntimeError(4014, `Invalid configuration of route '{path: "${fullPath}", redirectTo: "${route.redirectTo}"}': please provide 'pathMatch'. ${exp}`);
-    }
-    if (requireStandaloneComponents) {
-      assertStandalone(fullPath, route.component);
-    }
-  }
-  if (route.children) {
-    validateConfig(route.children, fullPath, requireStandaloneComponents);
-  }
-}
-function getFullPath(parentPath, currentRoute) {
-  if (!currentRoute) {
-    return parentPath;
-  }
-  if (!parentPath && !currentRoute.path) {
-    return '';
-  } else if (parentPath && !currentRoute.path) {
-    return `${parentPath}/`;
-  } else if (!parentPath && currentRoute.path) {
-    return currentRoute.path;
-  } else {
-    return `${parentPath}/${currentRoute.path}`;
-  }
-}
-function getOutlet(route) {
-  return route.outlet || PRIMARY_OUTLET;
-}
-function sortByMatchingOutlets(routes, outletName) {
-  const sortedConfig = routes.filter(r => getOutlet(r) === outletName);
-  sortedConfig.push(...routes.filter(r => getOutlet(r) !== outletName));
-  return sortedConfig;
-}
-function getClosestRouteInjector(snapshot) {
-  if (!snapshot) return null;
-  if (snapshot.routeConfig?._injector) {
-    return snapshot.routeConfig._injector;
-  }
-  for (let s = snapshot.parent; s; s = s.parent) {
-    const route = s.routeConfig;
-    if (route?._loadedInjector) return route._loadedInjector;
-    if (route?._injector) return route._injector;
-  }
-  return null;
-}
-
 class OutletContext {
   rootInjector;
   outlet = null;
@@ -1315,7 +1229,7 @@ class OutletContext {
   children;
   attachRef = null;
   get injector() {
-    return getClosestRouteInjector(this.route?.snapshot) ?? this.rootInjector;
+    return this.route?.snapshot._environmentInjector ?? this.rootInjector;
   }
   constructor(rootInjector) {
     this.rootInjector = rootInjector;
@@ -1361,7 +1275,7 @@ class ChildrenOutletContexts {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: ChildrenOutletContexts,
     deps: [{
@@ -1371,7 +1285,7 @@ class ChildrenOutletContexts {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: ChildrenOutletContexts,
     providedIn: 'root'
@@ -1379,7 +1293,7 @@ class ChildrenOutletContexts {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: ChildrenOutletContexts,
   decorators: [{
@@ -1472,8 +1386,8 @@ class RouterState extends Tree {
     return this.snapshot.toString();
   }
 }
-function createEmptyState(rootComponent) {
-  const snapshot = createEmptyStateSnapshot(rootComponent);
+function createEmptyState(rootComponent, injector) {
+  const snapshot = createEmptyStateSnapshot(rootComponent, injector);
   const emptyUrl = new BehaviorSubject([new UrlSegment('', {})]);
   const emptyParams = new BehaviorSubject({});
   const emptyData = new BehaviorSubject({});
@@ -1483,12 +1397,12 @@ function createEmptyState(rootComponent) {
   activated.snapshot = snapshot.root;
   return new RouterState(new TreeNode(activated, []), snapshot);
 }
-function createEmptyStateSnapshot(rootComponent) {
+function createEmptyStateSnapshot(rootComponent, injector) {
   const emptyParams = {};
   const emptyData = {};
   const emptyQueryParams = {};
   const fragment = '';
-  const activated = new ActivatedRouteSnapshot([], emptyParams, emptyQueryParams, fragment, emptyData, PRIMARY_OUTLET, rootComponent, null, {});
+  const activated = new ActivatedRouteSnapshot([], emptyParams, emptyQueryParams, fragment, emptyData, PRIMARY_OUTLET, rootComponent, null, {}, injector);
   return new RouterStateSnapshot('', new TreeNode(activated, []));
 }
 class ActivatedRoute {
@@ -1611,10 +1525,11 @@ class ActivatedRouteSnapshot {
   _routerState;
   _paramMap;
   _queryParamMap;
+  _environmentInjector;
   get title() {
     return this.data?.[RouteTitleKey];
   }
-  constructor(url, params, queryParams, fragment, data, outlet, component, routeConfig, resolve) {
+  constructor(url, params, queryParams, fragment, data, outlet, component, routeConfig, resolve, environmentInjector) {
     this.url = url;
     this.params = params;
     this.queryParams = queryParams;
@@ -1624,6 +1539,7 @@ class ActivatedRouteSnapshot {
     this.component = component;
     this.routeConfig = routeConfig;
     this._resolve = resolve;
+    this._environmentInjector = environmentInjector;
   }
   get root() {
     return this._routerState.root;
@@ -1719,9 +1635,11 @@ class RouterOutlet {
   deactivateEvents = new EventEmitter();
   attachEvents = new EventEmitter();
   detachEvents = new EventEmitter();
-  routerOutletData = input(...(ngDevMode ? [undefined, {
-    debugName: "routerOutletData"
-  }] : []));
+  routerOutletData = input(undefined, {
+    ...(ngDevMode ? {
+      debugName: "routerOutletData"
+    } : {})
+  });
   parentContexts = inject(ChildrenOutletContexts);
   location = inject(ViewContainerRef);
   changeDetector = inject(ChangeDetectorRef);
@@ -1834,7 +1752,7 @@ class RouterOutlet {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterOutlet,
     deps: [],
@@ -1842,7 +1760,7 @@ class RouterOutlet {
   });
   static ɵdir = i0.ɵɵngDeclareDirective({
     minVersion: "17.1.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     type: RouterOutlet,
     isStandalone: true,
     selector: "router-outlet",
@@ -1875,7 +1793,7 @@ class RouterOutlet {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterOutlet,
   decorators: [{
@@ -1984,7 +1902,7 @@ class RoutedComponentInputBinder {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RoutedComponentInputBinder,
     deps: [],
@@ -1992,14 +1910,14 @@ class RoutedComponentInputBinder {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RoutedComponentInputBinder
   });
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RoutedComponentInputBinder,
   decorators: [{
@@ -2010,7 +1928,7 @@ i0.ɵɵngDeclareClassMetadata({
 class ɵEmptyOutletComponent {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: ɵEmptyOutletComponent,
     deps: [],
@@ -2018,7 +1936,7 @@ class ɵEmptyOutletComponent {
   });
   static ɵcmp = i0.ɵɵngDeclareComponent({
     minVersion: "14.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     type: ɵEmptyOutletComponent,
     isStandalone: true,
     selector: "ng-component",
@@ -2038,7 +1956,7 @@ class ɵEmptyOutletComponent {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: ɵEmptyOutletComponent,
   decorators: [{
@@ -2382,7 +2300,7 @@ function getRouteGuards(futureNode, currNode, parentContexts, futurePath, checks
 }
 function shouldRunGuardsAndResolvers(curr, future, mode) {
   if (typeof mode === 'function') {
-    return mode(curr, future);
+    return runInInjectionContext(future._environmentInjector, () => mode(curr, future));
   }
   switch (mode) {
     case 'pathParamsChange':
@@ -2482,7 +2400,7 @@ function takeUntilAbort(signal) {
   return takeUntil(abortSignalToObservable(signal));
 }
 
-function checkGuards(injector, forwardEvent) {
+function checkGuards(forwardEvent) {
   return mergeMap(t => {
     const {
       targetSnapshot,
@@ -2498,22 +2416,22 @@ function checkGuards(injector, forwardEvent) {
         guardsResult: true
       });
     }
-    return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot, injector).pipe(mergeMap(canDeactivate => {
-      return canDeactivate && isBoolean(canDeactivate) ? runCanActivateChecks(targetSnapshot, canActivateChecks, injector, forwardEvent) : of(canDeactivate);
+    return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot).pipe(mergeMap(canDeactivate => {
+      return canDeactivate && isBoolean(canDeactivate) ? runCanActivateChecks(targetSnapshot, canActivateChecks, forwardEvent) : of(canDeactivate);
     }), map(guardsResult => ({
       ...t,
       guardsResult
     })));
   });
 }
-function runCanDeactivateChecks(checks, futureRSS, currRSS, injector) {
-  return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS, injector)), first(result => {
+function runCanDeactivateChecks(checks, futureRSS, currRSS) {
+  return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS)), first(result => {
     return result !== true;
   }, true));
 }
-function runCanActivateChecks(futureSnapshot, checks, injector, forwardEvent) {
+function runCanActivateChecks(futureSnapshot, checks, forwardEvent) {
   return from(checks).pipe(concatMap(check => {
-    return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path, injector), runCanActivate(futureSnapshot, check.route, injector));
+    return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path), runCanActivate(futureSnapshot, check.route));
   }), first(result => {
     return result !== true;
   }, true));
@@ -2530,12 +2448,12 @@ function fireChildActivationStart(snapshot, forwardEvent) {
   }
   return of(true);
 }
-function runCanActivate(futureRSS, futureARS, injector) {
+function runCanActivate(futureRSS, futureARS) {
   const canActivate = futureARS.routeConfig ? futureARS.routeConfig.canActivate : null;
   if (!canActivate || canActivate.length === 0) return of(true);
   const canActivateObservables = canActivate.map(canActivate => {
     return defer(() => {
-      const closestInjector = getClosestRouteInjector(futureARS) ?? injector;
+      const closestInjector = futureARS._environmentInjector;
       const guard = getTokenOrFunctionIdentity(canActivate, closestInjector);
       const guardVal = isCanActivate(guard) ? guard.canActivate(futureARS, futureRSS) : runInInjectionContext(closestInjector, () => guard(futureARS, futureRSS));
       return wrapIntoObservable(guardVal).pipe(first());
@@ -2543,13 +2461,13 @@ function runCanActivate(futureRSS, futureARS, injector) {
   });
   return of(canActivateObservables).pipe(prioritizedGuardValue());
 }
-function runCanActivateChild(futureRSS, path, injector) {
+function runCanActivateChild(futureRSS, path) {
   const futureARS = path[path.length - 1];
   const canActivateChildGuards = path.slice(0, path.length - 1).reverse().map(p => getCanActivateChild(p)).filter(_ => _ !== null);
   const canActivateChildGuardsMapped = canActivateChildGuards.map(d => {
     return defer(() => {
       const guardsMapped = d.guards.map(canActivateChild => {
-        const closestInjector = getClosestRouteInjector(d.node) ?? injector;
+        const closestInjector = d.node._environmentInjector;
         const guard = getTokenOrFunctionIdentity(canActivateChild, closestInjector);
         const guardVal = isCanActivateChild(guard) ? guard.canActivateChild(futureARS, futureRSS) : runInInjectionContext(closestInjector, () => guard(futureARS, futureRSS));
         return wrapIntoObservable(guardVal).pipe(first());
@@ -2559,11 +2477,11 @@ function runCanActivateChild(futureRSS, path, injector) {
   });
   return of(canActivateChildGuardsMapped).pipe(prioritizedGuardValue());
 }
-function runCanDeactivate(component, currARS, currRSS, futureRSS, injector) {
+function runCanDeactivate(component, currARS, currRSS, futureRSS) {
   const canDeactivate = currARS && currARS.routeConfig ? currARS.routeConfig.canDeactivate : null;
   if (!canDeactivate || canDeactivate.length === 0) return of(true);
   const canDeactivateObservables = canDeactivate.map(c => {
-    const closestInjector = getClosestRouteInjector(currARS) ?? injector;
+    const closestInjector = currARS._environmentInjector;
     const guard = getTokenOrFunctionIdentity(c, closestInjector);
     const guardVal = isCanDeactivate(guard) ? guard.canDeactivate(component, currARS, currRSS, futureRSS) : runInInjectionContext(closestInjector, () => guard(component, currARS, currRSS, futureRSS));
     return wrapIntoObservable(guardVal).pipe(first());
@@ -2727,6 +2645,114 @@ function getRedirectResult$1(redirectTo, currentSnapshot, injector) {
   }))));
 }
 
+function getOrCreateRouteInjectorIfNeeded(route, currentInjector) {
+  if (route.providers && !route._injector) {
+    route._injector = createEnvironmentInjector(route.providers, currentInjector, `Route: ${route.path}`);
+  }
+  return route._injector ?? currentInjector;
+}
+function validateConfig(config, parentPath = '', requireStandaloneComponents = false) {
+  for (let i = 0; i < config.length; i++) {
+    const route = config[i];
+    const fullPath = getFullPath(parentPath, route);
+    validateNode(route, fullPath, requireStandaloneComponents);
+  }
+}
+function assertStandalone(fullPath, component) {
+  if (component && _isNgModule(component)) {
+    throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. You are using 'loadComponent' with a module, ` + `but it must be used with standalone components. Use 'loadChildren' instead.`);
+  } else if (component && !isStandalone(component)) {
+    throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. The component must be standalone.`);
+  }
+}
+function validateNode(route, fullPath, requireStandaloneComponents) {
+  if (typeof ngDevMode === 'undefined' || ngDevMode) {
+    if (!route) {
+      throw new _RuntimeError(4014, `
+      Invalid configuration of route '${fullPath}': Encountered undefined route.
+      The reason might be an extra comma.
+
+      Example:
+      const routes: Routes = [
+        { path: '', redirectTo: '/dashboard', pathMatch: 'full' },
+        { path: 'dashboard',  component: DashboardComponent },, << two commas
+        { path: 'detail/:id', component: HeroDetailComponent }
+      ];
+    `);
+    }
+    if (Array.isArray(route)) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': Array cannot be specified`);
+    }
+    if (!route.redirectTo && !route.component && !route.loadComponent && !route.children && !route.loadChildren && route.outlet && route.outlet !== PRIMARY_OUTLET) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': a componentless route without children or loadChildren cannot have a named outlet set`);
+    }
+    if (route.redirectTo && route.children) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and children cannot be used together`);
+    }
+    if (route.redirectTo && route.loadChildren) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and loadChildren cannot be used together`);
+    }
+    if (route.children && route.loadChildren) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': children and loadChildren cannot be used together`);
+    }
+    if (route.component && route.loadComponent) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': component and loadComponent cannot be used together`);
+    }
+    if (route.redirectTo) {
+      if (route.component || route.loadComponent) {
+        throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and component/loadComponent cannot be used together`);
+      }
+      if (route.canMatch || route.canActivate) {
+        throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': redirectTo and ${route.canMatch ? 'canMatch' : 'canActivate'} cannot be used together.` + `Redirects happen before guards are executed.`);
+      }
+    }
+    if (route.path && route.matcher) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': path and matcher cannot be used together`);
+    }
+    if (route.redirectTo === void 0 && !route.component && !route.loadComponent && !route.children && !route.loadChildren) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}'. One of the following must be provided: component, loadComponent, redirectTo, children or loadChildren`);
+    }
+    if (route.path === void 0 && route.matcher === void 0) {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': routes must have either a path or a matcher specified`);
+    }
+    if (typeof route.path === 'string' && route.path.charAt(0) === '/') {
+      throw new _RuntimeError(4014, `Invalid configuration of route '${fullPath}': path cannot start with a slash`);
+    }
+    if (route.path === '' && route.redirectTo !== void 0 && route.pathMatch === void 0) {
+      const exp = `The default value of 'pathMatch' is 'prefix', but often the intent is to use 'full'.`;
+      throw new _RuntimeError(4014, `Invalid configuration of route '{path: "${fullPath}", redirectTo: "${route.redirectTo}"}': please provide 'pathMatch'. ${exp}`);
+    }
+    if (requireStandaloneComponents) {
+      assertStandalone(fullPath, route.component);
+    }
+  }
+  if (route.children) {
+    validateConfig(route.children, fullPath, requireStandaloneComponents);
+  }
+}
+function getFullPath(parentPath, currentRoute) {
+  if (!currentRoute) {
+    return parentPath;
+  }
+  if (!parentPath && !currentRoute.path) {
+    return '';
+  } else if (parentPath && !currentRoute.path) {
+    return `${parentPath}/`;
+  } else if (!parentPath && currentRoute.path) {
+    return currentRoute.path;
+  } else {
+    return `${parentPath}/${currentRoute.path}`;
+  }
+}
+function getOutlet(route) {
+  return route.outlet || PRIMARY_OUTLET;
+}
+function sortByMatchingOutlets(routes, outletName) {
+  const sortedConfig = routes.filter(r => getOutlet(r) === outletName);
+  sortedConfig.push(...routes.filter(r => getOutlet(r) !== outletName));
+  return sortedConfig;
+}
+
 const noMatch$1 = {
   matched: false,
   consumedSegments: [],
@@ -2745,9 +2771,6 @@ function matchWithChecks(segmentGroup, route, segments, injector, urlSerializer,
   }));
 }
 function match(segmentGroup, route, segments) {
-  if (route.path === '**') {
-    return createWildcardMatchResult(segments);
-  }
   if (route.path === '') {
     if (route.pathMatch === 'full' && (segmentGroup.hasChildren() || segments.length > 0)) {
       return {
@@ -2783,15 +2806,6 @@ function match(segmentGroup, route, segments) {
     positionalParamSegments: res.posParams ?? {}
   };
 }
-function createWildcardMatchResult(segments) {
-  return {
-    matched: true,
-    parameters: segments.length > 0 ? last(segments).parameters : {},
-    consumedSegments: segments,
-    remainingSegments: [],
-    positionalParamSegments: {}
-  };
-}
 function split(segmentGroup, consumedSegments, slicedSegments, config) {
   if (slicedSegments.length > 0 && containsEmptyPathMatchesWithNamedOutlets(segmentGroup, slicedSegments, config)) {
     const s = new UrlSegmentGroup(consumedSegments, createChildrenForEmptyPaths(config, new UrlSegmentGroup(slicedSegments, segmentGroup.children)));
@@ -2903,7 +2917,7 @@ let Recognizer$1 = class Recognizer {
   async match(rootSegmentGroup) {
     const rootSnapshot = new ActivatedRouteSnapshot([], Object.freeze({}), Object.freeze({
       ...this.urlTree.queryParams
-    }), this.urlTree.fragment, Object.freeze({}), PRIMARY_OUTLET, this.rootComponentType, null, {});
+    }), this.urlTree.fragment, Object.freeze({}), PRIMARY_OUTLET, this.rootComponentType, null, {}, this.injector);
     try {
       const children = await this.processSegmentGroup(this.injector, this.config, rootSegmentGroup, PRIMARY_OUTLET, rootSnapshot);
       return {
@@ -2999,7 +3013,7 @@ let Recognizer$1 = class Recognizer {
     }
     const currentSnapshot = new ActivatedRouteSnapshot(segments, parameters, Object.freeze({
       ...this.urlTree.queryParams
-    }), this.urlTree.fragment, getData$1(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve$1(route));
+    }), this.urlTree.fragment, getData$1(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve$1(route), injector);
     const inherited = getInherited(currentSnapshot, parentRoute, this.paramsInheritanceStrategy);
     currentSnapshot.params = Object.freeze(inherited.params);
     currentSnapshot.data = Object.freeze(inherited.data);
@@ -3033,7 +3047,7 @@ let Recognizer$1 = class Recognizer {
     } = result;
     const snapshot = new ActivatedRouteSnapshot(consumedSegments, parameters, Object.freeze({
       ...this.urlTree.queryParams
-    }), this.urlTree.fragment, getData$1(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve$1(route));
+    }), this.urlTree.fragment, getData$1(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve$1(route), injector);
     const inherited = getInherited(snapshot, parentRoute, this.paramsInheritanceStrategy);
     snapshot.params = Object.freeze(inherited.params);
     snapshot.data = Object.freeze(inherited.data);
@@ -3312,7 +3326,7 @@ class Recognizer {
   match(rootSegmentGroup) {
     const rootSnapshot = new ActivatedRouteSnapshot([], Object.freeze({}), Object.freeze({
       ...this.urlTree.queryParams
-    }), this.urlTree.fragment, Object.freeze({}), PRIMARY_OUTLET, this.rootComponentType, null, {});
+    }), this.urlTree.fragment, Object.freeze({}), PRIMARY_OUTLET, this.rootComponentType, null, {}, this.injector);
     return this.processSegmentGroup(this.injector, this.config, rootSegmentGroup, PRIMARY_OUTLET, rootSnapshot).pipe(map(children => {
       return {
         children,
@@ -3411,7 +3425,7 @@ class Recognizer {
     }
     const currentSnapshot = new ActivatedRouteSnapshot(segments, parameters, Object.freeze({
       ...this.urlTree.queryParams
-    }), this.urlTree.fragment, getData(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve(route));
+    }), this.urlTree.fragment, getData(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve(route), injector);
     const inherited = getInherited(currentSnapshot, parentRoute, this.paramsInheritanceStrategy);
     currentSnapshot.params = Object.freeze(inherited.params);
     currentSnapshot.data = Object.freeze(inherited.data);
@@ -3441,7 +3455,7 @@ class Recognizer {
         } = result;
         const snapshot = new ActivatedRouteSnapshot(consumedSegments, parameters, Object.freeze({
           ...this.urlTree.queryParams
-        }), this.urlTree.fragment, getData(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve(route));
+        }), this.urlTree.fragment, getData(route), getOutlet(route), route.component ?? route._loadedComponent ?? null, route, getResolve(route), injector);
         const inherited = getInherited(snapshot, parentRoute, this.paramsInheritanceStrategy);
         snapshot.params = Object.freeze(inherited.params);
         snapshot.data = Object.freeze(inherited.data);
@@ -3571,7 +3585,7 @@ function recognize(injector, configLoader, rootComponentType, config, serializer
   })));
 }
 
-function resolveData(paramsInheritanceStrategy, injector) {
+function resolveData(paramsInheritanceStrategy) {
   return mergeMap(t => {
     const {
       targetSnapshot,
@@ -3595,7 +3609,7 @@ function resolveData(paramsInheritanceStrategy, injector) {
     let routesProcessed = 0;
     return from(routesNeedingDataUpdates).pipe(concatMap(route => {
       if (routesWithResolversToRun.has(route)) {
-        return runResolve(route, targetSnapshot, paramsInheritanceStrategy, injector);
+        return runResolve(route, targetSnapshot, paramsInheritanceStrategy);
       } else {
         route.data = getInherited(route, route.parent, paramsInheritanceStrategy).resolve;
         return of(void 0);
@@ -3607,7 +3621,7 @@ function flattenRouteTree(route) {
   const descendants = route.children.map(child => flattenRouteTree(child)).flat();
   return [route, ...descendants];
 }
-function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, injector) {
+function runResolve(futureARS, futureRSS, paramsInheritanceStrategy) {
   const config = futureARS.routeConfig;
   const resolve = futureARS._resolve;
   if (config?.title !== undefined && !hasStaticTitle(config)) {
@@ -3615,7 +3629,7 @@ function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, injector) {
   }
   return defer(() => {
     futureARS.data = getInherited(futureARS, futureARS.parent, paramsInheritanceStrategy).resolve;
-    return resolveNode(resolve, futureARS, futureRSS, injector).pipe(map(resolvedData => {
+    return resolveNode(resolve, futureARS, futureRSS).pipe(map(resolvedData => {
       futureARS._resolvedData = resolvedData;
       futureARS.data = {
         ...futureARS.data,
@@ -3625,21 +3639,21 @@ function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, injector) {
     }));
   });
 }
-function resolveNode(resolve, futureARS, futureRSS, injector) {
+function resolveNode(resolve, futureARS, futureRSS) {
   const keys = getDataKeys(resolve);
   if (keys.length === 0) {
     return of({});
   }
   const data = {};
-  return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS, injector).pipe(first(), tap(value => {
+  return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS).pipe(first(), tap(value => {
     if (value instanceof RedirectCommand) {
       throw redirectingNavigationError(new DefaultUrlSerializer(), value);
     }
     data[key] = value;
   }))), takeLast(1), map(() => data), catchError(e => isEmptyError(e) ? EMPTY : throwError(e)));
 }
-function getResolver(injectionToken, futureARS, futureRSS, injector) {
-  const closestInjector = getClosestRouteInjector(futureARS) ?? injector;
+function getResolver(injectionToken, futureARS, futureRSS) {
+  const closestInjector = futureARS._environmentInjector;
   const resolver = getTokenOrFunctionIdentity(injectionToken, closestInjector);
   const resolverValue = resolver.resolve ? resolver.resolve(futureARS, futureRSS) : runInInjectionContext(closestInjector, () => resolver(futureARS, futureRSS));
   return wrapIntoObservable(resolverValue);
@@ -3670,7 +3684,7 @@ class TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: TitleStrategy,
     deps: [],
@@ -3678,7 +3692,7 @@ class TitleStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: TitleStrategy,
     providedIn: 'root',
@@ -3687,7 +3701,7 @@ class TitleStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: TitleStrategy,
   decorators: [{
@@ -3712,7 +3726,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultTitleStrategy,
     deps: [{
@@ -3722,7 +3736,7 @@ class DefaultTitleStrategy extends TitleStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultTitleStrategy,
     providedIn: 'root'
@@ -3730,7 +3744,7 @@ class DefaultTitleStrategy extends TitleStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: DefaultTitleStrategy,
   decorators: [{
@@ -3808,7 +3822,7 @@ class RouterConfigLoader {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterConfigLoader,
     deps: [],
@@ -3816,7 +3830,7 @@ class RouterConfigLoader {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouterConfigLoader,
     providedIn: 'root'
@@ -3824,7 +3838,7 @@ class RouterConfigLoader {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouterConfigLoader,
   decorators: [{
@@ -3886,7 +3900,7 @@ async function maybeResolveResources(value) {
 class UrlHandlingStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: UrlHandlingStrategy,
     deps: [],
@@ -3894,7 +3908,7 @@ class UrlHandlingStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: UrlHandlingStrategy,
     providedIn: 'root',
@@ -3903,7 +3917,7 @@ class UrlHandlingStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: UrlHandlingStrategy,
   decorators: [{
@@ -3926,7 +3940,7 @@ class DefaultUrlHandlingStrategy {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultUrlHandlingStrategy,
     deps: [],
@@ -3934,7 +3948,7 @@ class DefaultUrlHandlingStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultUrlHandlingStrategy,
     providedIn: 'root'
@@ -3942,7 +3956,7 @@ class DefaultUrlHandlingStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: DefaultUrlHandlingStrategy,
   decorators: [{
@@ -4000,16 +4014,18 @@ function createRenderPromise(injector) {
 const noop = () => {};
 const NAVIGATION_ERROR_HANDLER = new InjectionToken(typeof ngDevMode === 'undefined' || ngDevMode ? 'navigation error handler' : '');
 class NavigationTransitions {
-  currentNavigation = signal(null, ...(ngDevMode ? [{
-    debugName: "currentNavigation",
-    equal: () => false
-  }] : [{
+  currentNavigation = signal(null, {
+    ...(ngDevMode ? {
+      debugName: "currentNavigation"
+    } : {}),
     equal: () => false
-  }]));
+  });
   currentTransition = null;
-  lastSuccessfulNavigation = signal(null, ...(ngDevMode ? [{
-    debugName: "lastSuccessfulNavigation"
-  }] : []));
+  lastSuccessfulNavigation = signal(null, {
+    ...(ngDevMode ? {
+      debugName: "lastSuccessfulNavigation"
+    } : {})
+  });
   events = new Subject();
   transitionAbortWithErrorSubject = new Subject();
   configLoader = inject(RouterConfigLoader);
@@ -4075,6 +4091,9 @@ class NavigationTransitions {
     return this.transitions.pipe(filter(t => t !== null), switchMap(overallTransitionState => {
       let completedOrAborted = false;
       const abortController = new AbortController();
+      const shouldContinueNavigation = () => {
+        return !completedOrAborted && this.currentTransition?.id === overallTransitionState.id;
+      };
       return of(overallTransitionState).pipe(switchMap(t => {
         if (this.navigationId > overallTransitionState.id) {
           const cancellationReason = typeof ngDevMode === 'undefined' || ngDevMode ? `Navigation ID ${overallTransitionState.id} is not equal to the current navigation id ${this.navigationId}` : '';
@@ -4131,7 +4150,7 @@ class NavigationTransitions {
           } = t;
           const navStart = new NavigationStart(id, this.urlSerializer.serialize(extractedUrl), source, restoredState);
           this.events.next(navStart);
-          const targetSnapshot = createEmptyState(this.rootComponentType).snapshot;
+          const targetSnapshot = createEmptyState(this.rootComponentType, this.environmentInjector).snapshot;
           this.currentTransition = overallTransitionState = {
             ...t,
             targetSnapshot,
@@ -4153,48 +4172,48 @@ class NavigationTransitions {
           t.resolve(false);
           return EMPTY;
         }
-      }), tap(t => {
+      }), map(t => {
         const guardsStart = new GuardsCheckStart(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot);
         this.events.next(guardsStart);
-      }), map(t => {
         this.currentTransition = overallTransitionState = {
           ...t,
           guards: getAllRouteGuards(t.targetSnapshot, t.currentSnapshot, this.rootContexts)
         };
         return overallTransitionState;
-      }), checkGuards(this.environmentInjector, evt => this.events.next(evt)), tap(t => {
+      }), checkGuards(evt => this.events.next(evt)), switchMap(t => {
         overallTransitionState.guardsResult = t.guardsResult;
         if (t.guardsResult && typeof t.guardsResult !== 'boolean') {
           throw redirectingNavigationError(this.urlSerializer, t.guardsResult);
         }
         const guardsEnd = new GuardsCheckEnd(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot, !!t.guardsResult);
         this.events.next(guardsEnd);
-      }), filter(t => {
+        if (!shouldContinueNavigation()) {
+          return EMPTY;
+        }
         if (!t.guardsResult) {
           this.cancelNavigationTransition(t, '', NavigationCancellationCode.GuardRejected);
-          return false;
+          return EMPTY;
         }
-        return true;
-      }), switchTap(t => {
         if (t.guards.canActivateChecks.length === 0) {
-          return undefined;
+          return of(t);
+        }
+        const resolveStart = new ResolveStart(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot);
+        this.events.next(resolveStart);
+        if (!shouldContinueNavigation()) {
+          return EMPTY;
         }
-        return of(t).pipe(tap(t => {
-          const resolveStart = new ResolveStart(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot);
-          this.events.next(resolveStart);
-        }), switchMap(t => {
-          let dataResolved = false;
-          return of(t).pipe(resolveData(this.paramsInheritanceStrategy, this.environmentInjector), tap({
-            next: () => dataResolved = true,
-            complete: () => {
-              if (!dataResolved) {
-                this.cancelNavigationTransition(t, typeof ngDevMode === 'undefined' || ngDevMode ? `At least one route resolver didn't emit any value.` : '', NavigationCancellationCode.NoDataFromResolver);
-              }
+        let dataResolved = false;
+        return of(t).pipe(resolveData(this.paramsInheritanceStrategy), tap({
+          next: () => {
+            dataResolved = true;
+            const resolveEnd = new ResolveEnd(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot);
+            this.events.next(resolveEnd);
+          },
+          complete: () => {
+            if (!dataResolved) {
+              this.cancelNavigationTransition(t, typeof ngDevMode === 'undefined' || ngDevMode ? `At least one route resolver didn't emit any value.` : '', NavigationCancellationCode.NoDataFromResolver);
             }
-          }));
-        }), tap(t => {
-          const resolveEnd = new ResolveEnd(t.id, this.urlSerializer.serialize(t.extractedUrl), this.urlSerializer.serialize(t.urlAfterRedirects), t.targetSnapshot);
-          this.events.next(resolveEnd);
+          }
         }));
       }), switchTap(t => {
         const loadComponents = route => {
@@ -4202,7 +4221,7 @@ class NavigationTransitions {
           if (route.routeConfig?._loadedComponent) {
             route.component = route.routeConfig?._loadedComponent;
           } else if (route.routeConfig?.loadComponent) {
-            const injector = getClosestRouteInjector(route) ?? this.environmentInjector;
+            const injector = route._environmentInjector;
             loaders.push(this.configLoader.loadComponent(injector, route.routeConfig).then(loadedComponent => {
               route.component = loadedComponent;
             }));
@@ -4319,7 +4338,7 @@ class NavigationTransitions {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NavigationTransitions,
     deps: [],
@@ -4327,7 +4346,7 @@ class NavigationTransitions {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: NavigationTransitions,
     providedIn: 'root'
@@ -4335,7 +4354,7 @@ class NavigationTransitions {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: NavigationTransitions,
   decorators: [{
@@ -4353,7 +4372,7 @@ function isBrowserTriggeredNavigation(source) {
 class RouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouteReuseStrategy,
     deps: [],
@@ -4361,7 +4380,7 @@ class RouteReuseStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: RouteReuseStrategy,
     providedIn: 'root',
@@ -4370,7 +4389,7 @@ class RouteReuseStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: RouteReuseStrategy,
   decorators: [{
@@ -4399,7 +4418,7 @@ class BaseRouteReuseStrategy {
 class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultRouteReuseStrategy,
     deps: null,
@@ -4407,7 +4426,7 @@ class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: DefaultRouteReuseStrategy,
     providedIn: 'root'
@@ -4415,7 +4434,7 @@ class DefaultRouteReuseStrategy extends BaseRouteReuseStrategy {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: DefaultRouteReuseStrategy,
   decorators: [{
@@ -4466,13 +4485,16 @@ class StateManager {
       this.rawUrlTree = initialUrl;
     }
   }
-  routerState = createEmptyState(null);
+  routerState = createEmptyState(null, inject(EnvironmentInjector));
   getRouterState() {
     return this.routerState;
   }
-  stateMemento = this.createStateMemento();
+  _stateMemento = this.createStateMemento();
+  get stateMemento() {
+    return this._stateMemento;
+  }
   updateStateMemento() {
-    this.stateMemento = this.createStateMemento();
+    this._stateMemento = this.createStateMemento();
   }
   createStateMemento() {
     return {
@@ -4481,16 +4503,12 @@ class StateManager {
       routerState: this.routerState
     };
   }
-  resetInternalState({
-    finalUrl
-  }) {
-    this.routerState = this.stateMemento.routerState;
-    this.currentUrlTree = this.stateMemento.currentUrlTree;
-    this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, finalUrl ?? this.rawUrlTree);
+  restoredState() {
+    return this.location.getState();
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: StateManager,
     deps: [],
@@ -4498,7 +4516,7 @@ class StateManager {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: StateManager,
     providedIn: 'root',
@@ -4507,7 +4525,7 @@ class StateManager {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: StateManager,
   decorators: [{
@@ -4521,9 +4539,6 @@ i0.ɵɵngDeclareClassMetadata({
 class HistoryStateManager extends StateManager {
   currentPageId = 0;
   lastSuccessfulId = -1;
-  restoredState() {
-    return this.location.getState();
-  }
   get browserPageId() {
     if (this.canceledNavigationResolution !== 'computed') {
       return this.currentPageId;
@@ -4604,6 +4619,13 @@ class HistoryStateManager extends StateManager {
       this.resetUrlToCurrentUrlTree();
     }
   }
+  resetInternalState({
+    finalUrl
+  }) {
+    this.routerState = this.stateMemento.routerState;
+    this.currentUrlTree = this.stateMemento.currentUrlTree;
+    this.rawUrlTree = this.urlHandlingStrategy.merge(this.currentUrlTree, finalUrl ?? this.rawUrlTree);
+  }
   resetUrlToCurrentUrlTree() {
     this.location.replaceState(this.urlSerializer.serialize(this.getRawUrlTree()), '', this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));
   }
@@ -4620,7 +4642,7 @@ class HistoryStateManager extends StateManager {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: HistoryStateManager,
     deps: null,
@@ -4628,7 +4650,7 @@ class HistoryStateManager extends StateManager {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: HistoryStateManager,
     providedIn: 'root'
@@ -4636,7 +4658,7 @@ class HistoryStateManager extends StateManager {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: HistoryStateManager,
   decorators: [{
@@ -4734,6 +4756,7 @@ class Router {
             const opts = e.navigationBehaviorOptions;
             const mergedTree = this.urlHandlingStrategy.merge(e.url, currentTransition.currentRawUrl);
             const extras = {
+              scroll: currentTransition.extras.scroll,
               browserUrl: currentTransition.extras.browserUrl,
               info: currentTransition.extras.info,
               skipLocationChange: currentTransition.extras.skipLocationChange,
@@ -4950,7 +4973,7 @@ class Router {
   }
   static ɵfac = i0.ɵɵngDeclareFactory({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: Router,
     deps: [],
@@ -4958,7 +4981,7 @@ class Router {
   });
   static ɵprov = i0.ɵɵngDeclareInjectable({
     minVersion: "12.0.0",
-    version: "21.0.0",
+    version: "21.1.0-next.0",
     ngImport: i0,
     type: Router,
     providedIn: 'root'
@@ -4966,7 +4989,7 @@ class Router {
 }
 i0.ɵɵngDeclareClassMetadata({
   minVersion: "12.0.0",
-  version: "21.0.0",
+  version: "21.1.0-next.0",
   ngImport: i0,
   type: Router,
   decorators: [{
@@ -4986,5 +5009,5 @@ function validateCommands(commands) {
   }
 }
 
-export { ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, BaseRouteReuseStrategy, CREATE_VIEW_TRANSITION, ChildActivationEnd, ChildActivationStart, ChildrenOutletContexts, DefaultTitleStrategy, DefaultUrlSerializer, EventType, GuardsCheckEnd, GuardsCheckStart, HistoryStateManager, IMPERATIVE_NAVIGATION, INPUT_BINDER, NAVIGATION_ERROR_HANDLER, NavigationCancel, NavigationCancellationCode, NavigationEnd, NavigationError, NavigationSkipped, NavigationSkippedCode, NavigationStart, NavigationTransitions, OutletContext, PRIMARY_OUTLET, ROUTER_CONFIGURATION, ROUTER_OUTLET_DATA, ROUTES, RedirectCommand, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, RoutedComponentInputBinder, Router, RouterConfigLoader, RouterEvent, RouterOutlet, RouterState, RouterStateSnapshot, RoutesRecognized, Scroll, StateManager, TitleStrategy, UrlHandlingStrategy, UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree, VIEW_TRANSITION_OPTIONS, afterNextNavigation, convertToParamMap, createUrlTreeFromSnapshot, createViewTransition, defaultUrlMatcher, isUrlTree, loadChildren, provideSometimesSyncRecognize, stringifyEvent, ɵEmptyOutletComponent };
+export { ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, BaseRouteReuseStrategy, BeforeActivateRoutes, CREATE_VIEW_TRANSITION, ChildActivationEnd, ChildActivationStart, ChildrenOutletContexts, DefaultTitleStrategy, DefaultUrlSerializer, EventType, GuardsCheckEnd, GuardsCheckStart, IMPERATIVE_NAVIGATION, INPUT_BINDER, NAVIGATION_ERROR_HANDLER, NavigationCancel, NavigationCancellationCode, NavigationEnd, NavigationError, NavigationSkipped, NavigationSkippedCode, NavigationStart, NavigationTransitions, OutletContext, PRIMARY_OUTLET, ROUTER_CONFIGURATION, ROUTER_OUTLET_DATA, ROUTES, RedirectCommand, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, RoutedComponentInputBinder, Router, RouterConfigLoader, RouterEvent, RouterOutlet, RouterState, RouterStateSnapshot, RoutesRecognized, Scroll, StateManager, TitleStrategy, UrlHandlingStrategy, UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree, VIEW_TRANSITION_OPTIONS, afterNextNavigation, convertToParamMap, createUrlTreeFromSnapshot, createViewTransition, defaultUrlMatcher, isUrlTree, loadChildren, provideSometimesSyncRecognize, stringifyEvent, ɵEmptyOutletComponent };
 //# sourceMappingURL=_router-chunk.mjs.map