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
28b61a8c
Commit
28b61a8c
authored
Feb 08, 2019
by
Connor Davis
Committed by
Tim Neutkens
Feb 08, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove Unneeded _error import (#6224)
parent
cc0b3ef4
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
16 additions
and
18 deletions
+16
-18
render.tsx
packages/next-server/server/render.tsx
+16
-18
No files found.
packages/next-server/server/render.tsx
View file @
28b61a8c
...
@@ -15,19 +15,19 @@ type ComponentsEnhancer = {enhanceApp?: Enhancer, enhanceComponent?: Enhancer}|E
...
@@ -15,19 +15,19 @@ type ComponentsEnhancer = {enhanceApp?: Enhancer, enhanceComponent?: Enhancer}|E
function
enhanceComponents
(
options
:
ComponentsEnhancer
,
App
:
React
.
ComponentType
,
Component
:
React
.
ComponentType
):
{
function
enhanceComponents
(
options
:
ComponentsEnhancer
,
App
:
React
.
ComponentType
,
Component
:
React
.
ComponentType
):
{
App
:
React
.
ComponentType
,
App
:
React
.
ComponentType
,
Component
:
React
.
ComponentType
Component
:
React
.
ComponentType
,
}
{
}
{
// For backwards compatibility
// For backwards compatibility
if
(
typeof
options
===
'function'
)
{
if
(
typeof
options
===
'function'
)
{
return
{
return
{
App
:
App
,
App
,
Component
:
options
(
Component
)
Component
:
options
(
Component
)
,
}
}
}
}
return
{
return
{
App
:
options
.
enhanceApp
?
options
.
enhanceApp
(
App
)
:
App
,
App
:
options
.
enhanceApp
?
options
.
enhanceApp
(
App
)
:
App
,
Component
:
options
.
enhanceComponent
?
options
.
enhanceComponent
(
Component
)
:
Component
Component
:
options
.
enhanceComponent
?
options
.
enhanceComponent
(
Component
)
:
Component
,
}
}
}
}
...
@@ -57,7 +57,7 @@ type RenderOpts = {
...
@@ -57,7 +57,7 @@ type RenderOpts = {
Component
:
React
.
ComponentType
,
Component
:
React
.
ComponentType
,
Document
:
React
.
ComponentType
,
Document
:
React
.
ComponentType
,
App
:
React
.
ComponentType
,
App
:
React
.
ComponentType
,
ErrorDebug
?:
React
.
ComponentType
<
{
error
:
Error
}
>
ErrorDebug
?:
React
.
ComponentType
<
{
error
:
Error
}
>
,
}
}
function
renderDocument
(
Document
:
React
.
ComponentType
,
{
function
renderDocument
(
Document
:
React
.
ComponentType
,
{
...
@@ -97,7 +97,7 @@ function renderDocument(Document: React.ComponentType, {
...
@@ -97,7 +97,7 @@ function renderDocument(Document: React.ComponentType, {
runtimeConfig
,
// runtimeConfig if provided, otherwise don't sent in the resulting HTML
runtimeConfig
,
// runtimeConfig if provided, otherwise don't sent in the resulting HTML
nextExport
,
// If this is a page exported by `next export`
nextExport
,
// If this is a page exported by `next export`
dynamicIds
:
dynamicImportsIds
.
length
===
0
?
undefined
:
dynamicImportsIds
,
dynamicIds
:
dynamicImportsIds
.
length
===
0
?
undefined
:
dynamicImportsIds
,
err
:
(
err
)
?
serializeError
(
dev
,
err
)
:
undefined
// Error if one happened, otherwise don't sent in the resulting HTML
err
:
(
err
)
?
serializeError
(
dev
,
err
)
:
undefined
,
// Error if one happened, otherwise don't sent in the resulting HTML
}
}
}
}
staticMarkup=
{
staticMarkup
}
staticMarkup=
{
staticMarkup
}
devFiles=
{
devFiles
}
devFiles=
{
devFiles
}
...
@@ -105,11 +105,11 @@ function renderDocument(Document: React.ComponentType, {
...
@@ -105,11 +105,11 @@ function renderDocument(Document: React.ComponentType, {
dynamicImports=
{
dynamicImports
}
dynamicImports=
{
dynamicImports
}
assetPrefix=
{
assetPrefix
}
assetPrefix=
{
assetPrefix
}
{
...
docProps
}
{
...
docProps
}
/>
/>
,
)
)
}
}
export
async
function
renderToHTML
(
req
:
IncomingMessage
,
res
:
ServerResponse
,
pathname
:
string
,
query
:
ParsedUrlQuery
,
renderOpts
:
RenderOpts
):
Promise
<
string
|
null
>
{
export
async
function
renderToHTML
(
req
:
IncomingMessage
,
res
:
ServerResponse
,
pathname
:
string
,
query
:
ParsedUrlQuery
,
renderOpts
:
RenderOpts
):
Promise
<
string
|
null
>
{
const
{
const
{
err
,
err
,
dev
=
false
,
dev
=
false
,
...
@@ -119,10 +119,9 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...
@@ -119,10 +119,9 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
Component
,
Component
,
buildManifest
,
buildManifest
,
reactLoadableManifest
,
reactLoadableManifest
,
ErrorDebug
ErrorDebug
,
}
=
renderOpts
}
=
renderOpts
await
Loadable
.
preloadAll
()
// Make sure all dynamic imports are loaded
await
Loadable
.
preloadAll
()
// Make sure all dynamic imports are loaded
if
(
dev
)
{
if
(
dev
)
{
...
@@ -153,15 +152,14 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...
@@ -153,15 +152,14 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...
new
Set
([
...
new
Set
([
...
getPageFiles
(
buildManifest
,
pathname
),
...
getPageFiles
(
buildManifest
,
pathname
),
...
getPageFiles
(
buildManifest
,
'/_app'
),
...
getPageFiles
(
buildManifest
,
'/_app'
),
...
getPageFiles
(
buildManifest
,
'/_error'
)
]),
])
]
]
const
reactLoadableModules
:
string
[]
=
[]
const
reactLoadableModules
:
string
[]
=
[]
const
renderPage
=
(
options
:
ComponentsEnhancer
=
{}):
{
html
:
string
,
head
:
any
}
=>
{
const
renderPage
=
(
options
:
ComponentsEnhancer
=
{}):
{
html
:
string
,
head
:
any
}
=>
{
const
renderElementToString
=
staticMarkup
?
renderToStaticMarkup
:
renderToString
const
renderElementToString
=
staticMarkup
?
renderToStaticMarkup
:
renderToString
if
(
err
&&
ErrorDebug
)
{
if
(
err
&&
ErrorDebug
)
{
return
render
(
renderElementToString
,
<
ErrorDebug
error=
{
err
}
/>)
return
render
(
renderElementToString
,
<
ErrorDebug
error=
{
err
}
/>)
}
}
...
@@ -174,7 +172,7 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...
@@ -174,7 +172,7 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
router=
{
router
}
router=
{
router
}
{
...
props
}
{
...
props
}
/>
/>
</
LoadableCapture
>
</
LoadableCapture
>
,
)
)
}
}
...
@@ -194,16 +192,16 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...
@@ -194,16 +192,16 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
dynamicImportsIds
,
dynamicImportsIds
,
dynamicImports
,
dynamicImports
,
files
,
files
,
devFiles
devFiles
,
})
})
}
}
function
errorToJSON
(
err
:
Error
):
Error
{
function
errorToJSON
(
err
:
Error
):
Error
{
const
{
name
,
message
,
stack
}
=
err
const
{
name
,
message
,
stack
}
=
err
return
{
name
,
message
,
stack
}
return
{
name
,
message
,
stack
}
}
}
function
serializeError
(
dev
:
boolean
|
undefined
,
err
:
Error
):
Error
&
{
statusCode
?:
number
}
{
function
serializeError
(
dev
:
boolean
|
undefined
,
err
:
Error
):
Error
&
{
statusCode
?:
number
}
{
if
(
dev
)
{
if
(
dev
)
{
return
errorToJSON
(
err
)
return
errorToJSON
(
err
)
}
}
...
...
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