tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix importing emoji loader statically inside worker (#38541)

Browse Source
This commit is contained in:
Echo 2026-04-07 15:17:07 +02:00 committed by GitHub
parent 31d2885d95
commit 8e212fca59
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/javascript/mastodon/features/emoji/database.ts
View File

@ -302,7 +302,8 @@ async function toLoadedLocale(localeString: string) {
} }
if (!loadedLocales.has(locale)) { if (!loadedLocales.has(locale)) {
log('Locale %s not loaded, importing...', locale); log('Locale %s not loaded, importing...', locale);
const { importEmojiData } = await import('./loader'); // Ignore the INEFFECTIVE_DYNAMIC_IMPORT Vite warning, since the static import location is inside an inlined web worker.
const { importEmojiData } = await import(/* @vite-ignore */ './loader');
await importEmojiData(locale); await importEmojiData(locale);
return locale; return locale;
} }

7
app/javascript/mastodon/features/emoji/worker.ts
View File

@ -1,4 +1,9 @@
import { EMOJI_DB_NAME_SHORTCODES, EMOJI_TYPE_CUSTOM } from './constants'; import { EMOJI_DB_NAME_SHORTCODES, EMOJI_TYPE_CUSTOM } from './constants';
import {
importCustomEmojiData,
importEmojiData,
importLegacyShortcodes,
} from './loader';
addEventListener('message', handleMessage); addEventListener('message', handleMessage);
self.postMessage('ready'); // After the worker is ready, notify the main thread self.postMessage('ready'); // After the worker is ready, notify the main thread
@ -11,8 +16,6 @@ function handleMessage(event: MessageEvent<{ locale: string }>) {
} }
async function loadData(locale: string) { async function loadData(locale: string) {
const { importCustomEmojiData, importEmojiData, importLegacyShortcodes } =
await import('./loader');
let importCount: number | undefined; let importCount: number | undefined;
if (locale === EMOJI_TYPE_CUSTOM) { if (locale === EMOJI_TYPE_CUSTOM) {
importCount = (await importCustomEmojiData())?.length; importCount = (await importCustomEmojiData())?.length;