update eslint to 9.*, and redo a couple things that are required to s…

…upport it
yomidevs · Dec 28, 2024 · e276ddd · e276ddd
1 parent 00bf5fc
commit e276ddd
Show file tree

Hide file tree

Showing 15 changed files with 11,925 additions and 9,643 deletions.
diff --git a/.eslintignore b/.eslintignore
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
@@ -96,7 +96,7 @@ The generated `ext/manfiest.json` should not be committed.
 Linting rules are defined for a few types of files, and validation is performed as part of the standard tests
 run by `npm test` and the continuous integration process.
 
-- [.eslintrc.json](.eslintrc.json) rules are used for JavaScript files.
+- [eslint.config.js](eslint.config.js) rules are used for JavaScript files.
 - [.stylelintrc.json](.stylelintrc.json) rules are used for CSS files.
 - [.htmlvalidate.json](.htmlvalidate.json) rules are used for HTML files.
 

diff --git a/dev/jsconfig.json b/dev/jsconfig.json
@@ -12,38 +12,102 @@
         "skipLibCheck": true,
         "baseUrl": ".",
         "paths": {
-            "api-map": ["../types/ext/api-map"],
-            "anki-templates": ["../types/ext/anki-templates"],
-            "anki-templates-internal": ["../types/ext/anki-templates-internal"],
-            "cache-map": ["../types/ext/cache-map"],
-            "core": ["../types/ext/core"],
-            "css-style-applier": ["../types/ext/css-style-applier"],
-            "database": ["../types/ext/database"],
-            "dictionary": ["../types/ext/dictionary"],
-            "dictionary-data": ["../types/ext/dictionary-data"],
-            "dictionary-data-util": ["../types/ext/dictionary-data-util"],
-            "dictionary-database": ["../types/ext/dictionary-database"],
-            "dictionary-importer": ["../types/ext/dictionary-importer"],
-            "dictionary-importer-media-loader": ["../types/ext/dictionary-importer-media-loader"],
-            "dynamic-property": ["../types/ext/dynamic-property"],
-            "error": ["../types/ext/error"],
-            "event-listener-collection": ["../types/ext/event-listener-collection"],
-            "japanese-util": ["../types/ext/japanese-util"],
-            "language": ["../types/ext/language"],
-            "language-descriptors": ["../types/ext/language-descriptors"],
-            "CJK-util": ["../types/ext/CJK-util"],
-            "ext/json-schema": ["../types/ext/json-schema"],
-            "language-transformer": ["../types/ext/language-transformer"],
-            "language-transformer-internal": ["../types/ext/language-transformer-internal"],
-            "log": ["../types/ext/log"],
-            "settings": ["../types/ext/settings"],
-            "structured-content": ["../types/ext/structured-content"],
-            "translator": ["../types/ext/translator"],
-            "translation": ["../types/ext/translation"],
-            "translation-internal": ["../types/ext/translation-internal"],
-            "dev/*": ["../types/dev/*"],
-            "rollup/parseAst": ["../types/other/rollup-parse-ast"],
-            "chai": ["../node_modules/@vitest/expect/dist/chai.d.cts"]
+            "api-map": [
+                "../types/ext/api-map"
+            ],
+            "anki-templates": [
+                "../types/ext/anki-templates"
+            ],
+            "anki-templates-internal": [
+                "../types/ext/anki-templates-internal"
+            ],
+            "cache-map": [
+                "../types/ext/cache-map"
+            ],
+            "core": [
+                "../types/ext/core"
+            ],
+            "css-style-applier": [
+                "../types/ext/css-style-applier"
+            ],
+            "database": [
+                "../types/ext/database"
+            ],
+            "dictionary": [
+                "../types/ext/dictionary"
+            ],
+            "dictionary-data": [
+                "../types/ext/dictionary-data"
+            ],
+            "dictionary-data-util": [
+                "../types/ext/dictionary-data-util"
+            ],
+            "dictionary-database": [
+                "../types/ext/dictionary-database"
+            ],
+            "dictionary-importer": [
+                "../types/ext/dictionary-importer"
+            ],
+            "dictionary-importer-media-loader": [
+                "../types/ext/dictionary-importer-media-loader"
+            ],
+            "dynamic-property": [
+                "../types/ext/dynamic-property"
+            ],
+            "error": [
+                "../types/ext/error"
+            ],
+            "event-listener-collection": [
+                "../types/ext/event-listener-collection"
+            ],
+            "japanese-util": [
+                "../types/ext/japanese-util"
+            ],
+            "language": [
+                "../types/ext/language"
+            ],
+            "language-descriptors": [
+                "../types/ext/language-descriptors"
+            ],
+            "CJK-util": [
+                "../types/ext/CJK-util"
+            ],
+            "ext/json-schema": [
+                "../types/ext/json-schema"
+            ],
+            "language-transformer": [
+                "../types/ext/language-transformer"
+            ],
+            "language-transformer-internal": [
+                "../types/ext/language-transformer-internal"
+            ],
+            "log": [
+                "../types/ext/log"
+            ],
+            "settings": [
+                "../types/ext/settings"
+            ],
+            "structured-content": [
+                "../types/ext/structured-content"
+            ],
+            "translator": [
+                "../types/ext/translator"
+            ],
+            "translation": [
+                "../types/ext/translation"
+            ],
+            "translation-internal": [
+                "../types/ext/translation-internal"
+            ],
+            "dev/*": [
+                "../types/dev/*"
+            ],
+            "rollup/parseAst": [
+                "../types/other/rollup-parse-ast"
+            ],
+            "chai": [
+                "../node_modules/@vitest/expect/dist/chai.d.cts"
+            ]
         },
         "types": [
             "node",

diff --git a/ext/js/background/backend.js b/ext/js/background/backend.js
@@ -71,7 +71,6 @@ export class Backend {
             this._translator = new Translator(this._dictionaryDatabase);
             /** @type {ClipboardReader|ClipboardReaderProxy} */
             this._clipboardReader = new ClipboardReader(
-                // eslint-disable-next-line no-undef
                 (typeof document === 'object' && document !== null ? document : null),
                 '#clipboard-paste-target',
                 '#clipboard-rich-content-paste-target',

diff --git a/ext/js/data/options-util.js b/ext/js/data/options-util.js
@@ -1035,7 +1035,7 @@ export class OptionsUtil {
             const terminationCharacters = profile.options.sentenceParsing.terminationCharacters;
             const newAdditions = [];
             for (const character of additions) {
-                if (terminationCharacters.findIndex((value) => (value.character1 === character && value.character2 === null)) < 0) {
+                if (!terminationCharacters.some((value) => (value.character1 === character && value.character2 === null))) {
                     newAdditions.push(character);
                 }
             }

diff --git a/ext/js/dictionary/dictionary-database.js b/ext/js/dictionary/dictionary-database.js
@@ -454,14 +454,12 @@ export class DictionaryDatabase {
                 // The second branch can eventually be changed to use ImageDecoder when we are okay with dropping support for Firefox <133
                 // The branches can be unified entirely when Firefox implements support for transferring VideoFrames cross-process in postMessage
                 if ('serviceWorker' in navigator) { // this is just a check for chrome, we don't actually use service worker functionality here
-                    // eslint-disable-next-line no-undef
                     const imageDecoder = new ImageDecoder({type: m.mediaType, data: m.content});
                     await imageDecoder.decode().then((decodedImageResult) => {
                         source.postMessage({action: 'drawDecodedImageToCanvases', params: {decodedImage: decodedImageResult.image, canvasIndexes: m.canvasIndexes, generation: m.generation}}, [decodedImageResult.image]);
                     });
                 } else {
                     const image = new Blob([m.content], {type: m.mediaType});
-                    // eslint-disable-next-line no-undef
                     await createImageBitmap(image, {resizeWidth: m.canvasWidth, resizeHeight: m.canvasHeight, resizeQuality: 'high'}).then((decodedImage) => {
                         // we need to do a dumb hack where we convert this ImageBitmap to an ImageData by drawing it to a temporary canvas, because Firefox doesn't support transferring ImageBitmaps cross-process
                         const canvas = new OffscreenCanvas(decodedImage.width, decodedImage.height);

diff --git a/ext/js/pages/permissions-main.js b/ext/js/pages/permissions-main.js
@@ -113,8 +113,6 @@ await Application.main(true, async (application) => {
     /** @type {HTMLInputElement} */
     const permissionCheckbox2 = querySelectorNotNull(document, '#permission-checkbox-allow-file-url-access');
     /** @type {HTMLInputElement[]} */
-    // This collection is actually used, not sure why this eslint-disable is needed.
-    // eslint-disable-next-line sonarjs/no-unused-collection
     const permissionsCheckboxes = [permissionCheckbox1, permissionCheckbox2];
 
     const permissions = await Promise.all([

diff --git a/ext/js/pages/settings/dictionary-controller.js b/ext/js/pages/settings/dictionary-controller.js
@@ -832,7 +832,9 @@ export class DictionaryController {
         const dictionaries = this._dictionaries;
         if (dictionaries === null) { return; }
 
-        this._dictionaryEntries.map((dictionaryEntry) => dictionaryEntry.cleanup());
+        for (const dictionaryEntry of this._dictionaryEntries) {
+            dictionaryEntry.cleanup();
+        }
 
         const dictionaryOptionsArray = options.dictionaries;
         for (let i = 0; i < dictionaryOptionsArray.length; i++) {

diff --git a/ext/js/pages/settings/profile-controller.js b/ext/js/pages/settings/profile-controller.js
@@ -586,7 +586,7 @@ export class ProfileController {
         let i = 0;
         while (true) {
             const newName = `${prefix}${space}${index}${suffix}`;
-            if (i++ >= maxUniqueAttempts || profiles.findIndex((profile) => profile.name === newName) < 0) {
+            if (i++ >= maxUniqueAttempts || !profiles.some((profile) => profile.name === newName)) {
                 return newName;
             }
             if (typeof index !== 'number') {

diff --git a/ext/js/pages/settings/recommended-settings-controller.js b/ext/js/pages/settings/recommended-settings-controller.js
@@ -111,11 +111,11 @@ export class RecommendedSettingsController {
             }
             void this._settingsController.modifyProfileSettings(modifications).then(
                 (results) => {
-                    results.map((result) => {
+                    for (const result of results) {
                         if (Object.hasOwn(result, 'error')) {
                             log.error(new Error(`Failed to apply recommended setting: ${JSON.stringify(result)}`));
                         }
-                    });
+                    }
                 },
             );
             void this._settingsController.refresh();