Merge pull request #2237 from ClearlyClaire/glitch-soc/merge-upstream
Merge upstream changes
Fix `null` signUp URL in various places (#25190)
Handle Surrogate Pairs in truncate() (#25148)
Merge branch 'main' into glitch-soc/merge-upstream
Merge commit 'd27216dc4616d80659c0cc5d2a55394e0e1ae874' into glitch-soc/merge-upstream
Conflicts:
- `.eslintrc.js`:
Upstream moved a configuration block in which we had added a glitch-only
path.
Moved the configuration block as upstream did.
- other files:
Upstream reordered imports, and those files had different ones.
Kept our version and reordered imports using the same rules.
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 actions/modal and reducers/modal with typescript (#24833)
Update inconsistent `defaultMessage` (#25114)
Fix `null` signUp URL handling from #25014 (#25108)
Rewrite `<LoadGap />` as FC and TS (#25042)
Enforce import order with ESLint (#25096)