merge: prepare release 2025.4.3 (!1125)

View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/1125

Approved-by: Marie <github@yuugi.dev>
Approved-by: Julia <julia@insertdomain.name>

8 files changed, 20 insertions, 19 deletions

diff --git a/packages/frontend-embed/src/boot.ts b/packages/frontend-embed/src/boot.ts
index 7c8336ce3f..f11cfef8fd 100644
--- a/packages/frontend-embed/src/boot.ts
+++ b/packages/frontend-embed/src/boot.ts
@@ -28,7 +28,7 @@ console.log('Sharkey Embed');
 //#region Embedパラメータの取得・パース
 const params = new URLSearchParams(location.search);
 const embedParams = parseEmbedParams(params);
-if (_DEV_) console.log(embedParams);
+if (_DEV_) console.debug(embedParams);
 //#endregion
 
 //#region テーマ
diff --git a/packages/frontend-embed/src/components/EmMfm.ts b/packages/frontend-embed/src/components/EmMfm.ts
index d377d492e0..74ae3373ef 100644
--- a/packages/frontend-embed/src/components/EmMfm.ts
+++ b/packages/frontend-embed/src/components/EmMfm.ts
@@ -5,7 +5,7 @@
 
 import { h, provide } from 'vue';
 import type { VNode, SetupContext } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { host } from '@@/js/config.js';
 import EmUrl from '@/components/EmUrl.vue';
diff --git a/packages/frontend-embed/src/components/EmNote.vue b/packages/frontend-embed/src/components/EmNote.vue
index 666cbde72d..0dc77d09a7 100644
--- a/packages/frontend-embed/src/components/EmNote.vue
+++ b/packages/frontend-embed/src/components/EmNote.vue
@@ -105,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, ref, shallowRef } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { shouldCollapsed } from '@@/js/collapsed.js';
 import { url } from '@@/js/config.js';
diff --git a/packages/frontend-embed/src/components/EmNoteDetailed.vue b/packages/frontend-embed/src/components/EmNoteDetailed.vue
index 9f4be8c666..8a10778e8a 100644
--- a/packages/frontend-embed/src/components/EmNoteDetailed.vue
+++ b/packages/frontend-embed/src/components/EmNoteDetailed.vue
@@ -64,17 +64,17 @@ SPDX-License-Identifier: AGPL-3.0-only
 			</p>
 			<div v-show="mergedCW == null || showContent">
 				<span v-if="appearNote.isHidden" style="opacity: 0.5">({{ i18n.ts.private }})</span>
-				<EmA v-if="appearNote.replyId" :class="$style.noteReplyTarget" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></EmA>
-				<EmMfm
-					v-if="appearNote.text"
-					:parsedNodes="parsed"
-					:text="appearNote.text"
-					:author="appearNote.user"
-					:nyaize="'respect'"
-					:emojiUrls="appearNote.emojis"
-					:isBlock="true"
-				/>
-				<a v-if="appearNote.renote != null" :class="$style.rn">RN:</a>
+				<div>
+					<EmA v-if="appearNote.replyId" :class="$style.noteReplyTarget" :to="`/notes/${appearNote.replyId}`"><i class="ti ti-arrow-back-up"></i></EmA>
+					<EmMfm
+						v-if="appearNote.text"
+						:parsedNodes="parsed"
+						:text="appearNote.text"
+						:author="appearNote.user"
+						:nyaize="'respect'"
+						:emojiUrls="appearNote.emojis"
+					/>
+				</div>
 				<div v-if="appearNote.files && appearNote.files.length > 0">
 					<EmMediaList :mediaList="appearNote.files" :originalEntityUrl="`${url}/notes/${appearNote.id}`"/>
 				</div>
@@ -128,7 +128,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 
 <script lang="ts" setup>
 import { computed, inject, ref } from 'vue';
-import * as mfm from '@transfem-org/sfm-js';
+import * as mfm from 'mfm-js';
 import * as Misskey from 'misskey-js';
 import { computeMergedCw } from '@@/js/compute-merged-cw.js';
 import I18n from '@/components/I18n.vue';
diff --git a/packages/frontend-embed/src/post-message.ts b/packages/frontend-embed/src/post-message.ts
index 93b57c380b..f44b58acd3 100644
--- a/packages/frontend-embed/src/post-message.ts
+++ b/packages/frontend-embed/src/post-message.ts
@@ -28,7 +28,7 @@ let defaultIframeId: string | null = null;
 export function setIframeId(id: string): void {
 	if (defaultIframeId != null) return;
 
-	if (_DEV_) console.log('setIframeId', id);
+	if (_DEV_) console.debug('setIframeId', id);
 	defaultIframeId = id;
 }
 
@@ -40,7 +40,7 @@ export function postMessageToParentWindow<T extends PostMessageEventType = PostM
 	if (_iframeId == null) {
 		_iframeId = defaultIframeId;
 	}
-	if (_DEV_) console.log('postMessageToParentWindow', type, _iframeId, payload);
+	if (_DEV_) console.debug('postMessageToParentWindow', type, _iframeId, payload);
 	window.parent.postMessage({
 		type,
 		iframeId: _iframeId,
diff --git a/packages/frontend-embed/src/style.scss b/packages/frontend-embed/src/style.scss
index ba3238cd4c..529bb606be 100644
--- a/packages/frontend-embed/src/style.scss
+++ b/packages/frontend-embed/src/style.scss
@@ -101,7 +101,7 @@ rt {
 	}
 }
 
-.ti {
+.ti, ph-lg {
 	width: 1.28em;
 	vertical-align: -12%;
 	line-height: 1em;
diff --git a/packages/frontend-embed/src/ui.vue b/packages/frontend-embed/src/ui.vue
index 4ba5968a91..24db238ca2 100644
--- a/packages/frontend-embed/src/ui.vue
+++ b/packages/frontend-embed/src/ui.vue
@@ -54,7 +54,7 @@ function safeURIDecode(str: string): string {
 
 const page = location.pathname.split('/')[2];
 const contentId = safeURIDecode(location.pathname.split('/')[3]);
-if (_DEV_) console.log(page, contentId);
+if (_DEV_) console.debug(page, contentId);
 
 const embedParams = inject(DI.embedParams, defaultEmbedParams);
 
diff --git a/packages/frontend-embed/src/workers/tsconfig.json b/packages/frontend-embed/src/workers/tsconfig.json
index 8ee8930465..39ba45ddbb 100644
--- a/packages/frontend-embed/src/workers/tsconfig.json
+++ b/packages/frontend-embed/src/workers/tsconfig.json
@@ -1,5 +1,6 @@
 {
 	"compilerOptions": {
 		"lib": ["esnext", "webworker"],
+		"incremental": true
 	}
 }