Merge remote-tracking branch 'upstream/develop' into merge-upstream-12

.gitignore

@@ -68,6 +68,8 @@ misskey-assets
 # Vite temporary files
 vite.config.js.timestamp-*
 vite.config.ts.timestamp-*
+vite.config.local-dev.js.timestamp-*
+vite.config.local-dev.ts.timestamp-*
 
 # blender backups
 *.blend1

package.json

@@ -52,7 +52,7 @@
 	},
 	"dependencies": {
 		"cssnano": "6.1.2",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"fast-glob": "3.3.2",
 		"ignore-walk": "6.0.5",
 		"js-yaml": "4.1.0",

packages/backend/package.json

@@ -234,7 +234,7 @@
 		"aws-sdk-client-mock": "4.0.1",
 		"cross-env": "7.0.3",
 		"eslint-plugin-import": "2.30.0",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"fkill": "9.0.0",
 		"jest": "29.7.0",
 		"jest-mock": "29.7.0",

packages/frontend/src/pages/follow-requests.vue

@@ -17,7 +17,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 						</div>
 					</template>
 					<template #default="{items}">
-						<div class="mk-follow-requests">
+						<div class="mk-follow-requests _gaps">
 							<div v-for="req in items" :key="req.id" class="user _panel">
 								<MkAvatar class="avatar" :user="displayUser(req)" indicator link preview/>
 								<div class="body">
@@ -94,11 +94,11 @@ const headerTabs = computed(() => [
 	{
 		key: 'list',
 		title: i18n.ts._followRequest.recieved,
-		icon: 'ti ti-mail',
+		icon: 'ti ti-download',
 	}, {
 		key: 'sent',
 		title: i18n.ts._followRequest.sent,
-		icon: 'ti ti-send',
+		icon: 'ti ti-upload',
 	},
 ]);
 

packages/misskey-bubble-game/package.json

@@ -28,7 +28,7 @@
 		"@typescript-eslint/eslint-plugin": "7.1.0",
 		"@typescript-eslint/parser": "7.1.0",
 		"nodemon": "3.1.7",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"typescript": "5.6.3",
 		"esbuild": "0.24.0",
 		"glob": "11.0.0"

packages/misskey-js/package.json

@@ -47,7 +47,7 @@
 		"mock-socket": "9.3.1",
 		"ncp": "2.0.0",
 		"nodemon": "3.1.7",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"tsd": "0.31.2",
 		"typescript": "5.6.3",
 		"esbuild": "0.24.0",

packages/misskey-reversi/package.json

@@ -25,7 +25,7 @@
 		"@types/node": "22.9.0",
 		"@typescript-eslint/eslint-plugin": "7.1.0",
 		"@typescript-eslint/parser": "7.1.0",
-		"execa": "9.5.1",
+		"execa": "8.0.1",
 		"nodemon": "3.1.7",
 		"typescript": "5.6.3",
 		"esbuild": "0.24.0",