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(build): uplift Storybook to v8 #29408

Open
wants to merge 12 commits 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
2 changes: 1 addition & 1 deletion superset-frontend/.storybook/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ module.exports = {
addons: [
getAbsolutePath('@storybook/addon-essentials'),
getAbsolutePath('@storybook/addon-links'),
getAbsolutePath('storybook-addon-jsx'),
'@mihkeleidast/storybook-addon-source',
getAbsolutePath('@storybook/addon-controls'),
getAbsolutePath('@storybook/addon-mdx-gfm'),
],
Expand Down
4 changes: 2 additions & 2 deletions superset-frontend/.storybook/preview.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { jsxDecorator } from 'storybook-addon-jsx';
import { withJsx } from '@mihkeleidast/storybook-addon-source';
import { supersetTheme, ThemeProvider } from '@superset-ui/core';
import { combineReducers, createStore, applyMiddleware, compose } from 'redux';
import thunk from 'redux-thunk';
Expand Down Expand Up @@ -48,7 +48,7 @@ const providerDecorator = Story => (
</Provider>
);

export const decorators = [jsxDecorator, themeDecorator, providerDecorator];
export const decorators = [withJsx, themeDecorator, providerDecorator];

export const parameters = {
paddings: {
Expand Down
98,790 changes: 48,680 additions & 50,110 deletions superset-frontend/package-lock.json

Large diffs are not rendered by default.

24 changes: 11 additions & 13 deletions superset-frontend/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -228,17 +228,15 @@
"@emotion/jest": "^11.11.0",
"@hot-loader/react-dom": "^16.14.0",
"@istanbuljs/nyc-config-typescript": "^1.0.1",
"@storybook/addon-actions": "^7.6.13",
"@storybook/addon-controls": "^7.6.13",
"@storybook/addon-docs": "^7.6.13",
"@storybook/addon-essentials": "^7.6.13",
"@storybook/addon-links": "^7.6.13",
"@storybook/addon-mdx-gfm": "^7.6.15",
"@storybook/addons": "^7.6.13",
"@storybook/client-api": "^7.6.13",
"@storybook/components": "^7.6.13",
"@storybook/react": "^7.6.13",
"@storybook/react-webpack5": "^7.6.13",
"@storybook/addon-actions": "^8.1.11",
"@storybook/addon-controls": "^8.1.11",
"@storybook/addon-essentials": "^8.1.11",
"@storybook/addon-links": "^8.1.11",
"@storybook/addon-mdx-gfm": "^8.1.11",
"@storybook/preview-api": "^8.1.11",
"@storybook/components": "^8.1.11",
"@storybook/react": "^8.1.11",
"@storybook/react-webpack5": "^8.1.11",
"@svgr/webpack": "^8.0.1",
"@testing-library/dom": "^7.29.4",
"@testing-library/jest-dom": "^5.11.6",
Expand Down Expand Up @@ -341,8 +339,8 @@
"source-map": "^0.7.4",
"source-map-support": "^0.5.21",
"speed-measure-webpack-plugin": "^1.5.0",
"storybook": "^7.6.13",
"storybook-addon-jsx": "^7.3.14",
"storybook": "^8.1.11",
"@mihkeleidast/storybook-addon-source": "^1.0.1",
"style-loader": "^3.3.4",
"thread-loader": "^3.0.4",
"transform-loader": "^0.2.4",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ const customConfig = require('../../../webpack.config.js');
module.exports = {
addons: [
getAbsolutePath('@storybook/addon-controls'),
getAbsolutePath('storybook-addon-jsx'),
'@mihkeleidast/storybook-addon-source',
getAbsolutePath('@storybook/addon-actions'),
getAbsolutePath('@storybook/addon-links'),
],
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { jsxDecorator } from 'storybook-addon-jsx';
import { withJsx } from '@mihkeleidast/storybook-addon-source';
import {
configure,
getTimeFormatterRegistry,
Expand All @@ -15,7 +15,7 @@ import themeDecorator from './themeDecorator';
import 'bootstrap/dist/css/bootstrap.min.css';
import './storybook.css';

export const decorators = [jsxDecorator, themeDecorator];
export const decorators = [withJsx, themeDecorator];

export const parameters = {
passArgsFirst: false,
Expand Down
15 changes: 7 additions & 8 deletions superset-frontend/packages/superset-ui-demo/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -36,12 +36,11 @@
"@emotion/react": "^11.4.1",
"@emotion/styled": "^11.3.0",
"@react-icons/all-files": "^4.1.0",
"@storybook/addon-actions": "^7.6.13",
"@storybook/addon-controls": "^7.6.13",
"@storybook/addon-links": "^7.6.13",
"@storybook/addons": "^7.6.13",
"@storybook/react": "^7.6.13",
"@storybook/types": "^7.6.19",
"@storybook/addon-actions": "^8.1.11",
"@storybook/addon-controls": "^8.1.11",
"@storybook/addon-links": "^8.1.11",
"@storybook/react": "^8.1.11",
"@storybook/types": "^8.1.11",
"@types/react-loadable": "^5.5.3",
"antd": "4.10.3",
"bootstrap": "^3.4.1",
Expand All @@ -53,14 +52,14 @@
"react-dom": "^16.13.1",
"react-loadable": "^5.5.0",
"react-resizable": "^3.0.5",
"storybook-addon-jsx": "^7.3.14"
"@mihkeleidast/storybook-addon-source": "^1.0.1"
},
"devDependencies": {
"@babel/core": "^7.23.9",
"@babel/preset-env": "^7.23.9",
"@babel/preset-react": "^7.23.3",
"@babel/preset-typescript": "^7.23.3",
"@storybook/react-webpack5": "^7.6.13",
"@storybook/react-webpack5": "^8.1.11",
"babel-loader": "^9.1.3",
"fork-ts-checker-webpack-plugin": "^9.0.2",
"ts-loader": "^7.0.4",
Expand Down
2 changes: 1 addition & 1 deletion superset-frontend/packages/superset-ui-demo/tsconfig.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"extends": "../../tsconfig.json",
"compilerOptions": {
"jsx": "react",
"jsx": "preserve",
"outDir": "../../build/lib",
"rootDir": "../../",
"emitDeclarationOnly": false,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
import { useArgs } from '@storybook/client-api';
import { useArgs } from '@storybook/preview-api';
import Checkbox, { CheckboxProps } from '.';

export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/

// import { Meta, Source } from '@storybook/addon-docs';
import Markdown from 'markdown-to-jsx';

export default {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
* under the License.
*/

import { Source, Story } from '@storybook/addon-docs';
import Markdown from 'markdown-to-jsx';

export default {
Expand All @@ -41,10 +40,9 @@ Some of the common applications in Superset are:
- Display the database's metadata in a drill to detail modal to help the user understand what data they are looking
at while accessing the feature in the dashboard

## Basic example
## [Basic example]((./?path=/docs/design-system-components-metadatabar-examples--basic)
`}
</Markdown>
<Story id="design-system-components-metadatabar-examples--basic" />
<Markdown>
{`
## Variations
Expand All @@ -65,112 +63,122 @@ To check each content type in detail and its interactions, check the [MetadataBa
Below you can find the configurations for each content type:
`}
</Markdown>
<Source
language="jsx"
format
code={`
export enum MetadataType {
Dashboards = 'dashboards',
Description = 'description',
LastModified = 'lastModified',
Owner = 'owner',
Rows = 'rows',
Sql = 'sql',
Table = 'table',
Tags = 'tags',
}`}
/>

<Source
language="jsx"
format
code={`
export type Dashboards = {
type: MetadataType.Dashboards;
title: string;
description?: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Description = {
type: MetadataType.Description;
value: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type LastModified = {
type: MetadataType.LastModified;
value: Date;
modifiedBy: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Owner = {
type: MetadataType.Owner;
createdBy: string;
owners: string[];
createdOn: Date;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Rows = {
type: MetadataType.Rows;
title: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Sql = {
type: MetadataType.Sql;
title: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Table = {
type: MetadataType.Table;
title: string;
onClick?: (type: string) => void;
};`}
/>

<Source
language="jsx"
format
code={`
export type Tags = {
type: MetadataType.Tags;
values: string[];
onClick?: (type: string) => void;
};`}
/>

<Markdown>
{`
\`\`\`
export enum MetadataType {
Dashboards = 'dashboards',
Description = 'description',
LastModified = 'lastModified',
Owner = 'owner',
Rows = 'rows',
Sql = 'sql',
Table = 'table',
Tags = 'tags',
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Dashboards = {
type: MetadataType.Dashboards;
title: string;
description?: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Description = {
type: MetadataType.Description;
value: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type LastModified = {
type: MetadataType.LastModified;
value: Date;
modifiedBy: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Owner = {
type: MetadataType.Owner;
createdBy: string;
owners: string[];
createdOn: Date;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Rows = {
type: MetadataType.Rows;
title: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Sql = {
type: MetadataType.Sql;
title: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Table = {
type: MetadataType.Table;
title: string;
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>

<Markdown>
{`
\`\`\`
export type Tags = {
type: MetadataType.Tags;
values: string[];
onClick?: (type: string) => void;
};
\`\`\`
`}
</Markdown>
</>
);
Loading
Loading