@antfu/eslint-config 6.5.0 → 6.6.0

package/bin/index.mjs

@@ -0,0 +1,2 @@
+#!/usr/bin/env node
+import '../dist/cli.mjs'

package/dist/cli.mjs

@@ -9,7 +9,7 @@ import parse from "parse-gitignore";
 import { execSync } from "node:child_process";
 
 //#region package.json
-var version = "6.5.0";
+var version = "6.6.0";
 
 //#endregion
 //#region src/cli/constants.ts
@@ -172,8 +172,8 @@ async function updateEslintFiles(result) {
 //#endregion
 //#region src/cli/constants-generated.ts
 const versionsMap = {
-	"@eslint-react/eslint-plugin": "^2.3.12",
-	"@next/eslint-plugin-next": "^16.0.7",
+	"@eslint-react/eslint-plugin": "^2.3.13",
+	"@next/eslint-plugin-next": "^16.0.8",
 	"@unocss/eslint-plugin": "^66.5.10",
 	"astro-eslint-parser": "^1.2.2",
 	"eslint": "^9.39.1",

package/dist/index.d.mts

@@ -18577,6 +18577,12 @@ interface OptionsRegExp {
 interface OptionsIsInEditor {
   isInEditor?: boolean;
 }
+interface OptionsPnpm extends OptionsIsInEditor {
+  /**
+   * Requires catalogs usage
+   */
+  catalogs?: boolean;
+}
 interface OptionsUnoCSS extends OptionsOverrides {
   /**
    * Enable attributify support.
@@ -18897,7 +18903,7 @@ declare function node(): Promise<TypedFlatConfigItem[]>;
 declare function perfectionist(): Promise<TypedFlatConfigItem[]>;
 //#endregion
 //#region src/configs/pnpm.d.ts
-declare function pnpm(options: OptionsIsInEditor): Promise<TypedFlatConfigItem[]>;
+declare function pnpm(options: OptionsPnpm): Promise<TypedFlatConfigItem[]>;
 //#endregion
 //#region src/configs/react.d.ts
 declare function react(options?: OptionsTypeScriptParserOptions & OptionsTypeScriptWithTypes & OptionsReact & OptionsFiles): Promise<TypedFlatConfigItem[]>;
@@ -19058,4 +19064,4 @@ declare function ensurePackages(packages: (string | undefined)[]): Promise<void>
 declare function isInEditorEnv(): boolean;
 declare function isInGitHooksOrLintStaged(): boolean;
 //#endregion
-export { Awaitable, type ConfigNames, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, OptionsComponentExts, OptionsConfig, OptionsFiles, OptionsFormatters, OptionsHasTypeScript, OptionsIsInEditor, OptionsJSX, OptionsJSXA11y, OptionsOverrides, OptionsProjectType, OptionsReact, OptionsRegExp, OptionsStylistic, OptionsTypeScriptErasableOnly, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes, OptionsTypescript, OptionsUnicorn, OptionsUnoCSS, OptionsVue, ResolvedOptions, Rules, StylisticConfig, StylisticConfigDefaults, StylisticOptions, TypedFlatConfigItem, antfu, antfu as default, astro, combine, command, comments, defaultPluginRenaming, disables, ensurePackages, formatters, getOverrides, ignores, imports, interopDefault, isInEditorEnv, isInGitHooksOrLintStaged, isPackageInScope, javascript, jsdoc, jsonc, jsx, markdown, nextjs, node, parserPlain, perfectionist, pnpm, react, regexp, renamePluginInConfigs, renameRules, resolveSubOptions, solid, sortPackageJson, sortTsconfig, stylistic, svelte, test, toArray, toml, typescript, unicorn, unocss, vue, yaml };
+export { Awaitable, type ConfigNames, GLOB_ALL_SRC, GLOB_ASTRO, GLOB_ASTRO_TS, GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_MARKDOWN_IN_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_SVELTE, GLOB_SVG, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, OptionsComponentExts, OptionsConfig, OptionsFiles, OptionsFormatters, OptionsHasTypeScript, OptionsIsInEditor, OptionsJSX, OptionsJSXA11y, OptionsOverrides, OptionsPnpm, OptionsProjectType, OptionsReact, OptionsRegExp, OptionsStylistic, OptionsTypeScriptErasableOnly, OptionsTypeScriptParserOptions, OptionsTypeScriptWithTypes, OptionsTypescript, OptionsUnicorn, OptionsUnoCSS, OptionsVue, ResolvedOptions, Rules, StylisticConfig, StylisticConfigDefaults, StylisticOptions, TypedFlatConfigItem, antfu, antfu as default, astro, combine, command, comments, defaultPluginRenaming, disables, ensurePackages, formatters, getOverrides, ignores, imports, interopDefault, isInEditorEnv, isInGitHooksOrLintStaged, isPackageInScope, javascript, jsdoc, jsonc, jsx, markdown, nextjs, node, parserPlain, perfectionist, pnpm, react, regexp, renamePluginInConfigs, renameRules, resolveSubOptions, solid, sortPackageJson, sortTsconfig, stylistic, svelte, test, toArray, toml, typescript, unicorn, unocss, vue, yaml };

package/dist/index.mjs

@@ -19,6 +19,21 @@ import { configs } from "eslint-plugin-regexp";
 
 //#region node_modules/.pnpm/find-up-simple@1.0.1/node_modules/find-up-simple/index.js
 const toPath = (urlOrPath) => urlOrPath instanceof URL ? fileURLToPath(urlOrPath) : urlOrPath;
+async function findUp(name, { cwd = process.cwd(), type = "file", stopAt } = {}) {
+	let directory = path.resolve(toPath(cwd) ?? "");
+	const { root } = path.parse(directory);
+	stopAt = path.resolve(directory, toPath(stopAt ?? root));
+	const isAbsoluteName = path.isAbsolute(name);
+	while (directory) {
+		const filePath = isAbsoluteName ? name : path.join(directory, name);
+		try {
+			const stats = await fsPromises.stat(filePath);
+			if (type === "file" && stats.isFile() || type === "directory" && stats.isDirectory()) return filePath;
+		} catch {}
+		if (directory === stopAt || directory === root) break;
+		directory = path.dirname(directory);
+	}
+}
 function findUpSync(name, { cwd = process.cwd(), type = "file", stopAt } = {}) {
 	let directory = path.resolve(toPath(cwd) ?? "");
 	const { root } = path.parse(directory);
@@ -1125,12 +1140,19 @@ async function perfectionist() {
 
 //#endregion
 //#region src/configs/pnpm.ts
+async function detectCatalogUsage() {
+	const workspaceFile = await findUp("pnpm-workspace.yaml");
+	if (!workspaceFile) return false;
+	const yaml$1 = await fsPromises.readFile(workspaceFile, "utf-8");
+	return yaml$1.includes("catalog:") || yaml$1.includes("catalogs:");
+}
 async function pnpm(options) {
 	const [pluginPnpm, yamlParser, jsoncParser] = await Promise.all([
 		interopDefault(import("eslint-plugin-pnpm")),
 		interopDefault(import("yaml-eslint-parser")),
 		interopDefault(import("jsonc-eslint-parser"))
 	]);
+	const { catalogs = detectCatalogUsage(), isInEditor = false } = options;
 	return [
 		{
 			files: ["package.json", "**/package.json"],
@@ -1138,9 +1160,9 @@ async function pnpm(options) {
 			name: "antfu/pnpm/package-json",
 			plugins: { pnpm: pluginPnpm },
 			rules: {
-				"pnpm/json-enforce-catalog": ["error", { autofix: !options.isInEditor }],
-				"pnpm/json-prefer-workspace-settings": ["error", { autofix: !options.isInEditor }],
-				"pnpm/json-valid-catalog": ["error", { autofix: !options.isInEditor }]
+				...catalogs ? { "pnpm/json-enforce-catalog": ["error", { autofix: !isInEditor }] } : {},
+				"pnpm/json-prefer-workspace-settings": ["error", { autofix: !isInEditor }],
+				"pnpm/json-valid-catalog": ["error", { autofix: !isInEditor }]
 			}
 		},
 		{
@@ -2003,7 +2025,7 @@ async function typescript(options = {}) {
 		}] : [],
 		...erasableOnly ? [{
 			name: "antfu/typescript/erasable-syntax-only",
-			plugins: { "erasable-syntax-only": await interopDefault(import("./lib-_JXSfbp_.mjs")) },
+			plugins: { "erasable-syntax-only": await interopDefault(import("./lib-orfHobL2.mjs")) },
 			rules: {
 				"erasable-syntax-only/enums": "error",
 				"erasable-syntax-only/import-aliases": "error",