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.

Sign up for GitHub

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

Jump to bottom

Update Storybook to 6.5 #139334

Merged
merged 13 commits into from Sep 23, 2022
Merged

Update Storybook to 6.5 #139334

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
973a9fe
Update Storybook to 6.5
clintandrewhall Aug 24, 2022
6a3a195
Add @types/react-syntax-highlighter
clintandrewhall Aug 24, 2022
54e591c
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Aug 24, 2022
21583f2
fix type error
Aug 24, 2022
6ffb846
include some deduping and patch version bumping to encourage yarn to …
Aug 24, 2022
99bf902
fix path to canvas addon
Aug 24, 2022
6f3858c
remove addon build
Aug 24, 2022
1a4e525
fix some type issues
Aug 24, 2022
9706055
[CI] Auto-commit changed files from 'node scripts/eslint --no-cache -…
kibanamachine Sep 21, 2022
d50d1b7
Merge branch 'main' into storybook/update-6.5
clintandrewhall Sep 22, 2022
b3f4fb7
6.5.12
clintandrewhall Sep 22, 2022
84a4e73
Merge branch 'main' into storybook/update-6.5
clintandrewhall Sep 22, 2022
a694e71
Merge branch 'main' into storybook/update-6.5
clintandrewhall Sep 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
39 changes: 21 additions & 18 deletions package.json
View file
Open in desktop
Expand Up @@ -736,25 +736,26 @@
"@mapbox/vector-tile": "1.3.1",
"@octokit/rest": "^16.35.0",
"@openpgp/web-stream-tools": "^0.0.10",
"@storybook/addon-a11y": "^6.4.22",
"@storybook/addon-actions": "^6.4.22",
"@storybook/addon-controls": "^6.4.22",
"@storybook/addon-docs": "^6.4.22",
"@storybook/addon-essentials": "^6.4.22",
"@storybook/addon-a11y": "^6.5.11",
"@storybook/addon-actions": "^6.5.11",
"@storybook/addon-controls": "^6.5.11",
"@storybook/addon-docs": "^6.5.11",
"@storybook/addon-essentials": "^6.5.11",
"@storybook/addon-knobs": "^6.4.0",
"@storybook/addon-storyshots": "^6.4.22",
"@storybook/addons": "^6.4.22",
"@storybook/api": "^6.4.22",
"@storybook/client-api": "^6.4.22",
"@storybook/components": "^6.4.22",
"@storybook/core": "^6.4.22",
"@storybook/core-common": "^6.4.22",
"@storybook/core-events": "^6.4.22",
"@storybook/node-logger": "^6.4.22",
"@storybook/preview-web": "^6.4.22",
"@storybook/react": "^6.4.22",
"@storybook/testing-react": "^1.2.4",
"@storybook/theming": "^6.4.22",
"@storybook/addon-storyshots": "^6.5.11",
"@storybook/addons": "^6.5.11",
"@storybook/api": "^6.5.11",
"@storybook/client-api": "^6.5.11",
"@storybook/components": "^6.5.11",
"@storybook/core": "^6.5.11",
"@storybook/core-common": "^6.5.11",
"@storybook/core-events": "^6.5.11",
"@storybook/node-logger": "^6.5.11",
"@storybook/preview-web": "^6.5.11",
"@storybook/react": "^6.5.11",
"@storybook/react-docgen-typescript-plugin": "^1.0.1",
"@storybook/testing-react": "^1.3.0",
"@storybook/theming": "^6.5.11",
"@testing-library/dom": "^8.12.0",
"@testing-library/jest-dom": "^5.16.3",
"@testing-library/react": "^12.1.5",
Expand Down Expand Up @@ -1176,6 +1177,7 @@
"@types/react-router": "^5.1.7",
"@types/react-router-config": "^5.0.2",
"@types/react-router-dom": "^5.1.5",
"@types/react-syntax-highlighter": "^15.4.0",
"@types/react-test-renderer": "^17.0.2",
"@types/react-virtualized": "^9.21.21",
"@types/react-vis": "^1.11.9",
Expand Down Expand Up @@ -1362,6 +1364,7 @@
"q": "^1.5.1",
"raw-loader": "^3.1.0",
"react-test-renderer": "^17.0.2",
"react-textarea-autosize": "^8.3.4",
"regenerate": "^1.4.0",
"resolve": "^1.22.0",
"rxjs-marbles": "^7.0.1",
Expand Down
5 changes: 5 additions & 0 deletions packages/kbn-ambient-storybook-types/BUILD.bazel
View file
Open in desktop
Expand Up @@ -31,6 +31,11 @@ NPM_MODULE_EXTRA_FILES = [
# "@npm//name-of-package"
# eg. "@npm//lodash"
RUNTIME_DEPS = [
# Storybook react doesn't depend on these types even though their types use
# them, so we depend on them in this package and import them to make sure that they
# are available to users of the ambient types
"@npm//react-textarea-autosize",
"@npm//@storybook/react-docgen-typescript-plugin",
]

js_library(
Expand Down
2 changes: 1 addition & 1 deletion packages/kbn-storybook/src/lib/register.ts
View file
Open in desktop
Expand Up @@ -21,7 +21,7 @@ addons.setConfig({
showPanel: false,
isFullscreen: false,
panelPosition: 'bottom',
isToolshown: true,
showToolbar: true,
});

registerThemeSwitcherAddon();
1 change: 0 additions & 1 deletion src/plugins/discover/.storybook/discover.webpack.ts
View file
Open in desktop
Expand Up @@ -10,5 +10,4 @@ import { defaultConfig, StorybookConfig } from '@kbn/storybook';
export const discoverStorybookConfig: StorybookConfig = {
...defaultConfig,
stories: ['../**/*.stories.tsx'],
addons: [...(defaultConfig.addons || []), './addon/target/register'],
};
2 changes: 1 addition & 1 deletion x-pack/plugins/apm/public/components/shared/stacktrace/context.tsx
View file
Open in desktop
Expand Up @@ -138,7 +138,7 @@ export function Context({ stackframe, codeLanguage, isLibraryFrame }: Props) {
style={xcode}
PreTag={Line}
CodeTag={Code}
customStyle={{ padding: null, overflowX: null }}
customStyle={{ padding: undefined, overflowX: undefined }}
>
{line}
</SyntaxHighlighter>
Expand Down
11 changes: 0 additions & 11 deletions x-pack/plugins/canvas/storybook/addon/babel.config.js
View file
Open in desktop

This file was deleted.

0 ...book/addon/src/components/action_list.tsx → ...torybook/addon/components/action_list.tsx
View file
Open in desktop
File renamed without changes.
0 ...book/addon/src/components/action_tree.tsx → ...torybook/addon/components/action_tree.tsx
View file
Open in desktop
File renamed without changes.
0 ...s/storybook/addon/src/components/index.ts → ...anvas/storybook/addon/components/index.ts
View file
Open in desktop
File renamed without changes.
0 ...ook/addon/src/components/state_change.tsx → ...orybook/addon/components/state_change.tsx
View file
Open in desktop
File renamed without changes.
0 ...s/canvas/storybook/addon/src/constants.ts → ...ugins/canvas/storybook/addon/constants.ts
View file
Open in desktop
File renamed without changes.
0 ...gins/canvas/storybook/addon/src/panel.css → .../plugins/canvas/storybook/addon/panel.css
View file
Open in desktop
File renamed without changes.
0 ...gins/canvas/storybook/addon/src/panel.tsx → .../plugins/canvas/storybook/addon/panel.tsx
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...s/canvas/storybook/addon/src/register.tsx → ...ugins/canvas/storybook/addon/register.tsx
View file
Open in desktop
Expand Up @@ -44,6 +44,6 @@ addons.setConfig({
showPanel: true,
isFullscreen: false,
panelPosition: 'bottom',
isToolshown: true,
showToolbar: true,
selectedPanel: PANEL_ID,
});
67 changes: 0 additions & 67 deletions x-pack/plugins/canvas/storybook/addon/scripts/build.js
View file
Open in desktop

This file was deleted.

6 changes: 3 additions & 3 deletions ...ugins/canvas/storybook/addon/src/state.ts → ...k/plugins/canvas/storybook/addon/state.ts
View file
Open in desktop
Expand Up @@ -14,11 +14,11 @@ import { isFunction } from 'lodash';
import { EVENTS } from './constants';

// @ts-expect-error untyped local
import { getRootReducer } from '../../../public/state/reducers';
import { getRootReducer } from '../../public/state/reducers';

// @ts-expect-error Untyped local
import { getInitialState as getState } from '../../../public/state/initial_state';
import { State } from '../../../types';
import { getInitialState as getState } from '../../public/state/initial_state';
import { State } from '../../types';

export const getInitialState: () => State = () => getState();
export const getMiddleware = () => applyMiddleware(thunkMiddleware);
Expand Down
13 changes: 0 additions & 13 deletions x-pack/plugins/canvas/storybook/addon/tsconfig.json
View file
Open in desktop

This file was deleted.

2 changes: 1 addition & 1 deletion ...ugins/canvas/storybook/addon/src/types.ts → ...k/plugins/canvas/storybook/addon/types.ts
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@
*/

import { Action } from 'redux';
import { State } from '../../../types';
import { State } from '../../types';

export interface RecordedPayload {
previousState: State;
Expand Down
2 changes: 1 addition & 1 deletion x-pack/plugins/canvas/storybook/canvas_webpack.ts
View file
Open in desktop
Expand Up @@ -66,6 +66,6 @@ export const canvasWebpack = {

export const canvasStorybookConfig: StorybookConfig = {
...defaultConfig,
addons: [...(defaultConfig.addons || []), './addon/target/register'],
addons: [...(defaultConfig.addons || []), require.resolve('./addon/register')],
...mergeWebpackFinal(canvasWebpack),
};
4 changes: 2 additions & 2 deletions x-pack/plugins/canvas/storybook/decorators/redux_decorator.tsx
View file
Open in desktop
Expand Up @@ -18,8 +18,8 @@ import { elementsRegistry } from '../../public/lib/elements_registry';
import { image } from '../../canvas_plugin_src/elements/image';
elementsRegistry.register(image);

import { getInitialState, getReducer, getMiddleware, patchDispatch } from '../addon/src/state';
export { ADDON_ID, ACTIONS_PANEL_ID } from '../addon/src/constants';
import { getInitialState, getReducer, getMiddleware, patchDispatch } from '../addon/state';
export { ADDON_ID, ACTIONS_PANEL_ID } from '../addon/constants';

export interface Params {
workpad?: CanvasWorkpad;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/plugins/canvas/storybook/index.ts
View file
Open in desktop
Expand Up @@ -5,10 +5,10 @@
* 2.0.
*/

import { ACTIONS_PANEL_ID } from './addon/src/constants';
import { ACTIONS_PANEL_ID } from './addon/constants';

export * from './decorators';
export { ACTIONS_PANEL_ID } from './addon/src/constants';
export { ACTIONS_PANEL_ID } from './addon/constants';

export const getAddonPanelParameters = () => ({ options: { selectedPanel: ACTIONS_PANEL_ID } });

Expand Down