@vp-tw/eslint-config 0.0.14 → 0.0.16

package/dist/extends/react.d.ts

@@ -2,7 +2,9 @@ import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
 import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
-    readonly rules: "vdustr/react/rules";
+    readonly react: "vdustr/react/rules";
+    readonly reactCompilerSetup: "vdustr/react/react-compiler/setup";
+    readonly reactCompilerRules: "vdustr/react/react-compiler/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<react.ConfigNamesMapSource> {
@@ -10,12 +12,17 @@ declare module "../types" {
 }
 declare namespace react {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
+    interface Options {
+        react?: ConfigOverrides;
+        reactCompilerSetup?: ConfigOverrides;
+        reactCompilerRules?: ConfigOverrides;
     }
 }
 declare const react: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: react.Options) => void) & {
     configNamesMapSource: {
-        readonly rules: "vdustr/react/rules";
+        readonly react: "vdustr/react/rules";
+        readonly reactCompilerSetup: "vdustr/react/react-compiler/setup";
+        readonly reactCompilerRules: "vdustr/react/react-compiler/rules";
     };
 };
 export { react };

package/dist/extends/react.js

@@ -4,56 +4,41 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.react = void 0;
+var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _eslintPluginReactCompiler = require("../lib/eslint-plugin-react-compiler");
 var _extendsConfig = require("../utils/extendsConfig");
 var _utils = require("./_utils");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const configNamesMapSource = {
-  rules: "vdustr/react/rules"
+  react: "vdustr/react/rules",
+  reactCompilerSetup: "vdustr/react/react-compiler/setup",
+  reactCompilerRules: "vdustr/react/react-compiler/rules"
 };
 const reactInternal = (composer, options) => {
-  (0, _extendsConfig.extendsConfig)(composer, "antfu/react/rules", async config => [config, {
-    /**
-     * Inherited.
-     */
-    ...(0, _esToolkit.omit)(config, _utils.ignoreKeys),
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.rules,
-    plugins: {
-      /**
-       * Inherited.
-       */
-      ...config.plugins,
-      /**
-       * Default.
-       */
-      "react-compiler": await (0, _eslintPluginReactCompiler.reactCompiler)(),
-      /**
-       * Overridable.
-       */
-      ...options?.plugins
-    },
-    /**
-     * Overridable.
-     */
-    ...options,
-    rules: {
-      /**
-       * Default.
-       */
-      "react-compiler/react-compiler": "error",
-      /**
-       * Not all destructuring assignments are more readable than their alternatives.
-       */
-      "react/prefer-destructuring-assignment": "off",
-      /**
-       * Overridable.
-       */
-      ...options?.rules
-    }
-  }]);
+  (0, _extendsConfig.extendsConfig)(composer, "antfu/react/rules", async config => {
+    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.react ?? {}, ["files", "ignores"]), config);
+    const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
+    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
+      name: configNamesMapSource.react,
+      rules: {
+        "react/prefer-destructuring-assignment": "off"
+      }
+    }, omittedConfig);
+    const reactCompilerSetupConfig = (0, _defu.default)(options?.reactCompilerSetup, {
+      name: configNamesMapSource.reactCompilerSetup,
+      plugins: {
+        "react-compiler": await (0, _eslintPluginReactCompiler.reactCompiler)()
+      }
+    });
+    const reactCompilerRulesConfig = (0, _defu.default)(options?.reactCompilerRules, {
+      name: configNamesMapSource.reactCompilerRules,
+      rules: {
+        "react-compiler/react-compiler": "error"
+      }
+    }, omittedConfig);
+    return [modifiedConfig, rulesConfig, reactCompilerSetupConfig, reactCompilerRulesConfig];
+  });
 };
 const react = exports.react = Object.assign(reactInternal, {
   configNamesMapSource

package/dist/extends/typescript.d.ts

@@ -2,7 +2,7 @@ import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
 import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
-    readonly rules: "vdustr/typescript/rules";
+    readonly typescript: "vdustr/typescript/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<typescript.ConfigNamesMapSource> {
@@ -10,12 +10,13 @@ declare module "../types" {
 }
 declare namespace typescript {
     type ConfigNamesMapSource = typeof configNamesMapSource;
-    interface Options extends ConfigOverrides {
+    interface Options {
+        typescript?: ConfigOverrides;
     }
 }
 declare const typescript: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: typescript.Options) => void) & {
     configNamesMapSource: {
-        readonly rules: "vdustr/typescript/rules";
+        readonly typescript: "vdustr/typescript/rules";
     };
 };
 export { typescript };

package/dist/extends/typescript.js

@@ -4,58 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.typescript = void 0;
+var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _extendsConfig = require("../utils/extendsConfig");
 var _utils = require("./_utils");
+function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const configNamesMapSource = {
-  rules: "vdustr/typescript/rules"
+  typescript: "vdustr/typescript/rules"
 };
 const typescriptInternal = (composer, options) => {
-  (0, _extendsConfig.extendsConfig)(composer, "antfu/typescript/rules", config => [config, {
-    /**
-     * Inherited.
-     */
-    ...(0, _esToolkit.omit)(config, _utils.ignoreKeys),
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.rules,
-    /**
-     * Overridable.
-     */
-    ...options,
-    rules: {
-      /**
-       * Default.
-       */
-      /**
-       * Use `Array<T>` instead of `T[]` for better DX.
-       *
-       * - [Array<T> vs T[]: Which is better?](https://www.totaltypescript.com/array-types-in-typescript)
-       * - [Array Types in TypeScript](https://tkdodo.eu/blog/array-types-in-type-script)
-       */
-      "ts/array-type": ["error", {
-        default: "generic"
-      }],
-      /**
-       * Namespaces are useful for centralizing the management of types. Just avoid
-       * overusing them with runtime code.
-       *
-       * - References:
-       *   - <https://x.com/mattpocockuk/status/1805606072167940167>
-       */
-      "ts/no-namespace": "off",
-      "ts/no-redeclare": "off",
-      /**
-       * Check for unused variables in TypeScript.
-       */
-      "ts/no-unused-vars": "off",
-      /**
-       * Overridable.
-       */
-      ...options?.rules
-    }
-  }]);
+  (0, _extendsConfig.extendsConfig)(composer, "antfu/typescript/rules", config => {
+    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.typescript ?? {}, ["files", "ignores"]), config);
+    const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
+    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.typescript ?? {}, ["files", "ignores"]), {
+      name: configNamesMapSource.typescript,
+      rules: {
+        /**
+         * Use `Array<T>` instead of `T[]` for better DX.
+         *
+         * - [Array<T> vs T[]: Which is better?](https://www.totaltypescript.com/array-types-in-typescript)
+         * - [Array Types in TypeScript](https://tkdodo.eu/blog/array-types-in-type-script)
+         */
+        "ts/array-type": ["error", {
+          default: "generic"
+        }],
+        /**
+         * Namespaces are useful for centralizing the management of types. Just avoid
+         * overusing them with runtime code.
+         *
+         * - References:
+         *   - <https://x.com/mattpocockuk/status/1805606072167940167>
+         */
+        "ts/no-namespace": "off",
+        "ts/no-redeclare": "off",
+        /**
+         * Check for unused variables in TypeScript.
+         */
+        "ts/no-unused-vars": "off"
+      }
+    }, omittedConfig);
+    return [modifiedConfig, rulesConfig];
+  });
 };
 const typescript = exports.typescript = Object.assign(typescriptInternal, {
   configNamesMapSource

package/dist/extends/yaml.d.ts

@@ -2,8 +2,8 @@ import type { ConfigNames, TypedFlatConfigItem } from "@antfu/eslint-config";
 import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { ConfigOverrides, ResolveConfigNamesMap } from "../types";
 declare const configNamesMapSource: {
-    readonly rules: "vdustr/yaml/rules";
-    readonly sortKeys: "vdustr/yaml/sortKeys";
+    readonly yaml: "vdustr/yaml/rules";
+    readonly sortKeys: "vdustr/yaml/sort-keys/rules";
 };
 declare module "../types" {
     interface ConfigNamesMap extends ResolveConfigNamesMap<yaml.ConfigNamesMapSource> {
@@ -18,8 +18,8 @@ declare namespace yaml {
 }
 declare const yaml: ((composer: FlatConfigComposer<TypedFlatConfigItem, ConfigNames>, options?: yaml.Options) => void) & {
     configNamesMapSource: {
-        readonly rules: "vdustr/yaml/rules";
-        readonly sortKeys: "vdustr/yaml/sortKeys";
+        readonly yaml: "vdustr/yaml/rules";
+        readonly sortKeys: "vdustr/yaml/sort-keys/rules";
     };
 };
 export { yaml };

package/dist/extends/yaml.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.yaml = void 0;
+var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _eslintPluginYml = _interopRequireDefault(require("eslint-plugin-yml"));
 var _globs = require("../globs");
@@ -12,61 +13,36 @@ var _renameRules = require("../utils/renameRules");
 var _utils = require("./_utils");
 function _interopRequireDefault(e) { return e && e.__esModule ? e : { default: e }; }
 const configNamesMapSource = {
-  rules: "vdustr/yaml/rules",
-  sortKeys: "vdustr/yaml/sortKeys"
+  yaml: "vdustr/yaml/rules",
+  sortKeys: "vdustr/yaml/sort-keys/rules"
 };
 const yamlInternal = (composer, options) => {
-  (0, _extendsConfig.extendsConfig)(composer, "antfu/yaml/rules", config => [config, {
-    /**
-     * Inherited.
-     */
-    ...(0, _esToolkit.omit)(config, _utils.ignoreKeys),
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.rules,
-    /**
-     * Overridable.
-     */
-    ...options,
-    rules: {
-      /**
-       * Inherited from `eslint-plugin-yml`.
-       */
-      ...(0, _renameRules.renameRules)({
+  (0, _extendsConfig.extendsConfig)(composer, "antfu/yaml/rules", config => {
+    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.yaml ?? {}, ["files", "ignores"]), config);
+    const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
+    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.yaml ?? {}, ["files", "ignores"]), {
+      name: configNamesMapSource.yaml,
+      rules: (0, _renameRules.renameRules)({
         ...Object.fromEntries([..._eslintPluginYml.default.configs["flat/recommended"].flatMap(config2 => Object.entries(config2.rules ?? {})), ..._eslintPluginYml.default.configs["flat/prettier"].flatMap(config2 => Object.entries(config2.rules ?? {}))])
-      }),
-      /**
-       * Overridable.
-       */
-      ...options?.yaml?.rules
-    }
-  }, {
-    /**
-     * Inherited.
-     */
-    ...config,
-    /**
-     * Default.
-     */
-    name: configNamesMapSource.sortKeys,
-    /**
-     * Overridable.
-     */
-    ...options?.sortKeys,
-    files: [_globs.GLOB_PNPM_WORKSPACE_YAML, ...(options?.sortKeys?.files ?? [])],
-    rules: {
-      "yaml/sort-keys": ["error", {
-        pathPattern: ".*",
-        order: {
-          type: "asc",
-          caseSensitive: false,
-          natural: true
-        }
-      }],
-      ...options?.sortKeys?.rules
-    }
-  }]);
+      })
+    }, omittedConfig);
+    const sortKeysConfig = (0, _defu.default)(options?.sortKeys, {
+      ...(0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]),
+      name: configNamesMapSource.sortKeys,
+      files: [_globs.GLOB_PNPM_WORKSPACE_YAML],
+      rules: {
+        "yaml/sort-keys": ["error", {
+          pathPattern: ".*",
+          order: {
+            type: "asc",
+            caseSensitive: false,
+            natural: true
+          }
+        }]
+      }
+    });
+    return [modifiedConfig, rulesConfig, sortKeysConfig];
+  });
 };
 const yaml = exports.yaml = Object.assign(yamlInternal, {
   configNamesMapSource

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.14",
+  "version": "0.0.16",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {
@@ -41,19 +41,37 @@
   "dependencies": {
     "@mui/types": "^7.2.21",
     "@types/eslint-config-prettier": "^6.11.3",
+    "defu": "^6.1.4",
     "es-toolkit": "^1.31.0",
     "eslint-config-prettier": "^10.0.1",
     "eslint-flat-config-utils": "^2.0.0",
-    "eslint-plugin-package-json": "^0.21.1",
     "local-pkg": "^1.0.0"
   },
   "devDependencies": {
-    "@antfu/eslint-config": "^4.1.0",
     "eslint-typegen": "^1.0.0",
     "unbuild": "^3.3.1"
   },
   "peerDependencies": {
-    "@antfu/eslint-config": "^4.1.0"
+    "@antfu/eslint-config": "^4.1.0",
+    "eslint": "^9.19.0",
+    "eslint-plugin-mdx": "^3.1.5",
+    "eslint-plugin-package-json": "^0.21.1",
+    "eslint-plugin-react-compiler": "^19.0.0-beta-27714ef-20250124",
+    "eslint-plugin-storybook": "^0.11.2"
+  },
+  "peerDependenciesMeta": {
+    "eslint-mdx": {
+      "optional": true
+    },
+    "eslint-plugin-package-json": {
+      "optional": true
+    },
+    "eslint-plugin-react-compiler": {
+      "optional": true
+    },
+    "eslint-plugin-storybook": {
+      "optional": true
+    }
   },
   "publishConfig": {
     "access": "public"