From 2900d2c87dc461f2c4b2f4cad0f919f92d82179b Mon Sep 17 00:00:00 2001
From: David Taylor <david@taylorhq.com>
Date: Wed, 20 Nov 2024 14:43:28 +0000
Subject: [PATCH] DEV: Update linting (#933)

---
 .../discourse/components/ai-artifact.gjs      |  2 +-
 .../discourse/components/rag-uploader.gjs     | 22 +++++++++---------
 .../semantic-search.gjs                       |  1 +
 .../ai-post-helper-trigger.gjs                | 10 ++++----
 .../ai-summary-box.gjs                        |  2 +-
 .../initializers/ai-bot-replies.js            |  2 +-
 .../initializers/ai-image-caption.js          |  2 +-
 package.json                                  |  2 +-
 pnpm-lock.yaml                                | 23 +++++++++++++++----
 test/javascripts/unit/lib/ai-streamer-test.js |  1 +
 10 files changed, 41 insertions(+), 26 deletions(-)

diff --git a/assets/javascripts/discourse/components/ai-artifact.gjs b/assets/javascripts/discourse/components/ai-artifact.gjs
index 291e6cd2..6fcc692f 100644
--- a/assets/javascripts/discourse/components/ai-artifact.gjs
+++ b/assets/javascripts/discourse/components/ai-artifact.gjs
@@ -2,7 +2,7 @@ import Component from "@glimmer/component";
 import { tracked } from "@glimmer/tracking";
 import { on } from "@ember/modifier";
 import { action } from "@ember/object";
-import { inject as service } from "@ember/service";
+import { service } from "@ember/service";
 import DButton from "discourse/components/d-button";
 import htmlClass from "discourse/helpers/html-class";
 import getURL from "discourse-common/lib/get-url";
diff --git a/assets/javascripts/discourse/components/rag-uploader.gjs b/assets/javascripts/discourse/components/rag-uploader.gjs
index 27c2a5c6..ec0285fd 100644
--- a/assets/javascripts/discourse/components/rag-uploader.gjs
+++ b/assets/javascripts/discourse/components/rag-uploader.gjs
@@ -37,6 +37,15 @@ export default class RagUploader extends Component {
     },
   });
 
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.appEvents.off(
+      `upload-mixin:${this.uppyUpload.config}:all-uploads-complete`,
+      this,
+      "_updateTargetWithUploads"
+    );
+  }
+
   didReceiveAttrs() {
     super.didReceiveAttrs(...arguments);
 
@@ -64,15 +73,6 @@ export default class RagUploader extends Component {
     );
   }
 
-  willDestroy() {
-    super.willDestroy(...arguments);
-    this.appEvents.off(
-      `upload-mixin:${this.uppyUpload.config}:all-uploads-complete`,
-      this,
-      "_updateTargetWithUploads"
-    );
-  }
-
   _updateTargetWithUploads() {
     this.updateUploads(this.ragUploads);
   }
