fix(core): provide taskGraph for every task calculation

nrwl · Aug 1, 2023 · 711b8d7 · 711b8d7
1 parent fd6bccd
commit 711b8d7
Show file tree

Hide file tree

Showing 7 changed files with 459 additions and 379 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -208,10 +208,9 @@ jobs:
     executor: macos
     environment:
       NX_E2E_CI_CACHE_KEY: e2e-circleci-macos
-      NX_DAEMON: 'false' # TODO: Fix the hashing issue and re-enable this
+      NX_DAEMON: 'true'
       NX_PERF_LOGGING: 'false'
       SELECTED_PM: 'npm' # explicitly define npm for macOS tests
-      NX_SKIP_NX_CACHE: 'true' # TODO: Figure out what is going on with the cache and renable it
     steps:
       - run:
           name: Set dynamic nx run variable

diff --git a/packages/nx/src/command-line/affected/print-affected.ts b/packages/nx/src/command-line/affected/print-affected.ts
@@ -76,7 +76,6 @@ async function createTasks(
     {},
     [],
     projectGraph,
-    taskGraph,
     nxJson,
     {},
     fileHasher
@@ -85,7 +84,7 @@ async function createTasks(
   const tasks = Object.values(taskGraph.tasks);
 
   await Promise.all(
-    tasks.map((t) => hashTask(hasher, projectGraph, {} as any, t))
+    tasks.map((t) => hashTask(hasher, projectGraph, taskGraph, t))
   );
 
   return tasks.map((task) => ({

diff --git a/packages/nx/src/daemon/server/handle-hash-tasks.ts b/packages/nx/src/daemon/server/handle-hash-tasks.ts
@@ -10,7 +10,6 @@ import { setHashEnv } from '../../hasher/set-hash-env';
  * TaskHasher has a cache inside, so keeping it around results in faster performance
  */
 let storedProjectGraph: any = null;
-let storedTaskGraph: any = null;
 let storedHasher: InProcessTaskHasher | null = null;
 
 export async function handleHashTasks(payload: {
@@ -27,18 +26,18 @@ export async function handleHashTasks(payload: {
 
   if (projectGraph !== storedProjectGraph) {
     storedProjectGraph = projectGraph;
-    storedTaskGraph = payload.taskGraph;
     storedHasher = new InProcessTaskHasher(
       projectFileMap,
       allWorkspaceFiles,
       projectGraph,
-      payload.taskGraph,
       nxJson,
       payload.runnerOptions,
       fileHasher
     );
   }
-  const response = JSON.stringify(await storedHasher.hashTasks(payload.tasks));
+  const response = JSON.stringify(
+    await storedHasher.hashTasks(payload.tasks, payload.taskGraph)
+  );
   return {
     response,
     description: 'handleHashTasks',

diff --git a/packages/nx/src/hasher/hash-task.ts b/packages/nx/src/hasher/hash-task.ts
@@ -34,7 +34,7 @@ export async function hashTasksThatDoNotDependOnOutputsOfOtherTasks(
     })
     .map((t) => t.task);
 
-  const hashes = await hasher.hashTasks(tasksToHash);
+  const hashes = await hasher.hashTasks(tasksToHash, taskGraph);
   for (let i = 0; i < tasksToHash.length; i++) {
     tasksToHash[i].hash = hashes[i].value;
     tasksToHash[i].hashDetails = hashes[i].details;
@@ -59,7 +59,7 @@ export async function hashTask(
         projectsConfigurations,
         nxJsonConfiguration: readNxJson(),
       } as any)
-    : hasher.hashTask(task));
+    : hasher.hashTask(task, taskGraph));
   task.hash = value;
   task.hashDetails = details;
 }