fix: respect infastructureLogging.level for client.logging

webpack · Aug 11, 2021 · f5c319c · f5c319c
1 parent 1307332
commit f5c319c
Show file tree

Hide file tree

Showing 5 changed files with 493 additions and 7 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -213,6 +213,18 @@ class Server {
           ...options.client.overlay,
         };
       }
+
+      // Respect infrastructureLogging.level
+      if (typeof options.client.logging === "undefined") {
+        const configWithInfrastructureLogging =
+          configArray.find(
+            (config) =>
+              config.infrastructureLogging && config.infrastructureLogging.level
+          ) || configArray[0];
+
+        options.client.logging =
+          configWithInfrastructureLogging.infrastructureLogging.level;
+      }
     }
 
     if (typeof options.compress === "undefined") {

diff --git a/test/fixtures/simple-config/webpack.config.js b/test/fixtures/simple-config/webpack.config.js
@@ -10,6 +10,6 @@ module.exports = {
   },
   node: false,
   infrastructureLogging: {
-    level: "warn",
+    level: "info",
   },
 };
diff --git a/test/server/Server.test.js b/test/server/Server.test.js
@@ -283,6 +283,66 @@ describe("Server", () => {
           },
         },
       },
+      {
+        title:
+          "single compiler client.logging should default to infrastructureLogging.level",
+        multiCompiler: false,
+        options: {},
+        webpackConfig: {
+          infrastructureLogging: {
+            level: "verbose",
+          },
+        },
+      },
+      {
+        title:
+          "single compiler client.logging should override to infrastructureLogging.level",
+        multiCompiler: false,
+        options: {
+          client: {
+            logging: "none",
+          },
+        },
+        webpackConfig: {
+          infrastructureLogging: {
+            level: "verbose",
+          },
+        },
+      },
+      {
+        title:
+          "multi compiler client.logging should respect infrastructureLogging.level",
+        multiCompiler: true,
+        options: {},
+        webpackConfig: [
+          {},
+          // infrastructureLogging is set on the second compiler
+          {
+            infrastructureLogging: {
+              level: "warn",
+            },
+          },
+        ],
+      },
+      {
+        title:
+          "multi compiler client.logging should override infrastructureLogging.level",
+        multiCompiler: true,
+        options: {
+          client: {
+            logging: "none",
+          },
+        },
+        webpackConfig: [
+          {},
+          // infrastructureLogging is set on the second compiler
+          {
+            infrastructureLogging: {
+              level: "warn",
+            },
+          },
+        ],
+      },
       {
         title: "liveReload is true",
         multiCompiler: false,