override request in polyfill

vercel · Oct 24, 2022 · 89a9de5 · 89a9de5
1 parent 43f401e
commit 89a9de5
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 17 deletions.
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
@@ -195,14 +195,6 @@ function createErrorHandler(
   }
 }
 
-class NextFetchRequestImpl extends globalThis.Request {
-  next?: NextFetchRequestConfig | undefined
-  constructor(input: RequestInfo | URL, init?: RequestInit | undefined) {
-    super(input, init)
-    this.next = init?.next
-  }
-}
-
 let isFetchPatched = false
 
 // we patch fetch to collect cache information used for
@@ -216,12 +208,6 @@ function patchFetch(ComponentMod: any) {
 
   const staticGenerationAsyncStorage = ComponentMod.staticGenerationAsyncStorage
 
-  Object.defineProperty(globalThis, 'Request', {
-    get() {
-      return NextFetchRequestImpl
-    },
-  })
-
   const originFetch = globalThis.fetch
   globalThis.fetch = async (input, init) => {
     const staticGenerationStore =
@@ -244,7 +230,7 @@ function patchFetch(ComponentMod: any) {
         }
 
         const hasNextConfig = 'next' in init
-        const next = (hasNextConfig && init.next) || {}
+        const next = init.next || {}
         if (
           typeof next.revalidate === 'number' &&
           (typeof fetchRevalidate === 'undefined' ||

diff --git a/packages/next/server/node-polyfill-fetch.js b/packages/next/server/node-polyfill-fetch.js
@@ -6,6 +6,17 @@ if (!global.fetch) {
       ? require('next/dist/compiled/undici')
       : require('next/dist/compiled/node-fetch')
   }
+
+  function getRequestImpl() {
+    const OriginRequest = getFetchImpl().Request
+    return class Request extends OriginRequest {
+      constructor(input, init) {
+        super(input, init)
+        this.next = init?.next
+      }
+    }
+  }
+
   // Due to limitation of global configuration, we have to do this resolution at runtime
   global.fetch = (...args) => {
     const fetchImpl = getFetchImpl()
@@ -44,7 +55,7 @@ if (!global.fetch) {
     },
     Request: {
       get() {
-        return getFetchImpl().Request
+        return getRequestImpl()
       },
     },
     Response: {

diff --git a/packages/next/server/web/sandbox/context.ts b/packages/next/server/web/sandbox/context.ts
@@ -265,13 +265,15 @@ Learn More: https://nextjs.org/docs/messages/edge-dynamic-code-evaluation`),
 
       const __Request = context.Request
       context.Request = class extends __Request {
+        next?: NextFetchRequestConfig | undefined
         constructor(input: URL | RequestInfo, init?: RequestInit | undefined) {
           const url =
             typeof input !== 'string' && 'url' in input
               ? input.url
               : String(input)
           validateURL(url)
           super(url, init)
+          this.next = init?.next
         }
       }
 

diff --git a/packages/next/types/global.d.ts b/packages/next/types/global.d.ts
@@ -42,6 +42,10 @@ interface Window {
   __NEXT_HMR_CB?: null | ((message?: string) => void)
 }
 
+interface NextFetchRequestConfig {
+  revalidate?: number
+}
+
 interface RequestInit {
-  next?: { revalidate?: number } | undefined
+  next?: NextFetchRequestConfig | undefined
 }