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

package/dist/router.umd.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.3.1-pre.0
+ * @remix-run/router v1.3.2-pre.0
  *
  * 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
+        });
       }
     }
 
@@ -1484,6 +1478,7 @@
     reset: undefined,
     location: undefined
   };
+  const ABSOLUTE_URL_REGEX = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i;
   const isBrowser = typeof window !== "undefined" && typeof window.document !== "undefined" && typeof window.document.createElement !== "undefined";
   const isServer = !isBrowser; //#endregion
   ////////////////////////////////////////////////////////////////////////////////
@@ -1591,10 +1586,7 @@
     // promise resolves we update loaderData.  If a new navigation starts we
     // cancel active deferreds for eliminated routes.
 
-    let activeDeferreds = new Map(); // We ony support a single active blocker at the moment since we don't have
-    // any compelling use cases for multi-blocker yet
-
-    let activeBlocker = null; // Store blocker functions in a separate Map outside of router state since
+    let activeDeferreds = new Map(); // Store blocker functions in a separate Map outside of router state since
     // we don't need to update UI state if they change
 
     let blockerFunctions = new Map(); // Flag to ignore the next history update, so we can revert the URL change on
@@ -1621,13 +1613,14 @@
           return;
         }
 
+        warning(blockerFunctions.size === 0 || 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
@@ -2554,9 +2547,9 @@
       }, isFetchActionRedirect ? {
         _isFetchActionRedirect: true
       } : {}));
-      invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an external redirect that goes to a new origin
+      invariant(redirectLocation, "Expected a location on the redirect navigation"); // Check if this an absolute external redirect that goes to a new origin
 
-      if (isBrowser && typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
+      if (ABSOLUTE_URL_REGEX.test(redirect.location) && isBrowser && typeof ((_window = window) == null ? void 0 : _window.location) !== "undefined") {
         let newOrigin = init.history.createURL(redirect.location).origin;
 
         if (window.location.origin !== newOrigin) {
@@ -2734,13 +2727,6 @@
 
       if (blockerFunctions.get(key) !== fn) {
         blockerFunctions.set(key, fn);
-
-        if (activeBlocker == null) {
-          // This is now the active blocker
-          activeBlocker = key;
-        } else if (key !== activeBlocker) {
-          warning(false, "A router only supports one blocker at a time");
-        }
       }
 
       return blocker;
@@ -2749,10 +2735,6 @@
     function deleteBlocker(key) {
       state.blockers.delete(key);
       blockerFunctions.delete(key);
-
-      if (activeBlocker === key) {
-        activeBlocker = null;
-      }
     } // Utility function to update blockers, ensuring valid state transitions
 
 
@@ -2774,15 +2756,19 @@
         historyAction
       } = _ref2;
 
-      if (activeBlocker == null) {
+      if (blockerFunctions.size === 0) {
         return;
-      } // We only allow a single blocker at the moment.  This will need to be
-      // updated if we enhance to support multiple blockers in the future
+      } // We ony support a single active blocker at the moment since we don't have
+      // any compelling use cases for multi-blocker yet
 
 
-      let blockerFunction = blockerFunctions.get(activeBlocker);
-      invariant(blockerFunction, "Could not find a function for the active blocker");
-      let blocker = state.blockers.get(activeBlocker);
+      if (blockerFunctions.size > 1) {
+        warning(false, "A router only supports one blocker at a time");
+      }
+
+      let entries = Array.from(blockerFunctions.entries());
+      let [blockerKey, blockerFunction] = entries[entries.length - 1];
+      let blocker = state.blockers.get(blockerKey);
 
       if (blocker && blocker.state === "proceeding") {
         // If the blocker is currently proceeding, we don't need to re-check
@@ -2797,7 +2783,7 @@
         nextLocation,
         historyAction
       })) {
-        return activeBlocker;
+        return blockerKey;
       }
     }
 
@@ -3547,10 +3533,9 @@
 
       if (redirectStatusCodes.has(status)) {
         let location = result.headers.get("Location");
-        invariant(location, "Redirects returned/thrown from loaders/actions must have a Location header");
-        let isAbsolute = /^(?:[a-z][a-z0-9+.-]*:|\/\/)/i.test(location); // Support relative routing in internal redirects
+        invariant(location, "Redirects returned/thrown from loaders/actions must have a Location header"); // Support relative routing in internal redirects
 
-        if (!isAbsolute) {
+        if (!ABSOLUTE_URL_REGEX.test(location)) {
           let activeMatches = matches.slice(0, matches.indexOf(match) + 1);
           let routePathnames = getPathContributingMatches(activeMatches).map(match => match.pathnameBase);
           let resolvedLocation = resolveTo(location, routePathnames, new URL(request.url).pathname);