From 433230413ea4c9e5b9d5c165fffe7be4c7145085 Mon Sep 17 00:00:00 2001 From: tamaina Date: Sun, 28 Feb 2021 19:09:08 +0900 Subject: [PATCH 01/12] Fix lint --- src/client/os.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/os.ts b/src/client/os.ts index e97c2d7ba0..2b72391bf5 100644 --- a/src/client/os.ts +++ b/src/client/os.ts @@ -305,7 +305,7 @@ export async function pickEmoji(src?: HTMLElement, opts) { type AwaitType = T extends Promise ? U : - T extends (...args: Array) => Promise ? V : + T extends (...args: any[]) => Promise ? V : T; let openingEmojiPicker: AwaitType> | null = null; let activeTextarea: HTMLTextAreaElement | HTMLInputElement | null = null; From 2752afd5f5a68c555c892b68ad8405f9ed204a69 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 21:07:13 +0000 Subject: [PATCH 02/12] Bump cbor from 7.0.1 to 7.0.3 Bumps [cbor](https://github.com/hildjj/node-cbor/tree/HEAD/packages/cbor) from 7.0.1 to 7.0.3. - [Release notes](https://github.com/hildjj/node-cbor/releases) - [Commits](https://github.com/hildjj/node-cbor/commits/v7.0.3/packages/cbor) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 26 +++++++++++++++++--------- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 21a42f98d6..fa877da075 100644 --- a/package.json +++ b/package.json @@ -120,7 +120,7 @@ "broadcast-channel": "3.4.1", "bull": "3.20.1", "cafy": "15.2.1", - "cbor": "7.0.1", + "cbor": "7.0.3", "chalk": "4.1.0", "chart.js": "2.9.4", "cli-highlight": "2.1.10", diff --git a/yarn.lock b/yarn.lock index b8edcb8501..629dba80c4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -214,6 +214,11 @@ lodash "^4.17.19" to-fast-properties "^2.0.0" +"@cto.af/textdecoder@^0.0.0": + version "0.0.0" + resolved "https://registry.yarnpkg.com/@cto.af/textdecoder/-/textdecoder-0.0.0.tgz#e1e8d84c936c30a0f4619971f19ca41941af9fdc" + integrity sha512-sJpx3F5xcVV/9jNYJQtvimo4Vfld/nD3ph+ZWtQzZ03Zo8rJC7QKQTRcIGS13Rcz80DwFNthCWMrd58vpY4ZAQ== + "@discoveryjs/json-ext@^0.5.0": version "0.5.2" resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.2.tgz#8f03a22a04de437254e8ce8cc84ba39689288752" @@ -2390,12 +2395,13 @@ caseless@~0.12.0: resolved "https://registry.yarnpkg.com/caseless/-/caseless-0.12.0.tgz#1b681c21ff84033c826543090689420d187151dc" integrity sha1-G2gcIf+EAzyCZUMJBolCDRhxUdw= -cbor@7.0.1: - version "7.0.1" - resolved "https://registry.yarnpkg.com/cbor/-/cbor-7.0.1.tgz#b939a0ae1ce9bb76338e1d193ab2ccd9a85d55d0" - integrity sha512-+SVEDS4B2x9aat+if8rtUbm8WdxArH2/tVKiSD8eCxy7hnVNlESd4EQQM16EOFrUCvSHECscsvq61N1FPejZtw== +cbor@7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/cbor/-/cbor-7.0.3.tgz#216d292f2aedd1bb61414a8f949b63e4de11b33b" + integrity sha512-Io+lJytjYBJKgJqZQUz2bFaMPj+HtlsnT9kHSUiIJFqzWa05lm5/ycQ+NiZWpks3DR2Fz7j7axiTGeT57w/syg== dependencies: - nofilter "^2.0.0" + "@cto.af/textdecoder" "^0.0.0" + nofilter "^2.0.3" center-align@^0.1.1: version "0.1.3" @@ -7000,10 +7006,12 @@ nodemailer@6.5.0: resolved "https://registry.yarnpkg.com/nodemailer/-/nodemailer-6.5.0.tgz#d12c28d8d48778918e25f1999d97910231b175d9" integrity sha512-Tm4RPrrIZbnqDKAvX+/4M+zovEReiKlEXWDzG4iwtpL9X34MJY+D5LnQPH/+eghe8DLlAVshHAJZAZWBGhkguw== -nofilter@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-2.0.0.tgz#57a2d7c6fcd34dd396f490d6942c4f58640b5823" - integrity sha512-i3ck2PUWBa+trsGGBvwS3msnTowbFei5G++BgpOpT7y7VTrprXphMQP5svTdsMLdttKDZFo+5RqVWRqhmf+BwQ== +nofilter@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/nofilter/-/nofilter-2.0.3.tgz#f5460f3cb33147005883e3f5d4476239501fa187" + integrity sha512-FbuXC+lK+GU2+63D1kC1ETiZo+Z7SIi7B+mxKTCH1byrh6WFvfBCN/wpherFz0a0bjGd7EKTst/cz0yLeNngug== + dependencies: + "@cto.af/textdecoder" "^0.0.0" noop-logger@^0.1.1: version "0.1.1" From 3c5d2ecc91b42b5eb435952bdadfdc2044c58bf0 Mon Sep 17 00:00:00 2001 From: "dependabot-preview[bot]" <27856297+dependabot-preview[bot]@users.noreply.github.com> Date: Mon, 1 Mar 2021 21:15:38 +0000 Subject: [PATCH 03/12] Bump vue-router from 4.0.3 to 4.0.4 Bumps [vue-router](https://github.com/vuejs/vue-router) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/vuejs/vue-router/releases) - [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-router/commits) Signed-off-by: dependabot-preview[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 21a42f98d6..bed52885e5 100644 --- a/package.json +++ b/package.json @@ -250,7 +250,7 @@ "vue-json-pretty": "1.7.1", "vue-loader": "16.1.2", "vue-prism-editor": "2.0.0-alpha.2", - "vue-router": "4.0.3", + "vue-router": "4.0.4", "vue-style-loader": "4.1.2", "vuedraggable": "4.0.1", "web-push": "3.4.4", diff --git a/yarn.lock b/yarn.lock index b8edcb8501..cd6ba1b886 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10982,10 +10982,10 @@ vue-prism-editor@2.0.0-alpha.2: resolved "https://registry.yarnpkg.com/vue-prism-editor/-/vue-prism-editor-2.0.0-alpha.2.tgz#aa53a88efaaed628027cbb282c2b1d37fc7c5c69" integrity sha512-Gu42ba9nosrE+gJpnAEuEkDMqG9zSUysIR8SdXUw8MQKDjBnnNR9lHC18uOr/ICz7yrA/5c7jHJr9lpElODC7w== -vue-router@4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.3.tgz#8b26050c88b2dec7e27a88835f71046b365823ec" - integrity sha512-AD1OjtVPyQHTSpoRsEGfPpxRQwhAhxcacOYO3zJ3KNkYP/r09mileSp6kdMQKhZWP2cFsPR3E2M3PZguSN5/ww== +vue-router@4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-4.0.4.tgz#ad9b4b7bbdad622407b4ff189b1646f48c1e9053" + integrity sha512-uN6PDEaYdU9aRO7mU+Dkr1uaY49hV3fucEDG/Vre/Qj8ct3RoJS16vcPrvKVzn69zDDjBV5b9Xw7fZA9r6b/Iw== vue-style-loader@4.1.2: version "4.1.2" From 2154354a4f4442c03c48936872eadba76335ab8d Mon Sep 17 00:00:00 2001 From: tamaina Date: Tue, 2 Mar 2021 22:57:16 +0900 Subject: [PATCH 04/12] Revert "perf: use overflow: clip instead of hidden" (#7273) This reverts commit 06e817af597e7ee621bdeb370c72d7555482d943. --- src/client/components/autocomplete.vue | 9 +++---- src/client/components/channel-preview.vue | 3 +-- src/client/components/drive.file.vue | 3 +-- src/client/components/form/input.vue | 3 +-- src/client/components/form/link.vue | 3 +-- src/client/components/global/avatar.vue | 3 +-- .../global/misskey-flavored-markdown.vue | 3 +-- src/client/components/instance-stats.vue | 3 +-- src/client/components/instance-ticker.vue | 3 +-- src/client/components/media-banner.vue | 6 ++--- src/client/components/media-image.vue | 3 +-- src/client/components/media-list.vue | 3 +-- src/client/components/media-video.vue | 3 +-- src/client/components/note-detailed.vue | 6 ++--- src/client/components/note-header.vue | 6 ++--- src/client/components/note-preview.vue | 3 +-- src/client/components/note.vue | 9 +++---- src/client/components/notification.vue | 6 ++--- src/client/components/poll.vue | 3 +-- src/client/components/post-form-attaches.vue | 3 +-- src/client/components/sidebar.vue | 3 +-- src/client/components/toast.vue | 3 +-- src/client/components/ui/button.vue | 6 ++--- src/client/components/ui/container.vue | 3 +-- src/client/components/ui/input.vue | 6 ++--- src/client/components/ui/menu.vue | 3 +-- src/client/components/ui/modal-window.vue | 6 ++--- src/client/components/ui/range.vue | 3 +-- src/client/components/ui/window.vue | 6 ++--- src/client/components/url-preview.vue | 6 ++--- src/client/components/user-info.vue | 3 +-- src/client/components/user-preview.vue | 3 +-- src/client/components/users-dialog.vue | 6 ++--- src/client/components/visibility-picker.vue | 3 +-- src/client/pages/about-misskey.vue | 2 +- src/client/pages/follow-requests.vue | 6 ++--- src/client/pages/instance/emojis.vue | 18 +++++--------- src/client/pages/messaging/index.vue | 9 +++---- .../messaging/messaging-room.message.vue | 9 +++---- .../page-editor/page-editor.container.vue | 3 +-- src/client/pages/reversi/game.board.vue | 3 +-- src/client/pages/reversi/game.setting.vue | 3 +-- src/client/pages/settings/drive.vue | 3 +-- src/client/pages/settings/security.vue | 3 +-- src/client/pages/settings/theme.vue | 3 +-- src/client/pages/user/index.vue | 24 +++++++------------ src/client/pages/welcome.entrance.a.vue | 3 +-- src/client/pages/welcome.entrance.b.vue | 3 +-- src/client/pages/welcome.setup.vue | 3 +-- src/client/style.scss | 11 +-------- src/client/ui/_common_/header.vue | 3 +-- src/client/ui/_common_/upload.vue | 6 ++--- src/client/ui/chat/index.vue | 12 ++++------ src/client/ui/chat/note-header.vue | 6 ++--- src/client/ui/chat/note-preview.vue | 3 +-- src/client/ui/chat/note.vue | 6 ++--- src/client/ui/deck/column.vue | 6 ++--- src/client/ui/visitor/header.vue | 6 ++--- src/client/widgets/calendar.vue | 3 +-- src/client/widgets/federation.vue | 9 +++---- src/client/widgets/rss.vue | 3 +-- src/client/widgets/trends.vue | 9 +++---- 62 files changed, 105 insertions(+), 217 deletions(-) diff --git a/src/client/components/autocomplete.vue b/src/client/components/autocomplete.vue index 1fe74adc66..ae742610f7 100644 --- a/src/client/components/autocomplete.vue +++ b/src/client/components/autocomplete.vue @@ -401,8 +401,7 @@ export default defineComponent({ z-index: 65535; max-width: 100%; margin-top: calc(1em + 8px); - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; transition: top 0.1s ease, left 0.1s ease; > ol { @@ -419,8 +418,7 @@ export default defineComponent({ align-items: center; padding: 4px 12px; white-space: nowrap; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; font-size: 0.9em; cursor: default; @@ -429,8 +427,7 @@ export default defineComponent({ } * { - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; } diff --git a/src/client/components/channel-preview.vue b/src/client/components/channel-preview.vue index 3e24774f52..e222ad7ae7 100644 --- a/src/client/components/channel-preview.vue +++ b/src/client/components/channel-preview.vue @@ -66,8 +66,7 @@ export default defineComponent({ diff --git a/src/client/components/ui/button.vue b/src/client/components/ui/button.vue index e98c5efcc0..3901e8ae44 100644 --- a/src/client/components/ui/button.vue +++ b/src/client/components/ui/button.vue @@ -124,8 +124,7 @@ export default defineComponent({ text-decoration: none; background: var(--buttonBg); border-radius: 999px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; &:not(:disabled):hover { background: var(--buttonHoverBg); @@ -213,8 +212,7 @@ export default defineComponent({ width: 100%; height: 100%; border-radius: 6px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; ::v-deep(div) { position: absolute; diff --git a/src/client/components/ui/container.vue b/src/client/components/ui/container.vue index b9360e92fa..c3353cca89 100644 --- a/src/client/components/ui/container.vue +++ b/src/client/components/ui/container.vue @@ -116,8 +116,7 @@ export default defineComponent({ .ukygtjoj { position: relative; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; &.naked { background: transparent !important; diff --git a/src/client/components/ui/input.vue b/src/client/components/ui/input.vue index cea1ec1b7f..1c5222f8f2 100644 --- a/src/client/components/ui/input.vue +++ b/src/client/components/ui/input.vue @@ -298,8 +298,7 @@ export default defineComponent({ transform: scale(.75); white-space: nowrap; width: 133%; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; > .warning { @@ -355,8 +354,7 @@ export default defineComponent({ display: inline-block; min-width: 16px; max-width: 150px; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; white-space: nowrap; text-overflow: ellipsis; } diff --git a/src/client/components/ui/menu.vue b/src/client/components/ui/menu.vue index c9accf7c31..c2033402e3 100644 --- a/src/client/components/ui/menu.vue +++ b/src/client/components/ui/menu.vue @@ -155,8 +155,7 @@ export default defineComponent({ font-size: 0.9em; line-height: 20px; text-align: center; - overflow: hidden; // overflow: clip; をSafariが対応したら消す - overflow: clip; + overflow: hidden; text-overflow: ellipsis; &.danger { diff --git a/src/client/components/ui/modal-window.vue b/src/client/components/ui/modal-window.vue index 3965b537e5..2cdf961379 100644 --- a/src/client/components/ui/modal-window.vue +++ b/src/client/components/ui/modal-window.vue @@ -89,8 +89,7 @@ export default defineComponent({