@zjutjh/eslint-config 0.9.1 → 2.0.0-beta.0

package/README.md

@@ -1,11 +1,28 @@
-# `@zjutjh/eslint-config` [![npm-version](https://img.shields.io/npm/v/%40zjutjh%2Feslint-config)](https://www.npmjs.com/package/@zjutjh/eslint-config)
+# `@zjutjh/eslint-config`
+
+[![Open on npmx.dev](https://npmx.dev/api/registry/badge/license/@zjutjh/eslint-config?labelColor=000000&color=000000)](https://npmx.dev/package/@zjutjh/eslint-config)
+[![Open on npmx.dev](https://npmx.dev/api/registry/badge/version/@zjutjh/eslint-config?labelColor=000000&color=000000)](https://npmx.dev/package/@zjutjh/eslint-config)
+[![Open on npmx.dev](https://npmx.dev/api/registry/badge/size/@zjutjh/eslint-config?labelColor=000000&color=000000)](https://npmx.dev/package/@zjutjh/eslint-config)
 
 zjutjh 的 ESLint 配置，适用于 JS, TS, Vue3 等项目。
 
 ## 使用方式
 
+> [!TIP]
+> **For Agent**：可以通过 Skill 来接入
+> 
+> ```sh
+> # 推荐安装到项目本地。
+> npx skills add zjutjh/eslint-config --skill setup-zjutjh-eslint
+> ```
+> 安装完成后，在对话里提及接入 zjutjh eslint config 即可触发
+
+---
+
+**For Human**
+
 > [!IMPORTANT]
-> ESLint 版本需要 ^9.9.0 以上，Node 版本需要 ^20.19.0 以上
+> ESLint 版本需要 ^10.0.0 以上，Node 版本需要 ^20.19.0 以上
 
 ```sh
 # 确保你已经安装了 eslint
@@ -13,7 +30,7 @@ $ pnpm add -D eslint
 
 $ pnpm add -D @zjutjh/eslint-config
 
-# 如果你想使用 ts 编写配置文件，还需要安装 typescript, jiti 来帮助 eslint 解析配置
+# 如果你想使用 ts 编写配置文件，还需要安装 typescript, jiti 来帮助 eslint 解析配置。（Node 24 版本后不需要安装 jiti）
 $ pnpm add -D typescript jiti
 ```
 
@@ -134,22 +151,23 @@ export default zjutjh(
 很多人在意代码的格式化，这里单独拿出一章讲。
 
 内置两种格式化工具。`@stylistic/eslint-plugin` (lint 工具对格式的检查) 和传统的 formatter 工具
-(Prettier) 。stylistic 默认开启，如果要使用 Prettier，需要手动开启。
+([oxfmt](https://oxc.rs/docs/guide/usage/formatter))。stylistic 默认开启，如果要使用 oxfmt，需要手动开启。
 
 ```ts
-// 启用 prettier
+// 启用 oxfmt
 export default zjutjh({
-  prettier: true
+  oxfmt: true
 }),
 ```
 
-支持自定义 prettier 格式化选项，以及关闭对部分文件的格式化（默认对支持的文件全部开启）
+支持自定义 oxfmt 格式化选项，以及关闭对部分文件的格式化（默认对支持的文件全部开启）
 
 ```ts
 export default zjutjh({
-  prettier: {
-    prettierSelfOptions: {
-      // 自定义 prettier 的格式化风格配置
+  oxfmt: {
+    oxfmtSelfOptions: {
+      // 自定义 oxfmt 的格式化风格配置
+      // 参考 https://oxc.rs/docs/guide/usage/formatter
     },
     lang: {
       html: false // 关闭对一些文件的格式化。默认对支持的文件全部开启
@@ -158,7 +176,7 @@ export default zjutjh({
 })
 ```
 
-stylistic 只对 js(x) 和 ts(x) 进行格式化，而 prettier 还对其他文件，如 css，html 等的格式化。
+stylistic 只对 js(x) 和 ts(x) 进行格式化，而 oxfmt 还对其他文件，如 vue，css，html，json 等的格式化。
 如果你要**在编辑器中**自动格式化这些文件，需要配置编辑器来允许 eslint 校验这些类型的文件。
 
 ```jsonc
@@ -175,8 +193,8 @@ stylistic 只对 js(x) 和 ts(x) 进行格式化，而 prettier 还对其他文
 ```
 
 > [!WARNING]
-> 我们使用 eslint 调用 prettier 可执行文件来进行代码格式化，所以你的编辑器不需要安装 prettier 插件，有
-> eslint 插件就行。prettier 的格式化配置声明在配置源码内部，如果启用了 prettier 插件，他读取不到内部的配置，
+> 我们通过 eslint 调用 oxfmt 来进行代码格式化，所以你的编辑器不需要安装额外的格式化插件，有
+> eslint 插件就行。格式化配置声明在配置源码内部，如果启用了 prettier 插件，他读取不到内部的配置，
 > 会按照默认的配置来格式化，这会导致代码风格不一致。
 
 ## 开发指南

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { ParserOptions } from "@typescript-eslint/parser";
 import { Linter } from "eslint";
-import { Options } from "prettier";
+import { ParserOptions } from "@typescript-eslint/parser";
+import { FormatOptions } from "oxfmt";
 
 //#region src/types.d.ts
 interface OverridesConfigs {
@@ -15,7 +15,7 @@ interface OptionsConfig extends OptionsComponentExts {
   taro?: boolean;
   jsx?: boolean;
   react?: boolean;
-  prettier?: boolean | OptionsPrettier;
+  oxfmt?: boolean | OptionsOxfmt;
   ignores?: string[];
   overrides?: OverridesConfigs;
 }
@@ -25,9 +25,10 @@ interface OptionsComponentExts {
 interface OptionsTypeScriptParserOptions {
   parserOptions?: Partial<ParserOptions>;
 }
-interface OptionsPrettier {
-  prettierSelfOptions?: Options;
-  /** 对哪些文件启用 prettier，默认全部启用 */
+interface OptionsOxfmt {
+  /** 传递给 oxfmt format() API 的选项，参考 https://oxc.rs/docs/guide/usage/formatter */
+  oxfmtSelfOptions?: FormatOptions;
+  /** 对哪些文件启用 oxfmt，默认全部启用 */
   lang?: {
     /** js, ts, vue 文件 */es: boolean; /** css, less, scss 文件 */
     css: boolean;

package/dist/index.mjs

@@ -1,11 +1,10 @@
 import { isPackageExists } from "local-pkg";
-import eslintImportPlugin from "eslint-plugin-import";
+import importXPlugin, { flatConfigs } from "eslint-plugin-import-x";
 import simpleImportSortPlugin from "eslint-plugin-simple-import-sort";
 import eslintJS from "@eslint/js";
 import globals from "globals";
 import uniconPlugin from "eslint-plugin-unicorn";
 import pluginStylistic from "@stylistic/eslint-plugin";
-
 //#region src/globs.ts
 const GLOB_VUE = "**/*.vue";
 const GLOB_JS = "**/*.?([cm])js";
@@ -55,7 +54,6 @@ const GLOBS_EXCLUDES = [
 	"**/auto-import?(s).d.ts",
 	"**/components.d.ts"
 ];
-
 //#endregion
 //#region src/configs/ignores.ts
 function ignores(options) {
@@ -64,7 +62,6 @@ function ignores(options) {
 		ignores: [...GLOBS_EXCLUDES, ...options?.userIgnores ?? []]
 	}];
 }
-
 //#endregion
 //#region src/configs/imports.ts
 function imports() {
@@ -72,18 +69,18 @@ function imports() {
 		name: "zjutjh/imports/setup",
 		plugins: {
 			"simple-import-sort": simpleImportSortPlugin,
-			"import": eslintImportPlugin
+			"import-x": importXPlugin
 		}
 	}, {
 		name: "zjutjh/imports/rules",
 		rules: {
 			"simple-import-sort/imports": "error",
 			"simple-import-sort/exports": "error",
-			"import/no-duplicates": "error"
+			...flatConfigs.recommended.rules,
+			"import-x/no-unresolved": "off"
 		}
 	}];
 }
-
 //#endregion
 //#region src/configs/javascript.ts
 function javascript() {
@@ -131,7 +128,6 @@ function javascript() {
 		}
 	}];
 }
-
 //#endregion
 //#region src/configs/jsx.ts
 function jsx() {
@@ -141,7 +137,6 @@ function jsx() {
 		languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } }
 	}];
 }
-
 //#endregion
 //#region src/configs/misc.ts
 function misc() {
@@ -153,7 +148,6 @@ function misc() {
 		rules: { "unicorn/filename-case": ["error", { "case": "kebabCase" }] }
 	}];
 }
-
 //#endregion
 //#region src/utils.ts
 async function interopDefault(m) {
@@ -175,13 +169,12 @@ function resolveSubOptions(options, key) {
 function getOverrides(options, key) {
 	return { ...options.overrides?.[key] };
 }
-
 //#endregion
-//#region src/configs/prettier.ts
+//#region src/configs/oxfmt.ts
 /**
-* @see https://prettier.io/docs/options
+* @see https://oxc.rs/docs/guide/usage/formatter
 */
-const prettierOptions = {
+const oxfmtOptions = {
 	printWidth: 100,
 	tabWidth: 2,
 	useTabs: false,
@@ -193,31 +186,23 @@ const prettierOptions = {
 	bracketSpacing: true,
 	bracketSameLine: false,
 	arrowParens: "always",
-	requirePragma: false,
-	insertPragma: false,
-	proseWrap: "preserve",
 	htmlWhitespaceSensitivity: "css",
 	vueIndentScriptAndStyle: false,
 	endOfLine: "lf",
 	embeddedLanguageFormatting: "auto",
 	singleAttributePerLine: false
 };
-async function prettier(options) {
-	await ensurePackages([
-		"eslint-plugin-format",
-		"eslint-plugin-prettier",
-		"eslint-config-prettier",
-		"prettier"
-	]);
-	const [configPrettier, pluginFormat] = await Promise.all([interopDefault(import("eslint-plugin-prettier/recommended")), interopDefault(import("eslint-plugin-format"))]);
+async function oxfmt(options) {
+	await ensurePackages(["eslint-plugin-format", "oxfmt"]);
+	const pluginFormat = await interopDefault(import("eslint-plugin-format"));
 	const { es: enableESFormat = true, html: enableHTMLFormat = true, css: enableCSSFormat = true, json: enableJSONFormat = true } = options?.lang ?? {};
-	const mergedPrettierOptions = {
-		...prettierOptions,
-		...options?.prettierSelfOptions
+	const mergedOptions = {
+		...oxfmtOptions,
+		...options?.oxfmtSelfOptions
 	};
 	return [
 		enableESFormat ? {
-			name: "zjutjh/prettier/setup",
+			name: "zjutjh/oxfmt/es",
 			files: [
 				GLOB_VUE,
 				GLOB_TS,
@@ -225,21 +210,11 @@ async function prettier(options) {
 				GLOB_TSX,
 				GLOB_JSX
 			],
-			...configPrettier
-		} : {},
-		enableESFormat ? {
-			name: "zjutjh/prettier/es",
-			files: [
-				GLOB_VUE,
-				GLOB_TS,
-				GLOB_JS,
-				GLOB_TSX,
-				GLOB_JSX
-			],
-			rules: { "prettier/prettier": ["error", mergedPrettierOptions] }
+			plugins: { format: pluginFormat },
+			rules: { "format/oxfmt": ["error", mergedOptions] }
 		} : {},
 		enableCSSFormat ? {
-			name: "zjutjh/prettier/css",
+			name: "zjutjh/oxfmt/css",
 			files: [
 				GLOB_CSS,
 				GLOB_LESS,
@@ -247,23 +222,17 @@ async function prettier(options) {
 			],
 			languageOptions: { parser: pluginFormat.parserPlain },
 			plugins: { format: pluginFormat },
-			rules: { "format/prettier": ["error", {
-				parser: "css",
-				mergedPrettierOptions
-			}] }
+			rules: { "format/oxfmt": ["error", mergedOptions] }
 		} : {},
 		enableHTMLFormat ? {
-			name: "zjutjh/prettier/html",
+			name: "zjutjh/oxfmt/html",
 			files: [GLOB_HTML],
 			languageOptions: { parser: pluginFormat.parserPlain },
 			plugins: { format: pluginFormat },
-			rules: { "format/prettier": ["error", {
-				parser: "html",
-				mergedPrettierOptions
-			}] }
+			rules: { "format/oxfmt": ["error", mergedOptions] }
 		} : {},
 		enableJSONFormat ? {
-			name: "zjutjh/prettier/json",
+			name: "zjutjh/oxfmt/json",
 			files: [
 				GLOB_JSON,
 				GLOB_JSON5,
@@ -271,14 +240,10 @@ async function prettier(options) {
 			],
 			languageOptions: { parser: pluginFormat.parserPlain },
 			plugins: { format: pluginFormat },
-			rules: { "format/prettier": ["error", {
-				parser: "json",
-				mergedPrettierOptions
-			}] }
+			rules: { "format/oxfmt": ["error", mergedOptions] }
 		} : {}
 	];
 }
-
 //#endregion
 //#region src/configs/react.ts
 async function react(options) {
@@ -292,16 +257,10 @@ async function react(options) {
 		interopDefault(import("eslint-plugin-react-hooks")),
 		interopDefault(import("eslint-plugin-react-refresh"))
 	]);
-	const plugins = pluginReact.configs.all.plugins;
 	return [{
 		name: "zjutjh/react/setup",
 		plugins: {
-			"@eslint-react": plugins["@eslint-react"],
-			"@eslint-react/dom": plugins["@eslint-react/dom"],
-			"@eslint-react/hooks-extra": plugins["@eslint-react/hooks-extra"],
-			"@eslint-react/naming-convention": plugins["@eslint-react/naming-convention"],
-			"@eslint-react/rsc": plugins["@eslint-react/rsc"],
-			"@eslint-react/web-api": plugins["@eslint-react/web-api"],
+			"@eslint-react": pluginReact,
 			"react-hooks": pluginReactHooks,
 			"react-refresh": pluginReactRefresh
 		}
@@ -317,14 +276,12 @@ async function react(options) {
 			...pluginReact.configs.recommended.rules,
 			...pluginReactHooks.configs.recommended.rules,
 			"react-refresh/only-export-components": "warn",
-			"@eslint-react/no-leaked-conditional-rendering": "error",
 			"@eslint-react/no-missing-component-display-name": "error",
 			"@eslint-react/no-missing-context-display-name": "error",
 			...options.overrides
 		}
 	}];
 }
-
 //#endregion
 //#region src/configs/stylistic.ts
 function stylistic(options) {
@@ -364,7 +321,6 @@ function stylistic(options) {
 		}
 	}];
 }
-
 //#endregion
 //#region src/configs/typescript.ts
 async function typescript(options) {
@@ -400,6 +356,14 @@ async function typescript(options) {
 			files,
 			rules: {
 				...pluginTs.configs.strict.rules,
+				"@typescript-eslint/restrict-template-expressions": ["error", {
+					allowNumber: true,
+					allowBoolean: false,
+					allowAny: false,
+					allowNullish: false,
+					allowRegExp: false,
+					allowArray: false
+				}],
 				"@typescript-eslint/ban-ts-comment": ["error", { "ts-expect-error": "allow-with-description" }],
 				"@typescript-eslint/require-await": "error",
 				"@typescript-eslint/no-shadow": "error",
@@ -422,7 +386,6 @@ async function typescript(options) {
 		}
 	];
 }
-
 //#endregion
 //#region src/configs/vue.ts
 async function vue(options) {
@@ -469,11 +432,10 @@ async function vue(options) {
 		}
 	}];
 }
-
 //#endregion
 //#region src/factory.ts
 async function zjutjh(options = {}, ...userConfigs) {
-	const { componentExts = [], vue: enableVue = isPackageExists("vue"), ts: enableTs = isPackageExists("typescript"), taro: enableTaro = isPackageExists("@tarojs/taro"), jsx: enableJSX = isPackageExists("react"), react: enableReact = isPackageExists("react"), ignores: userIgnores, prettier: enablePrettier = false } = options;
+	const { componentExts = [], vue: enableVue = isPackageExists("vue"), ts: enableTs = isPackageExists("typescript"), taro: enableTaro = isPackageExists("@tarojs/taro"), jsx: enableJSX = isPackageExists("react"), react: enableReact = isPackageExists("react"), ignores: userIgnores, oxfmt: enableOxfmt = false } = options;
 	const configs = [];
 	configs.push(ignores({ userIgnores }), javascript(), imports(), stylistic({ overrides: getOverrides(options, "stylistic") }), misc());
 	if (enableVue) componentExts.push("vue");
@@ -490,14 +452,12 @@ async function zjutjh(options = {}, ...userConfigs) {
 	}));
 	if (enableJSX) configs.push(jsx());
 	if (enableReact) configs.push(await react({ overrides: getOverrides(options, "react") }));
-	const codeStyleOptions = resolveSubOptions(options, "prettier");
-	if (enablePrettier) configs.push(await prettier(codeStyleOptions));
+	const oxfmtOptions = resolveSubOptions(options, "oxfmt");
+	if (enableOxfmt) configs.push(await oxfmt(oxfmtOptions));
 	return configs.flat(1).concat(userConfigs);
 }
-
 //#endregion
 //#region src/index.ts
 var src_default = zjutjh;
-
 //#endregion
-export { src_default as default };
+export { src_default as default };

package/package.json

@@ -1,10 +1,10 @@
 {
   "name": "@zjutjh/eslint-config",
   "type": "module",
-  "version": "0.9.1",
+  "version": "2.0.0-beta.0",
   "license": "ISC",
   "author": "zjutjh",
-  "description": "Eslint config used by zjutjh",
+  "description": "ESLint config used by zjutjh",
   "files": [
     "dist"
   ],
@@ -25,20 +25,18 @@
     "registry": "https://registry.npmjs.org/"
   },
   "simple-git-hooks": {
-    "pre-commit": "pnpx lint-staged"
+    "pre-commit": "pnpm lint-staged"
   },
   "peerDependencies": {
-    "@eslint-react/eslint-plugin": "^2.13.0",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
-    "eslint": "^10.0.1",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-format": "^1.4.0",
-    "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.0",
+    "@eslint-react/eslint-plugin": "^4.2.3",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
+    "eslint": "^10.2.1",
+    "eslint-plugin-format": "^2.0.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-vue": "^10.8.0",
-    "prettier": "^3.8.1",
+    "oxfmt": "^0.35.0",
     "vue-eslint-parser": "^10.4.0"
   },
   "peerDependenciesMeta": {
@@ -51,15 +49,9 @@
     "@typescript-eslint/parser": {
       "optional": true
     },
-    "eslint-config-prettier": {
-      "optional": true
-    },
     "eslint-plugin-format": {
       "optional": true
     },
-    "eslint-plugin-prettier": {
-      "optional": true
-    },
     "eslint-plugin-react-hooks": {
       "optional": true
     },
@@ -69,7 +61,7 @@
     "eslint-plugin-vue": {
       "optional": true
     },
-    "prettier": {
+    "oxfmt": {
       "optional": true
     },
     "vue-eslint-parser": {
@@ -78,41 +70,39 @@
   },
   "dependencies": {
     "@antfu/install-pkg": "^1.1.0",
-    "@clack/prompts": "^1.0.1",
-    "@eslint/js": "^9.39.3",
-    "@stylistic/eslint-plugin": "^5.9.0",
-    "eslint-plugin-import": "^2.32.0",
-    "eslint-plugin-simple-import-sort": "^12.1.1",
-    "eslint-plugin-unicorn": "^63.0.0",
-    "globals": "^17.3.0",
+    "@clack/prompts": "^1.2.0",
+    "@eslint/js": "^10.0.1",
+    "@stylistic/eslint-plugin": "^5.10.0",
+    "eslint-plugin-import-x": "^4.16.2",
+    "eslint-plugin-simple-import-sort": "^13.0.0",
+    "eslint-plugin-unicorn": "^64.0.0",
+    "globals": "^17.5.0",
     "local-pkg": "^1.1.2"
   },
   "devDependencies": {
-    "@eslint-react/eslint-plugin": "^2.13.0",
-    "@eslint/config-inspector": "^1.4.2",
-    "@eslint/core": "^1.1.0",
-    "@types/node": "^25.3.0",
-    "@typescript-eslint/eslint-plugin": "^8.56.0",
-    "@typescript-eslint/parser": "^8.56.0",
-    "bumpp": "^10.4.1",
-    "cspell": "^9.6.4",
-    "eslint": "^10.0.1",
-    "eslint-config-prettier": "^10.1.8",
-    "eslint-plugin-format": "^1.4.0",
-    "eslint-plugin-prettier": "^5.5.5",
-    "eslint-plugin-react-hooks": "^7.0.1",
-    "eslint-plugin-react-refresh": "^0.5.0",
+    "@eslint-react/eslint-plugin": "^4.2.3",
+    "@eslint/config-inspector": "^2.0.0",
+    "@eslint/core": "^1.2.1",
+    "@types/node": "^25.6.0",
+    "@typescript-eslint/eslint-plugin": "^8.58.2",
+    "@typescript-eslint/parser": "^8.58.2",
+    "bumpp": "^11.0.1",
+    "cspell": "^10.0.0",
+    "eslint": "^10.2.1",
+    "eslint-plugin-format": "^2.0.1",
+    "eslint-plugin-react-hooks": "^7.1.1",
+    "eslint-plugin-react-refresh": "^0.5.2",
     "eslint-plugin-vue": "^10.8.0",
-    "jiti": "^2.6.1",
-    "prettier": "^3.8.1",
+    "lint-staged": "^16.4.0",
+    "oxfmt": "^0.35.0",
     "simple-git-hooks": "^2.13.1",
-    "tsdown": "^0.20.3",
-    "typescript": "^5.9.3",
+    "tsdown": "^0.21.9",
+    "typescript": "^6.0.3",
     "vue-eslint-parser": "^10.4.0"
   },
   "scripts": {
     "build": "tsdown",
-    "lint": "eslint .",
+    "lint": "eslint",
     "typecheck": "tsc --noEmit",
     "dev": "config-inspector",
     "release": "bumpp && pnpm publish --access public",