@dhzh/eslint-config 0.8.2 → 0.9.0

package/dist/cli.cjs

@@ -48,8 +48,8 @@ var import_picocolors = __toESM(require("picocolors"), 1);
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
-  version: "0.8.2",
-  packageManager: "pnpm@9.1.4",
+  version: "0.9.0",
+  packageManager: "pnpm@9.3.0",
   description: "Easton's ESLint config",
   author: "Easton Zheng <dhzhme@gmail.com>",
   license: "MIT",
@@ -133,10 +133,10 @@ var package_default = {
   dependencies: {
     "@antfu/install-pkg": "^0.3.3",
     "@clack/prompts": "^0.7.0",
-    "@eslint-react/eslint-plugin": "^1.5.14",
+    "@eslint-react/eslint-plugin": "^1.5.15",
     "@stylistic/eslint-plugin": "^2.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
-    "@typescript-eslint/parser": "^7.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
     "eslint-config-flat-gitignore": "^0.1.5",
     "eslint-flat-config-utils": "^0.2.5",
     "eslint-merge-processors": "^0.1.0",
@@ -144,10 +144,10 @@ var package_default = {
     "eslint-plugin-command": "^0.2.3",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.1",
-    "eslint-plugin-jsdoc": "^48.2.7",
+    "eslint-plugin-jsdoc": "^48.2.9",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-markdown": "^5.0.0",
-    "eslint-plugin-n": "^17.7.0",
+    "eslint-plugin-n": "^17.8.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.10.0",
     "eslint-plugin-react-hooks": "^4.6.2",
@@ -160,7 +160,7 @@ var package_default = {
     "eslint-plugin-vue": "^9.26.0",
     "eslint-plugin-yml": "^1.14.0",
     "eslint-processor-vue-blocks": "^0.1.2",
-    globals: "^15.3.0",
+    globals: "^15.4.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "parse-gitignore": "^2.0.0",
@@ -173,37 +173,37 @@ var package_default = {
   devDependencies: {
     "@antfu/ni": "^0.21.12",
     "@dhzh/eslint-config": "workspace:*",
-    "@eslint/config-inspector": "^0.4.10",
+    "@eslint/config-inspector": "^0.4.11",
     "@prettier/plugin-xml": "^3.4.1",
     "@stylistic/eslint-plugin-migrate": "^2.1.0",
     "@types/eslint": "^8.56.10",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.13.0",
+    "@types/node": "^20.14.2",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
     "@unocss/eslint-plugin": "^0.60.4",
     "astro-eslint-parser": "^1.0.2",
     bumpp: "^9.4.1",
     eslint: "npm:eslint-ts-patch@9.4.0-0",
-    "eslint-plugin-astro": "^1.2.0",
+    "eslint-plugin-astro": "^1.2.2",
     "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-solid": "^0.14.0",
-    "eslint-plugin-svelte": "^2.39.0",
+    "eslint-plugin-svelte": "^2.39.3",
     "eslint-ts-patch": "9.4.0-0",
     "eslint-typegen": "^0.2.4",
     esno: "^4.7.0",
-    execa: "^9.1.0",
+    execa: "^9.2.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.5",
+    "lint-staged": "^15.2.6",
     "prettier-plugin-astro": "^0.14.0",
     "prettier-plugin-slidev": "^1.0.5",
     rimraf: "^5.0.7",
     "simple-git-hooks": "^2.11.1",
-    svelte: "^4.2.17",
-    "svelte-eslint-parser": "^0.36.0",
-    tsup: "^8.0.2",
-    tsx: "^4.11.0",
+    svelte: "^4.2.18",
+    "svelte-eslint-parser": "^0.37.0",
+    tsup: "^8.1.0",
+    tsx: "^4.15.2",
     typescript: "^5.4.5",
     vitest: "^1.6.0",
     vue: "^3.4.27"

package/dist/cli.js

@@ -19,8 +19,8 @@ import c from "picocolors";
 var package_default = {
   name: "@dhzh/eslint-config",
   type: "module",
-  version: "0.8.2",
-  packageManager: "pnpm@9.1.4",
+  version: "0.9.0",
+  packageManager: "pnpm@9.3.0",
   description: "Easton's ESLint config",
   author: "Easton Zheng <dhzhme@gmail.com>",
   license: "MIT",
@@ -104,10 +104,10 @@ var package_default = {
   dependencies: {
     "@antfu/install-pkg": "^0.3.3",
     "@clack/prompts": "^0.7.0",
-    "@eslint-react/eslint-plugin": "^1.5.14",
+    "@eslint-react/eslint-plugin": "^1.5.15",
     "@stylistic/eslint-plugin": "^2.1.0",
-    "@typescript-eslint/eslint-plugin": "^7.11.0",
-    "@typescript-eslint/parser": "^7.11.0",
+    "@typescript-eslint/eslint-plugin": "^7.13.0",
+    "@typescript-eslint/parser": "^7.13.0",
     "eslint-config-flat-gitignore": "^0.1.5",
     "eslint-flat-config-utils": "^0.2.5",
     "eslint-merge-processors": "^0.1.0",
@@ -115,10 +115,10 @@ var package_default = {
     "eslint-plugin-command": "^0.2.3",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-import-x": "^0.5.1",
-    "eslint-plugin-jsdoc": "^48.2.7",
+    "eslint-plugin-jsdoc": "^48.2.9",
     "eslint-plugin-jsonc": "^2.16.0",
     "eslint-plugin-markdown": "^5.0.0",
-    "eslint-plugin-n": "^17.7.0",
+    "eslint-plugin-n": "^17.8.1",
     "eslint-plugin-no-only-tests": "^3.1.0",
     "eslint-plugin-perfectionist": "^2.10.0",
     "eslint-plugin-react-hooks": "^4.6.2",
@@ -131,7 +131,7 @@ var package_default = {
     "eslint-plugin-vue": "^9.26.0",
     "eslint-plugin-yml": "^1.14.0",
     "eslint-processor-vue-blocks": "^0.1.2",
-    globals: "^15.3.0",
+    globals: "^15.4.0",
     "jsonc-eslint-parser": "^2.4.0",
     "local-pkg": "^0.5.0",
     "parse-gitignore": "^2.0.0",
@@ -144,37 +144,37 @@ var package_default = {
   devDependencies: {
     "@antfu/ni": "^0.21.12",
     "@dhzh/eslint-config": "workspace:*",
-    "@eslint/config-inspector": "^0.4.10",
+    "@eslint/config-inspector": "^0.4.11",
     "@prettier/plugin-xml": "^3.4.1",
     "@stylistic/eslint-plugin-migrate": "^2.1.0",
     "@types/eslint": "^8.56.10",
     "@types/fs-extra": "^11.0.4",
-    "@types/node": "^20.13.0",
+    "@types/node": "^20.14.2",
     "@types/prompts": "^2.4.9",
     "@types/yargs": "^17.0.32",
     "@unocss/eslint-plugin": "^0.60.4",
     "astro-eslint-parser": "^1.0.2",
     bumpp: "^9.4.1",
     eslint: "npm:eslint-ts-patch@9.4.0-0",
-    "eslint-plugin-astro": "^1.2.0",
+    "eslint-plugin-astro": "^1.2.2",
     "eslint-plugin-format": "^0.1.1",
     "eslint-plugin-solid": "^0.14.0",
-    "eslint-plugin-svelte": "^2.39.0",
+    "eslint-plugin-svelte": "^2.39.3",
     "eslint-ts-patch": "9.4.0-0",
     "eslint-typegen": "^0.2.4",
     esno: "^4.7.0",
-    execa: "^9.1.0",
+    execa: "^9.2.0",
     "fast-glob": "^3.3.2",
     "fs-extra": "^11.2.0",
-    "lint-staged": "^15.2.5",
+    "lint-staged": "^15.2.6",
     "prettier-plugin-astro": "^0.14.0",
     "prettier-plugin-slidev": "^1.0.5",
     rimraf: "^5.0.7",
     "simple-git-hooks": "^2.11.1",
-    svelte: "^4.2.17",
-    "svelte-eslint-parser": "^0.36.0",
-    tsup: "^8.0.2",
-    tsx: "^4.11.0",
+    svelte: "^4.2.18",
+    "svelte-eslint-parser": "^0.37.0",
+    tsup: "^8.1.0",
+    tsx: "^4.15.2",
     typescript: "^5.4.5",
     vitest: "^1.6.0",
     vue: "^3.4.27"

package/dist/index.cjs

@@ -32,6 +32,7 @@ var src_exports = {};
 __export(src_exports, {
   GLOB_ALL_SRC: () => GLOB_ALL_SRC,
   GLOB_ASTRO: () => GLOB_ASTRO,
+  GLOB_ASTRO_TS: () => GLOB_ASTRO_TS,
   GLOB_CSS: () => GLOB_CSS,
   GLOB_EXCLUDE: () => GLOB_EXCLUDE,
   GLOB_GRAPHQL: () => GLOB_GRAPHQL,
@@ -75,6 +76,7 @@ __export(src_exports, {
   javascript: () => javascript,
   jsdoc: () => jsdoc,
   jsonc: () => jsonc,
+  jsx: () => jsx,
   markdown: () => markdown,
   node: () => node,
   parserPlain: () => parserPlain,
@@ -130,6 +132,7 @@ var GLOB_TOML = "**/*.toml";
 var GLOB_XML = "**/*.xml";
 var GLOB_HTML = "**/*.htm?(l)";
 var GLOB_ASTRO = "**/*.astro";
+var GLOB_ASTRO_TS = "**/*.astro/*.ts";
 var GLOB_GRAPHQL = "**/*.{g,graph}ql";
 var GLOB_MARKDOWN_CODE = `${GLOB_MARKDOWN}/${GLOB_SRC}`;
 var GLOB_TESTS = [
@@ -377,7 +380,7 @@ var StylisticConfigDefaults = {
 async function stylistic(options = {}) {
   const {
     indent,
-    jsx,
+    jsx: jsx2,
     lessOpinionated = false,
     overrides = {},
     quotes,
@@ -392,7 +395,7 @@ async function stylistic(options = {}) {
     braceStyle: "1tbs",
     flat: true,
     indent,
-    jsx,
+    jsx: jsx2,
     pluginName: "style",
     quotes,
     semi
@@ -425,7 +428,7 @@ async function stylistic(options = {}) {
 async function formatters(options = {}, stylistic2 = {}) {
   if (options === true) {
     options = {
-      astro: (0, import_local_pkg2.isPackageExists)("astro"),
+      astro: (0, import_local_pkg2.isPackageExists)("prettier-plugin-astro"),
       css: true,
       graphql: true,
       html: true,
@@ -646,6 +649,19 @@ async function formatters(options = {}, stylistic2 = {}) {
         ]
       }
     });
+    configs2.push({
+      files: [GLOB_ASTRO, GLOB_ASTRO_TS],
+      name: "antfu/formatter/astro/disables",
+      rules: {
+        "style/arrow-parens": "off",
+        "style/block-spacing": "off",
+        "style/comma-dangle": "off",
+        "style/indent": "off",
+        "style/no-multi-spaces": "off",
+        "style/quotes": "off",
+        "style/semi": "off"
+      }
+    });
   }
   if (options.graphql) {
     configs2.push({
@@ -749,6 +765,9 @@ async function javascript(options = {}) {
       linterOptions: {
         reportUnusedDisableDirectives: true
       },
+      name: "antfu/javascript/setup"
+    },
+    {
       name: "antfu/javascript/rules",
       plugins: {
         "antfu": import_eslint_plugin_antfu.default,
@@ -976,6 +995,23 @@ async function jsdoc(options = {}) {
   ];
 }
 
+// src/configs/jsx.ts
+async function jsx() {
+  return [
+    {
+      files: [GLOB_JSX, GLOB_TSX],
+      languageOptions: {
+        parserOptions: {
+          ecmaFeatures: {
+            jsx: true
+          }
+        }
+      },
+      name: "antfu/jsx/setup"
+    }
+  ];
+}
+
 // src/configs/jsonc.ts
 async function jsonc(options = {}) {
   const {
@@ -1123,25 +1159,6 @@ async function markdown(options = {}) {
         "unicode-bom": "off",
         "unused-imports/no-unused-imports": "off",
         "unused-imports/no-unused-vars": "off",
-        // Type aware rules
-        ...{
-          "ts/await-thenable": "off",
-          "ts/dot-notation": "off",
-          "ts/no-floating-promises": "off",
-          "ts/no-for-in-array": "off",
-          "ts/no-implied-eval": "off",
-          "ts/no-misused-promises": "off",
-          "ts/no-throw-literal": "off",
-          "ts/no-unnecessary-type-assertion": "off",
-          "ts/no-unsafe-argument": "off",
-          "ts/no-unsafe-assignment": "off",
-          "ts/no-unsafe-call": "off",
-          "ts/no-unsafe-member-access": "off",
-          "ts/no-unsafe-return": "off",
-          "ts/restrict-plus-operands": "off",
-          "ts/restrict-template-expressions": "off",
-          "ts/unbound-method": "off"
-        },
         ...overrides
       }
     }
@@ -1438,6 +1455,7 @@ async function sortPackageJson() {
               "packageManager",
               "description",
               "author",
+              "contributors",
               "license",
               "funding",
               "homepage",
@@ -1850,10 +1868,15 @@ async function typescript(options = {}) {
     parserOptions = {}
   } = options;
   const files = options.files ?? [
-    GLOB_SRC,
+    GLOB_TS,
+    GLOB_TSX,
     ...componentExts.map((ext) => `**/*.${ext}`)
   ];
   const filesTypeAware = options.filesTypeAware ?? [GLOB_TS, GLOB_TSX];
+  const ignoresTypeAware = options.ignoresTypeAware ?? [
+    `${GLOB_MARKDOWN}/**`,
+    GLOB_ASTRO_TS
+  ];
   const tsconfigPath = options?.tsconfigPath ? toArray(options.tsconfigPath) : void 0;
   const isTypeAware = !!tsconfigPath;
   const typeAwareRules = {
@@ -1915,7 +1938,7 @@ async function typescript(options = {}) {
     },
     // assign type-aware parser for type-aware files and type-unaware parser for the rest
     ...isTypeAware ? [
-      makeParser(true, filesTypeAware),
+      makeParser(true, filesTypeAware, ignoresTypeAware),
       makeParser(false, files, filesTypeAware)
     ] : [makeParser(false, files)],
     {
@@ -1962,6 +1985,7 @@ async function typescript(options = {}) {
     },
     ...isTypeAware ? [{
       files: filesTypeAware,
+      ignores: ignoresTypeAware,
       name: "antfu/typescript/rules-type-aware",
       rules: {
         ...tsconfigPath ? typeAwareRules : {},
@@ -1969,7 +1993,7 @@ async function typescript(options = {}) {
       }
     }] : [],
     {
-      files: ["**/*.d.ts"],
+      files: ["**/*.d.?([cm])ts"],
       name: "antfu/typescript/disables/dts",
       rules: {
         "eslint-comments/no-unlimited-disable": "off",
@@ -2358,6 +2382,7 @@ function dhzh(options = {}, ...userConfigs) {
     componentExts = [],
     gitignore: enableGitignore = true,
     isInEditor = !!((import_node_process3.default.env.VSCODE_PID || import_node_process3.default.env.VSCODE_CWD || import_node_process3.default.env.JETBRAINS_IDE || import_node_process3.default.env.VIM) && !import_node_process3.default.env.CI),
+    jsx: enableJsx = true,
     react: enableReact = false,
     regexp: enableRegexp = true,
     solid: enableSolid = false,
@@ -2368,7 +2393,7 @@ function dhzh(options = {}, ...userConfigs) {
   } = options;
   const stylisticOptions = options.stylistic === false ? false : typeof options.stylistic === "object" ? options.stylistic : {};
   if (stylisticOptions && !("jsx" in stylisticOptions)) {
-    stylisticOptions.jsx = options.jsx ?? true;
+    stylisticOptions.jsx = enableJsx;
   }
   const configs2 = [];
   if (enableGitignore) {
@@ -2404,6 +2429,9 @@ function dhzh(options = {}, ...userConfigs) {
   if (enableVue) {
     componentExts.push("vue");
   }
+  if (enableJsx) {
+    configs2.push(jsx());
+  }
   if (enableTypeScript) {
     configs2.push(typescript({
       ...typescriptOptions,
@@ -2541,6 +2569,7 @@ var src_default = dhzh;
 0 && (module.exports = {
   GLOB_ALL_SRC,
   GLOB_ASTRO,
+  GLOB_ASTRO_TS,
   GLOB_CSS,
   GLOB_EXCLUDE,
   GLOB_GRAPHQL,
@@ -2583,6 +2612,7 @@ var src_default = dhzh;
   javascript,
   jsdoc,
   jsonc,
+  jsx,
   markdown,
   node,
   parserPlain,