@kitql/eslint-config 0.5.8 → 0.6.0

package/.prettierrc.mjs

@@ -24,7 +24,8 @@ const config = {
 		'^(\\$env)(.*)$', // special sveltekit
 		'^(\\$app)(.*)$', // special sveltekit
 		'',
-		'^(@app/common)(.*)$', // Aliases
+		'^(\\$server)(.*)$', // special firstly
+		'^(\\$modules)(.*)$', // special firstly
 		'^(\\$)(.*)$', // Aliases
 		'',
 		'^[./]', // inside

package/eslint.config.js

@@ -1,19 +1,22 @@
 import { includeIgnoreFile } from '@eslint/compat'
 import js from '@eslint/js'
-import pnpmCatalogs from 'eslint-plugin-pnpm-catalogs'
+import pluginPnpm from 'eslint-plugin-pnpm'
 import svelte from 'eslint-plugin-svelte'
 import unusedImports from 'eslint-plugin-unused-imports'
 import globals from 'globals'
 import * as jsoncParser from 'jsonc-eslint-parser'
 import ts from 'typescript-eslint'
+import * as yamlParser from 'yaml-eslint-parser'
 
 import { findFileOrUp } from './helper/findFileOrUp.js'
 
 /**
  * @typedef {Object} PnpmCatalogsConfig
  * @property {boolean} [enable=true] - Whether to enable pnpm catalogs rules
- * @property {string[]} [files] - Files to apply the rules to
- * @property {Record<string, string>} [rules] - Rules configuration
+ * @property {string[]} [json_files] - Files to apply the rules to
+ * @property {Record<string, any>} [json_rules] - Rules configuration
+ * @property {string[]} [yaml_files] - Files to apply the rules to
+ * @property {Record<string, any>} [yaml_rules] - Rules configuration
  */
 
 const rulePrettierIgnore = ({ pnpmCatalogsEnabled = true }) => {
@@ -34,26 +37,47 @@ const rulePrettierIgnore = ({ pnpmCatalogsEnabled = true }) => {
 const rulePnpmCatalogs = (options = {}) => {
 	const {
 		enable = true,
-		files = ['package.json', '**/package.json'],
-		rules = {
-			'pnpm-catalogs/enforce-catalog': 'error',
-			'pnpm-catalogs/valid-catalog': 'error',
+		json_files = ['package.json', '**/package.json'],
+		json_rules = {
+			'pnpm/json-enforce-catalog': 'error',
+			'pnpm/json-valid-catalog': 'error',
+			'pnpm/json-prefer-workspace-settings': 'error',
+			...options.json_rules,
+		},
+		yaml_files = ['pnpm-workspace.yaml'],
+		yaml_rules = {
+			'pnpm/yaml-no-unused-catalog-item': 'error',
+			'pnpm/yaml-no-duplicate-catalog-item': 'off',
+			...options.yaml_rules,
 		},
 	} = options
 
-	if (!enable) return null
+	if (!enable) return []
 
-	return {
-		name: 'pnpm-catalogs:package.json',
-		files,
-		languageOptions: {
-			parser: jsoncParser,
+	return [
+		{
+			name: 'pnpm/package.json',
+			files: json_files,
+			languageOptions: {
+				parser: jsoncParser,
+			},
+			plugins: {
+				pnpm: pluginPnpm,
+			},
+			rules: json_rules,
 		},
-		plugins: {
-			'pnpm-catalogs': pnpmCatalogs,
+		{
+			name: 'pnpm/pnpm-workspace-yaml',
+			files: yaml_files,
+			languageOptions: {
+				parser: yamlParser,
+			},
+			plugins: {
+				pnpm: pluginPnpm,
+			},
+			rules: yaml_rules,
 		},
-		rules,
-	}
+	]
 }
 
 const othersRules = () => {
@@ -144,7 +168,7 @@ const config = [
 	//
 	rulePrettierIgnore({ pnpmCatalogsEnabled: true }),
 	...othersRules(),
-	rulePnpmCatalogs(),
+	...rulePnpmCatalogs(),
 ]
 
 export default config
@@ -166,6 +190,6 @@ export const kitql = (options = {}) => {
 		//
 		rulePrettierIgnore({ pnpmCatalogsEnabled }),
 		...othersRules(),
-		...(pnpmCatalogsEnabled ? [rulePnpmCatalogs(pnpmCatalogsConfig)] : []),
+		...(pnpmCatalogsEnabled ? rulePnpmCatalogs(pnpmCatalogsConfig) : []),
 	]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kitql/eslint-config",
-  "version": "0.5.8",
+  "version": "0.6.0",
   "type": "module",
   "description": "opinionated linting and formatting for projects",
   "repository": {
@@ -27,6 +27,9 @@
     "eslint",
     "eslint-config"
   ],
+  "peerDependencies": {
+    "prettier": "^3.5.3"
+  },
   "dependencies": {
     "@eslint/compat": "1.2.7",
     "@eslint/js": "9.22.0",
@@ -35,16 +38,17 @@
     "@typescript-eslint/parser": "8.26.0",
     "commander": "13.1.0",
     "eslint": "9.22.0",
-    "eslint-plugin-pnpm-catalogs": "0.1.0",
-    "eslint-plugin-svelte": "3.0.3",
+    "eslint-plugin-pnpm": "0.3.1",
+    "eslint-plugin-svelte": "3.3.0",
     "eslint-plugin-unused-imports": "4.1.4",
     "globals": "16.0.0",
     "jsonc-eslint-parser": "2.4.0",
     "ora": "8.2.0",
-    "prettier": "3.5.3",
+    "prettier": "^3.5.3",
     "prettier-plugin-svelte": "3.3.2",
     "prettier-plugin-tailwindcss": "0.6.6",
     "typescript-eslint": "8.26.0",
+    "yaml-eslint-parser": "1.3.0",
     "@kitql/helpers": "0.8.12"
   },
   "publishConfig": {