@rotki/eslint-config 2.5.0 → 2.6.0

package/dist/index.cjs

@@ -99,7 +99,7 @@ var import_local_pkg2 = require("local-pkg");
 // src/plugins.ts
 var import_eslint_plugin_antfu = __toESM(require("eslint-plugin-antfu"), 1);
 var import_eslint_plugin_eslint_comments = __toESM(require("eslint-plugin-eslint-comments"), 1);
-var pluginImport = __toESM(require("eslint-plugin-i"), 1);
+var pluginImport = __toESM(require("eslint-plugin-import-x"), 1);
 var import_eslint_plugin_n = __toESM(require("eslint-plugin-n"), 1);
 var import_eslint_plugin_unicorn = __toESM(require("eslint-plugin-unicorn"), 1);
 var import_eslint_plugin_unused_imports = __toESM(require("eslint-plugin-unused-imports"), 1);
@@ -180,6 +180,34 @@ async function ensurePackages(packages) {
   if (result)
     await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
 }
+function renameRules(rules, map) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([key, value]) => {
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`))
+          return [to + key.slice(from.length), value];
+      }
+      return [key, value];
+    })
+  );
+}
+function renamePluginInConfigs(configs, map) {
+  return configs.map((i) => {
+    const clone = { ...i };
+    if (clone.rules)
+      clone.rules = renameRules(clone.rules, map);
+    if (clone.plugins) {
+      clone.plugins = Object.fromEntries(
+        Object.entries(clone.plugins).map(([key, value]) => {
+          if (key in map)
+            return [map[key], value];
+          return [key, value];
+        })
+      );
+    }
+    return clone;
+  });
+}
 
 // src/globs.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -1159,6 +1187,22 @@ function sortPackageJson() {
           {
             order: ["types", "require", "import", "default"],
             pathPattern: "^exports.*$"
+          },
+          {
+            order: [
+              // client hooks only
+              "pre-commit",
+              "prepare-commit-msg",
+              "commit-msg",
+              "post-commit",
+              "pre-rebase",
+              "post-rewrite",
+              "post-checkout",
+              "post-merge",
+              "pre-push",
+              "pre-auto-gc"
+            ],
+            pathPattern: "^(?:gitHooks|husky|simple-git-hooks)$"
           }
         ]
       }
@@ -2115,6 +2159,12 @@ var VuePackages = [
   "vitepress",
   "@slidev/cli"
 ];
+var defaultPluginRenaming = {
+  "import-x": "import",
+  "n": "node",
+  "vitest": "test",
+  "yml": "yaml"
+};
 async function rotki(options = {}, ...userConfigs) {
   const {
     componentExts = [],
@@ -2254,11 +2304,11 @@ async function rotki(options = {}, ...userConfigs) {
   }, {});
   if (Object.keys(fusedConfig).length > 0)
     configs.push([fusedConfig]);
-  const merged = combine(
+  const merged = await combine(
     ...configs,
     ...userConfigs
   );
-  return merged;
+  return renamePluginInConfigs(merged, defaultPluginRenaming);
 }
 function resolveSubOptions(options, key) {
   return typeof options[key] === "boolean" ? {} : options[key] || {};

package/dist/index.d.cts

@@ -9,8 +9,8 @@ import { Rules as Rules$1 } from 'eslint-plugin-antfu';
 export { default as pluginAntfu } from 'eslint-plugin-antfu';
 import { StylisticCustomizeOptions, UnprefixedRuleOptions } from '@stylistic/eslint-plugin';
 export { default as pluginComments } from 'eslint-plugin-eslint-comments';
-import * as eslintPluginI from 'eslint-plugin-i';
-export { eslintPluginI as pluginImport };
+import * as eslintPluginImportX from 'eslint-plugin-import-x';
+export { eslintPluginImportX as pluginImport };
 export { default as pluginNode } from 'eslint-plugin-n';
 export { default as pluginUnicorn } from 'eslint-plugin-unicorn';
 export { default as pluginUnusedImports } from 'eslint-plugin-unused-imports';

package/dist/index.d.ts

@@ -9,8 +9,8 @@ import { Rules as Rules$1 } from 'eslint-plugin-antfu';
 export { default as pluginAntfu } from 'eslint-plugin-antfu';
 import { StylisticCustomizeOptions, UnprefixedRuleOptions } from '@stylistic/eslint-plugin';
 export { default as pluginComments } from 'eslint-plugin-eslint-comments';
-import * as eslintPluginI from 'eslint-plugin-i';
-export { eslintPluginI as pluginImport };
+import * as eslintPluginImportX from 'eslint-plugin-import-x';
+export { eslintPluginImportX as pluginImport };
 export { default as pluginNode } from 'eslint-plugin-n';
 export { default as pluginUnicorn } from 'eslint-plugin-unicorn';
 export { default as pluginUnusedImports } from 'eslint-plugin-unused-imports';

package/dist/index.js

@@ -6,7 +6,7 @@ import { isPackageExists as isPackageExists2 } from "local-pkg";
 // src/plugins.ts
 import { default as default2 } from "eslint-plugin-antfu";
 import { default as default3 } from "eslint-plugin-eslint-comments";
-import * as pluginImport from "eslint-plugin-i";
+import * as pluginImport from "eslint-plugin-import-x";
 import { default as default4 } from "eslint-plugin-n";
 import { default as default5 } from "eslint-plugin-unicorn";
 import { default as default6 } from "eslint-plugin-unused-imports";
@@ -87,6 +87,34 @@ async function ensurePackages(packages) {
   if (result)
     await import("@antfu/install-pkg").then((i) => i.installPackage(nonExistingPackages, { dev: true }));
 }
+function renameRules(rules, map) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([key, value]) => {
+      for (const [from, to] of Object.entries(map)) {
+        if (key.startsWith(`${from}/`))
+          return [to + key.slice(from.length), value];
+      }
+      return [key, value];
+    })
+  );
+}
+function renamePluginInConfigs(configs, map) {
+  return configs.map((i) => {
+    const clone = { ...i };
+    if (clone.rules)
+      clone.rules = renameRules(clone.rules, map);
+    if (clone.plugins) {
+      clone.plugins = Object.fromEntries(
+        Object.entries(clone.plugins).map(([key, value]) => {
+          if (key in map)
+            return [map[key], value];
+          return [key, value];
+        })
+      );
+    }
+    return clone;
+  });
+}
 
 // src/globs.ts
 var GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -1066,6 +1094,22 @@ function sortPackageJson() {
           {
             order: ["types", "require", "import", "default"],
             pathPattern: "^exports.*$"
+          },
+          {
+            order: [
+              // client hooks only
+              "pre-commit",
+              "prepare-commit-msg",
+              "commit-msg",
+              "post-commit",
+              "pre-rebase",
+              "post-rewrite",
+              "post-checkout",
+              "post-merge",
+              "pre-push",
+              "pre-auto-gc"
+            ],
+            pathPattern: "^(?:gitHooks|husky|simple-git-hooks)$"
           }
         ]
       }
@@ -2022,6 +2066,12 @@ var VuePackages = [
   "vitepress",
   "@slidev/cli"
 ];
+var defaultPluginRenaming = {
+  "import-x": "import",
+  "n": "node",
+  "vitest": "test",
+  "yml": "yaml"
+};
 async function rotki(options = {}, ...userConfigs) {
   const {
     componentExts = [],
@@ -2161,11 +2211,11 @@ async function rotki(options = {}, ...userConfigs) {
   }, {});
   if (Object.keys(fusedConfig).length > 0)
     configs.push([fusedConfig]);
-  const merged = combine(
+  const merged = await combine(
     ...configs,
     ...userConfigs
   );
-  return merged;
+  return renamePluginInConfigs(merged, defaultPluginRenaming);
 }
 function resolveSubOptions(options, key) {
   return typeof options[key] === "boolean" ? {} : options[key] || {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@rotki/eslint-config",
-  "version": "2.5.0",
-  "packageManager": "pnpm@8.14.3",
+  "version": "2.6.0",
+  "packageManager": "pnpm@8.15.5",
   "type": "module",
   "license": "AGPL-3.0",
   "bugs": {
@@ -51,11 +51,11 @@
   "dependencies": {
     "@antfu/eslint-define-config": "1.23.0-2",
     "@antfu/install-pkg": "0.3.1",
-    "@eslint-types/typescript-eslint": "7.0.2",
+    "@eslint-types/typescript-eslint": "7.2.0",
     "@eslint-types/unicorn": "51.0.1",
-    "@stylistic/eslint-plugin": "1.6.3",
-    "@typescript-eslint/eslint-plugin": "7.2.0",
-    "@typescript-eslint/parser": "7.2.0",
+    "@stylistic/eslint-plugin": "1.7.0",
+    "@typescript-eslint/eslint-plugin": "7.3.1",
+    "@typescript-eslint/parser": "7.3.1",
     "eslint-config-flat-gitignore": "0.1.3",
     "eslint-config-prettier": "9.1.0",
     "eslint-merge-processors": "0.1.0",
@@ -63,18 +63,18 @@
     "eslint-plugin-eslint-comments": "3.2.0",
     "eslint-plugin-format": "0.1.0",
     "eslint-plugin-html": "8.0.0",
-    "eslint-plugin-i": "2.29.1",
-    "eslint-plugin-jsonc": "2.13.0",
+    "eslint-plugin-import-x": "0.4.1",
+    "eslint-plugin-jsonc": "2.14.1",
     "eslint-plugin-markdown": "4.0.1",
     "eslint-plugin-n": "16.6.2",
     "eslint-plugin-no-only-tests": "3.1.0",
-    "eslint-plugin-perfectionist": "2.6.0",
+    "eslint-plugin-perfectionist": "2.7.0",
     "eslint-plugin-prettier": "5.1.3",
     "eslint-plugin-unicorn": "51.0.1",
     "eslint-plugin-unused-imports": "3.1.0",
     "eslint-plugin-vitest": "0.3.26",
     "eslint-plugin-vue": "9.23.0",
-    "eslint-plugin-yml": "1.12.2",
+    "eslint-plugin-yml": "1.13.2",
     "eslint-processor-vue-blocks": "0.1.1",
     "globals": "14.0.0",
     "jsonc-eslint-parser": "2.4.0",
@@ -85,23 +85,23 @@
     "yaml-eslint-parser": "1.2.2"
   },
   "devDependencies": {
-    "@commitlint/cli": "19.1.0",
+    "@commitlint/cli": "19.2.1",
     "@commitlint/config-conventional": "19.1.0",
     "@rotki/eslint-config": "*",
-    "@types/eslint": "8.56.5",
-    "@types/node": "20.11.26",
+    "@types/eslint": "8.56.6",
+    "@types/node": "20.11.30",
     "@types/prompts": "2.4.9",
     "bumpp": "9.4.0",
     "eslint": "8.57.0",
-    "eslint-flat-config-viewer": "0.1.11",
+    "eslint-flat-config-viewer": "0.1.14",
     "husky": "9.0.11",
     "lint-staged": "15.2.2",
     "rimraf": "5.0.5",
     "tsup": "8.0.2",
-    "typescript": "5.4.2"
+    "typescript": "5.4.3"
   },
   "engines": {
-    "node": ">=16 <19",
+    "node": ">=20 <21",
     "pnpm": ">=8 <9"
   },
   "lint-staged": {