@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/testing.mjs
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
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
|
*/
|
|
@@ -101,9 +101,9 @@ class RouterTestingModule {
|
|
|
101
101
|
};
|
|
102
102
|
}
|
|
103
103
|
}
|
|
104
|
-
RouterTestingModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
105
|
-
RouterTestingModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
106
|
-
RouterTestingModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
104
|
+
RouterTestingModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterTestingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
|
|
105
|
+
RouterTestingModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterTestingModule, exports: [RouterModule] });
|
|
106
|
+
RouterTestingModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterTestingModule, providers: [
|
|
107
107
|
ɵROUTER_PROVIDERS,
|
|
108
108
|
EXTRA_ROUTER_TESTING_PROVIDERS,
|
|
109
109
|
{ provide: Location, useClass: SpyLocation },
|
|
@@ -127,7 +127,7 @@ RouterTestingModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", ver
|
|
|
127
127
|
ɵprovidePreloading(NoPreloading),
|
|
128
128
|
provideRoutes([]),
|
|
129
129
|
], imports: [RouterModule] });
|
|
130
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
130
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterTestingModule, decorators: [{
|
|
131
131
|
type: NgModule,
|
|
132
132
|
args: [{
|
|
133
133
|
exports: [RouterModule],
|
package/fesm2015/upgrade.mjs
CHANGED
package/fesm2020/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
|
}] });
|
|
@@ -2382,9 +2382,9 @@ class ChildrenOutletContexts {
|
|
|
2382
2382
|
return this.contexts.get(childName) || null;
|
|
2383
2383
|
}
|
|
2384
2384
|
}
|
|
2385
|
-
ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2386
|
-
ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2387
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2385
|
+
ChildrenOutletContexts.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
2386
|
+
ChildrenOutletContexts.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, providedIn: 'root' });
|
|
2387
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ChildrenOutletContexts, decorators: [{
|
|
2388
2388
|
type: Injectable,
|
|
2389
2389
|
args: [{ providedIn: 'root' }]
|
|
2390
2390
|
}] });
|
|
@@ -2574,9 +2574,9 @@ class RouterOutlet {
|
|
|
2574
2574
|
this.activateEvents.emit(this.activated.instance);
|
|
2575
2575
|
}
|
|
2576
2576
|
}
|
|
2577
|
-
RouterOutlet.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2578
|
-
RouterOutlet.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
2579
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2577
|
+
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 });
|
|
2578
|
+
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 });
|
|
2579
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterOutlet, decorators: [{
|
|
2580
2580
|
type: Directive,
|
|
2581
2581
|
args: [{
|
|
2582
2582
|
selector: 'router-outlet',
|
|
@@ -2637,9 +2637,9 @@ function isComponentFactoryResolver(item) {
|
|
|
2637
2637
|
*/
|
|
2638
2638
|
class ɵEmptyOutletComponent {
|
|
2639
2639
|
}
|
|
2640
|
-
ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2641
|
-
ɵEmptyOutletComponent.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
2642
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
2640
|
+
ɵEmptyOutletComponent.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ɵEmptyOutletComponent, deps: [], target: i0.ɵɵFactoryTarget.Component });
|
|
2641
|
+
ɵ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"] }] });
|
|
2642
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: ɵEmptyOutletComponent, decorators: [{
|
|
2643
2643
|
type: Component,
|
|
2644
2644
|
args: [{
|
|
2645
2645
|
template: `<router-outlet></router-outlet>`,
|
|
@@ -3043,10 +3043,20 @@ function getCanActivateChild(p) {
|
|
|
3043
3043
|
return null;
|
|
3044
3044
|
return { node: p, guards: canActivateChild };
|
|
3045
3045
|
}
|
|
3046
|
-
function
|
|
3047
|
-
const
|
|
3048
|
-
const
|
|
3049
|
-
|
|
3046
|
+
function getTokenOrFunctionIdentity(tokenOrFunction, injector) {
|
|
3047
|
+
const NOT_FOUND = Symbol();
|
|
3048
|
+
const result = injector.get(tokenOrFunction, NOT_FOUND);
|
|
3049
|
+
if (result === NOT_FOUND) {
|
|
3050
|
+
if (typeof tokenOrFunction === 'function' && !ɵisInjectable(tokenOrFunction)) {
|
|
3051
|
+
// We think the token is just a function so return it as-is
|
|
3052
|
+
return tokenOrFunction;
|
|
3053
|
+
}
|
|
3054
|
+
else {
|
|
3055
|
+
// This will throw the not found error
|
|
3056
|
+
return injector.get(tokenOrFunction);
|
|
3057
|
+
}
|
|
3058
|
+
}
|
|
3059
|
+
return result;
|
|
3050
3060
|
}
|
|
3051
3061
|
function getChildRouteGuards(futureNode, currNode, contexts, futurePath, checks = {
|
|
3052
3062
|
canDeactivateChecks: [],
|
|
@@ -3200,6 +3210,9 @@ function isRedirectingNavigationCancelingError(error) {
|
|
|
3200
3210
|
function isNavigationCancelingError(error) {
|
|
3201
3211
|
return error && error[NAVIGATION_CANCELING_ERROR];
|
|
3202
3212
|
}
|
|
3213
|
+
function isEmptyError(e) {
|
|
3214
|
+
return e instanceof EmptyError || e?.name === 'EmptyError';
|
|
3215
|
+
}
|
|
3203
3216
|
|
|
3204
3217
|
/**
|
|
3205
3218
|
* @license
|
|
@@ -3242,28 +3255,28 @@ function prioritizedGuardValue() {
|
|
|
3242
3255
|
* Use of this source code is governed by an MIT-style license that can be
|
|
3243
3256
|
* found in the LICENSE file at https://angular.io/license
|
|
3244
3257
|
*/
|
|
3245
|
-
function checkGuards(
|
|
3258
|
+
function checkGuards(injector, forwardEvent) {
|
|
3246
3259
|
return mergeMap(t => {
|
|
3247
3260
|
const { targetSnapshot, currentSnapshot, guards: { canActivateChecks, canDeactivateChecks } } = t;
|
|
3248
3261
|
if (canDeactivateChecks.length === 0 && canActivateChecks.length === 0) {
|
|
3249
3262
|
return of({ ...t, guardsResult: true });
|
|
3250
3263
|
}
|
|
3251
|
-
return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot,
|
|
3264
|
+
return runCanDeactivateChecks(canDeactivateChecks, targetSnapshot, currentSnapshot, injector)
|
|
3252
3265
|
.pipe(mergeMap(canDeactivate => {
|
|
3253
3266
|
return canDeactivate && isBoolean(canDeactivate) ?
|
|
3254
|
-
runCanActivateChecks(targetSnapshot, canActivateChecks,
|
|
3267
|
+
runCanActivateChecks(targetSnapshot, canActivateChecks, injector, forwardEvent) :
|
|
3255
3268
|
of(canDeactivate);
|
|
3256
3269
|
}), map(guardsResult => ({ ...t, guardsResult })));
|
|
3257
3270
|
});
|
|
3258
3271
|
}
|
|
3259
|
-
function runCanDeactivateChecks(checks, futureRSS, currRSS,
|
|
3260
|
-
return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS,
|
|
3272
|
+
function runCanDeactivateChecks(checks, futureRSS, currRSS, injector) {
|
|
3273
|
+
return from(checks).pipe(mergeMap(check => runCanDeactivate(check.component, check.route, currRSS, futureRSS, injector)), first(result => {
|
|
3261
3274
|
return result !== true;
|
|
3262
3275
|
}, true));
|
|
3263
3276
|
}
|
|
3264
|
-
function runCanActivateChecks(futureSnapshot, checks,
|
|
3277
|
+
function runCanActivateChecks(futureSnapshot, checks, injector, forwardEvent) {
|
|
3265
3278
|
return from(checks).pipe(concatMap((check) => {
|
|
3266
|
-
return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path,
|
|
3279
|
+
return concat(fireChildActivationStart(check.route.parent, forwardEvent), fireActivationStart(check.route, forwardEvent), runCanActivateChild(futureSnapshot, check.path, injector), runCanActivate(futureSnapshot, check.route, injector));
|
|
3267
3280
|
}), first(result => {
|
|
3268
3281
|
return result !== true;
|
|
3269
3282
|
}, true));
|
|
@@ -3296,21 +3309,23 @@ function fireChildActivationStart(snapshot, forwardEvent) {
|
|
|
3296
3309
|
}
|
|
3297
3310
|
return of(true);
|
|
3298
3311
|
}
|
|
3299
|
-
function runCanActivate(futureRSS, futureARS,
|
|
3312
|
+
function runCanActivate(futureRSS, futureARS, injector) {
|
|
3300
3313
|
const canActivate = futureARS.routeConfig ? futureARS.routeConfig.canActivate : null;
|
|
3301
3314
|
if (!canActivate || canActivate.length === 0)
|
|
3302
3315
|
return of(true);
|
|
3303
|
-
const canActivateObservables = canActivate.map((
|
|
3316
|
+
const canActivateObservables = canActivate.map((canActivate) => {
|
|
3304
3317
|
return defer(() => {
|
|
3305
|
-
const
|
|
3306
|
-
const
|
|
3307
|
-
|
|
3318
|
+
const closestInjector = getClosestRouteInjector(futureARS) ?? injector;
|
|
3319
|
+
const guard = getTokenOrFunctionIdentity(canActivate, closestInjector);
|
|
3320
|
+
const guardVal = isCanActivate(guard) ?
|
|
3321
|
+
guard.canActivate(futureARS, futureRSS) :
|
|
3322
|
+
closestInjector.runInContext(() => guard(futureARS, futureRSS));
|
|
3308
3323
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3309
3324
|
});
|
|
3310
3325
|
});
|
|
3311
3326
|
return of(canActivateObservables).pipe(prioritizedGuardValue());
|
|
3312
3327
|
}
|
|
3313
|
-
function runCanActivateChild(futureRSS, path,
|
|
3328
|
+
function runCanActivateChild(futureRSS, path, injector) {
|
|
3314
3329
|
const futureARS = path[path.length - 1];
|
|
3315
3330
|
const canActivateChildGuards = path.slice(0, path.length - 1)
|
|
3316
3331
|
.reverse()
|
|
@@ -3318,10 +3333,12 @@ function runCanActivateChild(futureRSS, path, moduleInjector) {
|
|
|
3318
3333
|
.filter(_ => _ !== null);
|
|
3319
3334
|
const canActivateChildGuardsMapped = canActivateChildGuards.map((d) => {
|
|
3320
3335
|
return defer(() => {
|
|
3321
|
-
const guardsMapped = d.guards.map((
|
|
3322
|
-
const
|
|
3323
|
-
const
|
|
3324
|
-
|
|
3336
|
+
const guardsMapped = d.guards.map((canActivateChild) => {
|
|
3337
|
+
const closestInjector = getClosestRouteInjector(d.node) ?? injector;
|
|
3338
|
+
const guard = getTokenOrFunctionIdentity(canActivateChild, closestInjector);
|
|
3339
|
+
const guardVal = isCanActivateChild(guard) ?
|
|
3340
|
+
guard.canActivateChild(futureARS, futureRSS) :
|
|
3341
|
+
closestInjector.runInContext(() => guard(futureARS, futureRSS));
|
|
3325
3342
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3326
3343
|
});
|
|
3327
3344
|
return of(guardsMapped).pipe(prioritizedGuardValue());
|
|
@@ -3329,15 +3346,16 @@ function runCanActivateChild(futureRSS, path, moduleInjector) {
|
|
|
3329
3346
|
});
|
|
3330
3347
|
return of(canActivateChildGuardsMapped).pipe(prioritizedGuardValue());
|
|
3331
3348
|
}
|
|
3332
|
-
function runCanDeactivate(component, currARS, currRSS, futureRSS,
|
|
3349
|
+
function runCanDeactivate(component, currARS, currRSS, futureRSS, injector) {
|
|
3333
3350
|
const canDeactivate = currARS && currARS.routeConfig ? currARS.routeConfig.canDeactivate : null;
|
|
3334
3351
|
if (!canDeactivate || canDeactivate.length === 0)
|
|
3335
3352
|
return of(true);
|
|
3336
3353
|
const canDeactivateObservables = canDeactivate.map((c) => {
|
|
3337
|
-
const
|
|
3354
|
+
const closestInjector = getClosestRouteInjector(currARS) ?? injector;
|
|
3355
|
+
const guard = getTokenOrFunctionIdentity(c, closestInjector);
|
|
3338
3356
|
const guardVal = isCanDeactivate(guard) ?
|
|
3339
3357
|
guard.canDeactivate(component, currARS, currRSS, futureRSS) :
|
|
3340
|
-
guard(component, currARS, currRSS, futureRSS);
|
|
3358
|
+
closestInjector.runInContext(() => guard(component, currARS, currRSS, futureRSS));
|
|
3341
3359
|
return wrapIntoObservable(guardVal).pipe(first());
|
|
3342
3360
|
});
|
|
3343
3361
|
return of(canDeactivateObservables).pipe(prioritizedGuardValue());
|
|
@@ -3348,8 +3366,10 @@ function runCanLoadGuards(injector, route, segments, urlSerializer) {
|
|
|
3348
3366
|
return of(true);
|
|
3349
3367
|
}
|
|
3350
3368
|
const canLoadObservables = canLoad.map((injectionToken) => {
|
|
3351
|
-
const guard =
|
|
3352
|
-
const guardVal = isCanLoad(guard) ?
|
|
3369
|
+
const guard = getTokenOrFunctionIdentity(injectionToken, injector);
|
|
3370
|
+
const guardVal = isCanLoad(guard) ?
|
|
3371
|
+
guard.canLoad(route, segments) :
|
|
3372
|
+
injector.runInContext(() => guard(route, segments));
|
|
3353
3373
|
return wrapIntoObservable(guardVal);
|
|
3354
3374
|
});
|
|
3355
3375
|
return of(canLoadObservables)
|
|
@@ -3367,8 +3387,10 @@ function runCanMatchGuards(injector, route, segments, urlSerializer) {
|
|
|
3367
3387
|
if (!canMatch || canMatch.length === 0)
|
|
3368
3388
|
return of(true);
|
|
3369
3389
|
const canMatchObservables = canMatch.map(injectionToken => {
|
|
3370
|
-
const guard =
|
|
3371
|
-
const guardVal = isCanMatch(guard) ?
|
|
3390
|
+
const guard = getTokenOrFunctionIdentity(injectionToken, injector);
|
|
3391
|
+
const guardVal = isCanMatch(guard) ?
|
|
3392
|
+
guard.canMatch(route, segments) :
|
|
3393
|
+
injector.runInContext(() => guard(route, segments));
|
|
3372
3394
|
return wrapIntoObservable(guardVal);
|
|
3373
3395
|
});
|
|
3374
3396
|
return of(canMatchObservables)
|
|
@@ -3669,7 +3691,7 @@ class ApplyRedirects {
|
|
|
3669
3691
|
throw e;
|
|
3670
3692
|
}));
|
|
3671
3693
|
}), first((s) => !!s), catchError((e, _) => {
|
|
3672
|
-
if (e
|
|
3694
|
+
if (isEmptyError(e)) {
|
|
3673
3695
|
if (noLeftoversInUrl(segmentGroup, segments, outlet)) {
|
|
3674
3696
|
return of(new UrlSegmentGroup([], {}));
|
|
3675
3697
|
}
|
|
@@ -3972,7 +3994,7 @@ class Recognizer {
|
|
|
3972
3994
|
return from(routes).pipe(concatMap(r => {
|
|
3973
3995
|
return this.processSegmentAgainstRoute(r._injector ?? injector, r, segmentGroup, segments, outlet);
|
|
3974
3996
|
}), first((x) => !!x), catchError(e => {
|
|
3975
|
-
if (e
|
|
3997
|
+
if (isEmptyError(e)) {
|
|
3976
3998
|
if (noLeftoversInUrl(segmentGroup, segments, outlet)) {
|
|
3977
3999
|
return of([]);
|
|
3978
4000
|
}
|
|
@@ -4177,7 +4199,7 @@ function recognize(injector, rootComponentType, config, serializer, paramsInheri
|
|
|
4177
4199
|
* Use of this source code is governed by an MIT-style license that can be
|
|
4178
4200
|
* found in the LICENSE file at https://angular.io/license
|
|
4179
4201
|
*/
|
|
4180
|
-
function resolveData(paramsInheritanceStrategy,
|
|
4202
|
+
function resolveData(paramsInheritanceStrategy, injector) {
|
|
4181
4203
|
return mergeMap(t => {
|
|
4182
4204
|
const { targetSnapshot, guards: { canActivateChecks } } = t;
|
|
4183
4205
|
if (!canActivateChecks.length) {
|
|
@@ -4185,17 +4207,16 @@ function resolveData(paramsInheritanceStrategy, moduleInjector) {
|
|
|
4185
4207
|
}
|
|
4186
4208
|
let canActivateChecksResolved = 0;
|
|
4187
4209
|
return from(canActivateChecks)
|
|
4188
|
-
.pipe(concatMap(check => runResolve(check.route, targetSnapshot, paramsInheritanceStrategy,
|
|
4210
|
+
.pipe(concatMap(check => runResolve(check.route, targetSnapshot, paramsInheritanceStrategy, injector)), tap(() => canActivateChecksResolved++), takeLast(1), mergeMap(_ => canActivateChecksResolved === canActivateChecks.length ? of(t) : EMPTY));
|
|
4189
4211
|
});
|
|
4190
4212
|
}
|
|
4191
|
-
function runResolve(futureARS, futureRSS, paramsInheritanceStrategy,
|
|
4213
|
+
function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, injector) {
|
|
4192
4214
|
const config = futureARS.routeConfig;
|
|
4193
4215
|
const resolve = futureARS._resolve;
|
|
4194
4216
|
if (config?.title !== undefined && !hasStaticTitle(config)) {
|
|
4195
4217
|
resolve[RouteTitleKey] = config.title;
|
|
4196
4218
|
}
|
|
4197
|
-
return resolveNode(resolve, futureARS, futureRSS,
|
|
4198
|
-
.pipe(map((resolvedData) => {
|
|
4219
|
+
return resolveNode(resolve, futureARS, futureRSS, injector).pipe(map((resolvedData) => {
|
|
4199
4220
|
futureARS._resolvedData = resolvedData;
|
|
4200
4221
|
futureARS.data = inheritedParamsDataResolve(futureARS, paramsInheritanceStrategy).resolve;
|
|
4201
4222
|
if (config && hasStaticTitle(config)) {
|
|
@@ -4204,24 +4225,27 @@ function runResolve(futureARS, futureRSS, paramsInheritanceStrategy, moduleInjec
|
|
|
4204
4225
|
return null;
|
|
4205
4226
|
}));
|
|
4206
4227
|
}
|
|
4207
|
-
function resolveNode(resolve, futureARS, futureRSS,
|
|
4228
|
+
function resolveNode(resolve, futureARS, futureRSS, injector) {
|
|
4208
4229
|
const keys = getDataKeys(resolve);
|
|
4209
4230
|
if (keys.length === 0) {
|
|
4210
4231
|
return of({});
|
|
4211
4232
|
}
|
|
4212
4233
|
const data = {};
|
|
4213
|
-
return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS,
|
|
4234
|
+
return from(keys).pipe(mergeMap(key => getResolver(resolve[key], futureARS, futureRSS, injector)
|
|
4214
4235
|
.pipe(first(), tap((value) => {
|
|
4215
4236
|
data[key] = value;
|
|
4216
|
-
}))), takeLast(1), mapTo(data), catchError((e) => e
|
|
4237
|
+
}))), takeLast(1), mapTo(data), catchError((e) => isEmptyError(e) ? EMPTY : throwError(e)));
|
|
4217
4238
|
}
|
|
4218
4239
|
function getDataKeys(obj) {
|
|
4219
4240
|
return [...Object.keys(obj), ...Object.getOwnPropertySymbols(obj)];
|
|
4220
4241
|
}
|
|
4221
|
-
function getResolver(injectionToken, futureARS, futureRSS,
|
|
4222
|
-
const
|
|
4223
|
-
|
|
4224
|
-
|
|
4242
|
+
function getResolver(injectionToken, futureARS, futureRSS, injector) {
|
|
4243
|
+
const closestInjector = getClosestRouteInjector(futureARS) ?? injector;
|
|
4244
|
+
const resolver = getTokenOrFunctionIdentity(injectionToken, closestInjector);
|
|
4245
|
+
const resolverValue = resolver.resolve ?
|
|
4246
|
+
resolver.resolve(futureARS, futureRSS) :
|
|
4247
|
+
closestInjector.runInContext(() => resolver(futureARS, futureRSS));
|
|
4248
|
+
return wrapIntoObservable(resolverValue);
|
|
4225
4249
|
}
|
|
4226
4250
|
function hasStaticTitle(config) {
|
|
4227
4251
|
return typeof config.title === 'string' || config.title === null;
|
|
@@ -4301,9 +4325,9 @@ class TitleStrategy {
|
|
|
4301
4325
|
return snapshot.data[RouteTitleKey];
|
|
4302
4326
|
}
|
|
4303
4327
|
}
|
|
4304
|
-
TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4305
|
-
TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4306
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4328
|
+
TitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
4329
|
+
TitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) });
|
|
4330
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: TitleStrategy, decorators: [{
|
|
4307
4331
|
type: Injectable,
|
|
4308
4332
|
args: [{ providedIn: 'root', useFactory: () => inject(DefaultTitleStrategy) }]
|
|
4309
4333
|
}] });
|
|
@@ -4327,9 +4351,9 @@ class DefaultTitleStrategy extends TitleStrategy {
|
|
|
4327
4351
|
}
|
|
4328
4352
|
}
|
|
4329
4353
|
}
|
|
4330
|
-
DefaultTitleStrategy.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4331
|
-
DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4332
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4354
|
+
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 });
|
|
4355
|
+
DefaultTitleStrategy.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: DefaultTitleStrategy, providedIn: 'root' });
|
|
4356
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: DefaultTitleStrategy, decorators: [{
|
|
4333
4357
|
type: Injectable,
|
|
4334
4358
|
args: [{ providedIn: 'root' }]
|
|
4335
4359
|
}], ctorParameters: function () { return [{ type: i1.Title }]; } });
|
|
@@ -4523,9 +4547,9 @@ class RouterConfigLoader {
|
|
|
4523
4547
|
}));
|
|
4524
4548
|
}
|
|
4525
4549
|
}
|
|
4526
|
-
RouterConfigLoader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4527
|
-
RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4528
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
4550
|
+
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 });
|
|
4551
|
+
RouterConfigLoader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterConfigLoader, providedIn: 'root' });
|
|
4552
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterConfigLoader, decorators: [{
|
|
4529
4553
|
type: Injectable,
|
|
4530
4554
|
args: [{ providedIn: 'root' }]
|
|
4531
4555
|
}], ctorParameters: function () { return [{ type: i0.Injector }, { type: i0.Compiler }]; } });
|
|
@@ -5552,9 +5576,9 @@ class Router {
|
|
|
5552
5576
|
return { navigationId };
|
|
5553
5577
|
}
|
|
5554
5578
|
}
|
|
5555
|
-
Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5556
|
-
Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5557
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5579
|
+
Router.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
|
|
5580
|
+
Router.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, providedIn: 'root', useFactory: setupRouter });
|
|
5581
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: Router, decorators: [{
|
|
5558
5582
|
type: Injectable,
|
|
5559
5583
|
args: [{
|
|
5560
5584
|
providedIn: 'root',
|
|
@@ -5757,9 +5781,9 @@ class RouterLink {
|
|
|
5757
5781
|
});
|
|
5758
5782
|
}
|
|
5759
5783
|
}
|
|
5760
|
-
RouterLink.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5761
|
-
RouterLink.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
5762
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5784
|
+
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 });
|
|
5785
|
+
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 });
|
|
5786
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLink, decorators: [{
|
|
5763
5787
|
type: Directive,
|
|
5764
5788
|
args: [{
|
|
5765
5789
|
selector: ':not(a):not(area)[routerLink]',
|
|
@@ -5879,9 +5903,9 @@ class RouterLinkWithHref {
|
|
|
5879
5903
|
});
|
|
5880
5904
|
}
|
|
5881
5905
|
}
|
|
5882
|
-
RouterLinkWithHref.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5883
|
-
RouterLinkWithHref.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
5884
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
5906
|
+
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 });
|
|
5907
|
+
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 });
|
|
5908
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLinkWithHref, decorators: [{
|
|
5885
5909
|
type: Directive,
|
|
5886
5910
|
args: [{ selector: 'a[routerLink],area[routerLink]', standalone: true }]
|
|
5887
5911
|
}], ctorParameters: function () { return [{ type: Router }, { type: ActivatedRoute }, { type: i3.LocationStrategy }]; }, propDecorators: { target: [{
|
|
@@ -6106,9 +6130,9 @@ class RouterLinkActive {
|
|
|
6106
6130
|
this.links.some(isActiveCheckFn) || this.linksWithHrefs.some(isActiveCheckFn);
|
|
6107
6131
|
}
|
|
6108
6132
|
}
|
|
6109
|
-
RouterLinkActive.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6110
|
-
RouterLinkActive.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
6111
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6133
|
+
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 });
|
|
6134
|
+
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 });
|
|
6135
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterLinkActive, decorators: [{
|
|
6112
6136
|
type: Directive,
|
|
6113
6137
|
args: [{
|
|
6114
6138
|
selector: '[routerLinkActive]',
|
|
@@ -6173,9 +6197,9 @@ class PreloadAllModules {
|
|
|
6173
6197
|
return fn().pipe(catchError(() => of(null)));
|
|
6174
6198
|
}
|
|
6175
6199
|
}
|
|
6176
|
-
PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6177
|
-
PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6178
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6200
|
+
PreloadAllModules.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6201
|
+
PreloadAllModules.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, providedIn: 'root' });
|
|
6202
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: PreloadAllModules, decorators: [{
|
|
6179
6203
|
type: Injectable,
|
|
6180
6204
|
args: [{ providedIn: 'root' }]
|
|
6181
6205
|
}] });
|
|
@@ -6193,9 +6217,9 @@ class NoPreloading {
|
|
|
6193
6217
|
return of(null);
|
|
6194
6218
|
}
|
|
6195
6219
|
}
|
|
6196
|
-
NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6197
|
-
NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6198
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6220
|
+
NoPreloading.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, deps: [], target: i0.ɵɵFactoryTarget.Injectable });
|
|
6221
|
+
NoPreloading.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, providedIn: 'root' });
|
|
6222
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: NoPreloading, decorators: [{
|
|
6199
6223
|
type: Injectable,
|
|
6200
6224
|
args: [{ providedIn: 'root' }]
|
|
6201
6225
|
}] });
|
|
@@ -6289,9 +6313,9 @@ class RouterPreloader {
|
|
|
6289
6313
|
});
|
|
6290
6314
|
}
|
|
6291
6315
|
}
|
|
6292
|
-
RouterPreloader.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6293
|
-
RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6294
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6316
|
+
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 });
|
|
6317
|
+
RouterPreloader.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterPreloader });
|
|
6318
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterPreloader, decorators: [{
|
|
6295
6319
|
type: Injectable
|
|
6296
6320
|
}], ctorParameters: function () { return [{ type: Router }, { type: i0.Compiler }, { type: i0.EnvironmentInjector }, { type: PreloadingStrategy }, { type: RouterConfigLoader }]; } });
|
|
6297
6321
|
|
|
@@ -6378,9 +6402,9 @@ class RouterScroller {
|
|
|
6378
6402
|
}
|
|
6379
6403
|
}
|
|
6380
6404
|
}
|
|
6381
|
-
RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6382
|
-
RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6383
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6405
|
+
RouterScroller.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller, deps: "invalid", target: i0.ɵɵFactoryTarget.Injectable });
|
|
6406
|
+
RouterScroller.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller });
|
|
6407
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterScroller, decorators: [{
|
|
6384
6408
|
type: Injectable
|
|
6385
6409
|
}], ctorParameters: function () { return [{ type: Router }, { type: i3.ViewportScroller }, { type: undefined }]; } });
|
|
6386
6410
|
|
|
@@ -6502,10 +6526,10 @@ class RouterModule {
|
|
|
6502
6526
|
return { ngModule: RouterModule, providers: [provideRoutes(routes)] };
|
|
6503
6527
|
}
|
|
6504
6528
|
}
|
|
6505
|
-
RouterModule.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6506
|
-
RouterModule.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "14.2.0-next.
|
|
6507
|
-
RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6508
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.
|
|
6529
|
+
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 });
|
|
6530
|
+
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] });
|
|
6531
|
+
RouterModule.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, imports: [ɵEmptyOutletComponent] });
|
|
6532
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.0-next.1", ngImport: i0, type: RouterModule, decorators: [{
|
|
6509
6533
|
type: NgModule,
|
|
6510
6534
|
args: [{
|
|
6511
6535
|
imports: ROUTER_DIRECTIVES,
|
|
@@ -6739,7 +6763,7 @@ function providePreloading(preloadingStrategy) {
|
|
|
6739
6763
|
/**
|
|
6740
6764
|
* @publicApi
|
|
6741
6765
|
*/
|
|
6742
|
-
const VERSION = new Version('14.2.0-next.
|
|
6766
|
+
const VERSION = new Version('14.2.0-next.1');
|
|
6743
6767
|
|
|
6744
6768
|
/**
|
|
6745
6769
|
* @license
|