Add ack and only log disconnect if not at build success.

FormidableLabs · Apr 17, 2019 · c819882 · c819882
1 parent 893b762
commit c819882
Show file tree

Hide file tree

Showing 3 changed files with 44 additions and 31 deletions.
diff --git a/bin/webpack-dashboard.js b/bin/webpack-dashboard.js
@@ -65,9 +65,9 @@ const main = (module.exports = opts => {
     server.on("connection", socket => {
       socket.emit("mode", { minimal: program.minimal || false });
 
-      socket.on("message", message => {
+      socket.on("message", (message, ack) => {
         if (message.type !== "log") {
-          dashboard.setData(message);
+          dashboard.setData(message, ack);
         }
       });
     });
@@ -95,8 +95,8 @@ const main = (module.exports = opts => {
     });
   } else {
     server.on("connection", socket => {
-      socket.on("message", message => {
-        dashboard.setData(message);
+      socket.on("message", (message, ack) => {
+        dashboard.setData(message, ack);
       });
     });
   }

diff --git a/dashboard/index.js b/dashboard/index.js
@@ -91,7 +91,7 @@ class Dashboard {
     this.screen.render();
   }
 
-  setData(dataArray) {
+  setData(dataArray, ack) {
     dataArray
       .map(data =>
         data.error
@@ -105,6 +105,11 @@ class Dashboard {
       });
 
     this.screen.render();
+
+    // Send ack back if requested.
+    if (ack) {
+      ack();
+    }
   }
 
   setProgress(data) {

diff --git a/plugin/index.js b/plugin/index.js
@@ -72,6 +72,7 @@ class DashboardPlugin {
 
   apply(compiler) {
     let handler = this.handler;
+    let reachedSuccess = false;
     let timer;
 
     if (!handler) {
@@ -90,8 +91,10 @@ class DashboardPlugin {
         console.log(err);
       });
       this.socket.on("disconnect", () => {
-        // eslint-disable-next-line no-console
-        console.log("Socket.io disconnected.");
+        if (!reachedSuccess) {
+          // eslint-disable-next-line no-console
+          console.log("Socket.io disconnected before completing build lifecycle.");
+        }
       });
     }
 
@@ -180,32 +183,37 @@ class DashboardPlugin {
         warnings: true
       };
 
-      handler([
-        {
-          type: "status",
-          value: "Success"
-        },
-        {
-          type: "progress",
-          value: 1
-        },
-        {
-          type: "operations",
-          value: `idle${getTimeMessage(timer)}`
-        },
-        {
-          type: "stats",
-          value: {
-            errors: stats.hasErrors(),
-            warnings: stats.hasWarnings(),
-            data: stats.toJson(statsJsonOptions)
+      handler(
+        [
+          {
+            type: "status",
+            value: "Success"
+          },
+          {
+            type: "progress",
+            value: 1
+          },
+          {
+            type: "operations",
+            value: `idle${getTimeMessage(timer)}`
+          },
+          {
+            type: "stats",
+            value: {
+              errors: stats.hasErrors(),
+              warnings: stats.hasWarnings(),
+              data: stats.toJson(statsJsonOptions)
+            }
+          },
+          {
+            type: "log",
+            value: stats.toString(statsOptions)
           }
-        },
-        {
-          type: "log",
-          value: stats.toString(statsOptions)
+        ],
+        () => {
+          reachedSuccess = true;
         }
-      ]);
+      );
 
       if (!this.minimal) {
         this.observeMetrics(stats).subscribe({