fixup! Turbopack: support config.turbopack and deprecate config.experimental.turbopack.

wbinnssmith · wbinnssmith · commit 845d7d97a591 · 2025-04-07T14:21:47.000-07:00
diff --git a/bench/heavy-npm-deps/next.config.mjs b/bench/heavy-npm-deps/next.config.mjs
@@ -7,9 +7,7 @@ const nextConfig = {
     ignoreBuildErrors: true,
   },
   experimental: {
-    turbo: {
-      unstablePersistentCaching: process.env.TURBO_CACHE === '1',
-    },
+    turbopackPersistentCaching: process.env.TURBO_CACHE === '1',
   },
 }
 
diff --git a/examples/with-react-native-web/next.config.js b/examples/with-react-native-web/next.config.js
@@ -1,24 +1,22 @@
 /** @type {import('next').NextConfig} */
 module.exports = {
-  experimental: {
-    turbo: {
-      resolveAlias: {
-        "react-native": "react-native-web",
-      },
-      resolveExtensions: [
-        ".web.js",
-        ".web.jsx",
-        ".web.ts",
-        ".web.tsx",
-        ".mdx",
-        ".tsx",
-        ".ts",
-        ".jsx",
-        ".js",
-        ".mjs",
-        ".json",
-      ],
+  turbopack: {
+    resolveAlias: {
+      "react-native": "react-native-web",
     },
+    resolveExtensions: [
+      ".web.js",
+      ".web.jsx",
+      ".web.ts",
+      ".web.tsx",
+      ".mdx",
+      ".tsx",
+      ".ts",
+      ".jsx",
+      ".js",
+      ".mjs",
+      ".json",
+    ],
   },
   webpack: (config) => {
     config.resolve.alias = {
diff --git a/examples/with-turbopack-loaders/next.config.js b/examples/with-turbopack-loaders/next.config.js
@@ -1,15 +1,13 @@
 module.exports = {
-  experimental: {
-    turbo: {
-      rules: {
-        "*.react.svg": {
-          loaders: ["@svgr/webpack"],
-          as: "*.js",
-        },
-        "*.styl": {
-          loaders: ["stylus-loader"],
-          as: "*.css",
-        },
+  turbopack: {
+    rules: {
+      "*.react.svg": {
+        loaders: ["@svgr/webpack"],
+        as: "*.js",
+      },
+      "*.styl": {
+        loaders: ["stylus-loader"],
+        as: "*.css",
       },
     },
   },
diff --git a/packages/next/src/build/swc/index.ts b/packages/next/src/build/swc/index.ts
@@ -786,24 +786,24 @@ function bindingToApi(
     if (reactCompilerOptions) {
       const ruleKeys = ['*.ts', '*.js', '*.jsx', '*.tsx']
       if (
-        Object.keys(nextConfig?.experimental?.turbo?.rules ?? []).some((key) =>
+        Object.keys(nextConfig?.turbopack?.rules ?? []).some((key) =>
           ruleKeys.includes(key)
         )
       ) {
         Log.warn(
-          `The React Compiler cannot be enabled automatically because 'experimental.turbo' contains a rule for '*.ts', '*.js', '*.jsx', and '*.tsx'. Remove this rule, or add 'babel-loader' and 'babel-plugin-react-compiler' to the Turbopack configuration manually.`
+          `The React Compiler cannot be enabled automatically because 'turbopack.rules' contains a rule for '*.ts', '*.js', '*.jsx', and '*.tsx'. Remove this rule, or add 'babel-loader' and 'babel-plugin-react-compiler' to the Turbopack configuration manually.`
         )
       } else {
-        if (!nextConfig.experimental.turbo) {
-          nextConfig.experimental.turbo = {}
+        if (!nextConfig.turbopack) {
+          nextConfig.turbopack = {}
         }
 
-        if (!nextConfig.experimental.turbo.rules) {
-          nextConfig.experimental.turbo.rules = {}
+        if (!nextConfig.turbopack.rules) {
+          nextConfig.turbopack.rules = {}
         }
 
         for (const key of ['*.ts', '*.js', '*.jsx', '*.tsx']) {
-          nextConfig.experimental.turbo.rules[key] = {
+          nextConfig.turbopack.rules[key] = {
             browser: {
               foreign: false,
               loaders: [
@@ -840,7 +840,7 @@ function bindingToApi(
 
     if (nextConfigSerializable.experimental?.turbo?.rules) {
       ensureLoadersHaveSerializableOptions(
-        nextConfigSerializable.experimental.turbo?.rules
+        nextConfigSerializable.turbopack?.rules
       )
     }
 
diff --git a/packages/next/src/build/turbopack-build/impl.ts b/packages/next/src/build/turbopack-build/impl.ts
@@ -54,8 +54,7 @@ export async function turbopackBuild(): Promise<{
   const project = await bindings.turbo.createProject(
     {
       projectPath: dir,
-      rootPath:
-        config.experimental?.turbo?.root || config.outputFileTracingRoot || dir,
+      rootPath: config.turbopack?.root || config.outputFileTracingRoot || dir,
       distDir,
       nextConfig: config,
       jsConfig: await getTurbopackJsConfig(dir, config),
@@ -83,7 +82,7 @@ export async function turbopackBuild(): Promise<{
     },
     {
       persistentCaching,
-      memoryLimit: config.experimental.turbo?.memoryLimit,
+      memoryLimit: config.turbopack?.memoryLimit,
       dependencyTracking: persistentCaching,
     }
   )
diff --git a/packages/next/src/lib/turbopack-warning.ts b/packages/next/src/lib/turbopack-warning.ts
@@ -144,7 +144,7 @@ export async function validateTurboNextConfig({
       if (key.startsWith('webpack') && rawNextConfig.webpack) {
         hasWebpackConfig = true
       }
-      if (key.startsWith('experimental.turbo')) {
+      if (key.startsWith('turbopack')) {
         hasTurboConfig = true
       }
 
diff --git a/packages/next/src/server/config.test.ts b/packages/next/src/server/config.test.ts
@@ -127,14 +127,12 @@ describe('loadConfig', () => {
         loadConfig('', __dirname, {
           customConfig: {
             experimental: {
-              turbo: {
-                unstablePersistentCaching: true,
-              },
+              turbopackPersistentCaching: true,
             },
           },
         })
       ).rejects.toThrow(
-        /The experimental feature "experimental.turbo.unstablePersistentCaching" can only be enabled when using the latest canary version of Next.js./
+        /The experimental feature "experimental.turbopackPersistentCaching" can only be enabled when using the latest canary version of Next.js./
       )
     })
   })
diff --git a/packages/next/src/server/config.ts b/packages/next/src/server/config.ts
@@ -655,14 +655,11 @@ function assignDefaults(
     }
   }
 
-  if (
-    result?.experimental?.turbo?.root &&
-    !isAbsolute(result.experimental.turbo.root)
-  ) {
-    result.experimental.turbo.root = resolve(result.experimental.turbo.root)
+  if (result?.turbopack?.root && !isAbsolute(result.turbopack.root)) {
+    result.turbopack.root = resolve(result.turbopack.root)
     if (!silent) {
       Log.warn(
-        `experimental.turbo.root should be absolute, using: ${result.experimental.turbo.root}`
+        `turbopack.root should be absolute, using: ${result.turbopack.root}`
       )
     }
   }
diff --git a/packages/next/src/server/dev/hot-reloader-turbopack.ts b/packages/next/src/server/dev/hot-reloader-turbopack.ts
@@ -209,7 +209,7 @@ export async function createHotReloaderTurbopack(
     {
       projectPath: projectPath,
       rootPath:
-        opts.nextConfig.experimental.turbo?.root ||
+        opts.nextConfig.turbopack?.root ||
         opts.nextConfig.outputFileTracingRoot ||
         projectPath,
       distDir,
@@ -240,7 +240,7 @@ export async function createHotReloaderTurbopack(
     },
     {
       persistentCaching: isPersistentCachingEnabled(opts.nextConfig),
-      memoryLimit: opts.nextConfig.experimental.turbo?.memoryLimit,
+      memoryLimit: opts.nextConfig.turbopack?.memoryLimit,
     }
   )
   setBundlerFindSourceMapImplementation(
diff --git a/packages/next/src/shared/lib/turbopack/utils.ts b/packages/next/src/shared/lib/turbopack/utils.ts
@@ -262,5 +262,5 @@ export function renderStyledStringToErrorAnsi(string: StyledString): string {
 export function isPersistentCachingEnabled(
   config: NextConfigComplete
 ): boolean {
-  return config.experimental.turbo?.unstablePersistentCaching || false
+  return config.experimental?.turbopackPersistentCaching || false
 }
diff --git a/test/e2e/app-dir/react-owner-stacks-svgr/next.config.js b/test/e2e/app-dir/react-owner-stacks-svgr/next.config.js
@@ -2,13 +2,11 @@
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      rules: {
-        '*.svg': {
-          loaders: ['@svgr/webpack'],
-          as: '*.js',
-        },
+  turbopack: {
+    rules: {
+      '*.svg': {
+        loaders: ['@svgr/webpack'],
+        as: '*.js',
       },
     },
   },
diff --git a/test/e2e/app-dir/resolve-extensions/next.config.js b/test/e2e/app-dir/resolve-extensions/next.config.js
@@ -4,10 +4,8 @@ const extensions = ['', '.png', '.tsx', '.ts', '.jsx', '.js', '.json']
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      resolveExtensions: [...extensions],
-    },
+  turbopack: {
+    resolveExtensions: [...extensions],
   },
   webpack(config) {
     config.resolve.extensions = [...extensions]
diff --git a/test/e2e/app-dir/scss/npm-import-tilde/npm-import-tilde.test.ts b/test/e2e/app-dir/scss/npm-import-tilde/npm-import-tilde.test.ts
@@ -3,12 +3,10 @@
 import { nextTestSetup } from 'e2e-utils'
 
 const nextConfig = {
-  experimental: {
-    turbo: {
-      resolveAlias: {
-        '/*': './*',
-        '~*': '*',
-      },
+  turbopack: {
+    resolveAlias: {
+      '/*': './*',
+      '~*': '*',
     },
   },
 }
diff --git a/test/e2e/app-dir/turbopack-loader-resource-query/next.config.js b/test/e2e/app-dir/turbopack-loader-resource-query/next.config.js
@@ -1,12 +1,10 @@
 /** @type {import('next').NextConfig} */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      rules: {
-        '*.mdx': {
-          loaders: ['test-loader.js'],
-          as: '*.js',
-        },
+  turbopack: {
+    rules: {
+      '*.mdx': {
+        loaders: ['test-loader.js'],
+        as: '*.js',
       },
     },
   },
diff --git a/test/e2e/app-dir/webpack-loader-conditions/next.config.js b/test/e2e/app-dir/webpack-loader-conditions/next.config.js
@@ -2,38 +2,36 @@
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      rules: {
-        '*.test-file.js': {
-          browser: {
-            foreign: {
-              loaders: [
-                {
-                  loader: require.resolve('./test-file-loader.js'),
-                  options: { browser: true, foreign: true },
-                },
-              ],
-            },
-            default: {
-              loaders: [
-                {
-                  loader: require.resolve('./test-file-loader.js'),
-                  options: { browser: true },
-                },
-              ],
-            },
+  turbopack: {
+    rules: {
+      '*.test-file.js': {
+        browser: {
+          foreign: {
+            loaders: [
+              {
+                loader: require.resolve('./test-file-loader.js'),
+                options: { browser: true, foreign: true },
+              },
+            ],
           },
-          foreign: false,
           default: {
             loaders: [
               {
                 loader: require.resolve('./test-file-loader.js'),
-                options: { default: true },
+                options: { browser: true },
               },
             ],
           },
         },
+        foreign: false,
+        default: {
+          loaders: [
+            {
+              loader: require.resolve('./test-file-loader.js'),
+              options: { default: true },
+            },
+          ],
+        },
       },
     },
   },
diff --git a/test/e2e/app-dir/webpack-loader-ts-transform/next.config.js b/test/e2e/app-dir/webpack-loader-ts-transform/next.config.js
@@ -2,11 +2,9 @@
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      rules: {
-        '*.test-file.ts': [require.resolve('./test-file-loader.js')],
-      },
+  turbopack: {
+    rules: {
+      '*.test-file.ts': [require.resolve('./test-file-loader.js')],
     },
   },
 }
diff --git a/test/e2e/esm-externals/next.config.js b/test/e2e/esm-externals/next.config.js
@@ -1,9 +1,7 @@
 module.exports = {
-  experimental: {
-    turbo: {
-      resolveAlias: {
-        'preact/compat': 'react',
-      },
+  turbopack: {
+    resolveAlias: {
+      'preact/compat': 'react',
     },
   },
   serverExternalPackages: [
diff --git a/test/e2e/persistent-caching/next.config.js b/test/e2e/persistent-caching/next.config.js
@@ -2,19 +2,19 @@
  * @type {import('next').NextConfig}
  */
 const nextConfig = {
-  experimental: {
-    turbo: {
-      unstablePersistentCaching: true,
-      rules: {
-        'app/page.tsx': {
-          loaders: ['./my-loader.js'],
-        },
-        'pages/pages.tsx': {
-          loaders: ['./my-loader.js'],
-        },
+  turbopack: {
+    rules: {
+      'app/page.tsx': {
+        loaders: ['./my-loader.js'],
+      },
+      'pages/pages.tsx': {
+        loaders: ['./my-loader.js'],
       },
     },
   },
+  experimental: {
+    turbopackPersistentCaching: true,
+  },
   webpack(config) {
     config.module.rules.push({
       test: /app\/page\.tsx|pages\/pages.tsx/,
diff --git a/test/integration/module-id-strategies/next.config.js b/test/integration/module-id-strategies/next.config.js
diff --git a/test/integration/telemetry/next.config.persistent-cache b/test/integration/telemetry/next.config.persistent-cache

Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,7 @@ export async function turbopackBuild(): Promise<{`
`54`	`54`	`const project = await bindings.turbo.createProject(`
`55`	`55`	`{`
`56`	`56`	`projectPath: dir,`
`57`		`- rootPath:`
`58`		`- config.experimental?.turbo?.root \|\| config.outputFileTracingRoot \|\| dir,`
	`57`	`+ rootPath: config.turbopack?.root \|\| config.outputFileTracingRoot \|\| dir,`
`59`	`58`	`distDir,`
`60`	`59`	`nextConfig: config,`
`61`	`60`	`jsConfig: await getTurbopackJsConfig(dir, config),`
`@@ -83,7 +82,7 @@ export async function turbopackBuild(): Promise<{`
`83`	`82`	`},`
`84`	`83`	`{`
`85`	`84`	`persistentCaching,`
`86`		`- memoryLimit: config.experimental.turbo?.memoryLimit,`
	`85`	`+ memoryLimit: config.turbopack?.memoryLimit,`
`87`	`86`	`dependencyTracking: persistentCaching,`
`88`	`87`	`}`
`89`	`88`	`)`
Original file line number	Diff line number	Diff line change
`@@ -144,7 +144,7 @@ export async function validateTurboNextConfig({`
`144`	`144`	`if (key.startsWith('webpack') && rawNextConfig.webpack) {`
`145`	`145`	`hasWebpackConfig = true`
`146`	`146`	`}`
`147`		`- if (key.startsWith('experimental.turbo')) {`
	`147`	`+ if (key.startsWith('turbopack')) {`
`148`	`148`	`hasTurboConfig = true`
`149`	`149`	`}`
`150`	`150`
Original file line number	Diff line number	Diff line change
`@@ -655,14 +655,11 @@ function assignDefaults(`
`655`	`655`	`}`
`656`	`656`	`}`
`657`	`657`
`658`		`- if (`
`659`		`- result?.experimental?.turbo?.root &&`
`660`		`- !isAbsolute(result.experimental.turbo.root)`
`661`		`- ) {`
`662`		`- result.experimental.turbo.root = resolve(result.experimental.turbo.root)`
	`658`	`+ if (result?.turbopack?.root && !isAbsolute(result.turbopack.root)) {`
	`659`	`+ result.turbopack.root = resolve(result.turbopack.root)`
`663`	`660`	`if (!silent) {`
`664`	`661`	`Log.warn(`
`665`		- `experimental.turbo.root should be absolute, using: ${result.experimental.turbo.root}`
	`662`	+ `turbopack.root should be absolute, using: ${result.turbopack.root}`
`666`	`663`	`)`
`667`	`664`	`}`
`668`	`665`	`}`
Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ export async function createHotReloaderTurbopack(`
`209`	`209`	`{`
`210`	`210`	`projectPath: projectPath,`
`211`	`211`	`rootPath:`
`212`		`- opts.nextConfig.experimental.turbo?.root \|\|`
	`212`	`+ opts.nextConfig.turbopack?.root \|\|`
`213`	`213`	`opts.nextConfig.outputFileTracingRoot \|\|`
`214`	`214`	`projectPath,`
`215`	`215`	`distDir,`
`@@ -240,7 +240,7 @@ export async function createHotReloaderTurbopack(`
`240`	`240`	`},`
`241`	`241`	`{`
`242`	`242`	`persistentCaching: isPersistentCachingEnabled(opts.nextConfig),`
`243`		`- memoryLimit: opts.nextConfig.experimental.turbo?.memoryLimit,`
	`243`	`+ memoryLimit: opts.nextConfig.turbopack?.memoryLimit,`
`244`	`244`	`}`
`245`	`245`	`)`
`246`	`246`	`setBundlerFindSourceMapImplementation(`
Original file line number	Diff line number	Diff line change
`@@ -262,5 +262,5 @@ export function renderStyledStringToErrorAnsi(string: StyledString): string {`
`262`	`262`	`export function isPersistentCachingEnabled(`
`263`	`263`	`config: NextConfigComplete`
`264`	`264`	`): boolean {`
`265`		`- return config.experimental.turbo?.unstablePersistentCaching \|\| false`
	`265`	`+ return config.experimental?.turbopackPersistentCaching \|\| false`
`266`	`266`	`}`