@angular/router 15.0.0-next.4 → 15.0.0-next.6

package/fesm2020/router.mjs

@@ -1,11 +1,11 @@
 /**
- * @license Angular v15.0.0-next.4
+ * @license Angular v15.0.0-next.6
  * (c) 2010-2022 Google LLC. https://angular.io/
  * License: MIT
  */
 
 import * as i0 from '@angular/core';
-import { ɵisObservable, ɵisPromise, ɵRuntimeError, Injectable, EventEmitter, Directive, Attribute, Output, Component, createEnvironmentInjector, ɵisStandalone, ComponentFactoryResolver, ɵisInjectable, inject, InjectionToken, InjectFlags, NgModuleFactory, Injector, Compiler, NgModuleRef, ɵConsole, NgZone, ɵcoerceToBoolean, Input, HostListener, HostBinding, Optional, ContentChildren, APP_BOOTSTRAP_LISTENER, ApplicationRef, APP_INITIALIZER, ENVIRONMENT_INITIALIZER, NgProbeToken, SkipSelf, NgModule, Inject, Version } from '@angular/core';
+import { ɵisObservable, ɵisPromise, ɵRuntimeError, Injectable, EventEmitter, inject, ViewContainerRef, ChangeDetectorRef, EnvironmentInjector, Directive, Input, Output, Component, createEnvironmentInjector, ɵisStandalone, ComponentFactoryResolver, ɵisInjectable, InjectionToken, InjectFlags, NgModuleFactory, Injector, Compiler, NgModuleRef, ɵConsole, NgZone, ɵcoerceToBoolean, ɵɵsanitizeUrlOrResourceUrl, Attribute, HostBinding, HostListener, Optional, ContentChildren, makeEnvironmentProviders, APP_BOOTSTRAP_LISTENER, ApplicationRef, APP_INITIALIZER, ENVIRONMENT_INITIALIZER, NgProbeToken, SkipSelf, NgModule, Inject, Version } from '@angular/core';
 import { from, of, BehaviorSubject, EmptyError, combineLatest, concat, defer, pipe, throwError, Observable, EMPTY, ConnectableObservable, Subject } from 'rxjs';
 import * as i3 from '@angular/common';
 import { Location, ViewportScroller, LOCATION_INITIALIZED, LocationStrategy, HashLocationStrategy, PathLocationStrategy } from '@angular/common';
@@ -461,9 +461,9 @@ function mapChildrenIntoArray(segment, fn) {
  */
 class UrlSerializer {
 }
-UrlSerializer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: UrlSerializer, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-UrlSerializer.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: UrlSerializer, providedIn: 'root', useFactory: () => new DefaultUrlSerializer() });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: UrlSerializer, decorators: [{
+UrlSerializer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: UrlSerializer, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+UrlSerializer.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: UrlSerializer, providedIn: 'root', useFactory: () => new DefaultUrlSerializer() });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: UrlSerializer, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root', useFactory: () => new DefaultUrlSerializer() }]
         }] });
@@ -2388,9 +2388,9 @@ class ChildrenOutletContexts {
         return this.contexts.get(childName) || null;
     }
 }
-ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: ChildrenOutletContexts, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: ChildrenOutletContexts, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: ChildrenOutletContexts, decorators: [{
+ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: ChildrenOutletContexts, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: ChildrenOutletContexts, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: ChildrenOutletContexts, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -2455,13 +2455,15 @@ const NG_DEV_MODE$7 = typeof ngDevMode === 'undefined' || ngDevMode;
  * @publicApi
  */
 class RouterOutlet {
-    constructor(parentContexts, location, name, changeDetector, environmentInjector) {
-        this.parentContexts = parentContexts;
-        this.location = location;
-        this.changeDetector = changeDetector;
-        this.environmentInjector = environmentInjector;
+    constructor() {
         this.activated = null;
         this._activatedRoute = null;
+        /**
+         * The name of the outlet
+         *
+         * @see [named outlets](guide/router-tutorial-toh#displaying-multiple-routes-in-named-outlets)
+         */
+        this.name = PRIMARY_OUTLET;
         this.activateEvents = new EventEmitter();
         this.deactivateEvents = new EventEmitter();
         /**
@@ -2474,31 +2476,59 @@ class RouterOutlet {
          * subtree.
          */
         this.detachEvents = new EventEmitter();
-        this.name = name || PRIMARY_OUTLET;
-        parentContexts.onChildOutletCreated(this.name, this);
+        this.parentContexts = inject(ChildrenOutletContexts);
+        this.location = inject(ViewContainerRef);
+        this.changeDetector = inject(ChangeDetectorRef);
+        this.environmentInjector = inject(EnvironmentInjector);
+    }
+    /** @nodoc */
+    ngOnChanges(changes) {
+        if (changes['name']) {
+            const { firstChange, previousValue } = changes['name'];
+            if (firstChange) {
+                // The first change is handled by ngOnInit. Because ngOnChanges doesn't get called when no
+                // input is set at all, we need to centrally handle the first change there.
+                return;
+            }
+            // unregister with the old name
+            if (this.isTrackedInParentContexts(previousValue)) {
+                this.deactivate();
+                this.parentContexts.onChildOutletDestroyed(previousValue);
+            }
+            // register the new name
+            this.initializeOutletWithName();
+        }
     }
     /** @nodoc */
     ngOnDestroy() {
         // Ensure that the registered outlet is this one before removing it on the context.
-        if (this.parentContexts.getContext(this.name)?.outlet === this) {
+        if (this.isTrackedInParentContexts(this.name)) {
             this.parentContexts.onChildOutletDestroyed(this.name);
         }
     }
+    isTrackedInParentContexts(outletName) {
+        return this.parentContexts.getContext(outletName)?.outlet === this;
+    }
     /** @nodoc */
     ngOnInit() {
-        if (!this.activated) {
-            // If the outlet was not instantiated at the time the route got activated we need to populate
-            // the outlet when it is initialized (ie inside a NgIf)
-            const context = this.parentContexts.getContext(this.name);
-            if (context && context.route) {
-                if (context.attachRef) {
-                    // `attachRef` is populated when there is an existing component to mount
-                    this.attach(context.attachRef, context.route);
-                }
-                else {
-                    // otherwise the component defined in the configuration is created
-                    this.activateWith(context.route, context.injector);
-                }
+        this.initializeOutletWithName();
+    }
+    initializeOutletWithName() {
+        this.parentContexts.onChildOutletCreated(this.name, this);
+        if (this.activated) {
+            return;
+        }
+        // If the outlet was not instantiated at the time the route got activated we need to populate
+        // the outlet when it is initialized (ie inside a NgIf)
+        const context = this.parentContexts.getContext(this.name);
+        if (context?.route) {
+            if (context.attachRef) {
+                // `attachRef` is populated when there is an existing component to mount
+                this.attach(context.attachRef, context.route);
+            }
+            else {
+                // otherwise the component defined in the configuration is created
+                this.activateWith(context.route, context.injector);
             }
         }
     }
@@ -2580,19 +2610,18 @@ class RouterOutlet {
         this.activateEvents.emit(this.activated.instance);
     }
 }
-RouterOutlet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterOutlet, deps: [{ token: ChildrenOutletContexts }, { token: i0.ViewContainerRef }, { token: 'name', attribute: true }, { token: i0.ChangeDetectorRef }, { token: i0.EnvironmentInjector }], target: i0.ɵɵFactoryTarget.Directive });
-RouterOutlet.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.4", type: RouterOutlet, isStandalone: true, selector: "router-outlet", outputs: { activateEvents: "activate", deactivateEvents: "deactivate", attachEvents: "attach", detachEvents: "detach" }, exportAs: ["outlet"], ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterOutlet, decorators: [{
+RouterOutlet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterOutlet, deps: [], target: i0.ɵɵFactoryTarget.Directive });
+RouterOutlet.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.6", type: RouterOutlet, isStandalone: true, selector: "router-outlet", inputs: { name: "name" }, outputs: { activateEvents: "activate", deactivateEvents: "deactivate", attachEvents: "attach", detachEvents: "detach" }, exportAs: ["outlet"], usesOnChanges: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterOutlet, decorators: [{
             type: Directive,
             args: [{
                     selector: 'router-outlet',
                     exportAs: 'outlet',
                     standalone: true,
                 }]
-        }], ctorParameters: function () { return [{ type: ChildrenOutletContexts }, { type: i0.ViewContainerRef }, { type: undefined, decorators: [{
-                    type: Attribute,
-                    args: ['name']
-                }] }, { type: i0.ChangeDetectorRef }, { type: i0.EnvironmentInjector }]; }, propDecorators: { activateEvents: [{
+        }], propDecorators: { name: [{
+                type: Input
+            }], activateEvents: [{
                 type: Output,
                 args: ['activate']
             }], deactivateEvents: [{
@@ -2643,9 +2672,9 @@ function isComponentFactoryResolver(item) {
  */
 class ɵEmptyOutletComponent {
 }
-ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: ɵEmptyOutletComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
-ɵEmptyOutletComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.0-next.4", type: ɵEmptyOutletComponent, isStandalone: true, selector: "ng-component", ngImport: i0, template: `<router-outlet></router-outlet>`, isInline: true, dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: ɵEmptyOutletComponent, decorators: [{
+ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: ɵEmptyOutletComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
+ɵEmptyOutletComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "15.0.0-next.6", type: ɵEmptyOutletComponent, isStandalone: true, selector: "ng-component", ngImport: i0, template: `<router-outlet></router-outlet>`, isInline: true, dependencies: [{ kind: "directive", type: RouterOutlet, selector: "router-outlet", inputs: ["name"], outputs: ["activate", "deactivate", "attach", "detach"], exportAs: ["outlet"] }] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: ɵEmptyOutletComponent, decorators: [{
             type: Component,
             args: [{
                     template: `<router-outlet></router-outlet>`,
@@ -4331,9 +4360,9 @@ class TitleStrategy {
         return snapshot.data[RouteTitleKey];
     }
 }
-TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: TitleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: TitleStrategy, providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: TitleStrategy, decorators: [{
+TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: TitleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: TitleStrategy, providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: TitleStrategy, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) }]
         }] });
@@ -4357,9 +4386,9 @@ class DefaultTitleStrategy extends TitleStrategy {
         }
     }
 }
-DefaultTitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: DefaultTitleStrategy, deps: [{ token: i1.Title }], target: i0.ɵɵFactoryTarget.Injectable });
-DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: DefaultTitleStrategy, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: DefaultTitleStrategy, decorators: [{
+DefaultTitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: DefaultTitleStrategy, deps: [{ token: i1.Title }], target: i0.ɵɵFactoryTarget.Injectable });
+DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: DefaultTitleStrategy, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: DefaultTitleStrategy, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: i1.Title }]; } });
@@ -4459,6 +4488,17 @@ const ROUTER_CONFIGURATION = new InjectionToken(NG_DEV_MODE$4 ? 'router config'
     factory: () => ({}),
 });
 
