1 files changed, 57 insertions, 34 deletions
diff --git a/node_modules/webpack/lib/ModuleParseError.js b/node_modules/webpack/lib/ModuleParseError.js
index 3431d477b..32c7a69c1 100644
--- a/node_modules/webpack/lib/ModuleParseError.js
+++ b/node_modules/webpack/lib/ModuleParseError.js
@@ -1,34 +1,57 @@
-/*
-	MIT License http://www.opensource.org/licenses/mit-license.php
-	Author Tobias Koppers @sokra
-*/
-"use strict";
-
-const WebpackError = require("./WebpackError");
-
-class ModuleParseError extends WebpackError {
-	constructor(module, source, err) {
-		super();
-
-		this.name = "ModuleParseError";
-		this.message = "Module parse failed: " + err.message;
-		this.message += "\nYou may need an appropriate loader to handle this file type.";
-		if(err.loc && typeof err.loc === "object" && typeof err.loc.line === "number") {
-			var lineNumber = err.loc.line;
-			if(/[\0\u0001\u0002\u0003\u0004\u0005\u0006\u0007]/.test(source)) { // binary file
-				this.message += "\n(Source code omitted for this binary file)";
-			} else {
-				source = source.split("\n");
-				this.message += "\n| " + source.slice(Math.max(0, lineNumber - 3), lineNumber + 2).join("\n| ");
-			}
-		} else {
-			this.message += "\n" + err.stack;
-		}
-		this.module = module;
-		this.error = err;
-
-		Error.captureStackTrace(this, this.constructor);
-	}
-}
-
-module.exports = ModuleParseError;
+/*
+	MIT License http://www.opensource.org/licenses/mit-license.php
+	Author Tobias Koppers @sokra
+*/
+"use strict";
+
+const WebpackError = require("./WebpackError");
+
+/** @typedef {import("./Module")} Module */
+
+class ModuleParseError extends WebpackError {
+	/**
+	 * @param {Module} module the errored module
+	 * @param {string} source source code
+	 * @param {Error&any} err the parse error
+	 */
+	constructor(module, source, err) {
+		let message = "Module parse failed: " + err.message;
+		let loc = undefined;
+		message += "\nYou may need an appropriate loader to handle this file type.";
+		if (
+			err.loc &&
+			typeof err.loc === "object" &&
+			typeof err.loc.line === "number"
+		) {
+			var lineNumber = err.loc.line;
+			if (/[\0\u0001\u0002\u0003\u0004\u0005\u0006\u0007]/.test(source)) {
+				// binary file
+				message += "\n(Source code omitted for this binary file)";
+			} else {
+				const sourceLines = source.split("\n");
+				const start = Math.max(0, lineNumber - 3);
+				const linesBefore = sourceLines.slice(start, lineNumber - 1);
+				const theLine = sourceLines[lineNumber - 1];
+				const linesAfter = sourceLines.slice(lineNumber, lineNumber + 2);
+				message +=
+					linesBefore.map(l => `\n| ${l}`).join("") +
+					`\n> ${theLine}` +
+					linesAfter.map(l => `\n| ${l}`).join("");
+			}
+			loc = err.loc;
+		} else {
+			message += "\n" + err.stack;
+		}
+
+		super(message);
+
+		this.name = "ModuleParseError";
+		this.module = module;
+		this.loc = loc;
+		this.error = err;
+
+		Error.captureStackTrace(this, this.constructor);
+	}
+}
+
+module.exports = ModuleParseError;