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

# Conflicts: # package.json # packages/frontend/src/components/MkPostForm.vue # packages/frontend/src/navbar.ts
2023-12-02 00:47:40 +09:00 · 2023-12-02 00:47:40 +09:00 · 1802c5da5f
commit 1802c5da5f
parent e3761231b1 5cd4c36cad
59 changed files with 1606 additions and 951 deletions
--- a/packages/frontend/vite.config.ts
+++ b/packages/frontend/vite.config.ts
@ -150,10 +150,14 @@ export function getConfig(): UserConfig {
 		test: {
 			environment: 'happy-dom',
 			deps: {
-				inline: [
-					// XXX: misskey-dev/browser-image-resizer has no "type": "module"
-					'browser-image-resizer',
-				],
+				optimizer: {
+					web: {
+						include: [
+							// XXX: misskey-dev/browser-image-resizer has no "type": "module"
+							'browser-image-resizer',
+						],
+					},
+				},
 			},
 		},
 	};