diff --git a/dist/cli/formatter.js b/dist/cli/formatter.js index ac317fd3a..dff1400f4 100644 --- a/dist/cli/formatter.js +++ b/dist/cli/formatter.js @@ -14,12 +14,10 @@ for (const formatterName in mapFormatters) { } } function loadFormatters() { - const arrFiles = (0, glob_1.sync)('./formatters/*.js', { + const arrFiles = (0, glob_1.globSync)('./formatters/*.js', { cwd: __dirname, dot: false, nodir: true, - strict: false, - silent: true, }); const mapFormatters = {}; arrFiles.forEach((file) => { @@ -48,4 +46,4 @@ formatter.setFormat = function (format) { } }; module.exports = formatter; -//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQkFBOEI7QUFDOUIsbUNBQXFDO0FBQ3JDLCtCQUF1QztBQUN2QywrQkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxNQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxNQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLE1BQU0sYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO0lBQzFDLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ2hDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0FBQ0gsQ0FBQztBQUdELFNBQVMsY0FBYztJQUNyQixNQUFNLFFBQVEsR0FBRyxJQUFBLFdBQVEsRUFBQyxtQkFBbUIsRUFBRTtRQUM3QyxHQUFHLEVBQUUsU0FBUztRQUNkLEdBQUcsRUFBRSxLQUFLO1FBQ1YsS0FBSyxFQUFFLElBQUk7UUFDWCxNQUFNLEVBQUUsS0FBSztRQUNiLE1BQU0sRUFBRSxJQUFJO0tBQ2IsQ0FBQyxDQUFBO0lBRUYsTUFBTSxhQUFhLEdBQTBDLEVBQUUsQ0FBQTtJQUMvRCxRQUFRLENBQUMsT0FBTyxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUU7UUFDeEIsTUFBTSxRQUFRLEdBQUcsSUFBQSxZQUFLLEVBQUMsSUFBSSxDQUFDLENBQUE7UUFDNUIsTUFBTSxhQUFhLEdBQUcsSUFBQSxjQUFPLEVBQUMsU0FBUyxFQUFFLElBQUksQ0FBQyxDQUFBO1FBQzlDLGFBQWEsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLEdBQUcsT0FBTyxDQUFDLGFBQWEsQ0FBQyxDQUFBO0lBQ3ZELENBQUMsQ0FBQyxDQUFBO0lBRUYsT0FBTyxhQUFhLENBQUE7QUFDdEIsQ0FBQztBQXlDRCxNQUFNLFNBQVMsR0FBYyxJQUFJLHFCQUFZLEVBQWUsQ0FBQTtBQUU1RCxTQUFTLENBQUMsWUFBWSxHQUFHO0lBQ3ZCLE9BQU8sc0JBQXNCLENBQUE7QUFDL0IsQ0FBQyxDQUFBO0FBRUQsU0FBUyxDQUFDLElBQUksR0FBRyxVQUFVLFdBQVcsRUFBRSxVQUFVO0lBQ2hELFFBQVEsR0FBRyxXQUFXLENBQUE7SUFDdEIsT0FBTyxHQUFHLFVBQVUsQ0FBQTtBQUN0QixDQUFDLENBQUE7QUFFRCxTQUFTLENBQUMsU0FBUyxHQUFHLFVBQVUsTUFBTTtJQUNwQyxNQUFNLFlBQVksR0FBRyxhQUFhLENBQUMsTUFBTSxDQUFDLENBQUE7SUFFMUMsSUFBSSxZQUFZLEtBQUssU0FBUyxFQUFFLENBQUM7UUFDL0IsT0FBTyxDQUFDLEdBQUcsQ0FDVCxLQUFLLENBQUMsR0FBRyxDQUFDLGtEQUFrRCxDQUFDLEVBQzdELHNCQUFzQixDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FDbEMsQ0FBQTtRQUNELE9BQU8sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUE7SUFDakIsQ0FBQztTQUFNLENBQUM7UUFDTixZQUFZLENBQUMsU0FBUyxFQUFFLFFBQVEsRUFBRSxPQUFPLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0FBQ0gsQ0FBQyxDQUFBO0FBUUQsTUFBTSxDQUFDLE9BQU8sR0FBRyxTQUFTLENBQUEifQ== \ No newline at end of file +//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZm9ybWF0dGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL2NsaS9mb3JtYXR0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFBQSwrQkFBOEI7QUFDOUIsbUNBQXFDO0FBQ3JDLCtCQUErQjtBQUMvQiwrQkFBcUM7QUFJckMsSUFBSSxRQUEwQixDQUFBO0FBQzlCLElBQUksT0FBOEIsQ0FBQTtBQUdsQyxNQUFNLGFBQWEsR0FBRyxjQUFjLEVBQUUsQ0FBQTtBQUN0QyxNQUFNLHNCQUFzQixHQUFhLEVBQUUsQ0FBQTtBQUUzQyxLQUFLLE1BQU0sYUFBYSxJQUFJLGFBQWEsRUFBRSxDQUFDO0lBQzFDLElBQUksYUFBYSxLQUFLLFNBQVMsRUFBRSxDQUFDO1FBQ2hDLHNCQUFzQixDQUFDLElBQUksQ0FBQyxhQUFhLENBQUMsQ0FBQTtJQUM1QyxDQUFDO0FBQ0gsQ0FBQztBQUdELFNBQVMsY0FBYztJQUNyQixNQUFNLFFBQVEsR0FBRyxJQUFBLGVBQVEsRUFBQyxtQkFBbUIsRUFBRTtRQUM3QyxHQUFHLEVBQUUsU0FBUztRQUNkLEdBQUcsRUFBRSxLQUFLO1FBQ1YsS0FBSyxFQUFFLElBQUk7S0FDWixDQUFDLENBQUE7SUFFRixNQUFNLGFBQWEsR0FBMEMsRUFBRSxDQUFBO0lBQy9ELFFBQVEsQ0FBQyxPQUFPLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRTtRQUN4QixNQUFNLFFBQVEsR0FBRyxJQUFBLFlBQUssRUFBQyxJQUFJLENBQUMsQ0FBQTtRQUM1QixNQUFNLGFBQWEsR0FBRyxJQUFBLGNBQU8sRUFBQyxTQUFTLEVBQUUsSUFBSSxDQUFDLENBQUE7UUFDOUMsYUFBYSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsR0FBRyxPQUFPLENBQUMsYUFBYSxDQUFDLENBQUE7SUFDdkQsQ0FBQyxDQUFDLENBQUE7SUFFRixPQUFPLGFBQWEsQ0FBQTtBQUN0QixDQUFDO0FBeUNELE1BQU0sU0FBUyxHQUFjLElBQUkscUJBQVksRUFBZSxDQUFBO0FBRTVELFNBQVMsQ0FBQyxZQUFZLEdBQUc7SUFDdkIsT0FBTyxzQkFBc0IsQ0FBQTtBQUMvQixDQUFDLENBQUE7QUFFRCxTQUFTLENBQUMsSUFBSSxHQUFHLFVBQVUsV0FBVyxFQUFFLFVBQVU7SUFDaEQsUUFBUSxHQUFHLFdBQVcsQ0FBQTtJQUN0QixPQUFPLEdBQUcsVUFBVSxDQUFBO0FBQ3RCLENBQUMsQ0FBQTtBQUVELFNBQVMsQ0FBQyxTQUFTLEdBQUcsVUFBVSxNQUFNO0lBQ3BDLE1BQU0sWUFBWSxHQUFHLGFBQWEsQ0FBQyxNQUFNLENBQUMsQ0FBQTtJQUUxQyxJQUFJLFlBQVksS0FBSyxTQUFTLEVBQUUsQ0FBQztRQUMvQixPQUFPLENBQUMsR0FBRyxDQUNULEtBQUssQ0FBQyxHQUFHLENBQUMsa0RBQWtELENBQUMsRUFDN0Qsc0JBQXNCLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUNsQyxDQUFBO1FBQ0QsT0FBTyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUNqQixDQUFDO1NBQU0sQ0FBQztRQUNOLFlBQVksQ0FBQyxTQUFTLEVBQUUsUUFBUSxFQUFFLE9BQU8sQ0FBQyxDQUFBO0lBQzVDLENBQUM7QUFDSCxDQUFDLENBQUE7QUFRRCxNQUFNLENBQUMsT0FBTyxHQUFHLFNBQVMsQ0FBQSJ9 \ No newline at end of file diff --git a/dist/cli/htmlhint.js b/dist/cli/htmlhint.js index b0ec27e79..37e23fd88 100644 --- a/dist/cli/htmlhint.js +++ b/dist/cli/htmlhint.js @@ -5,7 +5,7 @@ const async_1 = require("async"); const chalk = require("chalk"); const commander_1 = require("commander"); const fs_1 = require("fs"); -const glob = require("glob"); +const glob_1 = require("glob"); const parse_glob_1 = require("./parse-glob"); const path_1 = require("path"); const stripJsonComments = require("strip-json-comments"); @@ -151,11 +151,9 @@ function loadCustomRules(rulesdir) { if ((0, fs_1.statSync)(rulesdir).isDirectory()) { rulesdir += /\/$/.test(rulesdir) ? '' : '/'; rulesdir += '**/*.js'; - const arrFiles = glob.sync(rulesdir, { + const arrFiles = (0, glob_1.globSync)(rulesdir, { dot: false, nodir: true, - strict: false, - silent: true, }); arrFiles.forEach((file) => { loadRule(file); @@ -323,23 +321,22 @@ function walkPath(globInfo, callback, onFinish) { arrIgnores.push(pattern); }); } - const walk = glob(pattern, { + const walk = (0, glob_1.globStream)(pattern, { cwd: base, dot: false, ignore: arrIgnores, nodir: true, - strict: false, - silent: true, - }, () => { - onFinish(); }); - walk.on('match', (file) => { + walk.on('data', (file) => { base = base.replace(/^.\//, ''); if (path_1.sep !== '/') { base = base.replace(/\//g, path_1.sep); } callback(base + file); }); + walk.on('end', () => { + onFinish(); + }); } function hintFile(filepath, ruleset) { let content = ''; @@ -376,4 +373,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":";;;AAEA,iCAAkE;AAClE,+BAA8B;AAC9B,yCAAmC;AACnC,2BAAsE;AACtE,+BAA2C;AAC3C,6CAAwC;AACxC,+BAA4C;AAE5C,yDAAwD;AAKxD,MAAM,QAAQ,GAAqB,OAAO,CAAC,gBAAgB,CAAC,CAAC,QAAQ,CAAA;AACrE,MAAM,SAAS,GAAc,OAAO,CAAC,aAAa,CAAC,CAAA;AAEnD,MAAM,GAAG,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;AAEzC,SAAS,GAAG,CAAC,GAAW;IACtB,MAAM,MAAM,GAAsC,EAAE,CAAA;IACpD,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;QAC9B,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAA;QACrC,MAAM,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;IACrD,CAAC,CAAC,CAAA;IACF,OAAO,MAAM,CAAA;AACf,CAAC;AAED,MAAM,OAAO,GAAG,IAAI,mBAAO,EAAE,CAAA;AAE7B,OAAO,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,EAAE;IACxB,OAAO,CAAC,GAAG,CAAC,aAAa,CAAC,CAAA;IAC1B,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;IACf,OAAO,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;IAC3B,OAAO,CAAC,GAAG,CAAC,kBAAkB,CAAC,CAAA;IAC/B,OAAO,CAAC,GAAG,CAAC,4BAA4B,CAAC,CAAA;IACzC,OAAO,CAAC,GAAG,CAAC,6BAA6B,CAAC,CAAA;IAC1C,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;IAC/C,OAAO,CAAC,GAAG,CAAC,uCAAuC,CAAC,CAAA;IACpD,OAAO,CAAC,GAAG,CAAC,oCAAoC,CAAC,CAAA;IACjD,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IAClC,OAAO,CAAC,GAAG,CAAC,qBAAqB,CAAC,CAAA;IAClC,OAAO,CAAC,GAAG,CACT,kEAAkE,CACnE,CAAA;IACD,OAAO,CAAC,GAAG,CAAC,6CAA6C,CAAC,CAAA;IAC1D,OAAO,CAAC,GAAG,CAAC,8CAA8C,CAAC,CAAA;IAC3D,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAA;IAC/C,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;AACjB,CAAC,CAAC,CAAA;AAEF,MAAM,sBAAsB,GAAG,SAAS,CAAC,YAAY,EAAE,CAAA;AAEvD,OAAO;KACJ,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC;KACpB,KAAK,CAAC,+CAA+C,CAAC;KACtD,MAAM,CAAC,YAAY,EAAE,iCAAiC,CAAC;KACvD,MAAM,CAAC,QAAQ,EAAE,yDAAyD,CAAC;KAC3E,MAAM,CAAC,qBAAqB,EAAE,2BAA2B,CAAC;KAC1D,MAAM,CACL,wCAAwC,EACxC,gCAAgC,EAChC,GAAG,CACJ;KACA,MAAM,CACL,8BAA8B,EAC9B,uCAAuC,CACxC;KACA,MAAM,CACL,iBAAiB,sBAAsB,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,EACpD,kCAAkC,CACnC;KACA,MAAM,CACL,qCAAqC,EACrC,gCAAgC,CACjC;KACA,MAAM,CAAC,WAAW,EAAE,eAAe,CAAC;KACpC,MAAM,CAAC,QAAQ,EAAE,wBAAwB,CAAC;KAC1C,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAA;AAEtB,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,EAAE,CAAA;AAEjC,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;IACpB,SAAS,EAAE,CAAA;IACX,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAA;AACjB,CAAC;AAED,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;IACpB,MAAM,OAAO,GAAG,UAAU,EAAE,CAAA;IAC5B,OAAO,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;AAC/B,CAAC;AAED,MAAM,UAAU,GAAG,OAAO,CAAC,IAAI,CAAA;AAC/B,IAAI,UAAU,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;IAC5B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;AACvB,CAAC;AAGD,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;IACvB,OAAO,EAAE,UAAU,CAAC,OAAO;CAC5B,CAAC,CAAA;AAEF,MAAM,MAAM,GAAG,UAAU,CAAC,MAAM,IAAI,SAAS,CAAA;AAC7C,IAAI,MAAM,EAAE,CAAC;IACX,SAAS,CAAC,SAAS,CAAC,MAAM,CAAC,CAAA;AAC7B,CAAC;AAED,WAAW,CAAC,UAAU,EAAE;IACtB,QAAQ,EAAE,UAAU,CAAC,QAAQ;IAC7B,OAAO,EAAE,UAAU,CAAC,KAAK;IACzB,SAAS,EAAE,SAAS;IACpB,MAAM,EAAE,UAAU,CAAC,MAAM;CAC1B,CAAC,CAAA;AAGF,SAAS,SAAS;IAChB,MAAM,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAA;IAC5B,MAAM,OAAO,GAAG,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAA;IAEzC,OAAO,CAAC,GAAG,CAAC,iBAAiB,CAAC,CAAA;IAC9B,OAAO,CAAC,GAAG,CAAC,qDAAqD,CAAC,CAAA;IAElE,KAAK,MAAM,EAAE,IAAI,OAAO,EAAE,CAAC;QACzB,MAAM,IAAI,GAAG,KAAK,CAAC,EAAE,CAAC,CAAA;QACtB,OAAO,CAAC,GAAG,CAAC,cAAc,EAAE,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,CAAA;IACpE,CAAC;AACH,CAAC;AAGD,SAAS,UAAU;IACjB,MAAM,UAAU,GAAG,aAAa,CAAA;IAChC,MAAM,aAAa,GAAG,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,cAAc,EAAE,IAAI,EAAE,CAAC,CAAC,CAAA;IAEtE,IAAI,CAAC;QAEH,IAAA,kBAAa,EAAC,UAAU,EAAE,aAAa,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,CAAA;QAC3E,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,KAAK,CAAC,gCAAgC,CAAC,EAAE,UAAU,CAAC,CAAA;QACtE,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACf,OAAO,CAAC,GAAG,CAAC,8BAA8B,CAAC,CAAA;QAC3C,OAAO,CAAC,GAAG,CAAC,KAAK,CAAC,IAAI,CAAC,aAAa,CAAC,CAAC,CAAA;QACtC,OAAO,IAAI,CAAA;IACb,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QAEf,IAAI,KAAK,YAAY,KAAK,IAAI,MAAM,IAAI,KAAK,IAAI,KAAK,CAAC,IAAI,KAAK,QAAQ,EAAE,CAAC;YACzE,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,MAAM,CAAC,uCAAuC,CAAC,EACrD,UAAU,CACX,CAAA;YACD,OAAO,IAAI,CAAA;QACb,CAAC;QAED,OAAO,CAAC,GAAG,CACT,KAAK,CAAC,GAAG,CAAC,yCAAyC,CAAC,EACpD,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CACvD,CAAA;QACD,OAAO,KAAK,CAAA;IACd,CAAC;AACH,CAAC;AAED,SAAS,WAAW,CAClB,UAAoB,EACpB,OAKC;IAED,IAAI,cAAc,GAIb,EAAE,CAAA;IACP,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,IAAI,gBAAgB,GAAG,CAAC,CAAA;IACxB,IAAI,YAAY,GAAG,CAAC,CAAA;IACpB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;IAEtC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;IAGnC,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAQ,CAAA;IACjC,IAAI,QAAQ,EAAE,CAAC;QACb,eAAe,CAAC,QAAQ,CAAC,CAAA;IAC3B,CAAC;IAGD,SAAS,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IAEvB,MAAM,QAAQ,GAAsC,EAAE,CAAA;IACtD,UAAU,CAAC,OAAO,CAAC,CAAC,MAAM,EAAE,EAAE;QAC5B,QAAQ,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;YACrB,YAAY,CAAC,MAAM,EAAE,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE;gBACvC,YAAY,IAAI,MAAM,CAAC,eAAe,CAAA;gBACtC,gBAAgB,IAAI,MAAM,CAAC,mBAAmB,CAAA;gBAC9C,YAAY,IAAI,MAAM,CAAC,eAAe,CAAA;gBACtC,cAAc,GAAG,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,iBAAiB,CAAC,CAAA;gBAChE,IAAI,EAAE,CAAA;YACR,CAAC,CAAC,CAAA;QACJ,CAAC,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;IAEF,IAAA,cAAW,EAAC,QAAQ,EAAE,GAAG,EAAE;QAEzB,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAA;QAClD,SAAS,CAAC,IAAI,CAAC,KAAK,EAAE;YACpB,cAAc,EAAE,cAAc;YAC9B,YAAY,EAAE,YAAY;YAC1B,gBAAgB,EAAE,gBAAgB;YAClC,YAAY,EAAE,YAAY;YAC1B,IAAI,EAAE,SAAS;SAChB,CAAC,CAAA;QACF,OAAO,CAAC,IAAI,CAAC,CAAC,UAAU,CAAC,IAAI,IAAI,YAAY,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAC5D,CAAC,CAAC,CAAA;AACJ,CAAC;AAGD,SAAS,eAAe,CAAC,QAAgB;IACvC,QAAQ,GAAG,QAAQ,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IACvC,IAAI,IAAA,eAAU,EAAC,QAAQ,CAAC,EAAE,CAAC;QACzB,IAAI,IAAA,aAAQ,EAAC,QAAQ,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YACrC,QAAQ,IAAI,KAAK,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;YAC3C,QAAQ,IAAI,SAAS,CAAA;YACrB,MAAM,QAAQ,GAAG,IAAA,eAAQ,EAAC,QAAQ,EAAE;gBAClC,GAAG,EAAE,KAAK;gBACV,KAAK,EAAE,IAAI;aACZ,CAAC,CAAA;YACF,QAAQ,CAAC,OAAO,CAAC,CAAC,IAAY,EAAE,EAAE;gBAChC,QAAQ,CAAC,IAAI,CAAC,CAAA;YAChB,CAAC,CAAC,CAAA;QACJ,CAAC;aAAM,CAAC;YACN,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACpB,CAAC;IACH,CAAC;AACH,CAAC;AAGD,SAAS,QAAQ,CAAC,QAAgB;IAChC,QAAQ,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,CAAA;IAC5B,IAAI,CAAC;QACH,MAAM,MAAM,GAAG,OAAO,CAAC,QAAQ,CAAC,CAAA;QAChC,MAAM,CAAC,QAAQ,CAAC,CAAA;IAClB,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;IAEb,CAAC;AACH,CAAC;AAGD,SAAS,YAAY,CACnB,MAAc,EACd,OAIC,EACD,UASU;IAEV,MAAM,QAAQ,GAAG,WAAW,CAAC,MAAM,CAAC,CAAA;IACpC,QAAQ,CAAC,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAEhC,MAAM,SAAS,GAAG,OAAO,CAAC,SAAS,CAAA;IAGnC,IAAI,eAAe,GAAG,CAAC,CAAA;IACvB,IAAI,mBAAmB,GAAG,CAAC,CAAA;IAC3B,IAAI,eAAe,GAAG,CAAC,CAAA;IACvB,MAAM,iBAAiB,GAIlB,EAAE,CAAA;IAGP,IAAI,OAAO,GAAG,OAAO,CAAC,OAAO,CAAA;IAC7B,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;QAC1B,OAAO,GAAG,SAAS,CAAC,UAAU,CAAC,MAAM,EAAE,QAAQ,CAAC,IAAI,EAAE,SAAS,CAAC,CAAA;IAClE,CAAC;IAGD,MAAM,SAAS,GAAG,IAAA,aAAU,EAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,EAAE;QACtD,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,CAAA;QAEtC,IAAI,QAAQ,KAAK,OAAO,EAAE,CAAC;YACzB,SAAS,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAA;QAC9B,CAAC;aAAM,IAAI,cAAc,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;YACzC,OAAO,CAAC,QAAQ,EAAE,OAAO,EAAE,QAAQ,CAAC,CAAA;QACtC,CAAC;aAAM,CAAC;YACN,MAAM,QAAQ,GAAG,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;YAC5C,QAAQ,CAAC,QAAQ,CAAC,CAAA;QACpB,CAAC;QAED,SAAS,QAAQ,CAAC,QAAgB;YAChC,MAAM,SAAS,GAAG,IAAI,IAAI,EAAE,CAAC,OAAO,EAAE,GAAG,SAAS,CAAA;YAClD,MAAM,SAAS,GAAG,QAAQ,CAAC,MAAM,CAAA;YACjC,IAAI,SAAS,GAAG,CAAC,EAAE,CAAC;gBAClB,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE;oBACrB,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,QAAQ;oBAClB,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAA;gBACF,iBAAiB,CAAC,IAAI,CAAC;oBACrB,IAAI,EAAE,QAAQ;oBACd,QAAQ,EAAE,QAAQ;oBAClB,IAAI,EAAE,SAAS;iBAChB,CAAC,CAAA;gBACF,mBAAmB,EAAE,CAAA;gBACrB,eAAe,IAAI,SAAS,CAAA;YAC9B,CAAC;YACD,eAAe,EAAE,CAAA;YACjB,YAAY,CAAC,IAAI,CAAC,CAAA;QACpB,CAAC;IACH,CAAC,EAAE,EAAE,CAAC,CAAA;IAGN,IAAI,UAAU,GAAG,KAAK,CAAA;IACtB,IAAI,UAAU,GAAG,IAAI,CAAA;IACrB,SAAS,CAAC,KAAK,CAAC,GAAG,EAAE;QACnB,UAAU,GAAG,IAAI,CAAA;QACjB,cAAc,EAAE,CAAA;IAClB,CAAC,CAAC,CAAA;IAEF,SAAS,cAAc;QACrB,IAAI,UAAU,IAAI,UAAU,EAAE,CAAC;YAC7B,UAAU,CAAC;gBACT,eAAe,EAAE,eAAe;gBAChC,mBAAmB,EAAE,mBAAmB;gBACxC,eAAe,EAAE,eAAe;gBAChC,iBAAiB,EAAE,iBAAiB;aACrC,CAAC,CAAA;QACJ,CAAC;IACH,CAAC;IAED,IAAI,MAAM,KAAK,OAAO,EAAE,CAAC;QACvB,UAAU,GAAG,IAAI,CAAA;QACjB,KAAK,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;SAAM,IAAI,cAAc,CAAC,IAAI,CAAC,MAAM,CAAC,EAAE,CAAC;QACvC,UAAU,GAAG,IAAI,CAAA;QACjB,KAAK,SAAS,CAAC,IAAI,CAAC,MAAM,CAAC,CAAA;IAC7B,CAAC;SAAM,CAAC;QACN,QAAQ,CACN,QAAQ,EACR,CAAC,QAAQ,EAAE,EAAE;YACX,UAAU,GAAG,KAAK,CAAA;YAClB,KAAK,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAA;QAC/B,CAAC,EACD,GAAG,EAAE;YACH,UAAU,GAAG,IAAI,CAAA;YACjB,cAAc,EAAE,CAAA;QAClB,CAAC,CACF,CAAA;IACH,CAAC;AACH,CAAC;AAGD,SAAS,WAAW,CAAC,MAAc;IAMjC,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,KAAK,EAAE,GAAG,CAAC,CAAA;IAEnC,MAAM,QAAQ,GAAG,IAAA,sBAAS,EAAC,MAAM,CAAC,CAAA;IAClC,IAAI,IAAI,GAAG,IAAA,cAAO,EAAC,QAAQ,CAAC,IAAI,CAAC,CAAA;IAEjC,IAAI,IAAI,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,CAAA;IAEnC,IAAI,OAAO,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC3B,MAAM,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAA;IAC9B,MAAM,WAAW,GAAG,cAAc,CAAA;IAElC,IAAI,QAAQ,CAAC,EAAE,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QAE9B,IAAI,QAAQ,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;YAC7B,OAAO,IAAI,WAAW,CAAA;QACxB,CAAC;IACH,CAAC;SAAM,CAAC;QAEN,IAAI,QAAQ,CAAC,QAAQ,KAAK,EAAE,EAAE,CAAC;YAC7B,OAAO,IAAI,MAAM,WAAW,EAAE,CAAA;QAChC,CAAC;aAEI,IAAI,IAAA,eAAU,EAAC,MAAM,CAAC,IAAI,IAAA,aAAQ,EAAC,MAAM,CAAC,CAAC,WAAW,EAAE,EAAE,CAAC;YAC9D,IAAI,IAAI,GAAG,QAAQ,CAAC,QAAQ,GAAG,CAAA;YAC/B,OAAO,GAAG,MAAM,WAAW,EAAE,CAAA;QAC/B,CAAC;IACH,CAAC;IAED,OAAO;QACL,IAAI,EAAE,IAAI;QACV,OAAO,EAAE,OAAO;KACjB,CAAA;AACH,CAAC;AAGD,SAAS,SAAS,CAChB,UAA8B,EAC9B,IAAY,EACZ,SAAoB;IAEpB,IAAI,UAAU,KAAK,SAAS,IAAI,IAAA,eAAU,EAAC,IAAI,CAAC,EAAE,CAAC;QAEjD,IAAI,IAAA,aAAQ,EAAC,IAAI,CAAC,CAAC,WAAW,EAAE,KAAK,KAAK,EAAE,CAAC;YAC3C,IAAI,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,CAAA;QACtB,CAAC;QAED,OAAO,IAAI,EAAE,CAAC;YACZ,MAAM,aAAa,GAAG,IAAA,cAAO,EAAC,IAAI,EAAE,aAAa,CAAC,CAAA;YAElD,IAAI,IAAA,eAAU,EAAC,aAAa,CAAC,EAAE,CAAC;gBAC9B,UAAU,GAAG,aAAa,CAAA;gBAC1B,MAAK;YACP,CAAC;YAED,IAAI,GAAG,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,UAAG,CAAC,CAAC,CAAA;QACjD,CAAC;IACH,CAAC;IAED,IAAI,UAAU,KAAK,SAAS,IAAI,IAAA,eAAU,EAAC,UAAU,CAAC,EAAE,CAAC;QACvD,MAAM,MAAM,GAAG,IAAA,iBAAY,EAAC,UAAU,EAAE,OAAO,CAAC,CAAA;QAChD,IAAI,OAAO,GAAY,EAAE,CAAA;QAEzB,IAAI,CAAC;YACH,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,CAAA;YAC/C,SAAS,CAAC,IAAI,CAAC,QAAQ,EAAE;gBACvB,OAAO,EAAE,OAAO;gBAChB,UAAU,EAAE,UAAU;aACvB,CAAC,CAAA;YACF,OAAO,OAAO,CAAA;QAChB,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,OAAO,CAAC,GAAG,CAAC,mCAAmC,EAAE,KAAK,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAA;YAC1E,OAAO,CAAC,GAAG,CAAC,EAAE,CAAC,CAAA;QACjB,CAAC;IACH,CAAC;IAGD,OAAO,SAAS,CAAA;AAClB,CAAC;AAGD,SAAS,QAAQ,CACf,QAA4D,EAC5D,QAAoC,EACpC,QAAoB;IAEpB,IAAI,IAAI,GAAW,QAAQ,CAAC,IAAI,CAAA;IAChC,MAAM,OAAO,GAAG,QAAQ,CAAC,OAAO,CAAA;IAChC,MAAM,MAAM,GAAuB,QAAQ,CAAC,MAAM,CAAA;IAClD,MAAM,UAAU,GAAG,CAAC,oBAAoB,CAAC,CAAA;IAEzC,IAAI,MAAM,EAAE,CAAC;QACX,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YACpC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;QAC1B,CAAC,CAAC,CAAA;IACJ,CAAC;IAED,MAAM,IAAI,GAAG,IAAA,iBAAU,EAAC,OAAO,EAAE;QAC/B,GAAG,EAAE,IAAI;QACT,GAAG,EAAE,KAAK;QACV,MAAM,EAAE,UAAU;QAClB,KAAK,EAAE,IAAI;KACZ,CAAC,CAAA;IAEF,IAAI,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAY,EAAE,EAAE;QAC/B,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,CAAC,CAAA;QAE/B,IAAI,UAAG,KAAK,GAAG,EAAE,CAAC;YAChB,IAAI,GAAG,IAAI,CAAC,OAAO,CAAC,KAAK,EAAE,UAAG,CAAC,CAAA;QACjC,CAAC;QAED,QAAQ,CAAC,IAAI,GAAG,IAAI,CAAC,CAAA;IACvB,CAAC,CAAC,CAAA;IAEF,IAAI,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QAClB,QAAQ,EAAE,CAAA;IACZ,CAAC,CAAC,CAAA;AACJ,CAAC;AAGD,SAAS,QAAQ,CAAC,QAAgB,EAAE,OAAiB;IACnD,IAAI,OAAO,GAAG,EAAE,CAAA;IAEhB,IAAI,CAAC;QACH,OAAO,GAAG,IAAA,iBAAY,EAAC,QAAQ,EAAE,OAAO,CAAC,CAAA;IAC3C,CAAC;IAAC,OAAO,CAAC,EAAE,CAAC;IAEb,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;AAC1C,CAAC;AAGD,SAAS,SAAS,CAChB,OAA4B,EAC5B,QAAoC;IAEpC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,MAAM,CAAC,CAAA;IAEjC,MAAM,OAAO,GAAa,EAAE,CAAA;IAE5B,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,MAAM,EAAE,CAAC,IAAI,EAAE,EAAE;QAChC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;IAEF,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,EAAE,GAAG,EAAE;QAC3B,MAAM,OAAO,GAAG,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,OAAO,EAAE,OAAO,CAAC,CAAA;QAClD,QAAQ,CAAC,QAAQ,CAAC,CAAA;IACpB,CAAC,CAAC,CAAA;AACJ,CAAC;AAGD,SAAS,OAAO,CACd,GAAW,EACX,OAA4B,EAC5B,QAAoC;IAEpC,MAAM,OAAO,GAAG,GAAG,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAA;IAClC,KAAK,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,QAAQ,EAAE,EAAE;QAC3B,IAAI,QAAQ,CAAC,EAAE,EAAE,CAAC;YAChB,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC5B,MAAM,QAAQ,GAAG,QAAQ,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAA;gBAC/C,QAAQ,CAAC,QAAQ,CAAC,CAAA;YACpB,CAAC,EAAE,OAAO,CAAC,CAAA;QACb,CAAC;aAAM,CAAC;YACN,OAAO,EAAE,CAAA;QACX,CAAC;IACH,CAAC,EAAE,OAAO,CAAC,CAAA;AACb,CAAC"} \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index cf3d72e78..328e3ebc4 100644 --- a/package-lock.json +++ b/package-lock.json @@ -12,7 +12,7 @@ "async": "3.2.6", "chalk": "4.1.2", "commander": "11.1.0", - "glob": "^8.1.0", + "glob": "^9.0.0", "is-glob": "^4.0.3", "node-sarif-builder": "^3.2.0", "strip-json-comments": "3.1.1", @@ -26,7 +26,6 @@ "@rollup/plugin-node-resolve": "16.0.1", "@rollup/plugin-terser": "^0.4.4", "@types/async": "^3.2.25", - "@types/glob": "^8.1.0", "@types/is-glob": "4.0.4", "@types/xml": "^1.0.11", "@typescript-eslint/eslint-plugin": "8.43.0", @@ -2030,17 +2029,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/@types/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-IO+MJPVhoqz+28h1qLAcBEH2+xHMK6MTyHJc7MTnnYb6wsoLR29POVGJ7LycmVXIqyy/4/2ShP5sUwTXuOwb/w==", - "dev": true, - "license": "MIT", - "dependencies": { - "@types/minimatch": "^5.1.2", - "@types/node": "*" - } - }, "node_modules/@types/is-glob": { "version": "4.0.4", "resolved": "https://registry.npmjs.org/@types/is-glob/-/is-glob-4.0.4.tgz", @@ -2082,13 +2070,6 @@ "dev": true, "license": "MIT" }, - "node_modules/@types/minimatch": { - "version": "5.1.2", - "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz", - "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA==", - "dev": true, - "license": "MIT" - }, "node_modules/@types/node": { "version": "12.7.2", "resolved": "https://registry.npmjs.org/@types/node/-/node-12.7.2.tgz", @@ -3917,20 +3898,17 @@ } }, "node_modules/glob": { - "version": "8.1.0", - "resolved": "https://registry.npmjs.org/glob/-/glob-8.1.0.tgz", - "integrity": "sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ==", - "deprecated": "Glob versions prior to v9 are no longer supported", - "license": "ISC", + "version": "9.3.5", + "resolved": "https://registry.npmjs.org/glob/-/glob-9.3.5.tgz", + "integrity": "sha512-e1LleDykUz2Iu+MTYdkSsuWX8lvAjAcs0Xef0lNIu0S2wOAzuTxCJtcd9S3cijlwYF18EsU3rzb8jPVobxDh9Q==", "dependencies": { "fs.realpath": "^1.0.0", - "inflight": "^1.0.4", - "inherits": "2", - "minimatch": "^5.0.1", - "once": "^1.3.0" + "minimatch": "^8.0.2", + "minipass": "^4.2.4", + "path-scurry": "^1.6.1" }, "engines": { - "node": ">=12" + "node": ">=16 || 14 >=14.17" }, "funding": { "url": "https://github.com/sponsors/isaacs" @@ -3986,20 +3964,58 @@ "version": "2.0.2", "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.2.tgz", "integrity": "sha512-Jt0vHyM+jmUBqojB7E1NIYadt0vI0Qxjxd2TErW94wDz+E2LAm5vKMXXwg6ZZBTHPuUlDgQHKXvjGBdfcF1ZDQ==", - "license": "MIT", "dependencies": { "balanced-match": "^1.0.0" } }, + "node_modules/glob/node_modules/lru-cache": { + "version": "10.4.3", + "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz", + "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ==" + }, "node_modules/glob/node_modules/minimatch": { - "version": "5.1.6", - "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-5.1.6.tgz", - "integrity": "sha512-lKwV/1brpG6mBUFHtb7NUmtABCb2WZZmm2wNiOA5hAb8VdCS4B3dtMWyvcoViccwAW/COERjXLt0zP1zXUN26g==", + "version": "8.0.4", + "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-8.0.4.tgz", + "integrity": "sha512-W0Wvr9HyFXZRGIDgCicunpQ299OKXs9RgZfaukz4qAW/pJhcpUfupc9c+OObPOFueNy8VSrZgEmDtk6Kh4WzDA==", "dependencies": { "brace-expansion": "^2.0.1" }, "engines": { - "node": ">=10" + "node": ">=16 || 14 >=14.17" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob/node_modules/minipass": { + "version": "4.2.8", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-4.2.8.tgz", + "integrity": "sha512-fNzuVyifolSLFL4NzpF+wEF4qrgqaaKX0haXPQEdQ7NKAN+WecoKMHV09YcuL/DHxrUsYQOK3MiuDf7Ip2OXfQ==", + "engines": { + "node": ">=8" + } + }, + "node_modules/glob/node_modules/path-scurry": { + "version": "1.11.1", + "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz", + "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==", + "dependencies": { + "lru-cache": "^10.2.0", + "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0" + }, + "engines": { + "node": ">=16 || 14 >=14.18" + }, + "funding": { + "url": "https://github.com/sponsors/isaacs" + } + }, + "node_modules/glob/node_modules/path-scurry/node_modules/minipass": { + "version": "7.1.2", + "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz", + "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==", + "engines": { + "node": ">=16 || 14 >=14.17" } }, "node_modules/globals": { @@ -4135,6 +4151,7 @@ "version": "1.0.6", "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz", "integrity": "sha1-Sb1jMdfQLQwJvJEKEHW6gWW1bfk=", + "dev": true, "dependencies": { "once": "^1.3.0", "wrappy": "1" @@ -4143,7 +4160,8 @@ "node_modules/inherits": { "version": "2.0.4", "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz", - "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==" + "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==", + "dev": true }, "node_modules/is-arrayish": { "version": "0.2.1", @@ -5463,6 +5481,7 @@ "version": "1.4.0", "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz", "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=", + "dev": true, "dependencies": { "wrappy": "1" } @@ -6592,7 +6611,8 @@ "node_modules/wrappy": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz", - "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=" + "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=", + "dev": true }, "node_modules/write-file-atomic": { "version": "5.0.1", diff --git a/package.json b/package.json index c64faa4af..ce2e02386 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,7 @@ "async": "3.2.6", "chalk": "4.1.2", "commander": "11.1.0", - "glob": "^8.1.0", + "glob": "^9.0.0", "is-glob": "^4.0.3", "node-sarif-builder": "^3.2.0", "strip-json-comments": "3.1.1", @@ -62,7 +62,6 @@ "@rollup/plugin-node-resolve": "16.0.1", "@rollup/plugin-terser": "^0.4.4", "@types/async": "^3.2.25", - "@types/glob": "^8.1.0", "@types/is-glob": "4.0.4", "@types/xml": "^1.0.11", "@typescript-eslint/eslint-plugin": "8.43.0", diff --git a/src/cli/formatter.ts b/src/cli/formatter.ts index cafbd0271..08f77df5f 100644 --- a/src/cli/formatter.ts +++ b/src/cli/formatter.ts @@ -1,6 +1,6 @@ import * as chalk from 'chalk' import { EventEmitter } from 'events' -import { sync as globSync } from 'glob' +import { globSync } from 'glob' import { parse, resolve } from 'path' import type { HTMLHint as IHTMLHint } from '../core/core' import type { Hint, Ruleset } from '../core/types' @@ -24,8 +24,6 @@ function loadFormatters() { cwd: __dirname, dot: false, nodir: true, - strict: false, - silent: true, }) const mapFormatters: { [name: string]: FormatterCallback } = {} diff --git a/src/cli/htmlhint.ts b/src/cli/htmlhint.ts index 7d9ff30fe..2491bbd55 100644 --- a/src/cli/htmlhint.ts +++ b/src/cli/htmlhint.ts @@ -4,8 +4,7 @@ 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 * as glob from 'glob' -import { IGlob } from 'glob' +import { globStream, globSync } from 'glob' import { parseGlob } from './parse-glob' import { dirname, resolve, sep } from 'path' // Native fetch is available in Node.js 18+ @@ -223,13 +222,11 @@ function loadCustomRules(rulesdir: string) { if (statSync(rulesdir).isDirectory()) { rulesdir += /\/$/.test(rulesdir) ? '' : '/' rulesdir += '**/*.js' - const arrFiles = glob.sync(rulesdir, { + const arrFiles = globSync(rulesdir, { dot: false, nodir: true, - strict: false, - silent: true, }) - arrFiles.forEach((file) => { + arrFiles.forEach((file: string) => { loadRule(file) }) } else { @@ -467,22 +464,14 @@ function walkPath( }) } - const walk: IGlob = glob( - pattern, - { - cwd: base, - dot: false, - ignore: arrIgnores, - nodir: true, - strict: false, - silent: true, - }, - () => { - onFinish() - } - ) + const walk = globStream(pattern, { + cwd: base, + dot: false, + ignore: arrIgnores, + nodir: true, + }) - walk.on('match', (file: string) => { + walk.on('data', (file: string) => { base = base.replace(/^.\//, '') if (sep !== '/') { @@ -491,6 +480,10 @@ function walkPath( callback(base + file) }) + + walk.on('end', () => { + onFinish() + }) } // hint file diff --git a/test/cli/formatters/sarif.sarif b/test/cli/formatters/sarif.sarif index 6bc40f033..ed08e0b49 100644 --- a/test/cli/formatters/sarif.sarif +++ b/test/cli/formatters/sarif.sarif @@ -26,7 +26,7 @@ "helpUri": "https://htmlhint.com/rules/attr-no-duplication", "help": { "text": "Elements cannot have duplicate attributes.", - "markdown": "\nThe same attribute can't be specified twice.\n\nLevel: Error\n\n## Config value\n\n- `true`: enable rule\n- `false`: disable rule\n\n### The following patterns are **not** considered rule violations\n\n```html\n``\n```\n\n### The following pattern is considered a rule violation:\n\n```html\n``\n```" + "markdown": "\nThe same attribute can't be specified twice.\n\nLevel: Error\n\n## Config value\n\n- `true`: enable rule\n- `false`: disable rule\n\n### The following patterns are **not** considered rule violations\n\n```html\n``\n```\n\n### The following pattern is considered a rule violation:\n\n```html\n``\n```\n\n### Why this rule is important\n\nDuplicate attributes can cause unexpected behavior and make the code harder to read and maintain." } }, { @@ -52,7 +52,7 @@ } } ], - "version": "1.5.1", + "version": "1.7.0", "informationUri": "https://htmlhint.com/" } }, diff --git a/website/.htmlhintrc b/website/.htmlhintrc index b71dd816f..a000d5815 100644 --- a/website/.htmlhintrc +++ b/website/.htmlhintrc @@ -16,10 +16,8 @@ "frame-title-require": true, "h1-require": true, "head-script-disabled": false, - "href-abs-or-rel": false, "html-lang-require": true, "id-class-ad-disabled": true, - "id-class-value": false, "id-unique": true, "inline-script-disabled": false, "inline-style-disabled": false, @@ -29,7 +27,6 @@ "meta-description-require": true, "meta-viewport-require": true, "script-disabled": false, - "space-tab-mixed-disabled": false, "spec-char-escape": false, "src-not-empty": true, "style-disabled": false,