Merge pull request #93 from subpopular/patch-4

Handle module build errors in SCSS files
erikras · Aug 4, 2015 · 2116e9b · 2116e9b
2 parents 15558c1 + 517e958
commit 2116e9b
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/webpack/utils/writeStats.js b/webpack/utils/writeStats.js
@@ -53,9 +53,11 @@ module.exports = function writeStats(stats, env) {
       }
     }
     //end
-    var regex = env === 'prod' ? /module\.exports = ((.|\n)+);/ : /exports\.locals = ((.|\n)+);/;
-    var match = m.source.match(regex);
-    cssModules[name] = match ? JSON.parse(match[1]) : {};
+    if (m.source) {
+      var regex = env === 'prod' ? /module\.exports = ((.|\n)+);/ : /exports\.locals = ((.|\n)+);/;
+      var match = m.source.match(regex);
+      cssModules[name] = match ? JSON.parse(match[1]) : {};
+    }
   });
 
   // Find compiled images in modules

diff --git a/webpack/webpack-dev-server.js b/webpack/webpack-dev-server.js
@@ -14,7 +14,11 @@ var WebpackDevServer = require('webpack-dev-server'),
     headers: {"Access-Control-Allow-Origin": "*"},
     stats: {colors: true}
   },
-  compiler = webpack(config),
+  compiler = webpack(config, function(err, stats){
+    var json = stats.toJson();
+    if (json.errors.length)
+      console.error(json.errors[0])
+  }),
   webpackDevServer = new WebpackDevServer(compiler, serverOptions);
 
 webpackDevServer.listen(port, host, function() {