@remix-run/router 1.3.1-pre.0 → 1.3.1

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.1-pre.0
+ * @remix-run/router v1.3.1
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -435,23 +435,17 @@
     }
 
     function handlePop() {
-      let nextAction = exports.Action.Pop;
+      action = exports.Action.Pop;
       let nextIndex = getIndex();
+      let delta = nextIndex == null ? null : nextIndex - index;
+      index = nextIndex;
 
-      if (nextIndex != null) {
-        let delta = nextIndex - index;
-        action = nextAction;
-        index = nextIndex;
-
-        if (listener) {
-          listener({
-            action,
-            location: history.location,
-            delta
-          });
-        }
-      } else {
-        warning$1(false, "You are trying to perform a POP navigation to a location that was not " + "created by @remix-run/router. This will fail silently in production.  " + "You should navigate via the router to avoid this situation (instead of " + "using window.history.pushState/window.location.hash).");
+      if (listener) {
+        listener({
+          action,
+          location: history.location,
+          delta
+        });
       }
     }
 
@@ -1621,13 +1615,14 @@
           return;
         }
 
+        warning(activeBlocker != null && delta === null, "You are trying to use a blocker on a POP navigation to a location " + "that was not created by @remix-run/router. This will fail silently in " + "production. This can happen if you are navigating outside the router " + "via `window.history.pushState`/`window.location.hash` instead of using " + "router navigation APIs.  This can also happen if you are using " + "createHashRouter and the user manually changes the URL.");
         let blockerKey = shouldBlockNavigation({
           currentLocation: state.location,
           nextLocation: location,
           historyAction
         });
 
-        if (blockerKey) {
+        if (blockerKey && delta != null) {
           // Restore the URL to match the current UI, but don't update router state
           ignoreNextHistoryUpdate = true;
           init.history.go(delta * -1); // Put the blocker into a blocked state