Merge branch 'main' into pr/await-async-events-rule-validates-userevent-session

Author: Belco90

.all-contributorsrc

@@ -639,6 +639,26 @@
         "test",
         "doc"
       ]
+    },
+    {
+      "login": "maisano",
+      "name": "Richard Maisano",
+      "avatar_url": "https://avatars.githubusercontent.com/u/689081?v=4",
+      "profile": "https://github.com/maisano",
+      "contributions": [
+        "code",
+        "test"
+      ]
+    },
+    {
+      "login": "doochik",
+      "name": "Aleksei Androsov",
+      "avatar_url": "https://avatars.githubusercontent.com/u/31961?v=4",
+      "profile": "https://github.com/doochik",
+      "contributions": [
+        "code",
+        "test"
+      ]
     }
   ],
   "contributorsPerLine": 7,

.github/workflows/pipeline.yml

@@ -33,7 +33,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 
@@ -61,7 +61,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version: ${{ matrix.node }}
 
@@ -90,7 +90,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 

.github/workflows/smoke-test.yml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Use Node
-        uses: actions/setup-node@v3
+        uses: actions/setup-node@v4
         with:
           node-version-file: '.nvmrc'
 

README.md

@@ -425,6 +425,8 @@ Thanks goes to these wonderful people ([emoji key](https://allcontributors.org/d
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/nathanmmiller"><img src="https://avatars.githubusercontent.com/u/37555055?v=4?s=100" width="100px;" alt="Nathan"/><br /><sub><b>Nathan</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=nathanmmiller" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=nathanmmiller" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/justintoman"><img src="https://avatars.githubusercontent.com/u/11649507?v=4?s=100" width="100px;" alt="justintoman"/><br /><sub><b>justintoman</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=justintoman" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=justintoman" title="Tests">⚠️</a></td>
       <td align="center" valign="top" width="14.28%"><a href="https://github.com/adevick"><img src="https://avatars.githubusercontent.com/u/106642175?v=4?s=100" width="100px;" alt="Anthony Devick"/><br /><sub><b>Anthony Devick</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=adevick" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=adevick" title="Tests">⚠️</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=adevick" title="Documentation">📖</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/maisano"><img src="https://avatars.githubusercontent.com/u/689081?v=4?s=100" width="100px;" alt="Richard Maisano"/><br /><sub><b>Richard Maisano</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=maisano" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=maisano" title="Tests">⚠️</a></td>
+      <td align="center" valign="top" width="14.28%"><a href="https://github.com/doochik"><img src="https://avatars.githubusercontent.com/u/31961?v=4?s=100" width="100px;" alt="Aleksei Androsov"/><br /><sub><b>Aleksei Androsov</b></sub></a><br /><a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=doochik" title="Code">💻</a> <a href="https://github.com/testing-library/eslint-plugin-testing-library/commits?author=doochik" title="Tests">⚠️</a></td>
     </tr>
   </tbody>
 </table>

lib/rules/no-manual-cleanup.ts

@@ -111,15 +111,12 @@ export default createTestingLibraryRule<Options, MessageIds>({
 		return {
 			'Program:exit'() {
 				const testingLibraryImportName = helpers.getTestingLibraryImportName();
-				const testingLibraryImportNode = helpers.getTestingLibraryImportNode();
 				const customModuleImportNode = helpers.getCustomModuleImportNode();
 
-				if (
-					testingLibraryImportName &&
-					testingLibraryImportNode &&
-					testingLibraryImportName.match(CLEANUP_LIBRARY_REGEXP)
-				) {
-					reportCandidateModule(testingLibraryImportNode);
+				if (testingLibraryImportName?.match(CLEANUP_LIBRARY_REGEXP)) {
+					for (const importNode of helpers.getAllTestingLibraryImportNodes()) {
+						reportCandidateModule(importNode);
+					}
 				}
 
 				if (customModuleImportNode) {