@vp-tw/eslint-config 0.0.22 → 0.0.24

package/dist/esm/extends/sort.mjs

@@ -0,0 +1,100 @@
+import { omit, pick } from "es-toolkit";
+import { GLOB_CSPELL_JSON } from "../globs.mjs";
+import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
+import { ignoreKeys } from "./_utils.mjs";
+const defaultSortJsonKeys = [
+  "error",
+  {
+    pathPattern: ".*",
+    order: {
+      type: "asc",
+      caseSensitive: false,
+      natural: true
+    }
+  }
+];
+const defaultSortJsonArrayValues = [
+  "error",
+  {
+    pathPattern: ".*",
+    order: {
+      type: "asc",
+      caseSensitive: false,
+      natural: true
+    }
+  }
+];
+const sortJsonKeys = async (composer, options) => {
+  extendsConfig(composer, "vdustr/jsonc/rules", async (config) => {
+    const omittedConfig = omit(config, ignoreKeys);
+    const rulesConfig = mergeConfig(
+      options?.sortKeys,
+      {
+        name: "vdustr/sort/json-keys",
+        rules: {
+          "jsonc/sort-keys": defaultSortJsonKeys
+        }
+      },
+      omittedConfig
+    );
+    return [config, rulesConfig];
+  });
+};
+const sortPackageJson = async (composer, options) => {
+  extendsConfig(composer, "antfu/sort/package-json", (config) => {
+    const modifiedConfig = mergeConfig(
+      pick(options?.packageJson ?? {}, ["files", "ignores"]),
+      config
+    );
+    const omittedConfig = omit(modifiedConfig, ignoreKeys);
+    const rulesConfig = mergeConfig(
+      options?.packageJson ?? {},
+      {
+        name: "vdustr/sort/package-json",
+        rules: {
+          "jsonc/sort-array-values": "off",
+          "jsonc/sort-keys": "off"
+        }
+      },
+      omittedConfig
+    );
+    return [modifiedConfig, rulesConfig];
+  });
+};
+const sortTsconfigJson = async (composer, options) => {
+  extendsConfig(composer, "antfu/sort/tsconfig-json", (config) => {
+    const modifiedConfig = mergeConfig(
+      pick(options?.tsconfigJson ?? {}, ["files", "ignores"]),
+      config
+    );
+    const omittedConfig = omit(modifiedConfig, ignoreKeys);
+    const rulesConfig = mergeConfig(
+      options?.tsconfigJson,
+      {
+        name: "vdustr/sort/tsconfig-json",
+        rules: {
+          "jsonc/sort-keys": defaultSortJsonKeys
+        }
+      },
+      omittedConfig
+    );
+    return [modifiedConfig, rulesConfig];
+  });
+};
+const sortJsonArrayValues = async (composer, options) => {
+  extendsConfig(composer, "vdustr/sort/json-keys", async (config) => {
+    const sortArrayValuesConfig = mergeConfig(
+      options?.sortJsonArrayValues,
+      {
+        name: "vdustr/sort/json-array-values",
+        files: [GLOB_CSPELL_JSON],
+        rules: {
+          "jsonc/sort-array-values": defaultSortJsonArrayValues
+        }
+      }
+    );
+    return [config, sortArrayValuesConfig];
+  });
+};
+export { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson };

package/dist/esm/extends/typescript.mjs

@@ -1,12 +1,15 @@
-import defu from "defu";
 import { omit, pick } from "es-toolkit";
 import { extendsConfig } from "../utils/extendsConfig.mjs";
