@kaliber/build 0.0.152-beta.1 → 0.0.152-beta.3

package/lib/serve.js

@@ -66,15 +66,8 @@ app.use((err, req, res, next) => {
   if (err.status && err.status >= 400 && err.status < 500)
     return res.status(err.status).send()
 
-  console.error(err)
-  if (reportError) reportError(err, req)
-
-  const response = res.status(500)
-  if (isProduction) {
-    findFile(req.path, internalServerError)
-      .then(file => file ? response.sendFile(file) : next())
-      .catch(next)
-  } else response.send(`<pre><title style='display: block;'>${err.stack || err.toString()}</title><pre>`)
+  reportServerError(err, req)
+  serveInternalServerError(err, { req, res, next })
 })
 
 app.listen(port, () => console.log(`Server listening at port ${port}`))
@@ -84,7 +77,7 @@ async function resolveFile(req, res, next) {
     const { path } = req
     /** @type {Array<[string, (file:any) => any]>} */
     const combinations = [
-      [indexWithRouting, file => serveIndexWithRouting(req, res, file)],
+      [indexWithRouting, file => serveIndexWithRouting(file, { req, res, next })],
       [notFound, file => res.status(404).sendFile(file)],
       [index, file => res.status(200).sendFile(file)],
     ]
@@ -138,7 +131,7 @@ function possibleDirectories(path) {
   return possibleDirectories
 }
 
-function serveIndexWithRouting(req, res, file) {
+function serveIndexWithRouting(file, { req, res, next }) {
   const envRequire = isProduction ? require : require('import-fresh')
 
   const routeTemplate = envRequire(file)
@@ -153,10 +146,19 @@ function serveIndexWithRouting(req, res, file) {
         const html = renderTemplate(template, location, { data })
         res.status(status).set(headers).send(html)
       })
+      .catch(error => {
+        reportServerError(error, req)
+        serveInternalServerError(error, { req, res, next })
+      })
   else {
-    const { data, status, headers } = dataOrPromise
-    const html = renderTemplate(template, location, { data })
-    res.status(status).set(headers).send(html)
+    try {
+      const { data, status, headers } = dataOrPromise
+      const html = renderTemplate(template, location, { data })
+      res.status(status).set(headers).send(html)
+    } catch (error) {
+      reportServerError(error, req)
+      serveInternalServerError(error, { req, res, next })
+    }
   }
 }
 
@@ -181,3 +183,17 @@ function renderTemplate(template, location, { data }) {
   const html = template({ location, data })
   return html
 }
+
+function serveInternalServerError(error, { res, req, next }) {
+  const response = res.status(500)
+  if (isProduction) {
+    findFile(req.path, internalServerError)
+      .then(file => file ? response.sendFile(file) : next())
+      .catch(next)
+  } else response.send(`<pre><title style='display: block;'>${error.stack || error.toString()}</title><pre>`)
+}
+
+function reportServerError(error, req) {
+  console.error(error)
+  if (reportError) reportError(error, req)
+}

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.152-beta.1",
+  "version": "0.0.152-beta.3",
   "name": "@kaliber/build",
   "description": "Zero configuration, opinionated webpack / react build setup",
   "scripts": {