☕️ Classic, reliable, trusted test framework for Node.js and the browser
chore: migrate lib/pending and lib/error-constants to ESM (#5767)
Copilot5aacbce08ff2
diff --git a/lib/cli/collect-files.js b/lib/cli/collect-files.jsindex 020e86e6..38433f0e 100644--- a/lib/cli/collect-files.js+++ b/lib/cli/collect-files.js@@ -4,7 +4,7 @@ const path = require("node:path");const pc = require("picocolors");const debug = require("debug")("mocha:cli:run:helpers");const { minimatch } = require("minimatch");-const { NO_FILES_MATCH_PATTERN } = require("../error-constants").constants;+const { NO_FILES_MATCH_PATTERN } = require("../error-constants.mjs").constants;const lookupFiles = require("./lookup-files");const { castArray } = require("../utils");diff --git a/lib/error-constants.js b/lib/error-constants.mjssimilarity index 97%rename from lib/error-constants.jsrename to lib/error-constants.mjsindex 362078b0..c86e0488 100644--- a/lib/error-constants.js+++ b/lib/error-constants.mjs@@ -1,12 +1,10 @@-"use strict";-/*** When Mocha throws exceptions (or rejects `Promise`s), it attempts to assign a `code` property to the `Error` object, for easier handling. These are the potential values of `code`.* @public* @namespace* @memberof module:lib/errors*/-var constants = {+export const constants = {/*** An unrecoverable error.* @constant@@ -119,5 +117,3 @@ var constants = {*/UNPARSABLE_FILE: "ERR_MOCHA_UNPARSABLE_FILE",};--module.exports = { constants };diff --git a/lib/errors.js b/lib/errors.jsindex 167ecc7b..7c1eb298 100644--- a/lib/errors.js+++ b/lib/errors.js@@ -8,7 +8,7 @@*/const { format } = require("node:util");-const { constants } = require("./error-constants.js");+const { constants } = require("./error-constants.mjs");const { isCI } = require("./utils");/**diff --git a/lib/pending.js b/lib/pending.mjssimilarity index 84%rename from lib/pending.jsrename to lib/pending.mjsindex 336a29bf..df7f8ff3 100644--- a/lib/pending.js+++ b/lib/pending.mjs@@ -1,5 +1,3 @@-"use strict";-/**@module Pending*/@@ -16,4 +14,4 @@ class PendingError extends Error {}}-module.exports = PendingError;+export default PendingError;diff --git a/lib/runnable.js b/lib/runnable.jsindex 88e0dfb2..0adf7fa3 100644--- a/lib/runnable.js+++ b/lib/runnable.js@@ -1,7 +1,7 @@"use strict";var EventEmitter = require("node:events").EventEmitter;-var PendingError = require("./pending");+var PendingError = require("./pending.mjs").default;var debug = require("debug")("mocha:runnable");var milliseconds = require("ms");var utils = require("./utils");diff --git a/lib/runner.js b/lib/runner.jsindex f0a39021..f002a678 100644--- a/lib/runner.js+++ b/lib/runner.js@@ -9,7 +9,7 @@* @private*/var EventEmitter = require("node:events").EventEmitter;-var PendingError = require("./pending");+var PendingError = require("./pending.mjs").default;var utils = require("./utils");var debug = require("debug")("mocha:runner");var Runnable = require("./runnable");@@ -31,7 +31,7 @@ const {createFatalError,isMochaError,} = require("./errors");-const { constants: errorConstants } = require("./error-constants");+const { constants: errorConstants } = require("./error-constants.mjs");/*** Non-enumerable globals.diff --git a/lib/types.d.ts b/lib/types.d.tsindex 72f4d01f..7b5e9858 100644--- a/lib/types.d.ts+++ b/lib/types.d.ts@@ -8,7 +8,7 @@ import type { FSWatcher, MatchFunction } from "chokidar" with {"resolution-mode": "import",};-import type { constants } from "./error-constants.js";+import type { constants } from "./error-constants.mjs";import type Mocha from "./mocha.js";import Runner from "./runner.js";diff --git a/package.json b/package.jsonindex 6892313a..ab2adbd7 100644--- a/package.json+++ b/package.json@@ -163,7 +163,7 @@},"files": ["bin/*mocha*",- "lib/**/*.{js,html,json}",+ "lib/**/*.{js,mjs,html,json}","index.js","mocha.css","mocha.js",diff --git a/test/integration/multiple-done.spec.js b/test/integration/multiple-done.spec.jsindex bdb8907e..eb37b7b7 100644--- a/test/integration/multiple-done.spec.js+++ b/test/integration/multiple-done.spec.js@@ -2,7 +2,7 @@var runMochaJSON = require("./helpers").runMochaJSON;var invokeMocha = require("./helpers").invokeMocha;-var MULTIPLE_DONE = require("../../lib/error-constants").constants+var MULTIPLE_DONE = require("../../lib/error-constants.mjs").constants.MULTIPLE_DONE;describe("multiple calls to done()", function () {diff --git a/test/node-unit/cli/options.spec.js b/test/node-unit/cli/options.spec.jsindex b5f61bf9..39aba8f1 100644--- a/test/node-unit/cli/options.spec.js+++ b/test/node-unit/cli/options.spec.js@@ -3,7 +3,7 @@const sinon = require("sinon");const rewiremock = require("rewiremock/node");const { ONE_AND_DONE_ARGS } = require("../../../lib/cli/one-and-dones");-const { constants } = require("../../../lib/error-constants");+const { constants } = require("../../../lib/error-constants.mjs");const modulePath = require.resolve("../../../lib/cli/options");const mocharcPath = require.resolve("../../../lib/mocharc.json");diff --git a/test/unit/errors.spec.js b/test/unit/errors.spec.jsindex 0847d713..844980e5 100644--- a/test/unit/errors.spec.js+++ b/test/unit/errors.spec.js@@ -1,7 +1,7 @@"use strict";var errors = require("../../lib/errors");-var constants = require("../../lib/error-constants");+var constants = require("../../lib/error-constants.mjs");const sinon = require("sinon");const { createNoFilesMatchPatternError } = require("../../lib/errors");diff --git a/test/unit/plugin-loader.spec.js b/test/unit/plugin-loader.spec.jsindex d56bf14c..625dea0a 100644--- a/test/unit/plugin-loader.spec.js+++ b/test/unit/plugin-loader.spec.js@@ -3,7 +3,7 @@const PluginLoader = require("../../lib/plugin-loader");const sinon = require("sinon");const { INVALID_PLUGIN_DEFINITION, INVALID_PLUGIN_IMPLEMENTATION } =- require("../../lib/error-constants").constants;+ require("../../lib/error-constants.mjs").constants;describe("plugin module", function () {describe("class PluginLoader", function () {diff --git a/test/unit/runnable.spec.js b/test/unit/runnable.spec.jsindex 44b800ab..e4697c92 100644--- a/test/unit/runnable.spec.js+++ b/test/unit/runnable.spec.js@@ -4,7 +4,7 @@ var Mocha = require("../../lib/mocha");var Runnable = Mocha.Runnable;var Suite = Mocha.Suite;var sinon = require("sinon");-const { TIMEOUT } = require("../../lib/error-constants").constants;+const { TIMEOUT } = require("../../lib/error-constants.mjs").constants;var STATE_FAILED = Runnable.constants.STATE_FAILED;describe("Runnable(title, fn)", function () {diff --git a/test/unit/runner.spec.js b/test/unit/runner.spec.jsindex c0adcf69..7b992439 100644--- a/test/unit/runner.spec.js+++ b/test/unit/runner.spec.js@@ -3,11 +3,11 @@const path = require("node:path");const sinon = require("sinon");const Mocha = require("../../lib/mocha");-const PendingError = require("../../lib/pending");+const PendingError = require("../../lib/pending.mjs").default;const { Suite, Runner, Test, Hook, Runnable } = Mocha;const { noop } = Mocha.utils;const { FATAL, MULTIPLE_DONE, UNSUPPORTED } =- require("../../lib/error-constants").constants;+ require("../../lib/error-constants.mjs").constants;const {EVENT_HOOK_BEGIN,