8 Commits

Author	SHA1	Message	Date
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
Claire	5321a553d5	Merge commit 'aa04efb92a47cf27c1aafb2aeb21584e91c526ac' into glitch-soc/merge-upstream ... 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.	2025-05-14 13:38:23 +02:00
Renaud Chaput	9244ffc425	Fix eslint import plugin resolution in vscode (#34651)	2025-05-12 07:12:56 +00:00
Claire	5cade30257	Merge commit '8c579c5b34b94a9ca59f91d24ec23366f4d21137' into glitch-soc/merge-upstream ... Conflicts: - `jest.config.js` - `package.json` - `tsconfig.json`	2025-05-08 15:47:40 +02:00
Echo	8c579c5b34	Migrate from Jest to Vitest (#34454)	2025-05-07 18:29:02 +00:00
Claire	e0406fcf02	Merge commit 'e8270e2807727e1cf6a47a40442b3038c5bca858' into glitch-soc/merge-upstream ... 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.	2025-04-01 20:59:34 +02:00
Echo	e8270e2807	Upgrade to ESLint v9 flat config (#34324) ... Co-authored-by: Nick Schonning <nschonni@gmail.com>	2025-04-01 16:30:18 +00:00