@vp-tw/eslint-config 0.0.20 → 0.0.22

package/README.md

@@ -46,6 +46,16 @@ export default vdustr(
 );
 ```
 
+## Release
+
+```bash
+pnpm -w v:patch # or
+pnpm -w v:minor # or
+pnpm -w v:major
+
+pnpm -r publish
+```
+
 ## License
 
 MIT © ViPro <vdustr@gmail.com> (<http://vdustr.dev>)

package/dist/configs/mdx.js

@@ -29,24 +29,33 @@ const mdx = async ({
     name: "vdustr/mdx/processor"
   };
   const rulesConfig = (0, _defu.default)(options.mdx, {
-    ...(0, _esToolkit.omit)(mdxPlugin.flat, ["plugins", "processor"]),
-    name: "vdustr/mdx/rules",
-    rules: (0, _renameRules.renameRules)(mdxPlugin.flat.rules ?? {}),
+    ignores: [
     /**
      * Handled by `@eslint/markdown`.
      */
-    ignores: [...(mdxPlugin.flat.ignores ?? []), _eslintConfig.GLOB_MARKDOWN]
+    _eslintConfig.GLOB_MARKDOWN]
+  }, {
+    ...(0, _esToolkit.omit)(mdxPlugin.flat, ["plugins", "processor"]),
+    name: "vdustr/mdx/rules",
+    rules: (0, _renameRules.renameRules)(mdxPlugin.flat.rules ?? {}),
+    ignores: mdxPlugin.flat.ignores ?? []
   });
   const configs = [setupConfig, processorConfig, rulesConfig];
   if (codeBlocks) {
     const codeBlocksConfig = (0, _defu.default)(codeBlocksOptions, {
-      ...mdxPlugin.flatCodeBlocks,
-      name: "vdustr/mdx/code-blocks",
-      rules: (0, _renameRules.renameRules)(mdxPlugin.flatCodeBlocks.rules ?? {}),
+      rules: {
+        "import/no-default-export": "off"
+      },
+      ignores: [
       /**
        * Handled by `@eslint/markdown`.
        */
-      ignores: [...(mdxPlugin.flatCodeBlocks.ignores ?? []), _eslintConfig.GLOB_MARKDOWN_CODE]
+      _eslintConfig.GLOB_MARKDOWN_CODE]
+    }, {
+      ...mdxPlugin.flatCodeBlocks,
+      name: "vdustr/mdx/code-blocks",
+      rules: (0, _renameRules.renameRules)(mdxPlugin.flatCodeBlocks.rules ?? {}),
+      ignores: mdxPlugin.flatCodeBlocks.ignores ?? []
     });
     configs.push(codeBlocksConfig);
   }

package/dist/esm/configs/mdx.mjs

@@ -28,30 +28,43 @@ const mdx = async ({
   };
   const rulesConfig = defu(
     options.mdx,
+    {
+      ignores: [
+        /**
+         * Handled by `@eslint/markdown`.
+         */
+        GLOB_MARKDOWN
+      ]
+    },
     {
       ...omit(mdxPlugin.flat, ["plugins", "processor"]),
       name: "vdustr/mdx/rules",
       rules: renameRules(mdxPlugin.flat.rules ?? {}),
-      /**
-       * Handled by `@eslint/markdown`.
-       */
-      ignores: [...mdxPlugin.flat.ignores ?? [], GLOB_MARKDOWN]
+      ignores: mdxPlugin.flat.ignores ?? []
     }
   );
   const configs = [setupConfig, processorConfig, rulesConfig];
   if (codeBlocks) {
-    const codeBlocksConfig = defu(codeBlocksOptions, {
-      ...mdxPlugin.flatCodeBlocks,
-      name: "vdustr/mdx/code-blocks",
-      rules: renameRules(mdxPlugin.flatCodeBlocks.rules ?? {}),
-      /**
-       * Handled by `@eslint/markdown`.
-       */
-      ignores: [
-        ...mdxPlugin.flatCodeBlocks.ignores ?? [],
-        GLOB_MARKDOWN_CODE
-      ]
-    });
+    const codeBlocksConfig = defu(
+      codeBlocksOptions,
+      {
+        rules: {
+          "import/no-default-export": "off"
+        },
+        ignores: [
+          /**
+           * Handled by `@eslint/markdown`.
+           */
+          GLOB_MARKDOWN_CODE
+        ]
+      },
+      {
+        ...mdxPlugin.flatCodeBlocks,
+        name: "vdustr/mdx/code-blocks",
+        rules: renameRules(mdxPlugin.flatCodeBlocks.rules ?? {}),
+        ignores: mdxPlugin.flatCodeBlocks.ignores ?? []
+      }
+    );
     configs.push(codeBlocksConfig);
   }
   return configs;

package/dist/esm/extends/javascript.mjs

@@ -21,8 +21,6 @@ const javascript = (composer, options) => {
            */
           "no-unused-vars": "off",
           "unused-imports/no-unused-vars": "off",
-          "unused-imports/no-unused-imports-ts": "off",
-          "unused-imports/no-unused-vars-ts": "off",
           "unused-imports/no-unused-imports": "off"
         }
       },

package/dist/esm/types.d.ts

@@ -4,7 +4,12 @@ import type { DistributiveOmit } 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";
-type Config = NonNullable<Parameters<typeof antfu>[1]>;
+type AnyObject = Record<PropertyKey, any>;
+type ObjectReplaceAntfuEslintRulesWithRulesDeeply<T extends AnyObject> = (Extract<T, AntfuEslintRules> extends never ? never : Rules) | {
+    [K in keyof T]: ReplaceAntfuEslintRulesWithVpRulesDeeply<T[K]>;
+};
+type ReplaceAntfuEslintRulesWithVpRulesDeeply<T> = (Extract<T, AntfuEslintRules> extends never ? never : Rules) | (ObjectReplaceAntfuEslintRulesWithRulesDeeply<Extract<T, AnyObject>> | Exclude<T, AnyObject>);
+type Config = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[1]>>;
 type Rules = RuleOptions & AntfuEslintRules;
 type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
 /**
@@ -19,4 +24,4 @@ interface ConfigOverrides extends DistributiveOmit<TypedFlatConfigItem, "process
  * Typed composer.
  */
 type VpComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
-export type { Config, ConfigNames, ConfigOverrides, TypedFlatConfigItem, VpComposer, };
+export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, TypedFlatConfigItem, VpComposer, };

package/dist/esm/vdustr.d.ts

@@ -1,4 +1,4 @@
-import type { Config, VpComposer } from "./types";
+import type { Config, ReplaceAntfuEslintRulesWithVpRulesDeeply, VpComposer } from "./types";
 import antfu from "@antfu/eslint-config";
 import { mdx } from "./configs/mdx";
 import { prettier } from "./configs/prettier";
@@ -9,7 +9,7 @@ import { jsonc } from "./extends/jsonc";
 import { react } from "./extends/react";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
-type Options = NonNullable<Parameters<typeof antfu>[0]> & {
+type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[0]>> & {
     javascriptExtends?: javascript.Options;
     importsExtends?: imports.Options;
     typescriptExtends?: typescript.Options;

package/dist/esm/vdustr.mjs

@@ -41,13 +41,7 @@ const vdustr = (options, ...userConfigs) => {
     config = config.append(
       mdx({
         ...mdxOptions,
-        codeBlocks: !mdxFlatCodeBlocksEnabled ? false : {
-          ...mdxFlatCodeBlocksOptions,
-          rules: {
-            "import/no-default-export": "off",
-            ...mdxFlatCodeBlocksOptions?.rules
-          }
-        }
+        codeBlocks: !mdxFlatCodeBlocksEnabled ? false : mdxFlatCodeBlocksOptions
       })
     );
   }

package/dist/extends/javascript.js

@@ -26,8 +26,6 @@ const javascript = (composer, options) => {
          */
         "no-unused-vars": "off",
         "unused-imports/no-unused-vars": "off",
-        "unused-imports/no-unused-imports-ts": "off",
-        "unused-imports/no-unused-vars-ts": "off",
         "unused-imports/no-unused-imports": "off"
       }
     }, omittedConfig);

package/dist/types.d.ts

@@ -4,7 +4,12 @@ import type { DistributiveOmit } 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";
-type Config = NonNullable<Parameters<typeof antfu>[1]>;
+type AnyObject = Record<PropertyKey, any>;
+type ObjectReplaceAntfuEslintRulesWithRulesDeeply<T extends AnyObject> = (Extract<T, AntfuEslintRules> extends never ? never : Rules) | {
+    [K in keyof T]: ReplaceAntfuEslintRulesWithVpRulesDeeply<T[K]>;
+};
+type ReplaceAntfuEslintRulesWithVpRulesDeeply<T> = (Extract<T, AntfuEslintRules> extends never ? never : Rules) | (ObjectReplaceAntfuEslintRulesWithRulesDeeply<Extract<T, AnyObject>> | Exclude<T, AnyObject>);
+type Config = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[1]>>;
 type Rules = RuleOptions & AntfuEslintRules;
 type ConfigNames = VpEslintConfigNames | AntfuEslintConfigNames;
 /**
@@ -19,4 +24,4 @@ interface ConfigOverrides extends DistributiveOmit<TypedFlatConfigItem, "process
  * Typed composer.
  */
 type VpComposer = FlatConfigComposer<TypedFlatConfigItem, ConfigNames>;
-export type { Config, ConfigNames, ConfigOverrides, TypedFlatConfigItem, VpComposer, };
+export type { AnyObject, Config, ConfigNames, ConfigOverrides, ReplaceAntfuEslintRulesWithVpRulesDeeply, TypedFlatConfigItem, VpComposer, };

package/dist/vdustr.d.ts

@@ -1,4 +1,4 @@
-import type { Config, VpComposer } from "./types";
+import type { Config, ReplaceAntfuEslintRulesWithVpRulesDeeply, VpComposer } from "./types";
 import antfu from "@antfu/eslint-config";
 import { mdx } from "./configs/mdx";
 import { prettier } from "./configs/prettier";
@@ -9,7 +9,7 @@ import { jsonc } from "./extends/jsonc";
 import { react } from "./extends/react";
 import { typescript } from "./extends/typescript";
 import { yaml } from "./extends/yaml";
-type Options = NonNullable<Parameters<typeof antfu>[0]> & {
+type Options = ReplaceAntfuEslintRulesWithVpRulesDeeply<NonNullable<Parameters<typeof antfu>[0]>> & {
     javascriptExtends?: javascript.Options;
     importsExtends?: imports.Options;
     typescriptExtends?: typescript.Options;

package/dist/vdustr.js

@@ -43,13 +43,7 @@ const vdustr = (options, ...userConfigs) => {
     };
     config = config.append((0, _mdx.mdx)({
       ...mdxOptions,
-      codeBlocks: !mdxFlatCodeBlocksEnabled ? false : {
-        ...mdxFlatCodeBlocksOptions,
-        rules: {
-          "import/no-default-export": "off",
-          ...mdxFlatCodeBlocksOptions?.rules
-        }
-      }
+      codeBlocks: !mdxFlatCodeBlocksEnabled ? false : mdxFlatCodeBlocksOptions
     }));
   }
   const prettierEnabled = Boolean(options?.prettier ?? true);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.20",
+  "version": "0.0.22",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {