Commit 670e32e1 authored by Niklas Mischkulnig's avatar Niklas Mischkulnig

DEBUG: skip NFT

parent 58695439
...@@ -133,7 +133,7 @@ import { ...@@ -133,7 +133,7 @@ import {
copyTracedFiles, copyTracedFiles,
isReservedPage, isReservedPage,
isAppBuiltinNotFoundPage, isAppBuiltinNotFoundPage,
collectRoutesUsingEdgeRuntime, // collectRoutesUsingEdgeRuntime,
collectMeta, collectMeta,
} from './utils' } from './utils'
import type { PageInfo, PageInfos } from './utils' import type { PageInfo, PageInfos } from './utils'
...@@ -172,8 +172,8 @@ import { startTypeChecking } from './type-check' ...@@ -172,8 +172,8 @@ import { startTypeChecking } from './type-check'
import { generateInterceptionRoutesRewrites } from '../lib/generate-interception-routes-rewrites' import { generateInterceptionRoutesRewrites } from '../lib/generate-interception-routes-rewrites'
import { buildDataRoute } from '../server/lib/router-utils/build-data-route' import { buildDataRoute } from '../server/lib/router-utils/build-data-route'
import { collectBuildTraces } from './collect-build-traces' // import { collectBuildTraces } from './collect-build-traces'
import type { BuildTraceContext } from './webpack/plugins/next-trace-entrypoints-plugin' // import type { BuildTraceContext } from './webpack/plugins/next-trace-entrypoints-plugin'
import { formatManifest } from './manifests/formatter/format-manifest' import { formatManifest } from './manifests/formatter/format-manifest'
import { import {
recordFrameworkVersion, recordFrameworkVersion,
...@@ -1568,7 +1568,7 @@ export default async function build( ...@@ -1568,7 +1568,7 @@ export default async function build(
PAGES_MANIFEST PAGES_MANIFEST
) )
let buildTraceContext: undefined | BuildTraceContext // let buildTraceContext: undefined | BuildTraceContext
let buildTracesPromise: Promise<any> | undefined = undefined let buildTracesPromise: Promise<any> | undefined = undefined
// If there's has a custom webpack config and disable the build worker. // If there's has a custom webpack config and disable the build worker.
...@@ -1615,7 +1615,7 @@ export default async function build( ...@@ -1615,7 +1615,7 @@ export default async function build(
const { const {
duration: compilerDuration, duration: compilerDuration,
shutdownPromise: p, shutdownPromise: p,
...rest // ...rest
} = await turbopackBuild( } = await turbopackBuild(
process.env.NEXT_TURBOPACK_USE_WORKER === undefined || process.env.NEXT_TURBOPACK_USE_WORKER === undefined ||
process.env.NEXT_TURBOPACK_USE_WORKER !== '0' process.env.NEXT_TURBOPACK_USE_WORKER !== '0'
...@@ -1623,7 +1623,7 @@ export default async function build( ...@@ -1623,7 +1623,7 @@ export default async function build(
shutdownPromise = p shutdownPromise = p
traceMemoryUsage('Finished build', nextBuildSpan) traceMemoryUsage('Finished build', nextBuildSpan)
buildTraceContext = rest.buildTraceContext // buildTraceContext = rest.buildTraceContext
const durationString = durationToString(compilerDuration) const durationString = durationToString(compilerDuration)
Log.event(`Compiled successfully in ${durationString}`) Log.event(`Compiled successfully in ${durationString}`)
...@@ -1650,37 +1650,37 @@ export default async function build( ...@@ -1650,37 +1650,37 @@ export default async function build(
'server', 'server',
]).then((res) => { ]).then((res) => {
traceMemoryUsage('Finished server compilation', nextBuildSpan) traceMemoryUsage('Finished server compilation', nextBuildSpan)
buildTraceContext = res.buildTraceContext // buildTraceContext = res.buildTraceContext
durationInSeconds += res.duration durationInSeconds += res.duration
if (collectServerBuildTracesInParallel) { if (collectServerBuildTracesInParallel) {
const buildTraceWorker = new Worker( console.log('Dangerously skipping build traces!')
require.resolve('./collect-build-traces'), // const buildTraceWorker = new Worker(
{ // require.resolve('./collect-build-traces'),
debuggerPortOffset: -1, // {
isolatedMemory: false, // debuggerPortOffset: -1,
numWorkers: 1, // isolatedMemory: false,
exposedMethods: ['collectBuildTraces'], // numWorkers: 1,
} // exposedMethods: ['collectBuildTraces'],
) as Worker & typeof import('./collect-build-traces') // }
// ) as Worker & typeof import('./collect-build-traces')
buildTracesPromise = buildTraceWorker // buildTracesPromise = buildTraceWorker
.collectBuildTraces({ // .collectBuildTraces({
dir, // dir,
config, // config,
distDir, // distDir,
// Serialize Map as this is sent to the worker. // // Serialize Map as this is sent to the worker.
edgeRuntimeRoutes: collectRoutesUsingEdgeRuntime(new Map()), // edgeRuntimeRoutes: collectRoutesUsingEdgeRuntime(new Map()),
staticPages: [], // staticPages: [],
hasSsrAmpPages: false, // hasSsrAmpPages: false,
buildTraceContext, // buildTraceContext,
outputFileTracingRoot, // outputFileTracingRoot,
isTurbopack: false, // isTurbopack: false,
}) // })
.catch((err) => { // .catch((err) => {
console.error(err) // console.error(err)
process.exit(1) // process.exit(1)
}) // })
} }
}) })
if (!runServerAndEdgeInParallel) { if (!runServerAndEdgeInParallel) {
...@@ -1727,13 +1727,11 @@ export default async function build( ...@@ -1727,13 +1727,11 @@ export default async function build(
}) })
) )
} else { } else {
const { duration: compilerDuration, ...rest } = await webpackBuild( const { duration: compilerDuration /* , ...rest */ } =
useBuildWorker, await webpackBuild(useBuildWorker, null)
null
)
traceMemoryUsage('Finished build', nextBuildSpan) traceMemoryUsage('Finished build', nextBuildSpan)
buildTraceContext = rest.buildTraceContext // buildTraceContext = rest.buildTraceContext
telemetry.record( telemetry.record(
eventBuildCompleted(pagesPaths, { eventBuildCompleted(pagesPaths, {
...@@ -2570,21 +2568,22 @@ export default async function build( ...@@ -2570,21 +2568,22 @@ export default async function build(
await writeFunctionsConfigManifest(distDir, functionsConfigManifest) await writeFunctionsConfigManifest(distDir, functionsConfigManifest)
if (!isGenerateMode && !buildTracesPromise) { if (!isGenerateMode && !buildTracesPromise) {
buildTracesPromise = collectBuildTraces({ console.log('Dangerously skipping build traces!')
dir, // buildTracesPromise = collectBuildTraces({
config, // dir,
distDir, // config,
edgeRuntimeRoutes: collectRoutesUsingEdgeRuntime(pageInfos), // distDir,
staticPages: [...staticPages], // edgeRuntimeRoutes: collectRoutesUsingEdgeRuntime(pageInfos),
nextBuildSpan, // staticPages: [...staticPages],
hasSsrAmpPages, // nextBuildSpan,
buildTraceContext, // hasSsrAmpPages,
outputFileTracingRoot, // buildTraceContext,
isTurbopack: true, // outputFileTracingRoot,
}).catch((err) => { // isTurbopack: true,
console.error(err) // }).catch((err) => {
process.exit(1) // console.error(err)
}) // process.exit(1)
// })
} }
if (serverPropsPages.size > 0 || ssgPages.size > 0) { if (serverPropsPages.size > 0 || ssgPages.size > 0) {
......
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