Merge branch 'develop' into dependabot/npm_and_yarn/typescript-eslint…

…-8.0.0-alpha.26
dequelabs · Jun 4, 2024 · 358a167 · 358a167
2 parents c5d2f7e + 2c713b5
commit 358a167
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 9 deletions.
diff --git a/eslint.config.js b/eslint.config.js
@@ -33,7 +33,8 @@ module.exports = [
       '@typescript-eslint/ban-types': 'off',
       '@typescript-eslint/no-unused-vars': 'error',
       '@typescript-eslint/no-explicit-any': 'error',
-      '@typescript-eslint/no-non-null-assertion': 'error'
+      '@typescript-eslint/no-non-null-assertion': 'error',
+      '@typescript-eslint/no-require-imports': 'off'
     }
   },
   {
@@ -54,11 +55,19 @@ module.exports = [
     }
   },
   {
-    files: ['**/*.test.ts', '**/*.test.tsx', '**/*.spec.ts', '**/*.spec.tsx'],
+    files: [
+      '**/*.test.ts',
+      '**/*.test.tsx',
+      '**/*.spec.ts',
+      '**/*.spec.tsx',
+      '**/test/**',
+      '**/tests/**'
+    ],
     rules: {
       '@typescript-eslint/no-empty-function': 'off',
       '@typescript-eslint/no-explicit-any': 'off',
-      '@typescript-eslint/no-non-null-assertion': 'off'
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-unused-expressions': 'off'
     }
   },
   {

diff --git a/packages/playwright/src/AxePartialRunner.ts b/packages/playwright/src/AxePartialRunner.ts
@@ -47,5 +47,4 @@ export default class AxePartialRunner {
 // See: https://stackoverflow.com/questions/40920179/should-i-refrain-from-handling-promise-rejection-asynchronously
 export const caught = ((f: () => void) => {
   return <T>(p: Promise<T>): Promise<T> => (p.catch(f), p);
-  /* eslint-disable @typescript-eslint/no-empty-function */
 })(() => {});
diff --git a/packages/puppeteer/src/axePartialRunner.ts b/packages/puppeteer/src/axePartialRunner.ts
@@ -48,5 +48,4 @@ export class AxePartialRunner {
 // See: https://stackoverflow.com/questions/40920179/should-i-refrain-from-handling-promise-rejection-asynchronously
 export const caught = ((f: () => void) => {
   return <T>(p: Promise<T>): Promise<T> => (p.catch(f), p);
-  /* eslint-disable @typescript-eslint/no-empty-function */
 })(() => {});
diff --git a/packages/react/test/index.ts b/packages/react/test/index.ts
@@ -10,7 +10,6 @@ reactAxe(React, ReactDOM, 1000, {
   checks: [
     {
       id: 'my-check',
-      // eslint-disable-next-line @typescript-eslint/explicit-function-return-type, @typescript-eslint/no-empty-function
       evaluate() {}
     }
   ],

diff --git a/packages/webdriverio/test/axe-webdriverio.spec.ts b/packages/webdriverio/test/axe-webdriverio.spec.ts
@@ -18,8 +18,6 @@ import { fixturesPath } from 'axe-test-fixtures';
 const connectToChromeDriver = (port: number): Promise<void> => {
   let socket: net.Socket;
   return new Promise((resolve, reject) => {
-    // eslint-disable-next-line prefer-const
-
     // Give up after 1s
     const timer = setTimeout(() => {
       socket.destroy();

diff --git a/packages/webdriverjs/src/axe-injector.ts b/packages/webdriverjs/src/axe-injector.ts
@@ -88,7 +88,6 @@ export default class AxeInjectorLegacy {
     // does not return a "real promise" (ManagedPromise)
     // and we want to await it.
     return new Promise((resolve, reject) => {
-      /* eslint-disable no-undef */
       this.driver
         // https://github.com/vercel/pkg/issues/676
         // we need to pass a string vs a function so we manually stringified the function