fix: support changed shape of getRequestHandlers return

pieh · pieh · commit 05cabc023be8 · 2024-12-08T09:39:51.000+01:00
diff --git a/src/run/handlers/server.ts b/src/run/handlers/server.ts
@@ -60,10 +60,10 @@ export default async (request: Request, context: FutureContext) => {
       nextConfig = await getRunConfig()
       setRunConfig(nextConfig)
 
-      const { getMockedRequestHandlers } = await nextImportPromise
+      const { getMockedRequestHandler } = await nextImportPromise
       const url = new URL(request.url)
 
-      ;[nextHandler] = await getMockedRequestHandlers({
+      nextHandler = await getMockedRequestHandler({
         port: Number(url.port) || 443,
         hostname: url.hostname,
         dir: process.cwd(),
diff --git a/src/run/next.cts b/src/run/next.cts
@@ -85,7 +85,7 @@ export type HtmlBlob = {
   isFallback: boolean
 }
 
-export async function getMockedRequestHandlers(...args: Parameters<typeof getRequestHandlers>) {
+export async function getMockedRequestHandler(...args: Parameters<typeof getRequestHandlers>) {
   const tracer = getTracer()
   return tracer.withActiveSpan('mocked request handler', async () => {
     const ofs = { ...fs }
@@ -131,6 +131,9 @@ export async function getMockedRequestHandlers(...args: Parameters<typeof getReq
       require('fs').promises,
     )
 
-    return getRequestHandlers(...args)
+    const requestHandlers = await getRequestHandlers(...args)
+    // depending on Next.js version requestHandlers might be an array of object
+    // see https://github.com/vercel/next.js/commit/08e7410f15706379994b54c3195d674909a8d533#diff-37243d614f1f5d3f7ea50bbf2af263f6b1a9a4f70e84427977781e07b02f57f1R742
+    return Array.isArray(requestHandlers) ? requestHandlers[0] : requestHandlers.requestHandler
   })
 }

Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ export type HtmlBlob = {`
`85`	`85`	`isFallback: boolean`
`86`	`86`	`}`
`87`	`87`
`88`		`-export async function getMockedRequestHandlers(...args: Parameters<typeof getRequestHandlers>) {`
	`88`	`+export async function getMockedRequestHandler(...args: Parameters<typeof getRequestHandlers>) {`
`89`	`89`	`const tracer = getTracer()`
`90`	`90`	`return tracer.withActiveSpan('mocked request handler', async () => {`
`91`	`91`	`const ofs = { ...fs }`
`@@ -131,6 +131,9 @@ export async function getMockedRequestHandlers(...args: Parameters<typeof getReq`
`131`	`131`	`require('fs').promises,`
`132`	`132`	`)`
`133`	`133`
`134`		`- return getRequestHandlers(...args)`
	`134`	`+ const requestHandlers = await getRequestHandlers(...args)`
	`135`	`+ // depending on Next.js version requestHandlers might be an array of object`
	`136`	`+ // see https://github.com/vercel/next.js/commit/08e7410f15706379994b54c3195d674909a8d533#diff-37243d614f1f5d3f7ea50bbf2af263f6b1a9a4f70e84427977781e07b02f57f1R742`
	`137`	`+ return Array.isArray(requestHandlers) ? requestHandlers[0] : requestHandlers.requestHandler`
`135`	`138`	`})`
`136`	`139`	`}`