fix(remix): Pass loadContext through wrapped document request function (#8268)

Ensure that the loadContext created in the remix server is passed
through to `app/entry.server.ts` in the document request handler.

Fixes issue #8265.

Author: dawnmist

packages/remix/src/utils/instrumentServer.ts

@@ -113,14 +113,15 @@ function makeWrappedDocumentRequestFunction(
     responseStatusCode: number,
     responseHeaders: Headers,
     context: Record<symbol, unknown>,
+    loadContext?: Record<string, unknown>,
   ): Promise<Response> {
     let res: Response;
 
     const activeTransaction = getActiveTransaction();
     const currentScope = getCurrentHub().getScope();
 
     if (!currentScope) {
-      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context);
+      return origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context, loadContext);
     }
 
     try {
@@ -133,7 +134,14 @@ function makeWrappedDocumentRequestFunction(
         },
       });
 
-      res = await origDocumentRequestFunction.call(this, request, responseStatusCode, responseHeaders, context);
+      res = await origDocumentRequestFunction.call(
+        this,
+        request,
+        responseStatusCode,
+        responseHeaders,
+        context,
+        loadContext,
+      );
 
       span?.finish();
     } catch (err) {

packages/remix/src/utils/types.ts

@@ -127,9 +127,13 @@ export interface ServerBuild {
 }
 
 export interface HandleDocumentRequestFunction {
-  (request: RemixRequest, responseStatusCode: number, responseHeaders: Headers, context: EntryContext):
-    | Promise<Response>
-    | Response;
+  (
+    request: RemixRequest,
+    responseStatusCode: number,
+    responseHeaders: Headers,
+    context: EntryContext,
+    loadContext?: AppLoadContext,
+  ): Promise<Response> | Response;
 }
 
 export interface HandleDataRequestFunction {