@oliver139/eslint-config 2.7.0 → 2.9.0

package/README.md

@@ -388,7 +388,7 @@ Since flat config requires us to explicitly provide the plugin names (instead of
 
 | New Prefix | Original Prefix        | Source Plugin                                                                              |
 | ---------- | ---------------------- | ------------------------------------------------------------------------------------------ |
-| `import/*` | `import-x/*`           | [eslint-plugin-import-x](https://github.com/un-es/eslint-plugin-import-x)                  |
+| `import/*` | `import-lite/*`        | [eslint-plugin-import-lite](https://github.com/9romise/eslint-plugin-import-lite)          |
 | `node/*`   | `n/*`                  | [eslint-plugin-n](https://github.com/eslint-community/eslint-plugin-n)                     |
 | `yaml/*`   | `yml/*`                | [eslint-plugin-yml](https://github.com/ota-meshi/eslint-plugin-yml)                        |
 | `ts/*`     | `@typescript-eslint/*` | [@typescript-eslint/eslint-plugin](https://github.com/typescript-eslint/typescript-eslint) |
@@ -502,10 +502,10 @@ export default eslintConfig()
   )
   // overrides any named configs
   .override(
-    'antfu/imports',
+    'antfu/stylistic/rules',
     {
       rules: {
-        'import/order': ['error', { 'newlines-between': 'always' }],
+        'style/generator-star-spacing': ['error', { after: true, before: false }],
       }
     }
   )

package/dist/cli.js

@@ -1,8 +1,4 @@
 import process from "node:process";
-import * as p$4 from "@clack/prompts";
-import * as p$3 from "@clack/prompts";
-import * as p$2 from "@clack/prompts";
-import * as p$1 from "@clack/prompts";
 import * as p from "@clack/prompts";
 import c, { green } from "ansis";
 import { cac } from "cac";
@@ -13,7 +9,7 @@ import parse from "parse-gitignore";
 import { execSync } from "node:child_process";
 
 //#region package.json
-var version = "2.7.0";
+var version = "2.9.0";
 
 //#endregion
 //#region src/cli/constants.ts
@@ -152,7 +148,7 @@ async function updateEslintFiles(result) {
 	const pathFlatConfig = path.join(cwd, configFileName);
 	const eslintIgnores = [];
 	if (fs.existsSync(pathESLintIgnore)) {
-		p$4.log.step(c.cyan`Migrating existing .eslintignore`);
+		p.log.step(c.cyan`Migrating existing .eslintignore`);
 		const content = await fsp.readFile(pathESLintIgnore, "utf-8");
 		const parsed = parse(content);
 		const globs = parsed.globs();
@@ -168,28 +164,28 @@ async function updateEslintFiles(result) {
 	const additionalConfig = [];
 	const eslintConfigContent = getEslintConfigContent(mainConfig, additionalConfig);
 	await fsp.writeFile(pathFlatConfig, eslintConfigContent);
-	p$4.log.success(c.green`Created ${configFileName}`);
+	p.log.success(c.green`Created ${configFileName}`);
 	const files = fs.readdirSync(cwd);
 	const legacyConfig = [];
 	files.forEach((file) => {
 		if (/eslint|prettier/.test(file) && !/eslint\.config\./.test(file)) legacyConfig.push(file);
 	});
-	if (legacyConfig.length) p$4.note(c.dim(legacyConfig.join(", ")), "You can now remove those files manually");
+	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": "^1.49.0",
-	"@unocss/eslint-plugin": "^66.1.2",
+	"@eslint-react/eslint-plugin": "^1.52.2",
+	"@unocss/eslint-plugin": "^66.3.2",
 	"astro-eslint-parser": "^1.2.2",
-	"eslint": "^9.26.0",
+	"eslint": "^9.30.1",
 	"eslint-plugin-astro": "^1.3.1",
 	"eslint-plugin-format": "^1.0.1",
 	"eslint-plugin-react-hooks": "^5.2.0",
 	"eslint-plugin-react-refresh": "^0.4.20",
 	"eslint-plugin-solid": "^0.14.5",
-	"eslint-plugin-svelte": "^3.7.0",
+	"eslint-plugin-svelte": "^3.10.1",
 	"prettier-plugin-astro": "^0.14.1",
 	"prettier-plugin-slidev": "^1.0.5",
 	"svelte-eslint-parser": "^1.2.0"
@@ -200,7 +196,7 @@ const versionsMap = {
 async function updatePackageJson(result) {
 	const cwd = process.cwd();
 	const pathPackageJSON = path.join(cwd, "package.json");
-	p$3.log.step(c.cyan`Bumping @oliver139/eslint-config to v${version}`);
+	p.log.step(c.cyan`Bumping @oliver139/eslint-config to v${version}`);
 	const pkgContent = await fsp.readFile(pathPackageJSON, "utf-8");
 	const pkg = JSON.parse(pkgContent);
 	pkg.devDependencies ??= {};
@@ -231,9 +227,9 @@ async function updatePackageJson(result) {
 			addedPackages.push(f);
 		});
 	}
-	if (addedPackages.length) p$3.note(c.dim(addedPackages.join(", ")), "Added packages");
+	if (addedPackages.length) p.note(c.dim(addedPackages.join(", ")), "Added packages");
 	await fsp.writeFile(pathPackageJSON, JSON.stringify(pkg, null, 2));
-	p$3.log.success(c.green`Changes wrote to package.json`);
+	p.log.success(c.green`Changes wrote to package.json`);
 }
 
 //#endregion
@@ -246,14 +242,14 @@ async function updateVscodeSettings(result) {
 	if (!fs.existsSync(dotVscodePath)) await fsp.mkdir(dotVscodePath, { recursive: true });
 	if (!fs.existsSync(settingsPath)) {
 		await fsp.writeFile(settingsPath, `{${vscodeSettingsString}}\n`, "utf-8");
-		p$2.log.success(green`Created .vscode/settings.json`);
+		p.log.success(green`Created .vscode/settings.json`);
 	} else {
 		let settingsContent = await fsp.readFile(settingsPath, "utf8");
 		settingsContent = settingsContent.trim().replace(/\s*\}$/, "");
 		settingsContent += settingsContent.endsWith(",") || settingsContent.endsWith("{") ? "" : ",";
 		settingsContent += `${vscodeSettingsString}}\n`;
 		await fsp.writeFile(settingsPath, settingsContent, "utf-8");
-		p$2.log.success(green`Updated .vscode/settings.json`);
+		p.log.success(green`Updated .vscode/settings.json`);
 	}
 }
 
@@ -264,7 +260,7 @@ async function run(options = {}) {
 	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"))) {
-		p$1.log.warn(c.yellow`eslint.config.js already exists, migration wizard exited.`);
+		p.log.warn(c.yellow`eslint.config.js already exists, migration wizard exited.`);
 		return process.exit(1);
 	}
 	let result = {
@@ -274,10 +270,10 @@ async function run(options = {}) {
 		updateVscodeSettings: true
 	};
 	if (!argSkipPrompt) {
-		result = await p$1.group({
+		result = await p.group({
 			uncommittedConfirmed: () => {
 				if (argSkipPrompt || isGitClean()) return Promise.resolve(true);
-				return p$1.confirm({
+				return p.confirm({
 					initialValue: false,
 					message: "There are uncommitted changes in the current repository, are you sure to continue?"
 				});
@@ -286,7 +282,7 @@ async function run(options = {}) {
 				const isArgTemplateValid = typeof argTemplate === "string" && !!frameworks.includes(argTemplate);
 				if (!results.uncommittedConfirmed || isArgTemplateValid) return;
 				const message = !isArgTemplateValid && argTemplate ? `"${argTemplate}" isn't a valid template. Please choose from below: ` : "Select a framework:";
-				return p$1.multiselect({
+				return p.multiselect({
 					message: c.reset(message),
 					options: frameworkOptions,
 					required: false
@@ -296,7 +292,7 @@ async function run(options = {}) {
 				const isArgExtraValid = argExtra?.length && !argExtra.filter((element) => !extra.includes(element)).length;
 				if (!results.uncommittedConfirmed || isArgExtraValid) return;
 				const message = !isArgExtraValid && argExtra ? `"${argExtra}" isn't a valid extra util. Please choose from below: ` : "Select a extra utils:";
-				return p$1.multiselect({
+				return p.multiselect({
 					message: c.reset(message),
 					options: extraOptions,
 					required: false
@@ -304,13 +300,13 @@ async function run(options = {}) {
 			},
 			updateVscodeSettings: ({ results }) => {
 				if (!results.uncommittedConfirmed) return;
-				return p$1.confirm({
+				return p.confirm({
 					initialValue: true,
 					message: "Update .vscode/settings.json for better VS Code experience?"
 				});
 			}
 		}, { onCancel: () => {
-			p$1.cancel("Operation cancelled.");
+			p.cancel("Operation cancelled.");
 			process.exit(0);
 		} });
 		if (!result.uncommittedConfirmed) return process.exit(1);
@@ -318,8 +314,8 @@ async function run(options = {}) {
 	await updatePackageJson(result);
 	await updateEslintFiles(result);
 	await updateVscodeSettings(result);
-	p$1.log.success(c.green`Setup completed`);
-	p$1.outro(`Now you can update the dependencies by run ${c.blue("pnpm install")} and run ${c.blue("eslint --fix")}\n`);
+	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