From 18fa16f7eea910044efa8107611ce0d631cfb295 Mon Sep 17 00:00:00 2001 From: Kamil Piechaczek Date: Thu, 3 Oct 2024 12:21:14 +0200 Subject: [PATCH] Fixed a listr2 integration after bumping it to the latest version. --- package.json | 2 ++ scripts/release/preparepackages.mjs | 10 ++++++---- scripts/release/publishpackages.mjs | 5 ++++- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index d7e659bd48e..4103b7b511b 100644 --- a/package.json +++ b/package.json @@ -119,6 +119,8 @@ "@ckeditor/ckeditor5-slash-command": "43.2.0", "@ckeditor/ckeditor5-template": "43.2.0", "@ckeditor/ckeditor5-track-changes": "43.2.0", + "@inquirer/prompts": "^6.0.0", + "@listr2/prompt-adapter-inquirer": "^2.0.16", "@ocular-d/vale-bin": "^2.29.1", "@webspellchecker/wproofreader-ckeditor5": "^3.0.0", "@wiris/mathtype-ckeditor5": "^8.10.0", diff --git a/scripts/release/preparepackages.mjs b/scripts/release/preparepackages.mjs index 85a6a3ab851..761105caf3b 100644 --- a/scripts/release/preparepackages.mjs +++ b/scripts/release/preparepackages.mjs @@ -13,6 +13,8 @@ import { EventEmitter } from 'events'; import * as releaseTools from '@ckeditor/ckeditor5-dev-release-tools'; import { tools } from '@ckeditor/ckeditor5-dev-utils'; import { Listr } from 'listr2'; +import { ListrInquirerPromptAdapter } from '@listr2/prompt-adapter-inquirer'; +import { confirm } from '@inquirer/prompts'; import updateVersionReferences from './utils/updateversionreferences.mjs'; import buildPackageUsingRollupCallback from './utils/buildpackageusingrollupcallback.mjs'; import buildTsAndDllForCKEditor5Root from './utils/buildtsanddllforckeditor5root.mjs'; @@ -97,10 +99,10 @@ const tasks = new Listr( [ return fs.emptyDir( RELEASE_DIRECTORY ); } - const shouldContinue = await task.prompt( { - type: 'Confirm', - message: 'The release directory must be empty. Continue and remove all files?' - } ); + const shouldContinue = await task.prompt( ListrInquirerPromptAdapter ) + .run( confirm, { + message: 'The release directory must be empty. Continue and remove all files?' + } ); if ( !shouldContinue ) { return Promise.reject( 'Aborting as requested.' ); diff --git a/scripts/release/publishpackages.mjs b/scripts/release/publishpackages.mjs index 20db8e5d191..bb65c83b5c6 100644 --- a/scripts/release/publishpackages.mjs +++ b/scripts/release/publishpackages.mjs @@ -11,6 +11,8 @@ import upath from 'upath'; import fs from 'fs-extra'; import * as releaseTools from '@ckeditor/ckeditor5-dev-release-tools'; import { Listr } from 'listr2'; +import { ListrInquirerPromptAdapter } from '@listr2/prompt-adapter-inquirer'; +import { confirm } from '@inquirer/prompts'; import validateDependenciesVersions from './utils/validatedependenciesversions.mjs'; import parseArguments from './utils/parsearguments.mjs'; import { CKEDITOR5_ROOT_PATH } from '../constants.mjs'; @@ -47,7 +49,8 @@ const tasks = new Listr( [ return true; } - return task.prompt( { type: 'Confirm', message: 'Do you want to continue?' } ); + return task.prompt( ListrInquirerPromptAdapter ) + .run( confirm, { message: 'Do you want to continue?' } ); }, optionalEntries: { // The `#default` key is used for all packages that do not have own definition.