@angular/router 12.2.1 → 12.2.5

package/bundles/router-testing.umd.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.2.1
+ * @license Angular v12.2.5
  * (c) 2010-2021 Google LLC. https://angular.io/
  * License: MIT
  */

package/bundles/router-upgrade.umd.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.2.1
+ * @license Angular v12.2.5
  * (c) 2010-2021 Google LLC. https://angular.io/
  * License: MIT
  */

package/bundles/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @license Angular v12.2.1
+ * @license Angular v12.2.5
  * (c) 2010-2021 Google LLC. https://angular.io/
  * License: MIT
  */
@@ -4419,7 +4419,7 @@
         return rxjs.of(null);
     }
     /**
-     * The equivalent `IsActiveUrlTreeOptions` options for `Router.isActive` is called with `true`
+     * The equivalent `IsActiveMatchOptions` options for `Router.isActive` is called with `true`
      * (exact = true).
      */
     var exactMatchOptions = {
@@ -4429,7 +4429,7 @@
         queryParams: 'exact'
     };
     /**
-     * The equivalent `IsActiveUrlTreeOptions` options for `Router.isActive` is called with `false`
+     * The equivalent `IsActiveMatchOptions` options for `Router.isActive` is called with `false`
      * (exact = false).
      */
     var subsetMatchOptions = {
@@ -4650,6 +4650,11 @@
                         t.extractedUrl.toString() !== _this.browserUrlTree.toString();
                     var processCurrentUrl = (_this.onSameUrlNavigation === 'reload' ? true : urlTransition) &&
                         _this.urlHandlingStrategy.shouldProcessUrl(t.rawUrl);
+                    // If the source of the navigation is from a browser event, the URL is
+                    // already updated. We already need to sync the internal state.
+                    if (isBrowserTriggeredNavigation(t.source)) {
+                        _this.browserUrlTree = t.rawUrl;
+                    }
                     if (processCurrentUrl) {
                         return rxjs.of(t).pipe(
                         // Fire NavigationStart event
@@ -4881,7 +4886,12 @@
                                 var mergedTree = _this.urlHandlingStrategy.merge(e.url, _this.rawUrlTree);
                                 var extras = {
                                     skipLocationChange: t.extras.skipLocationChange,
-                                    replaceUrl: _this.urlUpdateStrategy === 'eager'
+                                    // The URL is already updated at this point if we have 'eager' URL
+                                    // updates or if the navigation was triggered by the browser (back
+                                    // button, URL bar, etc). We want to replace that item in history if
+                                    // the navigation is rejected.
+                                    replaceUrl: _this.urlUpdateStrategy === 'eager' ||
+                                        isBrowserTriggeredNavigation(t.source)
                                 };
                                 _this.scheduleNavigation(mergedTree, 'imperative', null, extras, { resolve: t.resolve, reject: t.reject, promise: t.promise });
                             }, 0);
@@ -5247,7 +5257,7 @@
                 _this.lastSuccessfulNavigation = _this.currentNavigation;
                 t.resolve(true);
             }, function (e) {
-                _this.console.warn("Unhandled Navigation Error: ");
+                _this.console.warn("Unhandled Navigation Error: " + e);
             });
         };
         Router.prototype.scheduleNavigation = function (rawUrl, source, restoredState, extras, priorPromise) {
@@ -5267,7 +5277,8 @@
             var lastNavigation = this.getTransition();
             // We don't want to skip duplicate successful navs if they're imperative because
             // onSameUrlNavigation could be 'reload' (so the duplicate is intended).
-            var browserNavPrecededByRouterNav = source !== 'imperative' && (lastNavigation === null || lastNavigation === void 0 ? void 0 : lastNavigation.source) === 'imperative';
+            var browserNavPrecededByRouterNav = isBrowserTriggeredNavigation(source) && lastNavigation &&
+                !isBrowserTriggeredNavigation(lastNavigation.source);
             var lastNavigationSucceeded = this.lastSuccessfulId === lastNavigation.id;
             // If the last navigation succeeded or is in flight, we can use the rawUrl as the comparison.
             // However, if it failed, we should compare to the final result (urlAfterRedirects).
@@ -5438,6 +5449,9 @@
             }
         }
     }
+    function isBrowserTriggeredNavigation(source) {
+        return source !== 'imperative';
+    }
 
     /**
      * @license
@@ -6733,7 +6747,7 @@
     /**
      * @publicApi
      */
-    var VERSION = new core.Version('12.2.1');
+    var VERSION = new core.Version('12.2.5');
 
     /**
      * @license