templates: adjust entry.server for single fetch

remix-run · Nov 18, 2024 · 646048d · 646048d
1 parent 39d50b1
commit 646048d
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/templates/cloudflare-workers/app/entry.server.tsx b/templates/cloudflare-workers/app/entry.server.tsx
@@ -9,7 +9,7 @@ import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
 import { renderToReadableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5000;
+export const streamTimeout = 5000;
 
 export default async function handleRequest(
   request: Request,
@@ -22,13 +22,13 @@ export default async function handleRequest(
   loadContext: AppLoadContext
 ) {
   const controller = new AbortController();
-  const timeoutId = setTimeout(() => controller.abort(), ABORT_DELAY);
+  const timeoutId = setTimeout(() => controller.abort(), streamTimeout + 1000);
 
   const body = await renderToReadableStream(
     <RemixServer
       context={remixContext}
       url={request.url}
-      abortDelay={ABORT_DELAY}
+      abortDelay={streamTimeout}
     />,
     {
       signal: controller.signal,

diff --git a/templates/cloudflare/app/entry.server.tsx b/templates/cloudflare/app/entry.server.tsx
@@ -9,7 +9,7 @@ import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
 import { renderToReadableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5000;
+export const streamTimeout = 5000;
 
 export default async function handleRequest(
   request: Request,
@@ -22,13 +22,13 @@ export default async function handleRequest(
   loadContext: AppLoadContext
 ) {
   const controller = new AbortController();
-  const timeoutId = setTimeout(() => controller.abort(), ABORT_DELAY);
+  const timeoutId = setTimeout(() => controller.abort(), streamTimeout + 1000);
 
   const body = await renderToReadableStream(
     <RemixServer
       context={remixContext}
       url={request.url}
-      abortDelay={ABORT_DELAY}
+      abortDelay={streamTimeout}
     />,
     {
       signal: controller.signal,

diff --git a/templates/express/app/entry.server.tsx b/templates/express/app/entry.server.tsx
@@ -12,7 +12,7 @@ import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5_000;
+export const streamTimeout = 5_000;
 
 export default function handleRequest(
   request: Request,
@@ -51,7 +51,7 @@ function handleBotRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onAllReady() {
@@ -85,7 +85,7 @@ function handleBotRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout);
   });
 }
 
@@ -101,7 +101,7 @@ function handleBrowserRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onShellReady() {
@@ -135,6 +135,6 @@ function handleBrowserRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout + 1000);
   });
 }
diff --git a/templates/remix-javascript/app/entry.server.jsx b/templates/remix-javascript/app/entry.server.jsx
@@ -11,7 +11,7 @@ import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5_000;
+export const streamTimeout = 5_000;
 
 export default function handleRequest(
   request,
@@ -50,7 +50,7 @@ function handleBotRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onAllReady() {
@@ -84,7 +84,7 @@ function handleBotRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout + 1000);
   });
 }
 
@@ -100,7 +100,7 @@ function handleBrowserRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onShellReady() {
@@ -134,6 +134,6 @@ function handleBrowserRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout);
   });
 }
diff --git a/templates/remix/app/entry.server.tsx b/templates/remix/app/entry.server.tsx
@@ -12,7 +12,7 @@ import { RemixServer } from "@remix-run/react";
 import { isbot } from "isbot";
 import { renderToPipeableStream } from "react-dom/server";
 
-const ABORT_DELAY = 5_000;
+export const streamTimeout = 5_000;
 
 export default function handleRequest(
   request: Request,
@@ -51,7 +51,7 @@ function handleBotRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onAllReady() {
@@ -85,7 +85,7 @@ function handleBotRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout);
   });
 }
 
@@ -101,7 +101,7 @@ function handleBrowserRequest(
       <RemixServer
         context={remixContext}
         url={request.url}
-        abortDelay={ABORT_DELAY}
+        abortDelay={streamTimeout}
       />,
       {
         onShellReady() {
@@ -135,6 +135,6 @@ function handleBrowserRequest(
       }
     );
 
-    setTimeout(abort, ABORT_DELAY);
+    setTimeout(abort, streamTimeout + 1000);
   });
 }