Skip to content

Commit 0432d95

Browse files
committed
Revert "fix(router): Route matching should only happen once when navigating (#49163)" (#49634)
This reverts commit 1600687. PR Close #49634
1 parent 9c5fd50 commit 0432d95

File tree

14 files changed

+631
-470
lines changed

14 files changed

+631
-470
lines changed

goldens/circular-deps/packages.json

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -286,6 +286,12 @@
286286
"packages/forms/src/validators.ts",
287287
"packages/forms/src/model/abstract_model.ts"
288288
],
289+
[
290+
"packages/router/src/apply_redirects.ts",
291+
"packages/router/src/operators/check_guards.ts",
292+
"packages/router/src/navigation_transition.ts",
293+
"packages/router/src/operators/apply_redirects.ts"
294+
],
289295
[
290296
"packages/router/src/directives/router_outlet.ts",
291297
"packages/router/src/router_outlet_context.ts"
@@ -305,7 +311,7 @@
305311
],
306312
[
307313
"packages/router/src/navigation_transition.ts",
308-
"packages/router/src/operators/check_guards.ts"
314+
"packages/router/src/operators/apply_redirects.ts"
309315
],
310316
[
311317
"packages/router/src/navigation_transition.ts",

goldens/size-tracking/integration-payloads.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"cli-hello-world": {
33
"uncompressed": {
44
"runtime": 908,
5-
"main": 128657,
5+
"main": 129295,
66
"polyfills": 33792
77
}
88
},
@@ -26,15 +26,15 @@
2626
"cli-hello-world-lazy": {
2727
"uncompressed": {
2828
"runtime": 2734,
29-
"main": 230468,
29+
"main": 232018,
3030
"polyfills": 33810,
3131
"src_app_lazy_lazy_routes_ts": 487
3232
}
3333
},
3434
"forms": {
3535
"uncompressed": {
3636
"runtime": 888,
37-
"main": 161512,
37+
"main": 160778,
3838
"polyfills": 33772
3939
}
4040
},

packages/core/test/bundling/router/bundle.golden_symbols.json

Lines changed: 27 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,9 @@
3232
{
3333
"name": "ApplicationRef"
3434
},
35+
{
36+
"name": "ApplyRedirects"
37+
},
3538
{
3639
"name": "ArgumentOutOfRangeError"
3740
},
@@ -473,6 +476,9 @@
473476
{
474477
"name": "NoMatch"
475478
},
479+
{
480+
"name": "NoMatch2"
481+
},
476482
{
477483
"name": "NodeInjector"
478484
},
@@ -734,6 +740,9 @@
734740
{
735741
"name": "TakeSubscriber"
736742
},
743+
{
744+
"name": "TakeWhileSubscriber"
745+
},
737746
{
738747
"name": "TapSubscriber"
739748
},
@@ -1058,18 +1067,12 @@
10581067
{
10591068
"name": "createRoot"
10601069
},
1061-
{
1062-
"name": "createSegmentGroupFromRoute"
1063-
},
10641070
{
10651071
"name": "createTView"
10661072
},
10671073
{
10681074
"name": "createTemplateRef"
10691075
},
1070-
{
1071-
"name": "createUrlTreeFromSegmentGroup"
1072-
},
10731076
{
10741077
"name": "currentConsumer"
10751078
},
@@ -1349,6 +1352,9 @@
13491352
{
13501353
"name": "getOrCreateNodeInjectorForNode"
13511354
},
1355+
{
1356+
"name": "getOrCreateRouteInjectorIfNeeded"
1357+
},
13521358
{
13531359
"name": "getOrCreateTNode"
13541360
},
@@ -1556,6 +1562,9 @@
15561562
{
15571563
"name": "isFunction2"
15581564
},
1565+
{
1566+
"name": "isImmediateMatch"
1567+
},
15591568
{
15601569
"name": "isInlineTemplate"
15611570
},
@@ -1619,6 +1628,9 @@
16191628
{
16201629
"name": "joinWithSlash"
16211630
},
1631+
{
1632+
"name": "last"
1633+
},
16221634
{
16231635
"name": "last2"
16241636
},
@@ -1721,6 +1733,9 @@
17211733
{
17221734
"name": "ngZoneApplicationErrorHandlerFactory"
17231735
},
1736+
{
1737+
"name": "noLeftoversInUrl"
1738+
},
17241739
{
17251740
"name": "noMatch"
17261741
},
@@ -1853,6 +1868,9 @@
18531868
{
18541869
"name": "saveNameToExportMap"
18551870
},
1871+
{
1872+
"name": "scan"
1873+
},
18561874
{
18571875
"name": "scheduleArray"
18581876
},
@@ -1928,6 +1946,9 @@
19281946
{
19291947
"name": "shouldSearchParent"
19301948
},
1949+
{
1950+
"name": "sortByMatchingOutlets"
1951+
},
19311952
{
19321953
"name": "split"
19331954
},

0 commit comments

Comments
 (0)