From c161aa3c22cf36cde673210f4ce9850e14337263 Mon Sep 17 00:00:00 2001
From: Angel <60985614+j14i@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:41:59 -0400
Subject: [PATCH 01/18] feat(i18n): add Spanish localization
---
astro.config.mjs | 2 +-
src/constants/i18n.ts | 4 +-
src/i18n/es/translation.json | 511 +++++++++++++++++++++++++++++++++++
3 files changed, 515 insertions(+), 2 deletions(-)
create mode 100644 src/i18n/es/translation.json
diff --git a/astro.config.mjs b/astro.config.mjs
index 8cc48b5..85f540b 100644
--- a/astro.config.mjs
+++ b/astro.config.mjs
@@ -9,7 +9,7 @@ export default defineConfig({
site: 'https://zen-browser.app',
i18n: {
defaultLocale: 'en',
- locales: ['en', 'ja'],
+ locales: ['en', 'ja', 'es'],
routing: {
fallbackType: 'rewrite',
prefixDefaultLocale: false,
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index d9fe9d0..d9a6869 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -1,18 +1,20 @@
const UI_EN = (await import('~/i18n/en/translation.json', { with: { type: 'json' } })).default
const UI_JA = (await import('~/i18n/ja/translation.json', { with: { type: 'json' } })).default
+const UI_ES = (await import('~/i18n/es/translation.json', { with: { type: 'json' } })).default
export const i18n = {
DEFAULT_LOCALE: 'en',
LOCALES: [
{ label: 'English', value: 'en', ui: UI_EN, intl: 'en-US' },
{ label: '日本語', value: 'ja', ui: UI_JA, intl: 'ja-JP' },
+ { label: 'Español', value: 'es', ui: UI_ES, intl: 'es-ES' },
],
}
/**
* Type definition for UI translations based on the English translation
*/
-export type UIProps = typeof UI_EN | typeof UI_JA
+export type UIProps = typeof UI_EN | typeof UI_JA | typeof UI_ES
export const getIntlLocale = (locale: string) => {
return i18n.LOCALES.find(l => l.value === locale)?.intl
diff --git a/src/i18n/es/translation.json b/src/i18n/es/translation.json
new file mode 100644
index 0000000..9864073
--- /dev/null
+++ b/src/i18n/es/translation.json
@@ -0,0 +1,511 @@
+{
+ "routes": {
+ "index": {
+ "title": "Zen Browser",
+ "hero": {
+ "title": [
+ { "text": "bienvenido ", "highlight": false },
+ { "text": "a ", "highlight": false },
+ { "text": "\n", "highlight": false },
+ { "text": "un ", "highlight": false },
+ { "text": "internet más ", "highlight": false },
+ { "text": "tranquilo", "highlight": true }
+ ],
+ "description": [
+ "Hermosamente diseñado, enfocado en la privacidad y repleto de funciones.",
+ "Nos importa tu experiencia, no tus datos."
+ ],
+ "buttons": {
+ "beta": "¡Beta ya disponible!",
+ "support": "Apóyanos ❤️"
+ }
+ },
+ "features": {
+ "titles": ["Máxima ", "productividad", ""],
+ "description": "Zen está repleto de funciones que te ayudan a mantenerte productivo y enfocado. Los navegadores deberían ser herramientas que te ayuden a hacer las cosas, no distracciones que te alejen de tu trabajo.",
+ "featureTabs": {
+ "workspaces": {
+ "title": "Espacios de trabajo",
+ "description": "Organiza tus pestañas en Espacios de trabajo para mantener tus proyectos separados y organizados, y cambia entre ellos con facilidad."
+ },
+ "compactMode": {
+ "title": "Modo compacto",
+ "description": "El Modo compacto de Zen te brinda más espacio en pantalla al ocultar la barra de pestañas cuando no la necesitas, y mostrándola cuando sí."
+ },
+ "glance": {
+ "title": "Vistazo",
+ "description": "Vistazo te permite cambiar rápidamente entre tus pestañas más utilizadas, sin tener que desplazarte por tu historial."
+ },
+ "splitView": {
+ "title": "Vista dividida",
+ "description": "La Vista dividida te permite ver dos pestañas una al lado de la otra, lo que facilita la comparación y el cambio entre ellas."
+ }
+ }
+ },
+ "sponsors": {
+ "title": "Nuestros patrocinadores",
+ "description": "Estamos agradecidos con nuestros patrocinadores por su apoyo. Ellos nos ayudan a mantener el proyecto vivo.
¡Tú también puedes ser parte de este viaje donándonos directamente!",
+ "sponsors": {
+ "tuta": {
+ "name": "Tuta",
+ "url": "https://tuta.com/"
+ }
+ }
+ },
+ "community": {
+ "title": ["Nuestros ", "Valores ", "Fundamentales"],
+ "description": "Hacemos de esto no solo una prioridad, sino una necesidad para garantizar que Zen siempre encuentre el equilibrio adecuado entre belleza, rendimiento y privacidad. Estamos comprometidos a hacer de Zen el navegador más hermoso, productivo y respetuoso con la privacidad, sin comprometer tu experiencia.",
+ "lists": {
+ "freeAndOpenSource": {
+ "title": "Libre y de código abierto",
+ "description": "Zen es un software libre y de código abierto, lo que significa que puedes usarlo sin ningún costo y puedes modificarlo para adaptarlo a tus necesidades."
+ },
+ "simpleYetPowerful": {
+ "title": "Simple pero poderoso",
+ "description": "Zen es simple de usar, pero lo suficientemente poderoso como para manejar tus tareas diarias."
+ },
+ "privateAndAlwaysUpToDate": {
+ "title": "Privado y siempre actualizado",
+ "description": "Zen es privado y siempre está actualizado, lo que significa que puedes usarlo sin ningún costo y puedes modificarlo para adaptarlo a tus necesidades."
+ }
+ },
+ "images": {
+ "community": {
+ "alt": "Comunidad"
+ }
+ }
+ }
+ },
+ "mods": {
+ "title": "Zen Mods",
+ "description": "Explora nuestra diversa colección de Zen Mods, complementos y temas creados por la comunidad para Zen Browser. Descubre un tema que se adapte a tu estado de ánimo y un complemento que satisfaga cada requisito. ¡Comienza a personalizar tu experiencia de navegación hoy mismo!",
+ "pagination": {
+ "pagination": "{input} de {totalPages} ({totalItems} elementos)"
+ },
+ "search": "Escribe para buscar...",
+ "by": "por",
+ "sort": {
+ "lastCreated": "Última creación",
+ "lastUpdated": "Última actualización",
+ "perPage": "Por página"
+ },
+ "noResults": "No se encontraron resultados",
+ "noResultsDescription": "Intenta buscar un término diferente o vuelve más tarde.",
+ "slug": {
+ "title": "{name} - Zen Mods",
+ "description": "Aprende más sobre el mod {name} disponible en Zen Browser",
+ "alert": {
+ "description": "Necesitas tener Zen Browser instalado para instalar este tema.",
+ "button": "¡Descargar ahora!"
+ },
+ "createdBy": "Creado por {author} • v{version}",
+ "creationDate": "Fecha de creación: {createdAt}",
+ "latestUpdate": "Última actualización: {updatedAt}",
+ "visitModHomepage": "Visitar la página del mod",
+ "installMod": "Instalar mod 🎉",
+ "uninstallMod": "Desinstalar mod",
+ "back": "Atrás"
+ }
+ },
+ "releaseNotes": {
+ "topSection": {
+ "title": "Changelog",
+ "description": "Mantente al día con los últimos cambios en Zen. Desde la primera versión hasta {latestVersion}, hemos estado trabajando arduamente para hacer de Zen Browser lo mejor posible. ¡Gracias a todos por sus comentarios! ❤️"
+ },
+ "list": {
+ "support": "¡Danos un poco de apoyo!",
+ "navigateToVersion": "Navegar a la versión..."
+ },
+ "itemType": {
+ "fix": "Corregido",
+ "feature": "Añadido",
+ "known": "Conocido",
+ "break": "Ruptura",
+ "theme": "Tema",
+ "security": "Seguridad",
+ "change": "Cambio"
+ },
+ "backToTop": "Volver al principio",
+ "chooseVersion": "Elegir versión",
+ "components": {
+ "releaseNoteItem": {
+ "twilight": "Twilight",
+ "twilightChanges": "Cambios de Twilight",
+ "releaseChanges": "v{version}",
+ "firefoxVersion": "Firefox {version}",
+ "githubRelease": "GitHub Release",
+ "workflowRun": "Workflow run",
+ "compareChanges": "Comparar cambios",
+ "twilightWarning": "Ten en cuenta que Twilight es una versión preliminar de Zen Browser. Puede contener errores y funciones incompletas.",
+ "reportIssues": " Si encuentras algún problema, infórmalo en la página de problemas.",
+ "learnMore": "Aprender más",
+ "viewIssue": "Ver el problema número {issue} en GitHub"
+ }
+ },
+ "slug": {
+ "title": "Notas de la versión",
+ "redirect": "Redirigiendo a las notas de la versión {version}..."
+ }
+ },
+ "about": {
+ "title": "Acerca de Zen",
+ "description": "Simplemente somos un grupo de desarrolladores y diseñadores que se preocupan por tu experiencia en la web. Creemos que Internet debería ser un lugar donde puedas explorar, aprender y conectarte sin preocuparte por la recopilación de tus datos.",
+ "littleHelp": "¿Un poco de ayuda?",
+ "mainTeam": {
+ "title": "Equipo Principal",
+ "description": "Esta lista muestra a los miembros del equipo principal que están trabajando arduamente para brindarte la mejor experiencia de navegación.",
+ "subTitle": {
+ "browser": "Navegador",
+ "website": "Sitio web y marca"
+ },
+ "members": {
+ "browser": {
+ "mauro": {
+ "name": "Mauro B.",
+ "description": "Creador, Desarrollador Principal",
+ "link": "https://cheff.dev/"
+ },
+ "jan": {
+ "name": "Jan Heres",
+ "description": "Contribuyente activo y ayuda con las compilaciones de MacOS",
+ "link": "https://janheres.eu/"
+ },
+ "bryan": {
+ "name": "Bryan Galdámez",
+ "description": "Gran contribuyente en las funcionalidades de temas",
+ "link": "https://josuegalre.netlify.app/"
+ },
+ "oscar": {
+ "name": "Oscar Gonzalez",
+ "description": "Ingeniero de Confiabilidad del Sitio (SRE) y firma de código.",
+ "link": false
+ },
+ "daniel": {
+ "name": "Daniel García",
+ "description": "Mantenedor de certificados de MacOS y notarización de aplicaciones",
+ "link": false
+ },
+ "brhm": {
+ "name": "BrhmDev",
+ "description": "Contribuyente activo con grandes contribuciones",
+ "link": "https://github.com/BrhmDev"
+ },
+ "kristijanribaric": {
+ "name": "Kristijan Ribaric",
+ "description": "Contribuyente activo con vistas divididas / espacios de trabajo",
+ "link": "https://github.com/kristijanribaric"
+ },
+ "larvey": {
+ "name": "Larvey",
+ "description": "Mantenedor de AUR",
+ "link": "https://github.com/LarveyOfficial/"
+ },
+ "studio": {
+ "name": "Studio Movie Girl",
+ "description": "Gran contribuyente con el generador de degradados",
+ "link": "https://github.com/neurokitti"
+ }
+ },
+ "website": {
+ "taroj1205": {
+ "name": "Shintaro Jokagi",
+ "description": "Arquitecto Principal del Sitio Web, Liderando la Refactorización y Mejoras Técnicas",
+ "link": "https://github.com/taroj1205"
+ },
+ "jace": {
+ "name": "Jace",
+ "description": "Contribuye al diseño y la marca del sitio web",
+ "link": "https://x.com/JaceThings"
+ },
+ "canoa": {
+ "name": "Canoa",
+ "description": "Contribuyente activo y muy activo en la gestión de problemas y el sitio web",
+ "link": "https://thatcanoa.org/"
+ },
+ "adam": {
+ "name": "Adam",
+ "description": "Marca y diseño",
+ "link": "https://cybrneon.xyz/"
+ },
+ "n7itro": {
+ "name": "n7itro",
+ "description": "Contribuyente activo y escritor de notas de lanzamiento",
+ "link": "https://github.com/n7itro"
+ },
+ "jafeth": {
+ "name": "Jafeth Garro",
+ "description": "Escritor de documentación",
+ "link": "https://iamjafeth.com/"
+ }
+ }
+ }
+ },
+ "contributors": {
+ "title": "Contribuyentes",
+ "description": "Esta lista muestra a los contribuyentes que nos han ayudado a hacer de Zen Browser lo mejor que puede ser.",
+ "browser": "Navegador",
+ "website": "Sitio web"
+ }
+ },
+ "donate": {
+ "title": "Donar",
+ "description": "Somos un pequeño equipo de desarrolladores que trabaja arduamente para brindarte la mejor experiencia de navegación. Si te gusta lo que hacemos, considera apoyarnos.",
+ "patreon": {
+ "title": "Patreon",
+ "description": "Patreon te permite apoyarnos con una donación mensual. Puedes elegir el nivel de apoyo que mejor se adapte a ti.",
+ "button": "Ir a Patreon"
+ },
+ "koFi": {
+ "title": "Ko-fi",
+ "description": "Ko-fi te permite apoyarnos con una donación única. Puedes elegir la cantidad que mejor se adapte a ti. También están disponibles las donaciones mensuales.",
+ "button": "Ir a Ko-fi"
+ }
+ },
+ "download": {
+ "title": "Descargar Zen",
+ "description": "Descarga Zen para tu plataforma y experimenta una experiencia de navegación por Internet más consciente. Todas las descargas incluyen sumas de verificación SHA256 para verificación.",
+ "twilightInfo": "Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funciones y actualizaciones experimentales.",
+ "alertInfo": {
+ "description": "Modo Twilight: Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funciones y actualizaciones experimentales."
+ },
+ "platformSelector": {
+ "title": "Selector de Plataforma",
+ "description": "Selecciona tu plataforma para descargar Zen."
+ },
+ "additionalResources": {
+ "title": "Recursos Adicionales",
+ "sourceCode": {
+ "title": "Código Fuente",
+ "description": "Explora el código fuente de Zen en GitHub. Contribuye al proyecto o construye tu propia versión."
+ },
+ "documentation": {
+ "title": "Documentación",
+ "description": "Accede a documentación completa, guías y tutoriales para Zen."
+ }
+ },
+ "securityNotice": {
+ "title": "Descargas Verificadas y Seguras",
+ "description": "Todas las descargas de Zen están firmadas y verificadas para tu seguridad. Recomendamos descargar directamente desde nuestro sitio web oficial o repositorio de GitHub. Si tu descarga parece estar rota o es marcada por tu antivirus, por favor infórmanos."
+ },
+ "platformNames": {
+ "mac": "MacOS",
+ "windows": "Windows",
+ "linux": "Linux",
+ "macDownload": "Descarga de MacOS",
+ "windowsDownload": "Descarga de Windows",
+ "linuxDownload": "Descarga de Linux"
+ },
+ "platformDescriptions": {
+ "mac": "Funciona en nuevos Macs de Apple (M-Series) y en Macs Intel más antiguos.
Requiere macOS 11.0 o posterior.",
+ "windows": "Funciona en Windows 10 y Windows 11.
¿No estás seguro de qué versión obtener? La mayoría de las personas deberían elegir el instalador de 64 bits.",
+ "linux": "Funciona con muchas versiones de Linux.
Elige la descarga que coincida con tu sistema."
+ },
+ "links": {
+ "macos": { "universal": "Universal" },
+ "windows": { "64bit": "64-bit (Recomendado)", "ARM64": "ARM64" },
+ "linux": {
+ "flathub": "Flathub",
+ "x86_64": "Tarball",
+ "aarch64": "Tarball"
+ }
+ },
+ "buttonCard": {
+ "copy": "Copiar",
+ "showChecksum": "Mostrar SHA-256",
+ "beta": "Beta"
+ }
+ },
+ "privacyPolicy": {
+ "title": "Política de Privacidad",
+ "lastUpdated": "Última actualización: 2025-02-5",
+ "sections": {
+ "introduction": {
+ "title": "Introducción",
+ "body": "¡Bienvenido a Zen! Tu privacidad es nuestra prioridad. Esta Política de Privacidad describe los tipos de información personal que recopilamos, cómo la usamos y las medidas que tomamos para proteger tus datos cuando usas Zen.",
+ "summary": "No vendemos datos - No recopilamos datos - No te rastreamos"
+ },
+ "noCollect": {
+ "title": "1. Información que No Recopilamos",
+ "body": "Zen está diseñado con la privacidad en mente. No recopilamos, almacenamos ni compartimos ninguno de tus datos personales. Esto es lo que significa:"
+ },
+ "noTelemetry": {
+ "title": "1.1. No Telemetría",
+ "body": "No recopilamos ningún dato de telemetría ni informes de fallos.",
+ "body2": "Zen ha eliminado la telemetría integrada en Mozilla Firefox. Hemos eliminado toda la recopilación de datos de telemetría y los informes de fallos."
+ },
+ "noPersonalData": {
+ "title": "1.2. No Recopilación de Datos Personales",
+ "body": "Zen no recopila ninguna información personal, como tu dirección IP, historial de navegación, consultas de búsqueda o datos de formularios."
+ },
+ "noThirdParty": {
+ "title": "1.3. No Seguimiento de Terceros",
+ "body": "No permitimos que rastreadores de terceros o herramientas de análisis operen dentro de Zen. Tu actividad de navegación permanece completamente privada y no se comparte con ningún tercero. Mozilla no se considera un tercero, ya que es la base de Zen."
+ },
+ "externalConnections": {
+ "title": "1.4. Conexiones Externas Realizadas al Inicio",
+ "body": "Zen puede realizar conexiones externas al inicio para buscar actualizaciones y garantizar que el navegador esté actualizado en complementos, extensiones, verificar la conectividad y los servicios de geolocalización/notificaciones push para cumplir con los estándares web. Nosotros, en Zen, no recopilamos ningún dato de estas conexiones, pero pueden ser registradas por servicios de terceros o sitios web que visites. Estas conexiones son necesarias para el correcto funcionamiento del navegador y no se utilizan con fines de seguimiento o perfilado. Pueden deshabilitarse a través de las banderas del navegador (about:config)."
+ },
+ "localStorage": {
+ "title": "2. Información Almacenada Localmente en Tu Dispositivo"
+ },
+ "browsingData": {
+ "title": "2.1. Datos de Navegación",
+ "body": "Zen almacena ciertos datos localmente en tu dispositivo para mejorar tu experiencia de navegación. Esto incluye:"
+ },
+ "cookies": {
+ "title": "Cookies",
+ "body": "Las cookies se almacenan localmente en tu dispositivo y no se comparten con Zen ni con ningún tercero. Tienes control total sobre la gestión de cookies a través de la configuración del navegador."
+ },
+ "cache": {
+ "title": "Caché y Archivos Temporales",
+ "body": "Zen puede almacenar archivos de caché y otros datos temporales localmente para mejorar el rendimiento. Estos archivos se pueden eliminar en cualquier momento a través de la configuración del navegador."
+ },
+ "settings": {
+ "title": "2.2. Configuración y Preferencias",
+ "body": "Cualquier personalización, configuración y preferencia que realices dentro de Zen se almacena localmente en tu dispositivo. No tenemos acceso ni control sobre estos datos."
+ },
+ "sync": {
+ "title": "3. Función de Sincronización",
+ "body": "Zen ofrece una función de \"Sincronización\", que se implementa utilizando la función de sincronización de Mozilla Firefox. Esta función te permite sincronizar tus marcadores, historial, contraseñas y otros datos en múltiples dispositivos. Para que esta función funcione, tus datos se cifran y se almacenan en los servidores de Mozilla y se tratan de acuerdo con su Política de Privacidad. Nosotros, en Zen, no podemos ver ninguno de estos datos.",
+ "link1": "Sincronización de Mozilla Firefox",
+ "link2": "Así es como almacenamos tus contraseñas"
+ },
+ "addons": {
+ "title": "4. Complementos y \"Mods\"",
+ "body": "Puedes instalar complementos desde addons.mozilla.org. Zen verifica periódicamente si hay actualizaciones para estos complementos.\nTambién puedes instalar \"Mods\" desde zen-browser.app/mods. Estos Mods son alojados por nuestros servicios y siguen la misma política de privacidad que nuestro sitio web. No recopilamos ningún dato de estos Mods, son contenido puramente estático que se descarga en tu dispositivo."
+ },
+ "security": {
+ "title": "5. Seguridad de los Datos",
+ "body": "Aunque Zen no recopila tus datos, estamos comprometidos a proteger la información que se almacena localmente en tu dispositivo y, si utilizas la función de Sincronización, los datos cifrados almacenados en los servidores de Mozilla. Te recomendamos que utilices contraseñas seguras, habilites la encriptación del dispositivo y actualices regularmente tu software para garantizar que tus datos permanezcan seguros.",
+ "note": "Ten en cuenta que la mayoría de las medidas de seguridad son gestionadas por Mozilla Firefox."
+ },
+ "control": {
+ "title": "6. Tu Control",
+ "deletionTitle": "6.1. Eliminación de Datos",
+ "deletionBody": "Tienes control total sobre todos los datos almacenados localmente en tu dispositivo por Zen. Puedes borrar tus datos de navegación, cookies y caché en cualquier momento utilizando la configuración del navegador."
+ },
+ "website": {
+ "title": "7. Nuestro Sitio Web y Servicios",
+ "body": "El sitio web y los servicios de Zen no utilizan ningún servicio de análisis, seguimiento o CDN de terceros. No recopilamos ninguna información personal de los usuarios que visitan nuestro sitio web. El sitio web está alojado en Cloudflare, pero con análisis y seguimiento deshabilitados, Cloudflare puede recopilar algunos datos analíticos de las solicitudes HTTP para proporcionar mejoras de seguridad y rendimiento. Sin embargo, estos datos no están vinculados a ninguna información personal y no se utilizan con fines de seguimiento.",
+ "externalLinksTitle": "7.1. Enlaces Externos",
+ "externalLinksBody": "Zen puede contener enlaces a sitios web o servicios externos que no son propiedad ni están operados por nosotros. No somos responsables del contenido o las prácticas de privacidad de estos sitios. Te recomendamos que revises las políticas de privacidad de estos sitios antes de proporcionarles cualquier información personal."
+ },
+ "changes": {
+ "title": "8. Cambios en Esta Política de Privacidad",
+ "body": "Podemos actualizar esta Política de Privacidad de vez en cuando para reflejar cambios en nuestras prácticas o requisitos legales. Te notificaremos sobre cualquier cambio significativo actualizando la fecha de vigencia en la parte superior de esta política. El uso continuado de Zen después de dichos cambios constituye tu aceptación de los nuevos términos."
+ },
+ "otherTelemetry": {
+ "title": "9. Otra telemetría realizada por Mozilla Firefox",
+ "body": "Intentamos deshabilitar toda la recopilación de datos de telemetría en Zen. Pero, es posible que hayamos pasado por alto algunos. Consulta los siguientes enlaces para obtener más información.",
+ "firefoxPrivacyNotice": "Aviso de Privacidad de Firefox",
+ "forMoreInformation": "para más información."
+ },
+ "contact": {
+ "title": "10. Contáctanos",
+ "body": "Si tienes alguna pregunta o inquietud sobre esta Política de Privacidad o Zen, por favor contáctanos en:",
+ "discord": "Discord: ",
+ "discordLink": "Discord de Zen",
+ "github": "GitHub: ",
+ "githubLink": "Organización"
+ }
+ }
+ },
+ "welcome": {
+ "title": ["Bienvenido ", "a ", "Zen!"]
+ },
+ "whatsNew": {
+ "title": "¡Novedades en {latestVersion.version}!",
+ "reportIssue": "Reportar un problema",
+ "joinDiscord": "Unirse a nuestro Discord",
+ "readFullReleaseNotes": "Leer las notas de la versión completas"
+ },
+ "notFound": {
+ "title": "Página No Encontrada",
+ "description": "Lo sentimos, la página que estás buscando no existe o ha sido movida.",
+ "button": "Ir a Inicio"
+ }
+ },
+ "layout": {
+ "index": {
+ "title": "Zen Browser",
+ "description": "Diseñado con belleza, enfocado en la privacidad y repleto de características."
+ },
+ "mods": {
+ "title": "Zen Mods",
+ "description": "Explora nuestra diversa colección de Zen Mods, complementos y temas creados por la comunidad para Zen. Descubre un tema que se adapte a cada estado de ánimo y un complemento que satisfaga cada necesidad. ¡Comienza a personalizar tu experiencia de navegación hoy mismo!"
+ },
+ "releaseNotes": {
+ "title": "Notas de la versión - Zen",
+ "description": "¡Mantente al día con los últimos cambios en Zen! Desde el primer lanzamiento hasta {latestVersion}, hemos estado trabajando arduamente para hacer de Zen lo mejor que puede ser. ¡Gracias a todos por sus comentarios! ❤️"
+ },
+ "about": {
+ "title": "Acerca de Zen",
+ "description": "Simplemente somos un grupo de desarrolladores y diseñadores que se preocupan por tu experiencia en la web. Creemos que Internet debería ser un lugar donde puedas explorar, aprender y conectarte sin preocuparte por la recopilación de tus datos."
+ },
+ "donate": {
+ "title": "Donar - Zen",
+ "description": "Somos un pequeño equipo de desarrolladores que trabaja arduamente para brindarte la mejor experiencia de navegación. Si te gusta lo que hacemos, considera apoyarnos."
+ },
+ "download": {
+ "title": "Descargar - Zen",
+ "description": "Descarga Zen para tu plataforma y experimenta una navegación por Internet más consciente. Todas las descargas incluyen sumas de verificación SHA256 para verificación."
+ },
+ "privacyPolicy": {
+ "title": "Política de Privacidad - Zen",
+ "description": "Tu privacidad es nuestra prioridad. Esta Política de Privacidad describe los tipos de información personal que recopilamos, cómo la usamos y los pasos que tomamos para proteger tus datos cuando usas Zen."
+ },
+ "welcome": {
+ "title": "¡Bienvenido!",
+ "description": "¡Bienvenido a Zen!"
+ },
+ "whatsNew": {
+ "title": "¡Novedades en {latestVersion.version}!"
+ }
+ },
+ "components": {
+ "footer": {
+ "title": "Zen Browser",
+ "description": "Diseñado con belleza, enfocado en la privacidad y repleto de características. Nos importa tu experiencia, no tus datos.",
+ "download": "Descargar",
+ "followUs": "Síguenos",
+ "aboutUs": "Acerca de Nosotros",
+ "teamAndContributors": "Equipo y Contribuyentes",
+ "privacyPolicy": "Política de Privacidad",
+ "getStarted": "Comenzar",
+ "documentation": "Documentación",
+ "zenMods": "Zen Mods",
+ "releaseNotes": "Notas de la Versión",
+ "getHelp": "Obtener Ayuda",
+ "discord": "Discord",
+ "uptimeStatus": "Disponibilidad",
+ "reportAnIssue": "Reportar un Problema",
+ "twilight": "Twilight",
+ "madeWith": "Hecho con ❤️ por el Equipo de Zen"
+ },
+ "nav": {
+ "brand": "Zen Browser",
+ "menu": {
+ "gettingStarted": "Comenzar",
+ "usefulLinks": "Enlaces Útiles",
+ "mods": "Mods",
+ "download": "Descargar",
+ "discord": "Discord",
+ "releaseNotes": "Notas de la Versión",
+ "zenMods": "Zen Mods",
+ "tryZenMods": "Probar Zen Mods",
+ "zenModsDesc": "Personaliza tu experiencia de navegación con Zen Mods.",
+ "releaseNotesDesc": "Mantente al día con las últimas características y mejoras.",
+ "discordDesc": "¡Únete a nuestra comunidad en Discord para chatear con otros usuarios de Zen!",
+ "donate": "Donar ❤️",
+ "donateDesc": "Apoya el desarrollo de Zen con una donación.",
+ "aboutUs": "Acerca de Nosotros 🌟",
+ "aboutUsDesc": "Conoce más sobre el equipo detrás de Zen.",
+ "documentation": "Documentación",
+ "documentationDesc": "Aprende a usar Zen con nuestra documentación.",
+ "github": "GitHub",
+ "githubDesc": "Contribuye al desarrollo de Zen en GitHub.",
+ "menu": "Menú"
+ }
+ }
+ }
+}
From 2ea3d8c23977818e8deb742cf2c5b4bd37a44613 Mon Sep 17 00:00:00 2001
From: Angel <60985614+j14i@users.noreply.github.com>
Date: Wed, 4 Jun 2025 09:44:26 -0400
Subject: [PATCH 02/18] feat(cspell): add additional Spanish words to
dictionary
---
cspell.json | 12 +++++++++++-
1 file changed, 11 insertions(+), 1 deletion(-)
diff --git a/cspell.json b/cspell.json
index 4793b09..24957e9 100644
--- a/cspell.json
+++ b/cspell.json
@@ -65,7 +65,17 @@
"wmfcdm",
"XPCOM",
"xmark",
- "zsync"
+ "zsync",
+ "Apóyanos",
+ "donándonos",
+ "infórmalo",
+ "notarización",
+ "Refactorización",
+ "infórmanos",
+ "geolocalización",
+ "encriptación",
+ "Contáctanos",
+ "contáctanos"
],
"flagWords": [],
"ignorePaths": [
From ac6c8b28bb7a790aac670d1f280f0d72e75fa1fa Mon Sep 17 00:00:00 2001
From: Angel <60985614+j14i@users.noreply.github.com>
Date: Wed, 4 Jun 2025 16:10:21 -0400
Subject: [PATCH 03/18] feat(i18n): Update translation
---
src/constants/i18n.ts | 2 +-
src/i18n/es/translation.json | 10 +++++-----
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index d9a6869..8518b76 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -9,7 +9,7 @@ export const i18n = {
{ label: '日本語', value: 'ja', ui: UI_JA, intl: 'ja-JP' },
{ label: 'Español', value: 'es', ui: UI_ES, intl: 'es-ES' },
],
-}
+} as const
/**
* Type definition for UI translations based on the English translation
diff --git a/src/i18n/es/translation.json b/src/i18n/es/translation.json
index 9864073..a16bf08 100644
--- a/src/i18n/es/translation.json
+++ b/src/i18n/es/translation.json
@@ -93,9 +93,9 @@
"noResultsDescription": "Intenta buscar un término diferente o vuelve más tarde.",
"slug": {
"title": "{name} - Zen Mods",
- "description": "Aprende más sobre el mod {name} disponible en Zen Browser",
+ "description": "Aprende más sobre el mod {name} disponible en Zen",
"alert": {
- "description": "Necesitas tener Zen Browser instalado para instalar este tema.",
+ "description": "Necesitas tener Zen instalado para instalar este tema.",
"button": "¡Descargar ahora!"
},
"createdBy": "Creado por {author} • v{version}",
@@ -110,7 +110,7 @@
"releaseNotes": {
"topSection": {
"title": "Changelog",
- "description": "Mantente al día con los últimos cambios en Zen. Desde la primera versión hasta {latestVersion}, hemos estado trabajando arduamente para hacer de Zen Browser lo mejor posible. ¡Gracias a todos por sus comentarios! ❤️"
+ "description": "Mantente al día con los últimos cambios en Zen. Desde la primera versión hasta {latestVersion}, hemos estado trabajando arduamente para hacer de Zen lo mejor posible. ¡Gracias a todos por sus comentarios! ❤️"
},
"list": {
"support": "¡Danos un poco de apoyo!",
@@ -136,7 +136,7 @@
"githubRelease": "GitHub Release",
"workflowRun": "Workflow run",
"compareChanges": "Comparar cambios",
- "twilightWarning": "Ten en cuenta que Twilight es una versión preliminar de Zen Browser. Puede contener errores y funciones incompletas.",
+ "twilightWarning": "Ten en cuenta que Twilight es una versión preliminar de Zen. Puede contener errores y funciones incompletas.",
"reportIssues": " Si encuentras algún problema, infórmalo en la página de problemas.",
"learnMore": "Aprender más",
"viewIssue": "Ver el problema número {issue} en GitHub"
@@ -242,7 +242,7 @@
},
"contributors": {
"title": "Contribuyentes",
- "description": "Esta lista muestra a los contribuyentes que nos han ayudado a hacer de Zen Browser lo mejor que puede ser.",
+ "description": "Esta lista muestra a los contribuyentes que nos han ayudado a hacer de Zen lo mejor que puede ser.",
"browser": "Navegador",
"website": "Sitio web"
}
From 793d18b699dc675592f3f5883f28cbf3de5f961a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Thu, 5 Jun 2025 21:12:44 -0600
Subject: [PATCH 04/18] fix: minor spelling issues
---
src/i18n/es/translation.json | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/i18n/es/translation.json b/src/i18n/es/translation.json
index a16bf08..e596330 100644
--- a/src/i18n/es/translation.json
+++ b/src/i18n/es/translation.json
@@ -12,7 +12,7 @@
{ "text": "tranquilo", "highlight": true }
],
"description": [
- "Hermosamente diseñado, enfocado en la privacidad y repleto de funciones.",
+ "Hermosamente diseñado, enfocado en la privacidad y repleto de funcionalidades.",
"Nos importa tu experiencia, no tus datos."
],
"buttons": {
@@ -22,7 +22,7 @@
},
"features": {
"titles": ["Máxima ", "productividad", ""],
- "description": "Zen está repleto de funciones que te ayudan a mantenerte productivo y enfocado. Los navegadores deberían ser herramientas que te ayuden a hacer las cosas, no distracciones que te alejen de tu trabajo.",
+ "description": "Zen está repleto de funcionalidades que te ayudan a mantenerte productivo y enfocado. Los navegadores deberían ser herramientas que te ayuden a hacer las cosas, no distracciones que te alejen de tu trabajo.",
"featureTabs": {
"workspaces": {
"title": "Espacios de trabajo",
@@ -136,7 +136,7 @@
"githubRelease": "GitHub Release",
"workflowRun": "Workflow run",
"compareChanges": "Comparar cambios",
- "twilightWarning": "Ten en cuenta que Twilight es una versión preliminar de Zen. Puede contener errores y funciones incompletas.",
+ "twilightWarning": "Ten en cuenta que Twilight es una versión preliminar de Zen. Puede contener errores y funcionalidades incompletas.",
"reportIssues": " Si encuentras algún problema, infórmalo en la página de problemas.",
"learnMore": "Aprender más",
"viewIssue": "Ver el problema número {issue} en GitHub"
@@ -264,9 +264,9 @@
"download": {
"title": "Descargar Zen",
"description": "Descarga Zen para tu plataforma y experimenta una experiencia de navegación por Internet más consciente. Todas las descargas incluyen sumas de verificación SHA256 para verificación.",
- "twilightInfo": "Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funciones y actualizaciones experimentales.",
+ "twilightInfo": "Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funcionalidades y actualizaciones experimentales.",
"alertInfo": {
- "description": "Modo Twilight: Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funciones y actualizaciones experimentales."
+ "description": "Modo Twilight: Actualmente estás en modo Twilight, lo que significa que estás descargando las últimas funcionalidades y actualizaciones experimentales."
},
"platformSelector": {
"title": "Selector de Plataforma",
@@ -285,7 +285,7 @@
},
"securityNotice": {
"title": "Descargas Verificadas y Seguras",
- "description": "Todas las descargas de Zen están firmadas y verificadas para tu seguridad. Recomendamos descargar directamente desde nuestro sitio web oficial o repositorio de GitHub. Si tu descarga parece estar rota o es marcada por tu antivirus, por favor infórmanos."
+ "description": "Todas las descargas de Zen están firmadas y verificadas para tu seguridad. Recomendamos descargar directamente desde nuestro sitio web oficial o repositorio de GitHub. Si tu descarga parece estar rota o es marcada por tu antivirus, por favor infórmanos."
},
"platformNames": {
"mac": "MacOS",
From 8aa45eb35249b8ecf8f04981c380ec1d5a46b50c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Thu, 5 Jun 2025 21:21:51 -0600
Subject: [PATCH 05/18] chore: remove unnecessary margin
---
src/i18n/en/translation.json | 2 +-
src/i18n/es/translation.json | 2 +-
src/i18n/ja/translation.json | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/i18n/en/translation.json b/src/i18n/en/translation.json
index 0274a5e..cd8f4d2 100644
--- a/src/i18n/en/translation.json
+++ b/src/i18n/en/translation.json
@@ -285,7 +285,7 @@
},
"securityNotice": {
"title": "Verified & Secure Downloads",
- "description": "All Zen downloads are signed and verified for your security. We recommend downloading directly from our official website or GitHub repository. If your download seems broken or gets flagged by your antivirus, please report it to us."
+ "description": "All Zen downloads are signed and verified for your security. We recommend downloading directly from our official website or GitHub repository. If your download seems broken or gets flagged by your antivirus, please report it to us."
},
"platformNames": {
"mac": "macOS",
diff --git a/src/i18n/es/translation.json b/src/i18n/es/translation.json
index e596330..c5239a4 100644
--- a/src/i18n/es/translation.json
+++ b/src/i18n/es/translation.json
@@ -285,7 +285,7 @@
},
"securityNotice": {
"title": "Descargas Verificadas y Seguras",
- "description": "Todas las descargas de Zen están firmadas y verificadas para tu seguridad. Recomendamos descargar directamente desde nuestro sitio web oficial o repositorio de GitHub. Si tu descarga parece estar rota o es marcada por tu antivirus, por favor infórmanos."
+ "description": "Todas las descargas de Zen están firmadas y verificadas para tu seguridad. Recomendamos descargar directamente desde nuestro sitio web oficial o repositorio de GitHub. Si tu descarga parece estar rota o es marcada por tu antivirus, por favor infórmanos."
},
"platformNames": {
"mac": "MacOS",
diff --git a/src/i18n/ja/translation.json b/src/i18n/ja/translation.json
index 1bd377c..a04926e 100644
--- a/src/i18n/ja/translation.json
+++ b/src/i18n/ja/translation.json
@@ -285,7 +285,7 @@
},
"securityNotice": {
"title": "検証済み・安全なダウンロード",
- "description": "すべてのZenダウンロードは署名・検証済みです。公式サイトまたはGitHubからのダウンロードを推奨します。ダウンロードに問題がある場合やウイルス対策で警告が出た場合は、ご報告ください。"
+ "description": "すべてのZenダウンロードは署名・検証済みです。公式サイトまたはGitHubからのダウンロードを推奨します。ダウンロードに問題がある場合やウイルス対策で警告が出た場合は、ご報告ください。"
},
"platformNames": {
"mac": "macOS",
From e38074e6de1170dcea00adec438bb6ef306a38d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 00:09:42 -0600
Subject: [PATCH 06/18] feat: add arktype
---
package.json | 1 +
pnpm-lock.yaml | 23 +++++++++++++++++++++++
2 files changed, 24 insertions(+)
diff --git a/package.json b/package.json
index 950ecb9..e268922 100644
--- a/package.json
+++ b/package.json
@@ -37,6 +37,7 @@
"@fortawesome/free-solid-svg-icons": "6.7.1",
"@types/react": "^19.1.6",
"@types/react-dom": "^19.1.5",
+ "arktype": "^2.1.20",
"astro": "5.7.10",
"astro-navbar": "2.3.7",
"autoprefixer": "10.4.14",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 4397a56..481e5dc 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -44,6 +44,9 @@ importers:
'@types/react-dom':
specifier: ^19.1.5
version: 19.1.5(@types/react@19.1.6)
+ arktype:
+ specifier: ^2.1.20
+ version: 2.1.20
astro:
specifier: 5.7.10
version: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0)
@@ -233,6 +236,12 @@ packages:
resolution: {integrity: sha512-30iZtAPgz+LTIYoeivqYo853f02jBYSd5uGnGpkFV0M3xOt9aN73erkgYAmZU43x4VfqcnLxW9Kpg3R5LC4YYw==}
engines: {node: '>=6.0.0'}
+ '@ark/schema@0.46.0':
+ resolution: {integrity: sha512-c2UQdKgP2eqqDArfBqQIJppxJHvNNXuQPeuSPlDML4rjw+f1cu0qAlzOG4b8ujgm9ctIDWwhpyw6gjG5ledIVQ==}
+
+ '@ark/util@0.46.0':
+ resolution: {integrity: sha512-JPy/NGWn/lvf1WmGCPw2VGpBg5utZraE84I7wli18EDF3p3zc/e9WolT35tINeZO3l7C77SjqRJeAUoT0CvMRg==}
+
'@asamuzakjp/css-color@3.2.0':
resolution: {integrity: sha512-K1A6z8tS3XsmCMM86xoWdn7Fkdn9m6RSVtocUrJYIwZnFVkng/PvkEoWtOWmP+Scc6saYWHWZYbndEEXxl24jw==}
@@ -1869,6 +1878,9 @@ packages:
resolution: {integrity: sha512-COROpnaoap1E2F000S62r6A60uHZnmlvomhfyT2DlTcrY1OrBKn2UhH7qn5wTC9zMvD0AY7csdPSNwKP+7WiQw==}
engines: {node: '>= 0.4'}
+ arktype@2.1.20:
+ resolution: {integrity: sha512-IZCEEXaJ8g+Ijd59WtSYwtjnqXiwM8sWQ5EjGamcto7+HVN9eK0C4p0zDlCuAwWhpqr6fIBkxPuYDl4/Mcj/+Q==}
+
array-buffer-byte-length@1.0.2:
resolution: {integrity: sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==}
engines: {node: '>= 0.4'}
@@ -5104,6 +5116,12 @@ snapshots:
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
+ '@ark/schema@0.46.0':
+ dependencies:
+ '@ark/util': 0.46.0
+
+ '@ark/util@0.46.0': {}
+
'@asamuzakjp/css-color@3.2.0':
dependencies:
'@csstools/css-calc': 2.1.4(@csstools/css-parser-algorithms@3.0.5(@csstools/css-tokenizer@3.0.4))(@csstools/css-tokenizer@3.0.4)
@@ -6737,6 +6755,11 @@ snapshots:
aria-query@5.3.2: {}
+ arktype@2.1.20:
+ dependencies:
+ '@ark/schema': 0.46.0
+ '@ark/util': 0.46.0
+
array-buffer-byte-length@1.0.2:
dependencies:
call-bound: 1.0.4
From 54fc7d248483c92b6f35887ce6137dc7147b28c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 00:09:59 -0600
Subject: [PATCH 07/18] chore: update cspell dictionary
---
cspell.json | 37 +++++++++++++++++++------------------
1 file changed, 19 insertions(+), 18 deletions(-)
diff --git a/cspell.json b/cspell.json
index 24957e9..27005a9 100644
--- a/cspell.json
+++ b/cspell.json
@@ -5,24 +5,33 @@
"words": [
"adam",
"AMOLED",
+ "Apóyanos",
"Astronav",
- "Briel",
"brhm",
"Brhm",
+ "Briel",
"bryan",
- "Canoa",
"canoa",
+ "Canoa",
"cfasync",
+ "contáctanos",
+ "Contáctanos",
"createdAsc",
"createdDefault",
"createdDesc",
"daniel",
- "FMPEG",
+ "donándonos",
+ "encriptación",
+ "Español",
"ferrocyante",
"flatpaks",
+ "FMPEG",
"Galdámez",
"García",
"Garro",
+ "geolocalización",
+ "infórmalo",
+ "infórmanos",
"isnan",
"itro",
"jace",
@@ -33,29 +42,31 @@
"Jokagi",
"junicode",
"Junicode",
- "kristijanribaric",
"Kristijan",
+ "kristijanribaric",
"laggy",
"larvey",
"Larvey",
+ "linaarchsum",
"linuxarmsum",
"linuxsum",
- "linaarchsum",
"mfsa",
"mozilla",
"Nehalem",
+ "notarización",
"NSIS",
"OCSP",
"oscar",
"Otero",
"patreon",
"Pdzly",
+ "Refactorización",
"Ribaric",
"taroj",
"testid",
"theming",
- "tuta",
"tsconfigs",
+ "tuta",
"unfloatable",
"unfocusing",
"updatedAsc",
@@ -63,19 +74,9 @@
"updatedDesc",
"VAAPI",
"wmfcdm",
- "XPCOM",
"xmark",
- "zsync",
- "Apóyanos",
- "donándonos",
- "infórmalo",
- "notarización",
- "Refactorización",
- "infórmanos",
- "geolocalización",
- "encriptación",
- "Contáctanos",
- "contáctanos"
+ "XPCOM",
+ "zsync"
],
"flagWords": [],
"ignorePaths": [
From 8c5e776213edfc26ac6b1f0b8523773ff431d89d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 00:10:38 -0600
Subject: [PATCH 08/18] refactor: implement object schema with arktype to
validate schema on runtime
---
src/constants/i18n.ts | 471 +++++++++++++++++++++++++++++++++++++++++-
src/utils/i18n.ts | 16 +-
2 files changed, 468 insertions(+), 19 deletions(-)
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index 8518b76..2248173 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -1,21 +1,470 @@
-const UI_EN = (await import('~/i18n/en/translation.json', { with: { type: 'json' } })).default
-const UI_JA = (await import('~/i18n/ja/translation.json', { with: { type: 'json' } })).default
-const UI_ES = (await import('~/i18n/es/translation.json', { with: { type: 'json' } })).default
+import { type } from 'arktype'
+
+export const i18nSchema = type
+ .scope({
+ Title: type({
+ text: 'string',
+ highlight: 'boolean',
+ }),
+
+ Hero: {
+ title: 'Title[]',
+ description: 'string[]',
+ buttons: {
+ beta: 'string',
+ support: 'string',
+ },
+ },
+
+ Feature: type({
+ title: 'string',
+ description: 'string',
+ }),
+
+ Sponsor: type({
+ name: 'string',
+ url: 'string',
+ }),
+
+ ValuesListEntry: type({
+ title: 'string',
+ description: 'string',
+ }),
+
+ Image: type({
+ alt: 'string',
+ }),
+
+ Member: type({
+ name: 'string',
+ description: 'string',
+ link: 'string|false',
+ }),
+
+ Donation: type({
+ title: 'string',
+ description: 'string',
+ button: 'string',
+ }),
+
+ Routes: {
+ index: {
+ title: 'string',
+ hero: 'Hero',
+ features: {
+ titles: 'string[]',
+ description: 'string',
+ featureTabs: {
+ workspaces: 'Feature',
+ compactMode: 'Feature',
+ glance: 'Feature',
+ splitView: 'Feature',
+ },
+ },
+ sponsors: {
+ title: 'string',
+ description: 'string',
+ sponsors: {
+ tuta: 'Sponsor',
+ },
+ },
+ community: {
+ title: 'string[]',
+ description: 'string',
+ lists: {
+ freeAndOpenSource: 'ValuesListEntry',
+ simpleYetPowerful: 'ValuesListEntry',
+ privateAndAlwaysUpToDate: 'ValuesListEntry',
+ },
+ images: {
+ community: 'Image',
+ },
+ },
+ },
+ mods: {
+ title: 'string',
+ description: 'string',
+ pagination: {
+ pagination: 'string',
+ },
+ search: 'string',
+ by: 'string',
+ sort: {
+ lastCreated: 'string',
+ lastUpdated: 'string',
+ perPage: 'string',
+ },
+ noResults: 'string',
+ noResultsDescription: 'string',
+ slug: {
+ title: 'string',
+ description: 'string',
+ alert: {
+ description: 'string',
+ button: 'string',
+ },
+ createdBy: 'string',
+ creationDate: 'string',
+ latestUpdate: 'string',
+ visitModHomepage: 'string',
+ installMod: 'string',
+ uninstallMod: 'string',
+ back: 'string',
+ },
+ },
+ releaseNotes: {
+ topSection: {
+ title: 'string',
+ description: 'string',
+ },
+ list: {
+ support: 'string',
+ navigateToVersion: 'string',
+ },
+ itemType: {
+ fix: 'string',
+ feature: 'string',
+ known: 'string',
+ break: 'string',
+ theme: 'string',
+ security: 'string',
+ change: 'string',
+ },
+ backToTop: 'string',
+ chooseVersion: 'string',
+ components: {
+ releaseNoteItem: {
+ twilight: 'string',
+ twilightChanges: 'string',
+ releaseChanges: 'string',
+ firefoxVersion: 'string',
+ githubRelease: 'string',
+ workflowRun: 'string',
+ compareChanges: 'string',
+ twilightWarning: 'string',
+ reportIssues: 'string',
+ learnMore: 'string',
+ viewIssue: 'string',
+ },
+ },
+ slug: {
+ title: 'string',
+ redirect: 'string',
+ },
+ },
+ about: {
+ title: 'string',
+ description: 'string',
+ littleHelp: 'string',
+ mainTeam: {
+ title: 'string',
+ description: 'string',
+ subTitle: {
+ browser: 'string',
+ website: 'string',
+ },
+ members: {
+ browser: {
+ mauro: 'Member',
+ jan: 'Member',
+ bryan: 'Member',
+ oscar: 'Member',
+ daniel: 'Member',
+ brhm: 'Member',
+ kristijanribaric: 'Member',
+ larvey: 'Member',
+ studio: 'Member',
+ },
+ website: {
+ taroj1205: 'Member',
+ jace: 'Member',
+ canoa: 'Member',
+ adam: 'Member',
+ n7itro: 'Member',
+ jafeth: 'Member',
+ },
+ },
+ },
+ contributors: {
+ title: 'string',
+ description: 'string',
+ browser: 'string',
+ website: 'string',
+ },
+ },
+ donate: {
+ title: 'string',
+ description: 'string',
+ patreon: 'Donation',
+ koFi: 'Donation',
+ },
+ download: {
+ title: 'string',
+ description: 'string',
+ twilightInfo: 'string',
+ alertInfo: {
+ description: 'string',
+ },
+ platformSelector: {
+ title: 'string',
+ description: 'string',
+ },
+ additionalResources: {
+ title: 'string',
+ sourceCode: {
+ title: 'string',
+ description: 'string',
+ },
+ documentation: {
+ title: 'string',
+ description: 'string',
+ },
+ },
+ securityNotice: {
+ title: 'string',
+ description: 'string',
+ },
+ platformNames: {
+ mac: 'string',
+ windows: 'string',
+ linux: 'string',
+ macDownload: 'string',
+ windowsDownload: 'string',
+ linuxDownload: 'string',
+ },
+ platformDescriptions: {
+ mac: 'string',
+ windows: 'string',
+ linux: 'string',
+ },
+ links: {
+ macos: {
+ universal: 'string',
+ },
+ windows: {
+ '64bit': 'string',
+ ARM64: 'string',
+ },
+ linux: {
+ flathub: 'string',
+ x86_64: 'string',
+ aarch64: 'string',
+ },
+ },
+ buttonCard: {
+ copy: 'string',
+ showChecksum: 'string',
+ beta: 'string',
+ },
+ },
+ privacyPolicy: {
+ title: 'string',
+ lastUpdated: 'string',
+ sections: {
+ introduction: {
+ title: 'string',
+ body: 'string',
+ summary: 'string',
+ },
+ noCollect: {
+ title: 'string',
+ body: 'string',
+ },
+ noTelemetry: {
+ title: 'string',
+ body: 'string',
+ body2: 'string',
+ },
+ noPersonalData: {
+ title: 'string',
+ body: 'string',
+ },
+ noThirdParty: {
+ title: 'string',
+ body: 'string',
+ },
+ externalConnections: {
+ title: 'string',
+ body: 'string',
+ },
+ localStorage: {
+ title: 'string',
+ },
+ browsingData: {
+ title: 'string',
+ body: 'string',
+ },
+ cookies: {
+ title: 'string',
+ body: 'string',
+ },
+ cache: {
+ title: 'string',
+ body: 'string',
+ },
+ settings: {
+ title: 'string',
+ body: 'string',
+ },
+ sync: {
+ title: 'string',
+ body: 'string',
+ link1: 'string',
+ link2: 'string',
+ },
+ addons: {
+ title: 'string',
+ body: 'string',
+ },
+ security: {
+ title: 'string',
+ body: 'string',
+ note: 'string',
+ },
+ control: {
+ title: 'string',
+ deletionTitle: 'string',
+ deletionBody: 'string',
+ },
+ website: {
+ title: 'string',
+ body: 'string',
+ externalLinksTitle: 'string',
+ externalLinksBody: 'string',
+ },
+ changes: {
+ title: 'string',
+ body: 'string',
+ },
+ otherTelemetry: {
+ title: 'string',
+ body: 'string',
+ firefoxPrivacyNotice: 'string',
+ forMoreInformation: 'string',
+ },
+ contact: {
+ title: 'string',
+ body: 'string',
+ discord: 'string',
+ discordLink: 'string',
+ github: 'string',
+ githubLink: 'string',
+ },
+ },
+ },
+ welcome: {
+ title: 'string[]',
+ },
+ whatsNew: {
+ title: 'string',
+ reportIssue: 'string',
+ joinDiscord: 'string',
+ readFullReleaseNotes: 'string',
+ },
+ notFound: {
+ title: 'string',
+ description: 'string',
+ button: 'string',
+ },
+ },
+
+ Page: type({
+ title: 'string',
+ description: 'string?',
+ }),
+
+ Layout: {
+ index: 'Page',
+ mods: 'Page',
+ releaseNotes: 'Page',
+ about: 'Page',
+ donate: 'Page',
+ download: 'Page',
+ privacyPolicy: 'Page',
+ welcome: 'Page',
+ whatsNew: 'Page',
+ },
+
+ Components: type({
+ footer: {
+ title: 'string',
+ description: 'string',
+ download: 'string',
+ followUs: 'string',
+ aboutUs: 'string',
+ teamAndContributors: 'string',
+ privacyPolicy: 'string',
+ getStarted: 'string',
+ documentation: 'string',
+ zenMods: 'string',
+ releaseNotes: 'string',
+ getHelp: 'string',
+ discord: 'string',
+ uptimeStatus: 'string',
+ reportAnIssue: 'string',
+ twilight: 'string',
+ madeWith: 'string',
+ },
+ nav: {
+ brand: 'string',
+ menu: {
+ gettingStarted: 'string',
+ usefulLinks: 'string',
+ mods: 'string',
+ download: 'string',
+ discord: 'string',
+ releaseNotes: 'string',
+ zenMods: 'string',
+ tryZenMods: 'string',
+ zenModsDesc: 'string',
+ releaseNotesDesc: 'string',
+ discordDesc: 'string',
+ donate: 'string',
+ donateDesc: 'string',
+ aboutUs: 'string',
+ aboutUsDesc: 'string',
+ documentation: 'string',
+ documentationDesc: 'string',
+ github: 'string',
+ githubDesc: 'string',
+ menu: 'string',
+ },
+ },
+ }),
+
+ I18n: {
+ routes: 'Routes',
+ layout: 'Layout',
+ components: 'Components',
+ },
+ })
+ .export('I18n')
+
+export type I18nType = typeof i18nSchema.I18n.infer
+
+const languages: Record = Object.fromEntries(
+ Object.entries(import.meta.glob('~/i18n/**/translation.json', { eager: true })).map(
+ ([key, value]) => {
+ const result = i18nSchema.I18n(value)
+
+ if (result instanceof type.errors) {
+ throw new Error(`Invalid translation file (${key}):\n${' '.repeat(2)}${result.summary}`)
+ }
+
+ return [/i18n\/([A-z]{2})\/translation.json/.exec(key)?.[1], result]
+ }
+ )
+)
export const i18n = {
DEFAULT_LOCALE: 'en',
LOCALES: [
- { label: 'English', value: 'en', ui: UI_EN, intl: 'en-US' },
- { label: '日本語', value: 'ja', ui: UI_JA, intl: 'ja-JP' },
- { label: 'Español', value: 'es', ui: UI_ES, intl: 'es-ES' },
+ { label: 'English', value: 'en', ui: languages['en'], intl: 'en-US' },
+ { label: '日本語', value: 'ja', ui: languages['ja'], intl: 'ja-JP' },
+ { label: 'Español', value: 'es', ui: languages['es'], intl: 'es-ES' },
],
} as const
-/**
- * Type definition for UI translations based on the English translation
- */
-export type UIProps = typeof UI_EN | typeof UI_JA | typeof UI_ES
-
export const getIntlLocale = (locale: string) => {
return i18n.LOCALES.find(l => l.value === locale)?.intl
}
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 31784b3..62df0cf 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -1,7 +1,7 @@
import { type AstroGlobal, type GetStaticPaths } from 'astro'
import { CONSTANT } from '~/constants'
-import { type UIProps } from '~/constants/i18n'
+import { type I18nType } from '~/constants/i18n'
/**
* Represents the available locales in the application
@@ -73,7 +73,7 @@ export const getOtherLocales = (): Locale[] => otherLocales
* @param {Locale} [locale] - The target locale for translations
* @returns {UI} Merged UI translations
*/
-export const getUI = (locale?: Locale | string): UIProps => {
+export const getUI = (locale?: Locale | string): I18nType => {
const validLocale = locales.includes(locale as Locale) ? locale : CONSTANT.I18N.DEFAULT_LOCALE
const defaultUI = CONSTANT.I18N.LOCALES.find(
({ value }) => value === CONSTANT.I18N.DEFAULT_LOCALE
@@ -82,12 +82,12 @@ export const getUI = (locale?: Locale | string): UIProps => {
// Helper to recursively check for missing keys
function checkMismatch(
- defaultObj: UIProps,
- localeObj: Partial = {},
+ defaultObj: I18nType,
+ localeObj: Partial = {},
path: string[] = []
): void {
if (typeof defaultObj !== 'object' || defaultObj === null) return
- for (const key of Object.keys(defaultObj) as (keyof UIProps)[]) {
+ for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
if (!(key in localeObj)) {
console.error(
`[i18n] Missing translation key: ${[...path, key as string].join('.')} in locale '\x1b[1m${validLocale}\x1b[0m'. See src/i18n/${validLocale}/translation.json`
@@ -105,12 +105,12 @@ export const getUI = (locale?: Locale | string): UIProps => {
}
// Deep merge: localeUI overrides defaultUI, fallback to defaultUI for missing keys
- function deepMerge(defaultObj: UIProps, localeObj: Partial = {}): UIProps {
+ function deepMerge(defaultObj: I18nType, localeObj: Partial = {}): I18nType {
if (typeof defaultObj !== 'object' || defaultObj === null) return defaultObj
if (typeof localeObj !== 'object' || localeObj === null) return defaultObj
// eslint-disable-next-line @typescript-eslint/no-explicit-any
const result: any = Array.isArray(defaultObj) ? [...defaultObj] : { ...defaultObj }
- for (const key of Object.keys(defaultObj) as (keyof UIProps)[]) {
+ for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
if (key in localeObj) {
if (
typeof defaultObj[key] === 'object' &&
@@ -136,7 +136,7 @@ export const getUI = (locale?: Locale | string): UIProps => {
if (localeUI && validLocale !== CONSTANT.I18N.DEFAULT_LOCALE) {
checkMismatch(defaultUI, localeUI)
- return deepMerge(defaultUI, localeUI) as UIProps
+ return deepMerge(defaultUI, localeUI) as I18nType
}
// If localeUI is undefined or locale is default, just return defaultUI
From a1472a22824879751d293e36f0143480062bde03 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 12:19:52 -0600
Subject: [PATCH 09/18] refactor(i18n): simplify locale retrieval process
---
src/utils/i18n.ts | 130 +++++++++++++++++++++++++---------------------
1 file changed, 72 insertions(+), 58 deletions(-)
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 62df0cf..9a6b800 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -68,79 +68,93 @@ const otherLocales = CONSTANT.I18N.LOCALES.filter(
*/
export const getOtherLocales = (): Locale[] => otherLocales
-/**
- * Retrieves UI translations for a given locale, merging with default translations
- * @param {Locale} [locale] - The target locale for translations
- * @returns {UI} Merged UI translations
- */
-export const getUI = (locale?: Locale | string): I18nType => {
- const validLocale = locales.includes(locale as Locale) ? locale : CONSTANT.I18N.DEFAULT_LOCALE
- const defaultUI = CONSTANT.I18N.LOCALES.find(
- ({ value }) => value === CONSTANT.I18N.DEFAULT_LOCALE
- )?.ui
- const localeUI = CONSTANT.I18N.LOCALES.find(({ value }) => value === validLocale)?.ui
+// Helper to recursively check for missing keys
+export function checkMismatch(
+ defaultObj: I18nType,
+ localeObj: Partial = {},
+ path: string[] = [],
+ validLocale: Locale
+): void {
+ if (typeof defaultObj !== 'object' || defaultObj === null) return
+ for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
+ if (!(key in localeObj)) {
+ console.error(
+ `[i18n] Missing translation key: ${[...path, key as string].join('.')} in locale '\x1b[1m${validLocale}\x1b[0m'. See src/i18n/${validLocale}/translation.json`
+ )
+ } else if (
+ typeof defaultObj[key] === 'object' &&
+ defaultObj[key] !== null &&
+ typeof localeObj[key] === 'object' &&
+ localeObj[key] !== null
+ ) {
+ // @ts-expect-error: recursive structure
+ checkMismatch(defaultObj[key], localeObj[key], [...path, key as string], validLocale)
+ }
+ }
+}
- // Helper to recursively check for missing keys
- function checkMismatch(
- defaultObj: I18nType,
- localeObj: Partial = {},
- path: string[] = []
- ): void {
- if (typeof defaultObj !== 'object' || defaultObj === null) return
- for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
- if (!(key in localeObj)) {
- console.error(
- `[i18n] Missing translation key: ${[...path, key as string].join('.')} in locale '\x1b[1m${validLocale}\x1b[0m'. See src/i18n/${validLocale}/translation.json`
- )
- } else if (
+// Deep merge: localeUI overrides defaultUI, fallback to defaultUI for missing keys
+export function deepMerge(defaultObj: I18nType, localeObj: Partial = {}): I18nType {
+ if (
+ typeof defaultObj !== 'object' ||
+ defaultObj === null ||
+ typeof localeObj !== 'object' ||
+ localeObj === null
+ ) {
+ return defaultObj
+ }
+
+ // eslint-disable-next-line @typescript-eslint/no-explicit-any
+ const result: any = Array.isArray(defaultObj) ? [...defaultObj] : { ...defaultObj }
+ for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
+ if (key in localeObj) {
+ if (
typeof defaultObj[key] === 'object' &&
defaultObj[key] !== null &&
typeof localeObj[key] === 'object' &&
localeObj[key] !== null
) {
// @ts-expect-error: recursive structure
- checkMismatch(defaultObj[key], localeObj[key], [...path, key as string])
- }
- }
- }
-
- // Deep merge: localeUI overrides defaultUI, fallback to defaultUI for missing keys
- function deepMerge(defaultObj: I18nType, localeObj: Partial = {}): I18nType {
- if (typeof defaultObj !== 'object' || defaultObj === null) return defaultObj
- if (typeof localeObj !== 'object' || localeObj === null) return defaultObj
- // eslint-disable-next-line @typescript-eslint/no-explicit-any
- const result: any = Array.isArray(defaultObj) ? [...defaultObj] : { ...defaultObj }
- for (const key of Object.keys(defaultObj) as (keyof I18nType)[]) {
- if (key in localeObj) {
- if (
- typeof defaultObj[key] === 'object' &&
- defaultObj[key] !== null &&
- typeof localeObj[key] === 'object' &&
- localeObj[key] !== null
- ) {
- // @ts-expect-error: recursive structure
- result[key] = deepMerge(defaultObj[key], localeObj[key])
- } else {
- result[key] = localeObj[key]
- }
+ result[key] = deepMerge(defaultObj[key], localeObj[key])
} else {
- result[key] = defaultObj[key]
+ result[key] = localeObj[key]
}
+ } else {
+ result[key] = defaultObj[key]
}
- return result
}
+ return result
+}
- if (!defaultUI) {
- throw new Error('Default UI translation is missing!')
+const defaultUI = CONSTANT.I18N.LOCALES.find(({ value }) => {
+ return value === CONSTANT.I18N.DEFAULT_LOCALE
+})?.ui
+
+if (!defaultUI) {
+ throw new Error('Default UI translation is missing!')
+}
+
+const localesMap: Record = {} as Record
+
+for (const locale of locales) {
+ const maybeLocale = CONSTANT.I18N.LOCALES.find(({ value }) => {
+ return value === locale
+ })
+
+ if (maybeLocale) {
+ localesMap[locale] = maybeLocale.ui
}
+}
- if (localeUI && validLocale !== CONSTANT.I18N.DEFAULT_LOCALE) {
- checkMismatch(defaultUI, localeUI)
- return deepMerge(defaultUI, localeUI) as I18nType
- }
+/**
+ * Retrieves UI translations for a given locale
+ * @param {Locale} [locale] - The target locale for translations
+ * @returns {I18nType} UI translations
+ */
+export const getUI = (locale?: Locale): I18nType => {
+ const validLocale = locale && locales.includes(locale) ? locale : CONSTANT.I18N.DEFAULT_LOCALE
- // If localeUI is undefined or locale is default, just return defaultUI
- return defaultUI
+ return localesMap[validLocale] ?? defaultUI
}
/**
From bfb609fe978525f63231943a44908cf20872afbb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 12:35:09 -0600
Subject: [PATCH 10/18] fix: linter issues
---
src/components/download/release-data.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/components/download/release-data.ts b/src/components/download/release-data.ts
index 58ab556..93274b0 100644
--- a/src/components/download/release-data.ts
+++ b/src/components/download/release-data.ts
@@ -1,11 +1,11 @@
-import { getUI } from '~/utils/i18n'
+import { getUI, type Locale } from '~/utils/i18n'
/**
* Returns the releases object, injecting checksums dynamically.
* @param locale The locale to use for labels
* @param checksums Record mapping filenames to SHA-256 hashes
*/
-export function getReleasesWithChecksums(locale: string) {
+export function getReleasesWithChecksums(locale: Locale) {
const {
routes: {
download: {
From b0c122f98433f47fec7cbc7747eb970e40826599 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 18:17:55 -0600
Subject: [PATCH 11/18] refactor: replace import glob with static imports to
prevent playwright from dying
---
src/components/ModsList.astro | 3 +-
src/components/download/release-data.ts | 3 +-
src/constants/i18n.ts | 56 ++++++++++++++++++-------
src/utils/i18n.ts | 7 +---
4 files changed, 45 insertions(+), 24 deletions(-)
diff --git a/src/components/ModsList.astro b/src/components/ModsList.astro
index 0296a18..aa50114 100644
--- a/src/components/ModsList.astro
+++ b/src/components/ModsList.astro
@@ -3,7 +3,8 @@ import { icon, library } from '@fortawesome/fontawesome-svg-core'
import { faSort, faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons'
import Xmark from '~/icons/XmarkIcon.astro'
import { type ZenTheme } from '~/mods'
-import { getPath, type Locale } from '~/utils/i18n'
+import { getPath } from '~/utils/i18n'
+import { type Locale } from '~/constants/i18n'
// Add icons to the library
library.add(faSort, faSortUp, faSortDown)
diff --git a/src/components/download/release-data.ts b/src/components/download/release-data.ts
index 93274b0..b2eceda 100644
--- a/src/components/download/release-data.ts
+++ b/src/components/download/release-data.ts
@@ -1,4 +1,5 @@
-import { getUI, type Locale } from '~/utils/i18n'
+import { type Locale } from '~/constants/i18n'
+import { getUI } from '~/utils/i18n'
/**
* Returns the releases object, injecting checksums dynamically.
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index 2248173..c43f2f0 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -442,29 +442,53 @@ export const i18nSchema = type
export type I18nType = typeof i18nSchema.I18n.infer
-const languages: Record = Object.fromEntries(
- Object.entries(import.meta.glob('~/i18n/**/translation.json', { eager: true })).map(
- ([key, value]) => {
- const result = i18nSchema.I18n(value)
+export type Locale = (typeof locales)[number]['value']
- if (result instanceof type.errors) {
- throw new Error(`Invalid translation file (${key}):\n${' '.repeat(2)}${result.summary}`)
- }
+async function importI18n(
+ locale: Locale,
+ promise: Promise<{ default: unknown }>
+): Promise<[Locale, unknown]> {
+ const result = await promise
- return [/i18n\/([A-z]{2})\/translation.json/.exec(key)?.[1], result]
+ return [locale, result.default]
+}
+
+export const locales = [
+ { label: 'English', value: 'en', intl: 'en-US' },
+ { label: '日本語', value: 'ja', intl: 'ja-JP' },
+ { label: 'Español', value: 'es', intl: 'es-ES' },
+] as const
+
+const languages = Object.fromEntries(
+ (
+ await Promise.all([
+ importI18n('en', import('~/i18n/en/translation.json')),
+ importI18n('ja', import('~/i18n/ja/translation.json')),
+ importI18n('es', import('~/i18n/es/translation.json')),
+ ])
+ ).map(([locale, result]) => {
+ const parsed = i18nSchema.I18n(result)
+
+ if (parsed instanceof type.errors) {
+ throw new Error(`Invalid translation file (${locale}):\n${' '.repeat(2)}${parsed.summary}`)
}
- )
-)
+
+ return [locale, parsed]
+ })
+) as Record
export const i18n = {
DEFAULT_LOCALE: 'en',
- LOCALES: [
- { label: 'English', value: 'en', ui: languages['en'], intl: 'en-US' },
- { label: '日本語', value: 'ja', ui: languages['ja'], intl: 'ja-JP' },
- { label: 'Español', value: 'es', ui: languages['es'], intl: 'es-ES' },
- ],
+ LOCALES: locales.map(locale => {
+ return {
+ ...locale,
+ ui: languages[locale.value],
+ }
+ }),
} as const
export const getIntlLocale = (locale: string) => {
- return i18n.LOCALES.find(l => l.value === locale)?.intl
+ return locales.find(({ value }) => {
+ return value === locale
+ })?.intl
}
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 9a6b800..da332a5 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -1,12 +1,7 @@
import { type AstroGlobal, type GetStaticPaths } from 'astro'
import { CONSTANT } from '~/constants'
-import { type I18nType } from '~/constants/i18n'
-
-/**
- * Represents the available locales in the application
- */
-export type Locale = (typeof locales)[number]
+import { type I18nType, type Locale } from '~/constants/i18n'
/**
* Generates a localized path by prefixing the locale if necessary
From 35a7cc3fcc232016d0f10c912ff5506160a50dc6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Fri, 6 Jun 2025 18:28:02 -0600
Subject: [PATCH 12/18] chore: remove unnecessary mapping
---
src/constants/i18n.ts | 10 +++++-----
src/utils/i18n.ts | 30 ++++++++----------------------
2 files changed, 13 insertions(+), 27 deletions(-)
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index c43f2f0..56d35c7 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -453,18 +453,18 @@ async function importI18n(
return [locale, result.default]
}
-export const locales = [
+const locales = [
{ label: 'English', value: 'en', intl: 'en-US' },
{ label: '日本語', value: 'ja', intl: 'ja-JP' },
{ label: 'Español', value: 'es', intl: 'es-ES' },
] as const
-const languages = Object.fromEntries(
+export const languages = Object.fromEntries(
(
await Promise.all([
- importI18n('en', import('~/i18n/en/translation.json')),
- importI18n('ja', import('~/i18n/ja/translation.json')),
- importI18n('es', import('~/i18n/es/translation.json')),
+ importI18n('en', import('~/i18n/en/translation.json', { with: { type: 'json' } })),
+ importI18n('ja', import('~/i18n/ja/translation.json', { with: { type: 'json' } })),
+ importI18n('es', import('~/i18n/es/translation.json', { with: { type: 'json' } })),
])
).map(([locale, result]) => {
const parsed = i18nSchema.I18n(result)
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index da332a5..13d9a6c 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -1,7 +1,12 @@
import { type AstroGlobal, type GetStaticPaths } from 'astro'
import { CONSTANT } from '~/constants'
-import { type I18nType, type Locale } from '~/constants/i18n'
+import { languages, type I18nType, type Locale } from '~/constants/i18n'
+
+/**
+ * List of all supported locales
+ */
+export const locales = CONSTANT.I18N.LOCALES.map(({ value }) => value)
/**
* Generates a localized path by prefixing the locale if necessary
@@ -45,11 +50,6 @@ export const getLocale = (Astro: AstroGlobal): Locale => {
return Astro.currentLocale as Locale
}
-/**
- * List of all supported locales
- */
-export const locales = CONSTANT.I18N.LOCALES.map(({ value }) => value)
-
/**
* List of locales excluding the default locale
*/
@@ -121,26 +121,12 @@ export function deepMerge(defaultObj: I18nType, localeObj: Partial = {
return result
}
-const defaultUI = CONSTANT.I18N.LOCALES.find(({ value }) => {
- return value === CONSTANT.I18N.DEFAULT_LOCALE
-})?.ui
+const defaultUI = languages[CONSTANT.I18N.DEFAULT_LOCALE]
if (!defaultUI) {
throw new Error('Default UI translation is missing!')
}
-const localesMap: Record = {} as Record
-
-for (const locale of locales) {
- const maybeLocale = CONSTANT.I18N.LOCALES.find(({ value }) => {
- return value === locale
- })
-
- if (maybeLocale) {
- localesMap[locale] = maybeLocale.ui
- }
-}
-
/**
* Retrieves UI translations for a given locale
* @param {Locale} [locale] - The target locale for translations
@@ -149,7 +135,7 @@ for (const locale of locales) {
export const getUI = (locale?: Locale): I18nType => {
const validLocale = locale && locales.includes(locale) ? locale : CONSTANT.I18N.DEFAULT_LOCALE
- return localesMap[validLocale] ?? defaultUI
+ return languages[validLocale] ?? defaultUI
}
/**
From 0b09c5b14eed4e145574c737aa222afd45e14e11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Sat, 7 Jun 2025 09:29:23 -0600
Subject: [PATCH 13/18] refactor: split logic into multiple files
---
src/constants/i18n.ts | 507 +++---------------------------------------
src/i18n/locales.json | 5 +
src/schemas/i18n.ts | 444 ++++++++++++++++++++++++++++++++++++
src/types/i18n.ts | 13 ++
src/utils/i18n.ts | 113 ++++------
5 files changed, 536 insertions(+), 546 deletions(-)
create mode 100644 src/i18n/locales.json
create mode 100644 src/schemas/i18n.ts
create mode 100644 src/types/i18n.ts
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index 56d35c7..4ec3c59 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -1,494 +1,47 @@
import { type } from 'arktype'
-export const i18nSchema = type
- .scope({
- Title: type({
- text: 'string',
- highlight: 'boolean',
- }),
+import languages from '~/i18n/locales.json' with { type: 'json' }
+import { i18nSchema } from '~/schemas/i18n'
+import { type I18nType, type Locale } from '~/types/i18n'
- Hero: {
- title: 'Title[]',
- description: 'string[]',
- buttons: {
- beta: 'string',
- support: 'string',
- },
- },
+/**
+ * List of all supported locales.
+ */
+export const locales = Object.keys(languages) as Locale[]
- Feature: type({
- title: 'string',
- description: 'string',
- }),
+/**
+ * Maps locale keys to their corresponding translation objects.
+ */
+export const translations: Record = Object.fromEntries(
+ Object.entries(import.meta.glob('~/i18n/**/translation.json', { eager: true })).map(
+ ([key, value]) => {
+ const result = i18nSchema.I18n(value)
- Sponsor: type({
- name: 'string',
- url: 'string',
- }),
+ if (result instanceof type.errors) {
+ throw new Error(`Invalid translation file (${key}):\n${' '.repeat(2)}${result.summary}`)
+ }
- ValuesListEntry: type({
- title: 'string',
- description: 'string',
- }),
-
- Image: type({
- alt: 'string',
- }),
-
- Member: type({
- name: 'string',
- description: 'string',
- link: 'string|false',
- }),
-
- Donation: type({
- title: 'string',
- description: 'string',
- button: 'string',
- }),
-
- Routes: {
- index: {
- title: 'string',
- hero: 'Hero',
- features: {
- titles: 'string[]',
- description: 'string',
- featureTabs: {
- workspaces: 'Feature',
- compactMode: 'Feature',
- glance: 'Feature',
- splitView: 'Feature',
- },
- },
- sponsors: {
- title: 'string',
- description: 'string',
- sponsors: {
- tuta: 'Sponsor',
- },
- },
- community: {
- title: 'string[]',
- description: 'string',
- lists: {
- freeAndOpenSource: 'ValuesListEntry',
- simpleYetPowerful: 'ValuesListEntry',
- privateAndAlwaysUpToDate: 'ValuesListEntry',
- },
- images: {
- community: 'Image',
- },
- },
- },
- mods: {
- title: 'string',
- description: 'string',
- pagination: {
- pagination: 'string',
- },
- search: 'string',
- by: 'string',
- sort: {
- lastCreated: 'string',
- lastUpdated: 'string',
- perPage: 'string',
- },
- noResults: 'string',
- noResultsDescription: 'string',
- slug: {
- title: 'string',
- description: 'string',
- alert: {
- description: 'string',
- button: 'string',
- },
- createdBy: 'string',
- creationDate: 'string',
- latestUpdate: 'string',
- visitModHomepage: 'string',
- installMod: 'string',
- uninstallMod: 'string',
- back: 'string',
- },
- },
- releaseNotes: {
- topSection: {
- title: 'string',
- description: 'string',
- },
- list: {
- support: 'string',
- navigateToVersion: 'string',
- },
- itemType: {
- fix: 'string',
- feature: 'string',
- known: 'string',
- break: 'string',
- theme: 'string',
- security: 'string',
- change: 'string',
- },
- backToTop: 'string',
- chooseVersion: 'string',
- components: {
- releaseNoteItem: {
- twilight: 'string',
- twilightChanges: 'string',
- releaseChanges: 'string',
- firefoxVersion: 'string',
- githubRelease: 'string',
- workflowRun: 'string',
- compareChanges: 'string',
- twilightWarning: 'string',
- reportIssues: 'string',
- learnMore: 'string',
- viewIssue: 'string',
- },
- },
- slug: {
- title: 'string',
- redirect: 'string',
- },
- },
- about: {
- title: 'string',
- description: 'string',
- littleHelp: 'string',
- mainTeam: {
- title: 'string',
- description: 'string',
- subTitle: {
- browser: 'string',
- website: 'string',
- },
- members: {
- browser: {
- mauro: 'Member',
- jan: 'Member',
- bryan: 'Member',
- oscar: 'Member',
- daniel: 'Member',
- brhm: 'Member',
- kristijanribaric: 'Member',
- larvey: 'Member',
- studio: 'Member',
- },
- website: {
- taroj1205: 'Member',
- jace: 'Member',
- canoa: 'Member',
- adam: 'Member',
- n7itro: 'Member',
- jafeth: 'Member',
- },
- },
- },
- contributors: {
- title: 'string',
- description: 'string',
- browser: 'string',
- website: 'string',
- },
- },
- donate: {
- title: 'string',
- description: 'string',
- patreon: 'Donation',
- koFi: 'Donation',
- },
- download: {
- title: 'string',
- description: 'string',
- twilightInfo: 'string',
- alertInfo: {
- description: 'string',
- },
- platformSelector: {
- title: 'string',
- description: 'string',
- },
- additionalResources: {
- title: 'string',
- sourceCode: {
- title: 'string',
- description: 'string',
- },
- documentation: {
- title: 'string',
- description: 'string',
- },
- },
- securityNotice: {
- title: 'string',
- description: 'string',
- },
- platformNames: {
- mac: 'string',
- windows: 'string',
- linux: 'string',
- macDownload: 'string',
- windowsDownload: 'string',
- linuxDownload: 'string',
- },
- platformDescriptions: {
- mac: 'string',
- windows: 'string',
- linux: 'string',
- },
- links: {
- macos: {
- universal: 'string',
- },
- windows: {
- '64bit': 'string',
- ARM64: 'string',
- },
- linux: {
- flathub: 'string',
- x86_64: 'string',
- aarch64: 'string',
- },
- },
- buttonCard: {
- copy: 'string',
- showChecksum: 'string',
- beta: 'string',
- },
- },
- privacyPolicy: {
- title: 'string',
- lastUpdated: 'string',
- sections: {
- introduction: {
- title: 'string',
- body: 'string',
- summary: 'string',
- },
- noCollect: {
- title: 'string',
- body: 'string',
- },
- noTelemetry: {
- title: 'string',
- body: 'string',
- body2: 'string',
- },
- noPersonalData: {
- title: 'string',
- body: 'string',
- },
- noThirdParty: {
- title: 'string',
- body: 'string',
- },
- externalConnections: {
- title: 'string',
- body: 'string',
- },
- localStorage: {
- title: 'string',
- },
- browsingData: {
- title: 'string',
- body: 'string',
- },
- cookies: {
- title: 'string',
- body: 'string',
- },
- cache: {
- title: 'string',
- body: 'string',
- },
- settings: {
- title: 'string',
- body: 'string',
- },
- sync: {
- title: 'string',
- body: 'string',
- link1: 'string',
- link2: 'string',
- },
- addons: {
- title: 'string',
- body: 'string',
- },
- security: {
- title: 'string',
- body: 'string',
- note: 'string',
- },
- control: {
- title: 'string',
- deletionTitle: 'string',
- deletionBody: 'string',
- },
- website: {
- title: 'string',
- body: 'string',
- externalLinksTitle: 'string',
- externalLinksBody: 'string',
- },
- changes: {
- title: 'string',
- body: 'string',
- },
- otherTelemetry: {
- title: 'string',
- body: 'string',
- firefoxPrivacyNotice: 'string',
- forMoreInformation: 'string',
- },
- contact: {
- title: 'string',
- body: 'string',
- discord: 'string',
- discordLink: 'string',
- github: 'string',
- githubLink: 'string',
- },
- },
- },
- welcome: {
- title: 'string[]',
- },
- whatsNew: {
- title: 'string',
- reportIssue: 'string',
- joinDiscord: 'string',
- readFullReleaseNotes: 'string',
- },
- notFound: {
- title: 'string',
- description: 'string',
- button: 'string',
- },
- },
-
- Page: type({
- title: 'string',
- description: 'string?',
- }),
-
- Layout: {
- index: 'Page',
- mods: 'Page',
- releaseNotes: 'Page',
- about: 'Page',
- donate: 'Page',
- download: 'Page',
- privacyPolicy: 'Page',
- welcome: 'Page',
- whatsNew: 'Page',
- },
-
- Components: type({
- footer: {
- title: 'string',
- description: 'string',
- download: 'string',
- followUs: 'string',
- aboutUs: 'string',
- teamAndContributors: 'string',
- privacyPolicy: 'string',
- getStarted: 'string',
- documentation: 'string',
- zenMods: 'string',
- releaseNotes: 'string',
- getHelp: 'string',
- discord: 'string',
- uptimeStatus: 'string',
- reportAnIssue: 'string',
- twilight: 'string',
- madeWith: 'string',
- },
- nav: {
- brand: 'string',
- menu: {
- gettingStarted: 'string',
- usefulLinks: 'string',
- mods: 'string',
- download: 'string',
- discord: 'string',
- releaseNotes: 'string',
- zenMods: 'string',
- tryZenMods: 'string',
- zenModsDesc: 'string',
- releaseNotesDesc: 'string',
- discordDesc: 'string',
- donate: 'string',
- donateDesc: 'string',
- aboutUs: 'string',
- aboutUsDesc: 'string',
- documentation: 'string',
- documentationDesc: 'string',
- github: 'string',
- githubDesc: 'string',
- menu: 'string',
- },
- },
- }),
-
- I18n: {
- routes: 'Routes',
- layout: 'Layout',
- components: 'Components',
- },
- })
- .export('I18n')
-
-export type I18nType = typeof i18nSchema.I18n.infer
-
-export type Locale = (typeof locales)[number]['value']
-
-async function importI18n(
- locale: Locale,
- promise: Promise<{ default: unknown }>
-): Promise<[Locale, unknown]> {
- const result = await promise
-
- return [locale, result.default]
-}
-
-const locales = [
- { label: 'English', value: 'en', intl: 'en-US' },
- { label: '日本語', value: 'ja', intl: 'ja-JP' },
- { label: 'Español', value: 'es', intl: 'es-ES' },
-] as const
-
-export const languages = Object.fromEntries(
- (
- await Promise.all([
- importI18n('en', import('~/i18n/en/translation.json', { with: { type: 'json' } })),
- importI18n('ja', import('~/i18n/ja/translation.json', { with: { type: 'json' } })),
- importI18n('es', import('~/i18n/es/translation.json', { with: { type: 'json' } })),
- ])
- ).map(([locale, result]) => {
- const parsed = i18nSchema.I18n(result)
-
- if (parsed instanceof type.errors) {
- throw new Error(`Invalid translation file (${locale}):\n${' '.repeat(2)}${parsed.summary}`)
+ return [/i18n\/([A-z]{2})\/translation.json/.exec(key)?.[1], result]
}
+ )
+)
- return [locale, parsed]
- })
-) as Record
-
+/**
+ * Constants for i18n configuration.
+ */
export const i18n = {
DEFAULT_LOCALE: 'en',
- LOCALES: locales.map(locale => {
+ LOCALES: Object.entries(languages).map(([key, locale]) => {
return {
...locale,
- ui: languages[locale.value],
+ ui: translations[key],
}
}),
} as const
-export const getIntlLocale = (locale: string) => {
- return locales.find(({ value }) => {
- return value === locale
- })?.intl
+/**
+ * Retrieves the intl locale string for a given locale.
+ */
+export const getIntlLocale = (locale: Locale) => {
+ return languages[locale]?.intl
}
diff --git a/src/i18n/locales.json b/src/i18n/locales.json
new file mode 100644
index 0000000..b50b41a
--- /dev/null
+++ b/src/i18n/locales.json
@@ -0,0 +1,5 @@
+{
+ "en": { "label": "English", "intl": "en-US" },
+ "ja": { "label": "日本語", "intl": "ja-JP" },
+ "es": { "label": "Español", "intl": "es-ES" }
+}
diff --git a/src/schemas/i18n.ts b/src/schemas/i18n.ts
new file mode 100644
index 0000000..c5bc2ee
--- /dev/null
+++ b/src/schemas/i18n.ts
@@ -0,0 +1,444 @@
+import { type } from 'arktype'
+
+/**
+ * Defines the schema for the i18n object.
+ */
+export const i18nSchema = type
+ .scope({
+ Title: type({
+ text: 'string',
+ highlight: 'boolean',
+ }),
+
+ Hero: {
+ title: 'Title[]',
+ description: 'string[]',
+ buttons: {
+ beta: 'string',
+ support: 'string',
+ },
+ },
+
+ Feature: type({
+ title: 'string',
+ description: 'string',
+ }),
+
+ Sponsor: type({
+ name: 'string',
+ url: 'string',
+ }),
+
+ ValuesListEntry: type({
+ title: 'string',
+ description: 'string',
+ }),
+
+ Image: type({
+ alt: 'string',
+ }),
+
+ Member: type({
+ name: 'string',
+ description: 'string',
+ link: 'string|false',
+ }),
+
+ Donation: type({
+ title: 'string',
+ description: 'string',
+ button: 'string',
+ }),
+
+ Routes: {
+ index: {
+ title: 'string',
+ hero: 'Hero',
+ features: {
+ titles: 'string[]',
+ description: 'string',
+ featureTabs: {
+ workspaces: 'Feature',
+ compactMode: 'Feature',
+ glance: 'Feature',
+ splitView: 'Feature',
+ },
+ },
+ sponsors: {
+ title: 'string',
+ description: 'string',
+ sponsors: {
+ tuta: 'Sponsor',
+ },
+ },
+ community: {
+ title: 'string[]',
+ description: 'string',
+ lists: {
+ freeAndOpenSource: 'ValuesListEntry',
+ simpleYetPowerful: 'ValuesListEntry',
+ privateAndAlwaysUpToDate: 'ValuesListEntry',
+ },
+ images: {
+ community: 'Image',
+ },
+ },
+ },
+ mods: {
+ title: 'string',
+ description: 'string',
+ pagination: {
+ pagination: 'string',
+ },
+ search: 'string',
+ by: 'string',
+ sort: {
+ lastCreated: 'string',
+ lastUpdated: 'string',
+ perPage: 'string',
+ },
+ noResults: 'string',
+ noResultsDescription: 'string',
+ slug: {
+ title: 'string',
+ description: 'string',
+ alert: {
+ description: 'string',
+ button: 'string',
+ },
+ createdBy: 'string',
+ creationDate: 'string',
+ latestUpdate: 'string',
+ visitModHomepage: 'string',
+ installMod: 'string',
+ uninstallMod: 'string',
+ back: 'string',
+ },
+ },
+ releaseNotes: {
+ topSection: {
+ title: 'string',
+ description: 'string',
+ },
+ list: {
+ support: 'string',
+ navigateToVersion: 'string',
+ },
+ itemType: {
+ fix: 'string',
+ feature: 'string',
+ known: 'string',
+ break: 'string',
+ theme: 'string',
+ security: 'string',
+ change: 'string',
+ },
+ backToTop: 'string',
+ chooseVersion: 'string',
+ components: {
+ releaseNoteItem: {
+ twilight: 'string',
+ twilightChanges: 'string',
+ releaseChanges: 'string',
+ firefoxVersion: 'string',
+ githubRelease: 'string',
+ workflowRun: 'string',
+ compareChanges: 'string',
+ twilightWarning: 'string',
+ reportIssues: 'string',
+ learnMore: 'string',
+ viewIssue: 'string',
+ },
+ },
+ slug: {
+ title: 'string',
+ redirect: 'string',
+ },
+ },
+ about: {
+ title: 'string',
+ description: 'string',
+ littleHelp: 'string',
+ mainTeam: {
+ title: 'string',
+ description: 'string',
+ subTitle: {
+ browser: 'string',
+ website: 'string',
+ },
+ members: {
+ browser: {
+ mauro: 'Member',
+ jan: 'Member',
+ bryan: 'Member',
+ oscar: 'Member',
+ daniel: 'Member',
+ brhm: 'Member',
+ kristijanribaric: 'Member',
+ larvey: 'Member',
+ studio: 'Member',
+ },
+ website: {
+ taroj1205: 'Member',
+ jace: 'Member',
+ canoa: 'Member',
+ adam: 'Member',
+ n7itro: 'Member',
+ jafeth: 'Member',
+ },
+ },
+ },
+ contributors: {
+ title: 'string',
+ description: 'string',
+ browser: 'string',
+ website: 'string',
+ },
+ },
+ donate: {
+ title: 'string',
+ description: 'string',
+ patreon: 'Donation',
+ koFi: 'Donation',
+ },
+ download: {
+ title: 'string',
+ description: 'string',
+ twilightInfo: 'string',
+ alertInfo: {
+ description: 'string',
+ },
+ platformSelector: {
+ title: 'string',
+ description: 'string',
+ },
+ additionalResources: {
+ title: 'string',
+ sourceCode: {
+ title: 'string',
+ description: 'string',
+ },
+ documentation: {
+ title: 'string',
+ description: 'string',
+ },
+ },
+ securityNotice: {
+ title: 'string',
+ description: 'string',
+ },
+ platformNames: {
+ mac: 'string',
+ windows: 'string',
+ linux: 'string',
+ macDownload: 'string',
+ windowsDownload: 'string',
+ linuxDownload: 'string',
+ },
+ platformDescriptions: {
+ mac: 'string',
+ windows: 'string',
+ linux: 'string',
+ },
+ links: {
+ macos: {
+ universal: 'string',
+ },
+ windows: {
+ '64bit': 'string',
+ ARM64: 'string',
+ },
+ linux: {
+ flathub: 'string',
+ x86_64: 'string',
+ aarch64: 'string',
+ },
+ },
+ buttonCard: {
+ copy: 'string',
+ showChecksum: 'string',
+ beta: 'string',
+ },
+ },
+ privacyPolicy: {
+ title: 'string',
+ lastUpdated: 'string',
+ sections: {
+ introduction: {
+ title: 'string',
+ body: 'string',
+ summary: 'string',
+ },
+ noCollect: {
+ title: 'string',
+ body: 'string',
+ },
+ noTelemetry: {
+ title: 'string',
+ body: 'string',
+ body2: 'string',
+ },
+ noPersonalData: {
+ title: 'string',
+ body: 'string',
+ },
+ noThirdParty: {
+ title: 'string',
+ body: 'string',
+ },
+ externalConnections: {
+ title: 'string',
+ body: 'string',
+ },
+ localStorage: {
+ title: 'string',
+ },
+ browsingData: {
+ title: 'string',
+ body: 'string',
+ },
+ cookies: {
+ title: 'string',
+ body: 'string',
+ },
+ cache: {
+ title: 'string',
+ body: 'string',
+ },
+ settings: {
+ title: 'string',
+ body: 'string',
+ },
+ sync: {
+ title: 'string',
+ body: 'string',
+ link1: 'string',
+ link2: 'string',
+ },
+ addons: {
+ title: 'string',
+ body: 'string',
+ },
+ security: {
+ title: 'string',
+ body: 'string',
+ note: 'string',
+ },
+ control: {
+ title: 'string',
+ deletionTitle: 'string',
+ deletionBody: 'string',
+ },
+ website: {
+ title: 'string',
+ body: 'string',
+ externalLinksTitle: 'string',
+ externalLinksBody: 'string',
+ },
+ changes: {
+ title: 'string',
+ body: 'string',
+ },
+ otherTelemetry: {
+ title: 'string',
+ body: 'string',
+ firefoxPrivacyNotice: 'string',
+ forMoreInformation: 'string',
+ },
+ contact: {
+ title: 'string',
+ body: 'string',
+ discord: 'string',
+ discordLink: 'string',
+ github: 'string',
+ githubLink: 'string',
+ },
+ },
+ },
+ welcome: {
+ title: 'string[]',
+ },
+ whatsNew: {
+ title: 'string',
+ reportIssue: 'string',
+ joinDiscord: 'string',
+ readFullReleaseNotes: 'string',
+ },
+ notFound: {
+ title: 'string',
+ description: 'string',
+ button: 'string',
+ },
+ },
+
+ Page: type({
+ title: 'string',
+ description: 'string?',
+ }),
+
+ Layout: {
+ index: 'Page',
+ mods: 'Page',
+ releaseNotes: 'Page',
+ about: 'Page',
+ donate: 'Page',
+ download: 'Page',
+ privacyPolicy: 'Page',
+ welcome: 'Page',
+ whatsNew: 'Page',
+ },
+
+ Components: type({
+ footer: {
+ title: 'string',
+ description: 'string',
+ download: 'string',
+ followUs: 'string',
+ aboutUs: 'string',
+ teamAndContributors: 'string',
+ privacyPolicy: 'string',
+ getStarted: 'string',
+ documentation: 'string',
+ zenMods: 'string',
+ releaseNotes: 'string',
+ getHelp: 'string',
+ discord: 'string',
+ uptimeStatus: 'string',
+ reportAnIssue: 'string',
+ twilight: 'string',
+ madeWith: 'string',
+ },
+ nav: {
+ brand: 'string',
+ menu: {
+ gettingStarted: 'string',
+ usefulLinks: 'string',
+ mods: 'string',
+ download: 'string',
+ discord: 'string',
+ releaseNotes: 'string',
+ zenMods: 'string',
+ tryZenMods: 'string',
+ zenModsDesc: 'string',
+ releaseNotesDesc: 'string',
+ discordDesc: 'string',
+ donate: 'string',
+ donateDesc: 'string',
+ aboutUs: 'string',
+ aboutUsDesc: 'string',
+ documentation: 'string',
+ documentationDesc: 'string',
+ github: 'string',
+ githubDesc: 'string',
+ menu: 'string',
+ },
+ },
+ }),
+
+ I18n: {
+ routes: 'Routes',
+ layout: 'Layout',
+ components: 'Components',
+ },
+ })
+ .export('I18n')
diff --git a/src/types/i18n.ts b/src/types/i18n.ts
new file mode 100644
index 0000000..c6015cf
--- /dev/null
+++ b/src/types/i18n.ts
@@ -0,0 +1,13 @@
+import { type i18nSchema } from '~/schemas/i18n'
+
+import type languages from '~/i18n/locales.json'
+
+/**
+ * Represents the inferred type of the I18n schema.
+ */
+export type I18nType = typeof i18nSchema.I18n.infer
+
+/**
+ * List of all supported locale keys as defined in locales.json.
+ */
+export type Locale = keyof typeof languages
diff --git a/src/utils/i18n.ts b/src/utils/i18n.ts
index 13d9a6c..16fdd91 100644
--- a/src/utils/i18n.ts
+++ b/src/utils/i18n.ts
@@ -1,69 +1,51 @@
import { type AstroGlobal, type GetStaticPaths } from 'astro'
import { CONSTANT } from '~/constants'
-import { languages, type I18nType, type Locale } from '~/constants/i18n'
+import { locales, translations } from '~/constants/i18n'
+import { type I18nType, type Locale } from '~/types/i18n'
/**
- * List of all supported locales
+ * Generates a localized path by prefixing the locale if necessary.
*/
-export const locales = CONSTANT.I18N.LOCALES.map(({ value }) => value)
-
-/**
- * Generates a localized path by prefixing the locale if necessary
- * @param {Locale} [locale] - The current locale
- * @returns {function(string): string} A function that transforms paths based on the locale
- */
-export const getPath =
- (locale?: Locale): ((arg0: string) => string) =>
- (path: string) => {
- // Return external URLs unchanged
- if (path.startsWith('http://') || path.startsWith('https://')) {
- return path
- }
-
- // Check if path already contains any locale prefix
- const existingLocale = locales.find(l => path.startsWith(`/${l}/`))
-
- if (locale && locale !== CONSTANT.I18N.DEFAULT_LOCALE) {
- if (existingLocale) {
- // Replace existing locale with new locale
- return path.replace(`/${existingLocale}/`, `/${locale}/`)
- }
- // Add new locale prefix
- return `/${locale}${path.startsWith('/') ? '' : '/'}${path}`
- }
- // Remove locale prefix if switching to default locale
- if (existingLocale && locale === CONSTANT.I18N.DEFAULT_LOCALE) {
- return path.replace(`/${existingLocale}/`, '/')
- }
+export const getPath = (locale?: Locale) => (path: string) => {
+ // Return external URLs unchanged
+ if (path.startsWith('http://') || path.startsWith('https://')) {
return path
}
+ // Check if path already contains any locale prefix
+ const existingLocale = locales.find(l => path.startsWith(`/${l}/`))
+
+ if (locale && locale !== CONSTANT.I18N.DEFAULT_LOCALE) {
+ if (existingLocale) {
+ // Replace existing locale with new locale
+ return path.replace(`/${existingLocale}/`, `/${locale}/`)
+ }
+ // Add new locale prefix
+ return `/${locale}${path.startsWith('/') ? '' : '/'}${path}`
+ }
+ // Remove locale prefix if switching to default locale
+ if (existingLocale && locale === CONSTANT.I18N.DEFAULT_LOCALE) {
+ return path.replace(`/${existingLocale}/`, '/')
+ }
+ return path
+}
+
/**
* Retrieves the current locale from the Astro object.
- *
- * @param Astro - The Astro object containing the current locale information
- * @param Astro.currentLocale - The current locale string from Astro
- * @returns The current locale cast as a Locale type
*/
export const getLocale = (Astro: AstroGlobal): Locale => {
return Astro.currentLocale as Locale
}
/**
- * List of locales excluding the default locale
+ * List of locales excluding the default locale.
*/
-const otherLocales = CONSTANT.I18N.LOCALES.filter(
- ({ value }) => value !== CONSTANT.I18N.DEFAULT_LOCALE
-).map(({ value }) => value)
+export const otherLocales = locales.filter(locale => locale !== CONSTANT.I18N.DEFAULT_LOCALE)
/**
- * Retrieves locales other than the default locale
- * @returns {Locale[]} Array of non-default locales
+ * Recursively checks for missing keys in the translation objects.
*/
-export const getOtherLocales = (): Locale[] => otherLocales
-
-// Helper to recursively check for missing keys
export function checkMismatch(
defaultObj: I18nType,
localeObj: Partial = {},
@@ -88,7 +70,10 @@ export function checkMismatch(
}
}
-// Deep merge: localeUI overrides defaultUI, fallback to defaultUI for missing keys
+/**
+ * Deep merges two translation objects.
+ * localeUI overrides defaultUI, fallback to defaultUI for missing keys.
+ */
export function deepMerge(defaultObj: I18nType, localeObj: Partial = {}): I18nType {
if (
typeof defaultObj !== 'object' ||
@@ -121,26 +106,26 @@ export function deepMerge(defaultObj: I18nType, localeObj: Partial = {
return result
}
-const defaultUI = languages[CONSTANT.I18N.DEFAULT_LOCALE]
+/**
+ * Default UI translation for the default locale.
+ */
+const defaultUI = translations[CONSTANT.I18N.DEFAULT_LOCALE]
if (!defaultUI) {
throw new Error('Default UI translation is missing!')
}
/**
- * Retrieves UI translations for a given locale
- * @param {Locale} [locale] - The target locale for translations
- * @returns {I18nType} UI translations
+ * Retrieves UI translations for a given locale.
*/
export const getUI = (locale?: Locale): I18nType => {
const validLocale = locale && locales.includes(locale) ? locale : CONSTANT.I18N.DEFAULT_LOCALE
- return languages[validLocale] ?? defaultUI
+ return translations[validLocale] ?? defaultUI
}
/**
- * Generates static paths for internationalization
- * @returns {Array} An array of static paths for different locales
+ * Generates static paths for internationalization.
*/
export const getStaticPaths = (() => {
return [
@@ -148,21 +133,11 @@ export const getStaticPaths = (() => {
params: { locale: undefined },
props: { locale: CONSTANT.I18N.DEFAULT_LOCALE },
},
- ...CONSTANT.I18N.LOCALES.filter(({ value }) => value !== CONSTANT.I18N.DEFAULT_LOCALE).map(
- ({ value }) => ({
- params: { locale: value },
- props: {
- locale: value,
- },
- })
- ),
+ ...otherLocales.map(locale => ({
+ params: { locale },
+ props: {
+ locale,
+ },
+ })),
]
}) satisfies GetStaticPaths
-
-/**
- * Retrieves all available locales, including both default and non-default
- * @returns {Locale[]} Combined array of all locales
- */
-export const getLocales = (): Locale[] => {
- return [...locales, ...otherLocales]
-}
From e49e4dbbf13d9350e2bc9e765cd2911ba309a314 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Sat, 7 Jun 2025 09:29:41 -0600
Subject: [PATCH 14/18] chore: use new imports
---
src/components/ModsList.astro | 2 +-
src/components/download/release-data.ts | 2 +-
src/pages/[...locale]/mods/[...slug].astro | 5 +++--
3 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/src/components/ModsList.astro b/src/components/ModsList.astro
index aa50114..125c3a8 100644
--- a/src/components/ModsList.astro
+++ b/src/components/ModsList.astro
@@ -3,8 +3,8 @@ import { icon, library } from '@fortawesome/fontawesome-svg-core'
import { faSort, faSortDown, faSortUp } from '@fortawesome/free-solid-svg-icons'
import Xmark from '~/icons/XmarkIcon.astro'
import { type ZenTheme } from '~/mods'
+import { type Locale } from '~/types/i18n'
import { getPath } from '~/utils/i18n'
-import { type Locale } from '~/constants/i18n'
// Add icons to the library
library.add(faSort, faSortUp, faSortDown)
diff --git a/src/components/download/release-data.ts b/src/components/download/release-data.ts
index b2eceda..c576cf4 100644
--- a/src/components/download/release-data.ts
+++ b/src/components/download/release-data.ts
@@ -1,4 +1,4 @@
-import { type Locale } from '~/constants/i18n'
+import { type Locale } from '~/types/i18n'
import { getUI } from '~/utils/i18n'
/**
diff --git a/src/pages/[...locale]/mods/[...slug].astro b/src/pages/[...locale]/mods/[...slug].astro
index 95e32a6..56c225b 100644
--- a/src/pages/[...locale]/mods/[...slug].astro
+++ b/src/pages/[...locale]/mods/[...slug].astro
@@ -7,12 +7,13 @@ import InfoIcon from '~/icons/InfoIcon.astro'
import Layout from '~/layouts/Layout.astro'
import { getAllMods, getAuthorLink, getLocalizedDate } from '~/mods'
import { getPath, getUI } from '~/utils/i18n'
-import { getLocale, getOtherLocales } from '~/utils/i18n'
+import { getLocale, otherLocales } from '~/utils/i18n'
export async function getStaticPaths() {
const mods = await getAllMods()
+
return mods.flatMap(mod => [
- ...getOtherLocales().map(locale => ({
+ ...otherLocales.map(locale => ({
params: {
slug: mod.id,
locale: locale,
From 36c6215c92aa0f19896d750a6f4966f3ef36c187 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Sat, 7 Jun 2025 09:29:57 -0600
Subject: [PATCH 15/18] fix: fix playwright tests with import glob
---
src/tests/pages/checksum-mock.json | 38 ++++++++++++++++++++++++++++++
src/tests/pages/download.spec.ts | 29 ++++++++++++-----------
2 files changed, 53 insertions(+), 14 deletions(-)
create mode 100644 src/tests/pages/checksum-mock.json
diff --git a/src/tests/pages/checksum-mock.json b/src/tests/pages/checksum-mock.json
new file mode 100644
index 0000000..781e696
--- /dev/null
+++ b/src/tests/pages/checksum-mock.json
@@ -0,0 +1,38 @@
+{
+ "macos": {
+ "universal": {
+ "label": "Universal",
+ "link": "https://github.com/zen-browser/desktop/releases/latest/download/zen.macos-universal.dmg"
+ }
+ },
+ "windows": {
+ "x86_64": {
+ "label": "64-bit (Recommended)",
+ "link": "https://github.com/zen-browser/desktop/releases/latest/download/zen.installer.exe"
+ },
+ "arm64": {
+ "label": "ARM64",
+ "link": "https://github.com/zen-browser/desktop/releases/latest/download/zen.installer-arm64.exe"
+ }
+ },
+ "linux": {
+ "x86_64": {
+ "tarball": {
+ "label": "Tarball",
+ "link": "https://github.com/zen-browser/desktop/releases/latest/download/zen.linux-x86_64.tar.xz"
+ }
+ },
+ "aarch64": {
+ "tarball": {
+ "label": "Tarball",
+ "link": "https://github.com/zen-browser/desktop/releases/latest/download/zen.linux-aarch64.tar.xz"
+ }
+ },
+ "flathub": {
+ "all": {
+ "label": "Flathub",
+ "link": "https://flathub.org/apps/app.zen_browser.zen"
+ }
+ }
+ }
+}
diff --git a/src/tests/pages/download.spec.ts b/src/tests/pages/download.spec.ts
index ca8a3ff..861549b 100644
--- a/src/tests/pages/download.spec.ts
+++ b/src/tests/pages/download.spec.ts
@@ -1,13 +1,16 @@
import { expect, test, type BrowserContextOptions, type Page } from '@playwright/test'
-import { getReleasesWithChecksums } from '~/components/download/release-data'
-import { CONSTANT } from '~/constants'
+import checksumMock from './checksum-mock.json' with { type: 'json' }
-// Helper to get the platform section by id
+/**
+ * Helper to get the platform section by id.
+ */
const getPlatformSection = (page: Page, platform: string) =>
page.locator(`#${platform}-downloads.platform-section[data-active='true']`)
-// Helper to get the platform tab button
+/**
+ * Helper to get the platform tab button.
+ */
const getPlatformButton = (page: Page, platform: string) =>
page.locator(`button.platform-selector[data-platform='${platform}']`)
@@ -75,24 +78,22 @@ test.describe('Download page platform detection and tab switching', () => {
})
test.describe('Download page download links', () => {
- const releases = getReleasesWithChecksums('en')(CONSTANT.CHECKSUMS)
-
- type Releases = ReturnType>
- function getPlatformLinks(releases: Releases) {
+ function getPlatformLinks() {
return {
- mac: [releases.macos.universal],
- windows: [releases.windows.x86_64, releases.windows.arm64],
+ mac: [checksumMock.macos.universal],
+ windows: [checksumMock.windows.x86_64, checksumMock.windows.arm64],
linux: [
- releases.linux.x86_64.tarball,
- releases.linux.aarch64.tarball,
- releases.linux.flathub.all,
+ checksumMock.linux.x86_64.tarball,
+ checksumMock.linux.aarch64.tarball,
+ checksumMock.linux.flathub.all,
],
}
}
test('all platform download links are correct', async ({ page }) => {
const platforms = ['windows', 'mac', 'linux']
- const platformLinkSelectors = getPlatformLinks(releases)
+ const platformLinkSelectors = getPlatformLinks()
+
await page.goto('/download')
await page.waitForLoadState('domcontentloaded')
for (const platform of platforms) {
From af11fb4583e086bbaab81456fedd20a7e72ddff3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Sat, 7 Jun 2025 11:11:28 -0600
Subject: [PATCH 16/18] chore: update lock files
---
cspell.json | 2 +
pnpm-lock.yaml | 721 +++++++++++++++++++++++---------------------
pnpm-workspace.yaml | 4 +
3 files changed, 385 insertions(+), 342 deletions(-)
diff --git a/cspell.json b/cspell.json
index 27005a9..7801855 100644
--- a/cspell.json
+++ b/cspell.json
@@ -69,11 +69,13 @@
"tuta",
"unfloatable",
"unfocusing",
+ "unrs",
"updatedAsc",
"updatedDefault",
"updatedDesc",
"VAAPI",
"wmfcdm",
+ "workerd",
"xmark",
"XPCOM",
"zsync"
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
index 481e5dc..7b3c645 100644
--- a/pnpm-lock.yaml
+++ b/pnpm-lock.yaml
@@ -13,10 +13,10 @@ importers:
version: 0.9.4(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(typescript@5.6.3)
'@astrojs/cloudflare':
specifier: 12.5.2
- version: 12.5.2(@types/node@22.15.18)(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0))(jiti@2.4.2)(yaml@2.8.0)
+ version: 12.5.2(@types/node@22.15.18)(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0))(jiti@2.4.2)(yaml@2.8.0)
'@astrojs/react':
specifier: ^4.3.0
- version: 4.3.0(@types/node@22.15.18)(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(yaml@2.8.0)
+ version: 4.3.0(@types/node@22.15.18)(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(yaml@2.8.0)
'@astrojs/rss':
specifier: 4.0.11
version: 4.0.11
@@ -25,7 +25,7 @@ importers:
version: 3.3.1
'@astrojs/tailwind':
specifier: 6.0.2
- version: 6.0.2(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0))(tailwindcss@3.4.15)
+ version: 6.0.2(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0))(tailwindcss@3.4.15)
'@fontsource/bricolage-grotesque':
specifier: 5.1.0
version: 5.1.0
@@ -43,13 +43,13 @@ importers:
version: 19.1.6
'@types/react-dom':
specifier: ^19.1.5
- version: 19.1.5(@types/react@19.1.6)
+ version: 19.1.6(@types/react@19.1.6)
arktype:
specifier: ^2.1.20
version: 2.1.20
astro:
specifier: 5.7.10
- version: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0)
+ version: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0)
astro-navbar:
specifier: 2.3.7
version: 2.3.7
@@ -64,7 +64,7 @@ importers:
version: 4.1.0
free-astro-components:
specifier: 1.2.0
- version: 1.2.0(@types/node@22.15.18)(jiti@2.4.2)(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(rollup@4.41.1)(yaml@2.8.0)
+ version: 1.2.0(@types/node@22.15.18)(jiti@2.4.2)(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(rollup@4.42.0)(yaml@2.8.0)
jiti:
specifier: ^2.4.2
version: 2.4.2
@@ -73,7 +73,7 @@ importers:
version: 1.11.13
motion:
specifier: ^12.15.0
- version: 12.15.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+ version: 12.16.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
postcss:
specifier: 8.5.1
version: 8.5.1
@@ -221,7 +221,7 @@ importers:
version: 3.1.3(@types/debug@4.1.12)(@types/node@22.15.18)(jiti@2.4.2)(jsdom@26.1.0)(yaml@2.8.0)
wrangler:
specifier: 4.17.0
- version: 4.17.0(@cloudflare/workers-types@4.20250601.0)
+ version: 4.17.0(@cloudflare/workers-types@4.20250607.0)
packages:
@@ -256,8 +256,8 @@ packages:
peerDependencies:
astro: ^5.0.0
- '@astrojs/compiler@2.12.0':
- resolution: {integrity: sha512-7bCjW6tVDpUurQLeKBUN9tZ5kSv5qYrGmcn0sG0IwacL7isR2ZbyyA3AdZ4uxsuUFOS2SlgReTH7wkxO6zpqWA==}
+ '@astrojs/compiler@2.12.1':
+ resolution: {integrity: sha512-WDSyVIiz7sNcJcCJxJFITu6XjfGhJ50Z0auyaWsrM+xb07IlhBLFtQuDkNy0caVHWNcKTM2LISAaHhgkRqGAVg==}
'@astrojs/internal-helpers@0.6.1':
resolution: {integrity: sha512-l5Pqf6uZu31aG+3Lv8nl/3s4DbUzdlxTWDof4pEpto6GUJNhhCbelVi9dEyurOVyqaelwmS9oSyOWOENSfgo9A==}
@@ -316,16 +316,16 @@ packages:
resolution: {integrity: sha512-cjQ7ZlQ0Mv3b47hABuTevyTuYN4i+loJKGeV9flcCgIK37cCXRh+L1bd3iBHlynerhQ7BhCkn2BPbQUL+rGqFg==}
engines: {node: '>=6.9.0'}
- '@babel/compat-data@7.27.3':
- resolution: {integrity: sha512-V42wFfx1ymFte+ecf6iXghnnP8kWTO+ZLXIyZq+1LAXHHvTZdVxicn4yiVYdYMGaCO3tmqub11AorKkv+iodqw==}
+ '@babel/compat-data@7.27.5':
+ resolution: {integrity: sha512-KiRAp/VoJaWkkte84TvUd9qjdbZAdiqyvMxrGl1N6vzFogKmaLgoM3L1kgtLicp2HP5fBJS8JrZKLVIZGVJAVg==}
engines: {node: '>=6.9.0'}
'@babel/core@7.27.4':
resolution: {integrity: sha512-bXYxrXFubeYdvB0NhD/NBB3Qi6aZeV20GOWVI47t2dkecCEoneR4NPVcb7abpXDEvejgrUfFtG6vG/zxAKmg+g==}
engines: {node: '>=6.9.0'}
- '@babel/generator@7.27.3':
- resolution: {integrity: sha512-xnlJYj5zepml8NXtjkG0WquFUv8RskFqyFcVgTBp5k+NaA/8uw/K+OSVf8AMGw5e9HKP2ETd5xpK5MLZQD6b4Q==}
+ '@babel/generator@7.27.5':
+ resolution: {integrity: sha512-ZGhA37l0e/g2s1Cnzdix0O3aLYm66eF8aufiVteOgnwxgnRP8GoyMj7VWsgWnQbVKXyge7hqrFh2K2TQM6t1Hw==}
engines: {node: '>=6.9.0'}
'@babel/helper-compilation-targets@7.27.2':
@@ -358,12 +358,12 @@ packages:
resolution: {integrity: sha512-YvjJow9FxbhFFKDSuFnVCe2WxXk1zWc22fFePVNEaWJEu8IrZVlda6N0uHwzZrUM1il7NC9Mlp4MaJYbYd9JSg==}
engines: {node: '>=6.9.0'}
- '@babel/helpers@7.27.4':
- resolution: {integrity: sha512-Y+bO6U+I7ZKaM5G5rDUZiYfUvQPUibYmAFe7EnKdnKBbVXDZxvp+MWOH5gYciY0EPk4EScsuFMQBbEfpdRKSCQ==}
+ '@babel/helpers@7.27.6':
+ resolution: {integrity: sha512-muE8Tt8M22638HU31A3CgfSUciwz1fhATfoVai05aPXGor//CdWDCbnlY1yvBPo07njuVOCNGCSp/GTt12lIug==}
engines: {node: '>=6.9.0'}
- '@babel/parser@7.27.4':
- resolution: {integrity: sha512-BRmLHGwpUqLFR2jzx9orBuX/ABDkj2jLKOXrHDTN2aOKL+jFDDKaRNo9nyYsIl9h/UE/7lMKdDjKQQyxKKDZ7g==}
+ '@babel/parser@7.27.5':
+ resolution: {integrity: sha512-OsQd175SxWkGlzbny8J3K8TnnDD0N3lrIUtB92xwyRpzaenGZhxDvxN/JgU00U3CDZNj9tPuDJ5H0WS4Nt3vKg==}
engines: {node: '>=6.0.0'}
hasBin: true
@@ -379,8 +379,8 @@ packages:
peerDependencies:
'@babel/core': ^7.0.0-0
- '@babel/runtime@7.27.4':
- resolution: {integrity: sha512-t3yaEOuGu9NlIZ+hIeGbBjFtZT7j2cb2tg0fuaJKeGotchRjjLfrBA9Kwf8quhpP1EUuxModQg04q/mBwyg8uA==}
+ '@babel/runtime@7.27.6':
+ resolution: {integrity: sha512-vbavdySgbTTrmFE+EsiqUTzlOr5bzlnJtUv9PynGCAKvfQqjIXbvFdumPM/GxMDfyuGMJaJAU6TO4zc1Jf1i8Q==}
engines: {node: '>=6.9.0'}
'@babel/template@7.27.2':
@@ -391,8 +391,8 @@ packages:
resolution: {integrity: sha512-oNcu2QbHqts9BtOWJosOVJapWjBDSxGCpFvikNR5TGDYDQf3JwpIoMzIKrvfoti93cLfPJEG4tH9SPVeyCGgdA==}
engines: {node: '>=6.9.0'}
- '@babel/types@7.27.3':
- resolution: {integrity: sha512-Y1GkI4ktrtvmawoSq+4FCVHNryea6uR+qUQy0AGxLSsjCX0nVmkYQMBLHDkXZuo5hGx7eYdnIaslsdBFm7zbUw==}
+ '@babel/types@7.27.6':
+ resolution: {integrity: sha512-ETyHEk2VHHvl9b9jZP5IHPavHYk57EhanlRRuae9XCpb/j5bDCbPPMOBfCWhnl/7EDJz0jEMCi/RhccCE8r1+Q==}
engines: {node: '>=6.9.0'}
'@capsizecss/unpack@2.4.0':
@@ -441,8 +441,8 @@ packages:
cpu: [x64]
os: [win32]
- '@cloudflare/workers-types@4.20250601.0':
- resolution: {integrity: sha512-foAgsuo+u+swy5I+xzPwo4MquPhLZW0fuLLsl4uZlZv2k10WziSvZ4wTIkK/AADFtCVRjLNduTT8E/b7DDoInA==}
+ '@cloudflare/workers-types@4.20250607.0':
+ resolution: {integrity: sha512-OYmKNzC2eQy6CNj+j0go8Ut3SezjsprCgJyEaBzJql+473WAN9ndVnNZy9lj/tTyLV6wzpQkZWmRAKGDmacvkg==}
'@commitlint/cli@19.8.1':
resolution: {integrity: sha512-LXUdNIkspyxrlV6VDHWBmCZRtkEVRpBKxi2Gtw3J54cGWhLCTouVD/Q6ZSaSvd2YaDObWK8mDjrz3TIKtaQMAA==}
@@ -1370,126 +1370,126 @@ packages:
rollup:
optional: true
- '@rollup/rollup-android-arm-eabi@4.41.1':
- resolution: {integrity: sha512-NELNvyEWZ6R9QMkiytB4/L4zSEaBC03KIXEghptLGLZWJ6VPrL63ooZQCOnlx36aQPGhzuOMwDerC1Eb2VmrLw==}
+ '@rollup/rollup-android-arm-eabi@4.42.0':
+ resolution: {integrity: sha512-gldmAyS9hpj+H6LpRNlcjQWbuKUtb94lodB9uCz71Jm+7BxK1VIOo7y62tZZwxhA7j1ylv/yQz080L5WkS+LoQ==}
cpu: [arm]
os: [android]
- '@rollup/rollup-android-arm64@4.41.1':
- resolution: {integrity: sha512-DXdQe1BJ6TK47ukAoZLehRHhfKnKg9BjnQYUu9gzhI8Mwa1d2fzxA1aw2JixHVl403bwp1+/o/NhhHtxWJBgEA==}
+ '@rollup/rollup-android-arm64@4.42.0':
+ resolution: {integrity: sha512-bpRipfTgmGFdCZDFLRvIkSNO1/3RGS74aWkJJTFJBH7h3MRV4UijkaEUeOMbi9wxtxYmtAbVcnMtHTPBhLEkaw==}
cpu: [arm64]
os: [android]
- '@rollup/rollup-darwin-arm64@4.41.1':
- resolution: {integrity: sha512-5afxvwszzdulsU2w8JKWwY8/sJOLPzf0e1bFuvcW5h9zsEg+RQAojdW0ux2zyYAz7R8HvvzKCjLNJhVq965U7w==}
+ '@rollup/rollup-darwin-arm64@4.42.0':
+ resolution: {integrity: sha512-JxHtA081izPBVCHLKnl6GEA0w3920mlJPLh89NojpU2GsBSB6ypu4erFg/Wx1qbpUbepn0jY4dVWMGZM8gplgA==}
cpu: [arm64]
os: [darwin]
- '@rollup/rollup-darwin-x64@4.41.1':
- resolution: {integrity: sha512-egpJACny8QOdHNNMZKf8xY0Is6gIMz+tuqXlusxquWu3F833DcMwmGM7WlvCO9sB3OsPjdC4U0wHw5FabzCGZg==}
+ '@rollup/rollup-darwin-x64@4.42.0':
+ resolution: {integrity: sha512-rv5UZaWVIJTDMyQ3dCEK+m0SAn6G7H3PRc2AZmExvbDvtaDc+qXkei0knQWcI3+c9tEs7iL/4I4pTQoPbNL2SA==}
cpu: [x64]
os: [darwin]
- '@rollup/rollup-freebsd-arm64@4.41.1':
- resolution: {integrity: sha512-DBVMZH5vbjgRk3r0OzgjS38z+atlupJ7xfKIDJdZZL6sM6wjfDNo64aowcLPKIx7LMQi8vybB56uh1Ftck/Atg==}
+ '@rollup/rollup-freebsd-arm64@4.42.0':
+ resolution: {integrity: sha512-fJcN4uSGPWdpVmvLuMtALUFwCHgb2XiQjuECkHT3lWLZhSQ3MBQ9pq+WoWeJq2PrNxr9rPM1Qx+IjyGj8/c6zQ==}
cpu: [arm64]
os: [freebsd]
- '@rollup/rollup-freebsd-x64@4.41.1':
- resolution: {integrity: sha512-3FkydeohozEskBxNWEIbPfOE0aqQgB6ttTkJ159uWOFn42VLyfAiyD9UK5mhu+ItWzft60DycIN1Xdgiy8o/SA==}
+ '@rollup/rollup-freebsd-x64@4.42.0':
+ resolution: {integrity: sha512-CziHfyzpp8hJpCVE/ZdTizw58gr+m7Y2Xq5VOuCSrZR++th2xWAz4Nqk52MoIIrV3JHtVBhbBsJcAxs6NammOQ==}
cpu: [x64]
os: [freebsd]
- '@rollup/rollup-linux-arm-gnueabihf@4.41.1':
- resolution: {integrity: sha512-wC53ZNDgt0pqx5xCAgNunkTzFE8GTgdZ9EwYGVcg+jEjJdZGtq9xPjDnFgfFozQI/Xm1mh+D9YlYtl+ueswNEg==}
+ '@rollup/rollup-linux-arm-gnueabihf@4.42.0':
+ resolution: {integrity: sha512-UsQD5fyLWm2Fe5CDM7VPYAo+UC7+2Px4Y+N3AcPh/LdZu23YcuGPegQly++XEVaC8XUTFVPscl5y5Cl1twEI4A==}
cpu: [arm]
os: [linux]
- '@rollup/rollup-linux-arm-musleabihf@4.41.1':
- resolution: {integrity: sha512-jwKCca1gbZkZLhLRtsrka5N8sFAaxrGz/7wRJ8Wwvq3jug7toO21vWlViihG85ei7uJTpzbXZRcORotE+xyrLA==}
+ '@rollup/rollup-linux-arm-musleabihf@4.42.0':
+ resolution: {integrity: sha512-/i8NIrlgc/+4n1lnoWl1zgH7Uo0XK5xK3EDqVTf38KvyYgCU/Rm04+o1VvvzJZnVS5/cWSd07owkzcVasgfIkQ==}
cpu: [arm]
os: [linux]
- '@rollup/rollup-linux-arm64-gnu@4.41.1':
- resolution: {integrity: sha512-g0UBcNknsmmNQ8V2d/zD2P7WWfJKU0F1nu0k5pW4rvdb+BIqMm8ToluW/eeRmxCared5dD76lS04uL4UaNgpNA==}
+ '@rollup/rollup-linux-arm64-gnu@4.42.0':
+ resolution: {integrity: sha512-eoujJFOvoIBjZEi9hJnXAbWg+Vo1Ov8n/0IKZZcPZ7JhBzxh2A+2NFyeMZIRkY9iwBvSjloKgcvnjTbGKHE44Q==}
cpu: [arm64]
os: [linux]
- '@rollup/rollup-linux-arm64-musl@4.41.1':
- resolution: {integrity: sha512-XZpeGB5TKEZWzIrj7sXr+BEaSgo/ma/kCgrZgL0oo5qdB1JlTzIYQKel/RmhT6vMAvOdM2teYlAaOGJpJ9lahg==}
+ '@rollup/rollup-linux-arm64-musl@4.42.0':
+ resolution: {integrity: sha512-/3NrcOWFSR7RQUQIuZQChLND36aTU9IYE4j+TB40VU78S+RA0IiqHR30oSh6P1S9f9/wVOenHQnacs/Byb824g==}
cpu: [arm64]
os: [linux]
- '@rollup/rollup-linux-loongarch64-gnu@4.41.1':
- resolution: {integrity: sha512-bkCfDJ4qzWfFRCNt5RVV4DOw6KEgFTUZi2r2RuYhGWC8WhCA8lCAJhDeAmrM/fdiAH54m0mA0Vk2FGRPyzI+tw==}
+ '@rollup/rollup-linux-loongarch64-gnu@4.42.0':
+ resolution: {integrity: sha512-O8AplvIeavK5ABmZlKBq9/STdZlnQo7Sle0LLhVA7QT+CiGpNVe197/t8Aph9bhJqbDVGCHpY2i7QyfEDDStDg==}
cpu: [loong64]
os: [linux]
- '@rollup/rollup-linux-powerpc64le-gnu@4.41.1':
- resolution: {integrity: sha512-3mr3Xm+gvMX+/8EKogIZSIEF0WUu0HL9di+YWlJpO8CQBnoLAEL/roTCxuLncEdgcfJcvA4UMOf+2dnjl4Ut1A==}
+ '@rollup/rollup-linux-powerpc64le-gnu@4.42.0':
+ resolution: {integrity: sha512-6Qb66tbKVN7VyQrekhEzbHRxXXFFD8QKiFAwX5v9Xt6FiJ3BnCVBuyBxa2fkFGqxOCSGGYNejxd8ht+q5SnmtA==}
cpu: [ppc64]
os: [linux]
- '@rollup/rollup-linux-riscv64-gnu@4.41.1':
- resolution: {integrity: sha512-3rwCIh6MQ1LGrvKJitQjZFuQnT2wxfU+ivhNBzmxXTXPllewOF7JR1s2vMX/tWtUYFgphygxjqMl76q4aMotGw==}
+ '@rollup/rollup-linux-riscv64-gnu@4.42.0':
+ resolution: {integrity: sha512-KQETDSEBamQFvg/d8jajtRwLNBlGc3aKpaGiP/LvEbnmVUKlFta1vqJqTrvPtsYsfbE/DLg5CC9zyXRX3fnBiA==}
cpu: [riscv64]
os: [linux]
- '@rollup/rollup-linux-riscv64-musl@4.41.1':
- resolution: {integrity: sha512-LdIUOb3gvfmpkgFZuccNa2uYiqtgZAz3PTzjuM5bH3nvuy9ty6RGc/Q0+HDFrHrizJGVpjnTZ1yS5TNNjFlklw==}
+ '@rollup/rollup-linux-riscv64-musl@4.42.0':
+ resolution: {integrity: sha512-qMvnyjcU37sCo/tuC+JqeDKSuukGAd+pVlRl/oyDbkvPJ3awk6G6ua7tyum02O3lI+fio+eM5wsVd66X0jQtxw==}
cpu: [riscv64]
os: [linux]
- '@rollup/rollup-linux-s390x-gnu@4.41.1':
- resolution: {integrity: sha512-oIE6M8WC9ma6xYqjvPhzZYk6NbobIURvP/lEbh7FWplcMO6gn7MM2yHKA1eC/GvYwzNKK/1LYgqzdkZ8YFxR8g==}
+ '@rollup/rollup-linux-s390x-gnu@4.42.0':
+ resolution: {integrity: sha512-I2Y1ZUgTgU2RLddUHXTIgyrdOwljjkmcZ/VilvaEumtS3Fkuhbw4p4hgHc39Ypwvo2o7sBFNl2MquNvGCa55Iw==}
cpu: [s390x]
os: [linux]
- '@rollup/rollup-linux-x64-gnu@4.41.1':
- resolution: {integrity: sha512-cWBOvayNvA+SyeQMp79BHPK8ws6sHSsYnK5zDcsC3Hsxr1dgTABKjMnMslPq1DvZIp6uO7kIWhiGwaTdR4Og9A==}
+ '@rollup/rollup-linux-x64-gnu@4.42.0':
+ resolution: {integrity: sha512-Gfm6cV6mj3hCUY8TqWa63DB8Mx3NADoFwiJrMpoZ1uESbK8FQV3LXkhfry+8bOniq9pqY1OdsjFWNsSbfjPugw==}
cpu: [x64]
os: [linux]
- '@rollup/rollup-linux-x64-musl@4.41.1':
- resolution: {integrity: sha512-y5CbN44M+pUCdGDlZFzGGBSKCA4A/J2ZH4edTYSSxFg7ce1Xt3GtydbVKWLlzL+INfFIZAEg1ZV6hh9+QQf9YQ==}
+ '@rollup/rollup-linux-x64-musl@4.42.0':
+ resolution: {integrity: sha512-g86PF8YZ9GRqkdi0VoGlcDUb4rYtQKyTD1IVtxxN4Hpe7YqLBShA7oHMKU6oKTCi3uxwW4VkIGnOaH/El8de3w==}
cpu: [x64]
os: [linux]
- '@rollup/rollup-win32-arm64-msvc@4.41.1':
- resolution: {integrity: sha512-lZkCxIrjlJlMt1dLO/FbpZbzt6J/A8p4DnqzSa4PWqPEUUUnzXLeki/iyPLfV0BmHItlYgHUqJe+3KiyydmiNQ==}
+ '@rollup/rollup-win32-arm64-msvc@4.42.0':
+ resolution: {integrity: sha512-+axkdyDGSp6hjyzQ5m1pgcvQScfHnMCcsXkx8pTgy/6qBmWVhtRVlgxjWwDp67wEXXUr0x+vD6tp5W4x6V7u1A==}
cpu: [arm64]
os: [win32]
- '@rollup/rollup-win32-ia32-msvc@4.41.1':
- resolution: {integrity: sha512-+psFT9+pIh2iuGsxFYYa/LhS5MFKmuivRsx9iPJWNSGbh2XVEjk90fmpUEjCnILPEPJnikAU6SFDiEUyOv90Pg==}
+ '@rollup/rollup-win32-ia32-msvc@4.42.0':
+ resolution: {integrity: sha512-F+5J9pelstXKwRSDq92J0TEBXn2nfUrQGg+HK1+Tk7VOL09e0gBqUHugZv7SW4MGrYj41oNCUe3IKCDGVlis2g==}
cpu: [ia32]
os: [win32]
- '@rollup/rollup-win32-x64-msvc@4.41.1':
- resolution: {integrity: sha512-Wq2zpapRYLfi4aKxf2Xff0tN+7slj2d4R87WEzqw7ZLsVvO5zwYCIuEGSZYiK41+GlwUo1HiR+GdkLEJnCKTCw==}
+ '@rollup/rollup-win32-x64-msvc@4.42.0':
+ resolution: {integrity: sha512-LpHiJRwkaVz/LqjHjK8LCi8osq7elmpwujwbXKNW88bM8eeGxavJIKKjkjpMHAh/2xfnrt1ZSnhTv41WYUHYmA==}
cpu: [x64]
os: [win32]
'@rtsao/scc@1.1.0':
resolution: {integrity: sha512-zt6OdqaDoOnJ1ZYsCYGt9YmWzDXl4vQdKTyJev62gFhRGKdx7mcT54V9KIjg+d2wi9EXsPvAPKe7i7WjfVWB8g==}
- '@shikijs/core@3.4.2':
- resolution: {integrity: sha512-AG8vnSi1W2pbgR2B911EfGqtLE9c4hQBYkv/x7Z+Kt0VxhgQKcW7UNDVYsu9YxwV6u+OJrvdJrMq6DNWoBjihQ==}
+ '@shikijs/core@3.6.0':
+ resolution: {integrity: sha512-9By7Xb3olEX0o6UeJyPLI1PE1scC4d3wcVepvtv2xbuN9/IThYN4Wcwh24rcFeASzPam11MCq8yQpwwzCgSBRw==}
- '@shikijs/engine-javascript@3.4.2':
- resolution: {integrity: sha512-1/adJbSMBOkpScCE/SB6XkjJU17ANln3Wky7lOmrnpl+zBdQ1qXUJg2GXTYVHRq+2j3hd1DesmElTXYDgtfSOQ==}
+ '@shikijs/engine-javascript@3.6.0':
+ resolution: {integrity: sha512-7YnLhZG/TU05IHMG14QaLvTW/9WiK8SEYafceccHUSXs2Qr5vJibUwsDfXDLmRi0zHdzsxrGKpSX6hnqe0k8nA==}
- '@shikijs/engine-oniguruma@3.4.2':
- resolution: {integrity: sha512-zcZKMnNndgRa3ORja6Iemsr3DrLtkX3cAF7lTJkdMB6v9alhlBsX9uNiCpqofNrXOvpA3h6lHcLJxgCIhVOU5Q==}
+ '@shikijs/engine-oniguruma@3.6.0':
+ resolution: {integrity: sha512-nmOhIZ9yT3Grd+2plmW/d8+vZ2pcQmo/UnVwXMUXAKTXdi+LK0S08Ancrz5tQQPkxvjBalpMW2aKvwXfelauvA==}
- '@shikijs/langs@3.4.2':
- resolution: {integrity: sha512-H6azIAM+OXD98yztIfs/KH5H4PU39t+SREhmM8LaNXyUrqj2mx+zVkr8MWYqjceSjDw9I1jawm1WdFqU806rMA==}
+ '@shikijs/langs@3.6.0':
+ resolution: {integrity: sha512-IdZkQJaLBu1LCYCwkr30hNuSDfllOT8RWYVZK1tD2J03DkiagYKRxj/pDSl8Didml3xxuyzUjgtioInwEQM/TA==}
- '@shikijs/themes@3.4.2':
- resolution: {integrity: sha512-qAEuAQh+brd8Jyej2UDDf+b4V2g1Rm8aBIdvt32XhDPrHvDkEnpb7Kzc9hSuHUxz0Iuflmq7elaDuQAP9bHIhg==}
+ '@shikijs/themes@3.6.0':
+ resolution: {integrity: sha512-Fq2j4nWr1DF4drvmhqKq8x5vVQ27VncF8XZMBuHuQMZvUSS3NBgpqfwz/FoGe36+W6PvniZ1yDlg2d4kmYDU6w==}
- '@shikijs/types@3.4.2':
- resolution: {integrity: sha512-zHC1l7L+eQlDXLnxvM9R91Efh2V4+rN3oMVS2swCBssbj2U/FBwybD1eeLaq8yl/iwT+zih8iUbTBCgGZOYlVg==}
+ '@shikijs/types@3.6.0':
+ resolution: {integrity: sha512-cLWFiToxYu0aAzJqhXTQsFiJRTFDAGl93IrMSBNaGSzs7ixkLfdG6pH11HipuWFGW5vyx4X47W8HDQ7eSrmBUg==}
'@shikijs/vscode-textmate@10.0.2':
resolution: {integrity: sha512-83yeghZ2xxin3Nj8z1NMd/NCuca+gsYXswywDy5bHvwlWL8tpTQmzGeUuHd9FC3E/SBEMvzJRwWEOz5gGes9Qg==}
@@ -1544,6 +1544,9 @@ packages:
'@types/estree@1.0.7':
resolution: {integrity: sha512-w28IoSUCJpidD/TGviZwwMJckNESJZXFu7NBZ5YJ4mEUnNraUn9Pm8HSZm/jDF1pDWYKspWE7oVphigUPRakIQ==}
+ '@types/estree@1.0.8':
+ resolution: {integrity: sha512-dWHzHa2WqEXI/O1E9OjrocMTKJl2mSrEolh1Iomrv6U+JuNwaHXsXx9bLu5gG7BUWFIN0skIQJQ/L1rIex4X6w==}
+
'@types/hast@3.0.4':
resolution: {integrity: sha512-WPs+bbQw5aCj+x6laNGWLH3wviHtoCv/P3+otBhbOhJgG8qtpdAMlTCxLtsTWA7LH1Oh/bFCHsBn0TPS5m30EQ==}
@@ -1571,8 +1574,8 @@ packages:
'@types/node@22.15.18':
resolution: {integrity: sha512-v1DKRfUdyW+jJhZNEI1PYy29S2YRxMV5AOO/x/SjKmW0acCIOqmbj6Haf9eHAhsPmrhlHSxEhv/1WszcLWV4cg==}
- '@types/react-dom@19.1.5':
- resolution: {integrity: sha512-CMCjrWucUBZvohgZxkjd6S9h0nZxXjzus6yDfUb+xLxYM7VvjKNH1tQrE9GWLql1XoOP4/Ds3bwFqShHUYraGg==}
+ '@types/react-dom@19.1.6':
+ resolution: {integrity: sha512-4hOiT/dwO8Ko0gV1m/TJZYk3y0KBnY9vzDh7W+DH17b2HFSOGgdj33dhihPeuy3l0q23+4e+hoXHV6hCC4dCXw==}
peerDependencies:
'@types/react': ^19.0.0
@@ -1611,6 +1614,10 @@ packages:
resolution: {integrity: sha512-LMi/oqrzpqxyO72ltP+dBSP6V0xiUb4saY7WLtxSfiNEBI8m321LLVFU9/QDJxjDQG9/tjSqKz/E3380TEqSTw==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/scope-manager@8.33.1':
+ resolution: {integrity: sha512-dM4UBtgmzHR9bS0Rv09JST0RcHYearoEoo3pG5B6GoTR9XcyeqX87FEhPo+5kTvVfKCvfHaHrcgeJQc6mrDKrA==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/tsconfig-utils@8.33.0':
resolution: {integrity: sha512-sTkETlbqhEoiFmGr1gsdq5HyVbSOF0145SYDJ/EQmXHtKViCaGvnyLqWFFHtEXoS0J1yU8Wyou2UGmgW88fEug==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1628,6 +1635,10 @@ packages:
resolution: {integrity: sha512-DKuXOKpM5IDT1FA2g9x9x1Ug81YuKrzf4mYX8FAVSNu5Wo/LELHWQyM1pQaDkI42bX15PWl0vNPt1uGiIFUOpg==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/types@8.33.1':
+ resolution: {integrity: sha512-xid1WfizGhy/TKMTwhtVOgalHwPtV8T32MS9MaH50Cwvz6x6YqRIPdD2WvW0XaqOzTV9p5xdLY0h/ZusU5Lokg==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@typescript-eslint/typescript-estree@8.33.0':
resolution: {integrity: sha512-vegY4FQoB6jL97Tu/lWRsAiUUp8qJTqzAmENH2k59SJhw0Th1oszb9Idq/FyyONLuNqT1OADJPXfyUNOR8SzAQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
@@ -1645,96 +1656,100 @@ packages:
resolution: {integrity: sha512-7RW7CMYoskiz5OOGAWjJFxgb7c5UNjTG292gYhWeOAcFmYCtVCSqjqSBj5zMhxbXo2JOW95YYrUWJfU0zrpaGQ==}
engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+ '@typescript-eslint/visitor-keys@8.33.1':
+ resolution: {integrity: sha512-3i8NrFcZeeDHJ+7ZUuDkGT+UHq+XoFGsymNK2jZCOHcfEzRQ0BdpRtdpSx/Iyf3MHLWIcLS0COuOPibKQboIiQ==}
+ engines: {node: ^18.18.0 || ^20.9.0 || >=21.1.0}
+
'@ungap/structured-clone@1.3.0':
resolution: {integrity: sha512-WmoN8qaIAo7WTYWbAZuG8PYEhn5fkz7dZrqTBZ7dtt//lL2Gwms1IcnQ5yHqjDfX8Ft5j4YzDM23f87zBfDe9g==}
- '@unrs/resolver-binding-darwin-arm64@1.7.8':
- resolution: {integrity: sha512-rsRK8T7yxraNRDmpFLZCWqpea6OlXPNRRCjWMx24O1V86KFol7u2gj9zJCv6zB1oJjtnzWceuqdnCgOipFcJPA==}
+ '@unrs/resolver-binding-darwin-arm64@1.7.11':
+ resolution: {integrity: sha512-i3/wlWjQJXMh1uiGtiv7k1EYvrrS3L1hdwmWJJiz1D8jWy726YFYPIxQWbEIVPVAgrfRR0XNlLrTQwq17cuCGw==}
cpu: [arm64]
os: [darwin]
- '@unrs/resolver-binding-darwin-x64@1.7.8':
- resolution: {integrity: sha512-16yEMWa+Olqkk8Kl6Bu0ltT5OgEedkSAsxcz1B3yEctrDYp3EMBu/5PPAGhWVGnwhtf3hNe3y15gfYBAjOv5tQ==}
+ '@unrs/resolver-binding-darwin-x64@1.7.11':
+ resolution: {integrity: sha512-8XXyFvc6w6kmMmi6VYchZhjd5CDcp+Lv6Cn1YmUme0ypsZ/0Kzd+9ESrWtDrWibKPTgSteDTxp75cvBOY64FQQ==}
cpu: [x64]
os: [darwin]
- '@unrs/resolver-binding-freebsd-x64@1.7.8':
- resolution: {integrity: sha512-ST4uqF6FmdZQgv+Q73FU1uHzppeT4mhX3IIEmHlLObrv5Ep50olWRz0iQ4PWovadjHMTAmpuJAGaAuCZYb7UAQ==}
+ '@unrs/resolver-binding-freebsd-x64@1.7.11':
+ resolution: {integrity: sha512-0qJBYzP8Qk24CZ05RSWDQUjdiQUeIJGfqMMzbtXgCKl/a5xa6thfC0MQkGIr55LCLd6YmMyO640ifYUa53lybQ==}
cpu: [x64]
os: [freebsd]
- '@unrs/resolver-binding-linux-arm-gnueabihf@1.7.8':
- resolution: {integrity: sha512-Z/A/4Rm2VWku2g25C3tVb986fY6unx5jaaCFpx1pbAj0OKkyuJ5wcQLHvNbIcJ9qhiYwXfrkB7JNlxrAbg7YFg==}
+ '@unrs/resolver-binding-linux-arm-gnueabihf@1.7.11':
+ resolution: {integrity: sha512-1sGwpgvx+WZf0GFT6vkkOm6UJ+mlsVnjw+Yv9esK71idWeRAG3bbpkf3AoY8KIqKqmnzJExi0uKxXpakQ5Pcbg==}
cpu: [arm]
os: [linux]
- '@unrs/resolver-binding-linux-arm-musleabihf@1.7.8':
- resolution: {integrity: sha512-HN0p7o38qKmDo3bZUiQa6gP7Qhf0sKgJZtRfSHi6JL2Gi4NaUVF0EO1sQ1RHbeQ4VvfjUGMh3QE5dxEh06BgQQ==}
+ '@unrs/resolver-binding-linux-arm-musleabihf@1.7.11':
+ resolution: {integrity: sha512-D/1F/2lTe+XAl3ohkYj51NjniVly8sIqkA/n1aOND3ZMO418nl2JNU95iVa1/RtpzaKcWEsNTtHRogykrUflJg==}
cpu: [arm]
os: [linux]
- '@unrs/resolver-binding-linux-arm64-gnu@1.7.8':
- resolution: {integrity: sha512-HsoVqDBt9G69AN0KWeDNJW+7i8KFlwxrbbnJffgTGpiZd6Jw+Q95sqkXp8y458KhKduKLmXfVZGnKBTNxAgPjw==}
+ '@unrs/resolver-binding-linux-arm64-gnu@1.7.11':
+ resolution: {integrity: sha512-7vFWHLCCNFLEQlmwKQfVy066ohLLArZl+AV/AdmrD1/pD1FlmqM+FKbtnONnIwbHtgetFUCV/SRi1q4D49aTlw==}
cpu: [arm64]
os: [linux]
- '@unrs/resolver-binding-linux-arm64-musl@1.7.8':
- resolution: {integrity: sha512-VfR2yTDUbUvn+e/Aw22CC9fQg9zdShHAfwWctNBdOk7w9CHWl2OtYlcMvjzMAns8QxoHQoqn3/CEnZ4Ts7hfrA==}
+ '@unrs/resolver-binding-linux-arm64-musl@1.7.11':
+ resolution: {integrity: sha512-tYkGIx8hjWPh4zcn17jLEHU8YMmdP2obRTGkdaB3BguGHh31VCS3ywqC4QjTODjmhhNyZYkj/1Dz/+0kKvg9YA==}
cpu: [arm64]
os: [linux]
- '@unrs/resolver-binding-linux-ppc64-gnu@1.7.8':
- resolution: {integrity: sha512-xUauVQNz4uDgs4UJJiUAwMe3N0PA0wvtImh7V0IFu++UKZJhssXbKHBRR4ecUJpUHCX2bc4Wc8sGsB6P+7BANg==}
+ '@unrs/resolver-binding-linux-ppc64-gnu@1.7.11':
+ resolution: {integrity: sha512-6F328QIUev29vcZeRX6v6oqKxfUoGwIIAhWGD8wSysnBYFY0nivp25jdWmAb1GildbCCaQvOKEhCok7YfWkj4Q==}
cpu: [ppc64]
os: [linux]
- '@unrs/resolver-binding-linux-riscv64-gnu@1.7.8':
- resolution: {integrity: sha512-GqyIB+CuSHGhhc8ph5RrurtNetYJjb6SctSHafqmdGcRuGi6uyTMR8l18hMEhZFsXdFMc/MpInPLvmNV22xn+A==}
+ '@unrs/resolver-binding-linux-riscv64-gnu@1.7.11':
+ resolution: {integrity: sha512-NqhWmiGJGdzbZbeucPZIG9Iav4lyYLCarEnxAceguMx9qlpeEF7ENqYKOwB8Zqk7/CeuYMEcLYMaW2li6HyDzQ==}
cpu: [riscv64]
os: [linux]
- '@unrs/resolver-binding-linux-riscv64-musl@1.7.8':
- resolution: {integrity: sha512-eEU3rWIFRv60xaAbtsgwHNWRZGD7cqkpCvNtio/f1TjEE3HfKLzPNB24fA9X/8ZXQrGldE65b7UKK3PmO4eWIQ==}
+ '@unrs/resolver-binding-linux-riscv64-musl@1.7.11':
+ resolution: {integrity: sha512-J2RPIFKMdTrLtBdfR1cUMKl8Gcy05nlQ+bEs/6al7EdWLk9cs3tnDREHZ7mV9uGbeghpjo4i8neNZNx3PYUY9w==}
cpu: [riscv64]
os: [linux]
- '@unrs/resolver-binding-linux-s390x-gnu@1.7.8':
- resolution: {integrity: sha512-GVLI0f4I4TlLqEUoOFvTWedLsJEdvsD0+sxhdvQ5s+N+m2DSynTs8h9jxR0qQbKlpHWpc2Ortz3z48NHRT4l+w==}
+ '@unrs/resolver-binding-linux-s390x-gnu@1.7.11':
+ resolution: {integrity: sha512-bDpGRerHvvHdhun7MmFUNDpMiYcJSqWckwAVVRTJf8F+RyqYJOp/mx04PDc7DhpNPeWdnTMu91oZRMV+gGaVcQ==}
cpu: [s390x]
os: [linux]
- '@unrs/resolver-binding-linux-x64-gnu@1.7.8':
- resolution: {integrity: sha512-GX1pZ/4ncUreB0Rlp1l7bhKAZ8ZmvDIgXdeb5V2iK0eRRF332+6gRfR/r5LK88xfbtOpsmRHU6mQ4N8ZnwvGEA==}
+ '@unrs/resolver-binding-linux-x64-gnu@1.7.11':
+ resolution: {integrity: sha512-G9U7bVmylzRLma3cK39RBm3guoD1HOvY4o0NS4JNm37AD0lS7/xyMt7kn0JejYyc0Im8J+rH69/dXGM9DAJcSQ==}
cpu: [x64]
os: [linux]
- '@unrs/resolver-binding-linux-x64-musl@1.7.8':
- resolution: {integrity: sha512-n1N84MnsvDupzVuYqJGj+2pb9s8BI1A5RgXHvtVFHedGZVBCFjDpQVRlmsFMt6xZiKwDPaqsM16O/1isCUGt7w==}
+ '@unrs/resolver-binding-linux-x64-musl@1.7.11':
+ resolution: {integrity: sha512-7qL20SBKomekSunm7M9Fe5L93bFbn+FbHiGJbfTlp0RKhPVoJDP73vOxf1QrmJHyDPECsGWPFnKa/f8fO2FsHw==}
cpu: [x64]
os: [linux]
- '@unrs/resolver-binding-wasm32-wasi@1.7.8':
- resolution: {integrity: sha512-x94WnaU5g+pCPDVedfnXzoG6lCOF2xFGebNwhtbJCWfceE94Zj8aysSxdxotlrZrxnz5D3ijtyFUYtpz04n39Q==}
+ '@unrs/resolver-binding-wasm32-wasi@1.7.11':
+ resolution: {integrity: sha512-jisvIva8MidjI+B1lFRZZMfCPaCISePgTyR60wNT1MeQvIh5Ksa0G3gvI+Iqyj3jqYbvOHByenpa5eDGcSdoSg==}
engines: {node: '>=14.0.0'}
cpu: [wasm32]
- '@unrs/resolver-binding-win32-arm64-msvc@1.7.8':
- resolution: {integrity: sha512-vst2u8EJZ5L6jhJ6iLis3w9rg16aYqRxQuBAMYQRVrPMI43693hLP7DuqyOBRKgsQXy9/jgh204k0ViHkqQgdg==}
+ '@unrs/resolver-binding-win32-arm64-msvc@1.7.11':
+ resolution: {integrity: sha512-G+H5nQZ8sRZ8ebMY6mRGBBvTEzMYEcgVauLsNHpvTUavZoCCRVP1zWkCZgOju2dW3O22+8seTHniTdl1/uLz3g==}
cpu: [arm64]
os: [win32]
- '@unrs/resolver-binding-win32-ia32-msvc@1.7.8':
- resolution: {integrity: sha512-yb3LZOLMFqnA+/ShlE1E5bpYPGDsA590VHHJPB+efnyowT776GJXBoh82em6O9WmYBUq57YblGTcMYAFBm72HA==}
+ '@unrs/resolver-binding-win32-ia32-msvc@1.7.11':
+ resolution: {integrity: sha512-Hfy46DBfFzyv0wgR0MMOwFFib2W2+Btc8oE5h4XlPhpelnSyA6nFxkVIyTgIXYGTdFaLoZFNn62fmqx3rjEg3A==}
cpu: [ia32]
os: [win32]
- '@unrs/resolver-binding-win32-x64-msvc@1.7.8':
- resolution: {integrity: sha512-hHKFx+opG5BA3/owMXon8ypwSotBGTdblG6oda/iOu9+OEYnk0cxD2uIcGyGT8jCK578kV+xMrNxqbn8Zjlpgw==}
+ '@unrs/resolver-binding-win32-x64-msvc@1.7.11':
+ resolution: {integrity: sha512-7L8NdsQlCJ8T106Gbz/AjzM4QKWVsoQbKpB9bMBGcIZswUuAnJMHpvbqGW3RBqLHCIwX4XZ5fxSBHEFcK2h9wA==}
cpu: [x64]
os: [win32]
- '@vitejs/plugin-react@4.5.0':
- resolution: {integrity: sha512-JuLWaEqypaJmOJPLWwO335Ig6jSgC1FTONCWAxnqcQthLTK/Yc9aH6hr9z/87xciejbQcnP3GnA1FWUSWeXaeg==}
+ '@vitejs/plugin-react@4.5.1':
+ resolution: {integrity: sha512-uPZBqSI0YD4lpkIru6M35sIfylLGTyhGHvDZbNLuMA73lMlwJKz5xweH7FajfcCAc2HnINciejA9qTz0dr0M7A==}
engines: {node: ^14.18.0 || >=16.0.0}
peerDependencies:
vite: ^4.2.0 || ^5.0.0 || ^6.0.0
@@ -1761,8 +1776,8 @@ packages:
'@vitest/pretty-format@3.1.3':
resolution: {integrity: sha512-i6FDiBeJUGLDKADw2Gb01UtUNb12yyXAqC/mmRWuYl+m/U9GS7s8us5ONmGkGpUUo7/iAYzI2ePVfOZTYvUifA==}
- '@vitest/pretty-format@3.1.4':
- resolution: {integrity: sha512-cqv9H9GvAEoTaoq+cYqUTCGscUjKqlJZC7PRwY5FMySVj5J+xOm1KQcCiYHJOEzOKRUhLH4R2pTwvFlWCEScsg==}
+ '@vitest/pretty-format@3.2.2':
+ resolution: {integrity: sha512-FY4o4U1UDhO9KMd2Wee5vumwcaHw7Vg4V7yR4Oq6uK34nhEJOmdRYrk3ClburPRUA09lXD/oXWZ8y/Sdma0aUQ==}
'@vitest/runner@3.1.3':
resolution: {integrity: sha512-Tae+ogtlNfFei5DggOsSUvkIaSuVywujMj6HzR97AHK6XK8i3BuVyIifWAm/sE3a15lF5RH9yQIrbXYuo0IFyA==}
@@ -1888,8 +1903,8 @@ packages:
array-ify@1.0.0:
resolution: {integrity: sha512-c5AMf34bKdvPhQ7tBGhqkgKNUzMr4WUs+WDtC2ZUGOUncbxKMTvqxYctiseW3+L4bA8ec+GcZ6/A/FW4m8ukng==}
- array-includes@3.1.8:
- resolution: {integrity: sha512-itaWrbYbqpGXkGhZPGUulwnhVf5Hpy1xiCFsGqyIGglbBxmG5vSjxQen3/WGOjPpNEv1RtBLKxbmVXm8HpJStQ==}
+ array-includes@3.1.9:
+ resolution: {integrity: sha512-FmeCCAenzH0KH381SPT5FZmiA/TmpndpcaShhfgEN9eCVjnFBqq3l1xrI42y8+PPLI6hypzou4GXw00WHmPBLQ==}
engines: {node: '>= 0.4'}
array-iterate@2.0.1:
@@ -2052,8 +2067,8 @@ packages:
resolution: {integrity: sha512-8WB3Jcas3swSvjIeA2yvCJ+Miyz5l1ZmB6HFb9R1317dt9LCQoswg/BGrmAmkWVEszSrrg4RwmO46qIm2OEnSA==}
engines: {node: '>=16'}
- caniuse-lite@1.0.30001720:
- resolution: {integrity: sha512-Ec/2yV2nNPwb4DnTANEV99ZWwm3ZWfdlfkQbWSDDt+PsXEVYwlhPH8tdMaPunYTKKmz7AnHi2oNEi1GcmKCD8g==}
+ caniuse-lite@1.0.30001721:
+ resolution: {integrity: sha512-cOuvmUVtKrtEaoKiO0rSc29jcjwMwX5tOHDy4MgVFEWiUXj4uBMJkwI8MDySkgXidpMiHUcviogAvFi4pA2hDQ==}
ccount@2.0.1:
resolution: {integrity: sha512-eyrF0jiFpY+3drT6383f1qhkbGsLSifNAjA61IUjZjmLCWjItY6LB9ft9YhoDgwfmclB2zhu51Lc7+95b8NRAg==}
@@ -2405,8 +2420,8 @@ packages:
eastasianwidth@0.2.0:
resolution: {integrity: sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA==}
- electron-to-chromium@1.5.161:
- resolution: {integrity: sha512-hwtetwfKNZo/UlwHIVBlKZVdy7o8bIZxxKs0Mv/ROPiQQQmDgdm5a+KvKtBsxM8ZjFzTaCeLoodZ8jiBE3o9rA==}
+ electron-to-chromium@1.5.165:
+ resolution: {integrity: sha512-naiMx1Z6Nb2TxPU6fiFrUrDTjyPMLdTtaOd2oLmG8zVSg2hCWGkhPyxwk+qRmZ1ytwVqUv0u7ZcDA5+ALhaUtw==}
emmet@2.4.11:
resolution: {integrity: sha512-23QPJB3moh/U9sT4rQzGgeyyGIrcM+GH5uVYg2C6wZIxAIJq7Ng3QLT79tl8FUwDXhyq9SusfknOrofAKqvgyQ==}
@@ -2504,8 +2519,8 @@ packages:
peerDependencies:
eslint: '>=7.0.0'
- eslint-import-context@0.1.6:
- resolution: {integrity: sha512-/e2ZNPDLCrU8niIy0pddcvXuoO2YrKjf3NAIX+60mHJBT4yv7mqCqvVdyCW2E720e25e4S/1OSVef4U6efGLFg==}
+ eslint-import-context@0.1.8:
+ resolution: {integrity: sha512-bq+F7nyc65sKpZGT09dY0S0QrOnQtuDVIfyTGQ8uuvtMIF7oHp6CEP3mouN0rrnYF3Jqo6Ke0BfU/5wASZue1w==}
engines: {node: ^12.20.0 || ^14.18.0 || >=16.0.0}
peerDependencies:
unrs-resolver: ^1.0.0
@@ -2759,8 +2774,8 @@ packages:
fraction.js@4.3.7:
resolution: {integrity: sha512-ZsDfxO51wGAXREY55a7la9LScWpwv9RxIrYABrlvOFBlH/ShPnrtsXeuUIfXKKOVicNxQ+o8JTbJvjS4M89yew==}
- framer-motion@12.15.0:
- resolution: {integrity: sha512-XKg/LnKExdLGugZrDILV7jZjI599785lDIJZLxMiiIFidCsy0a4R2ZEf+Izm67zyOuJgQYTHOmodi7igQsw3vg==}
+ framer-motion@12.16.0:
+ resolution: {integrity: sha512-xryrmD4jSBQrS2IkMdcTmiS4aSKckbS7kLDCuhUn9110SQKG1w3zlq1RTqCblewg+ZYe+m3sdtzQA6cRwo5g8Q==}
peerDependencies:
'@emotion/is-prop-valid': '*'
react: ^18.0.0 || ^19.0.0
@@ -3587,14 +3602,14 @@ packages:
resolution: {integrity: sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==}
engines: {node: '>=16 || 14 >=14.17'}
- motion-dom@12.15.0:
- resolution: {integrity: sha512-D2ldJgor+2vdcrDtKJw48k3OddXiZN1dDLLWrS8kiHzQdYVruh0IoTwbJBslrnTXIPgFED7PBN2Zbwl7rNqnhA==}
+ motion-dom@12.16.0:
+ resolution: {integrity: sha512-Z2nGwWrrdH4egLEtgYMCEN4V2qQt1qxlKy/uV7w691ztyA41Q5Rbn0KNGbsNVDZr9E8PD2IOQ3hSccRnB6xWzw==}
motion-utils@12.12.1:
resolution: {integrity: sha512-f9qiqUHm7hWSLlNW8gS9pisnsN7CRFRD58vNjptKdsqFLpkVnX00TNeD6Q0d27V9KzT7ySFyK1TZ/DShfVOv6w==}
- motion@12.15.0:
- resolution: {integrity: sha512-HLouXyIb1uQFiZgJTYGrtEzbatPc6vK+HP+Qt6afLQjaudiGiLLVsoy71CwzD/Stlh06FUd5OpyiXqn6XvqjqQ==}
+ motion@12.16.0:
+ resolution: {integrity: sha512-P3HA83fnPMEGBLfKdD5vDdjH1Aa3wM3jT3+HX3fCVpy/4/lJiqvABajLgZenBu+rzkFzmeaPkvT7ouf9Tq5tVQ==}
peerDependencies:
'@emotion/is-prop-valid': '*'
react: ^18.0.0 || ^19.0.0
@@ -4141,8 +4156,8 @@ packages:
resolution: {integrity: sha512-g6QUff04oZpHs0eG5p83rFLhHeV00ug/Yf9nZM6fLeUrPguBTkTQOdpAWWspMh55TZfVQDPaN3NQJfbVRAxdIw==}
engines: {iojs: '>=1.0.0', node: '>=0.10.0'}
- rollup@4.41.1:
- resolution: {integrity: sha512-cPmwD3FnFv8rKMBc1MxWCwVQFxwf1JEmSX3iQXrRVVG15zerAIXRjMFVWnd5Q5QvgKF7Aj+5ykXFhUl+QGnyOw==}
+ rollup@4.42.0:
+ resolution: {integrity: sha512-LW+Vse3BJPyGJGAJt1j8pWDKPd73QM8cRXYK1IxOBgL2AGLu7Xd2YOW0M2sLUBCkF5MshXXtMApyEAEzMVMsnw==}
engines: {node: '>=18.0.0', npm: '>=8.0.0'}
hasBin: true
@@ -4216,8 +4231,8 @@ packages:
resolution: {integrity: sha512-7++dFhtcx3353uBaq8DDR4NuxBetBzC7ZQOhmTQInHEd6bSrXdiEyzCvG07Z44UYdLShWUyXt5M/yhz8ekcb1A==}
engines: {node: '>=8'}
- shiki@3.4.2:
- resolution: {integrity: sha512-wuxzZzQG8kvZndD7nustrNFIKYJ1jJoWIPaBpVe2+KHSvtzMi4SBjOxrigs8qeqce/l3U0cwiC+VAkLKSunHQQ==}
+ shiki@3.6.0:
+ resolution: {integrity: sha512-tKn/Y0MGBTffQoklaATXmTqDU02zx8NYBGQ+F6gy87/YjKbizcLd+Cybh/0ZtOBX9r1NEnAy/GTRDKtOsc1L9w==}
side-channel-list@1.0.0:
resolution: {integrity: sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==}
@@ -4272,6 +4287,10 @@ packages:
resolution: {integrity: sha512-UcjcJOWknrNkF6PLX83qcHM6KHgVKNkV62Y8a5uYDVv9ydGQVwAHMKqHdJje1VTWpljG0WYpCDhrCdAOYH4TWg==}
engines: {node: '>= 10.x'}
+ stable-hash-x@0.1.1:
+ resolution: {integrity: sha512-l0x1D6vhnsNUGPFVDx45eif0y6eedVC8nm5uACTrVFJFtl2mLRW17aWtVyxFCpn5t94VUPkjU8vSLwIuwwqtJQ==}
+ engines: {node: '>=12.0.0'}
+
stable-hash@0.0.5:
resolution: {integrity: sha512-+L3ccpzibovGXFK+Ap/f8LOS0ahMrHTf3xu7mMLSpEGU0EO9ucaysSylKo9eRDFNhWve/y275iPmIZ4z39a9iA==}
@@ -4628,8 +4647,8 @@ packages:
unist-util-visit@5.0.0:
resolution: {integrity: sha512-MR04uvD+07cwl/yhVuVWAtw+3GOR/knlL55Nd/wAdblk27GCVt3lqpTivy/tkJcZoNPzTwS1Y+KMojlLDhoTzg==}
- unrs-resolver@1.7.8:
- resolution: {integrity: sha512-2zsXwyOXmCX9nGz4vhtZRYhe30V78heAv+KDc21A/KMdovGHbZcixeD5JHEF0DrFXzdytwuzYclcPbvp8A3Jlw==}
+ unrs-resolver@1.7.11:
+ resolution: {integrity: sha512-OhuAzBImFPjKNgZ2JwHMfGFUA6NSbRegd1+BPjC1Y0E6X9Y/vJ4zKeGmIMqmlYboj6cMNEwKI+xQisrg4J0HaQ==}
unstorage@1.16.0:
resolution: {integrity: sha512-WQ37/H5A7LcRPWfYOrDa1Ys02xAbpPJq6q5GkO88FBXVSQzHd7+BjEwfRqyaSWCv9MbsJy058GWjjPjcJ16GGA==}
@@ -4859,11 +4878,11 @@ packages:
'@volar/language-service':
optional: true
- vscode-css-languageservice@6.3.5:
- resolution: {integrity: sha512-ehEIMXYPYEz/5Svi2raL9OKLpBt5dSAdoCFoLpo0TVFKrVpDemyuQwS3c3D552z/qQCg3pMp8oOLMObY6M3ajQ==}
+ vscode-css-languageservice@6.3.6:
+ resolution: {integrity: sha512-fU4h8mT3KlvfRcbF74v/M+Gzbligav6QMx4AD/7CbclWPYOpGb9kgIswfpZVJbIcOEJJACI9iYizkNwdiAqlHw==}
- vscode-html-languageservice@5.4.0:
- resolution: {integrity: sha512-9/cbc90BSYCghmHI7/VbWettHZdC7WYpz2g5gBK6UDUI1MkZbM773Q12uAYJx9jzAiNHPpyo6KzcwmcnugncAQ==}
+ vscode-html-languageservice@5.5.0:
+ resolution: {integrity: sha512-No6Er2P2L8IsXDnUFlp0bP4f2sdkJv+zJLZYFhtEQIp+2xNfxY8WYkhSxLJ/7bZhuV/aU55lmGSSHBVxSGer3Q==}
vscode-json-languageservice@4.1.8:
resolution: {integrity: sha512-0vSpg6Xd9hfV+eZAaYN63xVVMOTmJ4GgHxXnkLCh+9RsQBkWKIghzLhW2B9ebfG+LQQg8uLtsQ2aUKjTgE+QOg==}
@@ -5099,8 +5118,8 @@ packages:
zod@3.22.3:
resolution: {integrity: sha512-EjIevzuJRiRPbVH4mGc8nApb/lVLKVpmUhAaR5R5doKGfAnGJ6Gr3CViAVjP+4FWSxCsybeWQdcgCtbX+7oZug==}
- zod@3.25.46:
- resolution: {integrity: sha512-IqRxcHEIjqLd4LNS/zKffB3Jzg3NwqJxQQ0Ns7pdrvgGkwQsEBdEQcOHaBVqvvZArShRzI39+aMST3FBGmTrLQ==}
+ zod@3.25.56:
+ resolution: {integrity: sha512-rd6eEF3BTNvQnR2e2wwolfTmUTnp70aUTqr0oaGbHifzC3BKJsoV+Gat8vxUMR1hwOKBs6El+qWehrHbCpW6SQ==}
zwitch@2.0.4:
resolution: {integrity: sha512-bXE4cR/kVZhKZX/RjPEflHaKVhUVl85noU3v6b8apfQEc1x4A+zBxjZ4lN8LqGd6WZ3dl98pY4o717VFmoPp+A==}
@@ -5141,15 +5160,15 @@ snapshots:
- prettier
- prettier-plugin-astro
- '@astrojs/cloudflare@12.5.2(@types/node@22.15.18)(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0))(jiti@2.4.2)(yaml@2.8.0)':
+ '@astrojs/cloudflare@12.5.2(@types/node@22.15.18)(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0))(jiti@2.4.2)(yaml@2.8.0)':
dependencies:
'@astrojs/internal-helpers': 0.6.1
'@astrojs/underscore-redirects': 0.6.1
- '@cloudflare/workers-types': 4.20250601.0
- astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0)
+ '@cloudflare/workers-types': 4.20250607.0
+ astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0)
tinyglobby: 0.2.14
vite: 6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0)
- wrangler: 4.17.0(@cloudflare/workers-types@4.20250601.0)
+ wrangler: 4.17.0(@cloudflare/workers-types@4.20250607.0)
transitivePeerDependencies:
- '@types/node'
- bufferutil
@@ -5165,13 +5184,13 @@ snapshots:
- utf-8-validate
- yaml
- '@astrojs/compiler@2.12.0': {}
+ '@astrojs/compiler@2.12.1': {}
'@astrojs/internal-helpers@0.6.1': {}
'@astrojs/language-server@2.15.4(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(typescript@5.6.3)':
dependencies:
- '@astrojs/compiler': 2.12.0
+ '@astrojs/compiler': 2.12.1
'@astrojs/yaml2ts': 0.2.2
'@jridgewell/sourcemap-codec': 1.5.0
'@volar/kit': 2.4.14(typescript@5.6.3)
@@ -5187,7 +5206,7 @@ snapshots:
volar-service-typescript: 0.0.62(@volar/language-service@2.4.14)
volar-service-typescript-twoslash-queries: 0.0.62(@volar/language-service@2.4.14)
volar-service-yaml: 0.0.62(@volar/language-service@2.4.14)
- vscode-html-languageservice: 5.4.0
+ vscode-html-languageservice: 5.5.0
vscode-uri: 3.1.0
optionalDependencies:
prettier: 3.5.3
@@ -5211,7 +5230,7 @@ snapshots:
remark-parse: 11.0.0
remark-rehype: 11.1.2
remark-smartypants: 3.0.2
- shiki: 3.4.2
+ shiki: 3.6.0
smol-toml: 1.3.4
unified: 11.0.5
unist-util-remove-position: 5.0.0
@@ -5225,11 +5244,11 @@ snapshots:
dependencies:
prismjs: 1.30.0
- '@astrojs/react@4.3.0(@types/node@22.15.18)(@types/react-dom@19.1.5(@types/react@19.1.6))(@types/react@19.1.6)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(yaml@2.8.0)':
+ '@astrojs/react@4.3.0(@types/node@22.15.18)(@types/react-dom@19.1.6(@types/react@19.1.6))(@types/react@19.1.6)(jiti@2.4.2)(react-dom@19.1.0(react@19.1.0))(react@19.1.0)(yaml@2.8.0)':
dependencies:
'@types/react': 19.1.6
- '@types/react-dom': 19.1.5(@types/react@19.1.6)
- '@vitejs/plugin-react': 4.5.0(vite@6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0))
+ '@types/react-dom': 19.1.6(@types/react@19.1.6)
+ '@vitejs/plugin-react': 4.5.1(vite@6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0))
react: 19.1.0
react-dom: 19.1.0(react@19.1.0)
ultrahtml: 1.6.0
@@ -5257,11 +5276,11 @@ snapshots:
dependencies:
sitemap: 8.0.0
stream-replace-string: 2.0.0
- zod: 3.25.46
+ zod: 3.25.56
- '@astrojs/tailwind@6.0.2(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0))(tailwindcss@3.4.15)':
+ '@astrojs/tailwind@6.0.2(astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0))(tailwindcss@3.4.15)':
dependencies:
- astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0)
+ astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0)
autoprefixer: 10.4.21(postcss@8.5.4)
postcss: 8.5.4
postcss-load-config: 4.0.2(postcss@8.5.4)
@@ -5293,20 +5312,20 @@ snapshots:
js-tokens: 4.0.0
picocolors: 1.1.1
- '@babel/compat-data@7.27.3': {}
+ '@babel/compat-data@7.27.5': {}
'@babel/core@7.27.4':
dependencies:
'@ampproject/remapping': 2.3.0
'@babel/code-frame': 7.27.1
- '@babel/generator': 7.27.3
+ '@babel/generator': 7.27.5
'@babel/helper-compilation-targets': 7.27.2
'@babel/helper-module-transforms': 7.27.3(@babel/core@7.27.4)
- '@babel/helpers': 7.27.4
- '@babel/parser': 7.27.4
+ '@babel/helpers': 7.27.6
+ '@babel/parser': 7.27.5
'@babel/template': 7.27.2
'@babel/traverse': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
convert-source-map: 2.0.0
debug: 4.4.1
gensync: 1.0.0-beta.2
@@ -5315,17 +5334,17 @@ snapshots:
transitivePeerDependencies:
- supports-color
- '@babel/generator@7.27.3':
+ '@babel/generator@7.27.5':
dependencies:
- '@babel/parser': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/parser': 7.27.5
+ '@babel/types': 7.27.6
'@jridgewell/gen-mapping': 0.3.8
'@jridgewell/trace-mapping': 0.3.25
jsesc: 3.1.0
'@babel/helper-compilation-targets@7.27.2':
dependencies:
- '@babel/compat-data': 7.27.3
+ '@babel/compat-data': 7.27.5
'@babel/helper-validator-option': 7.27.1
browserslist: 4.25.0
lru-cache: 5.1.1
@@ -5334,7 +5353,7 @@ snapshots:
'@babel/helper-module-imports@7.27.1':
dependencies:
'@babel/traverse': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
transitivePeerDependencies:
- supports-color
@@ -5355,14 +5374,14 @@ snapshots:
'@babel/helper-validator-option@7.27.1': {}
- '@babel/helpers@7.27.4':
+ '@babel/helpers@7.27.6':
dependencies:
'@babel/template': 7.27.2
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
- '@babel/parser@7.27.4':
+ '@babel/parser@7.27.5':
dependencies:
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
'@babel/plugin-transform-react-jsx-self@7.27.1(@babel/core@7.27.4)':
dependencies:
@@ -5374,27 +5393,27 @@ snapshots:
'@babel/core': 7.27.4
'@babel/helper-plugin-utils': 7.27.1
- '@babel/runtime@7.27.4': {}
+ '@babel/runtime@7.27.6': {}
'@babel/template@7.27.2':
dependencies:
'@babel/code-frame': 7.27.1
- '@babel/parser': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/parser': 7.27.5
+ '@babel/types': 7.27.6
'@babel/traverse@7.27.4':
dependencies:
'@babel/code-frame': 7.27.1
- '@babel/generator': 7.27.3
- '@babel/parser': 7.27.4
+ '@babel/generator': 7.27.5
+ '@babel/parser': 7.27.5
'@babel/template': 7.27.2
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
debug: 4.4.1
globals: 11.12.0
transitivePeerDependencies:
- supports-color
- '@babel/types@7.27.3':
+ '@babel/types@7.27.6':
dependencies:
'@babel/helper-string-parser': 7.27.1
'@babel/helper-validator-identifier': 7.27.1
@@ -5432,7 +5451,7 @@ snapshots:
'@cloudflare/workerd-windows-64@1.20250523.0':
optional: true
- '@cloudflare/workers-types@4.20250601.0': {}
+ '@cloudflare/workers-types@4.20250607.0': {}
'@commitlint/cli@19.8.1(@types/node@22.15.18)(typescript@5.6.3)':
dependencies:
@@ -6197,103 +6216,103 @@ snapshots:
'@rolldown/pluginutils@1.0.0-beta.9': {}
- '@rollup/pluginutils@5.1.4(rollup@4.41.1)':
+ '@rollup/pluginutils@5.1.4(rollup@4.42.0)':
dependencies:
- '@types/estree': 1.0.7
+ '@types/estree': 1.0.8
estree-walker: 2.0.2
picomatch: 4.0.2
optionalDependencies:
- rollup: 4.41.1
+ rollup: 4.42.0
- '@rollup/rollup-android-arm-eabi@4.41.1':
+ '@rollup/rollup-android-arm-eabi@4.42.0':
optional: true
- '@rollup/rollup-android-arm64@4.41.1':
+ '@rollup/rollup-android-arm64@4.42.0':
optional: true
- '@rollup/rollup-darwin-arm64@4.41.1':
+ '@rollup/rollup-darwin-arm64@4.42.0':
optional: true
- '@rollup/rollup-darwin-x64@4.41.1':
+ '@rollup/rollup-darwin-x64@4.42.0':
optional: true
- '@rollup/rollup-freebsd-arm64@4.41.1':
+ '@rollup/rollup-freebsd-arm64@4.42.0':
optional: true
- '@rollup/rollup-freebsd-x64@4.41.1':
+ '@rollup/rollup-freebsd-x64@4.42.0':
optional: true
- '@rollup/rollup-linux-arm-gnueabihf@4.41.1':
+ '@rollup/rollup-linux-arm-gnueabihf@4.42.0':
optional: true
- '@rollup/rollup-linux-arm-musleabihf@4.41.1':
+ '@rollup/rollup-linux-arm-musleabihf@4.42.0':
optional: true
- '@rollup/rollup-linux-arm64-gnu@4.41.1':
+ '@rollup/rollup-linux-arm64-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-arm64-musl@4.41.1':
+ '@rollup/rollup-linux-arm64-musl@4.42.0':
optional: true
- '@rollup/rollup-linux-loongarch64-gnu@4.41.1':
+ '@rollup/rollup-linux-loongarch64-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-powerpc64le-gnu@4.41.1':
+ '@rollup/rollup-linux-powerpc64le-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-riscv64-gnu@4.41.1':
+ '@rollup/rollup-linux-riscv64-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-riscv64-musl@4.41.1':
+ '@rollup/rollup-linux-riscv64-musl@4.42.0':
optional: true
- '@rollup/rollup-linux-s390x-gnu@4.41.1':
+ '@rollup/rollup-linux-s390x-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-x64-gnu@4.41.1':
+ '@rollup/rollup-linux-x64-gnu@4.42.0':
optional: true
- '@rollup/rollup-linux-x64-musl@4.41.1':
+ '@rollup/rollup-linux-x64-musl@4.42.0':
optional: true
- '@rollup/rollup-win32-arm64-msvc@4.41.1':
+ '@rollup/rollup-win32-arm64-msvc@4.42.0':
optional: true
- '@rollup/rollup-win32-ia32-msvc@4.41.1':
+ '@rollup/rollup-win32-ia32-msvc@4.42.0':
optional: true
- '@rollup/rollup-win32-x64-msvc@4.41.1':
+ '@rollup/rollup-win32-x64-msvc@4.42.0':
optional: true
'@rtsao/scc@1.1.0': {}
- '@shikijs/core@3.4.2':
+ '@shikijs/core@3.6.0':
dependencies:
- '@shikijs/types': 3.4.2
+ '@shikijs/types': 3.6.0
'@shikijs/vscode-textmate': 10.0.2
'@types/hast': 3.0.4
hast-util-to-html: 9.0.5
- '@shikijs/engine-javascript@3.4.2':
+ '@shikijs/engine-javascript@3.6.0':
dependencies:
- '@shikijs/types': 3.4.2
+ '@shikijs/types': 3.6.0
'@shikijs/vscode-textmate': 10.0.2
oniguruma-to-es: 4.3.3
- '@shikijs/engine-oniguruma@3.4.2':
+ '@shikijs/engine-oniguruma@3.6.0':
dependencies:
- '@shikijs/types': 3.4.2
+ '@shikijs/types': 3.6.0
'@shikijs/vscode-textmate': 10.0.2
- '@shikijs/langs@3.4.2':
+ '@shikijs/langs@3.6.0':
dependencies:
- '@shikijs/types': 3.4.2
+ '@shikijs/types': 3.6.0
- '@shikijs/themes@3.4.2':
+ '@shikijs/themes@3.6.0':
dependencies:
- '@shikijs/types': 3.4.2
+ '@shikijs/types': 3.6.0
- '@shikijs/types@3.4.2':
+ '@shikijs/types@3.6.0':
dependencies:
'@shikijs/vscode-textmate': 10.0.2
'@types/hast': 3.0.4
@@ -6307,7 +6326,7 @@ snapshots:
'@testing-library/dom@10.4.0':
dependencies:
'@babel/code-frame': 7.27.1
- '@babel/runtime': 7.27.4
+ '@babel/runtime': 7.27.6
'@types/aria-query': 5.0.4
aria-query: 5.3.0
chalk: 4.1.2
@@ -6338,24 +6357,24 @@ snapshots:
'@types/babel__core@7.20.5':
dependencies:
- '@babel/parser': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/parser': 7.27.5
+ '@babel/types': 7.27.6
'@types/babel__generator': 7.27.0
'@types/babel__template': 7.4.4
'@types/babel__traverse': 7.20.7
'@types/babel__generator@7.27.0':
dependencies:
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
'@types/babel__template@7.4.4':
dependencies:
- '@babel/parser': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/parser': 7.27.5
+ '@babel/types': 7.27.6
'@types/babel__traverse@7.20.7':
dependencies:
- '@babel/types': 7.27.3
+ '@babel/types': 7.27.6
'@types/conventional-commits-parser@5.0.1':
dependencies:
@@ -6371,11 +6390,13 @@ snapshots:
'@types/eslint@9.6.1':
dependencies:
- '@types/estree': 1.0.7
+ '@types/estree': 1.0.8
'@types/json-schema': 7.0.15
'@types/estree@1.0.7': {}
+ '@types/estree@1.0.8': {}
+
'@types/hast@3.0.4':
dependencies:
'@types/unist': 3.0.3
@@ -6406,7 +6427,7 @@ snapshots:
dependencies:
undici-types: 6.21.0
- '@types/react-dom@19.1.5(@types/react@19.1.6)':
+ '@types/react-dom@19.1.6(@types/react@19.1.6)':
dependencies:
'@types/react': 19.1.6
@@ -6465,6 +6486,11 @@ snapshots:
'@typescript-eslint/types': 8.33.0
'@typescript-eslint/visitor-keys': 8.33.0
+ '@typescript-eslint/scope-manager@8.33.1':
+ dependencies:
+ '@typescript-eslint/types': 8.33.1
+ '@typescript-eslint/visitor-keys': 8.33.1
+
'@typescript-eslint/tsconfig-utils@8.33.0(typescript@5.6.3)':
dependencies:
typescript: 5.6.3
@@ -6482,6 +6508,8 @@ snapshots:
'@typescript-eslint/types@8.33.0': {}
+ '@typescript-eslint/types@8.33.1': {}
+
'@typescript-eslint/typescript-estree@8.33.0(typescript@5.6.3)':
dependencies:
'@typescript-eslint/project-service': 8.33.0(typescript@5.6.3)
@@ -6514,62 +6542,67 @@ snapshots:
'@typescript-eslint/types': 8.33.0
eslint-visitor-keys: 4.2.0
+ '@typescript-eslint/visitor-keys@8.33.1':
+ dependencies:
+ '@typescript-eslint/types': 8.33.1
+ eslint-visitor-keys: 4.2.0
+
'@ungap/structured-clone@1.3.0': {}
- '@unrs/resolver-binding-darwin-arm64@1.7.8':
+ '@unrs/resolver-binding-darwin-arm64@1.7.11':
optional: true
- '@unrs/resolver-binding-darwin-x64@1.7.8':
+ '@unrs/resolver-binding-darwin-x64@1.7.11':
optional: true
- '@unrs/resolver-binding-freebsd-x64@1.7.8':
+ '@unrs/resolver-binding-freebsd-x64@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-arm-gnueabihf@1.7.8':
+ '@unrs/resolver-binding-linux-arm-gnueabihf@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-arm-musleabihf@1.7.8':
+ '@unrs/resolver-binding-linux-arm-musleabihf@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-arm64-gnu@1.7.8':
+ '@unrs/resolver-binding-linux-arm64-gnu@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-arm64-musl@1.7.8':
+ '@unrs/resolver-binding-linux-arm64-musl@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-ppc64-gnu@1.7.8':
+ '@unrs/resolver-binding-linux-ppc64-gnu@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-riscv64-gnu@1.7.8':
+ '@unrs/resolver-binding-linux-riscv64-gnu@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-riscv64-musl@1.7.8':
+ '@unrs/resolver-binding-linux-riscv64-musl@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-s390x-gnu@1.7.8':
+ '@unrs/resolver-binding-linux-s390x-gnu@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-x64-gnu@1.7.8':
+ '@unrs/resolver-binding-linux-x64-gnu@1.7.11':
optional: true
- '@unrs/resolver-binding-linux-x64-musl@1.7.8':
+ '@unrs/resolver-binding-linux-x64-musl@1.7.11':
optional: true
- '@unrs/resolver-binding-wasm32-wasi@1.7.8':
+ '@unrs/resolver-binding-wasm32-wasi@1.7.11':
dependencies:
'@napi-rs/wasm-runtime': 0.2.10
optional: true
- '@unrs/resolver-binding-win32-arm64-msvc@1.7.8':
+ '@unrs/resolver-binding-win32-arm64-msvc@1.7.11':
optional: true
- '@unrs/resolver-binding-win32-ia32-msvc@1.7.8':
+ '@unrs/resolver-binding-win32-ia32-msvc@1.7.11':
optional: true
- '@unrs/resolver-binding-win32-x64-msvc@1.7.8':
+ '@unrs/resolver-binding-win32-x64-msvc@1.7.11':
optional: true
- '@vitejs/plugin-react@4.5.0(vite@6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0))':
+ '@vitejs/plugin-react@4.5.1(vite@6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0))':
dependencies:
'@babel/core': 7.27.4
'@babel/plugin-transform-react-jsx-self': 7.27.1(@babel/core@7.27.4)
@@ -6616,7 +6649,7 @@ snapshots:
dependencies:
tinyrainbow: 2.0.0
- '@vitest/pretty-format@3.1.4':
+ '@vitest/pretty-format@3.2.2':
dependencies:
tinyrainbow: 2.0.0
@@ -6767,14 +6800,16 @@ snapshots:
array-ify@1.0.0: {}
- array-includes@3.1.8:
+ array-includes@3.1.9:
dependencies:
call-bind: 1.0.8
+ call-bound: 1.0.4
define-properties: 1.2.1
es-abstract: 1.24.0
es-object-atoms: 1.1.1
get-intrinsic: 1.3.0
is-string: 1.1.1
+ math-intrinsics: 1.1.0
array-iterate@2.0.1: {}
@@ -6841,10 +6876,10 @@ snapshots:
astro-eslint-parser@1.2.2:
dependencies:
- '@astrojs/compiler': 2.12.0
- '@typescript-eslint/scope-manager': 8.33.0
- '@typescript-eslint/types': 8.33.0
- astrojs-compiler-sync: 1.1.1(@astrojs/compiler@2.12.0)
+ '@astrojs/compiler': 2.12.1
+ '@typescript-eslint/scope-manager': 8.33.1
+ '@typescript-eslint/types': 8.33.1
+ astrojs-compiler-sync: 1.1.1(@astrojs/compiler@2.12.1)
debug: 4.4.1
entities: 6.0.0
eslint-scope: 8.3.0
@@ -6858,15 +6893,15 @@ snapshots:
astro-navbar@2.3.7: {}
- astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0):
+ astro@5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0):
dependencies:
- '@astrojs/compiler': 2.12.0
+ '@astrojs/compiler': 2.12.1
'@astrojs/internal-helpers': 0.6.1
'@astrojs/markdown-remark': 6.3.1
'@astrojs/telemetry': 3.2.1
'@capsizecss/unpack': 2.4.0
'@oslojs/encoding': 1.1.0
- '@rollup/pluginutils': 5.1.4(rollup@4.41.1)
+ '@rollup/pluginutils': 5.1.4(rollup@4.42.0)
acorn: 8.14.1
aria-query: 5.3.2
axobject-query: 4.1.0
@@ -6902,7 +6937,7 @@ snapshots:
prompts: 2.4.2
rehype: 13.0.2
semver: 7.7.2
- shiki: 3.4.2
+ shiki: 3.6.0
tinyexec: 0.3.2
tinyglobby: 0.2.14
tsconfck: 3.1.6(typescript@5.6.3)
@@ -6916,9 +6951,9 @@ snapshots:
xxhash-wasm: 1.1.0
yargs-parser: 21.1.1
yocto-spinner: 0.2.3
- zod: 3.25.46
- zod-to-json-schema: 3.24.5(zod@3.25.46)
- zod-to-ts: 1.2.0(typescript@5.6.3)(zod@3.25.46)
+ zod: 3.25.56
+ zod-to-json-schema: 3.24.5(zod@3.25.56)
+ zod-to-ts: 1.2.0(typescript@5.6.3)(zod@3.25.56)
optionalDependencies:
sharp: 0.33.5
transitivePeerDependencies:
@@ -6956,9 +6991,9 @@ snapshots:
- uploadthing
- yaml
- astrojs-compiler-sync@1.1.1(@astrojs/compiler@2.12.0):
+ astrojs-compiler-sync@1.1.1(@astrojs/compiler@2.12.1):
dependencies:
- '@astrojs/compiler': 2.12.0
+ '@astrojs/compiler': 2.12.1
synckit: 0.11.8
async-function@1.0.0: {}
@@ -6966,7 +7001,7 @@ snapshots:
autoprefixer@10.4.14(postcss@8.5.1):
dependencies:
browserslist: 4.25.0
- caniuse-lite: 1.0.30001720
+ caniuse-lite: 1.0.30001721
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.1.1
@@ -6976,7 +7011,7 @@ snapshots:
autoprefixer@10.4.21(postcss@8.5.4):
dependencies:
browserslist: 4.25.0
- caniuse-lite: 1.0.30001720
+ caniuse-lite: 1.0.30001721
fraction.js: 4.3.7
normalize-range: 0.1.2
picocolors: 1.1.1
@@ -7035,8 +7070,8 @@ snapshots:
browserslist@4.25.0:
dependencies:
- caniuse-lite: 1.0.30001720
- electron-to-chromium: 1.5.161
+ caniuse-lite: 1.0.30001721
+ electron-to-chromium: 1.5.165
node-releases: 2.0.19
update-browserslist-db: 1.1.3(browserslist@4.25.0)
@@ -7065,7 +7100,7 @@ snapshots:
camelcase@8.0.0: {}
- caniuse-lite@1.0.30001720: {}
+ caniuse-lite@1.0.30001721: {}
ccount@2.0.1: {}
@@ -7444,7 +7479,7 @@ snapshots:
eastasianwidth@0.2.0: {}
- electron-to-chromium@1.5.161: {}
+ electron-to-chromium@1.5.165: {}
emmet@2.4.11:
dependencies:
@@ -7641,12 +7676,12 @@ snapshots:
dependencies:
eslint: 9.27.0(jiti@2.4.2)
- eslint-import-context@0.1.6(unrs-resolver@1.7.8):
+ eslint-import-context@0.1.8(unrs-resolver@1.7.11):
dependencies:
get-tsconfig: 4.10.1
- stable-hash: 0.0.5
+ stable-hash-x: 0.1.1
optionalDependencies:
- unrs-resolver: 1.7.8
+ unrs-resolver: 1.7.11
eslint-import-resolver-node@0.3.9:
dependencies:
@@ -7660,12 +7695,12 @@ snapshots:
dependencies:
debug: 4.4.1
eslint: 9.27.0(jiti@2.4.2)
- eslint-import-context: 0.1.6(unrs-resolver@1.7.8)
+ eslint-import-context: 0.1.8(unrs-resolver@1.7.11)
get-tsconfig: 4.10.1
is-bun-module: 2.0.0
stable-hash: 0.0.5
tinyglobby: 0.2.14
- unrs-resolver: 1.7.8
+ unrs-resolver: 1.7.11
optionalDependencies:
eslint-plugin-import: 2.31.0(@typescript-eslint/parser@8.33.0(eslint@9.27.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-typescript@4.4.1)(eslint@9.27.0(jiti@2.4.2))
transitivePeerDependencies:
@@ -7692,7 +7727,7 @@ snapshots:
dependencies:
'@eslint-community/eslint-utils': 4.7.0(eslint@9.27.0(jiti@2.4.2))
'@jridgewell/sourcemap-codec': 1.5.0
- '@typescript-eslint/types': 8.33.0
+ '@typescript-eslint/types': 8.33.1
astro-eslint-parser: 1.2.2
eslint: 9.27.0(jiti@2.4.2)
eslint-compat-utils: 0.6.5(eslint@9.27.0(jiti@2.4.2))
@@ -7705,7 +7740,7 @@ snapshots:
eslint-plugin-import@2.31.0(@typescript-eslint/parser@8.33.0(eslint@9.27.0(jiti@2.4.2))(typescript@5.6.3))(eslint-import-resolver-typescript@4.4.1)(eslint@9.27.0(jiti@2.4.2)):
dependencies:
'@rtsao/scc': 1.1.0
- array-includes: 3.1.8
+ array-includes: 3.1.9
array.prototype.findlastindex: 1.2.6
array.prototype.flat: 1.3.3
array.prototype.flatmap: 1.3.3
@@ -7748,7 +7783,7 @@ snapshots:
eslint-plugin-jsx-a11y@6.10.2(eslint@9.27.0(jiti@2.4.2)):
dependencies:
aria-query: 5.3.2
- array-includes: 3.1.8
+ array-includes: 3.1.9
array.prototype.flatmap: 1.3.3
ast-types-flow: 0.0.8
axe-core: 4.10.3
@@ -7770,7 +7805,7 @@ snapshots:
eslint-plugin-react@7.37.5(eslint@9.27.0(jiti@2.4.2)):
dependencies:
- array-includes: 3.1.8
+ array-includes: 3.1.9
array.prototype.findlast: 1.2.5
array.prototype.flatmap: 1.3.3
array.prototype.tosorted: 1.1.4
@@ -7812,7 +7847,7 @@ snapshots:
'@humanfs/node': 0.16.6
'@humanwhocodes/module-importer': 1.0.1
'@humanwhocodes/retry': 0.4.3
- '@types/estree': 1.0.7
+ '@types/estree': 1.0.8
'@types/json-schema': 7.0.15
ajv: 6.12.6
chalk: 4.1.2
@@ -7869,7 +7904,7 @@ snapshots:
estree-walker@3.0.3:
dependencies:
- '@types/estree': 1.0.7
+ '@types/estree': 1.0.8
esutils@2.0.3: {}
@@ -7973,19 +8008,19 @@ snapshots:
fraction.js@4.3.7: {}
- framer-motion@12.15.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
+ framer-motion@12.16.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
dependencies:
- motion-dom: 12.15.0
+ motion-dom: 12.16.0
motion-utils: 12.12.1
tslib: 2.8.1
optionalDependencies:
react: 19.1.0
react-dom: 19.1.0(react@19.1.0)
- free-astro-components@1.2.0(@types/node@22.15.18)(jiti@2.4.2)(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(rollup@4.41.1)(yaml@2.8.0):
+ free-astro-components@1.2.0(@types/node@22.15.18)(jiti@2.4.2)(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(rollup@4.42.0)(yaml@2.8.0):
dependencies:
'@astrojs/check': 0.9.4(prettier-plugin-astro@0.14.1)(prettier@3.5.3)(typescript@5.6.3)
- astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.41.1)(typescript@5.6.3)(yaml@2.8.0)
+ astro: 5.7.10(@types/node@22.15.18)(jiti@2.4.2)(rollup@4.42.0)(typescript@5.6.3)(yaml@2.8.0)
typescript: 5.6.3
transitivePeerDependencies:
- '@azure/app-configuration'
@@ -8459,7 +8494,7 @@ snapshots:
istanbul-lib-instrument@6.0.3:
dependencies:
'@babel/core': 7.27.4
- '@babel/parser': 7.27.4
+ '@babel/parser': 7.27.5
'@istanbuljs/schema': 0.1.3
istanbul-lib-coverage: 3.2.2
semver: 7.7.2
@@ -8570,7 +8605,7 @@ snapshots:
jsx-ast-utils@3.3.5:
dependencies:
- array-includes: 3.1.8
+ array-includes: 3.1.9
array.prototype.flat: 1.3.3
object.assign: 4.1.7
object.values: 1.2.1
@@ -8693,8 +8728,8 @@ snapshots:
magicast@0.3.5:
dependencies:
- '@babel/parser': 7.27.4
- '@babel/types': 7.27.3
+ '@babel/parser': 7.27.5
+ '@babel/types': 7.27.6
source-map-js: 1.2.1
make-dir@4.0.0:
@@ -9061,15 +9096,15 @@ snapshots:
minipass@7.1.2: {}
- motion-dom@12.15.0:
+ motion-dom@12.16.0:
dependencies:
motion-utils: 12.12.1
motion-utils@12.12.1: {}
- motion@12.15.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
+ motion@12.16.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0):
dependencies:
- framer-motion: 12.15.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
+ framer-motion: 12.16.0(react-dom@19.1.0(react@19.1.0))(react@19.1.0)
tslib: 2.8.1
optionalDependencies:
react: 19.1.0
@@ -9353,7 +9388,7 @@ snapshots:
prettier-plugin-astro@0.14.1:
dependencies:
- '@astrojs/compiler': 2.12.0
+ '@astrojs/compiler': 2.12.1
prettier: 3.5.3
sass-formatter: 0.7.9
@@ -9580,30 +9615,30 @@ snapshots:
reusify@1.1.0: {}
- rollup@4.41.1:
+ rollup@4.42.0:
dependencies:
'@types/estree': 1.0.7
optionalDependencies:
- '@rollup/rollup-android-arm-eabi': 4.41.1
- '@rollup/rollup-android-arm64': 4.41.1
- '@rollup/rollup-darwin-arm64': 4.41.1
- '@rollup/rollup-darwin-x64': 4.41.1
- '@rollup/rollup-freebsd-arm64': 4.41.1
- '@rollup/rollup-freebsd-x64': 4.41.1
- '@rollup/rollup-linux-arm-gnueabihf': 4.41.1
- '@rollup/rollup-linux-arm-musleabihf': 4.41.1
- '@rollup/rollup-linux-arm64-gnu': 4.41.1
- '@rollup/rollup-linux-arm64-musl': 4.41.1
- '@rollup/rollup-linux-loongarch64-gnu': 4.41.1
- '@rollup/rollup-linux-powerpc64le-gnu': 4.41.1
- '@rollup/rollup-linux-riscv64-gnu': 4.41.1
- '@rollup/rollup-linux-riscv64-musl': 4.41.1
- '@rollup/rollup-linux-s390x-gnu': 4.41.1
- '@rollup/rollup-linux-x64-gnu': 4.41.1
- '@rollup/rollup-linux-x64-musl': 4.41.1
- '@rollup/rollup-win32-arm64-msvc': 4.41.1
- '@rollup/rollup-win32-ia32-msvc': 4.41.1
- '@rollup/rollup-win32-x64-msvc': 4.41.1
+ '@rollup/rollup-android-arm-eabi': 4.42.0
+ '@rollup/rollup-android-arm64': 4.42.0
+ '@rollup/rollup-darwin-arm64': 4.42.0
+ '@rollup/rollup-darwin-x64': 4.42.0
+ '@rollup/rollup-freebsd-arm64': 4.42.0
+ '@rollup/rollup-freebsd-x64': 4.42.0
+ '@rollup/rollup-linux-arm-gnueabihf': 4.42.0
+ '@rollup/rollup-linux-arm-musleabihf': 4.42.0
+ '@rollup/rollup-linux-arm64-gnu': 4.42.0
+ '@rollup/rollup-linux-arm64-musl': 4.42.0
+ '@rollup/rollup-linux-loongarch64-gnu': 4.42.0
+ '@rollup/rollup-linux-powerpc64le-gnu': 4.42.0
+ '@rollup/rollup-linux-riscv64-gnu': 4.42.0
+ '@rollup/rollup-linux-riscv64-musl': 4.42.0
+ '@rollup/rollup-linux-s390x-gnu': 4.42.0
+ '@rollup/rollup-linux-x64-gnu': 4.42.0
+ '@rollup/rollup-linux-x64-musl': 4.42.0
+ '@rollup/rollup-win32-arm64-msvc': 4.42.0
+ '@rollup/rollup-win32-ia32-msvc': 4.42.0
+ '@rollup/rollup-win32-x64-msvc': 4.42.0
fsevents: 2.3.3
rrweb-cssom@0.8.0: {}
@@ -9705,14 +9740,14 @@ snapshots:
shebang-regex@3.0.0: {}
- shiki@3.4.2:
+ shiki@3.6.0:
dependencies:
- '@shikijs/core': 3.4.2
- '@shikijs/engine-javascript': 3.4.2
- '@shikijs/engine-oniguruma': 3.4.2
- '@shikijs/langs': 3.4.2
- '@shikijs/themes': 3.4.2
- '@shikijs/types': 3.4.2
+ '@shikijs/core': 3.6.0
+ '@shikijs/engine-javascript': 3.6.0
+ '@shikijs/engine-oniguruma': 3.6.0
+ '@shikijs/langs': 3.6.0
+ '@shikijs/themes': 3.6.0
+ '@shikijs/types': 3.6.0
'@shikijs/vscode-textmate': 10.0.2
'@types/hast': 3.0.4
@@ -9771,6 +9806,8 @@ snapshots:
split2@4.2.0: {}
+ stable-hash-x@0.1.1: {}
+
stable-hash@0.0.5: {}
stackback@0.0.2: {}
@@ -10197,27 +10234,27 @@ snapshots:
unist-util-is: 6.0.0
unist-util-visit-parents: 6.0.1
- unrs-resolver@1.7.8:
+ unrs-resolver@1.7.11:
dependencies:
napi-postinstall: 0.2.4
optionalDependencies:
- '@unrs/resolver-binding-darwin-arm64': 1.7.8
- '@unrs/resolver-binding-darwin-x64': 1.7.8
- '@unrs/resolver-binding-freebsd-x64': 1.7.8
- '@unrs/resolver-binding-linux-arm-gnueabihf': 1.7.8
- '@unrs/resolver-binding-linux-arm-musleabihf': 1.7.8
- '@unrs/resolver-binding-linux-arm64-gnu': 1.7.8
- '@unrs/resolver-binding-linux-arm64-musl': 1.7.8
- '@unrs/resolver-binding-linux-ppc64-gnu': 1.7.8
- '@unrs/resolver-binding-linux-riscv64-gnu': 1.7.8
- '@unrs/resolver-binding-linux-riscv64-musl': 1.7.8
- '@unrs/resolver-binding-linux-s390x-gnu': 1.7.8
- '@unrs/resolver-binding-linux-x64-gnu': 1.7.8
- '@unrs/resolver-binding-linux-x64-musl': 1.7.8
- '@unrs/resolver-binding-wasm32-wasi': 1.7.8
- '@unrs/resolver-binding-win32-arm64-msvc': 1.7.8
- '@unrs/resolver-binding-win32-ia32-msvc': 1.7.8
- '@unrs/resolver-binding-win32-x64-msvc': 1.7.8
+ '@unrs/resolver-binding-darwin-arm64': 1.7.11
+ '@unrs/resolver-binding-darwin-x64': 1.7.11
+ '@unrs/resolver-binding-freebsd-x64': 1.7.11
+ '@unrs/resolver-binding-linux-arm-gnueabihf': 1.7.11
+ '@unrs/resolver-binding-linux-arm-musleabihf': 1.7.11
+ '@unrs/resolver-binding-linux-arm64-gnu': 1.7.11
+ '@unrs/resolver-binding-linux-arm64-musl': 1.7.11
+ '@unrs/resolver-binding-linux-ppc64-gnu': 1.7.11
+ '@unrs/resolver-binding-linux-riscv64-gnu': 1.7.11
+ '@unrs/resolver-binding-linux-riscv64-musl': 1.7.11
+ '@unrs/resolver-binding-linux-s390x-gnu': 1.7.11
+ '@unrs/resolver-binding-linux-x64-gnu': 1.7.11
+ '@unrs/resolver-binding-linux-x64-musl': 1.7.11
+ '@unrs/resolver-binding-wasm32-wasi': 1.7.11
+ '@unrs/resolver-binding-win32-arm64-msvc': 1.7.11
+ '@unrs/resolver-binding-win32-ia32-msvc': 1.7.11
+ '@unrs/resolver-binding-win32-x64-msvc': 1.7.11
unstorage@1.16.0:
dependencies:
@@ -10295,7 +10332,7 @@ snapshots:
fdir: 6.4.5(picomatch@4.0.2)
picomatch: 4.0.2
postcss: 8.5.4
- rollup: 4.41.1
+ rollup: 4.42.0
tinyglobby: 0.2.14
optionalDependencies:
'@types/node': 22.15.18
@@ -10311,7 +10348,7 @@ snapshots:
dependencies:
'@vitest/expect': 3.1.3
'@vitest/mocker': 3.1.3(vite@6.3.5(@types/node@22.15.18)(jiti@2.4.2)(yaml@2.8.0))
- '@vitest/pretty-format': 3.1.4
+ '@vitest/pretty-format': 3.2.2
'@vitest/runner': 3.1.3
'@vitest/snapshot': 3.1.3
'@vitest/spy': 3.1.3
@@ -10350,7 +10387,7 @@ snapshots:
volar-service-css@0.0.62(@volar/language-service@2.4.14):
dependencies:
- vscode-css-languageservice: 6.3.5
+ vscode-css-languageservice: 6.3.6
vscode-languageserver-textdocument: 1.0.12
vscode-uri: 3.1.0
optionalDependencies:
@@ -10367,7 +10404,7 @@ snapshots:
volar-service-html@0.0.62(@volar/language-service@2.4.14):
dependencies:
- vscode-html-languageservice: 5.4.0
+ vscode-html-languageservice: 5.5.0
vscode-languageserver-textdocument: 1.0.12
vscode-uri: 3.1.0
optionalDependencies:
@@ -10404,14 +10441,14 @@ snapshots:
optionalDependencies:
'@volar/language-service': 2.4.14
- vscode-css-languageservice@6.3.5:
+ vscode-css-languageservice@6.3.6:
dependencies:
'@vscode/l10n': 0.0.18
vscode-languageserver-textdocument: 1.0.12
vscode-languageserver-types: 3.17.5
vscode-uri: 3.1.0
- vscode-html-languageservice@5.4.0:
+ vscode-html-languageservice@5.5.0:
dependencies:
'@vscode/l10n': 0.0.18
vscode-languageserver-textdocument: 1.0.12
@@ -10550,7 +10587,7 @@ snapshots:
'@cloudflare/workerd-linux-arm64': 1.20250523.0
'@cloudflare/workerd-windows-64': 1.20250523.0
- wrangler@4.17.0(@cloudflare/workers-types@4.20250601.0):
+ wrangler@4.17.0(@cloudflare/workers-types@4.20250607.0):
dependencies:
'@cloudflare/kv-asset-handler': 0.4.0
'@cloudflare/unenv-preset': 2.3.2(unenv@2.0.0-rc.17)(workerd@1.20250523.0)
@@ -10561,7 +10598,7 @@ snapshots:
unenv: 2.0.0-rc.17
workerd: 1.20250523.0
optionalDependencies:
- '@cloudflare/workers-types': 4.20250601.0
+ '@cloudflare/workers-types': 4.20250607.0
fsevents: 2.3.3
transitivePeerDependencies:
- bufferutil
@@ -10648,17 +10685,17 @@ snapshots:
mustache: 4.2.0
stacktracey: 2.1.8
- zod-to-json-schema@3.24.5(zod@3.25.46):
+ zod-to-json-schema@3.24.5(zod@3.25.56):
dependencies:
- zod: 3.25.46
+ zod: 3.25.56
- zod-to-ts@1.2.0(typescript@5.6.3)(zod@3.25.46):
+ zod-to-ts@1.2.0(typescript@5.6.3)(zod@3.25.56):
dependencies:
typescript: 5.6.3
- zod: 3.25.46
+ zod: 3.25.56
zod@3.22.3: {}
- zod@3.25.46: {}
+ zod@3.25.56: {}
zwitch@2.0.4: {}
diff --git a/pnpm-workspace.yaml b/pnpm-workspace.yaml
index 3ae92aa..eb6a2e3 100644
--- a/pnpm-workspace.yaml
+++ b/pnpm-workspace.yaml
@@ -1,2 +1,6 @@
onlyBuiltDependencies:
+ - esbuild
- lefthook
+ - sharp
+ - unrs-resolver
+ - workerd
From f48dbd9417ac31c8c23769bacb6409a97da71cb3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Sat, 7 Jun 2025 14:48:24 -0600
Subject: [PATCH 17/18] chore: fix types
---
src/constants/i18n.ts | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/constants/i18n.ts b/src/constants/i18n.ts
index 4ec3c59..37d21a2 100644
--- a/src/constants/i18n.ts
+++ b/src/constants/i18n.ts
@@ -12,7 +12,7 @@ export const locales = Object.keys(languages) as Locale[]
/**
* Maps locale keys to their corresponding translation objects.
*/
-export const translations: Record = Object.fromEntries(
+export const translations: Record = Object.fromEntries(
Object.entries(import.meta.glob('~/i18n/**/translation.json', { eager: true })).map(
([key, value]) => {
const result = i18nSchema.I18n(value)
@@ -34,7 +34,7 @@ export const i18n = {
LOCALES: Object.entries(languages).map(([key, locale]) => {
return {
...locale,
- ui: translations[key],
+ ui: translations[key as Locale],
}
}),
} as const
From a56efc8dbe0b77d0cc69057daeab0ba4a6c92423 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bryan=20Gald=C3=A1mez?=
Date: Mon, 9 Jun 2025 18:48:37 -0600
Subject: [PATCH 18/18] chore: update fonts with broader subset
---
public/fonts/JunicodeVF-Italic-subset.woff2 | Bin 5312 -> 233400 bytes
public/fonts/JunicodeVF-Roman-subset.woff2 | Bin 16940 -> 222100 bytes
2 files changed, 0 insertions(+), 0 deletions(-)
diff --git a/public/fonts/JunicodeVF-Italic-subset.woff2 b/public/fonts/JunicodeVF-Italic-subset.woff2
index e91abe0a5f09e2ad45fbddc9137d41e61c9f37f1..a2a6bceff57bd1b5d48459ce43c5fc5ff71dbe18 100644
GIT binary patch
literal 233400
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