rewrite errors tests, cleanup, update snapshots

Author: Steven Hargrove

lib/Compilation.js

@@ -39,6 +39,7 @@ const ModuleTemplate = require("./ModuleTemplate");
 const RuntimeGlobals = require("./RuntimeGlobals");
 const RuntimeTemplate = require("./RuntimeTemplate");
 const Stats = require("./Stats");
+const WebpackError = require("./WebpackError");
 const StatsFactory = require("./stats/StatsFactory");
 const StatsPrinter = require("./stats/StatsPrinter");
 const AsyncQueue = require("./util/AsyncQueue");
@@ -931,8 +932,6 @@ class Compilation {
 							return callback(err);
 						}
 
-						if (module.error) return callback(module.error);
-
 						// This avoids deadlocks for circular dependencies
 						if (this.processDependenciesQueue.isProcessing(module)) {
 							return callback();
@@ -1048,15 +1047,19 @@ class Compilation {
 			dependency === null ||
 			!dependency.constructor
 		) {
-			throw new Error("Parameter 'dependency' must be a Dependency");
+			return callback(
+				new WebpackError("Parameter 'dependency' must be a Dependency")
+			);
 		}
 		const Dep = /** @type {DepConstructor} */ (dependency.constructor);
 		const moduleFactory = this.dependencyFactories.get(Dep);
 		if (!moduleFactory) {
-			throw new Error(
-				`No dependency factory available for this dependency type: ${
-					dependency.constructor.name
-				}`
+			return callback(
+				new WebpackError(
+					`No dependency factory available for this dependency type: ${
+						dependency.constructor.name
+					}`
+				)
 			);
 		}
 
@@ -1076,7 +1079,7 @@ class Compilation {
 					this.factorizeQueue.stop();
 					return;
 				}
-				return callback();
+				callback();
 			}
 		);
 	}

package.json

@@ -19,7 +19,7 @@
     "events": "^3.0.0",
     "json-parse-better-errors": "^1.0.2",
     "json-stable-stringify": "^1.0.1",
-    "loader-runner": "^2.3.0",
+    "loader-runner": "hulkish/loader-runner#prefer-callback-errors",
     "loader-utils": "^1.1.0",
     "memory-fs": "~0.4.1",
     "micromatch": "^3.1.8",
@@ -61,6 +61,7 @@
     "lint-staged": "^8.0.4",
     "lodash": "^4.17.4",
     "prettier": "^1.14.3",
+    "pretty-format": "24.0.0-alpha.1",
     "pug": "^2.0.3",
     "pug-loader": "^2.4.0",
     "raw-loader": "~0.5.0",