Merge remote-tracking branch 'origin/main'

Author: BenoitZugmeyer

.github/workflows/tests.yml

@@ -13,8 +13,8 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           cache: npm
       - run: npm ci
@@ -32,10 +32,17 @@ jobs:
           - os: windows-latest
             eslint: latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           cache: npm
+      # https://github.com/actions/setup-node/issues/515#issuecomment-1153685437
+      - if: ${{ matrix.os == 'windows-latest' }}
+        run: |
+           $WhereNode = Get-Command node | Select-Object -ExpandProperty Definition
+           $NodeDirPath = Split-Path $WhereNode -Parent
+           cd $NodeDirPath
+           npm install npm@8.12.1
       - run: npm ci
       - run: bash tools/integration-tests.bash ${{ matrix.eslint }}
 
@@ -48,11 +55,6 @@ jobs:
         node: [12, 14, 16, 17]
         eslint: [latest]
         include:
-          # Node 10 support: will be dropped in next major version
-          - os: ubuntu-latest
-            node: 10
-            eslint: 7
-
           # ESLint 4.7 support: lowest version supported
           - os: ubuntu-latest
             node: 16
@@ -68,8 +70,8 @@ jobs:
             node: 16
             eslint: latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
+      - uses: actions/checkout@v3
+      - uses: actions/setup-node@v3
         with:
           node-version: ${{ matrix.node }}
           cache: npm

CHANGELOG.md

@@ -1,3 +1,6 @@
+UNRELEASED v7.0.0
+* **Breaking: drop Node 10 support**
+
 2021-09-20 v6.2.0
 * Update dependencies
 * Fix support for ESLint v8.0.0-beta.2

package-lock.json

@@ -17,12 +17,12 @@
   ],
   "main": "src/index.js",
   "dependencies": {
-    "htmlparser2": "^7.1.2"
+    "htmlparser2": "^8.0.1"
   },
   "devDependencies": {
     "eslint": "^8.5.0",
     "eslint-config-benoitz-prettier": "^1.1.0",
-    "jest": "^27.2.0",
+    "jest": "^28.1.3",
     "prettier": "^2.1.2",
     "semver": "^7.3.2"
   },

package.json

@@ -34,9 +34,11 @@ module.exports = {
 }
 EOF
 
+npx eslint --format compact index.html > actual_output 2>&1 || true
+
 expected_path="$(node -p "path.resolve('index.html')")"
 
-cat << EOF | diff -u <(npx eslint --format compact index.html 2>&1) -
+cat << EOF | diff -u actual_output -
 $expected_path: line 2, col 1, Error - Unexpected console statement. (no-console)
 
 1 problem