chore: update listr2 version

package.json

@@ -134,7 +134,7 @@
     "inquirer": "^8.0.0",
     "lerna": "^6.6.2",
     "lint-staged": "^12.1.7",
-    "listr2": "^5.0.3",
+    "listr2": "8.0.2",
     "minimist": "^1.2.6",
     "mocha": "^9.0.1",
     "mocha-junit-reporter": "^2.2.1",

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": "8.0.2",
     "semver": "^7.2.1"
   },
   "engines": {

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}`)

packages/api/cli/src/util/check-system.ts

@@ -117,7 +117,7 @@ export async function checkSystem(task: ForgeListrTask<never>) {
         concurrent: true,
         exitOnError: false,
         rendererOptions: {
-          collapse: true,
+          collapseSubtasks: true,
         },
       }
     );

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": "8.0.2",
     "lodash": "^4.17.20",
     "log-symbols": "^4.0.0",
     "node-fetch": "^2.6.7",

packages/api/core/src/api/import.ts

@@ -61,7 +61,7 @@ export default autoTrace(
     const listrOptions = {
       concurrent: false,
       rendererOptions: {
-        collapse: false,
+        collapseSubtasks: false,
         collapseErrors: false,
       },
       rendererSilent: !interactive,
@@ -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,
           },

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),
     }
   );
 

packages/api/core/src/api/make.ts

@@ -16,7 +16,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';
@@ -112,7 +112,7 @@ export const listrMake = (
   const listrOptions = {
     concurrent: false,
     rendererOptions: {
-      collapse: false,
+      collapseSubtasks: false,
       collapseErrors: false,
     },
     rendererSilent: !interactive,
@@ -206,7 +206,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 +230,7 @@ export const listrMake = (
             task.skip();
           }
         }),
-        options: {
+        rendererOptions: {
           persistentOutput: true,
         },
       },
@@ -258,7 +258,7 @@ export const listrMake = (
               ...listrOptions,
               concurrent: true,
               rendererOptions: {
-                collapse: false,
+                collapseSubtasks: false,
                 collapseErrors: false,
               },
             });
@@ -300,8 +300,8 @@ export const listrMake = (
                       }
                     }
                   }),
-                  options: {
-                    showTimer: true,
+                  rendererOptions: {
+                    timer: { ...PRESET_TIMER },
                   },
                 });
               }
@@ -321,7 +321,7 @@ export const listrMake = (
 
           task.output = `Artifacts available at: ${chalk.green(path.resolve(ctx.actualOutDir, 'make'))}`;
         }),
-        options: {
+        rendererOptions: {
           persistentOutput: true,
         },
       },

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),
       rendererOptions: {
-        collapse: false,
+        collapseSubtasks: false,
         collapseErrors: false,
       },
       ctx: {} as PackageContext,

packages/api/core/src/api/publish.ts

@@ -109,7 +109,7 @@ export default autoTrace(
 
             return delayTraceTillSignal(
               childTrace,
-              task.newListr<never>(
+              task.newListr<any>(
                 publishers.map((publisher) => ({
                   title: `${chalk.cyan(`[publisher-${publisher.name}]`)} Running the ${chalk.yellow('publish')} command`,
                   task: childTrace<Parameters<ForgeListrTaskFn>>(
@@ -126,13 +126,13 @@ export default autoTrace(
                       });
                     }
                   ),
-                  options: {
+                  rendererOptions: {
                     persistentOutput: true,
                   },
                 })),
                 {
                   rendererOptions: {
-                    collapse: false,
+                    collapseSubtasks: false,
                     collapseErrors: false,
                   },
                 }
@@ -141,7 +141,7 @@ export default autoTrace(
             );
           }
         ),
-        options: {
+        rendererOptions: {
           persistentOutput: true,
         },
       },
@@ -215,7 +215,7 @@ export default autoTrace(
               }
             }
           ),
-          options: {
+          rendererOptions: {
             persistentOutput: true,
           },
         },
@@ -267,7 +267,7 @@ export default autoTrace(
                                   makeResults: restoredMakeResults,
                                 },
                                 rendererOptions: {
-                                  collapse: false,
+                                  collapseSubtasks: false,
                                   collapseErrors: false,
                                 },
                               }),
@@ -279,7 +279,7 @@ export default autoTrace(
                     }),
                     {
                       rendererOptions: {
-                        collapse: false,
+                        collapseSubtasks: false,
                         collapseErrors: false,
                       },
                     }

packages/api/core/src/api/start.ts

@@ -5,7 +5,7 @@ import { ElectronProcess, ForgeArch, ForgeListrTaskFn, ForgePlatform, ResolvedFo
 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';
@@ -89,10 +89,10 @@ export default autoTrace(
               );
             }
           ),
-          options: {
+          rendererOptions: {
             persistentOutput: true,
             bottomBar: Infinity,
-            showTimer: true,
+            timer: { ...PRESET_TIMER },
           },
         },
         {

packages/api/core/src/util/plugin-interface.ts

@@ -108,7 +108,7 @@ export default class PluginInterface implements IForgePluginInterface {
                   }
                 }
               ),
-              options: {},
+              rendererOptions: {},
             });
           }
         }

packages/plugin/vite/src/VitePlugin.ts

@@ -4,6 +4,8 @@ import { namedHookWithTaskFn, PluginBase } from '@electron-forge/plugin-base';
 import chalk from 'chalk';
 import debug from 'debug';
 import fs from 'fs-extra';
+// eslint-disable-next-line node/no-extraneous-import
+import { PRESET_TIMER } from 'listr2';
 // eslint-disable-next-line node/no-unpublished-import
 import { default as vite } from 'vite';
 
@@ -138,9 +140,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 +151,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 +214,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;