Merge branch 'master' into release

Author: MaxKless

apps/intellij/src/main/kotlin/dev/nx/console/utils/FindNxConfigurationFiles.kt

@@ -3,10 +3,9 @@ package dev.nx.console.utils
 import com.intellij.openapi.application.readAction
 import com.intellij.openapi.progress.ProgressManager
 import com.intellij.openapi.project.Project
+import com.intellij.openapi.roots.ProjectFileIndex
 import com.intellij.openapi.vfs.LocalFileSystem
-import com.intellij.openapi.vfs.VfsUtilCore
 import com.intellij.openapi.vfs.VirtualFile
-import com.intellij.openapi.vfs.VirtualFileVisitor
 
 suspend fun findNxConfigurationFiles(
     project: Project,
@@ -16,22 +15,17 @@ suspend fun findNxConfigurationFiles(
     readAction {
         val startDirectory = LocalFileSystem.getInstance().findFileByPath(project.nxBasePath)
         if (startDirectory != null) {
-            VfsUtilCore.visitChildrenRecursively(
-                startDirectory,
-                object : VirtualFileVisitor<Any?>() {
-                    override fun visitFile(file: VirtualFile): Boolean {
-                        if (
-                            !file.isDirectory &&
-                                (file.name == "project.json" ||
-                                    (includeNxJson && file.name == "nx.json"))
-                        ) {
-                            paths.add(file)
-                        }
-                        ProgressManager.checkCanceled()
-                        return true
-                    }
+            ProjectFileIndex.getInstance(project).iterateContentUnderDirectory(startDirectory) {
+                file ->
+                if (
+                    !file.isDirectory &&
+                        (file.name == "project.json" || (includeNxJson && file.name == "nx.json"))
+                ) {
+                    paths.add(file)
                 }
-            )
+                ProgressManager.checkCanceled()
+                return@iterateContentUnderDirectory true
+            }
         }
     }
     return paths

apps/nxls/package.json

@@ -23,16 +23,6 @@
     "@parcel/watcher-linux-x64-glibc": "2.4.1",
     "@parcel/watcher-linux-x64-musl": "2.4.1",
     "@parcel/watcher-win32-arm64": "2.4.1",
-    "@parcel/watcher-win32-x64": "2.4.1",
-    "@nx/nx-darwin-arm64": "19.0.3",
-    "@nx/nx-darwin-x64": "19.0.3",
-    "@nx/nx-freebsd-x64": "19.0.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.0.3",
-    "@nx/nx-linux-arm64-gnu": "19.0.3",
-    "@nx/nx-linux-arm64-musl": "19.0.3",
-    "@nx/nx-linux-x64-gnu": "19.0.3",
-    "@nx/nx-linux-x64-musl": "19.0.3",
-    "@nx/nx-win32-arm64-msvc": "19.0.3",
-    "@nx/nx-win32-x64-msvc": "19.0.3"
+    "@parcel/watcher-win32-x64": "2.4.1"
   }
 }

apps/vscode/package.json

@@ -53,16 +53,6 @@
     "@parcel/watcher-linux-x64-musl": "2.4.1",
     "@parcel/watcher-win32-arm64": "2.4.1",
     "@parcel/watcher-win32-x64": "2.4.1",
-    "@nx/nx-darwin-arm64": "19.0.3",
-    "@nx/nx-darwin-x64": "19.0.3",
-    "@nx/nx-freebsd-x64": "19.0.3",
-    "@nx/nx-linux-arm-gnueabihf": "19.0.3",
-    "@nx/nx-linux-arm64-gnu": "19.0.3",
-    "@nx/nx-linux-arm64-musl": "19.0.3",
-    "@nx/nx-linux-x64-gnu": "19.0.3",
-    "@nx/nx-linux-x64-musl": "19.0.3",
-    "@nx/nx-win32-arm64-msvc": "19.0.3",
-    "@nx/nx-win32-x64-msvc": "19.0.3",
     "@vscode-elements/elements": "^1.6.1"
   },
   "contributes": {

libs/language-server/utils/src/index.ts

@@ -8,3 +8,4 @@ export * from './lib/lsp-log';
 export * from './lib/json-language-service';
 export * from './lib/find-property';
 export * from './lib/executor';
+export * from './lib/nx-cloud';

libs/language-server/utils/src/lib/nx-cloud.ts

@@ -0,0 +1,34 @@
+import { importNxPackagePath, readNxJson } from '@nx-console/shared/npm';
+import type { NxJsonConfiguration } from 'nx/src/devkit-exports';
+import { lspLogger } from './lsp-log';
+
+export async function isNxCloudUsed(workspacePath: string): Promise<boolean> {
+  const nxJson = await readNxJson(workspacePath);
+
+  let getIsNxCloudUsed: (nxJson: NxJsonConfiguration) => boolean;
+  try {
+    // try to use nx utils if they exist
+    const nxCloudUtils = await importNxPackagePath<
+      typeof import('nx/src/utils/nx-cloud-utils')
+    >(workspacePath, 'src/utils/nx-cloud-utils', lspLogger);
+    getIsNxCloudUsed = nxCloudUtils.isNxCloudUsed;
+  } catch (e) {
+    // fallback implementation, copied from nx
+    getIsNxCloudUsed = (nxJson: NxJsonConfiguration) => {
+      if (process.env.NX_NO_CLOUD === 'true' || nxJson.neverConnectToCloud) {
+        return false;
+      }
+
+      return (
+        !!process.env.NX_CLOUD_ACCESS_TOKEN ||
+        !!nxJson.nxCloudAccessToken ||
+        !!nxJson.nxCloudId ||
+        !!Object.values(nxJson.tasksRunnerOptions ?? {}).find(
+          (r) => r.runner == '@nrwl/nx-cloud' || r.runner == 'nx-cloud'
+        )
+      );
+    };
+  }
+
+  return getIsNxCloudUsed(nxJson);
+}

libs/language-server/watcher/src/lib/daemon-watcher.ts

@@ -94,7 +94,7 @@ export class DaemonWatcher {
             if (error === 'closed') {
               if (!this.stopped) {
                 lspLogger.log('Daemon watcher connection closed, restarting');
-                this.tryRestartWatcher();
+                this.useNativeWatcher();
               }
             } else if (error) {
               lspLogger.log('Error watching files: ' + error);
@@ -142,24 +142,8 @@ export class DaemonWatcher {
       lspLogger.log(
         `Error initializing daemon watcher, check daemon logs. ${e}`
       );
-      this.tryRestartWatcher();
-    }
-  }
-
-  private async tryRestartWatcher() {
-    this.disposeEverything();
-    if (this.retryCount > 0) {
-      lspLogger.log('Daemon watcher failed to restart, using native watcher');
       this.useNativeWatcher();
-      return;
     }
-    this.retryCount++;
-    await new Promise((resolve) => {
-      const timeout = setTimeout(resolve, 100);
-      this.disposables.add(() => clearTimeout(timeout));
-    });
-
-    await this.initWatcher();
   }
 
   private useNativeWatcher() {

libs/language-server/workspace/src/lib/get-cloud-onboarding-info.ts

@@ -3,7 +3,7 @@ import { existsSync, readFileSync } from 'fs';
 import * as os from 'node:os';
 import { join } from 'path';
 
-import { lspLogger } from '@nx-console/language-server/utils';
+import { isNxCloudUsed, lspLogger } from '@nx-console/language-server/utils';
 import {
   getNxAccessToken,
   getNxCloudId,
@@ -24,6 +24,16 @@ export async function getCloudOnboardingInfo(
     content.includes('nx affected')
   );
 
+  if (!(await isNxCloudUsed(workspacePath))) {
+    return {
+      hasNxInCI,
+      hasAffectedCommandsInCI,
+      isConnectedToCloud: false,
+      isWorkspaceClaimed: false,
+      personalAccessToken: undefined,
+    };
+  }
+
   const accessToken = await getNxAccessToken(workspacePath);
   const nxCloudId = await getNxCloudId(workspacePath);
   const nxCloudUrl = await getNxCloudUrl(workspacePath);
@@ -185,6 +195,7 @@ async function getNxCloudWorkspaceClaimed(
     headers['Nx-Cloud-Personal-Access-Token'] = pat;
   }
 
+  lspLogger.log(`Making claimed request`);
   try {
     const response = await xhr({
       type: 'POST',

libs/language-server/workspace/src/lib/get-recent-cipe-data.ts

@@ -1,4 +1,4 @@
-import { lspLogger } from '@nx-console/language-server/utils';
+import { isNxCloudUsed, lspLogger } from '@nx-console/language-server/utils';
 import {
   getNxAccessToken,
   getNxCloudId,
@@ -14,6 +14,15 @@ export async function getRecentCIPEData(workspacePath: string): Promise<{
   error?: CIPEInfoError;
   workspaceUrl?: string;
 }> {
+  if (!(await isNxCloudUsed(workspacePath))) {
+    return {
+      error: {
+        type: 'other',
+        message: 'Nx Cloud is not used in this workspace',
+      },
+    };
+  }
+
   const branches = getRecentlyCommittedGitBranches(workspacePath);
 
   const nxCloudUrl = await getNxCloudUrl(workspacePath);
@@ -44,6 +53,7 @@ export async function getRecentCIPEData(workspacePath: string): Promise<{
     headers['Authorization'] = accessToken;
   }
 
+  lspLogger.log(`Making recent CIPE request`);
   try {
     const response = await xhr({
       type: 'POST',
@@ -130,6 +140,7 @@ export function getDefaultBranch(workspacePath: string) {
       'git symbolic-ref refs/remotes/origin/HEAD',
       {
         cwd: workspacePath,
+        stdio: 'pipe',
       }
     )
       .toString()

libs/vscode/telemetry/src/lib/google-analytics-sender.ts

@@ -41,7 +41,7 @@ export class GoogleAnalyticsSender implements TelemetrySender {
     getOutputChannel().appendLine(`Uncaught Exception: ${error}`);
 
     const shouldLogToRollbar = this.production
-      ? Math.floor(Math.random() * 75) === 0
+      ? Math.floor(Math.random() * 25) === 0
       : true;
     if (shouldLogToRollbar) {
       this.rollbar.error(error);