Merge pull request #9247 from withastro/next

Merge the `next` branch into `main` for the 4.0 release

2 files changed, 4 insertions, 5 deletions

diff --git a/packages/integrations/node/src/createOutgoingHttpHeaders.ts b/packages/integrations/node/src/createOutgoingHttpHeaders.ts
index 781a74de6..44bbf81ca 100644
--- a/packages/integrations/node/src/createOutgoingHttpHeaders.ts
+++ b/packages/integrations/node/src/createOutgoingHttpHeaders.ts
@@ -23,8 +23,7 @@ export const createOutgoingHttpHeaders = (
 
 	// if there is > 1 set-cookie header, we have to fix it to be an array of values
 	if (headers.has('set-cookie')) {
-		// @ts-expect-error
-		const cookieHeaders = headers.getSetCookie() as string[];
+		const cookieHeaders = headers.getSetCookie();
 		if (cookieHeaders.length > 1) {
 			// the Headers.entries() API already normalized all header names to lower case so we can safely index this as 'set-cookie'
 			nodeHeaders['set-cookie'] = cookieHeaders;
diff --git a/packages/integrations/node/src/nodeMiddleware.ts b/packages/integrations/node/src/nodeMiddleware.ts
index 4fd0a4bc2..0b9381f1d 100644
--- a/packages/integrations/node/src/nodeMiddleware.ts
+++ b/packages/integrations/node/src/nodeMiddleware.ts
@@ -30,10 +30,10 @@ export default function (app: NodeApp, mode: Options['mode']) {
 		}
 
 		try {
-			const route = app.match(req);
-			if (route) {
+			const routeData = app.match(req);
+			if (routeData) {
 				try {
-					const response = await app.render(req, route, locals);
+					const response = await app.render(req, { routeData, locals });
 					await writeWebResponse(app, res, response);
 				} catch (err: unknown) {
 					if (next) {