fix(angular): read angularjson from the dir provided by the angular cli

nrwl · May 15, 2023 · 428b0c9 · 428b0c9 · vercel · May 15, 2023
1 parent 5419811
commit 428b0c9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 15 deletions.
diff --git a/packages/nx/src/adapter/angular-json.ts b/packages/nx/src/adapter/angular-json.ts
@@ -40,15 +40,19 @@ export function isAngularPluginInstalled() {
   }
 }
 
-function readAngularJson() {
-  return toNewFormat(readJsonFile(path.join(workspaceRoot, 'angular.json')))
-    .projects;
+function readAngularJson(angularCliWorkspaceRoot: string) {
+  return toNewFormat(
+    readJsonFile(path.join(angularCliWorkspaceRoot, 'angular.json'))
+  ).projects;
 }
 
-export function mergeAngularJsonAndGlobProjects(globProjects: {
-  [name: string]: ProjectConfiguration;
-}): { [name: string]: ProjectConfiguration } {
-  const res = readAngularJson();
+export function mergeAngularJsonAndGlobProjects(
+  globProjects: {
+    [name: string]: ProjectConfiguration;
+  },
+  angularCliWorkspaceRoot: string
+): { [name: string]: ProjectConfiguration } {
+  const res = readAngularJson(angularCliWorkspaceRoot);
   const folders = new Set();
   for (let k of Object.keys(res)) {
     folders.add(res[k].root);

diff --git a/packages/nx/src/config/workspaces.ts b/packages/nx/src/config/workspaces.ts
@@ -118,7 +118,8 @@ export class Workspaces {
       )
     ) {
       projectsConfigurations.projects = mergeAngularJsonAndGlobProjects(
-        projectsConfigurations.projects
+        projectsConfigurations.projects,
+        this.root
       );
     }
     this.cachedProjectsConfig = this.mergeTargetDefaultsIntoProjectDescriptions(

diff --git a/packages/nx/src/executors/utils/convert-nx-executor.ts b/packages/nx/src/executors/utils/convert-nx-executor.ts
@@ -22,12 +22,6 @@ export function convertNxExecutor(executor: Executor) {
     const projectsConfigurations = workspaces.readProjectsConfigurations();
 
     const promise = async () => {
-      let projectGraph: ProjectGraph;
-      try {
-        projectGraph = readCachedProjectGraph();
-      } catch {
-        projectGraph = await createProjectGraphAsync();
-      }
       const nxJsonConfiguration = workspaces.readNxJson();
       const context: ExecutorContext = {
         root: builderContext.workspaceRoot,
@@ -39,7 +33,7 @@ export function convertNxExecutor(executor: Executor) {
         nxJsonConfiguration,
         workspace: { ...projectsConfigurations, ...nxJsonConfiguration },
         cwd: process.cwd(),
-        projectGraph,
+        projectGraph: null,
         isVerbose: false,
       };
       return executor(options, context);