From a70a0df108804a32ec84e79ed4e2c4df834739b1 Mon Sep 17 00:00:00 2001
From: Jiachi Liu <inbox@huozhi.im>
Date: Tue, 12 Jul 2022 16:52:22 +0200
Subject: [PATCH] fix renderOpts.dev

---
 packages/next/client/app-index.tsx  |  4 ++--
 packages/next/client/dev/fouc.ts    |  1 -
 packages/next/server/app-render.tsx | 19 +++++++++++++------
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/packages/next/client/app-index.tsx b/packages/next/client/app-index.tsx
index 2e4c91251000b..74b0188408dcc 100644
--- a/packages/next/client/app-index.tsx
+++ b/packages/next/client/app-index.tsx
@@ -187,11 +187,11 @@ function createLoadFlightCssStream(callback?: () => Promise<void>) {
     },
   })
 
-  if (callback) {
+  if (process.env.NODE_ENV === 'development') {
     Promise.all(promises).then(() => {
       // TODO: find better timing for css injection
       setTimeout(() => {
-        callback()
+        callback?.()
       })
     })
   }
diff --git a/packages/next/client/dev/fouc.ts b/packages/next/client/dev/fouc.ts
index 2691c887d7de1..bca480e227192 100644
--- a/packages/next/client/dev/fouc.ts
+++ b/packages/next/client/dev/fouc.ts
@@ -6,7 +6,6 @@ const safeSetTimeout = (callback: () => void) => setTimeout(callback)
 // rendering won't have the correct computed values in effects.
 export function displayContent(): Promise<void> {
   return new Promise((resolve) => {
-    console.log('fouc')
     ;(window.requestAnimationFrame || safeSetTimeout)(function () {
       for (
         var x = document.querySelectorAll('[data-next-hide-fouc]'),
diff --git a/packages/next/server/app-render.tsx b/packages/next/server/app-render.tsx
index 38e7e525671ba..5da1b8e4255d6 100644
--- a/packages/next/server/app-render.tsx
+++ b/packages/next/server/app-render.tsx
@@ -177,7 +177,8 @@ function createServerComponentRenderer(
     transformStream: TransformStream<Uint8Array, Uint8Array>
     serverComponentManifest: NonNullable<RenderOpts['serverComponentManifest']>
     serverContexts: Array<[ServerContextName: string, JSONValue: any]>
-  }
+  },
+  dev: boolean
 ) {
   // We need to expose the `__webpack_require__` API globally for
   // react-server-dom-webpack. This is a hack until we find a better way.
@@ -191,7 +192,11 @@ function createServerComponentRenderer(
     globalThis.__next_chunk_load__ = () => Promise.resolve()
   }
 
-  const cssFlightData = getCssFlightData(ComponentMod, serverComponentManifest)
+  const cssFlightData = getCssFlightData(
+    ComponentMod,
+    serverComponentManifest,
+    dev
+  )
 
   let RSCStream: ReadableStream<Uint8Array>
   const createRSCStream = () => {
@@ -329,7 +334,7 @@ function getSegmentParam(segment: string): {
 function getCssFlightData(
   ComponentMod: any,
   serverComponentManifest: any,
-  dev?: boolean
+  dev: boolean
 ) {
   const importedServerCSSFiles: string[] =
     ComponentMod.__client__?.__next_rsc_css__ || []
@@ -370,6 +375,7 @@ export async function renderToHTML(
     runtime,
     ComponentMod,
   } = renderOpts
+  const dev = !!renderOpts.dev
 
   const isFlight = query.__flight__ !== undefined
 
@@ -769,7 +775,7 @@ export async function renderToHTML(
     const cssFlightData = getCssFlightData(
       ComponentMod,
       serverComponentManifest,
-      renderOpts.dev
+      dev
     )
     const flightData: FlightData = [
       // TODO: change walk to output without ''
@@ -848,7 +854,8 @@ export async function renderToHTML(
       transformStream: serverComponentsInlinedTransformStream,
       serverComponentManifest,
       serverContexts,
-    }
+    },
+    dev
   )
 
   const jsxStyleRegistry = createStyleRegistry()
@@ -898,7 +905,7 @@ export async function renderToHTML(
     }
 
     return await continueFromInitialStream(renderStream, {
-      dev: renderOpts.dev,
+      dev,
       suffix: '',
       dataStream: serverComponentsInlinedTransformStream?.readable,
       generateStaticHTML: generateStaticHTML || !hasConcurrentFeatures,