refactor: move common logic to server

packages/nitro/src/runtime/server.ts

@@ -16,6 +16,8 @@ const renderer = createRenderer(server, {
 })
 
 export async function render (url) {
+  const start = process.hrtime()
+
   const ssrContext: any = {
     url,
     runtimeConfig: {
@@ -26,13 +28,26 @@ export async function render (url) {
   const rendered = await renderer.renderToString(ssrContext)
 
   const state = `<script>window.__NUXT__ = ${devalue(ssrContext.payload)}</script>`
-  const html = `<div id="__nuxt">${rendered.html}</div>`
+  const _html = `<div id="__nuxt">${rendered.html}</div>`
 
-  return htmlTemplate({
+  const html = htmlTemplate({
     HTML_ATTRS: '',
     HEAD_ATTRS: '',
     BODY_ATTRS: '',
     HEAD: rendered.renderResourceHints() + rendered.renderStyles(),
-    APP: html + state + rendered.renderScripts()
+    APP: _html + state + rendered.renderScripts()
   })
+
+  const end = process.hrtime(start)
+  const time = ((end[0] * 1e9) + end[1]) / 1e6
+
+  return {
+    html,
+    status: 200,
+    headers: {
+      'Content-Type': 'text/html;charset=UTF-8',
+      'X-Nuxt-Coldstart': global._coldstart + 'ms',
+      'X-Nuxt-ResponseTime': time + 'ms'
+    }
+  }
 }

packages/nitro/src/targets/cli/entry.ts

@@ -1,9 +1,23 @@
 // @ts-ignore
 import { render } from '~runtime/server'
 
-render(process.argv[2] || '/')
+const debug = (label, ...args) => console.debug(`> ${label}:`, ...args)
-  .then(html => console.log(html))
+
-  .catch((err) => {
+async function main () {
+  const url = process.argv[2] || '/'
+  debug('URL', url)
+
+  const { html, status, headers } = await render(url)
+
+  debug('Status', status)
+  for (const header in headers) {
+    debug(header, headers[header])
+  }
+
+  console.log('\n', html)
+}
+
+main().catch((err) => {
   console.error(err)
   process.exit(1)
-  })
+})

packages/nitro/src/targets/vercel/entry.ts

@@ -1,18 +1,17 @@
 // @ts-ignore
 import { render } from '~runtime/server'
 
-module.exports = (req, res) => {
+module.exports = async (req, res) => {
-  const start = process.hrtime()
+  try {
-  render(req.url).then((html) => {
+    const { html, status, headers } = await render(req.url, { req, res })
-    const end = process.hrtime(start)
+    for (const header in headers) {
-    const time = ((end[0] * 1e9) + end[1]) / 1e6
+      res.setHeadeer(header, headers[header])
-    // @ts-ignore
+    }
-    res.setHeader('X-Nuxt-Coldstart', global._coldstart + 'ms')
+    res.status(status)
-    res.setHeader('X-Nuxt-Responsetime', time + 'ms')
-
     res.end(html)
-  }).catch((err) => {
+  } catch (error) {
-    console.error(err)
+    console.error(error)
-    res.end('Error: ' + err)
+    res.status(500)
-  })
+    res.end('Internal Error: ' + error)
+  }
 }