Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
N
next.js
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Alex
next.js
Commits
f5b88d91
Unverified
Commit
f5b88d91
authored
Nov 28, 2024
by
Jiachi Liu
Committed by
GitHub
Nov 28, 2024
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
handle pages router ignored frames (#73280)
parent
be19d30b
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
118 additions
and
10 deletions
+118
-10
middleware-turbopack.ts
...mponents/react-dev-overlay/server/middleware-turbopack.ts
+14
-6
middleware-webpack.ts
...components/react-dev-overlay/server/middleware-webpack.ts
+18
-4
error-ignored-frames.test.ts
...overlay/error-ignored-frames/error-ignored-frames.test.ts
+82
-0
pages.tsx
...pp-dir/error-overlay/error-ignored-frames/pages/pages.tsx
+4
-0
No files found.
packages/next/src/client/components/react-dev-overlay/server/middleware-turbopack.ts
View file @
f5b88d91
import
type
{
IncomingMessage
,
ServerResponse
}
from
'http'
import
{
badRequest
,
findSourcePackage
,
getOriginalCodeFrame
,
internalServerError
,
json
,
...
...
@@ -38,7 +37,19 @@ export async function batchedTraceSource(
if
(
!
file
)
return
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
// 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(
shouldIgnorePath
(
sourceFrame
.
file
)
||
// isInternal means resource starts with turbopack://[turbopack]
!!
sourceFrame
.
isInternal
if
(
sourceFrame
.
file
&&
!
ignored
)
{
if
(
sourceFrame
&&
sourceFrame
.
file
&&
!
ignored
)
{
let
sourcePromise
=
currentSourcesByFile
.
get
(
sourceFrame
.
file
)
if
(
!
sourcePromise
)
{
sourcePromise
=
project
.
getSourceForAsset
(
sourceFrame
.
file
)
...
...
@@ -103,15 +114,12 @@ export async function createOriginalStackFrame(
):
Promise
<
OriginalStackFrameResponse
|
null
>
{
const
traced
=
await
batchedTraceSource
(
project
,
frame
)
if
(
!
traced
)
{
const
sourcePackage
=
findSourcePackage
(
frame
)
if
(
sourcePackage
)
return
{
sourcePackage
}
return
null
}
return
{
originalStackFrame
:
traced
.
frame
,
originalCodeFrame
:
getOriginalCodeFrame
(
traced
.
frame
,
traced
.
source
),
sourcePackage
:
findSourcePackage
(
traced
.
frame
),
}
}
...
...
packages/next/src/client/components/react-dev-overlay/server/middleware-webpack.ts
View file @
f5b88d91
...
...
@@ -7,7 +7,6 @@ import { getSourceMapFromFile } from '../internal/helpers/get-source-map-from-fi
import
{
launchEditor
}
from
'../internal/helpers/launchEditor'
import
{
badRequest
,
findSourcePackage
,
getOriginalCodeFrame
,
internalServerError
,
json
,
...
...
@@ -246,7 +245,6 @@ export async function createOriginalStackFrame({
return
{
originalStackFrame
:
traced
,
originalCodeFrame
:
getOriginalCodeFrame
(
traced
,
sourceContent
),
sourcePackage
:
findSourcePackage
(
traced
),
}
}
...
...
@@ -413,8 +411,21 @@ export function getOverlayMiddleware(options: {
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
)
{
return
noContent
(
res
)
// return original stack frame with no source map
return
json
(
res
,
{
originalStackFrame
:
defaultStackFrame
,
originalCodeFrame
:
null
,
})
}
try
{
...
...
@@ -425,7 +436,10 @@ export function getOverlayMiddleware(options: {
})
if
(
!
originalStackFrameResponse
)
{
return
noContent
(
res
)
return
json
(
res
,
{
originalStackFrame
:
defaultStackFrame
,
originalCodeFrame
:
null
,
})
}
return
json
(
res
,
originalStackFrameResponse
)
...
...
test/development/app-dir/error-overlay/error-ignored-frames/error-ignored-frames.test.ts
View file @
f5b88d91
...
...
@@ -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 ()"
`
)
}
})
})
test/development/app-dir/error-overlay/error-ignored-frames/pages/pages.tsx
0 → 100644
View file @
f5b88d91
export
default
function
Page
()
{
throw
new
Error
(
'boom'
)
return
<
p
>
hello world
</
p
>
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment