From 5c357ca9573d81c8a3b9d7edd2ba5d51f0869d4a Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Wed, 7 Dec 2022 15:24:21 -0500 Subject: [PATCH 1/6] Vite: use v4 beta in repros --- code/lib/cli/src/repro-templates.ts | 24 +++++++++++++----------- 1 file changed, 13 insertions(+), 11 deletions(-) diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index a3b36ed04e5b..a6acbc93a21f 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -86,7 +86,7 @@ export const allTemplates: Record = { }, 'react-vite/default-js': { name: 'React Vite (JS)', - script: 'yarn create vite . --template react', + script: 'yarn create vite@beta . --template react', expected: { framework: '@storybook/react-vite', renderer: '@storybook/react', @@ -95,7 +95,7 @@ export const allTemplates: Record = { }, 'react-vite/default-ts': { name: 'React Vite (TS)', - script: 'yarn create vite . --template react-ts', + script: 'yarn create vite@beta . --template react-ts', expected: { framework: '@storybook/react-vite', renderer: '@storybook/react', @@ -122,7 +122,7 @@ export const allTemplates: Record = { }, 'vue3-vite/default-js': { name: 'Vue3 Vite (JS)', - script: 'yarn create vite . --template vue', + script: 'yarn create vite@beta . --template vue', expected: { framework: '@storybook/vue3-vite', renderer: '@storybook/vue3', @@ -131,7 +131,7 @@ export const allTemplates: Record = { }, 'vue3-vite/default-ts': { name: 'Vue3 Vite (TS)', - script: 'yarn create vite . --template vue-ts', + script: 'yarn create vite@beta . --template vue-ts', expected: { framework: '@storybook/vue3-vite', renderer: '@storybook/vue3', @@ -144,7 +144,7 @@ export const allTemplates: Record = { // We don't really want to maintain weird custom scripts like this, // preferring community bootstrap scripts / generators instead. script: - 'yarn create vite . --template vanilla && yarn add --dev @vitejs/plugin-vue2 vue-template-compiler vue@2 && echo "import vue2 from \'@vitejs/plugin-vue2\';\n\nexport default {\n\tplugins: [vue2()]\n};" > vite.config.js', + 'yarn create vite@beta . --template vanilla && yarn add --dev @vitejs/plugin-vue2 vue-template-compiler vue@2 && echo "import vue2 from \'@vitejs/plugin-vue2\';\n\nexport default {\n\tplugins: [vue2()]\n};" > vite.config.js', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -164,7 +164,8 @@ export const allTemplates: Record = { }, 'html-vite/default-js': { name: 'HTML Vite JS', - script: 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', + script: + 'yarn create vite@beta . --template vanilla && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -175,7 +176,8 @@ export const allTemplates: Record = { }, 'html-vite/default-ts': { name: 'HTML Vite TS', - script: 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', + script: + 'yarn create vite@beta . --template vanilla-ts && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -186,7 +188,7 @@ export const allTemplates: Record = { }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', - script: 'yarn create vite . --template svelte', + script: 'yarn create vite@beta . --template svelte', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -195,7 +197,7 @@ export const allTemplates: Record = { }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', - script: 'yarn create vite . --template svelte-ts', + script: 'yarn create vite@beta . --template svelte-ts', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -258,7 +260,7 @@ export const allTemplates: Record = { }, 'lit-vite/default-js': { name: 'Lit Vite (JS)', - script: 'yarn create vite . --template lit', + script: 'yarn create vite@beta . --template lit', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -269,7 +271,7 @@ export const allTemplates: Record = { }, 'lit-vite/default-ts': { name: 'Lit Vite (TS)', - script: 'yarn create vite . --template lit-ts', + script: 'yarn create vite@beta . --template lit-ts', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { From fc38bc90db5c81de2e945c39b583bd5ae00c5f29 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Wed, 7 Dec 2022 09:45:44 -0500 Subject: [PATCH 2/6] Remove vite dep from frameworks that don't use vite Not all frameworks use imports from "vite" directly. # Conflicts: # code/frameworks/html-vite/package.json # code/frameworks/web-components-vite/package.json # code/yarn.lock --- code/frameworks/html-vite/package.json | 6 ++---- code/frameworks/sveltekit/package.json | 3 +-- code/frameworks/web-components-vite/package.json | 6 ++---- code/yarn.lock | 5 +---- 4 files changed, 6 insertions(+), 14 deletions(-) diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index 1fa48285a822..a6f9d6453372 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -60,13 +60,11 @@ "@storybook/html": "7.0.0-alpha.62", "@storybook/node-logger": "7.0.0-alpha.62", "@storybook/preview-web": "7.0.0-alpha.62", - "magic-string": "^0.26.1", - "vite": "3" + "magic-string": "^0.26.1" }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "~4.9.3", - "vite": "^3.1.0" + "typescript": "~4.9.3" }, "engines": { "node": "^14.18 || >=16" diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index c325800f1cf0..3af0f80c95af 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -56,8 +56,7 @@ }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "^4.9.3", - "vite": "^3.1.3" + "typescript": "^4.9.3" }, "peerDependencies": { "@storybook/addon-svelte-csf": "^2.0.0" diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index 0d8f24cb69e4..73d7a061b2d0 100644 --- a/code/frameworks/web-components-vite/package.json +++ b/code/frameworks/web-components-vite/package.json @@ -55,13 +55,11 @@ "@storybook/core-server": "7.0.0-alpha.62", "@storybook/node-logger": "7.0.0-alpha.62", "@storybook/web-components": "7.0.0-alpha.62", - "magic-string": "^0.26.1", - "vite": "3" + "magic-string": "^0.26.1" }, "devDependencies": { "@types/node": "^16.0.0", - "typescript": "~4.9.3", - "vite": "^3.1.0" + "typescript": "~4.9.3" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/yarn.lock b/code/yarn.lock index 37fb19ab60d5..8a2331be1f6b 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -6427,7 +6427,6 @@ __metadata: "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.0 languageName: unknown linkType: soft @@ -7502,7 +7501,6 @@ __metadata: "@storybook/svelte-vite": 7.0.0-alpha.62 "@types/node": ^16.0.0 typescript: ^4.9.3 - vite: ^3.1.3 peerDependencies: "@storybook/addon-svelte-csf": ^2.0.0 peerDependenciesMeta: @@ -7741,7 +7739,6 @@ __metadata: "@types/node": ^16.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -33174,7 +33171,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:^3.1.0, vite@npm:^3.1.3, vite@npm:^3.1.7": +"vite@npm:^3.1.3, vite@npm:^3.1.7": version: 3.2.4 resolution: "vite@npm:3.2.4" dependencies: From d3086b9e7bb4986bdd7c8a757b28d8dd8f34679d Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Wed, 7 Dec 2022 09:47:41 -0500 Subject: [PATCH 3/6] Update vite # Conflicts: # code/yarn.lock --- code/frameworks/react-vite/package.json | 4 +- code/frameworks/svelte-vite/package.json | 4 +- code/frameworks/vue-vite/package.json | 3 +- code/frameworks/vue3-vite/package.json | 4 +- code/lib/builder-vite/package.json | 4 +- code/package.json | 2 +- code/yarn.lock | 59 +++++++++++++++++------- 7 files changed, 53 insertions(+), 27 deletions(-) diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index b05f35a1e272..d4e2c44d877f 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -59,12 +59,12 @@ "ast-types": "^0.14.2", "magic-string": "^0.26.1", "react-docgen": "^6.0.0-alpha.3", - "vite": "^3.1.3" + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 7d8e7a4918b5..c3f8e2dd1778 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -59,12 +59,12 @@ "magic-string": "^0.26.1", "svelte": "^3.0.0", "sveltedoc-parser": "^4.2.1", - "vite": "^3.1.3" + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "@storybook/addon-svelte-csf": "^2.0.0", diff --git a/code/frameworks/vue-vite/package.json b/code/frameworks/vue-vite/package.json index c6516d95db00..3ae6eb641605 100644 --- a/code/frameworks/vue-vite/package.json +++ b/code/frameworks/vue-vite/package.json @@ -55,11 +55,12 @@ "@storybook/core-server": "7.0.0-alpha.62", "@storybook/vue": "7.0.0-alpha.62", "magic-string": "^0.26.1", - "vite": "^3.1.3", + "vite": "^3.0.0||^4.0.0", "vue-docgen-api": "^4.40.0" }, "devDependencies": { "typescript": "~4.9.3", + "vite": "^4.0.0-beta.2", "vue": "^2.7.10" }, "peerDependencies": { diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 02157fc93b38..717af6321591 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -56,13 +56,13 @@ "@storybook/vue3": "7.0.0-alpha.62", "@vitejs/plugin-vue": "^3.0.0", "magic-string": "^0.26.1", - "vite": "^3.1.3", + "vite": "^3.0.0||^4.0.0", "vue-docgen-api": "^4.40.0" }, "devDependencies": { "@types/node": "^16.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "react": "^16.8.0 || ^17.0.0 || ^18.0.0", diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index 7b1701d9e4af..3ed50cd8c6ee 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -61,14 +61,14 @@ "rollup": "^2.25.0 || ^3.3.0", "rollup-plugin-external-globals": "^0.7.1", "slash": "^3.0.0", - "vite": "^3.1.3" + "vite": "^3.0.0||^4.0.0" }, "devDependencies": { "@types/express": "^4.17.13", "@types/node": "^16.0.0", "rollup": "^3.0.0", "typescript": "~4.9.3", - "vite": "^3.1.3" + "vite": "^4.0.0-beta.2" }, "peerDependencies": { "@preact/preset-vite": "*", diff --git a/code/package.json b/code/package.json index 418579621be1..1f4fac7e12ac 100644 --- a/code/package.json +++ b/code/package.json @@ -338,7 +338,7 @@ "tsup": "^6.2.2", "typescript": "~4.9.3", "util": "^0.12.4", - "vite": "^3.1.7", + "vite": "^4.0.0-beta.2", "vite-plugin-turbosnap": "^1.0.1", "wait-on": "^5.2.1", "web-component-analyzer": "^1.1.6", diff --git a/code/yarn.lock b/code/yarn.lock index 8a2331be1f6b..776a1e268c03 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -1,6 +1,3 @@ -# This file is generated by running "yarn install" inside your project. -# Manual changes might be lost - proceed with caution! - __metadata: version: 6 cacheKey: 8c0 @@ -5893,7 +5890,7 @@ __metadata: rollup-plugin-external-globals: ^0.7.1 slash: ^3.0.0 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: "@preact/preset-vite": "*" vite-plugin-glimmerx: "*" @@ -6991,7 +6988,7 @@ __metadata: magic-string: ^0.26.1 react-docgen: ^6.0.0-alpha.3 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 react-dom: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7286,7 +7283,7 @@ __metadata: util: ^0.12.4 verdaccio: ^4.10.0 verdaccio-auth-memory: ^9.7.2 - vite: ^3.1.7 + vite: ^4.0.0-beta.2 vite-plugin-turbosnap: ^1.0.1 wait-on: ^5.2.1 web-component-analyzer: ^1.1.6 @@ -7440,7 +7437,7 @@ __metadata: svelte: ^3.0.0 sveltedoc-parser: ^4.2.1 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 peerDependencies: "@storybook/addon-svelte-csf": ^2.0.0 react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -7605,7 +7602,7 @@ __metadata: "@storybook/vue": 7.0.0-alpha.62 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 vue: ^2.7.10 vue-docgen-api: ^4.40.0 peerDependencies: @@ -7651,7 +7648,7 @@ __metadata: "@vitejs/plugin-vue": ^3.0.0 magic-string: ^0.26.1 typescript: ~4.9.3 - vite: ^3.1.3 + vite: ^4.0.0-beta.2 vue-docgen-api: ^4.40.0 peerDependencies: react: ^16.8.0 || ^17.0.0 || ^18.0.0 @@ -26617,7 +26614,7 @@ __metadata: languageName: node linkType: hard -"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18": +"postcss@npm:^8.1.10, postcss@npm:^8.2.14, postcss@npm:^8.2.15, postcss@npm:^8.3.7, postcss@npm:^8.4.14, postcss@npm:^8.4.18, postcss@npm:^8.4.19": version: 8.4.19 resolution: "postcss@npm:8.4.19" dependencies: @@ -29179,6 +29176,34 @@ __metadata: languageName: node linkType: hard +"rollup@npm:^3.2.5": + version: 3.5.0 + resolution: "rollup@npm:3.5.0" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: 6e9621f169e79df96e6c22780a579c274f5be2b8fee3d5bffe29dda989263b6800ec8b276939ce6feab46aa0f5980a71505e1f80b2552fb90c848669c61907a7 + languageName: node + linkType: hard + +"rollup@npm:^3.6.0": + version: 3.6.0 + resolution: "rollup@npm:3.6.0" + dependencies: + fsevents: ~2.3.2 + dependenciesMeta: + fsevents: + optional: true + bin: + rollup: dist/bin/rollup + checksum: cb0ac6ba2e02ec544ca4658a184255b843ea3b7d4d62266706052f93e036bb1ab9e200ccfb8716855497cf52462551774b5fd54412bd02fcd6e8d7159533f54b + languageName: node + linkType: hard + "rst-selector-parser@npm:^2.2.3": version: 2.2.3 resolution: "rst-selector-parser@npm:2.2.3" @@ -33171,15 +33196,15 @@ __metadata: languageName: node linkType: hard -"vite@npm:^3.1.3, vite@npm:^3.1.7": - version: 3.2.4 - resolution: "vite@npm:3.2.4" +"vite@npm:^4.0.0-beta.2": + version: 4.0.0-beta.2 + resolution: "vite@npm:4.0.0-beta.2" dependencies: - esbuild: ^0.15.9 + esbuild: ^0.15.18 fsevents: ~2.3.2 - postcss: ^8.4.18 + postcss: ^8.4.19 resolve: ^1.22.1 - rollup: ^2.79.1 + rollup: ^3.6.0 peerDependencies: "@types/node": ">= 14" less: "*" @@ -33205,7 +33230,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: c3b6a1643e6436e4628db1fe183a3eb7db970bf8cf20104540079b9e97b6f5ce1ea33c498373f130ddee7259a96cc3f9ce96d5e43a8b23f7484e35ac8634bcc7 + checksum: 8b23b39b9d4475fdb73d8a849ea3ebac79dd3d8853904bb8a7aee70704da3e2443915a43504668526ff90a6e67dd1b5abf508c6a2a7ffa3baef675ddc77a1fa0 languageName: node linkType: hard From 5f56af268cc4cd46e4ae442282f82f75ad2728dc Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Wed, 7 Dec 2022 21:43:15 -0500 Subject: [PATCH 4/6] Fix yarn.lock --- code/yarn.lock | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/code/yarn.lock b/code/yarn.lock index 776a1e268c03..ceced32ede5c 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -1,3 +1,6 @@ +# This file is generated by running "yarn install" inside your project. +# Manual changes might be lost - proceed with caution! + __metadata: version: 6 cacheKey: 8c0 @@ -29148,20 +29151,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^2.79.1": - version: 2.79.1 - resolution: "rollup@npm:2.79.1" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 421418687f5dcd7324f4387f203c6bfc7118b7ace789e30f5da022471c43e037a76f5fd93837052754eeeae798a4fb266ac05ccee1e594406d912a59af98dde9 - languageName: node - linkType: hard - "rollup@npm:^3.0.0, rollup@npm:^3.2.5": version: 3.5.1 resolution: "rollup@npm:3.5.1" @@ -29176,20 +29165,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:^3.2.5": - version: 3.5.0 - resolution: "rollup@npm:3.5.0" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 6e9621f169e79df96e6c22780a579c274f5be2b8fee3d5bffe29dda989263b6800ec8b276939ce6feab46aa0f5980a71505e1f80b2552fb90c848669c61907a7 - languageName: node - linkType: hard - "rollup@npm:^3.6.0": version: 3.6.0 resolution: "rollup@npm:3.6.0" From e4b8440893cd5d37ceb62b18c32abcdf414a11cd Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Thu, 8 Dec 2022 07:27:29 -0500 Subject: [PATCH 5/6] Remove beta flag from vite project bootstraps --- code/lib/cli/src/repro-templates.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index a6acbc93a21f..410dbf8913cc 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -86,7 +86,7 @@ export const allTemplates: Record = { }, 'react-vite/default-js': { name: 'React Vite (JS)', - script: 'yarn create vite@beta . --template react', + script: 'yarn create vite . --template react', expected: { framework: '@storybook/react-vite', renderer: '@storybook/react', @@ -95,7 +95,7 @@ export const allTemplates: Record = { }, 'react-vite/default-ts': { name: 'React Vite (TS)', - script: 'yarn create vite@beta . --template react-ts', + script: 'yarn create vite . --template react-ts', expected: { framework: '@storybook/react-vite', renderer: '@storybook/react', @@ -122,7 +122,7 @@ export const allTemplates: Record = { }, 'vue3-vite/default-js': { name: 'Vue3 Vite (JS)', - script: 'yarn create vite@beta . --template vue', + script: 'yarn create vite . --template vue', expected: { framework: '@storybook/vue3-vite', renderer: '@storybook/vue3', @@ -131,7 +131,7 @@ export const allTemplates: Record = { }, 'vue3-vite/default-ts': { name: 'Vue3 Vite (TS)', - script: 'yarn create vite@beta . --template vue-ts', + script: 'yarn create vite . --template vue-ts', expected: { framework: '@storybook/vue3-vite', renderer: '@storybook/vue3', @@ -144,7 +144,7 @@ export const allTemplates: Record = { // We don't really want to maintain weird custom scripts like this, // preferring community bootstrap scripts / generators instead. script: - 'yarn create vite@beta . --template vanilla && yarn add --dev @vitejs/plugin-vue2 vue-template-compiler vue@2 && echo "import vue2 from \'@vitejs/plugin-vue2\';\n\nexport default {\n\tplugins: [vue2()]\n};" > vite.config.js', + 'yarn create vite . --template vanilla && yarn add --dev @vitejs/plugin-vue2 vue-template-compiler vue@2 && echo "import vue2 from \'@vitejs/plugin-vue2\';\n\nexport default {\n\tplugins: [vue2()]\n};" > vite.config.js', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -165,7 +165,7 @@ export const allTemplates: Record = { 'html-vite/default-js': { name: 'HTML Vite JS', script: - 'yarn create vite@beta . --template vanilla && echo "export default {}" > vite.config.js', + 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -177,7 +177,7 @@ export const allTemplates: Record = { 'html-vite/default-ts': { name: 'HTML Vite TS', script: - 'yarn create vite@beta . --template vanilla-ts && echo "export default {}" > vite.config.js', + 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -188,7 +188,7 @@ export const allTemplates: Record = { }, 'svelte-vite/default-js': { name: 'Svelte Vite (JS)', - script: 'yarn create vite@beta . --template svelte', + script: 'yarn create vite . --template svelte', expected: { framework: '@storybook/svelte-vite', renderer: '@storybook/svelte', @@ -197,7 +197,7 @@ export const allTemplates: Record = { }, 'svelte-vite/default-ts': { name: 'Svelte Vite (TS)', - script: 'yarn create vite@beta . --template svelte-ts', + script: 'yarn create vite . --template svelte-ts', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -260,7 +260,7 @@ export const allTemplates: Record = { }, 'lit-vite/default-js': { name: 'Lit Vite (JS)', - script: 'yarn create vite@beta . --template lit', + script: 'yarn create vite . --template lit', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { @@ -271,7 +271,7 @@ export const allTemplates: Record = { }, 'lit-vite/default-ts': { name: 'Lit Vite (TS)', - script: 'yarn create vite@beta . --template lit-ts', + script: 'yarn create vite . --template lit-ts', // Re-enable once https://github.com/storybookjs/storybook/issues/19351 is fixed. skipTasks: ['smoke-test'], expected: { From aec53c84525fad2eef3a42506fbab5757d966f58 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Thu, 8 Dec 2022 07:49:05 -0500 Subject: [PATCH 6/6] Fix formatting --- code/lib/cli/src/repro-templates.ts | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/code/lib/cli/src/repro-templates.ts b/code/lib/cli/src/repro-templates.ts index 410dbf8913cc..a3b36ed04e5b 100644 --- a/code/lib/cli/src/repro-templates.ts +++ b/code/lib/cli/src/repro-templates.ts @@ -164,8 +164,7 @@ export const allTemplates: Record = { }, 'html-vite/default-js': { name: 'HTML Vite JS', - script: - 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', + script: 'yarn create vite . --template vanilla && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html', @@ -176,8 +175,7 @@ export const allTemplates: Record = { }, 'html-vite/default-ts': { name: 'HTML Vite TS', - script: - 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', + script: 'yarn create vite . --template vanilla-ts && echo "export default {}" > vite.config.js', expected: { framework: '@storybook/html-vite', renderer: '@storybook/html',