wshanks · wshanks · Jul 22, 2024 · Jul 22, 2024 · Jul 22, 2024 · Jul 22, 2024
diff --git a/.eslintrc.json b/.eslintrc.json
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -7,20 +7,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out repo
-        uses: actions/checkout@v2
-      - name: Configure npm caching
-        uses: actions/cache@v2
+        uses: actions/checkout@v4
+      - name: Setup node
+        uses: actions/setup-node@v4
         with:
-          path: ~/.npm
-          key: ${{ runner.os }}-npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            ${{ runner.os }}-npm-
+          cache: npm
       - name: Install dependencies
         run: npm ci
       - name: Run prettier
-        run: |-
-          npx --no-install prettier --check .
+        run: npm run style
       - name: Run eslint
-        run: |-
-          npx --no-install eslint .
-        if: "! cancelled()"
+        run: npm run lint
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,9 @@
+- 2.3.0:
+
+  - Drop support for versions of Thunderbird older than 115.
+    Those versions can continue using 2.2.5.
+    This change is mainly a precaution to acknowledge that those older versions are not tested as part of development and could be broken by future updates (it also fulfills a request from addons.thunderbird.net).
+
 - 2.2.5:
 
   - Do not capture keys in the quick search box in Thunderbird 128+

diff --git a/addon/background.js b/addon/background.js
@@ -82,17 +82,6 @@ async function applyKeys() {
 }
 applyKeys();
 
-// Warn about updates requiring user action
-browser.runtime.onInstalled.addListener(async (details) => {
-  switch (details.reason) {
-    case "update": {
-      if (details.previousVersion.split(".")[0] < 2) {
-        const url = browser.runtime.getURL("update_v2.0.html");
-        await browser.tabs.create({ url });
-      }
-    }
-  }
-});
 browser.tbkeys.onSendMessage.addListener(async (extensionID, message) => {
   browser.runtime.sendMessage(extensionID, message);
 });
diff --git a/addon/implementation.js b/addon/implementation.js
@@ -1,5 +1,5 @@
 "use strict";
-/* global ChromeUtils */
+/* global ChromeUtils, Services */
 
 var { ExtensionCommon } = ChromeUtils.import(
   "resource://gre/modules/ExtensionCommon.jsm"
@@ -10,9 +10,6 @@ var { ExtensionParent } = ChromeUtils.import(
 var { ExtensionSupport } = ChromeUtils.import(
   "resource:///modules/ExtensionSupport.jsm"
 );
-var Services =
-  globalThis.Services ||
-  ChromeUtils.import("resource://gre/modules/Services.jsm").Services;
 
 const EXTENSION_NAME = "tbkeys@addons.thunderbird.net";
 var extension = ExtensionParent.GlobalManager.getExtension(EXTENSION_NAME);
@@ -124,7 +121,7 @@ function buildKeyCommand(win, command) {
       case "unset":
         break;
       default:
-        eval(command); // eslint-disable-line no-eval
+        eval(command);
         break;
     }
     return false;
@@ -242,11 +239,9 @@ var tbkeys = class extends ExtensionCommon.ExtensionAPI {
     Services.obs.notifyObservers(null, "startupcache-invalidate", null);
   }
 
-  // eslint-disable-next-line no-unused-vars
   getAPI(context) {
     return {
       tbkeys: {
-        // eslint-disable-next-line require-await
         bindKeys: async function (keyBindings) {
           TBKeys.bindKeys(keyBindings);
         },

diff --git a/addon/manifest.json b/addon/manifest.json
@@ -3,15 +3,15 @@
   "browser_specific_settings": {
     "gecko": {
       "id": "tbkeys@addons.thunderbird.net",
-      "strict_min_version": "68.0",
+      "strict_min_version": "115.0",
       "strict_max_version": "*",
       "update_url": "https://raw.githubusercontent.com/wshanks/tbkeys/main/updates.json"
     }
   },
   "name": "tbkeys",
   "description": "Custom Thunderbird keybindings",
   "author": "Will Shanks",
-  "version": "2.2.5",
+  "version": "2.3.0",
   "background": {
     "scripts": ["background.js"]
   },

diff --git a/addon/options.html b/addon/options.html
@@ -1,4 +1,4 @@
-<!DOCTYPE html>
+<!doctype html>
 
 <html>
   <head>

diff --git a/addon/options.js b/addon/options.js
@@ -113,7 +113,7 @@ function validateKeys() {
         JSON.parse(keysField.value);
       }
       keysField.setCustomValidity("");
-    } catch (err) {
+    } catch {
       keysField.setCustomValidity("Invalid JSON");
       valid = false;
     }

diff --git a/addon/update_v2.0.html b/addon/update_v2.0.html
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,32 @@
+import globals from "globals";
+import path from "node:path";
+import { fileURLToPath } from "node:url";
+import js from "@eslint/js";
+import { FlatCompat } from "@eslint/eslintrc";
+
+const __filename = fileURLToPath(import.meta.url);
+const __dirname = path.dirname(__filename);
+const compat = new FlatCompat({
+  baseDirectory: __dirname,
+  recommendedConfig: js.configs.recommended,
+  allConfig: js.configs.all,
+});
+
+export default [
+  {
+    ignores: ["**/build", "addon/modules"],
+  },
+  ...compat.extends("eslint:recommended"),
+  {
+    languageOptions: {
+      globals: {
+        ...globals.browser,
+      },
+
+      ecmaVersion: 12,
+      sourceType: "module",
+    },
+
+    rules: {},
+  },
+];