From 4feae8baa043e7f3886e2715956e0926195ed3c5 Mon Sep 17 00:00:00 2001 From: "Kamat, Trivikram" <16024985+trivikr@users.noreply.github.com> Date: Fri, 28 Aug 2026 14:18:24 -0700 Subject: [PATCH] chore(v8): replace Enquirer prompt adapter with Inquirer --- lib/update-v8/backport.js | 7 ++-- package-lock.json | 71 +++++++-------------------------------- package.json | 2 +- 3 files changed, 16 insertions(+), 64 deletions(-) diff --git a/lib/update-v8/backport.js b/lib/update-v8/backport.js index e0ac5607..7dba93b7 100644 --- a/lib/update-v8/backport.js +++ b/lib/update-v8/backport.js @@ -3,8 +3,8 @@ import { promises as fs } from 'node:fs'; -import { confirm } from '@inquirer/prompts'; -import { ListrEnquirerPromptAdapter } from '@listr2/prompt-adapter-enquirer'; +import { confirm, input } from '@inquirer/prompts'; +import { ListrInquirerPromptAdapter } from '@listr2/prompt-adapter-inquirer'; import { shortSha } from '../utils.js'; @@ -263,8 +263,7 @@ async function applyPatch(ctx, task, patch, method = 'apply') { ); } catch { patch.hadConflicts = true; - return task.prompt(ListrEnquirerPromptAdapter).run({ - type: 'input', + return task.prompt(ListrInquirerPromptAdapter).run(input, { message: "Resolve merge conflicts and enter 'RESOLVED'", validate: value => value.toUpperCase() === 'RESOLVED' }); diff --git a/package-lock.json b/package-lock.json index 50373b6a..69a2af09 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "7.2.0", "bundleDependencies": [ "@inquirer/prompts", - "@listr2/prompt-adapter-enquirer", + "@listr2/prompt-adapter-inquirer", "@node-core/caritat", "@pkgjs/nv", "branch-diff", @@ -31,7 +31,7 @@ "license": "MIT", "dependencies": { "@inquirer/prompts": "^7.4.1", - "@listr2/prompt-adapter-enquirer": "^2.0.12", + "@listr2/prompt-adapter-inquirer": "^3.0.5", "@node-core/caritat": "^1.6.0", "@pkgjs/nv": "^0.3.0", "branch-diff": "^3.1.1", @@ -790,17 +790,21 @@ "@jridgewell/sourcemap-codec": "^1.4.14" } }, - "node_modules/@listr2/prompt-adapter-enquirer": { - "version": "2.0.16", - "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-enquirer/-/prompt-adapter-enquirer-2.0.16.tgz", - "integrity": "sha512-CNhdBXWi+HWJCyjYwOSgEmK0rrUnwZrG9h0bKUrwxSqpz5A6unMTxvN254k+3TbDZRtzu+21mcb4KNT/6vxIzg==", + "node_modules/@listr2/prompt-adapter-inquirer": { + "version": "3.0.5", + "resolved": "https://registry.npmjs.org/@listr2/prompt-adapter-inquirer/-/prompt-adapter-inquirer-3.0.5.tgz", + "integrity": "sha512-WELs+hj6xcilkloBXYf9XXK8tYEnKsgLj01Xl5ONUJpKjmT5hGVUzNUS5tooUxs7pGMrw+jFD/41WpqW4V3LDA==", "inBundle": true, "license": "MIT", + "dependencies": { + "@inquirer/type": "^3.0.8" + }, "engines": { - "node": ">=18.0.0" + "node": ">=20.0.0" }, "peerDependencies": { - "enquirer": ">= 2.3.0 < 3" + "@inquirer/prompts": ">= 3 < 8", + "listr2": "9.0.5" } }, "node_modules/@node-core/caritat": { @@ -1625,17 +1629,6 @@ "url": "https://github.com/sponsors/epoberezkin" } }, - "node_modules/ansi-colors": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/ansi-colors/-/ansi-colors-4.1.3.tgz", - "integrity": "sha512-/6w/C21Pm1A7aZitlI5Ni/2J6FFQN8i1Cvz3kHABAAbw93v/NlvKdVOqz7CCWz/3iv/JplRSEEZ83XION15ovw==", - "inBundle": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=6" - } - }, "node_modules/ansi-regex": { "version": "6.1.0", "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-6.1.0.tgz", @@ -2922,46 +2915,6 @@ "node": ">=10.13.0" } }, - "node_modules/enquirer": { - "version": "2.4.1", - "resolved": "https://registry.npmjs.org/enquirer/-/enquirer-2.4.1.tgz", - "integrity": "sha512-rRqJg/6gd538VHvR3PSrdRBb/1Vy2YfzHqzvbhGIQpDRKIa4FgV/54b5Q1xYSxOOwKvjXweS26E0Q+nAMwp2pQ==", - "inBundle": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-colors": "^4.1.1", - "strip-ansi": "^6.0.1" - }, - "engines": { - "node": ">=8.6" - } - }, - "node_modules/enquirer/node_modules/ansi-regex": { - "version": "5.0.1", - "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz", - "integrity": "sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==", - "inBundle": true, - "license": "MIT", - "peer": true, - "engines": { - "node": ">=8" - } - }, - "node_modules/enquirer/node_modules/strip-ansi": { - "version": "6.0.1", - "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz", - "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==", - "inBundle": true, - "license": "MIT", - "peer": true, - "dependencies": { - "ansi-regex": "^5.0.1" - }, - "engines": { - "node": ">=8" - } - }, "node_modules/entities": { "version": "4.5.0", "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz", diff --git a/package.json b/package.json index 1f6695ac..83e94788 100644 --- a/package.json +++ b/package.json @@ -35,7 +35,7 @@ "bundleDependencies": true, "dependencies": { "@inquirer/prompts": "^7.4.1", - "@listr2/prompt-adapter-enquirer": "^2.0.12", + "@listr2/prompt-adapter-inquirer": "^3.0.5", "@node-core/caritat": "^1.6.0", "@pkgjs/nv": "^0.3.0", "branch-diff": "^3.1.1",