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
76e7564b
Commit
76e7564b
authored
Sep 16, 2025
by
Jiachi Liu
Browse files
Options
Browse Files
Download
Plain Diff
merge previous nextagt
parents
6ddb1e7d
acfbe1bd
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
1046 additions
and
69 deletions
+1046
-69
package.json
packages/next/package.json
+1
-1
web-socket.ts
packages/next/src/client/dev/hot-reloader/app/web-socket.ts
+5
-9
websocket.ts
packages/next/src/client/dev/hot-reloader/pages/websocket.ts
+3
-7
chat-interface.tsx
...xt/src/next-devtools/dev-overlay/agent/chat-interface.tsx
+688
-0
app-dev-overlay-setup.ts
.../src/next-devtools/userspace/app/app-dev-overlay-setup.ts
+3
-7
intercept-console-error.ts
...-devtools/userspace/app/errors/intercept-console-error.ts
+3
-4
use-error-handler.ts
...c/next-devtools/userspace/app/errors/use-error-handler.ts
+3
-11
forward-logs.ts
...ages/next/src/next-devtools/userspace/app/forward-logs.ts
+1
-0
pages-dev-overlay-setup.tsx
...next-devtools/userspace/pages/pages-dev-overlay-setup.tsx
+6
-11
file-logger.ts
packages/next/src/server/dev/browser-logs/file-logger.ts
+228
-0
receive-logs.ts
packages/next/src/server/dev/browser-logs/receive-logs.ts
+36
-3
hot-reloader-turbopack.ts
packages/next/src/server/dev/hot-reloader-turbopack.ts
+27
-1
hot-reloader-webpack.ts
packages/next/src/server/dev/hot-reloader-webpack.ts
+28
-1
pnpm-lock.yaml
pnpm-lock.yaml
+14
-14
No files found.
packages/next/package.json
View file @
76e7564b
...
@@ -105,7 +105,7 @@
...
@@ -105,7 +105,7 @@
"@anthropic-ai/claude-code"
:
"1.0.105"
,
"@anthropic-ai/claude-code"
:
"1.0.105"
,
"@anthropic-ai/sdk"
:
"0.61.0"
,
"@anthropic-ai/sdk"
:
"0.61.0"
,
"@modelcontextprotocol/sdk"
:
"1.17.5"
,
"@modelcontextprotocol/sdk"
:
"1.17.5"
,
"@next/env"
:
"15.
5.1-canary.2
4"
,
"@next/env"
:
"15.
6.0-canary.
4"
,
"@swc/helpers"
:
"0.5.15"
,
"@swc/helpers"
:
"0.5.15"
,
"@types/form-data"
:
"2.5.2"
,
"@types/form-data"
:
"2.5.2"
,
"caniuse-lite"
:
"^1.0.30001579"
,
"caniuse-lite"
:
"^1.0.30001579"
,
...
...
packages/next/src/client/dev/hot-reloader/app/web-socket.ts
View file @
76e7564b
...
@@ -12,10 +12,7 @@ import {
...
@@ -12,10 +12,7 @@ import {
processMessage
,
processMessage
,
type
StaticIndicatorState
,
type
StaticIndicatorState
,
}
from
'./hot-reloader-app'
}
from
'./hot-reloader-app'
import
{
import
{
logQueue
}
from
'../../../../next-devtools/userspace/app/forward-logs'
isTerminalLoggingEnabled
,
logQueue
,
}
from
'../../../../next-devtools/userspace/app/forward-logs'
import
{
InvariantError
}
from
'../../../../shared/lib/invariant-error'
import
{
InvariantError
}
from
'../../../../shared/lib/invariant-error'
export
function
createWebSocket
(
export
function
createWebSocket
(
...
@@ -34,11 +31,10 @@ export function createWebSocket(
...
@@ -34,11 +31,10 @@ export function createWebSocket(
webSocket
.
binaryType
=
'arraybuffer'
webSocket
.
binaryType
=
'arraybuffer'
if
(
isTerminalLoggingEnabled
)
{
// Always connect socket for file logging, regardless of terminal logging setting
webSocket
.
addEventListener
(
'open'
,
()
=>
{
webSocket
.
addEventListener
(
'open'
,
()
=>
{
logQueue
.
onSocketReady
(
webSocket
)
logQueue
.
onSocketReady
(
webSocket
)
})
})
}
const
sendMessage
=
(
data
:
string
)
=>
{
const
sendMessage
=
(
data
:
string
)
=>
{
if
(
webSocket
.
readyState
===
webSocket
.
OPEN
)
{
if
(
webSocket
.
readyState
===
webSocket
.
OPEN
)
{
...
...
packages/next/src/client/dev/hot-reloader/pages/websocket.ts
View file @
76e7564b
import
{
import
{
logQueue
}
from
'../../../../next-devtools/userspace/app/forward-logs'
isTerminalLoggingEnabled
,
logQueue
,
}
from
'../../../../next-devtools/userspace/app/forward-logs'
import
{
import
{
HMR_MESSAGE_SENT_TO_BROWSER
,
HMR_MESSAGE_SENT_TO_BROWSER
,
type
HmrMessageSentToBrowser
,
type
HmrMessageSentToBrowser
,
...
@@ -32,9 +29,8 @@ export function connectHMR(options: { path: string; assetPrefix: string }) {
...
@@ -32,9 +29,8 @@ export function connectHMR(options: { path: string; assetPrefix: string }) {
if
(
source
)
source
.
close
()
if
(
source
)
source
.
close
()
function
handleOnline
()
{
function
handleOnline
()
{
if
(
isTerminalLoggingEnabled
)
{
// Always connect socket for file logging, regardless of terminal logging setting
logQueue
.
onSocketReady
(
source
)
logQueue
.
onSocketReady
(
source
)
}
reconnections
=
0
reconnections
=
0
window
.
console
.
log
(
'[HMR] connected'
)
window
.
console
.
log
(
'[HMR] connected'
)
}
}
...
...
packages/next/src/next-devtools/dev-overlay/agent/chat-interface.tsx
0 → 100644
View file @
76e7564b
This diff is collapsed.
Click to expand it.
packages/next/src/next-devtools/userspace/app/app-dev-overlay-setup.ts
View file @
76e7564b
import
{
patchConsoleError
}
from
'./errors/intercept-console-error'
import
{
patchConsoleError
}
from
'./errors/intercept-console-error'
import
{
handleGlobalErrors
}
from
'./errors/use-error-handler'
import
{
handleGlobalErrors
}
from
'./errors/use-error-handler'
import
{
import
{
initializeDebugLogForwarding
}
from
'./forward-logs'
initializeDebugLogForwarding
,
isTerminalLoggingEnabled
,
}
from
'./forward-logs'
handleGlobalErrors
()
handleGlobalErrors
()
patchConsoleError
()
patchConsoleError
()
if
(
isTerminalLoggingEnabled
)
{
// Always initialize debug log forwarding for file logging
initializeDebugLogForwarding
(
'app'
)
initializeDebugLogForwarding
(
'app'
)
}
packages/next/src/next-devtools/userspace/app/errors/intercept-console-error.ts
View file @
76e7564b
...
@@ -2,7 +2,7 @@ import isError from '../../../../lib/is-error'
...
@@ -2,7 +2,7 @@ import isError from '../../../../lib/is-error'
import
{
isNextRouterError
}
from
'../../../../client/components/is-next-router-error'
import
{
isNextRouterError
}
from
'../../../../client/components/is-next-router-error'
import
{
handleConsoleError
}
from
'./use-error-handler'
import
{
handleConsoleError
}
from
'./use-error-handler'
import
{
parseConsoleArgs
}
from
'../../../../client/lib/console'
import
{
parseConsoleArgs
}
from
'../../../../client/lib/console'
import
{
forwardErrorLog
,
isTerminalLoggingEnabled
}
from
'../forward-logs'
import
{
forwardErrorLog
}
from
'../forward-logs'
export
const
originConsoleError
=
globalThis
.
console
.
error
export
const
originConsoleError
=
globalThis
.
console
.
error
...
@@ -37,9 +37,8 @@ export function patchConsoleError() {
...
@@ -37,9 +37,8 @@ export function patchConsoleError() {
args
args
)
)
}
}
if
(
isTerminalLoggingEnabled
)
{
forwardErrorLog
(
args
)
forwardErrorLog
(
args
)
}
originConsoleError
.
apply
(
window
.
console
,
args
)
originConsoleError
.
apply
(
window
.
console
,
args
)
}
}
...
...
packages/next/src/next-devtools/userspace/app/errors/use-error-handler.ts
View file @
76e7564b
...
@@ -7,11 +7,7 @@ import {
...
@@ -7,11 +7,7 @@ import {
import
isError
from
'../../../../lib/is-error'
import
isError
from
'../../../../lib/is-error'
import
{
createConsoleError
}
from
'../../../shared/console-error'
import
{
createConsoleError
}
from
'../../../shared/console-error'
import
{
coerceError
,
setOwnerStackIfAvailable
}
from
'./stitched-error'
import
{
coerceError
,
setOwnerStackIfAvailable
}
from
'./stitched-error'
import
{
import
{
forwardUnhandledError
,
logUnhandledRejection
}
from
'../forward-logs'
forwardUnhandledError
,
isTerminalLoggingEnabled
,
logUnhandledRejection
,
}
from
'../forward-logs'
const
queueMicroTask
=
const
queueMicroTask
=
globalThis
.
queueMicrotask
||
((
cb
:
()
=>
void
)
=>
Promise
.
resolve
().
then
(
cb
))
globalThis
.
queueMicrotask
||
((
cb
:
()
=>
void
)
=>
Promise
.
resolve
().
then
(
cb
))
...
@@ -100,9 +96,7 @@ function onUnhandledError(event: WindowEventMap['error']): void | boolean {
...
@@ -100,9 +96,7 @@ function onUnhandledError(event: WindowEventMap['error']): void | boolean {
const
error
=
coerceError
(
thrownValue
)
const
error
=
coerceError
(
thrownValue
)
setOwnerStackIfAvailable
(
error
)
setOwnerStackIfAvailable
(
error
)
handleClientError
(
error
)
handleClientError
(
error
)
if
(
isTerminalLoggingEnabled
)
{
forwardUnhandledError
(
error
)
forwardUnhandledError
(
error
)
}
}
}
}
}
...
@@ -121,9 +115,7 @@ function onUnhandledRejection(ev: WindowEventMap['unhandledrejection']): void {
...
@@ -121,9 +115,7 @@ function onUnhandledRejection(ev: WindowEventMap['unhandledrejection']): void {
handler
(
error
)
handler
(
error
)
}
}
if
(
isTerminalLoggingEnabled
)
{
logUnhandledRejection
(
reason
)
logUnhandledRejection
(
reason
)
}
}
}
export
function
handleGlobalErrors
()
{
export
function
handleGlobalErrors
()
{
...
...
packages/next/src/next-devtools/userspace/app/forward-logs.ts
View file @
76e7564b
...
@@ -171,6 +171,7 @@ export const logQueue: {
...
@@ -171,6 +171,7 @@ export const logQueue: {
sourceType
:
undefined
,
sourceType
:
undefined
,
router
:
null
,
router
:
null
,
scheduleLogSend
:
(
entry
:
ClientLogEntry
)
=>
{
scheduleLogSend
:
(
entry
:
ClientLogEntry
)
=>
{
// Always send logs to server for file logging, regardless of terminal logging setting
logQueue
.
entries
.
push
(
entry
)
logQueue
.
entries
.
push
(
entry
)
if
(
logQueue
.
flushScheduled
)
{
if
(
logQueue
.
flushScheduled
)
{
return
return
...
...
packages/next/src/next-devtools/userspace/pages/pages-dev-overlay-setup.tsx
View file @
76e7564b
...
@@ -15,7 +15,6 @@ import {
...
@@ -15,7 +15,6 @@ import {
forwardUnhandledError
,
forwardUnhandledError
,
logUnhandledRejection
,
logUnhandledRejection
,
forwardErrorLog
,
forwardErrorLog
,
isTerminalLoggingEnabled
,
}
from
'../app/forward-logs'
}
from
'../app/forward-logs'
const
usePagesDevOverlayBridge
=
()
=>
{
const
usePagesDevOverlayBridge
=
()
=>
{
...
@@ -82,9 +81,7 @@ function nextJsHandleConsoleError(...args: any[]) {
...
@@ -82,9 +81,7 @@ function nextJsHandleConsoleError(...args: any[]) {
storeHydrationErrorStateFromConsoleArgs
(...
args
)
storeHydrationErrorStateFromConsoleArgs
(...
args
)
// TODO: Surfaces non-errors logged via `console.error`.
// TODO: Surfaces non-errors logged via `console.error`.
handleError
(
maybeError
)
handleError
(
maybeError
)
if
(
isTerminalLoggingEnabled
)
{
forwardErrorLog
(
args
)
forwardErrorLog
(
args
)
}
origConsoleError
.
apply
(
window
.
console
,
args
)
origConsoleError
.
apply
(
window
.
console
,
args
)
}
}
...
@@ -92,7 +89,7 @@ function onUnhandledError(event: ErrorEvent) {
...
@@ -92,7 +89,7 @@ function onUnhandledError(event: ErrorEvent) {
const
error
=
event
?.
error
const
error
=
event
?.
error
handleError
(
error
)
handleError
(
error
)
if
(
error
&&
isTerminalLoggingEnabled
)
{
if
(
error
)
{
forwardUnhandledError
(
error
as
Error
)
forwardUnhandledError
(
error
as
Error
)
}
}
}
}
...
@@ -109,9 +106,8 @@ function onUnhandledRejection(ev: PromiseRejectionEvent) {
...
@@ -109,9 +106,8 @@ function onUnhandledRejection(ev: PromiseRejectionEvent) {
}
}
dispatcher
.
onUnhandledRejection
(
reason
)
dispatcher
.
onUnhandledRejection
(
reason
)
if
(
isTerminalLoggingEnabled
)
{
// Always log unhandled rejections for file logging
logUnhandledRejection
(
reason
)
logUnhandledRejection
(
reason
)
}
}
}
export
function
register
()
{
export
function
register
()
{
...
@@ -124,9 +120,8 @@ export function register() {
...
@@ -124,9 +120,8 @@ export function register() {
Error
.
stackTraceLimit
=
50
Error
.
stackTraceLimit
=
50
}
catch
{}
}
catch
{}
if
(
isTerminalLoggingEnabled
)
{
// Always initialize debug log forwarding for file logging
initializeDebugLogForwarding
(
'pages'
)
initializeDebugLogForwarding
(
'pages'
)
}
window
.
addEventListener
(
'error'
,
onUnhandledError
)
window
.
addEventListener
(
'error'
,
onUnhandledError
)
window
.
addEventListener
(
'unhandledrejection'
,
onUnhandledRejection
)
window
.
addEventListener
(
'unhandledrejection'
,
onUnhandledRejection
)
window
.
console
.
error
=
nextJsHandleConsoleError
window
.
console
.
error
=
nextJsHandleConsoleError
...
...
packages/next/src/server/dev/browser-logs/file-logger.ts
0 → 100644
View file @
76e7564b
import
{
promises
as
fs
}
from
'fs'
import
{
join
}
from
'path'
import
type
{
ServerLogEntry
}
from
'../../../next-devtools/shared/forward-logs-shared'
import
{
stripFormatSpecifiers
,
restoreUndefined
}
from
'./receive-logs'
import
type
{
MappingContext
}
from
'./source-map'
// Singleton instance to ensure one log file per dev session
let
globalFileLogger
:
FileLogger
|
null
=
null
export
class
FileLogger
{
private
logFilePath
:
string
private
writeQueue
:
string
[]
=
[]
private
isWriting
=
false
private
logsDir
:
string
private
logIndex
=
0
// Counter for log entries
constructor
(
distDir
:
string
)
{
this
.
logsDir
=
distDir
this
.
logFilePath
=
join
(
distDir
,
`next-session.log`
)
}
static
getInstance
(
distDir
:
string
):
FileLogger
{
if
(
!
globalFileLogger
)
{
globalFileLogger
=
new
FileLogger
(
distDir
)
}
return
globalFileLogger
}
private
formatTimestamp
():
string
{
const
now
=
new
Date
()
const
hours
=
String
(
now
.
getHours
()).
padStart
(
2
,
'0'
)
const
minutes
=
String
(
now
.
getMinutes
()).
padStart
(
2
,
'0'
)
const
seconds
=
String
(
now
.
getSeconds
()).
padStart
(
2
,
'0'
)
const
milliseconds
=
String
(
now
.
getMilliseconds
()).
padStart
(
3
,
'0'
)
return
`
${
hours
}
:
${
minutes
}
:
${
seconds
}
.
${
milliseconds
}
`
}
private
async
ensureLogFile
():
Promise
<
void
>
{
try
{
await
fs
.
access
(
this
.
logFilePath
)
}
catch
{
// create logs dir if it doesn't exist
await
fs
.
mkdir
(
this
.
logsDir
,
{
recursive
:
true
})
// File doesn't exist, create it
await
fs
.
writeFile
(
this
.
logFilePath
,
''
,
'utf8'
)
}
}
private
async
flushQueue
():
Promise
<
void
>
{
if
(
this
.
isWriting
||
this
.
writeQueue
.
length
===
0
)
{
return
}
this
.
isWriting
=
true
try
{
await
this
.
ensureLogFile
()
const
content
=
this
.
writeQueue
.
join
(
''
)
this
.
writeQueue
=
[]
await
fs
.
appendFile
(
this
.
logFilePath
,
content
,
'utf8'
)
}
catch
(
error
)
{
// If writing fails, put the content back in the queue
console
.
error
(
'Failed to write to log file:'
,
error
)
}
finally
{
this
.
isWriting
=
false
}
// If more items were added while we were writing, flush again
if
(
this
.
writeQueue
.
length
>
0
)
{
setImmediate
(()
=>
this
.
flushQueue
())
}
}
private
formatLogEntry
(
type
:
string
,
message
:
string
,
context
:
string
,
stack
?:
string
):
string
{
const
timestamp
=
this
.
formatTimestamp
()
const
typeCapitalized
=
type
.
charAt
(
0
).
toUpperCase
()
+
type
.
slice
(
1
).
toLowerCase
()
// Format: [12:18:41.157] [Server] Log message
// Pad context and type for alignment
const
contextPadded
=
context
.
padEnd
(
7
)
// "Server " or "Browser"
const
typePadded
=
typeCapitalized
.
padEnd
(
5
)
// "Log " or "Error"
let
logLine
=
`[
${
timestamp
}
] [
${
contextPadded
}
]
${
typePadded
}
${
message
}
`
if
(
stack
)
{
// Format stack trace with proper indentation to align with message content
const
stackLines
=
stack
.
split
(
'
\
n'
)
.
map
((
line
)
=>
line
.
trim
())
.
filter
(
Boolean
)
if
(
stackLines
.
length
>
0
)
{
// Indent to align with message: [timestamp] [context] type message
const
indent
=
' '
.
repeat
(
timestamp
.
length
+
context
.
length
+
typePadded
.
length
+
7
)
// 7 = brackets and spaces
logLine
+=
'
\
n'
+
stackLines
.
map
((
line
)
=>
`
${
indent
}${
line
}
`
).
join
(
'
\
n'
)
}
}
return
logLine
+
'
\
n'
}
private
serializeArgs
(
args
:
any
[]):
string
{
return
args
.
map
((
arg
)
=>
{
if
(
typeof
arg
===
'string'
)
{
return
arg
}
else
if
(
arg
&&
typeof
arg
===
'object'
)
{
try
{
return
JSON
.
stringify
(
arg
,
null
,
2
)
}
catch
{
return
String
(
arg
)
}
}
else
{
return
String
(
arg
)
}
})
.
join
(
' '
)
}
async
logEntry
(
entry
:
ServerLogEntry
,
ctx
?:
MappingContext
):
Promise
<
void
>
{
let
type
:
string
let
message
:
string
let
stack
:
string
|
undefined
// Determine context from mapping context
let
context
=
'Browser'
// Default to browser for client logs
if
(
ctx
)
{
if
(
ctx
.
isServer
||
ctx
.
isEdgeServer
)
{
context
=
'Server'
// Treat both server and edge as "Server"
}
}
switch
(
entry
.
kind
)
{
case
'console'
:
{
type
=
entry
.
method
// Process args similar to how it's done in receive-logs.ts
const
processedArgs
=
await
Promise
.
all
(
entry
.
args
.
map
(
async
(
arg
)
=>
{
if
(
arg
.
kind
===
'arg'
)
{
try
{
const
data
=
typeof
arg
.
data
===
'string'
?
JSON
.
parse
(
arg
.
data
)
:
arg
.
data
return
restoreUndefined
(
data
)
}
catch
{
return
restoreUndefined
(
arg
.
data
)
}
}
else
if
(
arg
.
kind
===
'formatted-error-arg'
)
{
// Skip stack processing for formatted errors
return
arg
.
prefix
}
})
)
message
=
this
.
serializeArgs
(
processedArgs
)
// Skip stack traces for console logs
break
}
case
'any-logged-error'
:
{
type
=
'error'
const
processedArgs
=
await
Promise
.
all
(
entry
.
args
.
map
(
async
(
arg
)
=>
{
if
(
arg
.
kind
===
'arg'
)
{
try
{
const
data
=
typeof
arg
.
data
===
'string'
?
JSON
.
parse
(
arg
.
data
)
:
arg
.
data
return
restoreUndefined
(
data
)
}
catch
{
return
restoreUndefined
(
arg
.
data
)
}
}
else
if
(
arg
.
kind
===
'formatted-error-arg'
)
{
// Skip stack processing for formatted errors
return
arg
.
prefix
}
})
)
message
=
this
.
serializeArgs
(
stripFormatSpecifiers
(
processedArgs
))
// Skip stack traces for logged errors too
break
}
case
'formatted-error'
:
{
type
=
'error'
message
=
entry
.
prefix
// Skip stack traces for formatted errors too
break
}
default
:
{
type
=
'unknown'
message
=
'Unknown log entry type'
break
}
}
const
logLine
=
this
.
formatLogEntry
(
type
,
message
,
context
,
stack
)
this
.
writeQueue
.
push
(
logLine
)
// Use setImmediate to avoid blocking the current execution
setImmediate
(()
=>
this
.
flushQueue
())
}
// Method to log server-side messages directly
async
logServerMessage
(
level
:
'log'
|
'info'
|
'warn'
|
'error'
|
'debug'
,
message
:
string
):
Promise
<
void
>
{
const
logLine
=
this
.
formatLogEntry
(
level
,
message
,
'Server'
)
this
.
writeQueue
.
push
(
logLine
)
setImmediate
(()
=>
this
.
flushQueue
())
}
async
close
():
Promise
<
void
>
{
// Flush any remaining logs
await
this
.
flushQueue
()
}
}
packages/next/src/server/dev/browser-logs/receive-logs.ts
View file @
76e7564b
...
@@ -13,6 +13,7 @@ import {
...
@@ -13,6 +13,7 @@ import {
type
ConsoleEntry
,
type
ConsoleEntry
,
UNDEFINED_MARKER
,
UNDEFINED_MARKER
,
}
from
'../../../next-devtools/shared/forward-logs-shared'
}
from
'../../../next-devtools/shared/forward-logs-shared'
import
{
FileLogger
}
from
'./file-logger'
export
function
restoreUndefined
(
x
:
any
):
any
{
export
function
restoreUndefined
(
x
:
any
):
any
{
if
(
x
===
UNDEFINED_MARKER
)
return
undefined
if
(
x
===
UNDEFINED_MARKER
)
return
undefined
...
@@ -417,11 +418,20 @@ export async function handleLog(
...
@@ -417,11 +418,20 @@ export async function handleLog(
entries
:
ServerLogEntry
[],
entries
:
ServerLogEntry
[],
ctx
:
MappingContext
,
ctx
:
MappingContext
,
distDir
:
string
,
distDir
:
string
,
config
:
boolean
|
{
logDepth
?:
number
;
showSourceLocation
?:
boolean
}
config
:
boolean
|
{
logDepth
?:
number
;
showSourceLocation
?:
boolean
},
fileLogger
:
FileLogger
):
Promise
<
void
>
{
):
Promise
<
void
>
{
const
browserPrefix
=
cyan
(
'[browser]'
)
const
browserPrefix
=
cyan
(
'[browser]'
)
for
(
const
entry
of
entries
)
{
for
(
const
entry
of
entries
)
{
// Log to file if fileLogger is provided
if
(
fileLogger
)
{
try
{
await
fileLogger
.
logEntry
(
entry
)
}
catch
(
error
)
{
console
.
error
(
'Failed to log to file:'
,
error
)
}
}
try
{
try
{
switch
(
entry
.
kind
)
{
switch
(
entry
.
kind
)
{
case
'console'
:
{
case
'console'
:
{
...
@@ -522,6 +532,23 @@ export async function handleLog(
...
@@ -522,6 +532,23 @@ export async function handleLog(
}
}
// the data is used later when we need to get sourcemaps for error stacks
// the data is used later when we need to get sourcemaps for error stacks
// Always log to file, regardless of terminal logging settings
export
async
function
logBrowserLogsToFile
(
opts
:
{
entries
:
ServerLogEntry
[]
distDir
:
string
ctx
?:
MappingContext
}):
Promise
<
void
>
{
const
fileLogger
=
FileLogger
.
getInstance
(
opts
.
distDir
)
for
(
const
entry
of
opts
.
entries
)
{
try
{
await
fileLogger
.
logEntry
(
entry
,
opts
.
ctx
)
}
catch
(
error
)
{
console
.
error
(
'Failed to log to file:'
,
error
)
}
}
}
export
async
function
receiveBrowserLogsWebpack
(
opts
:
{
export
async
function
receiveBrowserLogsWebpack
(
opts
:
{
entries
:
ServerLogEntry
[]
entries
:
ServerLogEntry
[]
router
:
'app'
|
'pages'
router
:
'app'
|
'pages'
...
@@ -559,7 +586,10 @@ export async function receiveBrowserLogsWebpack(opts: {
...
@@ -559,7 +586,10 @@ export async function receiveBrowserLogsWebpack(opts: {
rootDirectory
,
rootDirectory
,
}
}
await
handleLog
(
entries
,
ctx
,
distDir
,
opts
.
config
)
// Use singleton file logger instance
const
fileLogger
=
FileLogger
.
getInstance
(
distDir
)
await
handleLog
(
entries
,
ctx
,
distDir
,
opts
.
config
,
fileLogger
)
}
}
export
async
function
receiveBrowserLogsTurbopack
(
opts
:
{
export
async
function
receiveBrowserLogsTurbopack
(
opts
:
{
...
@@ -586,5 +616,8 @@ export async function receiveBrowserLogsTurbopack(opts: {
...
@@ -586,5 +616,8 @@ export async function receiveBrowserLogsTurbopack(opts: {
isAppDirectory
,
isAppDirectory
,
}
}
await
handleLog
(
entries
,
ctx
,
distDir
,
opts
.
config
)
// Use singleton file logger instance
const
fileLogger
=
FileLogger
.
getInstance
(
distDir
)
await
handleLog
(
entries
,
ctx
,
distDir
,
opts
.
config
,
fileLogger
)
}
}
packages/next/src/server/dev/hot-reloader-turbopack.ts
View file @
76e7564b
...
@@ -103,7 +103,10 @@ import { getSourceCodeMiddleware } from '../../next-devtools/server/source-code-
...
@@ -103,7 +103,10 @@ import { getSourceCodeMiddleware } from '../../next-devtools/server/source-code-
import
{
getRestartDevServerMiddleware
}
from
'../../next-devtools/server/restart-dev-server-middleware'
import
{
getRestartDevServerMiddleware
}
from
'../../next-devtools/server/restart-dev-server-middleware'
import
{
backgroundLogCompilationEvents
}
from
'../../shared/lib/turbopack/compilation-events'
import
{
backgroundLogCompilationEvents
}
from
'../../shared/lib/turbopack/compilation-events'
import
{
getSupportedBrowsers
}
from
'../../build/utils'
import
{
getSupportedBrowsers
}
from
'../../build/utils'
import
{
receiveBrowserLogsTurbopack
}
from
'./browser-logs/receive-logs'
import
{
receiveBrowserLogsTurbopack
,
logBrowserLogsToFile
,
}
from
'./browser-logs/receive-logs'
import
{
normalizePath
}
from
'../../lib/normalize-path'
import
{
normalizePath
}
from
'../../lib/normalize-path'
import
{
import
{
devToolsConfigMiddleware
,
devToolsConfigMiddleware
,
...
@@ -915,6 +918,29 @@ export async function createHotReloaderTurbopack(
...
@@ -915,6 +918,29 @@ export async function createHotReloaderTurbopack(
// TODO
// TODO
break
break
case
'browser-logs'
:
{
case
'browser-logs'
:
{
// Always log to file with sourcemap context
// Browser logs: if no sourceType specified, treat as client-side
// Only use server sourcemaps if explicitly marked as server/edge-server
const
isServerSourced
=
parsedData
.
sourceType
===
'server'
const
isEdgeServerSourced
=
parsedData
.
sourceType
===
'edge-server'
const
ctx
=
{
bundler
:
'turbopack'
as
const
,
project
,
projectPath
,
isServer
:
isServerSourced
,
isEdgeServer
:
isEdgeServerSourced
,
isAppDirectory
:
parsedData
.
router
===
'app'
,
}
await
logBrowserLogsToFile
({
entries
:
parsedData
.
entries
,
distDir
,
ctx
,
})
// Only log to terminal if enabled
if
(
nextConfig
.
experimental
.
browserDebugInfoInTerminal
)
{
if
(
nextConfig
.
experimental
.
browserDebugInfoInTerminal
)
{
await
receiveBrowserLogsTurbopack
({
await
receiveBrowserLogsTurbopack
({
entries
:
parsedData
.
entries
,
entries
:
parsedData
.
entries
,
...
...
packages/next/src/server/dev/hot-reloader-webpack.ts
View file @
76e7564b
...
@@ -95,7 +95,10 @@ import { getSourceCodeMiddleware } from '../../next-devtools/server/source-code-
...
@@ -95,7 +95,10 @@ import { getSourceCodeMiddleware } from '../../next-devtools/server/source-code-
import
getWebpackBundler
from
'../../shared/lib/get-webpack-bundler'
import
getWebpackBundler
from
'../../shared/lib/get-webpack-bundler'
import
{
getRestartDevServerMiddleware
}
from
'../../next-devtools/server/restart-dev-server-middleware'
import
{
getRestartDevServerMiddleware
}
from
'../../next-devtools/server/restart-dev-server-middleware'
import
{
checkPersistentCacheInvalidationAndCleanup
}
from
'../../build/webpack/cache-invalidation'
import
{
checkPersistentCacheInvalidationAndCleanup
}
from
'../../build/webpack/cache-invalidation'
import
{
receiveBrowserLogsWebpack
}
from
'./browser-logs/receive-logs'
import
{
receiveBrowserLogsWebpack
,
logBrowserLogsToFile
,
}
from
'./browser-logs/receive-logs'
import
{
import
{
devToolsConfigMiddleware
,
devToolsConfigMiddleware
,
getDevToolsConfig
,
getDevToolsConfig
,
...
@@ -571,6 +574,30 @@ export default class HotReloaderWebpack implements NextJsHotReloaderInterface {
...
@@ -571,6 +574,30 @@ export default class HotReloaderWebpack implements NextJsHotReloaderInterface {
break
break
}
}
case
'browser-logs'
:
{
case
'browser-logs'
:
{
// Always log to file with sourcemap context
// Browser logs: if no sourceType specified, treat as client-side
// Only use server sourcemaps if explicitly marked as server/edge-server
const
isServerSourced
=
payload
.
sourceType
===
'server'
const
isEdgeServerSourced
=
payload
.
sourceType
===
'edge-server'
const
ctx
=
{
bundler
:
'webpack'
as
const
,
isServer
:
isServerSourced
,
isEdgeServer
:
isEdgeServerSourced
,
isAppDirectory
:
payload
.
router
===
'app'
,
clientStats
:
()
=>
this
.
clientStats
,
serverStats
:
()
=>
this
.
serverStats
,
edgeServerStats
:
()
=>
this
.
edgeServerStats
,
rootDirectory
:
this
.
dir
,
}
await
logBrowserLogsToFile
({
entries
:
payload
.
entries
,
distDir
:
this
.
distDir
,
ctx
,
})
// Only log to terminal if enabled
if
(
this
.
config
.
experimental
.
browserDebugInfoInTerminal
)
{
if
(
this
.
config
.
experimental
.
browserDebugInfoInTerminal
)
{
await
receiveBrowserLogsWebpack
({
await
receiveBrowserLogsWebpack
({
entries
:
payload
.
entries
,
entries
:
payload
.
entries
,
...
...
pnpm-lock.yaml
View file @
76e7564b
...
@@ -162,7 +162,7 @@ importers:
...
@@ -162,7 +162,7 @@ importers:
version
:
1.1.0
version
:
1.1.0
'
@testing-library/jest-dom'
:
'
@testing-library/jest-dom'
:
specifier
:
6.1.2
specifier
:
6.1.2
version
:
6.1.2(@jest/globals@29.7.0)(@types/jest@29.5.5)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))(vitest@3.0.4(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))(sass@1.54.0)(tsx@4.19.2))
version
:
6.1.2(@jest/globals@29.7.0)(@types/jest@29.5.5)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)(vitest@3.0.4(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))(sass@1.54.0)(tsx@4.19.2))
'
@testing-library/react'
:
'
@testing-library/react'
:
specifier
:
^15.0.5
specifier
:
^15.0.5
version
:
15.0.7(@types/react@19.1.13)(react-dom@19.2.0-canary-8a8e9a7e-20250912(react@19.2.0-canary-8a8e9a7e-20250912))(react@19.2.0-canary-8a8e9a7e-20250912)
version
:
15.0.7(@types/react@19.1.13)(react-dom@19.2.0-canary-8a8e9a7e-20250912(react@19.2.0-canary-8a8e9a7e-20250912))(react@19.2.0-canary-8a8e9a7e-20250912)
...
@@ -297,7 +297,7 @@ importers:
...
@@ -297,7 +297,7 @@ importers:
version
:
2.31.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)
version
:
2.31.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)
eslint-plugin-jest
:
eslint-plugin-jest
:
specifier
:
27.6.3
specifier
:
27.6.3
version
:
27.6.3(@typescript-eslint/eslint-plugin@8.36.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))(typescript@5.8.2)
version
:
27.6.3(@typescript-eslint/eslint-plugin@8.36.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)(typescript@5.8.2)
eslint-plugin-jsdoc
:
eslint-plugin-jsdoc
:
specifier
:
48.0.4
specifier
:
48.0.4
version
:
48.0.4(eslint@9.12.0)
version
:
48.0.4(eslint@9.12.0)
...
@@ -387,7 +387,7 @@ importers:
...
@@ -387,7 +387,7 @@ importers:
version
:
29.7.0
version
:
29.7.0
jest-extended
:
jest-extended
:
specifier
:
4.0.2
specifier
:
4.0.2
version
:
4.0.2(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))
version
:
4.0.2(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)
jest-junit
:
jest-junit
:
specifier
:
16.0.0
specifier
:
16.0.0
version
:
16.0.0
version
:
16.0.0
...
@@ -936,8 +936,8 @@ importers:
...
@@ -936,8 +936,8 @@ importers:
specifier
:
1.17.5
specifier
:
1.17.5
version
:
1.17.5
version
:
1.17.5
'
@next/env'
:
'
@next/env'
:
specifier
:
15.
5.1-canary.2
4
specifier
:
15.
6.0-canary.
4
version
:
15.
5.1-canary.2
4
version
:
15.
6.0-canary.
4
'
@swc/helpers'
:
'
@swc/helpers'
:
specifier
:
0.5.15
specifier
:
0.5.15
version
:
0.5.15
version
:
0.5.15
...
@@ -965,6 +965,9 @@ importers:
...
@@ -965,6 +965,9 @@ importers:
styled-jsx
:
styled-jsx
:
specifier
:
5.1.6
specifier
:
5.1.6
version
:
5.1.6(@babel/core@7.26.10)(babel-plugin-macros@3.1.0)(react@19.2.0-canary-8a8e9a7e-20250912)
version
:
5.1.6(@babel/core@7.26.10)(babel-plugin-macros@3.1.0)(react@19.2.0-canary-8a8e9a7e-20250912)
zod
:
specifier
:
3.25.76
version
:
3.25.76
optionalDependencies
:
optionalDependencies
:
sharp
:
sharp
:
specifier
:
^0.34.3
specifier
:
^0.34.3
...
@@ -1627,9 +1630,6 @@ importers:
...
@@ -1627,9 +1630,6 @@ importers:
ws
:
ws
:
specifier
:
8.2.3
specifier
:
8.2.3
version
:
8.2.3
version
:
8.2.3
zod
:
specifier
:
3.25.76
version
:
3.25.76
zod-to-json-schema
:
zod-to-json-schema
:
specifier
:
3.23.5
specifier
:
3.23.5
version
:
3.23.5(zod@3.25.76)
version
:
3.23.5(zod@3.25.76)
...
@@ -4553,8 +4553,8 @@ packages:
...
@@ -4553,8 +4553,8 @@ packages:
'
@napi-rs/wasm-runtime@1.0.3'
:
'
@napi-rs/wasm-runtime@1.0.3'
:
resolution
:
{
integrity
:
sha512-rZxtMsLwjdXkMUGC3WwsPwLNVqVqnTJT6MNIB6e+5fhMcSCPP0AOsNWuMQ5mdCq6HNjs/ZeWAEchpqeprqBD2Q==
}
resolution
:
{
integrity
:
sha512-rZxtMsLwjdXkMUGC3WwsPwLNVqVqnTJT6MNIB6e+5fhMcSCPP0AOsNWuMQ5mdCq6HNjs/ZeWAEchpqeprqBD2Q==
}
'
@next/env@15.
5.1-canary.2
4'
:
'
@next/env@15.
6.0-canary.
4'
:
resolution
:
{
integrity
:
sha512-
/RdPfUB8X7M1Y1Zc9rppY0Jx9X8supO/M+LngZ3jddu8ueWFlDYbWMbwdFKRsG2kdLELhvyQkkaOWvZQA7F4Lw
==
}
resolution
:
{
integrity
:
sha512-
wuqv+KeDdKwtYZDvcjB1UNRRTw09CRzSyBbb5JErwo21AZFr68xn1mvKj6Pu0U6JGv7eMhC2y4GNINWxGfVGUg
==
}
'
@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1'
:
'
@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1'
:
resolution
:
{
integrity
:
sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
}
resolution
:
{
integrity
:
sha512-54/JRvkLIzzDWshCWfuhadfrfZVPiElY8Fcgmg1HroEly/EDSszzhBAsarCux+D/kOslTRquNzuyGSmUSTTHGg==
}
...
@@ -20464,7 +20464,7 @@ snapshots:
...
@@ -20464,7 +20464,7 @@ snapshots:
'
@tybys/wasm-util'
:
0.10.0
'
@tybys/wasm-util'
:
0.10.0
optional
:
true
optional
:
true
'
@next/env@15.
5.1-canary.2
4'
:
{}
'
@next/env@15.
6.0-canary.
4'
:
{}
'
@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1'
:
'
@nicolo-ribaudo/eslint-scope-5-internals@5.1.1-v1'
:
dependencies
:
dependencies
:
...
@@ -21590,7 +21590,7 @@ snapshots:
...
@@ -21590,7 +21590,7 @@ snapshots:
lz-string
:
1.5.0
lz-string
:
1.5.0
pretty-format
:
27.5.1
pretty-format
:
27.5.1
'
@testing-library/jest-dom@6.1.2(@jest/globals@29.7.0)(@types/jest@29.5.5)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))(vitest@3.0.4(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))(sass@1.54.0)(tsx@4.19.2))'
:
'
@testing-library/jest-dom@6.1.2(@jest/globals@29.7.0)(@types/jest@29.5.5)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)(vitest@3.0.4(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))(sass@1.54.0)(tsx@4.19.2))'
:
dependencies
:
dependencies
:
'
@adobe/css-tools'
:
4.3.1
'
@adobe/css-tools'
:
4.3.1
'
@babel/runtime'
:
7.27.0
'
@babel/runtime'
:
7.27.0
...
@@ -25831,7 +25831,7 @@ snapshots:
...
@@ -25831,7 +25831,7 @@ snapshots:
-
eslint-import-resolver-webpack
-
eslint-import-resolver-webpack
-
supports-color
-
supports-color
eslint-plugin-jest@27.6.3(@typescript-eslint/eslint-plugin@8.36.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))(typescript@5.8.2)
:
eslint-plugin-jest@27.6.3(@typescript-eslint/eslint-plugin@8.36.0(@typescript-eslint/parser@8.36.0(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(typescript@5.8.2))(eslint@9.12.0)(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)(typescript@5.8.2)
:
dependencies
:
dependencies
:
'
@typescript-eslint/utils'
:
5.62.0(eslint@9.12.0)(typescript@5.8.2)
'
@typescript-eslint/utils'
:
5.62.0(eslint@9.12.0)(typescript@5.8.2)
eslint
:
9.12.0
eslint
:
9.12.0
...
@@ -28536,7 +28536,7 @@ snapshots:
...
@@ -28536,7 +28536,7 @@ snapshots:
jest-mock
:
29.7.0
jest-mock
:
29.7.0
jest-util
:
29.7.0
jest-util
:
29.7.0
jest-extended@4.0.2(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu)))
:
jest-extended@4.0.2(jest@29.7.0(@types/node@20.17.6(patch_hash=rvl3vkomen3tospgr67bzubfyu))
(babel-plugin-macros@3.1.0)
)
:
dependencies
:
dependencies
:
jest-diff
:
29.7.0
jest-diff
:
29.7.0
jest-get-type
:
29.6.3
jest-get-type
:
29.6.3
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