@@ -152,7 +152,7 @@ export default class RagUploader extends Component {
                   @icon="times"
                   @title="discourse_ai.rag.uploads.remove"
                   @action={{fn this.removeUpload upload}}
-                  @class="btn-flat"
+                  class="btn-flat"
                 />
               </td>
             </tr>
@@ -173,7 +173,7 @@ export default class RagUploader extends Component {
                   @icon="times"
                   @title="discourse_ai.rag.uploads.remove"
                   @action={{fn this.cancelUploading upload}}
-                  @class="btn-flat"
+                  class="btn-flat"
                 />
               </td>
             </tr>
diff --git a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/semantic-search.gjs b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/semantic-search.gjs
index 94513499..bb1da3f8 100644
--- a/assets/javascripts/discourse/connectors/full-page-search-below-search-header/semantic-search.gjs
+++ b/assets/javascripts/discourse/connectors/full-page-search-below-search-header/semantic-search.gjs
@@ -168,6 +168,7 @@ export default class SemanticSearch extends Component {
       this.#resetAndSearchOnEvent();
     }
   }
+
   <template>
     <span {{didInsert this.checkQueryParamsAndSearch}}></span>
     {{#if this.searchEnabled}}
diff --git a/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs b/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
index 833027e8..ef39aac5 100644
--- a/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
+++ b/assets/javascripts/discourse/connectors/post-text-buttons/ai-post-helper-trigger.gjs
@@ -30,6 +30,11 @@ export default class AiPostHelperTrigger extends Component {
     options: "OPTIONS",
   };
 
+  willDestroy() {
+    super.willDestroy(...arguments);
+    this.removeHighlightedText();
+  }
+
   highlightSelectedText() {
     const postId = this.args.outletArgs.data.quoteState.postId;
     const postElement = document.querySelector(
@@ -120,11 +125,6 @@ export default class AiPostHelperTrigger extends Component {
     this.postHighlighted = false;
   }
 
-  willDestroy() {
-    super.willDestroy(...arguments);
-    this.removeHighlightedText();
-  }
-
   @action
   async showAiPostHelperMenu() {
     this.highlightSelectedText();
diff --git a/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-box.gjs b/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-box.gjs
index 9052c4b2..83683aa4 100644
--- a/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-box.gjs
+++ b/assets/javascripts/discourse/connectors/topic-map-expanded-after/ai-summary-box.gjs
@@ -245,7 +245,7 @@ export default class AiSummaryBox extends Component {
                     @title="discourse_ai.summarization.topic.close"
                     @action={{this.onClose}}
                     @icon="times"
-                    @class="btn-transparent ai-summary__close"
+                    class="btn-transparent ai-summary__close"
                   />
                 {{/if}}
               </header>
diff --git a/assets/javascripts/initializers/ai-bot-replies.js b/assets/javascripts/initializers/ai-bot-replies.js
index fa65c256..545a4438 100644
--- a/assets/javascripts/initializers/ai-bot-replies.js
+++ b/assets/javascripts/initializers/ai-bot-replies.js
@@ -223,7 +223,7 @@ function initializeShareWidgetButton(api) {
 
 function initializeShareTopicButton(api) {
   const modal = api.container.lookup("service:modal");
-  const currentUser = api.container.lookup("current-user:main");
+  const currentUser = api.container.lookup("service:current-user");
 
   api.registerTopicFooterButton({
     id: "share-ai-conversation",
diff --git a/assets/javascripts/initializers/ai-image-caption.js b/assets/javascripts/initializers/ai-image-caption.js
index 9963e94a..b44327a8 100644
--- a/assets/javascripts/initializers/ai-image-caption.js
+++ b/assets/javascripts/initializers/ai-image-caption.js
@@ -52,7 +52,7 @@ export default apiInitializer("1.25.0", (api) => {
 
         imageCaptionPopup.toggleLoadingState(true);
 
-        const site = api.container.lookup("site:main");
+        const site = api.container.lookup("service:site");
         if (!site.mobileView) {
           imageCaptionPopup.showPopup = !imageCaptionPopup.showPopup;
         }
diff --git a/package.json b/package.json
index 7b9f8d7b..7d0ecc75 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "private": true,
   "devDependencies": {
-    "@discourse/lint-configs": "2.0.1",
+    "@discourse/lint-configs": "2.2.0",
     "ember-template-lint": "6.0.0",
     "eslint": "9.14.0",
     "prettier": "2.8.8"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index aef887b9..dad185c2 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -9,8 +9,8 @@ importers:
   .:
     devDependencies:
       '@discourse/lint-configs':
-        specifier: 2.0.1
-        version: 2.0.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)
+        specifier: 2.2.0
+        version: 2.2.0(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)
       ember-template-lint:
         specifier: 6.0.0
         version: 6.0.0
@@ -141,8 +141,8 @@ packages:
     resolution: {integrity: sha512-Z/yiTPj+lDVnF7lWeKCIJzaIkI0vYO87dMpZ4bg4TDrFe4XXLFWL1TbXU27gBP3QccxV9mZICCrnjnYlJjXHOA==}
     engines: {node: '>=6.9.0'}
 
-  '@discourse/lint-configs@2.0.1':
-    resolution: {integrity: sha512-4AKSzX4EYIEAtTCj+1+VKx0ziQ5XbYJZuQQ8cxhE7/amRloWyuM3YuDpa5x1r2zaLRbfEHXjlveVk+obMRLPqw==}
+  '@discourse/lint-configs@2.2.0':
+    resolution: {integrity: sha512-lj13X+3/DRV2ZBQe3eJvxOO23e87DPfUSSqm0UPfP04VJ7141BHwWn9VVF0rOr+bMe2eiirsqlg2AbMn7gMb+A==}
     peerDependencies:
       ember-template-lint: 6.0.0
       eslint: ^9.14.0
@@ -288,6 +288,12 @@ packages:
     resolution: {integrity: sha512-LtoMMhxAlorcGhmFYI+LhPgbPZCkgP6ra1YL604EeF6U98pLlQ3iWIGMdWSC+vWmPBWBNgmDBAhnAobLROJmwg==}
     engines: {node: '>=18'}
 
+  '@stylistic/eslint-plugin-js@2.11.0':
+    resolution: {integrity: sha512-btchD0P3iij6cIk5RR5QMdEhtCCV0+L6cNheGhGCd//jaHILZMTi/EOqgEDAf1s4ZoViyExoToM+S2Iwa3U9DA==}
+    engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+    peerDependencies:
+      eslint: '>=8.40.0'
+
   '@types/eslint@8.56.12':
     resolution: {integrity: sha512-03ruubjWyOHlmljCVoxSuNDdmfZDzsrrz0P2LeJsOXr+ZwFQ+0yQIwNCwt/GYhV7Z31fgtXJTAEs+FYlEL851g==}
 
@@ -1935,11 +1941,12 @@ snapshots:
       '@babel/helper-string-parser': 7.25.9
       '@babel/helper-validator-identifier': 7.25.9
 
-  '@discourse/lint-configs@2.0.1(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)':
+  '@discourse/lint-configs@2.2.0(ember-template-lint@6.0.0)(eslint@9.14.0)(prettier@2.8.8)':
     dependencies:
       '@babel/core': 7.26.0
       '@babel/eslint-parser': 7.25.9(@babel/core@7.26.0)(eslint@9.14.0)
       '@babel/plugin-proposal-decorators': 7.25.9(@babel/core@7.26.0)
+      '@stylistic/eslint-plugin-js': 2.11.0(eslint@9.14.0)
       ember-template-lint: 6.0.0
       eslint: 9.14.0
       eslint-plugin-decorator-position: 6.0.0(@babel/eslint-parser@7.25.9(@babel/core@7.26.0)(eslint@9.14.0))(eslint@9.14.0)
@@ -2118,6 +2125,12 @@ snapshots:
 
   '@sindresorhus/merge-streams@2.3.0': {}
 
+  '@stylistic/eslint-plugin-js@2.11.0(eslint@9.14.0)':
+    dependencies:
+      eslint: 9.14.0
+      eslint-visitor-keys: 4.2.0
+      espree: 10.3.0
+
   '@types/eslint@8.56.12':
     dependencies:
       '@types/estree': 1.0.6
diff --git a/test/javascripts/unit/lib/ai-streamer-test.js b/test/javascripts/unit/lib/ai-streamer-test.js
index 55696025..8ad1ab1d 100644
--- a/test/javascripts/unit/lib/ai-streamer-test.js
+++ b/test/javascripts/unit/lib/ai-streamer-test.js
@@ -16,6 +16,7 @@ class FakeStreamUpdater {
   get streaming() {
     return this._streaming;
   }
+
   set streaming(value) {
     this._streaming = value;
   }