@antfu/eslint-config 6.7.0 → 6.7.1

package/dist/cli.mjs

@@ -1,6 +1,6 @@
 import process from "node:process";
-import fsPromises from "node:fs/promises";
-import fs from "node:fs";
+import fs from "node:fs/promises";
+import fs$1 from "node:fs";
 import path from "node:path";
 import * as p from "@clack/prompts";
 import c, { green } from "ansis";
@@ -9,7 +9,7 @@ import parse from "parse-gitignore";
 import { execSync } from "node:child_process";
 
 //#region package.json
-var version = "6.7.0";
+var version = "6.7.1";
 
 //#endregion
 //#region src/cli/constants.ts
@@ -143,13 +143,13 @@ async function updateEslintFiles(result) {
 	const cwd = process.cwd();
 	const pathESLintIgnore = path.join(cwd, ".eslintignore");
 	const pathPackageJSON = path.join(cwd, "package.json");
-	const pkgContent = await fsPromises.readFile(pathPackageJSON, "utf-8");
+	const pkgContent = await fs.readFile(pathPackageJSON, "utf-8");
 	const configFileName = JSON.parse(pkgContent).type === "module" ? "eslint.config.js" : "eslint.config.mjs";
 	const pathFlatConfig = path.join(cwd, configFileName);
 	const eslintIgnores = [];
-	if (fs.existsSync(pathESLintIgnore)) {
+	if (fs$1.existsSync(pathESLintIgnore)) {
 		p.log.step(c.cyan`Migrating existing .eslintignore`);
-		const globs = parse(await fsPromises.readFile(pathESLintIgnore, "utf-8")).globs();
+		const globs = parse(await fs.readFile(pathESLintIgnore, "utf-8")).globs();
 		for (const glob of globs) if (glob.type === "ignore") eslintIgnores.push(...glob.patterns);
 		else if (glob.type === "unignore") eslintIgnores.push(...glob.patterns.map((pattern) => `!${pattern}`));
 	}
@@ -159,9 +159,9 @@ async function updateEslintFiles(result) {
 	if (result.extra.includes("unocss")) configLines.push(`unocss: true,`);
 	for (const framework of result.frameworks) configLines.push(`${framework}: true,`);
 	const eslintConfigContent = getEslintConfigContent(configLines.map((i) => `  ${i}`).join("\n"), []);
-	await fsPromises.writeFile(pathFlatConfig, eslintConfigContent);
+	await fs.writeFile(pathFlatConfig, eslintConfigContent);
 	p.log.success(c.green`Created ${configFileName}`);
-	const files = fs.readdirSync(cwd);
+	const files = fs$1.readdirSync(cwd);
 	const legacyConfig = [];
 	files.forEach((file) => {
 		if (/eslint|prettier/.test(file) && !/eslint\.config\./.test(file)) legacyConfig.push(file);
@@ -194,7 +194,7 @@ async function updatePackageJson(result) {
 	const cwd = process.cwd();
 	const pathPackageJSON = path.join(cwd, "package.json");
 	p.log.step(c.cyan`Bumping @antfu/eslint-config to v${version}`);
-	const pkgContent = await fsPromises.readFile(pathPackageJSON, "utf-8");
+	const pkgContent = await fs.readFile(pathPackageJSON, "utf-8");
 	const pkg = JSON.parse(pkgContent);
 	pkg.devDependencies ??= {};
 	pkg.devDependencies["@antfu/eslint-config"] = `^${version}`;
@@ -225,7 +225,7 @@ async function updatePackageJson(result) {
 		});
 	}
 	if (addedPackages.length) p.note(c.dim(addedPackages.join(", ")), "Added packages");
-	await fsPromises.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
+	await fs.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
 	p.log.success(c.green`Changes wrote to package.json`);
 }
 
@@ -236,16 +236,16 @@ async function updateVscodeSettings(result) {
 	if (!result.updateVscodeSettings) return;
 	const dotVscodePath = path.join(cwd, ".vscode");
 	const settingsPath = path.join(dotVscodePath, "settings.json");
-	if (!fs.existsSync(dotVscodePath)) await fsPromises.mkdir(dotVscodePath, { recursive: true });
-	if (!fs.existsSync(settingsPath)) {
-		await fsPromises.writeFile(settingsPath, `{${vscodeSettingsString}}\n`, "utf-8");
+	if (!fs$1.existsSync(dotVscodePath)) await fs.mkdir(dotVscodePath, { recursive: true });
+	if (!fs$1.existsSync(settingsPath)) {
+		await fs.writeFile(settingsPath, `{${vscodeSettingsString}}\n`, "utf-8");
 		p.log.success(green`Created .vscode/settings.json`);
 	} else {
-		let settingsContent = await fsPromises.readFile(settingsPath, "utf8");
+		let settingsContent = await fs.readFile(settingsPath, "utf8");
 		settingsContent = settingsContent.trim().replace(/\s*\}$/, "");
 		settingsContent += settingsContent.endsWith(",") || settingsContent.endsWith("{") ? "" : ",";
 		settingsContent += `${vscodeSettingsString}}\n`;
-		await fsPromises.writeFile(settingsPath, settingsContent, "utf-8");
+		await fs.writeFile(settingsPath, settingsContent, "utf-8");
 		p.log.success(green`Updated .vscode/settings.json`);
 	}
 }
@@ -256,7 +256,7 @@ async function run(options = {}) {
 	const argSkipPrompt = !!process.env.SKIP_PROMPT || options.yes;
 	const argTemplate = options.frameworks?.map((m) => m?.trim()).filter(Boolean);
 	const argExtra = options.extra?.map((m) => m?.trim()).filter(Boolean);
-	if (fs.existsSync(path.join(process.cwd(), "eslint.config.js"))) {
+	if (fs$1.existsSync(path.join(process.cwd(), "eslint.config.js"))) {
 		p.log.warn(c.yellow`eslint.config.js already exists, migration wizard exited.`);
 		return process.exit(1);
 	}

package/dist/index.mjs

@@ -1,8 +1,8 @@
 import { FlatConfigComposer } from "eslint-flat-config-utils";
 import process from "node:process";
-import fsPromises from "node:fs/promises";
+import fs from "node:fs/promises";
 import { fileURLToPath } from "node:url";
-import fs from "node:fs";
+import fs$1 from "node:fs";
 import path from "node:path";
 import { isPackageExists } from "local-pkg";
 import createCommand from "eslint-plugin-command/config";
@@ -27,7 +27,7 @@ async function findUp(name, { cwd = process.cwd(), type = "file", stopAt } = {})
 	while (directory) {
 		const filePath = isAbsoluteName ? name : path.join(directory, name);
 		try {
-			const stats = await fsPromises.stat(filePath);
+			const stats = await fs.stat(filePath);
 			if (type === "file" && stats.isFile() || type === "directory" && stats.isDirectory()) return filePath;
 		} catch {}
 		if (directory === stopAt || directory === root) break;
@@ -42,7 +42,7 @@ function findUpSync(name, { cwd = process.cwd(), type = "file", stopAt } = {}) {
 	while (directory) {
 		const filePath = isAbsoluteName ? name : path.join(directory, name);
 		try {
-			const stats = fs.statSync(filePath, { throwIfNoEntry: false });
+			const stats = fs$1.statSync(filePath, { throwIfNoEntry: false });
 			if (type === "file" && stats?.isFile() || type === "directory" && stats?.isDirectory()) return filePath;
 		} catch {}
 		if (directory === stopAt || directory === root) break;
@@ -1143,7 +1143,7 @@ async function perfectionist() {
 async function detectCatalogUsage() {
 	const workspaceFile = await findUp("pnpm-workspace.yaml");
 	if (!workspaceFile) return false;
-	const yaml$1 = await fsPromises.readFile(workspaceFile, "utf-8");
+	const yaml$1 = await fs.readFile(workspaceFile, "utf-8");
 	return yaml$1.includes("catalog:") || yaml$1.includes("catalogs:");
 }
 async function pnpm(options) {
@@ -1174,9 +1174,9 @@ async function pnpm(options) {
 			plugins: { pnpm: pluginPnpm },
 			rules: {
 				"pnpm/yaml-enforce-settings": ["error", { settings: {
-					catalogMode: "prefer",
 					shellEmulator: true,
-					trustPolicy: "no-downgrade"
+					trustPolicy: "no-downgrade",
+					...catalogs ? { catalogMode: "prefer" } : {}
 				} }],
 				"pnpm/yaml-no-duplicate-catalog-item": "error",
 				"pnpm/yaml-no-unused-catalog-item": "error"

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@antfu/eslint-config",
   "type": "module",
-  "version": "6.7.0",
+  "version": "6.7.1",
   "description": "Anthony's ESLint config",
   "author": "Anthony Fu <anthonyfu117@hotmail.com> (https://github.com/antfu/)",
   "license": "MIT",
@@ -175,7 +175,7 @@
     "typescript": "^5.9.3",
     "vitest": "^4.0.15",
     "vue": "^3.5.25",
-    "@antfu/eslint-config": "6.7.0"
+    "@antfu/eslint-config": "6.7.1"
   },
   "resolutions": {
     "@eslint-community/eslint-utils": "catalog:peer",