Skip to content

armgit / mocha

Public Imported from GitHub
0

☕️ Classic, reliable, trusted test framework for Node.js and the browser

chore: migrate reporters to ESM (#5928)

Mostafa Nazarif6a62cae13bf
diff --git a/lib/reporters/doc.js b/lib/reporters/doc.mjs
similarity index 93%
rename from lib/reporters/doc.js
rename to lib/reporters/doc.mjs
index e1c02fa0..d35651e4 100644
--- a/lib/reporters/doc.js
+++ b/lib/reporters/doc.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,9 +9,10 @@
* Module dependencies.
*/
-var Base = require("./base");
-var utils = require("../utils");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import utils from "../utils.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
var EVENT_SUITE_BEGIN = constants.EVENT_SUITE_BEGIN;
@@ -98,4 +97,4 @@ class Doc extends Base {
}
}
-exports = module.exports = Doc;
+export { Doc };
diff --git a/lib/reporters/html.js b/lib/reporters/html.mjs
similarity index 98%
rename from lib/reporters/html.js
rename to lib/reporters/html.mjs
index b1fc9216..e8ef4710 100644
--- a/lib/reporters/html.js
+++ b/lib/reporters/html.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,10 +9,11 @@
* Module dependencies.
*/
-var Base = require("./base");
-var utils = require("../utils");
-var { escapeRegExp } = require("../utils/regexp.mjs");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import utils from "../utils.js";
+import { escapeRegExp } from "../utils/regexp.mjs";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
var EVENT_SUITE_BEGIN = constants.EVENT_SUITE_BEGIN;
@@ -422,4 +421,4 @@ function on(el, event, fn) {
}
}
-exports = module.exports = HTML;
+export { HTML };
diff --git a/lib/reporters/index.js b/lib/reporters/index.js
index 626cd2a3..d73a92c5 100644
--- a/lib/reporters/index.js
+++ b/lib/reporters/index.js
@@ -5,18 +5,29 @@
exports.Base = exports.base = require("./base");
const { Dot } = require("./dot.mjs");
exports.Dot = exports.dot = Dot;
-exports.Doc = exports.doc = require("./doc");
-exports.TAP = exports.tap = require("./tap");
-exports.JSON = exports.json = require("./json");
-exports.HTML = exports.html = require("./html");
+const { Doc } = require("./doc.mjs");
+exports.Doc = exports.doc = Doc;
+const { TAP } = require("./tap.mjs");
+exports.TAP = exports.tap = TAP;
+const { JSONReporter } = require("./json.mjs");
+exports.JSON = exports.json = JSONReporter;
+const { HTML } = require("./html.mjs");
+exports.HTML = exports.html = HTML;
const { List } = require("./list.mjs");
exports.List = exports.list = List;
const { Min } = require("./min.mjs");
exports.Min = exports.min = Min;
-exports.Spec = exports.spec = require("./spec");
-exports.Nyan = exports.nyan = require("./nyan");
-exports.XUnit = exports.xunit = require("./xunit");
-exports.Markdown = exports.markdown = require("./markdown");
-exports.Progress = exports.progress = require("./progress");
-exports.Landing = exports.landing = require("./landing");
-exports.JSONStream = exports["json-stream"] = require("./json-stream");
+const { Spec } = require("./spec.mjs");
+exports.Spec = exports.spec = Spec;
+const { NyanCat } = require("./nyan.mjs");
+exports.Nyan = exports.nyan = NyanCat;
+const { XUnit } = require("./xunit.mjs");
+exports.XUnit = exports.xunit = XUnit;
+const { Markdown } = require("./markdown.mjs");
+exports.Markdown = exports.markdown = Markdown;
+const { Progress } = require("./progress.mjs");
+exports.Progress = exports.progress = Progress;
+const { Landing } = require("./landing.mjs");
+exports.Landing = exports.landing = Landing;
+const { JSONStream } = require("./json-stream.mjs");
+exports.JSONStream = exports["json-stream"] = JSONStream;
diff --git a/lib/reporters/json-stream.js b/lib/reporters/json-stream.mjs
similarity index 93%
rename from lib/reporters/json-stream.js
rename to lib/reporters/json-stream.mjs
index c7d238d3..ac273f90 100644
--- a/lib/reporters/json-stream.js
+++ b/lib/reporters/json-stream.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
* @typedef {import('../test.js')} Test
@@ -12,8 +10,9 @@
* Module dependencies.
*/
-var Base = require("./base");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
@@ -87,4 +86,4 @@ function clean(test) {
};
}
-exports = module.exports = JSONStream;
+export { JSONStream };
diff --git a/lib/reporters/json.js b/lib/reporters/json.mjs
similarity index 91%
rename from lib/reporters/json.js
rename to lib/reporters/json.mjs
index 94f8a048..abffdcc8 100644
--- a/lib/reporters/json.js
+++ b/lib/reporters/json.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,12 +9,14 @@
* Module dependencies.
*/
-var Base = require("./base");
-var fs = require("node:fs");
-var path = require("node:path");
-const createUnsupportedError = require("../errors").createUnsupportedError;
-const utils = require("../utils");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import fs from "node:fs";
+import path from "node:path";
+import errors from "../errors.js";
+import utils from "../utils.js";
+import Runner from "../runner.js";
+const createUnsupportedError = errors.createUnsupportedError;
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_PENDING = constants.EVENT_TEST_PENDING;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
@@ -161,4 +161,4 @@ function errorJSON(err) {
return res;
}
-exports = module.exports = JSONReporter;
+export { JSONReporter };
diff --git a/lib/reporters/landing.js b/lib/reporters/landing.mjs
similarity index 91%
rename from lib/reporters/landing.js
rename to lib/reporters/landing.mjs
index 2151aea6..1dd9761d 100644
--- a/lib/reporters/landing.js
+++ b/lib/reporters/landing.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,12 +9,14 @@
* Module dependencies.
*/
-var Base = require("./base");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import Runner from "../runner.js";
+import Runnable from "../runnable.js";
+var constants = Runner.constants;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
var EVENT_RUN_END = constants.EVENT_RUN_END;
var EVENT_TEST_END = constants.EVENT_TEST_END;
-var STATE_FAILED = require("../runnable").constants.STATE_FAILED;
+var STATE_FAILED = Runnable.constants.STATE_FAILED;
var cursor = Base.cursor;
var color = Base.color;
@@ -109,4 +109,4 @@ class Landing extends Base {
}
}
-exports = module.exports = Landing;
+export { Landing };
diff --git a/lib/reporters/markdown.js b/lib/reporters/markdown.mjs
similarity index 93%
rename from lib/reporters/markdown.js
rename to lib/reporters/markdown.mjs
index c288dd8b..780fc214 100644
--- a/lib/reporters/markdown.js
+++ b/lib/reporters/markdown.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,9 +9,10 @@
* Module dependencies.
*/
-var Base = require("./base");
-var utils = require("../utils");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import utils from "../utils.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_RUN_END = constants.EVENT_RUN_END;
var EVENT_SUITE_BEGIN = constants.EVENT_SUITE_BEGIN;
var EVENT_SUITE_END = constants.EVENT_SUITE_END;
@@ -111,4 +110,4 @@ class Markdown extends Base {
}
}
-exports = module.exports = Markdown;
+export { Markdown };
diff --git a/lib/reporters/nyan.js b/lib/reporters/nyan.mjs
similarity index 97%
rename from lib/reporters/nyan.js
rename to lib/reporters/nyan.mjs
index 465c8649..7602d6dd 100644
--- a/lib/reporters/nyan.js
+++ b/lib/reporters/nyan.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,8 +9,9 @@
* Module dependencies.
*/
-var Base = require("./base");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
var EVENT_TEST_PENDING = constants.EVENT_TEST_PENDING;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
@@ -260,4 +259,4 @@ class NyanCat extends Base {
}
}
-exports = module.exports = NyanCat;
+export { NyanCat };
diff --git a/lib/reporters/progress.js b/lib/reporters/progress.mjs
similarity index 94%
rename from lib/reporters/progress.js
rename to lib/reporters/progress.mjs
index 3f86af9d..a64563a9 100644
--- a/lib/reporters/progress.js
+++ b/lib/reporters/progress.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
*/
@@ -11,8 +9,9 @@
* Module dependencies.
*/
-var Base = require("./base");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
var EVENT_TEST_END = constants.EVENT_TEST_END;
var EVENT_RUN_END = constants.EVENT_RUN_END;
@@ -99,4 +98,4 @@ class Progress extends Base {
}
}
-exports = module.exports = Progress;
+export { Progress };
diff --git a/lib/reporters/spec.js b/lib/reporters/spec.mjs
similarity index 94%
rename from lib/reporters/spec.js
rename to lib/reporters/spec.mjs
index fcdff533..f8212a9a 100644
--- a/lib/reporters/spec.js
+++ b/lib/reporters/spec.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
* @typedef {import('../test.js')} Test
@@ -12,8 +10,9 @@
* Module dependencies.
*/
-var Base = require("./base");
-var constants = require("../runner").constants;
+import Base from "./base.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
var EVENT_RUN_END = constants.EVENT_RUN_END;
var EVENT_SUITE_BEGIN = constants.EVENT_SUITE_BEGIN;
@@ -92,4 +91,4 @@ class Spec extends Base {
}
}
-exports = module.exports = Spec;
+export { Spec };
diff --git a/lib/reporters/tap.js b/lib/reporters/tap.mjs
similarity index 97%
rename from lib/reporters/tap.js
rename to lib/reporters/tap.mjs
index cb16578e..b2eae61e 100644
--- a/lib/reporters/tap.js
+++ b/lib/reporters/tap.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
* @typedef {import('../test.js')} Test
@@ -12,9 +10,10 @@
* Module dependencies.
*/
-var util = require("node:util");
-var Base = require("./base");
-var constants = require("../runner").constants;
+import util from "node:util";
+import Base from "./base.js";
+import Runner from "../runner.js";
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
var EVENT_RUN_BEGIN = constants.EVENT_RUN_BEGIN;
@@ -273,4 +272,4 @@ function indent(level) {
return Array(level + 1).join(" ");
}
-exports = module.exports = TAP;
+export { TAP };
diff --git a/lib/reporters/xunit.js b/lib/reporters/xunit.mjs
similarity index 93%
rename from lib/reporters/xunit.js
rename to lib/reporters/xunit.mjs
index a7129a3d..96024b93 100644
--- a/lib/reporters/xunit.js
+++ b/lib/reporters/xunit.mjs
@@ -1,5 +1,3 @@
-"use strict";
-
/**
* @typedef {import('../runner.js')} Runner
* @typedef {import('../test.js')} Test
@@ -12,18 +10,20 @@
* Module dependencies.
*/
-var Base = require("./base");
-var utils = require("../utils");
-var fs = require("node:fs");
-var path = require("node:path");
-var errors = require("../errors");
+import Base from "./base.js";
+import utils from "../utils.js";
+import fs from "node:fs";
+import path from "node:path";
+import errors from "../errors.js";
+import Runner from "../runner.js";
+import Runnable from "../runnable.js";
var createUnsupportedError = errors.createUnsupportedError;
-var constants = require("../runner").constants;
+var constants = Runner.constants;
var EVENT_TEST_PASS = constants.EVENT_TEST_PASS;
var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL;
var EVENT_RUN_END = constants.EVENT_RUN_END;
var EVENT_TEST_PENDING = constants.EVENT_TEST_PENDING;
-var STATE_FAILED = require("../runnable").constants.STATE_FAILED;
+var STATE_FAILED = Runnable.constants.STATE_FAILED;
var escape = utils.escape;
/**
@@ -224,4 +224,4 @@ function testFilePath(filepath, options) {
return filepath;
}
-exports = module.exports = XUnit;
+export { XUnit };
diff --git a/test/node-unit/mocha.spec.js b/test/node-unit/mocha.spec.js
index cc13a7cf..076dffee 100644
--- a/test/node-unit/mocha.spec.js
+++ b/test/node-unit/mocha.spec.js
@@ -264,7 +264,7 @@ describe("Mocha", function () {
it("should load from current working directory", function () {
expect(function () {
- mocha.reporter("./lib/reporters/spec.js");
+ mocha.reporter("./lib/reporters/spec.mjs");
}, "not to throw");
});
diff --git a/test/reporters/json.spec.js b/test/reporters/json.spec.js
index 42e05855..ca2a413e 100644
--- a/test/reporters/json.spec.js
+++ b/test/reporters/json.spec.js
@@ -2,7 +2,7 @@
var fs = require("node:fs");
var sinon = require("sinon");
-var JSONReporter = require("../../lib/reporters/json");
+var JSONReporter = require("../../lib/reporters/json.mjs").JSONReporter;
var utils = require("../../lib/utils");
var Mocha = require("../../");
var Suite = Mocha.Suite;