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

Merge upstream changes up to 9688c5fcc4659491fa74783f616b1c23583398f1

Merge branch 'main' into glitch-soc/merge-upstream

Update formatjs monorepo (#26955)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update babel monorepo to v7.22.20 (#26946)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

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

Merge upstream changes up to 6273416292090b2f6bfda33f070cea325a1759df

Merge commit '6273416292090b2f6bfda33f070cea325a1759df' into glitch-soc/merge-upstream

Conflicts:
- `.github/workflows/build-nightly.yml`:
  Upstream modified this file close to a line modified by glitch-soc to
  disable the ARMv64 builder (as glitch-soc doesn't have one).
  Ported upstream's changes.
- `.github/workflows/build-releases.yml`:
  Upstream modified this file close to lines changed by glitch-soc to
  change the Docker image repositories used (only ghcr, and based on the
  organization's name).
  Ported upstream's changes.

Merge commit '97e4011c3ce31c6d492d5f103e95a35b6ebdc9bd' into glitch-soc/merge-upstream

Conflicts:
- `config/initializers/content_security_policy.rb`:
  Upstream added some code to add the Identity Provider's sign-in endpoint to
  the `form-action` Content Security Policy directive but our version of the
  file is pretty different.
  Ported the change.

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

Merge commit '398635c0c4987ec44d937e98431ff5dee331ea94' into glitch-soc/merge-upstream

Update dependency sass to v1.67.0 (#26914)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @babel/core to v7.22.19 (#26920)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency uuid to v9.0.1 (#26900)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @rails/ujs to v7.0.8 (#26871)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @babel/core to v7.22.17 (#26855)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update formatjs monorepo (#26874)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency @types/lodash to v4.14.198 (#26878)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update eslint (non-major) (#26881)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Update dependency ws to v8.14.1 (#26862)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>

Use NodeJS v20 by default (#26830)

Update dependency ws to v8.14.0 (#26821)

Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>