@octohash/eslint-config 0.2.3 → 0.2.5

package/dist/index.d.mts

@@ -201,7 +201,7 @@ interface JSONSchema4 {
   format?: string | undefined;
 }
 //#endregion
-//#region node_modules/.pnpm/@eslint+core@1.1.0/node_modules/@eslint/core/dist/esm/types.d.ts
+//#region node_modules/.pnpm/@eslint+core@1.1.1/node_modules/@eslint/core/dist/esm/types.d.ts
 /**
  * Represents an error inside of a file.
  */
@@ -528,7 +528,7 @@ type RuleFixer = (fixer: RuleTextEditor) => RuleTextEdit | Iterable<RuleTextEdit
  * Data that can be used to fill placeholders in error messages.
  */
 type MessagePlaceholderData = Record<string, string | number | boolean | bigint | null | undefined>;
-interface ViolationReportBase {
+interface ViolationReportBase<MessageIds extends string = string> {
   /**
    * The data to insert into the message.
    */
@@ -541,9 +541,9 @@ interface ViolationReportBase {
    * An array of suggested fixes for the problem. These fixes may change the
    * behavior of the code, so they are not applied automatically.
    */
-  suggest?: SuggestedEdit[] | null | undefined;
+  suggest?: SuggestedEdit<MessageIds>[] | null | undefined;
 }
-type ViolationMessage<MessageIds = string> = {
+type ViolationMessage<MessageIds extends string = string> = {
   message: string;
 } | {
   messageId: MessageIds;
@@ -553,7 +553,7 @@ type ViolationLocation<Node> = {
 } | {
   node: Node;
 };
-type ViolationReport<Node = unknown, MessageIds = string> = ViolationReportBase & ViolationMessage<MessageIds> & ViolationLocation<Node>;
+type ViolationReport<Node = unknown, MessageIds extends string = string> = ViolationReportBase<MessageIds> & ViolationMessage<MessageIds> & ViolationLocation<Node>;
 interface SuggestedEditBase {
   /**
    * The data to insert into the message.
@@ -564,15 +564,15 @@ interface SuggestedEditBase {
    */
   fix: RuleFixer;
 }
-type SuggestionMessage = {
+type SuggestionMessage<MessageIds extends string = string> = {
   desc: string;
 } | {
-  messageId: string;
+  messageId: MessageIds;
 };
 /**
  * A suggested edit for a rule violation.
  */
-type SuggestedEdit = SuggestedEditBase & SuggestionMessage;
+type SuggestedEdit<MessageIds extends string = string> = SuggestedEditBase & SuggestionMessage<MessageIds>;
 /**
  * The normalized version of a lint suggestion.
  */
@@ -1300,19 +1300,26 @@ interface Directive {
   justification?: string;
 }
 //#endregion
-//#region node_modules/.pnpm/@eslint+config-helpers@0.5.2/node_modules/@eslint/config-helpers/dist/esm/types.d.ts
+//#region node_modules/.pnpm/@eslint+config-helpers@0.5.3/node_modules/@eslint/config-helpers/dist/esm/types.d.ts
 /**
  * Infinite array type.
  */
 type InfiniteArray<T> = T | InfiniteArray<T>[];
+/**
+ * A config object that may appear inside of `extends`.
+ * `basePath` and nested `extends` are not allowed on extension config objects.
+ */
+type ExtensionConfigObject = Omit<ConfigObject, "basePath"> & {
+  extends?: never;
+};
 /**
  * The type of array element in the `extends` property after flattening.
  */
-type SimpleExtendsElement = string | ConfigObject;
+type SimpleExtendsElement = string | ExtensionConfigObject;
 /**
  * The type of array element in the `extends` property before flattening.
  */
-type ExtendsElement = SimpleExtendsElement | InfiniteArray<ConfigObject>;
+type ExtendsElement = SimpleExtendsElement | InfiniteArray<ExtensionConfigObject>;
 /**
  * Config with extends. Valid only inside of `defineConfig()`.
  */
@@ -1320,10 +1327,10 @@ interface ConfigWithExtends$1 extends ConfigObject {
   extends?: ExtendsElement[];
 }
 //#endregion
-//#region node_modules/.pnpm/@eslint+config-helpers@0.5.2/node_modules/@eslint/config-helpers/dist/esm/index.d.ts
+//#region node_modules/.pnpm/@eslint+config-helpers@0.5.3/node_modules/@eslint/config-helpers/dist/esm/index.d.ts
 type ConfigWithExtends = ConfigWithExtends$1;
 //#endregion
-//#region node_modules/.pnpm/eslint-flat-config-utils@3.0.1/node_modules/eslint-flat-config-utils/dist/index.d.mts
+//#region node_modules/.pnpm/eslint-flat-config-utils@3.0.2/node_modules/eslint-flat-config-utils/dist/index.d.mts
 /**
  * A type that can be awaited. Promise<T> or T.
  */

package/dist/index.mjs

@@ -1,20 +1,16 @@
 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"
+		}
 	}];
 }
-
 //#endregion
 //#region src/configs/sort.ts
 async function sortPackageJson() {
@@ -74,6 +70,7 @@ async function sortPackageJson() {
 						"husky",
 						"simple-git-hooks",
 						"lint-staged",
+						"nano-staged",
 						"eslintConfig"
 					],
 					pathPattern: "^$"
@@ -115,71 +112,17 @@ async function sortPackageJson() {
 		...configs.recommended
 	];
 }
-
-//#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,53 +142,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
 function defineConfig(options, ...userConfigs) {
@@ -263,6 +162,5 @@ function mergeOptions(options) {
 		formatters
 	};
 }
-
 //#endregion
-export { defineConfig };
+export { defineConfig };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@octohash/eslint-config",
   "type": "module",
-  "version": "0.2.3",
+  "version": "0.2.5",
   "description": "Personal ESLint config based on @antfu/eslint-config with opinionated extensions.",
   "author": "jinghaihan",
   "license": "MIT",
@@ -38,35 +38,40 @@
     }
   },
   "dependencies": {
-    "@antfu/eslint-config": "^7.4.3",
+    "@antfu/eslint-config": "^7.7.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",
+    "tsdown": "^0.21.2",
     "@octohash/tsconfig": "^0.2.0",
     "bumpp": "^10.4.1",
-    "pncat": "^0.10.2",
+    "nano-staged": "^0.9.0",
+    "pncat": "^0.10.4",
     "simple-git-hooks": "^2.13.1",
-    "taze": "^19.9.2",
+    "taze": "^19.10.0",
     "typescript": "^5.9.3",
-    "eslint": "^10.0.0",
-    "eslint-flat-config-utils": "^3.0.1",
-    "eslint-plugin-better-tailwindcss": "^4.2.0",
-    "lint-staged": "^16.2.7",
+    "eslint": "^10.0.3",
+    "eslint-flat-config-utils": "^3.0.2",
+    "eslint-plugin-better-tailwindcss": "^4.3.2",
     "vitest": "^4.0.18",
-    "@types/node": "^24.10.13",
-    "@octohash/eslint-config": "0.2.3"
+    "@types/node": "^25.4.0",
+    "@octohash/eslint-config": "0.2.5"
   },
   "simple-git-hooks": {
-    "pre-commit": "pnpm lint-staged"
+    "pre-commit": "pnpm nano-staged"
   },
-  "lint-staged": {
+  "nano-staged": {
     "*": "eslint --fix"
   },
+  "inlinedDependencies": {
+    "@types/json-schema": "7.0.15",
+    "@eslint/core": "1.1.1",
+    "@eslint/config-helpers": "0.5.3",
+    "eslint-flat-config-utils": "3.0.2"
+  },
   "scripts": {
     "build": "tsdown",
     "typecheck": "tsc",