nx 21.3.0-rc.0 → 21.3.1

package/bin/nx.js

@@ -64,14 +64,14 @@ async function main() {
         if (!workspace) {
             handleNoWorkspace(GLOBAL_NX_VERSION);
         }
-        if (!localNx) {
+        if (!localNx && !isNxCloudCommand(process.argv[2])) {
             handleMissingLocalInstallation(workspace ? workspace.dir : null);
         }
         // this file is already in the local workspace
         if (isLocalInstall) {
             await (0, init_local_1.initLocal)(workspace);
         }
-        else {
+        else if (localNx) {
             // Nx is being run from globally installed CLI - hand off to the local
             warnIfUsingOutdatedGlobalInstall(GLOBAL_NX_VERSION, LOCAL_NX_VERSION);
             if (localNx.includes('.nx')) {
@@ -82,6 +82,11 @@ async function main() {
                 require(localNx);
             }
         }
+        else if (isNxCloudCommand(process.argv[2])) {
+            // nx-cloud commands can run without local Nx installation
+            process.env.NX_DAEMON = 'false';
+            require('nx/src/command-line/nx-commands').commandsObject.argv;
+        }
     }
 }
 function handleNoWorkspace(globalNxVersion) {
@@ -132,6 +137,18 @@ function resolveNx(workspace) {
         paths: [workspace ? workspace.dir : globalsRoot],
     });
 }
+function isNxCloudCommand(command) {
+    const nxCloudCommands = [
+        'start-ci-run',
+        'login',
+        'logout',
+        'connect',
+        'view-logs',
+        'fix-ci',
+        'record',
+    ];
+    return nxCloudCommands.includes(command);
+}
 function handleMissingLocalInstallation(detectedWorkspaceRoot) {
     output_1.output.error({
         title: detectedWorkspaceRoot

package/package.json

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

package/schemas/nx-schema.json

@@ -207,6 +207,13 @@
                 ],
                 "description": "By default, we will try and resolve the latest match for the releaseTagPattern from the current branch, falling back to all branches if no match is found on the current branch. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
               },
+              "releaseTagPatternRequireSemver": {
+                "type": "boolean",
+                "description": "Whether to require semver to be used for the release tag pattern. If set to false, the release tag pattern will not be checked for semver compliance."
+              },
+              "releaseTagPatternStrictPreid": {
+                "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
+              },
               "versionPlans": {
                 "oneOf": [
                   {
@@ -295,6 +302,13 @@
             }
           ],
           "description": "By default, we will try and resolve the latest match for the releaseTagPattern from the current branch, falling back to all branches if no match is found on the current branch. Setting this to true will cause us to ALWAYS check all branches for the latest match. Setting it to false will cause us to ONLY check the current branch for the latest match. Setting it to an array of strings will cause us to check all branches WHEN the current branch is one of the strings in the array. Glob patterns are supported."
+        },
+        "releaseTagPatternRequireSemver": {
+          "type": "boolean",
+          "description": "Whether to require semver to be used for the release tag pattern. If set to false, the release tag pattern will not be checked for semver compliance."
+        },
+        "releaseTagPatternStrictPreid": {
+          "$ref": "#/definitions/NxReleaseReleaseTagPatternStrictPreidConfiguration"
         }
       }
     },
@@ -925,6 +939,10 @@
         }
       }
     },
+    "NxReleaseReleaseTagPatternStrictPreidConfiguration": {
+      "type": "boolean",
+      "description": "When set to true and multiple tags match your configured \"releaseTagPattern\", the git tag matching logic will strictly prefer the tag which contain a semver preid which matches the one given to the nx release invocation.\n\nFor example, let's say your \"releaseTagPattern\" is \"{projectName}@{version}\" and you have the following tags for project \"my-lib\", which uses semver:\n- my-lib@1.2.4-beta.1\n- my-lib@1.2.4-alpha.1\n- my-lib@1.2.3\n\nIf \"releaseTagPatternStrictPreid\" is set to true and you run:\n- `nx release --preid beta`, the git tag \"my-lib@1.2.4-beta.1\" will be resolved.\n- `nx release --preid alpha`, the git tag \"my-lib@1.2.4-alpha.1\" will be resolved.\n- `nx release` (no preid), the git tag \"my-lib@1.2.3\" will be resolved.\n\nIf \"releaseTagPatternStrictPreid\" is set to false, the git tag \"my-lib@1.2.4-beta.1\" will always be resolved as the latest tag that matches the pattern, regardless of any preid which gets passed to nx release.\n\nNOTE: This feature was added in a minor version and is therefore set to false by default, but this may change in a future major version."
+    },
     "ChangelogRenderOptions": {
       "type": "object",
       "additionalProperties": true

package/src/command-line/init/implementation/add-nx-to-monorepo.d.ts

@@ -2,5 +2,5 @@ import { InitArgs } from '../init-v1';
 type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
     legacy?: boolean;
 };
