diff --git a/.gitignore b/.gitignore index 5da7c1a4f..dfb9b7511 100644 --- a/.gitignore +++ b/.gitignore @@ -27,9 +27,6 @@ yarn-error.log* .nyc_output coverage -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - # Dependency directory # Commenting this out is preferred by some people, see # https://www.npmjs.org/doc/misc/npm-faq.html#should-i-check-my-node_modules-folder-into-git- @@ -40,9 +37,6 @@ node_modules .AppleDouble .LSOverride -# Babel-compiled files -lib - # Test related files test/unit/coverage test/e2e/reports diff --git a/dist/cli/formatter.js b/dist/cli/formatter.js index dff1400f4..55d624831 100644 --- a/dist/cli/formatter.js +++ b/dist/cli/formatter.js @@ -1,7 +1,7 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const chalk = require("chalk"); const events_1 = require("events"); +const node_util_1 = require("node:util"); const glob_1 = require("glob"); const path_1 = require("path"); let HTMLHint; @@ -38,7 +38,7 @@ formatter.init = function (tmpHTMLHint, tmpOptions) { formatter.setFormat = function (format) { const formatHandel = mapFormatters[format]; if (formatHandel === undefined) { - console.log(chalk.red('No supported formatter, supported formatters: %s'), arrSupportedFormatters.join(', ')); + console.log((0, node_util_1.styleText)('red', 'No supported formatter, supported formatters: %s'), arrSupportedFormatters.join(', ')); process.exit(1); } else { @@ -46,4 +46,4 @@ formatter.setFormat = function (format) { } }; module.exports = formatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQkFBOEI7QUFDOUIsbUNBQXFDO0FBQ3JDLCtCQUErQjtBQUMvQiwrQkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxNQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxNQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLE1BQU0sYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO0lBQzFDLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ2hDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0FBQ0gsQ0FBQztBQUdELFNBQVMsY0FBYztJQUNyQixNQUFNLFFBQVEsR0FBRyxJQUFBLGVBQVEsRUFBQyxtQkFBbUIsRUFBRTtRQUM3QyxHQUFHLEVBQUUsU0FBUztRQUNkLEdBQUcsRUFBRSxLQUFLO1FBQ1YsS0FBSyxFQUFFLElBQUk7S0FDWixDQUFDLENBQUE7SUFFRixNQUFNLGFBQWEsR0FBMEMsRUFBRSxDQUFBO0lBQy9ELFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN4QixNQUFNLFFBQVEsR0FBRyxJQUFBLFlBQUssRUFBQyxJQUFJLENBQUMsQ0FBQTtRQUM1QixNQUFNLGFBQWEsR0FBRyxJQUFBLGNBQU8sRUFBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDOUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDdkQsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLGFBQWEsQ0FBQTtBQUN0QixDQUFDO0FBeUNELE1BQU0sU0FBUyxHQUFjLElBQUkscUJBQVksRUFBZSxDQUFBO0FBRTVELFNBQVMsQ0FBQyxZQUFZLEdBQUc7SUFDdkIsT0FBTyxzQkFBc0IsQ0FBQTtBQUMvQixDQUFDLENBQUE7QUFFRCxTQUFTLENBQUMsSUFBSSxHQUFHLFVBQVUsV0FBVyxFQUFFLFVBQVU7SUFDaEQsUUFBUSxHQUFHLFdBQVcsQ0FBQTtJQUN0QixPQUFPLEdBQUcsVUFBVSxDQUFBO0FBQ3RCLENBQUMsQ0FBQTtBQUVELFNBQVMsQ0FBQyxTQUFTLEdBQUcsVUFBVSxNQUFNO0lBQ3BDLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUUxQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMvQixPQUFPLENBQUMsR0FBRyxDQUNULEtBQUssQ0FBQyxHQUFHLENBQUMsa0RBQWtELENBQUMsRUFDN0Qsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUNsQyxDQUFBO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO1NBQU0sQ0FBQztRQUNOLFlBQVksQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVDLENBQUM7QUFDSCxDQUFDLENBQUE7QUFRRCxNQUFNLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSxtQ0FBcUM7QUFDckMseUNBQXFDO0FBQ3JDLCtCQUErQjtBQUMvQiwrQkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxNQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxNQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLE1BQU0sYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO0lBQzFDLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ2hDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0FBQ0gsQ0FBQztBQUdELFNBQVMsY0FBYztJQUNyQixNQUFNLFFBQVEsR0FBRyxJQUFBLGVBQVEsRUFBQyxtQkFBbUIsRUFBRTtRQUM3QyxHQUFHLEVBQUUsU0FBUztRQUNkLEdBQUcsRUFBRSxLQUFLO1FBQ1YsS0FBSyxFQUFFLElBQUk7S0FDWixDQUFDLENBQUE7SUFFRixNQUFNLGFBQWEsR0FBMEMsRUFBRSxDQUFBO0lBQy9ELFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN4QixNQUFNLFFBQVEsR0FBRyxJQUFBLFlBQUssRUFBQyxJQUFJLENBQUMsQ0FBQTtRQUM1QixNQUFNLGFBQWEsR0FBRyxJQUFBLGNBQU8sRUFBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDOUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDdkQsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLGFBQWEsQ0FBQTtBQUN0QixDQUFDO0FBeUNELE1BQU0sU0FBUyxHQUFjLElBQUkscUJBQVksRUFBZSxDQUFBO0FBRTVELFNBQVMsQ0FBQyxZQUFZLEdBQUc7SUFDdkIsT0FBTyxzQkFBc0IsQ0FBQTtBQUMvQixDQUFDLENBQUE7QUFFRCxTQUFTLENBQUMsSUFBSSxHQUFHLFVBQVUsV0FBVyxFQUFFLFVBQVU7SUFDaEQsUUFBUSxHQUFHLFdBQVcsQ0FBQTtJQUN0QixPQUFPLEdBQUcsVUFBVSxDQUFBO0FBQ3RCLENBQUMsQ0FBQTtBQUVELFNBQVMsQ0FBQyxTQUFTLEdBQUcsVUFBVSxNQUFNO0lBQ3BDLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUUxQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMvQixPQUFPLENBQUMsR0FBRyxDQUNULElBQUEscUJBQVMsRUFBQyxLQUFLLEVBQUUsa0RBQWtELENBQUMsRUFDcEUsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUNsQyxDQUFBO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO1NBQU0sQ0FBQztRQUNOLFlBQVksQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVDLENBQUM7QUFDSCxDQUFDLENBQUE7QUFRRCxNQUFNLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/formatters/compact.js b/dist/cli/formatters/compact.js index 0f2774477..d38fadd64 100644 --- a/dist/cli/formatters/compact.js +++ b/dist/cli/formatters/compact.js @@ -1,9 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const chalk = require("chalk"); +const node_util_1 = require("node:util"); const compactFormatter = function (formatter, HTMLHint, options) { const nocolor = options.nocolor; - const chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; formatter.on('file', (event) => { event.messages.forEach((message) => { console.log('%s: line %d, col %d, %s - %s (%s)', event.file, message.line, message.col, message.type, message.message, message.rule.id); @@ -14,9 +13,9 @@ const compactFormatter = function (formatter, HTMLHint, options) { if (allHintCount > 0) { console.log(''); const message = '%d problems'; - console.log(nocolor ? message : chalkInstance.red(message), event.allHintCount); + console.log(nocolor ? message : (0, node_util_1.styleText)('red', message), event.allHintCount); } }); }; module.exports = compactFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jb21wYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7SUFFL0IsTUFBTSxhQUFhLEdBQ2pCLE9BQU8sS0FBSyxLQUFLLENBQUMsQ0FBQyxDQUFDLElBQUksS0FBSyxDQUFDLFFBQVEsQ0FBQyxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUE7SUFFOUQsU0FBUyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM3QixLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQ1QsbUNBQW1DLEVBQ25DLEtBQUssQ0FBQyxJQUFJLEVBQ1YsT0FBTyxDQUFDLElBQUksRUFDWixPQUFPLENBQUMsR0FBRyxFQUNYLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLE9BQU8sRUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FDaEIsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQzVCLE1BQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdkMsSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNmLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQTtZQUM3QixPQUFPLENBQUMsR0FBRyxDQUNULE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxhQUFhLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxFQUM5QyxLQUFLLENBQUMsWUFBWSxDQUNuQixDQUFBO1FBQ0gsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxnQkFBZ0IsQ0FBQSJ9 \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29tcGFjdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9jb21wYWN0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQXFDO0FBR3JDLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLE9BQU8sQ0FBQyxPQUFPLENBQUE7SUFFL0IsU0FBUyxDQUFDLEVBQUUsQ0FBQyxNQUFNLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM3QixLQUFLLENBQUMsUUFBUSxDQUFDLE9BQU8sQ0FBQyxDQUFDLE9BQU8sRUFBRSxFQUFFO1lBQ2pDLE9BQU8sQ0FBQyxHQUFHLENBQ1QsbUNBQW1DLEVBQ25DLEtBQUssQ0FBQyxJQUFJLEVBQ1YsT0FBTyxDQUFDLElBQUksRUFDWixPQUFPLENBQUMsR0FBRyxFQUNYLE9BQU8sQ0FBQyxJQUFJLEVBQ1osT0FBTyxDQUFDLE9BQU8sRUFDZixPQUFPLENBQUMsSUFBSSxDQUFDLEVBQUUsQ0FDaEIsQ0FBQTtRQUNILENBQUMsQ0FBQyxDQUFBO0lBQ0osQ0FBQyxDQUFDLENBQUE7SUFFRixTQUFTLENBQUMsRUFBRSxDQUFDLEtBQUssRUFBRSxDQUFDLEtBQUssRUFBRSxFQUFFO1FBQzVCLE1BQU0sWUFBWSxHQUFHLEtBQUssQ0FBQyxZQUFZLENBQUE7UUFDdkMsSUFBSSxZQUFZLEdBQUcsQ0FBQyxFQUFFLENBQUM7WUFDckIsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtZQUNmLE1BQU0sT0FBTyxHQUFHLGFBQWEsQ0FBQTtZQUM3QixPQUFPLENBQUMsR0FBRyxDQUNULE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFBLHFCQUFTLEVBQUMsS0FBSyxFQUFFLE9BQU8sQ0FBQyxFQUM3QyxLQUFLLENBQUMsWUFBWSxDQUNuQixDQUFBO1FBQ0gsQ0FBQztJQUNILENBQUMsQ0FBQyxDQUFBO0FBQ0osQ0FBQyxDQUFBO0FBRUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxnQkFBZ0IsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/formatters/default.js b/dist/cli/formatters/default.js index 547973c2d..e345186b2 100644 --- a/dist/cli/formatters/default.js +++ b/dist/cli/formatters/default.js @@ -1,6 +1,6 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const chalk = require("chalk"); +const node_util_1 = require("node:util"); const defaultFormatter = function (formatter, HTMLHint, options) { const nocolor = !!options.nocolor; formatter.on('start', () => { @@ -8,11 +8,11 @@ const defaultFormatter = function (formatter, HTMLHint, options) { }); formatter.on('config', (event) => { const configPath = event.configPath; - console.log(' Config loaded: %s', nocolor ? configPath : chalk.cyan(configPath)); + console.log(' Config loaded: %s', nocolor ? configPath : (0, node_util_1.styleText)('cyan', configPath)); console.log(''); }); formatter.on('file', (event) => { - console.log(` ${chalk.white(event.file)}`); + console.log(` ${(0, node_util_1.styleText)('white', event.file)}`); const arrLogs = HTMLHint.format(event.messages, { colors: !nocolor, indent: 6, @@ -30,13 +30,13 @@ const defaultFormatter = function (formatter, HTMLHint, options) { let message; if (allHintCount > 0) { message = 'Scanned %d files, found %d errors in %d files (%d ms)'; - console.log(nocolor ? message : chalk.red(message), allFileCount, allHintCount, allHintFileCount, time); + console.log(nocolor ? message : (0, node_util_1.styleText)('red', message), allFileCount, allHintCount, allHintFileCount, time); } else { message = 'Scanned %d files, no errors found (%d ms).'; - console.log(nocolor ? message : chalk.green(message), allFileCount, time); + console.log(nocolor ? message : (0, node_util_1.styleText)('green', message), allFileCount, time); } }); }; module.exports = defaultFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRWpDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUN6QixPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUMvQixNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVyxDQUFBO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQ1Qsc0JBQXNCLEVBQ3RCLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxDQUM5QyxDQUFBO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUU1QyxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDOUMsTUFBTSxFQUFFLENBQUMsT0FBTztZQUNoQixNQUFNLEVBQUUsQ0FBQztTQUNWLENBQUMsQ0FBQTtRQUVGLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBRUYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDNUIsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtRQUN2QyxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLGdCQUFnQixDQUFBO1FBQy9DLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUE7UUFDdkIsSUFBSSxPQUFPLENBQUE7UUFFWCxJQUFJLFlBQVksR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNyQixPQUFPLEdBQUcsdURBQXVELENBQUE7WUFDakUsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFDdEMsWUFBWSxFQUNaLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsSUFBSSxDQUNMLENBQUE7UUFDSCxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sR0FBRyw0Q0FBNEMsQ0FBQTtZQUN0RCxPQUFPLENBQUMsR0FBRyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsS0FBSyxDQUFDLE9BQU8sQ0FBQyxFQUFFLFlBQVksRUFBRSxJQUFJLENBQUMsQ0FBQTtRQUMzRSxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZGVmYXVsdC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy9kZWZhdWx0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQXFDO0FBR3JDLE1BQU0sZ0JBQWdCLEdBQXNCLFVBQzFDLFNBQVMsRUFDVCxRQUFRLEVBQ1IsT0FBTztJQUVQLE1BQU0sT0FBTyxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRWpDLFNBQVMsQ0FBQyxFQUFFLENBQUMsT0FBTyxFQUFFLEdBQUcsRUFBRTtRQUN6QixPQUFPLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFBO0lBQ2pCLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUMvQixNQUFNLFVBQVUsR0FBRyxLQUFLLENBQUMsVUFBVyxDQUFBO1FBQ3BDLE9BQU8sQ0FBQyxHQUFHLENBQ1Qsc0JBQXNCLEVBQ3RCLE9BQU8sQ0FBQyxDQUFDLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxJQUFBLHFCQUFTLEVBQUMsTUFBTSxFQUFFLFVBQVUsQ0FBQyxDQUNyRCxDQUFBO1FBQ0QsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FBQyxNQUFNLElBQUEscUJBQVMsRUFBQyxPQUFPLEVBQUUsS0FBSyxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQTtRQUVuRCxNQUFNLE9BQU8sR0FBRyxRQUFRLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxRQUFRLEVBQUU7WUFDOUMsTUFBTSxFQUFFLENBQUMsT0FBTztZQUNoQixNQUFNLEVBQUUsQ0FBQztTQUNWLENBQUMsQ0FBQTtRQUVGLE9BQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUN0QixPQUFPLENBQUMsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ2xCLENBQUMsQ0FBQyxDQUFBO1FBRUYsT0FBTyxDQUFDLEdBQUcsQ0FBQyxFQUFFLENBQUMsQ0FBQTtJQUNqQixDQUFDLENBQUMsQ0FBQTtJQUVGLFNBQVMsQ0FBQyxFQUFFLENBQUMsS0FBSyxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDNUIsTUFBTSxZQUFZLEdBQUcsS0FBSyxDQUFDLFlBQVksQ0FBQTtRQUN2QyxNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLE1BQU0sZ0JBQWdCLEdBQUcsS0FBSyxDQUFDLGdCQUFnQixDQUFBO1FBQy9DLE1BQU0sSUFBSSxHQUFHLEtBQUssQ0FBQyxJQUFJLENBQUE7UUFDdkIsSUFBSSxPQUFPLENBQUE7UUFFWCxJQUFJLFlBQVksR0FBRyxDQUFDLEVBQUUsQ0FBQztZQUNyQixPQUFPLEdBQUcsdURBQXVELENBQUE7WUFDakUsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBQSxxQkFBUyxFQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsRUFDN0MsWUFBWSxFQUNaLFlBQVksRUFDWixnQkFBZ0IsRUFDaEIsSUFBSSxDQUNMLENBQUE7UUFDSCxDQUFDO2FBQU0sQ0FBQztZQUNOLE9BQU8sR0FBRyw0Q0FBNEMsQ0FBQTtZQUN0RCxPQUFPLENBQUMsR0FBRyxDQUNULE9BQU8sQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFBLHFCQUFTLEVBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxFQUMvQyxZQUFZLEVBQ1osSUFBSSxDQUNMLENBQUE7UUFDSCxDQUFDO0lBQ0gsQ0FBQyxDQUFDLENBQUE7QUFDSixDQUFDLENBQUE7QUFFRCxNQUFNLENBQUMsT0FBTyxHQUFHLGdCQUFnQixDQUFBIn0= \ No newline at end of file diff --git a/dist/cli/formatters/unix.js b/dist/cli/formatters/unix.js index be670c857..3cafeca97 100644 --- a/dist/cli/formatters/unix.js +++ b/dist/cli/formatters/unix.js @@ -1,9 +1,8 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); -const chalk = require("chalk"); +const node_util_1 = require("node:util"); const unixFormatter = function (formatter, HTMLHint, options) { const nocolor = options.nocolor; - const chalkInstance = nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk; formatter.on('file', (event) => { event.messages.forEach((message) => { console.log([ @@ -19,9 +18,9 @@ const unixFormatter = function (formatter, HTMLHint, options) { if (allHintCount > 0) { console.log(''); const message = '%d problems'; - console.log(nocolor ? message : chalkInstance.red(message), event.allHintCount); + console.log(nocolor ? message : (0, node_util_1.styleText)('red', message), event.allHintCount); } }); }; module.exports = unixFormatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5peC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy91bml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEsK0JBQThCO0FBRzlCLE1BQU0sYUFBYSxHQUFzQixVQUN2QyxTQUFTLEVBQ1QsUUFBUSxFQUNSLE9BQU87SUFFUCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRS9CLE1BQU0sYUFBYSxHQUNqQixPQUFPLEtBQUssS0FBSyxDQUFDLENBQUMsQ0FBQyxJQUFJLEtBQUssQ0FBQyxRQUFRLENBQUMsRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxDQUFBO0lBRTlELFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNqQyxPQUFPLENBQUMsR0FBRyxDQUNUO2dCQUNFLEtBQUssQ0FBQyxJQUFJO2dCQUNWLE9BQU8sQ0FBQyxJQUFJO2dCQUNaLE9BQU8sQ0FBQyxHQUFHO2dCQUNYLElBQUksT0FBTyxDQUFDLE9BQU8sS0FBSyxPQUFPLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO2FBQzNELENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUNaLENBQUE7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM1QixNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLElBQUksWUFBWSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3JCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDZixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUE7WUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsYUFBYSxDQUFDLEdBQUcsQ0FBQyxPQUFPLENBQUMsRUFDOUMsS0FBSyxDQUFDLFlBQVksQ0FDbkIsQ0FBQTtRQUNILENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFBIn0= \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidW5peC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL3NyYy9jbGkvZm9ybWF0dGVycy91bml4LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7O0FBQUEseUNBQXFDO0FBR3JDLE1BQU0sYUFBYSxHQUFzQixVQUN2QyxTQUFTLEVBQ1QsUUFBUSxFQUNSLE9BQU87SUFFUCxNQUFNLE9BQU8sR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFBO0lBRS9CLFNBQVMsQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLENBQUMsS0FBSyxFQUFFLEVBQUU7UUFDN0IsS0FBSyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxPQUFPLEVBQUUsRUFBRTtZQUNqQyxPQUFPLENBQUMsR0FBRyxDQUNUO2dCQUNFLEtBQUssQ0FBQyxJQUFJO2dCQUNWLE9BQU8sQ0FBQyxJQUFJO2dCQUNaLE9BQU8sQ0FBQyxHQUFHO2dCQUNYLElBQUksT0FBTyxDQUFDLE9BQU8sS0FBSyxPQUFPLENBQUMsSUFBSSxJQUFJLE9BQU8sQ0FBQyxJQUFJLENBQUMsRUFBRSxHQUFHO2FBQzNELENBQUMsSUFBSSxDQUFDLEdBQUcsQ0FBQyxDQUNaLENBQUE7UUFDSCxDQUFDLENBQUMsQ0FBQTtJQUNKLENBQUMsQ0FBQyxDQUFBO0lBRUYsU0FBUyxDQUFDLEVBQUUsQ0FBQyxLQUFLLEVBQUUsQ0FBQyxLQUFLLEVBQUUsRUFBRTtRQUM1QixNQUFNLFlBQVksR0FBRyxLQUFLLENBQUMsWUFBWSxDQUFBO1FBQ3ZDLElBQUksWUFBWSxHQUFHLENBQUMsRUFBRSxDQUFDO1lBQ3JCLE9BQU8sQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFDLENBQUE7WUFDZixNQUFNLE9BQU8sR0FBRyxhQUFhLENBQUE7WUFDN0IsT0FBTyxDQUFDLEdBQUcsQ0FDVCxPQUFPLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsSUFBQSxxQkFBUyxFQUFDLEtBQUssRUFBRSxPQUFPLENBQUMsRUFDN0MsS0FBSyxDQUFDLFlBQVksQ0FDbkIsQ0FBQTtRQUNILENBQUM7SUFDSCxDQUFDLENBQUMsQ0FBQTtBQUNKLENBQUMsQ0FBQTtBQUVELE1BQU0sQ0FBQyxPQUFPLEdBQUcsYUFBYSxDQUFBIn0= \ No newline at end of file diff --git a/dist/cli/htmlhint.js b/dist/cli/htmlhint.js index 5ae1d0e2a..89f4517e9 100644 --- a/dist/cli/htmlhint.js +++ b/dist/cli/htmlhint.js @@ -2,12 +2,12 @@ "use strict"; Object.defineProperty(exports, "__esModule", { value: true }); const async_1 = require("async"); -const chalk = require("chalk"); const commander_1 = require("commander"); const fs_1 = require("fs"); const glob_1 = require("glob"); -const parse_glob_1 = require("./parse-glob"); const path_1 = require("path"); +const node_util_1 = require("node:util"); +const parse_glob_1 = require("./parse-glob"); const stripJsonComments = require("strip-json-comments"); const HTMLHint = require('../htmlhint.js').HTMLHint; const formatter = require('./formatter'); @@ -86,7 +86,7 @@ function listRules() { console.log(' =================================================='); for (const id of ruleIds) { const rule = rules[id]; - console.log(' %s : %s', chalk.bold(rule.id), rule.description); + console.log(' %s : %s', (0, node_util_1.styleText)('bold', rule.id), rule.description); } } function initConfig() { @@ -94,18 +94,18 @@ function initConfig() { const defaultConfig = JSON.stringify(HTMLHint.defaultRuleset, null, 2); try { (0, fs_1.writeFileSync)(configPath, defaultConfig, { encoding: 'utf-8', flag: 'wx' }); - console.log(chalk.green('Created configuration file: %s'), configPath); + console.log((0, node_util_1.styleText)('green', 'Created configuration file: %s'), configPath); console.log(''); console.log('Configuration file contents:'); - console.log(chalk.gray(defaultConfig)); + console.log((0, node_util_1.styleText)('gray', defaultConfig)); return true; } catch (error) { if (error instanceof Error && 'code' in error && error.code === 'EEXIST') { - console.log(chalk.yellow('Configuration file already exists: %s'), configPath); + console.log((0, node_util_1.styleText)('yellow', 'Configuration file already exists: %s'), configPath); return true; } - console.log(chalk.red('Failed to create configuration file: %s'), error instanceof Error ? error.message : String(error)); + console.log((0, node_util_1.styleText)('red', 'Failed to create configuration file: %s'), error instanceof Error ? error.message : String(error)); return false; } } @@ -304,7 +304,7 @@ function getConfig(configPath, base, formatter) { return ruleset; } catch (e) { - console.log(' Config could not be parsed: %s', chalk.yellow(configPath)); + console.log(' Config could not be parsed: %s', (0, node_util_1.styleText)('yellow', configPath)); console.log(''); } } @@ -352,8 +352,8 @@ function hintFile(filepath, ruleset) { function hintStdin(ruleset, callback) { process.stdin.setEncoding('utf8'); const buffers = []; - process.stdin.on('data', (text) => { - buffers.push(text); + process.stdin.on('data', (chunk) => { + buffers.push(typeof chunk === 'string' ? chunk : chunk.toString('utf8')); }); process.stdin.on('end', () => { const content = buffers.join(''); @@ -375,4 +375,4 @@ function hintUrl(url, ruleset, callback) { } }, errorFn); } -//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"htmlhint.js","sourceRoot":"","sources":["../../src/cli/htmlhint.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index a6ece1855..bffad5a75 100644 --- a/package-lock.json +++ b/package-lock.json @@ -10,7 +10,6 @@ "license": "MIT", "dependencies": { "async": "3.2.6", - "chalk": "4.1.2", "commander": "11.1.0", "glob": "^13.0.6", "is-glob": "^4.0.3", @@ -28,6 +27,7 @@ "@rollup/plugin-terser": "^0.4.4", "@types/async": "^3.2.25", "@types/is-glob": "4.0.4", + "@types/node": "^20.19.0", "@types/xml": "^1.0.11", "@typescript-eslint/eslint-plugin": "8.57.1", "@typescript-eslint/parser": "8.57.1", @@ -2029,10 +2029,14 @@ "license": "MIT" }, "node_modules/@types/node": { - "version": "12.7.2", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz", - "integrity": "sha512-dyYO+f6ihZEtNPDcWNR1fkoTDf3zAK3lAABDze3mz6POyIercH0lEUawUFXlG8xaQZmm1yEBON/4TsYv/laDYg==", - "dev": true + "version": "20.19.37", + "resolved": "https://registry.npmjs.org/@types/node/-/node-20.19.37.tgz", + "integrity": "sha512-8kzdPJ3FsNsVIurqBs7oodNnCEVbni9yUEkaHbgptDACOPW04jimGagZ51E6+lXUwJjgnBw+hyko/lkFWCldqw==", + "dev": true, + "license": "MIT", + "dependencies": { + "undici-types": "~6.21.0" + } }, "node_modules/@types/resolve": { "version": "1.20.2", @@ -2707,6 +2711,7 @@ "version": "4.3.0", "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz", "integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==", + "dev": true, "license": "MIT", "dependencies": { "color-convert": "^2.0.1" @@ -2985,6 +2990,7 @@ "version": "4.1.2", "resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz", "integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==", + "dev": true, "license": "MIT", "dependencies": { "ansi-styles": "^4.1.0", @@ -3067,6 +3073,7 @@ "version": "2.0.1", "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz", "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==", + "dev": true, "license": "MIT", "dependencies": { "color-name": "~1.1.4" @@ -3079,6 +3086,7 @@ "version": "1.1.4", "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz", "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==", + "dev": true, "license": "MIT" }, "node_modules/commander": { @@ -3992,6 +4000,7 @@ "version": "4.0.0", "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz", "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==", + "dev": true, "license": "MIT", "engines": { "node": ">=8" @@ -6040,6 +6049,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, "license": "MIT", "dependencies": { "has-flag": "^4.0.0" @@ -6249,6 +6259,13 @@ "node": ">=14.17" } }, + "node_modules/undici-types": { + "version": "6.21.0", + "resolved": "https://registry.npmjs.org/undici-types/-/undici-types-6.21.0.tgz", + "integrity": "sha512-iwDZqg0QAGrg9Rav5H4n0M64c3mkR59cJ6wQp+7C4nI0gsmExaedaYLNO44eT4AtBBwjbTiGPMlt2Md0T9H9JQ==", + "dev": true, + "license": "MIT" + }, "node_modules/universalify": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz", diff --git a/package.json b/package.json index 9afa3d055..4662e6afe 100644 --- a/package.json +++ b/package.json @@ -50,7 +50,6 @@ }, "dependencies": { "async": "3.2.6", - "chalk": "4.1.2", "commander": "11.1.0", "glob": "^13.0.6", "is-glob": "^4.0.3", @@ -59,6 +58,7 @@ "xml": "1.0.1" }, "devDependencies": { + "@types/node": "^20.19.0", "@eslint/js": "^10.0.0", "@rollup/plugin-commonjs": "28.0.6", "@rollup/plugin-node-resolve": "16.0.3", diff --git a/src/cli/formatter.ts b/src/cli/formatter.ts index 08f77df5f..f95a55381 100644 --- a/src/cli/formatter.ts +++ b/src/cli/formatter.ts @@ -1,5 +1,5 @@ -import * as chalk from 'chalk' import { EventEmitter } from 'events' +import { styleText } from 'node:util' import { globSync } from 'glob' import { parse, resolve } from 'path' import type { HTMLHint as IHTMLHint } from '../core/core' @@ -91,7 +91,7 @@ formatter.setFormat = function (format) { if (formatHandel === undefined) { console.log( - chalk.red('No supported formatter, supported formatters: %s'), + styleText('red', 'No supported formatter, supported formatters: %s'), arrSupportedFormatters.join(', ') ) process.exit(1) diff --git a/src/cli/formatters/compact.ts b/src/cli/formatters/compact.ts index b4d108706..43ee46702 100644 --- a/src/cli/formatters/compact.ts +++ b/src/cli/formatters/compact.ts @@ -1,4 +1,4 @@ -import * as chalk from 'chalk' +import { styleText } from 'node:util' import { FormatterCallback } from '../formatter' const compactFormatter: FormatterCallback = function ( @@ -8,9 +8,6 @@ const compactFormatter: FormatterCallback = function ( ) { const nocolor = options.nocolor - const chalkInstance = - nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk - formatter.on('file', (event) => { event.messages.forEach((message) => { console.log( @@ -31,7 +28,7 @@ const compactFormatter: FormatterCallback = function ( console.log('') const message = '%d problems' console.log( - nocolor ? message : chalkInstance.red(message), + nocolor ? message : styleText('red', message), event.allHintCount ) } diff --git a/src/cli/formatters/default.ts b/src/cli/formatters/default.ts index 8b272939c..b394efb58 100644 --- a/src/cli/formatters/default.ts +++ b/src/cli/formatters/default.ts @@ -1,4 +1,4 @@ -import * as chalk from 'chalk' +import { styleText } from 'node:util' import { FormatterCallback } from '../formatter' const defaultFormatter: FormatterCallback = function ( @@ -16,13 +16,13 @@ const defaultFormatter: FormatterCallback = function ( const configPath = event.configPath! console.log( ' Config loaded: %s', - nocolor ? configPath : chalk.cyan(configPath) + nocolor ? configPath : styleText('cyan', configPath) ) console.log('') }) formatter.on('file', (event) => { - console.log(` ${chalk.white(event.file)}`) + console.log(` ${styleText('white', event.file)}`) const arrLogs = HTMLHint.format(event.messages, { colors: !nocolor, @@ -46,7 +46,7 @@ const defaultFormatter: FormatterCallback = function ( if (allHintCount > 0) { message = 'Scanned %d files, found %d errors in %d files (%d ms)' console.log( - nocolor ? message : chalk.red(message), + nocolor ? message : styleText('red', message), allFileCount, allHintCount, allHintFileCount, @@ -54,7 +54,11 @@ const defaultFormatter: FormatterCallback = function ( ) } else { message = 'Scanned %d files, no errors found (%d ms).' - console.log(nocolor ? message : chalk.green(message), allFileCount, time) + console.log( + nocolor ? message : styleText('green', message), + allFileCount, + time + ) } }) } diff --git a/src/cli/formatters/unix.ts b/src/cli/formatters/unix.ts index 6ab8f061a..b95eec94f 100644 --- a/src/cli/formatters/unix.ts +++ b/src/cli/formatters/unix.ts @@ -1,4 +1,4 @@ -import * as chalk from 'chalk' +import { styleText } from 'node:util' import { FormatterCallback } from '../formatter' const unixFormatter: FormatterCallback = function ( @@ -8,9 +8,6 @@ const unixFormatter: FormatterCallback = function ( ) { const nocolor = options.nocolor - const chalkInstance = - nocolor !== false ? new chalk.Instance({ level: 1 }) : chalk - formatter.on('file', (event) => { event.messages.forEach((message) => { console.log( @@ -30,7 +27,7 @@ const unixFormatter: FormatterCallback = function ( console.log('') const message = '%d problems' console.log( - nocolor ? message : chalkInstance.red(message), + nocolor ? message : styleText('red', message), event.allHintCount ) } diff --git a/src/cli/htmlhint.ts b/src/cli/htmlhint.ts index e343e60e6..5bb530d11 100644 --- a/src/cli/htmlhint.ts +++ b/src/cli/htmlhint.ts @@ -1,12 +1,12 @@ #!/usr/bin/env node import { queue as asyncQueue, series as asyncSeries } from 'async' -import * as chalk from 'chalk' import { Command } from 'commander' import { existsSync, readFileSync, statSync, writeFileSync } from 'fs' import { globStream, globSync } from 'glob' -import { parseGlob } from './parse-glob' import { dirname, resolve, sep } from 'path' +import { styleText } from 'node:util' +import { parseGlob } from './parse-glob' // Native fetch is available in Node.js 18+ import * as stripJsonComments from 'strip-json-comments' import type { HTMLHint as IHTMLHint } from '../core/core' @@ -123,7 +123,7 @@ function listRules() { for (const id of ruleIds) { const rule = rules[id] - console.log(' %s : %s', chalk.bold(rule.id), rule.description) + console.log(' %s : %s', styleText('bold', rule.id), rule.description) } } @@ -135,23 +135,26 @@ function initConfig(): boolean { try { // Use 'wx' flag to create file only if it doesn't exist (atomic operation) writeFileSync(configPath, defaultConfig, { encoding: 'utf-8', flag: 'wx' }) - console.log(chalk.green('Created configuration file: %s'), configPath) + console.log( + styleText('green', 'Created configuration file: %s'), + configPath + ) console.log('') console.log('Configuration file contents:') - console.log(chalk.gray(defaultConfig)) + console.log(styleText('gray', defaultConfig)) return true } catch (error) { // Check if the error is because the file already exists if (error instanceof Error && 'code' in error && error.code === 'EEXIST') { console.log( - chalk.yellow('Configuration file already exists: %s'), + styleText('yellow', 'Configuration file already exists: %s'), configPath ) return true // File exists is a successful state - no error } console.log( - chalk.red('Failed to create configuration file: %s'), + styleText('red', 'Failed to create configuration file: %s'), error instanceof Error ? error.message : String(error) ) return false @@ -436,7 +439,10 @@ function getConfig( }) return ruleset } catch (e) { - console.log(' Config could not be parsed: %s', chalk.yellow(configPath)) + console.log( + ' Config could not be parsed: %s', + styleText('yellow', configPath) + ) console.log('') } } @@ -510,8 +516,8 @@ function hintStdin( const buffers: string[] = [] - process.stdin.on('data', (text) => { - buffers.push(text) + process.stdin.on('data', (chunk: string) => { + buffers.push(chunk) }) process.stdin.on('end', () => { diff --git a/test/cli/formatters/compact.spec.js b/test/cli/formatters/compact.spec.js index 955a444f0..22659c5b6 100644 --- a/test/cli/formatters/compact.spec.js +++ b/test/cli/formatters/compact.spec.js @@ -23,6 +23,13 @@ describe('CLI', () => { '--format', 'compact', ].join(' '), + { + env: (() => { + const env = { ...process.env, FORCE_COLOR: '1' } + delete env.NO_COLOR + return env + })(), + }, (error, stdout, stderr) => { // HTMLHint should exit with code 1 when errors are found if (error) { diff --git a/test/cli/formatters/unix.spec.js b/test/cli/formatters/unix.spec.js index 63e87757a..f3a0bf8c4 100644 --- a/test/cli/formatters/unix.spec.js +++ b/test/cli/formatters/unix.spec.js @@ -24,6 +24,13 @@ describe('CLI', () => { '--format', 'unix', ].join(' '), + { + env: (() => { + const env = { ...process.env, FORCE_COLOR: '1' } + delete env.NO_COLOR + return env + })(), + }, (error, stdout, stderr) => { // HTMLHint should exit with code 1 when errors are found if (error) {