Migrate to ESLint 9 and ESLint flat config

eslint.config.js

@@ -0,0 +1,88 @@
+import hypothesis from 'eslint-config-hypothesis';
+import jsxA11y from 'eslint-plugin-jsx-a11y';
+import globals from 'globals';
+import tseslint from 'typescript-eslint';
+
+export default tseslint.config(
+  {
+    ignores: [
+      '.tox/**/*',
+      '.yalc/**/*',
+      '.yarn/**/*',
+      'build/**/*',
+      '**/vendor/**/*.js',
+      '**/coverage/**/*',
+      'docs/_build/*',
+      'dev-server/static/**/*.js',
+    ],
+  },
+  ...hypothesis,
+  ...tseslint.configs.recommended,
+  jsxA11y.flatConfigs.recommended,
+  {
+    rules: {
+      'prefer-arrow-callback': [
+        'error',
+        {
+          allowNamedFunctions: true,
+        },
+      ],
+
+      'object-shorthand': ['error', 'properties'],
+      'react/prop-types': 'off',
+      '@typescript-eslint/no-unused-vars': 'error',
+      'no-use-before-define': 'off',
+
+      '@typescript-eslint/no-use-before-define': [
+        'error',
+        {
+          functions: false,
+          typedefs: false,
+          ignoreTypeReferences: false,
+        },
+      ],
+
+      '@typescript-eslint/ban-ts-comment': 'off',
+      '@typescript-eslint/no-empty-function': 'off',
+      '@typescript-eslint/no-explicit-any': 'off',
+      '@typescript-eslint/no-non-null-assertion': 'off',
+      '@typescript-eslint/no-this-alias': 'off',
+      '@typescript-eslint/consistent-type-assertions': 'error',
+      '@typescript-eslint/consistent-type-imports': 'error',
+    },
+  },
+
+  // Annotator module
+  {
+    files: ['src/annotator/**/*.{js|tx|tsx}'],
+    rules: {
+      'no-restricted-properties': [
+        2,
+        {
+          // Disable `bind` usage in annotator/ code to prevent unexpected behavior
+          // due to broken bind polyfills. See
+          // https://github.com/hypothesis/client/issues/245
+          property: 'bind',
+          message:
+            'Use function expressions instead of bind() in annotator/ code',
+        },
+      ],
+    },
+  },
+
+  // Scripts and configuration files
+  {
+    files: ['**/*.js'],
+    ignores: ['src/**'],
+    rules: {
+      '@typescript-eslint/no-var-requires': 'off',
+      'no-console': 'off',
+      'react-hooks/rules-of-hooks': 'off',
+    },
+    languageOptions: {
+      globals: {
+        ...globals.node,
+      },
+    },
+  },
+);

package.json

@@ -38,8 +38,6 @@
     "@types/shallowequal": "^1.1.1",
     "@types/showdown": "^2.0.0",
     "@types/sinon": "^17.0.3",
-    "@typescript-eslint/eslint-plugin": "^7.0.1",
-    "@typescript-eslint/parser": "^7.0.1",
     "approx-string-match": "^2.0.0",
     "autoprefixer": "^10.0.1",
     "axe-core": "^4.0.0",
@@ -58,16 +56,17 @@
     "enzyme-adapter-preact-pure": "^4.0.1",
     "escape-html": "^1.0.3",
     "escape-string-regexp": "^4.0.0",
-    "eslint": "^8.3.0",
-    "eslint-config-hypothesis": "^2.6.0",
-    "eslint-plugin-jsx-a11y": "^6.2.3",
-    "eslint-plugin-mocha": "^10.0.1",
-    "eslint-plugin-react": "^7.12.4",
-    "eslint-plugin-react-hooks": "^4.0.4",
+    "eslint": "^9.12.0",
+    "eslint-config-hypothesis": "^3.0.0",
+    "eslint-plugin-jsx-a11y": "^6.10.0",
+    "eslint-plugin-mocha": "^10.5.0",
+    "eslint-plugin-react": "^7.37.1",
+    "eslint-plugin-react-hooks": "^5.0.0",
     "express": "^5.0.1",
     "fancy-log": "^2.0.0",
     "fetch-mock": "11",
     "focus-visible": "^5.0.0",
+    "globals": "^15.11.0",
     "gulp": "^5.0.0",
     "gulp-changed": "^5.0.1",
     "hammerjs": "^2.0.4",
@@ -101,6 +100,7 @@
     "tailwindcss": "^3.0.2",
     "tiny-emitter": "^2.0.2",
     "typescript": "^5.0.2",
+    "typescript-eslint": "^8.9.0",
     "wrap-text": "^1.0.7"
   },
   "browserslist": "chrome 92, firefox 90, safari 14.1",

src/annotator/anchoring/html.ts

@@ -126,7 +126,7 @@ export function describe(root: Element, range: Range) {
       if (anchor) {
         result.push(anchor.toSelector());
       }
-    } catch (error) {
+    } catch {
       // If resolving some anchor fails, we just want to skip it silently
     }
   }

src/annotator/anchoring/xpath.ts

