Skip to content

Commit

Permalink
Remove Unneeded _error import (#6224)
Browse files Browse the repository at this point in the history
  • Loading branch information
dav-is authored and timneutkens committed Feb 8, 2019
1 parent cc0b3ef commit 28b61a8
Showing 1 changed file with 16 additions and 18 deletions.
34 changes: 16 additions & 18 deletions packages/next-server/server/render.tsx
Expand Up @@ -15,19 +15,19 @@ type ComponentsEnhancer = {enhanceApp?: Enhancer, enhanceComponent?: Enhancer}|E

function enhanceComponents(options: ComponentsEnhancer, App: React.ComponentType, Component: React.ComponentType): {
App: React.ComponentType,
Component: React.ComponentType
Component: React.ComponentType,
} {
// For backwards compatibility
if(typeof options === 'function') {
if (typeof options === 'function') {
return {
App: App,
Component: options(Component)
App,
Component: options(Component),
}
}

return {
App: options.enhanceApp ? options.enhanceApp(App) : App,
Component: options.enhanceComponent ? options.enhanceComponent(Component) : Component
Component: options.enhanceComponent ? options.enhanceComponent(Component) : Component,
}
}

Expand Down Expand Up @@ -57,7 +57,7 @@ type RenderOpts = {
Component: React.ComponentType,
Document: React.ComponentType,
App: React.ComponentType,
ErrorDebug?: React.ComponentType<{error: Error}>
ErrorDebug?: React.ComponentType<{error: Error}>,
}

function renderDocument(Document: React.ComponentType, {
Expand Down Expand Up @@ -97,19 +97,19 @@ function renderDocument(Document: React.ComponentType, {
runtimeConfig, // runtimeConfig if provided, otherwise don't sent in the resulting HTML
nextExport, // If this is a page exported by `next export`
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}
devFiles={devFiles}
files={files}
dynamicImports={dynamicImports}
assetPrefix={assetPrefix}
{...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 {
err,
dev = false,
Expand All @@ -119,10 +119,9 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
Component,
buildManifest,
reactLoadableManifest,
ErrorDebug
ErrorDebug,
} = renderOpts


await Loadable.preloadAll() // Make sure all dynamic imports are loaded

if (dev) {
Expand Down Expand Up @@ -153,15 +152,14 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
...new Set([
...getPageFiles(buildManifest, pathname),
...getPageFiles(buildManifest, '/_app'),
...getPageFiles(buildManifest, '/_error')
])
]),
]

const reactLoadableModules: string[] = []
const renderPage = (options: ComponentsEnhancer = {}): {html: string, head: any} => {
const renderElementToString = staticMarkup ? renderToStaticMarkup : renderToString

if(err && ErrorDebug) {
if (err && ErrorDebug) {
return render(renderElementToString, <ErrorDebug error={err} />)
}

Expand All @@ -174,7 +172,7 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
router={router}
{...props}
/>
</LoadableCapture>
</LoadableCapture>,
)
}

Expand All @@ -194,16 +192,16 @@ export async function renderToHTML (req: IncomingMessage, res: ServerResponse, p
dynamicImportsIds,
dynamicImports,
files,
devFiles
devFiles,
})
}

function errorToJSON (err: Error): Error {
function errorToJSON(err: Error): Error {
const { name, message, stack } = err
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) {
return errorToJSON(err)
}
Expand Down

0 comments on commit 28b61a8

Please sign in to comment.