fix(core): fix projectFileMap access in plugins

nrwl · May 17, 2023 · 1670986 · 1670986 · vercel · May 17, 2023
1 parent 74c5ad3
commit 1670986
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 11 deletions.
diff --git a/packages/nx/src/project-graph/build-project-graph.ts b/packages/nx/src/project-graph/build-project-graph.ts
@@ -30,15 +30,14 @@ import { readNxJson } from '../config/configuration';
 import { existsSync } from 'fs';
 import { PackageJson } from '../utils/package-json';
 
-let storedProjectGraph: ProjectGraph | null = null;
 let storedProjectFileMap: ProjectFileMap | null = null;
 let storedAllWorkspaceFiles: FileData[] | null = null;
 
-export function getProjectFileMap(projectGraph: ProjectGraph): {
+export function getProjectFileMap(): {
   projectFileMap: ProjectFileMap;
   allWorkspaceFiles: FileData[];
 } {
-  if (projectGraph === storedProjectGraph) {
+  if (!!storedProjectFileMap) {
     return {
       projectFileMap: storedProjectFileMap,
       allWorkspaceFiles: storedAllWorkspaceFiles,
@@ -58,6 +57,9 @@ export async function buildProjectGraphUsingProjectFileMap(
   projectGraph: ProjectGraph;
   projectFileMapCache: ProjectFileMapCache;
 }> {
+  storedProjectFileMap = projectFileMap;
+  storedAllWorkspaceFiles = allWorkspaceFiles;
+
   const nxJson = readNxJson();
   const projectGraphVersion = '6.0';
   assertWorkspaceValidity(projectsConfigurations, nxJson);
@@ -106,11 +108,6 @@ export async function buildProjectGraphUsingProjectFileMap(
   if (shouldWriteCache) {
     writeCache(projectFileMapCache, projectGraph);
   }
-
-  storedProjectGraph = projectGraph;
-  storedProjectFileMap = projectFileMap;
-  storedAllWorkspaceFiles = allWorkspaceFiles;
-
   return {
     projectGraph,
     projectFileMapCache,

diff --git a/packages/nx/src/project-graph/project-graph-builder.ts b/packages/nx/src/project-graph/project-graph-builder.ts
@@ -22,7 +22,7 @@ export class ProjectGraphBuilder {
   constructor(g?: ProjectGraph, fileMap?: ProjectFileMap) {
     if (g) {
       this.graph = g;
-      this.fileMap = fileMap || getProjectFileMap(g).projectFileMap;
+      this.fileMap = fileMap || getProjectFileMap().projectFileMap;
     } else {
       this.graph = {
         nodes: {},

diff --git a/packages/nx/src/tasks-runner/run-command.ts b/packages/nx/src/tasks-runner/run-command.ts
@@ -236,8 +236,7 @@ export async function invokeTasksRunner({
   if (daemonClient.enabled()) {
     hasher = new DaemonBasedTaskHasher(daemonClient, runnerOptions);
   } else {
-    const { projectFileMap, allWorkspaceFiles } =
-      getProjectFileMap(projectGraph);
+    const { projectFileMap, allWorkspaceFiles } = getProjectFileMap();
     hasher = new InProcessTaskHasher(
       projectFileMap,
       allWorkspaceFiles,