feat: bump yargs to 17 (#5165)

* feat: bump yargs to 17 * fix: prefer coerced reporter-option for options * Aha, fix: process.exit() instead of process.exitCode * fix: --list-interfaces one-and-done conflict
mochajs · Jan 2, 2025 · 8f1c8d8 · 8f1c8d8
1 parent 6caa902
commit 8f1c8d8
Show file tree

Hide file tree

Showing 6 changed files with 181 additions and 177 deletions.
diff --git a/lib/cli/cli.js b/lib/cli/cli.js
@@ -12,7 +12,7 @@
 
 const debug = require('debug')('mocha:cli:cli');
 const symbols = require('log-symbols');
-const yargs = require('yargs/yargs');
+const yargs = require('yargs');
 const path = require('path');
 const {
   loadRc,
@@ -63,15 +63,15 @@ exports.main = (argv = process.argv.slice(2), mochaArgs) => {
       debug('caught error sometime before command handler: %O', err);
       yargs.showHelp();
       console.error(`\n${symbols.error} ${ansi.red('ERROR:')} ${msg}`);
-      process.exitCode = 1;
+      process.exit(1);
     })
     .help('help', 'Show usage information & exit')
     .alias('help', 'h')
     .version('version', 'Show version number & exit', version)
     .alias('version', 'V')
     .wrap(process.stdout.columns ? Math.min(process.stdout.columns, 80) : 80)
     .epilog(
-      `Mocha Resources
+      `${ansi.reset("Mocha Resources")}
     Chat: ${ansi.magenta(discord)}
   GitHub: ${ansi.blue(repository.url)}
     Docs: ${ansi.yellow(homepage)}

diff --git a/lib/cli/run.js b/lib/cli/run.js
@@ -169,11 +169,11 @@ exports.builder = yargs =>
         group: GROUPS.RULES
       },
       'list-interfaces': {
-        conflicts: Array.from(ONE_AND_DONE_ARGS),
+        conflicts: Array.from(ONE_AND_DONE_ARGS).filter(arg => arg !== "list-interfaces"),
         description: 'List built-in user interfaces & exit'
       },
       'list-reporters': {
-        conflicts: Array.from(ONE_AND_DONE_ARGS),
+        conflicts: Array.from(ONE_AND_DONE_ARGS).filter(arg => arg !== "list-reporters"),
         description: 'List built-in reporters & exit'
       },
       'no-colors': {

diff --git a/lib/mocha.js b/lib/mocha.js
@@ -194,7 +194,9 @@ function Mocha(options = {}) {
     .ui(options.ui)
     .reporter(
       options.reporter,
-      options.reporterOption || options.reporterOptions // for backwards compatibility
+      options['reporter-option'] ||
+        options.reporterOption ||
+        options.reporterOptions // for backwards compatibility
     )
     .slow(options.slow)
     .global(options.global);