Skip to content

Commit 88b108a

Browse files
authored
Merge pull request #209 from Jontii/master
feat: upgraded to storybook 8 and vite-framework
2 parents b902464 + a156b3e commit 88b108a

File tree

16 files changed

+3917
-5050
lines changed

16 files changed

+3917
-5050
lines changed

.github/workflows/nodejs.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,12 @@ jobs:
99

1010
strategy:
1111
matrix:
12-
node-version: [16.x, 18.x]
12+
node-version: [18.x, 20.x]
1313

1414
steps:
1515
- uses: actions/checkout@v1
1616
- name: Use Node.js ${{ matrix.node-version }}
17-
uses: actions/setup-node@v1
17+
uses: actions/setup-node@v4
1818
with:
1919
node-version: ${{ matrix.node-version }}
2020
- name: yarn install, build, and test

package.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,6 @@
3737
"devDependencies": {
3838
"@babel/core": "^7.21.4",
3939
"@babel/eslint-parser": "^7.21.3",
40-
"babel-loader": "^9.1.2",
4140
"eslint": "^8.37.0",
4241
"eslint-config-prettier": "^8.8.0",
4342
"eslint-plugin-import": "^2.27.5",
Lines changed: 14 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,20 @@
1-
import remarkGfm from 'remark-gfm';
2-
3-
export default {
1+
const config = {
42
stories: [
5-
'../stories/**/*stories.mdx',
6-
'../stories/**/*stories.@(js|jsx|ts|tsx)',
3+
'../stories/**/*.mdx',
4+
'../stories/**/stories.@(js|jsx|mjs|ts|tsx)',
75
],
86
addons: [
7+
'../../mock-addon/src/preset/manager.js',
98
'@storybook/addon-links',
10-
{
11-
name: '@storybook/addon-docs',
12-
options: {
13-
mdxPluginOptions: {
14-
mdxCompileOptions: {
15-
remarkPlugins: [remarkGfm],
16-
},
17-
},
18-
},
19-
},
20-
'@storybook/addon-viewport',
21-
'@storybook/addon-toolbars',
22-
'../../mock-addon/preset.js',
9+
'@storybook/addon-essentials',
10+
'@storybook/addon-interactions',
2311
],
24-
framework: '@storybook/react-webpack5',
12+
framework: {
13+
name: '@storybook/react-vite',
14+
options: {},
15+
},
16+
docs: {
17+
autodocs: 'tag',
18+
}
2519
};
20+
export default config;

packages/mock-addon-docs/.storybook/preview.js

Lines changed: 0 additions & 13 deletions
This file was deleted.
Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
import {withRoundTrip} from "storybook-addon-mock/src/withRoundTrip";
2+
3+
const Preview = {
4+
parameters: {
5+
options: {
6+
storySort: {
7+
order: ['Docs', ['Introduction', 'Installation', 'User guide']],
8+
includeName: true
9+
}
10+
},
11+
mockAddonConfigs: {
12+
globalMockData: [],
13+
refreshStoryOnUpdate: true,
14+
disableUsingOriginal: false,
15+
},
16+
},
17+
decorators: [withRoundTrip],
18+
}
19+
20+
export default Preview

packages/mock-addon-docs/package.json

Lines changed: 10 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -15,20 +15,21 @@
1515
"author": "Farhad Yasir(nutboltu)",
1616
"license": "MIT",
1717
"devDependencies": {
18-
"@storybook/addon-actions": "^7.4.2",
19-
"@storybook/addon-essentials": "^7.4.2",
20-
"@storybook/addon-interactions": "^7.4.2",
21-
"@storybook/addon-links": "^7.4.2",
22-
"@storybook/react-webpack5": "^7.4.2",
18+
"@storybook/addon-actions": "^8.0.8",
19+
"@storybook/addon-essentials": "^8.0.8",
20+
"@storybook/addon-interactions": "^8.0.8",
21+
"@storybook/addon-links": "^8.0.8",
22+
"@storybook/react": "^8.0.8",
23+
"@storybook/react-vite": "^8.0.8",
2324
"@storybook/storybook-deployer": "^2.8.16",
24-
"storybook": "^7.4.2"
25+
"storybook": "^8.0.8"
2526
},
2627
"dependencies": {
2728
"axios": "^1.3.4",
2829
"react": "^18.2.0",
29-
"react-code-blocks": "0.0.9-0",
30+
"react-code-blocks": "^0.0.9-0",
3031
"react-dom": "^18.2.0",
31-
"remark-gfm": "^3.0.1",
32-
"superagent": "^8.0.9"
32+
"superagent": "^8.0.9",
33+
"vite": "^5.2.8"
3334
}
3435
}

packages/mock-addon-docs/stories/docs/advanced-setup.stories.mdx renamed to packages/mock-addon-docs/stories/docs/advanced-setup.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import { Footer } from './footer';
1616

1717
<h3 className="subheading">1. Global configuration</h3>
1818

19-
You can set <strong>global configuration</strong> for the addon. Go to the `.storybook/preview.js` file and add `mockAddonConfigs` fields with the following properties.
19+
You can set <strong>global configuration</strong> for the addon. Go to the `.storybook/preview.jsx` file and add `mockAddonConfigs` fields with the following properties.
2020

2121

2222

packages/mock-addon-docs/stories/examples/components/get-component/index.jsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ import React, { useState } from 'react';
22
import PropTypes from 'prop-types';
33
import LinkTo from '@storybook/addon-links/react';
44

5-
import { buttonStyles, inputStyles, formStyles, labelStyles } from './styles';
5+
import { buttonStyles, inputStyles, formStyles } from './styles';
66
import { Container } from '../container';
77
import { Response } from '../response';
88
import { DEFAULT_URL } from '../../utils';

packages/mock-addon/.github/workflows/release.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ jobs:
1212
- name: Prepare repository
1313
run: git fetch --unshallow --tags
1414

15-
- name: Use Node.js 14.x
16-
uses: actions/setup-node@v1
15+
- name: Use Node.js 18.x
16+
uses: actions/setup-node@v4
1717
with:
18-
node-version: 14.x
18+
node-version: 18.x
1919

2020
- name: Install dependencies
2121
uses: bahmutov/npm-install@v1

packages/mock-addon/package.json

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "storybook-addon-mock",
3-
"version": "4.3.0",
3+
"version": "5.0.0",
44
"description": "A storybook addon to mock fetch/XHR request",
55
"keywords": [
66
"storybook",
@@ -44,18 +44,18 @@
4444
"release": "yarn build && auto shipit"
4545
},
4646
"dependencies": {
47-
"@storybook/addons": "^7.4.2",
48-
"@storybook/blocks": "^7.4.2",
49-
"@storybook/channels": "^7.4.2",
50-
"@storybook/components": "^7.4.2",
51-
"@storybook/core-events": "^7.4.2",
52-
"@storybook/manager-api": "^7.4.2",
53-
"@storybook/theming": "^7.4.2",
47+
"@storybook/blocks": "^8.0.8",
48+
"@storybook/channels": "^8.0.8",
49+
"@storybook/components": "^8.0.8",
50+
"@storybook/core-events": "^8.0.8",
51+
"@storybook/manager-api": "^8.0.8",
52+
"@storybook/preview-api": "^8.0.8",
53+
"@storybook/theming": "^8.0.8",
5454
"mock-xmlhttprequest": "^8.1.0",
5555
"path-to-regexp": "^6.2.1",
5656
"polished": "^4.2.2",
5757
"prop-types": "^15.8.1",
58-
"storybook": "^7.4.2",
58+
"storybook": "^8.0.8",
5959
"whatwg-fetch": "^3.6.19"
6060
},
6161
"devDependencies": {

packages/mock-addon/src/preset/manager.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
import { addons, types } from '@storybook/addons';
21
import { ADDON_ID, PANEL_ID } from '../utils/constants';
32
import { Panel } from '../Panel';
3+
import { addons, types } from '@storybook/manager-api';
44

55
addons.register(ADDON_ID, () => {
66
// Register the panel

packages/mock-addon/src/withRoundTrip.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { FORCE_RE_RENDER, STORY_CHANGED } from '@storybook/core-events';
2-
import { addons } from '@storybook/addons';
32
import { EVENTS, PARAM_KEY, GLOBAL_PARAM_KEY } from './utils/constants';
43
import faker from './utils/faker';
4+
import { addons } from '@storybook/preview-api';
55

66
const getParameter = (parameters, key, defaultValue) => {
77
return parameters[key] || defaultValue;

0 commit comments

Comments
 (0)