Skip to content

Commit be8b0f0

Browse files
jmattheisjmattheis
authored
Merge pull request #244 from screego/update
Update
2 parents 5285d3e + fa5eb93 commit be8b0f0

10 files changed

Lines changed: 538 additions & 770 deletions

File tree

‎.github/workflows/build.yml‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@ jobs:
55
screego:
66
runs-on: ubuntu-latest
77
steps:
8-
- uses: actions/setup-go@4dc6199c7b1a012772edbd06daecab0f50c9053c # v6.1.0
8+
- uses: actions/setup-go@4a3601121dd01d1626a1e23e37211e3254c1c06c # v6.4.0
99
with:
10-
go-version: 1.25.x
11-
- uses: actions/setup-node@395ad3262231945c25e8478fd5baf05154b1d79f #v6.1.0
10+
go-version: 1.26.x
11+
- uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
1212
with:
1313
node-version: '25'
14-
- uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 #v6.0.1
14+
- uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
1515
- run: go mod download
1616
- run: (cd ui && yarn)
1717
- run: (cd ui && yarn build)
1818
- run: (cd ui && yarn testformat)
1919
- uses: golangci/golangci-lint-action@1e7e51e771db61008b38414a730f564565cf7c20 # 9.2.0
2020
with:
21-
version: v2.7.2
21+
version: v2.11.4
2222
- run: go build ./...
2323
- run: go test -race ./...
2424
- if: startsWith(github.ref, 'refs/tags/v')
@@ -29,9 +29,9 @@ jobs:
2929
DOCKER_USER: ${{ secrets.DOCKER_USER }}
3030
DOCKER_PASS: ${{ secrets.DOCKER_PASS }}
3131
- if: startsWith(github.ref, 'refs/tags/v')
32-
uses: goreleaser/goreleaser-action@e435ccd777264be153ace6237001ef4d979d3a7a #v6.4.0
32+
uses: goreleaser/goreleaser-action@e24998b8b67b290c2fa8b7c14fcfa7de2c5c9b8c # v7.1.0
3333
with:
34-
version: 2.13.0
34+
version: 2.15.4
3535
args: release --skip=validate
3636
env:
3737
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

‎go.mod‎

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
module github.com/screego/server
22

3-
go 1.24.0
4-
5-
toolchain go1.24.1
3+
go 1.26.0
64

