@angular/router 17.0.0-next.7 → 17.0.0-rc.0
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/esm2022/src/components/empty_outlet.mjs +3 -3
- package/esm2022/src/directives/router_link.mjs +3 -3
- package/esm2022/src/directives/router_link_active.mjs +3 -3
- package/esm2022/src/directives/router_outlet.mjs +6 -6
- package/esm2022/src/index.mjs +1 -1
- package/esm2022/src/navigation_transition.mjs +6 -5
- package/esm2022/src/page_title_strategy.mjs +6 -6
- package/esm2022/src/provide_router.mjs +3 -3
- package/esm2022/src/route_reuse_strategy.mjs +6 -6
- package/esm2022/src/router.mjs +18 -21
- package/esm2022/src/router_config.mjs +1 -1
- package/esm2022/src/router_config_loader.mjs +3 -3
- package/esm2022/src/router_module.mjs +6 -10
- package/esm2022/src/router_outlet_context.mjs +3 -3
- package/esm2022/src/router_preloader.mjs +9 -9
- package/esm2022/src/router_scroller.mjs +3 -3
- package/esm2022/src/router_state.mjs +2 -2
- package/esm2022/src/statemanager/state_manager.mjs +204 -0
- package/esm2022/src/url_handling_strategy.mjs +6 -6
- package/esm2022/src/url_tree.mjs +3 -3
- package/esm2022/src/utils/view_transition.mjs +12 -4
- package/esm2022/src/version.mjs +1 -1
- package/esm2022/testing/src/router_testing_harness.mjs +6 -6
- package/esm2022/testing/src/router_testing_module.mjs +4 -4
- package/fesm2022/router.mjs +128 -134
- package/fesm2022/router.mjs.map +1 -1
- package/fesm2022/testing.mjs +11 -11
- package/fesm2022/upgrade.mjs +1 -1
- package/index.d.ts +56 -7
- package/package.json +4 -4
- package/testing/index.d.ts +1 -1
- package/upgrade/index.d.ts +1 -1
- package/esm2022/src/state_manager.mjs +0 -212
|
@@ -0,0 +1,204 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* @license
|
|
3
|
+
* Copyright Google LLC All Rights Reserved.
|
|
4
|
+
*
|
|
5
|
+
* Use of this source code is governed by an MIT-style license that can be
|
|
6
|
+
* found in the LICENSE file at https://angular.io/license
|
|
7
|
+
*/
|
|
8
|
+
import { Location } from '@angular/common';
|
|
9
|
+
import { inject, Injectable } from '@angular/core';
|
|
10
|
+
import { BeforeActivateRoutes, NavigationCancel, NavigationEnd, NavigationError, NavigationSkipped, NavigationStart, RoutesRecognized, } from '../events';
|
|
11
|
+
import { ROUTER_CONFIGURATION } from '../router_config';
|
|
12
|
+
import { createEmptyState } from '../router_state';
|
|
13
|
+
import { UrlHandlingStrategy } from '../url_handling_strategy';
|
|
14
|
+
import { UrlSerializer, UrlTree } from '../url_tree';
|
|
15
|
+
import * as i0 from "@angular/core";
|
|
16
|
+
export class StateManager {
|
|
17
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: StateManager, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
18
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: StateManager, providedIn: 'root', useFactory: () => inject(HistoryStateManager) }); }
|
|
19
|
+
}
|
|
20
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: StateManager, decorators: [{
|
|
21
|
+
type: Injectable,
|
|
22
|
+
args: [{ providedIn: 'root', useFactory: () => inject(HistoryStateManager) }]
|
|
23
|
+
}] });
|
|
24
|
+
export class HistoryStateManager extends StateManager {
|
|
25
|
+
constructor() {
|
|
26
|
+
super(...arguments);
|
|
27
|
+
this.location = inject(Location);
|
|
28
|
+
this.urlSerializer = inject(UrlSerializer);
|
|
29
|
+
this.options = inject(ROUTER_CONFIGURATION, { optional: true }) || {};
|
|
30
|
+
this.canceledNavigationResolution = this.options.canceledNavigationResolution || 'replace';
|
|
31
|
+
this.urlHandlingStrategy = inject(UrlHandlingStrategy);
|
|
32
|
+
this.urlUpdateStrategy = this.options.urlUpdateStrategy || 'deferred';
|
|
33
|
+
this.currentUrlTree = new UrlTree();
|
|
34
|
+
this.rawUrlTree = this.currentUrlTree;
|
|
35
|
+
/**
|
|
36
|
+
* The id of the currently active page in the router.
|
|
37
|
+
* Updated to the transition's target id on a successful navigation.
|
|
38
|
+
*
|
|
39
|
+
* This is used to track what page the router last activated. When an attempted navigation fails,
|
|
40
|
+
* the router can then use this to compute how to restore the state back to the previously active
|
|
41
|
+
* page.
|
|
42
|
+
*/
|
|
43
|
+
this.currentPageId = 0;
|
|
44
|
+
this.lastSuccessfulId = -1;
|
|
45
|
+
this.routerState = createEmptyState(this.currentUrlTree, null);
|
|
46
|
+
this.stateMemento = this.createStateMemento();
|
|
47
|
+
}
|
|
48
|
+
getCurrentUrlTree() {
|
|
49
|
+
return this.currentUrlTree;
|
|
50
|
+
}
|
|
51
|
+
getRawUrlTree() {
|
|
52
|
+
return this.rawUrlTree;
|
|
53
|
+
}
|
|
54
|
+
restoredState() {
|
|
55
|
+
return this.location.getState();
|
|
56
|
+
}
|
|
57
|
+
/**
|
|
58
|
+
* The ɵrouterPageId of whatever page is currently active in the browser history. This is
|
|
59
|
+
* important for computing the target page id for new navigations because we need to ensure each
|
|
60
|
+
* page id in the browser history is 1 more than the previous entry.
|
|
61
|
+
*/
|
|
62
|
+
get browserPageId() {
|
|
63
|
+
if (this.canceledNavigationResolution !== 'computed') {
|
|
64
|
+
return this.currentPageId;
|
|
65
|
+
}
|
|
66
|
+
return this.restoredState()?.ɵrouterPageId ?? this.currentPageId;
|
|
67
|
+
}
|
|
68
|
+
getRouterState() {
|
|
69
|
+
return this.routerState;
|
|
70
|
+
}
|
|
71
|
+
createStateMemento() {
|
|
72
|
+
return {
|
|
73
|
+
rawUrlTree: this.rawUrlTree,
|
|
74
|
+
currentUrlTree: this.currentUrlTree,
|
|
75
|
+
routerState: this.routerState,
|
|
76
|
+
};
|
|
77
|
+
}
|
|
78
|
+
registerNonRouterCurrentEntryChangeListener(listener) {
|
|
79
|
+
return this.location.subscribe(event => {
|
|
80
|
+
if (event['type'] === 'popstate') {
|
|
81
|
+
listener(event['url'], event.state);
|
|
82
|
+
}
|
|
83
|
+
});
|
|
84
|
+
}
|
|
85
|
+
handleRouterEvent(e, currentTransition) {
|
|
86
|
+
if (e instanceof NavigationStart) {
|
|
87
|
+
this.stateMemento = this.createStateMemento();
|
|
88
|
+
}
|
|
89
|
+
else if (e instanceof NavigationSkipped) {
|
|
90
|
+
this.rawUrlTree = currentTransition.initialUrl;
|
|
91
|
+
}
|
|
92
|
+
else if (e instanceof RoutesRecognized) {
|
|
93
|
+
if (this.urlUpdateStrategy === 'eager') {
|
|
94
|
+
if (!currentTransition.extras.skipLocationChange) {
|
|
95
|
+
const rawUrl = this.urlHandlingStrategy.merge(currentTransition.finalUrl, currentTransition.initialUrl);
|
|
96
|
+
this.setBrowserUrl(rawUrl, currentTransition);
|
|
97
|
+
}
|
|
98
|
+
}
|
|
99
|
+
}
|
|
100
|
+
else if (e instanceof BeforeActivateRoutes) {
|
|
101
|
+
this.currentUrlTree = currentTransition.finalUrl;
|
|
102
|
+
this.rawUrlTree =
|
|
103
|
+
this.urlHandlingStrategy.merge(currentTransition.finalUrl, currentTransition.initialUrl);
|
|
104
|
+
this.routerState = currentTransition.targetRouterState;
|
|
105
|
+
if (this.urlUpdateStrategy === 'deferred') {
|
|
106
|
+
if (!currentTransition.extras.skipLocationChange) {
|
|
107
|
+
this.setBrowserUrl(this.rawUrlTree, currentTransition);
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
}
|
|
111
|
+
else if (e instanceof NavigationCancel &&
|
|
112
|
+
(e.code === 3 /* NavigationCancellationCode.GuardRejected */ ||
|
|
113
|
+
e.code === 2 /* NavigationCancellationCode.NoDataFromResolver */)) {
|
|
114
|
+
this.restoreHistory(currentTransition);
|
|
115
|
+
}
|
|
116
|
+
else if (e instanceof NavigationError) {
|
|
117
|
+
this.restoreHistory(currentTransition, true);
|
|
118
|
+
}
|
|
119
|
+
else if (e instanceof NavigationEnd) {
|
|
120
|
+
this.lastSuccessfulId = e.id;
|
|
121
|
+
this.currentPageId = this.browserPageId;
|
|
122
|
+
}
|
|
123
|
+
}
|
|
124
|
+
setBrowserUrl(url, transition) {
|
|
125
|
+
const path = this.urlSerializer.serialize(url);
|
|
126
|
+
if (this.location.isCurrentPathEqualTo(path) || !!transition.extras.replaceUrl) {
|
|
127
|
+
// replacements do not update the target page
|
|
128
|
+
const currentBrowserPageId = this.browserPageId;
|
|
129
|
+
const state = {
|
|
130
|
+
...transition.extras.state,
|
|
131
|
+
...this.generateNgRouterState(transition.id, currentBrowserPageId)
|
|
132
|
+
};
|
|
133
|
+
this.location.replaceState(path, '', state);
|
|
134
|
+
}
|
|
135
|
+
else {
|
|
136
|
+
const state = {
|
|
137
|
+
...transition.extras.state,
|
|
138
|
+
...this.generateNgRouterState(transition.id, this.browserPageId + 1)
|
|
139
|
+
};
|
|
140
|
+
this.location.go(path, '', state);
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
/**
|
|
144
|
+
* Performs the necessary rollback action to restore the browser URL to the
|
|
145
|
+
* state before the transition.
|
|
146
|
+
*/
|
|
147
|
+
restoreHistory(navigation, restoringFromCaughtError = false) {
|
|
148
|
+
if (this.canceledNavigationResolution === 'computed') {
|
|
149
|
+
const currentBrowserPageId = this.browserPageId;
|
|
150
|
+
const targetPagePosition = this.currentPageId - currentBrowserPageId;
|
|
151
|
+
if (targetPagePosition !== 0) {
|
|
152
|
+
this.location.historyGo(targetPagePosition);
|
|
153
|
+
}
|
|
154
|
+
else if (this.currentUrlTree === navigation.finalUrl && targetPagePosition === 0) {
|
|
155
|
+
// We got to the activation stage (where currentUrlTree is set to the navigation's
|
|
156
|
+
// finalUrl), but we weren't moving anywhere in history (skipLocationChange or replaceUrl).
|
|
157
|
+
// We still need to reset the router state back to what it was when the navigation started.
|
|
158
|
+
this.resetState(navigation);
|
|
159
|
+
this.resetUrlToCurrentUrlTree();
|
|
160
|
+
}
|
|
161
|
+
else {
|
|
162
|
+
// The browser URL and router state was not updated before the navigation cancelled so
|
|
163
|
+
// there's no restoration needed.
|
|
164
|
+
}
|
|
165
|
+
}
|
|
166
|
+
else if (this.canceledNavigationResolution === 'replace') {
|
|
167
|
+
// TODO(atscott): It seems like we should _always_ reset the state here. It would be a no-op
|
|
168
|
+
// for `deferred` navigations that haven't change the internal state yet because guards
|
|
169
|
+
// reject. For 'eager' navigations, it seems like we also really should reset the state
|
|
170
|
+
// because the navigation was cancelled. Investigate if this can be done by running TGP.
|
|
171
|
+
if (restoringFromCaughtError) {
|
|
172
|
+
this.resetState(navigation);
|
|
173
|
+
}
|
|
174
|
+
this.resetUrlToCurrentUrlTree();
|
|
175
|
+
}
|
|
176
|
+
}
|
|
177
|
+
resetState(navigation) {
|
|
178
|
+
this.routerState = this.stateMemento.routerState;
|
|
179
|
+
this.currentUrlTree = this.stateMemento.currentUrlTree;
|
|
180
|
+
// Note here that we use the urlHandlingStrategy to get the reset `rawUrlTree` because it may be
|
|
181
|
+
// configured to handle only part of the navigation URL. This means we would only want to reset
|
|
182
|
+
// the part of the navigation handled by the Angular router rather than the whole URL. In
|
|
183
|
+
// addition, the URLHandlingStrategy may be configured to specifically preserve parts of the URL
|
|
184
|
+
// when merging, such as the query params so they are not lost on a refresh.
|
|
185
|
+
this.rawUrlTree =
|
|
186
|
+
this.urlHandlingStrategy.merge(this.currentUrlTree, navigation.finalUrl ?? this.rawUrlTree);
|
|
187
|
+
}
|
|
188
|
+
resetUrlToCurrentUrlTree() {
|
|
189
|
+
this.location.replaceState(this.urlSerializer.serialize(this.rawUrlTree), '', this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));
|
|
190
|
+
}
|
|
191
|
+
generateNgRouterState(navigationId, routerPageId) {
|
|
192
|
+
if (this.canceledNavigationResolution === 'computed') {
|
|
193
|
+
return { navigationId, ɵrouterPageId: routerPageId };
|
|
194
|
+
}
|
|
195
|
+
return { navigationId };
|
|
196
|
+
}
|
|
197
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: HistoryStateManager, deps: null, target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
198
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: HistoryStateManager, providedIn: 'root' }); }
|
|
199
|
+
}
|
|
200
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: HistoryStateManager, decorators: [{
|
|
201
|
+
type: Injectable,
|
|
202
|
+
args: [{ providedIn: 'root' }]
|
|
203
|
+
}] });
|
|
204
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"state_manager.js","sourceRoot":"","sources":["../../../../../../../packages/router/src/statemanager/state_manager.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\nimport {Location} from '@angular/common';\nimport {inject, Injectable} from '@angular/core';\nimport {SubscriptionLike} from 'rxjs';\n\nimport {BeforeActivateRoutes, Event, NavigationCancel, NavigationCancellationCode, NavigationEnd, NavigationError, NavigationSkipped, NavigationStart, PrivateRouterEvents, RoutesRecognized,} from '../events';\nimport {Navigation, RestoredState} from '../navigation_transition';\nimport {ROUTER_CONFIGURATION} from '../router_config';\nimport {createEmptyState, RouterState} from '../router_state';\nimport {UrlHandlingStrategy} from '../url_handling_strategy';\nimport {UrlSerializer, UrlTree} from '../url_tree';\n\n@Injectable({providedIn: 'root', useFactory: () => inject(HistoryStateManager)})\nexport abstract class StateManager {\n  /**\n   * Returns the currently activated `UrlTree`.\n   *\n   * This `UrlTree` shows only URLs that the `Router` is configured to handle (through\n   * `UrlHandlingStrategy`).\n   *\n   * The value is set after finding the route config tree to activate but before activating the\n   * route.\n   */\n  abstract getCurrentUrlTree(): UrlTree;\n\n  /**\n   * Returns a `UrlTree` that is represents what the browser is actually showing.\n   *\n   * In the life of a navigation transition:\n   * 1. When a navigation begins, the raw `UrlTree` is updated to the full URL that's being\n   * navigated to.\n   * 2. During a navigation, redirects are applied, which might only apply to _part_ of the URL (due\n   * to `UrlHandlingStrategy`).\n   * 3. Just before activation, the raw `UrlTree` is updated to include the redirects on top of the\n   * original raw URL.\n   *\n   * Note that this is _only_ here to support `UrlHandlingStrategy.extract` and\n   * `UrlHandlingStrategy.shouldProcessUrl`. Without those APIs, the current `UrlTree` would not\n   * deviated from the raw `UrlTree`.\n   *\n   * For `extract`, a raw `UrlTree` is needed because `extract` may only return part\n   * of the navigation URL. Thus, the current `UrlTree` may only represent _part_ of the browser\n   * URL. When a navigation gets cancelled and the router needs to reset the URL or a new navigation\n   * occurs, it needs to know the _whole_ browser URL, not just the part handled by\n   * `UrlHandlingStrategy`.\n   * For `shouldProcessUrl`, when the return is `false`, the router ignores the navigation but\n   * still updates the raw `UrlTree` with the assumption that the navigation was caused by the\n   * location change listener due to a URL update by the AngularJS router. In this case, the router\n   * still need to know what the browser's URL is for future navigations.\n   */\n  abstract getRawUrlTree(): UrlTree;\n\n  /** Returns the current state stored by the browser for the current history entry. */\n  abstract restoredState(): RestoredState|null|undefined;\n\n  /** Returns the current RouterState. */\n  abstract getRouterState(): RouterState;\n\n  /**\n   * Registers a listener that is called whenever the current history entry changes by some API\n   * outside the Router. This includes user-activated changes like back buttons and link clicks, but\n   * also includes programmatic APIs called by non-Router JavaScript.\n   */\n  abstract registerNonRouterCurrentEntryChangeListener(\n      listener: (url: string, state: RestoredState|null|undefined) => void): SubscriptionLike;\n\n  /**\n   * Handles a navigation event sent from the Router. These are typically events that indicate a\n   * navigation has started, progressed, been cancelled, or finished.\n   */\n  abstract handleRouterEvent(e: Event|PrivateRouterEvents, currentTransition: Navigation): void;\n}\n\n@Injectable({providedIn: 'root'})\nexport class HistoryStateManager extends StateManager {\n  private readonly location = inject(Location);\n  private readonly urlSerializer = inject(UrlSerializer);\n  private readonly options = inject(ROUTER_CONFIGURATION, {optional: true}) || {};\n  private readonly canceledNavigationResolution =\n      this.options.canceledNavigationResolution || 'replace';\n\n  private urlHandlingStrategy = inject(UrlHandlingStrategy);\n  private urlUpdateStrategy = this.options.urlUpdateStrategy || 'deferred';\n\n  private currentUrlTree = new UrlTree();\n\n  override getCurrentUrlTree() {\n    return this.currentUrlTree;\n  }\n\n  private rawUrlTree = this.currentUrlTree;\n\n  override getRawUrlTree() {\n    return this.rawUrlTree;\n  }\n\n  /**\n   * The id of the currently active page in the router.\n   * Updated to the transition's target id on a successful navigation.\n   *\n   * This is used to track what page the router last activated. When an attempted navigation fails,\n   * the router can then use this to compute how to restore the state back to the previously active\n   * page.\n   */\n  private currentPageId: number = 0;\n  private lastSuccessfulId: number = -1;\n\n  override restoredState(): RestoredState|null|undefined {\n    return this.location.getState() as RestoredState | null | undefined;\n  }\n\n  /**\n   * The ɵrouterPageId of whatever page is currently active in the browser history. This is\n   * important for computing the target page id for new navigations because we need to ensure each\n   * page id in the browser history is 1 more than the previous entry.\n   */\n  private get browserPageId(): number {\n    if (this.canceledNavigationResolution !== 'computed') {\n      return this.currentPageId;\n    }\n    return this.restoredState()?.ɵrouterPageId ?? this.currentPageId;\n  }\n\n  private routerState = createEmptyState(this.currentUrlTree, null);\n\n  override getRouterState() {\n    return this.routerState;\n  }\n\n  private stateMemento = this.createStateMemento();\n\n  private createStateMemento() {\n    return {\n      rawUrlTree: this.rawUrlTree,\n      currentUrlTree: this.currentUrlTree,\n      routerState: this.routerState,\n    };\n  }\n\n  override registerNonRouterCurrentEntryChangeListener(\n      listener: (url: string, state: RestoredState|null|undefined) => void): SubscriptionLike {\n    return this.location.subscribe(event => {\n      if (event['type'] === 'popstate') {\n        listener(event['url']!, event.state as RestoredState | null | undefined);\n      }\n    });\n  }\n\n  override handleRouterEvent(e: Event|PrivateRouterEvents, currentTransition: Navigation) {\n    if (e instanceof NavigationStart) {\n      this.stateMemento = this.createStateMemento();\n    } else if (e instanceof NavigationSkipped) {\n      this.rawUrlTree = currentTransition.initialUrl;\n    } else if (e instanceof RoutesRecognized) {\n      if (this.urlUpdateStrategy === 'eager') {\n        if (!currentTransition.extras.skipLocationChange) {\n          const rawUrl = this.urlHandlingStrategy.merge(\n              currentTransition.finalUrl!, currentTransition.initialUrl);\n          this.setBrowserUrl(rawUrl, currentTransition);\n        }\n      }\n    } else if (e instanceof BeforeActivateRoutes) {\n      this.currentUrlTree = currentTransition.finalUrl!;\n      this.rawUrlTree =\n          this.urlHandlingStrategy.merge(currentTransition.finalUrl!, currentTransition.initialUrl);\n      this.routerState = currentTransition.targetRouterState!;\n      if (this.urlUpdateStrategy === 'deferred') {\n        if (!currentTransition.extras.skipLocationChange) {\n          this.setBrowserUrl(this.rawUrlTree, currentTransition);\n        }\n      }\n    } else if (\n        e instanceof NavigationCancel &&\n        (e.code === NavigationCancellationCode.GuardRejected ||\n         e.code === NavigationCancellationCode.NoDataFromResolver)) {\n      this.restoreHistory(currentTransition);\n    } else if (e instanceof NavigationError) {\n      this.restoreHistory(currentTransition, true);\n    } else if (e instanceof NavigationEnd) {\n      this.lastSuccessfulId = e.id;\n      this.currentPageId = this.browserPageId;\n    }\n  }\n\n  private setBrowserUrl(url: UrlTree, transition: Navigation) {\n    const path = this.urlSerializer.serialize(url);\n    if (this.location.isCurrentPathEqualTo(path) || !!transition.extras.replaceUrl) {\n      // replacements do not update the target page\n      const currentBrowserPageId = this.browserPageId;\n      const state = {\n        ...transition.extras.state,\n        ...this.generateNgRouterState(transition.id, currentBrowserPageId)\n      };\n      this.location.replaceState(path, '', state);\n    } else {\n      const state = {\n        ...transition.extras.state,\n        ...this.generateNgRouterState(transition.id, this.browserPageId + 1)\n      };\n      this.location.go(path, '', state);\n    }\n  }\n\n  /**\n   * Performs the necessary rollback action to restore the browser URL to the\n   * state before the transition.\n   */\n  private restoreHistory(navigation: Navigation, restoringFromCaughtError = false) {\n    if (this.canceledNavigationResolution === 'computed') {\n      const currentBrowserPageId = this.browserPageId;\n      const targetPagePosition = this.currentPageId - currentBrowserPageId;\n      if (targetPagePosition !== 0) {\n        this.location.historyGo(targetPagePosition);\n      } else if (this.currentUrlTree === navigation.finalUrl && targetPagePosition === 0) {\n        // We got to the activation stage (where currentUrlTree is set to the navigation's\n        // finalUrl), but we weren't moving anywhere in history (skipLocationChange or replaceUrl).\n        // We still need to reset the router state back to what it was when the navigation started.\n        this.resetState(navigation);\n        this.resetUrlToCurrentUrlTree();\n      } else {\n        // The browser URL and router state was not updated before the navigation cancelled so\n        // there's no restoration needed.\n      }\n    } else if (this.canceledNavigationResolution === 'replace') {\n      // TODO(atscott): It seems like we should _always_ reset the state here. It would be a no-op\n      // for `deferred` navigations that haven't change the internal state yet because guards\n      // reject. For 'eager' navigations, it seems like we also really should reset the state\n      // because the navigation was cancelled. Investigate if this can be done by running TGP.\n      if (restoringFromCaughtError) {\n        this.resetState(navigation);\n      }\n      this.resetUrlToCurrentUrlTree();\n    }\n  }\n\n  private resetState(navigation: Navigation): void {\n    this.routerState = this.stateMemento.routerState;\n    this.currentUrlTree = this.stateMemento.currentUrlTree;\n    // Note here that we use the urlHandlingStrategy to get the reset `rawUrlTree` because it may be\n    // configured to handle only part of the navigation URL. This means we would only want to reset\n    // the part of the navigation handled by the Angular router rather than the whole URL. In\n    // addition, the URLHandlingStrategy may be configured to specifically preserve parts of the URL\n    // when merging, such as the query params so they are not lost on a refresh.\n    this.rawUrlTree =\n        this.urlHandlingStrategy.merge(this.currentUrlTree, navigation.finalUrl ?? this.rawUrlTree);\n  }\n\n  private resetUrlToCurrentUrlTree(): void {\n    this.location.replaceState(\n        this.urlSerializer.serialize(this.rawUrlTree), '',\n        this.generateNgRouterState(this.lastSuccessfulId, this.currentPageId));\n  }\n\n  private generateNgRouterState(navigationId: number, routerPageId: number) {\n    if (this.canceledNavigationResolution === 'computed') {\n      return {navigationId, ɵrouterPageId: routerPageId};\n    }\n    return {navigationId};\n  }\n}\n"]}
|
|
@@ -15,10 +15,10 @@ import * as i0 from "@angular/core";
|
|
|
15
15
|
* @publicApi
|
|
16
16
|
*/
|
|
17
17
|
export class UrlHandlingStrategy {
|
|
18
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
19
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-
|
|
18
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlHandlingStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
19
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlHandlingStrategy, providedIn: 'root', useFactory: () => inject(DefaultUrlHandlingStrategy) }); }
|
|
20
20
|
}
|
|
21
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
21
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlHandlingStrategy, decorators: [{
|
|
22
22
|
type: Injectable,
|
|
23
23
|
args: [{ providedIn: 'root', useFactory: () => inject(DefaultUrlHandlingStrategy) }]
|
|
24
24
|
}] });
|
|
@@ -35,10 +35,10 @@ export class DefaultUrlHandlingStrategy {
|
|
|
35
35
|
merge(newUrlPart, wholeUrl) {
|
|
36
36
|
return newUrlPart;
|
|
37
37
|
}
|
|
38
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
39
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-
|
|
38
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: DefaultUrlHandlingStrategy, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
39
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: DefaultUrlHandlingStrategy, providedIn: 'root' }); }
|
|
40
40
|
}
|
|
41
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
41
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: DefaultUrlHandlingStrategy, decorators: [{
|
|
42
42
|
type: Injectable,
|
|
43
43
|
args: [{ providedIn: 'root' }]
|
|
44
44
|
}] });
|
package/esm2022/src/url_tree.mjs
CHANGED
|
@@ -266,10 +266,10 @@ export function mapChildrenIntoArray(segment, fn) {
|
|
|
266
266
|
* @publicApi
|
|
267
267
|
*/
|
|
268
268
|
export class UrlSerializer {
|
|
269
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
270
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-
|
|
269
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlSerializer, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
270
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlSerializer, providedIn: 'root', useFactory: () => new DefaultUrlSerializer() }); }
|
|
271
271
|
}
|
|
272
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
272
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: UrlSerializer, decorators: [{
|
|
273
273
|
type: Injectable,
|
|
274
274
|
args: [{ providedIn: 'root', useFactory: () => new DefaultUrlSerializer() }]
|
|
275
275
|
}] });
|
|
@@ -7,7 +7,7 @@
|
|
|
7
7
|
*/
|
|
8
8
|
/// <reference types="@types/dom-view-transitions" />
|
|
9
9
|
import { DOCUMENT } from '@angular/common';
|
|
10
|
-
import { afterNextRender, InjectionToken, NgZone } from '@angular/core';
|
|
10
|
+
import { afterNextRender, InjectionToken, NgZone, runInInjectionContext } from '@angular/core';
|
|
11
11
|
export const CREATE_VIEW_TRANSITION = new InjectionToken(ngDevMode ? 'view transition helper' : '');
|
|
12
12
|
export const VIEW_TRANSITION_OPTIONS = new InjectionToken(ngDevMode ? 'view transition options' : '');
|
|
13
13
|
/**
|
|
@@ -16,7 +16,7 @@ export const VIEW_TRANSITION_OPTIONS = new InjectionToken(ngDevMode ? 'view tran
|
|
|
16
16
|
*
|
|
17
17
|
* @returns A Promise that resolves when the view transition callback begins.
|
|
18
18
|
*/
|
|
19
|
-
export function createViewTransition(injector) {
|
|
19
|
+
export function createViewTransition(injector, from, to) {
|
|
20
20
|
const transitionOptions = injector.get(VIEW_TRANSITION_OPTIONS);
|
|
21
21
|
const document = injector.get(DOCUMENT);
|
|
22
22
|
// Create promises outside the Angular zone to avoid causing extra change detections
|
|
@@ -29,10 +29,18 @@ export function createViewTransition(injector) {
|
|
|
29
29
|
const viewTransitionStarted = new Promise((resolve) => {
|
|
30
30
|
resolveViewTransitionStarted = resolve;
|
|
31
31
|
});
|
|
32
|
-
document.startViewTransition(() => {
|
|
32
|
+
const transition = document.startViewTransition(() => {
|
|
33
33
|
resolveViewTransitionStarted();
|
|
34
|
+
// We don't actually update dom within the transition callback. The resolving of the above
|
|
35
|
+
// promise unblocks the Router navigation, which synchronously activates and deactivates
|
|
36
|
+
// routes (the DOM update). This view transition waits for the next change detection to
|
|
37
|
+
// complete (below), which includes the update phase of the routed components.
|
|
34
38
|
return createRenderPromise(injector);
|
|
35
39
|
});
|
|
40
|
+
const { onViewTransitionCreated } = transitionOptions;
|
|
41
|
+
if (onViewTransitionCreated) {
|
|
42
|
+
runInInjectionContext(injector, () => onViewTransitionCreated({ transition, from, to }));
|
|
43
|
+
}
|
|
36
44
|
return viewTransitionStarted;
|
|
37
45
|
});
|
|
38
46
|
}
|
|
@@ -44,4 +52,4 @@ function createRenderPromise(injector) {
|
|
|
44
52
|
afterNextRender(resolve, { injector });
|
|
45
53
|
});
|
|
46
54
|
}
|
|
47
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
55
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"view_transition.js","sourceRoot":"","sources":["../../../../../../../packages/router/src/utils/view_transition.ts"],"names":[],"mappings":"AAAA;;;;;;GAMG;AAEH,qDAAqD;AAErD,OAAO,EAAC,QAAQ,EAAC,MAAM,iBAAiB,CAAC;AACzC,OAAO,EAAC,eAAe,EAAE,cAAc,EAAY,MAAM,EAAE,qBAAqB,EAAC,MAAM,eAAe,CAAC;AAIvG,MAAM,CAAC,MAAM,sBAAsB,GAC/B,IAAI,cAAc,CAA8B,SAAS,CAAC,CAAC,CAAC,wBAAwB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAC/F,MAAM,CAAC,MAAM,uBAAuB,GAChC,IAAI,cAAc,CACd,SAAS,CAAC,CAAC,CAAC,yBAAyB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AAmEpD;;;;;GAKG;AACH,MAAM,UAAU,oBAAoB,CAChC,QAAkB,EAAE,IAA4B,EAAE,EAA0B;IAC9E,MAAM,iBAAiB,GAAG,QAAQ,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;IAChE,MAAM,QAAQ,GAAG,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IACxC,oFAAoF;IACpF,OAAO,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,iBAAiB,CAAC,GAAG,EAAE;QACjD,IAAI,CAAC,QAAQ,CAAC,mBAAmB,IAAI,iBAAiB,CAAC,kBAAkB,EAAE;YACzE,iBAAiB,CAAC,kBAAkB,GAAG,KAAK,CAAC;YAC7C,OAAO,OAAO,CAAC,OAAO,EAAE,CAAC;SAC1B;QAED,IAAI,4BAAwC,CAAC;QAC7C,MAAM,qBAAqB,GAAG,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,EAAE;YAC1D,4BAA4B,GAAG,OAAO,CAAC;QACzC,CAAC,CAAC,CAAC;QACH,MAAM,UAAU,GAAG,QAAQ,CAAC,mBAAmB,CAAC,GAAG,EAAE;YACnD,4BAA4B,EAAE,CAAC;YAC/B,0FAA0F;YAC1F,wFAAwF;YACxF,uFAAuF;YACvF,8EAA8E;YAC9E,OAAO,mBAAmB,CAAC,QAAQ,CAAC,CAAC;QACvC,CAAC,CAAC,CAAC;QACH,MAAM,EAAC,uBAAuB,EAAC,GAAG,iBAAiB,CAAC;QACpD,IAAI,uBAAuB,EAAE;YAC3B,qBAAqB,CAAC,QAAQ,EAAE,GAAG,EAAE,CAAC,uBAAuB,CAAC,EAAC,UAAU,EAAE,IAAI,EAAE,EAAE,EAAC,CAAC,CAAC,CAAC;SACxF;QACD,OAAO,qBAAqB,CAAC;IAC/B,CAAC,CAAC,CAAC;AACL,CAAC;AAED;;GAEG;AACH,SAAS,mBAAmB,CAAC,QAAkB;IAC7C,OAAO,IAAI,OAAO,CAAO,OAAO,CAAC,EAAE;QACjC,eAAe,CAAC,OAAO,EAAE,EAAC,QAAQ,EAAC,CAAC,CAAC;IACvC,CAAC,CAAC,CAAC;AACL,CAAC","sourcesContent":["/**\n * @license\n * Copyright Google LLC All Rights Reserved.\n *\n * Use of this source code is governed by an MIT-style license that can be\n * found in the LICENSE file at https://angular.io/license\n */\n\n/// <reference types=\"@types/dom-view-transitions\" />\n\nimport {DOCUMENT} from '@angular/common';\nimport {afterNextRender, InjectionToken, Injector, NgZone, runInInjectionContext} from '@angular/core';\n\nimport {ActivatedRouteSnapshot} from '../router_state';\n\nexport const CREATE_VIEW_TRANSITION =\n    new InjectionToken<typeof createViewTransition>(ngDevMode ? 'view transition helper' : '');\nexport const VIEW_TRANSITION_OPTIONS =\n    new InjectionToken<ViewTransitionsFeatureOptions&{skipNextTransition: boolean}>(\n        ngDevMode ? 'view transition options' : '');\n\n/**\n * Options to configure the View Transitions integration in the Router.\n *\n * @experimental\n * @publicApi\n * @see withViewTransitions\n */\nexport interface ViewTransitionsFeatureOptions {\n  /**\n   * Skips the very first call to `startViewTransition`. This can be useful for disabling the\n   * animation during the application's initial loading phase.\n   */\n  skipInitialTransition?: boolean;\n\n  /**\n   * A function to run after the `ViewTransition` is created.\n   *\n   * This function is run in an injection context and can use `inject`.\n   */\n  onViewTransitionCreated?: (transitionInfo: ViewTransitionInfo) => void;\n}\n\n/**\n * The information passed to the `onViewTransitionCreated` function provided in the\n * `withViewTransitions` feature options.\n *\n * @publicApi\n * @experimental\n */\nexport interface ViewTransitionInfo {\n  // TODO(atscott): This type can/should be the built-in `ViewTransition` type\n  // from @types/dom-view-transitions but exporting that type from the public API is currently not\n  // supported by tooling.\n  /**\n   * The `ViewTransition` returned by the call to `startViewTransition`.\n   * @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition\n   */\n  transition: {\n    /**\n     * @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/finished\n     */\n    finished: Promise<void>,\n    /**\n     * @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/ready\n     */\n    ready: Promise<void>,\n    /**\n     * @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/updateCallbackDone\n     */\n    updateCallbackDone: Promise<void>,\n    /**\n     * @see https://developer.mozilla.org/en-US/docs/Web/API/ViewTransition/skipTransition\n     */\n    skipTransition(): void,\n  };\n  /**\n   * The `ActivatedRouteSnapshot` that the navigation is transitioning from.\n   */\n  from: ActivatedRouteSnapshot;\n  /**\n   * The `ActivatedRouteSnapshot` that the navigation is transitioning to.\n   */\n  to: ActivatedRouteSnapshot;\n}\n\n/**\n * A helper function for using browser view transitions. This function skips the call to\n * `startViewTransition` if the browser does not support it.\n *\n * @returns A Promise that resolves when the view transition callback begins.\n */\nexport function createViewTransition(\n    injector: Injector, from: ActivatedRouteSnapshot, to: ActivatedRouteSnapshot): Promise<void> {\n  const transitionOptions = injector.get(VIEW_TRANSITION_OPTIONS);\n  const document = injector.get(DOCUMENT);\n  // Create promises outside the Angular zone to avoid causing extra change detections\n  return injector.get(NgZone).runOutsideAngular(() => {\n    if (!document.startViewTransition || transitionOptions.skipNextTransition) {\n      transitionOptions.skipNextTransition = false;\n      return Promise.resolve();\n    }\n\n    let resolveViewTransitionStarted: () => void;\n    const viewTransitionStarted = new Promise<void>((resolve) => {\n      resolveViewTransitionStarted = resolve;\n    });\n    const transition = document.startViewTransition(() => {\n      resolveViewTransitionStarted();\n      // We don't actually update dom within the transition callback. The resolving of the above\n      // promise unblocks the Router navigation, which synchronously activates and deactivates\n      // routes (the DOM update). This view transition waits for the next change detection to\n      // complete (below), which includes the update phase of the routed components.\n      return createRenderPromise(injector);\n    });\n    const {onViewTransitionCreated} = transitionOptions;\n    if (onViewTransitionCreated) {\n      runInInjectionContext(injector, () => onViewTransitionCreated({transition, from, to}));\n    }\n    return viewTransitionStarted;\n  });\n}\n\n/**\n * Creates a promise that resolves after next render.\n */\nfunction createRenderPromise(injector: Injector) {\n  return new Promise<void>(resolve => {\n    afterNextRender(resolve, {injector});\n  });\n}\n"]}
|
package/esm2022/src/version.mjs
CHANGED
|
@@ -14,5 +14,5 @@ import { Version } from '@angular/core';
|
|
|
14
14
|
/**
|
|
15
15
|
* @publicApi
|
|
16
16
|
*/
|
|
17
|
-
export const VERSION = new Version('17.0.0-
|
|
17
|
+
export const VERSION = new Version('17.0.0-rc.0');
|
|
18
18
|
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3JvdXRlci9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSDs7OztHQUlHO0FBRUgsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUV0Qzs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSByb3V0ZXIgcGFja2FnZS5cbiAqL1xuXG5pbXBvcnQge1ZlcnNpb259IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG4vKipcbiAqIEBwdWJsaWNBcGlcbiAqL1xuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==
|
|
@@ -25,18 +25,18 @@ export class RootFixtureService {
|
|
|
25
25
|
this.fixture.detectChanges();
|
|
26
26
|
return this.fixture;
|
|
27
27
|
}
|
|
28
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
29
|
-
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-
|
|
28
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, deps: [], target: i0.ɵɵFactoryTarget.Injectable }); }
|
|
29
|
+
static { this.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, providedIn: 'root' }); }
|
|
30
30
|
}
|
|
31
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
31
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootFixtureService, decorators: [{
|
|
32
32
|
type: Injectable,
|
|
33
33
|
args: [{ providedIn: 'root' }]
|
|
34
34
|
}] });
|
|
35
35
|
export class RootCmp {
|
|
36
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
37
|
-
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.0.0-
|
|
36
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootCmp, deps: [], target: i0.ɵɵFactoryTarget.Component }); }
|
|
37
|
+
static { this.ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.0.0-rc.0", type: RootCmp, isStandalone: true, selector: "ng-component", viewQueries: [{ propertyName: "outlet", first: true, predicate: RouterOutlet, descendants: true }], 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"] }] }); }
|
|
38
38
|
}
|
|
39
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
39
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RootCmp, decorators: [{
|
|
40
40
|
type: Component,
|
|
41
41
|
args: [{
|
|
42
42
|
standalone: true,
|
|
@@ -46,16 +46,16 @@ export class RouterTestingModule {
|
|
|
46
46
|
]
|
|
47
47
|
};
|
|
48
48
|
}
|
|
49
|
-
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-
|
|
50
|
-
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.0-
|
|
51
|
-
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.0-
|
|
49
|
+
static { this.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule }); }
|
|
50
|
+
static { this.ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, exports: [RouterModule] }); }
|
|
51
|
+
static { this.ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, providers: [
|
|
52
52
|
ROUTER_PROVIDERS,
|
|
53
53
|
provideLocationMocks(),
|
|
54
54
|
withPreloading(NoPreloading).ɵproviders,
|
|
55
55
|
{ provide: ROUTES, multi: true, useValue: [] },
|
|
56
56
|
], imports: [RouterModule] }); }
|
|
57
57
|
}
|
|
58
|
-
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-
|
|
58
|
+
i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.0.0-rc.0", ngImport: i0, type: RouterTestingModule, decorators: [{
|
|
59
59
|
type: NgModule,
|
|
60
60
|
args: [{
|
|
61
61
|
exports: [RouterModule],
|