fix: persistent spinner breaks vscode context link detection (#1602)

* fix: persistent spinner breaks vscode context link detection * update dep visual-logger
electrode-io · Apr 16, 2020 · 065431e · 065431e
1 parent b4bca3d
commit 065431e
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 12 deletions.
diff --git a/packages/xarc-app-dev/lib/dev-admin/admin-server.js b/packages/xarc-app-dev/lib/dev-admin/admin-server.js
@@ -31,8 +31,6 @@ const DEV_ADMIN_STATUS = "DevAdminStatus";
 const WDS_PROGRESS = "WDSProgress";
 const LOG_ALERT = "LogAlert";
 
-const PROMPT_SPINNER = ">>>>>>>>      ";
-
 const SERVER_ENVS = {
   [APP_SERVER_NAME]: {
     XARC_BABEL_TARGET: "node"
@@ -68,8 +66,7 @@ class AdminServer {
     this._io.setup();
     this._io.addItem({
       name: DEV_ADMIN_STATUS,
-      display: ck`[<green.inverse>DEV ADMIN</>]`,
-      spinner: PROMPT_SPINNER
+      display: ck`[<green.inverse>DEV ADMIN</>]`
     });
     this.updateStatus("webpack is PENDING");
     this.handleUserInput();
@@ -134,8 +131,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
   }
 
   getServer(name) {
-    if (this._servers[name]) return this._servers[name];
-    return {};
+    return this._servers[name] || {};
   }
 
   handleServerExit(name) {
@@ -330,7 +326,11 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
           }
           if (line.startsWith(progSig)) {
             progLine = line.substring(progSig.length).replace(cwdRegex, ".");
-            this._io.addItem({ name: WDS_PROGRESS, spinner: true, display: `Webpack Progress` });
+            this._io.addItem({
+              name: WDS_PROGRESS,
+              spinner: true,
+              display: `Webpack Progress`
+            });
             this._io.updateItem(WDS_PROGRESS, progLine);
             const match = progLine.match(/\d{1,3}%/);
             if (match) {
@@ -389,9 +389,8 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
 
   toggleFullLogUrlMessage(serverName) {
     const server = this.getServer(serverName);
-    if (server && server.options.logSaver) {
-      const { options } = server;
-      const { logSaver } = options;
+    if (server.options) {
+      const { logSaver } = server.options;
       logSaver._toggle = !logSaver._toggle;
       if (!logSaver._toggle) {
         this._io.removeItem(LOG_ALERT);
@@ -405,7 +404,7 @@ ${proxyItem}<magenta>M</> - Show this menu <magenta>Q</> - Shutdown
     this._io.addItem({
       name: LOG_ALERT,
       display: ck`[<orange.inverse>ALERT</>]`,
-      spinner: PROMPT_SPINNER
+      spinner: false
     });
     const instruction = `<orange>View full logs at: <cyan.underline>${url}</></> - \
 <green>Press Z to hide or show this message</>`;

diff --git a/packages/xarc-app-dev/package.json b/packages/xarc-app-dev/package.json
@@ -79,7 +79,7 @@
     "style-loader": "^0.20.1",
     "subapp-util": "^1.0.5",
     "sudo-prompt": "^8.2.5",
-    "visual-logger": "^1.1.0",
+    "visual-logger": "^1.1.2",
     "webpack-cli": "^3.3.9",
     "webpack-dev-middleware": "^3.4.0",
     "webpack-hot-middleware": "^2.22.2",