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
85b60af2
Unverified
Commit
85b60af2
authored
May 14, 2020
by
Joe Haddad
Committed by
GitHub
May 14, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove `isInitialRender` usage for overlay (#12872)
parent
eed3923c
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
40 additions
and
23 deletions
+40
-23
index.js
packages/next/client/index.js
+40
-23
No files found.
packages/next/client/index.js
View file @
85b60af2
...
@@ -223,6 +223,40 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
...
@@ -223,6 +223,40 @@ export default async ({ webpackHMR: passedWebpackHMR } = {}) => {
initialErr
=
error
initialErr
=
error
}
}
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
const
{
getNodeError
}
=
require
(
'@next/react-dev-overlay/lib/client'
)
// Server-side runtime errors need to be re-thrown on the client-side so
// that the overlay is rendered.
if
(
initialErr
)
{
if
(
initialErr
===
err
)
{
setTimeout
(()
=>
{
let
error
try
{
// Generate a new error object. We `throw` it because some browsers
// will set the `stack` when thrown, and we want to ensure ours is
// not overridden when we re-throw it below.
throw
new
Error
(
initialErr
.
message
)
}
catch
(
e
)
{
error
=
e
}
error
.
name
=
initialErr
.
name
error
.
stack
=
initialErr
.
stack
const
node
=
getNodeError
(
error
)
throw
node
})
}
// We replaced the server-side error with a client-side error, and should
// no longer rewrite the stack trace to a Node error.
else
{
setTimeout
(()
=>
{
throw
initialErr
})
}
}
}
if
(
window
.
__NEXT_PRELOADREADY
)
{
if
(
window
.
__NEXT_PRELOADREADY
)
{
await
window
.
__NEXT_PRELOADREADY
(
dynamicIds
)
await
window
.
__NEXT_PRELOADREADY
(
dynamicIds
)
}
}
...
@@ -273,6 +307,12 @@ export async function render(props) {
...
@@ -273,6 +307,12 @@ export async function render(props) {
try
{
try
{
await
doRender
(
props
)
await
doRender
(
props
)
}
catch
(
err
)
{
}
catch
(
err
)
{
if
(
process
.
env
.
NODE_ENV
===
'development'
)
{
// Ensure this error is displayed in the overlay in development
setTimeout
(()
=>
{
throw
err
})
}
await
renderError
({
...
props
,
err
})
await
renderError
({
...
props
,
err
})
}
}
}
}
...
@@ -291,29 +331,6 @@ export function renderError(props) {
...
@@ -291,29 +331,6 @@ export function renderError(props) {
// FIXME: let's make this recoverable (error in GIP client-transition)
// FIXME: let's make this recoverable (error in GIP client-transition)
webpackHMR
.
onUnrecoverableError
()
webpackHMR
.
onUnrecoverableError
()
const
{
getNodeError
}
=
require
(
'@next/react-dev-overlay/lib/client'
)
// Server-side runtime errors need to be re-thrown on the client-side so
// that the overlay is rendered.
if
(
isInitialRender
)
{
setTimeout
(()
=>
{
let
error
try
{
// Generate a new error object. We `throw` it because some browsers
// will set the `stack` when thrown, and we want to ensure ours is
// not overridden when we re-throw it below.
throw
new
Error
(
err
.
message
)
}
catch
(
e
)
{
error
=
e
}
error
.
name
=
err
.
name
error
.
stack
=
err
.
stack
const
node
=
getNodeError
(
error
)
throw
node
})
}
// We need to render an empty <App> so that the `<ReactDevOverlay>` can
// We need to render an empty <App> so that the `<ReactDevOverlay>` can
// render itself.
// render itself.
return
doRender
({
return
doRender
({
...
...
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