Claire
d69c5f1a6e
Fix glitch assets not being found
2025-07-23 12:48:45 +02:00
Claire
45d79427c4
Merge commit '0af2c4829ff86cf84ed9e7804d023f31e805542b' into glitch-soc/merge-upstream
...
Conflicts:
- `vite.config.mts`:
Conflict because of differently-named theme plugins.
Updated to go with upstream's changes.
2025-07-23 12:08:59 +02:00
Claire
889c0b3a1f
Merge commit '9e6a9efe101b36291897ae9fd4dbc5163a6cef38' into glitch-soc/merge-upstream
...
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`
2025-07-22 23:07:30 +02:00
Echo
0af2c4829f
Creates Vite plugin to generate assets file ( #35454 )
2025-07-22 13:58:04 +00:00
Echo
9e6a9efe10
Replace Ruby Vite plugins ( #35195 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-07-17 10:04:04 +00:00
Claire
d17e4d11d0
Fix dev mode for glitch-soc
2025-06-16 21:43:30 +02:00
Claire
0bb83dfe7d
Merge commit '69f298731e523f7f2e97ddd6a559dfb485d4495c' into glitch-soc/merge-upstream
2025-06-16 21:07:55 +02:00
Claire
013c527406
Fix vite helpers crash in development mode ( #35035 )
...
Co-authored-by: ChaosExAnima <ChaosExAnima@users.noreply.github.com >
2025-06-16 14:25:12 +00:00
Claire
80af1ea434
Merge commit '825312d4b0587c0da5575f8eaabe038438746cd3' into glitch-soc/merge-upstream
...
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.
2025-06-12 20:32:25 +02:00
Echo
825312d4b0
Fix theme name requirement regression with efficient lookup by name ( #35007 )
...
Co-authored-by: Claire <claire.github-309c@sitedethib.com >
2025-06-12 14:09:45 +00:00
Claire
086a7016c4
Merge commit 'd78535eab9cefc285c0d7ef88adb125ab1ceb6bd' into glitch-soc/merge-upstream
...
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.
2025-05-27 20:49:19 +02:00
Claire
0372344d33
Move Mastodon theme handling to custom vite plugin ( #34808 )
...
Co-authored-by: Echo <ChaosExAnima@users.noreply.github.com >
2025-05-27 08:50:48 +00:00
Claire
f49940db85
Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream
...
Too many conflicts to list, because of webpack → vite migration.
2025-05-25 14:36:51 +02:00
Echo
c4f47adb49
Convert from Webpack to Vite ( #34450 )
...
Co-authored-by: Renaud Chaput <renchap@gmail.com >
2025-05-16 13:26:12 +00:00
