Merge branch 'main' into new-admin
This commit is contained in:
commit
4295368e2b
12
package.json
12
package.json
|
@ -43,8 +43,8 @@
|
||||||
"glob": "^8.0.3",
|
"glob": "^8.0.3",
|
||||||
"graceful-fs": "^4.2.9",
|
"graceful-fs": "^4.2.9",
|
||||||
"html-to-text": "^8.2.1",
|
"html-to-text": "^8.2.1",
|
||||||
"http-auth": "^4.1.9",
|
"http-auth": "^4.2.0",
|
||||||
"http-auth-connect": "^1.0.5",
|
"http-auth-connect": "^1.0.6",
|
||||||
"http-errors": "^2.0.0",
|
"http-errors": "^2.0.0",
|
||||||
"lodash": "^4.17.21",
|
"lodash": "^4.17.21",
|
||||||
"moment": "^2.29.4",
|
"moment": "^2.29.4",
|
||||||
|
@ -72,12 +72,12 @@
|
||||||
"@types/html-to-text": "^8.1.1",
|
"@types/html-to-text": "^8.1.1",
|
||||||
"@types/jest": "^29.0.3",
|
"@types/jest": "^29.0.3",
|
||||||
"@types/lodash": "^4.14.185",
|
"@types/lodash": "^4.14.185",
|
||||||
"@types/node": "^18.7.18",
|
"@types/node": "^18.7.23",
|
||||||
"@types/node-cron": "^3.0.4",
|
"@types/node-cron": "^3.0.4",
|
||||||
"@types/nodemailer": "^6.4.6",
|
"@types/nodemailer": "^6.4.6",
|
||||||
"@types/request": "^2.48.8",
|
"@types/request": "^2.48.8",
|
||||||
"@vue/eslint-config-prettier": "^7.0.0",
|
"@vue/eslint-config-prettier": "^7.0.0",
|
||||||
"@vue/eslint-config-typescript": "^11.0.1",
|
"@vue/eslint-config-typescript": "^11.0.2",
|
||||||
"bower": "^1.8.13",
|
"bower": "^1.8.13",
|
||||||
"escape-string-regexp": "^5.0.0",
|
"escape-string-regexp": "^5.0.0",
|
||||||
"eslint": "^8.22.0",
|
"eslint": "^8.22.0",
|
||||||
|
@ -107,9 +107,9 @@
|
||||||
"load-grunt-tasks": "^5.1.0",
|
"load-grunt-tasks": "^5.1.0",
|
||||||
"prettier": "^2.7.1",
|
"prettier": "^2.7.1",
|
||||||
"time-grunt": "^2.0.0",
|
"time-grunt": "^2.0.0",
|
||||||
"ts-jest": "^29.0.1",
|
"ts-jest": "^29.0.2",
|
||||||
"typescript": "^4.8.3",
|
"typescript": "^4.8.3",
|
||||||
"yarn-audit-fix": "^9.3.5"
|
"yarn-audit-fix": "^9.3.6"
|
||||||
},
|
},
|
||||||
"resolutions": {
|
"resolutions": {
|
||||||
"grunt-connect-proxy/**/http-proxy": "~1.18.1",
|
"grunt-connect-proxy/**/http-proxy": "~1.18.1",
|
||||||
|
|
66
yarn.lock
66
yarn.lock
|
@ -1009,10 +1009,10 @@
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-17.0.34.tgz#3b0b6a50ff797280b8d000c6281d229f9c538cef"
|
||||||
integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA==
|
integrity sha512-XImEz7XwTvDBtzlTnm8YvMqGW/ErMWBsKZ+hMTvnDIjGCKxwK5Xpc+c/oQjOauwq8M4OS11hEkpjX8rrI/eEgA==
|
||||||
|
|
||||||
"@types/node@^18.7.18":
|
"@types/node@^18.7.23":
|
||||||
version "18.7.18"
|
version "18.7.23"
|
||||||
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.18.tgz#633184f55c322e4fb08612307c274ee6d5ed3154"
|
resolved "https://registry.yarnpkg.com/@types/node/-/node-18.7.23.tgz#75c580983846181ebe5f4abc40fe9dfb2d65665f"
|
||||||
integrity sha512-m+6nTEOadJZuTPkKR/SYK3A2d7FZrgElol9UP1Kae90VVU4a6mxnPuLiIW1m4Cq4gZ/nWb9GrdVXJCoCazDAbg==
|
integrity sha512-DWNcCHolDq0ZKGizjx2DZjR/PqsYwAcYUJmfMWqtVU2MBMG5Mo+xFZrhGId5r/O5HOuMPyQEcM6KUBp5lBZZBg==
|
||||||
|
|
||||||
"@types/nodemailer@^6.4.6":
|
"@types/nodemailer@^6.4.6":
|
||||||
version "6.4.6"
|
version "6.4.6"
|
||||||
|
@ -1046,7 +1046,7 @@
|
||||||
"@types/tough-cookie" "*"
|
"@types/tough-cookie" "*"
|
||||||
form-data "^2.5.0"
|
form-data "^2.5.0"
|
||||||
|
|
||||||
"@types/semver@^7.3.11":
|
"@types/semver@^7.3.12":
|
||||||
version "7.3.12"
|
version "7.3.12"
|
||||||
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
|
resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.12.tgz#920447fdd78d76b19de0438b7f60df3c4a80bf1c"
|
||||||
integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
|
integrity sha512-WwA1MW0++RfXmCr12xeYOOC5baSC9mSb0ZqCquFzKhcoF4TvHu5MKOuXsncgZcpVFhB1pXd5hZmM0ryAoCp12A==
|
||||||
|
@ -1174,10 +1174,10 @@
|
||||||
eslint-config-prettier "^8.3.0"
|
eslint-config-prettier "^8.3.0"
|
||||||
eslint-plugin-prettier "^4.0.0"
|
eslint-plugin-prettier "^4.0.0"
|
||||||
|
|
||||||
"@vue/eslint-config-typescript@^11.0.1":
|
"@vue/eslint-config-typescript@^11.0.2":
|
||||||
version "11.0.1"
|
version "11.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.1.tgz#d79b3656aecea844ec9875bc93155163f684dde7"
|
resolved "https://registry.yarnpkg.com/@vue/eslint-config-typescript/-/eslint-config-typescript-11.0.2.tgz#03353f404d4472900794e653450bb6623de3c642"
|
||||||
integrity sha512-0U+nL0nA7ahnGPk3rTN49x76miUwuQtQPQNWOFvAcjg6nFJkIkA8qbGNtXwsuHtwBwRtWpHhShL3zK07v+632w==
|
integrity sha512-EiKud1NqlWmSapBFkeSrE994qpKx7/27uCGnhdqzllYDpQZroyX/O6bwjEpeuyKamvLbsGdO6PMR2faIf+zFnw==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@typescript-eslint/eslint-plugin" "^5.0.0"
|
"@typescript-eslint/eslint-plugin" "^5.0.0"
|
||||||
"@typescript-eslint/parser" "^5.0.0"
|
"@typescript-eslint/parser" "^5.0.0"
|
||||||
|
@ -3108,7 +3108,7 @@ find-up@^5.0.0:
|
||||||
locate-path "^6.0.0"
|
locate-path "^6.0.0"
|
||||||
path-exists "^4.0.0"
|
path-exists "^4.0.0"
|
||||||
|
|
||||||
find-up@^6.1.0, find-up@^6.3.0:
|
find-up@^6.3.0:
|
||||||
version "6.3.0"
|
version "6.3.0"
|
||||||
resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
|
resolved "https://registry.yarnpkg.com/find-up/-/find-up-6.3.0.tgz#2abab3d3280b2dc7ac10199ef324c4e002c8c790"
|
||||||
integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
|
integrity sha512-v2ZsoEuVHYy8ZIlYqwPe/39Cy+cFDzp4dXPaxNvkEuouymu+2Jbz0PxpKarJHYJTmv2HWT3O382qY8l4jMWthw==
|
||||||
|
@ -3887,15 +3887,15 @@ htmlparser2@^6.1.0:
|
||||||
domutils "^2.5.2"
|
domutils "^2.5.2"
|
||||||
entities "^2.0.0"
|
entities "^2.0.0"
|
||||||
|
|
||||||
http-auth-connect@^1.0.5:
|
http-auth-connect@^1.0.6:
|
||||||
version "1.0.5"
|
version "1.0.6"
|
||||||
resolved "https://registry.yarnpkg.com/http-auth-connect/-/http-auth-connect-1.0.5.tgz#7796d361f9ac56d80ada8ff54c61aa857768335f"
|
resolved "https://registry.yarnpkg.com/http-auth-connect/-/http-auth-connect-1.0.6.tgz#7b9fd411f8806efd1244e703477171c08396d503"
|
||||||
integrity sha512-zykAOKpVAXyzhOLm6+xyB/RtRcfN3uDfH4Al73DIfeSb6B7nr0WToLI6UyyM6ohtcLmbBPksWXzVbEDStz8ObQ==
|
integrity sha512-yaO0QSCPqGCjPrl3qEEHjJP+lwZ6gMpXLuCBE06eWwcXomkI5TARtu0kxf9teFuBj6iaV3Ybr15jaWUvbzNzHw==
|
||||||
|
|
||||||
http-auth@^4.1.9:
|
http-auth@^4.2.0:
|
||||||
version "4.1.9"
|
version "4.2.0"
|
||||||
resolved "https://registry.yarnpkg.com/http-auth/-/http-auth-4.1.9.tgz#9f3204422a1d6ee53122c041711e61e8303a323e"
|
resolved "https://registry.yarnpkg.com/http-auth/-/http-auth-4.2.0.tgz#9bb119ba22273b63a50796363d298eed3bdbadae"
|
||||||
integrity sha512-kvPYxNGc9EKGTXvOMnTBQw2RZfuiSihK/mLw/a4pbtRueTE45S55Lw/3k5CktIf7Ak0veMKEIteDj4YkNmCzmQ==
|
integrity sha512-trIkGI7dgnFJ5k8YaQFSr1Q5uq9c19vK6Y9ZCjlY0zBEQgdJpXZU3Cyrmk4nwrAGy4pKJhs599o7q6eicbVnhw==
|
||||||
dependencies:
|
dependencies:
|
||||||
apache-crypt "^1.1.2"
|
apache-crypt "^1.1.2"
|
||||||
apache-md5 "^1.0.6"
|
apache-md5 "^1.0.6"
|
||||||
|
@ -6047,12 +6047,12 @@ pkg-dir@^4.1.0, pkg-dir@^4.2.0:
|
||||||
dependencies:
|
dependencies:
|
||||||
find-up "^4.0.0"
|
find-up "^4.0.0"
|
||||||
|
|
||||||
pkg-dir@^6.0.1:
|
pkg-dir@^7.0.0:
|
||||||
version "6.0.1"
|
version "7.0.0"
|
||||||
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-6.0.1.tgz#8ec964cecaef98a2bdb9c164733f90a5bcd2352d"
|
resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-7.0.0.tgz#8f0c08d6df4476756c5ff29b3282d0bab7517d11"
|
||||||
integrity sha512-C9R+PTCKGA32HG0n5I4JMYkdLL58ZpayVuncQHQrGeKa8o26A4o2x0u6BKekHG+Au0jv5ZW7Xfq1Cj6lm9Ag4w==
|
integrity sha512-Ie9z/WINcxxLp27BKOCHGde4ITq9UklYKDzVo1nhk5sqGEXU3FpkwP5GM2voTGJkGd9B3Otl+Q4uwSOeSUtOBA==
|
||||||
dependencies:
|
dependencies:
|
||||||
find-up "^6.1.0"
|
find-up "^6.3.0"
|
||||||
|
|
||||||
pkg-up@^3.1.0:
|
pkg-up@^3.1.0:
|
||||||
version "3.1.0"
|
version "3.1.0"
|
||||||
|
@ -7328,10 +7328,10 @@ trim-newlines@^1.0.0, trim-newlines@~4.0.2:
|
||||||
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c"
|
resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-4.0.2.tgz#d6aaaf6a0df1b4b536d183879a6b939489808c7c"
|
||||||
integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==
|
integrity sha512-GJtWyq9InR/2HRiLZgpIKv+ufIKrVrvjQWEj7PxAXNc5dwbNJkqhAUoAGgzRmULAnoOM5EIpveYd3J2VeSAIew==
|
||||||
|
|
||||||
ts-jest@^29.0.1:
|
ts-jest@^29.0.2:
|
||||||
version "29.0.1"
|
version "29.0.2"
|
||||||
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.1.tgz#3296b39d069dc55825ce1d059a9510b33c718b86"
|
resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-29.0.2.tgz#0c45a1ac45d14f8b3bf89bca9048a2840c7bd5ad"
|
||||||
integrity sha512-htQOHshgvhn93QLxrmxpiQPk69+M1g7govO1g6kf6GsjCv4uvRV0znVmDrrvjUrVCnTYeY4FBxTYYYD4airyJA==
|
integrity sha512-P03IUItnAjG6RkJXtjjD5pu0TryQFOwcb1YKmW63rO19V0UFqL3wiXZrmR5D7qYjI98btzIOAcYafLZ0GHAcQg==
|
||||||
dependencies:
|
dependencies:
|
||||||
bs-logger "0.x"
|
bs-logger "0.x"
|
||||||
fast-json-stable-stringify "2.x"
|
fast-json-stable-stringify "2.x"
|
||||||
|
@ -7827,15 +7827,15 @@ yargs@^17.3.1:
|
||||||
y18n "^5.0.5"
|
y18n "^5.0.5"
|
||||||
yargs-parser "^21.0.0"
|
yargs-parser "^21.0.0"
|
||||||
|
|
||||||
yarn-audit-fix@^9.3.5:
|
yarn-audit-fix@^9.3.6:
|
||||||
version "9.3.5"
|
version "9.3.6"
|
||||||
resolved "https://registry.yarnpkg.com/yarn-audit-fix/-/yarn-audit-fix-9.3.5.tgz#3a0e9356c5b741a6aa50039af4cebfa9308c71d9"
|
resolved "https://registry.yarnpkg.com/yarn-audit-fix/-/yarn-audit-fix-9.3.6.tgz#f3b0d1405e953df13c4f8f068eb6ba595d120697"
|
||||||
integrity sha512-2bnEkix8of4qrkWMsKlIWPdIqY6YGFdR5rsrBNycNbGlSZRMaWddKiJgoOSowyNuMpB5ElHOlA1hSlxF4/7waQ==
|
integrity sha512-JeU1VRsMdGrTd/nUuS72HJhbcp4sfY9SPDMDP9pTpytrFBLM6NAcxSxdQOPUOZMm6Ze0v5jHSkZaOfToEVcdiQ==
|
||||||
dependencies:
|
dependencies:
|
||||||
"@types/find-cache-dir" "^3.2.1"
|
"@types/find-cache-dir" "^3.2.1"
|
||||||
"@types/fs-extra" "^9.0.13"
|
"@types/fs-extra" "^9.0.13"
|
||||||
"@types/lodash-es" "^4.17.6"
|
"@types/lodash-es" "^4.17.6"
|
||||||
"@types/semver" "^7.3.11"
|
"@types/semver" "^7.3.12"
|
||||||
"@types/yarnpkg__lockfile" "^1.1.5"
|
"@types/yarnpkg__lockfile" "^1.1.5"
|
||||||
"@yarnpkg/lockfile" "^1.1.0"
|
"@yarnpkg/lockfile" "^1.1.0"
|
||||||
chalk "^5.0.1"
|
chalk "^5.0.1"
|
||||||
|
@ -7846,7 +7846,7 @@ yarn-audit-fix@^9.3.5:
|
||||||
globby "^13.1.2"
|
globby "^13.1.2"
|
||||||
js-yaml "^4.1.0"
|
js-yaml "^4.1.0"
|
||||||
lodash-es "^4.17.21"
|
lodash-es "^4.17.21"
|
||||||
pkg-dir "^6.0.1"
|
pkg-dir "^7.0.0"
|
||||||
semver "^7.3.7"
|
semver "^7.3.7"
|
||||||
synp "^1.9.10"
|
synp "^1.9.10"
|
||||||
tslib "^2.4.0"
|
tslib "^2.4.0"
|
||||||
|
|
Loading…
Reference in a new issue