mocha 9.2.1 → 9.2.2

package/lib/cli/run-helpers.js

@@ -225,18 +225,18 @@ exports.validateLegacyPlugin = (opts, pluginType, map = {}) => {
 
   // if this exists, then it's already loaded, so nothing more to do.
   if (!map[pluginId]) {
+    let foundId;
     try {
-      map[pluginId] = require(pluginId);
+      foundId = require.resolve(pluginId);
+      map[pluginId] = require(foundId);
     } catch (err) {
-      if (err.code === 'MODULE_NOT_FOUND') {
-        // Try to load reporters from a path (absolute or relative)
-        try {
-          map[pluginId] = require(path.resolve(pluginId));
-        } catch (err) {
-          throw createUnknownError(err);
-        }
-      } else {
-        throw createUnknownError(err);
+      if (foundId) throw createUnknownError(err);
+
+      // Try to load reporters from a cwd-relative path
+      try {
+        map[pluginId] = require(path.resolve(pluginId));
+      } catch (e) {
+        throw createUnknownError(e);
       }
     }
   }

package/lib/mocha.js

@@ -16,7 +16,6 @@ var Suite = require('./suite');
 var esmUtils = require('./nodejs/esm-utils');
 var createStatsCollector = require('./stats-collector');
 const {
-  warn,
   createInvalidReporterError,
   createInvalidInterfaceError,
   createMochaInstanceAlreadyDisposedError,
@@ -335,35 +334,26 @@ Mocha.prototype.reporter = function (reporterName, reporterOptions) {
     }
     // Try to load reporters from process.cwd() and node_modules
     if (!reporter) {
+      let foundReporter;
       try {
-        reporter = require(reporterName);
+        foundReporter = require.resolve(reporterName);
+        reporter = require(foundReporter);
       } catch (err) {
-        if (err.code === 'MODULE_NOT_FOUND') {
-          // Try to load reporters from a path (absolute or relative)
-          try {
-            reporter = require(path.resolve(utils.cwd(), reporterName));
-          } catch (_err) {
-            _err.code === 'MODULE_NOT_FOUND'
-              ? warn(`'${reporterName}' reporter not found`)
-              : warn(
-                  `'${reporterName}' reporter blew up with error:\n ${err.stack}`
-                );
-          }
-        } else {
-          warn(`'${reporterName}' reporter blew up with error:\n ${err.stack}`);
+        if (foundReporter) {
+          throw createInvalidReporterError(err.message, foundReporter);
+        }
+        // Try to load reporters from a cwd-relative path
+        try {
+          reporter = require(path.resolve(reporterName));
+        } catch (e) {
+          throw createInvalidReporterError(e.message, reporterName);
         }
       }
     }
-    if (!reporter) {
-      throw createInvalidReporterError(
-        `invalid reporter '${reporterName}'`,
-        reporterName
-      );
-    }
     this._reporter = reporter;
   }
   this.options.reporterOption = reporterOptions;
-  // alias option name is used in public reporters xunit/tap/progress
+  // alias option name is used in built-in reporters xunit/tap/progress
   this.options.reporterOptions = reporterOptions;
   return this;
 };

package/lib/runner.js

@@ -655,7 +655,7 @@ Runner.prototype.parents = function () {
  * @private
  */
 Runner.prototype.runTest = function (fn) {
-  if (this._opts.dryRun) return fn();
+  if (this._opts.dryRun) return Runner.immediately(fn);
 
   var self = this;
   var test = this.test;

package/mocha-es2018.js

@@ -1,4 +1,4 @@
-// mocha@9.2.1 in javascript ES2018
+// mocha@9.2.2 in javascript ES2018
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? module.exports = factory() :
   typeof define === 'function' && define.amd ? define(factory) :
@@ -9427,8 +9427,8 @@
 
   let urlAlphabet =
     'useandom-26T198340PX75pxJACKVERYMINDBUSHWOLF_GQZbfghjklqvwyzrict';
-  let customAlphabet = (alphabet, size) => {
-    return () => {
+  let customAlphabet = (alphabet, defaultSize = 21) => {
+    return (size = defaultSize) => {
       let id = '';
       let i = size;
       while (i--) {
@@ -13609,7 +13609,7 @@
    * @private
    */
   Runner.prototype.runTest = function (fn) {
-    if (this._opts.dryRun) return fn();
+    if (this._opts.dryRun) return Runner.immediately(fn);
 
     var self = this;
     var test = this.test;
@@ -16500,9 +16500,14 @@
 
     if (options && options.reporterOptions) {
       if (options.reporterOptions.output) {
-        {
+        if (!fs.createWriteStream) {
           throw createUnsupportedError('file output not supported in browser');
         }
+
+        fs.mkdirSync(path.dirname(options.reporterOptions.output), {
+          recursive: true
+        });
+        self.fileStream = fs.createWriteStream(options.reporterOptions.output);
       }
 
       // get the suite name from the reporter options (if provided)
@@ -17109,7 +17114,7 @@
   });
 
   var name = "mocha";
-  var version = "9.2.1";
+  var version = "9.2.2";
   var homepage = "https://mochajs.org/";
   var notifyLogo = "https://ibin.co/4QuRuGjXvl36.png";
   var _package = {
@@ -18213,7 +18218,6 @@
 
 
   const {
-    warn,
     createInvalidReporterError,
     createInvalidInterfaceError,
     createMochaInstanceAlreadyDisposedError,
@@ -18532,35 +18536,26 @@
       }
       // Try to load reporters from process.cwd() and node_modules
       if (!reporter) {
+        let foundReporter;
         try {
-          reporter = commonjsRequire(reporterName);
+          foundReporter = require.resolve(reporterName);
+          reporter = commonjsRequire(foundReporter);
         } catch (err) {
-          if (err.code === 'MODULE_NOT_FOUND') {
-            // Try to load reporters from a path (absolute or relative)
-            try {
-              reporter = commonjsRequire(path.resolve(utils.cwd(), reporterName));
-            } catch (_err) {
-              _err.code === 'MODULE_NOT_FOUND'
-                ? warn(`'${reporterName}' reporter not found`)
-                : warn(
-                    `'${reporterName}' reporter blew up with error:\n ${err.stack}`
-                  );
-            }
-          } else {
-            warn(`'${reporterName}' reporter blew up with error:\n ${err.stack}`);
+          if (foundReporter) {
+            throw createInvalidReporterError(err.message, foundReporter);
+          }
+          // Try to load reporters from a cwd-relative path
+          try {
+            reporter = commonjsRequire(path.resolve(reporterName));
+          } catch (e) {
+            throw createInvalidReporterError(e.message, reporterName);
           }
         }
       }
-      if (!reporter) {
-        throw createInvalidReporterError(
-          `invalid reporter '${reporterName}'`,
-          reporterName
-        );
-      }
       this._reporter = reporter;
     }
     this.options.reporterOption = reporterOptions;
-    // alias option name is used in public reporters xunit/tap/progress
+    // alias option name is used in built-in reporters xunit/tap/progress
     this.options.reporterOptions = reporterOptions;
     return this;
   };