Commit 10f51e14 authored by Luke Sandberg's avatar Luke Sandberg Committed by Niklas Mischkulnig

Revert "Revert "Add a --webpack flag and default --turbopack to true (#84216)…"

This reverts commit dadfaa1b.
parent fe357ef2
...@@ -502,6 +502,7 @@ jobs: ...@@ -502,6 +502,7 @@ jobs:
export NEXT_TEST_MODE=start export NEXT_TEST_MODE=start
export NEXT_TEST_WASM=true export NEXT_TEST_WASM=true
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
test/production/pages-dir/production/test/index.test.ts \ test/production/pages-dir/production/test/index.test.ts \
test/e2e/streaming-ssr/index.test.ts test/e2e/streaming-ssr/index.test.ts
...@@ -711,7 +712,7 @@ jobs: ...@@ -711,7 +712,7 @@ jobs:
secrets: inherit secrets: inherit
test-dev: test-dev: # TODO: rename to include webpack
name: test dev name: test dev
needs: ['optimize-ci', 'changes', 'build-native', 'build-next'] needs: ['optimize-ci', 'changes', 'build-native', 'build-next']
if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }} if: ${{ needs.optimize-ci.outputs.skip == 'false' && needs.changes.outputs.docs-only == 'false' }}
...@@ -728,6 +729,7 @@ jobs: ...@@ -728,6 +729,7 @@ jobs:
uses: ./.github/workflows/build_reusable.yml uses: ./.github/workflows/build_reusable.yml
with: with:
afterBuild: | afterBuild: |
export IS_WEBPACK_TEST=1
export NEXT_TEST_MODE=dev export NEXT_TEST_MODE=dev
export NEXT_TEST_REACT_VERSION="${{ matrix.react }}" export NEXT_TEST_REACT_VERSION="${{ matrix.react }}"
...@@ -752,8 +754,10 @@ jobs: ...@@ -752,8 +754,10 @@ jobs:
uses: ./.github/workflows/build_reusable.yml uses: ./.github/workflows/build_reusable.yml
with: with:
# Should this be using turbopack? a variation?
afterBuild: | afterBuild: |
export NEXT_TEST_MODE=dev export NEXT_TEST_MODE=dev
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
test/e2e/app-dir/app/index.test.ts \ test/e2e/app-dir/app/index.test.ts \
...@@ -780,6 +784,7 @@ jobs: ...@@ -780,6 +784,7 @@ jobs:
with: with:
nodeVersion: 20.9.0 nodeVersion: 20.9.0
afterBuild: | afterBuild: |
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--concurrency 4 \ --concurrency 4 \
test/production/pages-dir/production/test/index.test.ts \ test/production/pages-dir/production/test/index.test.ts \
...@@ -808,6 +813,7 @@ jobs: ...@@ -808,6 +813,7 @@ jobs:
with: with:
afterBuild: | afterBuild: |
export NEXT_TEST_MODE=start export NEXT_TEST_MODE=start
export IS_WEBPACK_TEST=1
node run-tests.js --type production \ node run-tests.js --type production \
test/e2e/app-dir/app/index.test.ts \ test/e2e/app-dir/app/index.test.ts \
...@@ -836,6 +842,7 @@ jobs: ...@@ -836,6 +842,7 @@ jobs:
uses: ./.github/workflows/build_reusable.yml uses: ./.github/workflows/build_reusable.yml
with: with:
afterBuild: | afterBuild: |
export IS_WEBPACK_TEST=1
export NEXT_TEST_MODE=start export NEXT_TEST_MODE=start
export NEXT_TEST_REACT_VERSION="${{ matrix.react }}" export NEXT_TEST_REACT_VERSION="${{ matrix.react }}"
...@@ -875,6 +882,7 @@ jobs: ...@@ -875,6 +882,7 @@ jobs:
with: with:
nodeVersion: 20.9.0 nodeVersion: 20.9.0
afterBuild: | afterBuild: |
export IS_WEBPACK_TEST=1
export NEXT_TEST_REACT_VERSION="${{ matrix.react }}" export NEXT_TEST_REACT_VERSION="${{ matrix.react }}"
node run-tests.js \ node run-tests.js \
...@@ -896,6 +904,7 @@ jobs: ...@@ -896,6 +904,7 @@ jobs:
# these all run without concurrency because they're heavier # these all run without concurrency because they're heavier
export TEST_CONCURRENCY=1 export TEST_CONCURRENCY=1
export IS_WEBPACK_TEST=1
BROWSER_NAME=firefox node run-tests.js \ BROWSER_NAME=firefox node run-tests.js \
test/production/pages-dir/production/test/index.test.ts test/production/pages-dir/production/test/index.test.ts
...@@ -923,6 +932,7 @@ jobs: ...@@ -923,6 +932,7 @@ jobs:
afterBuild: | afterBuild: |
export __NEXT_EXPERIMENTAL_PPR=true export __NEXT_EXPERIMENTAL_PPR=true
export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json"
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
...@@ -945,6 +955,7 @@ jobs: ...@@ -945,6 +955,7 @@ jobs:
export __NEXT_EXPERIMENTAL_PPR=true export __NEXT_EXPERIMENTAL_PPR=true
export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json"
export NEXT_TEST_MODE=dev export NEXT_TEST_MODE=dev
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
...@@ -968,6 +979,7 @@ jobs: ...@@ -968,6 +979,7 @@ jobs:
export __NEXT_EXPERIMENTAL_PPR=true export __NEXT_EXPERIMENTAL_PPR=true
export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/ppr-tests-manifest.json"
export NEXT_TEST_MODE=start export NEXT_TEST_MODE=start
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
...@@ -990,6 +1002,7 @@ jobs: ...@@ -990,6 +1002,7 @@ jobs:
export __NEXT_EXPERIMENTAL_PPR=true # for compatibility with the existing tests export __NEXT_EXPERIMENTAL_PPR=true # for compatibility with the existing tests
export __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true export __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true
export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json"
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
...@@ -1014,6 +1027,7 @@ jobs: ...@@ -1014,6 +1027,7 @@ jobs:
export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json"
export NEXT_TEST_MODE=dev export NEXT_TEST_MODE=dev
export __NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD=true export __NEXT_EXPERIMENTAL_ISOLATED_DEV_BUILD=true
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
...@@ -1038,6 +1052,7 @@ jobs: ...@@ -1038,6 +1052,7 @@ jobs:
export __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true export __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true
export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json" export NEXT_EXTERNAL_TESTS_FILTERS="test/experimental-tests-manifest.json"
export NEXT_TEST_MODE=start export NEXT_TEST_MODE=start
export IS_WEBPACK_TEST=1
node run-tests.js \ node run-tests.js \
--timings \ --timings \
......
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
"private": true, "private": true,
"scripts": { "scripts": {
"dev-turbopack": "next dev --turbopack", "dev-turbopack": "next dev --turbopack",
"dev-webpack": "next dev", "dev-webpack": "next dev --webpack",
"build-turbopack": "next build --turbopack", "build-turbopack": "next build --turbopack",
"build-webpack": "next build", "build-webpack": "next build --webpack",
"start-turbopack": "next start", "start-turbopack": "next start",
"start-webpack": "next start", "start-webpack": "next start",
"build-application": "next build", "build-application": "next build",
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
"scripts": { "scripts": {
"prepare-bench": "node scripts/prepare-bench.mjs", "prepare-bench": "node scripts/prepare-bench.mjs",
"benchmark": "node scripts/benchmark-runner.mjs", "benchmark": "node scripts/benchmark-runner.mjs",
"dev-webpack": "next dev", "dev-webpack": "next dev --webpack",
"dev-turbopack": "next dev --turbo", "dev-turbopack": "next dev --turbopack",
"build-webpack": "next build", "build-webpack": "next build --webpack",
"build-turbopack": "next build --turbo", "build-turbopack": "next build --turbopack",
"start": "next start" "start": "next start"
}, },
"devDependencies": { "devDependencies": {
......
...@@ -17,29 +17,49 @@ ...@@ -17,29 +17,49 @@
"ci:publish": "tsx ./scripts/release/publish-npm.ts", "ci:publish": "tsx ./scripts/release/publish-npm.ts",
"test-types": "tsc", "test-types": "tsc",
"test-unit": "jest test/unit/ packages/next/ packages/font", "test-unit": "jest test/unit/ packages/next/ packages/font",
"test-dev": "cross-env NEXT_TEST_MODE=dev pnpm testheadless", "test-dev-inner": "cross-env NEXT_TEST_MODE=dev pnpm testheadless",
"test-dev-experimental": "cross-env NEXT_TEST_MODE=dev pnpm run with-experimental pnpm testheadless", "test-dev": "pnpm run test-dev-webpack",
"test-dev-rspack": "pnpm run with-rspack pnpm run test-dev", "test-dev-webpack": "pnpm run with-webpack pnpm test-dev-inner",
"test-dev-experimental-rspack": "pnpm run with-rspack pnpm run test-dev-experimental", "test-dev-experimental-inner": "pnpm run with-experimental pnpm test-dev-inner",
"test-dev-turbo": "cross-env NEXT_TEST_MODE=dev IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm testheadless", "test-dev-experimental": "pnpm run test-dev-experimental-webpack",
"test-dev-experimental-turbo": "cross-env NEXT_TEST_MODE=dev IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm run with-experimental pnpm testheadless", "test-dev-experimental-webpack": "pnpm run with-webpack pnpm test-dev-experimental-inner",
"test-start": "cross-env NEXT_TEST_MODE=start pnpm testheadless", "test-dev-rspack": "pnpm run with-rspack pnpm run test-dev-inner",
"test-start-experimental": "cross-env NEXT_TEST_MODE=start pnpm run with-experimental pnpm testheadless", "test-dev-experimental-rspack": "pnpm run with-rspack pnpm run test-dev-experimental-inner",
"test-start-rspack": "pnpm run with-rspack pnpm run test-start", "test-dev-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm test-dev-inner",
"test-start-experimental-rspack": "pnpm run with-rspack pnpm run test-start-experimental", "test-dev-experimental-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm run with-experimental pnpm test-dev-inner",
"test-start-turbo": "cross-env NEXT_TEST_MODE=start IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm testheadless", "test-start-inner": "cross-env NEXT_TEST_MODE=start pnpm testheadless",
"test-start-experimental-turbo": "cross-env NEXT_TEST_MODE=start IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm run with-experimental pnpm testheadless", "test-start": "pnpm run test-start-webpack",
"test-deploy": "cross-env NEXT_TEST_MODE=deploy pnpm testheadless", "test-start-webpack": "pnpm run with-webpack pnpm run test-start-inner",
"testonly-dev": "cross-env NEXT_TEST_MODE=dev pnpm testonly", "test-start-experimental-inner": "pnpm run with-experimental pnpm test-start-inner",
"testonly-dev-rspack": "pnpm run with-rspack pnpm run testonly-dev", "test-start-experimental": "pnpm run test-start-experimental-webpack",
"testonly-dev-turbo": "cross-env NEXT_TEST_MODE=dev IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm testonly", "test-start-experimental-webpack": "pnpm run with-webpack pnpm run test-start-experimental-inner",
"testonly-start": "cross-env NEXT_TEST_MODE=start pnpm testonly", "test-start-rspack": "pnpm run with-rspack pnpm run test-start-inner",
"testonly-start-rspack": "pnpm run with-rspack pnpm run testonly-start", "test-start-experimental-rspack": "pnpm run with-rspack pnpm run test-start-experimental-inner",
"testonly-start-turbo": "cross-env NEXT_TEST_MODE=start IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm testonly", "test-start-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm test-start-inner",
"testonly-deploy": "cross-env NEXT_TEST_MODE=deploy pnpm testonly", "test-start-experimental-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm run with-experimental pnpm test-start-experimental-inner",
"test": "pnpm testheadless", "test-deploy-inner": "cross-env NEXT_TEST_MODE=deploy pnpm testheadless",
"test-rspack": "pnpm run with-rspack pnpm run test", "test-deploy": "pnpm run test-deploy-webpack",
"test-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 TURBOPACK_BUILD=1 pnpm testheadless", "test-deploy-webpack": "pnpm run with-webpack pnpm test-deploy-inner",
"test-deploy-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm test-deploy-inner",
"testonly-dev-inner": "cross-env NEXT_TEST_MODE=dev pnpm testonly",
"testonly-dev": "pnpm run testonly-dev-webpack",
"testonly-dev-webpack": "pnpm run with-webpack pnpm run testonly-dev-inner",
"testonly-dev-rspack": "pnpm run with-rspack pnpm run testonly-dev-inner",
"testonly-dev-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 pnpm testonly-dev-inner",
"testonly-start-inner": "cross-env NEXT_TEST_MODE=start pnpm testonly",
"testonly-start": "pnpm run testonly-start-webpack",
"testonly-start-webpack": "pnpm run with-webpack pnpm run testonly-start-inner",
"testonly-start-rspack": "pnpm run with-rspack pnpm run testonly-start-inner",
"testonly-start-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm testonly-start-inner",
"testonly-deploy-inner": "cross-env NEXT_TEST_MODE=deploy pnpm testonly",
"testonly-deploy": "pnpm run testonly-deploy-webpack",
"testonly-deploy-webpack": "pnpm run with-webpack pnpm run testonly-deploy-inner",
"testonly-deploy-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_BUILD=1 pnpm testonly-deploy-inner",
"test-inner": "pnpm testheadless",
"test": "pnpm test-webpack",
"test-webpack": "pnpm run with-webpack pnpm run test-inner",
"test-rspack": "pnpm run with-rspack pnpm run test-inner",
"test-turbo": "cross-env IS_TURBOPACK_TEST=1 TURBOPACK_DEV=1 TURBOPACK_BUILD=1 pnpm test-inner",
"testonly": "jest --runInBand", "testonly": "jest --runInBand",
"testheadless": "cross-env HEADLESS=true pnpm testonly", "testheadless": "cross-env HEADLESS=true pnpm testonly",
"genstats": "cross-env LOCAL_STATS=true node .github/actions/next-stats-action/src/index.js", "genstats": "cross-env LOCAL_STATS=true node .github/actions/next-stats-action/src/index.js",
...@@ -89,6 +109,7 @@ ...@@ -89,6 +109,7 @@
"build-storybook": "turbo run build-storybook", "build-storybook": "turbo run build-storybook",
"test-storybook": "turbo run test-storybook", "test-storybook": "turbo run test-storybook",
"with-rspack": "cross-env NEXT_RSPACK=1 NEXT_TEST_USE_RSPACK=1", "with-rspack": "cross-env NEXT_RSPACK=1 NEXT_TEST_USE_RSPACK=1",
"with-webpack": "cross-env IS_WEBPACK_TEST=1",
"with-experimental": "cross-env __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true __NEXT_EXPERIMENTAL_PPR=true" "with-experimental": "cross-env __NEXT_EXPERIMENTAL_CACHE_COMPONENTS=true __NEXT_EXPERIMENTAL_PPR=true"
}, },
"devDependencies": { "devDependencies": {
......
module.exports = function withRspack(config) { module.exports = function withRspack(config) {
process.env.NEXT_RSPACK = 'true' process.env.NEXT_RSPACK = 'true'
process.env.RSPACK_CONFIG_VALIDATE = 'loose-silent' process.env.RSPACK_CONFIG_VALIDATE = 'loose-silent'
if (process.env.TURBOPACK === 'auto') {
// If next has defaulted to turbopack, override it.
delete process.env.TURBOPACK
} else if (process.env.TURBOPACK) {
console.error('Cannot call withRspack and pass the --turbopack flag.')
console.error('Please configure only one bundler.')
process.exit(1)
}
return config return config
} }
...@@ -133,8 +133,9 @@ program ...@@ -133,8 +133,9 @@ program
.option('--no-mangling', 'Disables mangling.') .option('--no-mangling', 'Disables mangling.')
.option('--profile', 'Enables production profiling for React.') .option('--profile', 'Enables production profiling for React.')
.option('--experimental-app-only', 'Builds only App Router routes.') .option('--experimental-app-only', 'Builds only App Router routes.')
.option('--turbo', 'Starts development mode using Turbopack.') .option('--turbo', 'Builds using Turbopack.')
.option('--turbopack', 'Starts development mode using Turbopack.') .option('--turbopack', 'Builds using Turbopack.')
.option('--webpack', 'Builds using webpack.')
.addOption( .addOption(
new Option( new Option(
'--experimental-build-mode [mode]', '--experimental-build-mode [mode]',
...@@ -173,6 +174,7 @@ program ...@@ -173,6 +174,7 @@ program
) )
.option('--turbo', 'Starts development mode using Turbopack.') .option('--turbo', 'Starts development mode using Turbopack.')
.option('--turbopack', 'Starts development mode using Turbopack.') .option('--turbopack', 'Starts development mode using Turbopack.')
.option('--webpack', 'Starts development mode using webpack.')
.addOption( .addOption(
new Option( new Option(
'-p, --port <port>', '-p, --port <port>',
......
...@@ -83,6 +83,7 @@ import { ...@@ -83,6 +83,7 @@ import {
UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY, UNDERSCORE_GLOBAL_ERROR_ROUTE_ENTRY,
} from '../shared/lib/entry-constants' } from '../shared/lib/entry-constants'
import { isDynamicRoute } from '../shared/lib/router/utils' import { isDynamicRoute } from '../shared/lib/router/utils'
import { Bundler, finalizeBundlerFromConfig } from '../lib/bundler'
import type { __ApiPreviewProps } from '../server/api-utils' import type { __ApiPreviewProps } from '../server/api-utils'
import loadConfig from '../server/config' import loadConfig from '../server/config'
import type { BuildManifest } from '../server/get-page-files' import type { BuildManifest } from '../server/get-page-files'
...@@ -901,7 +902,7 @@ export default async function build( ...@@ -901,7 +902,7 @@ export default async function build(
runLint = true, runLint = true,
noMangling = false, noMangling = false,
appDirOnly = false, appDirOnly = false,
isTurbopack = false, bundler = Bundler.Turbopack,
experimentalBuildMode: 'default' | 'compile' | 'generate' | 'generate-env', experimentalBuildMode: 'default' | 'compile' | 'generate' | 'generate-env',
traceUploadUrl: string | undefined traceUploadUrl: string | undefined
): Promise<void> { ): Promise<void> {
...@@ -914,7 +915,6 @@ export default async function build( ...@@ -914,7 +915,6 @@ export default async function build(
try { try {
const nextBuildSpan = trace('next-build', undefined, { const nextBuildSpan = trace('next-build', undefined, {
buildMode: experimentalBuildMode, buildMode: experimentalBuildMode,
isTurboBuild: String(isTurbopack),
version: process.env.__NEXT_VERSION as string, version: process.env.__NEXT_VERSION as string,
}) })
...@@ -949,6 +949,10 @@ export default async function build( ...@@ -949,6 +949,10 @@ export default async function build(
) )
loadedConfig = config loadedConfig = config
// Reading the config can modify environment variables that influence the bundler selection.
bundler = finalizeBundlerFromConfig(bundler)
nextBuildSpan.setAttribute('bundler', getBundlerForTelemetry(bundler))
process.env.NEXT_DEPLOYMENT_ID = config.deploymentId || '' process.env.NEXT_DEPLOYMENT_ID = config.deploymentId || ''
NextBuildContext.config = config NextBuildContext.config = config
...@@ -971,7 +975,7 @@ export default async function build( ...@@ -971,7 +975,7 @@ export default async function build(
NextBuildContext.buildId = buildId NextBuildContext.buildId = buildId
if (experimentalBuildMode === 'generate-env') { if (experimentalBuildMode === 'generate-env') {
if (isTurbopack) { if (bundler === Bundler.Turbopack) {
Log.warn('generate-env is not needed with turbopack') Log.warn('generate-env is not needed with turbopack')
process.exit(0) process.exit(0)
} }
...@@ -1398,7 +1402,7 @@ export default async function build( ...@@ -1398,7 +1402,7 @@ export default async function build(
}) })
// Turbopack already handles conflicting app and page routes. // Turbopack already handles conflicting app and page routes.
if (!isTurbopack) { if (bundler !== Bundler.Turbopack) {
const numConflictingAppPaths = conflictingAppPagePaths.length const numConflictingAppPaths = conflictingAppPagePaths.length
if (mappedAppPages && numConflictingAppPaths > 0) { if (mappedAppPages && numConflictingAppPaths > 0) {
Log.error( Log.error(
...@@ -1681,7 +1685,7 @@ export default async function build( ...@@ -1681,7 +1685,7 @@ export default async function build(
let shutdownPromise = Promise.resolve() let shutdownPromise = Promise.resolve()
if (!isGenerateMode) { if (!isGenerateMode) {
if (isTurbopack) { if (bundler === Bundler.Turbopack) {
const { const {
duration: compilerDuration, duration: compilerDuration,
shutdownPromise: p, shutdownPromise: p,
...@@ -1796,7 +1800,7 @@ export default async function build( ...@@ -1796,7 +1800,7 @@ export default async function build(
telemetry.record( telemetry.record(
eventBuildCompleted(pagesPaths, { eventBuildCompleted(pagesPaths, {
bundler: getBundlerForTelemetry(isTurbopack), bundler: getBundlerForTelemetry(bundler),
durationInSeconds, durationInSeconds,
totalAppPagesCount, totalAppPagesCount,
}) })
...@@ -1812,7 +1816,7 @@ export default async function build( ...@@ -1812,7 +1816,7 @@ export default async function build(
telemetry.record( telemetry.record(
eventBuildCompleted(pagesPaths, { eventBuildCompleted(pagesPaths, {
bundler: getBundlerForTelemetry(isTurbopack), bundler: getBundlerForTelemetry(bundler),
durationInSeconds: compilerDuration, durationInSeconds: compilerDuration,
totalAppPagesCount, totalAppPagesCount,
}) })
...@@ -2450,7 +2454,10 @@ export default async function build( ...@@ -2450,7 +2454,10 @@ export default async function build(
) )
// If there's edge routes, append the edge instrumentation hook // If there's edge routes, append the edge instrumentation hook
// Turbopack generates this chunk with a hashed name and references it in middleware-manifest. // Turbopack generates this chunk with a hashed name and references it in middleware-manifest.
if (!isTurbopack && (edgeRuntimeAppCount || edgeRuntimePagesCount)) { if (
bundler !== Bundler.Turbopack &&
(edgeRuntimeAppCount || edgeRuntimePagesCount)
) {
instrumentationHookEntryFiles.push( instrumentationHookEntryFiles.push(
path.join( path.join(
SERVER_DIRECTORY, SERVER_DIRECTORY,
...@@ -2503,7 +2510,7 @@ export default async function build( ...@@ -2503,7 +2510,7 @@ export default async function build(
path.join(SERVER_DIRECTORY, FUNCTIONS_CONFIG_MANIFEST), path.join(SERVER_DIRECTORY, FUNCTIONS_CONFIG_MANIFEST),
path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST), path.join(SERVER_DIRECTORY, MIDDLEWARE_MANIFEST),
path.join(SERVER_DIRECTORY, MIDDLEWARE_BUILD_MANIFEST + '.js'), path.join(SERVER_DIRECTORY, MIDDLEWARE_BUILD_MANIFEST + '.js'),
...(!isTurbopack ...(bundler !== Bundler.Turbopack
? [ ? [
path.join( path.join(
SERVER_DIRECTORY, SERVER_DIRECTORY,
...@@ -2538,7 +2545,7 @@ export default async function build( ...@@ -2538,7 +2545,7 @@ export default async function build(
), ),
] ]
: []), : []),
...(pagesDir && !isTurbopack ...(pagesDir && bundler !== Bundler.Turbopack
? [ ? [
DYNAMIC_CSS_MANIFEST + '.json', DYNAMIC_CSS_MANIFEST + '.json',
path.join(SERVER_DIRECTORY, DYNAMIC_CSS_MANIFEST + '.js'), path.join(SERVER_DIRECTORY, DYNAMIC_CSS_MANIFEST + '.js'),
...@@ -2606,7 +2613,7 @@ export default async function build( ...@@ -2606,7 +2613,7 @@ export default async function build(
], ],
} }
if (isTurbopack) { if (bundler === Bundler.Turbopack) {
await writeManifest( await writeManifest(
path.join( path.join(
distDir, distDir,
...@@ -2622,7 +2629,11 @@ export default async function build( ...@@ -2622,7 +2629,11 @@ export default async function build(
await writeFunctionsConfigManifest(distDir, functionsConfigManifest) await writeFunctionsConfigManifest(distDir, functionsConfigManifest)
if (!isTurbopack && !isGenerateMode && !buildTracesPromise) { if (
bundler !== Bundler.Turbopack &&
!isGenerateMode &&
!buildTracesPromise
) {
buildTracesPromise = nextBuildSpan buildTracesPromise = nextBuildSpan
.traceChild('collect-build-traces') .traceChild('collect-build-traces')
.traceAsyncFn(() => { .traceAsyncFn(() => {
...@@ -2764,7 +2775,7 @@ export default async function build( ...@@ -2764,7 +2775,7 @@ export default async function build(
// we don't need to inline for turbopack build as // we don't need to inline for turbopack build as
// it will handle it's own caching separate of compile // it will handle it's own caching separate of compile
if (isGenerateMode && !isTurbopack) { if (isGenerateMode && bundler !== Bundler.Turbopack) {
Log.info('Inlining static env ...') Log.info('Inlining static env ...')
await nextBuildSpan await nextBuildSpan
...@@ -4200,7 +4211,7 @@ export default async function build( ...@@ -4200,7 +4211,7 @@ export default async function build(
if (telemetry) { if (telemetry) {
telemetry.record( telemetry.record(
eventBuildFailed({ eventBuildFailed({
bundler: getBundlerForTelemetry(isTurbopack), bundler: getBundlerForTelemetry(bundler),
errorCode: getErrorCodeForTelemetry(e), errorCode: getErrorCodeForTelemetry(e),
durationInSeconds: Math.floor((Date.now() - buildStartTime) / 1000), durationInSeconds: Math.floor((Date.now() - buildStartTime) / 1000),
}) })
...@@ -4221,7 +4232,7 @@ export default async function build( ...@@ -4221,7 +4232,7 @@ export default async function build(
mode: 'build', mode: 'build',
projectDir: dir, projectDir: dir,
distDir: loadedConfig.distDir, distDir: loadedConfig.distDir,
isTurboSession: isTurbopack, isTurboSession: bundler === Bundler.Turbopack,
sync: true, sync: true,
}) })
} }
...@@ -4235,16 +4246,17 @@ function errorFromUnsupportedSegmentConfig(): never { ...@@ -4235,16 +4246,17 @@ function errorFromUnsupportedSegmentConfig(): never {
process.exit(1) process.exit(1)
} }
function getBundlerForTelemetry(isTurbopack: boolean) { function getBundlerForTelemetry(bundler: Bundler) {
if (isTurbopack) { switch (bundler) {
return 'turbopack' case Bundler.Turbopack:
return 'turbopack'
case Bundler.Rspack:
return 'rspack'
case Bundler.Webpack:
return 'webpack'
default:
throw new Error(`unknown bundler: ${bundler}`)
} }
if (process.env.NEXT_RSPACK) {
return 'rspack'
}
return 'webpack'
} }
function getErrorCodeForTelemetry(err: unknown) { function getErrorCodeForTelemetry(err: unknown) {
......
...@@ -10,6 +10,7 @@ import isError from '../lib/is-error' ...@@ -10,6 +10,7 @@ import isError from '../lib/is-error'
import { getProjectDir } from '../lib/get-project-dir' import { getProjectDir } from '../lib/get-project-dir'
import { enableMemoryDebuggingMode } from '../lib/memory/startup' import { enableMemoryDebuggingMode } from '../lib/memory/startup'
import { disableMemoryDebuggingMode } from '../lib/memory/shutdown' import { disableMemoryDebuggingMode } from '../lib/memory/shutdown'
import { parseBundlerArgs } from '../lib/bundler'
export type NextBuildOptions = { export type NextBuildOptions = {
debug?: boolean debug?: boolean
...@@ -19,6 +20,7 @@ export type NextBuildOptions = { ...@@ -19,6 +20,7 @@ export type NextBuildOptions = {
mangling: boolean mangling: boolean
turbo?: boolean turbo?: boolean
turbopack?: boolean turbopack?: boolean
webpack?: boolean
experimentalDebugMemoryUsage: boolean experimentalDebugMemoryUsage: boolean
experimentalAppOnly?: boolean experimentalAppOnly?: boolean
experimentalTurbo?: boolean experimentalTurbo?: boolean
...@@ -82,12 +84,7 @@ const nextBuild = (options: NextBuildOptions, directory?: string) => { ...@@ -82,12 +84,7 @@ const nextBuild = (options: NextBuildOptions, directory?: string) => {
printAndExit(`> No such directory exists as the project root: ${dir}`) printAndExit(`> No such directory exists as the project root: ${dir}`)
} }
const isTurbopack = Boolean( const bundler = parseBundlerArgs(options)
options.turbo || options.turbopack || process.env.IS_TURBOPACK_TEST
)
if (isTurbopack) {
process.env.TURBOPACK = '1'
}
return build( return build(
dir, dir,
...@@ -97,7 +94,7 @@ const nextBuild = (options: NextBuildOptions, directory?: string) => { ...@@ -97,7 +94,7 @@ const nextBuild = (options: NextBuildOptions, directory?: string) => {
lint, lint,
!mangling, !mangling,
experimentalAppOnly, experimentalAppOnly,
isTurbopack, bundler,
experimentalBuildMode, experimentalBuildMode,
traceUploadUrl traceUploadUrl
) )
......
...@@ -38,11 +38,17 @@ import { once } from 'node:events' ...@@ -38,11 +38,17 @@ import { once } from 'node:events'
import { clearTimeout } from 'timers' import { clearTimeout } from 'timers'
import { flushAllTraces, trace } from '../trace' import { flushAllTraces, trace } from '../trace'
import { traceId } from '../trace/shared' import { traceId } from '../trace/shared'
import {
Bundler,
finalizeBundlerFromConfig,
parseBundlerArgs,
} from '../lib/bundler'
export type NextDevOptions = { export type NextDevOptions = {
disableSourceMaps: boolean disableSourceMaps: boolean
turbo?: boolean turbo?: boolean
turbopack?: boolean turbopack?: boolean
webpack?: boolean
port: number port: number
hostname?: string hostname?: string
experimentalHttps?: boolean experimentalHttps?: boolean
...@@ -58,11 +64,11 @@ let dir: string ...@@ -58,11 +64,11 @@ let dir: string
let child: undefined | ChildProcess let child: undefined | ChildProcess
// The config in next-dev is only used to access config.distDir for telemetry and trace. // The config in next-dev is only used to access config.distDir for telemetry and trace.
let config: NextConfigComplete let config: NextConfigComplete
let isTurboSession = false let bundler: Bundler
let traceUploadUrl: string let traceUploadUrl: string
let sessionStopHandled = false let sessionStopHandled = false
let sessionStarted = Date.now() const sessionStarted = Date.now()
let sessionSpan = trace('next-dev') const sessionSpan = trace('next-dev')
// How long should we wait for the child to cleanly exit after sending // How long should we wait for the child to cleanly exit after sending
// SIGINT/SIGTERM to the child process before sending SIGKILL? // SIGINT/SIGTERM to the child process before sending SIGKILL?
...@@ -123,11 +129,13 @@ const handleSessionStop = async (signal: NodeJS.Signals | number | null) => { ...@@ -123,11 +129,13 @@ const handleSessionStop = async (signal: NodeJS.Signals | number | null) => {
new Telemetry({ new Telemetry({
distDir: path.join(dir, config.distDir), distDir: path.join(dir, config.distDir),
}) })
// Reading the config can modify environment variables that influence the bundler selection.
bundler = finalizeBundlerFromConfig(bundler)
telemetry.record( telemetry.record(
eventCliSessionStopped({ eventCliSessionStopped({
cliCommand: 'dev', cliCommand: 'dev',
turboFlag: isTurboSession, turboFlag: bundler === Bundler.Turbopack,
durationMilliseconds: Date.now() - sessionStarted, durationMilliseconds: Date.now() - sessionStarted,
pagesDir, pagesDir,
appDir, appDir,
...@@ -146,7 +154,7 @@ const handleSessionStop = async (signal: NodeJS.Signals | number | null) => { ...@@ -146,7 +154,7 @@ const handleSessionStop = async (signal: NodeJS.Signals | number | null) => {
mode: 'dev', mode: 'dev',
projectDir: dir, projectDir: dir,
distDir: config.distDir, distDir: config.distDir,
isTurboSession, isTurboSession: bundler === Bundler.Turbopack,
}) })
} }
...@@ -168,14 +176,7 @@ const nextDev = async ( ...@@ -168,14 +176,7 @@ const nextDev = async (
portSource: PortSource, portSource: PortSource,
directory?: string directory?: string
) => { ) => {
const isTurbopack = Boolean( bundler = parseBundlerArgs(options)
options.turbo || options.turbopack || process.env.IS_TURBOPACK_TEST
)
if (isTurbopack) {
process.env.TURBOPACK = '1'
}
isTurboSession = isTurbopack
dir = getProjectDir(process.env.NEXT_PRIVATE_DEV_DIR || directory) dir = getProjectDir(process.env.NEXT_PRIVATE_DEV_DIR || directory)
...@@ -288,7 +289,9 @@ const nextDev = async ( ...@@ -288,7 +289,9 @@ const nextDev = async (
stdio: 'inherit', stdio: 'inherit',
env: { env: {
...defaultEnv, ...defaultEnv,
...(isTurbopack ? { TURBOPACK: '1' } : undefined), ...(bundler === Bundler.Turbopack
? { TURBOPACK: process.env.TURBOPACK }
: undefined),
NEXT_PRIVATE_WORKER: '1', NEXT_PRIVATE_WORKER: '1',
NEXT_PRIVATE_TRACE_ID: traceId, NEXT_PRIVATE_TRACE_ID: traceId,
NODE_EXTRA_CA_CERTS: startServerOptions.selfSignedCertificate NODE_EXTRA_CA_CERTS: startServerOptions.selfSignedCertificate
...@@ -336,12 +339,13 @@ const nextDev = async ( ...@@ -336,12 +339,13 @@ const nextDev = async (
(await loadConfig(PHASE_DEVELOPMENT_SERVER, dir, { (await loadConfig(PHASE_DEVELOPMENT_SERVER, dir, {
silent: true, silent: true,
})) }))
bundler = finalizeBundlerFromConfig(bundler)
uploadTrace({ uploadTrace({
traceUploadUrl, traceUploadUrl,
mode: 'dev', mode: 'dev',
projectDir: dir, projectDir: dir,
distDir: config.distDir, distDir: config.distDir,
isTurboSession, isTurboSession: bundler === Bundler.Turbopack,
sync: true, sync: true,
}) })
} }
......
/// Utilties for configuring the bundler to use.
export enum Bundler {
Turbopack,
Webpack,
Rspack,
}
/**
* Parse the bundler arguments and potentially sets the `TURBOPACK` environment variable.
*
* NOTE: rspack is configured via next config which is chaotic so it is possible for this to be overridden later.
*
* @param options The options to parse.
* @returns The bundler that was configured
*/
export function parseBundlerArgs(options: {
turbo?: boolean
turbopack?: boolean
webpack?: boolean
}): Bundler {
const bundlerFlags = new Map<Bundler, string[]>()
const setBundlerFlag = (bundler: Bundler, flag: string) => {
bundlerFlags.set(bundler, (bundlerFlags.get(bundler) ?? []).concat(flag))
}
// What turbo flag was set? We allow multiple to be set, which is silly but not ambiguous, just pick the most relevant one.
if (options.turbopack) {
setBundlerFlag(Bundler.Turbopack, '--turbopack')
}
if (options.turbo) {
setBundlerFlag(Bundler.Turbopack, '--turbo')
} else if (process.env.TURBOPACK) {
// We don't really want to support this but it is trivial and not really confusing.
// If we don't support it and someone sets it, we would have inconsistent behavior
// since some parts of next would read the return value of this function and other
// parts will read the env variable.
setBundlerFlag(Bundler.Turbopack, 'TURBOPACK')
} else if (process.env.IS_TURBOPACK_TEST) {
setBundlerFlag(Bundler.Turbopack, 'IS_TURBOPACK_TEST')
}
if (options.webpack) {
setBundlerFlag(Bundler.Webpack, '--webpack')
}
if (process.env.IS_WEBPACK_TEST) {
setBundlerFlag(Bundler.Webpack, 'IS_WEBPACK_TEST')
}
// Mostly this is set via the NextConfig but it can also be set via the command line which is
// common for testing.
if (process.env.NEXT_RSPACK) {
setBundlerFlag(Bundler.Rspack, 'NEXT_RSPACK')
}
if (process.env.IS_RSPACK_TEST) {
setBundlerFlag(Bundler.Rspack, 'NEXT_TEST_USE_RSPACK')
}
if (bundlerFlags.size > 1) {
console.error(
`Multiple bundler flags set: ${Array.from(bundlerFlags.values()).flat().join(', ')}. Configure exactly one bundler.`
)
process.exit(1)
}
// The default is turbopack when nothing is configured.
if (bundlerFlags.size === 0) {
process.env.TURBOPACK = 'auto'
return Bundler.Turbopack
}
if (bundlerFlags.has(Bundler.Turbopack)) {
// Only conditionally assign to the environment variable, preserving already set values.
// If it was set to 'auto' because no flag was set and this function is called a second time we
// would upgrade to '1' but we don't really want that.
process.env.TURBOPACK ??= '1'
return Bundler.Turbopack
}
// Otherwise it is one of rspack or webpack. At this point there must be exactly one key in the map.
return bundlerFlags.keys().next().value!
}
/**
* Finalize the bundler based on the config.
*
* Rspack is configured via next config by setting an environment variable (yay, side effects)
* so this should only be called after parsing the config.
*/
export function finalizeBundlerFromConfig(fromOptions: Bundler) {
// Reading the next config can set NEXT_RSPACK environment variables.
if (process.env.NEXT_RSPACK) {
return Bundler.Rspack
}
return fromOptions
}
...@@ -47,11 +47,9 @@ const unsupportedTurbopackNextConfigOptions = [ ...@@ -47,11 +47,9 @@ const unsupportedTurbopackNextConfigOptions = [
] ]
// The following will need to be supported by `next build --turbopack` // The following will need to be supported by `next build --turbopack`
const unsupportedProductionSpecificTurbopackNextConfigOptions: string[] = [ const unsupportedProductionSpecificTurbopackNextConfigOptions: string[] = []
// TODO: Support disabling sourcemaps, currently they're always enabled.
// 'productionBrowserSourceMaps',
]
/** */
export async function validateTurboNextConfig({ export async function validateTurboNextConfig({
dir, dir,
isDev, isDev,
...@@ -71,7 +69,7 @@ export async function validateTurboNextConfig({ ...@@ -71,7 +69,7 @@ export async function validateTurboNextConfig({
let hasWebpackConfig = false let hasWebpackConfig = false
let hasTurboConfig = false let hasTurboConfig = false
let unsupportedConfig: string[] = [] const unsupportedConfig: string[] = []
let rawNextConfig: NextConfig = {} let rawNextConfig: NextConfig = {}
const phase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD const phase = isDev ? PHASE_DEVELOPMENT_SERVER : PHASE_PRODUCTION_BUILD
...@@ -124,7 +122,7 @@ export async function validateTurboNextConfig({ ...@@ -124,7 +122,7 @@ export async function validateTurboNextConfig({
const customKeys = flattenKeys(rawNextConfig) const customKeys = flattenKeys(rawNextConfig)
let unsupportedKeys = isDev const unsupportedKeys = isDev
? unsupportedTurbopackNextConfigOptions ? unsupportedTurbopackNextConfigOptions
: [ : [
...unsupportedTurbopackNextConfigOptions, ...unsupportedTurbopackNextConfigOptions,
...@@ -139,7 +137,7 @@ export async function validateTurboNextConfig({ ...@@ -139,7 +137,7 @@ export async function validateTurboNextConfig({
hasTurboConfig = true hasTurboConfig = true
} }
let isUnsupported = const isUnsupported =
unsupportedKeys.some( unsupportedKeys.some(
(unsupportedKey) => (unsupportedKey) =>
// Either the key matches (or is a more specific subkey) of // Either the key matches (or is a more specific subkey) of
...@@ -162,13 +160,26 @@ export async function validateTurboNextConfig({ ...@@ -162,13 +160,26 @@ export async function validateTurboNextConfig({
Log.error('Unexpected error occurred while checking config', e) Log.error('Unexpected error occurred while checking config', e)
} }
if (hasWebpackConfig && !hasTurboConfig) { // If the build was defaulted to Turbopack, we want to warn about possibly ignored webpack
Log.warn( // configuration. Otherwise the user explicitly picked turbopack and thus we expect that
`Webpack is configured while Turbopack is not, which may cause problems.` // they have configured it correctly.
if (process.env.TURBOPACK === 'auto' && hasWebpackConfig && !hasTurboConfig) {
const logMethod = isDev ? Log.warn : Log.error
// In a production build with auto-detected Turbopack, we want to fail the build.
logMethod(
`Webpack is configured while Turbopack is not. This may be a mistake.`
) )
Log.warn( logMethod(
`See instructions if you need to configure Turbopack:\n https://nextjs.org/docs/app/api-reference/next-config-js/turbopack\n` `To configure Turbopack, see:\n https://nextjs.org/docs/app/api-reference/next-config-js/turbopack`
) )
logMethod(
`TIP: Silence this ${isDev ? 'warning' : 'error'} by passing the --turbopack or --webpack flag explicitly.`
)
// For production builds we want to simply fail to prevent accidental misconfiguration.
if (!isDev) {
process.exit(1)
}
} }
if (unsupportedConfig.length) { if (unsupportedConfig.length) {
......
...@@ -153,6 +153,7 @@ async function main() { ...@@ -153,6 +153,7 @@ async function main() {
NEXT_EXTERNAL_TESTS_FILTERS, NEXT_EXTERNAL_TESTS_FILTERS,
NEXT_TEST_MODE: testMode, NEXT_TEST_MODE: testMode,
NEXT_TEST_VERSION: nextTestVersion, NEXT_TEST_VERSION: nextTestVersion,
IS_WEBPACK_TEST: '1',
}, },
}) })
} }
...@@ -170,6 +171,7 @@ async function main() { ...@@ -170,6 +171,7 @@ async function main() {
NEXT_TEST_VERSION: nextTestVersion, NEXT_TEST_VERSION: nextTestVersion,
IS_TURBOPACK_TEST: '1', IS_TURBOPACK_TEST: '1',
TURBOPACK_BUILD: testMode === 'start' ? '1' : undefined, TURBOPACK_BUILD: testMode === 'start' ? '1' : undefined,
TURBOPACK_DEV: testMode === 'dev' ? '1' : undefined,
}, },
}) })
} }
......
import { nextTestSetup } from 'e2e-utils' import { nextTestSetup } from 'e2e-utils'
;(process.env.IS_TURBOPACK_TEST ? describe : describe.skip)(
describe('next-config-ts - turbopack', () => { 'next-config-ts - turbopack',
const { next } = nextTestSetup({ () => {
files: __dirname, const { next } = nextTestSetup({
// explicitly ensure that turbopack is used files: __dirname,
startCommand: 'pnpm next dev --turbo', // explicitly ensure that turbopack is used
}) startCommand: 'pnpm next dev --turbopack',
it('should work with Turbopack', async () => { })
const $ = await next.render$('/') it('should work with Turbopack', async () => {
expect($('p').text()).toBe('foo') const $ = await next.render$('/')
}) expect($('p').text()).toBe('foo')
}) })
}
)
...@@ -5,40 +5,90 @@ const WARNING_MESSAGE = 'Webpack is configured while Turbopack is not' ...@@ -5,40 +5,90 @@ const WARNING_MESSAGE = 'Webpack is configured while Turbopack is not'
const itif = (condition: boolean) => (condition ? it : it.skip) const itif = (condition: boolean) => (condition ? it : it.skip)
const page = {
'app/page.js': `
export default function Page() {
return <p>hello world</p>
}
`,
}
const TURBOPACK_FLAG = process.env.TURBOPACK
describe('config-turbopack', () => { describe('config-turbopack', () => {
describe('when webpack is configured but Turbopack is not', () => { describe('when turbopack is auto selected', () => {
const { next, isTurbopack } = nextTestSetup({ if (process.env.IS_TURBOPACK_TEST) {
files: { beforeAll(() => {
'app/page.js': ` // This is hacky since it isn't a public API, but it's the only way to test this.
export default function Page() { // If next started ignoring IS_TURBOPACK_TEST we could possibly change nextTestSetup to not set the turbopack flag.
return <p>hello world</p> process.env.TURBOPACK = 'auto'
} })
`, afterAll(() => {
'next.config.js': ` if (TURBOPACK_FLAG) {
process.env.TURBOPACK = TURBOPACK_FLAG
} else {
delete process.env.TURBOPACK
}
})
}
describe('when webpack is configured but Turbopack is not', () => {
const { next, isTurbopack, isNextDev, isNextStart } = nextTestSetup({
skipStart: Boolean(process.env.TURBOPACK_BUILD),
turbo: false,
files: {
...page,
'next.config.js': `
module.exports = { module.exports = {
webpack: (config) => { webpack: (config) => {
return config return config
}, },
} }
`, `,
}, },
}) })
itif(isTurbopack)('warns', async () => { itif(isTurbopack && isNextDev)('warns', async () => {
if (next) await next.render('/') if (next) await next.render('/')
expect(next.cliOutput).toContain(WARNING_MESSAGE) expect(next.cliOutput).toContain(WARNING_MESSAGE)
})
itif(isTurbopack && isNextStart)('errors', async () => {
const { exitCode, cliOutput } = await next.build()
expect(exitCode).toBe(1)
expect(cliOutput).toContain(WARNING_MESSAGE)
})
}) })
// no warn cases work when auto selected too
noWarnCases()
}) })
describe('when webpack is configured and config.turbopack is set', () => { describe('when turbopack is explicitly configured', () => {
const { next, isTurbopack } = nextTestSetup({ describe('when webpack is configured but Turbopack is not', () => {
files: { const { next, isTurbopack } = nextTestSetup({
'app/page.js': ` files: {
export default function Page() { ...page,
return <p>hello world</p> 'next.config.js': `
} module.exports = {
`, webpack: (config) => {
'next.config.js': ` return config
},
}
`,
},
})
itif(isTurbopack)('does not warn', async () => {
if (next) await next.render('/')
expect(next.cliOutput).not.toContain(WARNING_MESSAGE)
})
})
noWarnCases()
})
/// These other cases don't warn because --turbopack is explicitly selected
function noWarnCases() {
describe('when webpack is configured and config.turbopack is set', () => {
const { next, isTurbopack } = nextTestSetup({
files: {
...page,
'next.config.js': `
module.exports = { module.exports = {
turbopack: { turbopack: {
rules: { rules: {
...@@ -52,24 +102,20 @@ describe('config-turbopack', () => { ...@@ -52,24 +102,20 @@ describe('config-turbopack', () => {
}, },
} }
`, `,
}, },
}) })
itif(isTurbopack)('does not warn', async () => { itif(isTurbopack)('does not warn', async () => {
if (next) await next.render('/') if (next) await next.render('/')
expect(next.cliOutput).not.toContain(WARNING_MESSAGE) expect(next.cliOutput).not.toContain(WARNING_MESSAGE)
})
}) })
})
describe('when webpack is configured and config.experimental.turbo is set', () => { describe('when webpack is configured and config.experimental.turbo is set', () => {
const { next, isTurbopack } = nextTestSetup({ const { next, isTurbopack } = nextTestSetup({
files: { files: {
'app/page.js': ` ...page,
export default function Page() { 'next.config.js': `
return <p>hello world</p>
}
`,
'next.config.js': `
module.exports = { module.exports = {
experimental: { experimental: {
turbo: { turbo: {
...@@ -85,12 +131,13 @@ describe('config-turbopack', () => { ...@@ -85,12 +131,13 @@ describe('config-turbopack', () => {
}, },
} }
`, `,
}, },
}) })
itif(isTurbopack)('does not warn', async () => { itif(isTurbopack)('does not warn', async () => {
if (next) await next.render('/') if (next) await next.render('/')
expect(next.cliOutput).not.toContain(WARNING_MESSAGE) expect(next.cliOutput).not.toContain(WARNING_MESSAGE)
})
}) })
}) }
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment