mocha 11.2.0 → 11.2.2

package/lib/cli/cli.js

@@ -20,7 +20,7 @@ const {
 } = require('./options');
 const lookupFiles = require('./lookup-files');
 const commands = require('./commands');
-const ansi = require('ansi-colors');
+const pc = require('picocolors');
 const {repository, homepage, version, discord} = require('../../package.json');
 const {cwd} = require('../utils');
 
@@ -60,7 +60,7 @@ exports.main = (argv = process.argv.slice(2), mochaArgs) => {
     .fail((msg, err, yargs) => {
       debug('caught error sometime before command handler: %O', err);
       yargs.showHelp();
-      console.error(`\n${symbols.error} ${ansi.red('ERROR:')} ${msg}`);
+      console.error(`\n${symbols.error} ${pc.red('ERROR:')} ${msg}`);
       process.exit(1);
     })
     .help('help', 'Show usage information & exit')
@@ -69,10 +69,10 @@ exports.main = (argv = process.argv.slice(2), mochaArgs) => {
     .alias('version', 'V')
     .wrap(process.stdout.columns ? Math.min(process.stdout.columns, 80) : 80)
     .epilog(
-      `${ansi.reset("Mocha Resources")}
-    Chat: ${ansi.magenta(discord)}
-  GitHub: ${ansi.blue(repository.url)}
-    Docs: ${ansi.yellow(homepage)}
+      `${pc.reset("Mocha Resources")}
+    Chat: ${pc.magenta(discord)}
+  GitHub: ${pc.blue(repository.url)}
+    Docs: ${pc.yellow(homepage)}
       `
     )
     .parserConfiguration(YARGS_PARSER_CONFIG)

package/lib/cli/collect-files.js

@@ -2,7 +2,7 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const ansi = require('ansi-colors');
+const pc = require('picocolors');
 const debug = require('debug')('mocha:cli:run:helpers');
 const minimatch = require('minimatch');
 const {NO_FILES_MATCH_PATTERN} = require('../errors').constants;
@@ -94,12 +94,12 @@ module.exports = ({
             unmatchedSpecFiles[0].pattern
           )}` // stringify to print escaped characters raw
         : 'Error: No test files found';
-    console.error(ansi.red(noneFoundMsg));
+    console.error(pc.red(noneFoundMsg));
     process.exit(1);
   } else {
     // print messages as a warning
     unmatchedSpecFiles.forEach(warning => {
-      console.warn(ansi.yellow(`Warning: ${warning.message}`));
+      console.warn(pc.yellow(`Warning: ${warning.message}`));
     });
   }
 

package/lib/cli/options.js

@@ -8,7 +8,7 @@
  */
 
 const fs = require('node:fs');
-const ansi = require('ansi-colors');
+const pc = require('picocolors');
 const yargsParser = require('yargs-parser');
 const {
   types,
@@ -180,7 +180,7 @@ const parse = (args = [], defaultValues = {}, ...configObjects) => {
     boolean: types.boolean.concat(nodeArgs.map(pair => pair[0]))
   });
   if (result.error) {
-    console.error(ansi.red(`Error: ${result.error.message}`));
+    console.error(pc.red(`Error: ${result.error.message}`));
     process.exit(1);
   }
 

package/lib/cli/run-helpers.js

@@ -9,7 +9,7 @@
 
 const fs = require('node:fs');
 const path = require('node:path');
-const ansi = require('ansi-colors');
+const pc = require('picocolors');
 const debug = require('debug')('mocha:cli:run:helpers');
 const {watchRun, watchParallelRun} = require('./watch-run');
 const collectFiles = require('./collect-files');
@@ -121,7 +121,7 @@ const handleUnmatchedFiles = (mocha, unmatchedFiles) => {
 
   unmatchedFiles.forEach(({pattern, absolutePath}) => {
     console.error(
-      ansi.yellow(
+      pc.yellow(
         `Warning: Cannot find any files matching pattern "${pattern}" at the absolute path "${absolutePath}"`
       )
     );

package/lib/cli/run.js

@@ -8,7 +8,7 @@
  */
 
 const symbols = require('log-symbols');
-const ansi = require('ansi-colors');
+const pc = require('picocolors');
 const Mocha = require('../mocha');
 const {
   createUnsupportedError,
@@ -357,7 +357,7 @@ exports.builder = yargs =>
         Object.assign(argv, plugins);
       } catch (err) {
         // this could be a bad --require, bad reporter, ui, etc.
-        console.error(`\n${symbols.error} ${ansi.red('ERROR:')}`, err);
+        console.error(`\n${symbols.error} ${pc.red('ERROR:')}`, err);
         yargs.exit(1);
       }
     })

package/lib/cli/watch-run.js

@@ -6,6 +6,7 @@ const path = require('node:path');
 const chokidar = require('chokidar');
 const Context = require('../context');
 const collectFiles = require('./collect-files');
+const glob = require('glob');
 
 /**
  * Exports the `watchRun` function that runs mocha in "watch" mode.
@@ -136,6 +137,42 @@ exports.watchRun = (mocha, {watchFiles, watchIgnore}, fileCollectParams) => {
   });
 };
 
+class GlobFilesTracker {
+  constructor(watchFiles, watchIgnore) {
+    this.watchFilesSet = new Set();
+    this.watchFiles = watchFiles;
+    this.watchIgnore = watchIgnore;
+  }
+
+  regenerate() {
+    const watchIgnoreSet = new Set();
+    for (const pattern of this.watchIgnore) {
+      glob.sync(pattern, { dot: true }).forEach(filePath => watchIgnoreSet.add(filePath));
+    }
+
+    const globOpts = {
+      dot: true,
+      ignore: {
+        childrenIgnored: pathToCheck => watchIgnoreSet.has(pathToCheck.relative())
+      }
+    };
+
+    this.watchFilesSet.clear();
+    for (const pattern of this.watchFiles) {
+      glob.sync(pattern, globOpts).forEach(pathToCheck => {
+        if (watchIgnoreSet.has(pathToCheck)) {
+          return;
+        }
+        this.watchFilesSet.add(pathToCheck);
+      });
+    }
+  }
+
+  has(filePath) {
+    return this.watchFilesSet.has(filePath)
+  }
+}
+
 /**
  * Bootstraps a chokidar watcher. Handles keyboard input & signals
  * @param {Mocha} mocha - Mocha instance
@@ -167,8 +204,10 @@ const createWatcher = (
   // we handle global fixtures manually
   mocha.enableGlobalSetup(false).enableGlobalTeardown(false);
 
-  const watcher = chokidar.watch(watchFiles, {
-    ignored: watchIgnore,
+  const tracker = new GlobFilesTracker(watchFiles, watchIgnore);
+  tracker.regenerate();
+
+  const watcher = chokidar.watch('.', {
     ignoreInitial: true
   });
 
@@ -184,8 +223,13 @@ const createWatcher = (
     rerunner.run();
   });
 
-  watcher.on('all', () => {
-    rerunner.scheduleRun();
+  watcher.on('all', (event, filePath) => {
+    if (event === 'add') {
+      tracker.regenerate();
+    }
+    if (tracker.has(filePath)) {
+      rerunner.scheduleRun();
+    }
   });
 
   hideCursor();

package/mocha.js

@@ -1,4 +1,4 @@
-// mocha@11.2.0 in javascript ES2018
+// mocha@11.2.2 in javascript ES2018
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -19256,7 +19256,7 @@
   };
 
   var name = "mocha";
-  var version = "11.2.0";
+  var version = "11.2.2";
   var homepage = "https://mochajs.org/";
   var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
   var require$$17 = {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mocha",
-  "version": "11.2.0",
+  "version": "11.2.2",
   "type": "commonjs",
   "description": "simple, flexible, fun test framework",
   "keywords": [
@@ -94,9 +94,8 @@
     "version": "run-p version:* && git add -A ./AUTHORS ./CHANGELOG.md"
   },
   "dependencies": {
-    "ansi-colors": "^4.1.3",
     "browser-stdout": "^1.3.1",
-    "chokidar": "^3.5.3",
+    "chokidar": "^4.0.1",
     "debug": "^4.3.5",
     "diff": "^5.2.0",
     "escape-string-regexp": "^4.0.0",
@@ -107,6 +106,7 @@
     "log-symbols": "^4.1.0",
     "minimatch": "^5.1.6",
     "ms": "^2.1.3",
+    "picocolors": "^1.1.1",
     "serialize-javascript": "^6.0.2",
     "strip-json-comments": "^3.1.1",
     "supports-color": "^8.1.1",