profxadke
/
misskey
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'develop' into refactor-ui

This commit is contained in:
syuilo 2021-09-30 00:51:10 +09:00
parent 5d1ead7793 1ac1a968b9
commit c6da0e8e69
4 changed files with 72 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package.json
View File

@ -104,7 +104,7 @@
"@types/websocket": "1.0.4",
"@types/ws": "7.4.7",
"@typescript-eslint/parser": "4.31.2",
"@vue/compiler-sfc": "3.2.18",
"@vue/compiler-sfc": "3.2.19",
"abort-controller": "3.0.0",
"apexcharts": "3.28.3",
"autobind-decorator": "2.4.0",
@ -233,7 +233,7 @@
"uuid": "8.3.2",
"v-debounce": "0.1.2",
"vanilla-tilt": "1.7.2",
"vue": "3.2.18",
"vue": "3.2.19",
"vue-loader": "16.7.0",
"vue-prism-editor": "2.0.0-alpha.2",
"vue-router": "4.0.5",

2
src/client/components/debobigego/switch.vue
View File

@ -12,7 +12,7 @@
:disabled="disabled"
@keydown.enter="toggle"
>
<span class="button">
<span class="button" v-tooltip="checked ? $ts.itsOn : $ts.itsOff">
<span></span>
</span>
<span class="label">

1
src/models/repositories/note.ts
View File

