fix: reload on warnings (#4056)

webpack · Nov 25, 2021 · 1ba9720 · 1ba9720
1 parent 5026601
commit 1ba9720
Show file tree

Hide file tree

Showing 8 changed files with 162 additions and 165 deletions.
diff --git a/client-src/index.js b/client-src/index.js
@@ -160,7 +160,7 @@ const onSocketMessage = {
 
     self.location.reload();
   },
-  warnings(warnings) {
+  warnings(warnings, params) {
     log.warn("Warnings while compiling.");
 
     const printableWarnings = warnings.map((error) => {
@@ -183,6 +183,12 @@ const onSocketMessage = {
     if (needShowOverlayForWarnings) {
       show("warning", warnings);
     }
+
+    if (params && params.preventReloading) {
+      return;
+    }
+
+    reloadApp(options, status);
   },
   errors(errors) {
     log.error("Errors while compiling. Reload prevented.");

diff --git a/client-src/socket.js b/client-src/socket.js
@@ -56,7 +56,7 @@ const socket = function initSocket(url, handlers, reconnect) {
     const message = JSON.parse(data);
 
     if (handlers[message.type]) {
-      handlers[message.type](message.data);
+      handlers[message.type](message.data, message.params);
     }
   });
 };

diff --git a/lib/Server.js b/lib/Server.js
@@ -2148,12 +2148,12 @@ class Server {
   }
 
   // eslint-disable-next-line class-methods-use-this
-  sendMessage(clients, type, data) {
+  sendMessage(clients, type, data, params) {
     for (const client of clients) {
       // `sockjs` uses `1` to indicate client is ready to accept data
       // `ws` uses `WebSocket.OPEN`, but it is mean `1` too
       if (client.readyState === 1) {
-        client.send(JSON.stringify({ type, data }));
+        client.send(JSON.stringify({ type, data, params }));
       }
     }
   }
@@ -2202,8 +2202,16 @@ class Server {
     this.sendMessage(clients, "hash", stats.hash);
 
     if (stats.errors.length > 0 || stats.warnings.length > 0) {
+      const hasErrors = stats.errors.length > 0;
+
       if (stats.warnings.length > 0) {
-        this.sendMessage(clients, "warnings", stats.warnings);
+        let params;
+
+        if (hasErrors) {
+          params = { preventReloading: true };
+        }
+
+        this.sendMessage(clients, "warnings", stats.warnings, params);
       }
 
       if (stats.errors.length > 0) {