Skip copying signal field for revalidate (#54533)

This ensures we don't pass through the signal field when revalidating a fetch as that can be delayed and we don't want to abort the revalidation. Closes: #54045
vercel · Aug 25, 2023 · 483ebc2 · 483ebc2
1 parent 9a2a349
commit 483ebc2
Showing 1 changed file with 40 additions and 37 deletions.
diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -306,43 +306,6 @@ export function patchFetch({
             console.error(`Failed to generate cache key for`, input)
           }
         }
-        const requestInputFields = [
-          'cache',
-          'credentials',
-          'headers',
-          'integrity',
-          'keepalive',
-          'method',
-          'mode',
-          'redirect',
-          'referrer',
-          'referrerPolicy',
-          'signal',
-          'window',
-          'duplex',
-        ]
-
-        if (isRequestInput) {
-          const reqInput: Request = input as any
-          const reqOptions: RequestInit = {
-            body: (reqInput as any)._ogBody || reqInput.body,
-          }
-
-          for (const field of requestInputFields) {
-            // @ts-expect-error custom fields
-            reqOptions[field] = reqInput[field]
-          }
-          input = new Request(reqInput.url, reqOptions)
-        } else if (init) {
-          const initialInit = init
-          init = {
-            body: (init as any)._ogBody || init.body,
-          }
-          for (const field of requestInputFields) {
-            // @ts-expect-error custom fields
-            init[field] = initialInit[field]
-          }
-        }
 
         const fetchIdx = staticGenerationStore.nextFetchId ?? 1
         staticGenerationStore.nextFetchId = fetchIdx + 1
@@ -354,6 +317,46 @@ export function patchFetch({
           isStale?: boolean,
           cacheReasonOverride?: string
         ) => {
+          const requestInputFields = [
+            'cache',
+            'credentials',
+            'headers',
+            'integrity',
+            'keepalive',
+            'method',
+            'mode',
+            'redirect',
+            'referrer',
+            'referrerPolicy',
+            'window',
+            'duplex',
+
+            // don't pass through signal when revalidating
+            ...(isStale ? [] : ['signal']),
+          ]
+
+          if (isRequestInput) {
+            const reqInput: Request = input as any
+            const reqOptions: RequestInit = {
+              body: (reqInput as any)._ogBody || reqInput.body,
+            }
+
+            for (const field of requestInputFields) {
+              // @ts-expect-error custom fields
+              reqOptions[field] = reqInput[field]
+            }
+            input = new Request(reqInput.url, reqOptions)
+          } else if (init) {
+            const initialInit = init
+            init = {
+              body: (init as any)._ogBody || init.body,
+            }
+            for (const field of requestInputFields) {
+              // @ts-expect-error custom fields
+              init[field] = initialInit[field]
+            }
+          }
+
           // add metadata to init without editing the original
           const clonedInit = {
             ...init,