feat: export the default 'handleRequest' from adapters (#204)

* feat: export the default 'handleRequest' from adapters

* chore: re-export

* chore: simplify demo server

packages/demo-site/app/entry.server.tsx

@@ -1,80 +1 @@
-/**
- * By default, Remix will handle generating the HTTP Response for you.
- * You are free to delete this file if you'd like to, but if you ever want it revealed again, you can run `npx remix reveal` ✨
- * For more information, see https://remix.run/file-conventions/entry.server
- */
-
-import { PassThrough } from 'node:stream'
-
-import type { AppLoadContext, EntryContext } from '@remix-run/node'
-import { createReadableStreamFromReadable } from '@remix-run/node'
-import { RemixServer } from '@remix-run/react'
-import isbot from 'isbot'
-import { renderToPipeableStream } from 'react-dom/server'
-
-const ABORT_DELAY = 5_000
-
-export default function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  loadContext: AppLoadContext,
-) {
-  const bot = isbot(request.headers.get('user-agent'))
-  return new Promise((resolve, reject) => {
-    let shellRendered = false
-    const body = new PassThrough()
-    const stream = createReadableStreamFromReadable(body)
-
-    const { pipe, abort } = renderToPipeableStream(
-      <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
-      {
-        onShellReady() {
-          if (!bot) {
-            shellRendered = true
-            responseHeaders.set('Content-Type', 'text/html')
-            resolve(
-              new Response(stream, {
-                headers: responseHeaders,
-                status: responseStatusCode,
-              }),
-            )
-            pipe(body)
-          }
-        },
-        onShellError(error: unknown) {
-          reject(error)
-        },
-        onAllReady() {
-          // Avoid a bug where responses aren't flushed if there's an outstanding timer.
-          clearTimeout(timer)
-          if (bot) {
-            shellRendered = true
-            responseHeaders.set('Content-Type', 'text/html')
-            resolve(
-              new Response(stream, {
-                headers: responseHeaders,
-                status: responseStatusCode,
-              }),
-            )
-            pipe(body)
-          }
-        },
-        onError(error: unknown) {
-          responseStatusCode = 500
-          // Log streaming rendering errors from inside the shell.  Don't log
-          // errors encountered during initial shell rendering since they'll
-          // reject and get logged in handleDocumentRequest.
-          if (shellRendered) {
-            console.error(error)
-          }
-        },
-      },
-    )
-
-    const timer = setTimeout(() => {
-      abort()
-    }, ABORT_DELAY)
-  })
-}
+export { handleRequest as default } from '@netlify/remix-adapter'

packages/demo-site/server.ts

@@ -1,12 +1,9 @@
 import * as build from '@remix-run/dev/server-build'
 import { createRequestHandler } from '@netlify/remix-adapter'
-import type { Context } from '@netlify/functions'
 
