@angular/router 14.2.0-next.0 → 14.2.0-next.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/esm2020/src/apply_redirects.mjs +4 -3
- package/esm2020/src/components/empty_outlet.mjs +3 -3
- package/esm2020/src/directives/router_link.mjs +6 -6
- package/esm2020/src/directives/router_link_active.mjs +3 -3
- package/esm2020/src/directives/router_outlet.mjs +3 -3
- package/esm2020/src/index.mjs +1 -1
- package/esm2020/src/models.mjs +1 -1
- package/esm2020/src/operators/check_guards.mjs +36 -26
- package/esm2020/src/operators/resolve_data.mjs +19 -15
- package/esm2020/src/page_title_strategy.mjs +6 -6
- package/esm2020/src/recognize.mjs +4 -3
- package/esm2020/src/router.mjs +3 -3
- package/esm2020/src/router_config_loader.mjs +3 -3
- package/esm2020/src/router_module.mjs +4 -4
- package/esm2020/src/router_outlet_context.mjs +3 -3
- package/esm2020/src/router_preloader.mjs +9 -9
- package/esm2020/src/router_scroller.mjs +3 -3
- package/esm2020/src/url_tree.mjs +3 -3
- package/esm2020/src/utils/preactivation.mjs +16 -6
- package/esm2020/src/utils/type_guards.mjs +5 -1
- package/esm2020/src/version.mjs +1 -1
- package/esm2020/testing/src/router_testing_module.mjs +4 -4
- package/fesm2015/router.mjs +124 -96
- package/fesm2015/router.mjs.map +1 -1
- package/fesm2015/testing.mjs +5 -5
- package/fesm2015/upgrade.mjs +1 -1
- package/fesm2020/router.mjs +120 -96
- package/fesm2020/router.mjs.map +1 -1
- package/fesm2020/testing.mjs +5 -5
- package/fesm2020/upgrade.mjs +1 -1
- package/index.d.ts +85 -65
- package/package.json +4 -4
- package/testing/index.d.ts +1 -1
- package/upgrade/index.d.ts +1 -1
package/fesm2015/router.mjs
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
/**
|
|
2
|
-
* @license Angular v14.2.0-next.
|
|
2
|
+
* @license Angular v14.2.0-next.1
|
|
3
3
|
* (c) 2010-2022 Google LLC. https://angular.io/
|
|
4
4
|
* License: MIT
|
|
5
5
|
*/
|
|
6
6
|
|
|
7
7
|
import * as i0 from '@angular/core';
|
|
8
|
-
import { ɵisObservable, ɵisPromise, Injectable, ɵRuntimeError, EventEmitter, Directive, Attribute, Output, Component, createEnvironmentInjector, ɵisStandalone, ComponentFactoryResolver, inject, InjectionToken, InjectFlags, NgModuleFactory, Injector, Compiler, NgModuleRef, ɵConsole, NgZone, ɵcoerceToBoolean, Input, HostListener, HostBinding, Optional, ContentChildren, NgProbeToken, SkipSelf,
|
|
9
|
-
import { from, of, BehaviorSubject, combineLatest, concat, defer, pipe, throwError,
|
|
8
|
+
import { ɵisObservable, ɵisPromise, Injectable, ɵRuntimeError, EventEmitter, Directive, Attribute, Output, Component, createEnvironmentInjector, ɵisStandalone, ComponentFactoryResolver, ɵisInjectable, inject, InjectionToken, InjectFlags, NgModuleFactory, Injector, Compiler, NgModuleRef, ɵConsole, NgZone, ɵcoerceToBoolean, Input, HostListener, HostBinding, Optional, ContentChildren, NgProbeToken, SkipSelf, NgModule, Inject, ApplicationRef, APP_BOOTSTRAP_LISTENER, APP_INITIALIZER, ENVIRONMENT_INITIALIZER, Version } from '@angular/core';
|
|
9
|
+
import { from, of, BehaviorSubject, EmptyError, combineLatest, concat, defer, pipe, throwError, Observable, EMPTY, ConnectableObservable, Subject } from 'rxjs';
|
|
10
10
|
import * as i3 from '@angular/common';
|
|
11
|
-
import { Location, LocationStrategy, HashLocationStrategy, PathLocationStrategy,
|
|
11
|
+
import { Location, ViewportScroller, LocationStrategy, HashLocationStrategy, PathLocationStrategy, LOCATION_INITIALIZED } from '@angular/common';
|
|
12
12
|
import { map, switchMap, take, startWith, filter, mergeMap, first, concatMap, tap, catchError, scan, last as last$1, takeWhile, defaultIfEmpty, takeLast, mapTo, finalize, refCount, mergeAll } from 'rxjs/operators';
|
|
13
13
|
import * as i1 from '@angular/platform-browser';
|
|
14
14
|
|
|
@@ -459,9 +459,9 @@ function mapChildrenIntoArray(segment, fn) {
|
|
|
459
459
|
*/
|
|
460
460
|
class UrlSerializer {
|
|
461
461
|
}
|
|
462
|
-
UrlSerializer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
463
|
-
UrlSerializer.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
464
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
462
|
+
UrlSerializer.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: UrlSerializer, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
463
|
+
UrlSerializer.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: UrlSerializer, providedIn: 'root', useFactory: () => new DefaultUrlSerializer() });
|
|
464
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: UrlSerializer, decorators: [{
|
|
465
465
|
type: Injectable,
|
|
466
466
|
args: [{ providedIn: 'root', useFactory: () => new DefaultUrlSerializer() }]
|
|
467
467
|
}] });
|
|
@@ -2388,9 +2388,9 @@ class ChildrenOutletContexts {
|
|
|
2388
2388
|
return this.contexts.get(childName) || null;
|
|
2389
2389
|
}
|
|
2390
2390
|
}
|
|
2391
|
-
ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2392
|
-
ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2393
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2391
|
+
ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
2392
|
+
ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, providedIn: 'root' });
|
|
2393
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, decorators: [{
|
|
2394
2394
|
type: Injectable,
|
|
2395
2395
|
args: [{ providedIn: 'root' }]
|
|
2396
2396
|
}] });
|
|
@@ -2581,9 +2581,9 @@ class RouterOutlet {
|
|
|
2581
2581
|
this.activateEvents.emit(this.activated.instance);
|
|
2582
2582
|
}
|
|
2583
2583
|
}
|
|
2584
|
-
RouterOutlet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2585
|
-
RouterOutlet.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
2586
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2584
|
+
RouterOutlet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterOutlet, deps: [{ token: ChildrenOutletContexts }, { token: i0.ViewContainerRef }, { token: 'name', attribute: true }, { token: i0.ChangeDetectorRef }, { token: i0.EnvironmentInjector }], target: i0.ɵɵFactoryTarget.Directive });
|
|
2585
|
+
RouterOutlet.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.1", type: RouterOutlet, isStandalone: true, selector: "router-outlet", outputs: { activateEvents: "activate", deactivateEvents: "deactivate", attachEvents: "attach", detachEvents: "detach" }, exportAs: ["outlet"], ngImport: i0 });
|
|
2586
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterOutlet, decorators: [{
|
|
2587
2587
|
type: Directive,
|
|
2588
2588
|
args: [{
|
|
2589
2589
|
selector: 'router-outlet',
|
|
@@ -2646,9 +2646,9 @@ function isComponentFactoryResolver(item) {
|
|
|
2646
2646
|
*/
|
|
2647
2647
|
class ɵEmptyOutletComponent {
|
|
2648
2648
|
}
|
|
2649
|
-
ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2650
|
-
ɵEmptyOutletComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
2651
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2649
|
+
ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ɵEmptyOutletComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
2650
|
+
ɵEmptyOutletComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.0-next.1", 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"] }] });
|
|
2651
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ɵEmptyOutletComponent, decorators: [{
|
|
2652
2652
|
type: Component,
|
|
2653
2653
|
args: [{
|
|
2654
2654
|
template: `<router-outlet></router-outlet>`,
|
|
@@ -3055,10 +3055,20 @@ function getCanActivateChild(p) {
|
|
|
3055
3055
|
return null;
|
|
3056
3056
|
return { node: p, guards: canActivateChild };
|
|
3057
3057
|
}
|
|
3058
|
-
function
|
|
3059
|
-
const
|
|
3060
|
-
const
|
|
3061
|
-
|
|
3058
|
+
function getTokenOrFunctionIdentity(tokenOrFunction, injector) {
|
|
3059
|
+
const NOT_FOUND = Symbol();
|
|
3060
|
+
const result = injector.get(tokenOrFunction, NOT_FOUND);
|
|
3061
|
+
if (result === NOT_FOUND) {
|
|
3062
|
+
if (typeof tokenOrFunction === 'function' && !ɵisInjectable(tokenOrFunction)) {
|
|
3063
|
+
// We think the token is just a function so return it as-is
|
|
3064
|
+
return tokenOrFunction;
|
|
3065
|
+
}
|
|
3066
|
+
else {
|
|
3067
|
+
// This will throw the not found error
|
|
3068
|
+
return injector.get(tokenOrFunction);
|
|
3069
|
+
}
|
|
3070
|
+
}
|
|
3071
|
+
return result;
|
|
3062
3072
|
}
|
|
3063
3073
|
function getChildRouteGuards(futureNode, currNode, contexts, futurePath, checks = {
|
|
3064
3074
|
canDeactivateChecks: [],
|
|
@@ -3212,6 +3222,9 @@ function isRedirectingNavigationCancelingError(error) {
|
|
|
3212
3222
|
function isNavigationCancelingError(error) {
|
|
3213
3223
|
return error && error[NAVIGATION_CANCELING_ERROR];
|
|
3214
3224
|
}
|
|
3225
|
+
function isEmptyError(e) {
|
|
3226
|
+
return e instanceof EmptyError || (e === null || e === void 0 ? void 0 : e.name) === 'EmptyError';
|
|
3227
|
+
}
|
|
3215
3228
|
|
|
3216
3229
|
/**
|
|
3217
3230
|
* @license
|
|
@@ -3254,28 +3267,28 @@ function prioritizedGuardValue() {
|
|
|
3254
3267
|
* Use of this source code is governed by an MIT-style license that can be
|
|
3255
3268
|
* found in the LICENSE file at https://angular.io/license
|
|
3256
3269
|
*/
|
|
3257
|
-
function checkGuards(
|
|
3270
|
+
function checkGuards(injector, forwardEvent) {
|
|
3258
3271
|
return mergeMap(t => {
|
|
3259
3272
|
const { targetSnapshot, currentSnapshot, guards: { canActivateChecks, canDeactivateChecks } } = t;
|
|
3260
3273
|
if (canDeactivateChecks.length === 0 && canActivateChecks.length === 0) {
|
|
3261
3274
|
return of(Object.assign(Object.assign({}, t), { guardsResult: true }));
|
|
3262
3275
|
}
|
|
3263
|
-
return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot,
|
|
3276
|
+
return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot, injector)
|
|
3264
3277
|
.pipe(mergeMap(canDeactivate => {
|
|
3265
3278
|
return canDeactivate && isBoolean(canDeactivate) ?
|
|
3266
|
-
runCanActivateChecks(targetSnapshot, canActivateChecks,
|
|
3279
|
+
runCanActivateChecks(targetSnapshot, canActivateChecks, injector, forwardEvent) :
|
|
3267
3280
|
of(canDeactivate);
|
|
3268
3281
|
}), map(guardsResult => (Object.assign(Object.assign({}, t), { guardsResult }))));
|
|
3269
3282
|
});
|
|
3270
3283
|
}
|
|
3271
|
-
function runCanDeactivateChecks(checks, futureRSS, currRSS,
|
|
3272
|
-
return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS,
|
|
3284
|
+
function runCanDeactivateChecks(checks, futureRSS, currRSS, injector) {
|
|
3285
|
+
return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS, injector)), first(result => {
|
|
3273
3286
|
return result !== true;
|
|
3274
3287
|
}, true));
|
|
3275
3288
|
}
|
|
3276
|
-
function runCanActivateChecks(futureSnapshot, checks,
|
|
3289
|
+
function runCanActivateChecks(futureSnapshot, checks, injector, forwardEvent) {
|
|
3277
3290
|
return from(checks).pipe(concatMap((check) => {
|
|
3278
|
-
return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path,
|
|
3291
|
+
return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path, injector), runCanActivate(futureSnapshot, check.route, injector));
|
|
3279
3292
|
}), first(result => {
|
|
3280
3293
|
return result !== true;
|
|
3281
3294
|
}, true));
|
|
@@ -3308,21 +3321,24 @@ function fireChildActivationStart(snapshot, forwardEvent) {
|
|
|
3308
3321
|
}
|
|
3309
3322
|
return of(true);
|
|
3310
3323
|
}
|
|
3311
|
-
function runCanActivate(futureRSS, futureARS,
|
|
3324
|
+
function runCanActivate(futureRSS, futureARS, injector) {
|
|
3312
3325
|
const canActivate = futureARS.routeConfig ? futureARS.routeConfig.canActivate : null;
|
|
3313
3326
|
if (!canActivate || canActivate.length === 0)
|
|
3314
3327
|
return of(true);
|
|
3315
|
-
const canActivateObservables = canActivate.map((
|
|
3328
|
+
const canActivateObservables = canActivate.map((canActivate) => {
|
|
3316
3329
|
return defer(() => {
|
|
3317
|
-
|
|
3318
|
-
const
|
|
3319
|
-
|
|
3330
|
+
var _a;
|
|
3331
|
+
const closestInjector = (_a = getClosestRouteInjector(futureARS)) !== null && _a !== void 0 ? _a : injector;
|
|
3332
|
+
const guard = getTokenOrFunctionIdentity(canActivate, closestInjector);
|
|
3333
|
+
const guardVal = isCanActivate(guard) ?
|
|
3334
|
+
guard.canActivate(futureARS, futureRSS) :
|
|
3335
|
+
closestInjector.runInContext(() => guard(futureARS, futureRSS));
|
|
3320
3336
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3321
3337
|
});
|
|
3322
3338
|
});
|
|
3323
3339
|
return of(canActivateObservables).pipe(prioritizedGuardValue());
|
|
3324
3340
|
}
|
|
3325
|
-
function runCanActivateChild(futureRSS, path,
|
|
3341
|
+
function runCanActivateChild(futureRSS, path, injector) {
|
|
3326
3342
|
const futureARS = path[path.length - 1];
|
|
3327
3343
|
const canActivateChildGuards = path.slice(0, path.length - 1)
|
|
3328
3344
|
.reverse()
|
|
@@ -3330,10 +3346,13 @@ function runCanActivateChild(futureRSS, path, moduleInjector) {
|
|
|
3330
3346
|
.filter(_ => _ !== null);
|
|
3331
3347
|
const canActivateChildGuardsMapped = canActivateChildGuards.map((d) => {
|
|
3332
3348
|
return defer(() => {
|
|
3333
|
-
const guardsMapped = d.guards.map((
|
|
3334
|
-
|
|
3335
|
-
const
|
|
3336
|
-
|
|
3349
|
+
const guardsMapped = d.guards.map((canActivateChild) => {
|
|
3350
|
+
var _a;
|
|
3351
|
+
const closestInjector = (_a = getClosestRouteInjector(d.node)) !== null && _a !== void 0 ? _a : injector;
|
|
3352
|
+
const guard = getTokenOrFunctionIdentity(canActivateChild, closestInjector);
|
|
3353
|
+
const guardVal = isCanActivateChild(guard) ?
|
|
3354
|
+
guard.canActivateChild(futureARS, futureRSS) :
|
|
3355
|
+
closestInjector.runInContext(() => guard(futureARS, futureRSS));
|
|
3337
3356
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3338
3357
|
});
|
|
3339
3358
|
return of(guardsMapped).pipe(prioritizedGuardValue());
|
|
@@ -3341,15 +3360,17 @@ function runCanActivateChild(futureRSS, path, moduleInjector) {
|
|
|
3341
3360
|
});
|
|
3342
3361
|
return of(canActivateChildGuardsMapped).pipe(prioritizedGuardValue());
|
|
3343
3362
|
}
|
|
3344
|
-
function runCanDeactivate(component, currARS, currRSS, futureRSS,
|
|
3363
|
+
function runCanDeactivate(component, currARS, currRSS, futureRSS, injector) {
|
|
3345
3364
|
const canDeactivate = currARS && currARS.routeConfig ? currARS.routeConfig.canDeactivate : null;
|
|
3346
3365
|
if (!canDeactivate || canDeactivate.length === 0)
|
|
3347
3366
|
return of(true);
|
|
3348
3367
|
const canDeactivateObservables = canDeactivate.map((c) => {
|
|
3349
|
-
|
|
3368
|
+
var _a;
|
|
3369
|
+
const closestInjector = (_a = getClosestRouteInjector(currARS)) !== null && _a !== void 0 ? _a : injector;
|
|
3370
|
+
const guard = getTokenOrFunctionIdentity(c, closestInjector);
|
|
3350
3371
|
const guardVal = isCanDeactivate(guard) ?
|
|
3351
3372
|
guard.canDeactivate(component, currARS, currRSS, futureRSS) :
|
|
3352
|
-
guard(component, currARS, currRSS, futureRSS);
|
|
3373
|
+
closestInjector.runInContext(() => guard(component, currARS, currRSS, futureRSS));
|
|
3353
3374
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3354
3375
|
});
|
|
3355
3376
|
return of(canDeactivateObservables).pipe(prioritizedGuardValue());
|
|
@@ -3360,8 +3381,10 @@ function runCanLoadGuards(injector, route, segments, urlSerializer) {
|
|
|
3360
3381
|
return of(true);
|
|
3361
3382
|
}
|
|
3362
3383
|
const canLoadObservables = canLoad.map((injectionToken) => {
|
|
3363
|
-
const guard =
|
|
3364
|
-
const guardVal = isCanLoad(guard) ?
|
|
3384
|
+
const guard = getTokenOrFunctionIdentity(injectionToken, injector);
|
|
3385
|
+
const guardVal = isCanLoad(guard) ?
|
|
3386
|
+
guard.canLoad(route, segments) :
|
|
3387
|
+
injector.runInContext(() => guard(route, segments));
|
|
3365
3388
|
return wrapIntoObservable(guardVal);
|
|
3366
3389
|
});
|
|
3367
3390
|
return of(canLoadObservables)
|
|
@@ -3379,8 +3402,10 @@ function runCanMatchGuards(injector, route, segments, urlSerializer) {
|
|
|
3379
3402
|
if (!canMatch || canMatch.length === 0)
|
|
3380
3403
|
return of(true);
|
|
3381
3404
|
const canMatchObservables = canMatch.map(injectionToken => {
|
|
3382
|
-
const guard =
|
|
3383
|
-
const guardVal = isCanMatch(guard) ?
|
|
3405
|
+
const guard = getTokenOrFunctionIdentity(injectionToken, injector);
|
|
3406
|
+
const guardVal = isCanMatch(guard) ?
|
|
3407
|
+
guard.canMatch(route, segments) :
|
|
3408
|
+
injector.runInContext(() => guard(route, segments));
|
|
3384
3409
|
return wrapIntoObservable(guardVal);
|
|
3385
3410
|
});
|
|
3386
3411
|
return of(canMatchObservables)
|
|
@@ -3681,7 +3706,7 @@ class ApplyRedirects {
|
|
|
3681
3706
|
throw e;
|
|
3682
3707
|
}));
|
|
3683
3708
|
}), first((s) => !!s), catchError((e, _) => {
|
|
3684
|
-
if (e
|
|
3709
|
+
if (isEmptyError(e)) {
|
|
3685
3710
|
if (noLeftoversInUrl(segmentGroup, segments, outlet)) {
|
|
3686
3711
|
return of(new UrlSegmentGroup([], {}));
|
|
3687
3712
|
}
|
|
@@ -3987,7 +4012,7 @@ class Recognizer {
|
|
|
3987
4012
|
var _a;
|
|
3988
4013
|
return this.processSegmentAgainstRoute((_a = r._injector) !== null && _a !== void 0 ? _a : injector, r, segmentGroup, segments, outlet);
|
|
3989
4014
|
}), first((x) => !!x), catchError(e => {
|
|
3990
|
-
if (e
|
|
4015
|
+
if (isEmptyError(e)) {
|
|
3991
4016
|
if (noLeftoversInUrl(segmentGroup, segments, outlet)) {
|
|
3992
4017
|
return of([]);
|
|
3993
4018
|
}
|
|
@@ -4197,7 +4222,7 @@ function recognize(injector, rootComponentType, config, serializer, paramsInheri
|
|
|
4197
4222
|
* Use of this source code is governed by an MIT-style license that can be
|
|
4198
4223
|
* found in the LICENSE file at https://angular.io/license
|
|
4199
4224
|
*/
|
|
4200
|
-
function resolveData(paramsInheritanceStrategy,
|
|
4225
|
+
function resolveData(paramsInheritanceStrategy, injector) {
|
|
4201
4226
|
return mergeMap(t => {
|
|
4202
4227
|
const { targetSnapshot, guards: { canActivateChecks } } = t;
|
|
4203
4228
|
if (!canActivateChecks.length) {
|
|
@@ -4205,17 +4230,16 @@ function resolveData(paramsInheritanceStrategy, moduleInjector) {
|
|
|
4205
4230
|
}
|
|
4206
4231
|
let canActivateChecksResolved = 0;
|
|
4207
4232
|
return from(canActivateChecks)
|
|
4208
|
-
.pipe(concatMap(check => runResolve(check.route, targetSnapshot, paramsInheritanceStrategy,
|
|
4233
|
+
.pipe(concatMap(check => runResolve(check.route, targetSnapshot, paramsInheritanceStrategy, injector)), tap(() => canActivateChecksResolved++), takeLast(1), mergeMap(_ => canActivateChecksResolved === canActivateChecks.length ? of(t) : EMPTY));
|
|
4209
4234
|
});
|
|
4210
4235
|
}
|
|
4211
|
-
function runResolve(futureARS, futureRSS, paramsInheritanceStrategy,
|
|
4236
|
+
function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, injector) {
|
|
4212
4237
|
const config = futureARS.routeConfig;
|
|
4213
4238
|
const resolve = futureARS._resolve;
|
|
4214
4239
|
if ((config === null || config === void 0 ? void 0 : config.title) !== undefined && !hasStaticTitle(config)) {
|
|
4215
4240
|
resolve[RouteTitleKey] = config.title;
|
|
4216
4241
|
}
|
|
4217
|
-
return resolveNode(resolve, futureARS, futureRSS,
|
|
4218
|
-
.pipe(map((resolvedData) => {
|
|
4242
|
+
return resolveNode(resolve, futureARS, futureRSS, injector).pipe(map((resolvedData) => {
|
|
4219
4243
|
futureARS._resolvedData = resolvedData;
|
|
4220
4244
|
futureARS.data = inheritedParamsDataResolve(futureARS, paramsInheritanceStrategy).resolve;
|
|
4221
4245
|
if (config && hasStaticTitle(config)) {
|
|
@@ -4224,24 +4248,28 @@ function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, moduleInjec
|
|
|
4224
4248
|
return null;
|
|
4225
4249
|
}));
|
|
4226
4250
|
}
|
|
4227
|
-
function resolveNode(resolve, futureARS, futureRSS,
|
|
4251
|
+
function resolveNode(resolve, futureARS, futureRSS, injector) {
|
|
4228
4252
|
const keys = getDataKeys(resolve);
|
|
4229
4253
|
if (keys.length === 0) {
|
|
4230
4254
|
return of({});
|
|
4231
4255
|
}
|
|
4232
4256
|
const data = {};
|
|
4233
|
-
return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS,
|
|
4257
|
+
return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS, injector)
|
|
4234
4258
|
.pipe(first(), tap((value) => {
|
|
4235
4259
|
data[key] = value;
|
|
4236
|
-
}))), takeLast(1), mapTo(data), catchError((e) => e
|
|
4260
|
+
}))), takeLast(1), mapTo(data), catchError((e) => isEmptyError(e) ? EMPTY : throwError(e)));
|
|
4237
4261
|
}
|
|
4238
4262
|
function getDataKeys(obj) {
|
|
4239
4263
|
return [...Object.keys(obj), ...Object.getOwnPropertySymbols(obj)];
|
|
4240
4264
|
}
|
|
4241
|
-
function getResolver(injectionToken, futureARS, futureRSS,
|
|
4242
|
-
|
|
4243
|
-
|
|
4244
|
-
|
|
4265
|
+
function getResolver(injectionToken, futureARS, futureRSS, injector) {
|
|
4266
|
+
var _a;
|
|
4267
|
+
const closestInjector = (_a = getClosestRouteInjector(futureARS)) !== null && _a !== void 0 ? _a : injector;
|
|
4268
|
+
const resolver = getTokenOrFunctionIdentity(injectionToken, closestInjector);
|
|
4269
|
+
const resolverValue = resolver.resolve ?
|
|
4270
|
+
resolver.resolve(futureARS, futureRSS) :
|
|
4271
|
+
closestInjector.runInContext(() => resolver(futureARS, futureRSS));
|
|
4272
|
+
return wrapIntoObservable(resolverValue);
|
|
4245
4273
|
}
|
|
4246
4274
|
function hasStaticTitle(config) {
|
|
4247
4275
|
return typeof config.title === 'string' || config.title === null;
|
|
@@ -4322,9 +4350,9 @@ class TitleStrategy {
|
|
|
4322
4350
|
return snapshot.data[RouteTitleKey];
|
|
4323
4351
|
}
|
|
4324
4352
|
}
|
|
4325
|
-
TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4326
|
-
TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4327
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4353
|
+
TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4354
|
+
TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) });
|
|
4355
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, decorators: [{
|
|
4328
4356
|
type: Injectable,
|
|
4329
4357
|
args: [{ providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) }]
|
|
4330
4358
|
}] });
|
|
@@ -4348,9 +4376,9 @@ class DefaultTitleStrategy extends TitleStrategy {
|
|
|
4348
4376
|
}
|
|
4349
4377
|
}
|
|
4350
4378
|
}
|
|
4351
|
-
DefaultTitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4352
|
-
DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4353
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4379
|
+
DefaultTitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: DefaultTitleStrategy, deps: [{ token: i1.Title }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4380
|
+
DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: DefaultTitleStrategy, providedIn: 'root' });
|
|
4381
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: DefaultTitleStrategy, decorators: [{
|
|
4354
4382
|
type: Injectable,
|
|
4355
4383
|
args: [{ providedIn: 'root' }]
|
|
4356
4384
|
}], ctorParameters: function () { return [{ type: i1.Title }]; } });
|
|
@@ -4545,9 +4573,9 @@ class RouterConfigLoader {
|
|
|
4545
4573
|
}));
|
|
4546
4574
|
}
|
|
4547
4575
|
}
|
|
4548
|
-
RouterConfigLoader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4549
|
-
RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4550
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4576
|
+
RouterConfigLoader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterConfigLoader, deps: [{ token: i0.Injector }, { token: i0.Compiler }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4577
|
+
RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterConfigLoader, providedIn: 'root' });
|
|
4578
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterConfigLoader, decorators: [{
|
|
4551
4579
|
type: Injectable,
|
|
4552
4580
|
args: [{ providedIn: 'root' }]
|
|
4553
4581
|
}], ctorParameters: function () { return [{ type: i0.Injector }, { type: i0.Compiler }]; } });
|
|
@@ -5571,9 +5599,9 @@ class Router {
|
|
|
5571
5599
|
return { navigationId };
|
|
5572
5600
|
}
|
|
5573
5601
|
}
|
|
5574
|
-
Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5575
|
-
Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5576
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5602
|
+
Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
|
|
5603
|
+
Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, providedIn: 'root', useFactory: setupRouter });
|
|
5604
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, decorators: [{
|
|
5577
5605
|
type: Injectable,
|
|
5578
5606
|
args: [{
|
|
5579
5607
|
providedIn: 'root',
|
|
@@ -5769,9 +5797,9 @@ class RouterLink {
|
|
|
5769
5797
|
});
|
|
5770
5798
|
}
|
|
5771
5799
|
}
|
|
5772
|
-
RouterLink.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5773
|
-
RouterLink.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
5774
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5800
|
+
RouterLink.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLink, deps: [{ token: Router }, { token: ActivatedRoute }, { token: 'tabindex', attribute: true }, { token: i0.Renderer2 }, { token: i0.ElementRef }], target: i0.ɵɵFactoryTarget.Directive });
|
|
5801
|
+
RouterLink.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.1", type: RouterLink, isStandalone: true, selector: ":not(a):not(area)[routerLink]", inputs: { queryParams: "queryParams", fragment: "fragment", queryParamsHandling: "queryParamsHandling", preserveFragment: "preserveFragment", skipLocationChange: "skipLocationChange", replaceUrl: "replaceUrl", state: "state", relativeTo: "relativeTo", routerLink: "routerLink" }, host: { listeners: { "click": "onClick()" } }, usesOnChanges: true, ngImport: i0 });
|
|
5802
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLink, decorators: [{
|
|
5775
5803
|
type: Directive,
|
|
5776
5804
|
args: [{
|
|
5777
5805
|
selector: ':not(a):not(area)[routerLink]',
|
|
@@ -5893,9 +5921,9 @@ class RouterLinkWithHref {
|
|
|
5893
5921
|
});
|
|
5894
5922
|
}
|
|
5895
5923
|
}
|
|
5896
|
-
RouterLinkWithHref.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5897
|
-
RouterLinkWithHref.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
5898
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5924
|
+
RouterLinkWithHref.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLinkWithHref, deps: [{ token: Router }, { token: ActivatedRoute }, { token: i3.LocationStrategy }], target: i0.ɵɵFactoryTarget.Directive });
|
|
5925
|
+
RouterLinkWithHref.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.1", type: RouterLinkWithHref, isStandalone: true, selector: "a[routerLink],area[routerLink]", inputs: { target: "target", queryParams: "queryParams", fragment: "fragment", queryParamsHandling: "queryParamsHandling", preserveFragment: "preserveFragment", skipLocationChange: "skipLocationChange", replaceUrl: "replaceUrl", state: "state", relativeTo: "relativeTo", 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 });
|
|
5926
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLinkWithHref, decorators: [{
|
|
5899
5927
|
type: Directive,
|
|
5900
5928
|
args: [{ selector: 'a[routerLink],area[routerLink]', standalone: true }]
|
|
5901
5929
|
}], ctorParameters: function () { return [{ type: Router }, { type: ActivatedRoute }, { type: i3.LocationStrategy }]; }, propDecorators: { target: [{
|
|
@@ -6122,9 +6150,9 @@ class RouterLinkActive {
|
|
|
6122
6150
|
this.links.some(isActiveCheckFn) || this.linksWithHrefs.some(isActiveCheckFn);
|
|
6123
6151
|
}
|
|
6124
6152
|
}
|
|
6125
|
-
RouterLinkActive.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6126
|
-
RouterLinkActive.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
6127
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6153
|
+
RouterLinkActive.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", 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 });
|
|
6154
|
+
RouterLinkActive.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.1", 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 });
|
|
6155
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLinkActive, decorators: [{
|
|
6128
6156
|
type: Directive,
|
|
6129
6157
|
args: [{
|
|
6130
6158
|
selector: '[routerLinkActive]',
|
|
@@ -6191,9 +6219,9 @@ class PreloadAllModules {
|
|
|
6191
6219
|
return fn().pipe(catchError(() => of(null)));
|
|
6192
6220
|
}
|
|
6193
6221
|
}
|
|
6194
|
-
PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6195
|
-
PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6196
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6222
|
+
PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6223
|
+
PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, providedIn: 'root' });
|
|
6224
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, decorators: [{
|
|
6197
6225
|
type: Injectable,
|
|
6198
6226
|
args: [{ providedIn: 'root' }]
|
|
6199
6227
|
}] });
|
|
@@ -6211,9 +6239,9 @@ class NoPreloading {
|
|
|
6211
6239
|
return of(null);
|
|
6212
6240
|
}
|
|
6213
6241
|
}
|
|
6214
|
-
NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6215
|
-
NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6216
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6242
|
+
NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6243
|
+
NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, providedIn: 'root' });
|
|
6244
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, decorators: [{
|
|
6217
6245
|
type: Injectable,
|
|
6218
6246
|
args: [{ providedIn: 'root' }]
|
|
6219
6247
|
}] });
|
|
@@ -6309,9 +6337,9 @@ class RouterPreloader {
|
|
|
6309
6337
|
});
|
|
6310
6338
|
}
|
|
6311
6339
|
}
|
|
6312
|
-
RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6313
|
-
RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6314
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6340
|
+
RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterPreloader, deps: [{ token: Router }, { token: i0.Compiler }, { token: i0.EnvironmentInjector }, { token: PreloadingStrategy }, { token: RouterConfigLoader }], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6341
|
+
RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterPreloader });
|
|
6342
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterPreloader, decorators: [{
|
|
6315
6343
|
type: Injectable
|
|
6316
6344
|
}], ctorParameters: function () { return [{ type: Router }, { type: i0.Compiler }, { type: i0.EnvironmentInjector }, { type: PreloadingStrategy }, { type: RouterConfigLoader }]; } });
|
|
6317
6345
|
|
|
@@ -6391,9 +6419,9 @@ class RouterScroller {
|
|
|
6391
6419
|
}
|
|
6392
6420
|
}
|
|
6393
6421
|
}
|
|
6394
|
-
RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6395
|
-
RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6396
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6422
|
+
RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
|
|
6423
|
+
RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller });
|
|
6424
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller, decorators: [{
|
|
6397
6425
|
type: Injectable
|
|
6398
6426
|
}], ctorParameters: function () { return [{ type: Router }, { type: i3.ViewportScroller }, { type: undefined }]; } });
|
|
6399
6427
|
|
|
@@ -6515,10 +6543,10 @@ class RouterModule {
|
|
|
6515
6543
|
return { ngModule: RouterModule, providers: [provideRoutes(routes)] };
|
|
6516
6544
|
}
|
|
6517
6545
|
}
|
|
6518
|
-
RouterModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6519
|
-
RouterModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
6520
|
-
RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6521
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6546
|
+
RouterModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, deps: [{ token: ROUTER_FORROOT_GUARD, optional: true }], target: i0.ɵɵFactoryTarget.NgModule });
|
|
6547
|
+
RouterModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, imports: [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, ɵEmptyOutletComponent], exports: [RouterOutlet, RouterLink, RouterLinkWithHref, RouterLinkActive, ɵEmptyOutletComponent] });
|
|
6548
|
+
RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, imports: [ɵEmptyOutletComponent] });
|
|
6549
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, decorators: [{
|
|
6522
6550
|
type: NgModule,
|
|
6523
6551
|
args: [{
|
|
6524
6552
|
imports: ROUTER_DIRECTIVES,
|
|
@@ -6756,7 +6784,7 @@ function providePreloading(preloadingStrategy) {
|
|
|
6756
6784
|
/**
|
|
6757
6785
|
* @publicApi
|
|
6758
6786
|
*/
|
|
6759
|
-
const VERSION = new Version('14.2.0-next.
|
|
6787
|
+
const VERSION = new Version('14.2.0-next.1');
|
|
6760
6788
|
|
|
6761
6789
|
/**
|
|
6762
6790
|
* @license
|