Merge pull request #29062 from storybookjs/version-non-patch-from-8.3…

….0-beta.3 Release: Prerelease 8.3.0-beta.4
storybookjs · Sep 9, 2024 · a2b7cfd · a2b7cfd
2 parents daf6159 + 7625d63
commit a2b7cfd
Show file tree

Hide file tree

Showing 19 changed files with 205 additions and 55 deletions.
diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md
@@ -1,3 +1,8 @@
+## 8.3.0-beta.4
+
+- Test: Rename vitest plugin entrypoint - [#29067](https://github.com/storybookjs/storybook/pull/29067), thanks @yannbf!
+- UI: Fix sidebar not wrapping - [#29055](https://github.com/storybookjs/storybook/pull/29055), thanks @JReinhold!
+
 ## 8.3.0-beta.3
 
 - Addon Test: Improve messages and post install script handling - [#29036](https://github.com/storybookjs/storybook/pull/29036), thanks @yannbf!

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/test/package.json b/code/addons/test/package.json
@@ -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/core/package.json b/code/core/package.json
@@ -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",

diff --git a/code/core/src/manager/components/sidebar/Sidebar.stories.tsx b/code/core/src/manager/components/sidebar/Sidebar.stories.tsx
@@ -143,6 +143,42 @@ export const WithRefs: Story = {
   },
 };
 
+export const WithRefsNarrow: Story = {
+  args: {
+    refs: {
+      wide: {
+        ...refs.optimized,
+        title: 'This is a ref with a very long title',
+      },
+    },
+  },
+  parameters: {
+    viewport: {
+      options: {
+        narrow: {
+          name: 'narrow',
+          styles: {
+            width: '400px',
+            height: '800px',
+          },
+        },
+      },
+    },
+    chromatic: {
+      modes: {
+        narrow: {
+          viewport: 400,
+        },
+      },
+    },
+  },
+  globals: {
+    viewport: {
+      value: 'narrow',
+    },
+  },
+};
+
 export const LoadingWithRefs: Story = {
   args: {
     ...Loading.args,

diff --git a/code/package.json b/code/package.json
@@ -295,5 +295,6 @@
         "Dependency Upgrades"
       ]
     ]
-  }
+  },
+  "deferredNextVersion": "8.3.0-beta.4"
 }