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

Use Object.assign instead of object spread for serverless loader (#6056)

Browse source 
Fixes https://github.com/zeit/now-builders/issues/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.
This commit is contained in:
Tim Neutkens 2019-01-15 02:20:20 +01:00 committed by GitHub
parent 9ab8714f38
commit da3c3aded1
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
packages/next/build/webpack/loaders/next-serverless-loader.ts
View file

@ -51,27 +51,24 @@ const nextServerlessLoader: loader.Loader = function () {
const parsedUrl = parse(req.url, true) const parsedUrl = parse(req.url, true)
try { try {
${page === '/_error' ? `res.statusCode = 404` : ''} ${page === '/_error' ? `res.statusCode = 404` : ''}
const result = await renderToHTML(req, res, "${page}", parsedUrl.query, { const result = await renderToHTML(req, res, "${page}", parsedUrl.query, Object.assign({}, options, {
...options,
Component Component
}) }))
return result return result
} catch (err) { } catch (err) {
if (err.code === 'ENOENT') { if (err.code === 'ENOENT') {
res.statusCode = 404 res.statusCode = 404
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, { const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
...options,
Component: Error Component: Error
}) }))
return result return result
} else { } else {
console.error(err) console.error(err)
res.statusCode = 500 res.statusCode = 500
const result = await renderToHTML(req, res, "/_error", parsedUrl.query, { const result = await renderToHTML(req, res, "/_error", parsedUrl.query, Object.assign({}, options, {
...options,
Component: Error, Component: Error,
err err
}) }))
return result return result
} }
} }