Merge branch '1.23.X' into 1.23.X-merge-to-2.X.X-2

# Conflicts:
#	docker/debian-base.dockerfile
This commit is contained in:
Louis Lam
2023-12-01 15:50:35 +08:00
13 changed files with 77 additions and 34 deletions

17
package-lock.json generated
View File

@@ -32,7 +32,7 @@
"express-basic-auth": "~1.2.1",
"express-static-gzip": "~2.1.7",
"form-data": "~4.0.0",
"gamedig": "~4.1.0",
"gamedig": "^4.2.0",
"html-escaper": "^3.0.3",
"http-graceful-shutdown": "~3.1.7",
"http-proxy-agent": "~5.0.0",
@@ -65,6 +65,7 @@
"playwright-core": "~1.35.1",
"prom-client": "~13.2.0",
"prometheus-api-metrics": "~3.2.1",
"promisify-child-process": "~4.1.2",
"protobufjs": "~7.2.4",
"qs": "~6.10.4",
"redbean-node": "~0.3.0",
@@ -8529,9 +8530,9 @@
}
},
"node_modules/gamedig": {
"version": "4.1.0",
"resolved": "https://registry.npmjs.org/gamedig/-/gamedig-4.1.0.tgz",
"integrity": "sha512-jvLUEakihJgpiw9t9yQRsbcemeALeTNlnaWY1gvYdwI63ZlkxznTaLqX5K/eluRTTCtAWNW3YceT6NVjyAZIwA==",
"version": "4.2.0",
"resolved": "https://registry.npmjs.org/gamedig/-/gamedig-4.2.0.tgz",
"integrity": "sha512-UwV9gT1PrOTxjwGzj9/i8XJLx9QqmzFtrRJnRLqN7fZWEIRHjbuUpx2b6Y3v/5QyRDFP+vaB3Pm0hw3Xg4RnOQ==",
"dependencies": {
"cheerio": "^1.0.0-rc.10",
"gbxremote": "^0.2.1",
@@ -12943,6 +12944,14 @@
"node": ">=10"
}
},
"node_modules/promisify-child-process": {
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/promisify-child-process/-/promisify-child-process-4.1.2.tgz",
"integrity": "sha512-APnkIgmaHNJpkAn7k+CrJSi9WMuff5ctYFbD0CO2XIPkM8yO7d/ShouU2clywbpHV/DUsyc4bpJCsNgddNtx4g==",
"engines": {
"node": ">=8"
}
},
"node_modules/prompts": {
"version": "2.4.2",
"resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",