Merge upstream/main into feature branch

Author: neriyarden

.all-contributorsrc

@@ -689,6 +689,24 @@
         "code",
         "test"
       ]
+    },
+    {
+      "login": "nostrorom",
+      "name": "nostro",
+      "avatar_url": "https://avatars.githubusercontent.com/u/49858211?v=4",
+      "profile": "https://github.com/nostrorom",
+      "contributions": [
+        "code"
+      ]
+    },
+    {
+      "login": "danielrentz",
+      "name": "Daniel Rentz",
+      "avatar_url": "https://avatars.githubusercontent.com/u/5064304?v=4",
+      "profile": "https://github.com/danielrentz",
+      "contributions": [
+        "doc"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.eslint-doc-generatorrc.js

@@ -8,6 +8,7 @@ const config = {
 		'flat/dom',
 		'flat/marko',
 		'flat/react',
+		'flat/svelte',
 		'flat/vue',
 	],
 	postprocess: (content) =>

.eslintrc.js

@@ -14,17 +14,6 @@ module.exports = {
 	rules: {
 		// Base
 		'max-lines-per-function': 'off',
-		'no-restricted-imports': [
-			'error',
-			{
-				patterns: [
-					{
-						group: ['@typescript-eslint/utils/dist/*'],
-						message: 'Import from `@typescript-eslint/utils` instead.',
-					},
-				],
-			},
-		],
 
 		// Import
 		'import/order': [
@@ -51,12 +40,12 @@ module.exports = {
 			files: ['**/*.ts?(x)'],
 			parser: '@typescript-eslint/parser',
 			parserOptions: {
+				project: './tsconfig.eslint.json',
 				tsconfigRootDir: __dirname,
-				project: ['./tsconfig.eslint.json'],
 			},
 			extends: [
 				'plugin:@typescript-eslint/recommended',
-				'plugin:@typescript-eslint/recommended-requiring-type-checking',
+				'plugin:@typescript-eslint/recommended-type-checked',
 				'plugin:import/typescript',
 			],
 			rules: {

.github/workflows/release.yml

@@ -23,28 +23,31 @@ permissions:
 
 jobs:
   publish:
-    name: Publish NPM package
+    name: Publish package
     runs-on: ubuntu-latest
     # Avoid publishing in forks
     if: github.repository == 'testing-library/eslint-plugin-testing-library'
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          cache: npm
+          cache: 'pnpm'
           node-version-file: '.nvmrc'
 
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
 
       - name: Build package
-        run: npm run build
+        run: pnpm run build
 
       - name: Release new version
-        run: npx semantic-release
+        run: pnpm exec semantic-release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
           NPM_CONFIG_PROVENANCE: true

.github/workflows/smoke-test.yml

@@ -14,19 +14,23 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
       - name: Use Node
         uses: actions/setup-node@v4
         with:
+          cache: 'pnpm'
           node-version-file: '.nvmrc'
 
       - run: |
-          npm install
-          npm run build
+          pnpm install
+          pnpm run build
 
-      - run: npm link
+      - run: pnpm link
         working-directory: ./dist
 
-      - run: npm link eslint-plugin-testing-library
+      - run: pnpm link eslint-plugin-testing-library
 
       - uses: AriPerkkio/eslint-remote-tester-run-action@v4
         with:

.github/workflows/verifications.yml

@@ -16,17 +16,20 @@ jobs:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          cache: npm
+          cache: 'pnpm'
           node-version-file: '.nvmrc'
 
       - name: Install dependencies
-        run: npm install
+        run: pnpm install
 
       - name: Run script
-        run: npm run ${{ matrix.validation-script }}
+        run: pnpm run ${{ matrix.validation-script }}
 
   tests:
     name: Tests (Node v${{ matrix.node }} - ESLint v${{ matrix.eslint }})
@@ -35,46 +38,31 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        node: [12.22.0, 12, 14.17.0, 14, 16, 17, 18, 19, 20, 22]
-        eslint: [7.5, 7, 8, 9]
-        exclude:
-          # eslint@9 doesn't support < Node v18
-          - node: 17
-            eslint: 9
-          - node: 16
-            eslint: 9
-          - node: 14
-            eslint: 9
-          - node: 14.17.0
-            eslint: 9
-          - node: 12
-            eslint: 9
-          - node: 12.22.0
-            eslint: 9
+        node: [18.18.0, 18, 20.9.0, 20, 21.1.0, 21, 22, 23]
+        eslint: [8.57.0, 8, 9]
     steps:
       - name: Checkout
         uses: actions/checkout@v4
 
+      - name: Install pnpm
+        uses: pnpm/action-setup@v4
+
       - name: Set up Node
         uses: actions/setup-node@v4
         with:
-          cache: npm
+          cache: 'pnpm'
           node-version: ${{ matrix.node }}
 
       - name: Install dependencies
-        run: npm install
-
-        # see https://github.com/npm/cli/issues/7349
-      - if: ${{ matrix.eslint == 9 }}
-        run: npm un @typescript-eslint/eslint-plugin eslint-plugin-jest eslint-doc-generator
+        run: pnpm install
 
       - name: Install ESLint v${{ matrix.eslint }}
-        run: npm install --no-save --force eslint@${{ matrix.eslint }}
+        run: pnpm add eslint@${{ matrix.eslint }}
 
       - name: Run tests
-        run: npm run test:ci
+        run: pnpm run test:ci
 
       - name: Upload coverage reports to Codecov
-        uses: codecov/codecov-action@v4
+        uses: codecov/codecov-action@v5
         env:
           CODECOV_TOKEN: ${{ secrets.CODECOV_TOKEN }}

.gitignore

@@ -67,6 +67,6 @@ yarn-error.log
 # Yarn Integrity file
 .yarn-integrity
 
-# Ignore locks other than npm
-pnpm-lock.yaml
+# Ignore locks other than pnpm
+package-lock.json
 yarn.lock

.gitpod.yml

@@ -1,7 +1,4 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 # Skip commit-msg hook on CI
 [ -n "$CI" ] && exit 0
 
-npx commitlint --edit $1
+commitlint --edit $1

.husky/commit-msg

@@ -1,7 +1,4 @@
-#!/bin/sh
-. "$(dirname "$0")/_/husky.sh"
-
 # Skip pre-commit hook on CI
 [ -n "$CI" ] && exit 0
 
-npx lint-staged
+lint-staged

.husky/pre-commit

@@ -1,2 +1,4 @@
 auto-install-peers=true
 enable-pre-post-scripts=true
+public-hoist-pattern[]=@commitlint*
+public-hoist-pattern[]=commitlint

.npmrc

@@ -1 +1 @@
-20
+22

.nvmrc

@@ -2,3 +2,4 @@ dist
 node_modules
 coverage
 .all-contributorsrc
+pnpm-lock.yaml

.prettierignore

@@ -11,7 +11,7 @@ Tweaking ESLint rules is mostly about traversing through the AST. [AST Explorer]
 
 1. Fork this repository
 2. Clone your forked repository
-3. Run `npm install` to install corresponding dependencies
+3. Run `pnpm install` to install corresponding dependencies
 4. Create a branch for your PR named like `pr/your-branch-name` (you can do this through git CLI with `git checkout -b pr/your-branch-name`)
 
 > Tip: Keep your `main` branch pointing at the original repository and make
@@ -63,7 +63,7 @@ each rule has three files named with its identifier (e.g. `no-debugging-utils`):
 
 Additionally, you need to do a couple of extra things:
 
-- Run `npm run generate:rules-doc` to include your rule in the "Supported Rules" table within the [README.md](./README.md)
+- Run `pnpm run generate:rules-doc` to include your rule in the "Supported Rules" table within the [README.md](./README.md)
 
 ### Custom rule creator
 
@@ -99,7 +99,7 @@ If you need some check related to Testing Library which is not available in any
 - pass it through `helpers`
 - write some generic test within `fake-rule.ts`, which is a dumb rule to be able to test all enhanced behavior from our custom Rule Creator.
 
-Take also into account that we're using our own `recommendedConfig` meta instead of the default `recommended` one. This is done so that our tools can automatically generate (`npm run generate:configs`) our configs.
+Take also into account that we're using our own `recommendedConfig` meta instead of the default `recommended` one. This is done so that our tools can automatically generate (`pnpm run generate:configs`) our configs.
 
 ## Updating existing rules