Conflicts:
- `package.json`:
Upstream added/updated dependency adjacent to glitch-soc-only dependency.
Updated as upstream did.
- `vite.config.mts`:
Upstream reworked the config file while using a different plugin for themes.
Adapted upstream's changes.
- `yarn.lock`:
Same as `package.json`
Conflicts:
- `app/helpers/theme_helper.rb`:
Conflict because of different theming system.
Adapted upstream's changes.
- `vite.config.mts`:
Conflict because of different theming system.
Adapted upstream's changes.
Conflicts:
- `vite.config.mts`:
Upstream moved its theming system to a plug-in, where we had our own.
Adapted the file as well as our own plugin to adopt the same mechanisms.
