@cuiqg/eslint-config 2.8.13 → 2.8.15

package/dist/index.mjs

@@ -1,11 +1,31 @@
 import { FlatConfigComposer } from "eslint-flat-config-utils";
 import globals from "globals";
-import { fileURLToPath } from "node:url";
-import { isPackageExists } from "local-pkg";
 import path from "node:path";
 import fs from "node:fs";
 import process$1 from "node:process";
+import { isPackageExists } from "local-pkg";
+
+//#region src/utils.js
+async function interopDefault(module) {
+	const resolved = await module;
+	return resolved.default || resolved;
+}
+
+//#endregion
+//#region src/configs/baseline.js
+async function baseline() {
+	const [pluginBaseline] = await Promise.all([interopDefault(import("eslint-plugin-baseline-js"))]);
+	return [{
+		name: "cuiqg/baseline",
+		plugins: { "baseline-js": pluginBaseline },
+		rules: { ...pluginBaseline.configs.recommended({
+			available: "widely",
+			level: "warn"
+		}).rules }
+	}];
+}
 
+//#endregion
 //#region src/globs.js
 const GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
 const GLOB_SRC = `**/*.${GLOB_SRC_EXT}`;
@@ -13,12 +33,9 @@ const GLOB_TS = `**/*.?([cm])ts`;
 const GLOB_TSX = `**/*.?([cm])tsx`;
 const GLOB_JS = `**/*.?([cm])js`;
 const GLOB_JSX = `**/*.?([cm])jsx`;
-const GLOB_STYLE = "**/*.{c,le,sc}ss";
+const GLOB_STYLE = "**/*.{c,sc}ss";
 const GLOB_CSS = "**/*.css";
 const GLOB_SCSS = "**/*.scss";
-const GLOB_LESS = "**/*.less";
-const GLOB_STYLUS = "**/*.styl";
-const GLOB_POSTCSS = "**/*.{p,post}css";
 const GLOB_VUE = "**/*.vue";
 const GLOB_EXCLUDE = [
 	"**/node_modules",
@@ -64,22 +81,14 @@ const GLOB_EXCLUDE = [
 //#endregion
 //#region src/configs/ignores.js
 async function ignores() {
+	const [pluginGitignore] = await Promise.all([interopDefault(import("eslint-config-flat-gitignore"))]);
 	return [{
 		ignores: [...GLOB_EXCLUDE],
 		name: "cuiqg/ignores"
-	}];
-}
-
-//#endregion
-//#region src/utils.js
-const scopeUrl = fileURLToPath(new URL(".", import.meta.url));
-async function interopDefault(module) {
-	try {
-		let resolved = await module;
-		return resolved?.default || resolved;
-	} catch (error) {
-		throw new Error(`Cannot import module: ${String(error)}`);
-	}
+	}, { ...pluginGitignore({
+		name: "cuiqg/ignores/gitignore",
+		strict: false
+	}) }];
 }
 
 //#endregion
