Unverified Commit f754a00c authored by Sebastian "Sebbie" Silbermann's avatar Sebastian "Sebbie" Silbermann Committed by GitHub

Reflect runtime type of `resHeaders` in static types (#87145)

parent 20da8ead
......@@ -414,7 +414,7 @@ export async function initialize(opts: {
req.url = removePathPrefix(origUrl, config.assetPrefix)
}
if (resHeaders) {
if (resHeaders !== null) {
for (const key of Object.keys(resHeaders)) {
res.setHeader(key, resHeaders[key])
}
......@@ -441,8 +441,10 @@ export async function initialize(opts: {
})
// apply any response headers from routing
for (const key of Object.keys(resHeaders || {})) {
res.setHeader(key, resHeaders[key])
if (resHeaders !== null) {
for (const key of Object.keys(resHeaders)) {
res.setHeader(key, resHeaders[key])
}
}
// handle redirect
......
......@@ -117,7 +117,7 @@ export function getResolveRoutes(
finished: boolean
statusCode?: number
bodyStream?: ReadableStream | null
resHeaders: Record<string, string | string[]>
resHeaders: Record<string, string | string[]> | null
parsedUrl: NextUrlWithParsedQuery
matchedOutput?: FsOutput | null
}> {
......@@ -752,10 +752,12 @@ export function getResolveRoutes(
parsedDestination.pathname
)
// @ts-expect-error // custom ParsedUrl
const unsafeParsedUrl: NextUrlWithParsedQuery = parsedDestination
return {
finished: true,
// @ts-expect-error custom ParsedUrl
parsedUrl: parsedDestination,
parsedUrl: unsafeParsedUrl,
resHeaders: null,
statusCode: getRedirectStatus(route),
}
}
......@@ -826,9 +828,11 @@ export function getResolveRoutes(
}
if (parsedDestination.protocol) {
// @ts-expect-error // custom ParsedUrl
const unsafeParsedUrl: NextUrlWithParsedQuery = parsedDestination
return {
// @ts-expect-error custom ParsedUrl
parsedUrl: parsedDestination,
parsedUrl: unsafeParsedUrl,
resHeaders: null,
finished: true,
}
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment