Update exports

.changeset/align-rr-types.md

@@ -16,6 +16,5 @@ Remove/align Remix types with those used in React Router
   * `MetaMatch.handle`
 * `useMatches()[i].handle` type changed from `{ [k: string]: any }` to `unknown`
 * `AppLoadContext` type changed from `{ [k: string]: unknown }` to `unknown`
-* Make `LoaderFunctionArgs`/`ActionFunctionArgs` generic to accept a `context` type
-* Rename `LoaderArgs`/`ActionArgs` to `LoaderFunctionArgs`/`ActionFunctionArgs`
 * Rename the `useMatches()` return type from `RouteMatch` to `UIMatch`
+* Rename `LoaderArgs`/`ActionArgs` to `LoaderFunctionArgs`/`ActionFunctionArgs` and add a generic to accept a `context` type

packages/remix-server-runtime/reexport.ts

@@ -1,10 +1,4 @@
-export type {
-  ActionFunction,
-  ActionFunctionArgs,
-  ErrorResponse,
-  LoaderFunction,
-  LoaderFunctionArgs,
-} from "@remix-run/router";
+export type { ErrorResponse } from "@remix-run/router";
 
 export type {
   HandleDataRequestFunction,
@@ -43,10 +37,14 @@ export type {
 export type { TypedDeferredData, TypedResponse } from "./responses";
 
 export type {
+  ActionFunction,
+  ActionFunctionArgs,
   DataFunctionArgs,
   HeadersArgs,
   HeadersFunction,
   LinksFunction,
+  LoaderFunction,
+  LoaderFunctionArgs,
   RouteHandle,
   ServerRuntimeMetaArgs,
   ServerRuntimeMetaDescriptor,

packages/remix-server-runtime/routes.ts

@@ -1,12 +1,12 @@
-import type {
-  AgnosticDataRouteObject,
-  ActionFunctionArgs,
-  LoaderFunctionArgs,
-} from "@remix-run/router";
+import type { AgnosticDataRouteObject } from "@remix-run/router";
 
 import { callRouteActionRR, callRouteLoaderRR } from "./data";
 import type { FutureConfig } from "./entry";
-import type { ServerRouteModule } from "./routeModules";
+import type {
+  ServerRouteModule,
+  ActionFunctionArgs,
+  LoaderFunctionArgs,
+} from "./routeModules";
 
 export interface RouteManifest<Route> {
   [routeId: string]: Route;

packages/remix-testing/create-remix-stub.tsx

@@ -1,10 +1,8 @@
 import * as React from "react";
 import {
   UNSAFE_convertRoutesToDataRoutes,
-  type ActionFunctionArgs,
   type HydrationState,
   type InitialEntry,
-  type LoaderFunctionArgs,
   type Router,
 } from "@remix-run/router";
 import { UNSAFE_RemixContext as RemixContext } from "@remix-run/react";
@@ -24,9 +22,11 @@ import type {
 import { createMemoryRouter, Outlet, RouterProvider } from "react-router-dom";
 import type {
   ActionFunction,
+  ActionFunctionArgs,
   AppLoadContext,
   LinksFunction,
   LoaderFunction,
+  LoaderFunctionArgs,
 } from "@remix-run/server-runtime";
 
 interface StubIndexRouteObject