Merge commit 'c8181eb0a41c4f5c1655d4e400cab071aee4182a' into glitch-soc/merge-upstream

Conflicts:
- `app/javascript/packs/admin.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.
- `app/javascript/packs/public.jsx`:
  Upstream reworked imports, but we had many changes.
  Reworked imports as upstream did.

package.json

@@ -79,6 +79,7 @@
     "jsdom": "^21.1.2",
     "lodash": "^4.17.21",
     "mark-loader": "^0.1.6",
+    "marky": "^1.2.5",
     "mini-css-extract-plugin": "^1.6.2",
     "mkdirp": "^2.1.6",
     "npmlog": "^7.0.1",
@@ -191,11 +192,11 @@
     "eslint-plugin-jsx-a11y": "~6.7.1",
     "eslint-plugin-promise": "~6.1.1",
     "eslint-plugin-react": "~7.32.2",
+    "eslint-plugin-react-hooks": "^4.6.0",
     "husky": "^8.0.3",
     "jest": "^29.5.0",
     "jest-environment-jsdom": "^29.5.0",
     "lint-staged": "^13.2.2",
-    "marky": "^1.2.5",
     "prettier": "^2.8.8",
     "raf": "^3.4.1",
     "react-intl-translations-manager": "^5.0.3",