-const handle = createRequestHandler({
+const handler = createRequestHandler({
   build,
   mode: process.env.NODE_ENV,
 })
 
-export default function handler(request: Request, context: Context) {
-  return handle(request, context)
-}
+export default handler

packages/edge-demo-site/app/entry.server.tsx

@@ -1,31 +1 @@
-import type { AppLoadContext, EntryContext } from '@netlify/remix-runtime'
-import { RemixServer } from '@remix-run/react'
-import isbot from 'isbot'
-import { renderToReadableStream } from 'react-dom/server'
-
-export default async function handleRequest(
-  request: Request,
-  responseStatusCode: number,
-  responseHeaders: Headers,
-  remixContext: EntryContext,
-  loadContext: AppLoadContext,
-) {
-  const body = await renderToReadableStream(<RemixServer context={remixContext} url={request.url} />, {
-    signal: request.signal,
-    onError(error: unknown) {
-      // Log streaming rendering errors from inside the shell
-      console.error(error)
-      responseStatusCode = 500
-    },
-  })
-
-  if (isbot(request.headers.get('user-agent'))) {
-    await body.allReady
-  }
-
-  responseHeaders.set('Content-Type', 'text/html')
-  return new Response(body, {
-    headers: responseHeaders,
-    status: responseStatusCode,
-  })
-}
+export { handleRequest as default } from '@netlify/remix-edge-adapter'

packages/remix-adapter/package.json

@@ -32,11 +32,11 @@
   },
   "homepage": "https://github.com/netlify/remix-compute#readme",
   "dependencies": {
-    "@remix-run/node": "^1.18.1"
+    "@remix-run/node": "^2.0.0",
+    "isbot": "^3.7.0"
   },
   "devDependencies": {
     "@netlify/functions": "^2.3.0",
-    "@types/lambda-tester": "^3.6.1",
     "lambda-tester": "^4.0.1"
   },
   "peerDependencies": {

packages/remix-adapter/src/entry.server.tsx

@@ -0,0 +1,74 @@
+import { PassThrough } from 'node:stream'
+
+import type { AppLoadContext, EntryContext } from '@remix-run/node'
+import { createReadableStreamFromReadable } from '@remix-run/node'
+import { RemixServer } from '@remix-run/react'
+import isbot from 'isbot'
+import { renderToPipeableStream } from 'react-dom/server'
+
+const ABORT_DELAY = 5_000
+
+export function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  loadContext: AppLoadContext,
+) {
+  const bot = isbot(request.headers.get('user-agent'))
+  return new Promise((resolve, reject) => {
+    let shellRendered = false
+    const body = new PassThrough()
+    const stream = createReadableStreamFromReadable(body)
+
+    const { pipe, abort } = renderToPipeableStream(
+      <RemixServer context={remixContext} url={request.url} abortDelay={ABORT_DELAY} />,
+      {
+        onShellReady() {
+          if (!bot) {
+            shellRendered = true
+            responseHeaders.set('Content-Type', 'text/html')
+            resolve(
+              new Response(stream, {
+                headers: responseHeaders,
+                status: responseStatusCode,
+              }),
+            )
+            pipe(body)
+          }
+        },
+        onShellError(error: unknown) {
+          reject(error)
+        },
+        onAllReady() {
+          // Avoid a bug where responses aren't flushed if there's an outstanding timer.
+          clearTimeout(timer)
+          if (bot) {
+            shellRendered = true
+            responseHeaders.set('Content-Type', 'text/html')
+            resolve(
+              new Response(stream, {
+                headers: responseHeaders,
+                status: responseStatusCode,
+              }),
+            )
+            pipe(body)
+          }
+        },
+        onError(error: unknown) {
+          responseStatusCode = 500
+          // Log streaming rendering errors from inside the shell.  Don't log
+          // errors encountered during initial shell rendering since they'll
+          // reject and get logged in handleDocumentRequest.
+          if (shellRendered) {
+            console.error(error)
+          }
+        },
+      },
+    )
+
+    const timer = setTimeout(() => {
+      abort()
+    }, ABORT_DELAY)
+  })
+}

packages/remix-adapter/src/index.ts

@@ -1,3 +1,4 @@
 export { config } from './defaultRemixConfig'
 export type { GetLoadContextFunction, RequestHandler } from './server'
 export { createRequestHandler } from './server'
+export { handleRequest } from './entry.server'

packages/remix-adapter/tsconfig.json

@@ -2,6 +2,7 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": "src",
+    "jsx": "react-jsx",
     "outDir": "./build"
   },
   "include": ["./src"]

packages/remix-edge-adapter/package.json

@@ -36,7 +36,8 @@
   },
   "homepage": "https://github.com/netlify/remix-compute#readme",
   "dependencies": {
-    "@netlify/remix-runtime": "2.0.0"
+    "@netlify/remix-runtime": "2.0.0",
+    "isbot": "^3.7.0"
   },
   "devDependencies": {
     "@remix-run/dev": "^2.0.0"

packages/remix-edge-adapter/src/entry.server.tsx

@@ -0,0 +1,31 @@
+import type { AppLoadContext, EntryContext } from '@netlify/remix-runtime'
+import { RemixServer } from '@remix-run/react'
+import isbot from 'isbot'
+import { renderToReadableStream } from 'react-dom/server'
+
+export async function handleRequest(
+  request: Request,
+  responseStatusCode: number,
+  responseHeaders: Headers,
+  remixContext: EntryContext,
+  loadContext: AppLoadContext,
+) {
+  const body = await renderToReadableStream(<RemixServer context={remixContext} url={request.url} />, {
+    signal: request.signal,
+    onError(error: unknown) {
+      // Log streaming rendering errors from inside the shell
+      console.error(error)
+      responseStatusCode = 500
+    },
+  })
+
+  if (isbot(request.headers.get('user-agent'))) {
+    await body.allReady
+  }
+
+  responseHeaders.set('Content-Type', 'text/html')
+  return new Response(body, {
+    headers: responseHeaders,
+    status: responseStatusCode,
+  })
+}

packages/remix-edge-adapter/src/index.ts

@@ -3,3 +3,4 @@ import './globals'
 export type { GetLoadContextFunction, RequestHandler } from './server'
 export { createRequestHandler } from './server'
 export { config } from './defaultRemixConfig'
+export { handleRequest } from './entry.server'

packages/remix-edge-adapter/tsconfig.json

@@ -2,7 +2,8 @@
   "extends": "../../tsconfig.json",
   "compilerOptions": {
     "rootDir": ".",
-    "outDir": "./build"
+    "outDir": "./build",
+    "jsx": "react-jsx"
   },
   "include": ["./src"]
   // "references": [

packages/remix-runtime/package.json

@@ -20,10 +20,10 @@
   },
   "homepage": "https://github.com/netlify/remix-compute#readme",
   "devDependencies": {
-    "@remix-run/server-runtime": "^1.18.1"
+    "@remix-run/server-runtime": "^2.1.0"
   },
   "peerDependencies": {
-    "@remix-run/server-runtime": "^1.18.1"
+    "@remix-run/server-runtime": "^2.0.0"
   },
   "publishConfig": {
     "access": "public"