Fix EntryContext type errors

remix-run · Jun 21, 2024 · 3a7879b · 3a7879b
1 parent 37375c5
commit 3a7879b
Show file tree

Hide file tree

Showing 13 changed files with 22 additions and 292 deletions.
diff --git a/packages/react-router/__tests__/server-runtime/serialize-test.ts b/packages/react-router/__tests__/server-runtime/serialize-test.ts
diff --git a/packages/react-router/index.ts b/packages/react-router/index.ts
@@ -328,6 +328,7 @@ export {
   PrefetchPageLinks,
 } from "./lib/dom/ssr/components";
 export type { ScriptsProps } from "./lib/dom/ssr/components";
+export type { EntryContext } from "./lib/dom/ssr/entry";
 export type {
   HtmlLinkDescriptor,
   LinkDescriptor,
@@ -396,6 +397,7 @@ export type {
   // TODO: (v7) Clean up code paths for these exports
   // ActionFunction,
   // ActionFunctionArgs,
+  // EntryContext,
   // ErrorResponse,
   // HtmlLinkDescriptor,
   // LinkDescriptor,
@@ -405,14 +407,14 @@ export type {
   // ServerRuntimeMetaArgs,
   // ServerRuntimeMetaDescriptor,
   // ServerRuntimeMetaFunction,
+  // SerializeFrom,
   AppLoadContext,
   Cookie,
   CookieOptions,
   CookieParseOptions,
   CookieSerializeOptions,
   CookieSignatureOptions,
   DataFunctionArgs,
-  EntryContext,
   FlashSessionData,
   HandleDataRequestFunction,
   HandleDocumentRequestFunction,
@@ -423,7 +425,6 @@ export type {
   HandleErrorFunction,
   PageLinkDescriptor,
   RequestHandler,
-  SerializeFrom,
   ServerBuild,
   ServerEntryModule,
   Session,

diff --git a/packages/react-router/lib/dom/ssr/entry.ts b/packages/react-router/lib/dom/ssr/entry.ts
@@ -43,6 +43,7 @@ export interface EntryContext extends RemixContextObject {
 export interface FutureConfig {
   v3_fetcherPersist: boolean;
   v3_relativeSplatPath: boolean;
+  v3_throwAbortReason: boolean;
 }
 
 export interface AssetsManifest {

diff --git a/packages/react-router/lib/dom/ssr/routes-test-stub.tsx b/packages/react-router/lib/dom/ssr/routes-test-stub.tsx
@@ -104,6 +104,7 @@ export function createRoutesStub(
         future: {
           v3_fetcherPersist: future?.v3_fetcherPersist === true,
           v3_relativeSplatPath: future?.v3_relativeSplatPath === true,
+          v3_throwAbortReason: future?.v3_throwAbortReason === true,
         },
         manifest: {
           routes: {},

diff --git a/packages/react-router/lib/server-runtime/build.ts b/packages/react-router/lib/server-runtime/build.ts
@@ -1,5 +1,9 @@
 import type { ActionFunctionArgs, LoaderFunctionArgs } from "./routeModules";
-import type { AssetsManifest, EntryContext, FutureConfig } from "./entry";
+import type {
+  AssetsManifest,
+  EntryContext,
+  FutureConfig,
+} from "../dom/ssr/entry";
 import type { ServerRouteManifest } from "./routes";
 import type { AppLoadContext } from "./data";
 

diff --git a/packages/react-router/lib/server-runtime/entry.ts b/packages/react-router/lib/server-runtime/entry.ts
@@ -1,50 +1,6 @@
-import type { StaticHandlerContext } from "../router";
-import type { SerializedError } from "./errors";
-import type { RouteManifest, ServerRouteManifest, EntryRoute } from "./routes";
+import type { ServerRouteManifest } from "./routes";
 import type { RouteModules, EntryRouteModule } from "./routeModules";
 
-export interface EntryContext {
-  manifest: AssetsManifest;
-  routeModules: RouteModules<EntryRouteModule>;
-  criticalCss?: string;
-  serverHandoffString?: string;
-  serverHandoffStream?: ReadableStream<Uint8Array>;
-  renderMeta?: {
-    didRenderScripts?: boolean;
-    streamCache?: Record<
-      number,
-      Promise<void> & {
-        result?: {
-          done: boolean;
-          value: string;
-        };
-        error?: unknown;
-      }
-    >;
-  };
-  staticHandlerContext: StaticHandlerContext;
-  future: FutureConfig;
-  isSpaMode: boolean;
-  serializeError(error: Error): SerializedError;
-}
-
-export interface FutureConfig {
-  v3_fetcherPersist: boolean;
-  v3_relativeSplatPath: boolean;
-  v3_throwAbortReason: boolean;
-}
-
-export interface AssetsManifest {
-  entry: {
-    imports: string[];
-    module: string;
-  };
-  routes: RouteManifest<EntryRoute>;
-  url: string;
-  version: string;
-  hmrRuntime?: string;
-}
-
 export function createEntryRouteModules(
   manifest: ServerRouteManifest
 ): RouteModules<EntryRouteModule> {

diff --git a/packages/react-router/lib/server-runtime/reexport.ts b/packages/react-router/lib/server-runtime/reexport.ts
@@ -26,8 +26,6 @@ export type { SignFunction, UnsignFunction } from "./crypto";
 
 export type { AppLoadContext } from "./data";
 
-export type { EntryContext } from "./entry";
-
 export type {
   HtmlLinkDescriptor,
   LinkDescriptor,
@@ -50,8 +48,6 @@ export type {
   ServerRuntimeMetaFunction,
 } from "./routeModules";
 
-export type { SerializeFrom } from "./serialize";
-
 export type { RequestHandler } from "./server";
 
 export type {

diff --git a/packages/react-router/lib/server-runtime/routeModules.ts b/packages/react-router/lib/server-runtime/routeModules.ts
@@ -9,7 +9,7 @@ import type {
 } from "../router";
 import type { AppData, AppLoadContext } from "./data";
 import type { LinkDescriptor } from "./links";
-import type { SerializeFrom } from "./serialize";
+import type { SerializeFrom } from "../dom/ssr/components";
 import type { ResponseStub } from "./single-fetch";
 
 export interface RouteModules<RouteModule> {
@@ -34,6 +34,13 @@ export type ActionFunction = (
   args: ActionFunctionArgs
 ) => ReturnType<RRActionFunction>;
 
+// export interface ActionFunction<Context = any> {
+//   (
+//     args: ActionFunctionArgs<Context>,
+//     handlerCtx?: unknown
+//   ): DataFunctionReturnValue;
+// }
+
 /**
  * Arguments passed to a route `action` function
  */

diff --git a/packages/react-router/lib/server-runtime/routes.ts b/packages/react-router/lib/server-runtime/routes.ts
@@ -4,7 +4,7 @@ import type {
   ActionFunctionArgs as RRActionFunctionArgs,
 } from "../router";
 import { callRouteAction, callRouteLoader } from "./data";
-import type { FutureConfig } from "./entry";
+import type { FutureConfig } from "../dom/ssr/entry";
 import type { ServerRouteModule } from "./routeModules";
 import type { DataStrategyCtx } from "./single-fetch";