Unverified Commit f5b88d91 authored by Jiachi Liu's avatar Jiachi Liu Committed by GitHub

handle pages router ignored frames (#73280)

parent be19d30b
import type { IncomingMessage, ServerResponse } from 'http' import type { IncomingMessage, ServerResponse } from 'http'
import { import {
badRequest, badRequest,
findSourcePackage,
getOriginalCodeFrame, getOriginalCodeFrame,
internalServerError, internalServerError,
json, json,
...@@ -38,7 +37,19 @@ export async function batchedTraceSource( ...@@ -38,7 +37,19 @@ export async function batchedTraceSource(
if (!file) return if (!file) return
const sourceFrame = await project.traceSource(frame) const sourceFrame = await project.traceSource(frame)
if (!sourceFrame) return if (!sourceFrame) {
return {
frame: {
file,
lineNumber: frame.line ?? 0,
column: frame.column ?? 0,
methodName: frame.methodName ?? '<unknown>',
ignored: shouldIgnorePath(frame.file),
arguments: [],
},
source: null,
}
}
let source = null let source = null
// Don't look up source for node_modules or internals. These can often be large bundled files. // Don't look up source for node_modules or internals. These can often be large bundled files.
...@@ -46,7 +57,7 @@ export async function batchedTraceSource( ...@@ -46,7 +57,7 @@ export async function batchedTraceSource(
shouldIgnorePath(sourceFrame.file) || shouldIgnorePath(sourceFrame.file) ||
// isInternal means resource starts with turbopack://[turbopack] // isInternal means resource starts with turbopack://[turbopack]
!!sourceFrame.isInternal !!sourceFrame.isInternal
if (sourceFrame.file && !ignored) { if (sourceFrame && sourceFrame.file && !ignored) {
let sourcePromise = currentSourcesByFile.get(sourceFrame.file) let sourcePromise = currentSourcesByFile.get(sourceFrame.file)
if (!sourcePromise) { if (!sourcePromise) {
sourcePromise = project.getSourceForAsset(sourceFrame.file) sourcePromise = project.getSourceForAsset(sourceFrame.file)
...@@ -103,15 +114,12 @@ export async function createOriginalStackFrame( ...@@ -103,15 +114,12 @@ export async function createOriginalStackFrame(
): Promise<OriginalStackFrameResponse | null> { ): Promise<OriginalStackFrameResponse | null> {
const traced = await batchedTraceSource(project, frame) const traced = await batchedTraceSource(project, frame)
if (!traced) { if (!traced) {
const sourcePackage = findSourcePackage(frame)
if (sourcePackage) return { sourcePackage }
return null return null
} }
return { return {
originalStackFrame: traced.frame, originalStackFrame: traced.frame,
originalCodeFrame: getOriginalCodeFrame(traced.frame, traced.source), originalCodeFrame: getOriginalCodeFrame(traced.frame, traced.source),
sourcePackage: findSourcePackage(traced.frame),
} }
} }
......
...@@ -7,7 +7,6 @@ import { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-fi ...@@ -7,7 +7,6 @@ import { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-fi
import { launchEditor } from '../internal/helpers/launchEditor' import { launchEditor } from '../internal/helpers/launchEditor'
import { import {
badRequest, badRequest,
findSourcePackage,
getOriginalCodeFrame, getOriginalCodeFrame,
internalServerError, internalServerError,
json, json,
...@@ -246,7 +245,6 @@ export async function createOriginalStackFrame({ ...@@ -246,7 +245,6 @@ export async function createOriginalStackFrame({
return { return {
originalStackFrame: traced, originalStackFrame: traced,
originalCodeFrame: getOriginalCodeFrame(traced, sourceContent), originalCodeFrame: getOriginalCodeFrame(traced, sourceContent),
sourcePackage: findSourcePackage(traced),
} }
} }
...@@ -413,8 +411,21 @@ export function getOverlayMiddleware(options: { ...@@ -413,8 +411,21 @@ export function getOverlayMiddleware(options: {
return internalServerError(res) return internalServerError(res)
} }
// This stack frame is used for the one that couldn't locate the source or source mapped frame
const defaultStackFrame: IgnorableStackFrame = {
file: frame.file,
lineNumber: frame.lineNumber,
column: frame.column ?? 1,
methodName: frame.methodName,
ignored: shouldIgnorePath(frame.file),
arguments: [],
}
if (!source) { if (!source) {
return noContent(res) // return original stack frame with no source map
return json(res, {
originalStackFrame: defaultStackFrame,
originalCodeFrame: null,
})
} }
try { try {
...@@ -425,7 +436,10 @@ export function getOverlayMiddleware(options: { ...@@ -425,7 +436,10 @@ export function getOverlayMiddleware(options: {
}) })
if (!originalStackFrameResponse) { if (!originalStackFrameResponse) {
return noContent(res) return json(res, {
originalStackFrame: defaultStackFrame,
originalCodeFrame: null,
})
} }
return json(res, originalStackFrameResponse) return json(res, originalStackFrameResponse)
......
...@@ -137,4 +137,86 @@ describe('error-ignored-frames', () => { ...@@ -137,4 +137,86 @@ describe('error-ignored-frames', () => {
`) `)
} }
}) })
it('should be able to collapse pages router ignored frames', async () => {
const browser = await next.browser('/pages')
await assertHasRedbox(browser)
const defaultStack = await getStackFramesContent(browser)
expect(defaultStack).toMatchInlineSnapshot(`""`)
await toggleCollapseCallStackFrames(browser)
const expendedStack = await getStackFramesContent(browser)
if (process.env.TURBOPACK) {
expect(expendedStack).toMatchInlineSnapshot(`
"at react-stack-bottom-frame ()
at renderWithHooks ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at finishFunctionComponent ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderNode ()
at renderChildrenArray ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderNode ()
at renderChildrenArray ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at finishFunctionComponent ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()"
`)
} else {
expect(expendedStack).toMatchInlineSnapshot(`
"at react-stack-bottom-frame ()
at renderWithHooks ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at finishFunctionComponent ()
at renderElement ()
at retryNode ()
at renderNodeDestructive ()
at renderNode ()
at renderChildrenArray ()"
`)
}
})
}) })
export default function Page() {
throw new Error('boom')
return <p>hello world</p>
}
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