DEV: Update linting (#39)

davidtaylorhq · web-flow · commit 67215adfaab5 · 2024-03-27T18:00:00.000+01:00
diff --git a/.eslintrc b/.eslintrc
diff --git a/.eslintrc.cjs b/.eslintrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/eslint-theme");
diff --git a/.prettierrc b/.prettierrc
diff --git a/.prettierrc.cjs b/.prettierrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/prettier");
diff --git a/.template-lintrc.cjs b/.template-lintrc.cjs
@@ -0,0 +1 @@
+module.exports = require("@discourse/lint-configs/template-lint");
diff --git a/.template-lintrc.js b/.template-lintrc.js
diff --git a/javascripts/discourse/initializers/topic-thumbnails-init.js b/javascripts/discourse/initializers/topic-thumbnails-init.js
@@ -1,13 +1,13 @@
-import { withPluginApi } from "discourse/lib/plugin-api";
-import { inject as service } from "@ember/service";
 import { readOnly } from "@ember/object/computed";
-import discourseComputed, { observes } from "discourse-common/utils/decorators";
 import { once } from "@ember/runloop";
+import { service } from "@ember/service";
+import { htmlSafe } from "@ember/template";
+import { withPluginApi } from "discourse/lib/plugin-api";
 import {
   getResolverOption,
   setResolverOption,
 } from "discourse-common/resolver";
-import { htmlSafe } from "@ember/template";
+import discourseComputed, { observes } from "discourse-common/utils/decorators";
 
 export default {
   name: "topic-thumbnails-init",
diff --git a/javascripts/discourse/raw-views/topic-list-thumbnail.js b/javascripts/discourse/raw-views/topic-list-thumbnail.js
@@ -1,7 +1,7 @@
-import discourseComputed from "discourse-common/utils/decorators";
 import EmberObject from "@ember/object";
-import { inject as service } from "@ember/service";
 import { and } from "@ember/object/computed";
+import { service } from "@ember/service";
+import discourseComputed from "discourse-common/utils/decorators";
 
 export default EmberObject.extend({
   topicThumbnailsService: service("topic-thumbnails"),
diff --git a/javascripts/discourse/services/topic-thumbnails.js b/javascripts/discourse/services/topic-thumbnails.js
@@ -1,7 +1,7 @@
-import Service, { inject as service } from "@ember/service";
-import discourseComputed from "discourse-common/utils/decorators";
-import Site from "discourse/models/site";
 import { dependentKeyCompat } from "@ember/object/compat";
+import Service, { service } from "@ember/service";
+import Site from "discourse/models/site";
+import discourseComputed from "discourse-common/utils/decorators";
 
 const minimalGridCategories = settings.minimal_grid_categories
   .split("|")
diff --git a/package.json b/package.json
@@ -1,10 +1,9 @@
 {
-  "name": "discourse-topic-thumbnails",
-  "version": "1.0.0",
-  "repository": "https://github.com/discourse/discourse-topic-thumbnails",
-  "author": "Discourse",
-  "license": "MIT",
+  "private": true,
   "devDependencies": {
-    "eslint-config-discourse": "^3.1.0"
+    "@discourse/lint-configs": "^1.3.7",
+    "ember-template-lint": "^5.13.0",
+    "eslint": "^8.56.0",
+    "prettier": "^2.8.8"
   }
 }
diff --git a/test/acceptance/suggested-topics-test.js b/test/acceptance/suggested-topics-test.js
@@ -1,10 +1,10 @@
+import { visit } from "@ember/test-helpers";
+import { test } from "qunit";
 import {
   acceptance,
   exists,
   query,
 } from "discourse/tests/helpers/qunit-helpers";
-import { visit } from "@ember/test-helpers";
-import { test } from "qunit";
 
 acceptance("topic list thumbnails | suggested topics", function () {
   test("list the tags", async function (assert) {
diff --git a/yarn.lock b/yarn.lock

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+module.exports = require("@discourse/lint-configs/eslint-theme");`
Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,9 @@`
`1`	`1`	`{`
`2`		`- "name": "discourse-topic-thumbnails",`
`3`		`- "version": "1.0.0",`
`4`		`- "repository": "https://github.com/discourse/discourse-topic-thumbnails",`
`5`		`- "author": "Discourse",`
`6`		`- "license": "MIT",`
	`2`	`+ "private": true,`
`7`	`3`	`"devDependencies": {`
`8`		`- "eslint-config-discourse": "^3.1.0"`
	`4`	`+ "@discourse/lint-configs": "^1.3.7",`
	`5`	`+ "ember-template-lint": "^5.13.0",`
	`6`	`+ "eslint": "^8.56.0",`
	`7`	`+ "prettier": "^2.8.8"`
`9`	`8`	`}`
`10`	`9`	`}`