75
require (
86
github.com/gorilla/handlers v1.5.2
@@ -12,15 +10,15 @@ require (
1210
github.com/joho/godotenv v1.5.1
1311
github.com/kelseyhightower/envconfig v1.4.0
1412
github.com/pion/randutil v0.1.0
15-
github.com/pion/turn/v4 v4.1.3
13+
github.com/pion/turn/v4 v4.1.4
1614
github.com/prometheus/client_golang v1.23.2
1715
github.com/rs/xid v1.6.0
18-
github.com/rs/zerolog v1.34.0
16+
github.com/rs/zerolog v1.35.1
1917
github.com/stretchr/testify v1.11.1
2018
github.com/urfave/cli v1.22.17
21-
golang.org/x/crypto v0.46.0
22-
golang.org/x/term v0.38.0
23-
golang.org/x/text v0.32.0
19+
golang.org/x/crypto v0.50.0
20+
golang.org/x/term v0.42.0
21+
golang.org/x/text v0.36.0
2422
)
2523

2624
require (
@@ -30,23 +28,23 @@ require (
3028
github.com/davecgh/go-spew v1.1.1 // indirect
3129
github.com/felixge/httpsnoop v1.0.3 // indirect
3230
github.com/gorilla/securecookie v1.1.2 // indirect
33-
github.com/klauspost/compress v1.18.0 // indirect
3431
github.com/kr/text v0.2.0 // indirect
35-
github.com/mattn/go-colorable v0.1.13 // indirect
36-
github.com/mattn/go-isatty v0.0.19 // indirect
32+
github.com/mattn/go-colorable v0.1.14 // indirect
33+
github.com/mattn/go-isatty v0.0.20 // indirect
3734
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3835
github.com/pion/dtls/v3 v3.0.7 // indirect
3936
github.com/pion/logging v0.2.4 // indirect
4037
github.com/pion/stun/v3 v3.0.1 // indirect
4138
github.com/pion/transport/v3 v3.1.1 // indirect
39+
github.com/pion/transport/v4 v4.0.1 // indirect
4240
github.com/pmezard/go-difflib v1.0.0 // indirect
4341
github.com/prometheus/client_model v0.6.2 // indirect
4442
github.com/prometheus/common v0.66.1 // indirect
4543
github.com/prometheus/procfs v0.16.1 // indirect
4644
github.com/russross/blackfriday/v2 v2.1.0 // indirect
4745
github.com/wlynxg/anet v0.0.5 // indirect
4846
go.yaml.in/yaml/v2 v2.4.2 // indirect
49-
golang.org/x/sys v0.39.0 // indirect
47+
golang.org/x/sys v0.43.0 // indirect
5048
google.golang.org/protobuf v1.36.8 // indirect
5149
gopkg.in/yaml.v3 v3.0.1 // indirect
5250
)

‎go.sum‎

Lines changed: 25 additions & 103 deletions
Large diffs are not rendered by default.

‎ui/package.json‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -6,23 +6,23 @@
66
"dependencies": {
77
"@emotion/react": "^11.13.3",
88
"@emotion/styled": "11.14.1",
9-
"@mui/icons-material": "7.3.6",
10-
"@mui/material": "7.3.6",
9+
"@mui/icons-material": "9.0.0",
10+
"@mui/material": "9.0.0",
1111
"@mui/styles": "^6.1.1",
12-
"@types/react": "19.2.7",
12+
"@types/react": "19.2.14",
1313
"@types/react-dom": "19.2.3",
14-
"@vitejs/plugin-react-swc": "4.2.2",
14+
"@vitejs/plugin-react": "6.0.1",
1515
"notistack": "^3.0.1",
16-
"prettier": "3.7.4",
17-
"react": "19.2.3",
18-
"react-dom": "19.2.3",
19-
"react-hotkeys-hook": "5.2.1",
16+
"prettier": "3.8.3",
17+
"react": "19.2.5",
18+
"react-dom": "19.2.5",
19+
"react-hotkeys-hook": "5.2.4",
2020
"tss-react": "^4.9.20",
21-
"typescript": "5.9.3",
21+
"typescript": "6.0.3",
2222
"use-http": "^1.0.28",
23-
"vite": "7.3.0",
24-
"vite-plugin-svgr": "4.5.0",
25-
"vite-tsconfig-paths": "6.0.3"
23+
"vite": "8.0.10",
24+
"vite-plugin-svgr": "5.2.0",
25+
"vite-tsconfig-paths": "6.1.1"
2626
},
2727
"scripts": {
2828
"start": "vite",

‎ui/src/LoginForm.tsx‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ export const LoginForm = ({config: {login}, hide}: {config: UseConfig; hide?: ()
5454
size="small"
5555
margin="dense"
5656
/>
57-
<Box marginTop={1}>
57+
<Box sx={{marginTop: 1}}>
5858
<LoadingButton
5959
type="submit"
6060
loading={loading}

‎ui/src/Room.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -240,7 +240,7 @@ export const Room = ({
240240
{(stream?.getAudioTracks().length ?? 0) > 0 && videoElement && (
241241
<AudioControl video={videoElement} />
242242
)}
243-
<Box whiteSpace="nowrap">
243+
<Box sx={{whiteSpace: 'nowrap'}}>
244244
{state.hostStream ? (
245245
<Tooltip title="Cancel Presentation" arrow>
246246
<IconButton onClick={stopShare} size="large">
@@ -390,7 +390,7 @@ const AudioControl = ({video}: {video: FullScreenHTMLVideoElement}) => {
390390
});
391391

392392
return (
393-
<Stack spacing={0.5} pr={2} direction="row" sx={{alignItems: 'center', my: 1, height: 35}}>
393+
<Stack spacing={0.5} direction="row" sx={{alignItems: 'center', my: 1, height: 35, pr: 2}}>
394394
<IconButton size="large" onClick={() => (video.muted = !video.muted)}>
395395
{video.muted ? (
396396
<VolumeMuteIcon fontSize="large" />

‎ui/src/RoomManage.tsx‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ const CreateRoom = ({room, config}: Pick<UseRoom, 'room'> & {config: UIConfig})
5050
}
5151
label="Close Room after you leave"
5252
/>
53-
<Box paddingBottom={0.5}>
53+
<Box sx={{paddingBottom: 0.5}}>
5454
<Typography>
5555
Nat Traversal via:{' '}
5656
<Link
@@ -79,7 +79,7 @@ export const RoomManage = ({room, config}: {room: FCreateRoom; config: UseConfig
7979
return (
8080
<Grid
8181
container={true}
82-
justifyContent="center"
82+
sx={{justifyContent: 'center'}}
8383
style={{paddingTop: 50, maxWidth: 400, width: '100%', margin: '0 auto'}}
8484
spacing={4}
8585
>

‎ui/src/SettingDialog.tsx‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
5252
<DialogTitle>Settings</DialogTitle>
5353
<DialogContent>
5454
<form onSubmit={doSubmit}>
55-
<Box paddingBottom={1}>
55+
<Box sx={{paddingBottom: 1}}>
5656
<TextField
5757
autoFocus
5858
margin="dense"
@@ -65,7 +65,7 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
6565
/>
6666
</Box>
6767
{NativeCodecs.length > 0 ? (
68-
<Box paddingY={1}>
68+
<Box sx={{paddingY: 1}}>
6969
<Autocomplete<PreferredCodec>
7070
options={[CodecBestQuality, CodecDefault, ...NativeCodecs]}
7171
getOptionLabel={({mimeType, sdpFmtpLine}) =>
@@ -88,7 +88,7 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
8888
/>
8989
</Box>
9090
) : undefined}
91-
<Box paddingTop={1}>
91+
<Box sx={{paddingTop: 1}}>
9292
<Autocomplete<VideoDisplayMode>
9393
options={Object.values(VideoDisplayMode)}
9494
onChange={(_, value) =>
@@ -102,7 +102,7 @@ export const SettingDialog = ({open, setOpen, updateName, saveSettings}: Setting
102102
renderInput={(params) => <TextField {...params} label="Display Mode" />}
103103
/>
104104
</Box>
105-
<Box paddingTop={1}>
105+
<Box sx={{paddingTop: 1}}>
106106
<NumberField
107107
label="FrameRate"
108108
min={1}

‎ui/vite.config.mts‎

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

44
export default defineConfig({
55
base: './',

0 commit comments

Comments
 (0)