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: { ...@@ -414,7 +414,7 @@ export async function initialize(opts: {
req.url = removePathPrefix(origUrl, config.assetPrefix) req.url = removePathPrefix(origUrl, config.assetPrefix)
} }
if (resHeaders) { if (resHeaders !== null) {
for (const key of Object.keys(resHeaders)) { for (const key of Object.keys(resHeaders)) {
res.setHeader(key, resHeaders[key]) res.setHeader(key, resHeaders[key])
} }
...@@ -441,8 +441,10 @@ export async function initialize(opts: { ...@@ -441,8 +441,10 @@ export async function initialize(opts: {
}) })
// apply any response headers from routing // apply any response headers from routing
for (const key of Object.keys(resHeaders || {})) { if (resHeaders !== null) {
res.setHeader(key, resHeaders[key]) for (const key of Object.keys(resHeaders)) {
res.setHeader(key, resHeaders[key])
}
} }
// handle redirect // handle redirect
......
...@@ -117,7 +117,7 @@ export function getResolveRoutes( ...@@ -117,7 +117,7 @@ export function getResolveRoutes(
finished: boolean finished: boolean
statusCode?: number statusCode?: number
bodyStream?: ReadableStream | null bodyStream?: ReadableStream | null
resHeaders: Record<string, string | string[]> resHeaders: Record<string, string | string[]> | null
parsedUrl: NextUrlWithParsedQuery parsedUrl: NextUrlWithParsedQuery
matchedOutput?: FsOutput | null matchedOutput?: FsOutput | null
}> { }> {
...@@ -752,10 +752,12 @@ export function getResolveRoutes( ...@@ -752,10 +752,12 @@ export function getResolveRoutes(
parsedDestination.pathname parsedDestination.pathname
) )
// @ts-expect-error // custom ParsedUrl
const unsafeParsedUrl: NextUrlWithParsedQuery = parsedDestination
return { return {
finished: true, finished: true,
// @ts-expect-error custom ParsedUrl parsedUrl: unsafeParsedUrl,
parsedUrl: parsedDestination, resHeaders: null,
statusCode: getRedirectStatus(route), statusCode: getRedirectStatus(route),
} }
} }
...@@ -826,9 +828,11 @@ export function getResolveRoutes( ...@@ -826,9 +828,11 @@ export function getResolveRoutes(
} }
if (parsedDestination.protocol) { if (parsedDestination.protocol) {
// @ts-expect-error // custom ParsedUrl
const unsafeParsedUrl: NextUrlWithParsedQuery = parsedDestination
return { return {
// @ts-expect-error custom ParsedUrl parsedUrl: unsafeParsedUrl,
parsedUrl: parsedDestination, resHeaders: null,
finished: true, 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