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

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

Merged
merged 1 commit into from
Jan 15, 2019
+6 −9
Merged

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

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 6 additions & 9 deletions packages/next/build/webpack/loaders/next-serverless-loader.ts
View file
Open in desktop
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