Remove v7_relativeSplatPath future flag and old code paths

remix-run · Jun 24, 2024 · 1ab15b1 · 1ab15b1
1 parent c9e50ca
commit 1ab15b1
Show file tree

Hide file tree

Showing 17 changed files with 150 additions and 235 deletions.
diff --git a/.changeset/tidy-clouds-lay.md b/.changeset/tidy-clouds-lay.md
@@ -0,0 +1,5 @@
+---
+"react-router": major
+---
+
+Remove `v7_relativeSplatPath` future flag
diff --git a/packages/react-router/__tests__/dom/data-browser-router-test.tsx b/packages/react-router/__tests__/dom/data-browser-router-test.tsx
@@ -2955,7 +2955,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo?a=1"
+            "/foo/bar?a=1"
           );
         });
 
@@ -2975,7 +2975,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo"
+            "/foo/bar"
           );
         });
 
@@ -2995,7 +2995,7 @@ function testDomRouter(
           let { container } = render(<RouterProvider router={router} />);
 
           expect(container.querySelector("form")?.getAttribute("action")).toBe(
-            "/foo"
+            "/foo/bar"
           );
         });
       });
@@ -3129,7 +3129,7 @@ function testDomRouter(
         let { container } = render(<RouterProvider router={router} />);
 
         expect(container.querySelector("form")?.getAttribute("action")).toBe(
-          "/inbox"
+          "/inbox/messages/1/2"
         );
       });
     });

diff --git a/packages/react-router/__tests__/dom/link-href-test.tsx b/packages/react-router/__tests__/dom/link-href-test.tsx
@@ -530,7 +530,7 @@ describe("<Link> href", () => {
       });
 
       expect(renderer.root.findByType("a").props.href).toEqual(
-        "/inbox/messages"
+        "/inbox/messages/abc"
       );
     });
 

diff --git a/packages/react-router/__tests__/dom/special-characters-test.tsx b/packages/react-router/__tests__/dom/special-characters-test.tsx
@@ -581,9 +581,13 @@ describe("special character tests", () => {
       }
 
       function Child() {
+        let location = useLocation();
+        let to = location.pathname.endsWith("grandchild")
+          ? "."
+          : "./grandchild";
         return (
           <>
-            <Link to="./grandchild">Link to grandchild</Link>
+            <Link to={to}>Link to grandchild</Link>
             <Routes>
               <Route path="grandchild" element={<Grandchild />} />
             </Routes>

diff --git a/packages/react-router/__tests__/router/path-resolution-test.ts b/packages/react-router/__tests__/router/path-resolution-test.ts
@@ -138,7 +138,7 @@ describe("path resolution", () => {
             path: "*",
           },
         ],
-        "/foo",
+        "/foo/bar",
         false
       );
     });