Merge branch 'develop' into vue3

This commit is contained in:
syuilo 2020-08-25 08:54:57 +09:00
commit 7326f45ffd
24 changed files with 390 additions and 145 deletions

View file

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.47.0",
"version": "12.47.1",
"codename": "indigo",
"repository": {
"type": "git",
@ -114,7 +114,7 @@
"aws-sdk": "2.724.0",
"bcryptjs": "2.4.3",
"blurhash": "1.1.3",
"bull": "3.16.0",
"bull": "3.18.0",
"cafy": "15.2.1",
"cbor": "5.1.0",
"chalk": "4.1.0",
@ -159,7 +159,7 @@
"is-root": "2.1.0",
"is-svg": "4.2.1",
"js-yaml": "3.14.0",
"jsdom": "16.3.0",
"jsdom": "16.4.0",
"json5": "2.1.3",
"json5-loader": "4.0.0",
"jsonld": "3.1.1",
@ -190,7 +190,8 @@
"os-utils": "0.0.14",
"parse5": "6.0.1",
"parsimmon": "1.15.0",
"pg": "8.3.0",
"pg": "8.3.2",
"portal-vue": "2.1.7",
"portscanner": "2.2.0",
"postcss-loader": "3.0.0",
"prismjs": "1.21.0",
@ -199,7 +200,7 @@
"promise-sequential": "1.1.1",
"pug": "2.0.4",
"punycode": "2.1.1",
"pureimage": "0.2.4",
"pureimage": "0.2.5",
"qrcode": "1.4.4",
"random-seed": "0.3.0",
"ratelimiter": "3.4.1",
@ -225,18 +226,18 @@
"style-loader": "1.2.1",
"summaly": "2.4.0",
"syslog-pro": "1.0.0",
"systeminformation": "4.26.10",
"systeminformation": "4.26.12",
"syuilo-password-strength": "0.0.1",
"textarea-caret": "3.1.0",
"three": "0.117.1",
"tinycolor2": "1.4.1",
"tmp": "0.2.1",
"ts-loader": "8.0.2",
"ts-node": "8.10.2",
"ts-node": "9.0.0",
"tslint": "6.1.3",
"tslint-sonarts": "1.9.0",
"typeorm": "0.2.25",
"typescript": "3.9.7",
"typescript": "4.0.2",
"ulid": "2.3.0",
"url-loader": "4.1.0",
"uuid": "8.3.0",
@ -252,14 +253,14 @@
"vue-marquee-text-component": "1.1.1",
"vue-meta": "2.4.0",
"vue-prism-component": "1.2.0",
"vue-prism-editor": "0.6.1",
"vue-prism-editor": "1.2.2",
"vue-router": "4.0.0-beta.7",
"vue-style-loader": "4.1.2",
"vue-svg-inline-loader-corejs3": "1.5.0",
"vue-template-compiler": "2.6.11",
"vuedraggable": "2.24.0",
"vuedraggable": "2.24.1",
"vuex": "4.0.0-beta.4",
"vuex-persistedstate": "3.0.1",
"vuex-persistedstate": "3.1.0",
"web-push": "3.4.4",
"webpack": "5.0.0-beta.28",
"webpack-cli": "3.3.12",