Update and refactor glob (#1730)

* Refactor glob usage in CLI for improved API and options

Replaces deprecated or less preferred glob API usages with updated methods (globSync, globStream) in formatter and htmlhint CLI modules. Removes unused or deprecated options and updates event handling for file matching, improving maintainability and compatibility.

* Update sourceMappingURL in htmlhint.js

The sourceMappingURL comment at the end of dist/cli/htmlhint.js was updated, likely reflecting a new or rebuilt source map. No other code changes were made.

* Update sarif.sarif

Author: coliff

dist/cli/formatter.js

@@ -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",

dist/cli/htmlhint.js

@@ -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 } = {}

package-lock.json

@@ -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

package.json

@@ -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`<img src=\"a.png\" />`\n```\n\n### The following pattern is considered a rule violation:\n\n```html\n`<img src=\"a.png\" src=\"b.png\" />`\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`<img src=\"a.png\" />`\n```\n\n### The following pattern is considered a rule violation:\n\n```html\n`<img src=\"a.png\" src=\"b.png\" />`\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/"
         }
       },

src/cli/formatter.ts

@@ -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,