@wongxy/eslint-config 2.0.1 → 3.0.0

package/dist/index.js

@@ -1,24 +1,27 @@
-import { __export, __reExport } from "./chunk-CHLpw0oG.js";
-import { antfu } from "@antfu/eslint-config";
+import { GLOB_SRC, GLOB_TS, GLOB_TSX, GLOB_VUE, antfu, getOverrides } from "@antfu/eslint-config";
 import { isPackageExists } from "local-pkg";
-import pluginTailwind from "eslint-plugin-tailwindcss";
-
-export * from "@antfu/eslint-config"
+import pluginTailwind from "eslint-plugin-better-tailwindcss";
 
 //#region src/tailwindcss.ts
-async function tailwindcss(options) {
-	const { overrides = {} } = options ?? {};
+async function tailwindcss(options = {}) {
+	const { overrides = {}, settings } = options;
+	const rules = {
+		"tw/enforce-consistent-class-order": "warn",
+		"tw/enforce-consistent-line-wrapping": ["warn", { printWidth: 100 }],
+		"tw/no-duplicate-classes": "warn",
+		"tw/no-unnecessary-whitespace": "warn",
+		"tw/no-conflicting-classes": "warn",
+		"tw/no-unregistered-classes": "warn"
+	};
 	return [{
-		name: "wongxy/tailwindcss",
+		name: "wongxy/tailwindcss/setup",
 		plugins: { tw: pluginTailwind },
 		languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } },
+		...!!settings && { settings: { "better-tailwindcss": settings } }
+	}, {
+		name: "wongxy/tailwindcss/rules",
 		rules: {
-			"tw/classnames-order": "warn",
-			"tw/enforces-negative-arbitrary-values": "warn",
-			"tw/enforces-shorthand": "warn",
-			"tw/migration-from-tailwind-2": "warn",
-			"tw/no-arbitrary-value": "off",
-			"tw/no-contradicting-classname": "error",
+			...rules,
 			...overrides
 		}
 	}];
@@ -26,11 +29,6 @@ async function tailwindcss(options) {
 
 //#endregion
 //#region src/index.ts
-var src_exports = {};
-__export(src_exports, {
-	default: () => wongxy,
-	tailwindcss: () => tailwindcss
-});
 const VuePackages = [
 	"vue",
 	"nuxt",
@@ -43,79 +41,69 @@ const ReactPackages = [
 	"react-dom",
 	"next"
 ];
-function wongxy(options, ...userConfigs) {
-	options = options ?? {};
-	const finalOptions = {
-		...options,
-		vue: options.vue ?? VuePackages.some((i) => isPackageExists(i)),
-		typescript: options.typescript ?? isPackageExists("typescript"),
-		react: (options.react || options.reactnative) ?? ReactPackages.some((i) => isPackageExists(i)),
-		reactnative: options.reactnative ?? isPackageExists("react-native"),
-		tailwindcss: options.tailwindcss ?? isPackageExists("tailwindcss")
-	};
-	const rules = {
-		"no-console": "off",
-		"no-alert": "off",
-		"no-multiple-empty-lines": "warn",
-		"antfu/top-level-function": "off",
-		"antfu/if-newline": "off",
-		"style/brace-style": [
-			"error",
-			"1tbs",
-			{ allowSingleLine: true }
-		]
-	};
-	for (const key in finalOptions.rules) delete rules[key];
-	userConfigs.splice(0, 0, {
-		name: "wongxy/rules",
-		rules
+function resolveRules(overrides, rules) {
+	return Object.fromEntries(Object.entries(rules).filter(([k]) => !overrides[k]));
+}
+function wongxy(options = {}, ...userConfigs) {
+	const { react: enableReact = ReactPackages.some((i) => isPackageExists(i)), typescript: enableTypeScript = isPackageExists("typescript"), vue: enableVue = VuePackages.some((i) => isPackageExists(i)), tailwindcss: enableTailwind = isPackageExists("tailwindcss"), reactnative: enableReactNative = isPackageExists("react-native") } = options;
+	const configs = [];
+	configs.push({
+		name: "wongxy/common",
+		rules: resolveRules(options.rules ?? {}, {
+			"no-console": "off",
+			"no-alert": "off",
+			"no-multiple-empty-lines": "warn",
+			"antfu/top-level-function": "off",
+			"antfu/if-newline": "off",
+			"style/brace-style": [
+				"error",
+				"1tbs",
+				{ allowSingleLine: true }
+			],
+			"perfectionist/sort-jsx-props": ["warn", {
+				order: "asc",
+				type: "natural"
+			}]
+		})
 	});
-	if (finalOptions.vue) {
-		const vue = typeof finalOptions.vue === "object" ? finalOptions.vue : {};
-		finalOptions.vue = {
-			...vue,
-			overrides: {
-				"vue/singleline-html-element-content-newline": "off",
-				"vue/valid-template-root": "off",
-				"vue/block-order": ["warn", { order: [["script", "template"], "style"] }],
-				"vue/custom-event-name-casing": "off",
-				...vue.overrides
-			}
-		};
-	}
-	if (finalOptions.react) {
-		const react = typeof finalOptions.react === "object" ? finalOptions.react : {};
-		finalOptions.react = {
-			...react,
-			overrides: {
-				"react/prefer-destructuring-assignment": "off",
-				...react.overrides
-			}
-		};
-	}
-	if (finalOptions.typescript) {
-		const typescript = typeof finalOptions.typescript === "object" ? finalOptions.typescript : {};
-		finalOptions.typescript = {
-			...typescript,
-			overrides: {
-				"ts/consistent-type-imports": ["error", {
-					disallowTypeAnnotations: false,
-					fixStyle: "inline-type-imports",
-					prefer: "type-imports"
-				}],
-				...finalOptions.reactnative ? {
-					"ts/no-require-imports": "off",
-					"ts/no-use-before-define": "off"
-				} : void 0,
-				...typescript.overrides
-			}
-		};
+	if (enableVue) configs.push({
+		name: "wongxy/vue",
+		files: [GLOB_VUE],
+		rules: resolveRules(getOverrides(options, "vue"), {
+			"vue/singleline-html-element-content-newline": "off",
+			"vue/valid-template-root": "off",
+			"vue/block-order": ["warn", { order: [["script", "template"], "style"] }],
+			"vue/custom-event-name-casing": "off"
+		})
+	});
+	if (enableReact) configs.push({
+		name: "wongxy/react",
+		files: [GLOB_SRC],
+		rules: resolveRules(getOverrides(options, "react"), { "react/prefer-destructuring-assignment": "off" })
+	});
+	if (enableTypeScript) configs.push({
+		name: "wongxy/typescript",
+		files: [GLOB_TS, GLOB_TSX],
+		rules: resolveRules(getOverrides(options, "typescript"), { "ts/consistent-type-imports": ["error", {
+			disallowTypeAnnotations: false,
+			fixStyle: "inline-type-imports",
+			prefer: "type-imports"
+		}] })
+	});
+	if (enableReactNative) configs.push({
+		name: "wongxy/reactnative",
+		files: [GLOB_TS, GLOB_TSX],
+		rules: resolveRules(getOverrides(options, "typescript"), {
+			"ts/no-require-imports": "off",
+			"ts/no-use-before-define": "off"
+		})
+	});
+	if (enableTailwind) {
+		const tw = typeof options.tailwindcss === "object" ? options.tailwindcss : void 0;
+		configs.push(tailwindcss(tw));
 	}
-	if (finalOptions.tailwindcss) userConfigs.splice(0, 0, tailwindcss({ overrides: typeof finalOptions.tailwindcss === "object" ? finalOptions.tailwindcss.overrides : void 0 }));
-	delete finalOptions.reactnative;
-	delete finalOptions.tailwindcss;
-	return antfu(finalOptions, ...userConfigs);
+	return antfu(options, ...configs, ...userConfigs);
 }
 
 //#endregion
-export { wongxy as default, tailwindcss };
+export { wongxy as default };

package/package.json

@@ -1,17 +1,15 @@
 {
   "name": "@wongxy/eslint-config",
   "type": "module",
-  "version": "2.0.1",
+  "version": "3.0.0",
   "description": "xiyaowong's eslint config",
   "author": "xiyaowong (https://github.com/xiyaowong)",
   "license": "MIT",
   "exports": {
-    ".": {
-      "import": "./dist/index.js",
-      "require": "./dist/index.cjs"
-    }
+    ".": "./dist/index.js"
   },
   "main": "dist/index.js",
+  "types": "./dist/index.d.ts",
   "files": [
     "dist"
   ],
@@ -20,9 +18,9 @@
     "@next/eslint-plugin-next": "^15.5.2",
     "@unocss/eslint-plugin": "^66.1.2",
     "eslint": "^9.27.0",
+    "eslint-plugin-better-tailwindcss": "^3.7.9",
     "eslint-plugin-react-hooks": "^5.2.0",
-    "eslint-plugin-react-refresh": "^0.4.20",
-    "eslint-plugin-tailwindcss": ">=3.18.0"
+    "eslint-plugin-react-refresh": "^0.4.20"
   },
   "dependencies": {
     "@antfu/eslint-config": "^5.2.1",
@@ -30,8 +28,8 @@
     "local-pkg": "^1.1.2"
   },
   "devDependencies": {
+    "@antfu/ni": "^26.0.1",
     "@types/eslint": "^9.6.1",
-    "@types/eslint-plugin-tailwindcss": "3.17.0",
     "@types/node": "^24.3.0",
     "bumpp": "^10.2.3",
     "eslint": "^9.34.0",
@@ -44,11 +42,11 @@
     "build": "nr typegen && tsdown --clean --dts",
     "stub": "tsdown --format esm",
     "watch": "tsdown --watch",
-    "lint": "pnpm run stub && eslint .",
     "dev": "tsdown --watch & eslint-flat-config-viewer",
-    "lint:fix": "pnpm run stub && eslint . --fix",
+    "lint:fix": "eslint . --fix",
+    "lint": "eslint .",
     "release": "bumpp && pnpm publish",
-    "inspect": "pnpm build && npx @eslint/config-inspector",
+    "inspect": "nlx @eslint/config-inspector",
     "typegen": "esno scripts/typegen.ts",
     "typecheck": "tsc --noEmit"
   }

package/dist/chunk-CHLpw0oG.js

@@ -1,25 +0,0 @@
-//#region rolldown:runtime
-var __defProp = Object.defineProperty;
-var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropNames = Object.getOwnPropertyNames;
-var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __export = (target, all) => {
-	for (var name in all) __defProp(target, name, {
-		get: all[name],
-		enumerable: true
-	});
-};
-var __copyProps = (to, from, except, desc) => {
-	if (from && typeof from === "object" || typeof from === "function") for (var keys = __getOwnPropNames(from), i = 0, n = keys.length, key; i < n; i++) {
-		key = keys[i];
-		if (!__hasOwnProp.call(to, key) && key !== except) __defProp(to, key, {
-			get: ((k) => from[k]).bind(null, key),
-			enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable
-		});
-	}
-	return to;
-};
-var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
-
-//#endregion
-export { __export, __reExport };