Skip to content

Commit 39e6dac

Browse files
dohomidohomi
committed
fix sb and next, upgrade all to latest versions
2 parents 128fc90 + 5560306 commit 39e6dac

File tree

116 files changed

+2422
-69170
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

116 files changed

+2422
-69170
lines changed

‎apps/nextjs/next-env.d.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
/// <reference types="next" />
22
/// <reference types="next/image-types/global" />
3+
/// <reference path="./.next/types/routes.d.ts" />
34

45
// NOTE: This file should not be edited
5-
// see https://nextjs.org/docs/pages/building-your-application/configuring/typescript for more information.
6+
// see https://nextjs.org/docs/pages/api-reference/config/typescript for more information.

‎apps/nextjs/package.json‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,16 +14,16 @@
1414
"@emotion/cache": "11.14.0",
1515
"@emotion/react": "11.14.0",
1616
"@emotion/server": "11.11.0",
17-
"@emotion/styled": "11.14.0",
18-
"@mui/icons-material": "7.0.1",
19-
"@mui/material": "7.0.1",
20-
"@mui/system": "7.0.1",
21-
"@mui/x-date-pickers": "7.28.3",
17+
"@emotion/styled": "11.14.1",
18+
"@mui/icons-material": "7.3.1",
19+
"@mui/material": "7.3.1",
20+
"@mui/system": "7.3.1",
21+
"@mui/x-date-pickers": "8.10.2",
2222
"eslint": "^8",
23-
"next": "15.1.4",
24-
"react": "19.0.0",
25-
"react-dom": "19.0.0",
26-
"react-hook-form": "7.54.2",
23+
"next": "15.5.2",
24+
"react": "19.1.1",
25+
"react-dom": "19.1.1",
26+
"react-hook-form": "7.62.0",
2727
"react-hook-form-mui": "portal:../../packages/rhf-mui"
2828
},
2929
"devDependencies": {
@@ -32,7 +32,7 @@
3232
"@types/react": "latest",
3333
"@types/react-dom": "latest",
3434
"cross-env": "latest",
35-
"eslint-config-next": "15.1.4",
36-
"typescript": "5.5.3"
35+
"eslint-config-next": "15.5.2",
36+
"typescript": "5.9.2"
3737
}
3838
}

‎apps/nextjs/src/pages/index.tsx‎

Lines changed: 22 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,7 @@ import {Button, Stack} from '@mui/material'
33

44
import {FormContainer, TextFieldElement} from 'react-hook-form-mui'
55
import {DatePickerElement} from 'react-hook-form-mui/date-pickers'
6-
import {LocalizationProvider} from '@mui/x-date-pickers'
7-
8-
// https://mui.com/x/react-date-pickers/getting-started/#setup-your-date-library-adapter
9-
import {AdapterDateFns} from '@mui/x-date-pickers/AdapterDateFnsV3'
6+
import {DateFnsProvider} from 'react-hook-form-mui/date-fns'
107

