@so1ve/eslint-config 4.1.1 → 4.1.3

package/dist/index.mjs

@@ -12,10 +12,9 @@ import * as pluginRegexp from "eslint-plugin-regexp";
 import pluginUnicorn from "eslint-plugin-unicorn";
 import pluginUnusedImports from "eslint-plugin-unused-imports";
 import globals from "globals";
-import fs from "node:fs/promises";
 import process$1 from "node:process";
 import { fileURLToPath } from "node:url";
-import fs$1 from "node:fs";
+import fs from "node:fs";
 import path from "node:path";
 import tseslint from "typescript-eslint";
 import { FlatConfigComposer } from "eslint-flat-config-utils";
@@ -1505,21 +1504,6 @@ async function perfectionist() {
 //#endregion
 //#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$1, { cwd = process$1.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$1);
-	while (directory) {
-		const filePath = isAbsoluteName ? name$1 : path.join(directory, name$1);
-		try {
-			const stats = await fs.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$1, { cwd = process$1.cwd(), type = "file", stopAt } = {}) {
 	let directory = path.resolve(toPath(cwd) ?? "");
 	const { root } = path.parse(directory);
@@ -1528,7 +1512,7 @@ function findUpSync(name$1, { cwd = process$1.cwd(), type = "file", stopAt } = {
 	while (directory) {
 		const filePath = isAbsoluteName ? name$1 : path.join(directory, name$1);
 		try {
-			const stats = fs$1.statSync(filePath, { throwIfNoEntry: false });
+			const stats = fs.statSync(filePath, { throwIfNoEntry: false });
 			if (type === "file" && stats?.isFile() || type === "directory" && stats?.isDirectory()) return filePath;
 		} catch {}
 		if (directory === stopAt || directory === root) break;
@@ -1538,14 +1522,8 @@ function findUpSync(name$1, { cwd = process$1.cwd(), type = "file", stopAt } = {
 
 //#endregion
 //#region src/configs/pnpm.ts
-async function detectCatalogUsage() {
-	const workspaceFile = await findUp("pnpm-workspace.yaml");
-	if (!workspaceFile) return false;
-	const yaml$1 = await fs.readFile(workspaceFile, "utf-8");
-	return yaml$1.includes("catalog:") || yaml$1.includes("catalogs:");
-}
 async function pnpm(options) {
-	const { catalogs = await detectCatalogUsage(), json = true, yaml: yaml$1 = true } = options;
+	const { json = true, yaml: yaml$1 = true } = options;
 	const [pluginPnpm, yamlParser, jsoncParser] = await Promise.all([
 		interopDefault(import("eslint-plugin-pnpm")),
 		yaml$1 ? interopDefault(import("yaml-eslint-parser")) : void 0,
@@ -1557,21 +1535,14 @@ async function pnpm(options) {
 		languageOptions: { parser: jsoncParser },
 		name: "so1ve/pnpm/package-json",
 		plugins: { pnpm: pluginPnpm },
-		rules: {
-			...catalogs && { "pnpm/json-enforce-catalog": ["error", { ignores: ["@types/vscode"] }] },
-			"pnpm/json-prefer-workspace-settings": "error",
-			"pnpm/json-valid-catalog": "error"
-		}
+		rules: { "pnpm/json-prefer-workspace-settings": "error" }
 	});
 	if (yaml$1) configs$1.push({
 		files: ["pnpm-workspace.yaml"],
 		languageOptions: { parser: yamlParser },
 		name: "so1ve/pnpm/pnpm-workspace-yaml",
 		plugins: { pnpm: pluginPnpm },
-		rules: {
-			"pnpm/yaml-enforce-settings": ["error", { settings: { shellEmulator: true } }],
-			"pnpm/yaml-no-unused-catalog-item": "error"
-		}
+		rules: { "pnpm/yaml-enforce-settings": ["error", { settings: { shellEmulator: true } }] }
 	}, {
 		files: ["pnpm-workspace.yaml"],
 		name: "so1ve/yaml/pnpm-workspace-yaml-sort",
@@ -2284,7 +2255,7 @@ function so1ve(options = {}, ...userConfigs) {
 	const { astro: enableAstro = isPackageExists("astro"), componentExts = [], gitignore: enableGitignore = true, ignores: userIgnores = [], pnpm: enablePnpm = !!findUpSync("pnpm-workspace.yaml"), solid: enableSolid = isPackageExists("solid-js"), typescript: enableTypeScript = isPackageExists("typescript"), vue: enableVue = VuePackages.some((i) => isPackageExists(i)) } = options;
 	const configs$1 = [];
 	if (enableGitignore) if (typeof enableGitignore === "boolean") {
-		if (fs$1.existsSync(".gitignore")) configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
+		if (fs.existsSync(".gitignore")) configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
 	} else configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
 	configs$1.push(ignores(userIgnores), javascript({ overrides: getOverrides(options, "javascript") }), comments(), node(), onlyError(), promise(), sortImports(), imports(), unicorn(), command(), deMorgan());
 	if (enablePnpm) configs$1.push(pnpm({

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-config",
-  "version": "4.1.1",
+  "version": "4.1.3",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "type": "module",
   "description": "Ray's eslint config.",
@@ -76,7 +76,7 @@
     "typescript-eslint": "^8.50.1",
     "vue-eslint-parser": "^10.2.0",
     "yaml-eslint-parser": "^1.3.2",
-    "@so1ve/eslint-plugin": "4.1.1"
+    "@so1ve/eslint-plugin": "4.1.3"
   },
   "devDependencies": {
     "eslint-plugin-de-morgan": "^2.0.0",