Revert "Fix other code paths for resolveTo from a splat route (#11045)"

This reverts commit 58d421f.
remix-run · Dec 1, 2023 · 29a886d · 29a886d
1 parent 30917ae
commit 29a886d
Show file tree

Hide file tree

Showing 7 changed files with 18 additions and 45 deletions.
diff --git a/package.json b/package.json
@@ -110,7 +110,7 @@
   },
   "filesize": {
     "packages/router/dist/router.umd.min.js": {
-      "none": "49.4 kB"
+      "none": "49.3 kB"
     },
     "packages/react-router/dist/react-router.production.min.js": {
       "none": "13.9 kB"

diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
@@ -14,7 +14,7 @@ import {
   AbortedDeferredError,
   Action as NavigationType,
   createMemoryHistory,
-  UNSAFE_getResolveToMatches as getResolveToMatches,
+  UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_invariant as invariant,
   parsePath,
   resolveTo,
@@ -281,7 +281,7 @@ export function Navigate({
   // StrictMode they navigate to the same place
   let path = resolveTo(
     to,
-    getResolveToMatches(matches),
+    getPathContributingMatches(matches).map((match) => match.pathnameBase),
     locationPathname,
     relative === "path"
   );

diff --git a/packages/react-router/lib/hooks.tsx b/packages/react-router/lib/hooks.tsx
@@ -18,7 +18,7 @@ import {
   IDLE_BLOCKER,
   Action as NavigationType,
   UNSAFE_convertRouteMatchToUiMatch as convertRouteMatchToUiMatch,
-  UNSAFE_getResolveToMatches as getResolveToMatches,
+  UNSAFE_getPathContributingMatches as getPathContributingMatches,
   UNSAFE_invariant as invariant,
   isRouteErrorResponse,
   joinPaths,
@@ -197,7 +197,9 @@ function useNavigateUnstable(): NavigateFunction {
   let { matches } = React.useContext(RouteContext);
   let { pathname: locationPathname } = useLocation();
 
-  let routePathnamesJson = JSON.stringify(getResolveToMatches(matches));
+  let routePathnamesJson = JSON.stringify(
+    getPathContributingMatches(matches).map((match) => match.pathnameBase)
+  );
 
   let activeRef = React.useRef(false);
   useIsomorphicLayoutEffect(() => {
@@ -309,7 +311,14 @@ export function useResolvedPath(
 ): Path {
   let { matches } = React.useContext(RouteContext);
   let { pathname: locationPathname } = useLocation();
-  let routePathnamesJson = JSON.stringify(getResolveToMatches(matches));
+
+  // Use the full pathname for the leaf match so we include splat values
+  // for "." links
+  let routePathnamesJson = JSON.stringify(
+    getPathContributingMatches(matches).map((match, idx) =>
+      idx === matches.length - 1 ? match.pathname : match.pathnameBase
+    )
+  );
 
   return React.useMemo(
     () =>

diff --git a/packages/router/__tests__/path-resolution-test.ts b/packages/router/__tests__/path-resolution-test.ts
@@ -138,7 +138,7 @@ describe("path resolution", () => {
             path: "*",
           },
         ],
-        "/foo/bar",
+        "/foo",
         false
       );
     });
@@ -391,21 +391,6 @@ describe("path resolution", () => {
       ]);
     });
 
-    it("from an index route", () => {
-      assertRoutingToChild([
-        {
-          path: "bar",
-          children: [
-            {
-              id: "activeRoute",
-              index: true,
-            },
-            { path: "baz" },
-          ],
-        },
-      ]);
-    });
-
     it("from a dynamic param route", () => {
       assertRoutingToChild([
         {
@@ -415,15 +400,6 @@ describe("path resolution", () => {
         },
       ]);
     });
-
-    it("from a splat route", () => {
-      assertRoutingToChild([
-        {
-          id: "activeRoute",
-          path: "*",
-        },
-      ]);
-    });
     /* eslint-enable jest/expect-expect */
   });
 

diff --git a/packages/router/index.ts b/packages/router/index.ts
@@ -87,7 +87,7 @@ export {
   ErrorResponseImpl as UNSAFE_ErrorResponseImpl,
   convertRoutesToDataRoutes as UNSAFE_convertRoutesToDataRoutes,
   convertRouteMatchToUiMatch as UNSAFE_convertRouteMatchToUiMatch,
-  getResolveToMatches as UNSAFE_getResolveToMatches,
+  getPathContributingMatches as UNSAFE_getPathContributingMatches,
 } from "./utils";
 
 export {

diff --git a/packages/router/router.ts b/packages/router/router.ts
@@ -40,7 +40,6 @@ import {
   convertRouteMatchToUiMatch,
   convertRoutesToDataRoutes,
   getPathContributingMatches,
-  getResolveToMatches,
   immutableRouteKeys,
   isRouteErrorResponse,
   joinPaths,
@@ -3341,7 +3340,7 @@ function normalizeTo(
   // Resolve the relative path
   let path = resolveTo(
     to ? to : ".",
-    getResolveToMatches(contextualMatches),
+    getPathContributingMatches(contextualMatches).map((m) => m.pathnameBase),
     stripBasename(location.pathname, basename) || location.pathname,
     relative === "path"
   );

diff --git a/packages/router/utils.ts b/packages/router/utils.ts
@@ -1145,17 +1145,6 @@ export function getPathContributingMatches<
   );
 }
 
-// Return the array of pathnames for the current route matches - used to
-// generate the routePathnames input for resolveTo()
-export function getResolveToMatches<
-  T extends AgnosticRouteMatch = AgnosticRouteMatch
->(matches: T[]) {
-  // Use the full pathname for the leaf match so we include splat values for "." links
-  return getPathContributingMatches(matches).map((match, idx) =>
-    idx === matches.length - 1 ? match.pathname : match.pathnameBase
-  );
-}
-
 /**
  * @private
  */