Skip to content

Commit 288342c

Browse files
committed
fix: support changed shape of getRequestHandlers return
1 parent 518a6d6 commit 288342c

File tree

2 files changed

+7
-4
lines changed

2 files changed

+7
-4
lines changed

src/run/handlers/server.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ export default async (request: Request) => {
5656
nextConfig = await getRunConfig()
5757
setRunConfig(nextConfig)
5858

59-
const { getMockedRequestHandlers } = await nextImportPromise
59+
const { getMockedRequestHandler } = await nextImportPromise
6060
const url = new URL(request.url)
6161

62-
;[nextHandler] = await getMockedRequestHandlers({
62+
nextHandler = await getMockedRequestHandler({
6363
port: Number(url.port) || 443,
6464
hostname: url.hostname,
6565
dir: process.cwd(),

src/run/next.cts

+5-2
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ export type HtmlBlob = {
8585
isFallback: boolean
8686
}
8787

88-
export async function getMockedRequestHandlers(...args: Parameters<typeof getRequestHandlers>) {
88+
export async function getMockedRequestHandler(...args: Parameters<typeof getRequestHandlers>) {
8989
const tracer = getTracer()
9090
return tracer.withActiveSpan('mocked request handler', async () => {
9191
const ofs = { ...fs }
@@ -131,6 +131,9 @@ export async function getMockedRequestHandlers(...args: Parameters<typeof getReq
131131
require('fs').promises,
132132
)
133133

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
135138
})
136139
}

0 commit comments

Comments
 (0)