Skip to content

Commit 72e6a94

Browse files
atscottthePunderWoman
authored andcommitted
refactor(router): Update recognize to use Observable instead of Promise (angular#46021)
The `Observable` chain is currenlty the most straightforward way to handle navigation cancellations where we ensure that the cancelled navigation does not continue to be processed. Until we design and implement an alternative way to accomplish equivalent functionality, we need to maintain the `Observable` chain wherever we might execute user code. One reason for this isthat user code may contain redirects so we do not want to execute those redirects if the navigation was already cancelled. PR Close angular#46021
1 parent de058bb commit 72e6a94

File tree

6 files changed

+241
-160
lines changed

6 files changed

+241
-160
lines changed

goldens/circular-deps/packages.json

+6-4
Original file line numberDiff line numberDiff line change
@@ -305,6 +305,12 @@
305305
"packages/forms/src/validators.ts",
306306
"packages/forms/src/model/abstract_model.ts"
307307
],
308+
[
309+
"packages/router/src/apply_redirects.ts",
310+
"packages/router/src/operators/check_guards.ts",
311+
"packages/router/src/router.ts",
312+
"packages/router/src/operators/apply_redirects.ts"
313+
],
308314
[
309315
"packages/router/src/directives/router_outlet.ts",
310316
"packages/router/src/router_outlet_context.ts"
@@ -326,10 +332,6 @@
326332
"packages/router/src/operators/apply_redirects.ts",
327333
"packages/router/src/router.ts"
328334
],
329-
[
330-
"packages/router/src/operators/check_guards.ts",
331-
"packages/router/src/router.ts"
332-
],
333335
[
334336
"packages/router/src/operators/recognize.ts",
335337
"packages/router/src/router.ts"

goldens/size-tracking/integration-payloads.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
"cli-hello-world-lazy": {
3434
"uncompressed": {
3535
"runtime": 2835,
36-
"main": 237084,
36+
"main": 238471,
3737
"polyfills": 33842,
3838
"src_app_lazy_lazy_module_ts": 780
3939
}

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

+16-4
Original file line numberDiff line numberDiff line change
@@ -494,6 +494,9 @@
494494
{
495495
"name": "ROUTES2"
496496
},
497+
{
498+
"name": "Recognizer"
499+
},
497500
{
498501
"name": "RefCountOperator"
499502
},
@@ -674,6 +677,9 @@
674677
{
675678
"name": "TakeSubscriber"
676679
},
680+
{
681+
"name": "TakeWhileSubscriber"
682+
},
677683
{
678684
"name": "TapSubscriber"
679685
},
@@ -1520,6 +1526,9 @@
15201526
{
15211527
"name": "joinWithSlash"
15221528
},
1529+
{
1530+
"name": "last"
1531+
},
15231532
{
15241533
"name": "last2"
15251534
},
@@ -1562,6 +1571,9 @@
15621571
{
15631572
"name": "matchSegments"
15641573
},
1574+
{
1575+
"name": "matchWithChecks"
1576+
},
15651577
{
15661578
"name": "materializeViewResults"
15671579
},
@@ -1604,9 +1616,6 @@
16041616
{
16051617
"name": "navigationCancelingError"
16061618
},
1607-
{
1608-
"name": "newObservableError"
1609-
},
16101619
{
16111620
"name": "nextBindingIndex"
16121621
},
@@ -1667,6 +1676,9 @@
16671676
{
16681677
"name": "pathCompareMap"
16691678
},
1679+
{
1680+
"name": "pipeFromArray"
1681+
},
16701682
{
16711683
"name": "platformBrowser"
16721684
},
@@ -1695,7 +1707,7 @@
16951707
"name": "readPatchedLView"
16961708
},
16971709
{
1698-
"name": "recognize2"
1710+
"name": "redirectIfUrlTree"
16991711
},
17001712
{
17011713
"name": "refCount"

0 commit comments

Comments
 (0)