Propagate async errors to webpack

index.js

@@ -152,7 +152,8 @@ module.exports = function(source) {
 				missingFileMode = false;
 				return;
 			}
-			throw e;
+			loaderContext.callback(e);
+			return;
 		}
 		var runtime = "var pug = require(" + loaderUtils.stringifyRequest(loaderContext, "!" + modulePaths.runtime) + ");\n\n";
 		loaderContext.callback(null, runtime + tmplFunc.toString() + ";\nmodule.exports = template;");

test/extend+error.test.js

@@ -0,0 +1,19 @@
+var should = require("should");
+
+var fs = require("fs");
+var path = require("path");
+
+var runLoader = require("./fakeModuleSystem");
+var pugLoader = require("../");
+
+var fixtures = path.join(__dirname, "fixtures");
+
+describe("extend+error", function() {
+	it("should propagate async errors to Webpack", function(done) {
+		var template = path.join(fixtures, "extend+error", "error.pug");
+		runLoader(pugLoader, path.join(fixtures, "extend+error"), template, fs.readFileSync(template, "utf-8"), function(err, result) {
+			should(err).be.not.null();
+			done();
+		});
+	});
+});

test/fakeModuleSystem.js

@@ -2,7 +2,7 @@ var fs = require("fs");
 var path = require("path");
 
 module.exports = function runLoader(loader, directory, filename, arg, callback) {
-	var async = true;
+	var async = false;
 	var loaderContext = {
 		async: function() {
 			async = true;
@@ -17,16 +17,26 @@ module.exports = function runLoader(loader, directory, filename, arg, callback)
 			async = true;
 			return callback.apply(this, arguments);
 		},
-		resolve: function(context, request, callback) {
-			callback(null, path.resolve(context, request));
+		resolve: function(context, request, resolveCallback) {
+			process.nextTick(function() {
+				resolveCallback(null, path.resolve(context, request));
+			});
 		},
-		loadModule: function(request, callback) {
+		loadModule: function(request, loadCallback) {
 			request = request.replace(/^-?!+/, "");
 			request = request.split("!");
-			var content = fs.readFileSync(request.pop(), "utf-8");
-			if(request[0] && /stringify/.test(request[0]))
-				content = JSON.stringify(content);
-			return callback(null, content);
+			fs.readFile(request.pop(), 'utf-8', function(err, content) {
+				if (err) {
+					loadCallback(err);
+					return;
+				}
+
+				if(request[0] && /stringify/.test(request[0])) {
+					content = JSON.stringify(content);
+				}
+
+				loadCallback(null, content);
+			});
 		}
 	};
 	var res = loader.call(loaderContext, arg);

test/fixtures/extend+error/error.pug

@@ -0,0 +1,3 @@
+extend /parent.pug
+
+p This will cause an error

test/fixtures/extend+error/parent.pug

@@ -0,0 +1,2 @@
+block output
+	p This might not see the light of day