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

upgrade to 7.0 and fix search shortcut #57

Open
wants to merge 11 commits into
base: main
Choose a base branch
from
2 changes: 1 addition & 1 deletion .github/workflows/release.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ jobs:
- name: Use Node.js 14.x
uses: actions/setup-node@v1
with:
node-version: 14.x
node-version: 16.x

- name: Install dependencies
uses: bahmutov/npm-install@v1
Expand Down
29 changes: 16 additions & 13 deletions .storybook/main.js
Original file line number Diff line number Diff line change
@@ -1,34 +1,37 @@
module.exports = {
stories: ['../src/**/*.stories.mdx', '../src/**/*.stories.(tsx|js)'],
staticDirs: ['./static'],
const config = {
framework: {
name: '@storybook/react-webpack5',
options: {
builder: {
fsCache: true,
},
},
},
stories: ['../src/**/*.mdx', '../src/**/*.stories.(tsx|js)'],
addons: [
'@storybook/addon-essentials',
'@storybook/addon-a11y',
'storybook-addon-pseudo-states',
'@storybook/addon-interactions',
],
docs: {
autodocs: true,
},
features: {
interactionsDebugger: true,
},
core: {
builder: {
name: 'webpack5',
options: {
fsCache: true,
},
},
},
staticDirs: ['./static'],
webpackFinal: async (config) => {
config.module.rules.push({
test: /\.mjs$/,
include: /node_modules/,
type: 'javascript/auto',
});

config.resolve.alias['./useMailingListForm'] = require.resolve(
'../src/__mocks__/useMailingListForm.mock.js'
);

return config;
},
};

export default config;
39 changes: 20 additions & 19 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,10 @@
"@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/components-marketing": "2.1.4--canary.57.fbe2ee4.0",
"@storybook/design-system": "^7.15.11",
"@storybook/manager-api": "^7.0.18",
"@storybook/theming": "^7.0.18",
"formik": "^2.1.5",
"human-format": "^0.11.0",
"react-merge-refs": "^1.1.0"
Expand All @@ -65,26 +66,25 @@
"@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.0.18",
"@storybook/addon-actions": "^7.0.18",
"@storybook/addon-docs": "^7.0.18",
"@storybook/addon-essentials": "^7.0.18",
"@storybook/addon-interactions": "^7.0.18",
"@storybook/eslint-config-storybook": "^3.1.2",
"@storybook/jest": "^0.0.10",
"@storybook/jest": "^0.1.0",
"@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.0.18",
"@storybook/react-webpack5": "^7.0.18",
"@storybook/testing-library": "^0.1.0",
"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.12",
"framer-motion": "^7.0.0",
"husky": "^4.2.5",
"lint-staged": "^10.2.9",
Expand All @@ -93,13 +93,14 @@
"react": "17",
"react-dom": "17",
"sort-package-json": "^1.51.0",
"storybook-addon-pseudo-states": "^1.15.0",
"storybook": "^7.0.18",
"storybook-addon-pseudo-states": "^2.0.1",
"ts-loader": "^7.0.5",
"typescript": "^4.7.4"
"typescript": "^5.0.4"
},
"peerDependencies": {
"@docsearch/css": "^3.1.0",
"@storybook/theming": "^6.5.9",
"@storybook/theming": "^7.0.0-alpha.54",
"framer-motion": "^7.0.0",
"react": "^15.0.0 || ^16.0.0 || ^17.0.0",
"react-dom": "^15.0.0 || ^16.0.0 || ^17.0.0"
Expand Down