fix(core): filter out automated release commits in getCommitsRelevantToProjects (#33482)

laneysmith · web-flow · commit 5fd57badb9ec · 2025-11-23T16:19:51.000+04:00
diff --git a/packages/nx/src/command-line/release/utils/resolve-semver-specifier.ts b/packages/nx/src/command-line/release/utils/resolve-semver-specifier.ts
@@ -11,17 +11,21 @@ export async function resolveSemverSpecifierFromConventionalCommits(
   from: string,
   projectGraph: ProjectGraph,
   projectNames: string[],
-  conventionalCommitsConfig: NxReleaseConfig['conventionalCommits']
+  releaseConfig: NxReleaseConfig
 ): // Map of projectName to semver bump type
 Promise<Map<string, SemverSpecifier | null>> {
   const commits = await getGitDiff(from);
   const parsedCommits = parseCommits(commits);
   const relevantCommits = await getCommitsRelevantToProjects(
     projectGraph,
     parsedCommits,
-    projectNames
+    projectNames,
+    releaseConfig
+  );
+  return determineSemverChange(
+    relevantCommits,
+    releaseConfig.conventionalCommits
   );
-  return determineSemverChange(relevantCommits, conventionalCommitsConfig);
 }
 
 export async function resolveSemverSpecifierFromPrompt(
diff --git a/packages/nx/src/command-line/release/utils/shared.spec.ts b/packages/nx/src/command-line/release/utils/shared.spec.ts
@@ -13,6 +13,8 @@ jest.mock('../../../config/nx-json', () => ({
   readNxJson: jest.fn(),
 }));
 import { createVersionConfig } from './test/test-utils';
+import { createNxReleaseConfig, NxReleaseConfig } from '../config/config';
+import { createProjectFileMapUsingProjectGraph } from '../../../project-graph/file-map-utils';
 
 describe('shared', () => {
   describe('createCommitMessageValues()', () => {
@@ -483,8 +485,9 @@ describe('shared', () => {
 
   describe(`getCommitsRelevantToProjects()`, () => {
     let mockProjectGraph: ProjectGraph;
+    let mockReleaseConfig: NxReleaseConfig | null;
 
-    beforeEach(() => {
+    beforeEach(async () => {
       (readNxJson as jest.Mock).mockReturnValue({});
 
       mockProjectGraph = {
@@ -532,6 +535,19 @@ describe('shared', () => {
         },
         externalNodes: {},
       };
+
+      ({ nxReleaseConfig: mockReleaseConfig } = await createNxReleaseConfig(
+        mockProjectGraph,
+        await createProjectFileMapUsingProjectGraph(mockProjectGraph),
+        {
+          projects: Object.keys(mockProjectGraph.nodes),
+          changelog: {
+            git: {
+              commitMessage: 'chore(release): publish packages',
+            },
+          },
+        }
+      ));
     });
 
     it('should include commits that directly touch target projects', async () => {
@@ -544,7 +560,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a', 'lib-b']
+        ['lib-a', 'lib-b'],
+        mockReleaseConfig!
       );
 
       expect(result.size).toBe(2);
@@ -564,7 +581,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       // Both commits should be included - nx.json affects all, and lib-a is directly touched
@@ -584,7 +602,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       expect(result.size).toBe(1);
@@ -610,7 +629,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       // lib-a depends on lib-c, so commit touching lib-c should affect lib-a
@@ -631,7 +651,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       expect(result.size).toBe(1);
@@ -650,7 +671,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a', 'lib-b']
+        ['lib-a', 'lib-b'],
+        mockReleaseConfig!
       );
 
       // Same commit should appear for both projects
@@ -667,7 +689,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a', 'lib-b']
+        ['lib-a', 'lib-b'],
+        mockReleaseConfig!
       );
 
       // Global file should appear for all requested projects
@@ -686,7 +709,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a', 'lib-b']
+        ['lib-a', 'lib-b'],
+        mockReleaseConfig!
       );
 
       expect(result.has('lib-a')).toBe(false);
@@ -698,7 +722,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         [],
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       expect(result.size).toBe(0);
@@ -712,7 +737,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        []
+        [],
+        mockReleaseConfig!
       );
 
       expect(result.size).toBe(0);
@@ -727,7 +753,8 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       // Lock file changes typically affect all or many projects
@@ -743,19 +770,45 @@ describe('shared', () => {
       const result = await getCommitsRelevantToProjects(
         mockProjectGraph,
         commits,
-        ['lib-a']
+        ['lib-a'],
+        mockReleaseConfig!
       );
 
       // package.json changes typically affect projects
       expect(result.size).toBeGreaterThanOrEqual(0);
     });
 
+    it('should exclude automated version or changelog commits', async () => {
+      const commits: GitCommit[] = [
+        createMockCommit(
+          'abc123',
+          ['libs/deleted-lib-1/package.json'],
+          'chore(release): publish 1.0.0' // with version interpolated
+        ),
+        createMockCommit(
+          'def456',
+          ['libs/deleted-lib-2/package.json'],
+          'chore(release): publish packages'
+        ),
+      ];
+
+      const result = await getCommitsRelevantToProjects(
+        mockProjectGraph,
+        commits,
+        ['lib-a'],
+        mockReleaseConfig!
+      );
+
+      expect(result.size).toBe(0);
+    });
+
     function createMockCommit(
       shortHash: string,
-      affectedFiles: string[]
+      affectedFiles: string[],
+      message?: string
     ): GitCommit {
       return {
-        message: `feat: commit ${shortHash}`,
+        message: message || `feat: commit ${shortHash}`,
         body: '',
         shortHash,
         author: { name: 'Test Author', email: 'test@example.com' },
diff --git a/packages/nx/src/command-line/release/utils/shared.ts b/packages/nx/src/command-line/release/utils/shared.ts
@@ -13,6 +13,7 @@ import type { NxArgs } from '../../../utils/command-line-utils';
 import { output } from '../../../utils/output';
 import type { ReleaseGroupWithName } from '../config/filter-release-groups';
 import { GitCommit, gitAdd, gitCommit } from './git';
+import { NxReleaseConfig } from '../config/config';
 
 export const noDiffInChangelogMessage = chalk.yellow(
   `NOTE: There was no diff detected for the changelog entry. Maybe you intended to pass alternative git references via --from and --to?`
@@ -387,10 +388,38 @@ export function handleDuplicateGitTags(gitTagValues: string[]): void {
   }
 }
 
+function isAutomatedReleaseCommit(
+  message: string,
+  nxReleaseConfig: NxReleaseConfig
+) {
+  // All possible commit message patterns based on config
+  const commitMessagePatterns = [
+    nxReleaseConfig.git.commitMessage,
+    nxReleaseConfig.version.git.commitMessage,
+    nxReleaseConfig.changelog.git.commitMessage,
+  ];
+  // Check if message matches any pattern
+  for (const pattern of commitMessagePatterns) {
+    if (!pattern) continue;
+    // Split on {version}, escape each part for regex, then join with version pattern
+    const parts = pattern.split('{version}');
+    const escapedParts = parts.map((part) =>
+      part.replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
+    );
+    const regexPattern = escapedParts.join('\\S+');
+    const regex = new RegExp(`^${regexPattern}$`);
+    if (regex.test(message)) {
+      return true;
+    }
+  }
+  return false;
+}
+
 export async function getCommitsRelevantToProjects(
   projectGraph: ProjectGraph,
   commits: GitCommit[],
-  projects: string[]
+  projects: string[],
+  nxReleaseConfig: NxReleaseConfig
 ): // Map of projectName to GitCommit[]
 Promise<Map<string, { commit: GitCommit; isProjectScopedCommit: boolean }[]>> {
   const projectSet = new Set(projects);
@@ -400,6 +429,11 @@ Promise<Map<string, { commit: GitCommit; isProjectScopedCommit: boolean }[]>> {
   > = new Map();
 
   for (const commit of commits) {
+    // Filter out automated release commits
+    if (isAutomatedReleaseCommit(commit.message, nxReleaseConfig)) {
+      continue;
+    }
+
     // Convert affectedFiles to FileChange[] format with proper diff computation
     const touchedFiles = calculateFileChanges(commit.affectedFiles, {
       base: `${commit.shortHash}^`,
diff --git a/packages/nx/src/command-line/release/version/derive-specifier-from-conventional-commits.ts b/packages/nx/src/command-line/release/version/derive-specifier-from-conventional-commits.ts
@@ -55,7 +55,7 @@ export async function deriveSpecifierFromConventionalCommits(
       previousVersionRef,
       projectGraph,
       affectedProjects,
-      nxReleaseConfig.conventionalCommits
+      nxReleaseConfig
     );
 
   const getHighestSemverChange = (
