DEV: Update eslint config

assets/javascripts/discourse/components/modal/activate-encrypt.js

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import I18n from "I18n";
 import { activateEncrypt } from "discourse/plugins/discourse-encrypt/lib/discourse";
 
@@ -30,7 +30,7 @@ export default class ActivateEncrypt extends Component {
 
       this.encryptWidgetStore.reset();
       this.args.closeModal();
-    } catch (e) {
+    } catch {
       this.error = I18n.t("encrypt.preferences.paper_key_invalid");
     } finally {
       this.inProgress = false;

assets/javascripts/discourse/components/modal/decrypt-all.gjs

@@ -65,7 +65,7 @@ export default class DecryptAllModal extends Component {
       try {
         await decrypter.run();
         this.successCount++;
-      } catch (e) {
+      } catch {
         this.errorCount++;
       }
       this.doneCount++;

assets/javascripts/discourse/components/modal/manage-paper-keys.js

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { dependentKeyCompat } from "@ember/object/compat";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import GeneratePaperKey from "./generate-paper-key";
 

assets/javascripts/discourse/components/modal/reset-key-pair.js

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import { popupAjaxError } from "discourse/lib/ajax-error";
 import { deleteDb } from "discourse/plugins/discourse-encrypt/lib/database";
@@ -44,7 +44,6 @@ export default class ResetKeyPair extends Component {
     this.inProgress = true;
 
     try {
-      // eslint-disable-next-line no-restricted-globals
       await Promise.all([
         ajax("/encrypt/reset", {
           type: "POST",

assets/javascripts/discourse/components/modal/rotate-key-pair.js

@@ -1,7 +1,7 @@
 import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import { ajax } from "discourse/lib/ajax";
 import { extractError } from "discourse/lib/ajax-error";
 import { saveDbIdentity } from "discourse/plugins/discourse-encrypt/lib/database";
@@ -37,7 +37,6 @@ export default class RotateKeyPair extends Component {
     this.error = null;
 
     try {
-      // eslint-disable-next-line no-restricted-globals
       const [data, oldIdentity, newIdentity] = await Promise.all([
         ajax("/encrypt/rotate"),
         getIdentity(),
@@ -55,7 +54,7 @@ export default class RotateKeyPair extends Component {
       }
 
       const topicKeys = {};
-      // eslint-disable-next-line no-restricted-globals
+
       await Promise.all(
         Object.entries(data.topic_keys).map(async ([topicId, topicKey]) => {
           const key = await importKey(topicKey, oldIdentity.encryptPrivate);

assets/javascripts/discourse/connectors/composer-action-after/encrypt.js

@@ -1,3 +1,4 @@
+/* eslint-disable ember/no-arrow-function-computed-properties */
 import { computed, defineProperty } from "@ember/object";
 import I18n from "I18n";
 import {

assets/javascripts/discourse/connectors/user-preferences-security/encrypt.js

@@ -1,3 +1,4 @@
+/* eslint-disable ember/no-arrow-function-computed-properties */
 import { getOwner } from "@ember/application";
 import { action, computed, defineProperty } from "@ember/object";
 import { popupAjaxError } from "discourse/lib/ajax-error";

assets/javascripts/discourse/initializers/decrypt-posts.js

@@ -408,7 +408,7 @@ export default {
           let key;
           try {
             key = await getTopicKey(topicId);
-          } catch (error) {
+          } catch {
             state.encryptState = "error";
             state.error = I18n.t("encrypt.invalid_topic_key");
             this.scheduleRerender();
@@ -418,7 +418,7 @@ export default {
           let plaintext;
           try {
             plaintext = await decrypt(key, ciphertext);
-          } catch (error) {
+          } catch {
             state.encryptState = "error";
             state.error = I18n.t("encrypt.invalid_ciphertext");
             this.scheduleRerender();
@@ -452,7 +452,7 @@ export default {
                   expected: true,
                 });
               }
-            } catch (error) {
+            } catch {
               verified[attrs.id] = [
                 {
                   attr: "signature",
@@ -471,7 +471,7 @@ export default {
           state.encryptState = "decrypted";
           state.plaintext = cooked.toString();
           this.scheduleRerender();
-        } catch (error) {
+        } catch {
           const store = getOwner(this).lookup("service:encrypt-widget-store");
           store.add(this);
 

eslint.config.mjs

@@ -0,0 +1,3 @@
+import DiscourseRecommended from "@discourse/lint-configs/eslint";
+
+export default [...DiscourseRecommended];

package.json

@@ -1,11 +1,10 @@
 {
   "private": true,
   "devDependencies": {
-    "@discourse/lint-configs": "1.3.10",
+    "@discourse/lint-configs": "2.0.1",
     "ember-template-lint": "6.0.0",
-    "eslint": "8.57.1",
-    "prettier": "2.8.8",
-    "@babel/plugin-proposal-decorators": "^7.25.7"
+    "eslint": "9.14.0",
+    "prettier": "2.8.8"
   },
   "engines": {
     "node": ">= 18",