diff --git a/app/javascript/flavours/glitch/features/emoji/worker.ts b/app/javascript/flavours/glitch/features/emoji/worker.ts index 5602577dbe..ce8eea09ab 100644 --- a/app/javascript/flavours/glitch/features/emoji/worker.ts +++ b/app/javascript/flavours/glitch/features/emoji/worker.ts @@ -1,9 +1,4 @@ import { EMOJI_DB_NAME_SHORTCODES, EMOJI_TYPE_CUSTOM } from './constants'; -import { - importCustomEmojiData, - importEmojiData, - importLegacyShortcodes, -} from './loader'; addEventListener('message', handleMessage); self.postMessage('ready'); // After the worker is ready, notify the main thread @@ -16,6 +11,8 @@ function handleMessage(event: MessageEvent<{ locale: string }>) { } async function loadData(locale: string) { + const { importCustomEmojiData, importEmojiData, importLegacyShortcodes } = + await import('./loader'); let importCount: number | undefined; if (locale === EMOJI_TYPE_CUSTOM) { importCount = (await importCustomEmojiData())?.length; diff --git a/config/vite/plugin-glitch-themes.ts b/config/vite/plugin-glitch-themes.ts index 97dba7d430..428b76f0e3 100644 --- a/config/vite/plugin-glitch-themes.ts +++ b/config/vite/plugin-glitch-themes.ts @@ -19,7 +19,7 @@ export function GlitchThemes(): Plugin { return { name: 'glitch-themes', async config(userConfig) { - const existingInputs = userConfig.build?.rollupOptions?.input; + const existingInputs = userConfig.build?.rolldownOptions?.input; if (typeof existingInputs === 'string') { entrypoints[path.basename(existingInputs)] = existingInputs; @@ -79,7 +79,7 @@ export function GlitchThemes(): Plugin { return { build: { - rollupOptions: { + rolldownOptions: { input: entrypoints, }, },