fix fetch cache in restartable render

Author: lubieowoce

packages/next/src/server/lib/patch-fetch.ts

@@ -290,6 +290,31 @@ export function createPatchedFetcher(
       cacheSignal.beginRead()
     }
 
+    const isStagedRenderingInDev = !!(
+      process.env.NODE_ENV === 'development' &&
+      workUnitStore &&
+      // eslint-disable-next-line no-restricted-syntax
+      workUnitStore.type === 'request' &&
+      // TODO: there's probably a cleaner way to detect this.
+      (workUnitStore.prerenderResumeDataCache ||
+        workUnitStore.renderResumeDataCache)
+    )
+
+    const isFillingCachesInDev = !!(
+      isStagedRenderingInDev && workUnitStore.cacheSignal
+    )
+
+    const dynamicInDevStagedRendering = async () => {
+      if (isFillingCachesInDev) {
+        // TODO(restart-on-cache-miss): block dynamic more effectively
+        await waitAtLeastOneReactRenderTask()
+        await waitAtLeastOneReactRenderTask()
+      } else if (isStagedRenderingInDev) {
+        // don't block, but delay
+        await waitAtLeastOneReactRenderTask()
+      }
+    }
+
     const result = getTracer().trace(
       isInternal ? NextNodeServerSpan.internalFetch : AppRenderSpan.fetch,
       {
@@ -557,6 +582,18 @@ export function createPatchedFetcher(
             case 'prerender-ppr':
             case 'prerender-legacy':
             case 'request':
+              if (
+                process.env.NODE_ENV === 'development' &&
+                isStagedRenderingInDev
+              ) {
+                if (cacheSignal) {
+                  cacheSignal.endRead()
+                  cacheSignal = null
+                }
+                // TODO(restart-on-cache-miss): block dynamic when filling caches
+                await dynamicInDevStagedRendering()
+              }
+              break
             case 'cache':
             case 'private-cache':
             case 'unstable-cache':
@@ -667,9 +704,21 @@ export function createPatchedFetcher(
                     workStore.route,
                     'fetch()'
                   )
+                case 'request':
+                  if (
+                    process.env.NODE_ENV === 'development' &&
+                    isStagedRenderingInDev
+                  ) {
+                    if (cacheSignal) {
+                      cacheSignal.endRead()
+                      cacheSignal = null
+                    }
+                    // TODO(restart-on-cache-miss): block dynamic when filling caches
+                    await dynamicInDevStagedRendering()
+                  }
+                  break
                 case 'prerender-ppr':
                 case 'prerender-legacy':
-                case 'request':
                 case 'cache':
                 case 'private-cache':
                 case 'unstable-cache':
@@ -841,9 +890,23 @@ export function createPatchedFetcher(
                       normalizedRevalidate,
                       handleUnlock
                     )
+                  case 'request':
+                    if (
+                      process.env.NODE_ENV === 'development' &&
+                      isFillingCachesInDev
+                    ) {
+                      return createCachedPrerenderResponse(
+                        res,
+                        cacheKey,
+                        incrementalCacheConfig,
+                        incrementalCache,
+                        normalizedRevalidate,
+                        handleUnlock
+                      )
+                    }
+                  // fallthrough
                   case 'prerender-ppr':
                   case 'prerender-legacy':
-                  case 'request':
                   case 'cache':
                   case 'private-cache':
                   case 'unstable-cache':
@@ -913,9 +976,16 @@ export function createPatchedFetcher(
                   // here.
                   await waitAtLeastOneReactRenderTask()
                   break
+                case 'request':
+                  if (
+                    process.env.NODE_ENV === 'development' &&
+                    isStagedRenderingInDev
+                  ) {
+                    await dynamicInDevStagedRendering()
+                  }
+                  break
                 case 'prerender-ppr':
                 case 'prerender-legacy':
-                case 'request':
                 case 'cache':
                 case 'private-cache':
                 case 'unstable-cache':
@@ -929,6 +999,7 @@ export function createPatchedFetcher(
               await handleUnlock()
             } else {
               // in dev, incremental cache response will be null in case the browser adds `cache-control: no-cache` in the request headers
+              // TODO: it seems like we also hit this after revalidates in dev?
               cacheReasonOverride = 'cache-control: no-cache (hard refresh)'
             }
 
@@ -995,7 +1066,11 @@ export function createPatchedFetcher(
           }
         }
 
-        if (workStore.isStaticGeneration && init && typeof init === 'object') {
+        if (
+          (workStore.isStaticGeneration || isStagedRenderingInDev) &&
+          init &&
+          typeof init === 'object'
+        ) {
           const { cache } = init
 
           // Delete `cache` property as Cloudflare Workers will throw an error
@@ -1017,9 +1092,21 @@ export function createPatchedFetcher(
                     workStore.route,
                     'fetch()'
                   )
+                case 'request':
+                  if (
+                    process.env.NODE_ENV === 'development' &&
+                    isStagedRenderingInDev
+                  ) {
+                    if (cacheSignal) {
+                      cacheSignal.endRead()
+                      cacheSignal = null
+                    }
+                    // TODO(restart-on-cache-miss): block dynamic when filling caches
+                    await dynamicInDevStagedRendering()
+                  }
+                  break
                 case 'prerender-ppr':
                 case 'prerender-legacy':
-                case 'request':
                 case 'cache':
                 case 'private-cache':
                 case 'unstable-cache':
@@ -1055,6 +1142,14 @@ export function createPatchedFetcher(
                       'fetch()'
                     )
                   case 'request':
+                    if (
+                      process.env.NODE_ENV === 'development' &&
+                      isStagedRenderingInDev
+                    ) {
+                      // TODO(restart-on-cache-miss): block dynamic when filling caches
+                      await dynamicInDevStagedRendering()
+                    }
+                    break
                   case 'cache':
                   case 'private-cache':
                   case 'unstable-cache':