From 56da52f6501abd46487df7a326e109e18e81fda1 Mon Sep 17 00:00:00 2001
From: Fatih Kalifa <fatihkalifa@gmail.com>
Date: Mon, 25 Nov 2024 06:19:01 +0700
Subject: [PATCH 1/2] exclude Response from loader & action types

---
 .../react-router/lib/types/route-module.ts    | 22 ++++++++++++-------
 1 file changed, 14 insertions(+), 8 deletions(-)

diff --git a/packages/react-router/lib/types/route-module.ts b/packages/react-router/lib/types/route-module.ts
index 6514ca9778..2af067f00c 100644
--- a/packages/react-router/lib/types/route-module.ts
+++ b/packages/react-router/lib/types/route-module.ts
@@ -72,11 +72,14 @@ type IsHydrate<ClientLoader> =
   ClientLoader extends { hydrate: false } ? false :
   false
 
-export type CreateLoaderData<T extends RouteModule> = _CreateLoaderData<
-  ServerDataFrom<T["loader"]>,
-  ClientDataFrom<T["clientLoader"]>,
-  IsHydrate<T["clientLoader"]>,
-  T extends { HydrateFallback: Func } ? true : false
+export type CreateLoaderData<T extends RouteModule> = Exclude<
+  _CreateLoaderData<
+    ServerDataFrom<T["loader"]>,
+    ClientDataFrom<T["clientLoader"]>,
+    IsHydrate<T["clientLoader"]>,
+    T extends { HydrateFallback: Func } ? true : false
+  >,
+  Response
 >;
 
 // prettier-ignore
@@ -95,9 +98,12 @@ type _CreateLoaderData<
   IsDefined<ServerLoaderData> extends true ? ServerLoaderData :
   undefined
 
-export type CreateActionData<T extends RouteModule> = _CreateActionData<
-  ServerDataFrom<T["action"]>,
-  ClientDataFrom<T["clientAction"]>
+export type CreateActionData<T extends RouteModule> = Exclude<
+  _CreateActionData<
+    ServerDataFrom<T["action"]>,
+    ClientDataFrom<T["clientAction"]>
+  >,
+  Response
 >;
 
 // prettier-ignore

From 63a7d74bd76fbe2965f3616f0fc60b49230316ca Mon Sep 17 00:00:00 2001
From: Fatih Kalifa <fatihkalifa@gmail.com>
Date: Mon, 25 Nov 2024 06:26:31 +0700
Subject: [PATCH 2/2] Sign CLA

---
 contributors.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/contributors.yml b/contributors.yml
index fef537e8f2..a010380a97 100644
--- a/contributors.yml
+++ b/contributors.yml
@@ -221,6 +221,7 @@
 - petersendidit
 - printfn
 - promet99
+- pveyes
 - pyitphyoaung
 - refusado
 - rifaidev