+/**
+ * @license
+ * Copyright Google LLC All Rights Reserved.
+ *
+ * Use of this source code is governed by an MIT-style license that can be
+ * found in the LICENSE file at https://angular.io/license
+ */
+function deprecatedLoadChildrenString(injector, loadChildren) {
+    return null;
+}
+
 /**
  * @license
  * Copyright Google LLC All Rights Reserved.
@@ -4496,7 +4536,7 @@ class RouterConfigLoader {
             this.onLoadStartListener(route);
         }
         const loadRunner = wrapIntoObservable(route.loadComponent())
-            .pipe(tap(component => {
+            .pipe(map(maybeUnwrapDefaultExport), tap(component => {
             if (this.onLoadEndListener) {
                 this.onLoadEndListener(route);
             }
@@ -4555,7 +4595,12 @@ class RouterConfigLoader {
         return loader;
     }
     loadModuleFactoryOrRoutes(loadChildren) {
-        return wrapIntoObservable(loadChildren()).pipe(mergeMap((t) => {
+        const deprecatedResult = deprecatedLoadChildrenString(this.injector, loadChildren);
+        if (deprecatedResult) {
+            return deprecatedResult;
+        }
+        return wrapIntoObservable(loadChildren())
+            .pipe(map(maybeUnwrapDefaultExport), mergeMap((t) => {
             if (t instanceof NgModuleFactory || Array.isArray(t)) {
                 return of(t);
             }
@@ -4565,12 +4610,23 @@ class RouterConfigLoader {
         }));
     }
 }
-RouterConfigLoader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterConfigLoader, deps: [{ token: i0.Injector }, { token: i0.Compiler }], target: i0.ɵɵFactoryTarget.Injectable });
-RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterConfigLoader, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterConfigLoader, decorators: [{
+RouterConfigLoader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterConfigLoader, deps: [{ token: i0.Injector }, { token: i0.Compiler }], target: i0.ɵɵFactoryTarget.Injectable });
+RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterConfigLoader, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterConfigLoader, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: i0.Injector }, { type: i0.Compiler }]; } });
+function isWrappedDefaultExport(value) {
+    // We use `in` here with a string key `'default'`, because we expect `DefaultExport` objects to be
+    // dynamically imported ES modules with a spec-mandated `default` key. Thus we don't expect that
+    // `default` will be a renamed property.
+    return value && typeof value === 'object' && 'default' in value;
+}
+function maybeUnwrapDefaultExport(input) {
+    // As per `isWrappedDefaultExport`, the `default` key here is generated by the browser and not
+    // subject to property renaming, so we reference it with bracket access.
+    return isWrappedDefaultExport(input) ? input['default'] : input;
+}
 
 /**
  * @license
@@ -4650,9 +4706,6 @@ function assignExtraOptionsToRouter(opts, router) {
     if (opts.paramsInheritanceStrategy) {
         router.paramsInheritanceStrategy = opts.paramsInheritanceStrategy;
     }
-    if (opts.relativeLinkResolution) {
-        router.relativeLinkResolution = opts.relativeLinkResolution;
-    }
     if (opts.urlUpdateStrategy) {
         router.urlUpdateStrategy = opts.urlUpdateStrategy;
     }
@@ -4791,10 +4844,9 @@ class Router {
          */
         this.urlUpdateStrategy = 'deferred';
         /**
-         * Enables a bug fix that corrects relative link resolution in components with empty paths.
-         * @see `RouterModule`
-         *
-         * @deprecated
+         * TODO(atscott): Remove all references to relativeLinkResolution when internal cleanup is
+         * finished.
+         * @internal
          */
         this.relativeLinkResolution = 'corrected';
         /**
@@ -5595,9 +5647,9 @@ class Router {
         return { navigationId };
     }
 }
-Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: Router, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
-Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: Router, providedIn: 'root', useFactory: setupRouter });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: Router, decorators: [{
+Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: Router, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
+Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: Router, providedIn: 'root', useFactory: setupRouter });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: Router, decorators: [{
             type: Injectable,
             args: [{
                     providedIn: 'root',
@@ -5721,19 +5773,36 @@ function isBrowserTriggeredNavigation(source) {
  * @publicApi
  */
 class RouterLink {
-    constructor(router, route, tabIndexAttribute, renderer, el) {
+    constructor(router, route, tabIndexAttribute, renderer, el, locationStrategy) {
         this.router = router;
         this.route = route;
         this.tabIndexAttribute = tabIndexAttribute;
         this.renderer = renderer;
         this.el = el;
+        this.locationStrategy = locationStrategy;
         this._preserveFragment = false;
         this._skipLocationChange = false;
         this._replaceUrl = false;
+        /**
+         * Represents an `href` attribute value applied to a host element,
+         * when a host element is `<a>`. For other tags, the value is `null`.
+         */
+        this.href = null;
         this.commands = null;
         /** @internal */
         this.onChanges = new Subject();
-        this.setTabIndexIfNotOnNativeEl('0');
+        const tagName = el.nativeElement.tagName;
+        this.isAnchorElement = tagName === 'A' || tagName === 'AREA';
+        if (this.isAnchorElement) {
+            this.subscription = router.events.subscribe((s) => {
+                if (s instanceof NavigationEnd) {
+                    this.updateHref();
+                }
+            });
+        }
+        else {
+            this.setTabIndexIfNotOnNativeEl('0');
+        }
     }
     /**
      * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
@@ -5776,20 +5845,16 @@ class RouterLink {
      * instantiation.
      */
     setTabIndexIfNotOnNativeEl(newTabIndex) {
-        if (this.tabIndexAttribute != null /* both `null` and `undefined` */) {
+        if (this.tabIndexAttribute != null /* both `null` and `undefined` */ || this.isAnchorElement) {
             return;
         }
-        const renderer = this.renderer;
-        const nativeElement = this.el.nativeElement;
-        if (newTabIndex !== null) {
-            renderer.setAttribute(nativeElement, 'tabindex', newTabIndex);
-        }
-        else {
-            renderer.removeAttribute(nativeElement, 'tabindex');
-        }
+        this.applyAttributeValue('tabindex', newTabIndex);
     }
     /** @nodoc */
     ngOnChanges(changes) {
+        if (this.isAnchorElement) {
+            this.updateHref();
+        }
         // This is subscribed to by `RouterLinkActive` so that it knows to update when there are changes
         // to the RouterLinks it's tracking.
         this.onChanges.next(this);
@@ -5812,178 +5877,61 @@ class RouterLink {
         }
     }
     /** @nodoc */
-    onClick() {
+    onClick(button, ctrlKey, shiftKey, altKey, metaKey) {
         if (this.urlTree === null) {
             return true;
         }
+        if (this.isAnchorElement) {
+            if (button !== 0 || ctrlKey || shiftKey || altKey || metaKey) {
+                return true;
+            }
+            if (typeof this.target === 'string' && this.target != '_self') {
+                return true;
+            }
+        }
         const extras = {
             skipLocationChange: this.skipLocationChange,
             replaceUrl: this.replaceUrl,
             state: this.state,
         };
         this.router.navigateByUrl(this.urlTree, extras);
-        return true;
-    }
-    get urlTree() {
-        if (this.commands === null) {
-            return null;
-        }
-        return this.router.createUrlTree(this.commands, {
-            // If the `relativeTo` input is not defined, we want to use `this.route` by default.
-            // Otherwise, we should use the value provided by the user in the input.
-            relativeTo: this.relativeTo !== undefined ? this.relativeTo : this.route,
-            queryParams: this.queryParams,
-            fragment: this.fragment,
-            queryParamsHandling: this.queryParamsHandling,
-            preserveFragment: this.preserveFragment,
-        });
-    }
-}
-RouterLink.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLink, deps: [{ token: Router }, { token: ActivatedRoute }, { token: 'tabindex', attribute: true }, { token: i0.Renderer2 }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Directive });
-RouterLink.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.4", type: RouterLink, isStandalone: true, selector: ":not(a):not(area)[routerLink]", inputs: { queryParams: "queryParams", fragment: "fragment", queryParamsHandling: "queryParamsHandling", state: "state", relativeTo: "relativeTo", preserveFragment: "preserveFragment", skipLocationChange: "skipLocationChange", replaceUrl: "replaceUrl", routerLink: "routerLink" }, host: { listeners: { "click": "onClick()" } }, usesOnChanges: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLink, decorators: [{
-            type: Directive,
-            args: [{
-                    selector: ':not(a):not(area)[routerLink]',
-                    standalone: true,
-                }]
-        }], ctorParameters: function () { return [{ type: Router }, { type: ActivatedRoute }, { type: undefined, decorators: [{
-                    type: Attribute,
-                    args: ['tabindex']
-                }] }, { type: i0.Renderer2 }, { type: i0.ElementRef }]; }, propDecorators: { queryParams: [{
-                type: Input
-            }], fragment: [{
-                type: Input
-            }], queryParamsHandling: [{
-                type: Input
-            }], state: [{
-                type: Input
-            }], relativeTo: [{
-                type: Input
-            }], preserveFragment: [{
-                type: Input
-            }], skipLocationChange: [{
-                type: Input
-            }], replaceUrl: [{
-                type: Input
-            }], routerLink: [{
-                type: Input
-            }], onClick: [{
-                type: HostListener,
-                args: ['click']
-            }] } });
-/**
- * @description
- *
- * Lets you link to specific routes in your app.
- *
- * See `RouterLink` for more information.
- *
- * @ngModule RouterModule
- *
- * @publicApi
- */
-class RouterLinkWithHref {
-    constructor(router, route, locationStrategy) {
-        this.router = router;
-        this.route = route;
-        this.locationStrategy = locationStrategy;
-        this._preserveFragment = false;
-        this._skipLocationChange = false;
-        this._replaceUrl = false;
-        this.commands = null;
-        // the url displayed on the anchor element.
-        // @HostBinding('attr.href') is used rather than @HostBinding() because it removes the
-        // href attribute when it becomes `null`.
-        this.href = null;
-        /** @internal */
-        this.onChanges = new Subject();
-        this.subscription = router.events.subscribe((s) => {
-            if (s instanceof NavigationEnd) {
-                this.updateTargetUrlAndHref();
-            }
-        });
-    }
-    /**
-     * Passed to {@link Router#createUrlTree Router#createUrlTree} as part of the
-     * `UrlCreationOptions`.
-     * @see {@link UrlCreationOptions#preserveFragment UrlCreationOptions#preserveFragment}
-     * @see {@link Router#createUrlTree Router#createUrlTree}
-     */
-    set preserveFragment(preserveFragment) {
-        this._preserveFragment = ɵcoerceToBoolean(preserveFragment);
-    }
-    get preserveFragment() {
-        return this._preserveFragment;
-    }
-    /**
-     * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
-     * `NavigationBehaviorOptions`.
-     * @see {@link NavigationBehaviorOptions#skipLocationChange NavigationBehaviorOptions#skipLocationChange}
-     * @see {@link Router#navigateByUrl Router#navigateByUrl}
-     */
-    set skipLocationChange(skipLocationChange) {
-        this._skipLocationChange = ɵcoerceToBoolean(skipLocationChange);
-    }
-    get skipLocationChange() {
-        return this._skipLocationChange;
-    }
-    /**
-     * Passed to {@link Router#navigateByUrl Router#navigateByUrl} as part of the
-     * `NavigationBehaviorOptions`.
-     * @see {@link NavigationBehaviorOptions#replaceUrl NavigationBehaviorOptions#replaceUrl}
-     * @see {@link Router#navigateByUrl Router#navigateByUrl}
-     */
-    set replaceUrl(replaceUrl) {
-        this._replaceUrl = ɵcoerceToBoolean(replaceUrl);
-    }
-    get replaceUrl() {
-        return this._replaceUrl;
-    }
-    /**
-     * Commands to pass to {@link Router#createUrlTree Router#createUrlTree}.
-     *   - **array**: commands to pass to {@link Router#createUrlTree Router#createUrlTree}.
-     *   - **string**: shorthand for array of commands with just the string, i.e. `['/route']`
-     *   - **null|undefined**: Disables the link by removing the `href`
-     * @see {@link Router#createUrlTree Router#createUrlTree}
-     */
-    set routerLink(commands) {
-        if (commands != null) {
-            this.commands = Array.isArray(commands) ? commands : [commands];
-        }
-        else {
-            this.commands = null;
-        }
-    }
-    /** @nodoc */
-    ngOnChanges(changes) {
-        this.updateTargetUrlAndHref();
-        this.onChanges.next(this);
+        // Return `false` for `<a>` elements to prevent default action
+        // and cancel the native behavior, since the navigation is handled
+        // by the Router.
+        return !this.isAnchorElement;
     }
     /** @nodoc */
     ngOnDestroy() {
-        this.subscription.unsubscribe();
+        this.subscription?.unsubscribe();
     }
-    /** @nodoc */
-    onClick(button, ctrlKey, shiftKey, altKey, metaKey) {
-        if (button !== 0 || ctrlKey || shiftKey || altKey || metaKey) {
-            return true;
+    updateHref() {
+        this.href = this.urlTree !== null && this.locationStrategy ?
+            this.locationStrategy?.prepareExternalUrl(this.router.serializeUrl(this.urlTree)) :
+            null;
+        const sanitizedValue = this.href === null ?
+            null :
+            // This class represents a directive that can be added to both `<a>` elements,
+            // as well as other elements. As a result, we can't define security context at
+            // compile time. So the security context is deferred to runtime.
+            // The `ɵɵsanitizeUrlOrResourceUrl` selects the necessary sanitizer function
+            // based on the tag and property names. The logic mimics the one from
+            // `packages/compiler/src/schema/dom_security_schema.ts`, which is used at compile time.
+            //
+            // Note: we should investigate whether we can switch to using `@HostBinding('attr.href')`
+            // instead of applying a value via a renderer, after a final merge of the
+            // `RouterLinkWithHref` directive.
+            ɵɵsanitizeUrlOrResourceUrl(this.href, this.el.nativeElement.tagName.toLowerCase(), 'href');
+        this.applyAttributeValue('href', sanitizedValue);
+    }
+    applyAttributeValue(attrName, attrValue) {
+        const renderer = this.renderer;
+        const nativeElement = this.el.nativeElement;
+        if (attrValue !== null) {
+            renderer.setAttribute(nativeElement, attrName, attrValue);
         }
-        if (typeof this.target === 'string' && this.target != '_self' || this.urlTree === null) {
-            return true;
+        else {
+            renderer.removeAttribute(nativeElement, attrName);
         }
-        const extras = {
-            skipLocationChange: this.skipLocationChange,
-            replaceUrl: this.replaceUrl,
-            state: this.state
-        };
-        this.router.navigateByUrl(this.urlTree, extras);
-        return false;
-    }
-    updateTargetUrlAndHref() {
-        this.href = this.urlTree !== null ?
-            this.locationStrategy.prepareExternalUrl(this.router.serializeUrl(this.urlTree)) :
-            null;
     }
     get urlTree() {
         if (this.commands === null) {
@@ -6000,12 +5948,18 @@ class RouterLinkWithHref {
         });
     }
 }
-RouterLinkWithHref.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLinkWithHref, deps: [{ token: Router }, { token: ActivatedRoute }, { token: i3.LocationStrategy }], target: i0.ɵɵFactoryTarget.Directive });
-RouterLinkWithHref.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.4", type: RouterLinkWithHref, isStandalone: true, selector: "a[routerLink],area[routerLink]", inputs: { target: "target", queryParams: "queryParams", fragment: "fragment", queryParamsHandling: "queryParamsHandling", state: "state", relativeTo: "relativeTo", preserveFragment: "preserveFragment", skipLocationChange: "skipLocationChange", replaceUrl: "replaceUrl", routerLink: "routerLink" }, host: { listeners: { "click": "onClick($event.button,$event.ctrlKey,$event.shiftKey,$event.altKey,$event.metaKey)" }, properties: { "attr.target": "this.target", "attr.href": "this.href" } }, usesOnChanges: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLinkWithHref, decorators: [{
+RouterLink.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterLink, deps: [{ token: Router }, { token: ActivatedRoute }, { token: 'tabindex', attribute: true }, { token: i0.Renderer2 }, { token: i0.ElementRef }, { token: i3.LocationStrategy }], target: i0.ɵɵFactoryTarget.Directive });
+RouterLink.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.6", type: RouterLink, isStandalone: true, selector: ":not(a):not(area)[routerLink],a[routerLink],area[routerLink]", inputs: { target: "target", queryParams: "queryParams", fragment: "fragment", queryParamsHandling: "queryParamsHandling", state: "state", relativeTo: "relativeTo", preserveFragment: "preserveFragment", skipLocationChange: "skipLocationChange", replaceUrl: "replaceUrl", routerLink: "routerLink" }, host: { listeners: { "click": "onClick($event.button,$event.ctrlKey,$event.shiftKey,$event.altKey,$event.metaKey)" }, properties: { "attr.target": "this.target" } }, usesOnChanges: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterLink, decorators: [{
             type: Directive,
