Skip to content

Commit 3626d7d

Browse files
authored
Merge pull request #938 from gotify/renovate/typescript-6.x
chore(deps): update dependency typescript to v6
2 parents 5ea1ed6 + ea6657d commit 3626d7d

File tree

5 files changed

+15
-15
lines changed

5 files changed

+15
-15
lines changed

ui/package.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
"@dnd-kit/utilities": "^3.2.2",
1111
"@emotion/react": "^11.14.0",
1212
"@emotion/styled": "^11.14.1",
13+
"@fontsource/roboto": "^5.2.10",
1314
"@mui/icons-material": "^7.2.0",
1415
"@mui/material": "^7.2.0",
1516
"@uiw/codemirror-theme-material": "^4.24.2",
@@ -33,7 +34,6 @@
3334
"remark-gfm": "^4.0.1",
3435
"remove-markdown": "^0.6.2",
3536
"tss-react": "^4.9.19",
36-
"typeface-roboto": "1.1.13",
3737
"vite": "^7.0.6",
3838
"vitest": "^4.0.0"
3939
},
@@ -59,7 +59,7 @@
5959
"puppeteer": "^24.15.0",
6060
"rimraf": "^6.0.1",
6161
"tree-kill": "^1.2.0",
62-
"typescript": "^5.9.2",
62+
"typescript": "^6.0.0",
6363
"typescript-eslint": "^8.38.0",
6464
"wait-on": "^9.0.0"
6565
},

ui/src/index.tsx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import * as React from 'react';
22
import {createRoot} from 'react-dom/client';
3-
import 'typeface-roboto';
3+
import '@fontsource/roboto';
44
import {initAxios} from './apiAuth';
55
import * as config from './config';
66
import Layout from './layout/Layout';

ui/src/layout/Navigation.tsx

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import Divider from '@mui/material/Divider';
2-
import Drawer from '@mui/material/Drawer';
2+
import Drawer, {DrawerProps} from '@mui/material/Drawer';
33
import {Theme} from '@mui/material/styles';
44
import React from 'react';
55
import {Link} from 'react-router-dom';
@@ -14,7 +14,6 @@ import {
1414
Avatar,
1515
ListItemButton,
1616
} from '@mui/material';
17-
import {DrawerProps} from '@mui/material/Drawer/Drawer';
1817
import CloseIcon from '@mui/icons-material/Close';
1918
import {makeStyles} from 'tss-react/mui';
2019
import {useStores} from '../stores';

ui/tsconfig.json

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,10 @@
77
"sourceMap": true,
88
"allowJs": true,
99
"jsx": "react",
10-
"moduleResolution": "node",
10+
"moduleResolution": "bundler",
1111
"rootDir": "src",
1212
"forceConsistentCasingInFileNames": true,
13+
"noUncheckedSideEffectImports": false,
1314
"noImplicitReturns": true,
1415
"noImplicitThis": true,
1516
"noImplicitAny": true,

ui/yarn.lock

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -640,6 +640,11 @@
640640
"@eslint/core" "^1.2.1"
641641
levn "^0.4.1"
642642

643+
"@fontsource/roboto@^5.2.10":
644+
version "5.2.10"
645+
resolved "https://registry.yarnpkg.com/@fontsource/roboto/-/roboto-5.2.10.tgz#b985d34de475913b41d0fb57e2dcd0b16ab9ecb5"
646+
integrity sha512-8HlA5FtSfz//oFSr2eL7GFXAiE7eIkcGOtx7tjsLKq+as702x9+GU7K95iDeWFapHC4M2hv9RrpXKRTGGBI8Zg==
647+
643648
"@hapi/address@^5.1.1":
644649
version "5.1.1"
645650
resolved "https://registry.yarnpkg.com/@hapi/address/-/address-5.1.1.tgz#e9925fc1b65f5cc3fbea821f2b980e4652e84cb6"
@@ -3799,11 +3804,6 @@ typed-query-selector@^2.12.0:
37993804
resolved "https://registry.yarnpkg.com/typed-query-selector/-/typed-query-selector-2.12.0.tgz#92b65dbc0a42655fccf4aeb1a08b1dddce8af5f2"
38003805
integrity sha512-SbklCd1F0EiZOyPiW192rrHZzZ5sBijB6xM+cpmrwDqObvdtunOHHIk9fCGsoK5JVIYXoyEp4iEdE3upFH3PAg==
38013806

3802-
typeface-roboto@1.1.13:
3803-
version "1.1.13"
3804-
resolved "https://registry.yarnpkg.com/typeface-roboto/-/typeface-roboto-1.1.13.tgz#9c4517cb91e311706c74823e857b4bac9a764ae5"
3805-
integrity sha512-YXvbd3a1QTREoD+FJoEkl0VQNJoEjewR2H11IjVv4bp6ahuIcw0yyw/3udC4vJkHw3T3cUh85FTg8eWef3pSaw==
3806-
38073807
typescript-eslint@^8.38.0:
38083808
version "8.54.0"
38093809
resolved "https://registry.yarnpkg.com/typescript-eslint/-/typescript-eslint-8.54.0.tgz#f4ef3b8882a5ddc2a41968e014194c178ab23f6a"
@@ -3814,10 +3814,10 @@ typescript-eslint@^8.38.0:
38143814
"@typescript-eslint/typescript-estree" "8.54.0"
38153815
"@typescript-eslint/utils" "8.54.0"
38163816

3817-
typescript@^5.9.2:
3818-
version "5.9.3"
3819-
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.9.3.tgz#5b4f59e15310ab17a216f5d6cf53ee476ede670f"
3820-
integrity sha512-jl1vZzPDinLr9eUt3J/t7V6FgNEw9QjvBPdysz9KfQDD41fQrC2Y4vKQdiaUpFT4bXlb1RHhLpp8wtm6M5TgSw==
3817+
typescript@^6.0.0:
3818+
version "6.0.3"
3819+
resolved "https://registry.yarnpkg.com/typescript/-/typescript-6.0.3.tgz#90251dc007916e972786cb94d74d15b185577d21"
3820+
integrity sha512-y2TvuxSZPDyQakkFRPZHKFm+KKVqIisdg9/CZwm9ftvKXLP8NRWj38/ODjNbr43SsoXqNuAisEf1GdCxqWcdBw==
38213821

38223822
undici-types@~7.16.0:
38233823
version "7.16.0"

0 commit comments

Comments
 (0)