@cuiqg/eslint-config 2.8.1 → 2.8.3

package/dist/index.mjs

@@ -1,7 +1,8 @@
 import { FlatConfigComposer } from "eslint-flat-config-utils";
+import { fileURLToPath } from "node:url";
+import { isPackageExists } from "local-pkg";
 import globals from "globals";
 import process from "node:process";
-import { isPackageExists } from "local-pkg";
 
 //#region src/globs.js
 const GLOB_SRC_EXT = "?([cm])[jt]s?(x)";
@@ -26,6 +27,8 @@ const GLOB_TOML = "**/*.toml";
 const GLOB_XML = "**/*.xml";
 const GLOB_SVG = "**/*.svg";
 const GLOB_HTML = "**/*.htm?(l)";
+const GLOB_GRAPHQL = "**/*.{g,graph}ql";
+const GLOB_PHP = "**/*.php";
 const GLOB_EXCLUDE = [
 	"**/node_modules",
 	"**/dist",
@@ -69,6 +72,7 @@ const GLOB_EXCLUDE = [
 
 //#endregion
 //#region src/utils.js
+const scopeUrl = fileURLToPath(new URL(".", import.meta.url));
 async function interopDefault(module) {
 	try {
 		let resolved = await module;
@@ -119,7 +123,15 @@ async function javascript() {
 		linterOptions: { reportUnusedDisableDirectives: true },
 		name: "cuiqg/javascript",
 		plugins: { js: pluginJs },
-		rules: { ...pluginJs.configs.recommended.rules }
+		rules: {
+			...pluginJs.configs.recommended.rules,
+			"no-unused-vars": ["error", {
+				argsIgnorePattern: "^_",
+				caughtErrorsIgnorePattern: "^_",
+				ignoreRestSiblings: true,
+				varsIgnorePattern: "^_"
+			}]
+		}
 	}];
 }
 
@@ -190,18 +202,19 @@ async function prettier() {
 
 //#endregion
 //#region src/configs/stylistic.js
+const stylisticConfigDefaults = {
+	experimental: false,
+	indent: 2,
+	jsx: true,
+	quotes: "single",
+	semi: false
+};
 async function stylistic() {
 	const pluginStylistic = await interopDefault(import("@stylistic/eslint-plugin"));
-	const config = pluginStylistic.configs.customize({
-		commaDangle: "never",
-		indent: 2,
-		pluginName: "style",
-		quotes: "single",
-		semi: false
-	});
+	const config = pluginStylistic.configs.customize({ ...stylisticConfigDefaults });
 	return [{
 		name: "cuiqg/stylistic",
-		plugins: { style: pluginStylistic },
+		plugins: { "@stylistic": pluginStylistic },
 		rules: { ...config.rules }
 	}];
 }
@@ -229,6 +242,7 @@ async function vue() {
 				computed: "readonly",
 				defineEmits: "readonly",
 				defineExpose: "readonly",
+				definePage: "readonly",
 				defineModel: "readonly",
 				defineOptions: "readonly",
 				defineProps: "readonly",
@@ -370,7 +384,20 @@ async function tailwindcss() {
 		name: "cuiqg/tailwindcss",
 		plugins: { tailwindcss: pluginTailwindcss },
 		languageOptions: { parserOptions: { ecmaFeatures: { jsx: true } } },
-		rules: { ...pluginTailwindcss.configs["flat/recommended"][1].rules }
+		rules: { ...pluginTailwindcss.configs.recommended.rules },
+		settings: {}
+	}];
+}
+
+//#endregion
+//#region src/configs/imports.js
+async function imports() {
+	const pluginImportX = await interopDefault(import("eslint-plugin-import-x"));
+	return [{
+		name: "cuiqg/imports",
+		plugins: { "import-x": pluginImportX },
+		rules: { ...pluginImportX.configs["flat/recommended"].rules },
+		settings: { "import-x/core-modules": ["electron", "vue-router/auto-routes"] }
 	}];
 }
 
@@ -396,20 +423,23 @@ const hasTailwindcss = () => isPackageExists("tailwindcss");
 
 //#endregion
 //#region src/presets.js
-const defaultPluginRenaming = {
-	"@stylistic": "style",
-	"@typescript-eslint": "ts"
-};
+const defaultPluginRenaming = {};
 /**
 *
 * @param {object} options - 设置选项
-* @param {...any} userConfigs - 用户配置
-* @returns {Promise<any[]>} 合并后的配置
+* @param {boolean} [options.prettier=false] - 是否启用 prettier 格式化
+* @param {boolean} [options.unocss] - 是否启用 unocss 格式化
+* @param {boolean} [options.tailwindcss] - 是否启用 tailwindcss 格式化
+* @param {boolean} [options.vue] - 是否启用 vue 格式化
+* @param {boolean|object} [options.formatter=true] - 是否启用格式化
+* @param {...Object} userConfigs - 用户配置
+* @returns {Promise<Object[]>} 合并后的配置
 */
 function cuiqg(options = {}, ...userConfigs) {
-	const { prettier: enablePrettier = false, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = hasTailwindcss(), vue: enableVue = hasVue() } = options;
+	const { prettier: enablePrettier = false, unocss: enableUnocss = hasUnocss(), tailwindcss: enableTailwindcss = hasTailwindcss(), vue: enableVue = hasVue(), imports: enableImports = true } = options;
 	const configs = [];
 	configs.push(ignores(), javascript(), jsdoc(), stylistic(), packageJson());
+	if (enableImports) configs.push(imports());
 	if (enableVue) configs.push(vue(), macros());
 	if (enableUnocss) configs.push(unocss());
 	if (enableTailwindcss) configs.push(tailwindcss());
@@ -424,4 +454,4 @@ function cuiqg(options = {}, ...userConfigs) {
 var src_default = cuiqg;
 
 //#endregion
-export { GLOB_CSS, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_STYLUS, GLOB_SVG, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, cuiqg, src_default as default, defaultPluginRenaming, hasTailwindcss, hasTypeScript, hasUnocss, hasVue, ignores, isInEditor, isInGitHookOrLintStaged, javascript, jsdoc, macros, packageJson, prettier, stylistic, tailwindcss, unocss, vue };
+export { GLOB_CSS, GLOB_EXCLUDE, GLOB_GRAPHQL, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_PHP, GLOB_POSTCSS, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_STYLUS, GLOB_SVG, GLOB_TOML, GLOB_TS, GLOB_TSX, GLOB_VUE, GLOB_XML, GLOB_YAML, cuiqg, src_default as default, defaultPluginRenaming, hasTailwindcss, hasTypeScript, hasUnocss, hasVue, ignores, imports, isInEditor, isInGitHookOrLintStaged, javascript, jsdoc, macros, packageJson, prettier, stylistic, stylisticConfigDefaults, tailwindcss, unocss, vue };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@cuiqg/eslint-config",
-  "version": "2.8.1",
+  "version": "2.8.3",
   "description": "Eslint config for @cuiqg",
   "keywords": [
     "eslint-config"
@@ -42,6 +42,8 @@
     "eslint-config-flat-gitignore": "^2.1.0",
     "eslint-config-prettier": "^10.1.8",
     "eslint-flat-config-utils": "^2.1.4",
+    "eslint-plugin-format": "^1.0.2",
+    "eslint-plugin-import-x": "^4.16.1",
     "eslint-plugin-jsdoc": "^61.4.1",
     "eslint-plugin-package-json": "^0.85.0",
     "eslint-plugin-prettier": "^5.5.4",