Skip to content

Commit 48283b8

Browse files
authored
Merge pull request #377 from dres-dev/dev
Dependabot and version info
2 parents 2c9ca04 + 19427f9 commit 48283b8

2 files changed

Lines changed: 157 additions & 39 deletions

File tree

backend/src/main/kotlin/dev/dres/DRES.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ import java.nio.file.Paths
1818

1919
object DRES {
2020

21-
const val VERSION = "1.2.2"
21+
const val VERSION = "1.3.0"
2222

2323
/** Application root; shoud pe relative to JAR file or classes path. */
2424
val rootPath = File(FFmpegUtil::class.java.protectionDomain.codeSource.location.toURI()).toPath()

frontend/yarn.lock

Lines changed: 156 additions & 38 deletions
Original file line numberDiff line numberDiff line change
@@ -2964,7 +2964,7 @@ __metadata:
29642964
languageName: node
29652965
linkType: hard
29662966

2967-
"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.7":
2967+
"accepts@npm:~1.3.4, accepts@npm:~1.3.5, accepts@npm:~1.3.8":
29682968
version: 1.3.8
29692969
resolution: "accepts@npm:1.3.8"
29702970
dependencies:
@@ -3614,7 +3614,27 @@ __metadata:
36143614
languageName: node
36153615
linkType: hard
36163616

3617-
"body-parser@npm:1.19.1, body-parser@npm:^1.19.0":
3617+
"body-parser@npm:1.20.1":
3618+
version: 1.20.1
3619+
resolution: "body-parser@npm:1.20.1"
3620+
dependencies:
3621+
bytes: 3.1.2
3622+
content-type: ~1.0.4
3623+
debug: 2.6.9
3624+
depd: 2.0.0
3625+
destroy: 1.2.0
3626+
http-errors: 2.0.0
3627+
iconv-lite: 0.4.24
3628+
on-finished: 2.4.1
3629+
qs: 6.11.0
3630+
raw-body: 2.5.1
3631+
type-is: ~1.6.18
3632+
unpipe: 1.0.0
3633+
checksum: f1050dbac3bede6a78f0b87947a8d548ce43f91ccc718a50dd774f3c81f2d8b04693e52acf62659fad23101827dd318da1fb1363444ff9a8482b886a3e4a5266
3634+
languageName: node
3635+
linkType: hard
3636+
3637+
"body-parser@npm:^1.19.0":
36183638
version: 1.19.1
36193639
resolution: "body-parser@npm:1.19.1"
36203640
dependencies:
@@ -3741,6 +3761,13 @@ __metadata:
37413761
languageName: node
37423762
linkType: hard
37433763

3764+
"bytes@npm:3.1.2":
3765+
version: 3.1.2
3766+
resolution: "bytes@npm:3.1.2"
3767+
checksum: e4bcd3948d289c5127591fbedf10c0b639ccbf00243504e4e127374a15c3bc8eed0d28d4aaab08ff6f1cf2abc0cce6ba3085ed32f4f90e82a5683ce0014e1b6e
3768+
languageName: node
3769+
linkType: hard
3770+
37443771
"cacache@npm:15.3.0, cacache@npm:^15.0.5, cacache@npm:^15.2.0, cacache@npm:^15.3.0":
37453772
version: 15.3.0
37463773
resolution: "cacache@npm:15.3.0"
@@ -4229,10 +4256,10 @@ __metadata:
42294256
languageName: node
42304257
linkType: hard
42314258

4232-
"cookie@npm:0.4.1":
4233-
version: 0.4.1
4234-
resolution: "cookie@npm:0.4.1"
4235-
checksum: bd7c47f5d94ab70ccdfe8210cde7d725880d2fcda06d8e375afbdd82de0c8d3b73541996e9ce57d35f67f672c4ee6d60208adec06b3c5fc94cebb85196084cf8
4259+
"cookie@npm:0.5.0":
4260+
version: 0.5.0
4261+
resolution: "cookie@npm:0.5.0"
4262+
checksum: 1f4bd2ca5765f8c9689a7e8954183f5332139eb72b6ff783d8947032ec1fdf43109852c178e21a953a30c0dd42257828185be01b49d1eb1a67fd054ca588a180
42364263
languageName: node
42374264
linkType: hard
42384265

@@ -4645,6 +4672,13 @@ __metadata:
46454672
languageName: node
46464673
linkType: hard
46474674

4675+
"depd@npm:2.0.0":
4676+
version: 2.0.0
4677+
resolution: "depd@npm:2.0.0"
4678+
checksum: abbe19c768c97ee2eed6282d8ce3031126662252c58d711f646921c9623f9052e3e1906443066beec1095832f534e57c523b7333f8e7e0d93051ab6baef5ab3a
4679+
languageName: node
4680+
linkType: hard
4681+
46484682
"depd@npm:^1.1.2, depd@npm:~1.1.2":
46494683
version: 1.1.2
46504684
resolution: "depd@npm:1.1.2"
@@ -4659,10 +4693,10 @@ __metadata:
46594693
languageName: node
46604694
linkType: hard
46614695

4662-
"destroy@npm:~1.0.4":
4663-
version: 1.0.4
4664-
resolution: "destroy@npm:1.0.4"
4665-
checksum: da9ab4961dc61677c709da0c25ef01733042614453924d65636a7db37308fef8a24cd1e07172e61173d471ca175371295fbc984b0af5b2b4ff47cd57bd784c03
4696+
"destroy@npm:1.2.0":
4697+
version: 1.2.0
4698+
resolution: "destroy@npm:1.2.0"
4699+
checksum: 0acb300b7478a08b92d810ab229d5afe0d2f4399272045ab22affa0d99dbaf12637659411530a6fcd597a9bdac718fc94373a61a95b4651bbc7b83684a565e38
46664700
languageName: node
46674701
linkType: hard
46684702

@@ -5605,40 +5639,41 @@ __metadata:
56055639
linkType: hard
56065640

56075641
"express@npm:^4.17.1":
5608-
version: 4.17.2
5609-
resolution: "express@npm:4.17.2"
5642+
version: 4.18.2
5643+
resolution: "express@npm:4.18.2"
56105644
dependencies:
5611-
accepts: ~1.3.7
5645+
accepts: ~1.3.8
56125646
array-flatten: 1.1.1
5613-
body-parser: 1.19.1
5647+
body-parser: 1.20.1
56145648
content-disposition: 0.5.4
56155649
content-type: ~1.0.4
5616-
cookie: 0.4.1
5650+
cookie: 0.5.0
56175651
cookie-signature: 1.0.6
56185652
debug: 2.6.9
5619-
depd: ~1.1.2
5653+
depd: 2.0.0
56205654
encodeurl: ~1.0.2
56215655
escape-html: ~1.0.3
56225656
etag: ~1.8.1
5623-
finalhandler: ~1.1.2
5657+
finalhandler: 1.2.0
56245658
fresh: 0.5.2
5659+
http-errors: 2.0.0
56255660
merge-descriptors: 1.0.1
56265661
methods: ~1.1.2
5627-
on-finished: ~2.3.0
5662+
on-finished: 2.4.1
56285663
parseurl: ~1.3.3
56295664
path-to-regexp: 0.1.7
56305665
proxy-addr: ~2.0.7
5631-
qs: 6.9.6
5666+
qs: 6.11.0
56325667
range-parser: ~1.2.1
56335668
safe-buffer: 5.2.1
5634-
send: 0.17.2
5635-
serve-static: 1.14.2
5669+
send: 0.18.0
5670+
serve-static: 1.15.0
56365671
setprototypeof: 1.2.0
5637-
statuses: ~1.5.0
5672+
statuses: 2.0.1
56385673
type-is: ~1.6.18
56395674
utils-merge: 1.0.1
56405675
vary: ~1.1.2
5641-
checksum: 1535d56d20e65a1a39b5f056c025dd635290a744478ac69cc47633aeb4b2ce51458f8eb4080cfb7ba47c853ba5cfd794d404cff822a25127f1556b726ec3914a
5676+
checksum: 3c4b9b076879442f6b968fe53d85d9f1eeacbb4f4c41e5f16cc36d77ce39a2b0d81b3f250514982110d815b2f7173f5561367f9110fcc541f9371948e8c8b037
56425677
languageName: node
56435678
linkType: hard
56445679

@@ -5782,7 +5817,7 @@ __metadata:
57825817
languageName: node
57835818
linkType: hard
57845819

5785-
"finalhandler@npm:1.1.2, finalhandler@npm:~1.1.2":
5820+
"finalhandler@npm:1.1.2":
57865821
version: 1.1.2
57875822
resolution: "finalhandler@npm:1.1.2"
57885823
dependencies:
@@ -5797,6 +5832,21 @@ __metadata:
57975832
languageName: node
57985833
linkType: hard
57995834

5835+
"finalhandler@npm:1.2.0":
5836+
version: 1.2.0
5837+
resolution: "finalhandler@npm:1.2.0"
5838+
dependencies:
5839+
debug: 2.6.9
5840+
encodeurl: ~1.0.2
5841+
escape-html: ~1.0.3
5842+
on-finished: 2.4.1
5843+
parseurl: ~1.3.3
5844+
statuses: 2.0.1
5845+
unpipe: ~1.0.0
5846+
checksum: 92effbfd32e22a7dff2994acedbd9bcc3aa646a3e919ea6a53238090e87097f8ef07cced90aa2cc421abdf993aefbdd5b00104d55c7c5479a8d00ed105b45716
5847+
languageName: node
5848+
linkType: hard
5849+
58005850
"find-cache-dir@npm:^3.3.1":
58015851
version: 3.3.2
58025852
resolution: "find-cache-dir@npm:3.3.2"
@@ -6376,6 +6426,19 @@ __metadata:
63766426
languageName: node
63776427
linkType: hard
63786428

6429+
"http-errors@npm:2.0.0":
6430+
version: 2.0.0
6431+
resolution: "http-errors@npm:2.0.0"
6432+
dependencies:
6433+
depd: 2.0.0
6434+
inherits: 2.0.4
6435+
setprototypeof: 1.2.0
6436+
statuses: 2.0.1
6437+
toidentifier: 1.0.1
6438+
checksum: 9b0a3782665c52ce9dc658a0d1560bcb0214ba5699e4ea15aefb2a496e2ca83db03ebc42e1cce4ac1f413e4e0d2d736a3fd755772c556a9a06853ba2a0b7d920
6439+
languageName: node
6440+
linkType: hard
6441+
63796442
"http-errors@npm:~1.6.2":
63806443
version: 1.6.3
63816444
resolution: "http-errors@npm:1.6.3"
@@ -8541,6 +8604,13 @@ __metadata:
85418604
languageName: node
85428605
linkType: hard
85438606

8607+
"object-inspect@npm:^1.9.0":
8608+
version: 1.12.2
8609+
resolution: "object-inspect@npm:1.12.2"
8610+
checksum: a534fc1b8534284ed71f25ce3a496013b7ea030f3d1b77118f6b7b1713829262be9e6243acbcb3ef8c626e2b64186112cb7f6db74e37b2789b9c789ca23048b2
8611+
languageName: node
8612+
linkType: hard
8613+
85448614
"object-is@npm:^1.0.1":
85458615
version: 1.1.5
85468616
resolution: "object-is@npm:1.1.5"
@@ -8577,6 +8647,15 @@ __metadata:
85778647
languageName: node
85788648
linkType: hard
85798649

8650+
"on-finished@npm:2.4.1":
8651+
version: 2.4.1
8652+
resolution: "on-finished@npm:2.4.1"
8653+
dependencies:
8654+
ee-first: 1.1.1
8655+
checksum: d20929a25e7f0bb62f937a425b5edeb4e4cde0540d77ba146ec9357f00b0d497cdb3b9b05b9c8e46222407d1548d08166bff69cc56dfa55ba0e4469228920ff0
8656+
languageName: node
8657+
linkType: hard
8658+
85808659
"on-finished@npm:~2.3.0":
85818660
version: 2.3.0
85828661
resolution: "on-finished@npm:2.3.0"
@@ -9596,6 +9675,15 @@ __metadata:
95969675
languageName: node
95979676
linkType: hard
95989677

9678+
"qs@npm:6.11.0":
9679+
version: 6.11.0
9680+
resolution: "qs@npm:6.11.0"
9681+
dependencies:
9682+
side-channel: ^1.0.4
9683+
checksum: 6e1f29dd5385f7488ec74ac7b6c92f4d09a90408882d0c208414a34dd33badc1a621019d4c799a3df15ab9b1d0292f97c1dd71dc7c045e69f81a8064e5af7297
9684+
languageName: node
9685+
linkType: hard
9686+
95999687
"qs@npm:6.9.6":
96009688
version: 6.9.6
96019689
resolution: "qs@npm:6.9.6"
@@ -9652,6 +9740,18 @@ __metadata:
96529740
languageName: node
96539741
linkType: hard
96549742

9743+
"raw-body@npm:2.5.1":
9744+
version: 2.5.1
9745+
resolution: "raw-body@npm:2.5.1"
9746+
dependencies:
9747+
bytes: 3.1.2
9748+
http-errors: 2.0.0
9749+
iconv-lite: 0.4.24
9750+
unpipe: 1.0.0
9751+
checksum: 5362adff1575d691bb3f75998803a0ffed8c64eabeaa06e54b4ada25a0cd1b2ae7f4f5ec46565d1bec337e08b5ac90c76eaa0758de6f72a633f025d754dec29e
9752+
languageName: node
9753+
linkType: hard
9754+
96559755
"read-cache@npm:^1.0.0":
96569756
version: 1.0.0
96579757
resolution: "read-cache@npm:1.0.0"
@@ -10254,24 +10354,24 @@ __metadata:
1025410354
languageName: node
1025510355
linkType: hard
1025610356

10257-
"send@npm:0.17.2":
10258-
version: 0.17.2
10259-
resolution: "send@npm:0.17.2"
10357+
"send@npm:0.18.0":
10358+
version: 0.18.0
10359+
resolution: "send@npm:0.18.0"
1026010360
dependencies:
1026110361
debug: 2.6.9
10262-
depd: ~1.1.2
10263-
destroy: ~1.0.4
10362+
depd: 2.0.0
10363+
destroy: 1.2.0
1026410364
encodeurl: ~1.0.2
1026510365
escape-html: ~1.0.3
1026610366
etag: ~1.8.1
1026710367
fresh: 0.5.2
10268-
http-errors: 1.8.1
10368+
http-errors: 2.0.0
1026910369
mime: 1.6.0
1027010370
ms: 2.1.3
10271-
on-finished: ~2.3.0
10371+
on-finished: 2.4.1
1027210372
range-parser: ~1.2.1
10273-
statuses: ~1.5.0
10274-
checksum: c28f36deb4ccba9b8d6e6a1e472b8e7c40a1f51575bdf8f67303568cc9e71131faa3adc36fdb72611616ccad1584358bbe4c3ebf419e663ecc5de868ad3d3f03
10373+
statuses: 2.0.1
10374+
checksum: 74fc07ebb58566b87b078ec63e5a3e41ecd987e4272ba67b7467e86c6ad51bc6b0b0154133b6d8b08a2ddda360464f71382f7ef864700f34844a76c8027817a8
1027510375
languageName: node
1027610376
linkType: hard
1027710377

@@ -10299,15 +10399,15 @@ __metadata:
1029910399
languageName: node
1030010400
linkType: hard
1030110401

10302-
"serve-static@npm:1.14.2":
10303-
version: 1.14.2
10304-
resolution: "serve-static@npm:1.14.2"
10402+
"serve-static@npm:1.15.0":
10403+
version: 1.15.0
10404+
resolution: "serve-static@npm:1.15.0"
1030510405
dependencies:
1030610406
encodeurl: ~1.0.2
1030710407
escape-html: ~1.0.3
1030810408
parseurl: ~1.3.3
10309-
send: 0.17.2
10310-
checksum: d97f3183b1dfcd8ce9c0e37e18e87fd31147ed6c8ee0b2c3a089d795e44ee851ca5061db01574f806d54f4e4b70bc694d9ca64578653514e04a28cbc97a1de05
10409+
send: 0.18.0
10410+
checksum: af57fc13be40d90a12562e98c0b7855cf6e8bd4c107fe9a45c212bf023058d54a1871b1c89511c3958f70626fff47faeb795f5d83f8cf88514dbaeb2b724464d
1031110411
languageName: node
1031210412
linkType: hard
1031310413

@@ -10364,6 +10464,17 @@ __metadata:
1036410464
languageName: node
1036510465
linkType: hard
1036610466

10467+
"side-channel@npm:^1.0.4":
10468+
version: 1.0.4
10469+
resolution: "side-channel@npm:1.0.4"
10470+
dependencies:
10471+
call-bind: ^1.0.0
10472+
get-intrinsic: ^1.0.2
10473+
object-inspect: ^1.9.0
10474+
checksum: 351e41b947079c10bd0858364f32bb3a7379514c399edb64ab3dce683933483fc63fb5e4efe0a15a2e8a7e3c436b6a91736ddb8d8c6591b0460a24bb4a1ee245
10475+
languageName: node
10476+
linkType: hard
10477+
1036710478
"signal-exit@npm:^3.0.0, signal-exit@npm:^3.0.2, signal-exit@npm:^3.0.3, signal-exit@npm:^3.0.7":
1036810479
version: 3.0.7
1036910480
resolution: "signal-exit@npm:3.0.7"
@@ -10681,6 +10792,13 @@ __metadata:
1068110792
languageName: node
1068210793
linkType: hard
1068310794

10795+
"statuses@npm:2.0.1":
10796+
version: 2.0.1
10797+
resolution: "statuses@npm:2.0.1"
10798+
checksum: 18c7623fdb8f646fb213ca4051be4df7efb3484d4ab662937ca6fbef7ced9b9e12842709872eb3020cc3504b93bde88935c9f6417489627a7786f24f8031cbcb
10799+
languageName: node
10800+
linkType: hard
10801+
1068410802
"statuses@npm:>= 1.4.0 < 2, statuses@npm:>= 1.5.0 < 2, statuses@npm:~1.5.0":
1068510803
version: 1.5.0
1068610804
resolution: "statuses@npm:1.5.0"

0 commit comments

Comments
 (0)