Await cacheReady during initial PPR prerender

Author: unstubbable

packages/next/src/server/app-render/app-render-prerender-utils.ts

@@ -7,7 +7,7 @@ import { isPrerenderInterruptedError } from './dynamic-rendering'
  */
 export function prerenderAndAbortInSequentialTasks<R>(
   prerender: () => Promise<R>,
-  abort: () => void
+  abort: () => Promise<void>
 ): Promise<R> {
   if (process.env.NEXT_RUNTIME === 'edge') {
     throw new InvariantError(
@@ -26,7 +26,8 @@ export function prerenderAndAbortInSequentialTasks<R>(
       })
       setImmediate(() => {
         abort()
-        resolve(pendingResult)
+          .then(() => resolve(pendingResult))
+          .catch(() => {})
       })
     })
   }

packages/next/src/server/app-render/app-render.tsx

@@ -2720,7 +2720,7 @@ async function prerenderToStream(
             implicitTags: implicitTags,
             renderSignal: initialClientController.signal,
             controller: initialClientController,
-            cacheSignal: null,
+            cacheSignal,
             dynamicTracking: null,
             revalidate: INFINITE_CACHE,
             expire: INFINITE_CACHE,
@@ -2773,7 +2773,8 @@ async function prerenderToStream(
                     : [bootstrapScript],
                 }
               ),
-            () => {
+            async () => {
+              await cacheSignal.cacheReady()
               initialClientController.abort()
             }
           ).catch((err) => {
@@ -2845,7 +2846,7 @@ async function prerenderToStream(
                 prerenderIsPending = false
                 return prerenderResult
               },
-              () => {
+              async () => {
                 if (finalServerController.signal.aborted) {
                   // If the server controller is already aborted we must have called something
                   // that required aborting the prerender synchronously such as with new Date()
@@ -2939,7 +2940,7 @@ async function prerenderToStream(
                   : [bootstrapScript],
               }
             ),
-          () => {
+          async () => {
             finalClientController.abort()
           }
         )