Make getRequestMeta in Edge work

mischnic · mischnic · commit bae255a602b8 · 2025-12-05T12:27:11.000+01:00
diff --git a/packages/next/src/server/base-http/web.ts b/packages/next/src/server/base-http/web.ts
@@ -7,6 +7,7 @@ import { DetachedPromise } from '../../lib/detached-promise'
 import type { NextRequestHint } from '../web/adapter'
 import { CloseController, trackBodyConsumed } from '../web/web-on-close'
 import { InvariantError } from '../../shared/lib/invariant-error'
+import { NEXT_REQUEST_META } from '../request-meta'
 
 export class WebNextRequest extends BaseNextRequest<ReadableStream | null> {
   public request: Request
@@ -28,6 +29,12 @@ export class WebNextRequest extends BaseNextRequest<ReadableStream | null> {
     for (const [name, value] of request.headers.entries()) {
       this.headers[name] = value
     }
+
+    // @ts-ignore
+    if (request[NEXT_REQUEST_META]) {
+      // @ts-ignore
+      this[NEXT_REQUEST_META] = request[NEXT_REQUEST_META]
+    }
   }
 
   async parseBody(_limit: string | number): Promise<any> {
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -1715,7 +1715,7 @@ export default class NextNodeServer extends BaseServer<
         method !== 'GET' && method !== 'HEAD'
           ? (getRequestMeta(params.request, 'clonableBody') as any)
           : undefined,
-
+      meta: getRequestMeta(params.request),
       signal: signalFromNodeResponse(params.response.originalResponse),
       waitUntil: this.getWaitUntil(),
     }
@@ -2056,6 +2056,7 @@ export default class NextNodeServer extends BaseServer<
           ...(params.params && { params: params.params }),
         },
         body: getRequestMeta(params.req, 'clonableBody'),
+        meta: getRequestMeta(params.req),
         signal: signalFromNodeResponse(params.res.originalResponse),
         waitUntil: this.getWaitUntil(),
       },
diff --git a/packages/next/src/server/web/adapter.ts b/packages/next/src/server/web/adapter.ts
@@ -35,6 +35,7 @@ import { CloseController } from './web-on-close'
 import { getEdgePreviewProps } from './get-edge-preview-props'
 import { getBuiltinRequestContext } from '../after/builtin-request-context'
 import { getImplicitTags } from '../lib/implicit-tags'
+import { NEXT_REQUEST_META, type RequestMeta } from '../request-meta'
 
 export class NextRequestHint extends NextRequest {
   sourcePage: string
@@ -43,10 +44,15 @@ export class NextRequestHint extends NextRequest {
   constructor(params: {
     init: RequestInit
     input: Request | string
+    meta: RequestMeta | undefined
     page: string
   }) {
     super(params.input, params.init)
     this.sourcePage = params.page
+    if (params.meta) {
+      // @ts-ignore
+      this[NEXT_REQUEST_META] = params.meta
+    }
   }
 
   get request() {
@@ -185,6 +191,7 @@ export async function adapter(
       nextConfig: params.request.nextConfig,
       signal: params.request.signal,
     },
+    meta: params.request.meta,
   })
 
   /**
diff --git a/packages/next/src/server/web/types.ts b/packages/next/src/server/web/types.ts
@@ -5,6 +5,7 @@ import type { NextResponse } from './spec-extension/response'
 import type { CloneableBody } from '../body-streams'
 import type { OutgoingHttpHeaders } from 'http'
 import type { FetchMetrics } from '../base-http'
+import type { RequestMeta } from '../request-meta'
 
 /**
  * @deprecated Use `ProxyConfig` instead. Middleware has been renamed to Proxy.
@@ -30,6 +31,7 @@ export interface RequestData {
     params?: { [key: string]: string | string[] | undefined }
   }
   url: string
+  meta?: RequestMeta
   body?: ReadableStream<Uint8Array>
   signal: AbortSignal
   /** passed in when running in edge runtime sandbox */
