Skip to content

Commit 8ede729

Browse files
authored
chore(storybook): remove storysource patch and bump to latest v7 (#385)
1 parent 0eb8f91 commit 8ede729

File tree

6 files changed

+308
-382
lines changed

6 files changed

+308
-382
lines changed

.storybook/main.ts

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,7 @@ import type { StorybookConfig } from '@storybook/react-webpack5';
22

33
const config: StorybookConfig = {
44
stories: [],
5-
addons: [
6-
'@storybook/addon-actions',
7-
'@storybook/addon-docs',
8-
'@nx/react/plugins/storybook',
9-
{
10-
name: '@storybook/addon-storysource',
11-
options: {
12-
loaderOptions: {
13-
injectStoryParameters: true,
14-
},
15-
},
16-
},
17-
],
5+
addons: ['@storybook/addon-docs', '@nx/react/plugins/storybook'],
186
framework: {
197
name: '@storybook/react-webpack5',
208
options: {},

package.json

Lines changed: 10 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -49,17 +49,16 @@
4949
"@nx/workspace": "20.8.1",
5050
"@playwright/experimental-ct-react": "^1.49.1",
5151
"@rnx-kit/eslint-plugin": "0.8.6",
52-
"@storybook/addon-docs": "7.6.17",
53-
"@storybook/addon-essentials": "7.6.17",
54-
"@storybook/addon-interactions": "7.6.17",
55-
"@storybook/addon-storysource": "7.6.17",
56-
"@storybook/addon-themes": "7.6.17",
57-
"@storybook/core-common": "7.6.17",
58-
"@storybook/core-events": "7.6.17",
59-
"@storybook/core-server": "7.6.17",
52+
"@storybook/addon-docs": "7.6.20",
53+
"@storybook/addon-essentials": "7.6.20",
54+
"@storybook/addon-interactions": "7.6.20",
55+
"@storybook/addon-themes": "7.6.20",
56+
"@storybook/core-common": "7.6.20",
57+
"@storybook/core-events": "7.6.20",
58+
"@storybook/core-server": "7.6.20",
6059
"@storybook/jest": "^0.2.3",
61-
"@storybook/preview-api": "7.6.17",
62-
"@storybook/react-webpack5": "7.6.17",
60+
"@storybook/preview-api": "7.6.20",
61+
"@storybook/react-webpack5": "7.6.20",
6362
"@storybook/test-runner": "0.14.0",
6463
"@storybook/testing-library": "^0.2.2",
6564
"@stylistic/eslint-plugin": "3.1.0",
@@ -95,7 +94,7 @@
9594
"react-window": "^1.8.10",
9695
"scheduler": "0.23.0",
9796
"semver": "^7.5.2",
98-
"storybook": "7.6.17",
97+
"storybook": "7.6.20",
9998
"stylelint": "^15.10.3",
10099
"syncpack": "^9.8.6",
101100
"ts-node": "10.9.2",
Lines changed: 4 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,11 @@
11
import type { StorybookConfig } from '@storybook/react-webpack5';
22

3+
// eslint-disable-next-line @nx/enforce-module-boundaries
4+
import rootConfig from '../../../.storybook/main';
5+
36
const config: StorybookConfig = {
7+
...rootConfig,
48
stories: ['../stories/**/index.stories.@(js|jsx|ts|tsx|mdx)'],
5-
addons: [
6-
'@nx/react/plugins/storybook',
7-
'@storybook/addon-actions',
8-
{
9-
name: '@storybook/addon-storysource',
10-
options: {
11-
loaderOptions: {
12-
injectStoryParameters: true,
13-
},
14-
},
15-
},
16-
],
17-
framework: {
18-
name: '@storybook/react-webpack5',
19-
options: {},
20-
},
219
};
2210

2311
export default config;
24-
25-
// To customize your webpack configuration you can use the webpackFinal field.
26-
// Check https://storybook.js.org/docs/react/builders/webpack#extending-storybooks-webpack-config
27-
// and https://nx.dev/packages/storybook/documents/custom-builder-configs
Lines changed: 4 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
1-
import * as React from 'react';
1+
import type { Preview } from '@storybook/react';
22

3-
import { Preview } from '@storybook/react';
4-
5-
import { FluentProvider, webLightTheme } from '@fluentui/react-components';
3+
// eslint-disable-next-line @nx/enforce-module-boundaries
4+
import rootPreview from '../../../.storybook/preview';
65

76
const preview: Preview = {
8-
decorators: [
9-
(Story) => (
10-
<FluentProvider theme={webLightTheme}>
11-
<Story />
12-
</FluentProvider>
13-
),
14-
],
7+
...rootPreview,
158
};
169

1710
export default preview;

0 commit comments

Comments
 (0)