terribleplan/next.js
1
0
Fork 0
mirror of https://github.com/terribleplan/next.js.git synced 2024-01-19 02:48:18 +00:00
Code Issues Releases Wiki Activity

Remove Unneeded _error import (#6224)

Browse source
This commit is contained in:
Connor Davis 2019-02-08 04:57:29 -06:00 committed by Tim Neutkens
parent cc0b3ef451
commit 28b61a8c94
1 changed files with 16 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
packages/next-server/server/render.tsx
View file

@ -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 = {
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, {
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, {
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
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
...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
router={router} router={router}
{...props} {...props}
/> />
</LoadableCapture> </LoadableCapture>,
) )
} }
@ -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)
} }