From d6e23b803b10a471bb5b1054b357c70a16e8f6da Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 23 Mar 2021 17:30:14 +0900 Subject: [PATCH] refactor: Tweak path alias of client --- src/client/account.ts | 6 +- src/client/components/abuse-report-window.vue | 8 +-- src/client/components/analog-clock.vue | 2 +- src/client/components/autocomplete.vue | 8 +-- src/client/components/avatars.vue | 2 +- .../components/channel-follow-button.vue | 2 +- src/client/components/dialog.vue | 8 +-- .../components/drive-file-thumbnail.vue | 2 +- src/client/components/drive-select-dialog.vue | 4 +- src/client/components/drive-window.vue | 2 +- src/client/components/drive.file.vue | 6 +- src/client/components/drive.folder.vue | 2 +- src/client/components/drive.nav-folder.vue | 2 +- src/client/components/drive.vue | 2 +- src/client/components/emoji-picker-dialog.vue | 4 +- src/client/components/emoji-picker-window.vue | 4 +- .../components/emoji-picker.section.vue | 2 +- src/client/components/emoji-picker.vue | 12 ++-- src/client/components/featured-photos.vue | 2 +- src/client/components/file-type-icon.vue | 2 +- src/client/components/follow-button.vue | 2 +- src/client/components/form-dialog.vue | 2 +- src/client/components/form/pagination.vue | 2 +- src/client/components/form/radios.vue | 2 +- src/client/components/formula-core.vue | 2 +- src/client/components/formula.vue | 2 +- src/client/components/global/a.vue | 12 ++-- src/client/components/global/acct.vue | 2 +- src/client/components/global/avatar.vue | 6 +- src/client/components/global/emoji.vue | 4 +- src/client/components/global/error.vue | 2 +- src/client/components/global/loading.vue | 2 +- .../global/misskey-flavored-markdown.vue | 2 +- src/client/components/global/url.vue | 8 +-- src/client/components/google.vue | 2 +- src/client/components/image-viewer.vue | 6 +- src/client/components/instance-stats.vue | 4 +- src/client/components/instance-ticker.vue | 2 +- src/client/components/launch-pad.vue | 6 +- src/client/components/link.vue | 8 +-- src/client/components/media-banner.vue | 4 +- src/client/components/media-image.vue | 6 +- src/client/components/media-list.vue | 2 +- src/client/components/media-video.vue | 2 +- src/client/components/mention.vue | 4 +- src/client/components/mfm.ts | 24 ++++---- src/client/components/mini-chart.vue | 2 +- src/client/components/note-detailed.vue | 24 ++++---- src/client/components/note-header.vue | 2 +- src/client/components/note-preview.vue | 2 +- src/client/components/note.sub.vue | 2 +- src/client/components/note.vue | 24 ++++---- src/client/components/notes.vue | 4 +- .../notification-setting-window.vue | 2 +- src/client/components/notification.vue | 4 +- src/client/components/notifications.vue | 4 +- src/client/components/page-preview.vue | 2 +- src/client/components/page-window.vue | 12 ++-- src/client/components/page/page.block.vue | 4 +- src/client/components/page/page.button.vue | 6 +- src/client/components/page/page.canvas.vue | 6 +- src/client/components/page/page.counter.vue | 6 +- src/client/components/page/page.if.vue | 4 +- src/client/components/page/page.image.vue | 6 +- src/client/components/page/page.note.vue | 8 +-- .../components/page/page.number-input.vue | 6 +- src/client/components/page/page.post.vue | 8 +-- .../components/page/page.radio-button.vue | 6 +- src/client/components/page/page.section.vue | 6 +- src/client/components/page/page.switch.vue | 6 +- .../components/page/page.text-input.vue | 6 +- src/client/components/page/page.text.vue | 6 +- .../components/page/page.textarea-input.vue | 8 +-- src/client/components/page/page.textarea.vue | 4 +- src/client/components/page/page.vue | 8 +-- src/client/components/poll.vue | 2 +- src/client/components/post-form-attaches.vue | 2 +- src/client/components/post-form-dialog.vue | 4 +- src/client/components/post-form.vue | 12 ++-- .../components/reactions-viewer.reaction.vue | 6 +- src/client/components/remote-caution.vue | 2 +- src/client/components/sample.vue | 14 ++--- src/client/components/sidebar.vue | 10 ++-- src/client/components/signin-dialog.vue | 2 +- src/client/components/signin.vue | 8 +-- src/client/components/signup-dialog.vue | 2 +- src/client/components/signup.vue | 6 +- src/client/components/sub-note-content.vue | 2 +- .../components/taskmanager.api-window.vue | 4 +- src/client/components/taskmanager.vue | 10 ++-- src/client/components/timeline.vue | 4 +- .../components/token-generate-window.vue | 2 +- src/client/components/ui/context-menu.vue | 2 +- src/client/components/ui/hr.vue | 2 +- src/client/components/ui/info.vue | 2 +- src/client/components/ui/input.vue | 2 +- src/client/components/ui/menu.vue | 4 +- src/client/components/ui/pagination.vue | 2 +- src/client/components/ui/radios.vue | 2 +- src/client/components/ui/window.vue | 4 +- src/client/components/url-preview-popup.vue | 2 +- src/client/components/url-preview.vue | 4 +- src/client/components/user-list.vue | 2 +- src/client/components/user-preview.vue | 2 +- src/client/components/user-select-dialog.vue | 4 +- src/client/components/users-dialog.vue | 2 +- src/client/components/visibility-picker.vue | 2 +- src/client/components/waiting-dialog.vue | 2 +- src/client/components/widgets.vue | 6 +- src/client/directives/follow-append.ts | 2 +- src/client/directives/particle.ts | 4 +- src/client/directives/tooltip.ts | 6 +- src/client/directives/user-preview.ts | 4 +- src/client/filters/user.ts | 2 +- src/client/i18n.ts | 2 +- src/client/init.ts | 56 +++++++++---------- src/client/os.ts | 38 ++++++------- src/client/pages/_error_.vue | 2 +- src/client/pages/_loading_.vue | 2 +- src/client/pages/about-misskey.vue | 16 +++--- src/client/pages/about.vue | 14 ++--- src/client/pages/advanced-theme-editor.vue | 24 ++++---- src/client/pages/announcements.vue | 6 +- src/client/pages/api-console.vue | 10 ++-- src/client/pages/auth.form.vue | 4 +- src/client/pages/auth.vue | 6 +- src/client/pages/channel-editor.vue | 10 ++-- src/client/pages/channel.vue | 10 ++-- src/client/pages/channels.vue | 8 +-- src/client/pages/clip.vue | 8 +-- src/client/pages/doc.vue | 4 +- src/client/pages/docs.vue | 2 +- src/client/pages/drive.vue | 4 +- src/client/pages/explore.vue | 10 ++-- src/client/pages/favorites.vue | 6 +- src/client/pages/featured.vue | 4 +- src/client/pages/follow-requests.vue | 4 +- src/client/pages/follow.vue | 2 +- src/client/pages/instance/abuses.vue | 10 ++-- src/client/pages/instance/announcements.vue | 8 +-- .../pages/instance/emoji-edit-dialog.vue | 8 +-- src/client/pages/instance/emojis.vue | 12 ++-- src/client/pages/instance/federation.vue | 10 ++-- src/client/pages/instance/file-dialog.vue | 14 ++--- src/client/pages/instance/files.vue | 14 ++--- src/client/pages/instance/index.metrics.vue | 14 ++--- src/client/pages/instance/index.vue | 16 +++--- src/client/pages/instance/instance.vue | 14 ++--- src/client/pages/instance/logs.vue | 10 ++-- src/client/pages/instance/queue.chart.vue | 2 +- src/client/pages/instance/queue.vue | 4 +- src/client/pages/instance/relays.vue | 6 +- src/client/pages/instance/settings.vue | 18 +++--- src/client/pages/instance/user-dialog.vue | 10 ++-- src/client/pages/instance/users.vue | 10 ++-- src/client/pages/mentions.vue | 4 +- src/client/pages/messages.vue | 4 +- src/client/pages/messaging/index.vue | 4 +- .../pages/messaging/messaging-room.form.vue | 6 +- .../messaging/messaging-room.message.vue | 4 +- src/client/pages/messaging/messaging-room.vue | 10 ++-- src/client/pages/mfm-cheat-sheet.vue | 2 +- src/client/pages/miauth.vue | 8 +-- .../pages/my-antennas/index.antenna.vue | 12 ++-- src/client/pages/my-antennas/index.vue | 4 +- src/client/pages/my-clips/index.vue | 6 +- src/client/pages/my-groups/group.vue | 6 +- src/client/pages/my-groups/index.vue | 12 ++-- src/client/pages/my-lists/index.vue | 6 +- src/client/pages/my-lists/list.vue | 6 +- src/client/pages/not-found.vue | 2 +- src/client/pages/note.vue | 12 ++-- src/client/pages/notifications.vue | 6 +- .../page-editor/els/page-editor.el.button.vue | 8 +-- .../page-editor/els/page-editor.el.canvas.vue | 4 +- .../els/page-editor.el.counter.vue | 4 +- .../page-editor/els/page-editor.el.if.vue | 4 +- .../page-editor/els/page-editor.el.image.vue | 4 +- .../page-editor/els/page-editor.el.note.vue | 10 ++-- .../els/page-editor.el.number-input.vue | 4 +- .../page-editor/els/page-editor.el.post.vue | 8 +-- .../els/page-editor.el.radio-button.vue | 6 +- .../els/page-editor.el.section.vue | 2 +- .../page-editor/els/page-editor.el.switch.vue | 6 +- .../els/page-editor.el.text-input.vue | 4 +- .../page-editor/els/page-editor.el.text.vue | 2 +- .../els/page-editor.el.textarea-input.vue | 6 +- .../els/page-editor.el.textarea.vue | 2 +- .../pages/page-editor/page-editor.blocks.vue | 2 +- .../page-editor/page-editor.script-block.vue | 10 ++-- src/client/pages/page-editor/page-editor.vue | 24 ++++---- src/client/pages/page.vue | 4 +- src/client/pages/pages.vue | 8 +-- src/client/pages/preview.vue | 2 +- src/client/pages/reversi/game.board.vue | 10 ++-- src/client/pages/reversi/game.setting.vue | 6 +- src/client/pages/reversi/game.vue | 2 +- src/client/pages/reversi/index.vue | 6 +- src/client/pages/room/preview.vue | 2 +- src/client/pages/room/room.vue | 14 ++--- src/client/pages/scratchpad.vue | 8 +-- src/client/pages/search.vue | 4 +- src/client/pages/settings/2fa.vue | 20 +++---- src/client/pages/settings/account-info.vue | 20 +++---- src/client/pages/settings/api.vue | 16 +++--- src/client/pages/settings/apps.vue | 14 ++--- src/client/pages/settings/deck.vue | 18 +++--- src/client/pages/settings/drive.vue | 12 ++-- src/client/pages/settings/email-address.vue | 10 ++-- .../pages/settings/email-notification.vue | 10 ++-- src/client/pages/settings/email.vue | 12 ++-- .../pages/settings/experimental-features.vue | 16 +++--- src/client/pages/settings/general.vue | 26 ++++----- src/client/pages/settings/import-export.vue | 12 ++-- src/client/pages/settings/index.vue | 16 +++--- src/client/pages/settings/integration.vue | 8 +-- src/client/pages/settings/mute-block.vue | 16 +++--- src/client/pages/settings/notifications.vue | 12 ++-- src/client/pages/settings/other.vue | 24 ++++---- src/client/pages/settings/plugin.install.vue | 24 ++++---- src/client/pages/settings/plugin.manage.vue | 18 +++--- src/client/pages/settings/plugin.vue | 10 ++-- src/client/pages/settings/privacy.vue | 12 ++-- src/client/pages/settings/profile.vue | 20 +++---- src/client/pages/settings/reaction.vue | 14 ++--- src/client/pages/settings/registry.keys.vue | 18 +++--- src/client/pages/settings/registry.value.vue | 18 +++--- src/client/pages/settings/registry.vue | 18 +++--- src/client/pages/settings/security.vue | 12 ++-- src/client/pages/settings/sidebar.vue | 18 +++--- src/client/pages/settings/sounds.vue | 16 +++--- src/client/pages/settings/theme.install.vue | 22 ++++---- src/client/pages/settings/theme.manage.vue | 24 ++++---- src/client/pages/settings/theme.vue | 26 ++++----- src/client/pages/settings/update.vue | 20 +++---- src/client/pages/settings/word-mute.vue | 16 +++--- src/client/pages/share.vue | 6 +- src/client/pages/tag.vue | 4 +- src/client/pages/test.vue | 12 ++-- src/client/pages/theme-editor.vue | 18 +++--- src/client/pages/timeline.tutorial.vue | 2 +- src/client/pages/timeline.vue | 10 ++-- src/client/pages/user/clips.vue | 2 +- src/client/pages/user/follow-list.vue | 4 +- src/client/pages/user/index.activity.vue | 4 +- src/client/pages/user/index.photos.vue | 6 +- src/client/pages/user/index.timeline.vue | 6 +- src/client/pages/user/index.vue | 20 +++---- src/client/pages/user/pages.vue | 4 +- src/client/pages/v.vue | 2 +- src/client/pages/welcome.entrance.a.vue | 16 +++--- src/client/pages/welcome.entrance.b.vue | 16 +++--- src/client/pages/welcome.entrance.c.vue | 16 +++--- src/client/pages/welcome.setup.vue | 10 ++-- src/client/pages/welcome.timeline.vue | 4 +- src/client/pages/welcome.vue | 4 +- src/client/plugin.ts | 6 +- src/client/router.ts | 6 +- src/client/scripts/aiscript/api.ts | 4 +- src/client/scripts/autocomplete.ts | 4 +- src/client/scripts/gen-search-query.ts | 2 +- src/client/scripts/get-static-image-url.ts | 2 +- src/client/scripts/get-user-menu.ts | 16 +++--- src/client/scripts/hpml/evaluator.ts | 4 +- src/client/scripts/initialize-sw.ts | 8 +-- src/client/scripts/paging.ts | 2 +- src/client/scripts/please-login.ts | 6 +- src/client/scripts/popout.ts | 2 +- src/client/scripts/reaction-picker.ts | 4 +- src/client/scripts/search.ts | 6 +- src/client/scripts/select-file.ts | 4 +- src/client/scripts/sound.ts | 2 +- src/client/scripts/stream.ts | 2 +- src/client/sidebar.ts | 8 +-- src/client/sw/sw.ts | 2 +- src/client/theme-store.ts | 4 +- src/client/tsconfig.json | 3 +- src/client/ui/_common_/common.vue | 8 +-- src/client/ui/_common_/stream-indicator.vue | 2 +- src/client/ui/_common_/upload.vue | 2 +- src/client/ui/chat/header-clock.vue | 2 +- src/client/ui/chat/index.vue | 14 ++--- src/client/ui/chat/note-header.vue | 6 +- src/client/ui/chat/note-preview.vue | 4 +- src/client/ui/chat/note.sub.vue | 4 +- src/client/ui/chat/note.vue | 32 +++++------ src/client/ui/chat/notes.vue | 4 +- src/client/ui/chat/post-form.vue | 18 +++--- src/client/ui/chat/side.vue | 8 +-- src/client/ui/chat/sub-note-content.vue | 6 +- src/client/ui/chat/timeline.vue | 10 ++-- src/client/ui/chat/widgets.vue | 2 +- src/client/ui/deck.vue | 12 ++-- src/client/ui/deck/antenna-column.vue | 4 +- src/client/ui/deck/column.vue | 2 +- src/client/ui/deck/deck-store.ts | 4 +- src/client/ui/deck/direct-column.vue | 6 +- src/client/ui/deck/list-column.vue | 4 +- src/client/ui/deck/main-column.vue | 8 +-- src/client/ui/deck/mentions-column.vue | 6 +- src/client/ui/deck/notifications-column.vue | 6 +- src/client/ui/deck/tl-column.vue | 4 +- src/client/ui/deck/widgets-column.vue | 2 +- src/client/ui/default.side.vue | 8 +-- src/client/ui/default.vue | 10 ++-- src/client/ui/default.widgets.vue | 4 +- src/client/ui/desktop.vue | 12 ++-- src/client/ui/visitor/a.vue | 12 ++-- src/client/ui/visitor/b.vue | 16 +++--- src/client/ui/visitor/header.vue | 8 +-- src/client/ui/visitor/kanban.vue | 12 ++-- src/client/ui/zen.vue | 2 +- src/client/widgets/activity.calendar.vue | 2 +- src/client/widgets/activity.chart.vue | 2 +- src/client/widgets/activity.vue | 4 +- src/client/widgets/aiscript.vue | 6 +- src/client/widgets/button.vue | 6 +- src/client/widgets/calendar.vue | 2 +- src/client/widgets/clock.vue | 6 +- src/client/widgets/define.ts | 4 +- src/client/widgets/digital-clock.vue | 2 +- src/client/widgets/federation.vue | 6 +- src/client/widgets/job-queue.vue | 4 +- src/client/widgets/memo.vue | 4 +- src/client/widgets/notifications.vue | 8 +-- src/client/widgets/online-users.vue | 2 +- src/client/widgets/photos.vue | 6 +- src/client/widgets/post-form.vue | 2 +- src/client/widgets/rss.vue | 4 +- src/client/widgets/server-metric/disk.vue | 2 +- src/client/widgets/server-metric/index.vue | 4 +- src/client/widgets/server-metric/mem.vue | 2 +- src/client/widgets/server-metric/net.vue | 2 +- src/client/widgets/slideshow.vue | 2 +- src/client/widgets/timeline.vue | 6 +- src/client/widgets/trends.vue | 6 +- src/tsconfig.json | 3 + webpack.config.ts | 3 +- 338 files changed, 1234 insertions(+), 1229 deletions(-) diff --git a/src/client/account.ts b/src/client/account.ts index e5b451cf14..6f06ee0f32 100644 --- a/src/client/account.ts +++ b/src/client/account.ts @@ -1,7 +1,7 @@ import { reactive } from 'vue'; -import { apiUrl } from '@/config'; -import { waiting } from '@/os'; -import { unisonReload } from '@/scripts/unison-reload'; +import { apiUrl } from '@client/config'; +import { waiting } from '@client/os'; +import { unisonReload } from '@client/scripts/unison-reload'; // TODO: 他のタブと永続化されたstateを同期 diff --git a/src/client/components/abuse-report-window.vue b/src/client/components/abuse-report-window.vue index 98578ee44f..7dbb9657bd 100644 --- a/src/client/components/abuse-report-window.vue +++ b/src/client/components/abuse-report-window.vue @@ -29,10 +29,10 @@ diff --git a/src/client/components/ui/info.vue b/src/client/components/ui/info.vue index 5c71b14a0a..12b3dbcfd1 100644 --- a/src/client/components/ui/info.vue +++ b/src/client/components/ui/info.vue @@ -9,7 +9,7 @@ diff --git a/src/client/pages/about-misskey.vue b/src/client/pages/about-misskey.vue index a52678e3cd..2d1da88fa1 100644 --- a/src/client/pages/about-misskey.vue +++ b/src/client/pages/about-misskey.vue @@ -55,14 +55,14 @@ import { defineComponent } from 'vue'; import { faInfoCircle, faCode, faLanguage, faHandHoldingMedical, } from '@fortawesome/free-solid-svg-icons'; import VanillaTilt from 'vanilla-tilt'; -import { version } from '@/config'; -import FormLink from '@/components/form/link.vue'; -import FormBase from '@/components/form/base.vue'; -import FormGroup from '@/components/form/group.vue'; -import FormKeyValueView from '@/components/form/key-value-view.vue'; -import MkLink from '@/components/link.vue'; -import { physics } from '@/scripts/physics.ts'; -import * as os from '@/os'; +import { version } from '@client/config'; +import FormLink from '@client/components/form/link.vue'; +import FormBase from '@client/components/form/base.vue'; +import FormGroup from '@client/components/form/group.vue'; +import FormKeyValueView from '@client/components/form/key-value-view.vue'; +import MkLink from '@client/components/link.vue'; +import { physics } from '@client/scripts/physics.ts'; +import * as os from '@client/os'; const patrons = [ 'Satsuki Yanagi', diff --git a/src/client/pages/about.vue b/src/client/pages/about.vue index 6ec74bc962..911fc0bc62 100644 --- a/src/client/pages/about.vue +++ b/src/client/pages/about.vue @@ -41,13 +41,13 @@