Skip to content

Reflect runtime type of resHeaders in static types #87145

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eps1lon merged 2 commits into from
Dec 16, 2025
+14 −8
Merged

Reflect runtime type of resHeaders in static types #87145

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
6b42b97
Reflect runtime type of `resHeaders` in static types
eps1lon Dec 13, 2025
9a5c53c
Poke "generate PR stats"
eps1lon Dec 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions packages/next/src/server/lib/router-server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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])
}
Expand All @@ -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
Expand Down
14 changes: 9 additions & 5 deletions packages/next/src/server/lib/router-utils/resolve-routes.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}> {
Expand Down Expand Up @@ -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,
Comment on lines -757 to -758
Copy link
Member Author

@eps1lon eps1lon Dec 13, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This somehow made the whole return type unsound. Once I moved the unsafe cast out of the object literal, TS started to complain about the missing resHeaders

Copy link
Member

@wyattjoh wyattjoh Dec 15, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, any // @ts-expect-error or // @ts-ignore inside an object declaration actually marks the entire object's definition, not just the next line.

parsedUrl: unsafeParsedUrl,
resHeaders: null,
statusCode: getRedirectStatus(route),
}
}
Expand Down Expand Up @@ -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,
}
}
Expand Down
Loading