Skip to content

Commit dcbe438

Browse files
committed
allow undefined transition config to fallthrough
1 parent d184444 commit dcbe438

File tree

2 files changed

+6
-4
lines changed

2 files changed

+6
-4
lines changed

packages/react-router/lib/components.tsx

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,9 +54,9 @@ import {
5454
FetchersContext,
5555
LocationContext,
5656
NavigationContext,
57-
RSCRouterContext,
5857
RouteContext,
5958
ViewTransitionContext,
59+
useIsRSCRouterContext,
6060
} from "./context";
6161
import {
6262
_renderMatches,
@@ -465,8 +465,8 @@ export function RouterProvider({
465465
unstable_onError,
466466
unstable_useTransitions,
467467
}: RouterProviderProps): React.ReactElement {
468-
let unstable_rsc = React.useContext(RSCRouterContext);
469-
unstable_useTransitions = unstable_useTransitions || unstable_rsc;
468+
let unstable_rsc = useIsRSCRouterContext();
469+
unstable_useTransitions = unstable_rsc || unstable_useTransitions;
470470

471471
let [_state, setStateImpl] = React.useState(router.state);
472472
let [state, setOptimisticState] = useOptimisticSafe(_state);

packages/react-router/lib/dom-export/hydrated-router.tsx

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,9 @@ function createHydratedRouter({
177177
hydrationRouteProperties,
178178
unstable_instrumentations,
179179
mapRouteProperties,
180-
future: {},
180+
future: {
181+
middleware: ssrInfo.context.future.v8_middleware,
182+
},
181183
dataStrategy: getTurboStreamSingleFetchDataStrategy(
182184
() => router,
183185
ssrInfo.manifest,

0 commit comments

Comments
 (0)