@ntnyq/eslint-config 3.10.0 → 3.10.2

package/dist/index.js

@@ -63,6 +63,10 @@ import { default as default24 } from "@eslint-community/eslint-plugin-eslint-com
 // src/eslint/configs.ts
 import { configs } from "typescript-eslint";
 
+// src/eslint/resolvers.ts
+import { createTypeScriptImportResolver } from "eslint-import-resolver-typescript";
+var createNodeResolver = default18.createNodeResolver;
+
 // src/eslint/processors.ts
 import { mergeProcessors } from "eslint-merge-processors";
 import { processorPassThrough } from "eslint-merge-processors";
@@ -92,6 +96,7 @@ var GLOB_JSON = "**/*.json";
 var GLOB_JSON5 = "**/*.json5";
 var GLOB_JSONC = "**/*.jsonc";
 var GLOB_PACKAGE_JSON = "**/package.json";
+var GLOB_SVG = "**/*.svg";
 var GLOB_VUE = "**/*.vue";
 var GLOB_YAML = "**/*.y?(a)ml";
 var GLOB_TOML = "**/*.toml";
@@ -990,8 +995,6 @@ var vitest = (options = {}) => [
 // src/configs/svgo.ts
 import { config as createSVGOConfig } from "eslint-plugin-svgo";
 var svgo = (options = {}) => [
-  // TODO: remove after fix type
-  // @ts-expect-error type
   {
     ...createSVGOConfig(options),
     name: "ntnyq/svgo"
@@ -1696,38 +1699,46 @@ var ignores = (customIgnores = []) => [
 ];
 
 // src/configs/importX.ts
-var { createNodeResolver } = default18;
-var importX = (options = {}) => [
-  {
-    name: "ntnyq/import-x",
-    plugins: {
-      "import-x": default18
-    },
-    settings: {
-      "import-x/resolver-next": [
-        createNodeResolver({
-          extensions: [".js", ".mjs", ".ts", ".mts", ".d.ts", ".json"]
-        })
-      ]
-    },
-    rules: {
-      "import-x/no-unresolved": "off",
-      "import-x/no-absolute-path": "off",
-      "import-x/no-named-as-default-member": "off",
-      "import-x/no-named-default": "off",
-      // disabled in favor or `perfectionist/sort-imports`
-      "import-x/order": "off",
-      "import-x/first": "error",
-      "import-x/export": "error",
-      "import-x/no-self-import": "error",
-      "import-x/no-duplicates": "error",
-      "import-x/no-mutable-exports": "error",
-      "import-x/newline-after-import": "error",
-      // Overrides rules
-      ...options.overrides
+var importX = (options = {}) => {
+  const {
+    typescript: enableTypeScript,
+    // use typescript resolve if possible
+    preferTypeScriptResolver = true
+  } = options;
+  return [
+    {
+      name: "ntnyq/import-x",
+      plugins: {
+        "import-x": default18
+      },
+      settings: {
+        "import-x/resolver-next": [
+          enableTypeScript && preferTypeScriptResolver ? createTypeScriptImportResolver({
+            extensions: [".ts", ".tsx", ".d.ts", ".js", ".jsx", ".json", ".node"]
+          }) : createNodeResolver({
+            extensions: [".js", ".mjs", ".ts", ".mts", ".d.ts", ".json"]
+          })
+        ]
+      },
+      rules: {
+        "import-x/no-unresolved": "off",
+        "import-x/no-absolute-path": "off",
+        "import-x/no-named-as-default-member": "off",
+        "import-x/no-named-default": "off",
+        // disabled in favor or `perfectionist/sort-imports`
+        "import-x/order": "off",
+        "import-x/first": "error",
+        "import-x/export": "error",
+        "import-x/no-self-import": "error",
+        "import-x/no-duplicates": "error",
+        "import-x/no-mutable-exports": "error",
+        "import-x/newline-after-import": "error",
+        // Overrides rules
+        ...options.overrides
+      }
     }
-  }
-];
+  ];
+};
 
 // src/configs/unicorn.ts
 var disabledRules2 = {
@@ -1977,7 +1988,7 @@ var markdown = (options = {}) => {
 // src/configs/prettier.ts
 var prettier = (options = {}) => {
   const {
-    disabledFiles = [GLOB_TOML, GLOB_ASTRO, GLOB_SVELTE],
+    disabledFiles = [GLOB_SVG, GLOB_TOML, GLOB_ASTRO, GLOB_SVELTE],
     // User defined disabled files
     userDisabledFiles = []
   } = options;
@@ -2922,6 +2933,8 @@ function defineESLintConfig(options = {}, ...userConfigs) {
       ...resolveSubOptions(options, "command")
     }),
     ...importX({
+      ...resolveSubOptions(options, "importX"),
+      typescript: !!enableTypeScript,
       overrides: getOverrides(options, "importX")
     }),
     ...jsdoc({
@@ -3119,6 +3132,7 @@ export {
   GLOB_SRC_EXT,
   GLOB_STYLE,
   GLOB_SVELTE,
+  GLOB_SVG,
   GLOB_TEST,
   GLOB_TOML,
   GLOB_TS,
@@ -3129,6 +3143,8 @@ export {
   antfu,
   command,
   comments,
+  createNodeResolver,
+  createTypeScriptImportResolver,
   defineESLintConfig,
   depend,
   esX,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ntnyq/eslint-config",
   "type": "module",
-  "version": "3.10.0",
+  "version": "3.10.2",
   "packageManager": "pnpm@9.15.1",
   "description": "An opinionated ESLint config preset of ntnyq",
   "keywords": [
@@ -63,6 +63,7 @@
     "@vitest/eslint-plugin": "^1.1.20",
     "eslint-config-flat-gitignore": "^0.3.0",
     "eslint-flat-config-utils": "^0.4.0",
+    "eslint-import-resolver-typescript": "^3.7.0",
     "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-antfu": "^2.7.0",
     "eslint-plugin-command": "^0.2.7",
@@ -79,7 +80,7 @@
     "eslint-plugin-pinia": "^0.4.1",
     "eslint-plugin-prettier": "^5.2.1",
     "eslint-plugin-regexp": "^2.7.0",
-    "eslint-plugin-svgo": "^0.1.1",
+    "eslint-plugin-svgo": "^0.2.0",
     "eslint-plugin-toml": "^0.12.0",
     "eslint-plugin-unicorn": "^56.0.1",
     "eslint-plugin-unused-imports": "^4.1.4",
@@ -98,7 +99,7 @@
   "devDependencies": {
     "@ntnyq/prettier-config": "^1.22.0",
     "@types/node": "^22.10.2",
-    "bumpp": "^9.9.1",
+    "bumpp": "^9.9.2",
     "eslint": "^9.17.0",
     "eslint-typegen": "^0.3.2",
     "husky": "^9.1.7",