fix: bump nx to >=16.5.1 (#3767)

lerna · Jul 14, 2023 · 0bbd74d · 0bbd74d
1 parent b2c4d74
commit 0bbd74d
Show file tree

Hide file tree

Showing 10 changed files with 236 additions and 281 deletions.
diff --git a/libs/commands/run/src/index.ts b/libs/commands/run/src/index.ts
@@ -17,8 +17,8 @@ import {
 } from "@lerna/core";
 import { TargetDependencyConfig } from "@nx/devkit";
 import { existsSync } from "fs-extra";
-import { runMany } from "nx/src/command-line/run-many";
-import { runOne } from "nx/src/command-line/run-one";
+import { runMany } from "nx/src/command-line/run-many/run-many";
+import { runOne } from "nx/src/command-line/run/run-one";
 import pMap from "p-map";
 import path from "path";
 import { performance } from "perf_hooks";

diff --git a/libs/core/src/lib/command/create-project-graph-with-packages.ts b/libs/core/src/lib/command/create-project-graph-with-packages.ts
@@ -1,6 +1,6 @@
 import { ProjectFileMap, ProjectGraph, ProjectGraphProjectNode, workspaceRoot } from "@nx/devkit";
 import { readJson } from "fs-extra";
-import { sortBy } from "lodash";
+import { reduce, sortBy } from "lodash";
 import minimatch from "minimatch";
 import { resolve } from "npm-package-arg";
 import { join } from "path";
@@ -62,6 +62,13 @@ export async function createProjectGraphWithPackages(
     };
   });
 
+  // order dependencies to create consistent results when iterating over them
+  projectGraphWithOrderedNodes.dependencies = reduce(
+    sortBy(Object.keys(projectGraphWithOrderedNodes.dependencies)),
+    (prev, next) => ({ ...prev, [next]: projectGraphWithOrderedNodes.dependencies[next] }),
+    {}
+  );
+
   // populate local npm package dependencies
   Object.values(projectGraphWithOrderedNodes.dependencies).forEach((projectDeps) => {
     const workspaceDeps = projectDeps.filter(

diff --git a/libs/core/src/lib/command/detect-projects.ts b/libs/core/src/lib/command/detect-projects.ts
@@ -7,24 +7,7 @@ export async function detectProjects(packageConfigs: string[]): Promise<{
   projectFileMap: ProjectFileMap;
 }> {
   const _projectGraph = await createProjectGraphAsync();
-
-  let projectFileMap: ProjectFileMap;
-
-  // if we are using Nx >= 16.3.1, we can use the helper function to create the file map
-  // otherwise, we need to use the old "files" property on the node data
-  if (createProjectFileMapUsingProjectGraph) {
-    projectFileMap = await createProjectFileMapUsingProjectGraph(_projectGraph);
-  } else {
-    projectFileMap = Object.entries(_projectGraph.nodes).reduce(
-      (map, [key, node]) => ({
-        ...map,
-        // eslint-disable-next-line @typescript-eslint/no-explicit-any
-        [key]: (node.data as any).files,
-      }),
-      {}
-    );
-  }
-
+  const projectFileMap = await createProjectFileMapUsingProjectGraph(_projectGraph);
   const projectGraph = await createProjectGraphWithPackages(_projectGraph, projectFileMap, packageConfigs);
 
   return {

diff --git a/libs/core/src/lib/test-helpers/create-project-graph.ts b/libs/core/src/lib/test-helpers/create-project-graph.ts
@@ -2,8 +2,8 @@
 process.env.NX_DAEMON = "false";
 process.env.NX_CACHE_PROJECT_GRAPH = "false";
 
-import { fileHasher } from "nx/src/hasher/impl";
 import { ProjectGraphDependency, ProjectGraphProjectNode } from "@nx/devkit";
+import { fileHasher } from "nx/src/hasher/file-hasher";
 import { Package, RawManifest } from "../package";
 import {
   ProjectGraphProjectNodeWithPackage,

diff --git a/libs/test-helpers/src/lib/cli.ts b/libs/test-helpers/src/lib/cli.ts
@@ -1,5 +1,5 @@
 import execa from "execa";
-import { fileHasher } from "nx/src/hasher/impl";
+import { fileHasher } from "nx/src/hasher/file-hasher";
 import { setWorkspaceRoot } from "nx/src/utils/workspace-root";
 import path, { join } from "path";
 import yargs from "yargs";