diff --git a/.changeset/three-ladybugs-clap.md b/.changeset/three-ladybugs-clap.md new file mode 100644 index 000000000..ae1b5177c --- /dev/null +++ b/.changeset/three-ladybugs-clap.md @@ -0,0 +1,6 @@ +--- +"react-router": patch +"react-router-dom": patch +--- + +Ensure useId consistency during SSR diff --git a/packages/react-router-dom/index.tsx b/packages/react-router-dom/index.tsx index 831ae90c9..cf0fd1424 100644 --- a/packages/react-router-dom/index.tsx +++ b/packages/react-router-dom/index.tsx @@ -178,7 +178,6 @@ export { export { UNSAFE_DataRouterContext, UNSAFE_DataRouterStateContext, - UNSAFE_DataStaticRouterContext, UNSAFE_NavigationContext, UNSAFE_LocationContext, UNSAFE_RouteContext, diff --git a/packages/react-router-dom/server.tsx b/packages/react-router-dom/server.tsx index 041d09c07..a8ac8cb10 100644 --- a/packages/react-router-dom/server.tsx +++ b/packages/react-router-dom/server.tsx @@ -27,7 +27,6 @@ import { Router, UNSAFE_DataRouterContext as DataRouterContext, UNSAFE_DataRouterStateContext as DataRouterStateContext, - UNSAFE_DataStaticRouterContext as DataStaticRouterContext, UNSAFE_enhanceManualRouteObjects as enhanceManualRouteObjects, } from "react-router-dom"; @@ -98,6 +97,7 @@ export function StaticRouterProvider({ router, navigator: getStatelessNavigator(), static: true, + staticContext: context, basename: context.basename || "/", }; @@ -119,22 +119,18 @@ export function StaticRouterProvider({ return ( <> - - - + + - - - - - - + + + + {hydrateScript ? (