respect log level in HMR client log groups

webpack · Jul 13, 2017 · 6c5dc1b · 6c5dc1b
1 parent 8d86864
commit 6c5dc1b
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 11 deletions.
diff --git a/hot/log-apply-result.js b/hot/log-apply-result.js
@@ -22,9 +22,9 @@ module.exports = function(updatedModules, renewedModules) {
 		renewedModules.forEach(function(moduleId) {
 			if(typeof moduleId === "string") {
 				var parts = moduleId.split("!");
-				log.groupCollapsed("[HMR]  - " + parts.pop());
+				log.groupCollapsed("info", "[HMR]  - " + parts.pop());
 				log("info", "[HMR]  - " + moduleId);
-				log.groupEnd();
+				log.groupEnd("info");
 			} else {
 				log("info", "[HMR]  - " + moduleId);
 			}

diff --git a/hot/log.js b/hot/log.js
@@ -2,20 +2,42 @@ var logLevel = "info";
 
 function dummy() {}
 
+function shouldLog(level) {
+	var shouldLog = (logLevel === "info" && level === "info") ||
+		(["info", "warning"].indexOf(logLevel) >= 0 && level === "warning") ||
+		(["info", "warning", "error"].indexOf(logLevel) >= 0 && level === "error");
+	return shouldLog;
+}
+
+function logGroup(logFn) {
+	return function(level, msg) {
+		if(shouldLog(level)) {
+			logFn(msg);
+		}
+	};
+}
+
 module.exports = function(level, msg) {
-	if(logLevel === "info" && level === "info")
-		return console.log(msg);
-	if(["info", "warning"].indexOf(logLevel) >= 0 && level === "warning")
-		return console.warn(msg);
-	if(["info", "warning", "error"].indexOf(logLevel) >= 0 && level === "error")
-		return console.error(msg);
+	if(shouldLog(level)) {
+		if(level === "info") {
+			console.log(msg);
+		} else if(level === "warning") {
+			console.warn(msg);
+		} else if(level === "error") {
+			console.error(msg);
+		}
+	}
 };
 
-module.exports.group = console.group || dummy;
+var group = console.group || dummy;
+var groupCollapsed = console.groupCollapsed || dummy;
+var groupEnd = console.groupEnd || dummy;
+
+module.exports.group = logGroup(group);
 
-module.exports.groupCollapsed = console.groupCollapsed || dummy;
+module.exports.groupCollapsed = logGroup(groupCollapsed);
 
-module.exports.groupEnd = console.groupEnd || dummy;
+module.exports.groupEnd = logGroup(groupEnd);
 
 module.exports.setLogLevel = function(level) {
 	logLevel = level;