Unverified Commit 3f94f33b authored by JJ Kasper's avatar JJ Kasper Committed by GitHub

Ensure error is passed up in minimal mode (#22030)

This ensures we pass the error up to the top-level when in minimal mode
parent 6b99bda3
...@@ -184,7 +184,7 @@ export default class Server { ...@@ -184,7 +184,7 @@ export default class Server {
this.nextConfig = loadConfig(phase, this.dir, conf) this.nextConfig = loadConfig(phase, this.dir, conf)
this.distDir = join(this.dir, this.nextConfig.distDir) this.distDir = join(this.dir, this.nextConfig.distDir)
this.publicDir = join(this.dir, CLIENT_PUBLIC_FILES_PATH) this.publicDir = join(this.dir, CLIENT_PUBLIC_FILES_PATH)
this.hasStaticDir = fs.existsSync(join(this.dir, 'static')) this.hasStaticDir = !minimalMode && fs.existsSync(join(this.dir, 'static'))
// Only serverRuntimeConfig needs the default // Only serverRuntimeConfig needs the default
// publicRuntimeConfig gets it's default in client/index.js // publicRuntimeConfig gets it's default in client/index.js
...@@ -567,6 +567,9 @@ export default class Server { ...@@ -567,6 +567,9 @@ export default class Server {
try { try {
return await this.run(req, res, parsedUrl) return await this.run(req, res, parsedUrl)
} catch (err) { } catch (err) {
if (this.minimalMode) {
throw err
}
this.logError(err) this.logError(err)
res.statusCode = 500 res.statusCode = 500
res.end('Internal Server Error') res.end('Internal Server Error')
...@@ -1835,14 +1838,19 @@ export default class Server { ...@@ -1835,14 +1838,19 @@ export default class Server {
} }
} }
} catch (err) { } catch (err) {
this.logError(err)
if (err && err.code === 'DECODE_FAILED') { if (err && err.code === 'DECODE_FAILED') {
this.logError(err)
res.statusCode = 400 res.statusCode = 400
return await this.renderErrorToHTML(err, req, res, pathname, query) return await this.renderErrorToHTML(err, req, res, pathname, query)
} }
res.statusCode = 500 res.statusCode = 500
return await this.renderErrorToHTML(err, req, res, pathname, query) const html = await this.renderErrorToHTML(err, req, res, pathname, query)
if (this.minimalMode) {
throw err
}
this.logError(err)
return html
} }
res.statusCode = 404 res.statusCode = 404
return await this.renderErrorToHTML(null, req, res, pathname, query) return await this.renderErrorToHTML(null, req, res, pathname, query)
...@@ -1863,6 +1871,10 @@ export default class Server { ...@@ -1863,6 +1871,10 @@ export default class Server {
) )
} }
const html = await this.renderErrorToHTML(err, req, res, pathname, query) const html = await this.renderErrorToHTML(err, req, res, pathname, query)
if (this.minimalMode && res.statusCode === 500) {
throw err
}
if (html === null) { if (html === null) {
return return
} }
...@@ -2007,9 +2019,11 @@ export default class Server { ...@@ -2007,9 +2019,11 @@ export default class Server {
} }
let nextFilesStatic: string[] = [] let nextFilesStatic: string[] = []
nextFilesStatic = recursiveReadDirSync( nextFilesStatic = !this.minimalMode
join(this.distDir, 'static') ? recursiveReadDirSync(join(this.distDir, 'static')).map((f) =>
).map((f) => join('.', relative(this.dir, this.distDir), 'static', f)) join('.', relative(this.dir, this.distDir), 'static', f)
)
: []
return (this._validFilesystemPathSet = new Set<string>([ return (this._validFilesystemPathSet = new Set<string>([
...nextFilesStatic, ...nextFilesStatic,
......
function Page(props) {
return <p>here comes an error</p>
}
Page.getInitialProps = ({ query }) => {
if (query.crash) {
throw new Error('gip hit an oops')
}
return {
hello: 'world',
}
}
export default Page
import { useRouter } from 'next/router'
function Page(props) {
if (useRouter().isFallback) {
return <p>loading...</p>
}
return <p>here comes an error</p>
}
export const getStaticPaths = () => {
return {
paths: [],
fallback: true,
}
}
export const getStaticProps = ({ params }) => {
if (params.post === 'crash') {
throw new Error('gsp hit an oops')
}
return {
props: {
hello: 'world',
},
}
}
export default Page
function Page(props) {
return <p>here comes an error</p>
}
export const getServerSideProps = ({ query }) => {
if (query.crash) {
throw new Error('gssp hit an oops')
}
return {
props: {
hello: 'world',
},
}
}
export default Page
...@@ -20,6 +20,7 @@ let nextApp ...@@ -20,6 +20,7 @@ let nextApp
let appPort let appPort
let buildId let buildId
let requiredFilesManifest let requiredFilesManifest
let errors = []
describe('Required Server Files', () => { describe('Required Server Files', () => {
beforeAll(async () => { beforeAll(async () => {
...@@ -58,7 +59,8 @@ describe('Required Server Files', () => { ...@@ -58,7 +59,8 @@ describe('Required Server Files', () => {
try { try {
await nextApp.getRequestHandler()(req, res) await nextApp.getRequestHandler()(req, res)
} catch (err) { } catch (err) {
console.error(err) console.error('top-level', err)
errors.push(err)
res.statusCode = 500 res.statusCode = 500
res.end('error') res.end('error')
} }
...@@ -419,4 +421,31 @@ describe('Required Server Files', () => { ...@@ -419,4 +421,31 @@ describe('Required Server Files', () => {
path: ['hello', 'world'], path: ['hello', 'world'],
}) })
}) })
it('should bubble error correctly for gip page', async () => {
errors = []
const res = await fetchViaHTTP(appPort, '/errors/gip', { crash: '1' })
expect(res.status).toBe(500)
expect(await res.text()).toBe('error')
expect(errors.length).toBe(1)
expect(errors[0].message).toContain('gip hit an oops')
})
it('should bubble error correctly for gssp page', async () => {
errors = []
const res = await fetchViaHTTP(appPort, '/errors/gssp', { crash: '1' })
expect(res.status).toBe(500)
expect(await res.text()).toBe('error')
expect(errors.length).toBe(1)
expect(errors[0].message).toContain('gssp hit an oops')
})
it('should bubble error correctly for gsp page', async () => {
errors = []
const res = await fetchViaHTTP(appPort, '/errors/gsp/crash')
expect(res.status).toBe(500)
expect(await res.text()).toBe('error')
expect(errors.length).toBe(1)
expect(errors[0].message).toContain('gsp hit an oops')
})
}) })
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment