nx 20.7.2 → 20.8.0-beta.1

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.defaultCreateReleaseProvider = exports.IMPLICIT_DEFAULT_RELEASE_GROUP = void 0;
+exports.defaultCreateReleaseProvider = exports.DEFAULT_VERSION_ACTIONS_PATH = exports.IMPLICIT_DEFAULT_RELEASE_GROUP = void 0;
 exports.createNxReleaseConfig = createNxReleaseConfig;
 exports.handleNxReleaseConfigError = handleNxReleaseConfigError;
 /**
@@ -21,12 +21,14 @@ const node_url_1 = require("node:url");
 const fileutils_1 = require("../../../utils/fileutils");
 const find_matching_projects_1 = require("../../../utils/find-matching-projects");
 const output_1 = require("../../../utils/output");
-const workspace_root_1 = require("../../../utils/workspace-root");
 const path_1 = require("../../../utils/path");
+const workspace_root_1 = require("../../../utils/workspace-root");
 const resolve_changelog_renderer_1 = require("../utils/resolve-changelog-renderer");
 const resolve_nx_json_error_message_1 = require("../utils/resolve-nx-json-error-message");
 const conventional_commits_1 = require("./conventional-commits");
+const use_legacy_versioning_1 = require("./use-legacy-versioning");
 exports.IMPLICIT_DEFAULT_RELEASE_GROUP = '__default__';
+exports.DEFAULT_VERSION_ACTIONS_PATH = '@nx/js/src/release/version-actions';
 // Apply default configuration to any optional user configuration and handle known errors
 async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig = {}) {
     if (userConfig.projects && userConfig.groups) {
@@ -50,12 +52,13 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
     if (hasInvalidConventionalCommitsConfig(userConfig)) {
         return {
             error: {
-                code: 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_GENERATOR_OPTIONS',
+                code: 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_OPTIONS',
                 data: {},
             },
             nxReleaseConfig: null,
         };
     }
+    const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userConfig);
     const gitDefaults = {
         commit: false,
         commitMessage: 'chore(release): publish {version}',
@@ -65,6 +68,7 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         tagArgs: '',
         stageChanges: false,
         push: false,
+        pushArgs: '',
     };
     const versionGitDefaults = {
         ...gitDefaults,
@@ -133,11 +137,24 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         projectsRelationship: workspaceProjectsRelationship,
         git: gitDefaults,
         version: {
+            useLegacyVersioning: USE_LEGACY_VERSIONING,
             git: versionGitDefaults,
             conventionalCommits: userConfig.version?.conventionalCommits || false,
-            generator: '@nx/js:release-version',
-            generatorOptions: defaultGeneratorOptions,
             preVersionCommand: userConfig.version?.preVersionCommand || '',
+            ...(USE_LEGACY_VERSIONING
+                ? {
+                    generator: '@nx/js:release-version',
+                    generatorOptions: defaultGeneratorOptions,
+                }
+                : {
+                    versionActions: exports.DEFAULT_VERSION_ACTIONS_PATH,
+                    versionActionsOptions: {},
+                    currentVersionResolver: defaultGeneratorOptions.currentVersionResolver,
+                    specifierSource: defaultGeneratorOptions.specifierSource,
+                    preserveLocalDependencyProtocols: userConfig.version?.preserveLocalDependencyProtocols ?? true,
+                    logUnchangedProjects: userConfig.version?.logUnchangedProjects ?? true,
+                    updateDependents: userConfig.version?.updateDependents ?? 'auto',
+                }),
         },
         changelog: {
             git: changelogGitDefaults,
@@ -185,12 +202,19 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
     const groupProjectsRelationship = userConfig.projectsRelationship || WORKSPACE_DEFAULTS.projectsRelationship;
     const GROUP_DEFAULTS = {
         projectsRelationship: groupProjectsRelationship,
-        version: {
-            conventionalCommits: false,
-            generator: '@nx/js:release-version',
-            generatorOptions: {},
-            groupPreVersionCommand: '',
-        },
+        version: USE_LEGACY_VERSIONING
+            ? {
+                conventionalCommits: false,
+                generator: '@nx/js:release-version',
+                generatorOptions: {},
+                groupPreVersionCommand: '',
+            }
+            : {
+                conventionalCommits: false,
+                versionActions: exports.DEFAULT_VERSION_ACTIONS_PATH,
+                versionActionsOptions: {},
+                groupPreVersionCommand: '',
+            },
         changelog: {
             createRelease: false,
             entryWhenNoChanges: 'This was a version bump only for {projectName} to align it with other projects, there were no code changes.',
@@ -219,7 +243,9 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
     const rootVersionConfig = deepMergeDefaults([
         WORKSPACE_DEFAULTS.version,
         // Merge in the git defaults from the top level
-        { git: versionGitDefaults },
+        {
+            git: versionGitDefaults,
+        },
         {
             git: userConfig.git,
         },
@@ -242,33 +268,50 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
         WORKSPACE_DEFAULTS.versionPlans);
     const rootConventionalCommitsConfig = deepMergeDefaults([WORKSPACE_DEFAULTS.conventionalCommits], fillUnspecifiedConventionalCommitsProperties(normalizeConventionalCommitsConfig(userConfig.conventionalCommits)));
     // these options are not supported at the group level, only the root/command level
-    const rootVersionWithoutGlobalOptions = {
+    let rootVersionWithoutGlobalOptions = {
         ...rootVersionConfig,
     };
     delete rootVersionWithoutGlobalOptions.git;
     delete rootVersionWithoutGlobalOptions.preVersionCommand;
     // Apply conventionalCommits shorthand to the final group defaults if explicitly configured in the original user config
     if (userConfig.version?.conventionalCommits === true) {
-        rootVersionWithoutGlobalOptions.generatorOptions = {
-            ...rootVersionWithoutGlobalOptions.generatorOptions,
-            currentVersionResolver: 'git-tag',
-            specifierSource: 'conventional-commits',
-        };
+        if (USE_LEGACY_VERSIONING) {
+            rootVersionWithoutGlobalOptions.generatorOptions = {
+                ...rootVersionWithoutGlobalOptions.generatorOptions,
+                currentVersionResolver: 'git-tag',
+                specifierSource: 'conventional-commits',
+            };
+        }
+        else {
+            rootVersionWithoutGlobalOptions.currentVersionResolver = 'git-tag';
+            rootVersionWithoutGlobalOptions.specifierSource = 'conventional-commits';
+        }
     }
     if (userConfig.version?.conventionalCommits === false) {
         delete rootVersionWithoutGlobalOptions.generatorOptions
             .currentVersionResolver;
         delete rootVersionWithoutGlobalOptions.generatorOptions.specifierSource;
+        delete rootVersionWithoutGlobalOptions
+            .currentVersionResolver;
+        delete rootVersionWithoutGlobalOptions
+            .specifierSource;
     }
     // Apply versionPlans shorthand to the final group defaults if explicitly configured in the original user config
     if (userConfig.versionPlans) {
-        rootVersionWithoutGlobalOptions.generatorOptions = {
-            ...rootVersionWithoutGlobalOptions.generatorOptions,
-            specifierSource: 'version-plans',
-        };
+        if (USE_LEGACY_VERSIONING) {
+            rootVersionWithoutGlobalOptions.generatorOptions = {
+                ...rootVersionWithoutGlobalOptions.generatorOptions,
+                specifierSource: 'version-plans',
+            };
+        }
+        else {
+            rootVersionWithoutGlobalOptions.specifierSource = 'version-plans';
+        }
     }
     if (userConfig.versionPlans === false) {
         delete rootVersionWithoutGlobalOptions.generatorOptions.specifierSource;
+        delete rootVersionWithoutGlobalOptions
+            .specifierSource;
     }
     const groups = userConfig.groups && Object.keys(userConfig.groups).length
         ? ensureProjectsConfigIsArray(userConfig.groups)
@@ -377,32 +420,51 @@ async function createNxReleaseConfig(projectGraph, projectFileMap, userConfig =
             // Ensure that the resolved project names take priority over the original user config (which could have contained unresolved globs etc)
             projects: matchingProjects,
         });
+        finalReleaseGroup.version =
+            finalReleaseGroup.version;
         // Apply conventionalCommits shorthand to the final group if explicitly configured in the original group
         if (releaseGroup.version?.conventionalCommits === true) {
-            finalReleaseGroup.version.generatorOptions = {
-                ...finalReleaseGroup.version.generatorOptions,
-                currentVersionResolver: 'git-tag',
-                specifierSource: 'conventional-commits',
-            };
+            if (USE_LEGACY_VERSIONING) {
+                finalReleaseGroup.version.generatorOptions = {
+                    ...finalReleaseGroup.version.generatorOptions,
+                    currentVersionResolver: 'git-tag',
+                    specifierSource: 'conventional-commits',
+                };
+            }
+            else {
+                finalReleaseGroup.version.currentVersionResolver = 'git-tag';
+                finalReleaseGroup.version.specifierSource = 'conventional-commits';
+            }
         }
         if (releaseGroup.version?.conventionalCommits === false &&
             releaseGroupName !== exports.IMPLICIT_DEFAULT_RELEASE_GROUP) {
             delete finalReleaseGroup.version.generatorOptions.currentVersionResolver;
             delete finalReleaseGroup.version.generatorOptions.specifierSource;
+            delete finalReleaseGroup.version
+                .currentVersionResolver;
+            delete finalReleaseGroup.version
+                .specifierSource;
         }
         // Apply versionPlans shorthand to the final group if explicitly configured in the original group
         if (releaseGroup.versionPlans) {
-            finalReleaseGroup.version = {
-                ...finalReleaseGroup.version,
-                generatorOptions: {
-                    ...finalReleaseGroup.version?.generatorOptions,
-                    specifierSource: 'version-plans',
-                },
-            };
+            if (USE_LEGACY_VERSIONING) {
+                finalReleaseGroup.version = {
+                    ...finalReleaseGroup.version,
+                    generatorOptions: {
+                        ...finalReleaseGroup.version?.generatorOptions,
+                        specifierSource: 'version-plans',
+                    },
+                };
+            }
+            else {
+                finalReleaseGroup.version.specifierSource = 'version-plans';
+            }
         }
         if (releaseGroup.versionPlans === false &&
             releaseGroupName !== exports.IMPLICIT_DEFAULT_RELEASE_GROUP) {
             delete finalReleaseGroup.version.generatorOptions.specifierSource;
+            delete finalReleaseGroup.version
+                .specifierSource;
         }
         releaseGroups[releaseGroupName] = finalReleaseGroup;
     }
@@ -517,7 +579,7 @@ function fillUnspecifiedConventionalCommitsProperties(config) {
         types,
     };
 }
-async function handleNxReleaseConfigError(error) {
+async function handleNxReleaseConfigError(error, useLegacyVersioning) {
     switch (error.code) {
         case 'PROJECTS_AND_GROUPS_DEFINED':
             {
@@ -569,13 +631,16 @@ async function handleNxReleaseConfigError(error) {
                 });
             }
             break;
-        case 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_GENERATOR_OPTIONS':
+        case 'CONVENTIONAL_COMMITS_SHORTHAND_MIXED_WITH_OVERLAPPING_OPTIONS':
             {
                 const nxJsonMessage = await (0, resolve_nx_json_error_message_1.resolveNxJsonConfigErrorMessage)([
                     'release',
                 ]);
+                const text = useLegacyVersioning
+                    ? '"version.generatorOptions"'
+                    : 'configuration options';
                 output_1.output.error({
-                    title: `You have configured both the shorthand "version.conventionalCommits" and one or more of the related "version.generatorOptions" that it sets for you. Please use one or the other:`,
+                    title: `You have configured both the shorthand "version.conventionalCommits" and one or more of the related ${text} that it sets for you. Please use one or the other:`,
                     bodyLines: [nxJsonMessage],
                 });
             }
@@ -723,21 +788,36 @@ function deepMergeDefaults(defaultConfigs, userConfig) {
 }
 /**
  * We want to prevent users from setting both the conventionalCommits shorthand and any of the related
- * generatorOptions at the same time, since it is at best redundant, and at worst invalid.
+ * configuration options at the same time, since it is at best redundant, and at worst invalid.
  */
 function hasInvalidConventionalCommitsConfig(userConfig) {
     // at the root
     if (userConfig.version?.conventionalCommits === true &&
-        (userConfig.version?.generatorOptions?.currentVersionResolver ||
-            userConfig.version?.generatorOptions?.specifierSource)) {
+        // v2 config - directly on version config
+        (userConfig.version
+            ?.currentVersionResolver ||
+            userConfig.version
+                ?.specifierSource ||
+            // Legacy config - on generatorOptions
+            userConfig.version
+                ?.generatorOptions?.currentVersionResolver ||
+            userConfig.version
+                ?.generatorOptions?.specifierSource)) {
         return true;
     }
     // within any groups
     if (userConfig.groups) {
         for (const group of Object.values(userConfig.groups)) {
             if (group.version?.conventionalCommits === true &&
-                (group.version?.generatorOptions?.currentVersionResolver ||
-                    group.version?.generatorOptions?.specifierSource)) {
+                // v2 config - directly on version config
+                (group.version
+                    ?.currentVersionResolver ||
+                    group.version?.specifierSource ||
+                    // Legacy config - on generatorOptions
+                    group.version
+                        ?.generatorOptions?.currentVersionResolver ||
+                    group.version
+                        ?.generatorOptions?.specifierSource)) {
                 return true;
             }
         }

package/src/command-line/release/config/use-legacy-versioning.d.ts

@@ -0,0 +1,2 @@
+import type { NxJsonConfiguration } from '../../../config/nx-json';
+export declare function shouldUseLegacyVersioning(releaseConfig: NxJsonConfiguration['release'] | undefined): boolean;

package/src/command-line/release/config/use-legacy-versioning.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.shouldUseLegacyVersioning = shouldUseLegacyVersioning;
+function shouldUseLegacyVersioning(releaseConfig) {
+    return process.env.NX_INTERNAL_USE_LEGACY_VERSIONING === 'false'
+        ? false
+        : // TODO(v21): switch this to false by default in Nx v21 and remove this function in v22
+            releaseConfig?.version?.useLegacyVersioning ?? true;
+}

package/src/command-line/release/index.d.ts

@@ -31,3 +31,7 @@ export declare const releaseVersion: typeof defaultClient.releaseVersion;
  * @public
  */
 export declare const release: typeof defaultClient.release;
+/**
+ * @public
+ */
+export { AfterAllProjectsVersioned, VersionActions, } from './version/version-actions';

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.release = exports.releaseVersion = exports.releasePublish = exports.releaseChangelog = exports.ReleaseClient = void 0;
+exports.VersionActions = exports.release = exports.releaseVersion = exports.releasePublish = exports.releaseChangelog = exports.ReleaseClient = void 0;
 const changelog_1 = require("./changelog");
 const publish_1 = require("./publish");
 const release_1 = require("./release");
@@ -35,3 +35,8 @@ exports.releaseVersion = defaultClient.releaseVersion.bind(defaultClient);
  * @public
  */
 exports.release = defaultClient.release.bind(defaultClient);
+/**
+ * @public
+ */
+var version_actions_1 = require("./version/version-actions");
+Object.defineProperty(exports, "VersionActions", { enumerable: true, get: function () { return version_actions_1.VersionActions; } });

package/src/command-line/release/plan-check.js

@@ -7,11 +7,12 @@ const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const output_1 = require("../../utils/output");
 const handle_errors_1 = require("../../utils/handle-errors");
+const output_1 = require("../../utils/output");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const version_plans_1 = require("./config/version-plans");
 const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
 const print_config_1 = require("./utils/print-config");
@@ -25,7 +26,8 @@ function createAPI(overrideReleaseConfig) {
         // Apply default configuration to any optional user configuration
         const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
         if (configError) {
-            return await (0, config_1.handleNxReleaseConfigError)(configError);
+            const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
+            return await (0, config_1.handleNxReleaseConfigError)(configError, USE_LEGACY_VERSIONING);
         }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {
@@ -47,7 +49,8 @@ function createAPI(overrideReleaseConfig) {
                 title: 'Version plans are not enabled',
                 bodyLines: [
                     'Please ensure at least one release group has version plans enabled in your Nx release configuration if you want to use this command.',
-                    // TODO: Add docs link here once it is available
+                    '',
+                    'Learn more about version plans here: https://nx.dev/recipes/nx-release/file-based-versioning-version-plans',
                 ],
             });
             return 1;

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

@@ -13,11 +13,12 @@ const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
 const all_file_data_1 = require("../../utils/all-file-data");
 const command_line_utils_1 = require("../../utils/command-line-utils");
-const output_1 = require("../../utils/output");
 const handle_errors_1 = require("../../utils/handle-errors");
+const output_1 = require("../../utils/output");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const version_plans_1 = require("./config/version-plans");
 const generate_version_plan_content_1 = require("./utils/generate-version-plan-content");
 const get_touched_projects_for_group_1 = require("./utils/get-touched-projects-for-group");
@@ -34,7 +35,8 @@ function createAPI(overrideReleaseConfig) {
         // Apply default configuration to any optional user configuration
         const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
         if (configError) {
-            return await (0, config_1.handleNxReleaseConfigError)(configError);
+            const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
+            return await (0, config_1.handleNxReleaseConfigError)(configError, USE_LEGACY_VERSIONING);
         }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {
@@ -210,10 +212,12 @@ async function promptForVersion(message) {
         ]);
         return reply.version;
     }
-    catch (e) {
+    catch {
         output_1.output.log({
             title: 'Cancelled version plan creation.',
         });
+        // Ensure the cursor is always restored before exiting
+        process.stdout.write('\u001b[?25h');
         process.exit(0);
     }
 }

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

@@ -4,19 +4,20 @@ exports.releasePublishCLIHandler = void 0;
 exports.createAPI = createAPI;
 const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
+const tasks_execution_hooks_1 = require("../../project-graph/plugins/tasks-execution-hooks");
 const project_graph_1 = require("../../project-graph/project-graph");
 const run_command_1 = require("../../tasks-runner/run-command");
 const command_line_utils_1 = require("../../utils/command-line-utils");
 const handle_errors_1 = require("../../utils/handle-errors");
 const output_1 = require("../../utils/output");
 const project_graph_utils_1 = require("../../utils/project-graph-utils");
+const workspace_root_1 = require("../../utils/workspace-root");
 const graph_1 = require("../graph/graph");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const print_config_1 = require("./utils/print-config");
-const workspace_root_1 = require("../../utils/workspace-root");
-const tasks_execution_hooks_1 = require("../../project-graph/plugins/tasks-execution-hooks");
 const releasePublishCLIHandler = (args) => (0, handle_errors_1.handleErrors)(args.verbose, async () => {
     const publishProjectsResult = await createAPI({})(args);
     // If all projects are published successfully, return 0, otherwise return 1
@@ -46,7 +47,8 @@ function createAPI(overrideReleaseConfig) {
         // Apply default configuration to any optional user configuration
         const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
         if (configError) {
-            return await (0, config_1.handleNxReleaseConfigError)(configError);
+            const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
+            return await (0, config_1.handleNxReleaseConfigError)(configError, USE_LEGACY_VERSIONING);
         }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {

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

@@ -7,12 +7,13 @@ const node_fs_1 = require("node:fs");
 const nx_json_1 = require("../../config/nx-json");
 const file_map_utils_1 = require("../../project-graph/file-map-utils");
 const project_graph_1 = require("../../project-graph/project-graph");
-const output_1 = require("../../utils/output");
 const handle_errors_1 = require("../../utils/handle-errors");
+const output_1 = require("../../utils/output");
 const changelog_1 = require("./changelog");
 const config_1 = require("./config/config");
 const deep_merge_json_1 = require("./config/deep-merge-json");
 const filter_release_groups_1 = require("./config/filter-release-groups");
+const use_legacy_versioning_1 = require("./config/use-legacy-versioning");
 const version_plans_1 = require("./config/version-plans");
 const publish_1 = require("./publish");
 const git_1 = require("./utils/git");
@@ -47,7 +48,8 @@ function createAPI(overrideReleaseConfig) {
         // Apply default configuration to any optional user configuration
         const { error: configError, nxReleaseConfig } = await (0, config_1.createNxReleaseConfig)(projectGraph, await (0, file_map_utils_1.createProjectFileMapUsingProjectGraph)(projectGraph), userProvidedReleaseConfig);
         if (configError) {
-            return await (0, config_1.handleNxReleaseConfigError)(configError);
+            const USE_LEGACY_VERSIONING = (0, use_legacy_versioning_1.shouldUseLegacyVersioning)(userProvidedReleaseConfig);
+            return await (0, config_1.handleNxReleaseConfigError)(configError, USE_LEGACY_VERSIONING);
         }
         // --print-config exits directly as it is not designed to be combined with any other programmatic operations
         if (args.printConfig) {
@@ -172,6 +174,7 @@ function createAPI(overrideReleaseConfig) {
             await (0, git_1.gitPush)({
                 dryRun: args.dryRun,
                 verbose: args.verbose,
+                additionalArgs: nxReleaseConfig.git.pushArgs,
             });
             hasPushedChanges = true;
         }
@@ -243,7 +246,9 @@ async function promptForPublish() {
         ]);
         return reply.confirmation;
     }
-    catch (e) {
+    catch {
+        // Ensure the cursor is always restored before exiting
+        process.stdout.write('\u001b[?25h');
         // Handle the case where the user exits the prompt with ctrl+c
         return false;
     }

package/src/command-line/release/utils/batch-projects-by-generator-config.js

@@ -10,11 +10,14 @@ function batchProjectsByGeneratorConfig(projectGraph, releaseGroup, projectNames
     const configBatches = new Map();
     for (const projectName of projectNamesToBatch) {
         const project = projectGraph.nodes[projectName];
-        const generator = project.data.release?.version?.generator ||
+        const generator = project.data.release?.version
+            ?.generator ||
             releaseGroup.version.generator;
         const generatorOptions = {
-            ...releaseGroup.version.generatorOptions,
-            ...project.data.release?.version?.generatorOptions,
+            ...releaseGroup.version
+                .generatorOptions,
+            ...project.data.release?.version
+                ?.generatorOptions,
         };
         let found = false;
         for (const [key, projects] of configBatches) {

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

@@ -50,10 +50,11 @@ export declare function gitTag({ tag, message, additionalArgs, dryRun, verbose,
     verbose?: boolean;
     logFn?: (message: string) => void;
 }): Promise<string>;
-export declare function gitPush({ gitRemote, dryRun, verbose, }: {
+export declare function gitPush({ gitRemote, dryRun, verbose, additionalArgs, }: {
     gitRemote?: string;
     dryRun?: boolean;
     verbose?: boolean;
+    additionalArgs?: string | string[];
 }): Promise<void>;
 export declare function parseCommits(commits: RawGitCommit[]): GitCommit[];
 export declare function parseConventionalCommitsMessage(message: string): {

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

@@ -308,7 +308,7 @@ async function gitTag({ tag, message, additionalArgs, dryRun, verbose, logFn, })
         throw new Error(`Unexpected error when creating tag ${tag}:\n\n${err}`);
     }
 }
-async function gitPush({ gitRemote, dryRun, verbose, }) {
+async function gitPush({ gitRemote, dryRun, verbose, additionalArgs, }) {
     const commandArgs = [
         'push',
         // NOTE: It's important we use --follow-tags, and not --tags, so that we are precise about what we are pushing
@@ -318,6 +318,14 @@ async function gitPush({ gitRemote, dryRun, verbose, }) {
         // Set custom git remote if provided
         ...(gitRemote ? [gitRemote] : []),
     ];
+    if (additionalArgs) {
+        if (Array.isArray(additionalArgs)) {
+            commandArgs.push(...additionalArgs);
+        }
+        else {
+            commandArgs.push(...additionalArgs.split(' '));
+        }
+    }
     if (verbose) {
         console.log(dryRun
             ? `Would push the current branch to the remote with the following command, but --dry-run was set:`
@@ -396,7 +404,7 @@ function parseGitCommit(commit, isVersionPlanCommit = false) {
             scope: '',
             references: extractReferencesFromCommitMessage(commit.message, commit.shortHash),
             // The commit message is not the source of truth for a breaking (major) change in version plans, so the value is not relevant
-            // TODO(v20): Make the current GitCommit interface more clearly tied to conventional commits
+            // TODO(v22): Make the current GitCommit interface more clearly tied to conventional commits
             isBreaking: false,
             authors: getAllAuthorsForCommit(commit),
             // Not applicable to version plans

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

@@ -198,7 +198,9 @@ async function promptForContinueInGitHub() {
         ]);
         return reply.open === 'Yes';
     }
-    catch (e) {
+    catch {
+        // Ensure the cursor is always restored before exiting
+        process.stdout.write('\u001b[?25h');
         // Handle the case where the user exits the prompt with ctrl+c
         process.exit(1);
     }

package/src/command-line/release/utils/resolve-semver-specifier.d.ts

@@ -1,4 +1,5 @@
 import { ProjectGraph } from '../../../config/project-graph';
 import { NxReleaseConfig } from '../config/config';
+import { SemverBumpType } from '../version/version-actions';
 export declare function resolveSemverSpecifierFromConventionalCommits(from: string, projectGraph: ProjectGraph, projectNames: string[], conventionalCommitsConfig: NxReleaseConfig['conventionalCommits']): Promise<string | null>;
-export declare function resolveSemverSpecifierFromPrompt(selectionMessage: string, customVersionMessage: string): Promise<string>;
+export declare function resolveSemverSpecifierFromPrompt(selectionMessage: string, customVersionMessage: string): Promise<SemverBumpType | string>;

package/src/command-line/release/utils/resolve-semver-specifier.js

@@ -50,7 +50,8 @@ async function resolveSemverSpecifierFromPrompt(selectionMessage, customVersionM
         }
     }
     catch {
-        // TODO: log the error to the user?
+        // Ensure the cursor is always restored before exiting
+        process.stdout.write('\u001b[?25h');
         // We need to catch the error from enquirer prompt, otherwise yargs will print its help
         process.exit(1);
     }

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

@@ -7,5 +7,13 @@ import { NxReleaseConfig } from '../config/config';
 import { GitCommit } from './git';
 export declare function isRelativeVersionKeyword(val: string): val is ReleaseType;
 export declare function isValidSemverSpecifier(specifier: string): boolean;
+/**
+ * TODO: We would be able to make the logging for the conventional commits use-case
+ * for fixed release groups more clear/precise if we passed through which project
+ * the conventional commits were detected for.
+ *
+ * It would then flow up through deriveSpecifierFromConventionalCommits back to
+ * ReleaseGroupProcessor.
+ */
 export declare function determineSemverChange(commits: GitCommit[], config: NxReleaseConfig['conventionalCommits']): 'patch' | 'minor' | 'major' | null;
 export declare function deriveNewSemverVersion(currentSemverVersion: string, semverSpecifier: string, preid?: string): string;

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

@@ -15,6 +15,14 @@ function isRelativeVersionKeyword(val) {
 function isValidSemverSpecifier(specifier) {
     return (specifier && !!((0, semver_1.valid)(specifier) || isRelativeVersionKeyword(specifier)));
 }
+/**
+ * TODO: We would be able to make the logging for the conventional commits use-case
+ * for fixed release groups more clear/precise if we passed through which project
+ * the conventional commits were detected for.
+ *
+ * It would then flow up through deriveSpecifierFromConventionalCommits back to
+ * ReleaseGroupProcessor.
+ */
 // https://github.com/unjs/changelogen/blob/main/src/semver.ts
 function determineSemverChange(commits, config) {
     let [hasMajor, hasMinor, hasPatch] = [false, false, false];