Unverified Commit cd36a8f2 authored by Will Binns-Smith's avatar Will Binns-Smith Committed by GitHub

Turbopack: don’t show long internal stack traces on build errors (#64427)

Turbopack: don’t show long internal stack traces on build errors
    
Fixes PACK-2909

Looks like this may have been introduced in #61929, when code was moved
out of `setup-dev-bundler.ts`, `ModuleBuildError` was duplicated and no
longer satisfied the `instanceof` check.

Closes PACK-2951
parent d1e7847a
...@@ -41,7 +41,7 @@ export async function getTurbopackJsConfig( ...@@ -41,7 +41,7 @@ export async function getTurbopackJsConfig(
return jsConfig ?? { compilerOptions: {} } return jsConfig ?? { compilerOptions: {} }
} }
class ModuleBuildError extends Error {} export class ModuleBuildError extends Error {}
/** /**
* Thin stopgap workaround layer to mimic existing wellknown-errors-plugin in webpack's build * Thin stopgap workaround layer to mimic existing wellknown-errors-plugin in webpack's build
......
...@@ -76,6 +76,7 @@ import { createHotReloaderTurbopack } from '../../dev/hot-reloader-turbopack' ...@@ -76,6 +76,7 @@ import { createHotReloaderTurbopack } from '../../dev/hot-reloader-turbopack'
import { getErrorSource } from '../../../shared/lib/error-source' import { getErrorSource } from '../../../shared/lib/error-source'
import type { StackFrame } from 'next/dist/compiled/stacktrace-parser' import type { StackFrame } from 'next/dist/compiled/stacktrace-parser'
import { generateEncryptionKeyBase64 } from '../../app-render/encryption-utils' import { generateEncryptionKeyBase64 } from '../../app-render/encryption-utils'
import { ModuleBuildError } from '../../dev/turbopack-utils'
export type SetupOpts = { export type SetupOpts = {
renderServer: LazyRenderServerInstance renderServer: LazyRenderServerInstance
...@@ -128,8 +129,6 @@ async function verifyTypeScript(opts: SetupOpts) { ...@@ -128,8 +129,6 @@ async function verifyTypeScript(opts: SetupOpts) {
return usingTypeScript return usingTypeScript
} }
class ModuleBuildError extends Error {}
export async function propagateServerField( export async function propagateServerField(
opts: SetupOpts, opts: SetupOpts,
field: PropagateToWorkersField, field: PropagateToWorkersField,
...@@ -972,15 +971,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -972,15 +971,7 @@ async function startWatcher(opts: SetupOpts) {
errorToLog = err errorToLog = err
} }
if (type === 'warning') { logError(errorToLog, type)
Log.warn(errorToLog)
} else if (type === 'app-dir') {
logAppDirError(errorToLog)
} else if (type) {
Log.error(`${type}:`, errorToLog)
} else {
Log.error(errorToLog)
}
console[type === 'warning' ? 'warn' : 'error'](originalCodeFrame) console[type === 'warning' ? 'warn' : 'error'](originalCodeFrame)
usedOriginalStack = true usedOriginalStack = true
} }
...@@ -993,17 +984,7 @@ async function startWatcher(opts: SetupOpts) { ...@@ -993,17 +984,7 @@ async function startWatcher(opts: SetupOpts) {
} }
if (!usedOriginalStack) { if (!usedOriginalStack) {
if (err instanceof ModuleBuildError) { logError(err, type)
Log.error(err.message)
} else if (type === 'warning') {
Log.warn(err)
} else if (type === 'app-dir') {
logAppDirError(err)
} else if (type) {
Log.error(`${type}:`, err)
} else {
Log.error(err)
}
} }
} }
...@@ -1025,6 +1006,23 @@ async function startWatcher(opts: SetupOpts) { ...@@ -1025,6 +1006,23 @@ async function startWatcher(opts: SetupOpts) {
} }
} }
function logError(
err: unknown,
type?: 'unhandledRejection' | 'uncaughtException' | 'warning' | 'app-dir'
) {
if (err instanceof ModuleBuildError) {
Log.error(err.message)
} else if (type === 'warning') {
Log.warn(err)
} else if (type === 'app-dir') {
logAppDirError(err)
} else if (type) {
Log.error(`${type}:`, err)
} else {
Log.error(err)
}
}
export async function setupDevBundler(opts: SetupOpts) { export async function setupDevBundler(opts: SetupOpts) {
const isSrcDir = path const isSrcDir = path
.relative(opts.dir, opts.pagesDir || opts.appDir || '') .relative(opts.dir, opts.pagesDir || opts.appDir || '')
......
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