Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

React-vite: update/cleanup dependencies #19025

Merged
merged 5 commits into from
Aug 26, 2022
Merged

React-vite: update/cleanup dependencies #19025

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c84dc00
React-vite: update/cleanup dependencies
IanVS Aug 26, 2022
d7b7e57
Fix react-docgen paths
IanVS Aug 26, 2022
cdbd146
Use `import` for docgen-typescript
IanVS Aug 26, 2022
b8fbc8c
Use require, but not .default
IanVS Aug 26, 2022
25d03bc
Remove @babel/core peer dep
IanVS Aug 26, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 4 additions & 16 deletions code/frameworks/react-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
},
Expand Down
6 changes: 3 additions & 3 deletions code/frameworks/react-vite/src/plugins/docgen-handlers/actualNameHandler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down
4 changes: 1 addition & 3 deletions code/frameworks/react-vite/src/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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');
Expand Down
69 changes: 11 additions & 58 deletions code/yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand All @@ -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:
Expand Down Expand Up @@ -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:
Expand Down Expand Up @@ -9013,29 +8998,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

Expand Down Expand Up @@ -11735,23 +11711,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:
Expand Down Expand Up @@ -37194,7 +37154,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:
Expand Down Expand Up @@ -37470,13 +37430,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"
Expand Down