Skip to content

Commit

Permalink
Use Object.assign instead of object spread for serverless loader (ver…
Browse files Browse the repository at this point in the history
…cel#6056)

Fixes vercel/now-builders#168

For some reason with a certain mix of deps `...` is not supported in webpack's parsing.
By default it is supported as all our tests passed before and we have deployed Next.js apps on v2 already.
  • Loading branch information
timneutkens committed Jan 17, 2019
1 parent 31af9c8 commit 8736d47
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions packages/next/build/webpack/loaders/next-serverless-loader.ts
Original file line number Diff line number Diff line change
Expand Up @@ -51,27 +51,24 @@ const nextServerlessLoader: loader.Loader = function () {
const parsedUrl = parse(req.url, true)
try {
${page === '/_error' ? `res.statusCode = 404` : ''}
const result = await renderToHTML(req, res, "${page}", parsedUrl.query, {
...options,
const result = await renderToHTML(req, res, "${page}", parsedUrl.query, Object.assign({}, options, {
Component
})
}))
return result
} catch (err) {
if (err.code === 'ENOENT') {
res.statusCode = 404
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, {
...options,
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
Component: Error
})
}))
return result
} else {
console.error(err)
res.statusCode = 500
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, {
...options,
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
Component: Error,
err
})
}))
return result
}
}
Expand Down

0 comments on commit 8736d47

Please sign in to comment.