Skip to content

Commit

Permalink
Merge pull request #6 from Opetushallitus/OK-646-mui-v6
Browse files Browse the repository at this point in the history
OK-646: Päivitetty Material-UI versioon 6
  • Loading branch information
pretseli authored Sep 13, 2024
2 parents 4033d6e + c5ce453 commit 695336b
Show file tree
Hide file tree
Showing 12 changed files with 8,522 additions and 13,346 deletions.
5 changes: 5 additions & 0 deletions .storybook/main.ts
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,19 @@ import type { StorybookConfig } from '@storybook/nextjs';

const config: StorybookConfig = {
stories: ['../src/**/*.mdx', '../src/**/*.stories.@(ts|tsx)'],

addons: [
'@storybook/addon-links',
'@storybook/addon-essentials',
'@storybook/addon-interactions',
'@storybook/addon-a11y',
],

framework: {
name: '@storybook/nextjs',
options: {},
},

typescript: {
reactDocgen: 'react-docgen-typescript',
reactDocgenTypescriptOptions: {
Expand All @@ -30,6 +33,8 @@ const config: StorybookConfig = {
: true,
}, // Available only when reactDocgen is set to 'react-docgen-typescript'
},

docs: {},
};

export default config;
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ Tämä Git-säilö sisältää muotoilujärjestelmän mukaan rakennetun React-ko
## Käytetyt teknologiat

- [React](https://react.dev/) v18
- [Material-UI](https://mui.com/material-ui/getting-started/) v5
- [Material-UI](https://mui.com/material-ui/getting-started/) v6
- [Next.js](https://nextjs.org/) v14 (App router)
- [Storybook](https://storybook.js.org/) v8

Expand All @@ -29,7 +29,7 @@ Varmista myös, että vertaisriippuvuudet (peer dependency) on asennettu:
```json
{
"peerDependencies": {
"@mui/material": "^5",
"@mui/material": "^6",
"next": "^14", // Pakollinen vain, jos käytät Next.js:ää
"react": "^18"
}
Expand Down
Loading

0 comments on commit 695336b

Please sign in to comment.