nx 22.0.0-beta.4 → 22.0.0-beta.6

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

@@ -76,7 +76,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         const projectVersionData = versionData[releaseGroupProjectNames[0]]; // all at the same version, so we can just pick the first one
         const releaseVersion = new ReleaseVersion({
             version: projectVersionData.newVersion,
-            releaseTagPattern: releaseGroup.releaseTagPattern,
+            releaseTagPattern: releaseGroup.releaseTag.pattern,
         });
         commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
             version: releaseVersion.rawVersion,
@@ -97,7 +97,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
             const projectVersionData = versionData[releaseGroupProjectNames[0]];
             const releaseVersion = new ReleaseVersion({
                 version: projectVersionData.newVersion,
-                releaseTagPattern: releaseGroup.releaseTagPattern,
+                releaseTagPattern: releaseGroup.releaseTag.pattern,
                 projectName: releaseGroupProjectNames[0],
             });
             commitMessageValues[0] = (0, utils_1.interpolate)(commitMessageValues[0], {
@@ -128,7 +128,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
                 if (projectVersionData.newVersion !== null) {
                     const releaseVersion = new ReleaseVersion({
                         version: projectVersionData.newVersion,
-                        releaseTagPattern: releaseGroup.releaseTagPattern,
+                        releaseTagPattern: releaseGroup.releaseTag.pattern,
                         projectName: project,
                     });
                     commitMessageValues.push(`- project: ${project} ${releaseVersion.rawVersion}`);
@@ -141,7 +141,7 @@ function createCommitMessageValues(releaseGroups, releaseGroupToFilteredProjects
         if (projectVersionData.newVersion !== null) {
             const releaseVersion = new ReleaseVersion({
                 version: projectVersionData.newVersion,
-                releaseTagPattern: releaseGroup.releaseTagPattern,
+                releaseTagPattern: releaseGroup.releaseTag.pattern,
             });
             commitMessageValues.push(`- release-group: ${releaseGroup.name} ${releaseVersion.rawVersion}`);
         }
@@ -160,7 +160,7 @@ function stripPlaceholders(str, placeholders) {
     return str;
 }
 function shouldPreferDockerVersionForReleaseGroup(releaseGroup) {
-    return releaseGroup.releaseTagPatternPreferDockerVersion;
+    return releaseGroup.releaseTag.preferDockerVersion;
 }
 function shouldSkipVersionActions(dockerOptions, projectName) {
     return (dockerOptions.skipVersionActions === true ||
@@ -182,13 +182,13 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                     if (preferDockerVersion === 'both') {
                         // Create tags for both docker and semver versions
                         if (projectVersionData.dockerVersion) {
-                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.dockerVersion,
                                 projectName: project,
                             }));
                         }
                         if (projectVersionData.newVersion) {
-                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                            tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                                 version: projectVersionData.newVersion,
                                 projectName: project,
                             }));
@@ -196,7 +196,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
                     }
                     else {
                         // Use either docker version or semver version based on preference
-                        tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                        tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                             version: preferDockerVersion
                                 ? projectVersionData.dockerVersion
                                 : projectVersionData.newVersion,
@@ -215,13 +215,13 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
             if (preferDockerVersion === 'both') {
                 // Create tags for both docker and semver versions
                 if (projectVersionData.dockerVersion) {
-                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                         version: projectVersionData.dockerVersion,
                         releaseGroupName: releaseGroup.name,
                     }));
                 }
                 if (projectVersionData.newVersion) {
-                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                    tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                         version: projectVersionData.newVersion,
                         releaseGroupName: releaseGroup.name,
                     }));
