From 10a687cbe1813033837482a7126ee79f5456721d Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Mon, 23 Sep 2024 14:53:20 +0200 Subject: [PATCH 1/4] Merge pull request #29184 from storybookjs/shilman/28269-downgrade-typescript-docgen React-Vite: Downgrade react-docgen-typescript plugin (cherry picked from commit b23e84ad3ac8523d8f2372157cd6e5ddab9312b1) --- code/frameworks/react-vite/package.json | 2 +- code/yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/code/frameworks/react-vite/package.json b/code/frameworks/react-vite/package.json index 7a106d3a96ac..524cca88812c 100644 --- a/code/frameworks/react-vite/package.json +++ b/code/frameworks/react-vite/package.json @@ -47,7 +47,7 @@ "prep": "jiti ../../../scripts/prepare/bundle.ts" }, "dependencies": { - "@joshwooding/vite-plugin-react-docgen-typescript": "0.3.1", + "@joshwooding/vite-plugin-react-docgen-typescript": "0.3.0", "@rollup/pluginutils": "^5.0.2", "@storybook/builder-vite": "workspace:*", "@storybook/react": "workspace:*", diff --git a/code/yarn.lock b/code/yarn.lock index 4468a63fa841..e36544c79acb 100644 --- a/code/yarn.lock +++ b/code/yarn.lock @@ -3677,9 +3677,9 @@ __metadata: languageName: node linkType: hard -"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.1": - version: 0.3.1 - resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.1" +"@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.0": + version: 0.3.0 + resolution: "@joshwooding/vite-plugin-react-docgen-typescript@npm:0.3.0" dependencies: glob: "npm:^7.2.0" glob-promise: "npm:^4.2.0" @@ -3691,7 +3691,7 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10c0/a9c7a03d7d1daf5bd64949255516ba64c88d5600366c8c74dcdb6f37c2a6099daaec02860b7587d2220e61afa47a0b2de17ef70d723c2db02f24e0890edfd9f3 + checksum: 10c0/31098ad8fcc2440437534599c111d9f2951dd74821e8ba46c521b969bae4c918d830b7bb0484efbad29a51711bb62d3bc623d5a1ed5b1695b5b5594ea9dd4ca0 languageName: node linkType: hard @@ -6708,7 +6708,7 @@ __metadata: version: 0.0.0-use.local resolution: "@storybook/react-vite@workspace:frameworks/react-vite" dependencies: - "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.3.1" + "@joshwooding/vite-plugin-react-docgen-typescript": "npm:0.3.0" "@rollup/pluginutils": "npm:^5.0.2" "@storybook/builder-vite": "workspace:*" "@storybook/react": "workspace:*" From 89a3f3237e95245d9eba6a6830fbd1017e315228 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 24 Sep 2024 12:54:52 +0200 Subject: [PATCH 2/4] Merge pull request #29187 from andrasczeh/patch-1 CLI: Show constraints in error when getting depndencies (cherry picked from commit 71a3eb426cd64171efc8eb2c41e689d53ad2b14d) --- code/core/src/common/js-package-manager/JsPackageManager.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/code/core/src/common/js-package-manager/JsPackageManager.ts b/code/core/src/common/js-package-manager/JsPackageManager.ts index 305ba8d99ed2..1d1f2ef5367c 100644 --- a/code/core/src/common/js-package-manager/JsPackageManager.ts +++ b/code/core/src/common/js-package-manager/JsPackageManager.ts @@ -418,7 +418,7 @@ export abstract class JsPackageManager { .find((version) => satisfies(version, constraint)); invariant( latestVersionSatisfyingTheConstraint != null, - 'No version satisfying the constraint.' + `No version satisfying the constraint: ${packageName}${constraint}` ); return latestVersionSatisfyingTheConstraint; } From ade0f73ca452a93660a95341820c27b319ff2562 Mon Sep 17 00:00:00 2001 From: Kasper Peulen Date: Tue, 24 Sep 2024 13:02:37 +0200 Subject: [PATCH 3/4] Merge pull request #29175 from JSMike/patch-1 Fix composed storybook TooltipLinkList bug where href isn't passed forward (cherry picked from commit 1a50094cd511ce7c27b9a0cf7b29075949b33263) --- code/core/src/components/components/tooltip/ListItem.tsx | 2 +- .../src/components/components/tooltip/TooltipLinkList.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/code/core/src/components/components/tooltip/ListItem.tsx b/code/core/src/components/components/tooltip/ListItem.tsx index 068ab88d59c2..8d50a05273de 100644 --- a/code/core/src/components/components/tooltip/ListItem.tsx +++ b/code/core/src/components/components/tooltip/ListItem.tsx @@ -169,7 +169,7 @@ const getItemProps = memoize(100)((onClick, href, LinkWrapper) => ({ export type LinkWrapperType = (props: any) => ReactNode; -export interface ListItemProps extends Omit, 'href' | 'title'> { +export interface ListItemProps extends Omit, 'title'> { loading?: boolean; title?: ReactNode; center?: ReactNode; diff --git a/code/core/src/components/components/tooltip/TooltipLinkList.tsx b/code/core/src/components/components/tooltip/TooltipLinkList.tsx index 51540335d034..f1467babec3a 100644 --- a/code/core/src/components/components/tooltip/TooltipLinkList.tsx +++ b/code/core/src/components/components/tooltip/TooltipLinkList.tsx @@ -22,7 +22,7 @@ export interface Link extends Omit { id: string; onClick?: ( event: SyntheticEvent, - item: Pick + item: Pick ) => void; } @@ -31,11 +31,11 @@ interface ItemProps extends Link { } const Item = ({ id, onClick, ...rest }: ItemProps) => { - const { active, disabled, title } = rest; + const { active, disabled, title, href } = rest; const handleClick = useCallback( - (event: SyntheticEvent) => onClick?.(event, { id, active, disabled, title }), - [onClick, id, active, disabled, title] + (event: SyntheticEvent) => onClick?.(event, { id, active, disabled, title, href }), + [onClick, id, active, disabled, title, href] ); return ; From bfc73ac488dc010db4413cccf6c089f7a5d85ff0 Mon Sep 17 00:00:00 2001 From: storybook-bot <32066757+storybook-bot@users.noreply.github.com> Date: Tue, 24 Sep 2024 11:17:26 +0000 Subject: [PATCH 4/4] Write changelog for 8.3.3 [skip ci] --- CHANGELOG.md | 6 ++++++ code/package.json | 3 ++- docs/versions/latest.json | 2 +- 3 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0bae092457f4..3115c6b4c070 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 8.3.3 + +- CLI: Show constraints in error when getting depndencies - [#29187](https://github.com/storybookjs/storybook/pull/29187), thanks @andrasczeh! +- React-Vite: Downgrade react-docgen-typescript plugin - [#29184](https://github.com/storybookjs/storybook/pull/29184), thanks @shilman! +- UI: Fix composed storybook TooltipLinkList bug where href isn't passed forward - [#29175](https://github.com/storybookjs/storybook/pull/29175), thanks @JSMike! + ## 8.3.2 - CLI: Fix skip-install for stable latest releases - [#29133](https://github.com/storybookjs/storybook/pull/29133), thanks @valentinpalkovic! diff --git a/code/package.json b/code/package.json index 3171a076d919..f5c866afa91d 100644 --- a/code/package.json +++ b/code/package.json @@ -295,5 +295,6 @@ "Dependency Upgrades" ] ] - } + }, + "deferredNextVersion": "8.3.3" } diff --git a/docs/versions/latest.json b/docs/versions/latest.json index ef423cd01887..b809ee18030e 100644 --- a/docs/versions/latest.json +++ b/docs/versions/latest.json @@ -1 +1 @@ -{"version":"8.3.2","info":{"plain":"- CLI: Fix skip-install for stable latest releases - [#29133](https://github.com/storybookjs/storybook/pull/29133), thanks @valentinpalkovic!\n- Core: Do not add packageManager field to package.json during `storybook dev` - [#29152](https://github.com/storybookjs/storybook/pull/29152), thanks @valentinpalkovic!"}} +{"version":"8.3.3","info":{"plain":"- CLI: Show constraints in error when getting depndencies - [#29187](https://github.com/storybookjs/storybook/pull/29187), thanks @andrasczeh!\n- React-Vite: Downgrade react-docgen-typescript plugin - [#29184](https://github.com/storybookjs/storybook/pull/29184), thanks @shilman!\n- UI: Fix composed storybook TooltipLinkList bug where href isn't passed forward - [#29175](https://github.com/storybookjs/storybook/pull/29175), thanks @JSMike!"}}