Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Release: Prerelease 8.0.0-beta.2 #25932

Merged
merged 76 commits into from
Feb 10, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
76 commits
Select commit Hold shift + click to select a range
086153a
Core: move @types packages to dev deps in core-common
kyletsang Dec 30, 2023
b2701d1
Remove Icons component
cdedreuille Jan 30, 2024
90c65c9
Update ToolbarMenuButton.tsx
cdedreuille Jan 30, 2024
9606804
Update preview.tsx
cdedreuille Jan 30, 2024
875744d
Update types
cdedreuille Jan 30, 2024
69a245b
Merge branch 'next' into charles-fix-toolbars-icons
cdedreuille Jan 31, 2024
324152e
Bring back old version
cdedreuille Jan 31, 2024
42c6704
Remove deprecate warning
cdedreuille Jan 31, 2024
98f9f1c
Replace icons
cdedreuille Jan 31, 2024
f85c41b
Continue to remove Icons
cdedreuille Jan 31, 2024
963140a
Remove other icons from addons
cdedreuille Jan 31, 2024
51524ac
Merge branch 'next' into charles-fix-toolbars-icons
cdedreuille Jan 31, 2024
c107c94
Update shortcuts.tsx
cdedreuille Jan 31, 2024
fa608f3
Update Color.tsx
cdedreuille Jan 31, 2024
b361f5c
Update SectionRow.tsx
cdedreuille Jan 31, 2024
306405d
refactor: rename testing-utils paths to portable-stories
yannbf Feb 2, 2024
d0d2a2f
Update StatusIcon.tsx
cdedreuille Feb 5, 2024
c08967b
Update Storybook icons package
cdedreuille Feb 5, 2024
c2123d4
Update props name
cdedreuille Feb 5, 2024
eeaf4b5
Merge branch 'next' into charles-fix-toolbars-icons
cdedreuille Feb 5, 2024
9ee4b76
Update StatusIcon.tsx
cdedreuille Feb 5, 2024
997fe11
Further docs updates
kylegach Feb 5, 2024
b383f1b
Format snippet
kylegach Feb 5, 2024
1d58763
Add a `rollup-plugin-webpack-stats` to allow stats from preview builds
tmeasday Feb 6, 2024
d1f67dc
Avoid duplication with existing TS plugin
tmeasday Feb 6, 2024
a64f90b
Merge branch 'next' into pr/kyletsang/25387
ndelangen Feb 6, 2024
a701072
Discard changes to code/addons/docs/docs/props-tables.md
ndelangen Feb 6, 2024
b4b7343
Discard changes to code/builders/builder-vite/input/iframe.html
ndelangen Feb 6, 2024
befe593
Discard changes to code/frameworks/nextjs/README.md
ndelangen Feb 6, 2024
92753a4
Discard changes to code/lib/cli/tsconfig.json
ndelangen Feb 6, 2024
ead01be
Discard changes to code/presets/vue3-webpack/README.md
ndelangen Feb 6, 2024
fa5a56c
rename portable stories files, refactor tests
yannbf Feb 6, 2024
a307dfa
Merge branch 'next' into yann/rename-testing-utils-to-portable-stories
yannbf Feb 6, 2024
34a76b2
Update CHANGELOG.md for v7.6.13 [skip ci]
storybook-bot Feb 6, 2024
ccb3e1a
Merge branch 'next-release' into next
storybook-bot Feb 6, 2024
27d4648
fix: update essential addons link
karolstawowski Feb 6, 2024
e058573
Merge branch 'next' into docs-fix
karolstawowski Feb 6, 2024
1d8b5ea
Merge pull request #25888 from storybookjs/yann/rename-testing-utils-…
yannbf Feb 6, 2024
b629fa7
Smaller refactors suggested by @JReinhold
tmeasday Feb 7, 2024
96c9ddf
docs(viewport.md): fix library name typos
stegano Feb 7, 2024
1088fcc
use number 0 instead of '0' for picked PRs count
JReinhold Feb 7, 2024
d56b95b
Fix condition for canceling when no patches to pick
JReinhold Feb 7, 2024
0dda3e2
Merge pull request #25387 from kyletsang/fix-core-common-types
ndelangen Feb 7, 2024
1a01ab9
Merge branch 'next' into patch-1
jonniebigodes Feb 7, 2024
5da92c0
Merge pull request #25940 from stegano/patch-1
jonniebigodes Feb 7, 2024
46a0165
Merge branch 'next' into docs-fix
jonniebigodes Feb 7, 2024
2d0bf45
Merge pull request #25931 from karolstawowski/docs-fix
jonniebigodes Feb 7, 2024
9c0d26a
Docs: Visual testing update minimum Storybook version
jonniebigodes Feb 7, 2024
576acc4
Merge branch 'next' into docs_update_visual_tests_addon_version
jonniebigodes Feb 7, 2024
99e551d
Merge pull request #25949 from storybookjs/docs_update_visual_tests_a…
jonniebigodes Feb 7, 2024
408ad0d
expect boolean args to be booleans instead of strings
JReinhold Feb 7, 2024
4e6fc0d
Refactor CanvasWrap component to use 'show' prop instead of 'display'…
JReinhold Feb 7, 2024
b6425f5
Merge pull request #25951 from storybookjs/jeppe/25946-bug-warning-re…
ndelangen Feb 7, 2024
d77745e
Merge pull request #25950 from storybookjs/jeppe/25035-bug-boolean-co…
JReinhold Feb 8, 2024
44ed235
Merge pull request #25923 from storybookjs/tom/add-vite-stats-json
tmeasday Feb 8, 2024
d9031ef
Add migration note about TS/stats and link to it
tmeasday Feb 8, 2024
913946a
manually set vitest thread count in CI
JReinhold Feb 8, 2024
ee90829
upgrade vitest
JReinhold Feb 8, 2024
8e2a375
pass story context to the play function of a composed story
yannbf Feb 8, 2024
d205ddf
Merge pull request #25954 from storybookjs/jeppe/fix-unit-test-timeouts
JReinhold Feb 8, 2024
ea81001
Merge pull request #25943 from storybookjs/yann/improve-play-fn-porta…
yannbf Feb 8, 2024
cc0f039
Docs: Test runner minor changes for plug and play support
jonniebigodes Feb 8, 2024
fbb4d53
Merge branch 'next' into charles-fix-toolbars-icons
cdedreuille Feb 8, 2024
404365b
Update icon library
cdedreuille Feb 8, 2024
a4c7fd0
Merge pull request #25822 from storybookjs/charles-fix-toolbars-icons
cdedreuille Feb 8, 2024
3b0aafc
Merge branch 'next' into tom/add-stats-migration-note
tmeasday Feb 9, 2024
9b750c2
Merge pull request #25952 from storybookjs/tom/add-stats-migration-note
tmeasday Feb 9, 2024
afac731
fixed migration.md react npm cmd
mh-ahs Feb 9, 2024
78e949a
Merge branch 'next' into docs_test_runner_pnpm_support
yannbf Feb 9, 2024
903317b
Merge pull request #25942 from storybookjs/jeppe/fix-gh-patch-prepara…
JReinhold Feb 9, 2024
ea0e539
Update docs/writing-tests/test-runner.md
jonniebigodes Feb 9, 2024
7261ebb
Merge branch 'next' into docs_test_runner_pnpm_support
jonniebigodes Feb 9, 2024
06f6234
change heading
jonniebigodes Feb 9, 2024
72afb5b
Merge pull request #25960 from storybookjs/docs_test_runner_pnpm_support
jonniebigodes Feb 9, 2024
44469ec
Merge pull request #25968 from mh-ahs/next
JReinhold Feb 9, 2024
05c0615
Write changelog for 8.0.0-beta.2 [skip ci]
storybook-bot Feb 9, 2024
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/prepare-patch-release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
- name: Setup Node.js
uses: actions/setup-node@v3
with:
node-version-file: '.nvmrc'
node-version-file: ".nvmrc"

