Merge branch 'master' into mapjam-mapjam-mapjam-mapjam-mapjam-mapjam-…

…mapjam-mapjam-mapjam-mapjam-mapjam-mapjam-mapjam-gyatt-dang-i-love-jam
cmss13-devs · Dec 14, 2024 · 10be22b · 10be22b
2 parents 8ff827d + 9d3d435
commit 10be22b
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 66 deletions.
diff --git a/tgui/packages/tgui-dev-server/package.json b/tgui/packages/tgui-dev-server/package.json
@@ -8,6 +8,6 @@
     "glob": "^7.2.3",
     "source-map": "^0.7.4",
     "stacktrace-parser": "^0.1.10",
-    "ws": "^8.16.0"
+    "ws": "^8.17.1"
   }
 }
diff --git a/tgui/packages/tgui-panel/package.json b/tgui/packages/tgui-panel/package.json
@@ -6,7 +6,7 @@
     "@types/node": "^20.12.3",
     "@types/react": "^18.2.74",
     "common": "workspace:*",
-    "dompurify": "^2.4.9",
+    "dompurify": "^2.5.4",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "tgui": "workspace:*",

diff --git a/tgui/packages/tgui/package.json b/tgui/packages/tgui/package.json
@@ -8,7 +8,7 @@
     "@types/react": "^18.2.74",
     "common": "workspace:*",
     "dateformat": "^4.6.3",
-    "dompurify": "^2.4.9",
+    "dompurify": "^2.5.4",
     "highlight.js": "^11.9.0",
     "jest": "^29.7.0",
     "js-yaml": "^4.1.0",

diff --git a/tgui/yarn.lock b/tgui/yarn.lock
@@ -2840,13 +2840,13 @@ __metadata:
   linkType: hard
 
 "cross-spawn@npm:^7.0.0, cross-spawn@npm:^7.0.2, cross-spawn@npm:^7.0.3":
-  version: 7.0.3
-  resolution: "cross-spawn@npm:7.0.3"
+  version: 7.0.6
+  resolution: "cross-spawn@npm:7.0.6"
   dependencies:
     path-key: "npm:^3.1.0"
     shebang-command: "npm:^2.0.0"
     which: "npm:^2.0.1"
-  checksum: 10c0/5738c312387081c98d69c98e105b6327b069197f864a60593245d64c8089c8a0a744e16349281210d56835bb9274130d825a78b2ad6853ca13cfbeffc0c31750
+  checksum: 10c0/053ea8b2135caff68a9e81470e845613e374e7309a47731e81639de3eaeb90c3d01af0e0b44d2ab9d50b43467223b88567dfeb3262db942dc063b9976718ffc1
   languageName: node
   linkType: hard
 
@@ -3146,10 +3146,10 @@ __metadata:
   languageName: node
   linkType: hard
 
-"dompurify@npm:^2.4.9":
-  version: 2.4.9
-  resolution: "dompurify@npm:2.4.9"
-  checksum: 10c0/cb847f5eacd9ff326dfc4566875709d050dc78c58837cc3afb83386992f6e7002295358cb9f75d66a9b638fe6da71b7d02ffa82f121713f78f7f3891394dece8
+"dompurify@npm:^2.5.4":
+  version: 2.5.8
+  resolution: "dompurify@npm:2.5.8"
+  checksum: 10c0/4101708d190b67be00350369d72619266a2e0ebb7dcab12628cf07711329b1df12239baea613df41b65cba571128e8ea4c29c442f4e2c98670a9bb5563521f03
   languageName: node
   linkType: hard
 
@@ -8289,7 +8289,7 @@ __metadata:
     glob: "npm:^7.2.3"
     source-map: "npm:^0.7.4"
     stacktrace-parser: "npm:^0.1.10"
-    ws: "npm:^8.16.0"
+    ws: "npm:^8.17.1"
   languageName: unknown
   linkType: soft
 
@@ -8300,7 +8300,7 @@ __metadata:
     "@types/node": "npm:^20.12.3"
     "@types/react": "npm:^18.2.74"
     common: "workspace:*"
-    dompurify: "npm:^2.4.9"
+    dompurify: "npm:^2.5.4"
     react: "npm:^18.2.0"
     react-dom: "npm:^18.2.0"
     tgui: "workspace:*"
@@ -8381,7 +8381,7 @@ __metadata:
     "@types/react": "npm:^18.2.74"
     common: "workspace:*"
     dateformat: "npm:^4.6.3"
-    dompurify: "npm:^2.4.9"
+    dompurify: "npm:^2.5.4"
     highlight.js: "npm:^11.9.0"
     jest: "npm:^29.7.0"
     js-yaml: "npm:^4.1.0"
@@ -9181,7 +9181,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"ws@npm:^8.11.0, ws@npm:^8.13.0, ws@npm:^8.16.0":
+"ws@npm:^8.11.0, ws@npm:^8.13.0":
   version: 8.16.0
   resolution: "ws@npm:8.16.0"
   peerDependencies:
@@ -9196,6 +9196,21 @@ __metadata:
   languageName: node
   linkType: hard
 
+"ws@npm:^8.17.1":
+  version: 8.18.0
+  resolution: "ws@npm:8.18.0"
+  peerDependencies:
+    bufferutil: ^4.0.1
+    utf-8-validate: ">=5.0.2"
+  peerDependenciesMeta:
+    bufferutil:
+      optional: true
+    utf-8-validate:
+      optional: true
+  checksum: 10c0/25eb33aff17edcb90721ed6b0eb250976328533ad3cd1a28a274bd263682e7296a6591ff1436d6cbc50fa67463158b062f9d1122013b361cec99a05f84680e06
+  languageName: node
+  linkType: hard
+
 "xml-name-validator@npm:^4.0.0":
   version: 4.0.0
   resolution: "xml-name-validator@npm:4.0.0"

diff --git a/tools/autowiki/package-lock.json b/tools/autowiki/package-lock.json
diff --git a/tools/autowiki/package.json b/tools/autowiki/package.json
@@ -5,6 +5,6 @@
 	"main": "autowiki.js",
 	"author": "Mothblocks",
 	"dependencies": {
-		"mwbot": "^2.0.0"
+		"mwbot": "^2.1.3"
 	}
 }
diff --git a/tools/requirements.txt b/tools/requirements.txt
@@ -1,6 +1,6 @@
 pygit2==1.7.2
 bidict==0.22.0
-Pillow==9.3.0
+Pillow==10.3.0
 
 # changelogs
 PyYaml==6.0.1