@kaliber/build 0.0.152-beta.3 → 0.0.152

package/lib/serve.js

@@ -66,8 +66,15 @@ app.use((err, req, res, next) => {
   if (err.status && err.status >= 400 && err.status < 500)
     return res.status(err.status).send()
 
-  reportServerError(err, req)
-  serveInternalServerError(err, { req, res, next })
+  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>`)
 })
 
 app.listen(port, () => console.log(`Server listening at port ${port}`))
@@ -77,7 +84,7 @@ async function resolveFile(req, res, next) {
     const { path } = req
     /** @type {Array<[string, (file:any) => any]>} */
     const combinations = [
-      [indexWithRouting, file => serveIndexWithRouting(file, { req, res, next })],
+      [indexWithRouting, file => serveIndexWithRouting(req, res, file)],
       [notFound, file => res.status(404).sendFile(file)],
       [index, file => res.status(200).sendFile(file)],
     ]
@@ -105,7 +112,7 @@ async function findFile(path, file) {
   return null
 }
 
-function fileExists(path) {
+async function fileExists(path) {
   return isProduction
     ? (!fileExists.cache || fileExists.cache[path] === undefined)
       ? accessFile(path).then(exists => (addPathToCache(path, exists), exists))
@@ -117,7 +124,7 @@ function fileExists(path) {
   }
 }
 
-function accessFile(path) {
+async function accessFile(path) {
   return new Promise(resolve => access(path, err => resolve(!err)))
 }
 
@@ -131,69 +138,26 @@ function possibleDirectories(path) {
   return possibleDirectories
 }
 
-function serveIndexWithRouting(file, { req, res, next }) {
+function serveIndexWithRouting(req, res, file) {
   const envRequire = isProduction ? require : require('import-fresh')
-
   const routeTemplate = envRequire(file)
 
-  const location = parsePath(req.url)
-
-  const [dataOrPromise, template] = getDataAndRouteTemplate(routeTemplate, { location, req })
-
-  if (dataOrPromise.then)
-    dataOrPromise
-      .then(({ status, headers, data }) => {
-        const html = renderTemplate(template, location, { data })
-        res.status(status).set(headers).send(html)
-      })
-      .catch(error => {
-        reportServerError(error, req)
-        serveInternalServerError(error, { req, res, next })
-      })
-  else {
-    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 })
-    }
-  }
-}
-
-function getDataAndRouteTemplate(routeTemplate, { location, req }) {
-  const envRequire = isProduction ? require : require('import-fresh')
-
   const routes = routeTemplate.routes
-  const dataOrPromise = (routes && routes.match(location, req)) || { status: 200, data: null }
-
-  if (!routes || !routes.resolveIndex)
-    return [dataOrPromise, routeTemplate]
-
-  const indexLocation = routes.resolveIndex(location, req)
-  if (!indexLocation)
-    return [dataOrPromise, routeTemplate]
-
-  const indexPath = resolve(target, publicPathDir, indexLocation, indexWithRouting)
-  return [dataOrPromise, envRequire(indexPath)]
-}
-
-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>`)
-}
+  const location = parsePath(req.url)
 
-function reportServerError(error, req) {
-  console.error(error)
-  if (reportError) reportError(error, req)
+  return Promise.resolve(routes)
+    .then(routes => (routes && routes.match(location, req)) || { status: 200, data: null })
+    .then(data => {
+      if (!routes || !routes.resolveIndex) return [data, routeTemplate]
+
+      const indexLocation = routes.resolveIndex(location, req)
+      if (!indexLocation) return [data, routeTemplate]
+
+      const indexPath = resolve(target, publicPathDir, indexLocation, indexWithRouting)
+      return [data, envRequire(indexPath)]
+    })
+    .then(([{ status, headers, data }, template]) =>
+      Promise.resolve(template({ location, data })).then(html => [status, headers, html])
+    )
+    .then(([ status, headers, html ]) => res.status(status).set(headers).send(html))
 }

package/package.json

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