Merge branch 'main' into new-admin

This commit is contained in:
baldo 2022-09-01 14:57:51 +02:00
commit d2c90ff833
3 changed files with 11 additions and 11 deletions

View file

@ -67,13 +67,13 @@
"@types/compression": "^1.7.2", "@types/compression": "^1.7.2",
"@types/deep-extend": "^0.4.32", "@types/deep-extend": "^0.4.32",
"@types/express": "^4.17.13", "@types/express": "^4.17.13",
"@types/glob": "^7.2.0", "@types/glob": "^8.0.0",
"@types/graceful-fs": "^4.1.5", "@types/graceful-fs": "^4.1.5",
"@types/html-to-text": "^8.1.1", "@types/html-to-text": "^8.1.1",
"@types/jest": "^29.0.0", "@types/jest": "^29.0.0",
"@types/lodash": "^4.14.184", "@types/lodash": "^4.14.184",
"@types/node": "^18.7.14", "@types/node": "^18.7.14",
"@types/node-cron": "^3.0.2", "@types/node-cron": "^3.0.3",
"@types/nodemailer": "^6.4.5", "@types/nodemailer": "^6.4.5",
"@types/request": "^2.48.8", "@types/request": "^2.48.8",
"@vue/eslint-config-prettier": "^7.0.0", "@vue/eslint-config-prettier": "^7.0.0",

View file

@ -12,7 +12,7 @@
}, },
token: { token: {
type: "string", type: "string",
regex: /^[0-9a-fA-F]{16}$/, regex: /^[0-9a-f]{16}$/i,
optional: false, optional: false,
}, },
node: { node: {

View file

@ -915,10 +915,10 @@
dependencies: dependencies:
"@types/node" "*" "@types/node" "*"
"@types/glob@^7.2.0": "@types/glob@^8.0.0":
version "7.2.0" version "8.0.0"
resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.2.0.tgz#bc1b5bf3aa92f25bd5dd39f35c57361bdce5b2eb" resolved "https://registry.yarnpkg.com/@types/glob/-/glob-8.0.0.tgz#321607e9cbaec54f687a0792b2d1d370739455d2"
integrity sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA== integrity sha512-l6NQsDDyQUVeoTynNpC9uRvCUint/gSUXQA2euwmTuWGvPY5LSDUu6tkCtJB2SvGQlJQzLaKqcGZP4//7EDveA==
dependencies: dependencies:
"@types/minimatch" "*" "@types/minimatch" "*"
"@types/node" "*" "@types/node" "*"
@ -994,10 +994,10 @@
resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40" resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ== integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
"@types/node-cron@^3.0.2": "@types/node-cron@^3.0.3":
version "3.0.2" version "3.0.3"
resolved "https://registry.yarnpkg.com/@types/node-cron/-/node-cron-3.0.2.tgz#1a95877680f828817e395789ac2bf8d72a5df6af" resolved "https://registry.yarnpkg.com/@types/node-cron/-/node-cron-3.0.3.tgz#6d7a7bebecb20d83c850421d4d3178a7555be538"
integrity sha512-SK/4GYWiWvGLPl/yv+Tm5oLYbzMx1V3y7CsNTvOb3vF8O9oXH11U6/zckISHnBl4YH8MvXHFIUXbYoBONSdmzw== integrity sha512-FPzux/llEiCe5mPn3TvLEORcF2pRXvH5cugtJCJf+UrkwQ7pYfb4wn9J/sxJ8QkT/sw9BjWSi9uur5Vh1OuAZQ==
"@types/node@*": "@types/node@*":
version "17.0.34" version "17.0.34"