-export declare function addNxToMonorepo(options: Options): Promise<void>;
+export declare function addNxToMonorepo(options: Options, guided?: boolean): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-monorepo.js

@@ -9,7 +9,7 @@ const fileutils_1 = require("../../../utils/fileutils");
 const output_1 = require("../../../utils/output");
 const utils_1 = require("./utils");
 const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
-async function addNxToMonorepo(options) {
+async function addNxToMonorepo(options, guided = true) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
     const packageJsonFiles = allProjectPackageJsonFiles(repoRoot);
@@ -18,7 +18,7 @@ async function addNxToMonorepo(options) {
     let cacheableOperations;
     let scriptOutputs = {};
     let useNxCloud;
-    if (options.interactive && scripts.length > 0) {
+    if (options.interactive && scripts.length > 0 && guided) {
         output_1.output.log({
             title: '🧑‍🔧 Please answer the following questions about the scripts found in your workspace in order to generate task runner configuration',
         });

package/src/command-line/init/implementation/add-nx-to-npm-repo.d.ts

@@ -2,5 +2,5 @@ import { InitArgs } from '../init-v1';
 type Options = Pick<InitArgs, 'nxCloud' | 'interactive' | 'cacheable'> & {
     legacy?: boolean;
 };
-export declare function addNxToNpmRepo(options: Options): Promise<void>;
+export declare function addNxToNpmRepo(options: Options, guided?: boolean): Promise<void>;
 export {};

package/src/command-line/init/implementation/add-nx-to-npm-repo.js

@@ -8,7 +8,7 @@ const output_1 = require("../../../utils/output");
 const package_manager_1 = require("../../../utils/package-manager");
 const utils_1 = require("./utils");
 const connect_to_nx_cloud_1 = require("../../nx-cloud/connect/connect-to-nx-cloud");
-async function addNxToNpmRepo(options) {
+async function addNxToNpmRepo(options, guided = true) {
     const repoRoot = process.cwd();
     output_1.output.log({ title: '🐳 Nx initialization' });
     let cacheableOperations;
@@ -16,7 +16,7 @@ async function addNxToNpmRepo(options) {
     let useNxCloud;
     const packageJson = (0, fileutils_1.readJsonFile)('package.json');
     const scripts = Object.keys(packageJson.scripts ?? {}).filter((s) => !s.startsWith('pre') && !s.startsWith('post'));
-    if (options.interactive && scripts.length > 0) {
+    if (options.interactive && scripts.length > 0 && guided) {
         output_1.output.log({
             title: '🧑‍🔧 Please answer the following questions about the scripts found in your package.json in order to generate task runner configuration',
         });

package/src/command-line/init/implementation/utils.js

@@ -24,7 +24,6 @@ const connect_to_nx_cloud_1 = require("../../../nx-cloud/generators/connect-to-n
 const url_shorten_1 = require("../../../nx-cloud/utilities/url-shorten");
 const connect_to_nx_cloud_2 = require("../../nx-cloud/connect/connect-to-nx-cloud");
 const deduce_default_base_1 = require("./deduce-default-base");
-const child_process_2 = require("../../../utils/child-process");
 function createNxJsonFile(repoRoot, topologicalTargets, cacheableOperations, scriptOutputs) {
     const nxJsonPath = (0, path_2.joinPathFragments)(repoRoot, 'nx.json');
     let nxJson = {};
@@ -263,13 +262,10 @@ function markPackageJsonAsNxProject(packageJsonPath) {
     (0, fileutils_1.writeJsonFile)(packageJsonPath, json);
 }
 function printFinalMessage({ learnMoreLink, appendLines, }) {
-    const pmc = (0, package_manager_1.getPackageManagerCommand)();
     output_1.output.success({
         title: '🎉 Done!',
         bodyLines: [
-            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} run-many -t build" to run the build target for every project in the workspace. Run it again to replay the cached computation. https://nx.dev/features/cache-task-results`,
-            `- Run "${(0, child_process_2.getRunNxBaseCommand)(pmc)} graph" to see the graph of projects and tasks in your workspace. https://nx.dev/core-features/explore-graph`,
-            learnMoreLink ? `- Learn more at ${learnMoreLink}.` : undefined,
+            `- Learn more about what to do next at ${learnMoreLink ?? 'https://nx.dev/getting-started/adding-to-existing'}`,
             ...(appendLines ?? []),
         ].filter(Boolean),
     });

package/src/command-line/init/init-v2.js

@@ -34,7 +34,7 @@ async function initHandler(options) {
             integrated: !!options.integrated,
         });
         (0, utils_1.printFinalMessage)({
-            learnMoreLink: 'https://nx.dev/recipes/angular/migration/angular',
+            learnMoreLink: 'https://nx.dev/technologies/angular/migration/angular',
         });
         return;
     }
@@ -45,6 +45,21 @@ async function initHandler(options) {
     const _isTurborepo = (0, fs_1.existsSync)('turbo.json');
     const _isMonorepo = _isNonJs ? false : (0, utils_1.isMonorepo)(packageJson);
     const _isCRA = _isNonJs ? false : (0, utils_1.isCRA)(packageJson);
+    let guided = true;
+    if (options.interactive && !(_isTurborepo || _isCRA || _isNonJs)) {
+        const setupType = await (0, enquirer_1.prompt)([
+            {
+                type: 'select',
+                name: 'setupPreference',
+                message: 'Would you like a minimum or guided setup?',
+                choices: [
+                    { name: 'Minimum', value: 'min' },
+                    { name: 'Guided', value: 'guided' },
+                ],
+            },
+        ]).then((r) => r.setupPreference);
+        guided = setupType === 'guided';
+    }
     /**
      * Turborepo users must have set up individual scripts already, and we keep the transition as minimal as possible.
      * We log a message during the conversion process in addNxToTurborepo about how they can learn more about the power
@@ -75,7 +90,7 @@ async function initHandler(options) {
         await (0, add_nx_to_monorepo_1.addNxToMonorepo)({
             interactive: options.interactive,
             nxCloud: false,
-        });
+        }, guided);
     }
     else if (_isNonJs) {
         (0, add_nx_scripts_1.generateDotNxSetup)(version);
@@ -85,41 +100,48 @@ async function initHandler(options) {
         await (0, add_nx_to_npm_repo_1.addNxToNpmRepo)({
             interactive: options.interactive,
             nxCloud: false,
-        });
+        }, guided);
     }
-    const useNxCloud = options.nxCloud ??
-        (options.interactive ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)() : false);
     const repoRoot = process.cwd();
     (0, utils_1.createNxJsonFile)(repoRoot, [], [], {});
     (0, utils_1.updateGitIgnore)(repoRoot);
     const nxJson = (0, nx_json_1.readNxJson)(repoRoot);
-    output_1.output.log({ title: '🧐 Checking dependencies' });
-    let plugins;
-    let updatePackageScripts;
-    if (_isCRA) {
-        plugins = ['@nx/vite'];
-        updatePackageScripts = true;
+    if (guided) {
+        output_1.output.log({ title: '🧐 Checking dependencies' });
+        let plugins;
+        let updatePackageScripts;
+        if (_isCRA) {
+            plugins = ['@nx/vite'];
+            updatePackageScripts = true;
+        }
+        else {
+            const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
+            plugins = _plugins;
+            updatePackageScripts = _updatePackageScripts;
+        }
+        output_1.output.log({ title: '📦 Installing Nx' });
+        (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
+        await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     }
-    else {
-        const { plugins: _plugins, updatePackageScripts: _updatePackageScripts } = await detectPlugins(nxJson, options.interactive);
-        plugins = _plugins;
-        updatePackageScripts = _updatePackageScripts;
+    let useNxCloud = options.nxCloud;
+    if (useNxCloud === undefined) {
+        output_1.output.log({ title: '🛠️ Setting up Self-Healing CI and Remote Caching' });
+        useNxCloud = options.interactive
+            ? await (0, connect_to_nx_cloud_1.connectExistingRepoToNxCloudPrompt)()
+            : false;
     }
-    output_1.output.log({ title: '📦 Installing Nx' });
-    (0, configure_plugins_1.installPluginPackages)(repoRoot, pmc, plugins);
-    await (0, configure_plugins_1.configurePlugins)(plugins, updatePackageScripts, pmc, repoRoot, options.verbose);
     if (useNxCloud) {
-        output_1.output.log({ title: '🛠️ Setting up Nx Cloud' });
         await (0, utils_1.initCloud)('nx-init');
     }
     (0, utils_1.printFinalMessage)({
+        learnMoreLink: _isMonorepo
+            ? 'https://nx.dev/recipes/adopting-nx/adding-to-monorepo'
+            : 'https://nx.dev/getting-started/adding-to-existing',
         appendLines: _isMonorepo
             ? [
                 `- Learn how Nx helps manage your TypeScript monorepo at https://nx.dev/features/maintain-ts-monorepos.`,
             ]
-            : [
-                `- Learn how Nx works with any type of project at https://nx.dev/recipes/adopting-nx/adding-to-existing-project.`,
-            ],
+            : [],
     });
 }
 const npmPackageToPluginMap = {

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

@@ -5,6 +5,7 @@ exports.createAPI = createAPI;
 const chalk = require("chalk");
 const enquirer_1 = require("enquirer");
 const node_fs_1 = require("node:fs");
+const semver_1 = require("semver");
 const tmp_1 = require("tmp");
 const nx_json_1 = require("../../config/nx-json");
 const tree_1 = require("../../generators/tree");
@@ -120,6 +121,16 @@ function createAPI(overrideReleaseConfig) {
         const to = args.to || 'HEAD';
         const toSHA = await (0, git_1.getCommitHash)(to);
         const headSHA = to === 'HEAD' ? toSHA : await (0, git_1.getCommitHash)('HEAD');
+        /**
+         * Extract the preid from the workspace version and the project versions
+         */
+        const workspacePreid = workspaceChangelogVersion
+            ? extractPreid(workspaceChangelogVersion)
+            : undefined;
+        const projectsPreid = Object.fromEntries(Object.entries(projectsVersionData).map(([projectName, v]) => [
+            projectName,
+            v.newVersion ? extractPreid(v.newVersion) : undefined,
+        ]));
         /**
          * Protect the user against attempting to create a new commit when recreating an old release changelog,
          * this seems like it would always be unintentional.
@@ -191,7 +202,13 @@ function createAPI(overrideReleaseConfig) {
         }
         else {
             let workspaceChangelogFromRef = args.from ||
-                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern, {}, nxReleaseConfig.releaseTagPatternCheckAllBranchesWhen, nxReleaseConfig.releaseTagPatternRequireSemver))?.tag;
+                (await (0, git_1.getLatestGitTagForPattern)(nxReleaseConfig.releaseTagPattern, {}, {
+                    checkAllBranchesWhen: nxReleaseConfig.releaseTagPatternCheckAllBranchesWhen,
+                    preid: workspacePreid ??
+                        projectsPreid?.[Object.keys(projectsPreid)[0]],
+                    releaseTagPatternRequireSemver: nxReleaseConfig.releaseTagPatternRequireSemver,
+                    releaseTagPatternStrictPreid: nxReleaseConfig.releaseTagPatternStrictPreid,
+                }))?.tag;
             if (!workspaceChangelogFromRef) {
                 if (useAutomaticFromRef) {
                     workspaceChangelogFromRef = await (0, git_1.getFirstGitCommit)();
@@ -326,7 +343,12 @@ function createAPI(overrideReleaseConfig) {
                             (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {
                                 projectName: project.name,
                                 releaseGroupName: releaseGroup.name,
-                            }, releaseGroup.releaseTagPatternCheckAllBranchesWhen, releaseGroup.releaseTagPatternRequireSemver))?.tag;
+                            }, {
+                                checkAllBranchesWhen: releaseGroup.releaseTagPatternCheckAllBranchesWhen,
+                                preid: projectsPreid[project.name],
+                                releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver,
+                                releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid,
+                            }))?.tag;
                         if (!fromRef && useAutomaticFromRef) {
                             const firstCommit = await (0, git_1.getFirstGitCommit)();
                             commits = await filterProjectCommits({
@@ -436,7 +458,13 @@ function createAPI(overrideReleaseConfig) {
                 }
                 else {
                     let fromRef = args.from ||
-                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {}, releaseGroup.releaseTagPatternCheckAllBranchesWhen, releaseGroup.releaseTagPatternRequireSemver))?.tag;
+                        (await (0, git_1.getLatestGitTagForPattern)(releaseGroup.releaseTagPattern, {}, {
+                            checkAllBranchesWhen: releaseGroup.releaseTagPatternCheckAllBranchesWhen,
+                            preid: workspacePreid ??
+                                projectsPreid?.[Object.keys(projectsPreid)[0]],
+                            releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver,
+                            releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid,
+                        }))?.tag;
                     if (!fromRef) {
                         if (useAutomaticFromRef) {
                             fromRef = await (0, git_1.getFirstGitCommit)();
@@ -967,3 +995,19 @@ function versionPlanSemverReleaseTypeToChangelogType(bump) {
             throw new Error(`Invalid semver bump type: ${bump}`);
     }
 }
+function extractPreid(version) {
+    if (!(0, shared_1.isPrerelease)(version)) {
+        return undefined;
+    }
+    const preid = (0, semver_1.prerelease)(version)?.[0];
+    if (typeof preid === 'string') {
+        if (preid.trim() === '') {
+            return undefined;
+        }
+        return preid;
+    }
+    if (typeof preid === 'number') {
+        return preid.toString();
+    }
+    return undefined;
+}

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

@@ -114,11 +114,15 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
     };
     const defaultFixedReleaseTagPattern = 'v{version}';
     /**
-     * TODO(v21): in v21, make it so that this pattern is used by default when any custom groups are used
+     * TODO(v22): in v22, 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 defaultReleaseTagPatternRequireSemver = true;
+    /**
+     * TODO(v22): in v22, set this to true by default
+     */
+    const defaultReleaseTagPatternStrictPreid = false;
     const workspaceProjectsRelationship = userConfig.projectsRelationship || 'fixed';
     const defaultGeneratorOptions = {};
     if (userConfig.version?.conventionalCommits) {
@@ -203,6 +207,8 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         releaseTagPatternRequireSemver: userConfig.releaseTagPatternRequireSemver ??
             defaultReleaseTagPatternRequireSemver,
+        releaseTagPatternStrictPreid: userConfig.releaseTagPatternStrictPreid ??
+            defaultReleaseTagPatternStrictPreid,
         conventionalCommits: conventional_commits_1.DEFAULT_CONVENTIONAL_COMMITS_CONFIG,
         versionPlans: (userConfig.versionPlans ||
             false),
@@ -210,6 +216,8 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
     const groupReleaseTagPatternRequireSemver = userConfig.releaseTagPatternRequireSemver ??
         WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver;
+    const groupReleaseTagPatternStrictPreid = userConfig.releaseTagPatternStrictPreid ??
+        defaultReleaseTagPatternStrictPreid;
     const GROUP_DEFAULTS = {
         projectsRelationship: groupProjectsRelationship,
         version: USE_LEGACY_VERSIONING
@@ -244,6 +252,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             : WORKSPACE_DEFAULTS.releaseTagPattern,
         releaseTagPatternCheckAllBranchesWhen: userConfig.releaseTagPatternCheckAllBranchesWhen ?? undefined,
         releaseTagPatternRequireSemver: groupReleaseTagPatternRequireSemver,
+        releaseTagPatternStrictPreid: groupReleaseTagPatternStrictPreid,
         versionPlans: false,
     };
     /**
@@ -429,6 +438,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             releaseTagPatternRequireSemver: releaseGroup.releaseTagPatternRequireSemver ??
                 userConfig.releaseTagPatternRequireSemver ??
                 defaultReleaseTagPatternRequireSemver,
+            releaseTagPatternStrictPreid: releaseGroup.releaseTagPatternStrictPreid ??
+                userConfig.releaseTagPatternStrictPreid ??
+                defaultReleaseTagPatternStrictPreid,
             versionPlans: releaseGroup.versionPlans ?? rootVersionPlansConfig,
         };
         const finalReleaseGroup = deepMergeDefaults([groupDefaults], {
@@ -503,6 +515,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             releaseTagPattern: WORKSPACE_DEFAULTS.releaseTagPattern,
             releaseTagPatternCheckAllBranchesWhen: WORKSPACE_DEFAULTS.releaseTagPatternCheckAllBranchesWhen,
             releaseTagPatternRequireSemver: WORKSPACE_DEFAULTS.releaseTagPatternRequireSemver,
+            releaseTagPatternStrictPreid: WORKSPACE_DEFAULTS.releaseTagPatternStrictPreid,
             git: rootGitConfig,
             version: rootVersionConfig,
             changelog: rootChangelogConfig,

package/src/command-line/release/utils/git.d.ts

@@ -12,6 +12,10 @@ export interface Reference {
     type: 'hash' | 'issue' | 'pull-request';
     value: string;
 }
+export interface GitTagAndVersion {
+    tag: string;
+    extractedVersion: string;
+}
 export interface GitCommit extends RawGitCommit {
     description: string;
     type: string;
@@ -22,10 +26,37 @@ export interface GitCommit extends RawGitCommit {
     affectedFiles: string[];
     revertedHashes: string[];
 }
-export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData?: {}, checkAllBranchesWhen?: boolean | string[], releaseTagPatternRequireSemver?: boolean): Promise<{
-    tag: string;
-    extractedVersion: string;
-} | null>;
+export interface GetLatestGitTagForPatternOptions {
+    checkAllBranchesWhen?: boolean | string[];
+    preid?: string;
+    releaseTagPatternRequireSemver: boolean;
+    releaseTagPatternStrictPreid: boolean;
+}
+/**
+ * Extract the tag and version from a tag string
+ *
+ * @param tag - The tag string to extract the tag and version from
+ * @param tagRegexp - The regex to use to extract the tag and version from the tag string
+ *
+ * @returns The tag and version
+ */
+export declare function extractTagAndVersion(tag: string, tagRegexp: string, options: GetLatestGitTagForPatternOptions): GitTagAndVersion;
+/**
+ * Get the latest git tag for the configured release tag pattern.
+ *
+ * This function will:
+ * - Get all tags from the git repo, sorted by version
+ * - Filter the tags into a list with SEMVER-compliant tags, matching the release tag pattern
+ * - If a preid is provided, prioritise tags for that preid, then semver tags without a preid
+ * - If no preid is provided, search only for stable semver tags (i.e. no pre-release or build metadata)
+ *
+ * @param releaseTagPattern - The pattern to filter the tags list by
+ * @param additionalInterpolationData - Additional data used when interpolating the release tag pattern
+ * @param options - The options to use when getting the latest git tag for the pattern
+ *
+ * @returns The tag and version
+ */
+export declare function getLatestGitTagForPattern(releaseTagPattern: string, additionalInterpolationData: {}, options: GetLatestGitTagForPatternOptions): Promise<GitTagAndVersion | null>;
 export declare function getGitDiff(from: string | undefined, to?: string): Promise<RawGitCommit[]>;
 export declare function gitAdd({ changedFiles, deletedFiles, dryRun, verbose, logFn, cwd, }: {
     changedFiles?: string[];

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

@@ -1,5 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+exports.extractTagAndVersion = extractTagAndVersion;
 exports.getLatestGitTagForPattern = getLatestGitTagForPattern;
 exports.getGitDiff = getGitDiff;
 exports.gitAdd = gitAdd;
@@ -21,12 +22,50 @@ const minimatch_1 = require("minimatch");
 const utils_1 = require("../../../tasks-runner/utils");
 const workspace_root_1 = require("../../../utils/workspace-root");
 const exec_command_1 = require("./exec-command");
+const shared_1 = require("./shared");
 function escapeRegExp(string) {
     return string.replace(/[/\-\\^$*+?.()|[\]{}]/g, '\\$&');
 }
 // https://semver.org/#is-there-a-suggested-regular-expression-regex-to-check-a-semver-string
 const SEMVER_REGEX = /^(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?$/g;
-async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, checkAllBranchesWhen, releaseTagPatternRequireSemver = true) {
+/**
+ * Extract the tag and version from a tag string
+ *
+ * @param tag - The tag string to extract the tag and version from
+ * @param tagRegexp - The regex to use to extract the tag and version from the tag string
+ *
+ * @returns The tag and version
+ */
+function extractTagAndVersion(tag, tagRegexp, options) {
+    const { releaseTagPatternRequireSemver } = options;
+    const [latestMatchingTag, ...rest] = tag.match(tagRegexp);
+    let version = releaseTagPatternRequireSemver
+        ? rest.filter((r) => {
+            return r.match(SEMVER_REGEX);
+        })[0]
+        : rest[0];
+    return {
+        tag: latestMatchingTag,
+        extractedVersion: version ?? null,
+    };
+}
+/**
+ * Get the latest git tag for the configured release tag pattern.
+ *
+ * This function will:
+ * - Get all tags from the git repo, sorted by version
+ * - Filter the tags into a list with SEMVER-compliant tags, matching the release tag pattern
+ * - If a preid is provided, prioritise tags for that preid, then semver tags without a preid
+ * - If no preid is provided, search only for stable semver tags (i.e. no pre-release or build metadata)
+ *
+ * @param releaseTagPattern - The pattern to filter the tags list by
+ * @param additionalInterpolationData - Additional data used when interpolating the release tag pattern
+ * @param options - The options to use when getting the latest git tag for the pattern
+ *
+ * @returns The tag and version
+ */
+async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolationData = {}, options) {
+    const { checkAllBranchesWhen, releaseTagPatternRequireSemver, releaseTagPatternStrictPreid, preid, } = options;
     /**
      * By default, we will try and resolve the latest match for the releaseTagPattern from the current branch,
      * falling back to all branches if no match is found on the current branch.
@@ -118,16 +157,37 @@ async function getLatestGitTagForPattern(releaseTagPattern, additionalInterpolat
         if (!matchingTags.length) {
             return null;
         }
-        const [latestMatchingTag, ...rest] = matchingTags[0].match(tagRegexp);
-        const version = releaseTagPatternRequireSemver
-            ? rest.filter((r) => {
-                return r.match(SEMVER_REGEX);
-            })[0]
-            : rest[0];
-        return {
-            tag: latestMatchingTag,
-            extractedVersion: version,
-        };
+        if (!releaseTagPatternStrictPreid) {
+            // If not using strict preid, we can just return the first matching tag
+            return extractTagAndVersion(matchingTags[0], tagRegexp, options);
+        }
+        if (preid && preid.length > 0) {
+            // When a preid is provided, first try to find a tag for it
+            const preidReleaseTags = matchingTags.filter((tag) => {
+                const match = tag.match(tagRegexp);
+                if (!match)
+                    return false;
+                const version = match.find((part) => part.match(SEMVER_REGEX));
+                return version && version.includes(`-${preid}.`);
+            });
+            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 && !(0, shared_1.isPrerelease)(version);
+        });
+        // If there are stable release tags, use the latest one
+        if (stableReleaseTags.length > 0) {
+            return extractTagAndVersion(stableReleaseTags[0], tagRegexp, options);
+        }
+        // Otherwise return null
+        return null;
     }
     catch {
         return null;

package/src/command-line/release/utils/shared.d.ts

@@ -21,6 +21,7 @@ export interface VersionDataEntry {
         rawVersionSpec: string;
     }[];
 }
+export declare function isPrerelease(version: string): boolean;
 export declare class ReleaseVersion {
     rawVersion: string;
     gitTag: string;

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ReleaseVersion = exports.noDiffInChangelogMessage = void 0;
+exports.isPrerelease = isPrerelease;
 exports.commitChanges = commitChanges;
 exports.createCommitMessageValues = createCommitMessageValues;
 exports.createGitTagValues = createGitTagValues;