@kaliber/build 0.0.153 → 0.0.155

package/lib/serve.js

@@ -69,7 +69,7 @@ app.use((err, req, res, next) => {
     return res.status(err.status).send()
 
   reportServerError(err, req)
-  serveInternalServerError(err, { req, res, next })
+  serveInternalServerError(err, req, res, next)
 })
 
 app.listen(port, () => console.log(`Server listening at port ${port}`))
@@ -88,7 +88,9 @@ async function resolveFile(req, res, next) {
     for (const dir of dirs) {
       for (const [file, handler] of combinations) {
         const filePath = resolve(dir, file)
-        if (await fileExists(filePath)) return handler(filePath)
+        if (await fileExists(filePath)) {
+          return handler(filePath)
+        }
       }
     }
 
@@ -135,9 +137,14 @@ function possibleDirectories(path) {
 
 function serveIndexWithRouting(file, req, res, next) {
   const routeTemplate = envRequire(file)
-
   const location = parsePath(req.url)
 
+  if (routeTemplate.handleRequest)
+    return routeTemplate.handleRequest(location, req, res).catch(error => {
+      reportServerError(error, req)
+      serveInternalServerError(error, req, res, next)
+    })
+
   const [dataOrPromise, template] = getDataAndRouteTemplate(routeTemplate, location, req)
 
   if (dataOrPromise.then)
@@ -178,7 +185,7 @@ function getDataAndRouteTemplate(routeTemplate, location, req) {
   return [dataOrPromise, envRequire(indexPath)]
 }
 
-function serveInternalServerError(error, res, req, next) {
+function serveInternalServerError(error, req, res, next) {
   const response = res.status(500)
   if (isProduction) {
     findFile(req.path, internalServerError)

package/package.json

@@ -1,5 +1,5 @@
 {
-  "version": "0.0.153",
+  "version": "0.0.155",
   "name": "@kaliber/build",
   "description": "Zero configuration, opinionated webpack / react build setup",
   "scripts": {