nx 23.2.0-beta.6 → 23.2.0-beta.8

package/dist/src/command-line/migrate/safe-prompt.js

@@ -1,10 +1,12 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.canPrompt = canPrompt;
-exports.migratePrompt = migratePrompt;
-const enquirer_1 = require("enquirer");
+exports.migrateConfirm = migrateConfirm;
+exports.migrateChoice = migrateChoice;
+const exit_codes_1 = require("../../utils/exit-codes");
 const is_ci_1 = require("../../utils/is-ci");
 const output_1 = require("../../utils/output");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 /**
  * Whether `nx migrate` may show interactive prompts: requires a TTY on stdin,
  * not running in CI, and the user not having passed `--no-interactive`.
@@ -13,46 +15,33 @@ function canPrompt(interactive) {
     return !!process.stdin.isTTY && !(0, is_ci_1.isCI)() && interactive !== false;
 }
 /**
- * Drop-in replacement for enquirer's `prompt()` that hardens cancel
- * handling for every interactive prompt under `nx migrate`.
- *
- * Why: enquirer's built-in cancel path (`Prompt.cancel` → `close` →
- * `keypress.js` `off` → `readline.pause`) races on `Interface.pause()`
- * when triggered more than once in quick succession (mashed Ctrl+C),
- * throwing `ERR_USE_AFTER_CLOSE` from an unhandled async chain that
- * `await prompt(...)` cannot catch.
- *
- * In raw mode, Ctrl+C does NOT generate a SIGINT signal (the kernel's
- * `ISIG` flag is cleared while enquirer's keypress listener is active);
- * instead the 0x03 byte flows through `combos.js` and dispatches the
- * `cancel` action. So a `process.on('SIGINT', ...)` handler is the wrong
- * mechanism here — it never fires.
- *
- * The right hook is enquirer's per-prompt `options.cancel` override. When
- * present, `Prompt.keypress` (lib/prompt.js:42) calls our handler INSTEAD
- * of `this.cancel`, so enquirer's broken cleanup never runs. Both Ctrl+C
- * (byte 0x03) and Esc map to the `cancel` action, so this single override
- * covers both paths.
- *
- * The handler emits a single-line notice via `output.warn` and exits with
- * POSIX status 130 (128 + SIGINT). Synchronous exit is correct here: the
- * user explicitly asked to abort, there's no recovery state to preserve.
+ * Aborts the run the way `nx migrate` wants a cancel to look: one notice, then
+ * POSIX 130 (128 + SIGINT). The user asked to stop, so there is no state worth
+ * preserving.
  */
