@remix-run/router 1.6.0-pre.0 → 1.6.1-pre.0

package/dist/router.js

@@ -1,5 +1,5 @@
 /**
- * @remix-run/router v1.6.0-pre.0
+ * @remix-run/router v1.6.1-pre.0
  *
  * Copyright (c) Remix Software Inc.
  *
@@ -3401,7 +3401,7 @@ function normalizeTo(location, matches, basename, prependBasename, to, fromRoute
   } // Resolve the relative path
 
 
-  let path = resolveTo(to ? to : ".", getPathContributingMatches(contextualMatches).map(m => m.pathnameBase), location.pathname, relative === "path"); // When `to` is not specified we inherit search/hash from the current
+  let path = resolveTo(to ? to : ".", getPathContributingMatches(contextualMatches).map(m => m.pathnameBase), stripBasename(location.pathname, basename) || location.pathname, relative === "path"); // When `to` is not specified we inherit search/hash from the current
   // location, unlike when to="." and we just inherit the path.
   // See https://github.com/remix-run/remix/issues/927
 
@@ -3535,7 +3535,7 @@ function getMatchesToLoad(history, state, matches, submission, location, isReval
       actionResult,
       defaultShouldRevalidate: // Forced revalidation due to submission, useRevalidator, or X-Remix-Revalidate
       isRevalidationRequired || // Clicked the same link, resubmitted a GET form
-      currentUrl.toString() === nextUrl.toString() || // Search params affect all loaders
+      currentUrl.pathname + currentUrl.search === nextUrl.pathname + nextUrl.search || // Search params affect all loaders
       currentUrl.search !== nextUrl.search || isNewRouteInstance(currentRouteMatch, nextRouteMatch)
     }));
   }); // Pick fetcher.loads that need to be revalidated
@@ -4150,7 +4150,22 @@ function stripHashFromPath(path) {
 }
 
 function isHashChangeOnly(a, b) {
-  return a.pathname === b.pathname && a.search === b.search && a.hash !== b.hash;
+  if (a.pathname !== b.pathname || a.search !== b.search) {
+    return false;
+  }
+
+  if (a.hash === "") {
+    // No hash -> hash
+    return b.hash !== "";
+  } else if (a.hash === b.hash) {
+    // current hash -> same hash
+    return true;
+  } else if (b.hash !== "") {
+    // current hash -> new hash
+    return true;
+  }
+
+  return false;
 }
 
 function isDeferredResult(result) {