fix: allow project graph loading with angular + nx workspaces (#1306)

nrwl · Jul 13, 2022 · d89ff6d · d89ff6d
1 parent 8b7149b
commit d89ff6d
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/libs/vscode/nx-workspace/src/lib/get-nx-workspace-config.ts b/libs/vscode/nx-workspace/src/lib/get-nx-workspace-config.ts
@@ -25,7 +25,8 @@ export type NxWorkspaceConfiguration = ProjectsConfigurations &
  */
 export async function getNxWorkspaceConfig(
   basedir: string,
-  format: 'nx' | 'angularCli'
+  format: 'nx' | 'angularCli',
+  isNxWorkspace: boolean
 ): Promise<{
   workspaceConfiguration: NxWorkspaceConfiguration;
   configPath: string;
@@ -56,7 +57,7 @@ export async function getNxWorkspaceConfig(
 
     let projectGraph: ProjectGraph | null = null;
     try {
-      if (format === 'angularCli') {
+      if (!isNxWorkspace) {
         throw 'No project graph support';
       }
 

diff --git a/libs/vscode/nx-workspace/src/lib/nx-workspace.ts b/libs/vscode/nx-workspace/src/lib/nx-workspace.ts
@@ -1,5 +1,6 @@
 import type { NxJsonConfiguration, ProjectsConfigurations } from '@nrwl/devkit';
 import {
+  checkIsNxWorkspace,
   clearJsonCache,
   fileExists,
   getOutputChannel,
@@ -85,9 +86,11 @@ async function _workspace(): Promise<NxWorkspace> {
   const isAngularWorkspace = await fileExists(
     join(workspacePath, 'angular.json')
   );
+  const isNxWorkspace = await checkIsNxWorkspace(workspacePath);
   const config = await getNxWorkspaceConfig(
     workspacePath,
-    isAngularWorkspace ? 'angularCli' : 'nx'
+    isAngularWorkspace ? 'angularCli' : 'nx',
+    isNxWorkspace
   );
 
   const isLerna = await fileExists(join(workspacePath, 'lerna.json'));