@pnpm/patching.commands 1100.0.22 → 1100.1.0

package/lib/getPatchedDependency.js

@@ -1,10 +1,10 @@
 import path from 'node:path';
+import { confirm, select } from '@inquirer/prompts';
 import { PnpmError } from '@pnpm/error';
 import { isGitHostedPkgUrl } from '@pnpm/fetching.pick-fetcher';
 import { readCurrentLockfile } from '@pnpm/lockfile.fs';
 import { nameVerFromPkgSnapshot } from '@pnpm/lockfile.utils';
 import { parseWantedDependency } from '@pnpm/resolving.parse-wanted-dependency';
-import enquirer from 'enquirer';
 import { realpathMissing } from 'realpath-missing';
 import semver from 'semver';
 export async function getPatchedDependency(rawDependency, opts) {
@@ -15,25 +15,28 @@ export async function getPatchedDependency(rawDependency, opts) {
     }
     dep.alias = dep.alias ?? rawDependency;
     if (preferredVersions.length > 1) {
-        const { version, applyToAll } = await enquirer.prompt([{
-                type: 'select',
-                name: 'version',
+        let version;
+        let applyToAll;
+        try {
+            version = await select({
                 message: 'Choose which version to patch',
                 choices: preferredVersions.map(preferred => ({
                     name: preferred.version,
-                    message: preferred.version,
                     value: preferred.gitTarballUrl ?? preferred.version,
-                    hint: preferred.gitTarballUrl ? 'Git Hosted' : undefined,
+                    description: preferred.gitTarballUrl ? 'Git Hosted' : undefined,
                 })),
-                result(selected) {
-                    const selectedVersion = preferredVersions.find(preferred => preferred.version === selected);
-                    return selectedVersion.gitTarballUrl ?? selected;
-                },
-            }, {
-                type: 'confirm',
-                name: 'applyToAll',
+                theme: { keybindings: ['vim'] },
+            });
+            applyToAll = await confirm({
                 message: 'Apply this patch to all versions?',
-            }]);
+            });
+        }
+        catch (err) {
+            if (err instanceof Error && err.name === 'ExitPromptError') {
+                throw new PnpmError('PATCH_CANCELED', 'Canceled');
+            }
+            throw err;
+        }
         return {
             ...dep,
             applyToAll,

package/lib/patchRemove.js

@@ -1,10 +1,10 @@
 import fs from 'node:fs/promises';
 import path from 'node:path';
+import { checkbox } from '@inquirer/prompts';
 import { docsUrl } from '@pnpm/cli.utils';
 import { types as allTypes } from '@pnpm/config.reader';
 import { PnpmError } from '@pnpm/error';
 import { install } from '@pnpm/installing.commands';
-import enquirer from 'enquirer';
 import { pick } from 'ramda';
 import { renderHelp } from 'render-help';
 import { updatePatchedDependencies } from './updatePatchedDependencies.js';
@@ -29,15 +29,23 @@ export async function handler(opts, params) {
     if (!params.length) {
         const allPatches = Object.keys(patchedDependencies);
         if (allPatches.length) {
-            ({ patches: patchesToRemove } = await enquirer.prompt({
-                type: 'multiselect',
-                name: 'patches',
-                message: 'Select the patch to be removed',
-                choices: allPatches,
-                validate(value) {
-                    return value.length === 0 ? 'Select at least one option.' : true;
-                },
-            }));
+            try {
+                patchesToRemove = await checkbox({
+                    choices: allPatches.map((name) => ({ name, value: name })),
+                    message: 'Select the patch to be removed',
+                    required: true,
+                    validate: (values) => {
+                        return values.length === 0 ? 'Select at least one option.' : true;
+                    },
+                    theme: { keybindings: ['vim'] },
+                });
+            }
+            catch (err) {
+                if (err instanceof Error && err.name === 'ExitPromptError') {
+                    throw new PnpmError('PATCH_REMOVE_CANCELED', 'Canceled');
+                }
+                throw err;
+            }
         }
     }
     if (!patchesToRemove.length) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnpm/patching.commands",
-  "version": "1100.0.22",
+  "version": "1100.1.0",
   "description": "Commands for creating patches",
   "keywords": [
     "pnpm",
@@ -25,8 +25,8 @@
     "!*.map"
   ],
   "dependencies": {
-    "chalk": "^5.6.0",
-    "enquirer": "^2.4.1",
+    "@inquirer/prompts": "^8.4.3",
+    "chalk": "^5.6.2",
     "escape-string-regexp": "^5.0.0",
     "is-windows": "^1.0.2",
     "make-empty-dir": "^4.0.0",
@@ -35,36 +35,35 @@
     "realpath-missing": "^2.0.0",
     "render-help": "^2.0.0",
     "safe-execa": "^0.3.0",
-    "semver": "^7.7.2",
+    "semver": "^7.8.1",
     "terminal-link": "^5.0.0",
-    "tinyglobby": "^0.2.14",
-    "@pnpm/cli.utils": "1101.0.7",
-    "@pnpm/config.reader": "1101.4.0",
-    "@pnpm/config.writer": "1100.0.9",
+    "tinyglobby": "^0.2.16",
+    "@pnpm/cli.utils": "1101.0.8",
+    "@pnpm/config.reader": "1101.5.0",
+    "@pnpm/config.writer": "1100.0.10",
     "@pnpm/constants": "1100.0.0",
     "@pnpm/crypto.hash": "1100.0.1",
     "@pnpm/error": "1100.0.0",
-    "@pnpm/fetching.pick-fetcher": "1100.0.8",
+    "@pnpm/fetching.pick-fetcher": "1100.0.9",
     "@pnpm/fs.packlist": "1100.0.1",
-    "@pnpm/installing.commands": "1100.5.0",
-    "@pnpm/installing.modules-yaml": "1100.0.5",
-    "@pnpm/lockfile.fs": "1100.1.1",
-    "@pnpm/lockfile.utils": "1100.0.9",
-    "@pnpm/pkg-manifest.reader": "1100.0.4",
-    "@pnpm/patching.apply-patch": "1100.0.0",
+    "@pnpm/installing.commands": "1100.7.0",
+    "@pnpm/lockfile.fs": "1100.1.2",
+    "@pnpm/installing.modules-yaml": "1100.0.6",
+    "@pnpm/patching.apply-patch": "1100.0.1",
+    "@pnpm/lockfile.utils": "1100.0.10",
+    "@pnpm/pkg-manifest.reader": "1100.0.5",
     "@pnpm/resolving.parse-wanted-dependency": "1100.0.1",
-    "@pnpm/store.connection-manager": "1100.2.3",
     "@pnpm/store.path": "1100.0.1",
-    "@pnpm/types": "1101.1.1",
-    "@pnpm/workspace.project-manifest-reader": "1100.0.8",
-    "@pnpm/workspace.workspace-manifest-reader": "1100.0.4"
+    "@pnpm/store.connection-manager": "1100.2.5",
+    "@pnpm/types": "1101.2.0",
+    "@pnpm/workspace.project-manifest-reader": "1100.0.9",
+    "@pnpm/workspace.workspace-manifest-reader": "1100.0.5"
   },
   "peerDependencies": {
-    "@pnpm/logger": ">=1001.0.0 <1002.0.0"
+    "@pnpm/logger": "^1001.0.1"
   },
   "devDependencies": {
     "@jest/globals": "30.3.0",
-    "@pnpm/registry-mock": "6.0.0",
     "@types/is-windows": "^1.0.2",
     "@types/normalize-path": "^3.0.2",
     "@types/ramda": "0.31.1",
@@ -72,11 +71,12 @@
     "tempy": "3.0.0",
     "write-yaml-file": "^6.0.0",
     "@pnpm/logger": "1100.0.0",
-    "@pnpm/patching.commands": "1100.0.22",
-    "@pnpm/prepare": "1100.0.10",
+    "@pnpm/patching.commands": "1100.1.0",
+    "@pnpm/prepare": "1100.0.12",
     "@pnpm/test-fixtures": "1100.0.0",
-    "@pnpm/testing.command-defaults": "1100.0.1",
-    "@pnpm/workspace.projects-filter": "1100.0.15"
+    "@pnpm/testing.command-defaults": "1100.0.2",
+    "@pnpm/testing.registry-mock": "1100.0.2",
+    "@pnpm/workspace.projects-filter": "1100.0.17"
   },
   "engines": {
     "node": ">=22.13"