fix: don't attempt to keep old query param working

Author: pieh

edge-runtime/lib/response.ts

@@ -13,7 +13,10 @@ import {
   normalizeDataUrl,
   normalizeLocalePath,
   normalizeTrailingSlash,
+  parseDataUrl,
   relativizeURL,
+  removeBasePath,
+  stripTrailingSlash,
 } from './util.ts'
 
 export interface FetchEventResult {
@@ -181,12 +184,23 @@ export const buildResponse = async ({
 
     if (isDataReq) {
       // The rewrite target is a data request, but a middleware rewrite target is always for the page route,
-      // so we need to tell the server this is a data request. Setting the `x-nextjs-data` header is not enough. 🤷
-      rewriteUrl.searchParams.set('__nextDataReq', '1')
-    }
+      // so we need to transform url back to data url
+
+      const { buildId } = parseDataUrl(
+        removeBasePath(new URL(request.url).pathname, nextConfig?.basePath),
+      )
+      const rewriteRoute = removeBasePath(rewriteUrl.pathname, nextConfig?.basePath)
 
-    // respect trailing slash rules to prevent 308s
-    rewriteUrl.pathname = normalizeTrailingSlash(rewriteUrl.pathname, nextConfig?.trailingSlash)
+      const newPath = addBasePath(
+        `/_next/data/${buildId}${rewriteRoute === '/' ? '/index' : stripTrailingSlash(rewriteRoute)}.json`,
+        nextConfig?.basePath,
+      )
+
+      rewriteUrl.pathname = newPath
+    } else {
+      // respect trailing slash rules to prevent 308s
+      rewriteUrl.pathname = normalizeTrailingSlash(rewriteUrl.pathname, nextConfig?.trailingSlash)
+    }
 
     const target = normalizeLocalizedTarget({ target: rewriteUrl.toString(), request, nextConfig })
     if (target === request.url) {

src/run/handlers/server.ts

@@ -83,15 +83,6 @@ export default async (request: Request) => {
       },
     })
 
-    if (new URL(request.url).searchParams.get('__nextDataReq')) {
-      const NEXT_REQUEST_META = Symbol.for('NextInternalRequestMeta')
-      // @ts-expect-error NEXT_REQUEST_META doesn't exist in IncomingMessage type
-      const meta = req[NEXT_REQUEST_META] ?? {}
-      meta.isNextDataReq = true
-      // @ts-expect-error NEXT_REQUEST_META doesn't exist in IncomingMessage type
-      req[NEXT_REQUEST_META] = meta
-    }
-
     disableFaultyTransferEncodingHandling(res as unknown as ComputeJsOutgoingMessage)
 
     const requestContext = getRequestContext() ?? createRequestContext()