nx 19.6.0-canary.20240727-efa59fa → 19.6.0-canary.20240730-acd9bb7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "nx",
-  "version": "19.6.0-canary.20240727-efa59fa",
+  "version": "19.6.0-canary.20240730-acd9bb7",
   "private": false,
   "description": "The core Nx plugin contains the core functionality of Nx like the project graph, nx commands and task orchestration.",
   "repository": {
@@ -71,7 +71,7 @@
     "yargs-parser": "21.1.1",
     "node-machine-id": "1.1.12",
     "ora": "5.3.0",
-    "@nrwl/tao": "19.6.0-canary.20240727-efa59fa"
+    "@nrwl/tao": "19.6.0-canary.20240730-acd9bb7"
   },
   "peerDependencies": {
     "@swc-node/register": "^1.8.0",
@@ -86,16 +86,16 @@
     }
   },
   "optionalDependencies": {
-    "@nx/nx-darwin-x64": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-darwin-arm64": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240727-efa59fa",
-    "@nx/nx-freebsd-x64": "19.6.0-canary.20240727-efa59fa"
+    "@nx/nx-darwin-x64": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-darwin-arm64": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-x64-gnu": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-x64-musl": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-win32-x64-msvc": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm64-gnu": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm64-musl": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-linux-arm-gnueabihf": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-win32-arm64-msvc": "19.6.0-canary.20240730-acd9bb7",
+    "@nx/nx-freebsd-x64": "19.6.0-canary.20240730-acd9bb7"
   },
   "nx-migrations": {
     "migrations": "./migrations.json",

package/release/changelog-renderer/index.js

@@ -25,10 +25,11 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
         }
     }
+    let relevantChanges = changes;
     // workspace root level changelog
     if (project === null) {
         // No changes for the workspace
-        if (changes.length === 0) {
+        if (relevantChanges.length === 0) {
             if (dependencyBumps?.length) {
                 applyAdditionalDependencyBumps({
                     markdownLines,
@@ -42,7 +43,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
             }
             return markdownLines.join('\n').trim();
         }
-        const typeGroups = groupBy(changes, 'type');
+        const typeGroups = groupBy(relevantChanges, 'type');
         markdownLines.push('', createVersionTitle(releaseVersion, changelogRenderOptions), '');
         for (const type of Object.keys(changeTypes)) {
             const group = typeGroups[type];
@@ -75,7 +76,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     else {
         // project level changelog
-        const relevantChanges = changes.filter((c) => c.affectedProjects &&
+        relevantChanges = relevantChanges.filter((c) => c.affectedProjects &&
             (c.affectedProjects === '*' || c.affectedProjects.includes(project)));
         // Generating for a named project, but that project has no relevant changes in the current set of commits, exit early
         if (relevantChanges.length === 0) {
@@ -128,7 +129,7 @@ const defaultChangelogRenderer = async ({ projectGraph, changes, releaseVersion,
     }
     if (changelogRenderOptions.authors) {
         const _authors = new Map();
-        for (const change of changes) {
+        for (const change of relevantChanges) {
             if (!change.author) {
                 continue;
             }

package/src/command-line/release/changelog.js

@@ -296,6 +296,7 @@ async function releaseChangelog(args) {
                     let fromRef = args.from ||
                         (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                             projectName: project.name,
+                            releaseGroupName: releaseGroup.name,
                         }))?.tag;
                     if (!fromRef && useAutomaticFromRef) {
                         const firstCommit = await (0, git_1.getFirstGitCommit)();

package/src/command-line/release/config/config.js

@@ -73,6 +73,10 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         tag: true,
     };
     const defaultFixedReleaseTagPattern = 'v{version}';
+    /**
+     * TODO: in v20, make it so that this pattern is used by default when any custom groups are used
+     */
+    const defaultFixedGroupReleaseTagPattern = '{releaseGroupName}-v{version}';
     const defaultIndependentReleaseTagPattern = '{projectName}@{version}';
     const workspaceProjectsRelationship = userConfig.projectsRelationship || 'fixed';
     const defaultGeneratorOptions = {};

package/src/command-line/release/utils/shared.js

@@ -169,6 +169,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
         if (projectVersionData.newVersion !== null) {
             tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
                 version: projectVersionData.newVersion,
+                releaseGroupName: releaseGroup.name,
             }));
         }
     }