DEV: Update linting (#55)

.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,47 +2,52 @@ 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
-  arm64-darwin-20
   ruby
-  x86_64-darwin-18
-  x86_64-darwin-19
-  x86_64-darwin-20
-  x86_64-linux
 
 DEPENDENCIES
   rubocop-discourse
   syntax_tree
 
 BUNDLED WITH
-   2.3.10
+   2.5.4

assets/javascripts/discourse/initializers/extend-for-signatures.js

@@ -1,6 +1,6 @@
+import { isEmpty } from "@ember/utils";
 import { withPluginApi } from "discourse/lib/plugin-api";
 import RawHtml from "discourse/widgets/raw-html";
-import { isEmpty } from "@ember/utils";
 
 function attachSignature(api, siteSettings) {
   api.includePostAttributes("user_signature");
@@ -64,7 +64,7 @@ function addSetting(api) {
 export default {
   name: "extend-for-signatures",
   initialize(container) {
-    const siteSettings = container.lookup("site-settings:main");
+    const siteSettings = container.lookup("service:site-settings");
     if (siteSettings.signatures_enabled) {
       withPluginApi("0.1", (api) => attachSignature(api, siteSettings));
       withPluginApi("0.1", (api) => addSetting(api, siteSettings));

package.json

@@ -1,10 +1,10 @@
 {
   "name": "discourse-signatures",
-  "version": "2.1.0",
+  "private": true,
-  "repository": "https://github.com/discourse/discourse-signatures",
-  "author": "Discourse",
-  "license": "MIT",
   "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: 2.1.0
 # author: Rafael Silva <xfalcox@gmail.com>
 # url: https://github.com/discourse/discourse-signatures
-# transpile_js: true
 
 enabled_site_setting :signatures_enabled