@ -272,6 +272,7 @@ export class NoteRepository extends Repository<Note> {
const tokens = packed.text ? mfm.parse(packed.text) : [];
mfm.inspect(tokens, node => {
if (node.type === 'text') {
// TODO: quoteなtextはskip
node.props.text = nyaize(node.props.text);
}
});

136
yarn.lock
View File

@ -1244,95 +1244,95 @@
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.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.18.tgz#239f8ed2e8a95e87f6a6235a4798d8d29e5b4dd8"
integrity sha512-zNKVUx2gN/46xjKy+fNRB3+PJVO2WoGUUdpQo9w5GylWj8vs/r7pMuzQralP8J02YDp6YgJ61v1Yjq7nW5xK6Q==
"@vue/compiler-core@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/compiler-core/-/compiler-core-3.2.19.tgz#b537dd377ce51fdb64e9b30ebfbff7cd70a64cb9"
integrity sha512-8dOPX0YOtaXol0Zf2cfLQ4NU/yHYl2H7DCKsLEZ7gdvPK6ZSEwGLJ7IdghhY2YEshEpC5RB9QKdC5I07z8Dtjg==
dependencies:
"@babel/parser" "^7.15.0"
"@vue/shared" "3.2.18"
"@vue/shared" "3.2.19"
estree-walker "^2.0.2"
source-map "^0.6.1"
"@vue/compiler-dom@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.18.tgz#6bb3b0e318a7eb16c02eb42fefa96a58766c6730"
integrity sha512-AqCND7Q0vYFlsBcwWnbcmOiVS/J/70qTZOCPxJnktvH+w4Y7F9omKDyuhsd/ZsJCmSvvpzqBNf2hgtMnoTjNiw==
"@vue/compiler-dom@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/compiler-dom/-/compiler-dom-3.2.19.tgz#0607bc90de6af55fde73b09b3c4d0bf8cb597ed8"
integrity sha512-WzQoE8rfkFjPtIioc7SSgTsnz9g2oG61DU8KHnzPrRS7fW/lji6H2uCYJfp4Z6kZE8GjnHc1Ljwl3/gxDes0cw==
dependencies:
"@vue/compiler-core" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-core" "3.2.19"
"@vue/shared" "3.2.19"
"@vue/compiler-sfc@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.18.tgz#d2dfcd09d2bb5a1dfe70d686ac5139473b25d5ef"
integrity sha512-ui+w1WtVjxlSlnvR4uYgVbbYcN75SrADyMuStnhRqhQM8E2MzJ99W/7Qm3UDs+GxzCEDyQA1CmUvtCg5tlwOMw==
"@vue/compiler-sfc@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/compiler-sfc/-/compiler-sfc-3.2.19.tgz#d412195a98ebd49b84602f171719294a1d9549be"
integrity sha512-pLlbgkO1UHTO02MSpa/sFOXUwIDxSMiKZ1ozE5n71CY4DM+YmI+G3gT/ZHZ46WBId7f3VTF/D8pGwMygcQbrQA==
dependencies:
"@babel/parser" "^7.15.0"
"@vue/compiler-core" "3.2.18"
"@vue/compiler-dom" "3.2.18"
"@vue/compiler-ssr" "3.2.18"
"@vue/ref-transform" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-core" "3.2.19"
"@vue/compiler-dom" "3.2.19"
"@vue/compiler-ssr" "3.2.19"
"@vue/ref-transform" "3.2.19"
"@vue/shared" "3.2.19"
estree-walker "^2.0.2"
magic-string "^0.25.7"
postcss "^8.1.10"
source-map "^0.6.1"
"@vue/compiler-ssr@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.18.tgz#d2801ac5e7472d0b3079f553a4ab98def96e7be9"
integrity sha512-qncqUn+y00o2X8h75XUmekzpxjlQOtZkR2XzEDkBFyRfe+jruG2l0MBFKq88wMeiHRzAfysRNqRQd2KXopHPFQ==
"@vue/compiler-ssr@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/compiler-ssr/-/compiler-ssr-3.2.19.tgz#3e91ecf70f8f961c5f63eacd2139bcdab9a7a07c"
integrity sha512-oLon0Cn3O7WEYzzmzZavGoqXH+199LT+smdjBT3Uf3UX4HwDNuBFCmvL0TsqV9SQnIgKvBRbQ7lhbpnd4lqM3w==
dependencies:
"@vue/compiler-dom" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-dom" "3.2.19"
"@vue/shared" "3.2.19"
"@vue/reactivity@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.18.tgz#46d5077289d1c57f62bdcdfc6a566e371e3f20cd"
integrity sha512-NTGsS2uQqWO4HIhGKmXXUZZvu/R+GW2e+i08ZYJVnR6vScN8WGlg+GU3HiG4UvhNrTAdhMFPoy+no5t3iXnvVw==
"@vue/reactivity@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/reactivity/-/reactivity-3.2.19.tgz#fc6e0f0106f295226835cfed5ff5f84d927bea65"
integrity sha512-FtachoYs2SnyrWup5UikP54xDX6ZJ1s5VgHcJp4rkGoutU3Ry61jhs+nCX7J64zjX992Mh9gGUC0LqTs8q9vCA==
dependencies:
"@vue/shared" "3.2.18"
"@vue/shared" "3.2.19"
"@vue/ref-transform@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.18.tgz#270be5502dd95d312ec970f518239d0e85548bc9"
integrity sha512-STPcQbA8u3DftZjZW/dS+0mGIABKgbXCxOJTyEYxP+rxa66tqa/QSkeuz54h0zk2wgPfe4vo2QPtcFGl3kl45A==
"@vue/ref-transform@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/ref-transform/-/ref-transform-3.2.19.tgz#cf0f986486bb26838fbd09749e927bab19745600"
integrity sha512-03wwUnoIAeKti5IGGx6Vk/HEBJ+zUcm5wrUM3+PQsGf7IYnXTbeIfHHpx4HeSeWhnLAjqZjADQwW8uA4rBmVbg==
dependencies:
"@babel/parser" "^7.15.0"
"@vue/compiler-core" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-core" "3.2.19"
"@vue/shared" "3.2.19"
estree-walker "^2.0.2"
magic-string "^0.25.7"
"@vue/runtime-core@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.18.tgz#f4de5b0524300eeb0a0b17f20ccbd1287aa33a16"
integrity sha512-wGRUSRE8grf90TdXJeWusdDG+mn+40L7wBH08neNM4L/f6qW9arlymvrYLOiMz7PoH28aMlI3w6l9tvGSlMbjA==
"@vue/runtime-core@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/runtime-core/-/runtime-core-3.2.19.tgz#807715b7f4728abb84fa4a8efdbe37d8ddb4c6d3"
integrity sha512-qArZSWKxWsgKfxk9BelZ32nY0MZ31CAW2kUUyVJyxh4cTfHaXGbjiQB5JgsvKc49ROMNffv9t3/qjasQqAH+RQ==
dependencies:
"@vue/reactivity" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/reactivity" "3.2.19"
"@vue/shared" "3.2.19"
"@vue/runtime-dom@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.18.tgz#25d23af43c104ab6c49b65ef9bc5e29be5788c2d"
integrity sha512-iP6AP0zANe0OfHWV7VDiR9eH2WGJuLHBHEsyIfOteZUuowM8VkIVgn+10HGnVEV+nfpaVAVPItQDc/TwmR73Rw==
"@vue/runtime-dom@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/runtime-dom/-/runtime-dom-3.2.19.tgz#7e8bf645754703e360fa132e4be9113edf2377bb"
integrity sha512-hIRboxXwafeHhbZEkZYNV0MiJXPNf4fP0X6hM2TJb0vssz8BKhD9cF92BkRgZztTQevecbhk0gu4uAPJ3dxL9A==
dependencies:
"@vue/runtime-core" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/runtime-core" "3.2.19"
"@vue/shared" "3.2.19"
csstype "^2.6.8"
"@vue/server-renderer@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.18.tgz#66ff958eac719e7dee430c22685d100847491453"
integrity sha512-UUndtVq2z3IN3PmK+siu1W6lFvP9lb2hyKFw2CxZug3A4jKrUuYadvtItIRxt2rNsLIoLydnxBa2pyUM6+8S4g==
"@vue/server-renderer@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/server-renderer/-/server-renderer-3.2.19.tgz#870bcec9f7cdaee0c2187a169b6e636ab4362fb1"
integrity sha512-A9FNT7fgQJXItwdzWREntAgWKVtKYuXHBKGev/H4+ByTu8vB7gQXGcim01QxaJshdNg4dYuH2tEBZXCNCNx+/w==
dependencies:
"@vue/compiler-ssr" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-ssr" "3.2.19"
"@vue/shared" "3.2.19"
"@vue/shared@3.2.18":
version "3.2.18"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.18.tgz#f601356e14e455428e5db8281c966ba4c1bc3403"
integrity sha512-vFa2annVlbI082ICC3BH239UFO66nn2Syxy9shI7N2haPrc4rFRyNuDjWKJRe3sX7py4yhYL7fopB5tWGwGVyA==
"@vue/shared@3.2.19":
version "3.2.19"
resolved "https://registry.yarnpkg.com/@vue/shared/-/shared-3.2.19.tgz#111ec3da18337d86274446984c49925b1b2b2dd7"
integrity sha512-Knqhx7WieLdVgwCAZgTVrDCXZ50uItuecLh9JdLC8O+a5ayaSyIQYveUK3hCRNC7ws5zalHmZwfdLMGaS8r4Ew==
"@webassemblyjs/ast@1.11.0":
version "1.11.0"
@ -11529,16 +11529,16 @@ vue-svg-loader@0.17.0-beta.2:
semver "^7.3.2"
svgo "^1.3.2"
vue@3.2.18:
version "3.2.18"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.18.tgz#7791cbacb7e4193cf866eaac13ca61b912ce8eb6"
integrity sha512-5HjXmnntBcFOdjqXzi4fxPENcl8MOrfUycr/iY+Th/NNNaZfa5BLPHk9Gc28fWCGbZT1U6XkkiEYysxY49lGuQ==
vue@3.2.19:
version "3.2.19"
resolved "https://registry.yarnpkg.com/vue/-/vue-3.2.19.tgz#da2c80a6a0271c7097fee9e31692adfd9d569c8f"
integrity sha512-6KAMdIfAtlK+qohTIUE4urwAv4A3YRuo8uAbByApUmiB0CziGAAPs6qVugN6oHPia8YIafHB/37K0O6KZ7sGmA==
dependencies:
"@vue/compiler-dom" "3.2.18"
"@vue/compiler-sfc" "3.2.18"
"@vue/runtime-dom" "3.2.18"
"@vue/server-renderer" "3.2.18"
"@vue/shared" "3.2.18"
"@vue/compiler-dom" "3.2.19"
"@vue/compiler-sfc" "3.2.19"
"@vue/runtime-dom" "3.2.19"
"@vue/server-renderer" "3.2.19"
"@vue/shared" "3.2.19"
vuedraggable@4.0.1:
version "4.0.1"