From 18951681b4ce6fc410c1e51ce2810b0c50ae5f48 Mon Sep 17 00:00:00 2001 From: Ahmed Tarek Date: Mon, 8 Jul 2024 23:03:02 +0300 Subject: [PATCH 01/35] docs: Update test-runner-local-build-workflow.md fix https://github.com/storybookjs/test-runner/issues/301 --- docs/_snippets/test-runner-local-build-workflow.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/_snippets/test-runner-local-build-workflow.md b/docs/_snippets/test-runner-local-build-workflow.md index ae7a76216d3f..b429c34cfaeb 100644 --- a/docs/_snippets/test-runner-local-build-workflow.md +++ b/docs/_snippets/test-runner-local-build-workflow.md @@ -22,6 +22,6 @@ jobs: run: | npx concurrently -k -s first -n "SB,TEST" -c "magenta,blue" \ "npx http-server storybook-static --port 6006 --silent" \ - "npx wait-on tcp:6006 && yarn test-storybook" + "npx wait-on tcp:127.0.0.1:6006 && yarn test-storybook" ``` From 8d7ec2409e90758173ddcb08ba877d83625f1230 Mon Sep 17 00:00:00 2001 From: William Helmrath <45471376+williamhelmrath@users.noreply.github.com> Date: Wed, 10 Jul 2024 17:48:50 -0400 Subject: [PATCH 02/35] change addon jsx to react-jsx --- code/core/assets/server/addon.tsconfig.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/core/assets/server/addon.tsconfig.json b/code/core/assets/server/addon.tsconfig.json index 38452bcdfa20..9161d5ff8254 100644 --- a/code/core/assets/server/addon.tsconfig.json +++ b/code/core/assets/server/addon.tsconfig.json @@ -1,6 +1,6 @@ { "compilerOptions": { - "jsx": "react", + "jsx": "react-jsx", "jsxImportSource": "react" } } From bac0a0b3978d328f0dee700dafa9d49e6b28d8fc Mon Sep 17 00:00:00 2001 From: Vincent de Vreede Date: Fri, 12 Jul 2024 14:25:23 +0200 Subject: [PATCH 03/35] Fix: Prevent iframe from capturing mouse events in composed Storybooks --- code/core/src/manager/components/layout/useDragging.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/core/src/manager/components/layout/useDragging.ts b/code/core/src/manager/components/layout/useDragging.ts index 4711354153b3..1c00f516c234 100644 --- a/code/core/src/manager/components/layout/useDragging.ts +++ b/code/core/src/manager/components/layout/useDragging.ts @@ -37,7 +37,7 @@ export function useDragging({ useEffect(() => { const panelResizer = panelResizerRef.current; const sidebarResizer = sidebarResizerRef.current; - const previewIframe = document.querySelector('#storybook-preview-iframe') as HTMLIFrameElement; + const previewIframe = document.querySelector('#storybook-preview-wrapper') as HTMLIFrameElement; let draggedElement: typeof panelResizer | typeof sidebarResizer | null = null; const onDragStart = (e: MouseEvent) => { From 82a133603b8547ff3f924ddbd2dc96a144ae1dde Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 12 Jul 2024 14:33:35 +0200 Subject: [PATCH 04/35] fix status in interactions panel tab --- code/addons/interactions/src/Panel.tsx | 6 +++--- code/addons/interactions/src/components/TabStatus.tsx | 7 ------- code/addons/interactions/src/manager.tsx | 4 +--- 3 files changed, 4 insertions(+), 13 deletions(-) delete mode 100644 code/addons/interactions/src/components/TabStatus.tsx diff --git a/code/addons/interactions/src/Panel.tsx b/code/addons/interactions/src/Panel.tsx index 490d1df1564c..f6e1b06b8619 100644 --- a/code/addons/interactions/src/Panel.tsx +++ b/code/addons/interactions/src/Panel.tsx @@ -180,13 +180,13 @@ export const Panel = memo<{ storyId: string }>(function PanelMemoized({ storyId }); }, [STORY_THREW_EXCEPTION]: () => { - set((s) => ({ ...s, isErrored: true })); + set((s) => ({ ...s, isErrored: true, hasException: true })); }, [PLAY_FUNCTION_THREW_EXCEPTION]: (e) => { - set((s) => ({ ...s, caughtException: e })); + set((s) => ({ ...s, caughtException: e, hasException: true })); }, [UNHANDLED_ERRORS_WHILE_PLAYING]: (e) => { - set((s) => ({ ...s, unhandledErrors: e })); + set((s) => ({ ...s, unhandledErrors: e, hasException: true })); }, }, [collapsed] diff --git a/code/addons/interactions/src/components/TabStatus.tsx b/code/addons/interactions/src/components/TabStatus.tsx deleted file mode 100644 index fc2390b5c823..000000000000 --- a/code/addons/interactions/src/components/TabStatus.tsx +++ /dev/null @@ -1,7 +0,0 @@ -import { styled } from 'storybook/internal/theming'; - -import { StatusIcon } from './StatusIcon'; - -export const TabIcon = styled(StatusIcon)({ - marginLeft: 5, -}); diff --git a/code/addons/interactions/src/manager.tsx b/code/addons/interactions/src/manager.tsx index 88b20d1d8bb1..2de5d48d8fa6 100644 --- a/code/addons/interactions/src/manager.tsx +++ b/code/addons/interactions/src/manager.tsx @@ -2,10 +2,8 @@ import React, { useCallback } from 'react'; import type { Combo } from 'storybook/internal/manager-api'; import { addons, Consumer, types, useAddonState } from 'storybook/internal/manager-api'; import { AddonPanel, Badge, Spaced } from 'storybook/internal/components'; -import { CallStates } from '@storybook/instrumenter'; import { ADDON_ID, PANEL_ID } from './constants'; import { Panel } from './Panel'; -import { TabIcon } from './components/TabStatus'; function Title() { const [addonState = {}] = useAddonState(ADDON_ID); @@ -18,7 +16,7 @@ function Title() { {interactionsCount && !hasException ? ( {interactionsCount} ) : null} - {hasException ? : null} + {hasException ? {interactionsCount} : null} ); From b8209a053a73f42270e2f56cf5798dedf7dba859 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 12 Jul 2024 17:32:19 +0200 Subject: [PATCH 05/35] add "missing-storybook-dependencies" automigration --- code/lib/cli/src/automigrate/fixes/index.ts | 2 + .../missing-storybook-dependencies.test.ts | 119 ++++++++++++++++++ .../fixes/missing-storybook-dependencies.ts | 112 +++++++++++++++++ 3 files changed, 233 insertions(+) create mode 100644 code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts create mode 100644 code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts diff --git a/code/lib/cli/src/automigrate/fixes/index.ts b/code/lib/cli/src/automigrate/fixes/index.ts index 3d68c5eec7c7..531606a6d095 100644 --- a/code/lib/cli/src/automigrate/fixes/index.ts +++ b/code/lib/cli/src/automigrate/fixes/index.ts @@ -30,10 +30,12 @@ import { vta } from './vta'; import { upgradeStorybookRelatedDependencies } from './upgrade-storybook-related-dependencies'; import { autodocsTags } from './autodocs-tags'; import { initialGlobals } from './initial-globals'; +import { missingStorybookDependencies } from './missing-storybook-dependencies'; export * from '../types'; export const allFixes: Fix[] = [ + missingStorybookDependencies, addonsAPI, newFrameworks, cra5, diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts new file mode 100644 index 000000000000..e437fa7c2aa3 --- /dev/null +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -0,0 +1,119 @@ +import { describe, expect, vi, it } from 'vitest'; +import type { JsPackageManager } from '@storybook/core/common'; + +import { missingStorybookDependencies } from './missing-storybook-dependencies'; +import { beforeEach } from 'node:test'; + +vi.mock('globby', () => ({ + __esModule: true, + globby: vi.fn().mockResolvedValue(['.storybook/manager.ts', 'path/to/file.stories.tsx']), +})); + +vi.mock('node:fs/promises', () => ({ + __esModule: true, + readFile: vi.fn().mockResolvedValue(` + // these are NOT installed, will be reported + import { someFunction } from '@storybook/preview-api'; + import { anotherFunction } from '@storybook/manager-api'; + import { SomeError } from '@storybook/core-events/server-errors'; + // this IS installed, will not be reported + import { yetAnotherFunction } from '@storybook/theming'; + `), +})); + +vi.mock('../../helpers', () => ({ + getStorybookVersionSpecifier: vi.fn().mockReturnValue('^8.1.10'), +})); + +const check = async ({ + packageManager, + storybookVersion = '8.1.10', +}: { + packageManager: JsPackageManager; + storybookVersion?: string; +}) => { + return missingStorybookDependencies.check({ + packageManager, + mainConfig: {} as any, + storybookVersion, + }); +}; + +describe('missingStorybookDependencies', () => { + beforeEach(() => { + vi.restoreAllMocks(); + }); + + const mockPackageManager = { + findInstallations: vi.fn().mockResolvedValue({ + dependencies: { + '@storybook/react': '8.1.0', + '@storybook/theming': '8.1.0', + }, + }), + retrievePackageJson: vi.fn().mockResolvedValue({ + dependencies: { + '@storybook/core': '8.1.0', + }, + }), + addDependencies: vi.fn().mockResolvedValue(undefined), + } as Partial; + + describe('check function', () => { + it('should identify missing dependencies', async () => { + const result = await check({ + packageManager: mockPackageManager as JsPackageManager, + }); + + expect(Object.keys(result!.packageUsage)).not.includes('@storybook/theming'); + expect(result).toEqual({ + packageUsage: { + '@storybook/preview-api': ['.storybook/manager.ts', 'path/to/file.stories.tsx'], + '@storybook/manager-api': ['.storybook/manager.ts', 'path/to/file.stories.tsx'], + '@storybook/core-events': ['.storybook/manager.ts', 'path/to/file.stories.tsx'], + }, + }); + }); + }); + + describe('prompt function', () => { + it('should provide a proper message with the missing dependencies', () => { + const packageUsage = { + '@storybook/preview-api': ['.storybook/manager.ts'], + '@storybook/manager-api': ['path/to/file.stories.tsx'], + }; + const message = missingStorybookDependencies.prompt({ packageUsage }); + + // @ts-expect-error not sure why the type is not augmented + expect(message).toMatchInlineSnapshot(` + "Found usage of the following Storybook packages, but they are not present in your project dependencies: + - @storybook/preview-api: (1 file) + - @storybook/manager-api: (1 file) + + Not having them directly installed will cause breakage in your project, and we can fix this by adding them to your dependencies." + `); + }); + }); + + describe('run function', () => { + it('should add missing dependencies', async () => { + const dryRun = false; + const packageUsage = { + '@storybook/preview-api': ['.storybook/manager.ts'], + '@storybook/manager-api': ['path/to/file.stories.tsx'], + }; + + await missingStorybookDependencies.run!({ + result: { packageUsage }, + dryRun, + packageManager: mockPackageManager as JsPackageManager, + mainConfigPath: 'path/to/main-config.js', + }); + + expect(mockPackageManager.addDependencies).toHaveBeenCalledWith( + { installAsDevDependencies: true }, + ['@storybook/preview-api@^8.1.10', '@storybook/manager-api@^8.1.10'] + ); + }); + }); +}); diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts new file mode 100644 index 000000000000..94d696ae78f3 --- /dev/null +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -0,0 +1,112 @@ +import chalk from 'chalk'; +import { readFile } from 'node:fs/promises'; +import { dedent } from 'ts-dedent'; + +import type { Fix } from '../types'; +import { getStorybookVersionSpecifier } from '../../helpers'; + +const logger = console; + +type PackageUsage = Record; + +interface MissingStorybookDependenciesOptions { + packageUsage: PackageUsage; +} + +const consolidatedPackages = [ + '@storybook/channels', + '@storybook/client-logger', + '@storybook/core-common', + '@storybook/core-events', + '@storybook/csf-tools', + '@storybook/docs-tools', + '@storybook/node-logger', + '@storybook/preview-api', + '@storybook/router', + '@storybook/telemetry', + '@storybook/theming', + '@storybook/types', + '@storybook/manager-api', + '@storybook/manager', + '@storybook/preview', + '@storybook/core-server', + '@storybook/builder-manager', + '@storybook/components', +]; + +/** + * Find usage of Storybook packages in the project files which are not present in the dependencies. + */ +export const missingStorybookDependencies: Fix = { + id: 'missingStorybookDependencies', + promptType: 'auto', + versionRange: ['*', '*'], + + async check({ packageManager }) { + // Dynamically import globby because it is a pure ESM module + const { globby } = await import('globby'); + + const result = await packageManager.findInstallations(consolidatedPackages); + if (!result) { + return null; + } + + const installedDependencies = Object.keys(result.dependencies); + const dependenciesToCheck = consolidatedPackages.filter( + (pkg) => !installedDependencies.includes(pkg) + ); + + const patterns = ['**/.storybook/*', '**/*.stories.*', '**/*.story.*']; + + const files = await globby(patterns, { + ignore: ['**/node_modules/**'], + }); + const packageUsage: PackageUsage = {}; + + for (const file of files) { + const content = await readFile(file, 'utf-8'); + dependenciesToCheck.forEach((pkg) => { + // match imports like @storybook/theming or @storybook/theming/create + const regex = new RegExp(`['"]${pkg}(/[^'"]*)?['"]`); + if (regex.test(content)) { + if (!packageUsage[pkg]) { + packageUsage[pkg] = []; + } + packageUsage[pkg].push(file); + } + }); + } + + return Object.keys(packageUsage).length > 0 ? { packageUsage } : null; + }, + + prompt({ packageUsage }) { + return dedent` + Found usage of the following Storybook packages, but they are not present in your project dependencies: + ${Object.entries(packageUsage) + .map( + ([pkg, files]) => + `- ${chalk.cyan(pkg)}: (${files.length} ${files.length === 1 ? 'file' : 'files'})` + ) + .join('\n')} + + Not having them directly installed will cause breakage in your project, and we can fix this by adding them to your dependencies. + `; + }, + + async run({ result: { packageUsage }, dryRun, packageManager }) { + logger.info( + `✅ Installing the following packages as devDependencies: ${Object.keys(packageUsage)}` + ); + if (!dryRun) { + const dependenciesToInstall = Object.keys(packageUsage); + const versionToInstall = getStorybookVersionSpecifier( + await packageManager.retrievePackageJson() + ); + await packageManager.addDependencies( + { installAsDevDependencies: true }, + dependenciesToInstall.map((pkg) => `${pkg}@${versionToInstall}`) + ); + } + }, +}; From 780f1b9e12674f1b663f9a649e289988c727802a Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 12 Jul 2024 17:52:49 +0200 Subject: [PATCH 06/35] second pass, use shallow depth in checks --- .../js-package-manager/JsPackageManager.ts | 4 ++ .../src/common/js-package-manager/NPMProxy.ts | 10 ++-- .../common/js-package-manager/PNPMProxy.ts | 18 ++++---- .../common/js-package-manager/Yarn1Proxy.ts | 22 +++++---- .../common/js-package-manager/Yarn2Proxy.ts | 22 +++++---- .../missing-storybook-dependencies.test.ts | 8 +++- .../fixes/missing-storybook-dependencies.ts | 46 ++++++++++++++++++- 7 files changed, 97 insertions(+), 33 deletions(-) diff --git a/code/core/src/common/js-package-manager/JsPackageManager.ts b/code/core/src/common/js-package-manager/JsPackageManager.ts index 66ac85860e72..1000cc7bf174 100644 --- a/code/core/src/common/js-package-manager/JsPackageManager.ts +++ b/code/core/src/common/js-package-manager/JsPackageManager.ts @@ -500,6 +500,10 @@ export abstract class JsPackageManager { stdio?: 'inherit' | 'pipe' ): string; public abstract findInstallations(pattern?: string[]): Promise; + public abstract findInstallations( + pattern?: string[], + options?: { depth: number } + ): Promise; public abstract parseErrorFromLogs(logs?: string): string; public executeCommandSync({ diff --git a/code/core/src/common/js-package-manager/NPMProxy.ts b/code/core/src/common/js-package-manager/NPMProxy.ts index 09379285d276..ff77aedfa95a 100644 --- a/code/core/src/common/js-package-manager/NPMProxy.ts +++ b/code/core/src/common/js-package-manager/NPMProxy.ts @@ -132,12 +132,12 @@ export class NPMProxy extends JsPackageManager { }); } - public async findInstallations(pattern: string[]) { - const exec = async ({ depth }: { depth: number }) => { + public async findInstallations(pattern: string[], { depth = 99 }: { depth?: number } = {}) { + const exec = async ({ packageDepth }: { packageDepth: number }) => { const pipeToNull = platform() === 'win32' ? '2>NUL' : '2>/dev/null'; return this.executeCommand({ command: 'npm', - args: ['ls', '--json', `--depth=${depth}`, pipeToNull], + args: ['ls', '--json', `--depth=${packageDepth}`, pipeToNull], env: { FORCE_COLOR: 'false', }, @@ -145,7 +145,7 @@ export class NPMProxy extends JsPackageManager { }; try { - const commandResult = await exec({ depth: 99 }); + const commandResult = await exec({ packageDepth: depth }); const parsedOutput = JSON.parse(commandResult); return this.mapDependencies(parsedOutput, pattern); @@ -153,7 +153,7 @@ export class NPMProxy extends JsPackageManager { // when --depth is higher than 0, npm can return a non-zero exit code // in case the user's project has peer dependency issues. So we try again with no depth try { - const commandResult = await exec({ depth: 0 }); + const commandResult = await exec({ packageDepth: 0 }); const parsedOutput = JSON.parse(commandResult); return this.mapDependencies(parsedOutput, pattern); diff --git a/code/core/src/common/js-package-manager/PNPMProxy.ts b/code/core/src/common/js-package-manager/PNPMProxy.ts index c44172aebb86..41c2858763c8 100644 --- a/code/core/src/common/js-package-manager/PNPMProxy.ts +++ b/code/core/src/common/js-package-manager/PNPMProxy.ts @@ -98,16 +98,16 @@ export class PNPMProxy extends JsPackageManager { }); } - public async findInstallations(pattern: string[]) { - const commandResult = await this.executeCommand({ - command: 'pnpm', - args: ['list', pattern.map((p) => `"${p}"`).join(' '), '--json', '--depth=99'], - env: { - FORCE_COLOR: 'false', - }, - }); - + public async findInstallations(pattern: string[], { depth = 99 }: { depth?: number } = {}) { try { + const commandResult = await this.executeCommand({ + command: 'pnpm', + args: ['list', pattern.map((p) => `"${p}"`).join(' '), '--json', `--depth=${depth}`], + env: { + FORCE_COLOR: 'false', + }, + }); + const parsedOutput = JSON.parse(commandResult); return this.mapDependencies(parsedOutput, pattern); } catch (e) { diff --git a/code/core/src/common/js-package-manager/Yarn1Proxy.ts b/code/core/src/common/js-package-manager/Yarn1Proxy.ts index 9924afd0fb91..b193d4db4f15 100644 --- a/code/core/src/common/js-package-manager/Yarn1Proxy.ts +++ b/code/core/src/common/js-package-manager/Yarn1Proxy.ts @@ -83,16 +83,22 @@ export class Yarn1Proxy extends JsPackageManager { return JSON.parse(readFileSync(packageJsonPath, 'utf-8')) as Record; } - public async findInstallations(pattern: string[]) { - const commandResult = await this.executeCommand({ - command: 'yarn', - args: ['list', '--pattern', pattern.map((p) => `"${p}"`).join(' '), '--recursive', '--json'], - env: { - FORCE_COLOR: 'false', - }, - }); + public async findInstallations(pattern: string[], { depth = 99 }: { depth?: number } = {}) { + const yarnArgs = ['list', '--pattern', pattern.map((p) => `"${p}"`).join(' '), '--json']; + + if (depth !== 0) { + yarnArgs.push('--recursive'); + } try { + const commandResult = await this.executeCommand({ + command: 'yarn', + args: yarnArgs.concat(pattern), + env: { + FORCE_COLOR: 'false', + }, + }); + const parsedOutput = JSON.parse(commandResult); return this.mapDependencies(parsedOutput, pattern); } catch (e) { diff --git a/code/core/src/common/js-package-manager/Yarn2Proxy.ts b/code/core/src/common/js-package-manager/Yarn2Proxy.ts index 0f824262df21..7917bc7e1ebd 100644 --- a/code/core/src/common/js-package-manager/Yarn2Proxy.ts +++ b/code/core/src/common/js-package-manager/Yarn2Proxy.ts @@ -120,16 +120,22 @@ export class Yarn2Proxy extends JsPackageManager { return this.executeCommand({ command: 'yarn', args: [command, ...args], cwd }); } - public async findInstallations(pattern: string[]) { - const commandResult = await this.executeCommand({ - command: 'yarn', - args: ['info', '--name-only', '--recursive', ...pattern], - env: { - FORCE_COLOR: 'false', - }, - }); + public async findInstallations(pattern: string[], { depth = 99 }: { depth?: number } = {}) { + const yarnArgs = ['info', '--name-only']; + + if (depth !== 0) { + yarnArgs.push('--recursive'); + } try { + const commandResult = await this.executeCommand({ + command: 'yarn', + args: yarnArgs.concat(pattern), + env: { + FORCE_COLOR: 'false', + }, + }); + return this.mapDependencies(commandResult, pattern); } catch (e) { return undefined; diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index e437fa7c2aa3..319ea1081ee3 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -110,8 +110,14 @@ describe('missingStorybookDependencies', () => { mainConfigPath: 'path/to/main-config.js', }); - expect(mockPackageManager.addDependencies).toHaveBeenCalledWith( + expect(mockPackageManager.addDependencies).toHaveBeenNthCalledWith( + 1, { installAsDevDependencies: true }, + ['@storybook/preview-api@8.1.10', '@storybook/manager-api@8.1.10'] + ); + expect(mockPackageManager.addDependencies).toHaveBeenNthCalledWith( + 2, + { installAsDevDependencies: true, skipInstall: true, packageJson: expect.anything() }, ['@storybook/preview-api@^8.1.10', '@storybook/manager-api@^8.1.10'] ); }); diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts index 94d696ae78f3..1b8450942303 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -4,6 +4,7 @@ import { dedent } from 'ts-dedent'; import type { Fix } from '../types'; import { getStorybookVersionSpecifier } from '../../helpers'; +import type { InstallationMetadata, JsPackageManager } from '@storybook/core/common'; const logger = console; @@ -34,6 +35,30 @@ const consolidatedPackages = [ '@storybook/components', ]; +async function checkInstallations( + packageManager: JsPackageManager, + packages: string[] +): Promise { + let result: Record = {}; + + // go through each package and get installation info at depth 0 to make sure + // the dependency is directly installed, else they could come from other dependencies + const promises = packages.map((pkg) => packageManager.findInstallations([pkg], { depth: 0 })); + + const analyses = await Promise.all(promises); + + analyses.forEach((analysis) => { + if (analysis?.dependencies) { + result = { + ...result, + ...analysis.dependencies, + }; + } + }); + + return result; +} + /** * Find usage of Storybook packages in the project files which are not present in the dependencies. */ @@ -46,12 +71,12 @@ export const missingStorybookDependencies: Fix !installedDependencies.includes(pkg) ); @@ -103,8 +128,25 @@ export const missingStorybookDependencies: Fix `${pkg}@${versionToInstallWithoutModifiers}`) + ); + const packageJson = await packageManager.retrievePackageJson(); + await packageManager.addDependencies( + { installAsDevDependencies: true, skipInstall: true, packageJson }, dependenciesToInstall.map((pkg) => `${pkg}@${versionToInstall}`) ); } From 24215f0861925739bc2c0e949032624dcf1b123a Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 12 Jul 2024 17:53:55 +0200 Subject: [PATCH 07/35] update error message --- .../fixes/missing-storybook-dependencies.test.ts | 6 ++++-- .../src/automigrate/fixes/missing-storybook-dependencies.ts | 6 ++++-- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 319ea1081ee3..ca8704bd7974 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -86,11 +86,13 @@ describe('missingStorybookDependencies', () => { // @ts-expect-error not sure why the type is not augmented expect(message).toMatchInlineSnapshot(` - "Found usage of the following Storybook packages, but they are not present in your project dependencies: + "Found the following Storybook packages used in your project, but they are missing from your project dependencies: - @storybook/preview-api: (1 file) - @storybook/manager-api: (1 file) - Not having them directly installed will cause breakage in your project, and we can fix this by adding them to your dependencies." + Referencing missing packages can cause your project to crash. We can automatically add them to your dependencies. + + More info: https://github.com/storybookjs/storybook/blob/next/MIGRATION.md#failed-to-resolve-import-storybookx-error" `); }); }); diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts index 1b8450942303..e7d032c062dc 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -107,7 +107,7 @@ export const missingStorybookDependencies: Fix @@ -115,7 +115,9 @@ export const missingStorybookDependencies: Fix Date: Fri, 12 Jul 2024 18:36:57 +0200 Subject: [PATCH 08/35] fix vitest imports --- .../automigrate/fixes/missing-storybook-dependencies.test.ts | 3 +-- code/lib/cli/src/automigrate/index.test.ts | 3 +-- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index ca8704bd7974..abe0f29a6cff 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -1,8 +1,7 @@ -import { describe, expect, vi, it } from 'vitest'; +import { describe, expect, vi, it, beforeEach } from 'vitest'; import type { JsPackageManager } from '@storybook/core/common'; import { missingStorybookDependencies } from './missing-storybook-dependencies'; -import { beforeEach } from 'node:test'; vi.mock('globby', () => ({ __esModule: true, diff --git a/code/lib/cli/src/automigrate/index.test.ts b/code/lib/cli/src/automigrate/index.test.ts index b7fc079655cd..7e5c7dacfb94 100644 --- a/code/lib/cli/src/automigrate/index.test.ts +++ b/code/lib/cli/src/automigrate/index.test.ts @@ -1,8 +1,7 @@ -import { vi, it, expect, describe, beforeEach } from 'vitest'; +import { vi, it, expect, describe, beforeEach, afterEach } from 'vitest'; import { runFixes } from './index'; import type { Fix } from './types'; import type { JsPackageManager, PackageJsonWithDepsAndDevDeps } from '@storybook/core/common'; -import { afterEach } from 'node:test'; const check1 = vi.fn(); const run1 = vi.fn(); From 08603e885dce6bd04becd3f0593397245d0ecb1b Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Fri, 12 Jul 2024 18:42:02 +0200 Subject: [PATCH 09/35] add specific version ranges --- .../cli/src/automigrate/fixes/missing-storybook-dependencies.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts index e7d032c062dc..9830126440d6 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -65,7 +65,7 @@ async function checkInstallations( export const missingStorybookDependencies: Fix = { id: 'missingStorybookDependencies', promptType: 'auto', - versionRange: ['*', '*'], + versionRange: ['<8.2', '>=8.2'], async check({ packageManager }) { // Dynamically import globby because it is a pure ESM module From c9ea81485d03f492321298c2dafa262f2dba2da7 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 12 Jul 2024 22:58:44 +0200 Subject: [PATCH 10/35] fix ts error --- .../src/automigrate/fixes/missing-storybook-dependencies.test.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index abe0f29a6cff..3f55f77ad228 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -83,7 +83,6 @@ describe('missingStorybookDependencies', () => { }; const message = missingStorybookDependencies.prompt({ packageUsage }); - // @ts-expect-error not sure why the type is not augmented expect(message).toMatchInlineSnapshot(` "Found the following Storybook packages used in your project, but they are missing from your project dependencies: - @storybook/preview-api: (1 file) From c269e84035bbb1a71c760bb7447fca393de9bd2c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 12 Jul 2024 23:11:27 +0200 Subject: [PATCH 11/35] fix tests --- .../automigrate/fixes/missing-storybook-dependencies.test.ts | 4 ---- 1 file changed, 4 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 3f55f77ad228..5295690f9b23 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -39,10 +39,6 @@ const check = async ({ }; describe('missingStorybookDependencies', () => { - beforeEach(() => { - vi.restoreAllMocks(); - }); - const mockPackageManager = { findInstallations: vi.fn().mockResolvedValue({ dependencies: { From 8467592d9ce225122ccaf471b19b23534c6f4639 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Fri, 12 Jul 2024 23:42:00 +0200 Subject: [PATCH 12/35] create consistent reporting (seems there sort ordering race condition) --- .../automigrate/fixes/missing-storybook-dependencies.test.ts | 2 +- .../src/automigrate/fixes/missing-storybook-dependencies.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 5295690f9b23..80917d1dfe9e 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -81,8 +81,8 @@ describe('missingStorybookDependencies', () => { expect(message).toMatchInlineSnapshot(` "Found the following Storybook packages used in your project, but they are missing from your project dependencies: - - @storybook/preview-api: (1 file) - @storybook/manager-api: (1 file) + - @storybook/preview-api: (1 file) Referencing missing packages can cause your project to crash. We can automatically add them to your dependencies. diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts index 9830126440d6..cdc9bf0fe505 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.ts @@ -76,7 +76,7 @@ export const missingStorybookDependencies: Fix !installedDependencies.includes(pkg) ); @@ -113,6 +113,7 @@ export const missingStorybookDependencies: Fix `- ${chalk.cyan(pkg)}: (${files.length} ${files.length === 1 ? 'file' : 'files'})` ) + .sort() .join('\n')} Referencing missing packages can cause your project to crash. We can automatically add them to your dependencies. From 68d17f11e5122ac77e23f44f2e596b824a65671f Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Sat, 13 Jul 2024 00:10:11 +0200 Subject: [PATCH 13/35] chalk not putting in colors in CI causing snapshot differences --- .../fixes/missing-storybook-dependencies.test.ts | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts index 80917d1dfe9e..52f0e42d8ff0 100644 --- a/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts +++ b/code/lib/cli/src/automigrate/fixes/missing-storybook-dependencies.test.ts @@ -1,5 +1,6 @@ import { describe, expect, vi, it, beforeEach } from 'vitest'; import type { JsPackageManager } from '@storybook/core/common'; +import stripAnsi from 'strip-ansi'; import { missingStorybookDependencies } from './missing-storybook-dependencies'; @@ -77,12 +78,13 @@ describe('missingStorybookDependencies', () => { '@storybook/preview-api': ['.storybook/manager.ts'], '@storybook/manager-api': ['path/to/file.stories.tsx'], }; + const message = missingStorybookDependencies.prompt({ packageUsage }); - expect(message).toMatchInlineSnapshot(` + expect(stripAnsi(message)).toMatchInlineSnapshot(` "Found the following Storybook packages used in your project, but they are missing from your project dependencies: - - @storybook/manager-api: (1 file) - - @storybook/preview-api: (1 file) + - @storybook/manager-api: (1 file) + - @storybook/preview-api: (1 file) Referencing missing packages can cause your project to crash. We can automatically add them to your dependencies. From 33b487f1e71bb91382c3842397cfe35e1dc62d41 Mon Sep 17 00:00:00 2001 From: Lars Rickert Date: Sat, 13 Jul 2024 18:52:26 +0200 Subject: [PATCH 14/35] fix(vue-component-meta): fix out of memory issue --- .../src/plugins/vue-component-meta.ts | 19 +++++++++++++++++++ .../vue3/src/docs/extractArgTypes.ts | 12 +++--------- 2 files changed, 22 insertions(+), 9 deletions(-) diff --git a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts index 54ac30cbb9dd..d5d3e96bfa64 100644 --- a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts +++ b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts @@ -50,6 +50,25 @@ export async function vueComponentMeta(tsconfigPath = 'tsconfig.json'): Promise< const exportName = exportNames[index]; + // we remove nested object schemas here since they are not used inside Storybook (we don't generate controls for object properties) + // and they can cause "out of memory" issues for large/complex schemas (e.g. HTMLElement) + // it also reduced the bundle size when running "Storybook build" when such schemas are used + (['props', 'exposed'] as const).forEach((key) => { + meta[key].forEach((value) => { + if (typeof value.schema !== 'object') return; + + // we need to use Object.defineProperty here since schema is a getter so we can not set it directly + Object.defineProperty(value, 'schema', { + configurable: true, + enumerable: true, + value: { + kind: value.schema.kind, + type: value.schema.type, + }, + }); + }); + }); + const exposed = // the meta also includes duplicated entries in the "exposed" array with "on" // prefix (e.g. onClick instead of click), so we need to filter them out here diff --git a/code/renderers/vue3/src/docs/extractArgTypes.ts b/code/renderers/vue3/src/docs/extractArgTypes.ts index 76c52cc755a7..164f5957e693 100644 --- a/code/renderers/vue3/src/docs/extractArgTypes.ts +++ b/code/renderers/vue3/src/docs/extractArgTypes.ts @@ -1,3 +1,4 @@ +import type { VueDocgenInfo, VueDocgenInfoEntry, VueDocgenPlugin } from '@storybook/vue3-vite'; import type { ExtractedProp } from 'storybook/internal/docs-tools'; import { convert, @@ -6,7 +7,6 @@ import { type ArgTypesExtractor, } from 'storybook/internal/docs-tools'; import type { SBType, StrictArgTypes, StrictInputType } from 'storybook/internal/types'; -import type { VueDocgenInfo, VueDocgenInfoEntry, VueDocgenPlugin } from '@storybook/vue3-vite'; type PropertyMetaSchema = VueDocgenInfoEntry<'vue-component-meta', 'props'>['schema']; @@ -283,17 +283,11 @@ export const convertVueComponentMetaProp = ( }; } - // recursively/deeply convert all properties of the object case 'object': return { name: 'object', - value: Object.entries(schema.schema ?? {}).reduce>( - (obj, [propName, propSchema]) => { - obj[propName] = convertVueComponentMetaProp(propSchema); - return obj; - }, - {} - ), + // Storybook does not generate controls for object properties so we don't need to recursively map the object schema here + value: {}, required, }; From 70a6a41b0fdb504f2c79ed8ab49038bb187f122c Mon Sep 17 00:00:00 2001 From: Lars Rickert Date: Sat, 13 Jul 2024 19:08:59 +0200 Subject: [PATCH 15/35] update comment --- code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts index d5d3e96bfa64..a263635a44f8 100644 --- a/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts +++ b/code/frameworks/vue3-vite/src/plugins/vue-component-meta.ts @@ -64,6 +64,7 @@ export async function vueComponentMeta(tsconfigPath = 'tsconfig.json'): Promise< value: { kind: value.schema.kind, type: value.schema.type, + // note that value.schema.schema is not included here (see comment above) }, }); }); From ebe47fff6e842b2c5a92b0c15a7045b3e3ec63df Mon Sep 17 00:00:00 2001 From: Lars Rickert Date: Sat, 13 Jul 2024 20:35:20 +0200 Subject: [PATCH 16/35] fix test --- .../extractArgTypes.test.ts.snap | 61 +++---------------- 1 file changed, 8 insertions(+), 53 deletions(-) diff --git a/code/renderers/vue3/src/docs/__snapshots__/extractArgTypes.test.ts.snap b/code/renderers/vue3/src/docs/__snapshots__/extractArgTypes.test.ts.snap index cbe74a47b7d6..39e2654bcff4 100644 --- a/code/renderers/vue3/src/docs/__snapshots__/extractArgTypes.test.ts.snap +++ b/code/renderers/vue3/src/docs/__snapshots__/extractArgTypes.test.ts.snap @@ -157,12 +157,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "value": { "name": "object", "required": false, - "value": { - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, }, }, @@ -183,12 +178,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "value": { "name": "object", "required": false, - "value": { - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, }, }, @@ -279,12 +269,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "type": { "name": "object", "required": true, - "value": { - "foo": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, }, "literalFromContext": { @@ -325,12 +310,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "type": { "name": "object", "required": true, - "value": { - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, }, "nestedIntersection": { @@ -347,16 +327,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "type": { "name": "object", "required": true, - "value": { - "additionalProp": { - "name": "string", - "required": true, - }, - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, }, "nestedOptional": { @@ -377,22 +348,12 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 { "name": "object", "required": false, - "value": { - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, { "name": "object", "required": false, - "value": { - "nestedProp": { - "name": "string", - "required": true, - }, - }, + "value": {}, }, ], }, @@ -411,13 +372,7 @@ exports[`extractArgTypes (vue-docgen-api) > should extract props for component 1 "type": { "name": "object", "required": false, - "value": { - "recursive": { - "name": "other", - "required": true, - "value": "MyNestedRecursiveProps", - }, - }, + "value": {}, }, }, "stringArray": { From 91e53a9cc700d0cba78260234da52d990974c855 Mon Sep 17 00:00:00 2001 From: Danny Kim <0916dhkim@gmail.com> Date: Sat, 13 Jul 2024 18:47:58 -0400 Subject: [PATCH 17/35] Add header for MountMustBeDestructuredError message --- code/core/src/preview-errors.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/code/core/src/preview-errors.ts b/code/core/src/preview-errors.ts index 31341bb6132c..c1d070f7c10a 100644 --- a/code/core/src/preview-errors.ts +++ b/code/core/src/preview-errors.ts @@ -214,6 +214,7 @@ export class MountMustBeDestructuredError extends StorybookError { category: Category.PREVIEW_API, code: 12, message: dedent` + Incorrect use of mount in the play function. To use mount in the play function, you must satisfy the following two requirements: From 1a8a0bf583781d8729e00c2e3b55f66c1570bc6c Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 15 Jul 2024 11:57:38 +0200 Subject: [PATCH 18/35] add direct dependencies on shim packages to ensure they exists --- code/renderers/html/package.json | 4 +++ code/renderers/preact/package.json | 4 +++ code/renderers/react/package.json | 4 +++ code/renderers/server/package.json | 4 +++ code/renderers/svelte/package.json | 4 +++ code/renderers/vue3/package.json | 4 +++ code/renderers/web-components/package.json | 4 +++ code/yarn.lock | 36 +++++++++++++++++++--- 8 files changed, 60 insertions(+), 4 deletions(-) diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index c2d343158949..66dc2ae7b0b2 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -47,7 +47,11 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index a0b2eaab393c..37a3f71ca970 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -47,7 +47,11 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "ts-dedent": "^2.0.0" }, "devDependencies": { diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index a6d18e19fe71..19ade57fedf1 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -64,8 +64,12 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", "@storybook/react-dom-shim": "workspace:*", + "@storybook/theming": "workspace:^", "@types/escodegen": "^0.0.6", "@types/estree": "^0.0.51", "@types/node": "^18.0.0", diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index 6de70a27ee24..01ce95136d61 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -46,8 +46,12 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/csf": "0.1.11", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "@types/fs-extra": "^11.0.1", "fs-extra": "^11.1.0", "ts-dedent": "^2.0.0", diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index 259b7e982f9b..a5076f7b8972 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -57,7 +57,11 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "sveltedoc-parser": "^4.2.1", "ts-dedent": "^2.0.0", "type-fest": "~2.19" diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index 4f3e08eacd5f..ff2881aadbe2 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -63,7 +63,11 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "@vue/compiler-core": "^3.0.0", "lodash": "^4.17.21", "ts-dedent": "^2.0.0", diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index d6815d095dac..4287094def3b 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -50,7 +50,11 @@ "prep": "node --loader ../../../scripts/node_modules/esbuild-register/loader.js -r ../../../scripts/node_modules/esbuild-register/register.js ../../../scripts/prepare/bundle.ts" }, "dependencies": { + "@storybook/components": "workspace:^", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "tiny-invariant": "^1.3.1", "ts-dedent": "^2.0.0" }, diff --git a/code/yarn.lock b/code/yarn.lock index 9ff47ee2f2dd..51407930a69a 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5688,7 +5688,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/components@workspace:deprecated/components": +"@storybook/components@workspace:^, @storybook/components@workspace:deprecated/components": version: 0.0.0-use.local resolution: "@storybook/components@workspace:deprecated/components" peerDependencies: @@ -6000,7 +6000,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/html@workspace:renderers/html" dependencies: + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" ts-dedent: "npm:^2.0.0" typescript: "npm:^5.3.2" peerDependencies: @@ -6058,7 +6062,7 @@ __metadata: languageName: node linkType: hard -"@storybook/manager-api@workspace:deprecated/manager-api": +"@storybook/manager-api@workspace:^, @storybook/manager-api@workspace:deprecated/manager-api": version: 0.0.0-use.local resolution: "@storybook/manager-api@workspace:deprecated/manager-api" peerDependencies: @@ -6187,7 +6191,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/preact@workspace:renderers/preact" dependencies: + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" preact: "npm:^10.5.13" ts-dedent: "npm:^2.0.0" typescript: "npm:^5.3.2" @@ -6327,7 +6335,7 @@ __metadata: languageName: unknown linkType: soft -"@storybook/preview-api@workspace:deprecated/preview-api": +"@storybook/preview-api@workspace:^, @storybook/preview-api@workspace:deprecated/preview-api": version: 0.0.0-use.local resolution: "@storybook/preview-api@workspace:deprecated/preview-api" peerDependencies: @@ -6420,9 +6428,13 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/react@workspace:renderers/react" dependencies: + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" "@storybook/react-dom-shim": "workspace:*" "@storybook/test": "workspace:*" + "@storybook/theming": "workspace:^" "@types/babel-plugin-react-docgen": "npm:^4" "@types/escodegen": "npm:^0.0.6" "@types/estree": "npm:^0.0.51" @@ -6626,8 +6638,12 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/server@workspace:renderers/server" dependencies: + "@storybook/components": "workspace:^" "@storybook/csf": "npm:0.1.11" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" "@types/fs-extra": "npm:^11.0.1" fs-extra: "npm:^11.1.0" ts-dedent: "npm:^2.0.0" @@ -6696,7 +6712,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/svelte@workspace:renderers/svelte" dependencies: + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" "@sveltejs/vite-plugin-svelte": "npm:^3.0.2" "@testing-library/jest-dom": "npm:^6.4.1" "@testing-library/svelte": "patch:@testing-library/svelte@npm%3A4.1.0#~/.yarn/patches/@testing-library-svelte-npm-4.1.0-34b7037bc0.patch" @@ -6773,7 +6793,7 @@ __metadata: languageName: node linkType: hard -"@storybook/theming@workspace:*, @storybook/theming@workspace:deprecated/theming": +"@storybook/theming@workspace:*, @storybook/theming@workspace:^, @storybook/theming@workspace:deprecated/theming": version: 0.0.0-use.local resolution: "@storybook/theming@workspace:deprecated/theming" peerDependencies: @@ -6832,7 +6852,11 @@ __metadata: resolution: "@storybook/vue3@workspace:renderers/vue3" dependencies: "@digitak/esrun": "npm:^3.2.2" + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" "@testing-library/vue": "npm:^8.0.0" "@types/prettier": "npm:^3.0.0" "@vitejs/plugin-vue": "npm:^4.4.0" @@ -6883,7 +6907,11 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/web-components@workspace:renderers/web-components" dependencies: + "@storybook/components": "workspace:^" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" "@types/cross-spawn": "npm:^6.0.2" "@types/node": "npm:^18.0.0" cross-spawn: "npm:^7.0.3" From 1075dbccf2025ce90323281c5911727c81572b42 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 15 Jul 2024 12:03:25 +0200 Subject: [PATCH 19/35] add angular too --- code/frameworks/angular/package.json | 4 ++++ code/yarn.lock | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index 120fa1d8bb20..a16fc8150a80 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -38,8 +38,12 @@ }, "dependencies": { "@storybook/builder-webpack5": "workspace:*", + "@storybook/components": "workspace:^", "@storybook/core-webpack": "workspace:*", "@storybook/global": "^5.0.0", + "@storybook/manager-api": "workspace:^", + "@storybook/preview-api": "workspace:^", + "@storybook/theming": "workspace:^", "@types/node": "^18.0.0", "@types/react": "^18.0.37", "@types/react-dom": "^18.0.11", diff --git a/code/yarn.lock b/code/yarn.lock index 51407930a69a..7c563aac8e27 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -5437,8 +5437,12 @@ __metadata: "@angular/platform-browser": "npm:^17.3.0" "@angular/platform-browser-dynamic": "npm:^17.3.0" "@storybook/builder-webpack5": "workspace:*" + "@storybook/components": "workspace:^" "@storybook/core-webpack": "workspace:*" "@storybook/global": "npm:^5.0.0" + "@storybook/manager-api": "workspace:^" + "@storybook/preview-api": "workspace:^" + "@storybook/theming": "workspace:^" "@types/cross-spawn": "npm:^6.0.2" "@types/node": "npm:^18.0.0" "@types/react": "npm:^18.0.37" From 53162103bbf9676b0ae14be80830a2195ab2001a Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 15 Jul 2024 12:30:27 +0200 Subject: [PATCH 20/35] add missing resolutions --- test-storybooks/ember-cli/package.json | 8 +++++--- test-storybooks/external-docs/package.json | 6 ++++-- .../portable-stories-kitchen-sink/nextjs/package.json | 4 ++++ .../portable-stories-kitchen-sink/react/package.json | 4 ++++ .../portable-stories-kitchen-sink/svelte/package.json | 4 ++++ .../portable-stories-kitchen-sink/vue3/package.json | 4 ++++ test-storybooks/server-kitchen-sink/package.json | 6 ++++-- test-storybooks/standalone-preview/package.json | 6 ++++-- 8 files changed, 33 insertions(+), 9 deletions(-) diff --git a/test-storybooks/ember-cli/package.json b/test-storybooks/ember-cli/package.json index 9eba65d74111..3ac8ca31acfb 100644 --- a/test-storybooks/ember-cli/package.json +++ b/test-storybooks/ember-cli/package.json @@ -35,6 +35,7 @@ "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5", "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", + "@storybook/components": "file:../../code/deprecated/components", "@storybook/core": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", @@ -42,6 +43,7 @@ "@storybook/html": "file:../../code/renderers/html", "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../code/frameworks/nextjs", "@storybook/preact": "file:../../code/renderers/preact", "@storybook/preact-vite": "file:../../code/frameworks/preact-vite", @@ -53,8 +55,7 @@ "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack", - "@storybook/preview": "file:../../code/lib/preview", - "@storybook/preview-api": "file:../../code/lib/preview-api", + "@storybook/preview-api": "file:../../code/deprecated/preview-api", "@storybook/react": "file:../../code/renderers/react", "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../code/frameworks/react-vite", @@ -67,6 +68,7 @@ "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../code/frameworks/sveltekit", "@storybook/test": "file:../../code/lib/test", + "@storybook/theming": "file:../../code/deprecated/theming", "@storybook/vue3": "file:../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", @@ -127,4 +129,4 @@ "projectToken": "19z23qxndju" } } -} \ No newline at end of file +} diff --git a/test-storybooks/external-docs/package.json b/test-storybooks/external-docs/package.json index 0032f36fada3..adb509ce45c3 100644 --- a/test-storybooks/external-docs/package.json +++ b/test-storybooks/external-docs/package.json @@ -35,6 +35,7 @@ "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5", "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", + "@storybook/components": "file:../../code/deprecated/components", "@storybook/core": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", @@ -42,6 +43,7 @@ "@storybook/html": "file:../../code/renderers/html", "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../code/frameworks/nextjs", "@storybook/preact": "file:../../code/renderers/preact", "@storybook/preact-vite": "file:../../code/frameworks/preact-vite", @@ -53,8 +55,7 @@ "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack", - "@storybook/preview": "file:../../code/lib/preview", - "@storybook/preview-api": "file:../../code/lib/preview-api", + "@storybook/preview-api": "file:../../code/deprecated/preview-api", "@storybook/react": "file:../../code/renderers/react", "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../code/frameworks/react-vite", @@ -67,6 +68,7 @@ "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../code/frameworks/sveltekit", "@storybook/test": "file:../../code/lib/test", + "@storybook/theming": "file:../../code/deprecated/theming", "@storybook/vue3": "file:../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json index 6e91d1a6f72c..a920943542af 100644 --- a/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/nextjs/package.json @@ -36,6 +36,7 @@ "@storybook/builder-vite": "file:../../../code/builders/builder-vite", "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5", "@storybook/codemod": "file:../../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "file:../../../code/core", "@storybook/core-webpack": "file:../../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../../code/lib/csf-plugin", @@ -43,6 +44,7 @@ "@storybook/html": "file:../../../code/renderers/html", "@storybook/html-webpack5": "file:../../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../../code/frameworks/nextjs", "@storybook/preact": "file:../../../code/renderers/preact", "@storybook/preact-vite": "file:../../../code/frameworks/preact-vite", @@ -54,6 +56,7 @@ "@storybook/preset-server-webpack": "file:../../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../../code/presets/vue3-webpack", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "file:../../../code/renderers/react", "@storybook/react-dom-shim": "file:../../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../../code/frameworks/react-vite", @@ -66,6 +69,7 @@ "@storybook/svelte-webpack5": "file:../../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../../code/frameworks/sveltekit", "@storybook/test": "file:../../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "file:../../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/portable-stories-kitchen-sink/react/package.json b/test-storybooks/portable-stories-kitchen-sink/react/package.json index 8b42d5fc47a2..7050a8a23e8a 100644 --- a/test-storybooks/portable-stories-kitchen-sink/react/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/react/package.json @@ -38,6 +38,7 @@ "@storybook/builder-vite": "portal:../../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5", "@storybook/codemod": "portal:../../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "portal:../../../code/core", "@storybook/core-webpack": "portal:../../../code/lib/core-webpack", "@storybook/csf-plugin": "portal:../../../code/lib/csf-plugin", @@ -45,6 +46,7 @@ "@storybook/html": "portal:../../../code/renderers/html", "@storybook/html-webpack5": "portal:../../../code/frameworks/html-webpack5", "@storybook/instrumenter": "portal:../../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "portal:../../../code/frameworks/nextjs", "@storybook/preact": "portal:../../../code/renderers/preact", "@storybook/preact-vite": "portal:../../../code/frameworks/preact-vite", @@ -56,6 +58,7 @@ "@storybook/preset-server-webpack": "portal:../../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "portal:../../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "portal:../../../code/presets/vue3-webpack", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "portal:../../../code/renderers/react", "@storybook/react-dom-shim": "portal:../../../code/lib/react-dom-shim", "@storybook/react-vite": "portal:../../../code/frameworks/react-vite", @@ -68,6 +71,7 @@ "@storybook/svelte-webpack5": "portal:../../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "portal:../../../code/frameworks/sveltekit", "@storybook/test": "portal:../../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "portal:../../../code/renderers/vue3", "@storybook/vue3-vite": "portal:../../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "portal:../../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json index d9e19bb7740a..fecb60d35bfc 100644 --- a/test-storybooks/portable-stories-kitchen-sink/svelte/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/svelte/package.json @@ -37,6 +37,7 @@ "@storybook/builder-vite": "portal:../../../code/builders/builder-vite", "@storybook/builder-webpack5": "portal:../../../code/builders/builder-webpack5", "@storybook/codemod": "portal:../../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "portal:../../../code/core", "@storybook/core-webpack": "portal:../../../code/lib/core-webpack", "@storybook/csf-plugin": "portal:../../../code/lib/csf-plugin", @@ -44,6 +45,7 @@ "@storybook/html": "portal:../../../code/renderers/html", "@storybook/html-webpack5": "portal:../../../code/frameworks/html-webpack5", "@storybook/instrumenter": "portal:../../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "portal:../../../code/frameworks/nextjs", "@storybook/preact": "portal:../../../code/renderers/preact", "@storybook/preact-vite": "portal:../../../code/frameworks/preact-vite", @@ -55,6 +57,7 @@ "@storybook/preset-server-webpack": "portal:../../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "portal:../../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "portal:../../../code/presets/vue3-webpack", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "portal:../../../code/renderers/react", "@storybook/react-dom-shim": "portal:../../../code/lib/react-dom-shim", "@storybook/react-vite": "portal:../../../code/frameworks/react-vite", @@ -67,6 +70,7 @@ "@storybook/svelte-webpack5": "portal:../../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "portal:../../../code/frameworks/sveltekit", "@storybook/test": "portal:../../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "portal:../../../code/renderers/vue3", "@storybook/vue3-vite": "portal:../../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "portal:../../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json index 506239c736a8..4b9e1d94f90f 100644 --- a/test-storybooks/portable-stories-kitchen-sink/vue3/package.json +++ b/test-storybooks/portable-stories-kitchen-sink/vue3/package.json @@ -38,6 +38,7 @@ "@storybook/builder-vite": "file:../../../code/builders/builder-vite", "@storybook/builder-webpack5": "file:../../../code/builders/builder-webpack5", "@storybook/codemod": "file:../../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "file:../../../code/core", "@storybook/core-webpack": "file:../../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../../code/lib/csf-plugin", @@ -45,6 +46,7 @@ "@storybook/html": "file:../../../code/renderers/html", "@storybook/html-webpack5": "file:../../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../../code/frameworks/nextjs", "@storybook/preact": "file:../../../code/renderers/preact", "@storybook/preact-vite": "file:../../../code/frameworks/preact-vite", @@ -56,6 +58,7 @@ "@storybook/preset-server-webpack": "file:../../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../../code/presets/vue3-webpack", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "file:../../../code/renderers/react", "@storybook/react-dom-shim": "file:../../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../../code/frameworks/react-vite", @@ -68,6 +71,7 @@ "@storybook/svelte-webpack5": "file:../../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../../code/frameworks/sveltekit", "@storybook/test": "file:../../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "file:../../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/server-kitchen-sink/package.json b/test-storybooks/server-kitchen-sink/package.json index 295980020f94..c271007a9a62 100644 --- a/test-storybooks/server-kitchen-sink/package.json +++ b/test-storybooks/server-kitchen-sink/package.json @@ -38,6 +38,7 @@ "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5", "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", @@ -45,6 +46,7 @@ "@storybook/html": "file:../../code/renderers/html", "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../code/frameworks/nextjs", "@storybook/preact": "file:../../code/renderers/preact", "@storybook/preact-vite": "file:../../code/frameworks/preact-vite", @@ -56,8 +58,7 @@ "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack", - "@storybook/preview": "file:../../code/lib/preview", - "@storybook/preview-api": "file:../../code/lib/preview-api", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "file:../../code/renderers/react", "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../code/frameworks/react-vite", @@ -70,6 +71,7 @@ "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../code/frameworks/sveltekit", "@storybook/test": "file:../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "file:../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", diff --git a/test-storybooks/standalone-preview/package.json b/test-storybooks/standalone-preview/package.json index a01e714cfde9..1d32f7457a40 100644 --- a/test-storybooks/standalone-preview/package.json +++ b/test-storybooks/standalone-preview/package.json @@ -31,6 +31,7 @@ "@storybook/builder-webpack5": "file:../../code/builders/builder-webpack5", "@storybook/client-logger": "file:../../code/lib/client-logger", "@storybook/codemod": "file:../../code/lib/codemod", + "@storybook/components": "file:../../../code/deprecated/components", "@storybook/core": "file:../../code/core", "@storybook/core-webpack": "file:../../code/lib/core-webpack", "@storybook/csf-plugin": "file:../../code/lib/csf-plugin", @@ -38,6 +39,7 @@ "@storybook/html": "file:../../code/renderers/html", "@storybook/html-webpack5": "file:../../code/frameworks/html-webpack5", "@storybook/instrumenter": "file:../../code/lib/instrumenter", + "@storybook/manager-api": "file:../../../code/deprecated/manager-api", "@storybook/nextjs": "file:../../code/frameworks/nextjs", "@storybook/preact": "file:../../code/renderers/preact", "@storybook/preact-vite": "file:../../code/frameworks/preact-vite", @@ -49,8 +51,7 @@ "@storybook/preset-server-webpack": "file:../../code/presets/server-webpack", "@storybook/preset-svelte-webpack": "file:../../code/presets/svelte-webpack", "@storybook/preset-vue3-webpack": "file:../../code/presets/vue3-webpack", - "@storybook/preview": "file:../../code/lib/preview", - "@storybook/preview-api": "file:../../code/lib/preview-api", + "@storybook/preview-api": "file:../../../code/deprecated/preview-api", "@storybook/react": "file:../../code/renderers/react", "@storybook/react-dom-shim": "file:../../code/lib/react-dom-shim", "@storybook/react-vite": "file:../../code/frameworks/react-vite", @@ -63,6 +64,7 @@ "@storybook/svelte-webpack5": "file:../../code/frameworks/svelte-webpack5", "@storybook/sveltekit": "file:../../code/frameworks/sveltekit", "@storybook/test": "file:../../code/lib/test", + "@storybook/theming": "file:../../../code/deprecated/theming", "@storybook/vue3": "file:../../code/renderers/vue3", "@storybook/vue3-vite": "file:../../code/frameworks/vue3-vite", "@storybook/vue3-webpack5": "file:../../code/frameworks/vue3-webpack5", From 308e213acea833d985440eff715c391e8a95203e Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 15 Jul 2024 12:33:03 +0200 Subject: [PATCH 21/35] Make a few automigrations run on all version upgrades --- code/lib/cli/src/automigrate/fixes/addon-postcss.ts | 2 +- code/lib/cli/src/automigrate/fixes/addons-api.ts | 2 +- code/lib/cli/src/automigrate/fixes/sb-binary.ts | 2 +- code/lib/cli/src/automigrate/fixes/sb-scripts.ts | 2 +- code/lib/cli/src/automigrate/fixes/wrap-require.ts | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/addon-postcss.ts b/code/lib/cli/src/automigrate/fixes/addon-postcss.ts index f8d134183c0b..0b9e9095d336 100644 --- a/code/lib/cli/src/automigrate/fixes/addon-postcss.ts +++ b/code/lib/cli/src/automigrate/fixes/addon-postcss.ts @@ -10,7 +10,7 @@ interface AddonPostcssRunOptions { export const addonPostCSS: Fix = { id: 'addon-postcss', - versionRange: ['<7', '>=7'], + versionRange: ['*', '*'], promptType: 'notification', diff --git a/code/lib/cli/src/automigrate/fixes/addons-api.ts b/code/lib/cli/src/automigrate/fixes/addons-api.ts index f193898aa82f..69d0f3284b03 100644 --- a/code/lib/cli/src/automigrate/fixes/addons-api.ts +++ b/code/lib/cli/src/automigrate/fixes/addons-api.ts @@ -9,7 +9,7 @@ interface AddonsAPIRunOptions { export const addonsAPI: Fix = { id: 'addons-api', - versionRange: ['<8', '>=8'], + versionRange: ['*', '*'], promptType: 'notification', diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.ts b/code/lib/cli/src/automigrate/fixes/sb-binary.ts index 09ee16bd5d84..57354620e176 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-binary.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-binary.ts @@ -23,7 +23,7 @@ const logger = console; export const sbBinary: Fix = { id: 'storybook-binary', - versionRange: ['<7', '>=7'], + versionRange: ['*', '*'], async check({ packageManager, storybookVersion }) { const packageJson = await packageManager.retrievePackageJson(); diff --git a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts index ec0fcbc158e4..c9a941de206f 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-scripts.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-scripts.ts @@ -78,7 +78,7 @@ export const getStorybookScripts = (allScripts: NonNullable = { id: 'sb-scripts', - versionRange: ['<7', '>=7'], + versionRange: ['*', '*'], async check({ packageManager, storybookVersion }) { const packageJson = await packageManager.retrievePackageJson(); diff --git a/code/lib/cli/src/automigrate/fixes/wrap-require.ts b/code/lib/cli/src/automigrate/fixes/wrap-require.ts index 829d42ee352f..0334d4b82f33 100644 --- a/code/lib/cli/src/automigrate/fixes/wrap-require.ts +++ b/code/lib/cli/src/automigrate/fixes/wrap-require.ts @@ -22,7 +22,7 @@ interface WrapRequireRunOptions { export const wrapRequire: Fix = { id: 'wrap-require', - versionRange: ['<7.2.0-rc.0', '>=7.2.0-rc.0'], + versionRange: ['*', '*'], async check({ packageManager, storybookVersion, mainConfigPath }) { const isStorybookInMonorepo = await packageManager.isStorybookInMonorepo(); From b9a745c80d3e06f8714ea678be97baaf25dcdf60 Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 15 Jul 2024 12:36:38 +0200 Subject: [PATCH 22/35] fix the pre-commit hook --- code/package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/package.json b/code/package.json index a4310abef8ba..e7d38085b51d 100644 --- a/code/package.json +++ b/code/package.json @@ -54,7 +54,7 @@ }, "husky": { "hooks": { - "pre-commit": "if [ -z \"$SKIP_STORYBOOK_GIT_HOOKS\" ]; then yarn storybook:lint; fi" + "pre-commit": "if [ -z \"$SKIP_STORYBOOK_GIT_HOOKS\" ]; then yarn lint-staged; fi" } }, "lint-staged": { From 8e31fb207fa6f11d84ed0f393241a7ca1eb54cc1 Mon Sep 17 00:00:00 2001 From: Tobias Diez Date: Mon, 15 Jul 2024 13:23:03 +0200 Subject: [PATCH 23/35] feat: add conditional logging for manager and preview start --- code/core/src/builder-manager/index.ts | 4 +++- code/core/src/core-server/dev-server.ts | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/code/core/src/builder-manager/index.ts b/code/core/src/builder-manager/index.ts index c6b5840fb3ff..01755fbdef2c 100644 --- a/code/core/src/builder-manager/index.ts +++ b/code/core/src/builder-manager/index.ts @@ -126,7 +126,9 @@ const starter: StarterFunction = async function* starterGeneratorFn({ options, router, }) { - logger.info('=> Starting manager..'); + if (!options.quiet) { + logger.info('=> Starting manager..'); + } const { config, diff --git a/code/core/src/core-server/dev-server.ts b/code/core/src/core-server/dev-server.ts index 1a8935d19a3a..1639e754fe04 100644 --- a/code/core/src/core-server/dev-server.ts +++ b/code/core/src/core-server/dev-server.ts @@ -95,7 +95,9 @@ export async function storybookDevServer(options: Options) { let previewStarted: Promise = Promise.resolve(); if (!options.ignorePreview) { - logger.info('=> Starting preview..'); + if (!options.quiet) { + logger.info('=> Starting preview..'); + } previewStarted = previewBuilder .start({ startTime: process.hrtime(), From 478f06c429869459fa812da22272f8969cd562fa Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 15 Jul 2024 13:51:39 +0200 Subject: [PATCH 24/35] Remove nx check in sb-binary automigration --- code/lib/cli/src/automigrate/fixes/sb-binary.ts | 6 ------ 1 file changed, 6 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.ts b/code/lib/cli/src/automigrate/fixes/sb-binary.ts index 57354620e176..798655f1e28a 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-binary.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-binary.ts @@ -28,15 +28,9 @@ export const sbBinary: Fix = { async check({ packageManager, storybookVersion }) { const packageJson = await packageManager.retrievePackageJson(); - const nrwlStorybookVersion = await packageManager.getPackageVersion('@nrwl/storybook'); const sbBinaryVersion = await packageManager.getPackageVersion('sb'); const storybookBinaryVersion = await packageManager.getPackageVersion('storybook'); - // Nx provides their own binary, so we don't need to do anything - if (nrwlStorybookVersion) { - return null; - } - const hasSbBinary = !!sbBinaryVersion; const hasStorybookBinary = !!storybookBinaryVersion; From a22d3371655b88eda3cd8bb89ef714a355cd4f60 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Mon, 15 Jul 2024 13:59:14 +0200 Subject: [PATCH 25/35] Add diagnostic when the `storybook` package is missing --- code/lib/cli/src/doctor/index.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts index 6aab5507b21a..0fe8627c9d3d 100644 --- a/code/lib/cli/src/doctor/index.ts +++ b/code/lib/cli/src/doctor/index.ts @@ -105,6 +105,15 @@ export const doctor = async ({ const allDependencies = (await packageManager.getAllDependencies()) as Record; + if (!('storybook' in allDependencies)) { + logDiagnostic( + 'Package storybook not found', + dedent` + The storybook package was not found in your package.json. + Installing storybook as a direct dev dependency in your package.json is required. + ` + ); + } const incompatibleStorybookPackagesList = await getIncompatibleStorybookPackages({ currentStorybookVersion: storybookVersion, }); From 12afaacdb9633e53f643c522bccc0026bdf4c5b9 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Mon, 15 Jul 2024 13:07:44 +0000 Subject: [PATCH 26/35] Update CHANGELOG.md for v8.2.3 [skip ci] --- CHANGELOG.md | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b1bffa805860..5143f97018fe 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,14 @@ +## 8.2.3 + +- Bug: Fix invalid docs links in Configure.mdx template page - [#28560](https://github.com/storybookjs/storybook/pull/28560), thanks @kylegach! +- CLI: Add "missing-storybook-dependencies" automigration - [#28579](https://github.com/storybookjs/storybook/pull/28579), thanks @yannbf! +- CPC: Add `theming/create` aliases in docs preset - [#28570](https://github.com/storybookjs/storybook/pull/28570), thanks @ndelangen! +- CPC: Fix incorrect re-export in `core-events` - [#28573](https://github.com/storybookjs/storybook/pull/28573), thanks @ndelangen! +- CPC: Fix Vite builder had wrong conditions - [#28581](https://github.com/storybookjs/storybook/pull/28581), thanks @ndelangen! +- CSF: Fix small typing issue - [#28587](https://github.com/storybookjs/storybook/pull/28587), thanks @valentinpalkovic! +- Portable stories: Remove unused types - [#28548](https://github.com/storybookjs/storybook/pull/28548), thanks @kasperpeulen! +- Webpack: Fix sourceMap generation in csf-tools - [#28585](https://github.com/storybookjs/storybook/pull/28585), thanks @valentinpalkovic! + ## 8.2.2 - CPC: Add `ESM` export to `docs-tools` & `node-logger` packages - [#28539](https://github.com/storybookjs/storybook/pull/28539), thanks @ndelangen! From c8c1f4aa7648e737a34e2c860eb9fadeb95a9a08 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Mon, 15 Jul 2024 16:01:04 +0200 Subject: [PATCH 27/35] Chalk storybook --- code/lib/cli/src/doctor/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts index 0fe8627c9d3d..e74e43c8903a 100644 --- a/code/lib/cli/src/doctor/index.ts +++ b/code/lib/cli/src/doctor/index.ts @@ -107,9 +107,9 @@ export const doctor = async ({ if (!('storybook' in allDependencies)) { logDiagnostic( - 'Package storybook not found', + `Package ${chalk.cyan('storybook')} not found`, dedent` - The storybook package was not found in your package.json. + The ${chalk.cyan('storybook')} package was not found in your package.json. Installing storybook as a direct dev dependency in your package.json is required. ` ); From 3fb7d9190631f9f128666fc993166b6f2848b8b3 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Mon, 15 Jul 2024 16:01:21 +0200 Subject: [PATCH 28/35] Chalk storybook --- code/lib/cli/src/doctor/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/lib/cli/src/doctor/index.ts b/code/lib/cli/src/doctor/index.ts index e74e43c8903a..0e2f0747aa7a 100644 --- a/code/lib/cli/src/doctor/index.ts +++ b/code/lib/cli/src/doctor/index.ts @@ -110,7 +110,7 @@ export const doctor = async ({ `Package ${chalk.cyan('storybook')} not found`, dedent` The ${chalk.cyan('storybook')} package was not found in your package.json. - Installing storybook as a direct dev dependency in your package.json is required. + Installing ${chalk.cyan('storybook')} as a direct dev dependency in your package.json is required. ` ); } From 2717559b7b01314c5ecf57c62136ce010bdb6219 Mon Sep 17 00:00:00 2001 From: Yann Braga Date: Mon, 15 Jul 2024 16:41:12 +0200 Subject: [PATCH 29/35] fix tests --- .../src/automigrate/fixes/sb-binary.test.ts | 22 +------------------ 1 file changed, 1 insertion(+), 21 deletions(-) diff --git a/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts b/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts index e51e919eb88a..34df12d717b6 100644 --- a/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts +++ b/code/lib/cli/src/automigrate/fixes/sb-binary.test.ts @@ -18,32 +18,12 @@ const checkStorybookBinary = async ({ describe('storybook-binary fix', () => { describe('sb >= 7.0', () => { - it('should no-op in NX projects', async () => { + it('should add storybook dependency if not present', async () => { const packageManager = { getPackageVersion: (packageName) => { switch (packageName) { - case '@storybook/react': - return Promise.resolve('7.0.0'); case '@nrwl/storybook': return Promise.resolve('15.7.1'); - default: - return null; - } - }, - retrievePackageJson: () => Promise.resolve({}), - } as Partial; - - await expect( - checkStorybookBinary({ - packageManager, - }) - ).resolves.toBeFalsy(); - }); - - it('should add storybook dependency if not present', async () => { - const packageManager = { - getPackageVersion: (packageName) => { - switch (packageName) { case '@storybook/react': return Promise.resolve('7.0.0-alpha.0'); default: From f702ad7cd7b7565b676d57585127724dcb37b15e Mon Sep 17 00:00:00 2001 From: Norbert de Langen Date: Mon, 15 Jul 2024 17:56:43 +0200 Subject: [PATCH 30/35] Send benchmarking base list to bot --- scripts/upload-bench.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/upload-bench.ts b/scripts/upload-bench.ts index d076fc3fff2b..6a30795ef1e0 100644 --- a/scripts/upload-bench.ts +++ b/scripts/upload-bench.ts @@ -89,8 +89,8 @@ const uploadBench = async () => { console.log('skip uploading results to github'); return; } - const [[base]]: any[] = await appTable.query({ - query: `SELECT * FROM \`storybook-benchmark.benchmark_results.bench2\` WHERE branch=@baseBranch AND label=@templateKey ORDER BY timestamp DESC LIMIT 1;`, + const [base]: any[] = await appTable.query({ + query: `SELECT * FROM \`storybook-benchmark.benchmark_results.bench2\` WHERE branch=@baseBranch AND label=@templateKey ORDER BY timestamp DESC LIMIT 20;`, params: { baseBranch, templateKey }, }); @@ -101,7 +101,7 @@ const uploadBench = async () => { owner: 'storybookjs', repo: 'storybook', issueNumber: prNumber, - base: { ...defaults, ...base }, + base: base.map((b: any) => ({ ...defaults, ...b })), head: row, }), }) From 06c3d0aac26d437c76bfceb68d4c797f25b66161 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Mon, 15 Jul 2024 18:36:08 +0000 Subject: [PATCH 31/35] Write changelog for 8.3.0-alpha.1 [skip ci] --- CHANGELOG.prerelease.md | 15 +++++++++++++++ code/package.json | 3 ++- docs/versions/next.json | 2 +- 3 files changed, 18 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index 1fa61452d5e9..452768602a10 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,18 @@ +## 8.3.0-alpha.1 + +- Bug: Fix invalid docs links in Configure.mdx template page - [#28560](https://github.com/storybookjs/storybook/pull/28560), thanks @kylegach! +- CLI: Add "missing-storybook-dependencies" automigration - [#28579](https://github.com/storybookjs/storybook/pull/28579), thanks @yannbf! +- CLI: Add diagnostic when the `storybook` package is missing - [#28604](https://github.com/storybookjs/storybook/pull/28604), thanks @kasperpeulen! +- CLI: Make a few automigrations run on all version upgrades - [#28601](https://github.com/storybookjs/storybook/pull/28601), thanks @yannbf! +- CPC: Add `theming/create` aliases in docs preset - [#28570](https://github.com/storybookjs/storybook/pull/28570), thanks @ndelangen! +- CPC: Direct dependencies on shim packages in renderers - [#28599](https://github.com/storybookjs/storybook/pull/28599), thanks @ndelangen! +- CPC: Fix Vite builder had wrong conditions - [#28581](https://github.com/storybookjs/storybook/pull/28581), thanks @ndelangen! +- CPC: Fix incorrect re-export in `core-events` - [#28573](https://github.com/storybookjs/storybook/pull/28573), thanks @ndelangen! +- CSF: Fix small typing issue - [#28587](https://github.com/storybookjs/storybook/pull/28587), thanks @valentinpalkovic! +- Core: Upgrade docs-mdx for smaller install - [#28552](https://github.com/storybookjs/storybook/pull/28552), thanks @shilman! +- Portable stories: Remove unused types - [#28548](https://github.com/storybookjs/storybook/pull/28548), thanks @kasperpeulen! +- Webpack: Fix sourceMap generation in csf-tools - [#28585](https://github.com/storybookjs/storybook/pull/28585), thanks @valentinpalkovic! + ## 8.3.0-alpha.0 diff --git a/code/package.json b/code/package.json index e7d38085b51d..1d3efde6720d 100644 --- a/code/package.json +++ b/code/package.json @@ -278,5 +278,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "8.3.0-alpha.1" } diff --git a/docs/versions/next.json b/docs/versions/next.json index 5ca4ed6ffcb7..6a3a45eedc89 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"8.3.0-alpha.0","info":{"plain":""}} +{"version":"8.3.0-alpha.1","info":{"plain":"- Bug: Fix invalid docs links in Configure.mdx template page - [#28560](https://github.com/storybookjs/storybook/pull/28560), thanks @kylegach!\n- CLI: Add \\\"missing-storybook-dependencies\\\" automigration - [#28579](https://github.com/storybookjs/storybook/pull/28579), thanks @yannbf!\n- CLI: Add diagnostic when the `storybook` package is missing - [#28604](https://github.com/storybookjs/storybook/pull/28604), thanks @kasperpeulen!\n- CLI: Make a few automigrations run on all version upgrades - [#28601](https://github.com/storybookjs/storybook/pull/28601), thanks @yannbf!\n- CPC: Add `theming/create` aliases in docs preset - [#28570](https://github.com/storybookjs/storybook/pull/28570), thanks @ndelangen!\n- CPC: Direct dependencies on shim packages in renderers - [#28599](https://github.com/storybookjs/storybook/pull/28599), thanks @ndelangen!\n- CPC: Fix Vite builder had wrong conditions - [#28581](https://github.com/storybookjs/storybook/pull/28581), thanks @ndelangen!\n- CPC: Fix incorrect re-export in `core-events` - [#28573](https://github.com/storybookjs/storybook/pull/28573), thanks @ndelangen!\n- CSF: Fix small typing issue - [#28587](https://github.com/storybookjs/storybook/pull/28587), thanks @valentinpalkovic!\n- Core: Upgrade docs-mdx for smaller install - [#28552](https://github.com/storybookjs/storybook/pull/28552), thanks @shilman!\n- Portable stories: Remove unused types - [#28548](https://github.com/storybookjs/storybook/pull/28548), thanks @kasperpeulen!\n- Webpack: Fix sourceMap generation in csf-tools - [#28585](https://github.com/storybookjs/storybook/pull/28585), thanks @valentinpalkovic!"}} From 5816be61408028100056c44b2f6373355546aa45 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Tue, 16 Jul 2024 02:15:55 +0000 Subject: [PATCH 32/35] Bump version from "8.3.0-alpha.0" to "8.3.0-alpha.1" [skip ci] --- code/addons/a11y/package.json | 2 +- code/addons/actions/package.json | 2 +- code/addons/backgrounds/package.json | 2 +- code/addons/controls/package.json | 2 +- code/addons/docs/package.json | 2 +- code/addons/essentials/package.json | 2 +- code/addons/gfm/package.json | 2 +- code/addons/highlight/package.json | 2 +- code/addons/interactions/package.json | 2 +- code/addons/jest/package.json | 2 +- code/addons/links/package.json | 2 +- code/addons/measure/package.json | 2 +- code/addons/onboarding/package.json | 2 +- code/addons/outline/package.json | 2 +- code/addons/storysource/package.json | 2 +- code/addons/themes/package.json | 2 +- code/addons/toolbars/package.json | 2 +- code/addons/viewport/package.json | 2 +- code/builders/builder-vite/package.json | 2 +- code/builders/builder-webpack5/package.json | 2 +- code/core/package.json | 2 +- code/core/src/common/versions.ts | 162 +++++++++--------- code/core/src/manager-api/version.ts | 2 +- code/deprecated/builder-manager/package.json | 2 +- code/deprecated/channels/package.json | 2 +- code/deprecated/client-logger/package.json | 2 +- code/deprecated/components/package.json | 2 +- code/deprecated/core-common/package.json | 2 +- code/deprecated/core-events/package.json | 2 +- code/deprecated/core-server/package.json | 2 +- code/deprecated/csf-tools/package.json | 2 +- code/deprecated/docs-tools/package.json | 2 +- code/deprecated/manager-api/package.json | 2 +- code/deprecated/manager/package.json | 2 +- code/deprecated/node-logger/package.json | 2 +- code/deprecated/preview-api/package.json | 2 +- code/deprecated/preview/package.json | 2 +- code/deprecated/router/package.json | 2 +- code/deprecated/telemetry/package.json | 2 +- code/deprecated/theming/package.json | 2 +- code/deprecated/types/package.json | 2 +- code/frameworks/angular/package.json | 2 +- code/frameworks/ember/package.json | 2 +- code/frameworks/html-vite/package.json | 2 +- code/frameworks/html-webpack5/package.json | 2 +- code/frameworks/nextjs/package.json | 2 +- code/frameworks/preact-vite/package.json | 2 +- code/frameworks/preact-webpack5/package.json | 2 +- code/frameworks/react-vite/package.json | 2 +- code/frameworks/react-webpack5/package.json | 2 +- code/frameworks/server-webpack5/package.json | 2 +- code/frameworks/svelte-vite/package.json | 2 +- code/frameworks/svelte-webpack5/package.json | 2 +- code/frameworks/sveltekit/package.json | 2 +- code/frameworks/vue3-vite/package.json | 2 +- code/frameworks/vue3-webpack5/package.json | 2 +- .../web-components-vite/package.json | 2 +- .../web-components-webpack5/package.json | 2 +- code/lib/blocks/package.json | 2 +- code/lib/cli-sb/package.json | 2 +- code/lib/cli-storybook/package.json | 2 +- code/lib/cli/package.json | 2 +- code/lib/codemod/package.json | 2 +- code/lib/core-webpack/package.json | 2 +- code/lib/csf-plugin/package.json | 2 +- code/lib/instrumenter/package.json | 2 +- code/lib/react-dom-shim/package.json | 2 +- code/lib/source-loader/package.json | 2 +- code/lib/test/package.json | 2 +- code/package.json | 5 +- code/presets/create-react-app/package.json | 2 +- code/presets/html-webpack/package.json | 2 +- code/presets/preact-webpack/package.json | 2 +- code/presets/react-webpack/package.json | 2 +- code/presets/server-webpack/package.json | 2 +- code/presets/svelte-webpack/package.json | 2 +- code/presets/vue3-webpack/package.json | 2 +- code/renderers/html/package.json | 2 +- code/renderers/preact/package.json | 2 +- code/renderers/react/package.json | 2 +- code/renderers/server/package.json | 2 +- code/renderers/svelte/package.json | 2 +- code/renderers/vue3/package.json | 2 +- code/renderers/web-components/package.json | 2 +- 84 files changed, 165 insertions(+), 166 deletions(-) diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json index ebaea076514c..513c725828a3 100644 --- a/code/addons/a11y/package.json +++ b/code/addons/a11y/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-a11y", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Test component compliance with web accessibility standards", "keywords": [ "a11y", diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json index dc1cc04c3558..f20ab02aaafc 100644 --- a/code/addons/actions/package.json +++ b/code/addons/actions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-actions", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Get UI feedback when an action is performed on an interactive element", "keywords": [ "storybook", diff --git a/code/addons/backgrounds/package.json b/code/addons/backgrounds/package.json index 7199d6d903cb..984c607d6bee 100644 --- a/code/addons/backgrounds/package.json +++ b/code/addons/backgrounds/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-backgrounds", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Switch backgrounds to view components in different settings", "keywords": [ "addon", diff --git a/code/addons/controls/package.json b/code/addons/controls/package.json index 8d2460f22c6b..bf4b6d98eab4 100644 --- a/code/addons/controls/package.json +++ b/code/addons/controls/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-controls", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Interact with component inputs dynamically in the Storybook UI", "keywords": [ "addon", diff --git a/code/addons/docs/package.json b/code/addons/docs/package.json index 8edc0d1a8063..954078a0e8f7 100644 --- a/code/addons/docs/package.json +++ b/code/addons/docs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-docs", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Document component usage and properties in Markdown", "keywords": [ "addon", diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json index d4ddbcff684d..4c13e5ccfd38 100644 --- a/code/addons/essentials/package.json +++ b/code/addons/essentials/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-essentials", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Curated addons to bring out the best of Storybook", "keywords": [ "addon", diff --git a/code/addons/gfm/package.json b/code/addons/gfm/package.json index dd4ff4c3d8ee..124357c1b712 100644 --- a/code/addons/gfm/package.json +++ b/code/addons/gfm/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-mdx-gfm", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "GitHub Flavored Markdown in Storybook", "keywords": [ "addon", diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json index 39c938c555c1..1a8971be5ae0 100644 --- a/code/addons/highlight/package.json +++ b/code/addons/highlight/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-highlight", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Highlight DOM nodes within your stories", "keywords": [ "storybook-addons", diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json index 380f82dae2f8..8f600495e3fb 100644 --- a/code/addons/interactions/package.json +++ b/code/addons/interactions/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-interactions", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Automate, test and debug user interactions", "keywords": [ "storybook-addons", diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json index ee2c153f25cc..4f64c432f345 100644 --- a/code/addons/jest/package.json +++ b/code/addons/jest/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-jest", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "React storybook addon that show component jest report", "keywords": [ "addon", diff --git a/code/addons/links/package.json b/code/addons/links/package.json index ffdc2edc3b0b..6f93d4ee197c 100644 --- a/code/addons/links/package.json +++ b/code/addons/links/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-links", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Link stories together to build demos and prototypes with your UI components", "keywords": [ "addon", diff --git a/code/addons/measure/package.json b/code/addons/measure/package.json index b31b31e8b2ee..18ee6189da68 100644 --- a/code/addons/measure/package.json +++ b/code/addons/measure/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-measure", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Inspect layouts by visualizing the box model", "keywords": [ "storybook-addons", diff --git a/code/addons/onboarding/package.json b/code/addons/onboarding/package.json index bb22179dbc1a..e43b9b07e903 100644 --- a/code/addons/onboarding/package.json +++ b/code/addons/onboarding/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-onboarding", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Addon Onboarding - Introduces a new onboarding experience", "keywords": [ "storybook-addons", diff --git a/code/addons/outline/package.json b/code/addons/outline/package.json index c5d87b4333c5..63baf2e64b62 100644 --- a/code/addons/outline/package.json +++ b/code/addons/outline/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-outline", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Outline all elements with CSS to help with layout placement and alignment", "keywords": [ "storybook-addons", diff --git a/code/addons/storysource/package.json b/code/addons/storysource/package.json index a5ad958fa003..91aaeceb7582 100644 --- a/code/addons/storysource/package.json +++ b/code/addons/storysource/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-storysource", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "View a story’s source code to see how it works and paste into your app", "keywords": [ "addon", diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json index 20776833b488..a0e05d999a1e 100644 --- a/code/addons/themes/package.json +++ b/code/addons/themes/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-themes", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Switch between multiple themes for you components in Storybook", "keywords": [ "css", diff --git a/code/addons/toolbars/package.json b/code/addons/toolbars/package.json index 614745a5f46d..6f1da7c0666e 100644 --- a/code/addons/toolbars/package.json +++ b/code/addons/toolbars/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-toolbars", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Create your own toolbar items that control story rendering", "keywords": [ "addon", diff --git a/code/addons/viewport/package.json b/code/addons/viewport/package.json index 32b29f79e6a1..13ab30a42045 100644 --- a/code/addons/viewport/package.json +++ b/code/addons/viewport/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/addon-viewport", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Build responsive components by adjusting Storybook’s viewport size and orientation", "keywords": [ "addon", diff --git a/code/builders/builder-vite/package.json b/code/builders/builder-vite/package.json index 9db90a1648ae..d1b6bfe7ecad 100644 --- a/code/builders/builder-vite/package.json +++ b/code/builders/builder-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "A plugin to run and build Storybooks with Vite", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/builders/builder-vite/#readme", "bugs": { diff --git a/code/builders/builder-webpack5/package.json b/code/builders/builder-webpack5/package.json index f6c854d55ed4..e640cb1ce9ea 100644 --- a/code/builders/builder-webpack5/package.json +++ b/code/builders/builder-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/core/package.json b/code/core/package.json index 326b6d18f517..5fd58d2a95fc 100644 --- a/code/core/package.json +++ b/code/core/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/core/src/common/versions.ts b/code/core/src/common/versions.ts index 44bb49ad6e5c..4da42abaacc2 100644 --- a/code/core/src/common/versions.ts +++ b/code/core/src/common/versions.ts @@ -1,84 +1,84 @@ // auto generated file, do not edit export default { - '@storybook/addon-a11y': '8.3.0-alpha.0', - '@storybook/addon-actions': '8.3.0-alpha.0', - '@storybook/addon-backgrounds': '8.3.0-alpha.0', - '@storybook/addon-controls': '8.3.0-alpha.0', - '@storybook/addon-docs': '8.3.0-alpha.0', - '@storybook/addon-essentials': '8.3.0-alpha.0', - '@storybook/addon-mdx-gfm': '8.3.0-alpha.0', - '@storybook/addon-highlight': '8.3.0-alpha.0', - '@storybook/addon-interactions': '8.3.0-alpha.0', - '@storybook/addon-jest': '8.3.0-alpha.0', - '@storybook/addon-links': '8.3.0-alpha.0', - '@storybook/addon-measure': '8.3.0-alpha.0', - '@storybook/addon-onboarding': '8.3.0-alpha.0', - '@storybook/addon-outline': '8.3.0-alpha.0', - '@storybook/addon-storysource': '8.3.0-alpha.0', - '@storybook/addon-themes': '8.3.0-alpha.0', - '@storybook/addon-toolbars': '8.3.0-alpha.0', - '@storybook/addon-viewport': '8.3.0-alpha.0', - '@storybook/builder-vite': '8.3.0-alpha.0', - '@storybook/builder-webpack5': '8.3.0-alpha.0', - '@storybook/core': '8.3.0-alpha.0', - '@storybook/builder-manager': '8.3.0-alpha.0', - '@storybook/channels': '8.3.0-alpha.0', - '@storybook/client-logger': '8.3.0-alpha.0', - '@storybook/components': '8.3.0-alpha.0', - '@storybook/core-common': '8.3.0-alpha.0', - '@storybook/core-events': '8.3.0-alpha.0', - '@storybook/core-server': '8.3.0-alpha.0', - '@storybook/csf-tools': '8.3.0-alpha.0', - '@storybook/docs-tools': '8.3.0-alpha.0', - '@storybook/manager': '8.3.0-alpha.0', - '@storybook/manager-api': '8.3.0-alpha.0', - '@storybook/node-logger': '8.3.0-alpha.0', - '@storybook/preview': '8.3.0-alpha.0', - '@storybook/preview-api': '8.3.0-alpha.0', - '@storybook/router': '8.3.0-alpha.0', - '@storybook/telemetry': '8.3.0-alpha.0', - '@storybook/theming': '8.3.0-alpha.0', - '@storybook/types': '8.3.0-alpha.0', - '@storybook/angular': '8.3.0-alpha.0', - '@storybook/ember': '8.3.0-alpha.0', - '@storybook/html-vite': '8.3.0-alpha.0', - '@storybook/html-webpack5': '8.3.0-alpha.0', - '@storybook/nextjs': '8.3.0-alpha.0', - '@storybook/preact-vite': '8.3.0-alpha.0', - '@storybook/preact-webpack5': '8.3.0-alpha.0', - '@storybook/react-vite': '8.3.0-alpha.0', - '@storybook/react-webpack5': '8.3.0-alpha.0', - '@storybook/server-webpack5': '8.3.0-alpha.0', - '@storybook/svelte-vite': '8.3.0-alpha.0', - '@storybook/svelte-webpack5': '8.3.0-alpha.0', - '@storybook/sveltekit': '8.3.0-alpha.0', - '@storybook/vue3-vite': '8.3.0-alpha.0', - '@storybook/vue3-webpack5': '8.3.0-alpha.0', - '@storybook/web-components-vite': '8.3.0-alpha.0', - '@storybook/web-components-webpack5': '8.3.0-alpha.0', - '@storybook/blocks': '8.3.0-alpha.0', - storybook: '8.3.0-alpha.0', - sb: '8.3.0-alpha.0', - '@storybook/cli': '8.3.0-alpha.0', - '@storybook/codemod': '8.3.0-alpha.0', - '@storybook/core-webpack': '8.3.0-alpha.0', - '@storybook/csf-plugin': '8.3.0-alpha.0', - '@storybook/instrumenter': '8.3.0-alpha.0', - '@storybook/react-dom-shim': '8.3.0-alpha.0', - '@storybook/source-loader': '8.3.0-alpha.0', - '@storybook/test': '8.3.0-alpha.0', - '@storybook/preset-create-react-app': '8.3.0-alpha.0', - '@storybook/preset-html-webpack': '8.3.0-alpha.0', - '@storybook/preset-preact-webpack': '8.3.0-alpha.0', - '@storybook/preset-react-webpack': '8.3.0-alpha.0', - '@storybook/preset-server-webpack': '8.3.0-alpha.0', - '@storybook/preset-svelte-webpack': '8.3.0-alpha.0', - '@storybook/preset-vue3-webpack': '8.3.0-alpha.0', - '@storybook/html': '8.3.0-alpha.0', - '@storybook/preact': '8.3.0-alpha.0', - '@storybook/react': '8.3.0-alpha.0', - '@storybook/server': '8.3.0-alpha.0', - '@storybook/svelte': '8.3.0-alpha.0', - '@storybook/vue3': '8.3.0-alpha.0', - '@storybook/web-components': '8.3.0-alpha.0', + '@storybook/addon-a11y': '8.3.0-alpha.1', + '@storybook/addon-actions': '8.3.0-alpha.1', + '@storybook/addon-backgrounds': '8.3.0-alpha.1', + '@storybook/addon-controls': '8.3.0-alpha.1', + '@storybook/addon-docs': '8.3.0-alpha.1', + '@storybook/addon-essentials': '8.3.0-alpha.1', + '@storybook/addon-mdx-gfm': '8.3.0-alpha.1', + '@storybook/addon-highlight': '8.3.0-alpha.1', + '@storybook/addon-interactions': '8.3.0-alpha.1', + '@storybook/addon-jest': '8.3.0-alpha.1', + '@storybook/addon-links': '8.3.0-alpha.1', + '@storybook/addon-measure': '8.3.0-alpha.1', + '@storybook/addon-onboarding': '8.3.0-alpha.1', + '@storybook/addon-outline': '8.3.0-alpha.1', + '@storybook/addon-storysource': '8.3.0-alpha.1', + '@storybook/addon-themes': '8.3.0-alpha.1', + '@storybook/addon-toolbars': '8.3.0-alpha.1', + '@storybook/addon-viewport': '8.3.0-alpha.1', + '@storybook/builder-vite': '8.3.0-alpha.1', + '@storybook/builder-webpack5': '8.3.0-alpha.1', + '@storybook/core': '8.3.0-alpha.1', + '@storybook/builder-manager': '8.3.0-alpha.1', + '@storybook/channels': '8.3.0-alpha.1', + '@storybook/client-logger': '8.3.0-alpha.1', + '@storybook/components': '8.3.0-alpha.1', + '@storybook/core-common': '8.3.0-alpha.1', + '@storybook/core-events': '8.3.0-alpha.1', + '@storybook/core-server': '8.3.0-alpha.1', + '@storybook/csf-tools': '8.3.0-alpha.1', + '@storybook/docs-tools': '8.3.0-alpha.1', + '@storybook/manager': '8.3.0-alpha.1', + '@storybook/manager-api': '8.3.0-alpha.1', + '@storybook/node-logger': '8.3.0-alpha.1', + '@storybook/preview': '8.3.0-alpha.1', + '@storybook/preview-api': '8.3.0-alpha.1', + '@storybook/router': '8.3.0-alpha.1', + '@storybook/telemetry': '8.3.0-alpha.1', + '@storybook/theming': '8.3.0-alpha.1', + '@storybook/types': '8.3.0-alpha.1', + '@storybook/angular': '8.3.0-alpha.1', + '@storybook/ember': '8.3.0-alpha.1', + '@storybook/html-vite': '8.3.0-alpha.1', + '@storybook/html-webpack5': '8.3.0-alpha.1', + '@storybook/nextjs': '8.3.0-alpha.1', + '@storybook/preact-vite': '8.3.0-alpha.1', + '@storybook/preact-webpack5': '8.3.0-alpha.1', + '@storybook/react-vite': '8.3.0-alpha.1', + '@storybook/react-webpack5': '8.3.0-alpha.1', + '@storybook/server-webpack5': '8.3.0-alpha.1', + '@storybook/svelte-vite': '8.3.0-alpha.1', + '@storybook/svelte-webpack5': '8.3.0-alpha.1', + '@storybook/sveltekit': '8.3.0-alpha.1', + '@storybook/vue3-vite': '8.3.0-alpha.1', + '@storybook/vue3-webpack5': '8.3.0-alpha.1', + '@storybook/web-components-vite': '8.3.0-alpha.1', + '@storybook/web-components-webpack5': '8.3.0-alpha.1', + '@storybook/blocks': '8.3.0-alpha.1', + storybook: '8.3.0-alpha.1', + sb: '8.3.0-alpha.1', + '@storybook/cli': '8.3.0-alpha.1', + '@storybook/codemod': '8.3.0-alpha.1', + '@storybook/core-webpack': '8.3.0-alpha.1', + '@storybook/csf-plugin': '8.3.0-alpha.1', + '@storybook/instrumenter': '8.3.0-alpha.1', + '@storybook/react-dom-shim': '8.3.0-alpha.1', + '@storybook/source-loader': '8.3.0-alpha.1', + '@storybook/test': '8.3.0-alpha.1', + '@storybook/preset-create-react-app': '8.3.0-alpha.1', + '@storybook/preset-html-webpack': '8.3.0-alpha.1', + '@storybook/preset-preact-webpack': '8.3.0-alpha.1', + '@storybook/preset-react-webpack': '8.3.0-alpha.1', + '@storybook/preset-server-webpack': '8.3.0-alpha.1', + '@storybook/preset-svelte-webpack': '8.3.0-alpha.1', + '@storybook/preset-vue3-webpack': '8.3.0-alpha.1', + '@storybook/html': '8.3.0-alpha.1', + '@storybook/preact': '8.3.0-alpha.1', + '@storybook/react': '8.3.0-alpha.1', + '@storybook/server': '8.3.0-alpha.1', + '@storybook/svelte': '8.3.0-alpha.1', + '@storybook/vue3': '8.3.0-alpha.1', + '@storybook/web-components': '8.3.0-alpha.1', }; diff --git a/code/core/src/manager-api/version.ts b/code/core/src/manager-api/version.ts index 2010c80e09ee..192f4ad7ab11 100644 --- a/code/core/src/manager-api/version.ts +++ b/code/core/src/manager-api/version.ts @@ -1 +1 @@ -export const version = '8.3.0-alpha.0'; +export const version = '8.3.0-alpha.1'; diff --git a/code/deprecated/builder-manager/package.json b/code/deprecated/builder-manager/package.json index c23a94632c3d..ba50c441a605 100644 --- a/code/deprecated/builder-manager/package.json +++ b/code/deprecated/builder-manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/builder-manager", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook manager builder", "keywords": [ "storybook" diff --git a/code/deprecated/channels/package.json b/code/deprecated/channels/package.json index 5e355be150c0..fa2c478a58d3 100644 --- a/code/deprecated/channels/package.json +++ b/code/deprecated/channels/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/channels", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/deprecated/client-logger/package.json b/code/deprecated/client-logger/package.json index 3ee33658fc74..e294478cbf45 100644 --- a/code/deprecated/client-logger/package.json +++ b/code/deprecated/client-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/client-logger", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/deprecated/components/package.json b/code/deprecated/components/package.json index b072d5bd9955..af7ff6ba77ee 100644 --- a/code/deprecated/components/package.json +++ b/code/deprecated/components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/components", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook Components", "keywords": [ "storybook" diff --git a/code/deprecated/core-common/package.json b/code/deprecated/core-common/package.json index 5da58e0d0c0d..0b399bb74ae5 100644 --- a/code/deprecated/core-common/package.json +++ b/code/deprecated/core-common/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-common", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/deprecated/core-events/package.json b/code/deprecated/core-events/package.json index b99a130b55d5..58c9499b84b2 100644 --- a/code/deprecated/core-events/package.json +++ b/code/deprecated/core-events/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-events", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Event names used in storybook core", "keywords": [ "storybook" diff --git a/code/deprecated/core-server/package.json b/code/deprecated/core-server/package.json index 5837d5034869..ec8266f6ac4c 100644 --- a/code/deprecated/core-server/package.json +++ b/code/deprecated/core-server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-server", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/deprecated/csf-tools/package.json b/code/deprecated/csf-tools/package.json index 29bfaee4b142..dd9af935811d 100644 --- a/code/deprecated/csf-tools/package.json +++ b/code/deprecated/csf-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-tools", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Parse and manipulate CSF and Storybook config files", "keywords": [ "storybook" diff --git a/code/deprecated/docs-tools/package.json b/code/deprecated/docs-tools/package.json index 289105b22848..efb88bdda298 100644 --- a/code/deprecated/docs-tools/package.json +++ b/code/deprecated/docs-tools/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/docs-tools", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Shared utility functions for frameworks to implement docs", "keywords": [ "storybook" diff --git a/code/deprecated/manager-api/package.json b/code/deprecated/manager-api/package.json index 028caf13d0b6..4f2b39cfd4a0 100644 --- a/code/deprecated/manager-api/package.json +++ b/code/deprecated/manager-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager-api", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook Manager API & Context", "keywords": [ "storybook" diff --git a/code/deprecated/manager/package.json b/code/deprecated/manager/package.json index a52d06df9842..ffee99ef38f7 100644 --- a/code/deprecated/manager/package.json +++ b/code/deprecated/manager/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/manager", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook UI", "keywords": [ "storybook" diff --git a/code/deprecated/node-logger/package.json b/code/deprecated/node-logger/package.json index 1daca1180932..042ca88507a9 100644 --- a/code/deprecated/node-logger/package.json +++ b/code/deprecated/node-logger/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/node-logger", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/deprecated/preview-api/package.json b/code/deprecated/preview-api/package.json index f2744ff9215d..d0230ee9421a 100644 --- a/code/deprecated/preview-api/package.json +++ b/code/deprecated/preview-api/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview-api", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/deprecated/preview/package.json b/code/deprecated/preview/package.json index b19e7fd1a362..f88764cf7f41 100644 --- a/code/deprecated/preview/package.json +++ b/code/deprecated/preview/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preview", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/deprecated/router/package.json b/code/deprecated/router/package.json index c5569f52f46e..440d518d151b 100644 --- a/code/deprecated/router/package.json +++ b/code/deprecated/router/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/router", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook Router", "keywords": [ "storybook" diff --git a/code/deprecated/telemetry/package.json b/code/deprecated/telemetry/package.json index b8552ca62b66..ec0006e0b243 100644 --- a/code/deprecated/telemetry/package.json +++ b/code/deprecated/telemetry/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/telemetry", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Telemetry logging for crash reports and usage statistics", "keywords": [ "storybook" diff --git a/code/deprecated/theming/package.json b/code/deprecated/theming/package.json index 3d79a749fb7e..f0a24385c90b 100644 --- a/code/deprecated/theming/package.json +++ b/code/deprecated/theming/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/theming", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook Components", "keywords": [ "storybook" diff --git a/code/deprecated/types/package.json b/code/deprecated/types/package.json index 52b9096ee28b..5cd30acfcdf5 100644 --- a/code/deprecated/types/package.json +++ b/code/deprecated/types/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/types", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Core Storybook TS Types", "keywords": [ "storybook" diff --git a/code/frameworks/angular/package.json b/code/frameworks/angular/package.json index a16fc8150a80..0e3b36be1e81 100644 --- a/code/frameworks/angular/package.json +++ b/code/frameworks/angular/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/angular", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Angular: Develop Angular components in isolation with hot reloading.", "keywords": [ "storybook", diff --git a/code/frameworks/ember/package.json b/code/frameworks/ember/package.json index dde834c496d5..60f7e7465772 100644 --- a/code/frameworks/ember/package.json +++ b/code/frameworks/ember/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/ember", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Ember: Develop Ember Component in isolation with Hot Reloading.", "homepage": "https://github.com/storybookjs/storybook/tree/next/code/frameworks/ember", "bugs": { diff --git a/code/frameworks/html-vite/package.json b/code/frameworks/html-vite/package.json index bbfe01fb992e..29838adda26e 100644 --- a/code/frameworks/html-vite/package.json +++ b/code/frameworks/html-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for HTML and Vite: Develop HTML in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/html-webpack5/package.json b/code/frameworks/html-webpack5/package.json index 19433e8b8f07..ebd7aded72dd 100644 --- a/code/frameworks/html-webpack5/package.json +++ b/code/frameworks/html-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/nextjs/package.json b/code/frameworks/nextjs/package.json index 0818278761e1..21548ab9ebfd 100644 --- a/code/frameworks/nextjs/package.json +++ b/code/frameworks/nextjs/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/nextjs", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Next.js", "keywords": [ "storybook", diff --git a/code/frameworks/preact-vite/package.json b/code/frameworks/preact-vite/package.json index d7344558a421..605d751e3b7a 100644 --- a/code/frameworks/preact-vite/package.json +++ b/code/frameworks/preact-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Preact and Vite: Develop Preact components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/preact-webpack5/package.json b/code/frameworks/preact-webpack5/package.json index 413179dc6fd1..8ffe8ecad7b4 100644 --- a/code/frameworks/preact-webpack5/package.json +++ b/code/frameworks/preact-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index 320b99cb3005..746a310a7f42 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for React and Vite: Develop React components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/react-webpack5/package.json b/code/frameworks/react-webpack5/package.json index 9be13bf40f80..bda584aa4ba3 100644 --- a/code/frameworks/react-webpack5/package.json +++ b/code/frameworks/react-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/server-webpack5/package.json b/code/frameworks/server-webpack5/package.json index 20c7176ad11c..29a98960cff6 100644 --- a/code/frameworks/server-webpack5/package.json +++ b/code/frameworks/server-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/svelte-vite/package.json b/code/frameworks/svelte-vite/package.json index 7382460efc65..d5872a468da5 100644 --- a/code/frameworks/svelte-vite/package.json +++ b/code/frameworks/svelte-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Svelte and Vite: Develop Svelte components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/svelte-webpack5/package.json b/code/frameworks/svelte-webpack5/package.json index a26b09f0e119..3f58160bd940 100644 --- a/code/frameworks/svelte-webpack5/package.json +++ b/code/frameworks/svelte-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/sveltekit/package.json b/code/frameworks/sveltekit/package.json index 07428f493a0d..be4aed6684ce 100644 --- a/code/frameworks/sveltekit/package.json +++ b/code/frameworks/sveltekit/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/sveltekit", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for SvelteKit", "keywords": [ "storybook", diff --git a/code/frameworks/vue3-vite/package.json b/code/frameworks/vue3-vite/package.json index f9361e7b775b..bf70101f1701 100644 --- a/code/frameworks/vue3-vite/package.json +++ b/code/frameworks/vue3-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Vue3 and Vite: Develop Vue3 components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/vue3-webpack5/package.json b/code/frameworks/vue3-webpack5/package.json index 41e17adba7a3..f8cc68b8cd74 100644 --- a/code/frameworks/vue3-webpack5/package.json +++ b/code/frameworks/vue3-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/web-components-vite/package.json b/code/frameworks/web-components-vite/package.json index a18fc4d66d45..6dca8fe1e879 100644 --- a/code/frameworks/web-components-vite/package.json +++ b/code/frameworks/web-components-vite/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-vite", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for web-components and Vite: Develop Web Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/frameworks/web-components-webpack5/package.json b/code/frameworks/web-components-webpack5/package.json index 7a3d01a09011..f210eaa12fad 100644 --- a/code/frameworks/web-components-webpack5/package.json +++ b/code/frameworks/web-components-webpack5/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components-webpack5", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for web-components: View web components snippets in isolation with Hot Reloading.", "keywords": [ "lit", diff --git a/code/lib/blocks/package.json b/code/lib/blocks/package.json index f6a998875bec..ebc7b9ca88aa 100644 --- a/code/lib/blocks/package.json +++ b/code/lib/blocks/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/blocks", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Doc Blocks", "keywords": [ "storybook" diff --git a/code/lib/cli-sb/package.json b/code/lib/cli-sb/package.json index 1f8b0cda1a5f..973525ffe4e8 100644 --- a/code/lib/cli-sb/package.json +++ b/code/lib/cli-sb/package.json @@ -1,6 +1,6 @@ { "name": "sb", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook CLI", "keywords": [ "storybook" diff --git a/code/lib/cli-storybook/package.json b/code/lib/cli-storybook/package.json index 4f28285772e4..2a1dbc51a0a1 100644 --- a/code/lib/cli-storybook/package.json +++ b/code/lib/cli-storybook/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/cli", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook CLI", "keywords": [ "storybook" diff --git a/code/lib/cli/package.json b/code/lib/cli/package.json index 3b7f10bf0838..7f78b60ee29b 100644 --- a/code/lib/cli/package.json +++ b/code/lib/cli/package.json @@ -1,6 +1,6 @@ { "name": "storybook", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook's CLI - install, dev, build, upgrade, and more", "keywords": [ "cli", diff --git a/code/lib/codemod/package.json b/code/lib/codemod/package.json index 6e55584c100d..33f47d4d70e8 100644 --- a/code/lib/codemod/package.json +++ b/code/lib/codemod/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/codemod", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "A collection of codemod scripts written with JSCodeshift", "keywords": [ "storybook" diff --git a/code/lib/core-webpack/package.json b/code/lib/core-webpack/package.json index 1e95304dbf0f..4b5d823b5653 100644 --- a/code/lib/core-webpack/package.json +++ b/code/lib/core-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/core-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook framework-agnostic API", "keywords": [ "storybook" diff --git a/code/lib/csf-plugin/package.json b/code/lib/csf-plugin/package.json index 447d677386e5..30a0c1882532 100644 --- a/code/lib/csf-plugin/package.json +++ b/code/lib/csf-plugin/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/csf-plugin", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Enrich CSF files via static analysis", "keywords": [ "storybook" diff --git a/code/lib/instrumenter/package.json b/code/lib/instrumenter/package.json index ba29f5151f1c..8c1d9af126fa 100644 --- a/code/lib/instrumenter/package.json +++ b/code/lib/instrumenter/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/instrumenter", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/lib/react-dom-shim/package.json b/code/lib/react-dom-shim/package.json index 29af1e282b9a..39f37f3b2eaf 100644 --- a/code/lib/react-dom-shim/package.json +++ b/code/lib/react-dom-shim/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react-dom-shim", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/lib/source-loader/package.json b/code/lib/source-loader/package.json index 3e052e22090b..cdd281fc63a6 100644 --- a/code/lib/source-loader/package.json +++ b/code/lib/source-loader/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/source-loader", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Source loader", "keywords": [ "lib", diff --git a/code/lib/test/package.json b/code/lib/test/package.json index ec3ed55f79cd..e8a45299549d 100644 --- a/code/lib/test/package.json +++ b/code/lib/test/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/test", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "", "keywords": [ "storybook" diff --git a/code/package.json b/code/package.json index 1d3efde6720d..8b3f199748e1 100644 --- a/code/package.json +++ b/code/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/root", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "private": true, "description": "Storybook root", "homepage": "https://storybook.js.org/", @@ -278,6 +278,5 @@ "Dependency Upgrades" ] ] - }, - "deferredNextVersion": "8.3.0-alpha.1" + } } diff --git a/code/presets/create-react-app/package.json b/code/presets/create-react-app/package.json index 2241500c2450..b45def35ba59 100644 --- a/code/presets/create-react-app/package.json +++ b/code/presets/create-react-app/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-create-react-app", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Create React App preset", "keywords": [ "storybook" diff --git a/code/presets/html-webpack/package.json b/code/presets/html-webpack/package.json index 704f6d59d308..7dd8843c1e19 100644 --- a/code/presets/html-webpack/package.json +++ b/code/presets/html-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-html-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for HTML: View HTML snippets in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/preact-webpack/package.json b/code/presets/preact-webpack/package.json index 6a1e0a280a15..bb2ad46d54a8 100644 --- a/code/presets/preact-webpack/package.json +++ b/code/presets/preact-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-preact-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Preact: Develop Preact Component in isolation.", "keywords": [ "storybook" diff --git a/code/presets/react-webpack/package.json b/code/presets/react-webpack/package.json index 771b67e795c7..9c55e89a4b22 100644 --- a/code/presets/react-webpack/package.json +++ b/code/presets/react-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-react-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for React: Develop React Component in isolation with Hot Reloading", "keywords": [ "storybook" diff --git a/code/presets/server-webpack/package.json b/code/presets/server-webpack/package.json index b516d0b928bf..e67ab81926ca 100644 --- a/code/presets/server-webpack/package.json +++ b/code/presets/server-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-server-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Server: View HTML snippets from a server in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/svelte-webpack/package.json b/code/presets/svelte-webpack/package.json index a2e60dd2a774..411ac6fbdefe 100644 --- a/code/presets/svelte-webpack/package.json +++ b/code/presets/svelte-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-svelte-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Svelte: Develop Svelte Component in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/presets/vue3-webpack/package.json b/code/presets/vue3-webpack/package.json index b122128b6ee6..ac6ce9139059 100644 --- a/code/presets/vue3-webpack/package.json +++ b/code/presets/vue3-webpack/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preset-vue3-webpack", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook for Vue 3: Develop Vue 3 Components in isolation with Hot Reloading.", "keywords": [ "storybook" diff --git a/code/renderers/html/package.json b/code/renderers/html/package.json index 66dc2ae7b0b2..86a3cb06529a 100644 --- a/code/renderers/html/package.json +++ b/code/renderers/html/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/html", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook HTML renderer", "keywords": [ "storybook" diff --git a/code/renderers/preact/package.json b/code/renderers/preact/package.json index 37a3f71ca970..fcf82aa276c1 100644 --- a/code/renderers/preact/package.json +++ b/code/renderers/preact/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/preact", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Preact renderer", "keywords": [ "storybook" diff --git a/code/renderers/react/package.json b/code/renderers/react/package.json index 19ade57fedf1..16bd63698d2c 100644 --- a/code/renderers/react/package.json +++ b/code/renderers/react/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/react", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook React renderer", "keywords": [ "storybook" diff --git a/code/renderers/server/package.json b/code/renderers/server/package.json index 01ce95136d61..704655e2cc58 100644 --- a/code/renderers/server/package.json +++ b/code/renderers/server/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/server", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Server renderer", "keywords": [ "storybook" diff --git a/code/renderers/svelte/package.json b/code/renderers/svelte/package.json index a5076f7b8972..99c7cb1ebe71 100644 --- a/code/renderers/svelte/package.json +++ b/code/renderers/svelte/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/svelte", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Svelte renderer", "keywords": [ "storybook" diff --git a/code/renderers/vue3/package.json b/code/renderers/vue3/package.json index ff2881aadbe2..c2db348acce1 100644 --- a/code/renderers/vue3/package.json +++ b/code/renderers/vue3/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/vue3", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook Vue 3 renderer", "keywords": [ "storybook" diff --git a/code/renderers/web-components/package.json b/code/renderers/web-components/package.json index 4287094def3b..05c585126c7b 100644 --- a/code/renderers/web-components/package.json +++ b/code/renderers/web-components/package.json @@ -1,6 +1,6 @@ { "name": "@storybook/web-components", - "version": "8.3.0-alpha.0", + "version": "8.3.0-alpha.1", "description": "Storybook web-components renderer", "keywords": [ "lit", From e9e441a2d1e89675e4fbfa5965d8ca297f42e0f5 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Tue, 16 Jul 2024 02:39:36 +0000 Subject: [PATCH 33/35] Update CHANGELOG.md for v8.2.4 [skip ci] --- CHANGELOG.md | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 5143f97018fe..7b3dd726dbd7 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 8.2.4 + +- CLI: Add diagnostic when the `storybook` package is missing - [#28604](https://github.com/storybookjs/storybook/pull/28604), thanks @kasperpeulen! +- CLI: Make a few automigrations run on all version upgrades - [#28601](https://github.com/storybookjs/storybook/pull/28601), thanks @yannbf! +- CPC: Direct dependencies on shim packages in renderers - [#28599](https://github.com/storybookjs/storybook/pull/28599), thanks @ndelangen! + ## 8.2.3 - Bug: Fix invalid docs links in Configure.mdx template page - [#28560](https://github.com/storybookjs/storybook/pull/28560), thanks @kylegach! From e75ac8b4da8b838e45731abb073322166624df0c Mon Sep 17 00:00:00 2001 From: Lars Rickert Date: Tue, 16 Jul 2024 20:44:05 +0200 Subject: [PATCH 34/35] update docs --- code/renderers/vue3/src/docs/extractArgTypes.ts | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/code/renderers/vue3/src/docs/extractArgTypes.ts b/code/renderers/vue3/src/docs/extractArgTypes.ts index 164f5957e693..31f4d19dc163 100644 --- a/code/renderers/vue3/src/docs/extractArgTypes.ts +++ b/code/renderers/vue3/src/docs/extractArgTypes.ts @@ -286,7 +286,8 @@ export const convertVueComponentMetaProp = ( case 'object': return { name: 'object', - // Storybook does not generate controls for object properties so we don't need to recursively map the object schema here + // while Storybook generates simple JSON object controls, nested schemas don't have specialized controls + // so we don't need to recursively map the object schema here value: {}, required, }; From f00dec5aaf503ce9241ff612b2b24fb82077dd86 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Wed, 17 Jul 2024 13:58:09 +0200 Subject: [PATCH 35/35] Remove external overrides, use package.json as source of truth --- code/core/scripts/entries.ts | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/code/core/scripts/entries.ts b/code/core/scripts/entries.ts index 85297c1b0c56..cdd013e83907 100644 --- a/code/core/scripts/entries.ts +++ b/code/core/scripts/entries.ts @@ -28,12 +28,7 @@ export const getEntries = (cwd: string) => { define('src/preview-api/index.ts', ['browser', 'node'], true), define('src/manager-api/index.ts', ['browser', 'node'], true, ['react']), define('src/router/index.ts', ['browser', 'node'], true, ['react']), - define('src/components/index.ts', ['browser', 'node'], true, [ - 'react', - 'react-dom', - '@storybook/csf', - '@storybook/global', - ]), + define('src/components/index.ts', ['browser', 'node'], true, ['react', 'react-dom']), define('src/theming/index.ts', ['browser', 'node'], true, ['react']), define('src/theming/create.ts', ['browser', 'node'], true, ['react']), define('src/docs-tools/index.ts', ['browser', 'node'], true),