only assign env when using react 18

vercel · Apr 28, 2022 · ea77b1d · ea77b1d
1 parent d7ddc6a
commit ea77b1d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/packages/next/bin/next.ts b/packages/next/bin/next.ts
@@ -106,7 +106,9 @@ if (process.env.NODE_ENV) {
 
 ;(process.env as any).NODE_ENV = process.env.NODE_ENV || defaultEnv
 ;(process.env as any).NEXT_RUNTIME = 'nodejs'
-;(process.env as any).__NEXT_REACT_ROOT = shouldUseReactRoot
+if (shouldUseReactRoot) {
+  ;(process.env as any).__NEXT_REACT_ROOT = 'true'
+}
 
 // x-ref: https://github.com/vercel/next.js/pull/34688#issuecomment-1047994505
 if (process.versions.pnp === '3') {

diff --git a/packages/next/server/node-web-streams-helper.ts b/packages/next/server/node-web-streams-helper.ts
@@ -132,18 +132,18 @@ export function createFlushEffectStream(
   })
 }
 
-export async function renderToInitialStream({
+export function renderToInitialStream({
   ReactDOMServer,
   element,
 }: {
-  ReactDOMServer: typeof import('react-dom/server')
+  ReactDOMServer: any
   element: React.ReactElement
 }): Promise<
   ReadableStream<Uint8Array> & {
     allReady?: Promise<void>
   }
 > {
-  return await (ReactDOMServer as any).renderToReadableStream(element)
+  return ReactDOMServer.renderToReadableStream(element)
 }
 
 export async function continueFromInitialStream({