Skip to content

Commit a55e89e

Browse files
mischnicwbinnssmith
authored andcommitted
Fixup
1 parent 5b5cb8c commit a55e89e

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Diff for: packages/next/src/server/config.ts

+5-11
Original file line numberDiff line numberDiff line change
@@ -669,27 +669,21 @@ function assignDefaults(
669669
result.deploymentId = process.env.NEXT_DEPLOYMENT_ID
670670
}
671671

672-
if (result?.outputFileTracingRoot && !result?.experimental?.turbo?.root) {
673-
dset(
674-
result,
675-
['experimental', 'turbo', 'root'],
676-
result.outputFileTracingRoot
677-
)
672+
if (result?.outputFileTracingRoot && !result?.turbopack?.root) {
673+
dset(result, ['turbopack', 'root'], result.outputFileTracingRoot)
678674
}
679675

680676
// use the closest lockfile as tracing root
681-
if (!result?.outputFileTracingRoot || !result?.experimental?.turbo?.root) {
677+
if (!result?.outputFileTracingRoot || !result?.turbopack?.root) {
682678
let rootDir = findRootDir(dir)
683679

684680
if (rootDir) {
685681
if (!result?.outputFileTracingRoot) {
686682
result.outputFileTracingRoot = rootDir
687-
defaultConfig.outputFileTracingRoot = result.outputFileTracingRoot
688683
}
689684

690-
if (!result?.experimental?.turbo?.root) {
691-
dset(result, ['experimental', 'turbo', 'root'], rootDir)
692-
dset(defaultConfig, ['experimental', 'turbo', 'root'], rootDir)
685+
if (!result?.turbopack?.root) {
686+
dset(result, ['turbopack', 'root'], rootDir)
693687
}
694688
}
695689
}

0 commit comments

Comments
 (0)