- name: Cache dependencies
uses: actions/cache@v3
Expand Down Expand Up @@ -89,7 +89,7 @@ jobs:
yarn release:pick-patches

- name: Cancel when no patches to pick
if: steps.pick-patches.outputs.pr-count == '0' && steps.pick-patches.outputs.pr-count != null
if: steps.pick-patches.outputs.no-patch-prs == 'true'
env:
GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
# From https://stackoverflow.com/a/75809743
Expand Down Expand Up @@ -123,7 +123,7 @@ jobs:
run: |
yarn release:write-changelog ${{ steps.versions.outputs.next }} --unpicked-patches --verbose

- name: 'Commit changes to branch: version-patch-from-${{ steps.versions.outputs.current }}'
- name: "Commit changes to branch: version-patch-from-${{ steps.versions.outputs.current }}"
working-directory: .
run: |
git config --global user.name 'storybook-bot'
Expand Down Expand Up @@ -185,4 +185,4 @@ jobs:
DISCORD_WEBHOOK: ${{ secrets.DISCORD_MONITORING_URL }}
uses: Ilshidur/action-discord@master
with:
args: 'The GitHub Action for preparing the release pull request bumping from v${{ steps.versions.outputs.current }} to v${{ steps.versions.outputs.next }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
args: "The GitHub Action for preparing the release pull request bumping from v${{ steps.versions.outputs.current }} to v${{ steps.versions.outputs.next }} (triggered by ${{ github.triggering_actor }}) failed! See run at: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}"
7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
## 7.6.13

