@cuiqg/eslint-config 2.8.11 → 2.8.12

package/README.md

@@ -22,17 +22,9 @@ npm i -D eslint @cuiqg/eslint-config
 创建 `eslint.config.mjs` 文件
 
 ```js
-import fs from 'node:fs'
 import cuiqg from '@cuiqg/eslint-config'
-import { FlatCompat } from '@eslint/eslintrc'
 
-const compat = new FlatCompat()
-
-export default cuiqg({}, 
-  fs.existsSync('.eslintrc-auto-import.json')
-    ? compat.extend('./.eslintrc-auto-import.json')
-    : []
-)
+export default cuiqg()
 ```
 
 ## 插件配置

package/dist/index.mjs

@@ -1,7 +1,9 @@
 import { FlatConfigComposer } from "eslint-flat-config-utils";
+import globals from "globals";
 import { fileURLToPath } from "node:url";
 import { isPackageExists } from "local-pkg";
-import globals from "globals";
+import path from "node:path";
+import fs from "node:fs";
 import process$1 from "node:process";
 
 //#region src/globs.js
@@ -59,6 +61,15 @@ const GLOB_EXCLUDE = [
 	"**/.eslint-config-inspector"
 ];
 
+//#endregion
+//#region src/configs/ignores.js
+async function ignores() {
+	return [{
+		ignores: [...GLOB_EXCLUDE],
+		name: "cuiqg/ignores"
+	}];
+}
+
 //#endregion
 //#region src/utils.js
 const scopeUrl = fileURLToPath(new URL(".", import.meta.url));
@@ -71,19 +82,6 @@ async function interopDefault(module) {
 	}
 }
 
-//#endregion
-//#region src/configs/ignores.js
-async function ignores() {
-	const configGitignore = await interopDefault(import("eslint-config-flat-gitignore"));
-	return [{
-		ignores: [...GLOB_EXCLUDE],
-		name: "cuiqg/ignores"
-	}, configGitignore({
-		name: "cuiqg/gitignore",
-		strict: false
-	})];
-}
-
 //#endregion
 //#region src/configs/javascript.js
 async function javascript(options = {}) {
@@ -834,6 +832,22 @@ async function typescript() {
 	}];
 }
 
+//#endregion
+//#region src/configs/auto-imports.js
+async function autoImports(options = {}) {
+	const { cwd = process.cwd(), filename = ".eslintrc-auto-import.json", strict = true } = options;
+	const config = [];
+	if (fs.existsSync(path.join(cwd, filename))) try {
+		config.push({
+			name: "cuiqg/auto-imports",
+			languageOptions: { ...JSON.parse(fs.readFileSync(path.join(cwd, filename), "utf8")) }
+		});
+	} catch (error) {
+		if (strict) throw error;
+	}
+	return config;
+}
+
 //#endregion
 //#region src/env.js
 const isInGitHookOrLintStaged = () => {
@@ -866,7 +880,7 @@ const hasTailwindcss = () => isPackageExists("tailwindcss");
 function cuiqg(options = {}, ...userConfigs) {
 	const { jsdoc: enableJsdoc = true, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = hasTailwindcss(), typescript: enableTypescript = hasTypeScript(), vue: enableVue = hasVue() } = options;
 	const configs = [];
-	configs.push(ignores(), comments(), javascript({ isInEditor }), stylistic(), packageJson());
+	configs.push(autoImports(), ignores(), comments(), javascript({ isInEditor }), stylistic(), packageJson());
 	if (enableTypescript) configs.push(typescript());
 	if (enableJsdoc) configs.push(jsdoc());
 	if (enableVue) configs.push(vue({ typescript: enableTypescript }), macros());
@@ -883,4 +897,4 @@ function cuiqg(options = {}, ...userConfigs) {
 var src_default = cuiqg;
 
 //#endregion
-export { GLOB_CSS, GLOB_EXCLUDE, GLOB_JS, GLOB_JSX, GLOB_LESS, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_STYLUS, GLOB_TS, GLOB_TSX, GLOB_VUE, comments, cuiqg, src_default as default, hasTailwindcss, hasTypeScript, hasUnocss, hasVue, ignores, isInEditor, isInGitHookOrLintStaged, javascript, jsdoc, macros, packageJson, stylistic, stylisticConfigDefaults, tailwindcss, typescript, unocss, vue };
+export { GLOB_CSS, GLOB_EXCLUDE, GLOB_JS, GLOB_JSX, GLOB_LESS, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_STYLUS, GLOB_TS, GLOB_TSX, GLOB_VUE, autoImports, comments, cuiqg, src_default as default, hasTailwindcss, hasTypeScript, hasUnocss, hasVue, ignores, isInEditor, isInGitHookOrLintStaged, javascript, jsdoc, macros, packageJson, stylistic, stylisticConfigDefaults, tailwindcss, typescript, unocss, vue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuiqg/eslint-config",
-  "version": "2.8.11",
+  "version": "2.8.12",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"
@@ -28,8 +28,8 @@
     "build:inspect": "npx @eslint/config-inspector build --config eslint-inspector.config.js",
     "lint": "eslint .",
     "lint:inspect": "npx @eslint/config-inspector --open false --config eslint-inspector.config.js",
-    "prepublishOnly": "npm run build",
-    "release": "bumpp"
+    "prerelease": "npm run build",
+    "release": "bumpp && npm publish"
   },
   "devDependencies": {
     "@eslint/config-inspector": "^1.4.2",
@@ -48,7 +48,6 @@
     "@typescript-eslint/parser": "^8.50.1",
     "@unocss/eslint-plugin": "^66.5.10",
     "@vue-macros/eslint-config": "3.0.0-beta.21",
-    "eslint-config-flat-gitignore": "^2.1.0",
     "eslint-flat-config-utils": "^2.1.4",
     "eslint-plugin-depend": "^1.4.0",
     "eslint-plugin-import-x": "^4.16.1",