diff --git a/lib/cli/cli.js b/lib/cli/cli.js index 6229335d85..836374dec1 100755 --- a/lib/cli/cli.js +++ b/lib/cli/cli.js @@ -9,7 +9,6 @@ */ const debug = require('debug')('mocha:cli:cli'); -const symbols = require('log-symbols'); const yargs = require('yargs'); const path = require('node:path'); const { @@ -22,7 +21,7 @@ const lookupFiles = require('./lookup-files'); const commands = require('./commands'); const pc = require('picocolors'); const {repository, homepage, version, discord} = require('../../package.json'); -const {cwd} = require('../utils'); +const {cwd, logSymbols} = require('../utils'); /** * - Accepts an `Array` of arguments @@ -60,7 +59,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} ${pc.red('ERROR:')} ${msg}`); + console.error(`\n${logSymbols.error} ${pc.red('ERROR:')} ${msg}`); process.exit(1); }) .help('help', 'Show usage information & exit') diff --git a/lib/cli/run.js b/lib/cli/run.js index 561592b916..bddae25270 100644 --- a/lib/cli/run.js +++ b/lib/cli/run.js @@ -7,7 +7,6 @@ * @private */ -const symbols = require('log-symbols'); const pc = require('picocolors'); const Mocha = require('../mocha'); const { @@ -15,6 +14,7 @@ const { createInvalidArgumentValueError, createMissingArgumentError } = require('../errors'); +const {logSymbols} = require('../utils'); const { list, @@ -361,7 +361,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} ${pc.red('ERROR:')}`, err); + console.error(`\n${logSymbols.error} ${pc.red('ERROR:')}`, err); yargs.exit(1); } }) diff --git a/lib/cli/watch-run.js b/lib/cli/watch-run.js index 6150ec33e3..930536b2d2 100644 --- a/lib/cli/watch-run.js +++ b/lib/cli/watch-run.js @@ -1,6 +1,6 @@ 'use strict'; -const logSymbols = require('log-symbols'); +const {logSymbols} = require('../utils'); const debug = require('debug')('mocha:cli:watch'); const path = require('node:path'); const chokidar = require('chokidar'); diff --git a/lib/reporters/base.js b/lib/reporters/base.js index bc210ca2f6..838581b1b3 100644 --- a/lib/reporters/base.js +++ b/lib/reporters/base.js @@ -17,7 +17,6 @@ var diff = require('diff'); var milliseconds = require('ms'); var utils = require('../utils'); var supportsColor = require('supports-color'); -var symbols = require('log-symbols'); var constants = require('../runner').constants; var EVENT_TEST_PASS = constants.EVENT_TEST_PASS; var EVENT_TEST_FAIL = constants.EVENT_TEST_FAIL; @@ -101,8 +100,8 @@ exports.colors = { */ exports.symbols = { - ok: symbols.success, - err: symbols.error, + ok: utils.logSymbols.success, + err: utils.logSymbols.error, dot: '.', comma: ',', bang: '!' diff --git a/lib/utils.js b/lib/utils.js index 4971b8de46..e693f2a8d6 100644 --- a/lib/utils.js +++ b/lib/utils.js @@ -11,6 +11,7 @@ var path = require('node:path'); var util = require('node:util'); var he = require('he'); +var pc = require('picocolors'); const MOCHA_ID_PROP_NAME = '__mocha_id__'; @@ -696,3 +697,10 @@ exports.breakCircularDeps = inputObj => { exports.isNumeric = input => { return !isNaN(parseFloat(input)); }; + +exports.logSymbols = { + info: pc.blue('ℹ'), + success: pc.green('✔'), + warning: pc.yellow('⚠'), + error: pc.red('✖'), +}; diff --git a/package-lock.json b/package-lock.json index dc8862e56b..eaf42dd4e7 100644 --- a/package-lock.json +++ b/package-lock.json @@ -18,7 +18,6 @@ "glob": "^10.4.5", "he": "^1.2.0", "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", "minimatch": "^9.0.5", "ms": "^2.1.3", "picocolors": "^1.1.1", @@ -4351,6 +4350,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "dependencies": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -4366,6 +4366,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "dependencies": { "has-flag": "^4.0.0" }, @@ -8742,17 +8743,6 @@ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true }, - "node_modules/is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==", - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/is-whitespace": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", @@ -10141,21 +10131,6 @@ "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==", "dev": true }, - "node_modules/log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "dependencies": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - }, - "engines": { - "node": ">=10" - }, - "funding": { - "url": "https://github.com/sponsors/sindresorhus" - } - }, "node_modules/log4js": { "version": "6.9.1", "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz", @@ -20291,6 +20266,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "requires": { "ansi-styles": "^4.1.0", "supports-color": "^7.1.0" @@ -20300,6 +20276,7 @@ "version": "7.2.0", "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz", "integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==", + "dev": true, "requires": { "has-flag": "^4.0.0" } @@ -23609,11 +23586,6 @@ "integrity": "sha512-cyA56iCMHAh5CdzjJIa4aohJyeO1YbwLi3Jc35MmRU6poroFjIGZzUzupGiRPOjgHg9TLu43xbpwXk523fMxKA==", "dev": true }, - "is-unicode-supported": { - "version": "0.1.0", - "resolved": "https://registry.npmjs.org/is-unicode-supported/-/is-unicode-supported-0.1.0.tgz", - "integrity": "sha512-knxG2q4UC3u8stRGyAVJCOdxFmv5DZiRcdlIaAQXAbSfJya+OhopNotLQrstBhququ4ZpuKbDc/8S6mgXgPFPw==" - }, "is-whitespace": { "version": "0.3.0", "resolved": "https://registry.npmjs.org/is-whitespace/-/is-whitespace-0.3.0.tgz", @@ -24689,15 +24661,6 @@ "integrity": "sha512-C7IOaBBK/0gMORRBd8OETNx3kmOkgIWIPvyDpZSCTwUrpYmgZwJkjZeOD8ww4xbOUOs4/attY+pciKvadNfFbg==", "dev": true }, - "log-symbols": { - "version": "4.1.0", - "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-4.1.0.tgz", - "integrity": "sha512-8XPvpAA8uyhfteu8pIvQxpJZ7SYYdpUivZpGy6sFsBuKRY/7rQGavedeB8aK+Zkyq6upMFVL/9AW6vOYzfRyLg==", - "requires": { - "chalk": "^4.1.0", - "is-unicode-supported": "^0.1.0" - } - }, "log4js": { "version": "6.9.1", "resolved": "https://registry.npmjs.org/log4js/-/log4js-6.9.1.tgz", diff --git a/package.json b/package.json index 2b84a04a53..572bbec8eb 100644 --- a/package.json +++ b/package.json @@ -106,7 +106,6 @@ "glob": "^10.4.5", "he": "^1.2.0", "js-yaml": "^4.1.0", - "log-symbols": "^4.1.0", "minimatch": "^9.0.5", "ms": "^2.1.3", "picocolors": "^1.1.1",