DEV: Update linting (#4)

cvx · web-flow · commit 883a25ff58d1 · 2025-05-06T16:45:18.000+01:00
diff --git a/.github/workflows/discourse-plugin.yml b/.github/workflows/discourse-plugin.yml
@@ -0,0 +1,11 @@
+name: Discourse Plugin
+
+on:
+  push:
+    branches:
+      - main
+  pull_request:
+
+jobs:
+  ci:
+    uses: discourse/.github/.github/workflows/discourse-plugin.yml@v1
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -0,0 +1,2 @@
+inherit_gem:
+  rubocop-discourse: stree-compat.yml
diff --git a/.streerc b/.streerc
@@ -0,0 +1,2 @@
+--print-width=100
+--plugins=plugin/trailing_comma,plugin/disable_auto_ternary
diff --git a/.template-lintrc.cjs b/.template-lintrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");
diff --git a/Gemfile b/Gemfile
@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+source "https://rubygems.org"
+
+group :development do
+  gem "rubocop-discourse"
+  gem "syntax_tree"
+end
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -0,0 +1,103 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.2)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
+    drb (2.2.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    json (2.11.3)
+    language_server-protocol (3.17.0.4)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
+    parallel (1.27.0)
+    parser (3.3.8.0)
+      ast (~> 2.4.1)
+      racc
+    prettier_print (1.2.1)
+    prism (1.4.0)
+    racc (1.8.1)
+    rack (3.1.13)
+    rainbow (3.1.1)
+    regexp_parser (2.10.0)
+    rubocop (1.75.5)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-capybara (2.22.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-discourse (3.12.1)
+      activesupport (>= 6.1)
+      lint_roller (>= 1.1.0)
+      rubocop (>= 1.73.2)
+      rubocop-capybara (>= 2.22.0)
+      rubocop-factory_bot (>= 2.27.0)
+      rubocop-rails (>= 2.30.3)
+      rubocop-rspec (>= 3.0.1)
+      rubocop-rspec_rails (>= 2.31.0)
+    rubocop-factory_bot (2.27.1)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rails (2.31.0)
+      activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
+      rack (>= 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rspec (3.6.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+    rubocop-rspec_rails (2.31.0)
+      lint_roller (~> 1.1)
+      rubocop (~> 1.72, >= 1.72.1)
+      rubocop-rspec (~> 3.5)
+    ruby-progressbar (1.13.0)
+    securerandom (0.4.1)
+    syntax_tree (6.2.0)
+      prettier_print (>= 1.2.0)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.3)
+
+PLATFORMS
+  arm64-darwin-24
+  ruby
+
+DEPENDENCIES
+  rubocop-discourse
+  syntax_tree
+
+BUNDLED WITH
+   2.6.8
diff --git a/assets/javascripts/discourse/initializers/just-chat.js b/assets/javascripts/discourse/initializers/just-chat.js
@@ -1,5 +1,4 @@
 import { withPluginApi } from "discourse/lib/plugin-api";
-import { getOwner } from "@ember/application";
 
 export default {
   name: "just-chat-home-logo-href",
@@ -22,7 +21,7 @@ export default {
           } else if (this._super) {
             return this._super(...arguments);
           }
-        }
+        },
       });
 
       function redirectToChatAndSidebar(router) {
@@ -35,14 +34,14 @@ export default {
       api.modifyClass("route:user-activity-drafts", {
         beforeModel() {
           redirectToChatAndSidebar(this.router);
-        }
+        },
       });
 
       // Block user activity route in Ember
       api.modifyClass("route:user-activity", {
         beforeModel() {
           redirectToChatAndSidebar(this.router);
-        }
+        },
       });
 
       // Force chat sidebar on preferences/account route
@@ -77,14 +76,7 @@ export default {
       });
 
       // Redirect all common list/user activity routes to /chat
