Fix incorrect 200 with wrong buildId (#397)

* fix incorrect 200 with wrong buildId

* Create blue-guests-punch.md

Author: conico974

.changeset/blue-guests-punch.md

@@ -0,0 +1,5 @@
+---
+"open-next": patch
+---
+
+Fix incorrect 200 with wrong buildId for page router

packages/open-next/src/adapters/plugins/routing/default.replacement.ts

@@ -42,6 +42,11 @@ export const processInternalEvent: ProcessInternalEvent = async (
   const nextHeaders = addNextConfigHeaders(event, ConfigHeaders) ?? {};
 
   let internalEvent = fixDataPage(event, BuildId);
+  // If we return InternalResult, it means that the build id is not correct
+  // We should return a 404
+  if ("statusCode" in internalEvent) {
+    return internalEvent;
+  }
 
   internalEvent = handleFallbackFalse(internalEvent, PrerenderManifest);
 

packages/open-next/src/adapters/routing/matcher.ts

@@ -239,9 +239,24 @@ export function handleRedirects(
   }
 }
 
-export function fixDataPage(internalEvent: InternalEvent, buildId: string) {
+export function fixDataPage(
+  internalEvent: InternalEvent,
+  buildId: string,
+): InternalEvent | InternalResult {
   const { rawPath, query } = internalEvent;
   const dataPattern = `/_next/data/${buildId}`;
+  // Return 404 for data requests that don't match the buildId
+  if (rawPath.startsWith("/_next/data") && !rawPath.startsWith(dataPattern)) {
+    return {
+      type: internalEvent.type,
+      statusCode: 404,
+      body: "{}",
+      headers: {
+        "Content-Type": "application/json",
+      },
+      isBase64Encoded: false,
+    };
+  }
 
   if (rawPath.startsWith(dataPattern) && rawPath.endsWith(".json")) {
     let newPath = rawPath.replace(dataPattern, "").replace(/\.json$/, "");