remix-run · brophdawg11 · Jun 25, 2024 · Jun 25, 2024
diff --git a/.changeset/late-buckets-turn.md b/.changeset/late-buckets-turn.md
@@ -0,0 +1,6 @@
+---
+"react-router-dom": major
+"react-router": major
+---
+
+Remove `future.v7_prependBasename` from the ionternalized `@remix-run/router` package
diff --git a/packages/react-router/__tests__/router/path-resolution-test.ts b/packages/react-router/__tests__/router/path-resolution-test.ts
@@ -521,7 +521,6 @@ describe("path resolution", () => {
   it("handles pathless relative routing when a basename is present", () => {
     let router = createRouter({
       routes: [{ path: "/path" }],
-      future: { v7_prependBasename: true },
       history: createMemoryHistory({ initialEntries: ["/base/path"] }),
       basename: "/base",
     }).initialize();

diff --git a/packages/react-router/__tests__/router/redirects-test.ts b/packages/react-router/__tests__/router/redirects-test.ts
@@ -44,7 +44,7 @@ describe("redirects", () => {
       initialEntries: ["/base/name"],
     });
 
-    let nav1 = await t.navigate("/base/name/parent");
+    let nav1 = await t.navigate("/parent");
 
     let nav2 = await nav1.loaders.parent.redirectReturn("/parent/child");
     await nav2.loaders.parent.resolve("PARENT");
@@ -451,7 +451,7 @@ describe("redirects", () => {
   it("properly handles same-origin absolute URLs when using a basename", async () => {
     let t = setup({ routes: REDIRECT_ROUTES, basename: "/base" });
 
-    let A = await t.navigate("/base/parent/child", {
+    let A = await t.navigate("/parent/child", {
       formMethod: "post",
       formData: createFormData({}),
     });
@@ -476,7 +476,7 @@ describe("redirects", () => {
   it("treats same-origin absolute URLs as external if they don't match the basename", async () => {
     let t = setup({ routes: REDIRECT_ROUTES, basename: "/base" });
 
-    let A = await t.navigate("/base/parent/child", {
+    let A = await t.navigate("/parent/child", {
       formMethod: "post",
       formData: createFormData({}),
     });

diff --git a/packages/react-router/__tests__/router/router-test.ts b/packages/react-router/__tests__/router/router-test.ts
@@ -555,7 +555,7 @@ describe("a router", () => {
       expect(t.history.action).toEqual("POP");
       expect(t.history.location.pathname).toEqual("/base/name");
 
-      await t.navigate("/base/name/tasks");
+      await t.navigate("/tasks");
       expect(t.router.state).toMatchObject({
         location: {
           pathname: "/base/name/tasks",
@@ -565,7 +565,7 @@ describe("a router", () => {
       expect(t.history.action).toEqual("PUSH");
       expect(t.history.location.pathname).toEqual("/base/name/tasks");
 
-      await t.navigate("/base/name/tasks/1");
+      await t.navigate("/tasks/1");
       expect(t.router.state).toMatchObject({
         location: {
           pathname: "/base/name/tasks/1",

diff --git a/packages/react-router/__tests__/router/scroll-restoration-test.ts b/packages/react-router/__tests__/router/scroll-restoration-test.ts
@@ -160,7 +160,7 @@ describe("scroll restoration", () => {
         }
       );
 
-      let nav1 = await t.navigate("/base/tasks");
+      let nav1 = await t.navigate("/tasks");
       await nav1.loaders.tasks.resolve("TASKS");
       expect(pathname).toBe("/base/tasks");
       expect(t.router.state.restoreScrollPosition).toBe(100);

diff --git a/packages/react-router/__tests__/router/submission-test.ts b/packages/react-router/__tests__/router/submission-test.ts
@@ -552,9 +552,6 @@ describe("submissions", () => {
               ],
             },
           ],
-          future: {
-            v7_prependBasename: false,
-          },
         });
         let A = await t.navigate("/child", {
           formMethod: "get",

diff --git a/packages/react-router/__tests__/router/utils/data-router-setup.ts b/packages/react-router/__tests__/router/utils/data-router-setup.ts
@@ -608,15 +608,7 @@ export function setup({
       return helpers;
     }
 
-    let navHref = href;
-    if (currentRouter.basename) {
-      navHref = stripBasename(navHref, currentRouter.basename) as string;
-      invariant(
-        navHref,
-        "href passed to t.navigate() should start with basename"
-      );
-    }
-    helpers = getNavigationHelpers(navHref, navigationId);
+    helpers = getNavigationHelpers(href, navigationId);
     shims?.forEach((routeId) =>
       shimHelper(helpers.loaders, "navigation", "loader", routeId)
     );

diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
@@ -127,7 +127,7 @@ export function createMemoryRouter(
   routes: RouteObject[],
   opts?: {
     basename?: string;
-    future?: Partial<Omit<RouterFutureConfig, "v7_prependBasename">>;
+    future?: Partial<RouterFutureConfig>;
     hydrationData?: HydrationState;
     initialEntries?: InitialEntry[];
     initialIndex?: number;
@@ -137,10 +137,7 @@ export function createMemoryRouter(
 ): RemixRouter {
   return createRouter({
     basename: opts?.basename,
-    future: {
-      ...opts?.future,
-      v7_prependBasename: true,
-    },
+    future: opts?.future,
     history: createMemoryHistory({
       initialEntries: opts?.initialEntries,
       initialIndex: opts?.initialIndex,

diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
@@ -124,7 +124,7 @@ try {
 
 interface DOMRouterOpts {
   basename?: string;
-  future?: Partial<Omit<RouterFutureConfig, "v7_prependBasename">>;
+  future?: Partial<RouterFutureConfig>;
   hydrationData?: HydrationState;
   unstable_dataStrategy?: unstable_DataStrategyFunction;
   unstable_patchRoutesOnMiss?: unstable_PatchRoutesOnMissFunction;
@@ -140,10 +140,7 @@ export function createBrowserRouter(
 ): RemixRouter {
   return createRouter({
     basename: opts?.basename,
-    future: {
-      ...opts?.future,
-      v7_prependBasename: true,
-    },
+    future: opts?.future,
     history: createBrowserHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
     routes,
@@ -163,10 +160,7 @@ export function createHashRouter(
 ): RemixRouter {
   return createRouter({
     basename: opts?.basename,
-    future: {
-      ...opts?.future,
-      v7_prependBasename: true,
-    },
+    future: opts?.future,
     history: createHashHistory({ window: opts?.window }),
     hydrationData: opts?.hydrationData || parseHydrationData(),
     routes,

diff --git a/packages/react-router/lib/dom/server.tsx b/packages/react-router/lib/dom/server.tsx
@@ -301,7 +301,6 @@ export function createStaticRouter(
     get future() {
       return {
         v7_fetcherPersist: false,
-        v7_prependBasename: false,
         unstable_skipActionErrorRevalidation: false,
       };
     },

diff --git a/packages/react-router/lib/dom/ssr/browser.tsx b/packages/react-router/lib/dom/ssr/browser.tsx
@@ -163,7 +163,6 @@ function createHydratedRouter(): RemixRouter {
     basename: ssrInfo.context.basename,
     future: {
       v7_fetcherPersist: ssrInfo.context.future.v3_fetcherPersist,
-      v7_prependBasename: true,
       // Single fetch enables this underlying behavior
       unstable_skipActionErrorRevalidation: true,
     },

diff --git a/packages/react-router/lib/router/router.ts b/packages/react-router/lib/router/router.ts
@@ -365,7 +365,6 @@ export type HydrationState = Partial<
  */
 export interface FutureConfig {
   v7_fetcherPersist: boolean;
-  v7_prependBasename: boolean;
   unstable_skipActionErrorRevalidation: boolean;
 }
 
@@ -841,7 +840,6 @@ export function createRouter(init: RouterInit): Router {
   // Config driven behavior flags
   let future: FutureConfig = {
     v7_fetcherPersist: false,
-    v7_prependBasename: false,
     unstable_skipActionErrorRevalidation: false,
     ...init.future,
   };
@@ -1357,7 +1355,6 @@ export function createRouter(init: RouterInit): Router {
       state.location,
       state.matches,
       basename,
-      future.v7_prependBasename,
       to,
       opts?.fromRouteId,
       opts?.relative
@@ -2145,7 +2142,6 @@ export function createRouter(init: RouterInit): Router {
       state.location,
       state.matches,
       basename,
-      future.v7_prependBasename,
       href,
       routeId,
       opts?.relative
@@ -4061,7 +4057,6 @@ function normalizeTo(
   location: Path,
   matches: AgnosticDataRouteMatch[],
   basename: string,
-  prependBasename: boolean,
   to: To | null,
   fromRouteId?: string,
   relative?: RelativeRoutingType
@@ -4116,7 +4111,7 @@ function normalizeTo(
   // this is a root navigation, then just use the raw basename which allows
   // the basename to have full control over the presence of a trailing slash
   // on root actions
-  if (prependBasename && basename !== "/") {
+  if (basename !== "/") {
     path.pathname =
       path.pathname === "/" ? basename : joinPaths([basename, path.pathname]);
   }
@@ -4967,7 +4962,6 @@ function normalizeRelativeRoutingRedirectResponse(
       new URL(request.url),
       trimmedMatches,
       basename,
-      true,
       location
     );
     response.headers.set("Location", location);