Revert "Turbopack build: Replace process.env.TURBOPACK usage (#77783)"

mischnic · mischnic · commit b8ff4c6e6fba · 2025-04-04T16:19:06.000-07:00
This reverts commit 1d685d4.
diff --git a/packages/next/next-runtime.webpack-config.js b/packages/next/next-runtime.webpack-config.js
@@ -229,7 +229,6 @@ module.exports = ({ dev, turbo, bundleType, experimental, ...rest }) => {
           experimental ? true : false
         ),
         'process.env.NEXT_RUNTIME': JSON.stringify('nodejs'),
-        'process.turbopack': JSON.stringify(turbo),
         'process.env.TURBOPACK': JSON.stringify(turbo),
       }),
       !!process.env.ANALYZE &&
diff --git a/packages/next/src/build/index.ts b/packages/next/src/build/index.ts
@@ -2275,6 +2275,7 @@ export default async function build(
 
                 // @ts-expect-error internal field TODO: fix this, should use a separate mechanism to pass the info.
                 isExperimentalCompile: isCompileMode,
+                isTurbopackBuild: isTurbopack,
               },
             },
             appDir: dir,
diff --git a/packages/next/src/cli/next-start.ts b/packages/next/src/cli/next-start.ts
@@ -33,6 +33,16 @@ const nextStart = async (options: NextStartOptions, directory?: string) => {
     printAndExit(getReservedPortExplanation(port), 1)
   }
 
+  const isTurbopack = Boolean(
+    options.turbo ||
+      options.turbopack ||
+      // TODO: Used for Testing in Next.js CI. Rename to something better like `NEXT_TEST_TURBOPACK`.
+      process.env.TURBOPACK
+  )
+  if (isTurbopack) {
+    process.env.TURBOPACK = '1'
+  }
+
   await startServer({
     dir,
     isDev: false,
diff --git a/packages/next/src/server/next-server.ts b/packages/next/src/server/next-server.ts
@@ -192,6 +192,20 @@ export default class NextNodeServer extends BaseServer<
     this.isDev = isDev
     this.sriEnabled = Boolean(options.conf.experimental?.sri?.algorithm)
 
+    // @ts-expect-error internal field not publicly exposed
+    const isTurbopackBuild = this.nextConfig.experimental?.isTurbopackBuild
+    if (!isDev && typeof isTurbopackBuild !== 'undefined') {
+      if (process.env.TURBOPACK && !isTurbopackBuild) {
+        throw new Error(
+          `Invariant: --turbopack is set but the build used Webpack`
+        )
+      } else if (!process.env.TURBOPACK && isTurbopackBuild) {
+        throw new Error(
+          `Invariant: --turbopack is not set but the build used Turbopack. Add --turbopack to "next start".`
+        )
+      }
+    }
+
     /**
      * This sets environment variable to be used at the time of SSR by head.tsx.
      * Using this from process.env allows targeting SSR by calling
diff --git a/packages/next/src/server/next.ts b/packages/next/src/server/next.ts
@@ -240,6 +240,9 @@ export class NextServer implements NextWrapperServer {
         // @ts-expect-error internal field
         config.experimental.isExperimentalCompile =
           serializedConfig.experimental.isExperimentalCompile
+        // @ts-expect-error internal field
+        config.experimental.isTurbopackBuild =
+          serializedConfig.experimental.isTurbopackBuild
       } catch (_) {
         // if distDir is customized we don't know until we
         // load the config so fallback to loading the config
diff --git a/test/production/app-dir/turbopack-build-marker/app/layout.tsx b/test/production/app-dir/turbopack-build-marker/app/layout.tsx
@@ -0,0 +1,8 @@
+import { ReactNode } from 'react'
+export default function Root({ children }: { children: ReactNode }) {
+  return (
+    <html>
+      <body>{children}</body>
+    </html>
+  )
+}
diff --git a/test/production/app-dir/turbopack-build-marker/app/page.tsx b/test/production/app-dir/turbopack-build-marker/app/page.tsx
@@ -0,0 +1,3 @@
+export default function Page() {
+  return <p>hello world</p>
+}
diff --git a/test/production/app-dir/turbopack-build-marker/next.config.js b/test/production/app-dir/turbopack-build-marker/next.config.js
@@ -0,0 +1,6 @@
+/**
+ * @type {import('next').NextConfig}
+ */
+const nextConfig = {}
+
+module.exports = nextConfig
diff --git a/test/production/app-dir/turbopack-build-marker/turbopack-build-marker.test.ts b/test/production/app-dir/turbopack-build-marker/turbopack-build-marker.test.ts
@@ -0,0 +1,15 @@
+import { nextTestSetup } from 'e2e-utils'
+describe('turbopack-build-marker', () => {
+  const { next } = nextTestSetup({
+    files: __dirname,
+  })
+
+  it('should have Turbopack build marker', async () => {
+    const requiredServerFilesManifest = await next.readJSON(
+      '.next/required-server-files.json'
+    )
+    expect(
+      requiredServerFilesManifest.config.experimental.isTurbopackBuild
+    ).toBe(!!process.env.TURBOPACK)
+  })
+})

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+export default function Page() {`
	`2`	`+ return <p>hello world</p>`
	`3`	`+}`