Merge pull request #259 from choojs/fix-SSR-errors

log SSR errors, closes #255
choojs · Oct 3, 2017 · 0f96cd2 · 0f96cd2
2 parents c0a3c9b + fb1a6bc
commit 0f96cd2
Show file tree

Hide file tree

Showing 5 changed files with 63 additions and 55 deletions.
diff --git a/lib/cmd-build.js b/lib/cmd-build.js
@@ -33,7 +33,9 @@ function build (entry, opts) {
 
     compiler.on('error', function (topic, sub, err) {
       if (err.pretty) log.error(err.pretty)
-      else log.error(`${topic}:${sub}`, err)
+      else {
+        log.error(`${topic}:${sub} ${err.message}\n${err.stack}`)
+      }
     })
 
     compiler.on('change', function (nodeName, edgeName, nodeState) {

diff --git a/lib/graph-document.js b/lib/graph-document.js
@@ -10,6 +10,7 @@ var hyperstream = require('hyperstream')
 
 var serverRender = require('./server-render')
 var utils = require('./utils')
+var ttyError = require('./tty-error')
 
 var WRITE_CONCURRENCY = 3
 
@@ -19,59 +20,64 @@ function node (state, createEdge) {
   var entry = utils.basefile(state.metadata.entry)
   var self = this
 
-  var render = serverRender(entry)
-  var fonts = extractFonts(state.assets)
-  var list = render.list
-
-  mapLimit(list, WRITE_CONCURRENCY, iterator, function (err) {
-    if (err) return self.emit(err)
-    createEdge('list', Buffer.from(list.join(',')))
-  })
-
-  function iterator (route, done) {
-    var res = render(route) // TODO: allow passing in state as second arg
-
-    var description = '' // TODO: extract from manifest
-    var language = res.language
-    var title = res.title
-    var body = res.body
-
-    var html = head(body, language)
-    var d = documentify(entry, html)
-    d.transform(polyfillTransform)
-    d.transform(scriptTransform, { hash: state.scripts.bundle.hash })
-    d.transform(styleTransform, { hash: state.style.bundle.hash })
-    d.transform(preloadTransform)
-    d.transform(loadFontsTransform, { fonts: fonts })
-    d.transform(manifestTransform)
-    d.transform(viewportTransform)
-    d.transform(descriptionTransform, { description: description })
-    d.transform(themeColorTransform, { color: String(state.manifest.color.buffer) })
-    d.transform(titleTransform, { title: title })
-    // TODO: twitter
-    // TODO: facebook
-    // TODO: apple touch icons
-    // TODO: favicons
-    d.transform(criticalTransform, { css: state.style.bundle.buffer })
-
-    if (state.metadata.reload) {
-      d.transform(reloadTransform, { bundle: state.reload.bundle.buffer })
+  serverRender(entry, function (err, render) {
+    if (err) {
+      err = ttyError('documents', entry, err)
+      return self.emit('error', 'documents', entry, err)
     }
+    var fonts = extractFonts(state.assets)
+    var list = render.list
 
-    var source = d.bundle()
-
-    pump(source, concat({ encoding: 'buffer' }, sink), function (err) {
-      if (err) return done(explain(err, 'Error in documentify while operating on ' + route))
-      done()
+    mapLimit(list, WRITE_CONCURRENCY, iterator, function (err) {
+      if (err) return self.emit(err)
+      createEdge('list', Buffer.from(list.join(',')))
     })
 
-    function sink (buf) {
-      var name = route
-      if (name === '/') name = 'index'
-      name = name + '.html'
-      createEdge(name, buf)
+    function iterator (route, done) {
+      var res = render(route) // TODO: allow passing in state as second arg
+
+      var description = '' // TODO: extract from manifest
+      var language = res.language
+      var title = res.title
+      var body = res.body
+
+      var html = head(body, language)
+      var d = documentify(entry, html)
+      d.transform(polyfillTransform)
+      d.transform(scriptTransform, { hash: state.scripts.bundle.hash })
+      d.transform(styleTransform, { hash: state.style.bundle.hash })
+      d.transform(preloadTransform)
+      d.transform(loadFontsTransform, { fonts: fonts })
+      d.transform(manifestTransform)
+      d.transform(viewportTransform)
+      d.transform(descriptionTransform, { description: description })
+      d.transform(themeColorTransform, { color: String(state.manifest.color.buffer) })
+      d.transform(titleTransform, { title: title })
+      // TODO: twitter
+      // TODO: facebook
+      // TODO: apple touch icons
+      // TODO: favicons
+      d.transform(criticalTransform, { css: state.style.bundle.buffer })
+
+      if (state.metadata.reload) {
+        d.transform(reloadTransform, { bundle: state.reload.bundle.buffer })
+      }
+
+      var source = d.bundle()
+
+      pump(source, concat({ encoding: 'buffer' }, sink), function (err) {
+        if (err) return done(explain(err, 'Error in documentify while operating on ' + route))
+        done()
+      })
+
+      function sink (buf) {
+        var name = route
+        if (name === '/') name = 'index'
+        name = name + '.html'
+        createEdge(name, buf)
+      }
     }
-  }
+  })
 }
 
 function head (body, lang) {

diff --git a/lib/server-render.js b/lib/server-render.js
@@ -15,7 +15,7 @@ var getAllRoutes = require('wayfarer/get-all-routes')
 
 module.exports = serverRender
 
-function serverRender (entry) {
+function serverRender (entry, cb) {
   assert.equal(typeof entry, 'string')
 
   var app
@@ -26,7 +26,9 @@ function serverRender (entry) {
 
   try {
     app = proxyquire(entry, {})
-  } catch (e) {
+  } catch (err) {
+    var failedRequire = err.message === `Cannot find module '${entry}'`
+    if (!failedRequire) return cb(err)
     app = null
   }
 
@@ -64,7 +66,7 @@ function serverRender (entry) {
     }
   }
 
-  return render
+  cb(null, render)
 
   function render (route, state) {
     var res

diff --git a/package.json b/package.json
@@ -46,7 +46,7 @@
     "http-gzip-maybe": "^1.0.0",
     "hyperstream": "^1.2.2",
     "iltorb": "^1.3.6",
-    "inline-critical-css": "^1.0.6",
+    "inline-critical-css": "^1.1.0",
     "json-stream-to-object": "^1.1.0",
     "keypress": "^0.2.1",
     "minimist": "^1.2.0",

diff --git a/test/document.js b/test/document.js
@@ -23,7 +23,6 @@ tape('renders some HTML', function (assert) {
         <meta name="description" content=>
         <meta name="theme-color" content=#fff>
         <title></title>
-        <style></style>
       </head>
       <body></body>
     </html>
@@ -68,7 +67,6 @@ tape('server render choo apps', function (assert) {
         <meta name="description" content=>
         <meta name="theme-color" content=#fff>
         <title></title>
-        <style></style>
       </head>
       <body>
         meow