@@ -327,8 +336,9 @@ async function jsdoc() {
 //#endregion
 //#region src/configs/macros.js
 async function macros() {
+	const [configMacros] = await Promise.all([interopDefault(import("@vue-macros/eslint-config"))]);
 	return [{
-		...await interopDefault(import("@vue-macros/eslint-config")),
+		...configMacros,
 		name: "cuiqg/macros"
 	}];
 }
@@ -429,7 +439,7 @@ async function stylistic(options = {}) {
 //#endregion
 //#region src/configs/unocss.js
 async function unocss() {
-	const pluginUnoCSS = await interopDefault(import("@unocss/eslint-plugin"));
+	const [pluginUnoCSS] = await Promise.all([interopDefault(import("@unocss/eslint-plugin"))]);
 	return [{
 		name: "cuiqg/unocss",
 		plugins: { "@unocss": pluginUnoCSS },
@@ -481,8 +491,8 @@ async function vue(options = {}) {
 			"vue/define-props-destructuring": ["error", { destructure: "always" }],
 			"vue/enforce-style-attribute": ["error", { allow: ["scoped", "plain"] }],
 			"vue/max-attributes-per-line": ["error", {
-				"singleline": { "max": 1 },
-				"multiline": { "max": 1 }
+				singleline: { max: 1 },
+				multiline: { max: 1 }
 			}],
 			"vue/html-button-has-type": "error",
 			"vue/html-end-tags": "error",
@@ -619,7 +629,7 @@ async function vue(options = {}) {
 //#endregion
 //#region src/configs/tailwindcss.js
 async function tailwindcss() {
-	const pluginTailwindcss = await interopDefault(import("eslint-plugin-tailwindcss"));
+	const [pluginTailwindcss] = await Promise.all([interopDefault(import("eslint-plugin-tailwindcss"))]);
 	return [{
 		name: "cuiqg/tailwindcss",
 		plugins: { tailwindcss: pluginTailwindcss },
@@ -632,7 +642,7 @@ async function tailwindcss() {
 //#endregion
 //#region src/configs/comments.js
 async function comments() {
-	const pluginComments = await interopDefault(import("@eslint-community/eslint-plugin-eslint-comments"));
+	const [pluginComments] = await Promise.all([interopDefault(import("@eslint-community/eslint-plugin-eslint-comments"))]);
 	return [{
 		name: "cuiqg/eslint-comments",
 		plugins: { "@eslint-community/eslint-comments": pluginComments },
@@ -863,37 +873,20 @@ const isInEditor = () => {
 	return !!(process$1.env.VSCODE_PID || process$1.env.VSCODE_CWD || process$1.env.JETBRAINS_IDE || process$1.env.VIM || process$1.env.NVIM);
 };
 const hasVue = () => isPackageExists("vue");
-const hasTypeScript = () => isPackageExists("typescript");
 const hasUnocss = () => isPackageExists("unocss");
-const hasTailwindcss = () => isPackageExists("tailwindcss");
 
 //#endregion
 //#region src/presets.js
-/**
-*
-* @param {object} options - 设置选项
-* @param {boolean} [options.typescript] - 是否启用 TypeScript 格式化
-* @param {boolean} [options.unocss] - 是否启用 Unocss 格式化
-* @param {boolean} [options.tailwindcss] - 是否启用 TailwindCSS 格式化
-* @param {boolean} [options.vue] - 是否启用 VUE 格式化
-* @param {boolean} [options.jsdoc=true] - 是否启用 JSDoc 格式化
-* @param {...Object} userConfigs - 用户配置
-*
-* @returns {Promise<Object[]>} 合并后的配置
-*/
 function cuiqg(options = {}, ...userConfigs) {
-	const { jsdoc: enableJsdoc = true, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = hasTailwindcss(), typescript: enableTypescript = hasTypeScript(), vue: enableVue = hasVue() } = options;
+	const { jsdoc: enableJsdoc = true, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = false, typescript: enableTypescript = false, vue: enableVue = hasVue() } = options;
 	const configs = [];
-	configs.push(autoImports(), ignores(), comments(), javascript({ isInEditor }), stylistic(), packageJson());
+	configs.push(autoImports(), baseline(), ignores(), comments(), javascript({ isInEditor }), stylistic(), packageJson());
 	if (enableTypescript) configs.push(typescript());
 	if (enableJsdoc) configs.push(jsdoc());
 	if (enableVue) configs.push(vue({ typescript: enableTypescript }), macros());
 	if (enableUnocss) configs.push(unocss());
 	if (enableTailwindcss) configs.push(tailwindcss());
-	let composer = new FlatConfigComposer();
-	composer = composer.append(...configs, ...userConfigs);
-	if (isInEditor) composer = composer.disableRulesFix(["unused-imports/no-unused-imports"], { builtinRules: () => import(["eslint", "use-at-your-own-risk"].join("/")).then((r) => r.builtinRules) });
-	return composer;
+	return new FlatConfigComposer(...configs, ...userConfigs);
 }
 
 //#endregion
@@ -901,4 +894,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, autoImports, 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_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TS, GLOB_TSX, GLOB_VUE, autoImports, baseline, comments, cuiqg, src_default as default, hasUnocss, hasVue, ignores, isInEditor, isInGitHookOrLintStaged, javascript, jsdoc, macros, packageJson, stylistic, stylisticConfigDefaults, tailwindcss, typescript, unocss, vue };

package/package.json

@@ -1,12 +1,15 @@
 {
   "name": "@cuiqg/eslint-config",
-  "version": "2.8.13",
+  "version": "2.8.15",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"
   ],
   "homepage": "https://eslint-config.tsuiqg.me",
-  "repository": "github:cuiqg/eslint-config",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/cuiqg/eslint-config.git"
+  },
   "publishConfig": {
     "access": "public",
     "registry": "https://registry.npmjs.org/"
@@ -17,26 +20,20 @@
   "main": "./dist/index.mjs",
   "module": "./dist/index.mjs",
   "exports": {
-    ".": "./dist/index.mjs"
+    ".": "./dist/index.mjs",
+    "./package.json": "./package.json"
   },
   "files": [
     "dist"
   ],
-  "scripts": {
-    "build": "tsdown",
-    "dev": "tsdown --watch",
-    "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",
-    "prerelease": "npm run build",
-    "release": "bumpp && npm publish"
-  },
   "devDependencies": {
     "@eslint/config-inspector": "^1.4.2",
+    "@types/node": "^25.0.3",
     "bumpp": "^10.3.2",
     "eslint": "^9.39.2",
     "tsdown": "^0.18.2",
-    "typescript": "^5.9.3"
+    "typescript": "^5.9.3",
+    "unrun": "^0.2.22"
   },
   "peerDependencies": {
     "eslint": ">=9.28.0"
@@ -48,7 +45,9 @@
     "@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-baseline-js": "^0.4.2",
     "eslint-plugin-depend": "^1.4.0",
     "eslint-plugin-import-x": "^4.16.1",
     "eslint-plugin-jsdoc": "^61.5.0",
@@ -60,5 +59,13 @@
     "jsonc-eslint-parser": "^2.4.2",
     "local-pkg": "^1.1.2",
     "vue-eslint-parser": "^10.2.0"
+  },
+  "scripts": {
+    "build": "tsdown",
+    "dev": "tsdown --watch",
+    "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",
+    "release": "bumpp"
   }
-}
+}