@kirklin/eslint-config 2.0.0 → 2.1.0

package/README.md

@@ -216,7 +216,7 @@ export default kirklin({
 
   // `.eslintignore` is no longer supported in Flat config, use `ignores` instead
   ignores: [
-    "./fixtures",
+    "**/fixtures",
     // ...globs
   ]
 });

package/README.zh-cn.md

@@ -216,7 +216,7 @@ export default kirklin({
 
   // 在Flat配置中不再支持`.eslintignore`，请使用`ignores`代替
   ignores: [
-    "./fixtures",
+    "**/fixtures",
     // ...globs
   ]
 });

package/dist/cli.cjs

@@ -46,39 +46,40 @@ var import_parse_gitignore = __toESM(require("parse-gitignore"), 1);
 var import_picocolors = __toESM(require("picocolors"), 1);
 
 // package.json
-var version = "2.0.0";
+var version = "2.1.0";
 var devDependencies = {
-  "@antfu/eslint-plugin-prettier": "^5.0.1-1",
+  "@antfu/eslint-plugin-prettier": "5.0.1-1",
   "@antfu/ni": "^0.21.12",
   "@kirklin/eslint-config": "workspace:*",
-  "@stylistic/eslint-plugin-migrate": "^1.5.1",
-  "@types/eslint": "^8.56.0",
+  "@stylistic/eslint-plugin-migrate": "^1.6.0",
+  "@types/eslint": "^8.56.2",
   "@types/fs-extra": "^11.0.4",
-  "@types/node": "^20.10.6",
+  "@types/node": "^20.11.16",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.58.2",
-  bumpp: "^9.2.1",
-  eslint: "npm:eslint-ts-patch@^8.56.0-0",
-  "eslint-flat-config-viewer": "^0.1.4",
+  "@unocss/eslint-plugin": "^0.58.5",
+  bumpp: "^9.3.0",
+  eslint: "npm:eslint-ts-patch@8.56.0-0",
+  "eslint-flat-config-viewer": "^0.1.11",
   "eslint-plugin-format": "^0.1.0",
   "eslint-plugin-react": "^7.33.2",
   "eslint-plugin-react-hooks": "^4.6.0",
   "eslint-plugin-react-refresh": "^0.4.5",
   "eslint-plugin-svelte": "^2.35.1",
-  "eslint-ts-patch": "^8.56.0-0",
+  "eslint-ts-patch": "8.56.0-0",
   esno: "^4.0.0",
   execa: "^8.0.1",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
-  "lint-staged": "^15.2.0",
+  "lint-staged": "^15.2.2",
   rimraf: "^5.0.5",
   "simple-git-hooks": "^2.9.0",
+  svelte: "^4.2.10",
   "svelte-eslint-parser": "^0.33.1",
   tsup: "^8.0.1",
   typescript: "^5.3.3",
-  vitest: "^1.1.0",
-  vue: "^3.4.3"
+  vitest: "^1.2.2",
+  vue: "^3.4.15"
 };
 
 // src/cli/constants.ts

package/dist/cli.js

@@ -17,39 +17,40 @@ import parse from "parse-gitignore";
 import c from "picocolors";
 
 // package.json
