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

Vite: Make vite a peer dependency, update plugins #20281

Merged
merged 14 commits into from
Dec 16, 2022
Merged

Vite: Make vite a peer dependency, update plugins #20281

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
4deabb1
Vite: make vite a peer dependency, update plugins
IanVS Dec 14, 2022
07d9079
Leave TODO for migration
IanVS Dec 14, 2022
f4e04db
make the version range of vite also allow for vite 4
ndelangen Dec 15, 2022
5443b4b
Merge remote-tracking branch 'origin/next' into vite/peer-dep
IanVS Dec 16, 2022
c3f8a4c
Ignore svelte plugin from eslint
IanVS Dec 16, 2022
b765182
Remove TODO
IanVS Dec 16, 2022
66d8509
Merge branch 'next' into tech/allow-vite-4
ndelangen Dec 16, 2022
d5c1462
Merge branch 'tech/allow-vite-4' into vite/peer-dep
ndelangen Dec 16, 2022
a9a72de
Merge branch 'next' into vite/peer-dep
ndelangen Dec 16, 2022
0cc40ab
fixes after merge
ndelangen Dec 16, 2022
248d139
Merge branch 'next' into vite/peer-dep
ndelangen Dec 16, 2022
1697571
Merge remote-tracking branch 'origin/next' into vite/peer-dep
IanVS Dec 16, 2022
f0d2977
Fix bad git merge
IanVS Dec 16, 2022
1147d80
Merge remote-tracking branch 'origin/next' into vite/peer-dep
IanVS Dec 16, 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
11 changes: 6 additions & 5 deletions code/frameworks/react-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,19 +55,20 @@
"@rollup/pluginutils": "^4.2.0",
"@storybook/builder-vite": "7.0.0-beta.9",
"@storybook/react": "7.0.0-beta.9",
"@vitejs/plugin-react": "^2.0.0",
"@vitejs/plugin-react": "^3.0.0",
"ast-types": "^0.14.2",
"magic-string": "^0.26.1",
"react-docgen": "^6.0.0-alpha.3",
"vite": "^3.0.0"
"react-docgen": "^6.0.0-alpha.3"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.9.3"
"typescript": "~4.9.3",
"vite": "^4.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
"vite": "3 - 4"
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
},
"engines": {
"node": "^14.18 || >=16"
Expand Down
11 changes: 6 additions & 5 deletions code/frameworks/svelte-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,21 +55,22 @@
"@storybook/builder-vite": "7.0.0-beta.9",
"@storybook/node-logger": "7.0.0-beta.9",
"@storybook/svelte": "7.0.0-beta.9",
"@sveltejs/vite-plugin-svelte": "^1.0.0",
"@sveltejs/vite-plugin-svelte": "^2.0.0",
"magic-string": "^0.26.1",
"svelte": "^3.0.0",
"sveltedoc-parser": "^4.2.1",
"ts-dedent": "^2.2.0",
"vite": "^3.0.0"
"ts-dedent": "^2.2.0"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.9.3"
"typescript": "~4.9.3",
"vite": "^4.0.0"
},
"peerDependencies": {
"@storybook/addon-svelte-csf": "^2.0.0",
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
"vite": "3 - 4"
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
},
"peerDependenciesMeta": {
"@storybook/addon-svelte-csf": {
Expand Down
2 changes: 2 additions & 0 deletions code/frameworks/svelte-vite/src/preset.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,8 @@ export const core: StorybookConfig['core'] = {

export const viteFinal: NonNullable<StorybookConfig['viteFinal']> = async (config, options) => {
const { plugins = [] } = config;
// TODO: set up eslint import to use typescript resolver
// eslint-disable-next-line import/no-unresolved
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sveltejs/vite-plugin-svelte#552

const { svelte, loadSvelteConfig } = await import('@sveltejs/vite-plugin-svelte');
const svelteOptions: Record<string, any> = await options.presets.apply(
'svelteOptions',
Expand Down
6 changes: 4 additions & 2 deletions code/frameworks/sveltekit/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,12 @@
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "^4.9.3"
"typescript": "^4.9.3",
"vite": "^4.0.0"
},
"peerDependencies": {
"@storybook/addon-svelte-csf": "^2.0.0"
"@storybook/addon-svelte-csf": "^2.0.0",
"vite": "^4.0.0"
},
"peerDependenciesMeta": {
"@storybook/addon-svelte-csf": {
Expand Down
3 changes: 2 additions & 1 deletion code/frameworks/vue-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,16 +55,17 @@
"@storybook/core-server": "7.0.0-beta.9",
"@storybook/vue": "7.0.0-beta.9",
"magic-string": "^0.26.1",
"vite": "^3.0.0",
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"typescript": "~4.9.3",
"vite": "^4.0.0",
"vue": "^2.7.10"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
"vite": "3 - 4",
"vue": "^2.7.0"
},
"engines": {
Expand Down
9 changes: 5 additions & 4 deletions code/frameworks/vue3-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,18 +54,19 @@
"@storybook/builder-vite": "7.0.0-beta.9",
"@storybook/core-server": "7.0.0-beta.9",
"@storybook/vue3": "7.0.0-beta.9",
"@vitejs/plugin-vue": "^3.0.0",
"@vitejs/plugin-vue": "^4.0.0",
"magic-string": "^0.26.1",
"vite": "^3.0.0",
"vue-docgen-api": "^4.40.0"
},
"devDependencies": {
"@types/node": "^16.0.0",
"typescript": "~4.9.3"
"typescript": "~4.9.3",
"vite": "^4.0.0"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0",
"vite": "3 - 4"
},
"engines": {
"node": "^14.18 || >=16"
Expand Down
7 changes: 4 additions & 3 deletions code/lib/builder-vite/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,18 +59,19 @@
"magic-string": "^0.26.1",
"rollup": "^2.25.0 || ^3.3.0",
"rollup-plugin-external-globals": "^0.7.1",
"slash": "^3.0.0",
"vite": "^3.0.0"
"slash": "^3.0.0"
},
"devDependencies": {
"@types/express": "^4.17.13",
"@types/node": "^16.0.0",
"rollup": "^3.0.0",
"typescript": "~4.9.3"
"typescript": "~4.9.3",
"vite": "^4.0.0"
},
"peerDependencies": {
"@preact/preset-vite": "*",
"typescript": ">= 4.3.x",
"vite": "3 - 4",
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
"vite-plugin-glimmerx": "*"
},
"peerDependenciesMeta": {
Expand Down
2 changes: 1 addition & 1 deletion code/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,7 @@
"tsup": "^6.2.2",
"typescript": "~4.9.3",
"util": "^0.12.4",
"vite": "^3.0.0",
ndelangen marked this conversation as resolved.
Show resolved Hide resolved
"vite": "^4.0.0",
"vite-plugin-turbosnap": "^1.0.1",
"wait-on": "^5.2.1",
"web-component-analyzer": "^1.1.6",
Expand Down
Loading