Merge remote-tracking branch 'misskey-original/develop' into develop

# Conflicts: # packages/frontend/src/components/MkNote.vue
2024-03-09 20:49:56 +09:00 · 2024-03-09 20:49:56 +09:00 · c2aba3886a
commit c2aba3886a
parent e9ffc01929 e4eaf1220e
38 changed files with 222 additions and 74 deletions
--- a/packages/backend/src/server/web/boot.js
+++ b/packages/backend/src/server/web/boot.js
@ -86,8 +86,8 @@
 	//#endregion

 	//#region Script
-	function importAppScript() {
-		import(`/vite/${CLIENT_ENTRY}`)
+	async function importAppScript() {
+		await import(`/vite/${CLIENT_ENTRY}`)
 			.catch(async e => {
 				console.error(e);
 				renderError('APP_IMPORT', e);