-var version = "2.0.0";
+var version = "2.1.0";
 var devDependencies = {
-  "@antfu/eslint-plugin-prettier": "^5.0.1-1",
+  "@antfu/eslint-plugin-prettier": "5.0.1-1",
   "@antfu/ni": "^0.21.12",
   "@kirklin/eslint-config": "workspace:*",
-  "@stylistic/eslint-plugin-migrate": "^1.5.1",
-  "@types/eslint": "^8.56.0",
+  "@stylistic/eslint-plugin-migrate": "^1.6.0",
+  "@types/eslint": "^8.56.2",
   "@types/fs-extra": "^11.0.4",
-  "@types/node": "^20.10.6",
+  "@types/node": "^20.11.16",
   "@types/prompts": "^2.4.9",
   "@types/yargs": "^17.0.32",
-  "@unocss/eslint-plugin": "^0.58.2",
-  bumpp: "^9.2.1",
-  eslint: "npm:eslint-ts-patch@^8.56.0-0",
-  "eslint-flat-config-viewer": "^0.1.4",
+  "@unocss/eslint-plugin": "^0.58.5",
+  bumpp: "^9.3.0",
+  eslint: "npm:eslint-ts-patch@8.56.0-0",
+  "eslint-flat-config-viewer": "^0.1.11",
   "eslint-plugin-format": "^0.1.0",
   "eslint-plugin-react": "^7.33.2",
   "eslint-plugin-react-hooks": "^4.6.0",
   "eslint-plugin-react-refresh": "^0.4.5",
   "eslint-plugin-svelte": "^2.35.1",
-  "eslint-ts-patch": "^8.56.0-0",
+  "eslint-ts-patch": "8.56.0-0",
   esno: "^4.0.0",
   execa: "^8.0.1",
   "fast-glob": "^3.3.2",
   "fs-extra": "^11.2.0",
-  "lint-staged": "^15.2.0",
+  "lint-staged": "^15.2.2",
   rimraf: "^5.0.5",
   "simple-git-hooks": "^2.9.0",
+  svelte: "^4.2.10",
   "svelte-eslint-parser": "^0.33.1",
   tsup: "^8.0.1",
   typescript: "^5.3.3",
-  vitest: "^1.1.0",
-  vue: "^3.4.3"
+  vitest: "^1.2.2",
+  vue: "^3.4.15"
 };
 
 // src/cli/constants.ts

package/dist/index.cjs

