Merge commit '04492e7f934d07f8e89fa9c3d4fe3381f251e8a2' into glitch-soc/merge-upstream

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@mastodon/mastodon",
   "license": "AGPL-3.0-or-later",
-  "packageManager": "yarn@4.6.0",
+  "packageManager": "yarn@4.7.0",
   "engines": {
     "node": ">=18"
   },
@@ -46,6 +46,7 @@
     "@dnd-kit/core": "^6.1.0",
     "@dnd-kit/sortable": "^10.0.0",
     "@dnd-kit/utilities": "^3.2.2",
+    "@emoji-mart/data": "1.2.1",
     "@formatjs/intl-pluralrules": "^5.2.2",
     "@gamestdio/websocket": "^0.3.2",
     "@github/webauthn-json": "^2.1.1",
@@ -183,10 +184,10 @@
     "eslint-define-config": "^2.0.0",
     "eslint-import-resolver-typescript": "^3.5.5",
     "eslint-plugin-formatjs": "^5.0.0",
-    "eslint-plugin-import": "~2.30.0",
+    "eslint-plugin-import": "~2.31.0",
     "eslint-plugin-jsdoc": "^50.0.0",
     "eslint-plugin-jsx-a11y": "~6.10.0",
-    "eslint-plugin-promise": "~7.1.0",
+    "eslint-plugin-promise": "~7.2.0",
     "eslint-plugin-react": "^7.33.2",
     "eslint-plugin-react-hooks": "^5.0.0",
     "husky": "^9.0.11",