+import { mergeConfig } from "../utils/mergeConfig.mjs";
 import { ignoreKeys } from "./_utils.mjs";
 const typescript = (composer, options) => {
   extendsConfig(composer, "antfu/typescript/rules", (config) => {
-    const modifiedConfig = defu(pick(options?.typescript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.typescript ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.typescript ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/typescript/rules",

package/dist/esm/extends/yaml.mjs

@@ -1,15 +1,18 @@
-import defu from "defu";
 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 = defu(pick(options?.yaml ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = mergeConfig(
+      pick(options?.yaml ?? {}, ["files", "ignores"]),
+      config
+    );
     const omittedConfig = omit(modifiedConfig, ignoreKeys);
-    const rulesConfig = defu(
+    const rulesConfig = mergeConfig(
       omit(options?.yaml ?? {}, ["files", "ignores"]),
       {
         name: "vdustr/yaml/rules",
@@ -26,7 +29,7 @@ const yaml = (composer, options) => {
       },
       omittedConfig
     );
-    const sortKeysConfig = defu(options?.sortKeys, {
+    const sortKeysConfig = mergeConfig(options?.sortKeys, {
       ...omit(omittedConfig, ["files", "ignores"]),
       name: "vdustr/yaml/sort-keys/rules",
       files: [GLOB_PNPM_WORKSPACE_YAML],

package/dist/esm/globs.d.ts

@@ -3,4 +3,5 @@ declare const GLOB_PACKAGE_JSON: string;
 declare const GLOB_PNPM_WORKSPACE_YAML: string;
 declare const GLOB_CSPELL_JSON: string;
 declare const GLOB_CONFIG_JS: string;
-export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, };
+declare const GLOB_VITEST_WORKSPACE: string;
+export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_VITEST_WORKSPACE, };

package/dist/esm/globs.mjs

@@ -3,10 +3,12 @@ const GLOB_PACKAGE_JSON = "**/package.json";
 const GLOB_PNPM_WORKSPACE_YAML = "**/pnpm-workspace.y?(a)ml";
 const GLOB_CSPELL_JSON = "**/cspell.json";
 const GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";
 export {
   GLOB_CODE_WORKSPACE,
   GLOB_CONFIG_JS,
   GLOB_CSPELL_JSON,
   GLOB_PACKAGE_JSON,
-  GLOB_PNPM_WORKSPACE_YAML
+  GLOB_PNPM_WORKSPACE_YAML,
+  GLOB_VITEST_WORKSPACE
 };

package/dist/esm/types.d.ts

@@ -1,6 +1,6 @@
 import type antfu from "@antfu/eslint-config";
 import type { ConfigNames as AntfuEslintConfigNames, Rules as AntfuEslintRules } from "@antfu/eslint-config";
-import type { DistributiveOmit } from "@mui/types";
+import type { DistributiveOmit, Overwrite } from "@mui/types";
 import type { Linter } from "eslint";
 import type { FlatConfigComposer } from "eslint-flat-config-utils";
 import type { RuleOptions, ConfigNames as VpEslintConfigNames } from "./eslint-typegen";
@@ -18,10 +18,16 @@ type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
 type TypedFlatConfigItem = Omit<Linter.Config<Linter.RulesRecord & Rules>, "plugins"> & {
     plugins?: Record<string, any>;
 };
-interface ConfigOverrides extends DistributiveOmit<TypedFlatConfigItem, "process"> {
+type Files = TypedFlatConfigItem["files"];
+type Ignores = TypedFlatConfigItem["ignores"];
+type Mutables<T> = T | ((config: T) => T);
+interface ConfigOverrides extends Overwrite<DistributiveOmit<TypedFlatConfigItem, "process">, {
+    files?: Mutables<Files>;
+    ignores?: Mutables<Ignores>;
+}> {
 }
 /**
  * Typed composer.
  */
 type VpComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
-export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, TypedFlatConfigItem, VpComposer, };
+export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, Rules, TypedFlatConfigItem, VpComposer, };

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

@@ -1,4 +1,17 @@
 import type { Linter } from "eslint";
 import type { Arrayable, Awaitable, DefaultConfigNamesMap, FlatConfigComposer, StringLiteralUnion } from "eslint-flat-config-utils";
-declare function extendsConfig<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>>), remove?: Arrayable<StringLiteralUnion<ConfigNames, string | number>>): void;
+/**
+ * <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;
+/**
+ * <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 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;
+};
 export { extendsConfig };

package/dist/esm/utils/extendsConfig.mjs

@@ -28,29 +28,26 @@ const tryGetConfigIndex = (configs, nameOrIndex) => {
     return -1;
   }
 };
-function extendsConfig(composer, sourceOrIndex, config, remove) {
-  const operations = (
-    // @ts-expect-error -- Hijacking the composer's operations.
-    composer._operations
-  );
-  operations.push(async (items) => {
-    const removingTargets = (() => {
-      if (!remove) return [];
-      const removeSources = Array.isArray(remove) ? remove : [remove];
-      return removeSources.flatMap((removeSource) => {
-        const index2 = tryGetConfigIndex(items, removeSource);
-        return index2 === -1 ? [] : [index2];
-      });
-    })();
-    items = removingTargets.length === 0 ? items : items.filter((_, index2) => !removingTargets.includes(index2));
-    const index = tryGetConfigIndex(items, sourceOrIndex);
-    const source = items[index];
-    if (!source) return items;
-    const newConfigs = await (async () => {
-      const awaited = typeof config === "function" ? await config(source) : await config;
-      return Array.isArray(awaited) ? awaited : [awaited];
-    })();
-    return [...items.slice(0, index), ...newConfigs, ...items.slice(index + 1)];
-  });
+const pushOverations = (composer, operations) => {
+  composer._operations.push(...operations);
+};
+function extendsConfigInternal(composer, sourceOrIndex, config) {
+  pushOverations(composer, [
+    async (items) => {
+      const index = tryGetConfigIndex(items, sourceOrIndex);
+      const source = items[index];
+      if (!source) return items;
+      const newConfigs = await (async () => {
+        const awaited = typeof config === "function" ? await config(source) : await config;
+        return Array.isArray(awaited) ? awaited : [awaited];
+      })();
+      return items.toSpliced(index, 1, ...newConfigs);
+    }
+  ]);
 }
+const extendsConfig = Object.assign(extendsConfigInternal, {
+  getConfigIndex,
+  tryGetConfigIndex,
+  pushOverations
+});
 export { extendsConfig };

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

@@ -0,0 +1,3 @@
+import type { ConfigOverrides, TypedFlatConfigItem } from "../types";
+declare function mergeConfig(source?: ConfigOverrides, ...[def, ...defs]: [TypedFlatConfigItem, ...Array<TypedFlatConfigItem>]): TypedFlatConfigItem;
+export { mergeConfig };

package/dist/esm/utils/mergeConfig.mjs

@@ -0,0 +1,56 @@
+import { omit } from "es-toolkit";
+const objectMergeKeys = ["rules", "plugins"];
+const mutableMergeKeys = ["files", "ignores"];
+function mergeConfig(source, ...[def, ...defs]) {
+  const reversedDefs = [def, ...defs].toReversed();
+  const mergedDef = {
+    ...Object.fromEntries(reversedDefs.flatMap((def2) => Object.entries(def2))),
+    ...Object.fromEntries(
+      objectMergeKeys.flatMap((key) => {
+        if (reversedDefs.every((def2) => !(key in def2))) return [];
+        const values = Object.fromEntries(
+          reversedDefs.flatMap((def2) => Object.entries(def2[key] ?? {}))
+        );
+        return [[key, values]];
+      })
+    )
+  };
+  if (!source) return mergedDef;
+  const merged = {
+    ...omit(mergedDef, [...objectMergeKeys, ...mutableMergeKeys]),
+    ...omit(source, [...objectMergeKeys, ...mutableMergeKeys]),
+    ...Object.fromEntries(
+      objectMergeKeys.flatMap((key) => {
+        if (!(key in source) && !(key in mergedDef)) return [];
+        return [
+          [
+            key,
+            {
+              ...mergedDef[key],
+              ...source[key]
+            }
+          ]
+        ];
+      })
+    ),
+    ...Object.fromEntries(
+      mutableMergeKeys.flatMap((key) => {
+        if (!(key in source) && !(key in mergedDef)) return [];
+        if (!(key in source)) return [[key, mergedDef[key]]];
+        const sourceValue = source[key];
+        if (sourceValue === void 0) return [];
+        if (typeof sourceValue === "function") {
+          const value = sourceValue(
+            // @ts-expect-error -- typeof files and ignores are different.
+            mergedDef[key]
+          );
+          if (value === void 0) return [];
+          return [[key, value]];
+        }
+        return [[key, sourceValue]];
+      })
+    )
+  };
+  return merged;
+}
+export { mergeConfig };

package/dist/esm/vdustr.d.ts

@@ -1,21 +1,30 @@
 import type { Config, ReplaceAntfuEslintRulesWithVpRulesDeeply, VpComposer } from "./types";
 import antfu from "@antfu/eslint-config";
 import { mdx } from "./configs/mdx";
+import { packageJson } from "./configs/packageJson";
 import { prettier } from "./configs/prettier";
 import { storybook } from "./configs/storybook";
 import { imports } from "./extends/imports";
 import { javascript } from "./extends/javascript";
 import { jsonc } from "./extends/jsonc";
 import { react } from "./extends/react";
+import { sortJsonArrayValues, sortJsonKeys, sortPackageJson, sortTsconfigJson } from "./extends/sort";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
 type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[0]>> & {
-    javascriptExtends?: javascript.Options;
-    importsExtends?: imports.Options;
-    typescriptExtends?: typescript.Options;
-    jsoncExtends?: jsonc.Options;
-    yamlExtends?: yaml.Options;
-    reactExtends?: react.Options;
+    extends?: {
+        javascript?: javascript.Options;
+        imports?: imports.Options;
+        typescript?: typescript.Options;
+        jsonc?: jsonc.Options;
+        sortPackageJson?: sortPackageJson.Options;
+        sortTsConfigJson?: sortTsconfigJson.Options;
+        sortJsonKeys?: sortJsonKeys.Options;
+        sortJsonArrayValues?: sortJsonArrayValues.Options;
+        yaml?: yaml.Options;
+        react?: react.Options;
+    };
+    packageJson?: boolean | packageJson.Options;
     mdx?: boolean | mdx.Options;
     storybook?: boolean | storybook.Options;
     prettier?: boolean | prettier.Options;

package/dist/esm/vdustr.mjs

@@ -1,36 +1,71 @@
 import antfu from "@antfu/eslint-config";
+import { omit, pick } from "es-toolkit";
 import { mdx } from "./configs/mdx.mjs";
+import { packageJson } from "./configs/packageJson.mjs";
 import { prettier } from "./configs/prettier.mjs";
 import { storybook } from "./configs/storybook.mjs";
 import { imports } from "./extends/imports.mjs";
 import { javascript } from "./extends/javascript.mjs";
 import { jsonc } from "./extends/jsonc.mjs";
 import { react } from "./extends/react.mjs";
+import {
+  sortJsonArrayValues,
+  sortJsonKeys,
+  sortPackageJson,
+  sortTsconfigJson
+} from "./extends/sort.mjs";
 import { typescript } from "./extends/typescript.mjs";
 import { yaml } from "./extends/yaml.mjs";
+const ownedConfigNames = [
+  "extends",
+  "packageJson",
+  "mdx",
+  "storybook",
+  "prettier"
+];
 const vdustr = (options, ...userConfigs) => {
+  const antfuOptions = omit(
+    options ?? {},
+    ownedConfigNames
+  );
+  const vpOptions = pick(options ?? {}, ownedConfigNames);
+  const packageJsonEnabled = Boolean(vpOptions?.packageJson ?? true);
+  const storybookEnabled = Boolean(vpOptions?.storybook ?? false);
+  const mdxEnabled = Boolean(vpOptions?.mdx ?? false);
+  const prettierEnabled = Boolean(vpOptions?.prettier ?? true);
   let config = antfu({
-    // Use `prettier` for formatting by default.
-    stylistic: false,
-    ...options
+    ...antfuOptions,
+    ...!prettierEnabled ? null : {
+      // Forcibly disable style rules if prettier is enabled.
+      stylistic: false
+    }
   });
-  javascript(config, options?.javascriptExtends);
-  imports(config, options?.importsExtends);
-  typescript(config, options?.typescriptExtends);
-  jsonc(config, options?.jsoncExtends);
-  yaml(config, options?.yamlExtends);
-  react(config, options?.reactExtends);
-  const storybookEnabled = Boolean(options?.storybook ?? false);
+  javascript(config, vpOptions?.extends?.javascript);
+  imports(config, vpOptions?.extends?.imports);
+  typescript(config, vpOptions?.extends?.typescript);
+  jsonc(config, vpOptions?.extends?.jsonc);
+  if (packageJsonEnabled)
+    sortPackageJson(config, vpOptions?.extends?.sortPackageJson);
+  sortTsconfigJson(config, vpOptions?.extends?.sortTsConfigJson);
+  sortJsonKeys(config, vpOptions?.extends?.sortJsonKeys);
+  sortJsonArrayValues(config, vpOptions?.extends?.sortJsonArrayValues);
+  yaml(config, vpOptions?.extends?.yaml);
+  react(config, vpOptions?.extends?.react);
+  if (packageJsonEnabled) {
+    const packageJsonOptions = typeof vpOptions?.packageJson !== "object" ? void 0 : vpOptions.packageJson;
+    config = config.append(
+      packageJson(...!packageJsonOptions ? [] : [packageJsonOptions])
+    );
+  }
   if (storybookEnabled) {
-    const storybookOptions = typeof options?.storybook !== "object" ? void 0 : options.storybook;
+    const storybookOptions = typeof vpOptions?.storybook !== "object" ? void 0 : vpOptions.storybook;
     config = config.append(
       storybook(...!storybookOptions ? [] : [storybookOptions])
     );
   }
-  const mdxEnabled = Boolean(options?.mdx ?? false);
   if (mdxEnabled) {
     const mdxOptions = {
-      ...typeof options?.mdx !== "object" ? null : options.mdx
+      ...typeof vpOptions?.mdx !== "object" ? null : vpOptions.mdx
     };
     const mdxFlatCodeBlocksEnabled = Boolean(
       mdxOptions?.codeBlocks ?? true
@@ -45,9 +80,8 @@ const vdustr = (options, ...userConfigs) => {
       })
     );
   }
-  const prettierEnabled = Boolean(options?.prettier ?? true);
   if (prettierEnabled) {
-    const prettierOptions = typeof options?.prettier !== "object" ? void 0 : options.prettier;
+    const prettierOptions = typeof vpOptions?.prettier !== "object" ? void 0 : vpOptions.prettier;
     config = config.append(
       prettier(...!prettierOptions ? [] : [prettierOptions])
     );

package/dist/extends/imports.js

@@ -5,17 +5,16 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.imports = void 0;
 var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 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 imports = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/imports/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.imports ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.imports ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.imports ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.imports ?? {}, ["files", "ignores"]), {
       name: "vdustr/imports/rules",
       rules: {
         /**
@@ -29,7 +28,7 @@ const imports = (composer, options) => {
         "import/no-namespace": "error"
       }
     }, omittedConfig);
-    const noDefaultExportConfig = (0, _defu.default)(options?.noDefaultExport, {
+    const noDefaultExportConfig = (0, _mergeConfig.mergeConfig)(options?.noDefaultExport, {
       name: "vdustr/imports/no-default-export/rules",
       rules: {
         /**
@@ -40,10 +39,10 @@ const imports = (composer, options) => {
          */
         "import/no-default-export": "error"
       },
-      files: [_eslintConfig.GLOB_JS, _eslintConfig.GLOB_JSX, _eslintConfig.GLOB_TS, _eslintConfig.GLOB_TSX, ...(options?.noDefaultExport?.files || [])],
+      files: [_eslintConfig.GLOB_JS, _eslintConfig.GLOB_JSX, _eslintConfig.GLOB_TS, _eslintConfig.GLOB_TSX],
       ignores: [
       // Configuration files
-      _globs.GLOB_CONFIG_JS, _eslintConfig.GLOB_MARKDOWN_CODE, _eslintConfig.GLOB_ASTRO_TS, ...(options?.noDefaultExport?.ignores || [])]
+      _globs.GLOB_CONFIG_JS, _eslintConfig.GLOB_MARKDOWN_CODE, _eslintConfig.GLOB_ASTRO_TS, _globs.GLOB_VITEST_WORKSPACE]
     }, (0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]));
     return [modifiedConfig, rulesConfig, noDefaultExportConfig];
   });

package/dist/extends/javascript.js

@@ -4,16 +4,15 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.javascript = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 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 javascript = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/javascript/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.javascript ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.javascript ?? {}, ["files", "ignores"]), config);
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.javascript ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.javascript ?? {}, ["files", "ignores"]), {
       name: "vdustr/javascript/rules",
       rules: {
         /**

package/dist/extends/jsonc.d.ts

@@ -2,8 +2,6 @@ import type { ConfigOverrides, VpComposer } from "../types";
 declare namespace jsonc {
     interface Options {
         jsonc?: ConfigOverrides;
-        sortArrayValues?: ConfigOverrides;
-        packageJson?: ConfigOverrides;
     }
 }
 declare const jsonc: (composer: VpComposer, options?: jsonc.Options) => Promise<void>;

package/dist/extends/jsonc.js

@@ -4,61 +4,26 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.jsonc = void 0;
-var _eslintConfig = require("@antfu/eslint-config");
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 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 jsonc = async (composer, options) => {
-  await (0, _eslintConfig.ensurePackages)(["eslint-plugin-package-json"]);
-  const packageJson = await (0, _eslintConfig.interopDefault)(Promise.resolve().then(() => require("eslint-plugin-package-json/configs/recommended")));
   (0, _extendsConfig.extendsConfig)(composer, "antfu/jsonc/rules", config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.jsonc ?? {}, ["files", "ignores"]), config, {
-      files: [_globs.GLOB_CODE_WORKSPACE],
-      ignores: [_globs.GLOB_PACKAGE_JSON]
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.pick)(options?.jsonc ?? {}, ["files", "ignores"]), config, {
+      files: [_globs.GLOB_CODE_WORKSPACE]
     });
     const omittedConfig = (0, _esToolkit.omit)(modifiedConfig, _utils.ignoreKeys);
-    const rulesConfig = (0, _defu.default)((0, _esToolkit.omit)(options?.jsonc ?? {}, ["files", "ignores"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.jsonc ?? {}, ["files", "ignores"]), {
       name: "vdustr/jsonc/rules",
       rules: {
         /**
-         * Default.
+         * No overrides for now.
          */
-        "jsonc/sort-keys": ["error", {
-          pathPattern: ".*",
-          order: {
-            type: "asc",
-            caseSensitive: false,
-            natural: true
-          }
-        }]
       }
     }, omittedConfig);
