use env var

vercel · Apr 28, 2022 · 328b91e · 328b91e
1 parent acc2398
commit 328b91e
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 10 deletions.
diff --git a/packages/next/bin/next.ts b/packages/next/bin/next.ts
@@ -2,7 +2,6 @@
 import * as log from '../build/output/log'
 import arg from 'next/dist/compiled/arg/index.js'
 import { NON_STANDARD_NODE_ENV } from '../lib/constants'
-import { shouldUseReactRoot } from '../lib/react'
 ;['react', 'react-dom'].forEach((dependency) => {
   try {
     // When 'npm link' is used it checks the clone location. Not the project.
@@ -43,6 +42,10 @@ const args = arg(
   }
 )
 
+// Detect if react-dom is enabled streaming rendering mode
+const shouldUseReactRoot = !!require('react-dom/server.browser')
+  .renderToReadableStream
+
 // Version is inlined into the file using taskr build pipeline
 if (args['--version']) {
   console.log(`Next.js v${process.env.__NEXT_VERSION}`)

diff --git a/packages/next/build/index.ts b/packages/next/build/index.ts
@@ -1,3 +1,4 @@
+import type { webpack5 as webpack } from 'next/dist/compiled/webpack/webpack'
 import { loadEnvConfig } from '@next/env'
 import chalk from 'next/dist/compiled/chalk'
 import crypto from 'crypto'
@@ -109,9 +110,7 @@ import { NextConfigComplete } from '../server/config-shared'
 import isError, { NextError } from '../lib/is-error'
 import { TelemetryPlugin } from './webpack/plugins/telemetry-plugin'
 import { MiddlewareManifest } from './webpack/plugins/middleware-plugin'
-import type { webpack5 as webpack } from 'next/dist/compiled/webpack/webpack'
 import { recursiveCopy } from '../lib/recursive-copy'
-import { shouldUseReactRoot } from '../lib/react'
 import { recursiveReadDir } from '../lib/recursive-readdir'
 import { lockfilePatchPromise } from './swc'
 

diff --git a/packages/next/lib/react.ts b/packages/next/lib/react.ts
diff --git a/packages/next/server/config.ts b/packages/next/server/config.ts
@@ -20,7 +20,6 @@ import {
 } from '../shared/lib/image-config'
 import { loadEnvConfig } from '@next/env'
 import { hasNextSupport } from '../telemetry/ci-info'
-import { shouldUseReactRoot } from '../lib/react'
 
 export { DomainLocale, NextConfig, normalizeConfig } from './config-shared'
 
@@ -188,7 +187,7 @@ function assignDefaults(userConfig: { [key: string]: any }) {
     }
   }
 
-  const hasReactRoot = shouldUseReactRoot
+  const hasReactRoot = process.env.__NEXT_REACT_ROOT
   if (hasReactRoot) {
     // users might not have the `experimental` key in their config
     result.experimental = result.experimental || {}

diff --git a/packages/next/server/dev/hot-reloader.ts b/packages/next/server/dev/hot-reloader.ts
@@ -38,7 +38,6 @@ import { getProperError } from '../../lib/is-error'
 import ws from 'next/dist/compiled/ws'
 import { promises as fs } from 'fs'
 import { getPageRuntime } from '../../build/entries'
-import { shouldUseReactRoot } from '../../lib/react'
 
 const wsServer = new ws.Server({ noServer: true })
 
@@ -199,7 +198,7 @@ export default class HotReloader {
 
     this.config = config
     this.runtime = config.experimental.runtime
-    this.hasReactRoot = shouldUseReactRoot
+    this.hasReactRoot = !!process.env.__NEXT_REACT_ROOT
     this.hasServerComponents =
       this.hasReactRoot && !!config.experimental.serverComponents
     this.previewProps = previewProps