@octohash/eslint-config 0.2.2 → 0.2.4

package/dist/index.mjs

@@ -1,17 +1,15 @@
 import antfu, { GLOB_HTML, GLOB_SRC, GLOB_VUE, ensurePackages, interopDefault } from "@antfu/eslint-config";
 import catalogsSort, { configs } from "eslint-plugin-catalogs-sort";
-import { readFile } from "node:fs/promises";
 import { getPackageInfo } from "local-pkg";
-import { basename, dirname, resolve } from "pathe";
-import { glob } from "tinyglobby";
-import process from "node:process";
-import { findUp } from "find-up-simple";
 
 //#region src/configs/octohash.ts
 async function octohash() {
 	return [{
 		name: "octohash/octohash/rules",
-		rules: { "pnpm/yaml-enforce-settings": "off" }
+		rules: {
+			"pnpm/yaml-enforce-settings": "off",
+			"markdown/no-unused-definitions": "off"
+		}
 	}];
 }
 
@@ -116,70 +114,17 @@ async function sortPackageJson() {
 	];
 }
 
-//#endregion
-//#region src/constants.ts
-const DEFAULT_IGNORE_PATHS = [
-	"**/.git/**",
-	"**/.next/**",
-	"**/.nuxt/**",
-	"**/.output/**",
-	"**/.vercel/**",
-	"**/.vscode/**",
-	"**/.idea/**",
-	"**/coverage/**",
-	"**/dist/**",
-	"**/build/**",
-	"**/node_modules/**",
-	"**/dist/**",
-	"**/public/**",
-	"**/fixture/**",
-	"**/fixtures/**"
-];
-const REPOSITORY_ROOT_FILES = [
-	".git",
-	"package-lock.json",
-	"npm-shrinkwrap.json",
-	"pnpm-lock.yaml",
-	"pnpm-workspace.yaml",
-	"yarn.lock",
-	"bun.lock",
-	"bun.lockb",
-	"deno.lock"
-];
-const TAILWIND_V3_CONFIG_PATTERNS = [
-	"**/tailwind.config.ts",
-	"**/tailwind.config.mjs",
-	"**/tailwind.config.cjs",
-	"**/tailwind.config.js"
-];
-const TAILWIND_V4_IMPORT_RE = /@import\s+['"]tailwindcss(?:\/[^'"]*)?['"]/;
-
-//#endregion
-//#region src/utils.ts
-async function findRepositoryRoot() {
-	for (const file of REPOSITORY_ROOT_FILES) {
-		const filepath = await findUp(file, file === ".git" ? { type: "directory" } : void 0);
-		if (filepath) return dirname(filepath);
-	}
-	return process.cwd();
-}
-function pathDepth(filepath) {
-	return filepath.split("/").length;
-}
-
 //#endregion
 //#region src/configs/tailwindcss.ts
 async function tailwindcss(options = {}) {
 	const pkg = await getPackageInfo("tailwindcss");
 	if (!pkg || !pkg.version) return [];
 	await ensurePackages(["eslint-plugin-better-tailwindcss"]);
-	const version = pkg.version;
 	const { files = [
 		GLOB_HTML,
 		GLOB_SRC,
 		GLOB_VUE
 	], overrides = {}, settings = {} } = options;
-	const resolvedSettings = await resolveTailwindSettings(settings, version);
 	return [{
 		name: "octohash/tailwindcss/setup",
 		plugins: { tailwindcss: await interopDefault(import("eslint-plugin-better-tailwindcss")) }
@@ -199,52 +144,9 @@ async function tailwindcss(options = {}) {
 			"tailwindcss/no-conflicting-classes": "error",
 			...overrides
 		},
-		settings: { "better-tailwindcss": resolvedSettings }
+		settings: { "better-tailwindcss": settings }
 	}];
 }
