Rename back to SerializeFrom

Author: brophdawg11

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

@@ -88,7 +88,7 @@ import {
   useResolvedPath,
   useRouteId,
 } from "../hooks";
-import type { DeprecatedSerializeFrom } from "../types";
+import type { SerializeFrom } from "../types";
 
 ////////////////////////////////////////////////////////////////////////////////
 //#region Global Stuff
@@ -1814,7 +1814,7 @@ export function useFetcher<T = any>({
     ```
    */
   key?: string;
-} = {}): FetcherWithComponents<DeprecatedSerializeFrom<T>> {
+} = {}): FetcherWithComponents<SerializeFrom<T>> {
   let { router } = useDataRouterContext(DataRouterHook.UseFetcher);
   let state = useDataRouterState(DataRouterStateHook.UseFetcher);
   let fetcherData = React.useContext(FetchersContext);

packages/react-router/lib/dom/ssr/routeModules.ts

@@ -12,7 +12,7 @@ import type {
 import type { EntryRoute } from "./routes";
 import type { DataRouteMatch } from "../../context";
 import type { LinkDescriptor } from "../../router/links";
-import type { DeprecatedSerializeFrom } from "../../types";
+import type { SerializeFrom } from "../../types";
 
 export interface RouteModules {
   [routeId: string]: RouteModule | undefined;
@@ -42,7 +42,7 @@ export type ClientActionFunction = (
  * Arguments passed to a route `clientAction` function
  */
 export type ClientActionFunctionArgs = ActionFunctionArgs<undefined> & {
-  serverAction: <T = unknown>() => Promise<DeprecatedSerializeFrom<T>>;
+  serverAction: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 
 /**
@@ -58,7 +58,7 @@ export type ClientLoaderFunction = ((
  * Arguments passed to a route `clientLoader` function
  */
 export type ClientLoaderFunctionArgs = LoaderFunctionArgs<undefined> & {
-  serverLoader: <T = unknown>() => Promise<DeprecatedSerializeFrom<T>>;
+  serverLoader: <T = unknown>() => Promise<SerializeFrom<T>>;
 };
 
 /**
@@ -101,7 +101,7 @@ export interface MetaMatch<
   id: RouteId;
   pathname: DataRouteMatch["pathname"];
   data: Loader extends LoaderFunction | ClientLoaderFunction
-    ? DeprecatedSerializeFrom<Loader>
+    ? SerializeFrom<Loader>
     : unknown;
   handle?: RouteHandle;
   params: DataRouteMatch["params"];
@@ -132,7 +132,7 @@ export interface MetaArgs<
 > {
   data:
     | (Loader extends LoaderFunction | ClientLoaderFunction
-        ? DeprecatedSerializeFrom<Loader>
+        ? SerializeFrom<Loader>
         : unknown)
     | undefined;
   params: Params;

packages/react-router/lib/hooks.tsx

@@ -48,7 +48,7 @@ import {
   resolveTo,
   stripBasename,
 } from "./router/utils";
-import type { DeprecatedSerializeFrom } from "./types";
+import type { SerializeFrom } from "./types";
 
 // TODO: Let's get this back to using an import map and development/production
 // condition once we get the rollup build replaced
@@ -1083,10 +1083,10 @@ export function useMatches(): UIMatch[] {
 
   @category Hooks
  */
-export function useLoaderData<T = any>(): DeprecatedSerializeFrom<T> {
+export function useLoaderData<T = any>(): SerializeFrom<T> {
   let state = useDataRouterState(DataRouterStateHook.UseLoaderData);
   let routeId = useCurrentRouteId(DataRouterStateHook.UseLoaderData);
-  return state.loaderData[routeId] as DeprecatedSerializeFrom<T>;
+  return state.loaderData[routeId] as SerializeFrom<T>;
 }
 
 /**
@@ -1118,9 +1118,9 @@ export function useLoaderData<T = any>(): DeprecatedSerializeFrom<T> {
  */
 export function useRouteLoaderData<T = any>(
   routeId: string
-): DeprecatedSerializeFrom<T> | undefined {
+): SerializeFrom<T> | undefined {
   let state = useDataRouterState(DataRouterStateHook.UseRouteLoaderData);
-  return state.loaderData[routeId] as DeprecatedSerializeFrom<T> | undefined;
+  return state.loaderData[routeId] as SerializeFrom<T> | undefined;
 }
 
 /**
@@ -1148,13 +1148,11 @@ export function useRouteLoaderData<T = any>(
 
   @category Hooks
  */
-export function useActionData<T = any>():
-  | DeprecatedSerializeFrom<T>
-  | undefined {
+export function useActionData<T = any>(): SerializeFrom<T> | undefined {
   let state = useDataRouterState(DataRouterStateHook.UseActionData);
   let routeId = useCurrentRouteId(DataRouterStateHook.UseLoaderData);
   return (state.actionData ? state.actionData[routeId] : undefined) as
-    | DeprecatedSerializeFrom<T>
+    | SerializeFrom<T>
     | undefined;
 }
 

packages/react-router/lib/types.ts

@@ -130,9 +130,7 @@ type Serialize<T> =
  * `meta`, etc. are deprecated in favor of the `Route.*` types generated via
  * `react-router typegen`
  */
-export type DeprecatedSerializeFrom<T> = T extends (
-  ...args: infer Args
-) => unknown
+export type SerializeFrom<T> = T extends (...args: infer Args) => unknown
   ? Args extends [ClientLoaderFunctionArgs | ClientActionFunctionArgs]
     ? ClientData<DataFrom<T>>
     : ServerData<DataFrom<T>>