Skip to content

Commit efa08f6

Browse files
authored
Fix middleware return types (#13311)
1 parent f1e14a2 commit efa08f6

File tree

3 files changed

+8
-3
lines changed

3 files changed

+8
-3
lines changed

.changeset/gentle-gifts-kneel.md

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
---
2+
"react-router": patch
3+
---
4+
5+
Fix types on `unstable_MiddlewareFunction` to avoid type errors when a middleware doesn't return a value

packages/react-router/lib/router/utils.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ export interface unstable_MiddlewareNextFunction<Result = unknown> {
220220
export type unstable_MiddlewareFunction<Result = unknown> = (
221221
args: DataFunctionArgs<unstable_RouterContextProvider>,
222222
next: unstable_MiddlewareNextFunction<Result>
223-
) => MaybePromise<Result | undefined>;
223+
) => MaybePromise<Result | void>;
224224

225225
/**
226226
* Arguments passed to loader functions

packages/react-router/lib/types/route-module.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -190,12 +190,12 @@ type ServerDataFunctionArgs<T extends RouteInfo> = {
190190
export type CreateServerMiddlewareFunction<T extends RouteInfo> = (
191191
args: ServerDataFunctionArgs<T>,
192192
next: unstable_MiddlewareNextFunction<Response>
193-
) => MaybePromise<Response | undefined>;
193+
) => MaybePromise<Response | void>;
194194

195195
export type CreateClientMiddlewareFunction<T extends RouteInfo> = (
196196
args: ClientDataFunctionArgs<T>,
197197
next: unstable_MiddlewareNextFunction<undefined>
198-
) => MaybePromise<undefined>;
198+
) => MaybePromise<void>;
199199

200200
export type CreateServerLoaderArgs<T extends RouteInfo> =
201201
ServerDataFunctionArgs<T>;

0 commit comments

Comments
 (0)