@@ -229,7 +229,7 @@ function createGitTagValues(releaseGroups, releaseGroupToFilteredProjects, versi
             }
             else {
                 // Use either docker version or semver version based on preference
-                tags.push((0, utils_1.interpolate)(releaseGroup.releaseTagPattern, {
+                tags.push((0, utils_1.interpolate)(releaseGroup.releaseTag.pattern, {
                     version: preferDockerVersion
                         ? projectVersionData.dockerVersion
                         : projectVersionData.newVersion,

package/src/command-line/release/version/release-group-processor.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAarE,eAAO,MAAM,qBAAqB;;;;;;;;;CAYxB,CAAC;AAEX,UAAU,4BAA4B;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IAEd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;OAIG;IACH,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IAEF,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,qBAAa,qBAAqB;IAmC9B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IAtCjB;;;OAGG;IACH,OAAO,CAAC,eAAe,CAA0B;IAEjD;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAA0B;IAEhD;;OAEG;IACH,OAAO,CAAC,WAAW,CAGL;IAEd;;;OAGG;IACH,OAAO,CAAC,kBAAkB,CAAqB;IAE/C;;;OAGG;IACH,OAAO,CAAC,yBAAyB,CAAqB;gBAG5C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,4BAA4B;IA+B/C,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKjE,YAAY,IAAI,MAAM,GAAG,IAAI;IAcvB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IAoCxC,sBAAsB;IAMtB,+BAA+B,IAAI,IAAI;IAMvC,cAAc,IAAI,WAAW;IAI7B;;;;;;;;;;OAUG;IACG,yBAAyB,CAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC;QACT,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IA6BI,qBAAqB,CACzB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM;YAyDV,YAAY;YAWZ,YAAY;YAUZ,qBAAqB;YAgKrB,2BAA2B;YA4E3B,8BAA8B;IAqH5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,8BAA8B;YAaxB,mBAAmB;YAoBnB,4BAA4B;YA+D5B,qBAAqB;YAgGrB,+BAA+B;IAa7C,OAAO,CAAC,4BAA4B;YAQtB,4BAA4B;IAwB1C,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,kCAAkC;CAI3C"}
+{"version":3,"file":"release-group-processor.d.ts","sourceRoot":"","sources":["../../../../../../../packages/nx/src/command-line/release/version/release-group-processor.ts"],"names":[],"mappings":"AAEA,OAAO,EACL,YAAY,EAEb,MAAM,+BAA+B,CAAC;AACvC,OAAO,EAAE,IAAI,EAAE,MAAM,0BAA0B,CAAC;AAEhD,OAAO,EAEL,KAAK,eAAe,EACrB,MAAM,kBAAkB,CAAC;AAE1B,OAAO,EAAyB,YAAY,EAAE,MAAM,wBAAwB,CAAC;AAE7E,OAAO,KAAK,EAAE,WAAW,EAAoB,MAAM,iBAAiB,CAAC;AAarE,eAAO,MAAM,qBAAqB;;;;;;;;;CAYxB,CAAC;AAEX,UAAU,4BAA4B;IACpC,MAAM,EAAE,OAAO,CAAC;IAChB,OAAO,EAAE,OAAO,CAAC;IACjB,YAAY,EAAE,OAAO,CAAC;IACtB,KAAK,EAAE,MAAM,CAAC;IAEd,kBAAkB,CAAC,EAAE,MAAM,CAAC;IAC5B,iBAAiB,CAAC,EAAE,MAAM,EAAE,CAAC;IAC7B;;;;OAIG;IACH,OAAO,EAAE;QACP,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;QACpB,MAAM,CAAC,EAAE,MAAM,EAAE,CAAC;KACnB,CAAC;IAEF,8BAA8B,CAAC,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;CAC1D;AAED,qBAAa,qBAAqB;IAmC9B,OAAO,CAAC,IAAI;IACZ,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,eAAe;IACvB,OAAO,CAAC,YAAY;IACpB,OAAO,CAAC,OAAO;IAtCjB;;;OAGG;IACH,OAAO,CAAC,eAAe,CAA0B;IAEjD;;;;OAIG;IACH,OAAO,CAAC,cAAc,CAA0B;IAEhD;;OAEG;IACH,OAAO,CAAC,WAAW,CAGL;IAEd;;;OAGG;IACH,OAAO,CAAC,kBAAkB,CAAqB;IAE/C;;;OAGG;IACH,OAAO,CAAC,yBAAyB,CAAqB;gBAG5C,IAAI,EAAE,IAAI,EACV,YAAY,EAAE,YAAY,EAC1B,eAAe,EAAE,eAAe,EAChC,YAAY,EAAE,YAAY,EAC1B,OAAO,EAAE,4BAA4B;IA+B/C,6BAA6B,CAAC,WAAW,EAAE,MAAM,GAAG,MAAM,GAAG,IAAI;IAKjE,YAAY,IAAI,MAAM,GAAG,IAAI;IAcvB,aAAa,IAAI,OAAO,CAAC,MAAM,EAAE,CAAC;IA4CxC,sBAAsB;IAMtB,+BAA+B,IAAI,IAAI;IAMvC,cAAc,IAAI,WAAW;IAI7B;;;;;;;;;;OAUG;IACG,yBAAyB,CAC7B,yBAAyB,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GACjD,OAAO,CAAC;QACT,YAAY,EAAE,MAAM,EAAE,CAAC;QACvB,YAAY,EAAE,MAAM,EAAE,CAAC;KACxB,CAAC;IA6BI,qBAAqB,CACzB,mBAAmB,CAAC,EAAE,MAAM,EAC5B,aAAa,CAAC,EAAE,MAAM;YAyDV,YAAY;YAWZ,YAAY;YAUZ,qBAAqB;YAgKrB,2BAA2B;YA4E3B,8BAA8B;IAqH5C,OAAO,CAAC,2BAA2B;IAWnC,OAAO,CAAC,0BAA0B;IAUlC,OAAO,CAAC,iCAAiC;IAMzC,OAAO,CAAC,8BAA8B;YAaxB,mBAAmB;YAoBnB,4BAA4B;YA+D5B,qBAAqB;YAgGrB,+BAA+B;IAa7C,OAAO,CAAC,4BAA4B;YAQtB,4BAA4B;IAwB1C,OAAO,CAAC,uBAAuB;IAQ/B,OAAO,CAAC,oBAAoB;IAI5B,OAAO,CAAC,kCAAkC;CAI3C"}

package/src/command-line/release/version/release-group-processor.js

@@ -93,6 +93,10 @@ class ReleaseGroupProcessor {
             if (this.processedGroups.has(nextGroup)) {
                 continue;
             }
+            // The next group might not present in the groupGraph if it has been filtered out
+            if (!this.releaseGraph.groupGraph.has(nextGroup)) {
+                continue;
+            }
             const allDependenciesProcessed = Array.from(this.releaseGraph.groupGraph.get(nextGroup).dependencies).every((dep) => this.processedGroups.has(dep));
             if (!allDependenciesProcessed) {
                 // If we encounter a group whose dependencies aren't all processed,
@@ -101,6 +105,10 @@ class ReleaseGroupProcessor {
                 for (const dep of this.releaseGraph.groupGraph.get(nextGroup)
                     .dependencies) {
                     if (!this.processedGroups.has(dep)) {
+                        // The next group might not present in the groupGraph if it has been filtered out
+                        if (!this.releaseGraph.groupGraph.has(dep)) {
+                            continue;
+                        }
                         await this.processGroup(dep);
                         this.processedGroups.add(dep);
                         processOrder.push(dep);
@@ -528,7 +536,7 @@ class ReleaseGroupProcessor {
         const releaseGroup = this.releaseGraph.groupGraph.get(releaseGroupName).group;
         const releaseGroupVersionConfig = releaseGroup.version;
         // Get updateDependents from the release group level config
-        const updateDependents = releaseGroupVersionConfig?.updateDependents || 'auto';
+        const updateDependents = releaseGroupVersionConfig?.updateDependents || 'always';
         // Only update dependencies for dependents if the group's updateDependents is 'auto' or 'always'
         if (updateDependents === 'auto' || updateDependents === 'always') {
             const dependents = this.getNonImplicitDependentsForProject(projectName);

package/src/config/nx-json.d.ts

@@ -146,9 +146,9 @@ export interface NxReleaseVersionConfiguration {
     /**
      * When versioning independent projects, this controls whether to update their dependents (i.e. the things that depend on them).
      * - 'never' means no dependents will be updated (unless they happen to be versioned directly as well).
-     * - 'auto' is the default and will cause dependents to be updated (a patch version bump) when a dependency is versioned, as long as a
+     * - 'always' is the default and will cause dependents to be updated (a patch version bump) when a dependency is versioned, even if they are not included in the group or projects filter.
+     * - 'auto' will cause dependents to be updated (a patch version bump) when a dependency is versioned, as long as a
      *   group or projects filter is not applied that does not include them.
-     * - 'always' will cause dependents to be updated (a patch version bump) when a dependency is versioned, even if they are not included in the group or projects filter.
      */
     updateDependents?: 'auto' | 'always' | 'never';
     /**
@@ -371,53 +371,79 @@ export interface NxReleaseConfiguration {
          */
         changelog?: NxReleaseChangelogConfiguration | boolean;
         /**
+         * Configuration for release tag generation and matching.
+         */
+        releaseTag?: {
+            /**
+             * The pattern to use for release tags. Supports interpolating {version}, {projectName}, and {releaseGroupName}.
+             */
+            pattern?: string;
+            /**
+             * 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 matches one of the strings in the array. Glob patterns are supported.
+             */
+            checkAllBranchesWhen?: boolean | string[];
+            /**
+             * By default, we will use semver when searching through the tags to find the latest matching tag.
+             *
+             * - Setting this to true will cause us to use semver to match the version
+             * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+             */
+            requireSemver?: boolean;
+            /**
+             * Controls how docker versions are used relative to semver versions when creating git tags and changelog entries.
+             *
+             * - true: Use only the docker version
+             * - false: Use only the semver version
+             * - 'both': Create tags and changelog entries for both docker and semver versions
+             *
+             * By default, this is set to true when docker configuration is present, and false otherwise.
+             */
+            preferDockerVersion?: boolean | 'both';
+            /**
+             * When set to true and multiple tags match your configured pattern, 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.
+             *
+             * For example, let's say your pattern is "{projectName}@{version}" and you have the following tags for project "my-lib", which uses semver:
+             * - my-lib@1.2.4-beta.1
+             * - my-lib@1.2.4-alpha.1
+             * - my-lib@1.2.3
+             *
+             * If "strictPreid" is set to true and you run:
+             * - `nx release --preid beta`, the git tag "my-lib@1.2.4-beta.1" will be resolved.
+             * - `nx release --preid alpha`, the git tag "my-lib@1.2.4-alpha.1" will be resolved.
+             * - `nx release` (no preid), the git tag "my-lib@1.2.3" will be resolved.
+             *
+             * If "strictPreid" 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.
+             *
+             * NOTE: 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.
+             */
+            strictPreid?: boolean;
+        };
+        /**
+         * @deprecated Use `releaseTag.pattern` instead. Will be removed in Nx 23.
          * Optionally override the git/release tag pattern to use for this group.
          */
         releaseTagPattern?: string;
         /**
-         * 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 matches one of the strings in the array. Glob patterns are supported.
+         * @deprecated Use `releaseTag.checkAllBranchesWhen` instead. Will be removed in Nx 23.
          */
         releaseTagPatternCheckAllBranchesWhen?: boolean | string[];
         /**
-         * By default, we will use semver when searching through the tags to find the latest matching tag.
-         *
-         * - Setting this to true will cause us to use semver to match the version
-         * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+         * @deprecated Use `releaseTag.requireSemver` instead. Will be removed in Nx 23.
          */
         releaseTagPatternRequireSemver?: boolean;
         /**
-         * Controls how docker versions are used relative to semver versions when creating git tags and changelog entries.
-         *
-         * - true: Use only the docker version
-         * - false: Use only the semver version
-         * - 'both': Create tags and changelog entries for both docker and semver versions
-         *
-         * By default, this is set to true when docker configuration is present, and false otherwise.
+         * @deprecated Use `releaseTag.preferDockerVersion` instead. Will be removed in Nx 23.
          */
         releaseTagPatternPreferDockerVersion?: boolean | 'both';
         /**
-         * 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.
-         *
-         * For example, let's say your "releaseTagPattern" is "{projectName}@{version}" and you have the following tags for project "my-lib", which uses semver:
-         * - my-lib@1.2.4-beta.1
-         * - my-lib@1.2.4-alpha.1
-         * - my-lib@1.2.3
-         *
-         * If "releaseTagPatternStrictPreid" is set to true and you run:
-         * - `nx release --preid beta`, the git tag "my-lib@1.2.4-beta.1" will be resolved.
-         * - `nx release --preid alpha`, the git tag "my-lib@1.2.4-alpha.1" will be resolved.
-         * - `nx release` (no preid), the git tag "my-lib@1.2.3" will be resolved.
-         *
-         * If "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.
-         *
-         * NOTE: 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.
+         * @deprecated Use `releaseTag.strictPreid` instead. Will be removed in Nx 23.
          */
         releaseTagPatternStrictPreid?: boolean;
         /**
@@ -468,6 +494,69 @@ export interface NxReleaseConfiguration {
         preVersionCommand?: string;
     };
     /**
+     * Configuration for release tag generation and matching.
+     */
+    releaseTag?: {
+        /**
+         * The pattern to use for release tags. This field is the source of truth
+         * for changelog generation and release tagging, as well as for conventional commits parsing.
+         *
+         * It supports interpolating the version as {version} and (if releasing independently or forcing
+         * project level version control system releases) the project name as {projectName} within the string.
+         *
+         * The default pattern for fixed/unified releases is: "v{version}"
+         * The default pattern for independent releases at the project level is: "{projectName}@{version}"
+         */
+        pattern?: string;
+        /**
+         * By default, we will try and resolve the latest match for the pattern 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 matches one of the strings in the array. Glob patterns are supported.
+         */
+        checkAllBranchesWhen?: boolean | string[];
+        /**
+         * By default, we will use semver when searching through the tags to find the latest matching tag.
+         *
+         * - Setting this to true will cause us to use semver to match the version
+         * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+         */
+        requireSemver?: boolean;
+        /**
+         * Controls how docker versions are used relative to semver versions when creating git tags and changelog entries.
+         *
+         * - true: Use only the docker version
+         * - false: Use only the semver version
+         * - 'both': Create tags and changelog entries for both docker and semver versions
+         *
+         * By default, this is set to true when docker configuration is present, and false otherwise.
+         */
+        preferDockerVersion?: boolean | 'both';
+        /**
+         * When set to true and multiple tags match your configured pattern, 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.
+         *
+         * For example, let's say your pattern is "{projectName}@{version}" and you have the following tags for project "my-lib", which uses semver:
+         * - my-lib@1.2.4-beta.1
+         * - my-lib@1.2.4-alpha.1
+         * - my-lib@1.2.3
+         *
+         * If "strictPreid" is set to true and you run:
+         * - `nx release --preid beta`, the git tag "my-lib@1.2.4-beta.1" will be resolved.
+         * - `nx release --preid alpha`, the git tag "my-lib@1.2.4-alpha.1" will be resolved.
+         * - `nx release` (no preid), the git tag "my-lib@1.2.3" will be resolved.
+         *
+         * If "strictPreid" 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.
+         *
+         * NOTE: 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.
+         */
+        strictPreid?: boolean;
+    };
+    /**
+     * @deprecated Use `releaseTag.pattern` instead. Will be removed in Nx 23.
      * Optionally override the git/release tag pattern to use. This field is the source of truth
      * for changelog generation and release tagging, as well as for conventional commits parsing.
      *
@@ -479,49 +568,19 @@ export interface NxReleaseConfiguration {
      */
     releaseTagPattern?: string;
     /**
-     * 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 matches one of the strings in the array. Glob patterns are supported.
+     * @deprecated Use `releaseTag.checkAllBranchesWhen` instead. Will be removed in Nx 23.
      */
     releaseTagPatternCheckAllBranchesWhen?: boolean | string[];
     /**
-     * By default, we will use semver when searching through the tags to find the latest matching tag.
-     *
-     * - Setting this to true will cause us to use semver to match the version
-     * - Setting this to false will cause us to not use semver to match the version allowing for non-semver versions
+     * @deprecated Use `releaseTag.requireSemver` instead. Will be removed in Nx 23.
      */
     releaseTagPatternRequireSemver?: boolean;
     /**
-     * Controls how docker versions are used relative to semver versions when creating git tags and changelog entries.
-     *
-     * - true: Use only the docker version
-     * - false: Use only the semver version
-     * - 'both': Create tags and changelog entries for both docker and semver versions
-     *
-     * By default, this is set to true when docker configuration is present, and false otherwise.
+     * @deprecated Use `releaseTag.preferDockerVersion` instead. Will be removed in Nx 23.
      */
     releaseTagPatternPreferDockerVersion?: boolean | 'both';
     /**
-     * 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.
-     *
-     * For example, let's say your "releaseTagPattern" is "{projectName}@{version}" and you have the following tags for project "my-lib", which uses semver:
-     * - my-lib@1.2.4-beta.1
-     * - my-lib@1.2.4-alpha.1
-     * - my-lib@1.2.3
-     *
-     * If "releaseTagPatternStrictPreid" is set to true and you run:
-     * - `nx release --preid beta`, the git tag "my-lib@1.2.4-beta.1" will be resolved.
-     * - `nx release --preid alpha`, the git tag "my-lib@1.2.4-alpha.1" will be resolved.
-     * - `nx release` (no preid), the git tag "my-lib@1.2.3" will be resolved.
-     *
-     * If "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.
-     *
-     * NOTE: 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.
+     * @deprecated Use `releaseTag.strictPreid` instead. Will be removed in Nx 23.
      */
     releaseTagPatternStrictPreid?: boolean;
     /**

package/src/config/nx-json.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"nx-json.d.ts","sourceRoot":"","sources":["../../../../../packages/nx/src/config/nx-json.ts"],"names":[],"mappings":"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"}