Skip to content

Commit

Permalink
Merge branch 'master' into snyk-fix-5627fd4631314545992a084be08e4e0c
Browse files Browse the repository at this point in the history
  • Loading branch information
maksxpl authored Jan 13, 2024
2 parents bec0dda + 42e159f commit 11d9879
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 16 deletions.
2 changes: 1 addition & 1 deletion tgui/packages/tgui-dev-server/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
"version": "4.3.0",
"type": "module",
"dependencies": {
"axios": "^0.21.1",
"axios": "^0.21.2",
"glob": "^7.1.7",
"source-map": "^0.7.3",
"stacktrace-parser": "^0.1.10",
Expand Down
28 changes: 14 additions & 14 deletions tgui/yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2473,12 +2473,12 @@ __metadata:
languageName: node
linkType: hard

"axios@npm:^0.21.1":
version: 0.21.1
resolution: "axios@npm:0.21.1"
"axios@npm:^0.21.2":
version: 0.21.4
resolution: "axios@npm:0.21.4"
dependencies:
follow-redirects: ^1.10.0
checksum: c87915fa0b18c15c63350112b6b3563a3e2ae524d7707de0a73d2e065e0d30c5d3da8563037bc29d4cc1b7424b5a350cb7274fa52525c6c04a615fe561c6ab11
follow-redirects: ^1.14.0
checksum: 44245f24ac971e7458f3120c92f9d66d1fc695e8b97019139de5b0cc65d9b8104647db01e5f46917728edfc0cfd88eb30fc4c55e6053eef4ace76768ce95ff3c
languageName: node
linkType: hard

Expand Down Expand Up @@ -4032,7 +4032,7 @@ __metadata:
languageName: node
linkType: hard

"follow-redirects@npm:^1.10.0":
"follow-redirects@npm:^1.14.0":
version: 1.15.2
resolution: "follow-redirects@npm:1.15.2"
peerDependenciesMeta:
Expand Down Expand Up @@ -7046,11 +7046,11 @@ resolve@^2.0.0-next.3:
linkType: hard

"semver@npm:^6.0.0, semver@npm:^6.1.1, semver@npm:^6.1.2, semver@npm:^6.3.0":
version: 6.3.0
resolution: "semver@npm:6.3.0"
version: 6.3.1
resolution: "semver@npm:6.3.1"
bin:
semver: ./bin/semver.js
checksum: 1b26ecf6db9e8292dd90df4e781d91875c0dcc1b1909e70f5d12959a23c7eebb8f01ea581c00783bbee72ceeaad9505797c381756326073850dc36ed284b21b9
semver: bin/semver.js
checksum: ae47d06de28836adb9d3e25f22a92943477371292d9b665fb023fae278d345d508ca1958232af086d85e0155aee22e313e100971898bbb8d5d89b8b1d4054ca2
languageName: node
linkType: hard

Expand Down Expand Up @@ -7675,7 +7675,7 @@ resolve@^2.0.0-next.3:
version: 0.0.0-use.local
resolution: "tgui-dev-server@workspace:packages/tgui-dev-server"
dependencies:
axios: ^0.21.1
axios: ^0.21.2
glob: ^7.1.7
source-map: ^0.7.3
stacktrace-parser: ^0.1.10
Expand Down Expand Up @@ -8439,9 +8439,9 @@ typescript@^4.3.5:
linkType: hard

"word-wrap@npm:^1.2.3, word-wrap@npm:~1.2.3":
version: 1.2.3
resolution: "word-wrap@npm:1.2.3"
checksum: 30b48f91fcf12106ed3186ae4fa86a6a1842416df425be7b60485de14bec665a54a68e4b5156647dec3a70f25e84d270ca8bc8cd23182ed095f5c7206a938c1f
version: 1.2.4
resolution: "word-wrap@npm:1.2.4"
checksum: 8f1f2e0a397c0e074ca225ba9f67baa23f99293bc064e31355d426ae91b8b3f6b5f6c1fc9ae5e9141178bb362d563f55e62fd8d5c31f2a77e3ade56cb3e35bd1
languageName: node
linkType: hard

Expand Down
2 changes: 1 addition & 1 deletion tools/requirements.txt
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
pygit2==1.0.1
bidict==0.13.1
Pillow==10.0.0
Pillow==10.0.1

# changelogs
PyYaml==5.4
Expand Down

0 comments on commit 11d9879

Please sign in to comment.