@discourse/lint-configs 2.8.0 → 2.10.0

package/.prettierrc.cjs

@@ -1,5 +1,6 @@
 module.exports = {
   plugins: ["prettier-plugin-ember-template-tag"],
+  trailingComma: "es5",
   overrides: [
     {
       files: "*.gjs",

package/eslint-rules/i18n-import-location.mjs

@@ -27,12 +27,12 @@ export default {
         }
 
         if (
-          node.source.value.toLowerCase() === "discourse-common/helpers/i18n"
+          node.source.value.toLowerCase() === "discourse-common/helpers/i18n" ||
+          node.source.value.toLowerCase() === "discourse/helpers/i18n"
         ) {
           context.report({
             node,
-            message:
-              "Import from 'discourse-common/helpers/i18n' is not allowed. Use 'discourse-i18n' instead.",
+            message: `Import from '${node.source.value}' is not allowed. Use 'discourse-i18n' instead.`,
             fix(fixer) {
               const existingImport = context
                 .getSourceCode()

package/eslint.mjs

@@ -7,6 +7,7 @@ import EmberESLintParser from "ember-eslint-parser";
 import DecoratorPosition from "eslint-plugin-decorator-position";
 import EmberPlugin from "eslint-plugin-ember";
 import EmberRecommended from "eslint-plugin-ember/configs/recommended";
+import ImportPlugin from "eslint-plugin-import";
 import QUnitPlugin from "eslint-plugin-qunit";
 import QUnitRecommended from "eslint-plugin-qunit/configs/recommended";
 import SimpleImportSort from "eslint-plugin-simple-import-sort";
@@ -101,6 +102,7 @@ export default [
       "decorator-position": DecoratorPosition,
       "simple-import-sort": SimpleImportSort,
       qunit: QUnitPlugin,
+      import: ImportPlugin,
       discourse: {
         rules: {
           "i18n-import-location": i18nImport,
@@ -156,7 +158,7 @@ export default [
       "valid-typeof": "error",
       "wrap-iife": ["error", "inside"],
       curly: "error",
-      "no-duplicate-imports": "error",
+      "import/no-duplicates": "error",
       "object-shorthand": ["error", "properties"],
       "no-dupe-class-members": "error",
       "@stylistic/js/lines-between-class-members": [

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discourse/lint-configs",
-  "version": "2.8.0",
+  "version": "2.10.0",
   "description": "Shareable lint configs for Discourse core, plugins, and themes",
   "author": "Discourse",
   "license": "MIT",
@@ -26,7 +26,7 @@
     "./template-lint-rules": "./template-lint-rules/index.mjs"
   },
   "scripts": {
-    "lint": "eslint --no-error-on-unmatched-pattern **/*.cjs */**.mjs **/*.js && pnpm prettier --check .",
+    "lint": "eslint --no-error-on-unmatched-pattern \"**/*.{cjs,mjs,js}\" && pnpm prettier --check \"**/*.{cjs,mjs,js}\"",
     "test": "cd ../test && node test.js"
   },
   "dependencies": {
@@ -38,12 +38,13 @@
     "eslint": "^9.21.0",
     "eslint-plugin-decorator-position": "^6.0.0",
     "eslint-plugin-ember": "^12.5.0",
+    "eslint-plugin-import": "^2.31.0",
     "eslint-plugin-qunit": "^8.1.2",
     "eslint-plugin-simple-import-sort": "^12.1.1",
     "eslint-plugin-sort-class-members": "^1.21.0",
     "globals": "^16.0.0",
-    "prettier": "^2.8.8",
-    "prettier-plugin-ember-template-tag": "^0.3.2",
+    "prettier": "^3.5.3",
+    "prettier-plugin-ember-template-tag": "^2.0.4",
     "stylelint": "^16.15.0",
     "stylelint-config-standard": "^37.0.0",
     "stylelint-config-standard-scss": "^14.0.0",
@@ -52,7 +53,7 @@
   "peerDependencies": {
     "ember-template-lint": "7.0.0",
     "eslint": "9.21.0",
-    "prettier": "2.8.8",
+    "prettier": "3.5.3",
     "stylelint": "16.15.0"
   }
 }