118
type FormProps = {
129
hallo: string
@@ -20,28 +17,28 @@ export default function Index() {
2017
return (
2118
<>
2219
<FormContainer defaultValues={defaultValues} onSuccess={onSubmit}>
23-
<Stack direction={'column'}>
24-
<TextFieldElement name={'hallo'} label={'hallo'} /> <br />
25-
<TextFieldElement
26-
color={'primary'}
27-
name={'primary'}
28-
label={'Primary'}
29-
/>
30-
<br />
31-
<TextFieldElement
32-
color={'secondary'}
33-
name={'secondary'}
34-
label={'Secondary'}
35-
/>
36-
<br />
37-
<LocalizationProvider dateAdapter={AdapterDateFns}>
20+
<DateFnsProvider>
21+
<Stack direction={'column'}>
22+
<TextFieldElement name={'hallo'} label={'hallo'} /> <br />
23+
<TextFieldElement
24+
color={'primary'}
25+
name={'primary'}
26+
label={'Primary'}
27+
/>
28+
<br />
29+
<TextFieldElement
30+
color={'secondary'}
31+
name={'secondary'}
32+
label={'Secondary'}
33+
/>
34+
<br />
3835
<DatePickerElement name={'date'} label={'Date'} />
39-
</LocalizationProvider>
40-
<br />
41-
<Button type={'submit'} variant={'contained'} color={'primary'}>
42-
Submit
43-
</Button>
44-
</Stack>
36+
<br />
37+
<Button type={'submit'} variant={'contained'} color={'primary'}>
38+
Submit
39+
</Button>
40+
</Stack>
41+
</DateFnsProvider>
4542
</FormContainer>
4643
<div>
4744
Data:

‎apps/nextjs/src/pages/withSub.tsx‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,7 @@
11
import {Alert, Button, Stack} from '@mui/material'
2-
import {LocalizationProvider} from '@mui/x-date-pickers'
32
import {FormContainer, TextFieldElement, useWatch} from 'react-hook-form-mui'
43
import {DatePickerElement} from 'react-hook-form-mui/date-pickers'
5-
6-
import {AdapterDateFns} from '@mui/x-date-pickers/AdapterDateFnsV3'
4+
import {DateFnsProvider} from 'react-hook-form-mui/date-fns'
75

86
const SubComponent = () => {
97
const [name, email] = useWatch({
@@ -39,21 +37,21 @@ export default function IndexPage() {
3937
console.log(data)
4038
}}
4139
>
42-
<Stack direction={'column'}>
43-
<TextFieldElement name={'name'} label={'Name'} required /> <br />
44-
<TextFieldElement
45-
name={'email'}
46-
label={'Email'}
47-
required
48-
type={'email'}
49-
/>{' '}
50-
<br />
51-
<TextFieldElement name={'interest'} label={'Interest'} /> <br />
52-
<LocalizationProvider dateAdapter={AdapterDateFns}>
40+
<DateFnsProvider>
41+
<Stack direction={'column'}>
42+
<TextFieldElement name={'name'} label={'Name'} required /> <br />
43+
<TextFieldElement
44+
name={'email'}
45+
label={'Email'}
46+
required
47+
type={'email'}
48+
/>{' '}
49+
<br />
50+
<TextFieldElement name={'interest'} label={'Interest'} /> <br />
5351
<DatePickerElement name={'date'} label={'Date'} /> <br />
54-
</LocalizationProvider>
55-
<SubComponent />
56-
</Stack>
52+
<SubComponent />
53+
</Stack>
54+
</DateFnsProvider>
5755
</FormContainer>
5856
</div>
5957
)

‎apps/storybook/.storybook/main.ts‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -7,17 +7,15 @@ import {StorybookConfig} from '@storybook/react-vite'
77

88
const config: StorybookConfig = {
99
stories: ['../stories/**/*.stories.@(js|jsx|ts|tsx|mdx)'],
10-
addons: [getAbsolutePath('@storybook/addon-essentials')],
10+
addons: [getAbsolutePath("@storybook/addon-docs")],
11+
1112
// core: {
1213
// builder: '@storybook/react-vite'
1314
// },
1415
framework: {
1516
name: getAbsolutePath('@storybook/react-vite'),
1617
options: {},
17-
},
18-
docs: {
19-
autodocs: true,
20-
},
18+
}
2119
}
2220
export default config
2321

‎apps/storybook/.storybook/preview.tsx‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import {Preview} from '@storybook/react'
1+
import {Preview} from '@storybook/react-vite'
22
import {createTheme, ThemeProvider} from '@mui/material'
33
import React from 'react';
44

@@ -12,6 +12,7 @@ const preview: Preview = {
1212
</ThemeProvider>
1313
),
1414
],
15+
1516
parameters: {
1617
options: {
1718
storySort: {
@@ -20,6 +21,8 @@ const preview: Preview = {
2021
}
2122
},
2223
},
24+
25+
tags: ['autodocs']
2326
}
2427

2528
export default preview;

‎apps/storybook/package.json‎

Lines changed: 15 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -37,28 +37,27 @@
3737
"@emotion/cache": "11.14.0",
3838
"@emotion/react": "11.14.0",
3939
"@emotion/server": "11.11.0",
40-
"@emotion/styled": "11.14.0",
41-
"@mui/icons-material": "7.0.1",
42-
"@mui/material": "7.0.1",
43-
"@mui/system": "7.0.1",
44-
"@mui/x-date-pickers": "7.28.3",
45-
"react": "19.0.0",
46-
"react-dom": "19.0.0",
40+
"@emotion/styled": "11.14.1",
41+
"@mui/icons-material": "7.3.1",
42+
"@mui/material": "7.3.1",
43+
"@mui/system": "7.3.1",
44+
"@mui/x-date-pickers": "8.10.2",
45+
"react": "19.1.1",
46+
"react-dom": "19.1.1",
4747
"react-hook-form-mui": "portal:../../packages/rhf-mui"
4848
},
4949
"devDependencies": {
50-
"@storybook/addon-essentials": "8.6.12",
51-
"@storybook/react": "8.6.12",
52-
"@storybook/react-vite": "8.6.12",
50+
"@storybook/addon-docs": "9.1.3",
51+
"@storybook/react-vite": "9.1.3",
5352
"@types/react": "^18.0.14",
5453
"@types/react-dom": "^18.0.5",
5554
"@vitejs/plugin-react-swc": "^3.6.0",
5655
"date-fns": "4.1.0",
57-
"react": "19.0.0",
58-
"react-dom": "19.0.0",
59-
"react-hook-form": "7.54.2",
60-
"storybook": "8.6.12",
61-
"typescript": "5.5.3",
62-
"vite": "^5.2.14"
56+
"react": "19.1.1",
57+
"react-dom": "19.1.1",
58+
"react-hook-form": "7.62.0",
59+
"storybook": "9.1.3",
60+
"typescript": "5.9.2",
61+
"vite": "7.1.3"
6362
}
6463
}

