fix error message and stack in Firefox

in Firefox stack doesn't include the message
webpack · Jun 12, 2019 · a1d4567 · a1d4567
1 parent acf2c2d
commit a1d4567
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/hot/dev-server.js b/hot/dev-server.js
@@ -40,10 +40,10 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot apply update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + (err.stack || err.message));
+					log("warning", "[HMR] " + log.formatError(err));
 					window.location.reload();
 				} else {
-					log("warning", "[HMR] Update failed: " + (err.stack || err.message));
+					log("warning", "[HMR] Update failed: " + log.formatError(err));
 				}
 			});
 	};

diff --git a/hot/log.js b/hot/log.js
@@ -45,3 +45,15 @@ module.exports.groupEnd = logGroup(groupEnd);
 module.exports.setLogLevel = function(level) {
 	logLevel = level;
 };
+
+module.exports.formatError = function(err) {
+	var message = err.message;
+	var stack = err.stack;
+	if (!stack) {
+		return message;
+	} else if (stack.indexOf(message) < 0) {
+		return message + "\n" + stack;
+	} else {
+		return stack;
+	}
+};
diff --git a/hot/only-dev-server.js b/hot/only-dev-server.js
@@ -72,12 +72,9 @@ if (module.hot) {
 						"warning",
 						"[HMR] Cannot check for update. Need to do a full reload!"
 					);
-					log("warning", "[HMR] " + (err.stack || err.message));
+					log("warning", "[HMR] " + log.formatError(err));
 				} else {
-					log(
-						"warning",
-						"[HMR] Update check failed: " + (err.stack || err.message)
-					);
+					log("warning", "[HMR] Update check failed: " + log.formatError(err));
 				}
 			});
 	};

diff --git a/hot/poll.js b/hot/poll.js
@@ -23,13 +23,10 @@ if (module.hot) {
 					var status = module.hot.status();
 					if (["abort", "fail"].indexOf(status) >= 0) {
 						log("warning", "[HMR] Cannot apply update.");
-						log("warning", "[HMR] " + (err.stack || err.message));
+						log("warning", "[HMR] " + log.formatError(err));
 						log("warning", "[HMR] You need to restart the application!");
 					} else {
-						log(
-							"warning",
-							"[HMR] Update failed: " + (err.stack || err.message)
-						);
+						log("warning", "[HMR] Update failed: " + log.formatError(err));
 					}
 				});
 		}

diff --git a/hot/signal.js b/hot/signal.js
@@ -37,7 +37,7 @@ if (module.hot) {
 				var status = module.hot.status();
 				if (["abort", "fail"].indexOf(status) >= 0) {
 					log("warning", "[HMR] Cannot apply update.");
-					log("warning", "[HMR] " + (err.stack || err.message));
+					log("warning", "[HMR] " + log.formatError(err));
 					log("warning", "[HMR] You need to restart the application!");
 				} else {
 					log("warning", "[HMR] Update failed: " + (err.stack || err.message));