chore: updated demo site to renderReadableStream

netlify · Feb 21, 2023 · 1c36659 · 1c36659
1 parent 008f627
commit 1c36659
Show file tree

Hide file tree

Showing 3 changed files with 32 additions and 8 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -55,7 +55,8 @@
   "dependencies": {
     "@netlify/edge-functions": "^2.0.0",
     "husky": "^8.0.3",
-    "if-env": "^1.0.4"
+    "if-env": "^1.0.4",
+    "isbot": "^3.6.6"
   },
   "engines": {
     "node": ">=14"

diff --git a/packages/edge-demo-site/app/entry.server.tsx b/packages/edge-demo-site/app/entry.server.tsx
@@ -1,19 +1,28 @@
-import type { EntryContext } from '@remix-run/node'
+import type { EntryContext } from '@remix-run/server-runtime'
 import { RemixServer } from '@remix-run/react'
-import { renderToString } from 'react-dom/server'
+import { renderToReadableStream } from 'react-dom/server'
+import isbot from 'isbot'
 
-export default function handleRequest(
+export default async function handleRequest(
   request: Request,
   responseStatusCode: number,
   responseHeaders: Headers,
   remixContext: EntryContext,
 ) {
-  const markup = renderToString(<RemixServer context={remixContext} url={request.url} />)
+  const body = await renderToReadableStream(<RemixServer context={remixContext} url={request.url} />, {
+    onError() {
+      responseStatusCode = 500
+    },
+  })
+
+  if (isbot(request.headers.get('user-agent'))) {
+    await body.allReady
+  }
 
   responseHeaders.set('Content-Type', 'text/html')
 
-  return new Response('<!DOCTYPE html>' + markup, {
-    headers: responseHeaders,
+  return new Response(body, {
     status: responseStatusCode,
+    headers: responseHeaders,
   })
 }