nx 20.1.0-canary.20241023-12cbfc3 → 20.1.0-canary.20241024-0bea5b2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "20.1.0-canary.20241023-12cbfc3",
+  "version": "20.1.0-canary.20241024-0bea5b2",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -80,16 +80,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-darwin-arm64": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-linux-x64-gnu": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-linux-x64-musl": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-win32-x64-msvc": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-linux-arm64-gnu": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-linux-arm64-musl": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-linux-arm-gnueabihf": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-win32-arm64-msvc": "20.1.0-canary.20241023-12cbfc3",
-    "@nx/nx-freebsd-x64": "20.1.0-canary.20241023-12cbfc3"
+    "@nx/nx-darwin-x64": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-darwin-arm64": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-linux-x64-gnu": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-linux-x64-musl": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-win32-x64-msvc": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-linux-arm64-gnu": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-linux-arm64-musl": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-linux-arm-gnueabihf": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-win32-arm64-msvc": "20.1.0-canary.20241024-0bea5b2",
+    "@nx/nx-freebsd-x64": "20.1.0-canary.20241024-0bea5b2"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/src/command-line/add/add.js

@@ -17,6 +17,7 @@ const plugins_1 = require("../../utils/plugins");
 const versions_1 = require("../../utils/versions");
 const workspace_root_1 = require("../../utils/workspace-root");
 const add_nx_scripts_1 = require("../init/implementation/dot-nx/add-nx-scripts");
+const semver_1 = require("semver");
 function addHandler(options) {
     return (0, handle_errors_1.handleErrors)(options.verbose, async () => {
         output_1.output.addNewline();
@@ -33,8 +34,14 @@ async function installPackage(pkgName, version, nxJson) {
     const spinner = ora(`Installing ${pkgName}@${version}...`);
     spinner.start();
     if ((0, fs_1.existsSync)('package.json')) {
-        const pmc = (0, package_manager_1.getPackageManagerCommand)();
-        await new Promise((resolve) => (0, child_process_1.exec)(`${pmc.addDev} ${pkgName}@${version}`, {
+        const pm = (0, package_manager_1.detectPackageManager)();
+        const pmv = (0, package_manager_1.getPackageManagerVersion)(pm);
+        const pmc = (0, package_manager_1.getPackageManagerCommand)(pm);
+        // if we explicitly specify latest in yarn berry, it won't resolve the version
+        const command = pm === 'yarn' && (0, semver_1.gte)(pmv, '2.0.0') && version === 'latest'
+            ? `${pmc.addDev} ${pkgName}`
+            : `${pmc.addDev} ${pkgName}@${version}`;
+        await new Promise((resolve) => (0, child_process_1.exec)(command, {
             windowsHide: false,
         }, (error, stdout) => {
             if (error) {

package/src/command-line/graph/graph.js

@@ -579,7 +579,7 @@ async function createTaskGraphClientResponse(pruneExternal = false) {
     }
     const nxJson = (0, configuration_1.readNxJson)();
     perf_hooks_1.performance.mark('task graph generation:start');
-    const taskGraphs = getAllTaskGraphsForWorkspace(nxJson, graph);
+    const taskGraphs = getAllTaskGraphsForWorkspace(graph);
     perf_hooks_1.performance.mark('task graph generation:end');
     const planner = new native_1.HashPlanner(nxJson, (0, native_1.transferProjectGraph)((0, transform_objects_1.transformProjectGraphForRust)(graph)));
     perf_hooks_1.performance.mark('task hash plan generation:start');
@@ -613,8 +613,7 @@ async function createExpandedTaskInputResponse(taskGraphClientResponse, depGraph
     perf_hooks_1.performance.measure('task input static generation', 'task input static generation:start', 'task input static generation:end');
     return response;
 }
-function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
-    const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
+function getAllTaskGraphsForWorkspace(projectGraph) {
     const taskGraphs = {};
     const taskGraphErrors = {};
     // TODO(cammisuli): improve performance here. Cache results or something.
@@ -624,7 +623,7 @@ function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
         targets.forEach((target) => {
             const taskId = createTaskId(projectName, target);
             try {
-                taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, [projectName], [target], undefined, {});
+                taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], undefined, {});
             }
             catch (err) {
                 taskGraphs[taskId] = {
@@ -639,7 +638,7 @@ function getAllTaskGraphsForWorkspace(nxJson, projectGraph) {
                 configurations.forEach((configuration) => {
                     const taskId = createTaskId(projectName, target, configuration);
                     try {
-                        taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, defaultDependencyConfigs, [projectName], [target], configuration, {});
+                        taskGraphs[taskId] = (0, create_task_graph_1.createTaskGraph)(projectGraph, {}, [projectName], [target], configuration, {});
                     }
                     catch (err) {
                         taskGraphs[taskId] = {
@@ -771,9 +770,7 @@ async function createJsonOutput(prunedGraph, rawGraph, projects, targets) {
         graph: prunedGraph,
     };
     if (targets?.length) {
-        const nxJson = (0, configuration_1.readNxJson)();
-        const defaultDependencyConfigs = (0, create_task_graph_1.mapTargetDefaultsToDependencies)(nxJson.targetDefaults);
-        const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, defaultDependencyConfigs, projects, targets, undefined, {});
+        const taskGraph = (0, create_task_graph_1.createTaskGraph)(rawGraph, {}, projects, targets, undefined, {});
         const hasher = (0, create_task_hasher_1.createTaskHasher)(rawGraph, (0, configuration_1.readNxJson)());
         let tasks = Object.values(taskGraph.tasks);
         const hashes = await hasher.hashTasks(tasks, taskGraph);