-            args: [{ selector: 'a[routerLink],area[routerLink]', standalone: true }]
-        }], ctorParameters: function () { return [{ type: Router }, { type: ActivatedRoute }, { type: i3.LocationStrategy }]; }, propDecorators: { target: [{
+            args: [{
+                    selector: ':not(a):not(area)[routerLink],a[routerLink],area[routerLink]',
+                    standalone: true,
+                }]
+        }], ctorParameters: function () { return [{ type: Router }, { type: ActivatedRoute }, { type: undefined, decorators: [{
+                    type: Attribute,
+                    args: ['tabindex']
+                }] }, { type: i0.Renderer2 }, { type: i0.ElementRef }, { type: i3.LocationStrategy }]; }, propDecorators: { target: [{
                 type: HostBinding,
                 args: ['attr.target']
             }, {
@@ -6020,9 +5974,6 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4",
                 type: Input
             }], relativeTo: [{
                 type: Input
-            }], href: [{
-                type: HostBinding,
-                args: ['attr.href']
             }], preserveFragment: [{
                 type: Input
             }], skipLocationChange: [{
@@ -6114,13 +6065,12 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4",
  * @publicApi
  */
 class RouterLinkActive {
-    constructor(router, element, renderer, cdr, link, linkWithHref) {
+    constructor(router, element, renderer, cdr, link) {
         this.router = router;
         this.element = element;
         this.renderer = renderer;
         this.cdr = cdr;
         this.link = link;
-        this.linkWithHref = linkWithHref;
         this.classes = [];
         this.isActive = false;
         /**
@@ -6157,14 +6107,14 @@ class RouterLinkActive {
     /** @nodoc */
     ngAfterContentInit() {
         // `of(null)` is used to force subscribe body to execute once immediately (like `startWith`).
-        of(this.links.changes, this.linksWithHrefs.changes, of(null)).pipe(mergeAll()).subscribe(_ => {
+        of(this.links.changes, of(null)).pipe(mergeAll()).subscribe(_ => {
             this.update();
             this.subscribeToEachLinkOnChanges();
         });
     }
     subscribeToEachLinkOnChanges() {
         this.linkInputChangesSubscription?.unsubscribe();
-        const allLinkChanges = [...this.links.toArray(), ...this.linksWithHrefs.toArray(), this.link, this.linkWithHref]
+        const allLinkChanges = [...this.links.toArray(), this.link]
             .filter((link) => !!link)
             .map(link => link.onChanges);
         this.linkInputChangesSubscription = from(allLinkChanges).pipe(mergeAll()).subscribe(link => {
@@ -6187,7 +6137,7 @@ class RouterLinkActive {
         this.linkInputChangesSubscription?.unsubscribe();
     }
     update() {
-        if (!this.links || !this.linksWithHrefs || !this.router.navigated)
+        if (!this.links || !this.router.navigated)
             return;
         Promise.resolve().then(() => {
             const hasActiveLinks = this.hasActiveLinks();
@@ -6222,14 +6172,12 @@ class RouterLinkActive {
     }
     hasActiveLinks() {
         const isActiveCheckFn = this.isLinkActive(this.router);
-        return this.link && isActiveCheckFn(this.link) ||
-            this.linkWithHref && isActiveCheckFn(this.linkWithHref) ||
-            this.links.some(isActiveCheckFn) || this.linksWithHrefs.some(isActiveCheckFn);
+        return this.link && isActiveCheckFn(this.link) || this.links.some(isActiveCheckFn);
     }
 }
-RouterLinkActive.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLinkActive, deps: [{ token: Router }, { token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.ChangeDetectorRef }, { token: RouterLink, optional: true }, { token: RouterLinkWithHref, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
-RouterLinkActive.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.4", type: RouterLinkActive, isStandalone: true, selector: "[routerLinkActive]", inputs: { routerLinkActiveOptions: "routerLinkActiveOptions", ariaCurrentWhenActive: "ariaCurrentWhenActive", routerLinkActive: "routerLinkActive" }, outputs: { isActiveChange: "isActiveChange" }, queries: [{ propertyName: "links", predicate: RouterLink, descendants: true }, { propertyName: "linksWithHrefs", predicate: RouterLinkWithHref, descendants: true }], exportAs: ["routerLinkActive"], usesOnChanges: true, ngImport: i0 });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterLinkActive, decorators: [{
+RouterLinkActive.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterLinkActive, deps: [{ token: Router }, { token: i0.ElementRef }, { token: i0.Renderer2 }, { token: i0.ChangeDetectorRef }, { token: RouterLink, optional: true }], target: i0.ɵɵFactoryTarget.Directive });
+RouterLinkActive.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "15.0.0-next.6", type: RouterLinkActive, isStandalone: true, selector: "[routerLinkActive]", inputs: { routerLinkActiveOptions: "routerLinkActiveOptions", ariaCurrentWhenActive: "ariaCurrentWhenActive", routerLinkActive: "routerLinkActive" }, outputs: { isActiveChange: "isActiveChange" }, queries: [{ propertyName: "links", predicate: RouterLink, descendants: true }], exportAs: ["routerLinkActive"], usesOnChanges: true, ngImport: i0 });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterLinkActive, decorators: [{
             type: Directive,
             args: [{
                     selector: '[routerLinkActive]',
@@ -6238,14 +6186,9 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4",
                 }]
         }], ctorParameters: function () { return [{ type: Router }, { type: i0.ElementRef }, { type: i0.Renderer2 }, { type: i0.ChangeDetectorRef }, { type: RouterLink, decorators: [{
                     type: Optional
-                }] }, { type: RouterLinkWithHref, decorators: [{
-                    type: Optional
                 }] }]; }, propDecorators: { links: [{
                 type: ContentChildren,
                 args: [RouterLink, { descendants: true }]
-            }], linksWithHrefs: [{
-                type: ContentChildren,
-                args: [RouterLinkWithHref, { descendants: true }]
             }], routerLinkActiveOptions: [{
                 type: Input
             }], ariaCurrentWhenActive: [{
@@ -6294,9 +6237,9 @@ class PreloadAllModules {
         return fn().pipe(catchError(() => of(null)));
     }
 }
-PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: PreloadAllModules, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: PreloadAllModules, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: PreloadAllModules, decorators: [{
+PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: PreloadAllModules, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: PreloadAllModules, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: PreloadAllModules, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -6314,9 +6257,9 @@ class NoPreloading {
         return of(null);
     }
 }
-NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: NoPreloading, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
-NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: NoPreloading, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: NoPreloading, decorators: [{
+NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: NoPreloading, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
+NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: NoPreloading, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: NoPreloading, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }] });
@@ -6410,9 +6353,9 @@ class RouterPreloader {
         });
     }
 }
-RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterPreloader, deps: [{ token: Router }, { token: i0.Compiler }, { token: i0.EnvironmentInjector }, { token: PreloadingStrategy }, { token: RouterConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
-RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterPreloader, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterPreloader, decorators: [{
+RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterPreloader, deps: [{ token: Router }, { token: i0.Compiler }, { token: i0.EnvironmentInjector }, { token: PreloadingStrategy }, { token: RouterConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
+RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterPreloader, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterPreloader, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: Router }, { type: i0.Compiler }, { type: i0.EnvironmentInjector }, { type: PreloadingStrategy }, { type: RouterConfigLoader }]; } });
@@ -6500,9 +6443,9 @@ class RouterScroller {
         }
     }
 }
-RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterScroller, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
-RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterScroller });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterScroller, decorators: [{
+RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterScroller, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
+RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterScroller });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterScroller, decorators: [{
             type: Injectable
         }], ctorParameters: function () { return [{ type: Router }, { type: i3.ViewportScroller }, { type: undefined }]; } });
 
@@ -6552,7 +6495,7 @@ const NG_DEV_MODE$1 = typeof ngDevMode === 'undefined' || ngDevMode;
  * @returns A set of providers to setup a Router.
  */
 function provideRouter(routes, ...features) {
-    return [
+    return makeEnvironmentProviders([
         provideRoutes(routes), { provide: ActivatedRoute, useFactory: rootRoute, deps: [Router] },
         { provide: APP_BOOTSTRAP_LISTENER, multi: true, useFactory: getBootstrapListener },
         features.map(feature => feature.ɵproviders),
@@ -6560,7 +6503,7 @@ function provideRouter(routes, ...features) {
         // how we want them to be configured. This API doesn't currently have a way to configure them
         // and we should decide what the _best_ way to do that is rather than just sticking with the
         // status quo of how it's done today.
-    ];
+    ]);
 }
 function rootRoute(router) {
     return router.routerState.root;
@@ -6926,7 +6869,7 @@ const NG_DEV_MODE = typeof ngDevMode === 'undefined' || ngDevMode;
 /**
  * The directives defined in the `RouterModule`.
  */
-const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, ɵEmptyOutletComponent];
+const ROUTER_DIRECTIVES = [RouterOutlet, RouterLink, RouterLinkActive, ɵEmptyOutletComponent];
 /**
  * @docsNotRequired
  */
@@ -7029,10 +6972,10 @@ class RouterModule {
         return { ngModule: RouterModule, providers: [provideRoutes(routes)] };
     }
 }
-RouterModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterModule, deps: [{ token: ROUTER_FORROOT_GUARD, optional: true }], target: i0.ɵɵFactoryTarget.NgModule });
-RouterModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterModule, imports: [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, ɵEmptyOutletComponent], exports: [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, ɵEmptyOutletComponent] });
-RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterModule, imports: [ɵEmptyOutletComponent] });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.4", ngImport: i0, type: RouterModule, decorators: [{
+RouterModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterModule, deps: [{ token: ROUTER_FORROOT_GUARD, optional: true }], target: i0.ɵɵFactoryTarget.NgModule });
+RouterModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterModule, imports: [RouterOutlet, RouterLink, RouterLinkActive, ɵEmptyOutletComponent], exports: [RouterOutlet, RouterLink, RouterLinkActive, ɵEmptyOutletComponent] });
+RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterModule, imports: [ɵEmptyOutletComponent] });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.0-next.6", ngImport: i0, type: RouterModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: ROUTER_DIRECTIVES,
@@ -7116,7 +7059,7 @@ function provideRouterInitializer() {
 /**
  * @publicApi
  */
-const VERSION = new Version('15.0.0-next.4');
+const VERSION = new Version('15.0.0-next.6');
 
 /**
  * @license
@@ -7155,5 +7098,5 @@ const VERSION = new Version('15.0.0-next.4');
  * Generated bundle index. Do not edit.
  */
 
-export { ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, BaseRouteReuseStrategy, ChildActivationEnd, ChildActivationStart, ChildrenOutletContexts, DefaultTitleStrategy, DefaultUrlSerializer, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, NoPreloading, OutletContext, PRIMARY_OUTLET, PreloadAllModules, PreloadingStrategy, ROUTER_CONFIGURATION, ROUTER_INITIALIZER, ROUTES, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterLink, RouterLinkActive, RouterLinkWithHref, RouterModule, RouterOutlet, RouterPreloader, RouterState, RouterStateSnapshot, RoutesRecognized, Scroll, TitleStrategy, UrlHandlingStrategy, UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree, VERSION, convertToParamMap, createUrlTreeFromSnapshot, defaultUrlMatcher, provideRouter, provideRoutes, withDebugTracing, withDisabledInitialNavigation, withEnabledBlockingInitialNavigation, withInMemoryScrolling, withPreloading, withRouterConfig, ɵEmptyOutletComponent, ROUTER_PROVIDERS as ɵROUTER_PROVIDERS, assignExtraOptionsToRouter as ɵassignExtraOptionsToRouter, flatten as ɵflatten, withPreloading as ɵwithPreloading };
+export { ActivatedRoute, ActivatedRouteSnapshot, ActivationEnd, ActivationStart, BaseRouteReuseStrategy, ChildActivationEnd, ChildActivationStart, ChildrenOutletContexts, DefaultTitleStrategy, DefaultUrlSerializer, GuardsCheckEnd, GuardsCheckStart, NavigationCancel, NavigationEnd, NavigationError, NavigationStart, NoPreloading, OutletContext, PRIMARY_OUTLET, PreloadAllModules, PreloadingStrategy, ROUTER_CONFIGURATION, ROUTER_INITIALIZER, ROUTES, ResolveEnd, ResolveStart, RouteConfigLoadEnd, RouteConfigLoadStart, RouteReuseStrategy, Router, RouterEvent, RouterLink, RouterLinkActive, RouterLink as RouterLinkWithHref, RouterModule, RouterOutlet, RouterPreloader, RouterState, RouterStateSnapshot, RoutesRecognized, Scroll, TitleStrategy, UrlHandlingStrategy, UrlSegment, UrlSegmentGroup, UrlSerializer, UrlTree, VERSION, convertToParamMap, createUrlTreeFromSnapshot, defaultUrlMatcher, provideRouter, provideRoutes, withDebugTracing, withDisabledInitialNavigation, withEnabledBlockingInitialNavigation, withInMemoryScrolling, withPreloading, withRouterConfig, ɵEmptyOutletComponent, ROUTER_PROVIDERS as ɵROUTER_PROVIDERS, assignExtraOptionsToRouter as ɵassignExtraOptionsToRouter, flatten as ɵflatten, withPreloading as ɵwithPreloading };
 //# sourceMappingURL=router.mjs.map