Refactor 404 and 500 approach (#7754)

* fix(app): refactor 404 and 500 approach

* chore: refactor logic

* fix: always treat error as page

* test: migrate ssr-prerender-404 to node adapter

* feat: merge original response metadata with error response

* chore: update lockfile

* chore: trigger ci

* chore(lint): fix lint issue

* fix: ensure merged request has proper status

* fix(node): prerender test

* chore: update test label

* fix(node): improve 404 behavior in middleware mode

* fix(vercel): improve 404 behavior

* fix(netlify): improve 404 behavior

* chore: update test labels

* chore: force ci

* chore: fix lint

* fix: avoid infinite loops

* test: fix failing test in Node 18

* chore: remove volta

2 files changed, 12 insertions, 26 deletions

diff --git a/packages/integrations/netlify/src/netlify-edge-functions.ts b/packages/integrations/netlify/src/netlify-edge-functions.ts
index 4a6d3674c..3897a5120 100644
--- a/packages/integrations/netlify/src/netlify-edge-functions.ts
+++ b/packages/integrations/netlify/src/netlify-edge-functions.ts
@@ -15,25 +15,19 @@ export function createExports(manifest: SSRManifest) {
 		if (manifest.assets.has(url.pathname)) {
 			return;
 		}
-		if (app.match(request)) {
-			const ip =
-				request.headers.get('x-nf-client-connection-ip') ||
-				context?.ip ||
-				(context as any)?.remoteAddr?.hostname;
-			Reflect.set(request, clientAddressSymbol, ip);
-			const response = await app.render(request);
-			if (app.setCookieHeaders) {
-				for (const setCookieHeader of app.setCookieHeaders(response)) {
-					response.headers.append('Set-Cookie', setCookieHeader);
-				}
+		const routeData = app.match(request)
+		const ip =
+			request.headers.get('x-nf-client-connection-ip') ||
+			context?.ip ||
+			(context as any)?.remoteAddr?.hostname;
+		Reflect.set(request, clientAddressSymbol, ip);
+		const response = await app.render(request, routeData);
+		if (app.setCookieHeaders) {
+			for (const setCookieHeader of app.setCookieHeaders(response)) {
+				response.headers.append('Set-Cookie', setCookieHeader);
 			}
-			return response;
 		}
-
-		return new Response(null, {
-			status: 404,
-			statusText: 'Not found',
-		});
+		return response;
 	};
 
 	return { default: handler };
diff --git a/packages/integrations/netlify/src/netlify-functions.ts b/packages/integrations/netlify/src/netlify-functions.ts
index 8d0196d5e..cc6636ec4 100644
--- a/packages/integrations/netlify/src/netlify-functions.ts
+++ b/packages/integrations/netlify/src/netlify-functions.ts
@@ -70,15 +70,7 @@ export const createExports = (manifest: SSRManifest, args: Args) => {
 		}
 		const request = new Request(rawUrl, init);
 
-		let routeData = app.match(request, { matchNotFound: true });
-
-		if (!routeData) {
-			return {
-				statusCode: 404,
-				body: 'Not found',
-			};
-		}
-
+		const routeData = app.match(request);
 		const ip = headers['x-nf-client-connection-ip'];
 		Reflect.set(request, clientAddressSymbol, ip);
 		let locals = {};