Fix EntryContext typings

remix-run · Mar 12, 2024 · f672242 · f672242
1 parent 8e53388
commit f672242
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 6 deletions.
diff --git a/packages/remix-react/entry.ts b/packages/remix-react/entry.ts
@@ -19,8 +19,8 @@ export interface RemixContextObject {
   abortDelay?: number;
   serializeError?(error: Error): SerializedError;
   renderMeta?: {
-    didRenderScripts: boolean;
-    streamCache: Record<
+    didRenderScripts?: boolean;
+    streamCache?: Record<
       number,
       Promise<void> & {
         result?: {

diff --git a/packages/remix-react/single-fetch.tsx b/packages/remix-react/single-fetch.tsx
@@ -40,7 +40,7 @@ export function StreamTransfer({
 }: StreamTransferProps) {
   // If the user didn't render the <Scripts> component then we don't have to
   // bother streaming anything in
-  if (!context.renderMeta?.didRenderScripts) {
+  if (!context.renderMeta || !context.renderMeta.didRenderScripts) {
     return null;
   }
 

diff --git a/packages/remix-server-runtime/entry.ts b/packages/remix-server-runtime/entry.ts
@@ -10,7 +10,19 @@ export interface EntryContext {
   criticalCss?: string;
   serverHandoffString?: string;
   serverHandoffStream?: ReadableStream<Uint8Array>;
-  renderMeta?: { didRenderScripts: boolean };
+  renderMeta?: {
+    didRenderScripts?: boolean;
+    streamCache?: Record<
+      number,
+      Promise<void> & {
+        result?: {
+          done: boolean;
+          value: string;
+        };
+        error?: unknown;
+      }
+    >;
+  };
   staticHandlerContext: StaticHandlerContext;
   future: FutureConfig;
   isSpaMode: boolean;

diff --git a/packages/remix-server-runtime/server.ts b/packages/remix-server-runtime/server.ts
@@ -587,7 +587,7 @@ async function handleDocumentRequest(
             build.entry.module.streamTimeout,
             serverMode
           ),
-          renderMeta: { didRenderScripts: false },
+          renderMeta: {},
         }
       : null),
     future: build.future,
@@ -663,7 +663,7 @@ async function handleDocumentRequest(
               build.entry.module.streamTimeout,
               serverMode
             ),
-            renderMeta: { didRenderScripts: false },
+            renderMeta: {},
           }
         : null),
     };