-    const sortArrayValuesConfig = (0, _defu.default)(options?.sortArrayValues, {
-      name: "vdustr/jsonc/sort-array-values/rules",
-      files: [_globs.GLOB_CSPELL_JSON],
-      rules: {
-        "jsonc/sort-array-values": ["error", {
-          pathPattern: ".*",
-          order: {
-            type: "asc",
-            caseSensitive: false,
-            natural: true
-          }
-        }]
-      }
-    });
-    const packageJsonSetupConfig = {
-      plugins: packageJson.plugins,
-      name: "vdustr/package-json/setup"
-    };
-    const packageJsonRulesConfig = (0, _defu.default)(options?.packageJson, {
-      ...(0, _esToolkit.omit)(packageJson, ["name", "plugins"]),
-      name: "vdustr/package-json/rules"
-    });
-    return [modifiedConfig, rulesConfig, sortArrayValuesConfig, packageJsonSetupConfig, packageJsonRulesConfig];
-  }, ["antfu/sort/package-json", "antfu/sort/tsconfig-json"]);
+    return [modifiedConfig, rulesConfig];
+  });
 };
 exports.jsonc = jsonc;

package/dist/extends/react.js

@@ -4,17 +4,16 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.react = void 0;
-var _defu = _interopRequireDefault(require("defu"));
 var _esToolkit = require("es-toolkit");
 var _reactCompiler = require("../configs/reactCompiler");
 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 react = (composer, options) => {
   (0, _extendsConfig.extendsConfig)(composer, "antfu/react/rules", async config => {
-    const modifiedConfig = (0, _defu.default)((0, _esToolkit.pick)(options?.react ?? {}, ["files", "ignores"]), config);
+    const modifiedConfig = (0, _mergeConfig.mergeConfig)((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"]), {
+    const rulesConfig = (0, _mergeConfig.mergeConfig)((0, _esToolkit.omit)(options?.react ?? {}, ["files", "ignores"]), {
       name: "vdustr/react/rules",
       rules: {
         "react/prefer-destructuring-assignment": "off"
@@ -22,7 +21,7 @@ const react = (composer, options) => {
     }, omittedConfig);
     const reactCompilerConfigs = await (0, _reactCompiler.reactCompiler)({
       setup: options?.reactCompilerSetup ?? {},
-      reactCompiler: (0, _defu.default)(options?.reactCompiler, (0, _esToolkit.pick)(omittedConfig, ["files", "ignores"]))
+      reactCompiler: (0, _mergeConfig.mergeConfig)(options?.reactCompiler, (0, _esToolkit.pick)(omittedConfig, ["files", "ignores"]))
     });
     return [modifiedConfig, rulesConfig, ...reactCompilerConfigs];
   });