-      [
-        "latest",
-        "new",
-        "top",
-        "hot",
-        "unread",
-        "unseen",
-      ].forEach((filter) => {
+      ["latest", "new", "top", "hot", "unread", "unseen"].forEach((filter) => {
         api.modifyClass(`route:discovery/${filter}`, {
           beforeModel(transition) {
             if (
@@ -96,39 +88,49 @@ export default {
             } else if (this._super) {
               return this._super(...arguments);
             }
-          }
+          },
         });
       });
 
       // Intercept category link clicks
       api.onPageChange(() => {
         // Handle category list links
-        document.querySelectorAll('.category-title-link').forEach(link => {
-          link.addEventListener('click', (e) => {
+        document.querySelectorAll(".category-title-link").forEach((link) => {
+          link.addEventListener("click", (e) => {
             e.preventDefault();
-            const href = link.getAttribute('href');
+            const href = link.getAttribute("href");
             if (href) {
               const router = api.container.lookup("service:router");
               // Extract the category path from the href, ignoring IDs
               const match = href.match(/\/c\/([^\/]+(?:\/[^\/]+)?)(?:\/\d+)?$/);
               if (match) {
                 // Remove any trailing ID from the category path
-                const categoryPath = match[1].replace(/\/\d+$/, '');
+                const categoryPath = match[1].replace(/\/\d+$/, "");
                 // Check if it's a subcategory
-                const parts = categoryPath.split('/');
+                const parts = categoryPath.split("/");
                 if (parts.length > 1) {
                   // It's a subcategory, use original parent category
                   const targetUrl = `/c/${parts[0]}/${parts[1]}/edit/`;
-                  const sidebarState = api.container.lookup("service:sidebar-state");
-                  if (sidebarState && typeof sidebarState.setPanel === "function") {
+                  const sidebarState = api.container.lookup(
+                    "service:sidebar-state"
+                  );
+                  if (
+                    sidebarState &&
+                    typeof sidebarState.setPanel === "function"
+                  ) {
                     sidebarState.setPanel("chat");
                   }
                   router.replaceWith(targetUrl);
                 } else {
                   // It's a parent category
                   const targetUrl = `/c/${categoryPath}/edit/`;
-                  const sidebarState = api.container.lookup("service:sidebar-state");
-                  if (sidebarState && typeof sidebarState.setPanel === "function") {
+                  const sidebarState = api.container.lookup(
+                    "service:sidebar-state"
+                  );
+                  if (
+                    sidebarState &&
+                    typeof sidebarState.setPanel === "function"
+                  ) {
                     sidebarState.setPanel("chat");
                   }
                   router.replaceWith(targetUrl);
@@ -139,41 +141,55 @@ export default {
         });
 
         // Handle chat interface category links
-        document.querySelectorAll('.badge-category__wrapper').forEach(link => {
-          link.addEventListener('click', (e) => {
-            e.preventDefault();
-            const href = link.getAttribute('href');
-            if (href) {
-              const router = api.container.lookup("service:router");
-              // Extract the category path from the href, ignoring IDs
-              const match = href.match(/\/c\/([^\/]+(?:\/[^\/]+)?)(?:\/\d+)?$/);
-              if (match) {
-                // Remove any trailing ID from the category path
-                const categoryPath = match[1].replace(/\/\d+$/, '');
-                // Check if it's a subcategory
-                const parts = categoryPath.split('/');
-                if (parts.length > 1) {
-                  // It's a subcategory, use original parent category
-                  const targetUrl = `/c/${parts[0]}/${parts[1]}/edit/`;
-                  const sidebarState = api.container.lookup("service:sidebar-state");
-                  if (sidebarState && typeof sidebarState.setPanel === "function") {
-                    sidebarState.setPanel("chat");
-                  }
-                  router.replaceWith(targetUrl);
-                } else {
-                  // It's a parent category
-                  const targetUrl = `/c/${categoryPath}/edit/`;
-                  const sidebarState = api.container.lookup("service:sidebar-state");
-                  if (sidebarState && typeof sidebarState.setPanel === "function") {
-                    sidebarState.setPanel("chat");
+        document
+          .querySelectorAll(".badge-category__wrapper")
+          .forEach((link) => {
+            link.addEventListener("click", (e) => {
+              e.preventDefault();
+              const href = link.getAttribute("href");
+              if (href) {
+                const router = api.container.lookup("service:router");
+                // Extract the category path from the href, ignoring IDs
+                const match = href.match(
+                  /\/c\/([^\/]+(?:\/[^\/]+)?)(?:\/\d+)?$/
+                );
+                if (match) {
+                  // Remove any trailing ID from the category path
+                  const categoryPath = match[1].replace(/\/\d+$/, "");
+                  // Check if it's a subcategory
+                  const parts = categoryPath.split("/");
+                  if (parts.length > 1) {
+                    // It's a subcategory, use original parent category
+                    const targetUrl = `/c/${parts[0]}/${parts[1]}/edit/`;
+                    const sidebarState = api.container.lookup(
+                      "service:sidebar-state"
+                    );
+                    if (
+                      sidebarState &&
+                      typeof sidebarState.setPanel === "function"
+                    ) {
+                      sidebarState.setPanel("chat");
+                    }
+                    router.replaceWith(targetUrl);
+                  } else {
+                    // It's a parent category
+                    const targetUrl = `/c/${categoryPath}/edit/`;
+                    const sidebarState = api.container.lookup(
+                      "service:sidebar-state"
+                    );
+                    if (
+                      sidebarState &&
+                      typeof sidebarState.setPanel === "function"
+                    ) {
+                      sidebarState.setPanel("chat");
+                    }
+                    router.replaceWith(targetUrl);
                   }
-                  router.replaceWith(targetUrl);
                 }
               }
-            }
+            });
           });
-        });
       });
     });
-  }
+  },
 };
diff --git a/config/routes.rb b/config/routes.rb
@@ -8,5 +8,5 @@
 Discourse::Application.routes.draw do
   mount ::JustChatModule::Engine, at: "discourse-just-chat"
   # Redirect root to /chat for all users
-  root to: redirect('/chat')
+  root to: redirect("/chat")
 end
diff --git a/eslint.config.mjs b/eslint.config.mjs
@@ -0,0 +1,3 @@
+import DiscourseRecommended from "@discourse/lint-configs/eslint";
+
+export default [...DiscourseRecommended];
diff --git a/package.json b/package.json
@@ -0,0 +1,17 @@
+{
+  "private": true,
+  "devDependencies": {
+    "@discourse/lint-configs": "2.16.1",
+    "ember-template-lint": "7.6.0",
+    "eslint": "9.26.0",
+    "prettier": "3.5.3",
+    "stylelint": "16.19.1"
+  },
+  "engines": {
+    "node": ">= 22",
+    "npm": "please-use-pnpm",
+    "yarn": "please-use-pnpm",
+    "pnpm": "9.x"
+  },
+  "packageManager": "pnpm@9.15.5"
+}
diff --git a/plugin.rb b/plugin.rb
@@ -19,10 +19,10 @@ module ::JustChatModule
 require_relative "lib/just_chat_module/engine"
 
 after_initialize do
-  DiscourseEvent.on(:user_created) do |user|
-    user_option = user.user_option
-    if user_option
-      user_option.update_column(:chat_separate_sidebar_mode, UserOption.chat_separate_sidebar_modes[:always])
-    end
+  on(:user_created) do |user|
+    user.user_option&.update_column(
+      :chat_separate_sidebar_mode,
+      UserOption.chat_separate_sidebar_modes[:always],
+    )
   end
 end
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/stylelint.config.mjs b/stylelint.config.mjs

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require("@discourse/lint-configs/prettier");`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+inherit_gem:`
	`2`	`+ rubocop-discourse: stree-compat.yml`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+--print-width=100`
	`2`	`+--plugins=plugin/trailing_comma,plugin/disable_auto_ternary`
Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,3 @@`
	`1`	`+import DiscourseRecommended from "@discourse/lint-configs/eslint";`
	`2`	`+`
	`3`	`+export default [...DiscourseRecommended];`