@nx/js 20.1.0-beta.4 → 20.1.0-beta.5

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@nx/js",
-  "version": "20.1.0-beta.4",
+  "version": "20.1.0-beta.5",
   "private": false,
   "description": "The JS plugin for Nx contains executors and generators that provide the best experience for developing JavaScript and TypeScript projects. ",
   "repository": {
@@ -39,8 +39,8 @@
     "@babel/preset-env": "^7.23.2",
     "@babel/preset-typescript": "^7.22.5",
     "@babel/runtime": "^7.22.6",
-    "@nx/devkit": "20.1.0-beta.4",
-    "@nx/workspace": "20.1.0-beta.4",
+    "@nx/devkit": "20.1.0-beta.5",
+    "@nx/workspace": "20.1.0-beta.5",
     "@zkochan/js-yaml": "0.0.7",
     "babel-plugin-const-enum": "^1.0.1",
     "babel-plugin-macros": "^2.8.0",

package/src/generators/release-version/release-version.js

@@ -492,7 +492,8 @@ To fix this you will either need to add a package.json file at that location, or
                 const totalProjectsToUpdate = updateDependents === 'auto' &&
                     options.releaseGroup.projectsRelationship === 'independent'
                     ? allDependentProjects.length +
-                        transitiveLocalPackageDependents.length -
+                        // Only count transitive dependents that aren't already direct dependents
+                        transitiveLocalPackageDependents.filter((transitive) => !allDependentProjects.some((direct) => direct.source === transitive.source)).length -
                         // There are two entries per circular dep
                         circularDependencies.size / 2
                     : dependentProjectsInCurrentBatch.length;
@@ -596,6 +597,25 @@ To fix this you will either need to add a package.json file at that location, or
                 }
             }
             for (const transitiveDependentProject of transitiveLocalPackageDependents) {
+                const isAlreadyDirectDependent = allDependentProjects.some((dep) => dep.source === transitiveDependentProject.source);
+                if (isAlreadyDirectDependent) {
+                    // Don't continue directly in this scenario - we still need to update the dependency version
+                    // but we don't want to bump the project's own version as it will end up being double patched
+                    const dependencyProjectName = transitiveDependentProject.target;
+                    const dependencyPackageRoot = projectNameToPackageRootMap.get(dependencyProjectName);
+                    if (!dependencyPackageRoot) {
+                        throw new Error(`The project "${dependencyProjectName}" does not have a packageRoot available. Please report this issue on https://github.com/nrwl/nx`);
+                    }
+                    const dependencyPackageJsonPath = (0, devkit_1.joinPathFragments)(dependencyPackageRoot, 'package.json');
+                    const dependencyPackageJson = (0, devkit_1.readJson)(tree, dependencyPackageJsonPath);
+                    updateDependentProjectAndAddToVersionData({
+                        dependentProject: transitiveDependentProject,
+                        dependencyPackageName: dependencyPackageJson.name,
+                        newDependencyVersion: dependencyPackageJson.version,
+                        forceVersionBump: false, // Never bump version for direct dependents
+                    });
+                    continue;
+                }
                 // Check if the transitive dependent originates from a circular dependency
                 const isFromCircularDependency = circularDependencies.has(`${transitiveDependentProject.source}:${transitiveDependentProject.target}`);
                 const dependencyProjectName = transitiveDependentProject.target;