Skip to content

Commit d052af0

Browse files
committed
apply match filtering to generateMiddlewareResponse as well in singleFetchLoaders
1 parent 23b62b6 commit d052af0

File tree

1 file changed

+11
-3
lines changed

1 file changed

+11
-3
lines changed

packages/react-router/lib/server-runtime/single-fetch.ts

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,10 @@
11
import { encode } from "../../vendor/turbo-stream-v2/turbo-stream";
22
import type { StaticHandler, StaticHandlerContext } from "../router/router";
33
import { isRedirectStatusCode, isResponse } from "../router/router";
4-
import type { RouterContextProvider } from "../router/utils";
4+
import type {
5+
AgnosticDataRouteMatch,
6+
RouterContextProvider,
7+
} from "../router/utils";
58
import {
69
isRouteErrorResponse,
710
ErrorResponseImpl,
@@ -140,14 +143,19 @@ export async function singleFetchLoaders(
140143
signal: request.signal,
141144
});
142145

146+
let filterMatchesToLoad = (m: AgnosticDataRouteMatch) =>
147+
!loadRouteIds || loadRouteIds.has(m.route.id);
148+
143149
let result = await staticHandler.query(handlerRequest, {
144150
requestContext: loadContext,
145-
filterMatchesToLoad: (m) => !loadRouteIds || loadRouteIds.has(m.route.id),
151+
filterMatchesToLoad,
146152
skipLoaderErrorBubbling: true,
147153
generateMiddlewareResponse: build.future.v8_middleware
148154
? async (query) => {
149155
try {
150-
let innerResult = await query(handlerRequest);
156+
let innerResult = await query(handlerRequest, {
157+
filterMatchesToLoad,
158+
});
151159
return handleQueryResult(innerResult);
152160
} catch (error) {
153161
return handleQueryError(error);

0 commit comments

Comments
 (0)