fix(server): change clientLogLevel order to be called first

webpack · Jun 5, 2019 · fcf85c2 · fcf85c2
1 parent 9582418
commit fcf85c2
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 5 deletions.
diff --git a/lib/Server.js b/lib/Server.js
@@ -694,10 +694,15 @@ class Server {
         }
       });
 
+      if (this.clientLogLevel) {
+        this.sockWrite([connection], 'log-level', this.clientLogLevel);
+      }
+
       if (this.hot) {
         this.sockWrite([connection], 'hot');
       }
 
+      // TODO: change condition at major version
       if (this.options.liveReload !== false) {
         this.sockWrite([connection], 'liveReload', this.options.liveReload);
       }
@@ -710,10 +715,6 @@ class Server {
         this.sockWrite([connection], 'overlay', this.clientOverlay);
       }
 
-      if (this.clientLogLevel) {
-        this.sockWrite([connection], 'log-level', this.clientLogLevel);
-      }
-
       if (!this._stats) {
         return;
       }

diff --git a/test/e2e/ClientOptions.test.js b/test/e2e/ClientOptions.test.js
@@ -250,6 +250,12 @@ describe('Client console.log', () => {
         liveReload: true,
       },
     },
+    {
+      title: 'clientLogLevel is silent',
+      options: {
+        clientLogLevel: 'silent',
+      },
+    },
   ];
 
   for (const { title, options } of cases) {

diff --git a/test/e2e/__snapshots__/ClientOptions.test.js.snap b/test/e2e/__snapshots__/ClientOptions.test.js.snap
@@ -1,5 +1,11 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
+exports[`Client console.log clientLogLevel is silent 1`] = `
+Array [
+  "Hey.",
+]
+`;
+
 exports[`Client console.log hot disabled 1`] = `
 Array [
   "Hey.",

diff --git a/test/fixtures/contentbase-config/public/node_modules/index.html b/test/fixtures/contentbase-config/public/node_modules/index.html