Conflicts:
- `app/javascript/entrypoints/common.js`:
Upstream moved everything from `app/javascript/packs` to
`app/javascript/entrypoints` while this file was a glitch-soc
addition. Moved it like the rest.
- `tsconfig.json`:
Conflict due to glitch-soc's flavor.
Updated like upstream.
Also moved and updated the following files accordingly:
- `app/javascript/flavours/vanilla/theme.yml`
- `app/javascript/flavours/glitch/theme.yml`
- everything in `app/javascript/flavours/glitch/packs`
Packs are now loaded from views, just like upstream, and are
identified by their filenames. The definition of `theme.yml` has
changed as such:
- `pack_directory` is now required
- `pack` is now unused
- `signed_in_preload` has been introduced
Remove the `fallback` property and do not fallback to using another flavour
when a pack is not available in the selected flavour.
Flavours should define all packs, and should they wish to piggy-back on
another one, they can import that other one's pack explicitly instead.
Conflicts:
- `app/javascript/packs/admin.jsx`:
This file was split between `app/javascript/core/admin.js`,
`app/javascript/pack/admin.jsx`, and
`app/javascript/flavours/glitch/packs/admin.jsx`.
Ported upstream's change, splitting the new file to
`app/javascript/core/admin.ts`, `app/javascript/packs/admin.tsx`,
and `app/javascript/flavours/glitch/packs/admin.tsx`
* Remove redundant asset preload
preloading these is already handled by glitch-soc theming system, meaning glitch packs get preloaded and if the user is signed in, vanilla packs.
The theming system preloads these unconditionally though.
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Remove preload of getting started
This matches upstreams preloads
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
---------
Signed-off-by: Plastikmensch <plastikmensch@users.noreply.github.com>
* Add glitch-soc locale files to prettierignore
* Run prettier on theme.yml
* Add glitch-soc emoji_map.json to .prettierignore
* Run prettier on config/i18n-tasks.yml
* Change locales file generation to use JSON sources
Instead of inheriting in JS files, set locale inheritance in the
theme's YML file, and inherit in the generated locale file, rather
than the source file.
* Convert glitch-soc JS translation files to JSON
Obtained running the following:
```sh
sed -i -z "s/import inherited from '.*';\s*\nconst messages = //" *.js
sed -i "s/\s*\/\/.*//" *.js
sed -i -z "s/;\s*export default .*/\n/" *.js
for i in *.js; do
json5 $i | json_pp > ${i}on;
done
```
* Change `yarn manage:translations` to exclude any translation already defined upstream
* Run yarn manage:translations
Claire