‎apps/storybook/src/FormDecorator.tsx‎

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,38 @@
1-
import {action} from '@storybook/addon-actions'
2-
import {SubmitButton} from './Shared'
3-
import {FormContainer} from 'react-hook-form-mui'
4-
import {DateFnsProvider} from 'react-hook-form-mui/date-fns'
1+
import { action } from 'storybook/actions'
2+
import { SubmitButton } from './Shared'
3+
import { FormContainer } from 'react-hook-form-mui'
4+
import { DateFnsProvider } from 'react-hook-form-mui/date-fns'
55

66
export function FormContainerDecorator(Story) {
77
return (
8-
<DateFnsProvider>
9-
<FormContainer
10-
defaultValues={{
11-
preset: '2023-02-01',
12-
datetime: null,
13-
wrong_date: '2023-13-199',
14-
}}
15-
onSuccess={action('submit')}
16-
>
17-
<Story />
18-
<SubmitButton />
19-
</FormContainer>
20-
</DateFnsProvider>
8+
<DateFnsProvider>
9+
<FormContainer
10+
defaultValues={{
11+
preset: '2023-02-01',
12+
datetime: null,
13+
wrong_date: '2023-13-199',
14+
}}
15+
onSuccess={action('submit')}
16+
>
17+
<Story/>
18+
<SubmitButton/>
19+
</FormContainer>
20+
</DateFnsProvider>
2121
)
2222
}
2323

2424
export function FormContainerDecoratorBasic(Story) {
2525
return (
26-
<FormContainer
27-
defaultValues={{
28-
preset: '2023-02-01',
29-
datetime: null,
30-
wrong_date: '2023-13-199',
31-
}}
32-
onSuccess={action('submit')}
33-
>
34-
<Story />
35-
<SubmitButton />
36-
</FormContainer>
26+
<FormContainer
27+
defaultValues={{
28+
preset: '2023-02-01',
29+
datetime: null,
30+
wrong_date: '2023-13-199',
31+
}}
32+
onSuccess={action('submit')}
33+
>
34+
<Story/>
35+
<SubmitButton/>
36+
</FormContainer>
3737
)
3838
}

‎apps/storybook/stories/AutocompleteElement.stories.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import {AutocompleteElement, FormContainer} from 'react-hook-form-mui'
22
import React from 'react'
3-
import {Meta, StoryObj} from '@storybook/react'
4-
import {action} from '@storybook/addon-actions'
3+
import {Meta, StoryObj} from '@storybook/react-vite'
4+
import {action} from 'storybook/actions'
55
import {Box, Button, Tooltip} from '@mui/material'
66
import LocationIcon from '@mui/icons-material/LocationOn'
77
import AutoModeIcon from '@mui/icons-material/AutoMode'

‎apps/storybook/stories/Checkbox.stories.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import {CheckboxElement, FormContainer} from 'react-hook-form-mui'
2-
import {Meta, StoryObj} from '@storybook/react'
3-
import {action} from '@storybook/addon-actions'
2+
import {Meta, StoryObj} from '@storybook/react-vite'
3+
import {action} from 'storybook/actions'
44
import {Box, Button} from '@mui/material'
55
import React from 'react'
66

0 commit comments

Comments
 (0)