From f85e41b5058d0f22a6bf9f436107aa36619e0f01 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Fri, 2 Sep 2022 15:00:49 -0400 Subject: [PATCH 1/4] Vite: Fix plugin types --- code/frameworks/react-vite/src/plugins/react-docgen.ts | 4 ++-- code/frameworks/react-vite/src/preset.ts | 4 ++-- code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts | 4 ++-- code/frameworks/svelte-vite/src/preset.ts | 2 +- code/frameworks/vue3-vite/src/plugins/vue-docgen.ts | 4 ++-- code/frameworks/vue3-vite/src/preset.ts | 2 +- 6 files changed, 10 insertions(+), 10 deletions(-) diff --git a/code/frameworks/react-vite/src/plugins/react-docgen.ts b/code/frameworks/react-vite/src/plugins/react-docgen.ts index ffa22b560212..46a99b7d8881 100644 --- a/code/frameworks/react-vite/src/plugins/react-docgen.ts +++ b/code/frameworks/react-vite/src/plugins/react-docgen.ts @@ -8,7 +8,7 @@ import { } from 'react-docgen'; import type { DocumentationObject } from 'react-docgen/lib/Documentation'; import MagicString from 'magic-string'; -import type { Plugin } from 'vite'; +import type { PluginOption } from 'vite'; import actualNameHandler from './docgen-handlers/actualNameHandler'; type DocObj = DocumentationObject & { actualName: string }; @@ -27,7 +27,7 @@ type Options = { export function reactDocgen({ include = /\.(mjs|tsx?|jsx?)$/, exclude = [/node_modules\/.*/], -}: Options = {}): Plugin { +}: Options = {}): PluginOption { const cwd = process.cwd(); const filter = createFilter(include, exclude); diff --git a/code/frameworks/react-vite/src/preset.ts b/code/frameworks/react-vite/src/preset.ts index bc9f83f65170..0abcdd4d9db8 100644 --- a/code/frameworks/react-vite/src/preset.ts +++ b/code/frameworks/react-vite/src/preset.ts @@ -41,9 +41,9 @@ export const viteFinal: StorybookConfig['viteFinal'] = async (config, { presets require('@joshwooding/vite-plugin-react-docgen-typescript')(reactDocgenTypescriptOptions) ); } else if (reactDocgen) { - const { reactDocgen } = await import('./plugins/react-docgen'); + const { reactDocgen: docgenPlugin } = await import('./plugins/react-docgen'); // Needs to run before the react plugin, so add to the front - plugins.unshift(reactDocgen() as any); + plugins.unshift(docgenPlugin()); } return config; diff --git a/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts b/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts index 9b0601f4c727..07f4697e0729 100644 --- a/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts +++ b/code/frameworks/svelte-vite/src/plugins/svelte-docgen.ts @@ -1,4 +1,4 @@ -import type { Plugin } from 'vite'; +import type { PluginOption } from 'vite'; import MagicString from 'magic-string'; import path from 'path'; import fs from 'fs'; @@ -42,7 +42,7 @@ function getNameFromFilename(filename: string) { return base[0].toUpperCase() + base.slice(1); } -export function svelteDocgen(svelteOptions: Record): Plugin { +export function svelteDocgen(svelteOptions: Record): PluginOption { const cwd = process.cwd(); const { preprocess: preprocessOptions, logDocgen = false } = svelteOptions; const include = /\.(svelte)$/; diff --git a/code/frameworks/svelte-vite/src/preset.ts b/code/frameworks/svelte-vite/src/preset.ts index 4e63182925a4..8006514d2fde 100644 --- a/code/frameworks/svelte-vite/src/preset.ts +++ b/code/frameworks/svelte-vite/src/preset.ts @@ -22,7 +22,7 @@ export function readPackageJson(): Record | false { export const viteFinal: StorybookConfig['viteFinal'] = async (config, { presets }) => { const { plugins = [] } = config; - plugins.push(svelteDocgen(config) as any); + plugins.push(svelteDocgen(config)); return { ...config, diff --git a/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts b/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts index 99336f939607..6bed6a1fed98 100644 --- a/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts +++ b/code/frameworks/vue3-vite/src/plugins/vue-docgen.ts @@ -1,9 +1,9 @@ import { parse } from 'vue-docgen-api'; -import type { Plugin } from 'vite'; +import type { PluginOption } from 'vite'; import { createFilter } from 'vite'; import MagicString from 'magic-string'; -export function vueDocgen(): Plugin { +export function vueDocgen(): PluginOption { const include = /\.(vue)$/; const filter = createFilter(include); diff --git a/code/frameworks/vue3-vite/src/preset.ts b/code/frameworks/vue3-vite/src/preset.ts index dc7e99dcad4c..3f35bed8b1ce 100644 --- a/code/frameworks/vue3-vite/src/preset.ts +++ b/code/frameworks/vue3-vite/src/preset.ts @@ -22,7 +22,7 @@ export function readPackageJson(): Record | false { export const viteFinal: StorybookConfig['viteFinal'] = async (config, { presets }) => { const { plugins = [] } = config; - plugins.push(vueDocgen() as any); + plugins.push(vueDocgen()); const updated = { ...config, From f79224b62108f0664ac0873f3b022ca2efeaee8c Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Mon, 5 Sep 2022 12:13:19 -0400 Subject: [PATCH 2/4] Update to vite 3.1.0 stable --- code/lib/builder-vite/package.json | 2 +- code/yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index e19b4aadb919..fe951254df2d 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -44,7 +44,7 @@ "@types/express": "^4.17.13", "@types/node": "^17.0.23", "typescript": "~4.6.3", - "vite": "3.1.0-beta.1" + "vite": "3.1.0" }, "peerDependencies": { "@storybook/mdx2-csf": "^0.0.3" diff --git a/code/yarn.lock b/code/yarn.lock index 419c3fe5f3ad..cfe0488647e7 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7728,7 +7728,7 @@ __metadata: react-docgen: ^6.0.0-alpha.0 slash: ^3.0.0 typescript: ~4.6.3 - vite: 3.1.0-beta.1 + vite: 3.1.0 peerDependencies: "@storybook/mdx2-csf": ^0.0.3 peerDependenciesMeta: @@ -44650,11 +44650,11 @@ __metadata: languageName: node linkType: hard -"vite@npm:3.1.0-beta.1": - version: 3.1.0-beta.1 - resolution: "vite@npm:3.1.0-beta.1" +"vite@npm:3.1.0": + version: 3.1.0 + resolution: "vite@npm:3.1.0" dependencies: - esbuild: ^0.14.47 + esbuild: ^0.15.6 fsevents: ~2.3.2 postcss: ^8.4.16 resolve: ^1.22.1 @@ -44678,7 +44678,7 @@ __metadata: optional: true bin: vite: bin/vite.js - checksum: 2dad78ffb2c6dff7bbeb76ba8c237c25d1b7be3b054b3958c3d2df681bacdf300abed3d2646975788254b4a9b193636541017753fd52825e946c497f45d1dd37 + checksum: 38c1a495226ebda7a3f2b341152dc01cb13cbe014a0f834c0bae2f29a6a4fefa3a18587a8d787e25e0ebbd4874da2506a87e3e37b959b26ee8a22983fed2a9e0 languageName: node linkType: hard From e1c42aeedf4f8e33e605ffe14abdbccb74e644ca Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Mon, 5 Sep 2022 22:48:28 -0400 Subject: [PATCH 3/4] Consolidate versions of vite in monorepo --- code/lib/builder-vite/package.json | 2 +- code/yarn.lock | 50 ++---------------------------- 2 files changed, 3 insertions(+), 49 deletions(-) diff --git a/code/lib/builder-vite/package.json b/code/lib/builder-vite/package.json index fe951254df2d..29a62e79fc9f 100644 --- a/code/lib/builder-vite/package.json +++ b/code/lib/builder-vite/package.json @@ -44,7 +44,7 @@ "@types/express": "^4.17.13", "@types/node": "^17.0.23", "typescript": "~4.6.3", - "vite": "3.1.0" + "vite": "^3.1.0" }, "peerDependencies": { "@storybook/mdx2-csf": "^0.0.3" diff --git a/code/yarn.lock b/code/yarn.lock index cfe0488647e7..8f92ecbc3afd 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -7728,7 +7728,7 @@ __metadata: react-docgen: ^6.0.0-alpha.0 slash: ^3.0.0 typescript: ~4.6.3 - vite: 3.1.0 + vite: ^3.1.0 peerDependencies: "@storybook/mdx2-csf": ^0.0.3 peerDependenciesMeta: @@ -39292,20 +39292,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:>=2.75.6 <2.77.0 || ~2.77.0": - version: 2.77.3 - resolution: "rollup@npm:2.77.3" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 7e04ba4e8fdbc3a4a368013e4b788044c16fe94e7301aacbf38e37210983e159b97887ddd3333be9f78fedb30264f094c111ff56a0207c21d4e1745248a7aa42 - languageName: node - linkType: hard - "rollup@npm:^2.43.1, rollup@npm:^2.60.2, rollup@npm:^2.74.1, rollup@npm:~2.78.0": version: 2.78.1 resolution: "rollup@npm:2.78.1" @@ -44618,39 +44604,7 @@ __metadata: languageName: node linkType: hard -"vite@npm:3": - version: 3.0.9 - resolution: "vite@npm:3.0.9" - dependencies: - esbuild: ^0.14.47 - fsevents: ~2.3.2 - postcss: ^8.4.16 - resolve: ^1.22.1 - rollup: ">=2.75.6 <2.77.0 || ~2.77.0" - peerDependencies: - less: "*" - sass: "*" - stylus: "*" - terser: ^5.4.0 - dependenciesMeta: - fsevents: - optional: true - peerDependenciesMeta: - less: - optional: true - sass: - optional: true - stylus: - optional: true - terser: - optional: true - bin: - vite: bin/vite.js - checksum: 0e39c11e8befd9ac139ab48ace83125bb4ad0ded14fd7c370290af8c001accbb5e67ce7677d958f5b2ffaf0a38b342ffabf166bc33aa5de32a8510ecb4596be9 - languageName: node - linkType: hard - -"vite@npm:3.1.0": +"vite@npm:3, vite@npm:^3.1.0": version: 3.1.0 resolution: "vite@npm:3.1.0" dependencies: From e20573899c0a0917642bf9ee6c64e7b29629b990 Mon Sep 17 00:00:00 2001 From: Ian VanSchooten Date: Tue, 6 Sep 2022 14:17:15 -0400 Subject: [PATCH 4/4] Keep vite versions aligned across builder/frameworks --- code/frameworks/react-vite/package.json | 2 +- code/frameworks/svelte-vite/package.json | 2 +- code/frameworks/vue3-vite/package.json | 2 +- code/yarn.lock | 52 ++---------------------- 4 files changed, 6 insertions(+), 52 deletions(-) diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index bdc6bd41b135..9a3ee123baaf 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -64,7 +64,7 @@ "devDependencies": { "@types/node": "^14.14.20 || ^16.0.0", "typescript": "~4.6.3", - "vite": "^3.0.0-beta.1" + "vite": "^3.1.0" }, "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 0d4526a46663..60cb1ab09626 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -64,7 +64,7 @@ "devDependencies": { "@types/node": "^14.14.20 || ^16.0.0", "typescript": "~4.6.3", - "vite": "^3.0.0-beta.1" + "vite": "^3.1.0" }, "engines": { "node": "^14.18 || >=16" diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index 6b2c857d835c..214e8d43d50c 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -62,7 +62,7 @@ "devDependencies": { "@types/node": "^14.14.20 || ^16.0.0", "typescript": "~4.6.3", - "vite": "^3.0.0-beta.1" + "vite": "^3.1.0" }, "engines": { "node": "^14.18 || >=16" diff --git a/code/yarn.lock b/code/yarn.lock index 4c65027b0b13..a6c9b81b81f8 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -8849,7 +8849,7 @@ __metadata: magic-string: ^0.26.1 react-docgen: ^6.0.0-alpha.3 typescript: ~4.6.3 - vite: ^3.0.0-beta.1 + 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 @@ -9326,7 +9326,7 @@ __metadata: svelte: ^3.0.0 sveltedoc-parser: ^4.2.1 typescript: ~4.6.3 - vite: ^3.0.0-beta.1 + vite: ^3.1.0 languageName: unknown linkType: soft @@ -9532,7 +9532,7 @@ __metadata: "@vitejs/plugin-vue": ^3.0.3 magic-string: ^0.26.1 typescript: ~4.6.3 - vite: ^3.0.0-beta.1 + vite: ^3.1.0 vue-docgen-api: ^4.40.0 languageName: unknown linkType: soft @@ -39049,20 +39049,6 @@ __metadata: languageName: node linkType: hard -"rollup@npm:>=2.75.6 <2.77.0 || ~2.77.0": - version: 2.77.3 - resolution: "rollup@npm:2.77.3" - dependencies: - fsevents: ~2.3.2 - dependenciesMeta: - fsevents: - optional: true - bin: - rollup: dist/bin/rollup - checksum: 7e04ba4e8fdbc3a4a368013e4b788044c16fe94e7301aacbf38e37210983e159b97887ddd3333be9f78fedb30264f094c111ff56a0207c21d4e1745248a7aa42 - languageName: node - linkType: hard - "rollup@npm:^2.43.1, rollup@npm:^2.60.2, rollup@npm:^2.74.1, rollup@npm:~2.78.0": version: 2.78.1 resolution: "rollup@npm:2.78.1" @@ -44364,38 +44350,6 @@ __metadata: languageName: node linkType: hard -"vite@npm:^3.0.0-beta.1": - version: 3.0.9 - resolution: "vite@npm:3.0.9" - dependencies: - esbuild: ^0.14.47 - fsevents: ~2.3.2 - postcss: ^8.4.16 - resolve: ^1.22.1 - rollup: ">=2.75.6 <2.77.0 || ~2.77.0" - peerDependencies: - less: "*" - sass: "*" - stylus: "*" - terser: ^5.4.0 - dependenciesMeta: - fsevents: - optional: true - peerDependenciesMeta: - less: - optional: true - sass: - optional: true - stylus: - optional: true - terser: - optional: true - bin: - vite: bin/vite.js - checksum: 0e39c11e8befd9ac139ab48ace83125bb4ad0ded14fd7c370290af8c001accbb5e67ce7677d958f5b2ffaf0a38b342ffabf166bc33aa5de32a8510ecb4596be9 - languageName: node - linkType: hard - "vite@npm:^3.1.0": version: 3.1.0 resolution: "vite@npm:3.1.0"