Merge pull request #215 from dvbern/disable-websocket-in-static-mode

Disable viewer websocket connection if mode is static
webpack-contrib · Oct 16, 2018 · 5be7049 · 5be7049
2 parents aad11d1 + 256f55f
commit 5be7049
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/client/viewer.jsx b/client/viewer.jsx
@@ -9,7 +9,9 @@ import styles from './viewer.css';
 // Initializing WebSocket for live treemap updates
 let ws;
 try {
-  ws = new WebSocket(`ws://${location.host}`);
+  if (window.enableWebSocket) {
+    ws = new WebSocket(`ws://${location.host}`);
+  }
 } catch (err) {
   console.warn(
     "Couldn't connect to analyzer websocket server so you'll have to reload page manually to see updates in the treemap"

diff --git a/src/viewer.js b/src/viewer.js
@@ -52,7 +52,8 @@ async function startServer(bundleStats, opts) {
     res.render('viewer', {
       mode: 'server',
       get chartData() { return JSON.stringify(chartData) },
-      defaultSizes: JSON.stringify(defaultSizes)
+      defaultSizes: JSON.stringify(defaultSizes),
+      enableWebSocket: true
     });
   });
 
@@ -130,7 +131,8 @@ function generateReport(bundleStats, opts) {
       mode: 'static',
       chartData: JSON.stringify(chartData),
       assetContent: getAssetContent,
-      defaultSizes: JSON.stringify(defaultSizes)
+      defaultSizes: JSON.stringify(defaultSizes),
+      enableWebSocket: false
     },
     (err, reportHtml) => {
       if (err) return logger.error(err);

diff --git a/views/viewer.ejs b/views/viewer.ejs
@@ -13,6 +13,7 @@
     <script>
       window.chartData = <%- chartData %>;
       window.defaultSizes = <%- defaultSizes %>;
+      window.enableWebSocket = <%- enableWebSocket %>;
     </script>
   </body>
 </html>