DEV: Update linting (#275)

.eslintrc

@@ -1,3 +0,0 @@
-{
-  "extends": "eslint-config-discourse"
-}

.eslintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint");

.prettierrc

@@ -1 +0,0 @@
-{}

.prettierrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");

.template-lintrc.cjs

@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");

.template-lintrc.js

@@ -1,4 +0,0 @@
-module.exports = {
-  plugins: ["ember-template-lint-plugin-discourse"],
-  extends: "discourse:recommended",
-};

Gemfile.lock

@@ -2,35 +2,45 @@ GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
-    json (2.6.2)
+    json (2.7.1)
-    parallel (1.22.1)
+    language_server-protocol (3.17.0.3)
-    parser (3.1.2.1)
+    parallel (1.24.0)
+    parser (3.3.0.4)
       ast (~> 2.4.1)
-    prettier_print (1.2.0)
+      racc
+    prettier_print (1.2.1)
+    racc (1.7.3)
     rainbow (3.1.1)
-    regexp_parser (2.6.0)
+    regexp_parser (2.9.0)
-    rexml (3.2.5)
+    rexml (3.2.6)
-    rubocop (1.36.0)
+    rubocop (1.60.0)
       json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
       parallel (~> 1.10)
-      parser (>= 3.1.2.1)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml (>= 3.2.5, < 4.0)
-      rubocop-ast (>= 1.20.1, < 2.0)
+      rubocop-ast (>= 1.30.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 3.0)
+      unicode-display_width (>= 2.4.0, < 3.0)
-    rubocop-ast (1.21.0)
+    rubocop-ast (1.30.0)
-      parser (>= 3.1.1.0)
+      parser (>= 3.2.1.0)
-    rubocop-discourse (3.0)
+    rubocop-capybara (2.20.0)
-      rubocop (>= 1.1.0)
+      rubocop (~> 1.41)
-      rubocop-rspec (>= 2.0.0)
+    rubocop-discourse (3.6.0)
-    rubocop-rspec (2.13.2)
+      rubocop (>= 1.59.0)
-      rubocop (~> 1.33)
+      rubocop-rspec (>= 2.25.0)
-    ruby-progressbar (1.11.0)
+    rubocop-factory_bot (2.25.1)
-    syntax_tree (5.1.0)
+      rubocop (~> 1.41)
+    rubocop-rspec (2.26.1)
+      rubocop (~> 1.40)
+      rubocop-capybara (~> 2.17)
+      rubocop-factory_bot (~> 2.22)
+    ruby-progressbar (1.13.0)
+    syntax_tree (6.2.0)
       prettier_print (>= 1.2.0)
-    unicode-display_width (2.3.0)
+    unicode-display_width (2.5.0)
 
 PLATFORMS
   ruby
@@ -40,4 +50,4 @@ DEPENDENCIES
   syntax_tree
 
 BUNDLED WITH
-   2.1.4
+   2.5.4

assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.hbs

@@ -1,10 +1,10 @@
 {{#if this.siteSettings.solved_enabled}}
   <ComboBox
-    @class="solved-status-filter"
     @content={{this.statuses}}
     @value={{this.status}}
     @valueProperty="value"
     @options={{hash caretDownIcon="caret-right" caretUpIcon="caret-down"}}
     @onChange={{this.changeStatus}}
+    class="solved-status-filter"
   />
 {{/if}}

assets/javascripts/discourse/connectors/bread-crumbs-right/solved-status-filter.js

@@ -1,8 +1,8 @@
-import I18n from "I18n";
-import { getOwnerWithFallback } from "discourse-common/lib/get-owner";
 import Component from "@glimmer/component";
 import { action } from "@ember/object";
 import { inject as service } from "@ember/service";
+import { getOwnerWithFallback } from "discourse-common/lib/get-owner";
+import I18n from "I18n";
 
 const QUERY_PARAM_VALUES = {
   solved: "yes",

assets/javascripts/discourse/initializers/add-topic-list-class.js

@@ -1,5 +1,5 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import TopicListItem from "discourse/components/topic-list-item";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default {
   name: "add-topic-list-class",

assets/javascripts/discourse/initializers/extend-for-solved-button.js

@@ -1,15 +1,15 @@
-import I18n from "I18n";
+import { computed } from "@ember/object";
+import TopicStatusIcons from "discourse/helpers/topic-status-icons";
+import { ajax } from "discourse/lib/ajax";
+import { popupAjaxError } from "discourse/lib/ajax-error";
+import { withPluginApi } from "discourse/lib/plugin-api";
+import { formatUsername } from "discourse/lib/utilities";
 import Topic from "discourse/models/topic";
 import User from "discourse/models/user";
 import TopicStatus from "discourse/raw-views/topic-status";
-import TopicStatusIcons from "discourse/helpers/topic-status-icons";
-import { popupAjaxError } from "discourse/lib/ajax-error";
-import { withPluginApi } from "discourse/lib/plugin-api";
-import { ajax } from "discourse/lib/ajax";
 import PostCooked from "discourse/widgets/post-cooked";
-import { formatUsername } from "discourse/lib/utilities";
 import { iconHTML, iconNode } from "discourse-common/lib/icon-library";
-import { computed } from "@ember/object";
+import I18n from "I18n";
 
 function clearAccepted(topic) {
   const posts = topic.get("postStream.posts");

assets/javascripts/discourse/pre-initializers/extend-category-for-solved.js

@@ -1,5 +1,5 @@
-import Category from "discourse/models/category";
 import { computed, get } from "@ember/object";
+import Category from "discourse/models/category";
 
 export default {
   name: "extend-category-for-solved",

package.json

@@ -1,7 +1,10 @@
 {
-  "author": "Discourse",
+  "name": "discourse-solved",
-  "license": "MIT",
+  "private": true,
   "devDependencies": {
-    "eslint-config-discourse": "^3.4.0"
+    "@discourse/lint-configs": "^1.3.5",
+    "ember-template-lint": "^5.13.0",
+    "eslint": "^8.56.0",
+    "prettier": "^2.8.8"
   }
 }

plugin.rb

@@ -6,7 +6,6 @@
 # version: 0.1
 # authors: Sam Saffron
 # url: https://github.com/discourse/discourse-solved
-# transpile_js: true
 
 enabled_site_setting :solved_enabled
 
@@ -569,7 +568,7 @@ SQL
     end
 
     def topic_accepted_answer
-      topic&.custom_fields[::DiscourseSolved::ACCEPTED_ANSWER_POST_ID_CUSTOM_FIELD].present?
+      topic&.custom_fields&.[](::DiscourseSolved::ACCEPTED_ANSWER_POST_ID_CUSTOM_FIELD).present?
     end
 
     def topic

spec/requests/topics_controller_spec.rb

@@ -23,7 +23,6 @@ RSpec.describe TopicsController do
       answer_json = ""
     end
 
-    # rubocop:todo Layout/LineLength
     '<script type="application/ld+json">{"@context":"http://schema.org","@type":"QAPage","name":"%{title}","mainEntity":{"@type":"Question","name":"%{title}","text":"%{question_text}","upvoteCount":%{question_likes},"answerCount":%{answerCount},"datePublished":"%{created_at}","author":{"@type":"Person","name":"%{username1}","url":"%{user1_url}"}%{answer_json}}}</script>' %
       # rubocop:enable Layout/LineLength
       {

test/javascripts/acceptance/discourse-solved-test.js

@@ -1,7 +1,7 @@
-import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
-import { fixturesByUrl } from "discourse/tests/helpers/create-pretender";
-import { test } from "qunit";
 import { click, fillIn, visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { fixturesByUrl } from "discourse/tests/helpers/create-pretender";
+import { acceptance, queryAll } from "discourse/tests/helpers/qunit-helpers";
 import { cloneJSON } from "discourse-common/lib/object";
 
 acceptance("Discourse Solved Plugin", function (needs) {

test/javascripts/acceptance/user-activity-solved-test.js

@@ -1,6 +1,6 @@
-import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
-import { test } from "qunit";
 import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
+import { acceptance, query } from "discourse/tests/helpers/qunit-helpers";
 import I18n from "I18n";
 
 acceptance(