align FutureConfig types

remix-run · Jun 27, 2024 · 3109cfd · 3109cfd
1 parent 2140f0f
commit 3109cfd
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/react-router/__tests__/useResolvedPath-test.tsx b/packages/react-router/__tests__/useResolvedPath-test.tsx
@@ -368,10 +368,7 @@ describe("useResolvedPath", () => {
   // gh-issue #11629
   it("'.' resolves to the current path including any splat paths nested in pathless routes", () => {
     let { container } = render(
-      <MemoryRouter
-        initialEntries={["/foo/bar"]}
-        future={{ v7_relativeSplatPath: true }}
-      >
+      <MemoryRouter initialEntries={["/foo/bar"]}>
         <Routes>
           <Route path="foo">
             <Route>

diff --git a/packages/react-router/lib/components.tsx b/packages/react-router/lib/components.tsx
@@ -1,5 +1,5 @@
 import type {
-  FutureConfig as RouterFutureConfig,
+  FutureConfig,
   HydrationState,
   InitialEntry,
   LazyRouteFunction,
@@ -127,7 +127,7 @@ export function createMemoryRouter(
   routes: RouteObject[],
   opts?: {
     basename?: string;
-    future?: Partial<RouterFutureConfig>;
+    future?: Partial<FutureConfig>;
     hydrationData?: HydrationState;
     initialEntries?: InitialEntry[];
     initialIndex?: number;

diff --git a/packages/react-router/lib/dom/lib.tsx b/packages/react-router/lib/dom/lib.tsx
@@ -12,7 +12,7 @@ import type {
   unstable_DataStrategyFunction,
   Fetcher,
   FormEncType,
-  FutureConfig as RouterFutureConfig,
+  FutureConfig,
   GetScrollRestorationKeyFunction,
   HashHistory,
   History,
@@ -128,7 +128,7 @@ try {
 
 interface DOMRouterOpts {
   basename?: string;
-  future?: Partial<RouterFutureConfig>;
+  future?: Partial<FutureConfig>;
   hydrationData?: HydrationState;
   unstable_dataStrategy?: unstable_DataStrategyFunction;
   unstable_patchRoutesOnMiss?: unstable_PatchRoutesOnMissFunction;

diff --git a/packages/react-router/lib/dom/server.tsx b/packages/react-router/lib/dom/server.tsx
@@ -8,7 +8,7 @@ import type {
   CreateStaticHandlerOptions as RouterCreateStaticHandlerOptions,
   UNSAFE_RouteManifest as RouteManifest,
   RouterState,
-  FutureConfig as RouterFutureConfig,
+  FutureConfig,
   To,
 } from "../router";
 import {
@@ -270,7 +270,9 @@ export function createStaticHandler(
 export function createStaticRouter(
   routes: RouteObject[],
   context: StaticHandlerContext,
-  opts: {} = {}
+  opts: {
+    future?: Partial<FutureConfig>;
+  } = {}
 ): RemixRouter {
   let manifest: RouteManifest = {};
   let dataRoutes = convertRoutesToDataRoutes(
@@ -301,6 +303,7 @@ export function createStaticRouter(
     get future() {
       return {
         unstable_skipActionErrorRevalidation: false,
+        ...opts?.future,
       };
     },
     get state() {