Conflicts:
- `tsconfig.json`:
Upstream added config for storybook files, while glitch-soc had an addition
for the glitch flavor on the last line.
Added upstream's new config.
- `yarn.lock`:
Upstream added a new dependency to an `eslint` plugin textually adjacent to
a couple glitch-only-dependencies.
Added upstream's new dependency.
Conflicts:
- `spec/helpers/theme_helper_spec.rb`:
Conflict due to glitch-soc's different theming system.
Adapted upstream changes to glitch-soc's theming system.
Conflicts:
- `app/models/user_settings.rb`:
Not a real conflict, upstream added a setting on a line adjacent to a
glitch-soc-only line.
Added upstream's new setting.
Conflicts:
- `.eslintrc.js`:
Upstream moved it to `eslint.config.mjs`.
Ported the glitch-soc changes there.
- `yarn.lock`:
Upstream updated dependencies close to glitch-soc-only dependencies.
Ported upstream's changes.
