@vp-tw/eslint-config 0.0.27 → 0.0.29

package/README.md

@@ -56,46 +56,6 @@ pnpm -w v:major
 pnpm -r publish
 ```
 
-## Known Issues
-
-### `eslint-plugin-unicorn@^57.0.0`
-
-Getting the following error when call `typegen`:
-
-<!-- cSpell:disable -->
-
-```
-/eslint-config/node_modules/.pnpm/eslint-plugin-unicorn@57.0.0_eslint@9.21.0_jiti@2.4.2_/node_modules/eslint-plugin-unicorn/rules…
-│     atisIdentifierName,
-│     at^
-│ TypeError: Cannot destructure property 'isIdentifierName' of 'import_helper_validator_identifier.default' as it is undefined.
-│     at resolveVariableName (/eslint-config/node_modules/.pnpm/eslint-plugin-unicorn@57.0.0_eslint@9.21.0_jiti@2.4.2_/node_modules…
-│     at Object.<anonymous> (/eslint-config/node_modules/.pnpm/eslint-plugin-unicorn@57.0.0_eslint@9.21.0_jiti@2.4.2_/node_modules/…
-│     at Module._compile (node:internal/modules/cjs/loader:1739:14)
-│     at Object.transformer (/eslint-config/node_modules/.pnpm/tsx@4.19.3/node_modules/tsx/dist/register-DCnOAxY2.cjs:2:1186)
-│     at Module.load (node:internal/modules/cjs/loader:1473:32)
-│     at Function._load (node:internal/modules/cjs/loader:1285:12)
-│     at TracingChannel.traceSync (node:diagnostics_channel:322:14)
-│     at wrapModuleLoad (node:internal/modules/cjs/loader:234:24)
-│     at Module.require (node:internal/modules/cjs/loader:1495:12)
-│     at require (node:internal/modules/helpers:135:16)
-```
-
-<!-- cSpell:enable -->
-
-Workaround: downgrade `eslint-plugin-unicorn` to `^56.0.1`.
-
-```jsonc
-// package.json
-{
-  "pnpm": {
-    "overrides": {
-      "eslint-plugin-unicorn": "^56.0.1",
-    },
-  },
-}
-```
-
 ## License
 
 MIT © ViPro <vdustr@gmail.com> (<http://vdustr.dev>)

package/dist/eslint-typegen.d.ts

@@ -72,7 +72,7 @@ export interface RuleOptions {
    */
   'storybook/story-exports'?: Linter.RuleEntry<[]>
   /**
-   * Use expect from `@storybook/test` or `@storybook/jest`
+   * Use expect from `@storybook/test`, `storybook/test` or `@storybook/jest`
    * @see https://github.com/storybookjs/eslint-plugin-storybook/blob/main/docs/rules/use-storybook-expect.md
    */
   'storybook/use-storybook-expect'?: Linter.RuleEntry<[]>
@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = '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/typescript/rules' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = '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'
   

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

@@ -72,7 +72,7 @@ export interface RuleOptions {
    */
   'storybook/story-exports'?: Linter.RuleEntry<[]>
   /**
-   * Use expect from `@storybook/test` or `@storybook/jest`
+   * Use expect from `@storybook/test`, `storybook/test` or `@storybook/jest`
    * @see https://github.com/storybookjs/eslint-plugin-storybook/blob/main/docs/rules/use-storybook-expect.md
    */
   'storybook/use-storybook-expect'?: Linter.RuleEntry<[]>
@@ -99,5 +99,5 @@ type StorybookNoUninstalledAddons = []|[{
   [k: string]: unknown | undefined
 }]
   // Names of all the configs
-  export type ConfigNames = '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/typescript/rules' | 'vdustr/yaml/rules' | 'vdustr/yaml/sort-keys/rules'
+  export type ConfigNames = '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'
   

package/dist/esm/extends/react.mjs

@@ -1,6 +1,7 @@
+import { GLOB_MARKDOWN_CODE } from "@antfu/eslint-config";
 import { omit, pick } from "es-toolkit";
 import { reactCompiler } from "../configs/reactCompiler.mjs";
-import { GLOB_REACT_IN_MD } from "../globs.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";
@@ -35,7 +36,7 @@ const react = (composer, options) => {
       {
         ...modifiedConfig,
         name: "vdustr/react/md/rules",
-        files: [GLOB_REACT_IN_MD],
+        files: [GLOB_MARKDOWN_CODE, GLOB_MDX_CODE],
         rules: {
           "react-compiler/react-compiler": "off",
           "react-hooks/rules-of-hooks": "off",

package/dist/esm/extends/yaml.mjs

@@ -29,10 +29,20 @@ const yaml = (composer, options) => {
       },
       omittedConfig
     );
+    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, {
-      ...omit(omittedConfig, ["files", "ignores"]),
+      ...omittedConfig,
       name: "vdustr/yaml/sort-keys/rules",
-      files: [GLOB_PNPM_WORKSPACE_YAML],
       rules: {
         "yaml/sort-keys": [
           "error",
@@ -47,7 +57,7 @@ const yaml = (composer, options) => {
         ]
       }
     });
-    return [modifiedConfig, rulesConfig, sortKeysConfig];
+    return [config, sortKeysConfig];
   });
 };
 export { yaml };

package/dist/esm/globs.d.ts

@@ -1,11 +1,9 @@
 declare const GLOB_CODE_WORKSPACE: string;
+declare const GLOB_CONFIG_JS: string;
+declare const GLOB_CSPELL_JSON: string;
+declare const GLOB_MDX: string;
+declare const GLOB_MDX_CODE: string;
 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;
-/**
- * Glob pattern for React files in Markdown files, including MDX.
- */
-declare const GLOB_REACT_IN_MD: string;
 declare const GLOB_VITEST_WORKSPACE: string;
-export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_REACT_IN_MD, GLOB_VITEST_WORKSPACE, };
+export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_MDX, GLOB_MDX_CODE, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_VITEST_WORKSPACE, };

package/dist/esm/globs.mjs

@@ -1,16 +1,19 @@
+import { GLOB_SRC } from "@antfu/eslint-config";
 const GLOB_CODE_WORKSPACE = "**/*.code-workspace";
+const GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_CSPELL_JSON = "**/cspell.json";
+const GLOB_MDX = "**/*.mdx";
+const GLOB_MDX_CODE = `${GLOB_MDX}/${GLOB_SRC}`;
 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_REACT_IN_MD = "**/*.md?(x)/**/*.?([mc])[jt]s?(x)";
 const GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";
 export {
   GLOB_CODE_WORKSPACE,
   GLOB_CONFIG_JS,
   GLOB_CSPELL_JSON,
+  GLOB_MDX,
+  GLOB_MDX_CODE,
   GLOB_PACKAGE_JSON,
   GLOB_PNPM_WORKSPACE_YAML,
-  GLOB_REACT_IN_MD,
   GLOB_VITEST_WORKSPACE
 };

package/dist/extends/react.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.react = void 0;
+var _eslintConfig = require("@antfu/eslint-config");
 var _esToolkit = require("es-toolkit");
 var _reactCompiler = require("../configs/reactCompiler");
 var _globs = require("../globs");
@@ -29,7 +30,7 @@ const react = (composer, options) => {
     }, {
       ...modifiedConfig,
       name: "vdustr/react/md/rules",
-      files: [_globs.GLOB_REACT_IN_MD],
+      files: [_eslintConfig.GLOB_MARKDOWN_CODE, _globs.GLOB_MDX_CODE],
       rules: {
         "react-compiler/react-compiler": "off",
         "react-hooks/rules-of-hooks": "off",

package/dist/extends/yaml.js

@@ -22,10 +22,17 @@ const yaml = (composer, options) => {
         ...Object.fromEntries([..._eslintPluginYml.default.configs["flat/recommended"].flatMap(config2 => Object.entries(config2.rules ?? {})), ..._eslintPluginYml.default.configs["flat/prettier"].flatMap(config2 => Object.entries(config2.rules ?? {}))])
       })
     }, 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, {
-      ...(0, _esToolkit.omit)(omittedConfig, ["files", "ignores"]),
+      ...omittedConfig,
       name: "vdustr/yaml/sort-keys/rules",
-      files: [_globs.GLOB_PNPM_WORKSPACE_YAML],
       rules: {
         "yaml/sort-keys": ["error", {
           pathPattern: ".*",
@@ -37,7 +44,7 @@ const yaml = (composer, options) => {
         }]
       }
     });
-    return [modifiedConfig, rulesConfig, sortKeysConfig];
+    return [config, sortKeysConfig];
   });
 };
 exports.yaml = yaml;

package/dist/globs.d.ts

@@ -1,11 +1,9 @@
 declare const GLOB_CODE_WORKSPACE: string;
+declare const GLOB_CONFIG_JS: string;
+declare const GLOB_CSPELL_JSON: string;
+declare const GLOB_MDX: string;
+declare const GLOB_MDX_CODE: string;
 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;
-/**
- * Glob pattern for React files in Markdown files, including MDX.
- */
-declare const GLOB_REACT_IN_MD: string;
 declare const GLOB_VITEST_WORKSPACE: string;
-export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_REACT_IN_MD, GLOB_VITEST_WORKSPACE, };
+export { GLOB_CODE_WORKSPACE, GLOB_CONFIG_JS, GLOB_CSPELL_JSON, GLOB_MDX, GLOB_MDX_CODE, GLOB_PACKAGE_JSON, GLOB_PNPM_WORKSPACE_YAML, GLOB_VITEST_WORKSPACE, };

package/dist/globs.js

@@ -3,11 +3,13 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.GLOB_VITEST_WORKSPACE = exports.GLOB_REACT_IN_MD = exports.GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PACKAGE_JSON = exports.GLOB_CSPELL_JSON = exports.GLOB_CONFIG_JS = exports.GLOB_CODE_WORKSPACE = void 0;
+exports.GLOB_VITEST_WORKSPACE = exports.GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PACKAGE_JSON = exports.GLOB_MDX_CODE = exports.GLOB_MDX = exports.GLOB_CSPELL_JSON = exports.GLOB_CONFIG_JS = exports.GLOB_CODE_WORKSPACE = void 0;
+var _eslintConfig = require("@antfu/eslint-config");
 const GLOB_CODE_WORKSPACE = exports.GLOB_CODE_WORKSPACE = "**/*.code-workspace";
+const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
+const GLOB_CSPELL_JSON = exports.GLOB_CSPELL_JSON = "**/cspell.json";
+const GLOB_MDX = exports.GLOB_MDX = "**/*.mdx";
+const GLOB_MDX_CODE = exports.GLOB_MDX_CODE = `${GLOB_MDX}/${_eslintConfig.GLOB_SRC}`;
 const GLOB_PACKAGE_JSON = exports.GLOB_PACKAGE_JSON = "**/package.json";
 const GLOB_PNPM_WORKSPACE_YAML = exports.GLOB_PNPM_WORKSPACE_YAML = "**/pnpm-workspace.y?(a)ml";
-const GLOB_CSPELL_JSON = exports.GLOB_CSPELL_JSON = "**/cspell.json";
-const GLOB_CONFIG_JS = exports.GLOB_CONFIG_JS = "**/*.config.?([cm])[jt]s";
-const GLOB_REACT_IN_MD = exports.GLOB_REACT_IN_MD = "**/*.md?(x)/**/*.?([mc])[jt]s?(x)";
 const GLOB_VITEST_WORKSPACE = exports.GLOB_VITEST_WORKSPACE = "**/vitest.workspace.?([cm])[jt]s";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vp-tw/eslint-config",
-  "version": "0.0.27",
+  "version": "0.0.29",
   "description": "ViPro's ESLint configuration",
   "homepage": "https://github.com/vdustr/eslint-config",
   "author": {
@@ -40,23 +40,24 @@
   ],
   "dependencies": {
     "@mui/types": "^7.2.21",
-    "es-toolkit": "^1.32.0",
+    "es-toolkit": "^1.33.0",
     "eslint-flat-config-utils": "^2.0.1",
-    "local-pkg": "^1.1.0"
+    "local-pkg": "^1.1.1"
   },
   "devDependencies": {
     "eslint-typegen": "^2.0.0",
     "unbuild": "^3.3.1"
   },
   "peerDependencies": {
-    "@antfu/eslint-config": "^4.3.0",
+    "@antfu/eslint-config": "4.10.1",
     "@types/eslint-config-prettier": "^6.11.3",
-    "eslint": "^9.21.0",
-    "eslint-config-prettier": "^10.0.2",
-    "eslint-plugin-mdx": "^3.1.5",
-    "eslint-plugin-package-json": "^0.26.0",
-    "eslint-plugin-react-compiler": "^19.0.0-beta-e1e972c-20250221",
-    "eslint-plugin-storybook": "^0.11.3"
+    "eslint": "^9.22.0",
+    "eslint-config-prettier": "^10.1.1",
+    "eslint-plugin-mdx": "^3.2.0",
+    "eslint-plugin-package-json": "^0.26.3",
+    "eslint-plugin-react-compiler": "^19.0.0-beta-bafa41b-20250307",
+    "eslint-plugin-storybook": "^0.11.4",
+    "eslint-plugin-yml": "^1.17.0"
   },
   "peerDependenciesMeta": {
     "@types/eslint-config-prettier": {
@@ -76,6 +77,9 @@
     },
     "eslint-plugin-storybook": {
       "optional": true
+    },
+    "eslint-plugin-yml": {
+      "optional": true
     }
   },
   "publishConfig": {
@@ -84,6 +88,6 @@
   "scripts": {
     "build": "unbuild",
     "copy": "tsx scripts/copy",
-    "typegen": "tsx scripts/typegen"
+    "typegen": "jiti scripts/typegen"
   }
 }