Skip to content

Commit 9b58a95

Browse files
fliiiixfliiiix
authored
Merge pull request #937 from docat-org/update/eslint
Upgrade all the rest to latest for now
2 parents 5a21197 + ac58274 commit 9b58a95

7 files changed

Lines changed: 513 additions & 715 deletions

File tree

‎web/package.json‎

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,17 @@
66
"dependencies": {
77
"@emotion/react": "^11.14.0",
88
"@emotion/styled": "^11.14.1",
9-
"@mui/icons-material": "^7.3.9",
10-
"@mui/material": "^7.3.9",
11-
"fuse.js": "^7.1.0",
12-
"react": "^19.2.4",
13-
"react-dom": "^19.2.4",
9+
"@mui/icons-material": "^9.0.0",
10+
"@mui/material": "^9.0.0",
11+
"fuse.js": "^7.3.0",
12+
"react": "^19.2.5",
13+
"react-dom": "^19.2.5",
1414
"react-markdown": "^10.1.0",
15-
"react-router": "^7.13.1",
16-
"react-router-dom": "^7.13.1",
15+
"react-router": "^7.14.0",
16+
"react-router-dom": "^7.14.0",
1717
"semver": "^7.7.4",
18-
"typescript": "^5.9.3",
19-
"vite": "^7.3.1"
18+
"typescript": "^6.0.2",
19+
"vite": "^8.0.8"
2020
},
2121
"scripts": {
2222
"start": "VITE_DOCAT_VERSION=$(git describe --tags --always) vite",
@@ -38,19 +38,19 @@
3838
]
3939
},
4040
"devDependencies": {
41-
"@vitejs/plugin-react-swc": "^4.3.0",
42-
"@eslint/js": "^9.17.0",
41+
"@vitejs/plugin-react": "^6.0.1",
42+
"@eslint/js": "^10.0.1",
4343
"@types/semver": "^7.7.1",
44-
"@types/node": "^25.4.0",
44+
"@types/node": "^25.6.0",
4545
"@types/react": "^19.2.14",
4646
"@types/react-dom": "^19.2.3",
47-
"jsdom": "^28.1.0",
47+
"jsdom": "^29.0.2",
4848
"eslint": "^10.2.0",
49-
"eslint-config-prettier": "^10.0.1",
49+
"eslint-config-prettier": "^10.1.8",
5050
"@eslint-react/eslint-plugin": "^4.2.3",
5151
"globals": "^17.4.0",
52-
"prettier": "^3.8.1",
52+
"prettier": "^3.8.2",
5353
"typescript-eslint": "^8.58.1",
54-
"vitest": "^4.0.18"
54+
"vitest": "^4.1.4"
5555
}
5656
}

‎web/src/components/FavoriteStar.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
import { Star, StarOutline } from '@mui/icons-material'
1+
import { Star, StarOutlined } from '@mui/icons-material'
22
import React, { useState } from 'react'
33
import ProjectRepository from '../repositories/ProjectRepository'
44

@@ -20,7 +20,7 @@ export default function FavoriteStar(props: Props): React.JSX.Element {
2020
props.onFavoriteChanged()
2121
}
2222

23-
const StarType = isFavorite ? Star : StarOutline
23+
const StarType = isFavorite ? Star : StarOutlined
2424

