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
87ff667e
Commit
87ff667e
authored
Apr 01, 2017
by
Arunoda Susiripala
Committed by
Guillermo Rauch
Apr 01, 2017
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "Introduce better debug error handling (#1590)" (#1591)
This reverts commit
0bdd3216
.
parent
0bdd3216
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
58 deletions
+20
-58
index.js
client/index.js
+11
-38
next-dev.js
client/next-dev.js
+6
-13
app.js
lib/app.js
+2
-1
document.js
server/document.js
+1
-6
No files found.
client/index.js
View file @
87ff667e
...
@@ -6,7 +6,6 @@ import { createRouter } from '../lib/router'
...
@@ -6,7 +6,6 @@ import { createRouter } from '../lib/router'
import
App
from
'../lib/app'
import
App
from
'../lib/app'
import
evalScript
from
'../lib/eval-script'
import
evalScript
from
'../lib/eval-script'
import
{
loadGetInitialProps
,
getURL
}
from
'../lib/utils'
import
{
loadGetInitialProps
,
getURL
}
from
'../lib/utils'
import
ErrorDebugComponent
from
'../lib/error-debug'
// Polyfill Promise globally
// Polyfill Promise globally
// This is needed because Webpack2's dynamic loading(common chunks) code
// This is needed because Webpack2's dynamic loading(common chunks) code
...
@@ -40,57 +39,33 @@ export const router = createRouter(pathname, query, getURL(), {
...
@@ -40,57 +39,33 @@ export const router = createRouter(pathname, query, getURL(), {
})
})
const
headManager
=
new
HeadManager
()
const
headManager
=
new
HeadManager
()
const
appContainer
=
document
.
getElementById
(
'__next'
)
const
container
=
document
.
getElementById
(
'__next'
)
const
errorContainer
=
document
.
getElementById
(
'__next-error'
)
export
default
()
=>
{
export
default
(
onError
)
=>
{
const
emitter
=
mitt
()
const
emitter
=
mitt
()
router
.
subscribe
(({
Component
,
props
,
hash
,
err
})
=>
{
router
.
subscribe
(({
Component
,
props
,
hash
,
err
})
=>
{
render
({
Component
,
props
,
err
,
hash
,
emitter
})
render
({
Component
,
props
,
err
,
hash
,
emitter
}
,
onError
)
})
})
const
hash
=
location
.
hash
.
substring
(
1
)
const
hash
=
location
.
hash
.
substring
(
1
)
render
({
Component
,
props
,
hash
,
err
,
emitter
})
render
({
Component
,
props
,
hash
,
err
,
emitter
}
,
onError
)
return
emitter
return
emitter
}
}
export
async
function
render
(
props
)
{
export
async
function
render
(
props
,
onError
=
renderErrorComponent
)
{
if
(
props
.
err
)
{
await
renderError
(
props
.
err
)
return
}
try
{
try
{
await
doRender
(
props
)
await
doRender
(
props
)
}
catch
(
err
)
{
}
catch
(
err
)
{
if
(
err
.
abort
)
return
await
onError
(
err
)
await
renderError
(
err
)
}
}
}
}
// This method handles all runtime and debug errors.
async
function
renderErrorComponent
(
err
)
{
// 404 and 500 errors are special kind of errors
const
{
pathname
,
query
}
=
router
// and they are still handle via the main render method.
const
props
=
await
loadGetInitialProps
(
ErrorComponent
,
{
err
,
pathname
,
query
})
export
async
function
renderError
(
error
)
{
await
doRender
({
Component
:
ErrorComponent
,
props
,
err
})
const
prod
=
process
.
env
.
NODE_ENV
===
'production'
// We need to unmount the current app component because it's
// in the inconsistant state.
// Otherwise, we need to face issues when the issue is fixed and
// it's get notified via HMR
ReactDOM
.
unmountComponentAtNode
(
appContainer
)
const
errorMessage
=
`
${
error
.
message
}
\n
${
error
.
stack
}
`
console
.
error
(
errorMessage
)
if
(
prod
)
{
const
initProps
=
{
err
:
error
,
pathname
,
query
}
const
props
=
await
loadGetInitialProps
(
ErrorComponent
,
initProps
)
ReactDOM
.
render
(
createElement
(
ErrorComponent
,
props
),
errorContainer
)
}
else
{
ReactDOM
.
render
(
createElement
(
ErrorDebugComponent
,
{
error
}),
errorContainer
)
}
}
}
async
function
doRender
({
Component
,
props
,
hash
,
err
,
emitter
})
{
async
function
doRender
({
Component
,
props
,
hash
,
err
,
emitter
})
{
...
@@ -113,9 +88,7 @@ async function doRender ({ Component, props, hash, err, emitter }) {
...
@@ -113,9 +88,7 @@ async function doRender ({ Component, props, hash, err, emitter }) {
// lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.
// lastAppProps has to be set before ReactDom.render to account for ReactDom throwing an error.
lastAppProps
=
appProps
lastAppProps
=
appProps
// We need to clear any existing runtime error messages
ReactDOM
.
render
(
createElement
(
App
,
appProps
),
container
)
ReactDOM
.
unmountComponentAtNode
(
errorContainer
)
ReactDOM
.
render
(
createElement
(
App
,
appProps
),
appContainer
)
if
(
emitter
)
{
if
(
emitter
)
{
emitter
.
emit
(
'after-reactdom-render'
,
{
Component
})
emitter
.
emit
(
'after-reactdom-render'
,
{
Component
})
...
...
client/next-dev.js
View file @
87ff667e
import
evalScript
from
'../lib/eval-script'
import
evalScript
from
'../lib/eval-script'
import
ReactReconciler
from
'react-dom/lib/ReactReconciler'
const
{
__NEXT_DATA__
:
{
errorComponent
}
}
=
window
const
{
__NEXT_DATA__
:
{
errorComponent
}
}
=
window
const
ErrorComponent
=
evalScript
(
errorComponent
).
default
const
ErrorComponent
=
evalScript
(
errorComponent
).
default
...
@@ -8,18 +7,12 @@ require('react-hot-loader/patch')
...
@@ -8,18 +7,12 @@ require('react-hot-loader/patch')
const
next
=
window
.
next
=
require
(
'./'
)
const
next
=
window
.
next
=
require
(
'./'
)
const
emitter
=
next
.
default
()
const
emitter
=
next
.
default
(
onError
)
// This is a patch to catch most of the errors throw inside React components.
function
onError
(
err
)
{
const
originalMountComponent
=
ReactReconciler
.
mountComponent
// just show the debug screen but don't render ErrorComponent
ReactReconciler
.
mountComponent
=
function
(...
args
)
{
// so that the current component doesn't lose props
try
{
next
.
render
({
err
,
emitter
})
return
originalMountComponent
(...
args
)
}
catch
(
err
)
{
next
.
renderError
(
err
)
err
.
abort
=
true
throw
err
}
}
}
let
lastScroll
let
lastScroll
...
...
lib/app.js
View file @
87ff667e
...
@@ -17,7 +17,7 @@ export default class App extends Component {
...
@@ -17,7 +17,7 @@ export default class App extends Component {
}
}
render
()
{
render
()
{
const
{
Component
,
props
,
hash
,
router
}
=
this
.
props
const
{
Component
,
props
,
hash
,
err
,
router
}
=
this
.
props
const
url
=
createUrl
(
router
)
const
url
=
createUrl
(
router
)
// If there no component exported we can't proceed.
// If there no component exported we can't proceed.
// We'll tackle that here.
// We'll tackle that here.
...
@@ -28,6 +28,7 @@ export default class App extends Component {
...
@@ -28,6 +28,7 @@ export default class App extends Component {
return
<
div
>
return
<
div
>
<
Container
{...
containerProps
}
/
>
<
Container
{...
containerProps
}
/
>
{
ErrorDebug
&&
err
?
<
ErrorDebug
error
=
{
err
}
/> : null
}
<
/div
>
<
/div
>
}
}
}
}
...
...
server/document.js
View file @
87ff667e
...
@@ -50,12 +50,7 @@ export class Main extends Component {
...
@@ -50,12 +50,7 @@ export class Main extends Component {
render
()
{
render
()
{
const
{
html
}
=
this
.
context
.
_documentProps
const
{
html
}
=
this
.
context
.
_documentProps
return
(
return
<
div
id
=
'__next'
dangerouslySetInnerHTML
=
{{
__html
:
html
}}
/
>
<
div
>
<
div
id
=
'__next'
dangerouslySetInnerHTML
=
{{
__html
:
html
}}
/
>
<
div
id
=
'__next-error'
/>
<
/div
>
)
}
}
}
}
...
...
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