Merge pull request #19025 from storybookjs/react-vite-deps

React-vite: update/cleanup dependencies
storybookjs · Aug 26, 2022 · 196839d · 196839d
2 parents 77421b4 + 25d03bc
commit 196839d
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 80 deletions.
diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json
@@ -51,36 +51,24 @@
     "prepare": "../../../scripts/prepare/bundle.ts"
   },
   "dependencies": {
-    "@joshwooding/vite-plugin-react-docgen-typescript": "0.0.4",
+    "@joshwooding/vite-plugin-react-docgen-typescript": "^0.0.5",
     "@rollup/pluginutils": "^4.2.0",
     "@storybook/builder-vite": "7.0.0-alpha.25",
     "@storybook/core-server": "7.0.0-alpha.25",
     "@storybook/react": "7.0.0-alpha.25",
-    "@types/node": "^14.14.20 || ^16.0.0",
-    "@vitejs/plugin-react": "^1.0.8",
+    "@vitejs/plugin-react": "^2.0.1",
     "ast-types": "^0.14.2",
-    "core-js": "^3.8.2",
     "magic-string": "^0.26.1",
-    "react-docgen": "6.0.0-alpha.1",
-    "regenerator-runtime": "^0.13.7"
+    "react-docgen": "^6.0.0-alpha.3"
   },
   "devDependencies": {
-    "jest-specific-snapshot": "^4.0.0",
+    "@types/node": "^14.14.20 || ^16.0.0",
     "typescript": "~4.6.3"
   },
   "peerDependencies": {
-    "@babel/core": "^7.11.5",
     "react": "^16.8.0 || ^17.0.0 || ^18.0.0",
     "react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
   },
-  "peerDependenciesMeta": {
-    "@babel/core": {
-      "optional": true
-    },
-    "typescript": {
-      "optional": true
-    }
-  },
   "engines": {
     "node": ">=10.13.0"
   },

diff --git a/code/frameworks/react-vite/src/plugins/docgen-handlers/actualNameHandler.ts b/code/frameworks/react-vite/src/plugins/docgen-handlers/actualNameHandler.ts
@@ -11,9 +11,9 @@
 
 import { namedTypes as t } from 'ast-types';
 import type { NodePath } from 'ast-types/lib/node-path';
