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

Author: fahslaj

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";

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(

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 {

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,

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";

package-lock.json

@@ -33,13 +33,13 @@
   "license": "MIT",
   "homepage": "https://lerna.js.org",
   "devDependencies": {
-    "@nx/esbuild": "16.3.2",
-    "@nx/eslint-plugin": "16.3.2",
-    "@nx/jest": "16.3.2",
-    "@nx/js": "16.3.2",
-    "@nx/linter": "16.3.2",
-    "@nx/plugin": "16.3.2",
-    "@nx/web": "16.3.2",
+    "@nx/esbuild": "16.5.1",
+    "@nx/eslint-plugin": "16.5.1",
+    "@nx/jest": "16.5.1",
+    "@nx/js": "16.5.1",
+    "@nx/linter": "16.5.1",
+    "@nx/plugin": "16.5.1",
+    "@nx/web": "16.5.1",
     "@swc-node/register": "^1.4.2",
     "@swc/cli": "0.1.62",
     "@swc/core": "^1.2.173",
@@ -96,7 +96,7 @@
     "lodash": "^4.17.21",
     "normalize-newline": "^3.0.0",
     "normalize-path": "^3.0.0",
-    "nx": "16.3.2",
+    "nx": "16.5.1",
     "nx-cloud": "16.0.5",
     "prettier": "^2.2.1",
     "resolve.exports": "2.0.0",

package.json

@@ -40,7 +40,7 @@
     "@lerna/child-process": "7.1.3",
     "@lerna/create": "7.1.3",
     "@npmcli/run-script": "6.0.2",
-    "@nx/devkit": ">=16.1.3 < 17",
+    "@nx/devkit": ">=16.5.1 < 17",
     "@octokit/plugin-enterprise-rest": "6.0.1",
     "@octokit/rest": "19.0.11",
     "byte-size": "8.1.1",
@@ -82,7 +82,7 @@
     "npm-packlist": "5.1.1",
     "npm-registry-fetch": "^14.0.5",
     "npmlog": "^6.0.2",
-    "nx": ">=16.1.3 < 17",
+    "nx": ">=16.5.1 < 17",
     "p-map": "4.0.0",
     "p-map-series": "2.1.0",
     "p-pipe": "3.1.0",

packages/lerna/package.json

@@ -1,6 +1,6 @@
 import { Command } from "@lerna/core";
 import log from "npmlog";
-import { repair } from "nx/src/command-line/repair";
+import { repair } from "nx/src/command-line/repair/repair";
 
 // eslint-disable-next-line @typescript-eslint/no-var-requires
 const migrationsJson = require("../../../migrations.json");

packages/lerna/src/commands/repair/index.ts

@@ -5,7 +5,7 @@ import {
   ProjectGraphProjectNodeWithPackage,
   ValidationError,
 } from "@lerna/core";
-import { watch } from "nx/src/command-line/watch";
+import { watch } from "nx/src/command-line/watch/watch";
 
 module.exports = function factory(argv: NodeJS.Process["argv"]) {
   return new WatchCommand(argv);