From d1f0385e4011a2c660399bf2b42ef91f96cbb8d3 Mon Sep 17 00:00:00 2001 From: dohi0512 Date: Tue, 29 Oct 2024 13:13:23 +0900 Subject: [PATCH 1/5] Remove duplicate comments --- code/frameworks/nextjs/src/routing/app-router-provider.tsx | 2 -- 1 file changed, 2 deletions(-) diff --git a/code/frameworks/nextjs/src/routing/app-router-provider.tsx b/code/frameworks/nextjs/src/routing/app-router-provider.tsx index d21fdc8382cf..881bb98a172f 100644 --- a/code/frameworks/nextjs/src/routing/app-router-provider.tsx +++ b/code/frameworks/nextjs/src/routing/app-router-provider.tsx @@ -41,8 +41,6 @@ function getSelectedParams(currentTree: FlightRouterState, params: Params = {}): continue; } - // Ensure catchAll and optional catchall are turned into an array - // Ensure catchAll and optional catchall are turned into an array const isCatchAll = isDynamicParameter && (segment[2] === 'c' || segment[2] === 'oc'); From 909297a014e4d53fa470c91fcab57c6300f112d1 Mon Sep 17 00:00:00 2001 From: Gert Hengeveld Date: Mon, 4 Nov 2024 12:15:45 +0100 Subject: [PATCH 2/5] Prevent clipping box shadow on file search modal --- code/core/src/manager/components/sidebar/FileSearchModal.tsx | 1 + 1 file changed, 1 insertion(+) diff --git a/code/core/src/manager/components/sidebar/FileSearchModal.tsx b/code/core/src/manager/components/sidebar/FileSearchModal.tsx index 469493744d43..043abffb5107 100644 --- a/code/core/src/manager/components/sidebar/FileSearchModal.tsx +++ b/code/core/src/manager/components/sidebar/FileSearchModal.tsx @@ -13,6 +13,7 @@ const MODAL_HEIGHT = 418; const ModalStyled = styled(Modal)(() => ({ boxShadow: 'none', background: 'transparent', + overflow: 'visible', })); const ModalChild = styled.div<{ height?: number }>(({ theme, height }) => ({ From 39a13d1355fbbc5494ee8d19b491cddcfc089c99 Mon Sep 17 00:00:00 2001 From: Valentin Palkovic Date: Mon, 4 Nov 2024 12:21:35 +0100 Subject: [PATCH 3/5] Addon Test: Enhance post-install logic for Next.js Vite framework support --- code/addons/test/src/postinstall.ts | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/code/addons/test/src/postinstall.ts b/code/addons/test/src/postinstall.ts index f7b5efe8521c..90595b0e15d6 100644 --- a/code/addons/test/src/postinstall.ts +++ b/code/addons/test/src/postinstall.ts @@ -58,7 +58,9 @@ export default async function postInstall(options: PostinstallOptions) { '@storybook/experimental-nextjs-vite', '@storybook/sveltekit', ].includes(info.frameworkPackageName) - ? info.frameworkPackageName + ? info.frameworkPackageName === '@storybook/nextjs' + ? '@storybook/experimental-nextjs-vite' + : info.frameworkPackageName : info.rendererPackageName && ['@storybook/react', '@storybook/svelte', '@storybook/vue3'].includes( info.rendererPackageName @@ -431,7 +433,7 @@ const getVitestPluginInfo = (framework: string) => { let frameworkPluginCall = ''; let frameworkPluginDocs = ''; - if (framework === '@storybook/nextjs') { + if (framework === '@storybook/nextjs' || framework === '@storybook/experimental-nextjs-vite') { frameworkPluginImport = "import { storybookNextJsPlugin } from '@storybook/experimental-nextjs-vite/vite-plugin';"; frameworkPluginDocs = From 9aa2f867d0fe3ca5ff9af933cf167d9982b9ba4f Mon Sep 17 00:00:00 2001 From: Gert Hengeveld Date: Mon, 4 Nov 2024 16:29:31 +0100 Subject: [PATCH 4/5] Fix type errors --- .../manager/components/sidebar/Heading.stories.tsx | 8 +++++--- .../src/manager/components/sidebar/Menu.stories.tsx | 11 ++++++----- 2 files changed, 11 insertions(+), 8 deletions(-) diff --git a/code/core/src/manager/components/sidebar/Heading.stories.tsx b/code/core/src/manager/components/sidebar/Heading.stories.tsx index 678a6c8e2ae5..81436bfc0a1d 100644 --- a/code/core/src/manager/components/sidebar/Heading.stories.tsx +++ b/code/core/src/manager/components/sidebar/Heading.stories.tsx @@ -24,9 +24,11 @@ export default { } as Meta; const menuItems = [ - { title: 'Menu Item 1', onClick: action('onActivateMenuItem'), id: '1' }, - { title: 'Menu Item 2', onClick: action('onActivateMenuItem'), id: '2' }, - { title: 'Menu Item 3', onClick: action('onActivateMenuItem'), id: '3' }, + [ + { title: 'Menu Item 1', onClick: action('onActivateMenuItem'), id: '1' }, + { title: 'Menu Item 2', onClick: action('onActivateMenuItem'), id: '2' }, + { title: 'Menu Item 3', onClick: action('onActivateMenuItem'), id: '3' }, + ], ]; export const MenuHighlighted: Story = () => ( diff --git a/code/core/src/manager/components/sidebar/Menu.stories.tsx b/code/core/src/manager/components/sidebar/Menu.stories.tsx index 663bd4caa3b4..d5bf90dc2a60 100644 --- a/code/core/src/manager/components/sidebar/Menu.stories.tsx +++ b/code/core/src/manager/components/sidebar/Menu.stories.tsx @@ -1,4 +1,3 @@ -import type { ComponentProps } from 'react'; import React from 'react'; import { TooltipLinkList } from '@storybook/core/components'; @@ -11,11 +10,13 @@ import type { State } from '@storybook/core/manager-api'; import { useMenu } from '../../container/Menu'; import { LayoutProvider } from '../layout/LayoutProvider'; -import { SidebarMenu } from './Menu'; +import { type MenuList, SidebarMenu } from './Menu'; -const fakemenu: ComponentProps['links'] = [ - { title: 'has icon', icon: , id: 'icon' }, - { title: 'has no icon', id: 'non' }, +const fakemenu: MenuList = [ + [ + { title: 'has icon', icon: , id: 'icon' }, + { title: 'has no icon', id: 'non' }, + ], ]; const meta = { From e9d6e2968b813004c258bc3a8c495b406ffc9afb Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Tue, 5 Nov 2024 02:32:55 +0000 Subject: [PATCH 5/5] Write changelog for 8.5.0-alpha.3 [skip ci] --- CHANGELOG.prerelease.md | 5 +++++ code/package.json | 3 ++- docs/versions/next.json | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.prerelease.md b/CHANGELOG.prerelease.md index f9f62e7c79d9..597322a9ce2a 100644 --- a/CHANGELOG.prerelease.md +++ b/CHANGELOG.prerelease.md @@ -1,3 +1,8 @@ +## 8.5.0-alpha.3 + +- Addon Test: Fix post-install logic for Next.js Vite framework support - [#29524](https://github.com/storybookjs/storybook/pull/29524), thanks @valentinpalkovic! +- Core: Prevent clipping box shadow on file search modal - [#29523](https://github.com/storybookjs/storybook/pull/29523), thanks @ghengeveld! + ## 8.5.0-alpha.2 - Addon Test: Only render the TestingModule component in development mode - [#29501](https://github.com/storybookjs/storybook/pull/29501), thanks @yannbf! diff --git a/code/package.json b/code/package.json index 78ec34d4fafe..3612783dda03 100644 --- a/code/package.json +++ b/code/package.json @@ -293,5 +293,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "8.5.0-alpha.3" } diff --git a/docs/versions/next.json b/docs/versions/next.json index 641189d11f4c..617b3b564f76 100644 --- a/docs/versions/next.json +++ b/docs/versions/next.json @@ -1 +1 @@ -{"version":"8.5.0-alpha.2","info":{"plain":"- Addon Test: Only render the TestingModule component in development mode - [#29501](https://github.com/storybookjs/storybook/pull/29501), thanks @yannbf!\n- CLI: Fix Solid init by installing `@storybook/test` - [#29514](https://github.com/storybookjs/storybook/pull/29514), thanks @shilman!\n- Core: Add bun support with npm fallback - [#29267](https://github.com/storybookjs/storybook/pull/29267), thanks @stephenjason89!\n- Core: Shim CJS-only globals in ESM output - [#29157](https://github.com/storybookjs/storybook/pull/29157), thanks @valentinpalkovic!\n- Next.js: Fix bundled react and react-dom in monorepos - [#29444](https://github.com/storybookjs/storybook/pull/29444), thanks @sentience!\n- Next.js: Upgrade sass-loader from ^13.2.0 to ^14.2.1 - [#29264](https://github.com/storybookjs/storybook/pull/29264), thanks @HoncharenkoZhenya!\n- UI: Add support for groups to `TooltipLinkList` and use it in main menu - [#29507](https://github.com/storybookjs/storybook/pull/29507), thanks @ghengeveld!"}} +{"version":"8.5.0-alpha.3","info":{"plain":"- Addon Test: Fix post-install logic for Next.js Vite framework support - [#29524](https://github.com/storybookjs/storybook/pull/29524), thanks @valentinpalkovic!\n- Core: Prevent clipping box shadow on file search modal - [#29523](https://github.com/storybookjs/storybook/pull/29523), thanks @ghengeveld!"}}