fix no cache warnings

Author: lubieowoce

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

@@ -621,17 +621,14 @@ async function generateDynamicFlightRenderResult(
     const getPayload = async (
       // eslint-disable-next-line @typescript-eslint/no-shadow
       requestStore: RequestStore
-    ): Promise<RSCPayload> => {
-      const rscPayload: RSCPayload & {
-        /** Only available during cacheComponents development builds. Used for logging errors. */
-        _validation?: Promise<ReactNode>
-        _bypassCachesInDev?: React.ReactNode
-      } = await workUnitAsyncStorage.run(
-        requestStore,
-        generateDynamicRSCPayload,
-        ctx,
-        options
-      )
+    ) => {
+      const rscPayload: RSCPayload & RSCPayloadDevProperties =
+        await workUnitAsyncStorage.run(
+          requestStore,
+          generateDynamicRSCPayload,
+          ctx,
+          options
+        )
       if (isBypassingCachesInDev(renderOpts, requestStore)) {
         rscPayload._bypassCachesInDev = createElement(
           WarnForBypassCachesInDev,
@@ -2279,6 +2276,12 @@ function applyMetadataFromPrerenderResult(
   }
 }
 
+type RSCPayloadDevProperties = {
+  /** Only available during cacheComponents development builds. Used for logging errors. */
+  _validation?: Promise<ReactNode>
+  _bypassCachesInDev?: ReactNode
+}
+
 async function renderToStream(
   requestStore: RequestStore,
   req: BaseNextRequest,
@@ -2423,18 +2426,13 @@ async function renderToStream(
       // We only have a Prerender environment for projects opted into cacheComponents
       cacheComponents
     ) {
-      type RSCPayloadWithValidation = InitialRSCPayload & {
-        /** Only available during cacheComponents development builds. Used for logging errors. */
-        _validation?: Promise<ReactNode>
-      }
-
       const [resolveValidation, validationOutlet] = createValidationOutlet()
       let debugChannel: DebugChannelPair | undefined
       const getPayload = async (
         // eslint-disable-next-line @typescript-eslint/no-shadow
         requestStore: RequestStore
-      ): Promise<RSCPayloadWithValidation> => {
-        const payload: RSCPayloadWithValidation =
+      ) => {
+        const payload: InitialRSCPayload & RSCPayloadDevProperties =
           await workUnitAsyncStorage.run(
             requestStore,
             getRSCPayload,
@@ -2447,6 +2445,15 @@ async function renderToStream(
         // because we're not going to wait for the stream to complete,
         // so leaving the validation unresolved is fine.
         payload._validation = validationOutlet
+
+        if (isBypassingCachesInDev(renderOpts, requestStore)) {
+          // Mark the RSC payload to indicate that caches were bypassed in dev.
+          // This lets the client know not to cache anything based on this render.
+          payload._bypassCachesInDev = createElement(WarnForBypassCachesInDev, {
+            route: workStore.route,
+          })
+        }
+
         return payload
       }
 
@@ -2476,7 +2483,9 @@ async function renderToStream(
       } else {
         // We're either bypassing caches or we can't restart the render.
         // Do a dynamic render, but with (basic) environment labels.
-        debugChannel = createDebugChannel && createDebugChannel()
+
+        debugChannel = setReactDebugChannel && createDebugChannel()
+
         const serverStream =
           await stagedRenderToReadableStreamWithoutCachesInDev(
             ctx,
@@ -2521,15 +2530,14 @@ async function renderToStream(
       )
     } else {
       // This is a dynamic render. We don't do dynamic tracking because we're not prerendering
-      const RSCPayload: RSCPayload & {
-        _bypassCachesInDev?: React.ReactNode
-      } = await workUnitAsyncStorage.run(
-        requestStore,
-        getRSCPayload,
-        tree,
-        ctx,
-        res.statusCode === 404
-      )
+      const RSCPayload: RSCPayload & RSCPayloadDevProperties =
+        await workUnitAsyncStorage.run(
+          requestStore,
+          getRSCPayload,
+          tree,
+          ctx,
+          res.statusCode === 404
+        )
 
       if (isBypassingCachesInDev(renderOpts, requestStore)) {
         // Mark the RSC payload to indicate that caches were bypassed in dev.