2525
return (
2626
<StarType

‎web/src/components/Project.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ export default function Project(props: Props): React.JSX.Element {
8282
{props.project.versions.length === 1
8383
? `${props.project.versions.length} version`
8484
: `${props.project.versions.length} versions`}
85-
<Typography sx={{ marginLeft: 1.5 }} fontSize={'0.9em'} component={'span'} fontWeight={300}>{props.project.storage}</Typography>
85+
<Typography component={'span'} sx={{ marginLeft: 1.5, fontSize: '0.9em', fontWeight: 300 }}>{props.project.storage}</Typography>
8686
</div>
8787

8888
<FavoriteStar

‎web/src/pages/Claim.tsx‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -83,8 +83,10 @@ export default function Claim(): JSX.Element {
8383
<TextField
8484
fullWidth
8585
label="Token"
86-
inputProps={{
87-
readOnly: true
86+
slotProps={{
87+
input: {
88+
readOnly: true,
89+
},
8890
}}
8991
value={token}
9092
>

‎web/src/pages/Home.tsx‎

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import { useEffect, useState, JSX } from 'react';
22
import { useNavigate } from 'react-router';
33

4-
import { Delete, ErrorOutline, FileUpload, KeyboardArrowDown, Lock } from '@mui/icons-material';
4+
import { Delete, ErrorOutlined, FileUpload, KeyboardArrowDown, Lock } from '@mui/icons-material';
55
import { useProjects } from '../data-providers/ProjectDataProvider';
66
import { useSearch } from '../data-providers/SearchProvider';
77
import { type Project } from '../models/ProjectsResponse';
@@ -55,7 +55,7 @@ export default function Home(): JSX.Element {
5555
<div className={styles.home}>
5656
<Header />
5757
<div className={styles['loading-error']}>
58-
<ErrorOutline color="error" />
58+
<ErrorOutlined color="error" />
5959
<div>Failed to load projects</div>
6060
</div>
6161
<Footer />
@@ -147,7 +147,7 @@ export default function Home(): JSX.Element {
147147
/>
148148
:
149149
<>
150-
<Typography sx={{ marginLeft: '24px', marginBottom: 1.5 }} fontWeight={300} fontSize={20}>FAVOURITES</Typography>
150+
<Typography sx={{ marginLeft: '24px', marginBottom: 1.5, fontSize: 20, fontWeight: 300 }}>FAVOURITES</Typography>
151151
{ (favoriteProjects.length === 0) ?
152152
<Box sx={{marginLeft: '24px'}}>
153153
No docs favourited at the moment, search for docs or
@@ -168,7 +168,7 @@ export default function Home(): JSX.Element {
168168
opacity: 0.8,
169169
}, }}>
170170
<Link to={''} onClick={() => onShowFavourites(true)} >
171-
<Typography fontWeight={'300'} fontSize={'1.1em'} component={'span'}>SHOW ALL DOCS </Typography>
171+
<Typography component={'span'} sx={{ fontSize: '1.1em', fontWeight: 300 }}>SHOW ALL DOCS </Typography>
172172
<KeyboardArrowDown sx={{ marginBottom: -0.6, marginLeft: 1 }} />
173173
</Link>
174174
</Box>
@@ -191,21 +191,21 @@ export default function Home(): JSX.Element {
191191
marginTop: 15,
192192
width: '400px'
193193
}}>
194-
<Typography sx={{display: 'inline-block'}} fontWeight={300} fontSize={'1.1em'} component={'span'}>INSTANCE STATS</Typography>
194+
<Typography component={'span'} sx={{display: 'inline-block', fontSize: '1.1em', fontWeight: 300}}>INSTANCE STATS</Typography>
195195
<Box />
196196

197-
<Typography fontSize={'1em'} fontWeight={200} sx={{ opacity: 0.8 }} component={'span'}># </Typography>
198-
<Typography sx={{width: 100, display: 'inline-block', marginTop: 1}} fontWeight={300} fontSize={'1em'} component={'span'}>DOCS </Typography>
199-
<Typography fontSize={'1em'} fontWeight={200} sx={{ opacity: 0.8 }} component={'span'}>{stats.n_projects}</Typography>
197+
<Typography component={'span'} sx={{opacity: 0.8, fontSize: '1em', fontWeight: 200}}># </Typography>
198+
<Typography component={'span'} sx={{width: 100, display: 'inline-block', marginTop: 1, fontSize: '1em', fontWeight: 300}}>DOCS </Typography>
199+
<Typography component={'span'} sx={{opacity: 0.8, fontSize: '1em', fontWeight: 200}} >{stats.n_projects}</Typography>
200200

201201
<Box />
202-
<Typography fontSize={'1em'} fontWeight={200} sx={{ opacity: 0.8 }} component={'span'}># </Typography>
203-
<Typography sx={{width: 100, display: 'inline-block', marginTop: 0.4}} fontWeight={300} fontSize={'1em'} component={'span'}>VERSIONS </Typography>
204-
<Typography fontSize={'1em'} fontWeight={200} sx={{ opacity: 0.8 }} component={'span'}>{stats.n_versions}</Typography>
202+
<Typography component={'span'} sx={{opacity: 0.8, fontSize: '1em', fontWeight: 200 }}># </Typography>
203+
<Typography component={'span'} sx={{width: 100, display: 'inline-block', marginTop: 0.4, fontSize: '1em', fontWeight: 300}}>VERSIONS </Typography>
204+
<Typography component={'span'} sx={{opacity: 0.8, fontSize: '1em', fontWeight: 200 }} >{stats.n_versions}</Typography>
205205

206206
<Box />
207-
<Typography sx={{width: 115, display: 'inline-block', marginTop: 0.4}} fontWeight={300} fontSize={'1em'} component={'span'}>STORAGE </Typography>
208-
<Typography fontSize={'1em'} fontWeight={200} sx={{ opacity: 0.8 }} component={'span'}>{stats.storage}</Typography>
207+
<Typography component={'span'} sx={{width: 115, display: 'inline-block', marginTop: 0.4, fontSize: '1em', fontWeight: 300}}>STORAGE </Typography>
208+
<Typography component={'span'} sx={{opacity: 0.8, fontSize: '1em', fontWeight: 200 }} >{stats.storage}</Typography>
209209
</Box>
210210
</div>
211211
<Footer />

‎web/vite.config.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { defineConfig, loadEnv } from 'vite'
2-
import react from '@vitejs/plugin-react-swc'
2+
import react from '@vitejs/plugin-react'
33

44
// https://vitejs.dev/config/
55
export default defineConfig(({ mode }) => {

0 commit comments

Comments
 (0)