@discourse/lint-configs 2.21.0 → 2.23.0

package/eslint-rules/theme-imports.mjs

@@ -0,0 +1,96 @@
+export default {
+  meta: {
+    type: "problem",
+    docs: {
+      description: "Do not use themeSetting or themeI18n helpers.",
+    },
+    fixable: "code",
+    schema: [], // no options
+  },
+
+  create(context) {
+    return {
+      ImportDeclaration(node) {
+        const modulePath = node.source.value.toLowerCase();
+        const moduleScope = context.sourceCode.scopeManager.scopes.find(
+          (s) => s.type === "module"
+        );
+
+        if (modulePath === "discourse/helpers/theme-setting") {
+          context.report({
+            node,
+            message: `Importing themeSetting is not allowed.`,
+            fix(fixer) {
+              const fixes = [fixer.remove(node)];
+
+              const importName = node.specifiers[0].local.name;
+              const themeSetting = moduleScope.variables.find(
+                (v) => v.name === importName
+              );
+              themeSetting.references.forEach((ref) => {
+                const expression = ref.identifier.parent.parent;
+                const param = expression?.params[0];
+
+                if (expression?.type === "GlimmerMustacheStatement") {
+                  fixes.push(
+                    fixer.replaceText(expression, `{{settings.${param.value}}}`)
+                  );
+                } else if (expression?.type === "GlimmerSubExpression") {
+                  fixes.push(
+                    fixer.replaceText(expression, `settings.${param.value}`)
+                  );
+                }
+              });
+
+              return fixes;
+            },
+          });
+        } else if (modulePath === "discourse/helpers/theme-i18n") {
+          context.report({
+            node,
+            message: `Importing themeI18n is not allowed.`,
+            fix(fixer) {
+              const fixes = [];
+
+              const i18nImport = moduleScope.variables.find(
+                (v) => v.name === "i18n"
+              );
+              if (i18nImport) {
+                fixes.push(fixer.remove(node));
+              } else {
+                fixes.push(
+                  fixer.replaceText(
+                    node,
+                    `import { i18n } from "discourse-i18n";`
+                  )
+                );
+              }
+
+              const importName = node.specifiers[0].local.name;
+              const themeI18n = moduleScope.variables.find(
+                (v) => v.name === importName
+              );
+              themeI18n.references.forEach((ref) => {
+                const expression = ref.identifier.parent.parent;
+                if (
+                  ["GlimmerMustacheStatement", "GlimmerSubExpression"].includes(
+                    expression?.type
+                  )
+                ) {
+                  const param = expression.params[0];
+                  if (param) {
+                    fixes.push(fixer.replaceText(ref.identifier, "i18n"));
+                    fixes.push(fixer.insertTextBefore(param, "(themePrefix "));
+                    fixes.push(fixer.insertTextAfter(param, ")"));
+                  }
+                }
+              });
+
+              return fixes;
+            },
+          });
+        }
+      },
+    };
+  },
+};

package/eslint.mjs

@@ -24,6 +24,7 @@ import linesBetweenClassMembers from "./eslint-rules/lines-between-class-members
 import noCurlyComponents from "./eslint-rules/no-curly-components.mjs";
 import noSimpleQuerySelector from "./eslint-rules/no-simple-query-selector.mjs";
 import serviceInjectImport from "./eslint-rules/service-inject-import.mjs";
+import themeImports from "./eslint-rules/theme-imports.mjs";
 import truthHelpersImports from "./eslint-rules/truth-helpers-imports.mjs";
 
 // Copied from "ember-template-imports/lib/utils"
@@ -117,6 +118,7 @@ export default [
           "i18n-t": i18nT,
           "service-inject-import": serviceInjectImport,
           "truth-helpers-imports": truthHelpersImports,
+          "theme-imports": themeImports,
           "no-simple-query-selector": noSimpleQuerySelector,
           "deprecated-lookups": deprecatedLookups,
           "discourse-common-imports": discourseCommonImports,
@@ -190,8 +192,6 @@ export default [
       "ember/avoid-leaking-state-in-ember-objects": "off",
       "ember/no-get": "off",
       "ember/no-observers": "off",
-      "ember/no-mixins": "off",
-      "ember/no-new-mixins": "off",
       "ember/no-implicit-injections": "off", // this rule is broken
       "ember/no-array-prototype-extensions": "off",
       "ember/no-at-ember-render-modifiers": "off",
@@ -294,6 +294,7 @@ export default [
       "discourse/i18n-t": ["error"],
       "discourse/service-inject-import": ["error"],
       "discourse/truth-helpers-imports": ["error"],
+      "discourse/theme-imports": ["error"],
       "discourse/no-simple-query-selector": ["error"],
       "discourse/deprecated-lookups": ["error"],
       "discourse/discourse-common-imports": ["error"],

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@discourse/lint-configs",
-  "version": "2.21.0",
+  "version": "2.23.0",
   "description": "Shareable lint configs for Discourse core, plugins, and themes",
   "author": "Discourse",
   "license": "MIT",
@@ -30,21 +30,21 @@
     "test": "cd ../test && node test.js"
   },
   "dependencies": {
-    "@babel/core": "^7.27.1",
+    "@babel/core": "^7.27.4",
     "@babel/eslint-parser": "^7.27.1",
     "@babel/plugin-proposal-decorators": "^7.27.1",
     "ember-template-lint": "^7.7.0",
-    "eslint": "^9.27.0",
+    "eslint": "^9.28.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.1.0",
+    "globals": "^16.2.0",
     "prettier": "^3.5.3",
     "prettier-plugin-ember-template-tag": "^2.0.5",
-    "stylelint": "^16.19.1",
+    "stylelint": "^16.20.0",
     "stylelint-config-standard": "^38.0.0",
     "stylelint-config-standard-scss": "^15.0.1",
     "stylelint-scss": "^6.12.0",
@@ -52,8 +52,8 @@
   },
   "peerDependencies": {
     "ember-template-lint": "7.7.0",
-    "eslint": "9.27.0",
+    "eslint": "9.28.0",
     "prettier": "3.5.3",
-    "stylelint": "16.19.1"
+    "stylelint": "16.20.0"
   }
 }