mirror/cherrypick
1
1
Fork 0
mirror of https://github.com/kokonect-link/cherrypick synced 2024-11-27 22:38:34 +09:00
Code

Merge branch 'develop'

Browse Source
This commit is contained in:
syuilo 2021-07-23 21:37:09 +09:00
commit 12913a16fd
2 changed files with 56 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package.json
View File

@ -1,7 +1,7 @@
{
"name": "misskey",
"author": "syuilo <syuilotan@yahoo.co.jp>",
"version": "12.84.0",
"version": "12.84.1",
"codename": "indigo",
"repository": {
"type": "git",
@ -101,7 +101,7 @@
"@types/websocket": "1.0.3",
"@types/ws": "7.4.6",
"@typescript-eslint/parser": "4.28.3",
"@vue/compiler-sfc": "3.2.0-beta.2",
"@vue/compiler-sfc": "3.2.0-beta.4",
"abort-controller": "3.0.0",
"apexcharts": "3.27.2",
"autobind-decorator": "2.4.0",
@ -238,7 +238,7 @@
"uuid": "8.3.2",
"v-debounce": "0.1.2",
"vanilla-tilt": "1.7.0",
"vue": "3.2.0-beta.2",
"vue": "3.2.0-beta.4",
"vue-color": "2.8.1",
"vue-json-pretty": "1.8.1",
"vue-loader": "16.3.1",

106
yarn.lock
View File

@ -1312,37 +1312,37 @@
resolved "https://registry.yarnpkg.com/@ungap/promise-all-settled/-/promise-all-settled-1.1.2.tgz#aa58042711d6e3275dd37dc597e5d31e8c290a44"
integrity sha512-sL/cEvJWAnClXw0wHk85/2L0G6Sj8UB0Ctc1TEMbKSsmpRosqhwj9gWgFRZSrBr2f9tiXISwNhCPmlfqUqyb9Q==
"@vue/compiler-core@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.0-beta.2.tgz#2bb29fb48acf1bae78575c07c8eb32e6bd98b274"
integrity sha512-AOzxqOYlWrQqCQ35JA8he4dCOUmBamLh3ILpr+h66d9SZNaN61H4TZbDYz3NckfPlkNxtOEZjPVRnJtqQO+hUQ==
"@vue/compiler-core@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.0-beta.4.tgz#5cc738e4ba6e63cf859d5f1e136b60f1b55ccb46"
integrity sha512-AStaT3fehyb0SYYjiRCxrxyI8lFyzE2Hg8CB8Hf6SM05lONUCileI9Gu3Z8Z+iyho/HL9Z2JhZs47VPpR4z0iA==
dependencies:
"@babel/parser" "^7.12.0"
"@babel/types" "^7.12.0"
"@vue/shared" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.4"
estree-walker "^2.0.1"
source-map "^0.6.1"
"@vue/compiler-dom@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.0-beta.2.tgz#f8f1744e7766064916eecea34c0dad1736de1fa1"
integrity sha512-bBA5V3EoP//8934pRS3+TQN/gwRT/+dv3bG/fpe0CveyLB/EEE5KW0dyGy83HYERcNNKNhR8mZKmPB6XyTz7DA==
"@vue/compiler-dom@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.0-beta.4.tgz#1c0bdf84ec2c4db4da32f65773d902e0324541dd"
integrity sha512-Vtql3zHmkGOfEg6j5NdrofMV3CmkeVlyyzMS3Rg144H98L2QnGRCiRiPhse7TrSyxP8mJtBsq+Ury6M4yi8K8g==
dependencies:
"@vue/compiler-core" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/compiler-core" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
"@vue/compiler-sfc@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.0-beta.2.tgz#534e69cd386bf4d2e2b6eaa43d36f4f1d35acbc2"
integrity sha512-0+sXdpZTQR+UO5g55ZcYU79GiysBvW1vg9qCfyShvmVmHs8d9YdNxXTuy13dk64BjEHgeMi8PRRKK4kiJ/2/9g==
"@vue/compiler-sfc@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.0-beta.4.tgz#ad1de09c8ce3beb4c23f764fbf71b43a8fe455c7"
integrity sha512-aj3tz+1qjyl9TVsNBIVgtydMJdhGjOej49tTRCgEM4HSmJF3zFZalF03D8lvJSX4V9tlFyBVI3D69e1+YGqDlw==
dependencies:
"@babel/parser" "^7.13.9"
"@babel/types" "^7.13.0"
"@types/estree" "^0.0.48"
"@vue/compiler-core" "3.2.0-beta.2"
"@vue/compiler-dom" "3.2.0-beta.2"
"@vue/compiler-ssr" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/compiler-core" "3.2.0-beta.4"
"@vue/compiler-dom" "3.2.0-beta.4"
"@vue/compiler-ssr" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
consolidate "^0.16.0"
estree-walker "^2.0.1"
hash-sum "^2.0.0"
@ -1354,42 +1354,42 @@
postcss-selector-parser "^6.0.4"
source-map "^0.6.1"
"@vue/compiler-ssr@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.0-beta.2.tgz#c0d8a2dffd0a5cc312b239115a5c9ce5d92351b2"
integrity sha512-nz1diH5t8MqcRgw5LlSizF5/oBHgGa9hfZxzDLKSCASPbn0XW8yyy4GvKZ92xRfHwzf7zXp8SS4DOQ3CjkGOFw==
"@vue/compiler-ssr@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.0-beta.4.tgz#2112faeca659f44fee1188c7a43d05546df8c10a"
integrity sha512-+Qcx2c02suic9Sloz+fXsQULntSCSOaUfARQKfh73FknSuY3FtT/66MVz4WcI19WCOlQ+9VhZiA9KYrdRgS2/g==
dependencies:
"@vue/compiler-dom" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/compiler-dom" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
"@vue/reactivity@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.0-beta.2.tgz#4eec43b5cb30042feb0d461e3d8715dabe7bc3e6"
integrity sha512-+7mbCjsS83zE990ANJwABctHT0tFP948D/azI3WRcT0+kcnmY9LJHmNJawi7pOo93PYbiY1JX6QsDNxwcjdBYg==
"@vue/reactivity@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.0-beta.4.tgz#3f1f593fa196d2f306ae62091fe05868e269873f"
integrity sha512-0ICucYc4ldgF6CmLxApfm+Y2gn1B8sLpjDFBO9/p4RzSKW4G3IakWlyENO6uukeixuOeLj4Tvp6rCjhMSqa8qA==
dependencies:
"@vue/shared" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.4"
"@vue/runtime-core@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.0-beta.2.tgz#5286f18577b648833c639d420b08d189d75a42b2"
integrity sha512-/FE330p8aI/HssaNgsnsKNlB6Xof8kYcI7WQXMyCjB+kTPGY1+EsjEThAFlOc8d+U9l3ixaX+d1kmUBOa0OEhw==
"@vue/runtime-core@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.0-beta.4.tgz#e80761fe9777aece946c8a54673365b37691483c"
integrity sha512-t/2+1mEBSD3DiHwlHNyNM6cjvN/po5FqaOtoyLm+z+Nt4ohWvn8F/61ZGzKTnwZFW3S+kDVsVK0BsSYEkxlEnA==
dependencies:
"@vue/reactivity" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/reactivity" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
"@vue/runtime-dom@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.0-beta.2.tgz#b253ac4344160e63a82376cfcfa5a9dcaf6628d2"
integrity sha512-h5uKQlWpnqjxMRV0QsV9OgMOlmaXsHiGnste25j+q1B645aZ8/dX55SK4BCJfheE+7gML2dSvpuQU9GGBS21RA==
"@vue/runtime-dom@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.0-beta.4.tgz#ce90ecd2a9535fbdfe1a8bb7197063b24656fa93"
integrity sha512-QcoGD5unHSyw3o63KbQzp5QZk5gYfKBw/Z489pQOwZW8xWnAeX2SFbVBh/39BZy2vYy7qutJoiaUo/VPDujOPA==
dependencies:
"@vue/runtime-core" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/runtime-core" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
csstype "^2.6.8"
"@vue/shared@3.2.0-beta.2":
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.0-beta.2.tgz#d51af33e1cb5f289b6a4efc2b98417372fed3a65"
integrity sha512-WrmgOlq3mjgRLZuo0t2Ug77c1Cm/KmbJi64UMoNz6Iwz1kjjxMLCIkoHTMvoBt0iUr05mhN+75iiRyqPCii3ww==
"@vue/shared@3.2.0-beta.4":
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.0-beta.4.tgz#ade5973291798177b90367d663319fc4e6d4172f"
integrity sha512-eKPlvlQtWw+tuJSIHUg+/8f/wQt4oGDHCZ9HbAIKOPlzuaIqrIOKwP2pDZQeHUAkjs+G8QaqguiI9qKzOQ5fWQ==
"@webassemblyjs/ast@1.11.0":
version "1.11.0"
@ -11591,14 +11591,14 @@ vue-svg-loader@0.17.0-beta.2:
semver "^7.3.2"
svgo "^1.3.2"
vue@3.2.0-beta.2:
version "3.2.0-beta.2"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.0-beta.2.tgz#a84cbe56c98691be8df9a98177c9fc93a6b8c817"
integrity sha512-JKpezpLqXnDH1LnBHIolZ5JvvyWWbTUUz8iaLEQCLSOVFKcHuRIAsqwyf2jpDrcTvpoRwaWS0lmzBUyXCjA8Og==
vue@3.2.0-beta.4:
version "3.2.0-beta.4"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.0-beta.4.tgz#62c676f627cdce3b3b7d9e1c3c756c26445dff58"
integrity sha512-w5yV/L+W4YuErS1mf1NnXXZU52pQ/PfhUhG3PTpf5PSClRkZinj77pASPPtyaqBAWWCjyxwR39hqG+9VKmV74Q==
dependencies:
"@vue/compiler-dom" "3.2.0-beta.2"
"@vue/runtime-dom" "3.2.0-beta.2"
"@vue/shared" "3.2.0-beta.2"
"@vue/compiler-dom" "3.2.0-beta.4"
"@vue/runtime-dom" "3.2.0-beta.4"
"@vue/shared" "3.2.0-beta.4"
vuedraggable@4.0.1:
version "4.0.1"