1 files changed, 36 insertions, 24 deletions
diff --git a/node_modules/webpack/lib/ModuleError.js b/node_modules/webpack/lib/ModuleError.js
index 9e9be7683..7079d6132 100644
--- a/node_modules/webpack/lib/ModuleError.js
+++ b/node_modules/webpack/lib/ModuleError.js
@@ -1,24 +1,36 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-const cleanUp = require("./ErrorHelpers").cleanUp;
-
-class ModuleError extends WebpackError {
-	constructor(module, err) {
-		super();
-
-		this.name = "ModuleError";
-		this.module = module;
-		this.message = err && typeof err === "object" && err.message ? err.message : err;
-		this.error = err;
-		this.details = err && typeof err === "object" && err.stack ? cleanUp(err.stack, this.message) : undefined;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ModuleError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+const { cleanUp } = require("./ErrorHelpers");
+
+class ModuleError extends WebpackError {
+	constructor(module, err, { from = null } = {}) {
+		let message = "Module Error";
+		if (from) {
+			message += ` (from ${from}):\n`;
+		} else {
+			message += ": ";
+		}
+		if (err && typeof err === "object" && err.message) {
+			message += err.message;
+		} else if (err) {
+			message += err;
+		}
+		super(message);
+		this.name = "ModuleError";
+		this.module = module;
+		this.error = err;
+		this.details =
+			err && typeof err === "object" && err.stack
+				? cleanUp(err.stack, this.message)
+				: undefined;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ModuleError;