@vp-tw/eslint-config 0.1.6 → 1.0.2

package/README.md

@@ -10,7 +10,8 @@ ViPro's ESLint configuration.
   - [@tanstack/eslint-plugin-query](https://www.npmjs.com/package/@tanstack/eslint-plugin-query)
   - [eslint-mdx](https://github.com/mdx-js/eslint-mdx)
   - [eslint-plugin-storybook](https://github.com/storybookjs/eslint-plugin-storybook)
-  - [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier)
+  - [eslint-plugin-svelte](https://github.com/sveltejs/eslint-plugin-svelte)
+  - [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) - disables formatting rules to work with any formatter (Prettier, oxfmt, etc.)
 - Fine-tuned to provide an opinionated, optimal DX. Please copy the VSCode settings from [eslint-config.code-workspace](https://github.com/VdustR/eslint-config/blob/main/eslint-config.code-workspace).
 
 Check [here](https://vdustr.dev/eslint-config) to preview the ESLint inspection.
@@ -23,7 +24,7 @@ pnpm i -D eslint @antfu/eslint-config @vp-tw/eslint-config
 
 ## Usage
 
-Simlar to [antfu/eslint-config](https://github.com/antfu/eslint-config) but with additional options:
+Similar to [antfu/eslint-config](https://github.com/antfu/eslint-config) but with additional options:
 
 ```ts
 // eslint.config.ts
@@ -35,25 +36,55 @@ import path from "pathe";
 
 const __filename = fileURLToPath(import.meta.url);
 const __dirname = path.dirname(__filename);
-const prettierignorePath = path.resolve(__dirname, ".prettierignore");
+const eslintignorePath = path.resolve(__dirname, ".eslintignore");
 
 export default vdustr(
   {
     // By default, we disable `stylistic` and use `prettier` instead.
     // stylistic: false,
 
-    // Defaults
-    packageJson: true,
-    emotion: false,
-    tanstackQuery: false,
-    mdx: false,
-    storybook: false,
-    prettier: true,
+    // Options (defaults shown)
+    react: false, // Enable React support with eslint-react strict-typescript rules
+    svelte: false, // Enable Svelte support
+    packageJson: true, // Enable package.json linting
+    emotion: false, // Enable Emotion CSS-in-JS linting
+    tanstackQuery: false, // Enable TanStack Query linting
+    mdx: false, // Enable MDX linting
+    storybook: false, // Enable Storybook linting
+    prettier: true, // Enable eslint-config-prettier to disable formatting rules
+
+    // Extends options for fine-grained control
+    extends: {
+      react: {
+        typescript: true, // Use strict-typescript rules (default: true)
+      },
+    },
   },
-  includeIgnoreFile(prettierignorePath),
+  includeIgnoreFile(eslintignorePath),
 );
 ```
 
+## Features
+
+### React Support
+
+When `react: true`, this config uses `@eslint-react/eslint-plugin` with `strict-typescript` rules by default. You can disable TypeScript-specific rules:
+
+```ts
+export default vdustr({
+  react: true,
+  extends: {
+    react: {
+      typescript: false, // Use strict rules instead of strict-typescript
+    },
+  },
+});
+```
+
+### pnpm Workspace Sorting
+
+Automatically sorts keys in `pnpm-workspace.yaml` alphabetically using `yaml/sort-keys` rule.
+
 ## Release
 
 ```bash

package/dist/configs/packageJson.js

@@ -18,7 +18,10 @@ const packageJson = async options => {
   };
   const packageJsonRulesConfig = (0, _mergeConfig.mergeConfig)(options?.packageJson, {
     ...(0, _esToolkit.omit)(recommended, ["name", "plugins"]),
-    rules: (0, _renameRules.renameRules)(recommended.rules),
+    rules: (0, _renameRules.renameRules)({
+      ...recommended.rules,
+      "package-json/order-properties": "off"
+    }),
     name: "vdustr/package-json/rules"
   });
   return [packageJsonSetupConfig, packageJsonRulesConfig];

package/dist/configs/tanstackQuery.js

@@ -10,13 +10,15 @@ var _mergeConfig = require("../utils/mergeConfig");
 const tanstackQuery = async options => {
   await (0, _eslintConfig.ensurePackages)(["@tanstack/eslint-plugin-query"]);
   const tanstackQueryPlugin = await (0, _eslintConfig.interopDefault)(Promise.resolve().then(() => require("@tanstack/eslint-plugin-query")));
-  const recommended = tanstackQueryPlugin.configs["flat/recommended"];
+  const recommendedConfigs = tanstackQueryPlugin.configs["flat/recommended"];
+  const setupConfig = recommendedConfigs[0];
+  if (!setupConfig) throw new Error("Failed to load @tanstack/eslint-plugin-query recommended config.");
   const tanstackQuerySetupConfig = {
-    ...(0, _esToolkit.pick)(recommended[0], ["plugins"]),
+    ...(0, _esToolkit.pick)(setupConfig, ["plugins"]),
     name: "vdustr/tanstack-query/setup"
   };
   const tanstackQueryRulesConfig = (0, _mergeConfig.mergeConfig)(options?.tanstackQuery, {
-    ...recommended[0],
+    ...setupConfig,
     name: "vdustr/tanstack-query/rules"
   });
   return [tanstackQuerySetupConfig, tanstackQueryRulesConfig];

package/dist/eslint-typegen.d.ts

@@ -181,5 +181,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/emotion/setup' | 'vdustr/emotion/rules' | 'vdustr/tanstack-query/setup' | 'vdustr/tanstack-query/rules' | 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/javascript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/react/md/rules' | 'vdustr/typescript/rules' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = 'vdustr/emotion/setup' | 'vdustr/emotion/rules' | 'vdustr/tanstack-query/setup' | 'vdustr/tanstack-query/rules' | 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/react/md/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/pnpm/pnpm-workspace-yaml-sort' | 'vdustr/yaml/rules'
   

package/dist/esm/configs/mdx.mjs

@@ -1,16 +1,8 @@
-import {
-  ensurePackages,
-  GLOB_MARKDOWN,
-  interopDefault
-} from "@antfu/eslint-config";
+import { ensurePackages, GLOB_MARKDOWN, interopDefault } from "@antfu/eslint-config";
 import { omit, pick } from "es-toolkit";
 import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
-const mdx = async ({
-  codeBlocks = true,
-  processorOptions,
-  ...options
-} = {}) => {
+const mdx = async ({ codeBlocks = true, processorOptions, ...options } = {}) => {
   await ensurePackages(["eslint-plugin-mdx"]);
   const mdxPlugin = await interopDefault(await import("eslint-plugin-mdx"));
   const codeBlocksOptions = typeof codeBlocks !== "object" ? {} : codeBlocks;

package/dist/esm/configs/packageJson.mjs

@@ -4,9 +4,7 @@ import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const packageJson = async (options) => {
   await ensurePackages(["eslint-plugin-package-json"]);
-  const packageJson2 = await interopDefault(
-    import("eslint-plugin-package-json")
-  );
+  const packageJson2 = await interopDefault(import("eslint-plugin-package-json"));
   const recommended = packageJson2.configs.recommended;
   const packageJsonSetupConfig = {
     plugins: recommended.plugins,
@@ -14,7 +12,10 @@ const packageJson = async (options) => {
   };
   const packageJsonRulesConfig = mergeConfig(options?.packageJson, {
     ...omit(recommended, ["name", "plugins"]),
-    rules: renameRules(recommended.rules),
+    rules: renameRules({
+      ...recommended.rules,
+      "package-json/order-properties": "off"
+    }),
     name: "vdustr/package-json/rules"
   });
   return [packageJsonSetupConfig, packageJsonRulesConfig];

package/dist/esm/configs/prettier.mjs

@@ -3,9 +3,7 @@ import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const prettier = async (options) => {
   await ensurePackages(["eslint-config-prettier"]);
-  const eslintConfigPrettier = await interopDefault(
-    import("eslint-config-prettier")
-  );
+  const eslintConfigPrettier = await interopDefault(import("eslint-config-prettier"));
   const rulesConfig = mergeConfig(options?.prettier, {
     ...eslintConfigPrettier,
     rules: renameRules(eslintConfigPrettier.rules),

package/dist/esm/configs/storybook.mjs

@@ -4,9 +4,7 @@ import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 const storybook = async (options) => {
   await ensurePackages(["eslint-plugin-storybook", "storybook"]);
-  const storybookPlugin = await interopDefault(
-    import("eslint-plugin-storybook")
-  );
+  const storybookPlugin = await interopDefault(import("eslint-plugin-storybook"));
   const inheritingConfigs = storybookPlugin.configs["flat/csf-strict"];
   const originalSetupConfig = inheritingConfigs[0];
   const originalStoryRulesConfig = inheritingConfigs[1];
@@ -52,10 +50,6 @@ const storybook = async (options) => {
       rules: renameRules(originalMainRulesConfig.rules ?? {})
     }
   );
-  return [
-    setupConfig,
-    storyRulesConfig,
-    mainRulesConfig
-  ];
+  return [setupConfig, storyRulesConfig, mainRulesConfig];
 };
 export { storybook };

package/dist/esm/configs/tanstackQuery.mjs

@@ -3,16 +3,17 @@ import { pick } from "es-toolkit";
 import { mergeConfig } from "../utils/mergeConfig.mjs";
 const tanstackQuery = async (options) => {
   await ensurePackages(["@tanstack/eslint-plugin-query"]);
-  const tanstackQueryPlugin = await interopDefault(
-    import("@tanstack/eslint-plugin-query")
-  );
-  const recommended = tanstackQueryPlugin.configs["flat/recommended"];
+  const tanstackQueryPlugin = await interopDefault(import("@tanstack/eslint-plugin-query"));
+  const recommendedConfigs = tanstackQueryPlugin.configs["flat/recommended"];
+  const setupConfig = recommendedConfigs[0];
+  if (!setupConfig)
+    throw new Error("Failed to load @tanstack/eslint-plugin-query recommended config.");
   const tanstackQuerySetupConfig = {
-    ...pick(recommended[0], ["plugins"]),
+    ...pick(setupConfig, ["plugins"]),
     name: "vdustr/tanstack-query/setup"
   };
   const tanstackQueryRulesConfig = mergeConfig(options?.tanstackQuery, {
-    ...recommended[0],
+    ...setupConfig,
     name: "vdustr/tanstack-query/rules"
   });
   return [tanstackQuerySetupConfig, tanstackQueryRulesConfig];

package/dist/esm/eslint-typegen.d.ts

@@ -181,5 +181,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = 'vdustr/emotion/setup' | 'vdustr/emotion/rules' | 'vdustr/tanstack-query/setup' | 'vdustr/tanstack-query/rules' | 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/javascript/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/react/md/rules' | 'vdustr/typescript/rules' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = 'vdustr/emotion/setup' | 'vdustr/emotion/rules' | 'vdustr/tanstack-query/setup' | 'vdustr/tanstack-query/rules' | 'vdustr/mdx/setup' | 'vdustr/mdx/processor' | 'vdustr/mdx/rules' | 'vdustr/mdx/code-blocks' | 'vdustr/prettier/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/stroybook/setup' | 'vdustr/storybook/stories/rules' | 'vdustr/storybook/main/rules' | 'vdustr/javascript/rules' | 'vdustr/imports/rules' | 'vdustr/imports/no-default-export/rules' | 'vdustr/typescript/rules' | 'vdustr/react/rules' | 'vdustr/react/react-compiler/setup' | 'vdustr/react/react-compiler/rules' | 'vdustr/react/md/rules' | 'vdustr/jsonc/rules' | 'vdustr/sort/json-keys' | 'vdustr/sort/json-array-values' | 'vdustr/sort/tsconfig-json' | 'vdustr/pnpm/pnpm-workspace-yaml-sort' | 'vdustr/yaml/rules'
   

package/dist/esm/extends/_utils.d.ts

@@ -1,2 +1,2 @@
-declare const ignoreKeys: ("plugins" | "name" | "processor" | "rules")[];
+declare const ignoreKeys: ("plugins" | "rules" | "name" | "processor")[];
 export { ignoreKeys };

package/dist/esm/extends/imports.mjs

@@ -13,10 +13,7 @@ import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const imports = (composer, options) => {
   extendsConfig(composer, "antfu/imports/rules", (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options?.imports ?? {}, ["files", "ignores"]),
-      config
-    );
+    const modifiedConfig = mergeConfig(pick(options?.imports ?? {}, ["files", "ignores"]), config);
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
       omit(options?.imports ?? {}, ["files", "ignores"]),

package/dist/esm/extends/pnpm.d.ts

@@ -0,0 +1,8 @@
+import type { ConfigOverrides, VpComposer } from "../types";
+declare namespace pnpm {
+    interface Options {
+        pnpm?: ConfigOverrides;
+    }
+}
+declare const pnpm: (composer: VpComposer, options?: pnpm.Options) => void;
+export { pnpm };

package/dist/esm/extends/pnpm.mjs

@@ -0,0 +1,33 @@
+import { omit, pick } from "es-toolkit";
+import { GLOB_PNPM_WORKSPACE_YAML } from "../globs.mjs";
+import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
+import { ignoreKeys } from "./_utils.mjs";
+const pnpm = (composer, options) => {
+  extendsConfig(composer, "antfu/pnpm/pnpm-workspace-yaml-sort", (config) => {
+    const modifiedConfig = mergeConfig(pick(options?.pnpm ?? {}, ["files", "ignores"]), {
+      ...config,
+      files: [GLOB_PNPM_WORKSPACE_YAML]
+    });
+    const omittedConfig = omit(modifiedConfig, ignoreKeys);
+    const sortKeysConfig = mergeConfig(options?.pnpm, {
+      ...omittedConfig,
+      name: "vdustr/pnpm/pnpm-workspace-yaml-sort",
+      rules: {
+        "yaml/sort-keys": [
+          "error",
+          {
+            pathPattern: ".*",
+            order: {
+              type: "asc",
+              caseSensitive: false,
+              natural: true
+            }
+          }
+        ]
+      }
+    });
+    return [modifiedConfig, sortKeysConfig];
+  });
+};
+export { pnpm };

package/dist/esm/extends/react.d.ts

@@ -6,6 +6,7 @@ declare namespace react {
         reactCompiler?: reactCompiler.Options["reactCompiler"];
         reactCompilerSetup?: reactCompiler.Options["setup"];
         md?: ConfigOverrides;
+        typescript?: boolean;
     }
 }
 declare const react: (composer: VpComposer, options?: react.Options) => void;

package/dist/esm/extends/react.mjs

@@ -1,33 +1,56 @@
 import { GLOB_MARKDOWN_CODE } from "@antfu/eslint-config";
+import eslintReact from "@eslint-react/eslint-plugin";
 import { omit, pick } from "es-toolkit";
 import { reactCompiler } from "../configs/reactCompiler.mjs";
 import { GLOB_MDX_CODE } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
 import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
+const reactRulesRenameMap = {
+  "@eslint-react": "react",
+  "@eslint-react/dom": "react-dom",
+  "@eslint-react/hooks-extra": "react-hooks-extra",
+  "@eslint-react/naming-convention": "react-naming-convention",
+  "@eslint-react/web-api": "react-web-api"
+};
+function renameReactRules(rules) {
+  return Object.fromEntries(
+    Object.entries(rules).map(([key, value]) => {
+      const namespaceArray = key.split("/");
+      const namespace = namespaceArray.slice(0, -1).join("/");
+      if (namespace in reactRulesRenameMap) {
+        const newNamespace = reactRulesRenameMap[namespace];
+        if (newNamespace) {
+          const newKey = key.replace(namespace, newNamespace);
+          return [newKey, value];
+        }
+      }
+      return [key, value];
+    })
+  );
+}
 const react = (composer, options) => {
+  const typescriptEnabled = options?.typescript ?? true;
   extendsConfig(composer, "antfu/react/rules", async (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options?.react ?? {}, ["files", "ignores"]),
-      config
-    );
+    const modifiedConfig = mergeConfig(pick(options?.react ?? {}, ["files", "ignores"]), config);
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
+    const baseConfig = typescriptEnabled ? eslintReact.configs["strict-typescript"] : eslintReact.configs.strict;
     const rulesConfig = mergeConfig(
       omit(options?.react ?? {}, ["files", "ignores"]),
       {
+        // plugins already setup by antfu
+        ...omit(baseConfig, ["plugins"]),
         name: "vdustr/react/rules",
-        rules: {
+        rules: renameReactRules({
+          ...baseConfig.rules,
           "react/prefer-destructuring-assignment": "off"
-        }
+        })
       },
       omittedConfig
     );
     const reactCompilerConfigs = await reactCompiler({
       setup: options?.reactCompilerSetup ?? {},
-      reactCompiler: mergeConfig(
-        options?.reactCompiler,
-        pick(omittedConfig, ["files", "ignores"])
-      )
+      reactCompiler: mergeConfig(options?.reactCompiler, pick(omittedConfig, ["files", "ignores"]))
     });
     const mdConfig = mergeConfig(
       {

package/dist/esm/extends/sort.mjs

@@ -43,10 +43,7 @@ const sortJsonKeys = async (composer, options) => {
 };
 const sortPackageJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/package-json", (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options ?? {}, ["files", "ignores"]),
-      config
-    );
+    const modifiedConfig = mergeConfig(pick(options ?? {}, ["files", "ignores"]), config);
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
       options,
@@ -64,10 +61,7 @@ const sortPackageJson = async (composer, options) => {
 };
 const sortTsconfigJson = async (composer, options) => {
   extendsConfig(composer, "antfu/sort/tsconfig-json", (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options ?? {}, ["files", "ignores"]),
-      config
-    );
+    const modifiedConfig = mergeConfig(pick(options ?? {}, ["files", "ignores"]), config);
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
       options,

package/dist/esm/extends/yaml.d.ts

@@ -2,7 +2,6 @@ import type { ConfigOverrides, VpComposer } from "../types";
 declare namespace yaml {
     interface Options {
         yaml?: ConfigOverrides;
-        sortKeys?: ConfigOverrides;
     }
 }
 declare const yaml: (composer: VpComposer, options?: yaml.Options) => void;

package/dist/esm/extends/yaml.mjs

@@ -1,16 +1,12 @@
 import { omit, pick } from "es-toolkit";
 import eslintPluginYml from "eslint-plugin-yml";
-import { GLOB_PNPM_WORKSPACE_YAML } from "../globs.mjs";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
 import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { renameRules } from "../utils/renameRules.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const yaml = (composer, options) => {
   extendsConfig(composer, "antfu/yaml/rules", (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options?.yaml ?? {}, ["files", "ignores"]),
-      config
-    );
+    const modifiedConfig = mergeConfig(pick(options?.yaml ?? {}, ["files", "ignores"]), config);
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
     const rulesConfig = mergeConfig(
       omit(options?.yaml ?? {}, ["files", "ignores"]),
@@ -31,33 +27,5 @@ const yaml = (composer, options) => {
     );
     return [modifiedConfig, rulesConfig];
   });
-  extendsConfig(composer, "antfu/yaml/pnpm-workspace", (config) => {
-    const modifiedConfig = mergeConfig(
-      pick(options?.yaml ?? {}, ["files", "ignores"]),
-      {
-        ...config,
-        files: [GLOB_PNPM_WORKSPACE_YAML]
-      }
-    );
-    const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const sortKeysConfig = mergeConfig(options?.sortKeys, {
-      ...omittedConfig,
-      name: "vdustr/yaml/sort-keys/rules",
-      rules: {
-        "yaml/sort-keys": [
-          "error",
-          {
-            pathPattern: ".*",
-            order: {
-              type: "asc",
-              caseSensitive: false,
-              natural: true
-            }
-          }
-        ]
-      }
-    });
-    return [config, sortKeysConfig];
-  });
 };
 export { yaml };

package/dist/esm/lib/eslint-plugin-react-compiler.mjs

@@ -1,9 +1,7 @@
 import { ensurePackages, interopDefault } from "@antfu/eslint-config";
 const reactCompiler = async () => {
   await ensurePackages(["eslint-plugin-react-compiler"]);
-  const reactCompiler2 = await interopDefault(
-    import("eslint-plugin-react-compiler")
-  );
+  const reactCompiler2 = await interopDefault(import("eslint-plugin-react-compiler"));
   return reactCompiler2;
 };
 export { reactCompiler };

package/dist/esm/utils/extendsConfig.d.ts

@@ -4,14 +4,16 @@ import type { Arrayable, Awaitable, DefaultConfigNamesMap, FlatConfigComposer, S
  * <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L492-L512>
  */
 declare function getConfigIndex(configs: Array<Linter.Config>, nameOrIndex: string | number): number;
+declare const tryGetConfigIndex: typeof getConfigIndex;
 /**
  * <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L91>
  */
 type Operation<T extends object = Linter.Config> = (items: Array<T>) => Promise<Array<T>>;
+declare const pushOverations: <T extends object = Linter.Config, ConfigNames extends string = keyof DefaultConfigNamesMap>(composer: FlatConfigComposer<T, ConfigNames>, operations: Array<Operation<T>>) => void;
 declare function extendsConfigInternal<T extends object = Linter.Config, ConfigNames extends string = keyof DefaultConfigNamesMap>(composer: FlatConfigComposer<T, ConfigNames>, sourceOrIndex: StringLiteralUnion<ConfigNames, string | number>, config: Awaitable<Arrayable<T>> | ((config: T) => Awaitable<Arrayable<T>>)): void;
 declare const extendsConfig: typeof extendsConfigInternal & {
     getConfigIndex: typeof getConfigIndex;
-    tryGetConfigIndex: typeof getConfigIndex;
-    pushOverations: <T extends object = Linter.Config<Linter.RulesRecord>, ConfigNames extends string = never>(composer: FlatConfigComposer<T, ConfigNames>, operations: Array<Operation<T>>) => void;
+    tryGetConfigIndex: typeof tryGetConfigIndex;
+    pushOverations: typeof pushOverations;
 };
 export { extendsConfig };

package/dist/esm/vdustr.d.ts

@@ -10,6 +10,7 @@ import { tanstackQuery } from "./configs/tanstackQuery";
 import { imports } from "./extends/imports";
 import { javascript } from "./extends/javascript";
 import { jsonc } from "./extends/jsonc";
+import { pnpm } from "./extends/pnpm";
 import { react } from "./extends/react";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
@@ -22,6 +23,7 @@ type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<t
         sort?: sort.Options;
         yaml?: yaml.Options;
         react?: react.Options;
+        pnpm?: pnpm.Options;
     };
     packageJson?: boolean | packageJson.Options;
     emotion?: boolean | emotion.Options;

package/dist/esm/vdustr.mjs

@@ -9,6 +9,7 @@ import { tanstackQuery } from "./configs/tanstackQuery.mjs";
 import { imports } from "./extends/imports.mjs";
 import { javascript } from "./extends/javascript.mjs";
 import { jsonc } from "./extends/jsonc.mjs";
+import { pnpm } from "./extends/pnpm.mjs";
 import { react } from "./extends/react.mjs";
 import {
   sortJsonArrayValues,
@@ -35,9 +36,7 @@ const vdustr = (options, ...userConfigs) => {
   const vpOptions = pick(options ?? {}, ownedConfigNames);
   const packageJsonEnabled = Boolean(vpOptions?.packageJson ?? true);
   const emotionEnabled = Boolean(vpOptions?.emotion ?? false);
-  const tanstackQueryEnabled = Boolean(
-    vpOptions?.tanstackQuery ?? false
-  );
+  const tanstackQueryEnabled = Boolean(vpOptions?.tanstackQuery ?? false);
   const mdxEnabled = Boolean(vpOptions?.mdx ?? false);
   const storybookEnabled = Boolean(vpOptions?.storybook ?? false);
   const prettierEnabled = Boolean(vpOptions?.prettier ?? true);
@@ -52,44 +51,34 @@ const vdustr = (options, ...userConfigs) => {
   imports(config, vpOptions?.extends?.imports);
   typescript(config, vpOptions?.extends?.typescript);
   jsonc(config, vpOptions?.extends?.jsonc);
-  if (packageJsonEnabled)
-    sortPackageJson(config, vpOptions?.extends?.sort?.packageJson);
+  if (packageJsonEnabled) sortPackageJson(config, vpOptions?.extends?.sort?.packageJson);
   sortTsconfigJson(config, vpOptions?.extends?.sort?.tsconfigJson);
   sortJsonKeys(config, vpOptions?.extends?.sort?.jsoncSortKeys);
   sortJsonArrayValues(config, vpOptions?.extends?.sort?.jsoncSortArrayValues);
   yaml(config, vpOptions?.extends?.yaml);
   react(config, vpOptions?.extends?.react);
+  pnpm(config, vpOptions?.extends?.pnpm);
   if (packageJsonEnabled) {
     const packageJsonOptions = typeof vpOptions?.packageJson !== "object" ? void 0 : vpOptions.packageJson;
-    config = config.append(
-      packageJson(...!packageJsonOptions ? [] : [packageJsonOptions])
-    );
+    config = config.append(packageJson(...!packageJsonOptions ? [] : [packageJsonOptions]));
   }
   if (emotionEnabled) {
     const emotionOptions = typeof vpOptions?.emotion !== "object" ? void 0 : vpOptions.emotion;
-    config = config.append(
-      emotion(...!emotionOptions ? [] : [emotionOptions])
-    );
+    config = config.append(emotion(...!emotionOptions ? [] : [emotionOptions]));
   }
   if (tanstackQueryEnabled) {
     const tanstackQueryOptions = typeof vpOptions?.tanstackQuery !== "object" ? void 0 : vpOptions.tanstackQuery;
-    config = config.append(
-      tanstackQuery(...!tanstackQueryOptions ? [] : [tanstackQueryOptions])
-    );
+    config = config.append(tanstackQuery(...!tanstackQueryOptions ? [] : [tanstackQueryOptions]));
   }
   if (storybookEnabled) {
     const storybookOptions = typeof vpOptions?.storybook !== "object" ? void 0 : vpOptions.storybook;
-    config = config.append(
-      storybook(...!storybookOptions ? [] : [storybookOptions])
-    );
+    config = config.append(storybook(...!storybookOptions ? [] : [storybookOptions]));
   }
   if (mdxEnabled) {
     const mdxOptions = {
       ...typeof vpOptions?.mdx !== "object" ? null : vpOptions.mdx
     };
-    const mdxFlatCodeBlocksEnabled = Boolean(
-      mdxOptions?.codeBlocks ?? true
-    );
+    const mdxFlatCodeBlocksEnabled = Boolean(mdxOptions?.codeBlocks ?? true);
     const mdxFlatCodeBlocksOptions = {
       ...typeof mdxOptions?.codeBlocks !== "object" ? null : mdxOptions.codeBlocks
     };
@@ -102,9 +91,7 @@ const vdustr = (options, ...userConfigs) => {
   }
   if (prettierEnabled) {
     const prettierOptions = typeof vpOptions?.prettier !== "object" ? void 0 : vpOptions.prettier;
-    config = config.append(
-      prettier(...!prettierOptions ? [] : [prettierOptions])
-    );
+    config = config.append(prettier(...!prettierOptions ? [] : [prettierOptions]));
   }
   config.append(...userConfigs);
   return config;

package/dist/extends/_utils.d.ts

@@ -1,2 +1,2 @@
-declare const ignoreKeys: ("plugins" | "name" | "processor" | "rules")[];
+declare const ignoreKeys: ("plugins" | "rules" | "name" | "processor")[];
 export { ignoreKeys };

package/dist/extends/pnpm.d.ts

@@ -0,0 +1,8 @@
+import type { ConfigOverrides, VpComposer } from "../types";
+declare namespace pnpm {
+    interface Options {
+        pnpm?: ConfigOverrides;
+    }
+}
+declare const pnpm: (composer: VpComposer, options?: pnpm.Options) => void;
+export { pnpm };

package/dist/extends/pnpm.js

@@ -0,0 +1,36 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.pnpm = void 0;
+var _esToolkit = require("es-toolkit");
+var _globs = require("../globs");
+var _extendsConfig = require("../utils/extendsConfig");
+var _mergeConfig = require("../utils/mergeConfig");
+var _utils = require("./_utils");
+const pnpm = (composer, options) => {
+  (0, _extendsConfig.extendsConfig)(composer, "antfu/pnpm/pnpm-workspace-yaml-sort", config => {
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.pnpm ?? {}, ["files", "ignores"]), {
+      ...config,
+      files: [_globs.GLOB_PNPM_WORKSPACE_YAML]
+    });
+    const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
+    const sortKeysConfig = (0, _mergeConfig.mergeConfig)(options?.pnpm, {
+      ...omittedConfig,
+      name: "vdustr/pnpm/pnpm-workspace-yaml-sort",
+      rules: {
+        "yaml/sort-keys": ["error", {
+          pathPattern: ".*",
+          order: {
+            type: "asc",
+            caseSensitive: false,
+            natural: true
+          }
+        }]
+      }
+    });
+    return [modifiedConfig, sortKeysConfig];
+  });
+};
+exports.pnpm = pnpm;

package/dist/extends/react.d.ts

@@ -6,6 +6,7 @@ declare namespace react {
         reactCompiler?: reactCompiler.Options["reactCompiler"];
         reactCompilerSetup?: reactCompiler.Options["setup"];
         md?: ConfigOverrides;
+        typescript?: boolean;
     }
 }
 declare const react: (composer: VpComposer, options?: react.Options) => void;

package/dist/extends/react.js

@@ -5,21 +5,49 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.react = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
+var _eslintPlugin = _interopRequireDefault(require("@eslint-react/eslint-plugin"));
 var _esToolkit = require("es-toolkit");
 var _reactCompiler = require("../configs/reactCompiler");
 var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
 var _mergeConfig = require("../utils/mergeConfig");
 var _utils = require("./_utils");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
+const reactRulesRenameMap = {
+  "@eslint-react": "react",
+  "@eslint-react/dom": "react-dom",
+  "@eslint-react/hooks-extra": "react-hooks-extra",
+  "@eslint-react/naming-convention": "react-naming-convention",
+  "@eslint-react/web-api": "react-web-api"
+};
+function renameReactRules(rules) {
+  return Object.fromEntries(Object.entries(rules).map(([key, value]) => {
+    const namespaceArray = key.split("/");
+    const namespace = namespaceArray.slice(0, -1).join("/");
+    if (namespace in reactRulesRenameMap) {
+      const newNamespace = reactRulesRenameMap[namespace];
+      if (newNamespace) {
+        const newKey = key.replace(namespace, newNamespace);
+        return [newKey, value];
+      }
+    }
+    return [key, value];
+  }));
+}
 const react = (composer, options) => {
+  const typescriptEnabled = options?.typescript ?? true;
   (0, _extendsConfig.extendsConfig)(composer, "antfu/react/rules", async config => {
     const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.react ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
+    const baseConfig = typescriptEnabled ? _eslintPlugin.default.configs["strict-typescript"] : _eslintPlugin.default.configs.strict;
     const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
+      // plugins already setup by antfu
+      ...(0, _esToolkit.omit)(baseConfig, ["plugins"]),
       name: "vdustr/react/rules",
-      rules: {
+      rules: renameReactRules({
+        ...baseConfig.rules,
         "react/prefer-destructuring-assignment": "off"
-      }
+      })
     }, omittedConfig);
     const reactCompilerConfigs = await (0, _reactCompiler.reactCompiler)({
       setup: options?.reactCompilerSetup ?? {},

package/dist/extends/yaml.d.ts

@@ -2,7 +2,6 @@ import type { ConfigOverrides, VpComposer } from "../types";
 declare namespace yaml {
     interface Options {
         yaml?: ConfigOverrides;
-        sortKeys?: ConfigOverrides;
     }
 }
 declare const yaml: (composer: VpComposer, options?: yaml.Options) => void;

package/dist/extends/yaml.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.yaml = void 0;
 var _esToolkit = require("es-toolkit");
 var _eslintPluginYml = _interopRequireDefault(require("eslint-plugin-yml"));
-var _globs = require("../globs");
 var _extendsConfig = require("../utils/extendsConfig");
 var _mergeConfig = require("../utils/mergeConfig");
 var _renameRules = require("../utils/renameRules");
@@ -24,27 +23,5 @@ const yaml = (composer, options) => {
     }, omittedConfig);
     return [modifiedConfig, rulesConfig];
   });
-  (0, _extendsConfig.extendsConfig)(composer, "antfu/yaml/pnpm-workspace", config => {
-    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.yaml ?? {}, ["files", "ignores"]), {
-      ...config,
-      files: [_globs.GLOB_PNPM_WORKSPACE_YAML]
-    });
-    const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const sortKeysConfig = (0, _mergeConfig.mergeConfig)(options?.sortKeys, {
-      ...omittedConfig,
-      name: "vdustr/yaml/sort-keys/rules",
-      rules: {
-        "yaml/sort-keys": ["error", {
-          pathPattern: ".*",
-          order: {
-            type: "asc",
-            caseSensitive: false,
-            natural: true
-          }
-        }]
-      }
-    });
-    return [config, sortKeysConfig];
-  });
 };
 exports.yaml = yaml;

package/dist/utils/extendsConfig.d.ts

@@ -4,14 +4,16 @@ import type { Arrayable, Awaitable, DefaultConfigNamesMap, FlatConfigComposer, S
  * <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L492-L512>
  */
 declare function getConfigIndex(configs: Array<Linter.Config>, nameOrIndex: string | number): number;
+declare const tryGetConfigIndex: typeof getConfigIndex;
 /**
  * <https://github.com/antfu/eslint-flat-config-utils/blob/ac3a9b4/src/composer.ts#L91>
  */
 type Operation<T extends object = Linter.Config> = (items: Array<T>) => Promise<Array<T>>;
+declare const pushOverations: <T extends object = Linter.Config, ConfigNames extends string = keyof DefaultConfigNamesMap>(composer: FlatConfigComposer<T, ConfigNames>, operations: Array<Operation<T>>) => void;
 declare function extendsConfigInternal<T extends object = Linter.Config, ConfigNames extends string = keyof DefaultConfigNamesMap>(composer: FlatConfigComposer<T, ConfigNames>, sourceOrIndex: StringLiteralUnion<ConfigNames, string | number>, config: Awaitable<Arrayable<T>> | ((config: T) => Awaitable<Arrayable<T>>)): void;
 declare const extendsConfig: typeof extendsConfigInternal & {
     getConfigIndex: typeof getConfigIndex;
-    tryGetConfigIndex: typeof getConfigIndex;
-    pushOverations: <T extends object = Linter.Config<Linter.RulesRecord>, ConfigNames extends string = never>(composer: FlatConfigComposer<T, ConfigNames>, operations: Array<Operation<T>>) => void;
+    tryGetConfigIndex: typeof tryGetConfigIndex;
+    pushOverations: typeof pushOverations;
 };
 export { extendsConfig };

package/dist/vdustr.d.ts

@@ -10,6 +10,7 @@ import { tanstackQuery } from "./configs/tanstackQuery";
 import { imports } from "./extends/imports";
 import { javascript } from "./extends/javascript";
 import { jsonc } from "./extends/jsonc";
+import { pnpm } from "./extends/pnpm";
 import { react } from "./extends/react";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
@@ -22,6 +23,7 @@ type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<t
         sort?: sort.Options;
         yaml?: yaml.Options;
         react?: react.Options;
+        pnpm?: pnpm.Options;
     };
     packageJson?: boolean | packageJson.Options;
     emotion?: boolean | emotion.Options;

package/dist/vdustr.js

@@ -15,6 +15,7 @@ var _tanstackQuery = require("./configs/tanstackQuery");
 var _imports = require("./extends/imports");
 var _javascript = require("./extends/javascript");
 var _jsonc = require("./extends/jsonc");
+var _pnpm = require("./extends/pnpm");
 var _react = require("./extends/react");
 var _sort = require("./extends/sort");
 var _typescript = require("./extends/typescript");
@@ -47,6 +48,7 @@ const vdustr = (options, ...userConfigs) => {
   (0, _sort.sortJsonArrayValues)(config, vpOptions?.extends?.sort?.jsoncSortArrayValues);
   (0, _yaml.yaml)(config, vpOptions?.extends?.yaml);
   (0, _react.react)(config, vpOptions?.extends?.react);
+  (0, _pnpm.pnpm)(config, vpOptions?.extends?.pnpm);
   if (packageJsonEnabled) {
     const packageJsonOptions = typeof vpOptions?.packageJson !== "object" ? void 0 : vpOptions.packageJson;
     config = config.append((0, _packageJson.packageJson)(...(!packageJsonOptions ? [] : [packageJsonOptions])));

package/package.json

@@ -1,13 +1,20 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.1.6",
+  "version": "1.0.2",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
+  "license": "MIT",
   "author": {
     "name": "ViPro",
     "url": "https://vdustr.dev"
   },
+  "files": [
+    "dist"
+  ],
   "type": "module",
+  "main": "./dist/index.js",
+  "module": "./dist/esm/index.mjs",
+  "types": "./dist/index.d.ts",
   "exports": {
     ".": {
       "import": {
@@ -33,35 +40,44 @@
     "./package": "./package.json",
     "./package.json": "./package.json"
   },
-  "main": "./dist/index.js",
-  "module": "./dist/esm/index.mjs",
-  "types": "./dist/index.d.ts",
-  "files": [
-    "dist"
-  ],
+  "publishConfig": {
+    "access": "public"
+  },
   "dependencies": {
     "@mui/types": "^7.4.2",
-    "es-toolkit": "^1.39.7",
-    "eslint-flat-config-utils": "^2.1.0",
-    "local-pkg": "^1.1.1"
+    "@typescript-eslint/utils": "^8.54.0",
+    "es-toolkit": "^1.44.0",
+    "eslint-flat-config-utils": "^3.0.0",
+    "local-pkg": "^1.1.2"
   },
   "devDependencies": {
+    "@antfu/eslint-config": "^7.2.0",
+    "@emotion/eslint-plugin": "^11.12.0",
+    "@tanstack/eslint-plugin-query": "^5.91.3",
+    "@types/eslint-config-prettier": "^6.11.3",
+    "eslint": "^9.39.2",
+    "eslint-config-prettier": "^10.1.8",
+    "eslint-plugin-mdx": "^3.6.2",
+    "eslint-plugin-package-json": "^0.88.2",
+    "eslint-plugin-react-compiler": "19.1.0-rc.2",
+    "eslint-plugin-storybook": "^10.2.1",
+    "eslint-plugin-yml": "^3.0.0",
     "eslint-typegen": "^2.2.0",
+    "storybook": "^10.2.1",
     "unbuild": "^3.5.0"
   },
   "peerDependencies": {
-    "@antfu/eslint-config": "^4.17.0",
     "@emotion/eslint-plugin": "^11.12.0",
-    "@tanstack/eslint-plugin-query": "^5.81.2",
+    "@tanstack/eslint-plugin-query": "^5.91.3",
     "@types/eslint-config-prettier": "^6.11.3",
-    "eslint": "^9.31.0",
+    "eslint": "^9.39.2",
     "eslint-config-prettier": "^10.1.8",
     "eslint-plugin-mdx": "^3.6.2",
-    "eslint-plugin-package-json": "^0.40.5",
+    "eslint-plugin-package-json": "^0.88.2",
     "eslint-plugin-react-compiler": "19.1.0-rc.2",
-    "eslint-plugin-storybook": "^9.0.17",
-    "eslint-plugin-yml": "^1.18.0",
-    "storybook": "^9.0.17"
+    "eslint-plugin-storybook": "^10.2.1",
+    "eslint-plugin-yml": "^3.0.0",
+    "storybook": "^10.2.1"
   },
   "peerDependenciesMeta": {
     "@emotion/eslint-plugin": {
@@ -95,9 +111,6 @@
       "optional": true
     }
   },
-  "publishConfig": {
-    "access": "public"
-  },
   "scripts": {
     "build": "unbuild",
     "copy": "tsx scripts/copy",