diff --git a/.storybook/main.ts b/.storybook/main.ts index 11a01d1fbb7..9e4ec0e49f9 100644 --- a/.storybook/main.ts +++ b/.storybook/main.ts @@ -1,4 +1,3 @@ -import path from 'node:path'; import { dirname, join } from 'path'; import type { StorybookConfig } from '@storybook/react-vite'; import remarkGfm from 'remark-gfm'; @@ -72,10 +71,7 @@ const config: StorybookConfig = { autodocs: true }, typescript: { - reactDocgen: 'react-docgen-typescript', - reactDocgenTypescriptOptions: { - tsconfigPath: path.resolve(__dirname, './../tsconfig.json') - } + reactDocgen: 'react-docgen-typescript' }, staticDirs: [isDevMode && 'images-dev', 'images'].filter(Boolean) }; diff --git a/package.json b/package.json index 7c567469829..40a75e02693 100644 --- a/package.json +++ b/package.json @@ -113,7 +113,8 @@ }, "resolutions": { "tocbot": "4.32.2", - "react-is": "^19" + "react-is": "^19", + "@joshwooding/vite-plugin-react-docgen-typescript": "0.3.0" }, "type": "module", "nyc": { diff --git a/yarn.lock b/yarn.lock index 59b52241392..8263838d10c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3108,19 +3108,21 @@ __metadata: languageName: node linkType: hard -"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.4.2": - version: 0.4.2 - resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.4.2" +"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.0": + version: 0.3.0 + resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.0" dependencies: + glob: "npm:^7.2.0" + glob-promise: "npm:^4.2.0" magic-string: "npm:^0.27.0" react-docgen-typescript: "npm:^2.2.2" peerDependencies: typescript: ">= 4.3.x" - vite: ^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0 + vite: ^3.0.0 || ^4.0.0 || ^5.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 10c0/355d13ad92a9da786b561a25250e6c94a8e51d235ced345e54ebfe709abc45ab60c2a8d06599df6ec0441fba01720f189883429943cb62dff9a4c31b59f0939c + checksum: 10c0/31098ad8fcc2440437534599c111d9f2951dd74821e8ba46c521b969bae4c918d830b7bb0484efbad29a51711bb62d3bc623d5a1ed5b1695b5b5594ea9dd4ca0 languageName: node linkType: hard @@ -5219,6 +5221,16 @@ __metadata: languageName: node linkType: hard +"@types/glob@npm:^7.1.3": + version: 7.2.0 + resolution: "@types/glob@npm:7.2.0" + dependencies: + "@types/minimatch": "npm:*" + "@types/node": "npm:*" + checksum: 10c0/a8eb5d5cb5c48fc58c7ca3ff1e1ddf771ee07ca5043da6e4871e6757b4472e2e73b4cfef2644c38983174a4bc728c73f8da02845c28a1212f98cabd293ecae98 + languageName: node + linkType: hard + "@types/hast@npm:^2.0.0": version: 2.3.10 resolution: "@types/hast@npm:2.3.10" @@ -5385,6 +5397,13 @@ __metadata: languageName: node linkType: hard +"@types/minimatch@npm:*": + version: 5.1.2 + resolution: "@types/minimatch@npm:5.1.2" + checksum: 10c0/83cf1c11748891b714e129de0585af4c55dd4c2cafb1f1d5233d79246e5e1e19d1b5ad9e8db449667b3ffa2b6c80125c429dbee1054e9efb45758dbc4e118562 + languageName: node + linkType: hard + "@types/minimatch@npm:^3.0.3": version: 3.0.5 resolution: "@types/minimatch@npm:3.0.5" @@ -12722,6 +12741,17 @@ __metadata: languageName: node linkType: hard +"glob-promise@npm:^4.2.0": + version: 4.2.2 + resolution: "glob-promise@npm:4.2.2" + dependencies: + "@types/glob": "npm:^7.1.3" + peerDependencies: + glob: ^7.1.6 + checksum: 10c0/3eb01bed2901539365df6a4d27800afb8788840647d01f9bf3500b3de756597f2ff4b8c823971ace34db228c83159beca459dc42a70968d4e9c8200ed2cc96bd + languageName: node + linkType: hard + "glob@npm:7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0"