Merge pull request #40 from fson/show-errors

Show errors during static page generation
gatsbyjs · Sep 23, 2015 · 49fa931 · 49fa931
2 parents 726a4be + 78b28e5
commit 49fa931
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 17 deletions.
diff --git a/lib/utils/static-entry.cjsx b/lib/utils/static-entry.cjsx
@@ -25,22 +25,28 @@ module.exports = (locals, callback) ->
     else
       childPages = []
 
-    body = React.renderToString(
-      <Handler
-        config={config}
-        pages={pages}
-        page={page}
-        childPages={childPages}
-        state={state}
-      />
-    )
+    body = ''
+    html = ''
+    try
+      body = React.renderToString(
+        <Handler
+          config={config}
+          pages={pages}
+          page={page}
+          childPages={childPages}
+          state={state}
+        />
+      )
 
-    html = "<!DOCTYPE html>\n" + React.renderToStaticMarkup(
-      <HTML
-        config={config}
-        page={page}
-        body={body}
-      />
-    )
+      html = "<!DOCTYPE html>\n" + React.renderToStaticMarkup(
+        <HTML
+          config={config}
+          page={page}
+          body={body}
+        />
+      )
+    catch e
+      console.error e.stack
+      return callback(e)
 
     callback null, html
diff --git a/lib/utils/static-generation.coffee b/lib/utils/static-generation.coffee
@@ -13,4 +13,8 @@ module.exports = (program, callback) ->
     compilerConfig = webpackConfig(program, directory, 'static', null, routes)
 
     webpack(compilerConfig).run (err, stats) ->
-      callback(err, stats)
+      if err
+        return callback(err, stats)
+      if stats.hasErrors()
+        return callback('Error: ' + stats.toJson().errors, stats)
+      callback(null, stats)