fix: add windowsHide: true in more places (#2262)

nrwl · Sep 25, 2024 · 1731bc9 · 1731bc9
1 parent 67a4721
commit 1731bc9
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 8 deletions.
diff --git a/apps/nxls-e2e/src/nxls-wrapper.ts b/apps/nxls-e2e/src/nxls-wrapper.ts
@@ -21,7 +21,7 @@ export class NxlsWrapper {
   private readerErrorDisposable?: { dispose: () => void };
   private pendingRequestMap = new Map<
     number,
-    (message: ResponseMessage) => void
+    [(message: ResponseMessage) => void, NodeJS.Timeout]
   >();
   private pendingNotificationMap = new Map<
     string,
@@ -102,16 +102,17 @@ export class NxlsWrapper {
       res(new Error('nxls stopped'));
       clearTimeout(timeout);
     });
-    this.pendingRequestMap.forEach((res, key) =>
+    this.pendingRequestMap.forEach(([res, timeout], key) => {
       res({
         jsonrpc: '2.0',
         id: key,
         error: {
           code: -32000,
           message: 'nxls stopped',
         },
-      })
-    );
+      });
+      clearTimeout(timeout);
+    });
 
     this.readerDisposable?.dispose();
     this.readerErrorDisposable?.dispose();
@@ -158,7 +159,7 @@ export class NxlsWrapper {
       }, (customTimeoutMinutes ?? 3) * 60 * 1000);
 
       const id = this.idCounter++;
-      this.pendingRequestMap.set(id, resolve);
+      this.pendingRequestMap.set(id, [resolve, timeout]);
 
       const fullRequest = {
         jsonrpc: '2.0',
@@ -236,9 +237,11 @@ export class NxlsWrapper {
       }
 
       if (isResponseMessage(message) && typeof message.id === 'number') {
-        const resolve = this.pendingRequestMap.get(message.id);
-        if (resolve) {
+        const requestAndTimeout = this.pendingRequestMap.get(message.id);
+        if (requestAndTimeout) {
+          const [resolve, timeout] = requestAndTimeout;
           resolve(message);
+          clearTimeout(timeout);
           this.pendingRequestMap.delete(message.id);
         }
       } else if (isNotificationMessage(message)) {

diff --git a/libs/language-server/workspace/src/lib/nx-stop-daemon.ts b/libs/language-server/workspace/src/lib/nx-stop-daemon.ts
@@ -16,5 +16,6 @@ export async function nxStopDaemon(workspacePath: string, logger: Logger) {
   );
   execSync(`${packageManagerCommands.exec} nx daemon --stop`, {
     cwd: workspacePath,
+    windowsHide: true,
   });
 }
diff --git a/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts b/libs/vscode/add-dependency/src/lib/vscode-add-dependency.ts
@@ -277,7 +277,14 @@ async function getWorkspaceAddFlag(
     private?: boolean;
   }>(join(workspacePath, 'package.json'));
   if (pkgManager === 'yarn') {
-    const isYarnV1 = major(execSync('yarn --version').toString().trim()) === 1;
+    const isYarnV1 =
+      major(
+        execSync('yarn --version', {
+          windowsHide: true,
+        })
+          .toString()
+          .trim()
+      ) === 1;
     const isWorkspace =
       !!pkgJson.private &&
       !!pkgJson.workspaces &&

diff --git a/libs/vscode/nx-cloud-view/src/lib/get-cloud-onboarding-url.ts b/libs/vscode/nx-cloud-view/src/lib/get-cloud-onboarding-url.ts
@@ -110,6 +110,7 @@ export function getGithubSlugOrNull(): string | null {
   try {
     const gitRemote = execSync('git remote -v', {
       stdio: 'pipe',
+      windowsHide: true,
     }).toString();
     // If there are no remotes, we default to github
     if (!gitRemote || gitRemote.length === 0) {