Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Properly support custom 500 page in the web server #33729

Merged
merged 5 commits into from Jan 27, 2022
Merged

Properly support custom 500 page in the web server #33729

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
7396938
proper support for custom 500 page
shuding Jan 27, 2022
71d59d5
fix invalid token
shuding Jan 27, 2022
92f22d3
Merge branch 'canary' into shu/f8bc
shuding Jan 27, 2022
7fe8c37
Merge branch 'canary' into shu/f8bc
shuding Jan 27, 2022
90bd8d7
Merge branch 'canary' into shu/f8bc
kodiakhq[bot] Jan 27, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
29 changes: 14 additions & 15 deletions packages/next/build/webpack/loaders/next-middleware-ssr-loader/index.ts
View file
Open in desktop
Expand Up @@ -14,28 +14,26 @@ export default async function middlewareSSRLoader(this: any) {
stringifiedConfig,
} = this.getOptions()

const stringifiedAbsolutePagePath = stringifyRequest(this, absolutePagePath)
const stringifiedAbsoluteAppPath = stringifyRequest(this, absoluteAppPath)
const stringifiedAbsolute500PagePath = stringifyRequest(
this,
absolute500Path || absoluteErrorPath
)
const stringifiedAbsoluteDocumentPath = stringifyRequest(
this,
absoluteDocumentPath
)
const stringifiedPagePath = stringifyRequest(this, absolutePagePath)
const stringifiedAppPath = stringifyRequest(this, absoluteAppPath)
const stringifiedErrorPath = stringifyRequest(this, absoluteErrorPath)
const stringifiedDocumentPath = stringifyRequest(this, absoluteDocumentPath)
const stringified500Path = absolute500Path
? stringifyRequest(this, absolute500Path)
: 'null'

const transformed = `
import { adapter } from 'next/dist/server/web/adapter'
import { RouterContext } from 'next/dist/shared/lib/router-context'

import App from ${stringifiedAbsoluteAppPath}
import Document from ${stringifiedAbsoluteDocumentPath}

import { getRender } from 'next/dist/build/webpack/loaders/next-middleware-ssr-loader/render'

const pageMod = require(${stringifiedAbsolutePagePath})
const errorMod = require(${stringifiedAbsolute500PagePath})
import App from ${stringifiedAppPath}
import Document from ${stringifiedDocumentPath}

const pageMod = require(${stringifiedPagePath})
const errorMod = require(${stringifiedErrorPath})
const error500Mod = ${stringified500Path} ? require(${stringified500Path}) : null

const buildManifest = self.__BUILD_MANIFEST
const reactLoadableManifest = self.__REACT_LOADABLE_MANIFEST
Expand All @@ -62,6 +60,7 @@ export default async function middlewareSSRLoader(this: any) {

// components
errorMod,
error500Mod,

// renderOpts
buildId: ${JSON.stringify(buildId)},
Expand Down
20 changes: 19 additions & 1 deletion packages/next/server/web-server.ts
View file
Open in desktop
Expand Up @@ -169,8 +169,26 @@ export default class NextWebServer extends BaseServer {
}
}

const { errorMod, error500Mod } = (globalThis as any).__server_context

// If there is a custom 500 page.
if (pathname === '/500' && error500Mod) {
return {
query: {
...(query || {}),
...(params || {}),
},
components: {
...(globalThis as any).__server_context,
Component: error500Mod.default,
getStaticProps: error500Mod.getStaticProps,
getServerSideProps: error500Mod.getServerSideProps,
getStaticPaths: error500Mod.getStaticPaths,
} as LoadComponentsReturnType,
}
}

if (pathname === '/_error') {
const errorMod = (globalThis as any).__server_context.errorMod
return {
query: {
...(query || {}),
Expand Down