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

feat: add support for Storybook v8 #156

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
10 changes: 5 additions & 5 deletions examples/react-esm/.storybook/main.mjs
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
const config = {
stories: ['../../stories/**/*.stories.*'],
addons: ['storybook-addon-performance'],
addons: ['@storybook/addon-webpack5-compiler-babel', 'storybook-addon-performance'],
framework: {
name: '@storybook/react-webpack5',
options: {}
options: {},
},
docs: {
docsPage: 'automatic'
}
docsPage: 'automatic',
},
};

export default config;
export default config;
2 changes: 1 addition & 1 deletion examples/react-esm/.storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';
import { themes } from '@storybook/theming';

addons.setConfig({
Expand Down
11 changes: 7 additions & 4 deletions examples/react-esm/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -14,13 +14,16 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/react": "7.0.0-beta.2",
"@storybook/react-webpack5": "7.0.0-beta.2",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/manager-api": "^8.0.0",
"@storybook/react": "^8.0.0",
"@storybook/react-webpack5": "^8.0.0",
"@storybook/theming": "^8.0.0",
"babel-loader": "^9.1.3",
"http-server": "^14.1.1",
"storybook": "7.0.0-beta.2",
"storybook": "^8.0.0",
"storybook-addon-performance": "workspace:*",
"typescript": "^4.9.5",
"typescript": "^5.6.3",
"webpack": "^5.90.0"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions examples/react-v16.8/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
stories: ['../../stories/**/*.stories.*'],
addons: ['storybook-addon-performance'],
addons: ['@storybook/addon-webpack5-compiler-babel', 'storybook-addon-performance'],
framework: {
name: '@storybook/react-webpack5',
options: {}
options: {},
},
docs: {
docsPage: 'automatic'
}
docsPage: 'automatic',
},
};
2 changes: 1 addition & 1 deletion examples/react-v16.8/.storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';
import { themes } from '@storybook/theming';

addons.setConfig({
Expand Down
11 changes: 7 additions & 4 deletions examples/react-v16.8/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/react": "^7.0.0",
"@storybook/react-webpack5": "^7.0.0",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/manager-api": "^8.0.0",
"@storybook/react": "^8.0.0",
"@storybook/react-webpack5": "^8.0.0",
"@storybook/theming": "^8.0.0",
"babel-loader": "^9.1.3",
"http-server": "^14.1.1",
"storybook": "^7.0.0",
"storybook": "^8.0.0",
"storybook-addon-performance": "workspace:*",
"typescript": "^4.9.5",
"typescript": "^5.6.3",
"webpack": "^5.90.0"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions examples/react-v17/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
stories: ['../../stories/**/*.stories.*'],
addons: ['storybook-addon-performance'],
addons: ['@storybook/addon-webpack5-compiler-babel', 'storybook-addon-performance'],
framework: {
name: '@storybook/react-webpack5',
options: {}
options: {},
},
docs: {
docsPage: 'automatic'
}
docsPage: 'automatic',
},
};
2 changes: 1 addition & 1 deletion examples/react-v17/.storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';
import { themes } from '@storybook/theming';

