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.

Sign up for GitHub

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

Jump to bottom

Patch packages dependencies vulnerabilities #916

Merged
merged 3 commits into from
Mar 7, 2022
Merged

Patch packages dependencies vulnerabilities #916

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
38ebc6d
Patch packages dependencies vulnerabilities
Jordanlelay Feb 23, 2022
152d129
Sort Storybook stories and use extra addons
bbenoist Feb 24, 2022
3e214bc
When possible, avoid relying on resolutions in package.json file
bbenoist Feb 24, 2022
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
6 changes: 5 additions & 1 deletion .storybook/main.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,11 @@ module.exports = {
core: {
builder: "webpack5",
},
addons: ["storybook-addon-next-router"],
addons: [
"@storybook/addon-essentials",
"storybook-addon-next-router",
"@chakra-ui/storybook-addon",
],
typescript: { reactDocgen: "react-docgen" },
webpackFinal: async (config = {}) => {
// https://stackoverflow.com/a/61706308
Expand Down
18 changes: 13 additions & 5 deletions .storybook/preview.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,21 @@
import { RouterContext } from "next/dist/shared/lib/router-context"; // next 11.2
import { theme } from "../typescript/web/src/theme";

export const parameters = {
options: {
// Sort stories alphabetically by default
storySort: (a, b) =>
a[1].kind === b[1].kind
? 0
: a[1].id.localeCompare(b[1].id, undefined, { numeric: true }),
},
nextRouter: {
Provider: RouterContext.Provider,
isReady: true,
path: '/', // defaults to `/`
asPath: '/', // defaults to `/`
path: "/", // defaults to `/`
asPath: "/", // defaults to `/`
bbenoist marked this conversation as resolved.
Show resolved Hide resolved
query: {}, // defaults to `{}`
push() {
} // defaults to using addon actions integration,
push() {}, // defaults to using addon actions integration,
},
}
chakra: { theme },
};
1 change: 1 addition & 0 deletions .vscode/extensions.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"davidanson.vscode-markdownlint",
"dbaeumer.vscode-eslint",
"esbenp.prettier-vscode",
"JounQin.vscode-mdx",
"mjmlio.vscode-mjml",
"prisma.prisma"
],
Expand Down
20 changes: 19 additions & 1 deletion .yarnrc.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@ logFilters:
nodeLinker: node-modules

packageExtensions:
"@labelflow/web@*":
peerDependencies:
"@storybook/addon-essentials": "*"
"@babel/core": "*"
"@chakra-ui/accordion@1.3.6":
peerDependencies:
framer-motion: "*"
Expand All @@ -20,15 +24,26 @@ packageExtensions:
"@chakra-ui/theme": "*"
"@emotion/react": "*"
"@emotion/styled": "*"
"@chakra-ui/storybook-addon@*":
peerDependencies:
"@chakra-ui/system": "*"
"@chakra-ui/switch@1.2.9":
peerDependencies:
framer-motion: "*"
"@endemolshinegroup/cosmiconfig-typescript-loader@*":
peerDependencies:
typescript: "*"
"@graphql-codegen/cli@1.21.4":
"@graphql-codegen/cli@*":
peerDependencies:
typescript: "*"
"@mdx-js/loader@*":
peerDependencies:
"react": "*"
"@storybook/addon-essentials@*":
peerDependencies:
"@storybook/components": "*"
"@storybook/core-events": "*"
"@storybook/theming": "*"
"@storybook/core-server@*":
peerDependencies:
"@babel/core": "*"
Expand Down Expand Up @@ -57,6 +72,9 @@ packageExtensions:
dependencies:
core-js-bundle: "*"
regenerator-runtime: "*"
styled-jsx@*:
peerDependencies:
"@babel/core": "*"
next-auth@*:
peerDependencies:
"@prisma/client": "*"
Expand Down