-async function migratePrompt(questions) {
-    const cancel = () => {
-        // `\n\r` → next line at column 0 (enquirer left the TTY in raw mode,
-        //   so a bare LF would not carry an implicit CR).
-        // `\x1B[J` → clear from cursor to end of screen. Wipes enquirer's
-        //   leftover choice / input rendering below the row where we'll
-        //   write our message so the exit output isn't shadowed by orphaned
-        //   prompt fragments.
-        process.stdout.write('\n\r\x1B[J');
-        output_1.output.warn({ title: 'nx migrate interrupted by user.' });
-        process.exit(130);
-    };
-    const withCancel = (q) => ({ ...q, cancel });
-    const injected = Array.isArray(questions)
-        ? questions.map(withCancel)
-        : withCancel(questions);
-    return (await (0, enquirer_1.prompt)(injected));
+function cancelMigrate() {
+    process.stdout.write('\n');
+    output_1.output.warn({ title: 'nx migrate interrupted by user.' });
+    (0, exit_codes_1.exitAsInterrupted)();
+}
+/**
+ * Yes/no question for `nx migrate`, aborting the run if the user cancels.
+ */
+async function migrateConfirm(options) {
+    return (0, prompt_helpers_1.confirmationPrompt)({
+        message: options.message,
+        initial: options.initial,
+        onCancel: cancelMigrate,
+    });
+}
+/**
+ * Single-choice question for `nx migrate`, aborting the run if the user cancels.
+ */
+async function migrateChoice(options) {
+    return (0, prompt_helpers_1.selectPrompt)({
+        message: options.message,
+        choices: options.choices,
+        initial: options.initial,
+        onCancel: cancelMigrate,
+    });
 }

package/dist/src/command-line/migrate/step-actions.d.ts

@@ -0,0 +1,5 @@
+/** Allowed values for `--step-action`, the orchestrated reconcile's decision relay. */
+export declare const STEP_ACTIONS: readonly ['retry', 'skip', 'retry-clean', 'adopt'];
+export type StepAction = (typeof STEP_ACTIONS)[number];
+/** Runtime guard backed by {@link STEP_ACTIONS} so the two can't drift apart. */
+export declare function isStepAction(value: unknown): value is StepAction;

package/dist/src/command-line/migrate/step-actions.js

@@ -0,0 +1,12 @@
+"use strict";
+// Zero-dep source of truth for --step-action: keeps migrate/run's execution
+// chain out of CLI startup for callers that only need the value list or type.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.STEP_ACTIONS = void 0;
+exports.isStepAction = isStepAction;
+/** Allowed values for `--step-action`, the orchestrated reconcile's decision relay. */
+exports.STEP_ACTIONS = ['retry', 'skip', 'retry-clean', 'adopt'];
+/** Runtime guard backed by {@link STEP_ACTIONS} so the two can't drift apart. */
+function isStepAction(value) {
+    return exports.STEP_ACTIONS.includes(value);
+}

package/dist/src/command-line/migrate/text.d.ts

@@ -0,0 +1,18 @@
+/**
+ * Collapses every character a reader could take for a line break, so a value
+ * cannot break out of the line it is rendered on. The driving agent scans the
+ * same stdout for `<nx_migrate_*>` blocks, which are framed by a bare newline,
+ * so a value carrying its own break could open a forged one at a line start.
+ *
+ * The set is the line terminators and nothing else. U+0085, U+2028 and U+2029
+ * are in it because "line start" is the reader's notion, not this process's: a
+ * JavaScript `^` under `/m` treats the latter two as terminators, and Nx does
+ * not know what parses its output. Quoting is not a substitute either, since
+ * `JSON.stringify` leaves all three literal.
+ *
+ * Deliberately not every control character. Some of this text is already
+ * colored when it arrives, and stripping ESC would leave the rest of the
+ * escape sequence behind as visible noise without closing anything: only a
+ * real terminator can put a value at the start of a line.
+ */
+export declare function singleLine(value: string): string;

package/dist/src/command-line/migrate/text.js

@@ -0,0 +1,26 @@
+"use strict";
+// Dependency-free on purpose. Every module that renders text an AI agent will
+// read needs this, run/run-state.ts included, and that one cannot reach
+// run/util.ts without a cycle through run/state-lock.ts.
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.singleLine = singleLine;
+/**
+ * Collapses every character a reader could take for a line break, so a value
+ * cannot break out of the line it is rendered on. The driving agent scans the
+ * same stdout for `<nx_migrate_*>` blocks, which are framed by a bare newline,
+ * so a value carrying its own break could open a forged one at a line start.
+ *
+ * The set is the line terminators and nothing else. U+0085, U+2028 and U+2029
+ * are in it because "line start" is the reader's notion, not this process's: a
+ * JavaScript `^` under `/m` treats the latter two as terminators, and Nx does
+ * not know what parses its output. Quoting is not a substitute either, since
+ * `JSON.stringify` leaves all three literal.
+ *
+ * Deliberately not every control character. Some of this text is already
+ * colored when it arrives, and stripping ESC would leave the rest of the
+ * escape sequence behind as visible noise without closing anything: only a
+ * real terminator can put a value at the start of a line.
+ */
+function singleLine(value) {
+    return value.replace(/[\r\n\u000b\u000c\u0085\u2028\u2029]+/g, ' ');
+}

package/dist/src/command-line/migrate/version-skew-guard.d.ts

@@ -1,10 +1,12 @@
 export declare const NEW_MIGRATE_FLAGS_FLOOR = "23.2.0";
-export declare const NEW_MIGRATE_FLAGS: readonly ['--run-migration', '--runMigration'];
+export declare const NEW_MIGRATE_FLAGS: readonly ['--run-migration', '--runMigration', '--run-id', '--runId', '--step-action', '--stepAction'];
+export declare function findNewMigrateFlag(argv: string[]): string | undefined;
 /**
- * Matches an exact token or `<flag>=<value>`. The `=` matters: a bare
- * `startsWith` would also match `--run-migrations` (trailing s).
+ * Whether the invocation names an existing orchestrated run. Such an
+ * invocation has to execute against the workspace-local nx that owns the run's
+ * state under `.nx/migrate-runs`, so it never routes to a temp installation.
  */
-export declare function findNewMigrateFlag(argv: string[]): string | undefined;
+export declare function targetsExistingRun(argv: string[]): boolean;
 /**
  * Guard A (local side, before hop A). The current nx knows the new flags, but
  * the temp CLI 'nx migrate' is about to install may be older and would

package/dist/src/command-line/migrate/version-skew-guard.js

@@ -2,36 +2,45 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NEW_MIGRATE_FLAGS = exports.NEW_MIGRATE_FLAGS_FLOOR = void 0;
 exports.findNewMigrateFlag = findNewMigrateFlag;
+exports.targetsExistingRun = targetsExistingRun;
 exports.resolveNewMigrateFlagsRunTarget = resolveNewMigrateFlagsRunTarget;
 exports.assertWorkspaceNxSupportsNewMigrateFlags = assertWorkspaceNxSupportsNewMigrateFlags;
 const semver_1 = require("semver");
 const logger_1 = require("../../utils/logger");
 const output_1 = require("../../utils/output");
 const version_utils_1 = require("./version-utils");
-// The first stable release shipping --run-migration. Deliberately the final
-// release rather than its first prerelease: 23.2.0 prereleases published
-// before the feature landed do not carry it, so a prerelease floor would
-// wrongly accept them. The cost is that a later 23.2.0 prerelease that does
-// carry the feature is refused too, which fails toward refusal. Permanent;
-// never bumped at release time, but it must name the release that actually
-// ships the feature: if that slips past 23.2.0, versions in the gap pass
-// this floor and route to a temp CLI that drops the new flags and runs the
-// plan phase instead.
+// The first stable release shipping --run-migration/--run-id. Deliberately
+// the final release rather than its first prerelease: 23.2.0 prereleases
+// published before the feature landed do not carry it, so a prerelease floor
+// would wrongly accept them. The cost is that a later 23.2.0 prerelease that
+// does carry the feature is refused too, which fails toward refusal.
+// Permanent; never bumped at release time, but it must name the release that
+// actually ships the feature: if that slips past 23.2.0, versions in the gap
+// pass this floor and route to a temp CLI that drops the new flags and runs
+// the plan phase instead.
 exports.NEW_MIGRATE_FLAGS_FLOOR = '23.2.0';
-// yargs accepts both spellings and the raw argv is forwarded across both
-// migrate hops, so detection must catch each one.
-exports.NEW_MIGRATE_FLAGS = ['--run-migration', '--runMigration'];
+// yargs accepts both spellings of each flag and the raw argv is forwarded
+// across both migrate hops, so detection must catch every one.
+exports.NEW_MIGRATE_FLAGS = [
+    '--run-migration',
+    '--runMigration',
+    '--run-id',
+    '--runId',
+    '--step-action',
+    '--stepAction',
+];
+const RUN_ID_FLAGS = ['--run-id', '--runId'];
 /**
  * Matches an exact token or `<flag>=<value>`. The `=` matters: a bare
  * `startsWith` would also match `--run-migrations` (trailing s).
  */
-function findNewMigrateFlag(argv) {
+function findFlag(argv, flags) {
     for (const arg of argv) {
         // Everything after the -- separator is positional data, not options.
         if (arg === '--') {
             return undefined;
         }
-        for (const flag of exports.NEW_MIGRATE_FLAGS) {
+        for (const flag of flags) {
             if (arg === flag || arg.startsWith(`${flag}=`)) {
                 return flag;
             }
@@ -39,6 +48,17 @@ function findNewMigrateFlag(argv) {
     }
     return undefined;
 }
+function findNewMigrateFlag(argv) {
+    return findFlag(argv, exports.NEW_MIGRATE_FLAGS);
+}
+/**
+ * Whether the invocation names an existing orchestrated run. Such an
+ * invocation has to execute against the workspace-local nx that owns the run's
+ * state under `.nx/migrate-runs`, so it never routes to a temp installation.
+ */
+function targetsExistingRun(argv) {
+    return findFlag(argv, RUN_ID_FLAGS) !== undefined;
+}
 /**
  * Guard A (local side, before hop A). The current nx knows the new flags, but
  * the temp CLI 'nx migrate' is about to install may be older and would

package/dist/src/command-line/nx-cloud/connect/connect-to-nx-cloud.js

@@ -8,7 +8,7 @@ exports.connectExistingRepoToNxCloudPrompt = connectExistingRepoToNxCloudPrompt;
 exports.connectToNxCloudWithPrompt = connectToNxCloudWithPrompt;
 const tslib_1 = require("tslib");
 const path_1 = require("path");
-const handle_import_1 = require("../../../utils/handle-import");
+const prompt_helpers_1 = require("../../../utils/prompt-helpers");
 const output_1 = require("../../../utils/output");
 const configuration_1 = require("../../../config/configuration");
 const tree_1 = require("../../../generators/tree");
@@ -248,23 +248,19 @@ function utmContentForCommand(command) {
 }
 async function nxCloudPrompt(key, utmContent) {
     const { message, choices, initial, footer, hint } = ab_testing_1.messages.getPrompt(key);
-    const promptConfig = {
-        name: 'NxCloud',
-        message,
-        type: 'autocomplete',
-        choices,
-        initial,
-    }; // meeroslav: types in enquirer are not up to date
-    if (footer) {
-        promptConfig.footer = () => pc.dim(`${footer} ${(0, ab_testing_1.nxCloudHyperlink)(utmContent)}`);
-    }
-    if (hint) {
-        promptConfig.hint = () => pc.dim(hint);
-    }
-    const enquirer = await (0, handle_import_1.handleImport)('enquirer');
-    return await enquirer
-        .prompt([promptConfig])
-        .then((a) => {
-        return a.NxCloud;
-    });
+    // No separate footer/hint slot, so both are folded into the message.
+    const suffix = [hint, footer && `${footer} ${(0, ab_testing_1.nxCloudHyperlink)(utmContent)}`]
+        .filter(Boolean)
+        .map((t) => pc.dim(t));
+    return (await (0, prompt_helpers_1.selectPrompt)({
+        message: [message, ...suffix].join('\n'),
+        // These choices are `{ value, name }` where `name` is the display text,
+        // the inverse of enquirer's usual `{ name, message }`. Prefer `value` so
+        // the answer is the key the caller compares against, not the label.
+        choices: choices.map((c) => typeof c === 'string'
+            ? { value: c, label: c }
+            : { value: c.value ?? c.name, label: c.message ?? c.name ?? c.value }),
+        initial: choices[initial ?? 0]?.value ??
+            choices[initial ?? 0]?.name,
+    }));
 }

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

@@ -5,7 +5,7 @@ exports.isChangelogEffectivelyEnabled = isChangelogEffectivelyEnabled;
 exports.createAPI = createAPI;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const node_fs_1 = require("node:fs");
 const semver_1 = require("semver");
 const tmp_1 = require("tmp");
@@ -843,22 +843,11 @@ async function filterProjectCommits({ fromSHA, toSHA, projectPath, }) {
     return allCommits.filter((c) => c.affectedFiles.find((f) => f.startsWith(projectPath)));
 }
 async function promptForRemoteRelease() {
-    try {
-        const result = await (0, enquirer_1.prompt)([
-            {
-                name: 'confirmation',
-                message: `Do you want to create a ${remoteReleaseProviderName ?? 'remote'} release anyway?`,
-                type: 'confirm',
-            },
-        ]);
-        return result.confirmation;
-    }
-    catch {
-        // Ensure the cursor is always restored
-        process.stdout.write('\u001b[?25h');
-        // Handle the case where the user exits the prompt with ctrl+c
-        return false;
-    }
+    return (0, prompt_helpers_1.confirmationPrompt)({
+        message: `Do you want to create a ${remoteReleaseProviderName ?? 'remote'} release anyway?`,
+        // Cancelling declines the release rather than failing the run.
+        onCancel: () => false,
+    });
 }
 async function resolveWorkspaceChangelogChanges({ releaseGraph, nxReleaseConfig, args, workspacePreid, projectsPreid, useAutomaticFromRef, toSHA, fromSHA, }) {
     // NOTE: If there are multiple release groups, we'll just skip the workspace changelog anyway.

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releasePlanCLIHandler = void 0;
 exports.createAPI = createAPI;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = require("node:path");
@@ -199,25 +199,16 @@ async function createVersionPlanFileForBumps(args, versionPlanBumps) {
     }
 }
 async function promptForVersion(message) {
-    try {
-        const reply = await (0, enquirer_1.prompt)([
-            {
-                name: 'version',
-                message,
-                type: 'select',
-                choices: [...semver_1.RELEASE_TYPES, 'none'],
-            },
-        ]);
-        return reply.version;
-    }
-    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);
-    }
+    return (0, prompt_helpers_1.selectPrompt)({
+        message,
+        choices: [...semver_1.RELEASE_TYPES, 'none'],
+        onCancel: () => {
+            output_1.output.log({
+                title: 'Cancelled version plan creation.',
+            });
+            process.exit(0);
+        },
+    });
 }
 async function promptForMessage(versionPlanName) {
     let message;
@@ -228,14 +219,10 @@ async function promptForMessage(versionPlanName) {
 }
 async function _promptForMessage(versionPlanName) {
     try {
-        const reply = await (0, enquirer_1.prompt)([
-            {
-                name: 'message',
-                message: 'What changelog message would you like associated with this change? (Leave blank to open an external editor for multi-line messages/easier editing)',
-                type: 'input',
-            },
-        ]);
-        let message = reply.message.trim();
+        const reply = await (0, prompt_helpers_1.textPrompt)({
+            message: 'What changelog message would you like associated with this change? (Leave blank to open an external editor for multi-line messages/easier editing)',
+        });
+        let message = reply.trim();
         if (!message.length) {
             const tmpDir = (0, tmp_1.dirSync)().name;
             const messageFilePath = (0, node_path_1.join)(tmpDir, `DRAFT_MESSAGE__${versionPlanName}.md`);

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.releaseCLIHandler = void 0;
 exports.createAPI = createAPI;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../utils/prompt-helpers");
 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");
@@ -285,22 +285,11 @@ function createAPI(overrideReleaseConfig, ignoreNxJsonConfig) {
     };
 }
 async function promptForPublish() {
-    try {
-        const reply = await (0, enquirer_1.prompt)([
-            {
-                name: 'confirmation',
-                message: 'Do you want to publish these versions?',
-                type: 'confirm',
-            },
-        ]);
-        return reply.confirmation;
-    }
-    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;
-    }
+    return (0, prompt_helpers_1.confirmationPrompt)({
+        message: 'Do you want to publish these versions?',
+        // Cancelling is a decision not to publish, not a failure.
+        onCancel: () => false,
+    });
 }
 function shouldCreateRemoteRelease(changelogConfig) {
     if (changelogConfig === false) {

package/dist/src/command-line/release/utils/remote-release-clients/github.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GithubRemoteReleaseClient = exports.defaultCreateReleaseProvider = void 0;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const node_os_1 = require("node:os");
@@ -104,6 +104,12 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
         await Promise.all([...authors.keys()].map(async (authorName) => {
             const meta = authors.get(authorName);
             for (const email of meta.email) {
+                // An empty email makes the URL `/users/find/`, so ungh attributes
+                // the commit to the "find" user rather than the real author.
+                // Non-emails just 404, but skip those too to avoid a wasted lookup.
+                if (!email || !email.includes('@')) {
+                    continue;
+                }
                 if (email.endsWith('@users.noreply.github.com')) {
                     const match = email.match(/^(\d+\+)?([^@]+)@users\.noreply\.github\.com$/);
                     if (match && match[2]) {
@@ -250,29 +256,17 @@ class GithubRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
     }
     async promptForContinueInGitHub() {
         try {
-            const reply = await (0, enquirer_1.prompt)([
-                {
-                    name: 'open',
-                    message: 'Do you want to finish creating the release manually in your browser?',
-                    type: 'autocomplete',
-                    choices: [
-                        {
-                            name: 'Yes',
-                            hint: 'It will pre-populate the form for you',
-                        },
-                        {
-                            name: 'No',
-                        },
-                    ],
-                    initial: 0,
-                },
-            ]);
-            return reply.open === 'Yes';
+            const open = await (0, prompt_helpers_1.selectPrompt)({
+                message: 'Do you want to finish creating the release manually in your browser?',
+                choices: [
+                    { value: 'Yes', hint: 'It will pre-populate the form for you' },
+                    { value: 'No' },
+                ],
+                onCancel: () => process.exit(1),
+            });
+            return open === 'Yes';
         }
         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/dist/src/command-line/release/utils/remote-release-clients/gitlab.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.GitLabRemoteReleaseClient = exports.defaultCreateReleaseProvider = void 0;
 const tslib_1 = require("tslib");
 const pc = tslib_1.__importStar(require("picocolors"));
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../../../utils/prompt-helpers");
 const node_child_process_1 = require("node:child_process");
 const output_1 = require("../../../../utils/output");
 const extract_repo_slug_1 = require("./extract-repo-slug");
@@ -172,29 +172,20 @@ class GitLabRemoteReleaseClient extends remote_release_client_1.RemoteReleaseCli
     }
     async promptForContinueInGitLab() {
         try {
-            const reply = await (0, enquirer_1.prompt)([
-                {
-                    name: 'open',
-                    message: 'Do you want to create the release manually in your browser?',
-                    type: 'autocomplete',
-                    choices: [
-                        {
-                            name: 'Yes',
-                            hint: 'It will open the GitLab release page for you',
-                        },
-                        {
-                            name: 'No',
-                        },
-                    ],
-                    initial: 0,
-                },
-            ]);
-            return reply.open === 'Yes';
+            const open = await (0, prompt_helpers_1.selectPrompt)({
+                message: 'Do you want to create the release manually in your browser?',
+                choices: [
+                    {
+                        value: 'Yes',
+                        hint: 'It will open the GitLab release page for you',
+                    },
+                    { value: 'No' },
+                ],
+                onCancel: () => process.exit(1),
+            });
+            return open === 'Yes';
         }
         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/dist/src/command-line/release/utils/resolve-semver-specifier.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.resolveSemverSpecifierFromConventionalCommits = resolveSemverSpecifierFromConventionalCommits;
 exports.resolveSemverSpecifierFromPrompt = resolveSemverSpecifierFromPrompt;
-const enquirer_1 = require("enquirer");
+const prompt_helpers_1 = require("../../../utils/prompt-helpers");
 const semver_1 = require("semver");
 const git_1 = require("./git");
 const semver_2 = require("./semver");
@@ -19,45 +19,23 @@ releaseGroupProjects = projectNames) {
     return (0, semver_2.determineSemverChange)(relevantCommits, releaseConfig.conventionalCommits);
 }
 async function resolveSemverSpecifierFromPrompt(selectionMessage, customVersionMessage) {
-    try {
-        const reply = await (0, enquirer_1.prompt)([
-            {
-                name: 'specifier',
-                message: selectionMessage,
-                type: 'select',
-                choices: [
-                    ...semver_1.RELEASE_TYPES.map((t) => ({ name: t, message: t })),
-                    {
-                        name: 'custom',
-                        message: 'Custom exact version',
-                    },
-                ],
-            },
-        ]);
-        if (reply.specifier !== 'custom') {
-            return reply.specifier;
-        }
-        else {
-            const reply = await (0, enquirer_1.prompt)([
-                {
-                    name: 'specifier',
-                    message: customVersionMessage,
-                    type: 'input',
-                    validate: (input) => {
-                        if ((0, semver_1.valid)(input)) {
-                            return true;
-                        }
-                        return 'Please enter a valid semver version';
-                    },
-                },
-            ]);
-            return reply.specifier;
-        }
-    }
-    catch {
-        // 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);
+    // Cancelling exits rather than returning, so yargs never prints its help for
+    // what the user meant as an abort.
+    const abort = () => process.exit(1);
+    const specifier = await (0, prompt_helpers_1.selectPrompt)({
+        message: selectionMessage,
+        choices: [
+            ...semver_1.RELEASE_TYPES,
+            { value: 'custom', label: 'Custom exact version' },
+        ],
+        onCancel: abort,
+    });
+    if (specifier !== 'custom') {
+        return specifier;
     }
+    return (0, prompt_helpers_1.textPrompt)({
+        message: customVersionMessage,
+        validate: (input) => (0, semver_1.valid)(input) ? undefined : 'Please enter a valid semver version',
+        onCancel: abort,
+    });
 }