@angular/router 12.2.1 → 12.2.5

package/esm2015/src/version.js

@@ -14,5 +14,5 @@ import { Version } from '@angular/core';
 /**
  * @publicApi
  */
-export const VERSION = new Version('12.2.1');
+export const VERSION = new Version('12.2.5');
 //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidmVyc2lvbi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uLy4uLy4uL3BhY2thZ2VzL3JvdXRlci9zcmMvdmVyc2lvbi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQTs7Ozs7O0dBTUc7QUFFSDs7OztHQUlHO0FBRUgsT0FBTyxFQUFDLE9BQU8sRUFBQyxNQUFNLGVBQWUsQ0FBQztBQUV0Qzs7R0FFRztBQUNILE1BQU0sQ0FBQyxNQUFNLE9BQU8sR0FBRyxJQUFJLE9BQU8sQ0FBQyxtQkFBbUIsQ0FBQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiLyoqXG4gKiBAbGljZW5zZVxuICogQ29weXJpZ2h0IEdvb2dsZSBMTEMgQWxsIFJpZ2h0cyBSZXNlcnZlZC5cbiAqXG4gKiBVc2Ugb2YgdGhpcyBzb3VyY2UgY29kZSBpcyBnb3Zlcm5lZCBieSBhbiBNSVQtc3R5bGUgbGljZW5zZSB0aGF0IGNhbiBiZVxuICogZm91bmQgaW4gdGhlIExJQ0VOU0UgZmlsZSBhdCBodHRwczovL2FuZ3VsYXIuaW8vbGljZW5zZVxuICovXG5cbi8qKlxuICogQG1vZHVsZVxuICogQGRlc2NyaXB0aW9uXG4gKiBFbnRyeSBwb2ludCBmb3IgYWxsIHB1YmxpYyBBUElzIG9mIHRoZSByb3V0ZXIgcGFja2FnZS5cbiAqL1xuXG5pbXBvcnQge1ZlcnNpb259IGZyb20gJ0Bhbmd1bGFyL2NvcmUnO1xuXG4vKipcbiAqIEBwdWJsaWNBcGlcbiAqL1xuZXhwb3J0IGNvbnN0IFZFUlNJT04gPSBuZXcgVmVyc2lvbignMC4wLjAtUExBQ0VIT0xERVInKTtcbiJdfQ==

package/fesm2015/router.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
  */
@@ -3827,7 +3827,7 @@ function defaultRouterHook(snapshot, runExtras) {
     return 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).
  */
 const exactMatchOptions = {
@@ -3837,7 +3837,7 @@ const exactMatchOptions = {
     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).
  */
 const subsetMatchOptions = {
@@ -4052,6 +4052,11 @@ class Router {
                     t.extractedUrl.toString() !== this.browserUrlTree.toString();
                 const 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 of(t).pipe(
                     // Fire NavigationStart event
@@ -4283,7 +4288,12 @@ class Router {
                             const mergedTree = this.urlHandlingStrategy.merge(e.url, this.rawUrlTree);
                             const 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);
@@ -4640,7 +4650,7 @@ class Router {
             this.lastSuccessfulNavigation = this.currentNavigation;
             t.resolve(true);
         }, e => {
-            this.console.warn(`Unhandled Navigation Error: `);
+            this.console.warn(`Unhandled Navigation Error: ${e}`);
         });
     }
     scheduleNavigation(rawUrl, source, restoredState, extras, priorPromise) {
@@ -4660,7 +4670,8 @@ class Router {
         const 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).
-        const browserNavPrecededByRouterNav = source !== 'imperative' && (lastNavigation === null || lastNavigation === void 0 ? void 0 : lastNavigation.source) === 'imperative';
+        const browserNavPrecededByRouterNav = isBrowserTriggeredNavigation(source) && lastNavigation &&
+            !isBrowserTriggeredNavigation(lastNavigation.source);
         const 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).
@@ -4829,6 +4840,9 @@ function validateCommands(commands) {
         }
     }
 }
+function isBrowserTriggeredNavigation(source) {
+    return source !== 'imperative';
+}
 
 /**
  * @license
@@ -6060,7 +6074,7 @@ function provideRouterInitializer() {
 /**
  * @publicApi
  */
-const VERSION = new Version('12.2.1');
+const VERSION = new Version('12.2.5');
 
 /**
  * @license