Merge branch 'release' into staging

4ab4fca89dc56e26e7573cc9d56166c7022c80bf

Cohee <18619528+Cohee1207@users.noreply.github.com>

Parents: 645b8063e1e2c623852f8bda4c05cb546e9a870d 30e66f0ea0a8af256bff328349f9f95fc947d018
4 files changed, +10 -8Ignore whitespace
.dockerignore+1 -0
@@ -11,6 +11,7 @@
11/docker/extensions11/docker/extensions
12/docker/data12/docker/data
13/docker/plugins13/docker/plugins
14/docker/dist
14/public/scripts/extensions/third-party15/public/scripts/extensions/third-party
1516
16# --- Plugins (keep only package files) ---17# --- Plugins (keep only package files) ---
.gitignore+1 -0
@@ -26,6 +26,7 @@ public/stats.json
26/docker/user26/docker/user
27/docker/extensions27/docker/extensions
28/docker/data28/docker/data
29/docker/dist
29.DS_Store30.DS_Store
30public/settings.json31public/settings.json
31/thumbnails32/thumbnails
package-lock.json+7 -7
@@ -103,7 +103,7 @@
103 "ws": "^8.18.3",103 "ws": "^8.18.3",
104 "yaml": "^2.8.1",104 "yaml": "^2.8.1",
105 "yargs": "^17.7.1",105 "yargs": "^17.7.1",
106 "yauzl": "^3.2.0"106 "yauzl": "^3.2.1"
107 },107 },
108 "bin": {108 "bin": {
109 "sillytavern": "src/server-global.js"109 "sillytavern": "src/server-global.js"
@@ -5190,9 +5190,9 @@
5190 "license": "SEE LICENSE IN LICENSE.txt"5190 "license": "SEE LICENSE IN LICENSE.txt"
5191 },5191 },
5192 "node_modules/flatted": {5192 "node_modules/flatted": {
5193 "version": "3.2.9",5193 "version": "3.4.1",
5194 "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.2.9.tgz",5194 "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.4.1.tgz",
5195 "integrity": "sha512-36yxDn5H7OFZQla0/jFJmbIKTdZAQHngCedGxiMmpNfEZM0sdEeT+WczLQrjK6D7o2aiyLYDnkw0R3JK0Qv1RQ==",5195 "integrity": "sha512-IxfVbRFVlV8V/yRaGzk0UVIcsKKHMSfYw66T/u4nTwlWteQePsxe//LjudR1AMX4tZW3WFCh3Zqa/sjlqpbURQ==",
5196 "dev": true,5196 "dev": true,
5197 "license": "ISC"5197 "license": "ISC"
5198 },5198 },
@@ -9681,9 +9681,9 @@
9681 }9681 }
9682 },9682 },
9683 "node_modules/yauzl": {9683 "node_modules/yauzl": {
9684 "version": "3.2.0",9684 "version": "3.2.1",
9685 "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.0.tgz",9685 "resolved": "https://registry.npmjs.org/yauzl/-/yauzl-3.2.1.tgz",
9686 "integrity": "sha512-Ow9nuGZE+qp1u4JIPvg+uCiUr7xGQWdff7JQSk5VGYTAZMDe2q8lxJ10ygv10qmSj031Ty/6FNJpLO4o1Sgc+w==",9686 "integrity": "sha512-k1isifdbpNSFEHFJ1ZY4YDewv0IH9FR61lDetaRMD3j2ae3bIXGV+7c+LHCqtQGofSd8PIyV4X6+dHMAnSr60A==",
9687 "license": "MIT",9687 "license": "MIT",
9688 "dependencies": {9688 "dependencies": {
9689 "buffer-crc32": "~0.2.3",9689 "buffer-crc32": "~0.2.3",
package.json+1 -1
@@ -93,7 +93,7 @@
93 "ws": "^8.18.3",93 "ws": "^8.18.3",
94 "yaml": "^2.8.1",94 "yaml": "^2.8.1",
95 "yargs": "^17.7.1",95 "yargs": "^17.7.1",
96 "yauzl": "^3.2.0"96 "yauzl": "^3.2.1"
97 },97 },
98 "engines": {98 "engines": {
99 "node": ">= 20"99 "node": ">= 20"