@@ -328,7 +328,6 @@ async function javascript(options = {}) {
         "no-multi-str": "error",
         "no-new": "error",
         "no-new-func": "error",
-        "no-new-object": "error",
         "no-new-symbol": "error",
         "no-new-wrappers": "error",
         "no-obj-calls": "error",
@@ -534,7 +533,6 @@ async function jsdoc(options = {}) {
     {
       name: "kirklin:jsdoc",
       plugins: {
-        // @ts-expect-error missing types
         jsdoc: await interopDefault(import("eslint-plugin-jsdoc"))
       },
       rules: {
@@ -1325,6 +1323,7 @@ async function svelte(options = {}) {
         }
       },
       name: "kirklin:svelte:rules",
+      processor: pluginSvelte.processors[".svelte"],
       rules: {
         "import/no-mutable-exports": "off",
         "no-undef": "off",
@@ -1438,6 +1437,8 @@ async function typescript(options = {}) {
     ...componentExts.map((ext) => `**/*.${ext}`)
   ];
   const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
+  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
     "dot-notation": "off",
     "no-implied-eval": "off",
@@ -1459,7 +1460,6 @@ async function typescript(options = {}) {
     "ts/restrict-template-expressions": "error",
     "ts/unbound-method": "error"
   };
-  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
   const [
     pluginTs,
     parserTs
@@ -1467,29 +1467,41 @@ async function typescript(options = {}) {
     interopDefault(import("@typescript-eslint/eslint-plugin")),
     interopDefault(import("@typescript-eslint/parser"))
   ]);
-  return [
-    {
-      // Install the plugins without globs, so they can be configured separately.
-      name: "kirklin:typescript:setup",
-      plugins: {
-        kirklin: import_eslint_plugin_kirklin.default,
-        ts: pluginTs
-      }
-    },
-    {
-      files,
+  function makeParser(typeAware, files2, ignores2) {
+    return {
+      files: files2,
+      ...ignores2 ? { ignores: ignores2 } : {},
       languageOptions: {
         parser: parserTs,
         parserOptions: {
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
           sourceType: "module",
-          ...tsconfigPath ? {
+          ...typeAware ? {
             project: tsconfigPath,
             tsconfigRootDir: import_node_process2.default.cwd()
           } : {},
           ...parserOptions
         }
       },
+      name: `kirklin:typescript:${typeAware ? "type-aware-parser" : "parser"}`
+    };
+  }
+  return [
+    {
+      // Install the plugins without globs, so they can be configured separately.
+      name: "kirklin:typescript:setup",
+      plugins: {
+        kirklin: import_eslint_plugin_kirklin.default,
+        ts: pluginTs
+      }
+    },
+    // assign type-aware parser for type-aware files and type-unaware parser for the rest
+    ...isTypeAware ? [
+      makeParser(true, filesTypeAware),
+      makeParser(false, files, filesTypeAware)
+    ] : [makeParser(false, files)],
+    {
+      files,
       name: "kirklin:typescript:rules",
       rules: {
         ...renameRules(
@@ -1511,6 +1523,8 @@ async function typescript(options = {}) {
         "ts/ban-types": ["error", { types: { Function: false } }],
         "ts/consistent-type-definitions": ["error", "interface"],
         "ts/consistent-type-imports": ["error", { disallowTypeAnnotations: false, prefer: "type-imports" }],
+        "ts/method-signature-style": ["error", "property"],
+        // https://www.totaltypescript.com/method-shorthand-syntax-considered-harmful
         "ts/no-dupe-class-members": "error",
         "ts/no-dynamic-delete": "off",
         "ts/no-explicit-any": "off",
@@ -1715,6 +1729,8 @@ async function vue(options = {}) {
           registeredComponentsOnly: false
         }],
         "vue/component-options-name-casing": ["error", "PascalCase"],
+        // this is deprecated
+        "vue/component-tags-order": "off",
         "vue/custom-event-name-casing": ["error", "camelCase"],
         "vue/define-macros-order": ["error", {
           order: ["defineOptions", "defineProps", "defineEmits", "defineSlots"]
@@ -1728,7 +1744,6 @@ async function vue(options = {}) {
         "vue/multi-word-component-names": "off",
         "vue/no-dupe-keys": "off",
         "vue/no-empty-pattern": "error",
-        "vue/no-extra-parens": ["error", "functions"],
         "vue/no-irregular-whitespace": "error",
         "vue/no-loss-of-precision": "error",
         "vue/no-restricted-syntax": [
@@ -1910,6 +1925,7 @@ async function toml(options = {}) {
 
 // src/factory.ts
 var flatConfigProps = [
+  "name",
   "files",
   "ignores",
   "languageOptions",
@@ -1974,7 +1990,8 @@ async function kirklin(options = {}, ...userConfigs) {
   if (enableTypeScript) {
     configs.push(typescript({
       ...resolveSubOptions(options, "typescript"),
-      componentExts
+      componentExts,
+      overrides: getOverrides(options, "typescript")
     }));
   }
   if (stylisticOptions) {
@@ -1992,6 +2009,7 @@ async function kirklin(options = {}, ...userConfigs) {
   if (enableVue) {
     configs.push(vue({
       ...resolveSubOptions(options, "vue"),
+      overrides: getOverrides(options, "vue"),
       stylistic: stylisticOptions,
       typescript: !!enableTypeScript
     }));

package/dist/index.d.cts

@@ -316,7 +316,7 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    stylistic?: boolean | StylisticConfig;
+    stylistic?: boolean | (StylisticConfig & OptionsOverrides);
     /**
      * Enable react rules.
      *

package/dist/index.d.ts

@@ -316,7 +316,7 @@ interface OptionsConfig extends OptionsComponentExts {
      *
      * @default true
      */
-    stylistic?: boolean | StylisticConfig;
+    stylistic?: boolean | (StylisticConfig & OptionsOverrides);
     /**
      * Enable react rules.
      *

package/dist/index.js

@@ -235,7 +235,6 @@ async function javascript(options = {}) {
         "no-multi-str": "error",
         "no-new": "error",
         "no-new-func": "error",
-        "no-new-object": "error",
         "no-new-symbol": "error",
         "no-new-wrappers": "error",
         "no-obj-calls": "error",
@@ -441,7 +440,6 @@ async function jsdoc(options = {}) {
     {
       name: "kirklin:jsdoc",
       plugins: {
-        // @ts-expect-error missing types
         jsdoc: await interopDefault(import("eslint-plugin-jsdoc"))
       },
       rules: {
@@ -1232,6 +1230,7 @@ async function svelte(options = {}) {
         }
       },
       name: "kirklin:svelte:rules",
+      processor: pluginSvelte.processors[".svelte"],
       rules: {
         "import/no-mutable-exports": "off",
         "no-undef": "off",
@@ -1345,6 +1344,8 @@ async function typescript(options = {}) {
     ...componentExts.map((ext) => `**/*.${ext}`)
   ];
   const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
+  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
+  const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
     "dot-notation": "off",
     "no-implied-eval": "off",
@@ -1366,7 +1367,6 @@ async function typescript(options = {}) {
     "ts/restrict-template-expressions": "error",
     "ts/unbound-method": "error"
   };
-  const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
   const [
     pluginTs,
     parserTs
@@ -1374,29 +1374,41 @@ async function typescript(options = {}) {
     interopDefault(import("@typescript-eslint/eslint-plugin")),
     interopDefault(import("@typescript-eslint/parser"))
   ]);
-  return [
-    {
-      // Install the plugins without globs, so they can be configured separately.
-      name: "kirklin:typescript:setup",
-      plugins: {
-        kirklin: default2,
-        ts: pluginTs
-      }
-    },
-    {
-      files,
+  function makeParser(typeAware, files2, ignores2) {
+    return {
+      files: files2,
+      ...ignores2 ? { ignores: ignores2 } : {},
       languageOptions: {
         parser: parserTs,
         parserOptions: {
           extraFileExtensions: componentExts.map((ext) => `.${ext}`),
           sourceType: "module",
-          ...tsconfigPath ? {
+          ...typeAware ? {
             project: tsconfigPath,
             tsconfigRootDir: process2.cwd()
           } : {},
           ...parserOptions
         }
       },
+      name: `kirklin:typescript:${typeAware ? "type-aware-parser" : "parser"}`
+    };
+  }
+  return [
+    {
+      // Install the plugins without globs, so they can be configured separately.
+      name: "kirklin:typescript:setup",
+      plugins: {
+        kirklin: default2,
+        ts: pluginTs
+      }
+    },
+    // assign type-aware parser for type-aware files and type-unaware parser for the rest
+    ...isTypeAware ? [
+      makeParser(true, filesTypeAware),
+      makeParser(false, files, filesTypeAware)
+    ] : [makeParser(false, files)],
+    {
+      files,
       name: "kirklin:typescript:rules",
       rules: {
         ...renameRules(
@@ -1418,6 +1430,8 @@ async function typescript(options = {}) {
         "ts/ban-types": ["error", { types: { Function: false } }],
         "ts/consistent-type-definitions": ["error", "interface"],
         "ts/consistent-type-imports": ["error", { disallowTypeAnnotations: false, prefer: "type-imports" }],
+        "ts/method-signature-style": ["error", "property"],
+        // https://www.totaltypescript.com/method-shorthand-syntax-considered-harmful
         "ts/no-dupe-class-members": "error",
         "ts/no-dynamic-delete": "off",
         "ts/no-explicit-any": "off",
@@ -1622,6 +1636,8 @@ async function vue(options = {}) {
           registeredComponentsOnly: false
         }],
         "vue/component-options-name-casing": ["error", "PascalCase"],
+        // this is deprecated
+        "vue/component-tags-order": "off",
         "vue/custom-event-name-casing": ["error", "camelCase"],
         "vue/define-macros-order": ["error", {
           order: ["defineOptions", "defineProps", "defineEmits", "defineSlots"]
@@ -1635,7 +1651,6 @@ async function vue(options = {}) {
         "vue/multi-word-component-names": "off",
         "vue/no-dupe-keys": "off",
         "vue/no-empty-pattern": "error",
-        "vue/no-extra-parens": ["error", "functions"],
         "vue/no-irregular-whitespace": "error",
         "vue/no-loss-of-precision": "error",
         "vue/no-restricted-syntax": [
@@ -1817,6 +1832,7 @@ async function toml(options = {}) {
 
 // src/factory.ts
 var flatConfigProps = [
+  "name",
   "files",
   "ignores",
   "languageOptions",
@@ -1881,7 +1897,8 @@ async function kirklin(options = {}, ...userConfigs) {
   if (enableTypeScript) {
     configs.push(typescript({
       ...resolveSubOptions(options, "typescript"),
-      componentExts
+      componentExts,
+      overrides: getOverrides(options, "typescript")
     }));
   }
   if (stylisticOptions) {
@@ -1899,6 +1916,7 @@ async function kirklin(options = {}, ...userConfigs) {
   if (enableVue) {
     configs.push(vue({
       ...resolveSubOptions(options, "vue"),
+      overrides: getOverrides(options, "vue"),
       stylistic: stylisticOptions,
       typescript: !!enableTypeScript
     }));

package/package.json

@@ -1,8 +1,8 @@
 {
   "name": "@kirklin/eslint-config",
   "type": "module",
-  "version": "2.0.0",
-  "packageManager": "pnpm@8.13.1",
+  "version": "2.1.0",
+  "packageManager": "pnpm@8.15.1",
   "description": "Kirk Lin's ESLint config",
   "author": "Kirk Lin (https://github.com/kirklin/)",
   "license": "MIT",
@@ -24,19 +24,6 @@
     "bin",
     "dist"
   ],
-  "scripts": {
-    "build": "tsup --format esm,cjs --clean --dts",
-    "stub": "tsup --format esm",
-    "dev": "tsup --format esm,cjs --watch & eslint-flat-config-viewer",
-    "watch": "tsup --format esm,cjs --watch",
-    "lint": "eslint .",
-    "lint:fix": "eslint . --fix",
-    "prepack": "nr build",
-    "release": "bumpp && pnpm publish",
-    "test": "vitest",
-    "typecheck": "tsc --noEmit",
-    "prepare": "simple-git-hooks"
-  },
   "peerDependencies": {
     "@unocss/eslint-plugin": ">=0.50.0",
     "eslint": ">=8.40.0",
@@ -71,31 +58,31 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-define-config": "^1.23.0-2",
+    "@antfu/eslint-define-config": "1.23.0-2",
     "@antfu/install-pkg": "^0.3.1",
-    "@eslint-types/jsdoc": "46.9.1",
-    "@eslint-types/typescript-eslint": "^6.16.0",
+    "@eslint-types/jsdoc": "48.0.4",
+    "@eslint-types/typescript-eslint": "^6.19.1",
     "@eslint-types/unicorn": "^50.0.1",
-    "@stylistic/eslint-plugin": "^1.5.1",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
+    "@stylistic/eslint-plugin": "^1.6.0",
+    "@typescript-eslint/eslint-plugin": "^6.21.0",
+    "@typescript-eslint/parser": "^6.21.0",
     "eslint-config-flat-gitignore": "^0.1.2",
     "eslint-merge-processors": "^0.1.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-i": "^2.29.1",
-    "eslint-plugin-jsdoc": "^46.10.1",
-    "eslint-plugin-jsonc": "^2.11.2",
+    "eslint-plugin-jsdoc": "^48.0.5",
+    "eslint-plugin-jsonc": "^2.13.0",
     "eslint-plugin-kirklin": "^1.1.0",
     "eslint-plugin-markdown": "^3.0.1",
-    "eslint-plugin-n": "^16.6.0",
+    "eslint-plugin-n": "^16.6.2",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.5.0",
-    "eslint-plugin-toml": "^0.8.0",
+    "eslint-plugin-toml": "^0.9.2",
     "eslint-plugin-unicorn": "^50.0.1",
     "eslint-plugin-unused-imports": "^3.0.0",
-    "eslint-plugin-vitest": "^0.3.20",
-    "eslint-plugin-vue": "^9.19.2",
-    "eslint-plugin-yml": "^1.11.0",
+    "eslint-plugin-vitest": "^0.3.21",
+    "eslint-plugin-vue": "^9.21.1",
+    "eslint-plugin-yml": "^1.12.2",
     "eslint-processor-vue-blocks": "^0.1.1",
     "globals": "^13.24.0",
     "jsonc-eslint-parser": "^2.4.0",
@@ -104,47 +91,59 @@
     "picocolors": "^1.0.0",
     "prompts": "^2.4.2",
     "toml-eslint-parser": "^0.9.3",
-    "vue-eslint-parser": "^9.3.2",
+    "vue-eslint-parser": "^9.4.2",
     "yaml-eslint-parser": "^1.2.2",
     "yargs": "^17.7.2"
   },
   "devDependencies": {
-    "@antfu/eslint-plugin-prettier": "^5.0.1-1",
+    "@antfu/eslint-plugin-prettier": "5.0.1-1",
     "@antfu/ni": "^0.21.12",
-    "@kirklin/eslint-config": "workspace:*",
-    "@stylistic/eslint-plugin-migrate": "^1.5.1",
-    "@types/eslint": "^8.56.0",
+    "@stylistic/eslint-plugin-migrate": "^1.6.0",
+    "@types/eslint": "^8.56.2",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.16",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
-    "@unocss/eslint-plugin": "^0.58.2",
-    "bumpp": "^9.2.1",
-    "eslint": "npm:eslint-ts-patch@^8.56.0-0",
-    "eslint-flat-config-viewer": "^0.1.4",
+    "@unocss/eslint-plugin": "^0.58.5",
+    "bumpp": "^9.3.0",
+    "eslint": "npm:eslint-ts-patch@8.56.0-0",
+    "eslint-flat-config-viewer": "^0.1.11",
     "eslint-plugin-format": "^0.1.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^4.6.0",
     "eslint-plugin-react-refresh": "^0.4.5",
     "eslint-plugin-svelte": "^2.35.1",
-    "eslint-ts-patch": "^8.56.0-0",
+    "eslint-ts-patch": "8.56.0-0",
     "esno": "^4.0.0",
     "execa": "^8.0.1",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.0",
+    "lint-staged": "^15.2.2",
     "rimraf": "^5.0.5",
     "simple-git-hooks": "^2.9.0",
+    "svelte": "^4.2.10",
     "svelte-eslint-parser": "^0.33.1",
     "tsup": "^8.0.1",
     "typescript": "^5.3.3",
-    "vitest": "^1.1.0",
-    "vue": "^3.4.3"
+    "vitest": "^1.2.2",
+    "vue": "^3.4.15",
+    "@kirklin/eslint-config": "2.1.0"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"
   },
   "lint-staged": {
     "*": "eslint --fix"
+  },
+  "scripts": {
+    "build": "tsup --format esm,cjs --clean --dts",
+    "stub": "tsup --format esm",
+    "dev": "tsup --format esm,cjs --watch & eslint-flat-config-viewer",
+    "watch": "tsup --format esm,cjs --watch",
+    "lint": "eslint .",
+    "lint:fix": "eslint . --fix",
+    "release": "bumpp && pnpm publish",
+    "test": "vitest",
+    "typecheck": "tsc --noEmit"
   }
-}
+}