From 3d19008f0cb0bed027f9c51833bafacd2090d43d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Thu, 4 Jun 2026 21:59:09 +0300 Subject: [PATCH] lint --- build/sw_plugin.js | 19 ++++++++-------- src/App.js | 13 ++++++----- src/boot/after_store.js | 2 +- .../account_actions/account_actions.js | 7 ++++-- src/components/announcement/announcement.js | 4 +--- src/components/attachment/attachment.js | 9 +++----- .../basic_user_card/basic_user_card.js | 1 - src/components/block_card/block_card.js | 2 +- .../bookmark_folder_edit.js | 2 +- src/components/chat/chat.js | 6 ++--- src/components/chat_message/chat_message.js | 4 ++-- src/components/chat_title/chat_title.js | 1 - src/components/color_input/color_input.vue | 2 +- src/components/conversation/conversation.js | 3 +-- src/components/draft/draft.js | 4 ++-- src/components/draft_closer/draft_closer.js | 1 + .../edit_status_form/edit_status_form.js | 2 +- .../edit_status_modal/edit_status_modal.js | 2 +- src/components/emoji_picker/emoji_picker.js | 3 +-- .../emoji_reactions/emoji_reactions.js | 2 -- src/components/font_control/font_control.js | 2 +- src/components/interactions/interactions.js | 2 +- .../interface_language_switcher.js | 2 +- src/components/lists_edit/lists_edit.js | 4 ++-- src/components/media_modal/media_modal.js | 17 ++++++-------- src/components/mute_card/mute_card.js | 2 +- src/components/navigation/navigation_pins.js | 5 +---- src/components/notification/notification.js | 22 +++++++++---------- src/components/notifications/notifications.js | 4 ++-- src/components/poll/poll.js | 1 - .../post_status_form/post_status_form.js | 8 +++---- src/components/quote/quote.js | 5 +---- src/components/registration/registration.js | 2 +- src/components/report/report.js | 2 -- src/components/rich_content/rich_content.jsx | 2 +- src/components/search/search.js | 3 +-- .../helpers/emoji_editing_popover.vue | 1 - src/components/side_drawer/side_drawer.js | 2 +- src/components/staff_panel/staff_panel.js | 2 +- src/components/status/status.js | 4 ++-- .../action_button_container.js | 10 ++++++--- src/components/status_body/status_body.js | 6 +---- .../status_bookmark_folder_menu.js | 2 -- .../status_content/status_content.js | 6 ++--- .../status_history_modal.js | 2 -- .../still-image/still-image-emoji-popover.js | 2 -- src/components/thread_tree/thread_tree.js | 6 +---- src/components/timeline/timeline.js | 2 -- src/components/timeline_menu/timeline_menu.js | 4 ++-- src/components/user_avatar/user_avatar.js | 6 +---- src/components/user_card/user_card.js | 22 ++++++++++--------- .../user_list_popover/user_list_popover.js | 2 +- src/components/user_panel/user_panel.js | 1 + src/components/user_profile/user_profile.js | 6 ++--- .../user_reporting_modal.js | 2 -- src/components/who_to_follow/who_to_follow.js | 2 +- .../specs/components/rich_content.spec.js | 2 +- vite.config.js | 5 +---- 58 files changed, 114 insertions(+), 155 deletions(-) diff --git a/build/sw_plugin.js b/build/sw_plugin.js index 115e8ca3a..6abe7b8d6 100644 --- a/build/sw_plugin.js +++ b/build/sw_plugin.js @@ -1,7 +1,7 @@ import { readFile } from 'node:fs/promises' -import { exactRegex } from '@rolldown/pluginutils' import { dirname, resolve } from 'node:path' import { fileURLToPath } from 'node:url' +import { exactRegex } from '@rolldown/pluginutils' import { build } from 'vite' import { @@ -15,7 +15,6 @@ const getSWMessagesAsText = async () => { } const projectRoot = dirname(dirname(fileURLToPath(import.meta.url))) - // Idea taken from // https://github.com/vite-pwa/vite-plugin-pwa/blob/main/src/plugins/build.ts // rollup does not support compiling to iife if we want to code-split; @@ -27,13 +26,13 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { const swEnvName = 'virtual:pleroma-fe/service_worker_env' const swEnvNameResolved = '\0' + swEnvName - let rootConfig, config + let config return { name: 'build-sw-plugin', enforce: 'post', configResolved(resolvedConfig) { - rootConfig = resolvedConfig + resolvedConfig config = { define: resolvedConfig.define, resolve: resolvedConfig.resolve, @@ -44,14 +43,14 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { emptyOutDir: false, rolldownOptions: { input: { - main: swSrc + main: swSrc, }, context: 'self', output: { entryFileNames: swDest, codeSplitting: false, format: 'iife', - } + }, }, }, configFile: false, @@ -76,7 +75,7 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { filter: { id: exactRegex(swEnvNameResolved) }, handler() { return `self.serviceWorkerOption = { assets: ${JSON.stringify(assets)} };` - } + }, }, }) }, @@ -85,7 +84,7 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { filter: { id: new RegExp(swDest) }, handler() { return swFullSrc - } + }, }, load: { filter: { id: new RegExp(swFullSrc) }, @@ -100,12 +99,12 @@ export const buildSwPlugin = ({ swSrc, swDest }) => { load: { filter: { id: exactRegex(swEnvNameResolved) }, handler: () => 'self.serviceWorkerOption = { assets: [] }', - } + }, }) const swBundle = await build(config) return swBundle.output[0] - } + }, }, closeBundle: { order: 'post', diff --git a/src/App.js b/src/App.js index 0f755a1f0..e2f6c6454 100644 --- a/src/App.js +++ b/src/App.js @@ -38,13 +38,14 @@ export default { InstanceSpecificPanel, FeaturesPanel, WhoToFollowPanel: defineAsyncComponent( - () => import('src/components/who_to_follow_panel/who_to_follow_panel.vue'), + () => + import('src/components/who_to_follow_panel/who_to_follow_panel.vue'), ), ShoutPanel: defineAsyncComponent( () => import('src/components/shout_panel/shout_panel.vue'), ), - MediaModal: defineAsyncComponent( - () => import( 'src/components/media_modal/media_modal.vue'), + MediaModal: defineAsyncComponent( + () => import('src/components/media_modal/media_modal.vue'), ), MobilePostStatusButton, MobileNav, @@ -53,13 +54,15 @@ export default { () => import('src/components/settings_modal/settings_modal.vue'), ), UpdateNotification: defineAsyncComponent( - () => import('src/components/update_notification/update_notification.vue'), + () => + import('src/components/update_notification/update_notification.vue'), ), PostStatusModal: defineAsyncComponent( () => import('src/components/post_status_modal/post_status_modal.vue'), ), UserReportingModal: defineAsyncComponent( - () => import('src/components/user_reporting_modal/user_reporting_modal.vue') + () => + import('src/components/user_reporting_modal/user_reporting_modal.vue'), ), EditStatusModal: defineAsyncComponent( () => import('src/components/edit_status_modal/edit_status_modal.vue'), diff --git a/src/boot/after_store.js b/src/boot/after_store.js index 8e008aef2..fe65a7387 100644 --- a/src/boot/after_store.js +++ b/src/boot/after_store.js @@ -6,8 +6,8 @@ import { createRouter, createWebHistory } from 'vue-router' import VueVirtualScroller from 'vue-virtual-scroller' import 'vue-virtual-scroller/dist/vue-virtual-scroller.css' -import Status from 'src/components/status/status.vue' import RichContent from 'src/components/rich_content/rich_content.jsx' +import Status from 'src/components/status/status.vue' import StillImage from 'src/components/still-image/still-image.vue' import { config } from '@fortawesome/fontawesome-svg-core' diff --git a/src/components/account_actions/account_actions.js b/src/components/account_actions/account_actions.js index 2465639de..9b4775b97 100644 --- a/src/components/account_actions/account_actions.js +++ b/src/components/account_actions/account_actions.js @@ -1,9 +1,9 @@ import { mapState } from 'pinia' import { defineAsyncComponent } from 'vue' -import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue' import Popover from 'src/components/popover/popover.vue' import ProgressButton from 'src/components/progress_button/progress_button.vue' +import UserListMenu from 'src/components/user_list_menu/user_list_menu.vue' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' import { useMergedConfigStore } from 'src/stores/merged_config.js' @@ -30,7 +30,10 @@ const AccountActions = { () => import('src/components/confirm_modal/confirm_modal.vue'), ), UserTimedFilterModal: defineAsyncComponent( - () => import( 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue'), + () => + import( + 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' + ), ), }, methods: { diff --git a/src/components/announcement/announcement.js b/src/components/announcement/announcement.js index 9b3dbc859..7f559f8fe 100644 --- a/src/components/announcement/announcement.js +++ b/src/components/announcement/announcement.js @@ -1,15 +1,13 @@ import { mapState } from 'vuex' -import localeService from '../../services/locale/locale.service.js' import AnnouncementEditor from 'src/components/announcement_editor/announcement_editor.vue' - +import localeService from '../../services/locale/locale.service.js' import { useAnnouncementsStore } from 'src/stores/announcements.js' const Announcement = { components: { AnnouncementEditor, - }, data() { return { diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index 615c1389c..4b733258f 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -1,10 +1,9 @@ import { mapState } from 'pinia' import { defineAsyncComponent } from 'vue' -import nsfwImage from '../../assets/nsfw.png' import Popover from 'src/components/popover/popover.vue' - import VideoAttachment from 'src/components/video_attachment/video_attachment.vue' +import nsfwImage from '../../assets/nsfw.png' import { useInstanceStore } from 'src/stores/instance.js' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' @@ -69,12 +68,10 @@ const Attachment = { } }, components: { - Flash: defineAsyncComponent( - () => import( 'src/components/flash/flash.vue'), - ), + Flash: defineAsyncComponent(() => import('src/components/flash/flash.vue')), VideoAttachment: defineAsyncComponent( - () => import( 'src/components/video_attachment/video_attachment.vue'), + () => import('src/components/video_attachment/video_attachment.vue'), ), Popover, }, diff --git a/src/components/basic_user_card/basic_user_card.js b/src/components/basic_user_card/basic_user_card.js index 73a664b33..1c69f81b4 100644 --- a/src/components/basic_user_card/basic_user_card.js +++ b/src/components/basic_user_card/basic_user_card.js @@ -1,4 +1,3 @@ - import UserAvatar from 'src/components/user_avatar/user_avatar.vue' import UserLink from 'src/components/user_link/user_link.vue' import UserPopover from 'src/components/user_popover/user_popover.vue' diff --git a/src/components/block_card/block_card.js b/src/components/block_card/block_card.js index 0e7335c65..6484accff 100644 --- a/src/components/block_card/block_card.js +++ b/src/components/block_card/block_card.js @@ -1,7 +1,7 @@ import { mapState } from 'pinia' -import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' import BasicUserCard from 'src/components/basic_user_card/basic_user_card.vue' +import UserTimedFilterModal from 'src/components/user_timed_filter_modal/user_timed_filter_modal.vue' import { useInstanceCapabilitiesStore } from 'src/stores/instance_capabilities.js' diff --git a/src/components/bookmark_folder_edit/bookmark_folder_edit.js b/src/components/bookmark_folder_edit/bookmark_folder_edit.js index 2bfe780f3..43aa239b2 100644 --- a/src/components/bookmark_folder_edit/bookmark_folder_edit.js +++ b/src/components/bookmark_folder_edit/bookmark_folder_edit.js @@ -1,5 +1,5 @@ -import apiService from '../../services/api/api.service' import EmojiPicker from 'src/components/emoji_picker/emoji_picker.vue' +import apiService from '../../services/api/api.service' import { useBookmarkFoldersStore } from 'src/stores/bookmark_folders.js' import { useInterfaceStore } from 'src/stores/interface.js' diff --git a/src/components/chat/chat.js b/src/components/chat/chat.js index 8005c2c70..7428c0dc7 100644 --- a/src/components/chat/chat.js +++ b/src/components/chat/chat.js @@ -2,13 +2,13 @@ import { throttle } from 'lodash' import { mapState as mapPiniaState } from 'pinia' import { mapGetters, mapState } from 'vuex' +import ChatMessage from 'src/components/chat_message/chat_message.vue' +import ChatTitle from 'src/components/chat_title/chat_title.vue' +import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' import { WSConnectionStatus } from '../../services/api/api.service.js' import chatService from '../../services/chat_service/chat_service.js' import { buildFakeMessage } from '../../services/chat_utils/chat_utils.js' import { promiseInterval } from '../../services/promise_interval/promise_interval.js' -import ChatMessage from 'src/components/chat_message/chat_message.vue' -import ChatTitle from 'src/components/chat_title/chat_title.vue' -import PostStatusForm from 'src/components/post_status_form/post_status_form.vue' import { getNewTopPosition, getScrollPosition, diff --git a/src/components/chat_message/chat_message.js b/src/components/chat_message/chat_message.js index 12a147803..ba06172ed 100644 --- a/src/components/chat_message/chat_message.js +++ b/src/components/chat_message/chat_message.js @@ -1,15 +1,15 @@ import { mapState as mapPiniaState } from 'pinia' -import { mapGetters, mapState } from 'vuex' import { defineAsyncComponent } from 'vue' +import { mapGetters, mapState } from 'vuex' import Attachment from 'src/components/attachment/attachment.vue' import ChatMessageDate from 'src/components/chat_message_date/chat_message_date.vue' +import Gallery from 'src/components/gallery/gallery.vue' import LinkPreview from 'src/components/link-preview/link-preview.vue' import Popover from 'src/components/popover/popover.vue' import StatusContent from 'src/components/status_content/status_content.vue' import UserAvatar from 'src/components/user_avatar/user_avatar.vue' import UserPopover from 'src/components/user_popover/user_popover.vue' -import Gallery from 'src/components/gallery/gallery.vue' import { useInstanceStore } from 'src/stores/instance.js' import { useInterfaceStore } from 'src/stores/interface' diff --git a/src/components/chat_title/chat_title.js b/src/components/chat_title/chat_title.js index 5a2b5d775..52d4445b6 100644 --- a/src/components/chat_title/chat_title.js +++ b/src/components/chat_title/chat_title.js @@ -1,6 +1,5 @@ import { defineAsyncComponent } from 'vue' - import UserAvatar from 'src/components/user_avatar/user_avatar.vue' import UserPopover from 'src/components/user_popover/user_popover.vue' diff --git a/src/components/color_input/color_input.vue b/src/components/color_input/color_input.vue index f7e553f58..208bdf2dc 100644 --- a/src/components/color_input/color_input.vue +++ b/src/components/color_input/color_input.vue @@ -66,8 +66,8 @@