Skip to content

Commit

Permalink
Merge pull request #209 from Jontii/master
Browse files Browse the repository at this point in the history
feat: upgraded to storybook 8 and vite-framework
  • Loading branch information
nutboltu committed Apr 15, 2024
2 parents b902464 + a156b3e commit 88b108a
Show file tree
Hide file tree
Showing 16 changed files with 3,917 additions and 5,050 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/nodejs.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ jobs:

strategy:
matrix:
node-version: [16.x, 18.x]
node-version: [18.x, 20.x]

steps:
- uses: actions/checkout@v1
- name: Use Node.js ${{ matrix.node-version }}
uses: actions/setup-node@v1
uses: actions/setup-node@v4
with:
node-version: ${{ matrix.node-version }}
- name: yarn install, build, and test
Expand Down
1 change: 0 additions & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@
"devDependencies": {
"@babel/core": "^7.21.4",
"@babel/eslint-parser": "^7.21.3",
"babel-loader": "^9.1.2",
"eslint": "^8.37.0",
"eslint-config-prettier": "^8.8.0",
"eslint-plugin-import": "^2.27.5",
Expand Down
33 changes: 14 additions & 19 deletions packages/mock-addon-docs/.storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,25 +1,20 @@
import remarkGfm from 'remark-gfm';

export default {
const config = {
stories: [
'../stories/**/*stories.mdx',
'../stories/**/*stories.@(js|jsx|ts|tsx)',
'../stories/**/*.mdx',
'../stories/**/stories.@(js|jsx|mjs|ts|tsx)',
],
addons: [
'../../mock-addon/src/preset/manager.js',
'@storybook/addon-links',
{
name: '@storybook/addon-docs',
options: {
mdxPluginOptions: {
mdxCompileOptions: {
remarkPlugins: [remarkGfm],
},
},
},
},
'@storybook/addon-viewport',
'@storybook/addon-toolbars',
'../../mock-addon/preset.js',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
],
framework: '@storybook/react-webpack5',
framework: {
name: '@storybook/react-vite',
options: {},
},
docs: {
autodocs: 'tag',
}
};
export default config;
13 changes: 0 additions & 13 deletions packages/mock-addon-docs/.storybook/preview.js

This file was deleted.

20 changes: 20 additions & 0 deletions packages/mock-addon-docs/.storybook/preview.jsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import {withRoundTrip} from "storybook-addon-mock/src/withRoundTrip";

const Preview = {
parameters: {
options: {
storySort: {
order: ['Docs', ['Introduction', 'Installation', 'User guide']],
includeName: true
}
},
mockAddonConfigs: {
globalMockData: [],
refreshStoryOnUpdate: true,
disableUsingOriginal: false,
},
},
decorators: [withRoundTrip],
}

export default Preview
19 changes: 10 additions & 9 deletions packages/mock-addon-docs/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,20 +15,21 @@
"author": "Farhad Yasir(nutboltu)",
"license": "MIT",
"devDependencies": {
"@storybook/addon-actions": "^7.4.2",
"@storybook/addon-essentials": "^7.4.2",
"@storybook/addon-interactions": "^7.4.2",
"@storybook/addon-links": "^7.4.2",
"@storybook/react-webpack5": "^7.4.2",
"@storybook/addon-actions": "^8.0.8",
"@storybook/addon-essentials": "^8.0.8",
"@storybook/addon-interactions": "^8.0.8",
"@storybook/addon-links": "^8.0.8",
"@storybook/react": "^8.0.8",
"@storybook/react-vite": "^8.0.8",
"@storybook/storybook-deployer": "^2.8.16",
"storybook": "^7.4.2"
"storybook": "^8.0.8"
},
"dependencies": {
"axios": "^1.3.4",
"react": "^18.2.0",
"react-code-blocks": "0.0.9-0",
"react-code-blocks": "^0.0.9-0",
"react-dom": "^18.2.0",
"remark-gfm": "^3.0.1",
"superagent": "^8.0.9"
"superagent": "^8.0.9",
"vite": "^5.2.8"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import { Footer } from './footer';

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

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.
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.



Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import React, { useState } from 'react';
import PropTypes from 'prop-types';
import LinkTo from '@storybook/addon-links/react';

import { buttonStyles, inputStyles, formStyles, labelStyles } from './styles';
import { buttonStyles, inputStyles, formStyles } from './styles';
import { Container } from '../container';
import { Response } from '../response';
import { DEFAULT_URL } from '../../utils';
Expand Down
6 changes: 3 additions & 3 deletions packages/mock-addon/.github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,10 @@ jobs:
- name: Prepare repository
run: git fetch --unshallow --tags

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

- name: Install dependencies
uses: bahmutov/npm-install@v1
Expand Down
18 changes: 9 additions & 9 deletions packages/mock-addon/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "storybook-addon-mock",
"version": "4.3.0",
"version": "5.0.0",
"description": "A storybook addon to mock fetch/XHR request",
"keywords": [
"storybook",
Expand Down Expand Up @@ -44,18 +44,18 @@
"release": "yarn build && auto shipit"
},
"dependencies": {
"@storybook/addons": "^7.4.2",
"@storybook/blocks": "^7.4.2",
"@storybook/channels": "^7.4.2",
"@storybook/components": "^7.4.2",
"@storybook/core-events": "^7.4.2",
"@storybook/manager-api": "^7.4.2",
"@storybook/theming": "^7.4.2",
"@storybook/blocks": "^8.0.8",
"@storybook/channels": "^8.0.8",
"@storybook/components": "^8.0.8",
"@storybook/core-events": "^8.0.8",
"@storybook/manager-api": "^8.0.8",
"@storybook/preview-api": "^8.0.8",
"@storybook/theming": "^8.0.8",
"mock-xmlhttprequest": "^8.1.0",
"path-to-regexp": "^6.2.1",
"polished": "^4.2.2",
"prop-types": "^15.8.1",
"storybook": "^7.4.2",
"storybook": "^8.0.8",
"whatwg-fetch": "^3.6.19"
},
"devDependencies": {
Expand Down
2 changes: 1 addition & 1 deletion packages/mock-addon/src/preset/manager.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { addons, types } from '@storybook/addons';
import { ADDON_ID, PANEL_ID } from '../utils/constants';
import { Panel } from '../Panel';
import { addons, types } from '@storybook/manager-api';

addons.register(ADDON_ID, () => {
// Register the panel
Expand Down
2 changes: 1 addition & 1 deletion packages/mock-addon/src/withRoundTrip.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { FORCE_RE_RENDER, STORY_CHANGED } from '@storybook/core-events';
import { addons } from '@storybook/addons';
import { EVENTS, PARAM_KEY, GLOBAL_PARAM_KEY } from './utils/constants';
import faker from './utils/faker';
import { addons } from '@storybook/preview-api';

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

0 comments on commit 88b108a

Please sign in to comment.