Merge pull request #2236 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes up to e387175fc9a3ebfd72ab45ebfe43ecfabef7b0c3

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

Merge commit '8d6aea33260dedeacb3d22ac1a6d2f9cc3856a5e' into glitch-soc/merge-upstream

Merge commit '2ce0b666a139726dc406e6c1887728553b947e59' into glitch-soc/merge-upstream

Conflicts:
- `config/webpack/generateLocalePacks.js`:
  A dependency update changed how functions are imported.
  Also, some linting fixes not applicable to glitch-soc.

Rewrite `<TimelineHint />` as FC and TS (#25091)

Rewrite `<Skeleton/>` as FC and TS (#25055)

Allow scripts in post embed previews (#25071)

Upgrade to React 18 (#24916)

Fix being unable to load past a full page of filtered posts in Home timeline (#24930)

Fix spelling of "Lets" on the onboarding page after clicking the confirmation email (#24959)

Co-authored-by: Steven Munn <stevenjmunn@gmail.com>
Co-authored-by: Claire <claire.github-309c@sitedethib.com>

Merge pull request #2216 from ClearlyClaire/glitch-soc/merge-upstream

Merge upstream changes

Fix UI crash in moderation interface when opening the media modal (#24816)

Fix Onboarding Errors (#24883)

Change "Sign in" to "Login" (#24942)

Add stricter ESLint rules for Typescript files (#24926)

Enable ESLint react/no-deprecated (#24471)

Rewrite `logo.tsx` as FC (#24909)

Add type annotation for DisplayName component (#24752)

Rename Image component to ServerHeroImage (#24894)

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.