@@ -149,7 +149,7 @@ export function nodeFromXPath(
 ): Node | null {
   try {
     return evaluateSimpleXPath(xpath, root);
-  } catch (err) {
+  } catch {
     return document.evaluate(
       '.' + xpath,
       root,

src/annotator/config/settings.ts

@@ -148,7 +148,7 @@ export function settingsFrom(window_: Window): SettingsGetters {
       if (queryFragmentMatch) {
         try {
           return decodeURIComponent(queryFragmentMatch[2]);
-        } catch (err) {
+        } catch {
           // URI Error should return the page unfiltered.
         }
       }

src/annotator/frame-observer.ts

@@ -70,7 +70,7 @@ export class FrameObserver {
         this._removeFrame(frame);
       });
       this._onFrameAdded(frame);
-    } catch (e) {
+    } catch {
       console.warn(
         `Unable to inject the Hypothesis client (from '${document.location.href}' into a cross-origin frame '${frame.src}')`,
       );

src/annotator/guest.ts

@@ -667,7 +667,7 @@ export class Guest extends TinyEmitter implements Annotator, Destroyable {
         // this anchor.
         const textRange = TextRange.fromRange(range);
         anchor = { annotation, target, range: textRange };
-      } catch (err) {
+      } catch {
         anchor = { annotation, target };
       }
       return anchor;

src/annotator/integrations/html-metadata.ts

@@ -182,7 +182,7 @@ export class HTMLMetadata {
       try {
         const href = this._absoluteUrl(link.href);
         links.push({ href, rel: link.rel, type: link.type });
-      } catch (e) {
+      } catch {
         // Ignore URIs which cannot be parsed.
       }
     }
@@ -197,7 +197,7 @@ export class HTMLMetadata {
               href: this._absoluteUrl(url),
               type: 'application/pdf',
             });
-          } catch (e) {
+          } catch {
             // Ignore URIs which cannot be parsed.
           }
         }
@@ -253,7 +253,7 @@ export class HTMLMetadata {
       if (['shortcut icon', 'icon'].includes(link.rel)) {
         try {
           favicon = this._absoluteUrl(link.href);
-        } catch (e) {
+        } catch {
           // Ignore URIs which cannot be parsed.
         }
       }

src/annotator/integrations/pdf.tsx

@@ -330,7 +330,7 @@ export class PDFIntegration extends TinyEmitter implements Integration {
     // Wait for PDF to load.
     try {
       await this.uri();
-    } catch (e) {
+    } catch {
       return;
     }
 

src/annotator/integrations/test/html-metadata-test.js

@@ -342,9 +342,9 @@ describe('HTMLMetadata', () => {
       // location in tests, create a proxy object in front of our blank HTML
       // document.
       const fakeDocument = {
-        createElement: htmlDoc.createElement.bind(htmlDoc), // eslint-disable-line no-restricted-properties
+        createElement: htmlDoc.createElement.bind(htmlDoc),
         baseURI: baseURI ?? href,
-        querySelectorAll: htmlDoc.querySelectorAll.bind(htmlDoc), // eslint-disable-line no-restricted-properties
+        querySelectorAll: htmlDoc.querySelectorAll.bind(htmlDoc),
         location: {
           href,
         },

src/annotator/range-util.ts

@@ -79,7 +79,7 @@ export function isNodeInRange(range: Range, node: Node) {
       // Check end of node is after start of range.
       range.comparePoint(node, length) >= 0
     );
-  } catch (e) {
+  } catch {
     // `comparePoint` may fail if the `range` and `node` do not share a common
     // ancestor or `node` is a doctype.
     return false;

src/annotator/sidebar.tsx

@@ -467,7 +467,7 @@ export class Sidebar implements Destroyable {
 
     // Suppressing ban-types here because the functions are originally defined
     // as `Function` somewhere else. To be fixed when that is migrated to TS
-    // eslint-disable-next-line @typescript-eslint/ban-types
+    // eslint-disable-next-line @typescript-eslint/no-unsafe-function-type
     const eventHandlers: Array<[SidebarToHostEvent, Function | undefined]> = [
       ['loginRequested', this.onLoginRequest],
       ['logoutRequested', this.onLogoutRequest],

src/annotator/util/emitter.ts

@@ -1,4 +1,4 @@
-/* eslint-disable @typescript-eslint/ban-types */
+/* eslint-disable @typescript-eslint/no-unsafe-function-type */
 
 /*
  * Disable @typescript-eslint/ban-types for the whole file, as changing the

src/boot/browser-check.ts

@@ -39,7 +39,7 @@ export function isBrowserSupported(): boolean {
 
   try {
     return checks.every(check => check());
-  } catch (err) {
+  } catch {
     return false;
   }
 }

src/karma.config.cjs

@@ -1,6 +1,6 @@
-/* global __dirname */
+/* global __dirname require module */
 
-// eslint-disable-next-line @typescript-eslint/no-var-requires
+// eslint-disable-next-line @typescript-eslint/no-require-imports
 const path = require('path');
 
 module.exports = function (config) {

src/shared/listener-collection.ts

@@ -48,7 +48,6 @@ export class ListenerCollection {
     this._listeners.set(symbol, {
       eventTarget,
       eventType,
-      // eslint-disable-next-line object-shorthand
       listener: listener as EventListener,
       options,
     });