fix(core): remove redundant allWorkspaceFiles from the project graph pipeline

Author: leosvelperez

packages/nx/src/daemon/server/project-graph-incremental-recomputation.ts

@@ -57,7 +57,6 @@ let cachedSerializedProjectGraphPromise: Promise<SerializedProjectGraph>;
 export let fileMapWithFiles:
   | {
       fileMap: FileMap;
-      allWorkspaceFiles: FileData[];
       rustReferences: NxWorkspaceFilesExternals;
     }
   | undefined;
@@ -408,14 +407,12 @@ async function createAndSerializeProjectGraph({
   try {
     performance.mark('create-project-graph-start');
     const fileMap = copyFileMap(fileMapWithFiles.fileMap);
-    const allWorkspaceFiles = copyFileData(fileMapWithFiles.allWorkspaceFiles);
     const rustReferences = fileMapWithFiles.rustReferences;
     const { projectGraph, projectFileMapCache } =
       await buildProjectGraphUsingFileMap(
         projects,
         knownExternalNodes,
         fileMap,
-        allWorkspaceFiles,
         rustReferences,
         currentProjectFileMapCache || readFileMapCache(),
         await getPlugins(),

packages/nx/src/hasher/create-task-hasher.ts

@@ -16,7 +16,7 @@ export function createTaskHasher(
   if (daemonClient.enabled()) {
     return new DaemonBasedTaskHasher(daemonClient, runnerOptions);
   } else {
-    const { fileMap, allWorkspaceFiles, rustReferences } = getFileMap();
+    const { rustReferences } = getFileMap();
     return new InProcessTaskHasher(
       projectGraph,
       nxJson,

packages/nx/src/project-graph/build-project-graph.ts

@@ -48,18 +48,15 @@ import { DelayedSpinner } from '../utils/delayed-spinner';
 import { hashObject } from '../hasher/file-hasher';
 
 let storedFileMap: FileMap | null = null;
-let storedAllWorkspaceFiles: FileData[] | null = null;
 let storedRustReferences: NxWorkspaceFilesExternals | null = null;
 
 export function getFileMap(): {
   fileMap: FileMap;
-  allWorkspaceFiles: FileData[];
   rustReferences: NxWorkspaceFilesExternals | null;
 } {
   if (!!storedFileMap) {
     return {
       fileMap: storedFileMap,
-      allWorkspaceFiles: storedAllWorkspaceFiles,
       rustReferences: storedRustReferences,
     };
   } else {
@@ -68,27 +65,23 @@ export function getFileMap(): {
         nonProjectFiles: [],
         projectFileMap: {},
       },
-      allWorkspaceFiles: [],
       rustReferences: null,
     };
   }
 }
 
 export function hydrateFileMap(
   fileMap: FileMap,
-  allWorkspaceFiles: FileData[],
   rustReferences: NxWorkspaceFilesExternals
 ) {
   storedFileMap = fileMap;
-  storedAllWorkspaceFiles = allWorkspaceFiles;
   storedRustReferences = rustReferences;
 }
 
 export async function buildProjectGraphUsingProjectFileMap(
   projectRootMap: Record<string, ProjectConfiguration>,
   externalNodes: Record<string, ProjectGraphExternalNode>,
   fileMap: FileMap,
-  allWorkspaceFiles: FileData[],
   rustReferences: NxWorkspaceFilesExternals,
   fileMapCache: FileMapCache | null,
   plugins: LoadedNxPlugin[],
@@ -98,7 +91,6 @@ export async function buildProjectGraphUsingProjectFileMap(
   projectFileMapCache: FileMapCache;
 }> {
   storedFileMap = fileMap;
-  storedAllWorkspaceFiles = allWorkspaceFiles;
   storedRustReferences = rustReferences;
 
   const projects: Record<string, ProjectConfiguration> = {};

packages/nx/src/project-graph/file-map-utils.spec.ts

@@ -47,12 +47,6 @@ describe('fileMapUtils', () => {
           },
           nonProjectFiles: [{ file: 'tools/myfile.txt', hash: 'some-hash' }],
         },
-        allWorkspaceFiles: [
-          { file: 'apps/demo/src/main.ts', hash: 'some-hash' },
-          { file: 'apps/demo-e2e/src/main.ts', hash: 'some-hash' },
-          { file: 'libs/ui/src/index.ts', hash: 'some-hash' },
-          { file: 'tools/myfile.txt', hash: 'some-hash' },
-        ],
       });
     });
   });

packages/nx/src/project-graph/file-map-utils.ts

@@ -1,29 +1,26 @@
-import {
+import type {
   FileData,
   FileMap,
   ProjectFileMap,
   ProjectGraph,
 } from '../config/project-graph';
-import {
+import type {
   ProjectConfiguration,
   ProjectsConfigurations,
 } from '../config/workspace-json-project-json';
-import { daemonClient } from '../daemon/client/client';
 import { NxWorkspaceFilesExternals } from '../native';
 import {
   getAllFileDataInContext,
   updateProjectFiles,
 } from '../utils/workspace-context';
 import { workspaceRoot } from '../utils/workspace-root';
 import { readProjectsConfigurationFromProjectGraph } from './project-graph';
-import { buildAllWorkspaceFiles } from './utils/build-all-workspace-files';
 import {
   createProjectRootMappingsFromProjectConfigurations,
   findProjectForPath,
 } from './utils/find-project-for-path';
 
 export interface WorkspaceFileMap {
-  allWorkspaceFiles: FileData[];
   fileMap: FileMap;
 }
 
@@ -70,7 +67,6 @@ export function createFileMap(
     }
   }
   return {
-    allWorkspaceFiles,
     fileMap: {
       projectFileMap,
       nonProjectFiles,
@@ -94,10 +90,6 @@ export function updateFileMap(
   );
   return {
     fileMap: updates.fileMap,
-    allWorkspaceFiles: buildAllWorkspaceFiles(
-      updates.fileMap.projectFileMap,
-      updates.fileMap.nonProjectFiles
-    ),
     rustReferences: updates.externalReferences,
   };
 }

packages/nx/src/project-graph/project-graph.ts

@@ -133,8 +133,10 @@ export async function buildProjectGraphAndSourceMapsWithoutDaemon() {
   performance.mark('retrieve-project-configurations:end');
 
   performance.mark('retrieve-workspace-files:start');
-  const { allWorkspaceFiles, fileMap, rustReferences } =
-    await retrieveWorkspaceFiles(workspaceRoot, projectRootMap);
+  const { fileMap, rustReferences } = await retrieveWorkspaceFiles(
+    workspaceRoot,
+    projectRootMap
+  );
   performance.mark('retrieve-workspace-files:end');
 
   const cacheEnabled = process.env.NX_CACHE_PROJECT_GRAPH !== 'false';
@@ -148,7 +150,6 @@ export async function buildProjectGraphAndSourceMapsWithoutDaemon() {
       projects,
       externalNodes,
       fileMap,
-      allWorkspaceFiles,
       rustReferences,
       cacheEnabled ? readFileMapCache() : null,
       plugins,
@@ -227,9 +228,11 @@ async function readCachedGraphAndHydrateFileMap(minimumComputedAt?: number) {
       project,
     ])
   );
-  const { allWorkspaceFiles, fileMap, rustReferences } =
-    await retrieveWorkspaceFiles(workspaceRoot, projectRootMap);
-  hydrateFileMap(fileMap, allWorkspaceFiles, rustReferences);
+  const { fileMap, rustReferences } = await retrieveWorkspaceFiles(
+    workspaceRoot,
+    projectRootMap
+  );
+  hydrateFileMap(fileMap, rustReferences);
   return graph;
 }
 

packages/nx/src/project-graph/utils/retrieve-workspace-files.ts

@@ -12,15 +12,13 @@ import {
 import type { LoadedNxPlugin } from '../plugins/loaded-nx-plugin';
 import {
   getNxWorkspaceFilesFromContext,
-  globWithWorkspaceContext,
   multiGlobWithWorkspaceContext,
 } from '../../utils/workspace-context';
-import { buildAllWorkspaceFiles } from './build-all-workspace-files';
 import { join } from 'path';
 import { getOnlyDefaultPlugins, getPlugins } from '../plugins/get-plugins';
 
 /**
- * Walks the workspace directory to create the `projectFileMap`, `ProjectConfigurations` and `allWorkspaceFiles`
+ * Walks the workspace directory to create the `projectFileMap` and `ProjectConfigurations`
  * @throws
  * @param workspaceRoot
  * @param nxJson
@@ -49,7 +47,6 @@ export async function retrieveWorkspaceFiles(
   );
 
   return {
-    allWorkspaceFiles: buildAllWorkspaceFiles(projectFileMap, globalFiles),
     fileMap: {
       projectFileMap,
       nonProjectFiles: globalFiles,