@oliver139/eslint-config 5.1.0 → 6.0.0

package/README.md

@@ -3,7 +3,7 @@
 [![npm](https://img.shields.io/npm/v/@oliver139/eslint-config?color=010101&style=for-the-badge)](https://npmjs.com/package/@oliver139/eslint-config)
 
 > [!NOTE]
-> Based on [Anthony's code style v7.4.3](https://github.com/antfu/eslint-config)  
+> Based on [Anthony's code style v7.7.3](https://github.com/antfu/eslint-config)  
 > Content below keeps nearly unchanged
 
 <!-- [![code style](https://antfu.me/badge-code-style.svg)](https://github.com/antfu/eslint-config) -->
@@ -182,11 +182,11 @@ Add the following settings to your `.zed/settings.json`:
 
 ```jsonc
 {
-  "format_on_save": "on",
-  "formatter": [
-    // Use ESLint's --fix:
-    { "code_action": "source.fixAll.eslint" }
-  ],
+  // Use ESLint's --fix:
+  "code_actions_on_format": {
+    "source.fixAll.eslint": true
+  },
+  "formatter": [],
   // Enable eslint for all supported languages
   // Defaults only include https://github.com/search?q=repo%3Azed-industries%2Fzed%20eslint_languages&type=code
   "languages": {
@@ -196,6 +196,9 @@ Add the following settings to your `.zed/settings.json`:
     "Markdown": {
       "language_servers": ["...", "eslint"]
     },
+    "Markdown-Inline": {
+      "language_servers": ["...", "eslint"]
+    },
     "JSON": {
       "language_servers": ["...", "eslint"]
     },
@@ -213,10 +216,7 @@ Add the following settings to your `.zed/settings.json`:
   "lsp": {
     "eslint": {
       "settings": {
-        // Remove after https://github.com/zed-industries/zed/issues/49387
-        "experimental": {
-          "useFlatConfig": false
-        },
+        "workingDirectories": ["./"],
 
         // Silent the stylistic rules in your IDE, but still auto fix them
         "rulesCustomizations": [
@@ -713,7 +713,7 @@ export default eslintConfig({
 Running `npx eslint` should prompt you to install the required dependencies, otherwise, you can install them manually:
 
 ```bash
-npm i -D @eslint-react/eslint-plugin eslint-plugin-react-hooks eslint-plugin-react-refresh
+npm i -D @eslint-react/eslint-plugin eslint-plugin-react-refresh
 ```
 
 #### Next.js

package/dist/cli.mjs

@@ -7,10 +7,8 @@ import c, { green } from "ansis";
 import { cac } from "cac";
 import parse from "parse-gitignore";
 import { execSync } from "node:child_process";
-
 //#region package.json
-var version = "5.1.0";
-
+var version = "6.0.0";
 //#endregion
 //#region src/cli/constants.ts
 const vscodeSettingsString = `
@@ -105,18 +103,13 @@ const dependenciesMap = {
 	formatter: ["eslint-plugin-format"],
 	formatterAstro: ["prettier-plugin-astro"],
 	nextjs: ["@next/eslint-plugin-next"],
-	react: [
-		"@eslint-react/eslint-plugin",
-		"eslint-plugin-react-hooks",
-		"eslint-plugin-react-refresh"
-	],
+	react: ["@eslint-react/eslint-plugin", "eslint-plugin-react-refresh"],
 	slidev: ["prettier-plugin-slidev"],
 	solid: ["eslint-plugin-solid"],
 	svelte: ["eslint-plugin-svelte", "svelte-eslint-parser"],
 	unocss: ["@unocss/eslint-plugin"],
 	vue: []
 };
-
 //#endregion
 //#region src/cli/utils.ts
 function isGitClean() {
@@ -136,9 +129,10 @@ ${mainConfig}
 }${additionalConfigs?.map((config) => `,{\n${config}\n}`)})
 `.trimStart();
 }
-
 //#endregion
 //#region src/cli/stages/update-eslint-files.ts
+const ESLINT_OR_PRETTIER = /eslint|prettier/;
+const ESLINT_CONFIG = /eslint\.config\./;
 async function updateEslintFiles(result) {
 	const cwd = process.cwd();
 	const pathESLintIgnore = path.join(cwd, ".eslintignore");
@@ -164,30 +158,27 @@ async function updateEslintFiles(result) {
 	const files = fs$1.readdirSync(cwd);
 	const legacyConfig = [];
 	files.forEach((file) => {
-		if (/eslint|prettier/.test(file) && !/eslint\.config\./.test(file)) legacyConfig.push(file);
+		if (ESLINT_OR_PRETTIER.test(file) && !ESLINT_CONFIG.test(file)) legacyConfig.push(file);
 	});
 	if (legacyConfig.length) p.note(c.dim(legacyConfig.join(", ")), "You can now remove those files manually");
 }
-
 //#endregion
 //#region src/cli/constants-generated.ts
 const versionsMap = {
-	"@eslint-react/eslint-plugin": "^2.13.0",
-	"@next/eslint-plugin-next": "^16.1.6",
-	"@unocss/eslint-plugin": "^66.6.1",
-	"astro-eslint-parser": "^1.3.0",
-	"eslint": "^10.0.2",
-	"eslint-plugin-astro": "^1.6.0",
+	"@eslint-react/eslint-plugin": "^3.0.0",
+	"@next/eslint-plugin-next": "^16.2.3",
+	"@unocss/eslint-plugin": "^66.6.8",
+	"astro-eslint-parser": "^1.4.0",
+	"eslint": "^10.2.0",
+	"eslint-plugin-astro": "^1.7.0",
 	"eslint-plugin-format": "^2.0.1",
-	"eslint-plugin-react-hooks": "^7.0.1",
 	"eslint-plugin-react-refresh": "^0.5.2",
 	"eslint-plugin-solid": "^0.14.5",
-	"eslint-plugin-svelte": "^3.15.0",
+	"eslint-plugin-svelte": "^3.17.0",
 	"prettier-plugin-astro": "^0.14.1",
 	"prettier-plugin-slidev": "^1.0.5",
-	"svelte-eslint-parser": "^1.5.1"
+	"svelte-eslint-parser": "^1.6.0"
 };
-
 //#endregion
 //#region src/cli/stages/update-package-json.ts
 async function updatePackageJson(result) {
@@ -228,9 +219,9 @@ async function updatePackageJson(result) {
 	await fs.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
 	p.log.success(c.green`Changes wrote to package.json`);
 }
-
 //#endregion
 //#region src/cli/stages/update-vscode-settings.ts
+const LAST_LINE_PATTERN = /\s*\}$/;
 async function updateVscodeSettings(result) {
 	const cwd = process.cwd();
 	if (!result.updateVscodeSettings) return;
@@ -242,14 +233,13 @@ async function updateVscodeSettings(result) {
 		p.log.success(green`Created .vscode/settings.json`);
 	} else {
 		let settingsContent = await fs.readFile(settingsPath, "utf8");
-		settingsContent = settingsContent.trim().replace(/\s*\}$/, "");
+		settingsContent = settingsContent.trim().replace(LAST_LINE_PATTERN, "");
 		settingsContent += settingsContent.endsWith(",") || settingsContent.endsWith("{") ? "" : ",";
 		settingsContent += `${vscodeSettingsString}}\n`;
 		await fs.writeFile(settingsPath, settingsContent, "utf-8");
 		p.log.success(green`Updated .vscode/settings.json`);
 	}
 }
-
 //#endregion
 //#region src/cli/run.ts
 async function run(options = {}) {
@@ -314,7 +304,6 @@ async function run(options = {}) {
 	p.log.success(c.green`Setup completed`);
 	p.outro(`Now you can update the dependencies by run ${c.blue("pnpm install")} and run ${c.blue("eslint --fix")}\n`);
 }
-
 //#endregion
 //#region src/cli/index.ts
 function header() {
@@ -335,6 +324,5 @@ cli.command("", "Run the initialization or migration").option("--yes, -y", "Skip
 cli.help();
 cli.version(version);
 cli.parse();
-
 //#endregion
-export {  };
+export {};