From 406b4bdbe79b5b0b68fcdcb3c4b6e419460a0258 Mon Sep 17 00:00:00 2001 From: zyoshoka <107108195+zyoshoka@users.noreply.github.com> Date: Thu, 7 Dec 2023 14:42:09 +0900 Subject: refactor(frontend): 非推奨となったReactivity Transformを使わないように (#12539) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * refactor(frontend): 非推奨となったReactivity Transformを使わないように * refactor: 不要な括弧を除去 * fix: 不要なアノテーションを除去 * fix: Refの配列をrefしている部分の対応 * refactor: 不要な括弧を除去 * fix: lint * refactor: Ref、ShallowRef、ComputedRefの変数の宣言をletからconstに置換 * fix: type error * chore: drop reactivity transform from eslint configuration * refactor: remove unnecessary import * fix: 対応漏れ --- packages/frontend/src/pages/admin/_header_.vue | 8 +- packages/frontend/src/pages/admin/abuses.vue | 26 ++--- packages/frontend/src/pages/admin/ads.vue | 20 ++-- .../frontend/src/pages/admin/announcements.vue | 20 ++-- .../frontend/src/pages/admin/bot-protection.vue | 48 ++++----- packages/frontend/src/pages/admin/branding.vue | 76 ++++++------- packages/frontend/src/pages/admin/database.vue | 6 +- .../frontend/src/pages/admin/email-settings.vue | 46 ++++---- .../frontend/src/pages/admin/external-services.vue | 18 ++-- packages/frontend/src/pages/admin/federation.vue | 30 +++--- packages/frontend/src/pages/admin/files.vue | 24 ++--- packages/frontend/src/pages/admin/index.vue | 100 ++++++++--------- .../frontend/src/pages/admin/instance-block.vue | 19 ++-- packages/frontend/src/pages/admin/invites.vue | 8 +- packages/frontend/src/pages/admin/moderation.vue | 46 ++++---- packages/frontend/src/pages/admin/modlog.vue | 16 +-- .../frontend/src/pages/admin/object-storage.vue | 82 +++++++------- .../frontend/src/pages/admin/other-settings.vue | 30 +++--- .../src/pages/admin/overview.active-users.vue | 10 +- .../src/pages/admin/overview.ap-requests.vue | 14 +-- .../src/pages/admin/overview.federation.vue | 30 +++--- .../frontend/src/pages/admin/overview.heatmap.vue | 3 +- .../src/pages/admin/overview.moderators.vue | 10 +- .../frontend/src/pages/admin/overview.queue.vue | 26 ++--- .../frontend/src/pages/admin/overview.stats.vue | 22 ++-- .../frontend/src/pages/admin/overview.users.vue | 9 +- packages/frontend/src/pages/admin/overview.vue | 44 ++++---- .../frontend/src/pages/admin/proxy-account.vue | 22 ++-- packages/frontend/src/pages/admin/queue.chart.vue | 26 ++--- packages/frontend/src/pages/admin/queue.vue | 9 +- packages/frontend/src/pages/admin/relays.vue | 10 +- packages/frontend/src/pages/admin/roles.edit.vue | 28 ++--- packages/frontend/src/pages/admin/roles.editor.vue | 54 +++++----- packages/frontend/src/pages/admin/roles.role.vue | 14 +-- packages/frontend/src/pages/admin/roles.vue | 4 +- packages/frontend/src/pages/admin/security.vue | 80 +++++++------- packages/frontend/src/pages/admin/server-rules.vue | 10 +- packages/frontend/src/pages/admin/settings.vue | 118 ++++++++++----------- packages/frontend/src/pages/admin/users.vue | 30 +++--- 39 files changed, 600 insertions(+), 596 deletions(-) (limited to 'packages/frontend/src/pages/admin') diff --git a/packages/frontend/src/pages/admin/_header_.vue b/packages/frontend/src/pages/admin/_header_.vue index 503fb2af9c..03f28b5219 100644 --- a/packages/frontend/src/pages/admin/_header_.vue +++ b/packages/frontend/src/pages/admin/_header_.vue @@ -69,7 +69,7 @@ const metadata = injectPageMetadata(); const el = shallowRef(null); const tabRefs = {}; -const tabHighlightEl = $shallowRef(null); +const tabHighlightEl = shallowRef(null); const bg = ref(null); const height = ref(0); const hasTabs = computed(() => { @@ -131,13 +131,13 @@ onMounted(() => { watch(() => [props.tab, props.tabs], () => { nextTick(() => { const tabEl = tabRefs[props.tab]; - if (tabEl && tabHighlightEl) { + if (tabEl && tabHighlightEl.value) { // offsetWidth や offsetLeft は少数を丸めてしまうため getBoundingClientRect を使う必要がある // https://developer.mozilla.org/ja/docs/Web/API/HTMLElement/offsetWidth#%E5%80%A4 const parentRect = tabEl.parentElement.getBoundingClientRect(); const rect = tabEl.getBoundingClientRect(); - tabHighlightEl.style.width = rect.width + 'px'; - tabHighlightEl.style.left = (rect.left - parentRect.left) + 'px'; + tabHighlightEl.value.style.width = rect.width + 'px'; + tabHighlightEl.value.style.left = (rect.left - parentRect.left) + 'px'; } }); }, { diff --git a/packages/frontend/src/pages/admin/abuses.vue b/packages/frontend/src/pages/admin/abuses.vue index 875702ee7e..3613189548 100644 --- a/packages/frontend/src/pages/admin/abuses.vue +++ b/packages/frontend/src/pages/admin/abuses.vue @@ -52,7 +52,7 @@ SPDX-License-Identifier: AGPL-3.0-only diff --git a/packages/frontend/src/pages/admin/overview.federation.vue b/packages/frontend/src/pages/admin/overview.federation.vue index 346a9c0258..033fc9ad85 100644 --- a/packages/frontend/src/pages/admin/overview.federation.vue +++ b/packages/frontend/src/pages/admin/overview.federation.vue @@ -46,7 +46,7 @@ SPDX-License-Identifier: AGPL-3.0-only diff --git a/packages/frontend/src/pages/admin/overview.heatmap.vue b/packages/frontend/src/pages/admin/overview.heatmap.vue index 4d09f183bf..8e3c809353 100644 --- a/packages/frontend/src/pages/admin/overview.heatmap.vue +++ b/packages/frontend/src/pages/admin/overview.heatmap.vue @@ -17,10 +17,11 @@ SPDX-License-Identifier: AGPL-3.0-only