Merge branch 'release' into staging

b6a480b3290a0fd78c9b4fb337fb9d1519fe48e2

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

Parents: 43f182430973d55314aeed4b20eb37b02ade2a70 52a08603209d8b45999729b97a4f0e6dd3509300
8 files changed, +112 -101Ignore whitespace
Dockerfile+1 -1
@@ -17,7 +17,7 @@ COPY . ./
1717
1818RUN \
1919 echo "*** Install npm packages ***" && \
2020 npm ici --no-audit --no-fund --loglevel=error --no-progress --omit=dev && npm cache clean --force
2121
2222# Create config directory and link config.yaml
2323RUN \
Start.bat+1 -1
@@ -1,7 +1,7 @@
11@echo off
22pushd %~dp0
33set NODE_ENV=production
44call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
55node server.js %*
66pause
77popd
UpdateAndStart.bat+1 -1
@@ -20,7 +20,7 @@ if %errorlevel% neq 0 (
2020 )
2121)
2222set NODE_ENV=production
2323call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
2424node server.js %*
2525:end
2626pause
UpdateForkAndStart.bat+1 -1
@@ -102,7 +102,7 @@ if %errorlevel% neq 0 (
102102
103103echo Installing npm packages and starting server
104104set NODE_ENV=production
105105call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
106106node server.js %*
107107
108108:end
package-lock.json+105 -94
@@ -3255,36 +3255,33 @@
32553255 "node": ">=8"
32563256 }
32573257 },
32583258 "node_modules/call-bind-apply-helpers": {
32593259 "version": "1.0.72",
32603260 "resolved": "https://registry.npmjs.org/call-bind-apply-helpers/-/call-bind-apply-helpers-1.0.72.tgz",
32613261 "integrity": "sha512-GHTSNSYICQ7scH7sZ+M2rFopRoLh8t2bLSW6BbgrtLsahOIB5iyAVJf9GjWK3cYTDaMj4XdBpM1cA6pIS0Kv2wSp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b/KwFe21cMpmHtPOSij8K99/wSfoEuTObmuMQ==",
32623262 "license": "MIT",
32633263 "dependencies": {
3264- "es-define-property": "^1.0.0",
32653264 "es-errors": "^1.3.0",
32663265 "function-bind": "^1.1.2",
3267- "get-intrinsic": "^1.2.4",
3268- "set-function-length": "^1.2.1"
32693266 },
32703267 "engines": {
32713268 "node": ">= 0.4"
3272- },
3273- "funding": {
3274- "url": "https://github.com/sponsors/ljharb"
32753269 }
32763270 },
32773271 "node_modules/call-bind-apply-helpersbound": {
32783272 "version": "1.0.24",
32793273 "resolved": "https://registry.npmjs.org/call-bind-apply-helpersbound/-/call-bind-apply-helpersbound-1.0.24.tgz",
32803274 "integrity": "sha512-Sp1ablJ0ivDkSzjcaJdxEunN5/XvksFJ2sMBFfq6x0ryhQV/2b+ys997U96po4Kx/KwFe21cMpmHtPOSij8K99ABpBCqhA9EuxJaQWDQg7295H4hBphv3IZg0boBKuwYpt4YXp6MZ5AmZQnU/wSfoEuTObmuMQtyMTlRpaSejg==",
32813275 "license": "MIT",
32823276 "dependencies": {
32833277 "escall-errorsbind-apply-helpers": "^1.3.0.2",
32843278 "functionget-bindintrinsic": "^1.13.20"
32853279 },
32863280 "engines": {
32873281 "node": ">= 0.4"
3282+ },
3283+ "funding": {
3284+ "url": "https://github.com/sponsors/ljharb"
32883285 }
32893286 },
32903287 "node_modules/callsites": {
@@ -4019,23 +4016,6 @@
40194016 "node": ">=10"
40204017 }
40214018 },
4022- "node_modules/define-data-property": {
4023- "version": "1.1.4",
4024- "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
4025- "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
4026- "license": "MIT",
4027- "dependencies": {
4028- "es-define-property": "^1.0.0",
4029- "es-errors": "^1.3.0",
4030- "gopd": "^1.0.1"
4031- },
4032- "engines": {
4033- "node": ">= 0.4"
4034- },
4035- "funding": {
4036- "url": "https://github.com/sponsors/ljharb"
4037- }
4038- },
40394019 "node_modules/define-lazy-prop": {
40404020 "version": "3.0.0",
40414021 "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-3.0.0.tgz",
@@ -4793,39 +4773,39 @@
47934773 "integrity": "sha512-c2bQfLNbMzLPmzQuOr8fy0csy84WmwnER81W88DzTp9CYNPJ6yzOj2EZAh9pywYpqHnshVLHQJ8WzldAyfY+Iw=="
47944774 },
47954775 "node_modules/express": {
47964776 "version": "4.2122.21",
47974777 "resolved": "https://registry.npmjs.org/express/-/express-4.2122.21.tgz",
47984778 "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfHF2X8g9P1X7uCPZMA3MVf9wcTqlyNp7IhH5qPCI0izhaOIYXaW9L535tGA3qmjRzpH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnAbZczqq7hVKxTR4NWnu+g==",
47994779 "license": "MIT",
48004780 "dependencies": {
48014781 "accepts": "~1.3.8",
48024782 "array-flatten": "1.1.1",
48034783 "body-parser": "~1.20.3",
48044784 "content-disposition": "~0.5.4",
48054785 "content-type": "~1.0.4",
48064786 "cookie": "~0.7.1",
48074787 "cookie-signature": "~1.0.6",
48084788 "debug": "2.6.9",
48094789 "depd": "2.0.0",
48104790 "encodeurl": "~2.0.0",
48114791 "escape-html": "~1.0.3",
48124792 "etag": "~1.8.1",
48134793 "finalhandler": "~1.3.1",
48144794 "fresh": "~0.5.2",
48154795 "http-errors": "~2.0.0",
48164796 "merge-descriptors": "1.0.3",
48174797 "methods": "~1.1.2",
48184798 "on-finished": "~2.4.1",
48194799 "parseurl": "~1.3.3",
48204800 "path-to-regexp": "~0.1.12",
48214801 "proxy-addr": "~2.0.7",
48224802 "qs": "~6.1314.0",
48234803 "range-parser": "~1.2.1",
48244804 "safe-buffer": "5.2.1",
48254805 "send": "~0.19.0",
48264806 "serve-static": "~1.16.2",
48274807 "setprototypeof": "1.2.0",
48284808 "statuses": "~2.0.1",
48294809 "type-is": "~1.6.18",
48304810 "utils-merge": "1.0.1",
48314811 "vary": "~1.1.2"
@@ -4838,13 +4818,19 @@
48384818 "url": "https://opencollective.com/express"
48394819 }
48404820 },
48414821 "node_modules/express/node_modules/cookieqs": {
48424822 "version": "06.714.10",
48434823 "resolved": "https://registry.npmjs.org/cookieqs/-/cookieqs-06.714.10.tgz",
48444824 "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZwYWWTjgABSKcvs/nX51bHt6YQl8jsGo4ynWBi9PycY/0wJiPJqOD4JA6o9Sej2AtvSGarXxKC3OQSk4pAarbdQlKAh5D4FCQkJNkW+GAn3w==",
48454825 "license": "MITBSD-3-Clause",
4826+ "dependencies": {
4827+ "side-channel": "^1.1.0"
4828+ },
48464829 "engines": {
48474830 "node": ">= 0.6"
4831+ },
4832+ "funding": {
4833+ "url": "https://github.com/sponsors/ljharb"
48484834 }
48494835 },
48504836 "node_modules/express/node_modules/safe-buffer": {
@@ -5514,18 +5500,6 @@
55145500 "node": ">=8"
55155501 }
55165502 },
5517- "node_modules/has-property-descriptors": {
5518- "version": "1.0.2",
5519- "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
5520- "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
5521- "license": "MIT",
5522- "dependencies": {
5523- "es-define-property": "^1.0.0"
5524- },
5525- "funding": {
5526- "url": "https://github.com/sponsors/ljharb"
5527- }
5528- },
55295503 "node_modules/has-symbols": {
55305504 "version": "1.1.0",
55315505 "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
@@ -6738,9 +6712,9 @@
67386712 }
67396713 },
67406714 "node_modules/object-inspect": {
67416715 "version": "1.13.24",
67426716 "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.24.tgz",
67436717 "integrity": "sha512-IRZSRuzJiynemAXPYtPe5BoI/RESNYR7TYm50MC5Mqbd3Jmw5y790sErYw3V6SryFJD64b74qQQs9wn5Bg/k3gW67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
67446718 "license": "MIT",
67456719 "engines": {
67466720 "node": ">= 0.4"
@@ -7875,23 +7849,6 @@
78757849 "node": ">= 0.8.0"
78767850 }
78777851 },
7878- "node_modules/set-function-length": {
7879- "version": "1.2.2",
7880- "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
7881- "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
7882- "license": "MIT",
7883- "dependencies": {
7884- "define-data-property": "^1.1.4",
7885- "es-errors": "^1.3.0",
7886- "function-bind": "^1.1.2",
7887- "get-intrinsic": "^1.2.4",
7888- "gopd": "^1.0.1",
7889- "has-property-descriptors": "^1.0.2"
7890- },
7891- "engines": {
7892- "node": ">= 0.4"
7893- }
7894- },
78957852 "node_modules/setprototypeof": {
78967853 "version": "1.2.0",
78977854 "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.2.0.tgz",
@@ -7945,15 +7902,69 @@
79457902 }
79467903 },
79477904 "node_modules/side-channel": {
79487905 "version": "1.01.60",
79497906 "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.01.60.tgz",
79507907 "integrity": "sha512-fDW/EZ6Q9RiO8eFG8HjZX99e6tRweoUXqR+7uVBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/oW+XrPTIChwCOM2+th2A6OblDtYYIpve9m+KvI9Z4C9qSEXlaGR6bTEYHReuglAxbKn6hqfPRHujUNwz5fy/wbbhnpw==",
7908+ "license": "MIT",
7909+ "dependencies": {
7910+ "es-errors": "^1.3.0",
7911+ "object-inspect": "^1.13.3",
7912+ "side-channel-list": "^1.0.0",
7913+ "side-channel-map": "^1.0.1",
7914+ "side-channel-weakmap": "^1.0.2"
7915+ },
7916+ "engines": {
7917+ "node": ">= 0.4"
7918+ },
7919+ "funding": {
7920+ "url": "https://github.com/sponsors/ljharb"
7921+ }
7922+ },
7923+ "node_modules/side-channel-list": {
7924+ "version": "1.0.0",
7925+ "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
7926+ "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
7927+ "license": "MIT",
7928+ "dependencies": {
7929+ "es-errors": "^1.3.0",
7930+ "object-inspect": "^1.13.3"
7931+ },
7932+ "engines": {
7933+ "node": ">= 0.4"
7934+ },
7935+ "funding": {
7936+ "url": "https://github.com/sponsors/ljharb"
7937+ }
7938+ },
7939+ "node_modules/side-channel-map": {
7940+ "version": "1.0.1",
7941+ "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
7942+ "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
7943+ "license": "MIT",
7944+ "dependencies": {
7945+ "call-bound": "^1.0.2",
7946+ "es-errors": "^1.3.0",
7947+ "get-intrinsic": "^1.2.5",
7948+ "object-inspect": "^1.13.3"
7949+ },
7950+ "engines": {
7951+ "node": ">= 0.4"
7952+ },
7953+ "funding": {
7954+ "url": "https://github.com/sponsors/ljharb"
7955+ }
7956+ },
7957+ "node_modules/side-channel-weakmap": {
7958+ "version": "1.0.2",
7959+ "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
7960+ "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
79517961 "license": "MIT",
79527962 "dependencies": {
79537963 "call-bindbound": "^1.0.72",
79547964 "es-errors": "^1.3.0",
79557965 "get-intrinsic": "^1.2.45",
79567966 "object-inspect": "^1.13.13",
7967+ "side-channel-map": "^1.0.1"
79577968 },
79587969 "engines": {
79597970 "node": ">= 0.4"
src/electron/Start.bat+1 -1
@@ -1,6 +1,6 @@
11@echo off
22pushd %~dp0
33call npm install --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
44npm run start server.js %*
55pause
66popd
src/electron/start.sh+1 -1
@@ -5,7 +5,7 @@ cd "$(dirname "$0")"
55
66echo "Assuming nodejs and npm is already installed. If you haven't installed them already, do so now"
77echo "Installing Electron Wrapper's Node Modules..."
88npm i --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
99
1010echo "Starting Electron Wrapper..."
1111npm run start -- "$@"
start.sh+1 -1
@@ -10,7 +10,7 @@ fi
1010
1111echo "Installing Node Modules..."
1212export NODE_ENV=production
1313npm i --no-save --no-audit --no-fund --loglevel=error --no-progress --omit=dev
1414
1515echo "Entering SillyTavern..."
1616node "server.js" "$@"