fix(release): ensure --preid flag considers stable tags for version determination (#33703)

Coly010 · web-flow · commit 19e6404eb5c1 · 2025-12-05T12:28:01.000Z
When using `nx release version --preid=alpha`, the version determination now correctly considers both prerelease tags AND stable release tags to determine the "latest" version. Previously, it would only look at prerelease tags matching the preid, ignoring stable releases that should have become the new baseline. For example, with tags: 1.1.0, 1.1.0-alpha.0, 1.1.0-alpha.1, 1.1.1 - Before: Would return 1.1.0-alpha.1 → bump to 1.1.0-alpha.2 - After: Returns 1.1.1 (stable >= preid base) → bump to 1.1.2-alpha.0 Fixes #33343
diff --git a/packages/nx/src/command-line/release/utils/git.spec.ts b/packages/nx/src/command-line/release/utils/git.spec.ts
@@ -27,6 +27,10 @@ my-lib-4@1.2.4-alpha.1
 my-lib-4@1.2.3
 alpha-lib@1.2.4
 alpha-lib@1.2.4-beta.1
+my-lib-5@1.1.1
+my-lib-5@1.1.0-alpha.3
+my-lib-5@1.1.0-alpha.2
+my-lib-5@1.1.0
 lib-only-pre-release@1.2.4-beta.1
 lib-only-pre-release@1.2.4-beta.1+build.1
 my-group@1.5.0
@@ -385,8 +389,9 @@ See merge request nx-release-test/nx-release-test!2`,
         {
           pattern: '{projectName}@{version}',
           projectName: 'alpha-lib',
-          expectedTag: 'alpha-lib@1.2.4-beta.1',
-          expectedVersion: '1.2.4-beta.1',
+          // Alpha lib has a stable 1.2.4 release, so this should be returned regardless of preid
+          expectedTag: 'alpha-lib@1.2.4',
+          expectedVersion: '1.2.4',
           preid: 'beta',
         },
         {
@@ -421,6 +426,13 @@ See merge request nx-release-test/nx-release-test!2`,
           expectedVersion: undefined,
           preid: 'alpha',
         },
+        {
+          pattern: '{projectName}@{version}',
+          projectName: 'my-lib-5',
+          expectedTag: 'my-lib-5@1.1.1',
+          expectedVersion: '1.1.1',
+          preid: 'alpha',
+        },
       ];
 
       it.each(releaseTagPatternTestCases)(
diff --git a/packages/nx/src/command-line/release/utils/git.ts b/packages/nx/src/command-line/release/utils/git.ts
@@ -4,6 +4,7 @@
  */
 import { relative } from 'node:path';
 import { minimatch } from 'minimatch';
+import { coerce as semverCoerce, gte as semverGte } from 'semver';
 import { interpolate } from '../../../tasks-runner/utils';
 import { workspaceRoot } from '../../../utils/workspace-root';
 import { execCommand } from './exec-command';
@@ -257,8 +258,16 @@ export async function getLatestGitTagForPattern(
       return extractTagAndVersion(matchingTags[0], tagRegexp, options);
     }
 
+    // Find stable release tags
+    const stableReleaseTags = matchingTags.filter((tag) => {
+      const matches = tag.match(tagRegexp);
+      if (!matches) return false;
+      const [, version] = matches;
+      return version && !isPrerelease(version);
+    });
+
     if (preid && preid.length > 0) {
-      // When a preid is provided, first try to find a tag for it
+      // When a preid is provided, find tags matching that preid
       const preidReleaseTags = matchingTags.filter((tag) => {
         const match = tag.match(tagRegexp);
         if (!match) return false;
@@ -267,20 +276,47 @@ export async function getLatestGitTagForPattern(
         return version && version.includes(`-${preid}.`);
       });
 
+      // If both preid and stable tags exist, compare them to determine which is truly "latest"
+      if (preidReleaseTags.length > 0 && stableReleaseTags.length > 0) {
+        const preidResult = extractTagAndVersion(
+          preidReleaseTags[0],
+          tagRegexp,
+          options
+        );
+        const stableResult = extractTagAndVersion(
+          stableReleaseTags[0],
+          tagRegexp,
+          options
+        );
+
+        // Get the base version of the preid release (e.g., "1.2.4" from "1.2.4-alpha.1")
+        const preidBaseVersion = semverCoerce(
+          preidResult.extractedVersion
+        )?.version;
+        const stableVersion = stableResult.extractedVersion;
+
+        // If the stable version is >= the preid's base version, use the stable tag
+        // This handles the case where a stable release was made after the prerelease
+        // (e.g., 1.1.1 stable was released after 1.1.0-alpha.3)
+        if (
+          preidBaseVersion &&
+          stableVersion &&
+          semverGte(stableVersion, preidBaseVersion)
+        ) {
+          return stableResult;
+        }
+
+        // Otherwise, use the preid tag (prerelease's base is ahead of stable)
+        return preidResult;
+      }
+
+      // If only preid tags exist (no stable), use the latest preid tag
       if (preidReleaseTags.length > 0) {
         return extractTagAndVersion(preidReleaseTags[0], tagRegexp, options);
       }
-    }
-
-    // Then try to find the latest stable release tag
-    const stableReleaseTags = matchingTags.filter((tag) => {
-      const matches = tag.match(tagRegexp);
 
-      if (!matches) return false;
-
-      const [, version] = matches;
-      return version && !isPrerelease(version);
-    });
+      // If no matching preid tags, fall through to find stable tags below
+    }
 
     // If there are stable release tags, use the latest one
     if (stableReleaseTags.length > 0) {

-Original file line number
+Diff line change
 [email protected]
 [email protected]
 [email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 +[email protected]
 [email protected]
 [email protected]+build.1
 [email protected]
+        {
           pattern: '{projectName}@{version}',
           projectName: 'alpha-lib',
 -          expectedTag: '[email protected]',
 -          expectedVersion: '1.2.4-beta.1',
 +          // Alpha lib has a stable 1.2.4 release, so this should be returned regardless of preid
 +          expectedTag: '[email protected]',
 +          expectedVersion: '1.2.4',
           preid: 'beta',
         },
+        {
           expectedVersion: undefined,
           preid: 'alpha',
         },
 +        {
 +          pattern: '{projectName}@{version}',
 +          projectName: 'my-lib-5',
 +          expectedTag: '[email protected]',
 +          expectedVersion: '1.1.1',
 +          preid: 'alpha',
 +        },
       ];
       it.each(releaseTagPatternTestCases)(