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

Export render instead of default for serverless target (#5979)

Browse source 
Extends on #5927, instead of `.default` we'll expose `.render` which is semantically more correct / mirrors the naming of the custom server API.

I've updated the spec in #5927 to reflect this change.

(copied from #5927):

```js
const http = require('http')
const page = require('./.next/serverless/about.js')
const server = new http.Server((req, res) => page.render(req, res))
server.listen(3000, () => console.log('Listening on http://localhost:3000'))
```
This commit is contained in:
Tim Neutkens 2019-01-02 14:59:28 +01:00 committed by GitHub
parent 672a87d981
commit 07c6e2852f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -39,7 +39,7 @@ const nextServerlessLoader: loader.Loader = function () {
import Error from '${absoluteErrorPath}'; import Error from '${absoluteErrorPath}';
import App from '${absoluteAppPath}'; import App from '${absoluteAppPath}';
import Component from '${absolutePagePath}'; import Component from '${absolutePagePath}';
async function render(req, res) { async function renderReqToHTML(req, res) {
const options = { const options = {
App, App,
Document, Document,
@ -76,9 +76,9 @@ const nextServerlessLoader: loader.Loader = function () {
} }
} }
} }
export default async (req, res) => { export async function render (req, res) {
try { try {
const html = await render(req, res) const html = await renderReqToHTML(req, res)
sendHTML(req, res, html, {generateEtags: ${generateEtags}}) sendHTML(req, res, html, {generateEtags: ${generateEtags}})
} catch(err) { } catch(err) {
console.error(err) console.error(err)

12
test/integration/serverless/server.js
View file

@ -8,22 +8,22 @@ module.exports = function start (port = 0) {
const nextStaticDir = path.join(__dirname, '.next', 'static') const nextStaticDir = path.join(__dirname, '.next', 'static')
app.use('/_next/static', express.static(nextStaticDir)) app.use('/_next/static', express.static(nextStaticDir))
app.get('/', (req, res) => { app.get('/', (req, res) => {
require('./.next/serverless/pages/index.js').default(req, res) require('./.next/serverless/pages/index.js').render(req, res)
}) })
app.get('/abc', (req, res) => { app.get('/abc', (req, res) => {
require('./.next/serverless/pages/abc.js').default(req, res) require('./.next/serverless/pages/abc.js').render(req, res)
}) })
app.get('/fetch', (req, res) => { app.get('/fetch', (req, res) => {
require('./.next/serverless/pages/fetch.js').default(req, res) require('./.next/serverless/pages/fetch.js').render(req, res)
}) })
app.get('/dynamic', (req, res) => { app.get('/dynamic', (req, res) => {
require('./.next/serverless/pages/dynamic.js').default(req, res) require('./.next/serverless/pages/dynamic.js').render(req, res)
}) })
app.get('/dynamic-two', (req, res) => { app.get('/dynamic-two', (req, res) => {
require('./.next/serverless/pages/dynamic-two.js').default(req, res) require('./.next/serverless/pages/dynamic-two.js').render(req, res)
}) })
app.get('/404', (req, res) => { app.get('/404', (req, res) => {
require('./.next/serverless/pages/_error.js').default(req, res) require('./.next/serverless/pages/_error.js').render(req, res)
}) })
const server = new http.Server(app) const server = new http.Server(app)