Merge commit 'fcf012c6026418b6c76bff173eec944e0c25913f' into glitch-soc/merge-upstream
Conflicts: - `vite.config.mts`: Upstream changed a line adjacent to one glitch-soc modified due to its theming system. Adapted upstream's change. - `yarn.lock`: Upstream updated a dependency next to one glitch-soc added. Updated the dependency as upstream did.
This commit is contained in:
@@ -21,7 +21,6 @@ import { VitePWA } from 'vite-plugin-pwa';
|
||||
import svgr from 'vite-plugin-svgr';
|
||||
|
||||
import { MastodonAssetsManifest } from './config/vite/plugin-assets-manifest';
|
||||
import { MastodonEmojiCompressed } from './config/vite/plugin-emoji-compressed';
|
||||
import { GlitchThemes as MastodonThemes } from './config/vite/plugin-glitch-themes';
|
||||
import { MastodonNameLookup } from './config/vite/plugin-name-lookup';
|
||||
import { MastodonServiceWorkerLocales } from './config/vite/plugin-sw-locales';
|
||||
@@ -179,7 +178,6 @@ export const config: UserConfigFnPromise = async ({ mode, command }) => {
|
||||
MastodonThemes(),
|
||||
MastodonAssetsManifest(),
|
||||
MastodonServiceWorkerLocales(),
|
||||
MastodonEmojiCompressed(),
|
||||
legacy({
|
||||
renderLegacyChunks: false,
|
||||
modernPolyfills: true,
|
||||
@@ -203,7 +201,6 @@ export const config: UserConfigFnPromise = async ({ mode, command }) => {
|
||||
vite: [
|
||||
// Provide a virtual import with only the locales used in the ServiceWorker
|
||||
MastodonServiceWorkerLocales(),
|
||||
MastodonEmojiCompressed(),
|
||||
],
|
||||
},
|
||||
},
|
||||
|
||||
Reference in New Issue
Block a user