diff --git a/package.json b/package.json index 0a4b32c72f..2c8a28ef2f 100644 --- a/package.json +++ b/package.json @@ -62,6 +62,7 @@ "got": "^11.8.5", "html-webpack-plugin": "^5.5.3", "interpret": "^3.1.1", + "listr2": "^7.0.2", "lodash": "^4.17.20", "log-symbols": "^4.0.0", "mime-types": "^2.1.25", @@ -134,7 +135,6 @@ "inquirer": "^8.0.0", "lerna": "^6.6.2", "lint-staged": "^12.1.7", - "listr2": "^5.0.3", "minimist": "^1.2.6", "mocha": "^9.0.1", "mocha-junit-reporter": "^2.2.1", diff --git a/packages/api/cli/package.json b/packages/api/cli/package.json index 4f5de30b32..b0d6f11dc0 100644 --- a/packages/api/cli/package.json +++ b/packages/api/cli/package.json @@ -24,7 +24,7 @@ "commander": "^4.1.1", "debug": "^4.3.1", "fs-extra": "^10.0.0", - "listr2": "^5.0.3", + "listr2": "^7.0.2", "semver": "^7.2.1" }, "engines": { diff --git a/packages/api/cli/src/electron-forge.ts b/packages/api/cli/src/electron-forge.ts index 1f7b6b031e..b8044fc889 100755 --- a/packages/api/cli/src/electron-forge.ts +++ b/packages/api/cli/src/electron-forge.ts @@ -65,7 +65,7 @@ program await runner.run(); - if (runner.err.length) { + if (runner.errors.length) { console.error( chalk.red(`\nIt looks like you are missing some dependencies you need to get Electron running. Make sure you have git installed and Node.js version ${metadata.engines.node}`) diff --git a/packages/api/cli/src/util/check-system.ts b/packages/api/cli/src/util/check-system.ts index 93db9ad767..8f2b49b92a 100644 --- a/packages/api/cli/src/util/check-system.ts +++ b/packages/api/cli/src/util/check-system.ts @@ -117,7 +117,7 @@ export async function checkSystem(task: ForgeListrTask) { concurrent: true, exitOnError: false, rendererOptions: { - collapse: true, + collapseSubtasks: true, }, } ); diff --git a/packages/api/core/package.json b/packages/api/core/package.json index 7de0749e4e..659d7e8cb9 100644 --- a/packages/api/core/package.json +++ b/packages/api/core/package.json @@ -63,7 +63,7 @@ "fs-extra": "^10.0.0", "got": "^11.8.5", "interpret": "^3.1.1", - "listr2": "^5.0.3", + "listr2": "^7.0.2", "lodash": "^4.17.20", "log-symbols": "^4.0.0", "node-fetch": "^2.6.7", diff --git a/packages/api/core/src/api/import.ts b/packages/api/core/src/api/import.ts index 031dbc1453..0759560e64 100644 --- a/packages/api/core/src/api/import.ts +++ b/packages/api/core/src/api/import.ts @@ -1,7 +1,7 @@ import path from 'path'; import { safeYarnOrNpm, updateElectronDependency } from '@electron-forge/core-utils'; -import { ForgeListrTaskFn } from '@electron-forge/shared-types'; +import { ForgeListrOptions, ForgeListrTaskFn } from '@electron-forge/shared-types'; import baseTemplate from '@electron-forge/template-base'; import { autoTrace } from '@electron-forge/tracer'; import chalk from 'chalk'; @@ -58,14 +58,14 @@ export default autoTrace( childTrace, { dir = process.cwd(), interactive = false, confirmImport, shouldContinueOnExisting, shouldRemoveDependency, shouldUpdateScript, outDir }: ImportOptions ): Promise => { - const listrOptions = { + const listrOptions: ForgeListrOptions = { concurrent: false, rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), }; const runner = new Listr( @@ -91,7 +91,7 @@ export default autoTrace( }, { title: 'Processing configuration and dependencies', - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, }, @@ -251,7 +251,7 @@ export default autoTrace( }, { title: 'Finalizing import', - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, }, diff --git a/packages/api/core/src/api/init.ts b/packages/api/core/src/api/init.ts index 03a7093db7..29c514215b 100644 --- a/packages/api/core/src/api/init.ts +++ b/packages/api/core/src/api/init.ts @@ -74,9 +74,7 @@ export default async ({ dir = process.cwd(), interactive = false, copyCIFiles = await initDirectory(dir, task, force); await initGit(dir); }, - options: { - persistentOutput: true, - }, + rendererOptions: { persistentOutput: true }, }, { title: 'Preparing template', @@ -153,8 +151,8 @@ export default async ({ dir = process.cwd(), interactive = false, copyCIFiles = ], { concurrent: false, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), } ); diff --git a/packages/api/core/src/api/make.ts b/packages/api/core/src/api/make.ts index e55fe2584c..58510dfee1 100644 --- a/packages/api/core/src/api/make.ts +++ b/packages/api/core/src/api/make.ts @@ -5,6 +5,7 @@ import { MakerBase } from '@electron-forge/maker-base'; import { ForgeArch, ForgeConfigMaker, + ForgeListrOptions, ForgeListrTaskFn, ForgeMakeResult, ForgePlatform, @@ -16,7 +17,7 @@ import { getHostArch } from '@electron/get'; import chalk from 'chalk'; import filenamify from 'filenamify'; import fs from 'fs-extra'; -import { Listr } from 'listr2'; +import { Listr, PRESET_TIMER } from 'listr2'; import logSymbols from 'log-symbols'; import getForgeConfig from '../util/forge-config'; @@ -109,14 +110,14 @@ export const listrMake = ( }: MakeOptions, receiveMakeResults?: (results: ForgeMakeResult[]) => void ) => { - const listrOptions = { + const listrOptions: ForgeListrOptions = { concurrent: false, rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), }; const runner = new Listr( @@ -206,7 +207,7 @@ export const listrMake = ( task.output = `Making for the following targets: ${chalk.magenta(`${makers.map((maker) => maker.name).join(', ')}`)}`; } ), - options: { + rendererOptions: { persistentOutput: true, }, }, @@ -230,7 +231,7 @@ export const listrMake = ( task.skip(); } }), - options: { + rendererOptions: { persistentOutput: true, }, }, @@ -258,7 +259,7 @@ export const listrMake = ( ...listrOptions, concurrent: true, rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, }); @@ -300,8 +301,8 @@ export const listrMake = ( } } }), - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, }); } @@ -321,7 +322,7 @@ export const listrMake = ( task.output = `Artifacts available at: ${chalk.green(path.resolve(ctx.actualOutDir, 'make'))}`; }), - options: { + rendererOptions: { persistentOutput: true, }, }, diff --git a/packages/api/core/src/api/package.ts b/packages/api/core/src/api/package.ts index c098095955..db916b079e 100644 --- a/packages/api/core/src/api/package.ts +++ b/packages/api/core/src/api/package.ts @@ -10,7 +10,7 @@ import chalk from 'chalk'; import debug from 'debug'; import glob from 'fast-glob'; import fs from 'fs-extra'; -import { Listr } from 'listr2'; +import { Listr, PRESET_TIMER } from 'listr2'; import getForgeConfig from '../util/forge-config'; import { getHookListrTasks, runHook } from '../util/hook'; @@ -399,8 +399,8 @@ export const listrPackage = ( task: async () => { await addSignalAndWait(signalPackageDone, target); }, - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, } : { @@ -431,10 +431,10 @@ export const listrPackage = ( signalRebuildStart.get(getTargetKey(target))?.pop()?.(task); await addSignalAndWait(signalRebuildDone, target); }), - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, - showTimer: true, + timer: { ...PRESET_TIMER }, }, }, { @@ -444,18 +444,18 @@ export const listrPackage = ( }), }, ], - { rendererOptions: { collapse: true, collapseErrors: false } } + { rendererOptions: { collapseSubtasks: true, collapseErrors: false } } ), 'run' ); } ), - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, } ), - { concurrent: true, rendererOptions: { collapse: false, collapseErrors: false } } + { concurrent: true, rendererOptions: { collapseSubtasks: false, collapseErrors: false } } ), 'run' ); @@ -486,10 +486,10 @@ export const listrPackage = ( ], { concurrent: false, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, ctx: {} as PackageContext, diff --git a/packages/api/core/src/api/publish.ts b/packages/api/core/src/api/publish.ts index 7ff458ae93..81a21e67d6 100644 --- a/packages/api/core/src/api/publish.ts +++ b/packages/api/core/src/api/publish.ts @@ -3,6 +3,7 @@ import path from 'path'; import { PublisherBase } from '@electron-forge/publisher-base'; import { ForgeConfigPublisher, + ForgeListrOptions, ForgeListrTask, ForgeListrTaskFn, ForgeMakeResult, @@ -86,13 +87,13 @@ export default autoTrace( throw new Error("Can't dry run and resume a dry run at the same time"); } - const listrOptions = { + const listrOptions: ForgeListrOptions = { concurrent: false, rendererOptions: { collapseErrors: false, }, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), }; const publishDistributablesTasks = (childTrace: typeof autoTrace) => [ @@ -126,13 +127,13 @@ export default autoTrace( }); } ), - options: { + rendererOptions: { persistentOutput: true, }, })), { rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, } @@ -141,7 +142,7 @@ export default autoTrace( ); } ), - options: { + rendererOptions: { persistentOutput: true, }, }, @@ -215,7 +216,7 @@ export default autoTrace( } } ), - options: { + rendererOptions: { persistentOutput: true, }, }, @@ -267,7 +268,7 @@ export default autoTrace( makeResults: restoredMakeResults, }, rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, }), @@ -279,7 +280,7 @@ export default autoTrace( }), { rendererOptions: { - collapse: false, + collapseSubtasks: false, collapseErrors: false, }, } diff --git a/packages/api/core/src/api/start.ts b/packages/api/core/src/api/start.ts index b2c36a35aa..3c30718fa9 100644 --- a/packages/api/core/src/api/start.ts +++ b/packages/api/core/src/api/start.ts @@ -1,11 +1,19 @@ import { spawn, SpawnOptions } from 'child_process'; import { getElectronVersion, listrCompatibleRebuildHook } from '@electron-forge/core-utils'; -import { ElectronProcess, ForgeArch, ForgeListrTaskFn, ForgePlatform, ResolvedForgeConfig, StartOptions } from '@electron-forge/shared-types'; +import { + ElectronProcess, + ForgeArch, + ForgeListrOptions, + ForgeListrTaskFn, + ForgePlatform, + ResolvedForgeConfig, + StartOptions, +} from '@electron-forge/shared-types'; import { autoTrace, delayTraceTillSignal } from '@electron-forge/tracer'; import chalk from 'chalk'; import debug from 'debug'; -import { Listr } from 'listr2'; +import { Listr, PRESET_TIMER } from 'listr2'; import locateElectronExecutable from '../util/electron-executable'; import getForgeConfig from '../util/forge-config'; @@ -41,13 +49,13 @@ export default autoTrace( ): Promise => { const platform = process.env.npm_config_platform || process.platform; const arch = process.env.npm_config_arch || process.arch; - const listrOptions = { + const listrOptions: ForgeListrOptions = { concurrent: false, rendererOptions: { collapseErrors: false, }, - rendererSilent: !interactive, - rendererFallback: Boolean(process.env.DEBUG), + silentRendererCondition: !interactive, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), }; const runner = new Listr( @@ -89,10 +97,10 @@ export default autoTrace( ); } ), - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, - showTimer: true, + timer: { ...PRESET_TIMER }, }, }, { @@ -128,7 +136,7 @@ export default autoTrace( inspectBrk, }); if (typeof spawnedPluginChild === 'object' && 'tasks' in spawnedPluginChild) { - const innerRunner = new Listr([], listrOptions); + const innerRunner = new Listr([], listrOptions as ForgeListrOptions); for (const task of spawnedPluginChild.tasks) { innerRunner.add(task); } diff --git a/packages/api/core/src/util/plugin-interface.ts b/packages/api/core/src/util/plugin-interface.ts index d6a77ceb8b..b5b442e679 100644 --- a/packages/api/core/src/util/plugin-interface.ts +++ b/packages/api/core/src/util/plugin-interface.ts @@ -108,7 +108,7 @@ export default class PluginInterface implements IForgePluginInterface { } } ), - options: {}, + rendererOptions: {}, }); } } diff --git a/packages/plugin/vite/package.json b/packages/plugin/vite/package.json index 77474a489f..447b6b77c1 100644 --- a/packages/plugin/vite/package.json +++ b/packages/plugin/vite/package.json @@ -21,7 +21,8 @@ "@electron-forge/web-multi-logger": "7.3.1", "chalk": "^4.0.0", "debug": "^4.3.1", - "fs-extra": "^10.0.0" + "fs-extra": "^10.0.0", + "listr2": "^7.0.2" }, "devDependencies": { "@electron/packager": "^18.3.1", diff --git a/packages/plugin/vite/src/VitePlugin.ts b/packages/plugin/vite/src/VitePlugin.ts index 6e71ca7c6c..1df51a905f 100644 --- a/packages/plugin/vite/src/VitePlugin.ts +++ b/packages/plugin/vite/src/VitePlugin.ts @@ -4,6 +4,7 @@ import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base'; import chalk from 'chalk'; import debug from 'debug'; import fs from 'fs-extra'; +import { PRESET_TIMER } from 'listr2'; // eslint-disable-next-line node/no-unpublished-import import { default as vite } from 'vite'; @@ -138,9 +139,9 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`); task: async () => { await this.launchRendererDevServers(); }, - options: { + rendererOptions: { persistentOutput: true, - showTimer: true, + timer: { ...PRESET_TIMER }, }, }, // The main process depends on the `server.port` of the renderer process, so the renderer process is run first. @@ -149,8 +150,8 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`); task: async () => { await this.build(); }, - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, }, ], @@ -212,7 +213,7 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`); this.servers.push(viteDevServer); if (viteDevServer.httpServer) { - // Make suee that `getDefines` in VitePlugin.ts gets the correct `server.port`. (#3198) + // Make sure that `getDefines` in VitePlugin.ts gets the correct `server.port`. (#3198) const addressInfo = viteDevServer.httpServer.address(); const isAddressInfo = (x: any): x is AddressInfo => x?.address; diff --git a/packages/plugin/webpack/package.json b/packages/plugin/webpack/package.json index 779fabc6c5..936f5e37eb 100644 --- a/packages/plugin/webpack/package.json +++ b/packages/plugin/webpack/package.json @@ -33,6 +33,7 @@ "fast-glob": "^3.2.7", "fs-extra": "^10.0.0", "html-webpack-plugin": "^5.5.3", + "listr2": "^7.0.2", "webpack": "^5.69.1", "webpack-dev-server": "^4.0.0", "webpack-merge": "^5.7.3" diff --git a/packages/plugin/webpack/src/WebpackPlugin.ts b/packages/plugin/webpack/src/WebpackPlugin.ts index d41b6021ab..602e462edf 100644 --- a/packages/plugin/webpack/src/WebpackPlugin.ts +++ b/packages/plugin/webpack/src/WebpackPlugin.ts @@ -11,6 +11,7 @@ import chalk from 'chalk'; import debug from 'debug'; import glob from 'fast-glob'; import fs from 'fs-extra'; +import { PRESET_TIMER } from 'listr2'; import webpack, { Configuration, Watching } from 'webpack'; import WebpackDevServer from 'webpack-dev-server'; import { merge } from 'webpack-merge'; @@ -239,7 +240,7 @@ export default class WebpackPlugin extends PluginBase { innerTask ); }, - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, showTimer: true, @@ -320,10 +321,10 @@ export default class WebpackPlugin extends PluginBase { innerTask ); }, - options: { + rendererOptions: { persistentOutput: true, bottomBar: Infinity, - showTimer: true, + timer: { ...PRESET_TIMER }, }, }, { @@ -340,8 +341,8 @@ export default class WebpackPlugin extends PluginBase { await fs.move(path.resolve(this.baseDir, child), path.resolve(targetDir, child)); } }, - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, }, ...multiArchTasks, @@ -579,8 +580,8 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`); task: async () => { await this.compileMain(true, logger); }, - options: { - showTimer: true, + rendererOptions: { + timer: { ...PRESET_TIMER }, }, }, { @@ -589,9 +590,9 @@ the generated files). Instead, it is ${JSON.stringify(pj.main)}`); await this.launchRendererDevServers(logger); task.output = `Output Available: ${chalk.cyan(`http://localhost:${this.loggerPort}`)}\n`; }, - options: { + rendererOptions: { persistentOutput: true, - showTimer: true, + timer: { ...PRESET_TIMER }, }, }, ], diff --git a/packages/template/vite/package.json b/packages/template/vite/package.json index caecffb388..538d500237 100644 --- a/packages/template/vite/package.json +++ b/packages/template/vite/package.json @@ -25,7 +25,7 @@ "devDependencies": { "@electron-forge/test-utils": "7.3.1", "chai": "^4.3.3", - "listr2": "^5.0.3" + "listr2": "^7.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/template/vite/test/ViteTemplate_spec.ts b/packages/template/vite/test/ViteTemplate_spec.ts index c76a5b067d..259fe61589 100644 --- a/packages/template/vite/test/ViteTemplate_spec.ts +++ b/packages/template/vite/test/ViteTemplate_spec.ts @@ -16,9 +16,13 @@ describe('ViteTemplate', () => { it('should succeed in initializing the vite template', async () => { const tasks = await template.initializeTemplate(dir, {}); - const runner = new Listr(tasks, { concurrent: false, exitOnError: false }); + const runner = new Listr(tasks, { + concurrent: false, + exitOnError: false, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), + }); await runner.run(); - expect(runner.err).to.have.lengthOf(0); + expect(runner.errors).to.have.lengthOf(0); }); context('template files are copied to project', () => { diff --git a/packages/template/webpack-typescript/package.json b/packages/template/webpack-typescript/package.json index fd63a4645f..65c92d05e5 100644 --- a/packages/template/webpack-typescript/package.json +++ b/packages/template/webpack-typescript/package.json @@ -29,7 +29,7 @@ "chai": "^4.3.3", "fast-glob": "^3.2.7", "fork-ts-checker-webpack-plugin": "^7.2.13", - "listr2": "^5.0.3" + "listr2": "^7.0.2" }, "files": [ "dist", diff --git a/packages/template/webpack/package.json b/packages/template/webpack/package.json index 0f31e794e7..d61672f6b8 100644 --- a/packages/template/webpack/package.json +++ b/packages/template/webpack/package.json @@ -21,7 +21,7 @@ "devDependencies": { "@electron-forge/test-utils": "7.3.1", "chai": "^4.3.3", - "listr2": "^5.0.3" + "listr2": "^7.0.2" }, "publishConfig": { "access": "public" diff --git a/packages/template/webpack/test/WebpackTemplate_spec.ts b/packages/template/webpack/test/WebpackTemplate_spec.ts index 256f02f18d..2f182b66f3 100644 --- a/packages/template/webpack/test/WebpackTemplate_spec.ts +++ b/packages/template/webpack/test/WebpackTemplate_spec.ts @@ -16,9 +16,13 @@ describe('WebpackTemplate', () => { it('should succeed in initializing the webpack template', async () => { const tasks = await template.initializeTemplate(dir, {}); - const runner = new Listr(tasks, { concurrent: false, exitOnError: false }); + const runner = new Listr(tasks, { + concurrent: false, + exitOnError: false, + fallbackRendererCondition: Boolean(process.env.DEBUG) || Boolean(process.env.CI), + }); await runner.run(); - expect(runner.err).to.have.lengthOf(0); + expect(runner.errors).to.have.lengthOf(0); }); context('template files are copied to project', () => { diff --git a/packages/utils/core-utils/src/rebuild.ts b/packages/utils/core-utils/src/rebuild.ts index 1a47ebff69..853063d1b8 100644 --- a/packages/utils/core-utils/src/rebuild.ts +++ b/packages/utils/core-utils/src/rebuild.ts @@ -59,7 +59,9 @@ export const listrCompatibleRebuildHook = async ( break; } case 'rebuild-done': { - task.task.rendererTaskOptions.persistentOutput = false; + if (task.task.rendererTaskOptions && 'persistentOutput' in task.task.rendererTaskOptions) { + task.task.rendererTaskOptions.persistentOutput = false; + } break; } } diff --git a/packages/utils/types/package.json b/packages/utils/types/package.json index 8fd8553edf..06acfab2b5 100644 --- a/packages/utils/types/package.json +++ b/packages/utils/types/package.json @@ -11,7 +11,7 @@ "@electron-forge/tracer": "7.3.1", "@electron/packager": "^18.3.1", "@electron/rebuild": "^3.2.10", - "listr2": "^5.0.3" + "listr2": "^7.0.2" }, "engines": { "node": ">= 16.4.0" diff --git a/packages/utils/types/src/index.ts b/packages/utils/types/src/index.ts index 6592a39d29..d87772a3bb 100644 --- a/packages/utils/types/src/index.ts +++ b/packages/utils/types/src/index.ts @@ -3,9 +3,18 @@ import { ChildProcess } from 'child_process'; import { autoTrace } from '@electron-forge/tracer'; import { ArchOption, Options as ElectronPackagerOptions, TargetPlatform } from '@electron/packager'; import { RebuildOptions } from '@electron/rebuild'; -import { ListrDefaultRenderer, ListrTask, ListrTaskWrapper } from 'listr2'; - -export type ForgeListrTask = ListrTaskWrapper; +import { + ListrBaseClassOptions, + ListrDefaultRenderer, + ListrDefaultRendererValue, + ListrSimpleRenderer, + ListrSimpleRendererValue, + ListrTask, + ListrTaskWrapper, +} from 'listr2'; + +export type ForgeListrOptions = ListrBaseClassOptions; +export type ForgeListrTask = ListrTaskWrapper; export type ForgeListrTaskFn = ListrTask['task']; export type ElectronProcess = ChildProcess & { restarted: boolean }; diff --git a/yarn.lock b/yarn.lock index d5f4a41dea..41fd5beacb 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3723,6 +3723,13 @@ ansi-escapes@^4.2.1, ansi-escapes@^4.3.0: dependencies: type-fest "^0.21.3" +ansi-escapes@^5.0.0: + version "5.0.0" + resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-5.0.0.tgz#b6a0caf0eef0c41af190e9a749e0c00ec04bb2a6" + integrity sha512-5GFMVX8HqE/TB+FuBJGuO5XG0WrsA6ptUqoODaT/n9mmUaZFkqnBueB4leqGBCmrUHnCnC4PCZTCd0E7QQ83bA== + dependencies: + type-fest "^1.0.2" + ansi-html-community@^0.0.8: version "0.0.8" resolved "https://registry.yarnpkg.com/ansi-html-community/-/ansi-html-community-0.0.8.tgz#69fbc4d6ccbe383f9736934ae34c3f8290f1bf41" @@ -4529,6 +4536,13 @@ cli-cursor@^2.1.0: dependencies: restore-cursor "^2.0.0" +cli-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/cli-cursor/-/cli-cursor-4.0.0.tgz#3cecfe3734bf4fe02a8361cbdc0f6fe28c6a57ea" + integrity sha512-VGtlMu3x/4DOtIUwEkRezxUZ2lBacNJCHash0N0WeZDBS+7Ux1dm3XWAgWYxLJFMMdOeXMHXorshEFhbMSGelg== + dependencies: + restore-cursor "^4.0.0" + cli-progress@^3.9.0: version "3.11.2" resolved "https://registry.yarnpkg.com/cli-progress/-/cli-progress-3.11.2.tgz#f8c89bd157e74f3f2c43bcfb3505670b4d48fc77" @@ -4661,7 +4675,7 @@ color-support@^1.1.2, color-support@^1.1.3: resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== -colorette@^2.0.10, colorette@^2.0.19: +colorette@^2.0.10: version "2.0.19" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.19.tgz#cdf044f47ad41a0f4b56b3a0d5b4e6e1a2d5a798" integrity sha512-3tlv/dIP7FWvj3BsbHrGLJ6l/oKh1O3TcgBqMn+yyCagOxc23fyzDS6HypQbgxWbkpDnf52p1LuR4eWDQ/K9WQ== @@ -4671,6 +4685,11 @@ colorette@^2.0.16: resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.16.tgz#713b9af84fdb000139f04546bd4a93f62a5085da" integrity sha512-hUewv7oMjCp+wkBv5Rm0v87eJhq4woh5rSR+42YSQJKecCqgIqNkZ6lAlQms/BwHPJA5NKMRlpxPRv0n8HQW6g== +colorette@^2.0.20: + version "2.0.20" + resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" + integrity sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w== + colors@1.0.x: version "1.0.3" resolved "https://registry.yarnpkg.com/colors/-/colors-1.0.3.tgz#0433f44d809680fdeb60ed260f1b0c262e82a40b" @@ -6342,6 +6361,11 @@ eventemitter3@^4.0.0, eventemitter3@^4.0.4: resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f" integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw== +eventemitter3@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-5.0.1.tgz#53f5ffd0a492ac800721bb42c66b841de96423c4" + integrity sha512-GWkBvjiSZK87ELrYOSESUYeVIc9mvLLf/nXalMOS5dYrgZq9o5OVkbZAVM06CVxYsCwH9BDZFPlQTlPA1j4ahA== + events@3.3.0, events@^3.2.0, events@^3.3.0: version "3.3.0" resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400" @@ -8729,19 +8753,17 @@ listr2@^4.0.5: through "^2.3.8" wrap-ansi "^7.0.0" -listr2@^5.0.3: - version "5.0.5" - resolved "https://registry.yarnpkg.com/listr2/-/listr2-5.0.5.tgz#4651a940d12b984abecfae4450e40edd5695f808" - integrity sha512-DpBel6fczu7oQKTXMekeprc0o3XDgGMkD7JNYyX+X0xbwK+xgrx9dcyKoXKqpLSUvAWfmoePS7kavniOcq3r4w== +listr2@^7.0.2: + version "7.0.2" + resolved "https://registry.yarnpkg.com/listr2/-/listr2-7.0.2.tgz#3aa3e1549dfaf3c57ab5eeaba754da3b87f33063" + integrity sha512-rJysbR9GKIalhTbVL2tYbF2hVyDnrf7pFUZBwjPaMIdadYHmeT+EVi/Bu3qd7ETQPahTotg2WRCatXwRBW554g== dependencies: - cli-truncate "^2.1.0" - colorette "^2.0.19" - log-update "^4.0.0" - p-map "^4.0.0" + cli-truncate "^3.1.0" + colorette "^2.0.20" + eventemitter3 "^5.0.1" + log-update "^5.0.1" rfdc "^1.3.0" - rxjs "^7.5.6" - through "^2.3.8" - wrap-ansi "^7.0.0" + wrap-ansi "^8.1.0" load-json-file@6.2.0: version "6.2.0" @@ -8897,6 +8919,17 @@ log-update@^4.0.0: slice-ansi "^4.0.0" wrap-ansi "^6.2.0" +log-update@^5.0.1: + version "5.0.1" + resolved "https://registry.yarnpkg.com/log-update/-/log-update-5.0.1.tgz#9e928bf70cb183c1f0c9e91d9e6b7115d597ce09" + integrity sha512-5UtUDQ/6edw4ofyljDNcOVJQ4c7OjDro4h3y8e1GQL5iYElYclVHJ3zeWchylvMaKnDbDilC8irOVyexnA/Slw== + dependencies: + ansi-escapes "^5.0.0" + cli-cursor "^4.0.0" + slice-ansi "^5.0.0" + strip-ansi "^7.0.1" + wrap-ansi "^8.0.1" + loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" @@ -11492,6 +11525,14 @@ restore-cursor@^3.1.0: onetime "^5.1.0" signal-exit "^3.0.2" +restore-cursor@^4.0.0: + version "4.0.0" + resolved "https://registry.yarnpkg.com/restore-cursor/-/restore-cursor-4.0.0.tgz#519560a4318975096def6e609d44100edaa4ccb9" + integrity sha512-I9fPXU9geO9bHOt9pHHOhOkYerIMsmVaWB0rA2AI9ERh/+x/i7MV5HKBNrg+ljO5eoPVgCcnFuRjJ9uH6I/3eg== + dependencies: + onetime "^5.1.0" + signal-exit "^3.0.2" + retry-request@^7.0.0: version "7.0.1" resolved "https://registry.yarnpkg.com/retry-request/-/retry-request-7.0.1.tgz#b0163aeb934bd3fa2de76902d683b09b8ce364ba" @@ -11606,7 +11647,7 @@ rxjs@^6.4.0, rxjs@^6.5.1: dependencies: tslib "^1.9.0" -rxjs@^7.5.5, rxjs@^7.5.6: +rxjs@^7.5.5: version "7.5.7" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.5.7.tgz#2ec0d57fdc89ece220d2e702730ae8f1e49def39" integrity sha512-z9MzKh/UcOqB3i20H6rtrlaE/CgjLOvheWK/9ILrbhROGTweAi1BaFsTT9FbwZi5Trr1qNRs+MXkhmR06awzQA== @@ -12752,6 +12793,11 @@ type-fest@^0.8.1: resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.8.1.tgz#09e249ebde851d3b1e48d27c105444667f17b83d" integrity sha512-4dbzIzqvjtgiM5rw1k5rEHtBANKmdudhGyBEajN01fEyhaAIhsoKNy6y7+IN93IfpFtwY9iqi7kD+xwKhQsNJA== +type-fest@^1.0.2: + version "1.4.0" + resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-1.4.0.tgz#e9fb813fe3bf1744ec359d55d1affefa76f14be1" + integrity sha512-yGSza74xk0UG8k+pLh5oeoYirvIiWo5t0/o3zHHAO2tRDiZcxWP7fywNlXhqb6/r6sWvwi+RsyQMWhVLe4BVuA== + type-is@~1.6.18: version "1.6.18" resolved "https://registry.yarnpkg.com/type-is/-/type-is-1.6.18.tgz#4e552cd05df09467dcbc4ef739de89f2cf37c131" @@ -13361,7 +13407,7 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^8.1.0: +wrap-ansi@^8.0.1, wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" integrity sha512-si7QWI6zUMq56bESFvagtmzMdGOtoxfR+Sez11Mobfc7tm+VkUckk9bW2UeffTGVUbOksxmSw0AA2gs8g71NCQ==