@cany748/eslint-config 4.1.0 → 4.2.0

package/dist/{index.js → index.mjs}

@@ -181,8 +181,7 @@ const parserPlain = {
 * Combine array and non-array configs into a single array.
 */
 async function combine(...configs$1) {
-	const resolved = await Promise.all(configs$1);
-	return resolved.flat();
+	return (await Promise.all(configs$1)).flat();
 }
 function toArray(value) {
 	return Array.isArray(value) ? value : [value];
@@ -254,7 +253,12 @@ function formatters(options = true) {
 //#endregion
 //#region src/configs/ignores.ts
 function ignores(userIgnores = []) {
-	return [{ ignores: [...GLOB_EXCLUDE, ...userIgnores] }];
+	let ignores$1 = [...GLOB_EXCLUDE];
+	ignores$1 = typeof userIgnores === "function" ? userIgnores(ignores$1) : [...ignores$1, ...userIgnores];
+	return [{
+		ignores: ignores$1,
+		name: "ignores"
+	}];
 }
 
 //#endregion
@@ -286,7 +290,7 @@ function javascript(options = {}) {
 	const { isInEditor = false, overrides = {} } = options;
 	return [{
 		languageOptions: {
-			ecmaVersion: 2022,
+			ecmaVersion: "latest",
 			globals: {
 				...globals.browser,
 				...globals.es2021,
@@ -297,7 +301,7 @@ function javascript(options = {}) {
 			},
 			parserOptions: {
 				ecmaFeatures: { jsx: true },
-				ecmaVersion: 2022,
+				ecmaVersion: "latest",
 				sourceType: "module"
 			},
 			sourceType: "module"
@@ -667,6 +671,14 @@ function sortPackageJson() {
 					order: { type: "asc" },
 					pathPattern: "^(?:resolutions|overrides|pnpm.overrides)$"
 				},
+				{
+					order: { type: "asc" },
+					pathPattern: String.raw`^workspaces\.catalog$`
+				},
+				{
+					order: { type: "asc" },
+					pathPattern: String.raw`^workspaces\.catalogs\.[^.]+$`
+				},
 				{
 					order: [
 						"types",
@@ -986,9 +998,8 @@ function unicorn() {
 //#endregion
 //#region src/configs/unocss.ts
 async function unocss() {
-	const pluginUnoCSS = await interopDefault(import("@unocss/eslint-plugin"));
 	return [{
-		...pluginUnoCSS.configs.flat,
+		...(await interopDefault(import("@unocss/eslint-plugin"))).configs.flat,
 		name: "unocss"
 	}];
 }
@@ -1117,7 +1128,7 @@ const VuePackages = [
 *  The merged ESLint configurations.
 */
 const factoryConfig = function(options = {}, ...userConfigs) {
-	const { componentExts = [], formatters: enableFormatters = true, gitignore: enableGitignore = true, jsonc: enableJSONC = true, regexp: enableRegexp = true, test: enableTest = true, typescript: enableTypeScript = isPackageExists("typescript"), unocss: enableUnoCSS = isPackageExists("unocss"), vue: enableVue = VuePackages.some((i) => isPackageExists(i)) } = options;
+	const { componentExts = [], formatters: enableFormatters = true, gitignore: enableGitignore = true, ignores: userIgnores = [], jsonc: enableJSONC = true, regexp: enableRegexp = true, test: enableTest = true, typescript: enableTypeScript = isPackageExists("typescript"), unocss: enableUnoCSS = isPackageExists("unocss"), vue: enableVue = VuePackages.some((i) => isPackageExists(i)) } = options;
 	let isInEditor = options.isInEditor;
 	if (isInEditor == null) {
 		isInEditor = isInEditorEnv();
@@ -1126,7 +1137,7 @@ const factoryConfig = function(options = {}, ...userConfigs) {
 	const configs$1 = [];
 	if (enableGitignore) if (typeof enableGitignore === "boolean") configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r({ strict: false })]));
 	else configs$1.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
-	configs$1.push(comments(), ignores(options.ignores), imports(), javascript({
+	configs$1.push(comments(), ignores(userIgnores), imports(), javascript({
 		isInEditor,
 		overrides: options.javascript?.overrides
 	}), node(), unicorn());

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@cany748/eslint-config",
   "type": "module",
-  "version": "4.1.0",
+  "version": "4.2.0",
   "exports": {
     ".": "./dist/index.js"
   },
@@ -11,9 +11,9 @@
     "dist"
   ],
   "peerDependencies": {
-    "@unocss/eslint-plugin": "^66.4.2",
-    "eslint-plugin-vue": "^10.4.0",
-    "typescript-eslint": "^8.40.0"
+    "@unocss/eslint-plugin": "^66.5.10",
+    "eslint-plugin-vue": "^10.6.2",
+    "typescript-eslint": "^8.49.0"
   },
   "peerDependenciesMeta": {
     "@unocss/eslint-plugin": {
@@ -28,36 +28,36 @@
   },
   "dependencies": {
     "@eslint-community/eslint-plugin-eslint-comments": "^4.5.0",
-    "@vitest/eslint-plugin": "^1.3.4",
-    "eslint": "^9.33.0",
+    "@vitest/eslint-plugin": "^1.5.2",
+    "eslint": "^9.39.2",
     "eslint-config-flat-gitignore": "^2.1.0",
     "eslint-config-prettier": "^10.1.8",
-    "eslint-flat-config-utils": "^2.1.1",
+    "eslint-flat-config-utils": "^2.1.4",
     "eslint-plugin-import-x": "^4.16.1",
-    "eslint-plugin-jsonc": "^2.20.1",
-    "eslint-plugin-n": "^17.21.3",
+    "eslint-plugin-jsonc": "^2.21.0",
+    "eslint-plugin-n": "^17.23.1",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-prettier": "^5.5.4",
     "eslint-plugin-regexp": "^2.10.0",
-    "eslint-plugin-unicorn": "^60.0.0",
-    "eslint-plugin-unused-imports": "^4.2.0",
-    "globals": "^16.3.0",
-    "jiti": "^2.5.1",
-    "jsonc-eslint-parser": "^2.4.0",
+    "eslint-plugin-unicorn": "^62.0.0",
+    "eslint-plugin-unused-imports": "^4.3.0",
+    "globals": "^16.5.0",
+    "jiti": "^2.6.1",
+    "jsonc-eslint-parser": "^2.4.2",
     "local-pkg": "^1.1.2",
-    "prettier": "^3.6.2"
+    "prettier": "^3.7.4"
   },
   "devDependencies": {
-    "@types/node": "^24.3.0",
-    "@unocss/eslint-plugin": "^66.4.2",
-    "bumpp": "^10.2.3",
-    "eslint-plugin-vue": "^10.4.0",
+    "@types/node": "^25.0.2",
+    "@unocss/eslint-plugin": "^66.5.10",
+    "bumpp": "^10.3.2",
+    "eslint-plugin-vue": "^10.6.2",
     "eslint-typegen": "^2.3.0",
-    "lint-staged": "^16.1.5",
+    "lint-staged": "^16.2.7",
     "simple-git-hooks": "^2.13.1",
-    "tsdown": "^0.14.1",
-    "typescript": "^5.9.2",
-    "typescript-eslint": "^8.40.0"
+    "tsdown": "^0.17.4",
+    "typescript": "^5.9.3",
+    "typescript-eslint": "^8.49.0"
   },
   "simple-git-hooks": {
     "pre-commit": "pnpm lint-staged"