Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-15 00:38:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'c4f47adb49663f24ee80d9174ab24431a8c165c0' into glitch-soc/merge-upstream

Browse Source 
Too many conflicts to list, because of webpack → vite migration.
This commit is contained in:
Claire
2025-05-24 12:37:51 +02:00
parent a8ed678761 c4f47adb49
commit f49940db85
159 changed files with 2373 additions and 7784 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/flavours/glitch/entrypoints/admin.tsx
View File

@@ -1,4 +1,3 @@
import '@/entrypoints/public-path';
import { createRoot } from 'react-dom/client';
import Rails from '@rails/ujs';
@@ -273,7 +272,7 @@ async function mountReactComponent(element: Element) {
);
const { default: Component } = (await import(
`@/flavours/glitch/components/admin/${componentName}`
`@/flavours/glitch/components/admin/${componentName}.jsx`
)) as { default: React.ComponentType };
const root = createRoot(element);