Commit 09cab2df authored by JJ Kasper's avatar JJ Kasper Committed by Joe Haddad

Fix typo in serverless loader (#9431)

* Fix typo in serverless loader

* Add test for top level error in API route

* Fix type error
parent fefe453e
......@@ -68,10 +68,10 @@ const nextServerlessLoader: loader.Loader = function() {
: `{}`
}
const resolver = require('${absolutePagePath}')
apiResolver(req, res, params, resolver)
} catch (error) {
await onError(err)
apiResolver(req, res, params, resolver, onError)
} catch (err) {
console.error(err)
await onError(err)
res.statusCode = 500
res.end('Internal Server Error')
}
......
......@@ -14,7 +14,8 @@ export async function apiResolver(
req: NextApiRequest,
res: NextApiResponse,
params: any,
resolverModule: any
resolverModule: any,
onError?: ({ err }: { err: any }) => Promise<void>
) {
try {
let config: PageConfig = {}
......@@ -51,11 +52,12 @@ export async function apiResolver(
const resolver = interopDefault(resolverModule)
resolver(req, res)
} catch (e) {
if (e instanceof ApiError) {
sendError(res, e.statusCode, e.message)
} catch (err) {
if (err instanceof ApiError) {
sendError(res, err.statusCode, err.message)
} else {
console.error(e)
console.error(err)
if (onError) await onError({ err })
sendError(res, 500, 'Internal Server Error')
}
}
......
......@@ -100,7 +100,7 @@ export default class Server {
dev?: boolean
}
private compression?: Middleware
private onErrorMiddleware?: ({ err }: { err: Error }) => void
private onErrorMiddleware?: ({ err }: { err: Error }) => Promise<void>
router: Router
protected dynamicRoutes?: Array<{ page: string; match: RouteMatch }>
protected customRoutes?: {
......@@ -498,7 +498,8 @@ export default class Server {
req,
res,
params,
resolverFunction ? require(resolverFunction) : undefined
resolverFunction ? require(resolverFunction) : undefined,
this.onErrorMiddleware
)
}
......
throw new Error('top-level-oops')
// eslint-disable-next-line
export default (req, res) => {
res.end('hi')
}
......@@ -6,6 +6,7 @@ import cheerio from 'cheerio'
import { existsSync, readdirSync, readFileSync } from 'fs'
import {
killApp,
waitFor,
findPort,
nextBuild,
nextStart,
......@@ -20,6 +21,7 @@ const appDir = join(__dirname, '../')
const serverlessDir = join(appDir, '.next/serverless/pages')
const chunksDir = join(appDir, '.next/static/chunks')
const buildIdFile = join(appDir, '.next/BUILD_ID')
let stderr = ''
let appPort
let app
jasmine.DEFAULT_TIMEOUT_INTERVAL = 1000 * 60 * 5
......@@ -28,7 +30,11 @@ describe('Serverless', () => {
beforeAll(async () => {
await nextBuild(appDir)
appPort = await findPort()
app = await nextStart(appDir, appPort)
app = await nextStart(appDir, appPort, {
onStderr: msg => {
stderr += msg || ''
},
})
})
afterAll(() => killApp(app))
......@@ -251,6 +257,12 @@ describe('Serverless', () => {
expect(data.query).toEqual({ slug: paramRaw })
})
it('should log error in API route correctly', async () => {
await renderViaHTTP(appPort, '/api/top-level-error')
await waitFor(1000)
expect(stderr).toContain('top-level-oops')
})
describe('With basic usage', () => {
it('should allow etag header support', async () => {
const url = `http://localhost:${appPort}/`
......
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