-async function resolveTailwindSettings(settings, version) {
-	const resolvedSettings = { ...settings ?? {} };
-	const major = Number.parseInt(version, 10);
-	const cwd = await findRepositoryRoot();
-	if (major === 4 && !resolvedSettings.entryPoint) resolvedSettings.entryPoint = await findTailwindV4ImportCSS(cwd) ?? void 0;
-	if (major === 3 && !resolvedSettings.tailwindConfig) resolvedSettings.tailwindConfig = await findTailwindV3Config(cwd) ?? void 0;
-	return resolvedSettings;
-}
-async function findTailwindV3Config(cwd) {
-	const files = await glob(TAILWIND_V3_CONFIG_PATTERNS, {
-		cwd,
-		ignore: DEFAULT_IGNORE_PATHS,
-		onlyFiles: true
-	});
-	if (files.length === 0) return void 0;
-	const extensionPriority = new Map(TAILWIND_V3_CONFIG_PATTERNS.map((pattern, index) => [basename(pattern), index]));
-	files.sort((a, b) => {
-		const depthDiff = pathDepth(a) - pathDepth(b);
-		if (depthDiff !== 0) return depthDiff;
-		return (extensionPriority.get(basename(a)) ?? Number.POSITIVE_INFINITY) - (extensionPriority.get(basename(b)) ?? Number.POSITIVE_INFINITY);
-	});
-	return resolve(cwd, files[0]);
-}
-async function findTailwindV4ImportCSS(cwd) {
-	const files = await glob("**/*.css", {
-		cwd,
-		ignore: DEFAULT_IGNORE_PATHS,
-		onlyFiles: true
-	});
-	files.sort((a, b) => pathDepth(a) - pathDepth(b));
-	for (const file of files) {
-		const fullPath = resolve(cwd, file);
-		if (await hasTailwindV4Import(fullPath)) return fullPath;
-	}
-}
-async function hasTailwindV4Import(filePath) {
-	try {
-		const content = await readFile(filePath, "utf-8");
-		return TAILWIND_V4_IMPORT_RE.test(content);
-	} catch {
-		return false;
-	}
-}
 
 //#endregion
 //#region src/index.ts
@@ -257,9 +159,10 @@ function defineConfig(options, ...userConfigs) {
 	return config;
 }
 function mergeOptions(options) {
+	const formatters = typeof options?.formatters === "object" ? options.formatters : typeof options?.formatters === "boolean" ? options.formatters : void 0;
 	return {
 		...options,
-		formatters: { ...typeof options?.formatters === "object" ? options.formatters : {} }
+		formatters
 	};
 }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octohash/eslint-config",
   "type": "module",
-  "version": "0.2.2",
+  "version": "0.2.4",
   "description": "Personal ESLint config based on @antfu/eslint-config with opinionated extensions.",
   "author": "jinghaihan",
   "license": "MIT",
@@ -38,12 +38,11 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-config": "^7.4.3",
+    "@antfu/eslint-config": "^7.6.0",
     "eslint-plugin-catalogs-sort": "^0.0.0-alpha.0",
     "find-up-simple": "^1.0.1",
     "local-pkg": "^1.1.2",
-    "pathe": "^2.0.3",
-    "tinyglobby": "^0.2.15"
+    "pathe": "^2.0.3"
   },
   "devDependencies": {
     "tsdown": "^0.20.3",
@@ -53,13 +52,13 @@
     "simple-git-hooks": "^2.13.1",
     "taze": "^19.9.2",
     "typescript": "^5.9.3",
-    "eslint": "^10.0.0",
+    "eslint": "^10.0.2",
     "eslint-flat-config-utils": "^3.0.1",
-    "eslint-plugin-better-tailwindcss": "^4.2.0",
+    "eslint-plugin-better-tailwindcss": "^4.3.0",
     "lint-staged": "^16.2.7",
     "vitest": "^4.0.18",
-    "@types/node": "^24.10.13",
-    "@octohash/eslint-config": "0.2.2"
+    "@types/node": "^25.3.0",
+    "@octohash/eslint-config": "0.2.4"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"