pr feedback

remix-run · May 7, 2024 · ab4a44d · ab4a44d
1 parent a977be6
commit ab4a44d
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 17 deletions.
diff --git a/packages/remix-cloudflare/index.ts b/packages/remix-cloudflare/index.ts
@@ -12,8 +12,8 @@ export {
 export {
   createRequestHandler,
   createSession,
-  defineLoader,
-  defineAction,
+  unstable_defineLoader,
+  unstable_defineAction,
   defer,
   broadcastDevReady,
   logDevReady,

diff --git a/packages/remix-deno/index.ts b/packages/remix-deno/index.ts
@@ -16,8 +16,8 @@ export {
 export {
   broadcastDevReady,
   createSession,
-  defineLoader,
-  defineAction,
+  unstable_defineLoader,
+  unstable_defineAction,
   defer,
   isCookie,
   isSession,

diff --git a/packages/remix-node/index.ts b/packages/remix-node/index.ts
@@ -24,8 +24,8 @@ export {
 export {
   createRequestHandler,
   createSession,
-  defineLoader,
-  defineAction,
+  unstable_defineLoader,
+  unstable_defineAction,
   defer,
   broadcastDevReady,
   logDevReady,

diff --git a/packages/remix-react/future/single-fetch.d.ts b/packages/remix-react/future/single-fetch.d.ts
@@ -22,21 +22,17 @@ type Serialize<T extends Loader | Action> =
   Awaited<ReturnType<T>>;
 
 declare module "@remix-run/react" {
-  export function useLoaderData<T>(): T extends Loader ? Serialize<T> : T;
+  export function useLoaderData<T extends Loader>(): Serialize<T>;
 
-  export function useActionData<T>(): T extends Action
-    ? Serialize<T> | undefined
-    : T;
+  export function useActionData<T extends Action>(): Serialize<T> | undefined;
 
-  export function useRouteLoaderData<T>(
+  export function useRouteLoaderData<T extends Loader>(
     routeId: string
-  ): T extends Loader ? Serialize<T> : never;
+  ): Serialize<T>;
 
-  export function useFetcher<TData = unknown>(
+  export function useFetcher<T extends Loader | Action>(
     opts?: Parameters<typeof useFetcherRR>[0]
-  ): FetcherWithComponents<
-    TData extends Loader | Action ? Serialize<TData> : TData
-  >;
+  ): FetcherWithComponents<Serialize<T>>;
 
   export type UIMatch_SingleFetch<D = unknown, H = unknown> = Omit<
     UIMatch<D, H>,

diff --git a/packages/remix-server-runtime/index.ts b/packages/remix-server-runtime/index.ts
@@ -87,4 +87,7 @@ export type {
   UploadHandler,
   UploadHandlerPart,
 } from "./reexport";
-export { defineLoader, defineAction } from "./reexport";
+export {
+  defineLoader as unstable_defineLoader,
+  defineAction as unstable_defineAction,
+} from "./reexport";