- Next.js: Fix frameworkOptions resolution - [#25907](https://github.com/storybookjs/storybook/pull/25907), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!
- React Native: Fix init fails when package is already installed - [#25908](https://github.com/storybookjs/storybook/pull/25908), thanks [@dannyhw](https://github.com/dannyhw)!
- React Native: Remove watcher from init - [#25895](https://github.com/storybookjs/storybook/pull/25895), thanks [@dannyhw](https://github.com/dannyhw)!
- Webpack: Update StorybookConfig import in core-webpack types.ts - [#25740](https://github.com/storybookjs/storybook/pull/25740), thanks [@valentinpalkovic](https://github.com/valentinpalkovic)!

## 7.6.12

- CLI: Fix `upgrade` detecting the wrong version of existing Storybooks - [#25752](https://github.com/storybookjs/storybook/pull/25752), thanks [@JReinhold](https://github.com/JReinhold)!
Expand Down
10 changes: 10 additions & 0 deletions CHANGELOG.prerelease.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,13 @@
## 8.0.0-beta.2

- Core: Fix boolean `true` args in URL getting ignored - [#25950](https://github.com/storybookjs/storybook/pull/25950), thanks [@JReinhold](https://github.com/JReinhold)!
- Core: Move @types packages to dev deps in core-common - [#25387](https://github.com/storybookjs/storybook/pull/25387), thanks [@kyletsang](https://github.com/kyletsang)!
- Maintenance: Rename testing-utils paths to portable-stories - [#25888](https://github.com/storybookjs/storybook/pull/25888), thanks [@yannbf](https://github.com/yannbf)!
- Portable stories: Pass story context to the play function of a composed story - [#25943](https://github.com/storybookjs/storybook/pull/25943), thanks [@yannbf](https://github.com/yannbf)!
- UI: Fix `display=true` warning in console - [#25951](https://github.com/storybookjs/storybook/pull/25951), thanks [@JReinhold](https://github.com/JReinhold)!
- UI: Update deprecated Icons with the new @storybook/icons in addons - [#25822](https://github.com/storybookjs/storybook/pull/25822), thanks [@cdedreuille](https://github.com/cdedreuille)!
- Vite: Add a `rollup-plugin-webpack-stats` to allow stats from preview builds - [#25923](https://github.com/storybookjs/storybook/pull/25923), thanks [@tmeasday](https://github.com/tmeasday)!

## 8.0.0-beta.1

- Addon-docs: Fix MDX components not applied in Vite and theme loading twice - [#25925](https://github.com/storybookjs/storybook/pull/25925), thanks [@JReinhold](https://github.com/JReinhold)!
Expand Down
9 changes: 8 additions & 1 deletion MIGRATION.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
- [Removal of `storiesOf`-API](#removal-of-storiesof-api)
- [Removed deprecated shim packages](#removed-deprecated-shim-packages)
- [Framework-specific Vite plugins have to be explicitly added](#framework-specific-vite-plugins-have-to-be-explicitly-added)
- [TurboSnap Vite plugin is no longer needed](#turbosnap-vite-plugin-is-no-longer-needed)
- [Implicit actions can not be used during rendering (for example in the play function)](#implicit-actions-can-not-be-used-during-rendering-for-example-in-the-play-function)
- [MDX related changes](#mdx-related-changes)
- [MDX is upgraded to v3](#mdx-is-upgraded-to-v3)
Expand Down Expand Up @@ -460,6 +461,12 @@ export default defineConfig({
});
```

### TurboSnap Vite plugin is no longer needed

At least in build mode, `builder-vite` now supports the `--webpack-stats-json` flag and will output `preview-stats.json`.

This means https://github.com/IanVS/vite-plugin-turbosnap is no longer necessary, and duplicative, and the plugin will automatically be removed if found.

### Implicit actions can not be used during rendering (for example in the play function)

In Storybook 7, we inferred if the component accepts any action props,
Expand Down Expand Up @@ -1493,7 +1500,7 @@ Storybook uses `react` in a variety of docs-related packages. In the past, we've
To upgrade manually, add any version of `react` and `react-dom` as devDependencies using your package manager of choice, e.g.

```
npm add react react-dom --dev
npm add react react-dom --save-dev
```

#### start-storybook / build-storybook binaries removed
Expand Down
2 changes: 1 addition & 1 deletion code/addons/a11y/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/global": "^5.0.0",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/theming": "workspace:*",
Expand Down
8 changes: 2 additions & 6 deletions code/addons/a11y/src/components/Report/Item.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
import React, { Fragment, useState } from 'react';

import { styled } from '@storybook/theming';
import { Icons } from '@storybook/components';

import type { Result } from 'axe-core';
import { Info } from './Info';
Expand All @@ -11,6 +10,7 @@ import { Tags } from './Tags';

import type { RuleType } from '../A11YPanel';
import HighlightToggle from './HighlightToggle';
import { ChevronSmallDownIcon } from '@storybook/icons';

const Wrapper = styled.div(({ theme }) => ({
display: 'flex',
Expand All @@ -21,10 +21,7 @@ const Wrapper = styled.div(({ theme }) => ({
},
}));

const Icon = styled(Icons)({
height: 10,
width: 10,
minWidth: 10,
const Icon = styled(ChevronSmallDownIcon)({
marginRight: 10,
transition: 'transform 0.1s ease-in-out',
verticalAlign: 'inherit',
Expand Down Expand Up @@ -75,7 +72,6 @@ export const Item = (props: ItemProps) => {
<Wrapper>
<HeaderBar onClick={() => onToggle(!open)} role="button">
<Icon
icon="arrowdown"
style={{
transform: `rotate(${open ? 0 : -90}deg)`,
}}
Expand Down
2 changes: 1 addition & 1 deletion code/addons/backgrounds/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"devDependencies": {
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/theming": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/interactions/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@storybook/components": "workspace:*",
"@storybook/core-common": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/instrumenter": "workspace:*",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
Expand Down
8 changes: 2 additions & 6 deletions code/addons/interactions/src/components/List.tsx
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import React, { Fragment, useState } from 'react';
import { styled, themes, convert } from '@storybook/theming';
import { Icons, type IconsProps } from '@storybook/components';
import { ChevronSmallDownIcon } from '@storybook/icons';

const ListWrapper = styled.ul({
listStyle: 'none',
Expand All @@ -18,10 +18,7 @@ const Wrapper = styled.div({
},
});

const Icon = styled(Icons)<IconsProps>({
height: 10,
width: 10,
minWidth: 10,
const Icon = styled(ChevronSmallDownIcon)({
color: convert(themes.light).textMutedColor,
marginRight: 10,
transition: 'transform 0.1s ease-in-out',
Expand Down Expand Up @@ -68,7 +65,6 @@ export const ListItem: React.FC<ListItemProps> = ({ item }) => {
<Wrapper>
<HeaderBar onClick={() => onToggle(!open)} role="button">
<Icon
icon="arrowdown"
color={convert(themes.light).appBorderColor}
style={{
transform: `rotate(${open ? 0 : -90}deg)`,
Expand Down
71 changes: 32 additions & 39 deletions code/addons/interactions/src/components/StatusIcon.tsx
Original file line number Diff line number Diff line change
@@ -1,51 +1,44 @@
import React from 'react';
import { Icons, type IconsProps } from '@storybook/components';
import { type Call, CallStates } from '@storybook/instrumenter';
import { styled } from '@storybook/theming';
import { styled, useTheme } from '@storybook/theming';

import { transparentize } from 'polished';
import localTheme from '../theme';
import { CheckIcon, CircleIcon, PlayIcon, StopAltIcon } from '@storybook/icons';

export interface StatusIconProps {
status: Call['status'];
useSymbol?: IconsProps['useSymbol'];
className?: string;
}

const {
colors: {
pure: { gray },
},
} = localTheme;

const StyledStatusIcon = styled(Icons)<StatusIconProps>(({ theme, status }) => {
const color = {
[CallStates.DONE]: theme.color.positive,
[CallStates.ERROR]: theme.color.negative,
[CallStates.ACTIVE]: theme.color.secondary,
[CallStates.WAITING]: transparentize(0.5, gray[500]),
}[status];
return {
width: status === CallStates.WAITING ? 6 : 12,
height: status === CallStates.WAITING ? 6 : 12,
color,
justifySelf: 'center',
};
const WarningContainer = styled.div({
width: 14,
height: 14,
display: 'flex',
alignItems: 'center',
justifyContent: 'center',
});

export const StatusIcon: React.FC<StatusIconProps> = ({ status, className }) => {
const icon = {
[CallStates.DONE]: 'check',
[CallStates.ERROR]: 'stopalt',
[CallStates.ACTIVE]: 'play',
[CallStates.WAITING]: 'circle',
}[status] as IconsProps['icon'];
return (
<StyledStatusIcon
data-testid={`icon-${status}`}
status={status}
icon={icon}
className={className}
/>
);
export const StatusIcon: React.FC<StatusIconProps> = ({ status }) => {
const theme = useTheme();

switch (status) {
case CallStates.DONE: {
return <CheckIcon color={theme.color.positive} data-testid="icon-done" />;
}
case CallStates.ERROR: {
return <StopAltIcon color={theme.color.negative} data-testid="icon-error" />;
}
case CallStates.ACTIVE: {
return <PlayIcon color={theme.color.secondary} data-testid="icon-active" />;
}
case CallStates.WAITING: {
return (
<WarningContainer data-testid="icon-waiting">
<CircleIcon color={transparentize(0.5, '#CCCCCC')} size={6} />
</WarningContainer>
);
}
default: {
return null;
}
}
};
1 change: 1 addition & 0 deletions code/addons/jest/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,7 @@
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/theming": "workspace:*",
Expand Down
8 changes: 2 additions & 6 deletions code/addons/jest/src/components/Result.tsx
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import React, { Fragment, useState } from 'react';
import { styled, themes, convert } from '@storybook/theming';
import { Icons } from '@storybook/components';
// eslint-disable-next-line import/no-named-as-default
import Message from './Message';
import { ChevronSmallDownIcon } from '@storybook/icons';

const Wrapper = styled.div<{ status: string }>(({ theme, status }) => ({
display: 'flex',
Expand Down Expand Up @@ -30,10 +30,7 @@ const HeaderBar = styled.div<{ status: string }>(({ theme, status }) => ({
},
}));

const Icon = styled(Icons)(({ theme }) => ({
height: 10,
width: 10,
minWidth: 10,
const Icon = styled(ChevronSmallDownIcon)(({ theme }) => ({
color: theme.textMutedColor,
marginRight: 10,
transition: 'transform 0.1s ease-in-out',
Expand Down Expand Up @@ -66,7 +63,6 @@ export function Result(props: ResultProps) {
<HeaderBar onClick={onToggle} role="button" status={status}>
{status === `failed` ? (
<Icon
icon="arrowdown"
color={convert(themes.light).textMutedColor}
style={{
transform: `rotate(${isOpen ? 0 : -90}deg)`,
Expand Down
2 changes: 1 addition & 1 deletion code/addons/measure/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/types": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/outline/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/types": "workspace:*",
Expand Down
2 changes: 1 addition & 1 deletion code/addons/themes/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
"@storybook/client-logger": "workspace:*",
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/theming": "workspace:*",
Expand Down
6 changes: 5 additions & 1 deletion code/addons/toolbars/src/components/ToolbarMenuButton.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,10 @@ interface ToolbarMenuButtonProps {
onClick?: () => void;
}

// We can't remove the Icons component just yet because there's no way for now to import icons
// in the preview directly. Before having a better solution, we are going to keep the Icons component
// for now and remove the deprecated warning.

export const ToolbarMenuButton: FC<ToolbarMenuButtonProps> = ({
active,
title,
Expand All @@ -19,7 +23,7 @@ export const ToolbarMenuButton: FC<ToolbarMenuButtonProps> = ({
}) => {
return (
<IconButton active={active} title={description} onClick={onClick}>
{icon && <Icons icon={icon} />}
{icon && <Icons icon={icon} __suppressDeprecationWarning={true} />}
{title ? `\xa0${title}` : null}
</IconButton>
);
Expand Down
2 changes: 1 addition & 1 deletion code/addons/viewport/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
"@storybook/components": "workspace:*",
"@storybook/core-events": "workspace:*",
"@storybook/global": "^5.0.0",
"@storybook/icons": "^1.2.3",
"@storybook/icons": "^1.2.5",
"@storybook/manager-api": "workspace:*",
"@storybook/preview-api": "workspace:*",
"@storybook/theming": "workspace:*",
Expand Down
3 changes: 2 additions & 1 deletion code/builders/builder-vite/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,8 @@
"express": "^4.17.3",
"find-cache-dir": "^3.0.0",
"fs-extra": "^11.1.0",
"magic-string": "^0.30.0"
"magic-string": "^0.30.0",
"ts-dedent": "^2.0.0"
},
"devDependencies": {
"@types/express": "^4.17.13",
Expand Down
Loading