feat(remix-server-runtime): pass AppLoadContext to the server's handleRequest function

docs/api/conventions.md

@@ -494,14 +494,19 @@ import { renderToString } from "react-dom/server";
 import type {
   EntryContext,
   HandleDataRequestFunction,
+  AppLoadContext,
 } from "@remix-run/node"; // or cloudflare/deno
 import { RemixServer } from "@remix-run/react";
 
 export default function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
-  remixContext: EntryContext
+  remixContext: EntryContext,
+  // This is the context you passed in to your server adapter's getLoadContext() function.
+  // It is the same value that is also passed to your loaders and actions.
+  // See also the description of the loader `context` parameter later in this document.
+  loadContext: AppLoadContext,
 ) {
   const markup = renderToString(
     <RemixServer context={remixContext} url={request.url} />

packages/remix-server-runtime/__tests__/server-test.ts

@@ -1720,5 +1720,34 @@ describe("shared server runtime", () => {
       expect(calls.length).toBe(2 * DATA_CALL_MULTIPIER);
       expect(spy.console.mock.calls.length).toBe(1 * DATA_CALL_MULTIPIER);
     });
+
+    test("provides load context to server entrypoint", async () => {
+      let build = mockServerBuild({
+        root: {
+          default: {},
+        },
+        "routes/index": {
+          parentId: "root",
+          default: () => null,
+          index: true
+        }
+      });
+
+      build.entry.module.default = jest.fn(
+        async (request, responseStatusCode, responseHeaders, entryContext, loadContext) =>
+          new Response(loadContext, {
+            status: responseStatusCode,
+            headers: responseHeaders
+          })
+      );
+
+      let handler = createRequestHandler(build, {}, ServerMode.Development);
+      let request = new Request(`${baseUrl}/`, { method: "get" });
+      let loadContext = "load context";
+
+      let result = await handler(request, loadContext);
+      expect(result.status).toBe(200);
+      expect(await result.text()).toBe(loadContext);
+    });
   });
 });

packages/remix-server-runtime/__tests__/utils.ts

@@ -48,7 +48,7 @@ export function mockServerBuild(
     entry: {
       module: {
         default: jest.fn(
-          async (request, responseStatusCode, responseHeaders, entryContext) =>
+          async (request, responseStatusCode, responseHeaders, entryContext, loadContext) =>
             new Response(null, {
               status: responseStatusCode,
               headers: responseHeaders,

packages/remix-server-runtime/build.ts

@@ -1,6 +1,7 @@
 import type { DataFunctionArgs } from "./routeModules";
 import type { AssetsManifest, EntryContext, FutureConfig } from "./entry";
 import type { ServerRouteManifest } from "./routes";
+import type { AppLoadContext } from "./data";
 
 /**
  * The output of the compiler for the server build.
@@ -21,7 +22,8 @@ export interface HandleDocumentRequestFunction {
     request: Request,
     responseStatusCode: number,
     responseHeaders: Headers,
-    context: EntryContext
+    context: EntryContext,
+    loadContext: AppLoadContext
   ): Promise<Response> | Response;
 }
 

packages/remix-server-runtime/server.ts

@@ -828,7 +828,8 @@ async function handleDocumentRequest({
       request,
       responseStatusCode,
       responseHeaders,
-      entryContext
+      entryContext,
+      loadContext
     );
   } catch (error: any) {
     responseStatusCode = 500;
@@ -848,7 +849,8 @@ async function handleDocumentRequest({
         request,
         responseStatusCode,
         responseHeaders,
-        entryContext
+        entryContext,
+        loadContext
       );
     } catch (error: any) {
       return returnLastResortErrorResponse(error, serverMode);