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

Storybook 7.4 upgrade #70

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ storybook-static
.env.development.local
.env.test.local
.env.production.local
.tool-versions

npm-debug.log*
yarn-debug.log*
Expand Down
26 changes: 18 additions & 8 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,23 +1,19 @@
module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.(tsx|js)'],
staticDirs: ['./static'],

addons: [
'@storybook/addon-essentials',
'@storybook/addon-a11y',
'storybook-addon-pseudo-states',
'@storybook/addon-interactions',
'@storybook/addon-mdx-gfm'
],

features: {
interactionsDebugger: true,
},
core: {
builder: {
name: 'webpack5',
options: {
fsCache: true,
},
},
},

webpackFinal: async (config) => {
config.module.rules.push({
test: /\.mjs$/,
Expand All @@ -31,4 +27,18 @@ module.exports = {

return config;
},

framework: {
name: '@storybook/react-webpack5',

options: {
builder: {
fsCache: true
}
}
},

docs: {
autodocs: true
}
};
35 changes: 18 additions & 17 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,13 @@
"scripts": {
"patch-package": "patch-package",
"build": "yarn patch-package && babel src -d dist --extensions \".js,.jsx,.ts,.tsx\" --ignore \"**/*.stories.tsx\" --ignore \"**/*.stories.js\"",
"build-storybook": "yarn patch-package && build-storybook",
"build-storybook": "yarn patch-package && storybook build",
"clean": "rm -rf dist",
"lint": "yarn lint:js && yarn lint:package",
"lint:js": "cross-env NODE_ENV=production eslint --cache --cache-location=.cache/eslint --ext .js,.jsx,.html,.ts,.tsx,.mjs --report-unused-disable-directives",
"lint:package": "sort-package-json",
"release": "dotenv yarn build & yarn typescript:generate && auto shipit",
"storybook": "yarn patch-package && start-storybook -p 6006",
"storybook": "yarn patch-package && storybook dev -p 6006",
"typescript:check": "tsc --project ./tsconfig.json --noEmit",
"typescript:generate": "tsc --declaration --emitDeclarationOnly --outDir dist --declarationMap"
},
Expand All @@ -48,9 +48,9 @@
"@docsearch/react": "^3.1.0",
"@emotion/weak-memoize": "^0.2.5",
"@floating-ui/react-dom-interactions": "^0.6.5",
"@storybook/api": "^6.5.9",
"@storybook/design-system": "^7.9.0",
"@storybook/theming": "^6.5.9",
"@storybook/design-system": "^7.15.15",
"@storybook/manager-api": "^7.4.2",
"@storybook/theming": "^7.4.2",
"formik": "^2.1.5",
"human-format": "^0.11.0",
"react-merge-refs": "^1.1.0"
Expand All @@ -65,26 +65,26 @@
"@babel/preset-react": "^7.10.1",
"@babel/preset-typescript": "^7.10.1",
"@emotion/babel-plugin": "^11.9.2",
"@storybook/addon-a11y": "^6.5.9",
"@storybook/addon-actions": "^6.5.9",
"@storybook/addon-docs": "^6.5.9",
"@storybook/addon-essentials": "^6.5.9",
"@storybook/addon-interactions": "^6.5.9",
"@storybook/builder-webpack5": "^6.5.10",
"@storybook/addon-a11y": "^7.4.2",
"@storybook/addon-actions": "^7.4.2",
"@storybook/addon-docs": "^7.4.2",
"@storybook/addon-essentials": "^7.4.2",
"@storybook/addon-interactions": "^7.4.2",
"@storybook/addon-mdx-gfm": "^7.4.2",
"@storybook/eslint-config-storybook": "^3.1.2",
"@storybook/jest": "^0.0.10",
"@storybook/jest": "^0.2.2",
"@storybook/linter-config": "^3.1.2",
"@storybook/manager-webpack5": "^6.5.10",
"@storybook/react": "^6.5.9",
"@storybook/testing-library": "^0.0.13",
"@storybook/react": "^7.4.2",
"@storybook/react-webpack5": "^7.4.2",
"@storybook/testing-library": "^0.2.1",
"auto": "^10.37.4",
"babel-eslint": "^10.1.0",
"babel-loader": "^8.1.0",
"chromatic": "^5.0.0",
"cross-env": "^7.0.2",
"dotenv-cli": "^3.1.0",
"eslint": "^7.1.0",
"eslint-plugin-storybook": "^0.5.12",
"eslint-plugin-storybook": "^0.6.13",
"framer-motion": "^7.0.0",
"husky": "^4.2.5",
"lint-staged": "^10.2.9",
Expand All @@ -93,7 +93,8 @@
"react": "17",
"react-dom": "17",
"sort-package-json": "^1.51.0",
"storybook-addon-pseudo-states": "^1.15.0",
"storybook": "^7.4.2",
"storybook-addon-pseudo-states": "^2.1.1",
"ts-loader": "^7.0.5",
"typescript": "^4.7.4"
},
Expand Down
2 changes: 1 addition & 1 deletion src/components/Search.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import React, { FunctionComponent } from 'react';
import { controlOrMetaKey, shortcutToHumanString } from '@storybook/api/shortcut';
import { controlOrMetaKey, shortcutToHumanString } from '@storybook/manager-api';
import { css, Global, styled } from '@storybook/theming';
import { styles } from '@storybook/design-system';
import { DocSearch } from '@docsearch/react';
Expand Down