diff --git a/packages/frontend/lib/vite-plugin-create-search-index.ts b/packages/frontend/lib/vite-plugin-create-search-index.ts index 9bbc68322b..be140a3eb3 100644 --- a/packages/frontend/lib/vite-plugin-create-search-index.ts +++ b/packages/frontend/lib/vite-plugin-create-search-index.ts @@ -83,7 +83,7 @@ function extractUsageInfoFromTemplateAst( } function traverse(node: any) { - if (node.type === 1 && node.tag === 'MkSearchMarker') { + if (node.type === 1 && node.tag === 'SearchMarker') { // 元々の props を staticProps に全て展開する const staticProps: Record = {}; if (node.props && Array.isArray(node.props)) { @@ -211,7 +211,7 @@ async function processVueFile( if (ast) { function traverse(node: any, currentParent?: any) { - if (node.type === 1 && node.tag === 'MkSearchMarker') { + if (node.type === 1 && node.tag === 'SearchMarker') { // 行番号はコード先頭からの改行数で取得 const lineNumber = code.slice(0, node.loc.start.offset).split('\n').length; // ファイルパスと行番号からハッシュ値を生成 @@ -225,7 +225,7 @@ async function processVueFile( node.__markerId = nodeMarkerId; // 子マーカーの場合、親ノードに __children を設定しておく - if (currentParent && currentParent.type === 1 && currentParent.tag === 'MkSearchMarker') { + if (currentParent && currentParent.type === 1 && currentParent.tag === 'SearchMarker') { currentParent.__children = currentParent.__children || []; currentParent.__children.push(nodeMarkerId); } @@ -245,7 +245,7 @@ async function processVueFile( } } - const newParent = node.type === 1 && node.tag === 'MkSearchMarker' ? node : currentParent; + const newParent = node.type === 1 && node.tag === 'SearchMarker' ? node : currentParent; if (node.children && Array.isArray(node.children)) { node.children.forEach(child => traverse(child, newParent)); } diff --git a/packages/frontend/src/components/MkSearchMarker.vue b/packages/frontend/src/components/global/SearchMarker.vue similarity index 100% rename from packages/frontend/src/components/MkSearchMarker.vue rename to packages/frontend/src/components/global/SearchMarker.vue diff --git a/packages/frontend/src/components/index.ts b/packages/frontend/src/components/index.ts index 0252bf0252..5cba647c51 100644 --- a/packages/frontend/src/components/index.ts +++ b/packages/frontend/src/components/index.ts @@ -3,8 +3,6 @@ * SPDX-License-Identifier: AGPL-3.0-only */ -import type { App } from 'vue'; - import Mfm from './global/MkMfm.js'; import MkA from './global/MkA.vue'; import MkAcct from './global/MkAcct.vue'; @@ -26,6 +24,8 @@ import MkSpacer from './global/MkSpacer.vue'; import MkFooterSpacer from './global/MkFooterSpacer.vue'; import MkStickyContainer from './global/MkStickyContainer.vue'; import MkLazy from './global/MkLazy.vue'; +import SearchMarker from './global/SearchMarker.vue'; +import type { App } from 'vue'; export default function(app: App) { for (const [key, value] of Object.entries(components)) { @@ -55,6 +55,7 @@ export const components = { MkFooterSpacer: MkFooterSpacer, MkStickyContainer: MkStickyContainer, MkLazy: MkLazy, + SearchMarker: SearchMarker, }; declare module '@vue/runtime-core' { @@ -80,5 +81,6 @@ declare module '@vue/runtime-core' { MkFooterSpacer: typeof MkFooterSpacer; MkStickyContainer: typeof MkStickyContainer; MkLazy: typeof MkLazy; + SearchMarker: typeof SearchMarker; } } diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 77b9f6be37..26e7348201 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + - @@ -34,25 +34,25 @@ SPDX-License-Identifier: AGPL-3.0-only - +
- {{ i18n.ts.showFixedPostForm }} - + - {{ i18n.ts.showFixedPostFormInChannel }} - + - @@ -62,7 +62,7 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts.add }} {{ i18n.ts.remove }} - +
@@ -72,7 +72,7 @@ SPDX-License-Identifier: AGPL-3.0-only
- @@ -80,65 +80,65 @@ SPDX-License-Identifier: AGPL-3.0-only - + - {{ i18n.ts.showNoteActionsOnlyHover }} - + - {{ i18n.ts.showClipButtonInNoteFooter }} - + - {{ i18n.ts.enableAdvancedMfm }} - + - {{ i18n.ts.enableAnimatedMfm }} - + - {{ i18n.ts.enableQuickAddMfmFunction }} - + - {{ i18n.ts.showReactionsCount }} - + - {{ i18n.ts.showGapBetweenNotesInTimeline }} - + - {{ i18n.ts.loadRawImages }} - + - @@ -148,17 +148,17 @@ SPDX-License-Identifier: AGPL-3.0-only - + - {{ i18n.ts.limitWidthOfReaction }} - +
- @@ -168,9 +168,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + - @@ -180,9 +180,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + - @@ -193,7 +193,7 @@ SPDX-License-Identifier: AGPL-3.0-only - +
@@ -203,14 +203,14 @@ SPDX-License-Identifier: AGPL-3.0-only
- {{ i18n.ts.useGroupedNotifications }} - + - @@ -221,9 +221,9 @@ SPDX-License-Identifier: AGPL-3.0-only - + - @@ -232,7 +232,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + {{ i18n.ts._notification.checkNotificationBehavior }}
diff --git a/packages/frontend/src/pages/settings/mute-block.vue b/packages/frontend/src/pages/settings/mute-block.vue index 71e2f89a48..10aae0e5d4 100644 --- a/packages/frontend/src/pages/settings/mute-block.vue +++ b/packages/frontend/src/pages/settings/mute-block.vue @@ -5,7 +5,7 @@ SPDX-License-Identifier: AGPL-3.0-only - + - @@ -193,21 +193,21 @@ SPDX-License-Identifier: AGPL-3.0-only
{{ i18n.ts._accountSettings.mayNotEffectForFederatedNotes }}
- +
- {{ i18n.ts.rememberNoteVisibility }} - + - @@ -228,16 +228,16 @@ SPDX-License-Identifier: AGPL-3.0-only {{ i18n.ts._visibility.disableFederation }}
- + - {{ i18n.ts.keepCw }} - + @@ -258,7 +258,6 @@ import FormSlot from '@/components/form/slot.vue'; import { formatDateTimeString } from '@/scripts/format-time-string.js'; import MkInput from '@/components/MkInput.vue'; import * as os from '@/os.js'; -import MkSearchMarker from '@/components/MkSearchMarker.vue'; const $i = signinRequired(); diff --git a/packages/frontend/src/pages/settings/profile.vue b/packages/frontend/src/pages/settings/profile.vue index e6d0369215..037f801232 100644 --- a/packages/frontend/src/pages/settings/profile.vue +++ b/packages/frontend/src/pages/settings/profile.vue @@ -18,18 +18,18 @@ SPDX-License-Identifier: AGPL-3.0-only - + - + - + - + @@ -125,7 +125,6 @@ import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/MkInput.vue'; import MkSwitch from '@/components/MkSwitch.vue'; import MkSelect from '@/components/MkSelect.vue'; -import MkSearchMarker from '@/components/MkSearchMarker.vue'; import FormSplit from '@/components/form/split.vue'; import MkFolder from '@/components/MkFolder.vue'; import FormSlot from '@/components/form/slot.vue';