addons.setConfig({
Expand Down
11 changes: 7 additions & 4 deletions examples/react-v17/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/react": "7.0.0-beta.2",
"@storybook/react-webpack5": "7.0.0-beta.2",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/manager-api": "^8.0.0",
"@storybook/react": "^8.0.0",
"@storybook/react-webpack5": "^8.0.0",
"@storybook/theming": "^8.0.0",
"babel-loader": "^9.1.3",
"http-server": "^14.1.1",
"storybook": "7.0.0-beta.2",
"storybook": "^8.0.0",
"storybook-addon-performance": "workspace:*",
"typescript": "^4.9.5",
"typescript": "^5.6.3",
"webpack": "^5.90.0"
},
"scripts": {
Expand Down
8 changes: 4 additions & 4 deletions examples/react-v18/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
module.exports = {
stories: ['../../stories/**/*.stories.*'],
addons: ['storybook-addon-performance'],
addons: ['@storybook/addon-webpack5-compiler-babel', 'storybook-addon-performance'],
framework: {
name: '@storybook/react-webpack5',
options: {}
options: {},
},
docs: {
docsPage: 'automatic'
}
docsPage: 'automatic',
},
};
2 changes: 1 addition & 1 deletion examples/react-v18/.storybook/manager.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { addons } from '@storybook/addons';
import { addons } from '@storybook/manager-api';
import { themes } from '@storybook/theming';

addons.setConfig({
Expand Down
11 changes: 7 additions & 4 deletions examples/react-v18/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,16 @@
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/react": "7.0.0-beta.2",
"@storybook/react-webpack5": "7.0.0-beta.2",
"@storybook/addon-webpack5-compiler-babel": "^3.0.3",
"@storybook/manager-api": "^8.0.0",
"@storybook/react": "^8.0.0",
"@storybook/react-webpack5": "^8.0.0",
"@storybook/theming": "^8.0.0",
"babel-loader": "^9.1.3",
"http-server": "^14.1.1",
"storybook": "7.0.0-beta.2",
"storybook": "^8.0.0",
"storybook-addon-performance": "workspace:*",
"typescript": "^4.9.5",
"typescript": "^5.6.3",
"webpack": "^5.90.0"
},
"scripts": {
Expand Down
4 changes: 2 additions & 2 deletions packages/storybook-addon-performance-cli/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
},
"devDependencies": {
"@types/jest": "^29.5.11",
"@types/node": "^16.18.76",
"@types/node": "^20.14.8",
"@typescript-eslint/eslint-plugin": "^5.62.0",
"@typescript-eslint/parser": "^5.62.0",
"eslint": "^8.56.0",
Expand All @@ -47,7 +47,7 @@
"ts-jest": "^29.1.2",
"tslib": "^2.6.2",
"tsup": "^6.7.0",
"typescript": "^4.9.5"
"typescript": "^5.6.3"
},
"engines": {
"node": ">=20.0.0"
Expand Down
25 changes: 12 additions & 13 deletions packages/storybook-addon-performance/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -23,23 +23,22 @@
"/dist"
],
"dependencies": {
"@storybook/manager-api": "^7.6.10",
"@storybook/theming": "^7.6.10",
"@storybook/types": "^7.6.10",
"@xstate/react": "^3.2.2",
"xstate": "^4.38.3"
},
"peerDependencies": {
"react": "^16.8.0 || ^17.0.0 || ^18.0.0",
"react-dom": "^16.8.0 || ^17.0.0 || ^18.0.0"
},
"devDependencies": {
"@storybook/channels": "^7.6.10",
"@storybook/components": "^7.6.10",
"@storybook/core-events": "^7.6.10",
"@storybook/preview-api": "^7.6.10",
"@storybook/channels": "^8.0.0",
"@storybook/components": "^8.0.0",
"@storybook/core-events": "^8.0.0",
"@storybook/icons": "^1.2.12",
"@storybook/manager": "^8.0.0",
"@storybook/manager-api": "^8.0.0",
"@storybook/preview-api": "^8.0.0",
"@storybook/theming": "^8.0.0",
"@storybook/types": "^8.0.0",
"@testing-library/react": "^10.4.9",
"@types/jest": "^29.5.11",
"@types/node": "^20.14.8",
"@types/react": "16.9.17",
"@types/react-dom": "16.9.17",
"@typescript-eslint/eslint-plugin": "^5.62.0",
Expand All @@ -57,8 +56,8 @@
"react-dom": "^16.14.0",
"tiny-invariant": "^1.3.1",
"ts-jest": "^29.1.2",
"tsup": "^6.7.0",
"typescript": "^4.9.5"
"tsup": "^8.3.5",
"typescript": "^5.6.3"
},
"config": {
"prettier_target": "src/**/*.{ts,tsx,js,jsx,md,json} test/**/*.{ts,tsx,js,jsx,md,json} examples/**/*.{ts,tsx,js,jsx,md,json}"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import React, { useCallback, useState } from 'react';
import { styled } from '@storybook/theming';
import * as Expand from './parts';
import { Button, Icons } from '@storybook/components';
import { Button } from '@storybook/components';
import { ArrowDownIcon, ArrowRightIcon } from '@storybook/icons';
import { useActor } from '@xstate/react';
import useRequiredContext from '../../use-required-context';
import ServiceContext from '../service-context';
Expand Down Expand Up @@ -71,11 +72,7 @@ const IconContainer = styled.span`
`;

function ExpandIcon({ isExpanded }: ExpandedArgs) {
return (
<IconContainer>
<Icons icon={isExpanded ? 'arrowdown' : 'arrowright'} />
</IconContainer>
);
return <IconContainer>{isExpanded ? <ArrowDownIcon /> : <ArrowRightIcon />}</IconContainer>;
}

export function ExpandingResult({ name, result, getExpanded }: Props) {
Expand All @@ -97,10 +94,8 @@ export function ExpandingResult({ name, result, getExpanded }: Props) {
{isExpanded ? (
<Expand.Section>
{
// @ts-ignore
<Button
secondary
small
size="small"
disabled={!nextEventsInclude('START_ONE', state.nextEvents)}
onClick={() => send({ type: 'START_ONE', taskName: name })}
>
Expand Down
41 changes: 13 additions & 28 deletions packages/storybook-addon-performance/src/panel/top-bar.tsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import { Button, Form, Icons, IconsProps } from '@storybook/components';
import { Button, Form } from '@storybook/components';
import { DownloadIcon, LockIcon, UnlockIcon, UploadIcon } from '@storybook/icons';
import { styled } from '@storybook/theming';
import React, { ChangeEvent } from 'react';
import useRequiredContext from '../use-required-context';
Expand Down Expand Up @@ -59,12 +60,6 @@ const MetaSettings = styled.div`
flex-direction: row;
`;

const ResponsiveIcon = styled(Icons)`
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The component is no longer needed, as the button uses gap instead of margin

@media screen and (max-width: ${TABLET_BREAKPOINT}px) {
margin-right: 0px !important;
}
`;

const ResponsiveText = styled.span`
@media screen and (max-width: ${TABLET_BREAKPOINT}px) {
display: none;
Expand Down Expand Up @@ -99,12 +94,6 @@ export default function Topbar() {
unpin: nextEventsInclude('UNPIN', state.nextEvents) && current.results != null,
};

const icons: { pin: IconsProps['icon']; save: IconsProps['icon']; load: IconsProps['icon'] } = {
pin: pinned ? 'lock' : 'unlock',
save: 'download',
load: 'upload',
};

return (
<Container>
<Segment>
Expand All @@ -114,8 +103,8 @@ export default function Topbar() {
css={{
textTransform: 'uppercase',
}}
primary
small
variant="solid"
size="small"
onClick={() => send({ type: 'START_ALL' })}
disabled={!enabled.start}
id={selectors.startAllButtonId}
Expand Down Expand Up @@ -169,13 +158,12 @@ export default function Topbar() {
{
<Button
id={selectors.pinButtonId}
secondary
outline={!pinned}
small
variant={!pinned ? 'outline' : undefined}
size="small"
disabled={pinned ? !enabled.unpin : !enabled.pin}
onClick={() => send({ type: pinned ? 'UNPIN' : 'PIN' })}
>
<ResponsiveIcon icon={icons.pin} aria-label={icons.pin} />
{pinned ? <LockIcon aria-label="lock" /> : <UnlockIcon aria-label="unlock" />}
<ResponsiveText>{pinned ? 'Unpin baseline' : 'Pin as baseline'}</ResponsiveText>
</Button>
}
Expand All @@ -185,30 +173,27 @@ export default function Topbar() {
{
<Button
id={selectors.saveButtonId}
secondary
small
outline
size="small"
variant="outline"
disabled={current.results == null}
onClick={() => send({ type: 'SAVE' })}
>
<ResponsiveIcon icon={icons.save} aria-label={icons.save} />
<DownloadIcon aria-label="save" />
<ResponsiveText>Save result</ResponsiveText>
</Button>
}
{
<Button
secondary
small
outline
size="small"
variant="outline"
onClick={() => {
document.getElementById(selectors.loadButtonId)?.click();
}}
>
<ResponsiveIcon icon={icons.load} aria-label={icons.load} />
<UploadIcon aria-label="load" />
<ResponsiveText>Load result</ResponsiveText>
</Button>
}
{/* @ts-expect-error */}
<Form.Input
style={{ display: 'none' }}
id={selectors.loadButtonId}
Expand Down
2 changes: 2 additions & 0 deletions packages/storybook-addon-performance/tsup.config.js
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { globalPackages } from '@storybook/manager/globals';
import { defineConfig } from 'tsup';

export default defineConfig({
Expand All @@ -7,4 +8,5 @@ export default defineConfig({
clean: true,
minify: false,
platform: 'browser',
external: globalPackages,
});
Loading