@so1ve/eslint-config 3.7.0 → 3.8.1

package/dist/index.js

@@ -312,9 +312,11 @@ async function formatting(options) {
 //#endregion
 //#region src/configs/html.ts
 async function html() {
-	const parserHtml = await interopDefault(import("@html-eslint/parser"));
-	const pluginHtml = await interopDefault(import("@html-eslint/eslint-plugin"));
-	const pluginHtmlJsSupport = await interopDefault(import("eslint-plugin-html"));
+	const [parserHtml, pluginHtml, pluginHtmlJsSupport] = await Promise.all([
+		interopDefault(import("@html-eslint/parser")),
+		interopDefault(import("@html-eslint/eslint-plugin")),
+		interopDefault(import("eslint-plugin-html"))
+	]);
 	return [{
 		name: "so1ve/html/setup",
 		plugins: {
@@ -401,12 +403,9 @@ const imports = (options = {}) => [
 			"import/no-mutable-exports": "error",
 			"import/no-useless-path-segments": ["error", { noUselessIndex: true }],
 			"import/no-named-as-default": "error",
-			"import/no-unresolved": "off",
-			"import/no-absolute-path": "off",
 			"import/no-duplicates": "error",
 			"import/no-named-default": "error",
-			"import/no-webpack-loader-syntax": "error",
-			"import/no-named-as-default-member": "off"
+			"import/no-webpack-loader-syntax": "error"
 		}
 	},
 	{
@@ -759,8 +758,7 @@ async function javascript({ overrides } = {}) {
 //#endregion
 //#region src/configs/jsonc.ts
 async function jsonc() {
-	const parserJsonc = await interopDefault(import("jsonc-eslint-parser"));
-	const pluginJsonc = await interopDefault(import("eslint-plugin-jsonc"));
+	const [parserJsonc, pluginJsonc] = await Promise.all([interopDefault(import("jsonc-eslint-parser")), interopDefault(import("eslint-plugin-jsonc"))]);
 	return [{
 		name: "so1ve/jsonc/setup",
 		plugins: { jsonc: pluginJsonc }
@@ -846,6 +844,33 @@ const onlyError = () => [{
 	plugins: { "only-error": pluginOnlyError }
 }];
 
+//#endregion
+//#region src/configs/pnpm.ts
+async function pnpm() {
+	const [pluginPnpm, yamlParser, jsoncParser] = await Promise.all([
+		interopDefault(import("eslint-plugin-pnpm")),
+		interopDefault(import("yaml-eslint-parser")),
+		interopDefault(import("jsonc-eslint-parser"))
+	]);
+	return [{
+		files: ["package.json", "**/package.json"],
+		languageOptions: { parser: jsoncParser },
+		name: "so1ve/pnpm/package-json",
+		plugins: { pnpm: pluginPnpm },
+		rules: {
+			"pnpm/json-enforce-catalog": "error",
+			"pnpm/json-prefer-workspace-settings": "error",
+			"pnpm/json-valid-catalog": "error"
+		}
+	}, {
+		files: ["pnpm-workspace.yaml"],
+		languageOptions: { parser: yamlParser },
+		name: "so1ve/pnpm/pnpm-workspace-yaml",
+		plugins: { pnpm: pluginPnpm },
+		rules: { "pnpm/yaml-no-unused-catalog-item": "error" }
+	}];
+}
+
 //#endregion
 //#region src/configs/promise.ts
 const promise = () => [{
@@ -893,9 +918,11 @@ const sortImports = () => [{
 //#endregion
 //#region src/configs/test.ts
 async function test({ overrides } = {}) {
-	const pluginNoOnlyTests = await interopDefault(import("eslint-plugin-no-only-tests"));
-	const pluginVitest = await interopDefault(import("@vitest/eslint-plugin"));
-	const pluginJestFormatting = await interopDefault(import("eslint-plugin-jest-formatting"));
+	const [pluginNoOnlyTests, pluginVitest, pluginJestFormatting] = await Promise.all([
+		interopDefault(import("eslint-plugin-no-only-tests")),
+		interopDefault(import("@vitest/eslint-plugin")),
+		interopDefault(import("eslint-plugin-jest-formatting"))
+	]);
 	return [{
 		name: "so1ve/test/setup",
 		plugins: {
@@ -933,8 +960,7 @@ async function test({ overrides } = {}) {
 //#endregion
 //#region src/configs/toml.ts
 async function toml({ overrides } = {}) {
-	const parserToml = await interopDefault(import("toml-eslint-parser"));
-	const pluginToml = await interopDefault(import("eslint-plugin-toml"));
+	const [parserToml, pluginToml] = await Promise.all([interopDefault(import("toml-eslint-parser")), interopDefault(import("eslint-plugin-toml"))]);
 	return [{
 		name: "so1ve/toml/setup",
 		plugins: { toml: pluginToml }
@@ -1248,8 +1274,7 @@ const unicorn = () => [{
 //#endregion
 //#region src/configs/vue.ts
 async function vue({ overrides, typescript: typescript$1 } = {}) {
-	const parserVue = await interopDefault(import("vue-eslint-parser"));
-	const pluginVue = await interopDefault(import("eslint-plugin-vue"));
+	const [parserVue, pluginVue] = await Promise.all([interopDefault(import("vue-eslint-parser")), interopDefault(import("eslint-plugin-vue"))]);
 	return [{
 		name: "so1ve/vue/setup",
 		plugins: { vue: pluginVue }
@@ -1370,7 +1395,6 @@ async function vue({ overrides, typescript: typescript$1 } = {}) {
 				"table",
 				"time"
 			] }],
-			"vue/camelcase": "error",
 			"vue/v-for-delimiter-style": ["error", "in"],
 			"vue/attributes-order": ["error", {
 				order: [
@@ -1435,8 +1459,7 @@ async function vue({ overrides, typescript: typescript$1 } = {}) {
 //#endregion
 //#region src/configs/yaml.ts
 async function yaml({ overrides } = {}) {
-	const parserYaml = await interopDefault(import("yaml-eslint-parser"));
-	const pluginYaml = await interopDefault(import("eslint-plugin-yml"));
+	const [parserYaml, pluginYaml] = await Promise.all([interopDefault(import("yaml-eslint-parser")), interopDefault(import("eslint-plugin-yml"))]);
 	return [{
 		name: "so1ve/yaml/setup",
 		plugins: { yaml: pluginYaml }
@@ -1484,12 +1507,13 @@ const defaultPluginRenaming = {
 * Construct an array of ESLint flat config items.
 */
 function so1ve(options = {}, ...userConfigs) {
-	const { vue: enableVue = VuePackages.some((i) => isPackageExists(i)), solid: enableSolid = isPackageExists("solid-js"), typescript: enableTypeScript = isPackageExists("typescript"), gitignore: enableGitignore = true, componentExts = [] } = options;
+	const { vue: enableVue = VuePackages.some((i) => isPackageExists(i)), solid: enableSolid = isPackageExists("solid-js"), typescript: enableTypeScript = isPackageExists("typescript"), gitignore: enableGitignore = true, pnpm: enableCatalogs = false, componentExts = [] } = options;
 	const configs = [];
 	if (enableGitignore) if (typeof enableGitignore === "boolean") {
 		if (fs.existsSync(".gitignore")) configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r()]));
 	} else configs.push(interopDefault(import("eslint-config-flat-gitignore")).then((r) => [r(enableGitignore)]));
 	configs.push(ignores(), javascript({ overrides: getOverrides(options, "javascript") }), comments(), node(), onlyError(), promise(), sortImports(), imports(), unicorn());
+	if (enableCatalogs) configs.push(pnpm());
 	if (enableVue) componentExts.push("vue");
 	if (options.html ?? true) configs.push(html());
 	if (enableTypeScript) configs.push(typescript({
@@ -1531,4 +1555,4 @@ function getOverrides(options, key) {
 }
 
 //#endregion
-export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, comments, defaultPluginRenaming, formatting, getOverrides, html, ignores, imports, interopDefault, javascript, jsonc, mdx, node, onlyError, promise, renameRules, resolveSubOptions, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, yaml };
+export { GLOB_ALL_SRC, GLOB_CSS, GLOB_DTS, GLOB_ESLINTRC, GLOB_EXCLUDE, GLOB_HTML, GLOB_JS, GLOB_JSON, GLOB_JSON5, GLOB_JSONC, GLOB_JSX, GLOB_LESS, GLOB_MARKDOWN, GLOB_MARKDOWN_CODE, GLOB_PACKAGEJSON, GLOB_SCSS, GLOB_SRC, GLOB_SRC_EXT, GLOB_STYLE, GLOB_TESTS, GLOB_TOML, GLOB_TS, GLOB_TSCONFIG, GLOB_TSX, GLOB_VUE, GLOB_YAML, comments, defaultPluginRenaming, formatting, getOverrides, html, ignores, imports, interopDefault, javascript, jsonc, mdx, node, onlyError, pnpm, promise, renameRules, resolveSubOptions, so1ve, solid, sortImports, test, toml, typescript, unicorn, vue, yaml };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@so1ve/eslint-config",
-  "version": "3.7.0",
+  "version": "3.8.1",
   "author": "Ray <i@mk1.io> (https://github.com/so1ve/)",
   "type": "module",
   "description": "Ray's eslint config.",
@@ -54,6 +54,7 @@
     "eslint-plugin-no-explicit-type-exports": "^0.12.1",
     "eslint-plugin-no-only-tests": "^3.3.0",
     "eslint-plugin-only-error": "^1.0.2",
+    "eslint-plugin-pnpm": "^1.0.0",
     "eslint-plugin-promise": "^7.2.1",
     "eslint-plugin-regexp": "^2.9.0",
     "eslint-plugin-solid": "^0.14.5",
@@ -69,15 +70,15 @@
     "typescript-eslint": "^8.34.0",
     "vue-eslint-parser": "^10.1.3",
     "yaml-eslint-parser": "^1.3.0",
-    "@so1ve/eslint-plugin-sort-imports": "3.7.0",
-    "@so1ve/eslint-plugin": "3.7.0"
+    "@so1ve/eslint-plugin": "3.8.1",
+    "@so1ve/eslint-plugin-sort-imports": "3.8.1"
   },
   "devDependencies": {
     "@typescript-eslint/utils": "^8.34.0"
   },
   "peerDependencies": {
-    "eslint": ">=8.40.0",
-    "prettier": "^3.0.0"
+    "eslint": "^9",
+    "prettier": "^3"
   },
   "scripts": {
     "build": "tsdown && nr typegen",