.eslintrc.json

@@ -3,7 +3,8 @@
   "extends": [
     "eslint:recommended",
     "plugin:jsdoc/recommended",
-    "plugin:node/recommended",
+    "plugin:n/recommended",
+    "plugin:unicorn/recommended",
     "prettier"
   ],
   "env": { "node": true },
@@ -46,23 +47,33 @@
     "no-void": 2,
 
     "jsdoc/require-jsdoc": 0,
-    "jsdoc/check-param-names": 0,
     "jsdoc/check-tag-names": 2,
-    "jsdoc/newline-after-description": 2,
+    "jsdoc/tag-lines": [2, "any", { "startLines": 1 }],
     "jsdoc/require-description-complete-sentence": 2,
     "jsdoc/require-hyphen-before-param-description": 2,
     "jsdoc/require-param-description": 2,
     "jsdoc/require-param-name": 2,
     "jsdoc/require-param-type": 0,
     "jsdoc/require-returns-type": 0,
-    "jsdoc/require-param": 0,
     "jsdoc/no-types": 2,
     "jsdoc/valid-types": 2,
-    "jsdoc/tag-lines": 0,
 
-    "node/no-unsupported-features/es-syntax": 0,
-    "node/file-extension-in-import": ["error", "always"],
-    "node/no-missing-import": 0
+    "n/file-extension-in-import": [2, "always"],
+    "n/no-missing-import": 0,
+
+    "unicorn/no-null": 0,
+    "unicorn/prevent-abbreviations": 0,
+    "unicorn/prefer-code-point": 0,
+    "unicorn/no-for-loop": 0,
+    "unicorn/no-array-callback-reference": 0,
+    "unicorn/prefer-spread": 0,
+    "unicorn/no-useless-undefined": 0,
+    "unicorn/no-array-reduce": 0,
+    "unicorn/prefer-array-find": 0,
+    "unicorn/prefer-module": 0,
+    "unicorn/prefer-at": 0,
+    "unicorn/prefer-string-replace-all": 0,
+    "unicorn/prefer-switch": [2, { "emptyDefaultCase": "do-nothing-comment" }]
   },
   "settings": {
     "jsdoc": {
@@ -75,18 +86,23 @@
   "overrides": [
     {
       "files": "*.ts",
+      "plugins": ["expect-type"],
       "extends": [
+        "plugin:expect-type/recommended",
         "plugin:@typescript-eslint/eslint-recommended",
         "plugin:@typescript-eslint/recommended",
         "prettier"
       ],
       "parserOptions": {
         "sourceType": "module",
-        "project": "./tsconfig.eslint.json"
+        "project": "./tsconfig.json"
       },
       "rules": {
         "dot-notation": 0,
         "curly": [2, "multi-line"],
+        "n/no-unsupported-features/es-syntax": 0,
+
+        "jsdoc/require-returns-check": 0, // Broken with overloaded fns
 
         "@typescript-eslint/prefer-for-of": 0,
         "@typescript-eslint/member-ordering": 0,
@@ -102,14 +118,17 @@
         "@typescript-eslint/prefer-includes": 2,
         "@typescript-eslint/switch-exhaustiveness-check": 2,
         "@typescript-eslint/prefer-nullish-coalescing": 2,
+        "@typescript-eslint/no-non-null-assertion": 1,
+        "@typescript-eslint/consistent-type-imports": 2,
 
         "@typescript-eslint/no-explicit-any": 1 // TODO
       }
     },
     {
       "files": "*.spec.ts",
-      "extends": "plugin:jest/recommended",
+      "extends": "plugin:vitest/legacy-recommended",
       "rules": {
+        "n/no-unpublished-import": 0,
         "@typescript-eslint/no-explicit-any": 0
       }
     }

.github/dependabot.yml

@@ -6,6 +6,12 @@ updates:
       interval: daily
     open-pull-requests-limit: 10
     versioning-strategy: increase
+  - package-ecosystem: npm
+    directory: '/website'
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 4
+    versioning-strategy: increase
   - package-ecosystem: 'github-actions'
     directory: '/'
     schedule:

.github/workflows/benchmark.yml

@@ -8,24 +8,25 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
 
 permissions:
   contents: read
 
 jobs:
   benchmark:
     runs-on: ubuntu-latest
-    if: "!contains(github.event.commits[0].message, '[bench skip]') && !contains(github.event.commits[0].message, '[skip bench]')"
+    if:
+      "!contains(github.event.commits[0].message, '[bench skip]') &&
+      !contains(github.event.commits[0].message, '[skip bench]')"
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v4.0.3
         with:
-          node-version: '${{ env.NODE }}'
+          node-version: lts/*
           cache: 'npm'
 
       - name: Install npm dependencies

.github/workflows/ci.yml

@@ -8,7 +8,7 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE_COV: 16 # The Node.js version to run coveralls on
+  NODE_COV: lts/* # The Node.js version to run coveralls on
 
 permissions:
   contents: read
@@ -25,34 +25,34 @@ jobs:
       fail-fast: false
       matrix:
         node:
-          - 12
-          - 14
-          - 16
           - 18
+          - 20
+          - 22
+          - lts/*
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v4.0.3
         with:
           node-version: '${{ matrix.node }}'
           cache: 'npm'
 
       - name: Install npm dependencies
         run: npm ci
 
-      - name: Run Jest
-        run: npm run test:jest
+      - name: Run tests
+        run: npm run test:vi
         if: matrix.node != env.NODE_COV
 
-      - name: Run Jest with coverage
-        run: npm run test:jest:cov
+      - name: Run tests with coverage
+        run: npm run test:vi -- --coverage
         if: matrix.node == env.NODE_COV
 
       - name: Run Coveralls
-        uses: coverallsapp/github-action@1.1.3
+        uses: coverallsapp/github-action@v2.3.0
         if: matrix.node == env.NODE_COV
         continue-on-error: true
         with:

.github/workflows/codeql.yml

@@ -24,12 +24,12 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v2
+        uses: github/codeql-action/init@v3
         with:
           languages: 'javascript'
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v2
+        uses: github/codeql-action/analyze@v3

.github/workflows/dependabot-automerge.yml

@@ -13,14 +13,14 @@ jobs:
     steps:
       - name: Dependabot metadata
         id: metadata
-        uses: dependabot/fetch-metadata@v1.3.1
+        uses: dependabot/fetch-metadata@v2.2.0
         with:
           github-token: '${{ secrets.GITHUB_TOKEN }}'
       - name: Enable auto-merge for Dependabot PRs
         # Automatically merge semver-patch and semver-minor PRs
-        if: "${{ steps.metadata.outputs.update-type ==
-          'version-update:semver-minor' ||
-          steps.metadata.outputs.update-type ==
+        if:
+          "${{ steps.metadata.outputs.update-type ==
+          'version-update:semver-minor' || steps.metadata.outputs.update-type ==
           'version-update:semver-patch' }}"
         run: gh pr merge --auto --squash "$PR_URL"
         env:

.github/workflows/lint.yml

@@ -8,7 +8,6 @@ on:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
 
 permissions:
   contents: read
@@ -19,12 +18,12 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v4.0.3
         with:
-          node-version: '${{ env.NODE }}'
+          node-version: lts/*
           cache: 'npm'
 
       - name: Install npm dependencies

.github/workflows/site.yml

@@ -1,29 +1,75 @@
-name: Deploy to GitHub Pages
+name: Deploy website to GitHub Pages
+
+# Based on https://raw.githubusercontent.com/actions/starter-workflows
+
 on:
+  # Runs on pushes targeting the main branch
   push:
-    branches:
-      - main
+    branches: [main]
+
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
+
+# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
+permissions:
+  contents: read
+  pages: write
+  id-token: write
+
+# Allow one concurrent deployment
+concurrency:
+  group: 'pages'
+  cancel-in-progress: true
 
 jobs:
-  deploy:
-    name: Deploy to GitHub Pages
+  # Build job
+  build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-node@v3.3.0
+      - name: Checkout
+        uses: actions/checkout@v4
+      - name: Setup Node
+        uses: actions/setup-node@v4.0.3
         with:
-          node-version: '${{ env.NODE }}'
+          # Use current Node LTS version
+          node-version: lts/*
           cache: 'npm'
-      - run: npm ci
+      - name: Setup Pages
+        id: pages
+        uses: actions/configure-pages@v5
+      - name: Install dependencies
+        run: npm ci
+      - name: Build
+        run: npm run build
+      - name: Install website dependencies
+        working-directory: website
+        run: npm ci
+      - name: Sync Crowdin
+        working-directory: website
+        run: npm run crowdin:sync
+        continue-on-error: true
+        env:
+          CROWDIN_PERSONAL_TOKEN: ${{ secrets.CROWDIN_PERSONAL_TOKEN }}
       - name: Build docs
-        run: npm run build:docs
-      - name: Deploy
-        uses: peaceiris/actions-gh-pages@v3
+        working-directory: website
+        run: npm run build
+      - name: Upload artifact
+        uses: actions/upload-pages-artifact@v3
         with:
-          github_token: ${{ secrets.GITHUB_TOKEN }}
-          publish_dir: docs
-          cname: cheerio.js.org
+          path: ./website/build
+
+  # Deployment job
+  deploy:
+    environment:
+      name: github-pages
+      url: ${{ steps.deployment.outputs.page_url }}
+    runs-on: ubuntu-latest
+    needs: build
+    if: ${{github.repository == 'cheeriojs/cheerio'}}
+    steps:
+      - name: Deploy to GitHub Pages
+        id: deployment
+        uses: actions/deploy-pages@v4

.github/workflows/sponsors.yml

@@ -4,10 +4,11 @@ on:
   schedule:
     # Run once a day, at 4pm
     - cron: '0 16 * * *'
+  # Allow manual trigger
+  workflow_dispatch:
 
 env:
   FORCE_COLOR: 2
-  NODE: 16
 
 permissions:
   contents: read
@@ -21,12 +22,12 @@ jobs:
 
     steps:
       - name: Clone repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Set up Node.js
-        uses: actions/setup-node@v3.3.0
+        uses: actions/setup-node@v4.0.3
         with:
-          node-version: '${{ env.NODE }}'
+          node-version: lts/*
           cache: 'npm'
 
       - name: Install npm dependencies
@@ -35,10 +36,12 @@ jobs:
       - name: Update the README
         run: npm run update-sponsors
         env:
-          CHEERIO_SPONSORS_GITHUB_TOKEN: ${{ secrets.CHEERIO_SPONSORS_GITHUB_TOKEN }}
+          CHEERIO_SPONSORS_GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+          IMGIX_TOKEN: ${{ secrets.IMGIX_TOKEN }}
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v6
+        continue-on-error: true
         with:
           commit-message: 'docs(readme): Update Sponsors'
           title: Update Sponsors