-import { getNameOrValue, isReactForwardRefCall } from 'react-docgen/lib/utils';
-import type { Importer } from 'react-docgen/lib/parse';
-import type Documentation from 'react-docgen/lib/Documentation';
+import { getNameOrValue, isReactForwardRefCall } from 'react-docgen/dist/utils';
+import type { Importer } from 'react-docgen/dist/parse';
+import type Documentation from 'react-docgen/dist/Documentation';
 
 export default function actualNameHandler(
   documentation: Documentation,

diff --git a/code/frameworks/react-vite/src/preset.ts b/code/frameworks/react-vite/src/preset.ts
@@ -38,9 +38,7 @@ export const viteFinal: StorybookConfig['viteFinal'] = async (config, { presets
 
   if (reactDocgen === 'react-docgen-typescript' && typescriptPresent) {
     plugins.push(
-      require('@joshwooding/vite-plugin-react-docgen-typescript').default(
-        reactDocgenTypescriptOptions
-      )
+      require('@joshwooding/vite-plugin-react-docgen-typescript')(reactDocgenTypescriptOptions)
     );
   } else if (reactDocgen) {
     const { reactDocgen } = await import('./plugins/react-docgen');

diff --git a/code/yarn.lock b/code/yarn.lock
@@ -516,7 +516,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/core@npm:^7.17.10, @babel/core@npm:^7.18.10":
+"@babel/core@npm:^7.18.10":
   version: 7.18.10
   resolution: "@babel/core@npm:7.18.10"
   dependencies:
@@ -1767,7 +1767,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-development@npm:^7.16.7, @babel/plugin-transform-react-jsx-development@npm:^7.18.6":
+"@babel/plugin-transform-react-jsx-development@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-transform-react-jsx-development@npm:7.18.6"
   dependencies:
@@ -1778,7 +1778,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-self@npm:^7.16.7, @babel/plugin-transform-react-jsx-self@npm:^7.18.6":
+"@babel/plugin-transform-react-jsx-self@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-transform-react-jsx-self@npm:7.18.6"
   dependencies:
@@ -1789,7 +1789,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx-source@npm:^7.16.7, @babel/plugin-transform-react-jsx-source@npm:^7.18.6":
+"@babel/plugin-transform-react-jsx-source@npm:^7.18.6":
   version: 7.18.6
   resolution: "@babel/plugin-transform-react-jsx-source@npm:7.18.6"
   dependencies:
@@ -1815,7 +1815,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@babel/plugin-transform-react-jsx@npm:^7.17.3, @babel/plugin-transform-react-jsx@npm:^7.18.10":
+"@babel/plugin-transform-react-jsx@npm:^7.18.10":
   version: 7.18.10
   resolution: "@babel/plugin-transform-react-jsx@npm:7.18.10"
   dependencies:
@@ -3883,22 +3883,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.0.4":
-  version: 0.0.4
-  resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.0.4"
-  dependencies:
-    glob: ^7.2.0
-    glob-promise: ^4.2.0
-    magic-string: ^0.26.1
-    react-docgen-typescript: ^2.1.1
-  peerDependencies:
-    typescript: ">= 4.3.x"
-    vite: ">2.0.0-0"
-  checksum: 32edc485a121e1b5dcc0ca1344378f3e4a8a8ef726103dec59fb5b1d062858b0373050631592c336b468c599eedaf5a0591428ddfecd21b08be4c9899eac32dc
-  languageName: node
-  linkType: hard
-
-"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.0.5":
+"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.0.5, @joshwooding/vite-plugin-react-docgen-typescript@npm:^0.0.5":
   version: 0.0.5
   resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.0.5"
   dependencies:
@@ -9023,29 +9008,20 @@ __metadata:
   version: 0.0.0-use.local
   resolution: "@storybook/react-vite@workspace:frameworks/react-vite"
   dependencies:
-    "@joshwooding/vite-plugin-react-docgen-typescript": 0.0.4
+    "@joshwooding/vite-plugin-react-docgen-typescript": ^0.0.5
     "@rollup/pluginutils": ^4.2.0
     "@storybook/builder-vite": 7.0.0-alpha.25
     "@storybook/core-server": 7.0.0-alpha.25
     "@storybook/react": 7.0.0-alpha.25
     "@types/node": ^14.14.20 || ^16.0.0
-    "@vitejs/plugin-react": ^1.0.8
+    "@vitejs/plugin-react": ^2.0.1
     ast-types: ^0.14.2
-    core-js: ^3.8.2
-    jest-specific-snapshot: ^4.0.0
     magic-string: ^0.26.1
-    react-docgen: 6.0.0-alpha.1
-    regenerator-runtime: ^0.13.7
+    react-docgen: ^6.0.0-alpha.3
     typescript: ~4.6.3
   peerDependencies:
-    "@babel/core": ^7.11.5
     react: ^16.8.0 || ^17.0.0 || ^18.0.0
     react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0
-  peerDependenciesMeta:
-    "@babel/core":
-      optional: true
-    typescript:
-      optional: true
   languageName: unknown
   linkType: soft
 
@@ -11779,23 +11755,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@vitejs/plugin-react@npm:^1.0.8":
-  version: 1.3.2
-  resolution: "@vitejs/plugin-react@npm:1.3.2"
-  dependencies:
-    "@babel/core": ^7.17.10
-    "@babel/plugin-transform-react-jsx": ^7.17.3
-    "@babel/plugin-transform-react-jsx-development": ^7.16.7
-    "@babel/plugin-transform-react-jsx-self": ^7.16.7
-    "@babel/plugin-transform-react-jsx-source": ^7.16.7
-    "@rollup/pluginutils": ^4.2.1
-    react-refresh: ^0.13.0
-    resolve: ^1.22.0
-  checksum: 0d386828bdc2a03251959638ccf326e9533e820ffb3108f7bba6112dd07021ec839498395d9345391ae9233b17dbb81a732ea9f8e021fc8904fccae844d008f2
-  languageName: node
-  linkType: hard
-
-"@vitejs/plugin-react@npm:^2.0.0":
+"@vitejs/plugin-react@npm:^2.0.0, @vitejs/plugin-react@npm:^2.0.1":
   version: 2.0.1
   resolution: "@vitejs/plugin-react@npm:2.0.1"
   dependencies:
@@ -37238,7 +37198,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-docgen@npm:^6.0.0-alpha.0":
+"react-docgen@npm:^6.0.0-alpha.0, react-docgen@npm:^6.0.0-alpha.3":
   version: 6.0.0-alpha.3
   resolution: "react-docgen@npm:6.0.0-alpha.3"
   dependencies:
@@ -37514,13 +37474,6 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-refresh@npm:^0.13.0":
-  version: 0.13.0
-  resolution: "react-refresh@npm:0.13.0"
-  checksum: cb9f324d471485e569628854dc08d1550c0798cde57f1bfb8d954e006659de1da0bdccaf7d5d2ac0d3d53df1aae7b740b2a36128789afb8aff0f7ec01b128587
-  languageName: node
-  linkType: hard
-
 "react-refresh@npm:^0.14.0":
   version: 0.14.0
   resolution: "react-refresh@npm:0.14.0"