Update fetch cache internal handling

vercel · Feb 28, 2023 · 99d6e24 · 99d6e24
1 parent 6b27604
commit 99d6e24
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/.github/workflows/build_test_deploy.yml b/.github/workflows/build_test_deploy.yml
@@ -592,7 +592,7 @@ jobs:
         node: [16]
         group: [1, 2, 3, 4, 5, 6, 7, 8]
     # run LTS matrix always and maintenance tests during a release
-    if: ${{ needs.build.outputs.isRelease == 'true' }}
+    # if: ${{ needs.build.outputs.isRelease == 'true' }}
     steps:
       - run: echo "${{needs.build.outputs.docsChange}}"
 
@@ -822,7 +822,7 @@ jobs:
         testDevLTS,
         testProdLTS,
         testDevE2ELTS,
-        testprode2elts,
+        testProdE2ELTS,
       ]
     steps:
       - run: exit 0

diff --git a/packages/next/src/server/lib/patch-fetch.ts b/packages/next/src/server/lib/patch-fetch.ts
@@ -14,10 +14,9 @@ export function patchFetch({
   serverHooks: typeof import('../../client/components/hooks-server-context')
   staticGenerationAsyncStorage: StaticGenerationAsyncStorage
 }) {
-  if ((globalThis.fetch as any).patched) return
+  if ((fetch as any).__nextPatched) return
 
   const { DynamicServerError } = serverHooks
-
   const originFetch = fetch
 
   // @ts-expect-error - we're patching fetch
@@ -151,6 +150,7 @@ export function patchFetch({
       }
 
       const doOriginalFetch = async () => {
+        init = init || {}
         return originFetch(input, init).then(async (res) => {
           if (
             staticGenerationStore.incrementalCache &&
@@ -291,5 +291,5 @@ export function patchFetch({
       return doOriginalFetch()
     }
   )
-  ;(globalThis.fetch as any).patched = true
+  ;(fetch as any).__nextPatched = true
 }