Merge remote-tracking branch 'upstream/main'

# Conflicts:
#	.dockerignore
#	package.json
#	yarn.lock

package.json

@@ -29,7 +29,7 @@
     "bcryptjs": "^2.4.3",
     "cron": "^3.1.6",
     "echarts": "^5.4.3",
-    "emoji-picker-react": "^4.7.10",
+    "emoji-picker-react": "^4.9.2",
     "fuse.js": "^7.0.0",
     "html-to-image": "^1.11.11",
     "mermaid": "^10.7.0",
@@ -56,12 +56,12 @@
     "zustand": "^4.5.0"
   },
   "devDependencies": {
-    "@tauri-apps/cli": "^1.5.8",
+    "@tauri-apps/cli": "1.5.11",
+    "@types/node": "^20.11.30",
+    "@types/react": "^18.2.70",
     "@types/bcryptjs": "^2.4.6",
     "@types/cookie": "^0.6.0",
-    "@types/node": "^20.11.10",
     "@types/nodemailer": "^6.4.14",
-    "@types/react": "^18.2.48",
     "@types/react-dom": "^18.2.7",
     "@types/react-highlight-words": "^0.16.7",
     "@types/react-katex": "^3.0.0",