From 7f8bd1a0f6a88b68b52359ec0fa3df8c57f0aa1a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fernando=20Fern=C3=A1ndez?= Date: Mon, 26 Feb 2024 08:08:34 +0000 Subject: [PATCH] fix(vuetify): remove defaultRtl handling With [3.5.0](https://github.com/vuetifyjs/vuetify/releases/tag/v3.5.0), the defaultRtl information is hardcoded in the package and can't be treeshaken with our method. Signed-off-by: GitHub --- frontend/scripts/virtual-modules.ts | 16 ---------------- frontend/src/plugins/vuetify.ts | 4 +--- frontend/types/modules/virtual.d.ts | 4 ---- 3 files changed, 1 insertion(+), 23 deletions(-) diff --git a/frontend/scripts/virtual-modules.ts b/frontend/scripts/virtual-modules.ts index a91fc483801..44a9fde5cb5 100644 --- a/frontend/scripts/virtual-modules.ts +++ b/frontend/scripts/virtual-modules.ts @@ -53,19 +53,6 @@ const vuetifyExports = localeNames .map((l) => localeTransform(vuetifyKeys, l)) .filter((l): l is string => typeof l === 'string'); -/** - * Map the RTL value of the mapped locales - */ -const transformedVuetifyRtl: Record = {}; - -for (const e of vuetifyExports) { - const localeSplitted = e.includes(' as ') ? e.split(' as ') : e; - const originalLocale = Array.isArray(localeSplitted) ? localeSplitted[0] : e; - const targetLocale = Array.isArray(localeSplitted) ? localeSplitted[1] : e; - - transformedVuetifyRtl[targetLocale] = vuetify.defaultRtl[originalLocale as keyof typeof vuetify.defaultRtl]; -} - /** * Get commit hash */ @@ -84,8 +71,5 @@ export default { 'virtual:locales/vuetify': `export { ${vuetifyExports.join( ', ' )} } from 'vuetify/locale'`, - 'virtual:locales/vuetify/rtl': `export const defaultRtl = ${JSON.stringify( - transformedVuetifyRtl - )}`, 'virtual:commit': `export const commit_hash = ${commit_hash}` }; diff --git a/frontend/src/plugins/vuetify.ts b/frontend/src/plugins/vuetify.ts index c57b925a35f..d13f6d0b623 100644 --- a/frontend/src/plugins/vuetify.ts +++ b/frontend/src/plugins/vuetify.ts @@ -1,5 +1,4 @@ import * as vuetifyLocales from 'virtual:locales/vuetify'; -import { defaultRtl } from 'virtual:locales/vuetify/rtl'; import { createVuetify, type ThemeDefinition } from 'vuetify'; import { md3 } from 'vuetify/blueprints'; import { aliases, mdi } from 'vuetify/iconsets/mdi-svg'; @@ -79,8 +78,7 @@ export const vuetify = createVuetify({ }, locale: { fallback: 'en', - messages: vuetifyLocales, - rtl: defaultRtl + messages: vuetifyLocales }, theme: { themes: { diff --git a/frontend/types/modules/virtual.d.ts b/frontend/types/modules/virtual.d.ts index 2b349afc197..fd56d617140 100644 --- a/frontend/types/modules/virtual.d.ts +++ b/frontend/types/modules/virtual.d.ts @@ -12,10 +12,6 @@ declare module 'virtual:locales/vuetify' { export = typeWithoutRtl; } -declare module 'virtual:locales/vuetify/rtl' { - export { defaultRtl } from 'vuetify/locale'; -} - declare module 'virtual:commit' { export const commit_hash: string | undefined; }