Merge branch 'next' of github.com:storybookjs/storybook into valentin…

…/propagate-error-in-testing
storybookjs · Sep 9, 2024 · fe0843b · fe0843b
2 parents c24f221 + 01b9f91
commit fe0843b
Show file tree

Hide file tree

Showing 103 changed files with 375 additions and 224 deletions.
diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,10 @@
+## 8.3.0-beta.3
+
+- Addon Test: Improve messages and post install script handling - [#29036](https://github.com/storybookjs/storybook/pull/29036), thanks @yannbf!
+- Next.js-Vite: Fix vite plugin exports - [#29046](https://github.com/storybookjs/storybook/pull/29046), thanks @valentinpalkovic!
+- Next.js: Update dependencies - [#29052](https://github.com/storybookjs/storybook/pull/29052), thanks @valentinpalkovic!
+- UI: Fix conditional hooks usage in sidebar - [#28979](https://github.com/storybookjs/storybook/pull/28979), thanks @JReinhold!
+
 ## 8.3.0-beta.2
 
 - Addon Vitest: Fix indentation of 'vitePluginNext' in generated Vitest config file - [#29011](https://github.com/storybookjs/storybook/pull/29011), thanks @ghengeveld!

diff --git a/code/.storybook/vitest.config.ts b/code/.storybook/vitest.config.ts
@@ -21,7 +21,7 @@ export default mergeConfig(
  vitestCommonConfig,
  defineProject({
  plugins: [
- import('@storybook/experimental-addon-test/vite-plugin').then(({ storybookTest }) =>
+ import('@storybook/experimental-addon-test/vitest-plugin').then(({ storybookTest }) =>
  storybookTest({
  configDir: process.cwd(),
  })

diff --git a/code/addons/a11y/package.json b/code/addons/a11y/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-a11y",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Test component compliance with web accessibility standards",
  "keywords": [
  "a11y",

diff --git a/code/addons/actions/package.json b/code/addons/actions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-actions",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-backgrounds",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-controls",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-docs",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Document component usage and properties in Markdown",
  "keywords": [
  "addon",

diff --git a/code/addons/essentials/package.json b/code/addons/essentials/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-essentials",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-mdx-gfm",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "GitHub Flavored Markdown in Storybook",
  "keywords": [
  "addon",

diff --git a/code/addons/highlight/package.json b/code/addons/highlight/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-highlight",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Highlight DOM nodes within your stories",
  "keywords": [
  "storybook-addons",

diff --git a/code/addons/interactions/package.json b/code/addons/interactions/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-interactions",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Automate, test and debug user interactions",
  "keywords": [
  "storybook-addons",

diff --git a/code/addons/jest/package.json b/code/addons/jest/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-jest",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-links",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-measure",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-onboarding",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-outline",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-storysource",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "View a story’s source code to see how it works and paste into your app",
  "keywords": [
  "addon",

diff --git a/code/addons/test/package.json b/code/addons/test/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/experimental-addon-test",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Integrate Vitest with Storybook",
  "keywords": [
  "storybook-addons",
@@ -29,24 +29,24 @@
  "import": "./dist/index.js",
  "require": "./dist/index.cjs"
  },
- "./vite-plugin": {
- "types": "./dist/plugin/index.d.ts",
- "import": "./dist/plugin/index.js",
- "require": "./dist/plugin/index.cjs"
+ "./vitest-plugin": {
+ "types": "./dist/vitest-plugin/index.d.ts",
+ "import": "./dist/vitest-plugin/index.js",
+ "require": "./dist/vitest-plugin/index.cjs"
  },
  "./internal/global-setup": {
- "types": "./dist/plugin/global-setup.d.ts",
- "import": "./dist/plugin/global-setup.js",
- "require": "./dist/plugin/global-setup.cjs"
+ "types": "./dist/vitest-plugin/global-setup.d.ts",
+ "import": "./dist/vitest-plugin/global-setup.js",
+ "require": "./dist/vitest-plugin/global-setup.cjs"
  },
  "./internal/setup-file": {
- "types": "./dist/plugin/setup-file.d.ts",
- "import": "./dist/plugin/setup-file.js"
+ "types": "./dist/vitest-plugin/setup-file.d.ts",
+ "import": "./dist/vitest-plugin/setup-file.js"
  },
  "./internal/test-utils": {
- "types": "./dist/plugin/test-utils.d.ts",
- "import": "./dist/plugin/test-utils.js",
- "require": "./dist/plugin/test-utils.cjs"
+ "types": "./dist/vitest-plugin/test-utils.d.ts",
+ "import": "./dist/vitest-plugin/test-utils.js",
+ "require": "./dist/vitest-plugin/test-utils.cjs"
  },
  "./manager": "./dist/manager.js",
  "./preset": "./dist/preset.cjs",
@@ -93,16 +93,16 @@
  "bundler": {
  "exportEntries": [
  "./src/index.ts",
- "./src/plugin/test-utils.ts",
- "./src/plugin/setup-file.ts"
+ "./src/vitest-plugin/test-utils.ts",
+ "./src/vitest-plugin/setup-file.ts"
  ],
  "managerEntries": [
  "./src/manager.tsx"
  ],
  "nodeEntries": [
  "./src/preset.ts",
- "./src/plugin/index.ts",
- "./src/plugin/global-setup.ts",
+ "./src/vitest-plugin/index.ts",
+ "./src/vitest-plugin/global-setup.ts",
  "./src/postinstall.ts"
  ]
  }

diff --git a/code/addons/test/src/index.ts b/code/addons/test/src/index.ts
@@ -1,9 +1,9 @@
-import type { storybookTest as storybookTestImport } from './plugin';
+import type { storybookTest as storybookTestImport } from './vitest-plugin';
 
 // make it work with --isolatedModules
 export default {};
 
 // @ts-expect-error - this is a hack to make the module's sub-path augmentable
-declare module '@storybook/experimental-addon-test/vite-plugin' {
+declare module '@storybook/experimental-addon-test/vitest-plugin' {
  export const storybookTest: typeof storybookTestImport;
 }
diff --git a/code/addons/test/src/postinstall.ts b/code/addons/test/src/postinstall.ts
@@ -286,7 +286,7 @@ export default async function postInstall(options: PostinstallOptions) {
  browserWorkspaceFile,
  dedent`
  import { defineWorkspace } from 'vitest/config';
- import { storybookTest } from '@storybook/experimental-addon-test/vite-plugin';${vitestInfo.frameworkPluginImport}
+ import { storybookTest } from '@storybook/experimental-addon-test/vitest-plugin';${vitestInfo.frameworkPluginImport}
 
  // More info at: https://storybook.js.org/docs/writing-tests/test-runner-with-vitest
  export default defineWorkspace([
@@ -325,7 +325,7 @@ export default async function postInstall(options: PostinstallOptions) {
  newVitestConfigFile,
  dedent`
  import { defineConfig } from 'vitest/config';
- import { storybookTest } from '@storybook/experimental-addon-test/vite-plugin';${vitestInfo.frameworkPluginImport}
+ import { storybookTest } from '@storybook/experimental-addon-test/vitest-plugin';${vitestInfo.frameworkPluginImport}
 
  // More info at: https://storybook.js.org/docs/writing-tests/test-runner-with-vitest
  export default defineConfig({

diff --git a/code/addons/test/src/plugin/global-setup.ts → ...ns/test/src/vitest-plugin/global-setup.ts b/code/addons/test/src/plugin/global-setup.ts → ...ns/test/src/vitest-plugin/global-setup.ts
diff --git a/code/addons/test/src/plugin/index.ts → code/addons/test/src/vitest-plugin/index.ts b/code/addons/test/src/plugin/index.ts → code/addons/test/src/vitest-plugin/index.ts
diff --git a/...addons/test/src/plugin/setup-file.test.ts → ...test/src/vitest-plugin/setup-file.test.ts b/...addons/test/src/plugin/setup-file.test.ts → ...test/src/vitest-plugin/setup-file.test.ts
diff --git a/code/addons/test/src/plugin/setup-file.ts → ...dons/test/src/vitest-plugin/setup-file.ts b/code/addons/test/src/plugin/setup-file.ts → ...dons/test/src/vitest-plugin/setup-file.ts
diff --git a/code/addons/test/src/plugin/test-utils.ts → ...dons/test/src/vitest-plugin/test-utils.ts b/code/addons/test/src/plugin/test-utils.ts → ...dons/test/src/vitest-plugin/test-utils.ts
diff --git a/code/addons/test/src/plugin/types.ts → code/addons/test/src/vitest-plugin/types.ts b/code/addons/test/src/plugin/types.ts → code/addons/test/src/vitest-plugin/types.ts
diff --git a/.../addons/test/src/plugin/viewports.test.ts → .../test/src/vitest-plugin/viewports.test.ts b/.../addons/test/src/plugin/viewports.test.ts → .../test/src/vitest-plugin/viewports.test.ts
diff --git a/code/addons/test/src/plugin/viewports.ts → ...ddons/test/src/vitest-plugin/viewports.ts b/code/addons/test/src/plugin/viewports.ts → ...ddons/test/src/vitest-plugin/viewports.ts
diff --git a/code/addons/themes/package.json b/code/addons/themes/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-themes",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-toolbars",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/addon-viewport",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/builder-vite",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "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
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/builder-webpack5",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Storybook framework-agnostic API",
  "keywords": [
  "storybook"

diff --git a/code/core/package.json b/code/core/package.json
@@ -1,6 +1,6 @@
 {
  "name": "@storybook/core",
- "version": "8.3.0-beta.2",
+ "version": "8.3.0-beta.3",
  "description": "Storybook framework-agnostic API",
  "keywords": [
  "storybook"
@@ -307,7 +307,7 @@
  "@ndelangen/get-tarball": "^3.0.7",
  "@popperjs/core": "^2.6.0",
  "@radix-ui/react-dialog": "^1.0.5",
- "@radix-ui/react-scroll-area": "^1.0.5",
+ "@radix-ui/react-scroll-area": "1.2.0-rc.7",
  "@radix-ui/react-slot": "^1.0.2",
  "@storybook/docs-mdx": "4.0.0-next.1",
  "@storybook/global": "^5.0.0",