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

package/CHANGELOG.md

@@ -1,17 +1,25 @@
 # `@remix-run/router`
 
-## 1.6.0-pre.0
+## 1.6.1-pre.0
+
+### Patch Changes
+
+- Fix basename handling when navigating without a path ([#10433](https://github.com/remix-run/react-router/pull/10433))
+- "Same hash" navigations no longer re-run loaders to match browser behavior (i.e. `/path#hash -> /path#hash`) ([#10408](https://github.com/remix-run/react-router/pull/10408))
+
+## 1.6.0
 
 ### Minor Changes
 
-- - Enable relative routing in the `@remix-run/router` when providing a source route ID from which the path is relative to: ([#10336](https://github.com/remix-run/react-router/pull/10336))
+- Enable relative routing in the `@remix-run/router` when providing a source route ID from which the path is relative to: ([#10336](https://github.com/remix-run/react-router/pull/10336))
+
+  - Example: `router.navigate("../path", { fromRouteId: "some-route" })`.
+  - This also applies to `router.fetch` which already receives a source route ID
 
-    - Example: `router.navigate("../path", { fromRouteId: "some-route" })`.
-    - This also applies to `router.fetch` which already receives a source route ID
+- Introduce a new `@remix-run/router` `future.v7_prependBasename` flag to enable `basename` prefixing to all paths coming into `router.navigate` and `router.fetch`.
 
-  - Introduce a new `@remix-run/router` `future.v7_prependBasename` flag to enable `basename` prefixing to all paths coming into `router.navigate` and `router.fetch`.
-    - Previously the `basename` was prepended in the React Router layer, but now that relative routing is being handled by the router we need prepend the `basename` _after_ resolving any relative paths
-    - This also enables `basename` support in `useFetcher` as well
+  - Previously the `basename` was prepended in the React Router layer, but now that relative routing is being handled by the router we need prepend the `basename` _after_ resolving any relative paths
+  - This also enables `basename` support in `useFetcher` as well
 
 ### Patch Changes
 

package/dist/router.cjs.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.
  *
@@ -3454,7 +3454,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
 
@@ -3588,7 +3588,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
@@ -4203,7 +4203,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) {