From 2122de50e36590ff25bbfa63aa6a68cd49c7d9cf Mon Sep 17 00:00:00 2001 From: selankon Date: Wed, 12 Apr 2023 15:10:42 +0200 Subject: [PATCH] chore(all): fix production build --- .linguirc | 20 - i18n/en/messages.po | 93 ++- i18n/es/messages.po | 93 ++- i18n/it/messages.po | 93 ++- i18n/pt/messages.po | 93 ++- lingui.config.js | 23 + package-lock.json | 687 ++++++++++++------ package.json | 8 +- .../src/components/components.tsx | 2 + .../src/components/internetPathChart.tsx | 10 +- .../src/components/internetStatus.tsx | 8 +- .../lime-plugin-rx/src/sections/alignment.tsx | 2 +- .../src/sections/internetPath.tsx | 2 +- src/components/elements/button.tsx | 11 +- src/components/icons/SvgIcon.tsx | 3 +- src/utils/test_utils.js | 1 + 16 files changed, 806 insertions(+), 343 deletions(-) delete mode 100644 .linguirc create mode 100644 lingui.config.js diff --git a/.linguirc b/.linguirc deleted file mode 100644 index a6af6a04..00000000 --- a/.linguirc +++ /dev/null @@ -1,20 +0,0 @@ -{ - "locales": ["es", "pt", "en", "it"], - "catalogs": [{ - "path": "i18n/{locale}/messages", - "include": ["src", "plugins"] - }], - "format": "po", - "compileNamespace": "cjs", - "extractBabelOptions": { - "presets": [ - "preact", - "@babel/preset-typescript", - "@lingui/babel-preset-react" - ] - }, - "sourceLocale": "en", - "fallbackLocales": { - "default": "en" - } -} diff --git a/i18n/en/messages.po b/i18n/en/messages.po index e1845640..56e7d68c 100644 --- a/i18n/en/messages.po +++ b/i18n/en/messages.po @@ -151,6 +151,10 @@ msgstr "" msgid "Channel" msgstr "Channel" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:80 +msgid "Check<0/>Alignment" +msgstr "Check<0/>Alignment" + #: plugins/lime-plugin-fbw/src/containers/Setting.js:100 msgid "Checking connection" msgstr "" @@ -302,10 +306,14 @@ msgstr "Description" msgid "Description: {name}" msgstr "Description: {name}" -#: plugins/lime-plugin-rx/src/rxPage.js:51 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:51 msgid "Device" msgstr "" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:90 +msgid "Diagnose" +msgstr "Diagnose" + #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:52 #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:69 #: plugins/lime-plugin-pirania/nodeAdmin/PortalConfigItem.tsx:19 @@ -445,7 +453,8 @@ msgstr "Expires {0}" #: plugins/lime-plugin-align/src/alignPage.js:37 #: plugins/lime-plugin-fbw/src/containers/scanPage/components/networkTile.js:80 -#: plugins/lime-plugin-rx/src/rxPage.js:92 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:92 +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:63 msgid "Fetching name" msgstr "" @@ -458,7 +467,7 @@ msgid "Filter by" msgstr "Filter by" #: plugins/lime-plugin-firmware/src/firmwareMenu.js:18 -#: plugins/lime-plugin-rx/src/rxPage.js:58 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:58 msgid "Firmware" msgstr "" @@ -506,7 +515,7 @@ msgstr "" msgid "I don't know the shared password" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:180 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:180 msgid "IP Addresses" msgstr "" @@ -526,15 +535,27 @@ msgstr "If you invalidate this voucher no one will be able to use it anymore. Th msgid "If your community network has local services, you can point a link to them." msgstr "If your community network has local services, you can point a link to them." -#: plugins/lime-plugin-rx/src/rxPage.js:97 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:97 msgid "Interface" msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:68 +msgid "Interface:" +msgstr "Interface:" + +#: plugins/lime-plugin-rx/src/components/internetPathChart.tsx:190 +msgid "Internet" +msgstr "Internet" + #: plugins/lime-plugin-metrics/src/components/internetStatus.js:10 -#: plugins/lime-plugin-rx/src/rxPage.js:148 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:148 msgid "Internet connection" msgstr "" +#: plugins/lime-plugin-rx/src/components/internetStatus.tsx:17 +msgid "Internet<0/>connection" +msgstr "Internet<0/>connection" + #: plugins/lime-plugin-pirania/src/screens/voucher.js:96 msgid "Invalidate" msgstr "Invalidate" @@ -562,6 +583,10 @@ msgstr "" msgid "It must start with https:// or http://" msgstr "It must start with https:// or http://" +#: plugins/lime-plugin-rx/src/components/footer.tsx:15 +msgid "Join" +msgstr "Join" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:72 msgid "Join the mesh" msgstr "" @@ -583,7 +608,11 @@ msgstr "Link URL" msgid "Load last known Internet path" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:127 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:78 +msgid "Loading <0/>last internet path..." +msgstr "Loading <0/>last internet path..." + +#: plugins/lime-plugin-rx/src/rxPageBAK.js:127 msgid "Loading node status..." msgstr "" @@ -608,6 +637,7 @@ msgid "Manage Vouchers" msgstr "Manage Vouchers" #: plugins/lime-plugin-locate/src/locateMenu.js:18 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:93 msgid "Map" msgstr "" @@ -635,14 +665,22 @@ msgstr "" msgid "More than 10 characters" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:79 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:79 msgid "Most Active" msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:56 +msgid "Most active link" +msgstr "Most active link" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:129 msgid "Must select a valid hostname" msgstr "Must select a valid hostname" +#: plugins/lime-plugin-rx/src/components/footer.tsx:12 +msgid "Need support?" +msgstr "Need support?" + #: plugins/lime-plugin-network-admin/src/netAdminMenu.js:6 #~ msgid "Network Configuration" #~ msgstr "" @@ -739,6 +777,10 @@ msgstr "" msgid "Password: {password}" msgstr "Password: {password}" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:73 +msgid "Path to Internet" +msgstr "Path to Internet" + #: plugins/lime-plugin-pirania/src/components/voucherListItem.js:58 msgid "Permanent" msgstr "Permanent" @@ -948,7 +990,7 @@ msgstr "" msgid "Status: {0}" msgstr "Status: {0}" -#: plugins/lime-plugin-rx/src/rxPage.js:42 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:42 msgid "System" msgstr "" @@ -1061,10 +1103,14 @@ msgstr "" msgid "To enable remote access an internet connection is needed" msgstr "To enable remote access an internet connection is needed" -#: plugins/lime-plugin-rx/src/rxPage.js:102 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:102 msgid "Traffic" msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:74 +msgid "Traffic:" +msgstr "Traffic:" + #: plugins/lime-plugin-firmware/src/upgradingPage/upgradingPage.js:12 msgid "Try reloading the app" msgstr "" @@ -1094,7 +1140,7 @@ msgstr "" msgid "Upload firmware image from your device" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:45 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:45 msgid "Uptime" msgstr "" @@ -1103,6 +1149,7 @@ msgid "Use vouchers for access" msgstr "Use vouchers for access" #: plugins/lime-plugin-changeNode/src/changeNodePage.js:75 +#: plugins/lime-plugin-rx/src/components/footer.tsx:24 msgid "Visit" msgstr "" @@ -1149,6 +1196,10 @@ msgstr "" msgid "Wifi Password" msgstr "" +#: plugins/lime-plugin-rx/src/sections/wired.tsx:64 +msgid "Wired connections" +msgstr "Wired connections" + #: plugins/lime-plugin-align/src/containers/alignSingle/index.js:108 msgid "With radio {fromRadio} alignin with" msgstr "" @@ -1202,6 +1253,10 @@ msgstr "" msgid "You should try to connect to the network {wifiSsid}." msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:105 +msgid "Your Alignment" +msgstr "Your Alignment" + #: plugins/lime-plugin-remotesupport/src/remoteSupportPage.js:74 msgid "Your node has no internet connection" msgstr "Your node has no internet connection" @@ -1214,10 +1269,18 @@ msgstr "" msgid "confirm location" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:29 +msgid "docs.altermundi.net" +msgstr "docs.altermundi.net" + #: plugins/lime-plugin-locate/src/locatePage.tsx:246 msgid "edit location" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:20 +msgid "foro.librerouter.org" +msgstr "foro.librerouter.org" + #: plugins/lime-plugin-locate/src/locatePage.tsx:257 msgid "hide community" msgstr "" @@ -1246,15 +1309,15 @@ msgstr "" msgid "{0, plural, =0 {No one has joined yet.} one {One person has joined.} other {# people have joined.}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:20 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:20 msgid "{days, plural, one {# day} other {# days}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:23 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:23 msgid "{hours, plural, one {# hour} other {# hours}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:26 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:26 msgid "{mins, plural, one {# minute} other {# minutes}}" msgstr "" @@ -1262,7 +1325,7 @@ msgstr "" msgid "{secondsAmount} seconds ago" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:29 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:29 msgid "{secs, plural, one {# second} other {# seconds}}" msgstr "" diff --git a/i18n/es/messages.po b/i18n/es/messages.po index de66aa49..caceb81f 100644 --- a/i18n/es/messages.po +++ b/i18n/es/messages.po @@ -151,6 +151,10 @@ msgstr "Cambiar Contraseña Compartida" msgid "Channel" msgstr "Canal" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:80 +msgid "Check<0/>Alignment" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/Setting.js:100 msgid "Checking connection" msgstr "Comprobando conexión" @@ -302,10 +306,14 @@ msgstr "Descripción" msgid "Description: {name}" msgstr "Descripción: {name}" -#: plugins/lime-plugin-rx/src/rxPage.js:51 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:51 msgid "Device" msgstr "Equipo" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:90 +msgid "Diagnose" +msgstr "" + #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:52 #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:69 #: plugins/lime-plugin-pirania/nodeAdmin/PortalConfigItem.tsx:19 @@ -445,7 +453,8 @@ msgstr "" #: plugins/lime-plugin-align/src/alignPage.js:37 #: plugins/lime-plugin-fbw/src/containers/scanPage/components/networkTile.js:80 -#: plugins/lime-plugin-rx/src/rxPage.js:92 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:92 +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:63 msgid "Fetching name" msgstr "Consiguiendo nombre" @@ -458,7 +467,7 @@ msgid "Filter by" msgstr "Filtrar por" #: plugins/lime-plugin-firmware/src/firmwareMenu.js:18 -#: plugins/lime-plugin-rx/src/rxPage.js:58 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:58 msgid "Firmware" msgstr "Firmware" @@ -506,7 +515,7 @@ msgstr "Nombre del nodo" msgid "I don't know the shared password" msgstr "No sé la contraseña compartida" -#: plugins/lime-plugin-rx/src/rxPage.js:180 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:180 msgid "IP Addresses" msgstr "Direcciones IP" @@ -526,15 +535,27 @@ msgstr "Si invalidas este cupón, el mismo no podrá volver a ser utilizado. Est msgid "If your community network has local services, you can point a link to them." msgstr "Si tu red comunitaria tiene servicios locales, puedes indicar un enlace para acceder a ellos." -#: plugins/lime-plugin-rx/src/rxPage.js:97 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:97 msgid "Interface" msgstr "Interfaz" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:68 +msgid "Interface:" +msgstr "" + +#: plugins/lime-plugin-rx/src/components/internetPathChart.tsx:190 +msgid "Internet" +msgstr "" + #: plugins/lime-plugin-metrics/src/components/internetStatus.js:10 -#: plugins/lime-plugin-rx/src/rxPage.js:148 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:148 msgid "Internet connection" msgstr "Conexión a Internet" +#: plugins/lime-plugin-rx/src/components/internetStatus.tsx:17 +msgid "Internet<0/>connection" +msgstr "" + #: plugins/lime-plugin-pirania/src/screens/voucher.js:96 msgid "Invalidate" msgstr "Invalidar" @@ -562,6 +583,10 @@ msgstr "Está habilitado por defecto en {communityName}" msgid "It must start with https:// or http://" msgstr "Debe empezar con https:// o http://" +#: plugins/lime-plugin-rx/src/components/footer.tsx:15 +msgid "Join" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:72 msgid "Join the mesh" msgstr "Unirse a la red" @@ -583,7 +608,11 @@ msgstr "URL del enlace" msgid "Load last known Internet path" msgstr "Cargando última ruta a Internet conocida" -#: plugins/lime-plugin-rx/src/rxPage.js:127 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:78 +msgid "Loading <0/>last internet path..." +msgstr "" + +#: plugins/lime-plugin-rx/src/rxPageBAK.js:127 msgid "Loading node status..." msgstr "Cargando el estado del nodo..." @@ -608,6 +637,7 @@ msgid "Manage Vouchers" msgstr "Administrar Cupones" #: plugins/lime-plugin-locate/src/locateMenu.js:18 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:93 msgid "Map" msgstr "Mapa" @@ -635,14 +665,22 @@ msgstr "Más info en:" msgid "More than 10 characters" msgstr "Más de 10 caracteres" -#: plugins/lime-plugin-rx/src/rxPage.js:79 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:79 msgid "Most Active" msgstr "Enlace más activo" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:56 +msgid "Most active link" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:129 msgid "Must select a valid hostname" msgstr "Debes elegir un nombre de host valido" +#: plugins/lime-plugin-rx/src/components/footer.tsx:12 +msgid "Need support?" +msgstr "" + #: plugins/lime-plugin-network-admin/src/netAdminMenu.js:6 #~ msgid "Network Configuration" #~ msgstr "Configuración de la Red" @@ -739,6 +777,10 @@ msgstr "Contraseña" msgid "Password: {password}" msgstr "Contraseña: {password}" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:73 +msgid "Path to Internet" +msgstr "" + #: plugins/lime-plugin-pirania/src/components/voucherListItem.js:58 msgid "Permanent" msgstr "Permanente" @@ -948,7 +990,7 @@ msgstr "Estado" msgid "Status: {0}" msgstr "Estado: {0}" -#: plugins/lime-plugin-rx/src/rxPage.js:42 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:42 msgid "System" msgstr "Sistema" @@ -1061,10 +1103,14 @@ msgstr "Hasta Internet" msgid "To enable remote access an internet connection is needed" msgstr "Para posibilitar el acceso remoto es necesaria una conexión a internet." -#: plugins/lime-plugin-rx/src/rxPage.js:102 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:102 msgid "Traffic" msgstr "Tráfico" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:74 +msgid "Traffic:" +msgstr "" + #: plugins/lime-plugin-firmware/src/upgradingPage/upgradingPage.js:12 msgid "Try reloading the app" msgstr "Intentar recargar la app" @@ -1094,7 +1140,7 @@ msgstr "Actualizar a {versionName}" msgid "Upload firmware image from your device" msgstr "Subí una imagen del firmware desde tu dispositivo" -#: plugins/lime-plugin-rx/src/rxPage.js:45 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:45 msgid "Uptime" msgstr "Tiempo en actividad" @@ -1103,6 +1149,7 @@ msgid "Use vouchers for access" msgstr "Usar cupones de acceso" #: plugins/lime-plugin-changeNode/src/changeNodePage.js:75 +#: plugins/lime-plugin-rx/src/components/footer.tsx:24 msgid "Visit" msgstr "Visitar" @@ -1149,6 +1196,10 @@ msgstr "Al recargar la aplicación, se te pedirá que confirmes la actualizació msgid "Wifi Password" msgstr "Contraseña del Wifi" +#: plugins/lime-plugin-rx/src/sections/wired.tsx:64 +msgid "Wired connections" +msgstr "" + #: plugins/lime-plugin-align/src/containers/alignSingle/index.js:108 msgid "With radio {fromRadio} alignin with" msgstr "Con radio {fromRadio} alineando con" @@ -1202,6 +1253,10 @@ msgstr "Debes ingresar la contraseña compartida para seguir" msgid "You should try to connect to the network {wifiSsid}." msgstr "Intente conectarse a la red wifi {wifiSsid} para completar la instalación." +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:105 +msgid "Your Alignment" +msgstr "" + #: plugins/lime-plugin-remotesupport/src/remoteSupportPage.js:74 msgid "Your node has no internet connection" msgstr "Tu nodo no tiene conexión a internet" @@ -1214,10 +1269,18 @@ msgstr "cancelar" msgid "confirm location" msgstr "confirmar ubicación" +#: plugins/lime-plugin-rx/src/components/footer.tsx:29 +msgid "docs.altermundi.net" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:246 msgid "edit location" msgstr "modificar ubicación" +#: plugins/lime-plugin-rx/src/components/footer.tsx:20 +msgid "foro.librerouter.org" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:257 msgid "hide community" msgstr "esconder comunidad" @@ -1246,15 +1309,15 @@ msgstr "a la versión anterior" msgid "{0, plural, =0 {No one has joined yet.} one {One person has joined.} other {# people have joined.}}" msgstr "{0, plural, =0 {Nadie se ha unido aún.} one {Una persona se ha unido.} other {# personas se han unido.}}" -#: plugins/lime-plugin-rx/src/rxPage.js:20 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:20 msgid "{days, plural, one {# day} other {# days}}" msgstr "{days, plural, one {# día} other {# días}}" -#: plugins/lime-plugin-rx/src/rxPage.js:23 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:23 msgid "{hours, plural, one {# hour} other {# hours}}" msgstr "{hours, plural, one {# hora} other {# horas}}" -#: plugins/lime-plugin-rx/src/rxPage.js:26 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:26 msgid "{mins, plural, one {# minute} other {# minutes}}" msgstr "{mins, plural, one {# minuto} other {# minutos}}" @@ -1262,7 +1325,7 @@ msgstr "{mins, plural, one {# minuto} other {# minutos}}" msgid "{secondsAmount} seconds ago" msgstr "hace {secondsAmount} segundos" -#: plugins/lime-plugin-rx/src/rxPage.js:29 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:29 msgid "{secs, plural, one {# second} other {# seconds}}" msgstr "{secs, plural, one {# segundo} other {# segundos}}" diff --git a/i18n/it/messages.po b/i18n/it/messages.po index 5c7bb34b..23faaff1 100644 --- a/i18n/it/messages.po +++ b/i18n/it/messages.po @@ -151,6 +151,10 @@ msgstr "" msgid "Channel" msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:80 +msgid "Check<0/>Alignment" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/Setting.js:100 msgid "Checking connection" msgstr "" @@ -302,10 +306,14 @@ msgstr "" msgid "Description: {name}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:51 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:51 msgid "Device" msgstr "" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:90 +msgid "Diagnose" +msgstr "" + #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:52 #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:69 #: plugins/lime-plugin-pirania/nodeAdmin/PortalConfigItem.tsx:19 @@ -445,7 +453,8 @@ msgstr "" #: plugins/lime-plugin-align/src/alignPage.js:37 #: plugins/lime-plugin-fbw/src/containers/scanPage/components/networkTile.js:80 -#: plugins/lime-plugin-rx/src/rxPage.js:92 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:92 +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:63 msgid "Fetching name" msgstr "" @@ -458,7 +467,7 @@ msgid "Filter by" msgstr "" #: plugins/lime-plugin-firmware/src/firmwareMenu.js:18 -#: plugins/lime-plugin-rx/src/rxPage.js:58 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:58 msgid "Firmware" msgstr "" @@ -506,7 +515,7 @@ msgstr "" msgid "I don't know the shared password" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:180 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:180 msgid "IP Addresses" msgstr "Indirizzi IP" @@ -526,15 +535,27 @@ msgstr "" msgid "If your community network has local services, you can point a link to them." msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:97 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:97 msgid "Interface" msgstr "Interfaccia" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:68 +msgid "Interface:" +msgstr "" + +#: plugins/lime-plugin-rx/src/components/internetPathChart.tsx:190 +msgid "Internet" +msgstr "" + #: plugins/lime-plugin-metrics/src/components/internetStatus.js:10 -#: plugins/lime-plugin-rx/src/rxPage.js:148 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:148 msgid "Internet connection" msgstr "Connessione a Internet" +#: plugins/lime-plugin-rx/src/components/internetStatus.tsx:17 +msgid "Internet<0/>connection" +msgstr "" + #: plugins/lime-plugin-pirania/src/screens/voucher.js:96 msgid "Invalidate" msgstr "" @@ -562,6 +583,10 @@ msgstr "" msgid "It must start with https:// or http://" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:15 +msgid "Join" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:72 msgid "Join the mesh" msgstr "" @@ -583,7 +608,11 @@ msgstr "" msgid "Load last known Internet path" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:127 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:78 +msgid "Loading <0/>last internet path..." +msgstr "" + +#: plugins/lime-plugin-rx/src/rxPageBAK.js:127 msgid "Loading node status..." msgstr "Caricando lo stato del nodo..." @@ -608,6 +637,7 @@ msgid "Manage Vouchers" msgstr "" #: plugins/lime-plugin-locate/src/locateMenu.js:18 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:93 msgid "Map" msgstr "" @@ -635,14 +665,22 @@ msgstr "" msgid "More than 10 characters" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:79 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:79 msgid "Most Active" msgstr "Più attivi" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:56 +msgid "Most active link" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:129 msgid "Must select a valid hostname" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:12 +msgid "Need support?" +msgstr "" + #: plugins/lime-plugin-network-admin/src/netAdminMenu.js:6 #~ msgid "Network Configuration" #~ msgstr "" @@ -739,6 +777,10 @@ msgstr "" msgid "Password: {password}" msgstr "" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:73 +msgid "Path to Internet" +msgstr "" + #: plugins/lime-plugin-pirania/src/components/voucherListItem.js:58 msgid "Permanent" msgstr "" @@ -948,7 +990,7 @@ msgstr "Stato" msgid "Status: {0}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:42 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:42 msgid "System" msgstr "Sistema" @@ -1061,10 +1103,14 @@ msgstr "All'Internet" msgid "To enable remote access an internet connection is needed" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:102 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:102 msgid "Traffic" msgstr "Traffico di dati" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:74 +msgid "Traffic:" +msgstr "" + #: plugins/lime-plugin-firmware/src/upgradingPage/upgradingPage.js:12 msgid "Try reloading the app" msgstr "" @@ -1094,7 +1140,7 @@ msgstr "" msgid "Upload firmware image from your device" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:45 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:45 msgid "Uptime" msgstr "Tempo di attività" @@ -1103,6 +1149,7 @@ msgid "Use vouchers for access" msgstr "" #: plugins/lime-plugin-changeNode/src/changeNodePage.js:75 +#: plugins/lime-plugin-rx/src/components/footer.tsx:24 msgid "Visit" msgstr "" @@ -1149,6 +1196,10 @@ msgstr "" msgid "Wifi Password" msgstr "" +#: plugins/lime-plugin-rx/src/sections/wired.tsx:64 +msgid "Wired connections" +msgstr "" + #: plugins/lime-plugin-align/src/containers/alignSingle/index.js:108 msgid "With radio {fromRadio} alignin with" msgstr "" @@ -1202,6 +1253,10 @@ msgstr "" msgid "You should try to connect to the network {wifiSsid}." msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:105 +msgid "Your Alignment" +msgstr "" + #: plugins/lime-plugin-remotesupport/src/remoteSupportPage.js:74 msgid "Your node has no internet connection" msgstr "" @@ -1214,10 +1269,18 @@ msgstr "" msgid "confirm location" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:29 +msgid "docs.altermundi.net" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:246 msgid "edit location" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:20 +msgid "foro.librerouter.org" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:257 msgid "hide community" msgstr "" @@ -1246,15 +1309,15 @@ msgstr "" msgid "{0, plural, =0 {No one has joined yet.} one {One person has joined.} other {# people have joined.}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:20 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:20 msgid "{days, plural, one {# day} other {# days}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:23 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:23 msgid "{hours, plural, one {# hour} other {# hours}}" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:26 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:26 msgid "{mins, plural, one {# minute} other {# minutes}}" msgstr "" @@ -1262,7 +1325,7 @@ msgstr "" msgid "{secondsAmount} seconds ago" msgstr "" -#: plugins/lime-plugin-rx/src/rxPage.js:29 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:29 msgid "{secs, plural, one {# second} other {# seconds}}" msgstr "" diff --git a/i18n/pt/messages.po b/i18n/pt/messages.po index ee3e80c2..c8b4a4ce 100644 --- a/i18n/pt/messages.po +++ b/i18n/pt/messages.po @@ -151,6 +151,10 @@ msgstr "Mudar senha compartilhada" msgid "Channel" msgstr "" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:80 +msgid "Check<0/>Alignment" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/Setting.js:100 msgid "Checking connection" msgstr "Verificando conexão" @@ -302,10 +306,14 @@ msgstr "Descrição" msgid "Description: {name}" msgstr "Descrição: {name}" -#: plugins/lime-plugin-rx/src/rxPage.js:51 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:51 msgid "Device" msgstr "Dispositivo" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:90 +msgid "Diagnose" +msgstr "" + #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:52 #: plugins/lime-plugin-node-admin/src/nodeAdminPage.js:69 #: plugins/lime-plugin-pirania/nodeAdmin/PortalConfigItem.tsx:19 @@ -445,7 +453,8 @@ msgstr "" #: plugins/lime-plugin-align/src/alignPage.js:37 #: plugins/lime-plugin-fbw/src/containers/scanPage/components/networkTile.js:80 -#: plugins/lime-plugin-rx/src/rxPage.js:92 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:92 +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:63 msgid "Fetching name" msgstr "Pegando nome" @@ -458,7 +467,7 @@ msgid "Filter by" msgstr "Filtrar por" #: plugins/lime-plugin-firmware/src/firmwareMenu.js:18 -#: plugins/lime-plugin-rx/src/rxPage.js:58 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:58 msgid "Firmware" msgstr "Firmware" @@ -506,7 +515,7 @@ msgstr "Nome do nó" msgid "I don't know the shared password" msgstr "Não sei a senha compartilhada" -#: plugins/lime-plugin-rx/src/rxPage.js:180 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:180 msgid "IP Addresses" msgstr "Endereços IP" @@ -526,15 +535,27 @@ msgstr "Se você invalidar este voucher, ninguém mais poderá utilizá-lo. E is msgid "If your community network has local services, you can point a link to them." msgstr "Se a sua rede comunitária tem serviços locais, você pode colocar o link para eles." -#: plugins/lime-plugin-rx/src/rxPage.js:97 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:97 msgid "Interface" msgstr "Interface" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:68 +msgid "Interface:" +msgstr "" + +#: plugins/lime-plugin-rx/src/components/internetPathChart.tsx:190 +msgid "Internet" +msgstr "" + #: plugins/lime-plugin-metrics/src/components/internetStatus.js:10 -#: plugins/lime-plugin-rx/src/rxPage.js:148 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:148 msgid "Internet connection" msgstr "Conexão à Internet" +#: plugins/lime-plugin-rx/src/components/internetStatus.tsx:17 +msgid "Internet<0/>connection" +msgstr "" + #: plugins/lime-plugin-pirania/src/screens/voucher.js:96 msgid "Invalidate" msgstr "Invalidar" @@ -562,6 +583,10 @@ msgstr "Está ativado por padrão na {communityName}" msgid "It must start with https:// or http://" msgstr "Deve-se iniciar com https:// ou http://" +#: plugins/lime-plugin-rx/src/components/footer.tsx:15 +msgid "Join" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:72 msgid "Join the mesh" msgstr "Se junte à rede" @@ -583,7 +608,11 @@ msgstr "Link URL" msgid "Load last known Internet path" msgstr "Calculando o caminho da rede" -#: plugins/lime-plugin-rx/src/rxPage.js:127 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:78 +msgid "Loading <0/>last internet path..." +msgstr "" + +#: plugins/lime-plugin-rx/src/rxPageBAK.js:127 msgid "Loading node status..." msgstr "Carregando o status do nó..." @@ -608,6 +637,7 @@ msgid "Manage Vouchers" msgstr "Gerenciar Vouchers" #: plugins/lime-plugin-locate/src/locateMenu.js:18 +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:93 msgid "Map" msgstr "Mapa" @@ -635,14 +665,22 @@ msgstr "Mais informações em:" msgid "More than 10 characters" msgstr "Mais de 10 caracteres" -#: plugins/lime-plugin-rx/src/rxPage.js:79 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:79 msgid "Most Active" msgstr "Mais Ativos" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:56 +msgid "Most active link" +msgstr "" + #: plugins/lime-plugin-fbw/src/containers/scanPage/SelectForm.js:129 msgid "Must select a valid hostname" msgstr "" +#: plugins/lime-plugin-rx/src/components/footer.tsx:12 +msgid "Need support?" +msgstr "" + #: plugins/lime-plugin-network-admin/src/netAdminMenu.js:6 #~ msgid "Network Configuration" #~ msgstr "Configurações de Rede" @@ -739,6 +777,10 @@ msgstr "Senha" msgid "Password: {password}" msgstr "Senha: {password}" +#: plugins/lime-plugin-rx/src/sections/internetPath.tsx:73 +msgid "Path to Internet" +msgstr "" + #: plugins/lime-plugin-pirania/src/components/voucherListItem.js:58 msgid "Permanent" msgstr "Permanent" @@ -948,7 +990,7 @@ msgstr "Status" msgid "Status: {0}" msgstr "Estado: {0}" -#: plugins/lime-plugin-rx/src/rxPage.js:42 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:42 msgid "System" msgstr "Sistema" @@ -1061,10 +1103,14 @@ msgstr "Para a Internet" msgid "To enable remote access an internet connection is needed" msgstr "Para ativar o acesso remoto é preciso uma conexão com a internet" -#: plugins/lime-plugin-rx/src/rxPage.js:102 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:102 msgid "Traffic" msgstr "Tráfego" +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:74 +msgid "Traffic:" +msgstr "" + #: plugins/lime-plugin-firmware/src/upgradingPage/upgradingPage.js:12 msgid "Try reloading the app" msgstr "Tente recarregar o aplicativo" @@ -1094,7 +1140,7 @@ msgstr "Atualizar para {versionName}" msgid "Upload firmware image from your device" msgstr "Carregar uma imagem de firmware do seu dispositivo" -#: plugins/lime-plugin-rx/src/rxPage.js:45 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:45 msgid "Uptime" msgstr "Tempo de atividade" @@ -1103,6 +1149,7 @@ msgid "Use vouchers for access" msgstr "Use vouchers de acesso" #: plugins/lime-plugin-changeNode/src/changeNodePage.js:75 +#: plugins/lime-plugin-rx/src/components/footer.tsx:24 msgid "Visit" msgstr "Visitar" @@ -1149,6 +1196,10 @@ msgstr "Ao carregar o aplicativo, será pedida uma confirmação da atualizaçã msgid "Wifi Password" msgstr "Senha do WiFi" +#: plugins/lime-plugin-rx/src/sections/wired.tsx:64 +msgid "Wired connections" +msgstr "" + #: plugins/lime-plugin-align/src/containers/alignSingle/index.js:108 msgid "With radio {fromRadio} alignin with" msgstr "Com rádio %{radio} alinhado com" @@ -1202,6 +1253,10 @@ msgstr "Deve usar a senha compartiada para entrar" msgid "You should try to connect to the network {wifiSsid}." msgstr "Tente conectar-se a rede wifi %{network} para completar a instalação." +#: plugins/lime-plugin-rx/src/sections/alignment.tsx:105 +msgid "Your Alignment" +msgstr "" + #: plugins/lime-plugin-remotesupport/src/remoteSupportPage.js:74 msgid "Your node has no internet connection" msgstr "Seu nó não tem conexão com a internet" @@ -1214,10 +1269,18 @@ msgstr "cancelar" msgid "confirm location" msgstr "confirmar localização" +#: plugins/lime-plugin-rx/src/components/footer.tsx:29 +msgid "docs.altermundi.net" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:246 msgid "edit location" msgstr "editar localização" +#: plugins/lime-plugin-rx/src/components/footer.tsx:20 +msgid "foro.librerouter.org" +msgstr "" + #: plugins/lime-plugin-locate/src/locatePage.tsx:257 msgid "hide community" msgstr "esconder comunidade" @@ -1246,15 +1309,15 @@ msgstr "a versão prévia" msgid "{0, plural, =0 {No one has joined yet.} one {One person has joined.} other {# people have joined.}}" msgstr "{0, plural, =0 {Ninguém se uniu à sessão.} one {Uma pessoa se uniu à sessão.} other {# pessoas se uniram à sessão.}}" -#: plugins/lime-plugin-rx/src/rxPage.js:20 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:20 msgid "{days, plural, one {# day} other {# days}}" msgstr "{days, plural, one {# dia} other {# dias}}" -#: plugins/lime-plugin-rx/src/rxPage.js:23 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:23 msgid "{hours, plural, one {# hour} other {# hours}}" msgstr "{hours, plural, one {# hora} other {# horas}}" -#: plugins/lime-plugin-rx/src/rxPage.js:26 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:26 msgid "{mins, plural, one {# minute} other {# minutes}}" msgstr "{mins, plural, one {# minuto} other {# minutos}}" @@ -1262,7 +1325,7 @@ msgstr "{mins, plural, one {# minuto} other {# minutos}}" msgid "{secondsAmount} seconds ago" msgstr "a {secondsAmount} segundos" -#: plugins/lime-plugin-rx/src/rxPage.js:29 +#: plugins/lime-plugin-rx/src/rxPageBAK.js:29 msgid "{secs, plural, one {# second} other {# seconds}}" msgstr "{secs, plural, one {# segundo} other {# segundos}}" diff --git a/lingui.config.js b/lingui.config.js new file mode 100644 index 00000000..e3f877f9 --- /dev/null +++ b/lingui.config.js @@ -0,0 +1,23 @@ +/** @type {import('@lingui/conf').LinguiConfig} */ +module.exports = { + locales: ["es", "pt", "en", "it"], + catalogs: [ + { + path: "i18n/{locale}/messages", + include: ["src", "plugins"], + }, + ], + format: "po", + compileNamespace: "cjs", + extractBabelOptions: { + presets: [ + "preact", + "@babel/preset-typescript", + "@lingui/babel-preset-react", + ], + }, + sourceLocale: "en", + fallbackLocales: { + default: "en", + }, +}; diff --git a/package-lock.json b/package-lock.json index d221c0c1..38a64a58 100644 --- a/package-lock.json +++ b/package-lock.json @@ -30,10 +30,10 @@ "devDependencies": { "@babel/preset-react": "^7.18.6", "@lingui/babel-preset-react": "^2.9.2", - "@lingui/cli": "^3.14.0", - "@lingui/detect-locale": "^3.14.0", - "@lingui/loader": "^3.14.0", - "@lingui/macro": "^3.14.0", + "@lingui/cli": "^3.17.2", + "@lingui/detect-locale": "^3.17.2", + "@lingui/loader": "^3.17.2", + "@lingui/macro": "^3.17.2", "@storybook/addon-actions": "^6.5.12", "@storybook/addon-controls": "^6.5.12", "@storybook/addon-essentials": "^6.5.12", @@ -196,13 +196,14 @@ } }, "node_modules/@babel/generator": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", - "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz", + "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==", "dev": true, "dependencies": { - "@babel/types": "^7.19.0", + "@babel/types": "^7.21.4", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "engines": { @@ -519,9 +520,9 @@ } }, "node_modules/@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", "dev": true, "engines": { "node": ">=6.9.0" @@ -660,9 +661,9 @@ } }, "node_modules/@babel/parser": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", - "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz", + "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==", "dev": true, "bin": { "parser": "bin/babel-parser.js" @@ -2225,11 +2226,11 @@ } }, "node_modules/@babel/runtime": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz", - "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", + "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", "dependencies": { - "regenerator-runtime": "^0.13.4" + "regenerator-runtime": "^0.13.11" }, "engines": { "node": ">=6.9.0" @@ -2280,13 +2281,13 @@ } }, "node_modules/@babel/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", - "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz", + "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==", "dev": true, "dependencies": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" }, "engines": { @@ -2325,31 +2326,37 @@ "node": ">=0.1.90" } }, - "node_modules/@discoveryjs/json-ext": { - "version": "0.5.7", - "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", - "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "node_modules/@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", "dev": true, + "peer": true, + "dependencies": { + "@jridgewell/trace-mapping": "0.3.9" + }, "engines": { - "node": ">=10.0.0" + "node": ">=12" } }, - "node_modules/@endemolshinegroup/cosmiconfig-typescript-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz", - "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==", + "node_modules/@cspotcode/source-map-support/node_modules/@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", "dev": true, + "peer": true, "dependencies": { - "lodash.get": "^4", - "make-error": "^1", - "ts-node": "^9", - "tslib": "^2" - }, + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + }, + "node_modules/@discoveryjs/json-ext": { + "version": "0.5.7", + "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", + "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", + "dev": true, "engines": { "node": ">=10.0.0" - }, - "peerDependencies": { - "cosmiconfig": ">=6" } }, "node_modules/@eslint/eslintrc": { @@ -3415,13 +3422,13 @@ "dev": true }, "node_modules/@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "dev": true, "dependencies": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "node_modules/@leichtgewicht/ip-codec": { @@ -3431,18 +3438,18 @@ "dev": true }, "node_modules/@lingui/babel-plugin-extract-messages": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.14.0.tgz", - "integrity": "sha512-4lcDgVdjYiObuFdDwnAG3jJxS+d3YLq4i7qywlHgjIqteKUH01S3paJRXhZaPvLGl56HarSq0kt8Pymxw8lOrA==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.17.2.tgz", + "integrity": "sha512-Ovhf8a6dBlIZJFOqk6/+LRgQvSlVMol6hxvnVGLsCr/0xNcKlpGUAJ+bvY6NrmxZubpTvZqNkH23u5nEAdXtfg==", "dev": true, "dependencies": { - "@babel/generator": "^7.11.6", - "@babel/runtime": "^7.11.2", - "@lingui/conf": "^3.14.0", + "@babel/generator": "^7.20.14", + "@babel/runtime": "^7.20.13", + "@lingui/conf": "3.17.2", "mkdirp": "^1.0.4" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" } }, "node_modules/@lingui/babel-plugin-transform-js": { @@ -3474,18 +3481,20 @@ } }, "node_modules/@lingui/cli": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.14.0.tgz", - "integrity": "sha512-QZURsIf7A97tf28b/ffpeL0DekA6tBmcwnj4FBui1SbQqJw1d4IPg2bUM5VRn3/25vhqpi9Uhx5m9x7Vv8QfCQ==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.17.2.tgz", + "integrity": "sha512-8hPZOfwB7KZolZ01diUqtprKva1RNAUUNdzISN9pmAUGw9zCPRY/dlOvM6obZi8v0VC/JKrcadOs4Z8krIS2QQ==", "dev": true, "dependencies": { - "@babel/generator": "^7.11.6", - "@babel/parser": "^7.11.5", - "@babel/plugin-syntax-jsx": "^7.10.4", - "@babel/runtime": "^7.11.2", - "@babel/types": "^7.11.5", - "@lingui/babel-plugin-extract-messages": "^3.14.0", - "@lingui/conf": "^3.14.0", + "@babel/generator": "^7.20.14", + "@babel/parser": "^7.20.15", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/runtime": "^7.20.13", + "@babel/types": "^7.20.7", + "@lingui/babel-plugin-extract-messages": "3.17.2", + "@lingui/conf": "3.17.2", + "@lingui/core": "3.17.2", + "@messageformat/parser": "^5.0.0", "babel-plugin-macros": "^3.0.1", "bcp-47": "^1.0.7", "chalk": "^4.1.0", @@ -3498,7 +3507,6 @@ "glob": "^7.1.4", "inquirer": "^7.3.3", "make-plural": "^6.2.2", - "messageformat-parser": "^4.1.3", "micromatch": "4.0.2", "mkdirp": "^1.0.4", "node-gettext": "^3.0.0", @@ -3512,14 +3520,14 @@ "ramda": "^0.27.1" }, "bin": { - "lingui": "lingui.js" + "lingui": "build/lingui.js" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { "@babel/core": "^7.0.0", - "babel-plugin-macros": "2 || 3", + "babel-plugin-macros": "2 || 3", "typescript": "2 || 3 || 4" } }, @@ -3627,20 +3635,32 @@ } }, "node_modules/@lingui/conf": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.14.0.tgz", - "integrity": "sha512-5GMAbIRad9FavqYsfZCRAwjcOLzE7tONDJe9lSYE5SSJbbG01RI5kR5P0B84DUhTI6cGXau+1dAcP9K+JbEx+g==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.17.2.tgz", + "integrity": "sha512-q3ADfpMYCYMgiu/lrYOOvE3ptxXIqYhA1ozyAq6ynguL8ppqfyaTluLoHfVJVWxnTMI/es9s2W9Kg81QH+nuXQ==", "dev": true, "dependencies": { - "@babel/runtime": "^7.11.2", - "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", + "@babel/runtime": "^7.20.13", "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", + "cosmiconfig": "^8.0.0", + "cosmiconfig-typescript-loader": "^4.3.0", "jest-validate": "^26.5.2", "lodash.get": "^4.4.2" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" + }, + "peerDependencies": { + "ts-node": ">=10", + "typescript": ">=4" + }, + "peerDependenciesMeta": { + "ts-node": { + "optional": true + }, + "typescript": { + "optional": true + } } }, "node_modules/@lingui/conf/node_modules/@jest/types": { @@ -3660,9 +3680,9 @@ } }, "node_modules/@lingui/conf/node_modules/@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "15.0.15", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz", + "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==", "dev": true, "dependencies": { "@types/yargs-parser": "*" @@ -3680,6 +3700,24 @@ "url": "https://github.com/sponsors/sindresorhus" } }, + "node_modules/@lingui/conf/node_modules/cosmiconfig": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz", + "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==", + "dev": true, + "dependencies": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + }, + "engines": { + "node": ">=14" + }, + "funding": { + "url": "https://github.com/sponsors/d-fischer" + } + }, "node_modules/@lingui/conf/node_modules/jest-get-type": { "version": "26.3.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", @@ -3728,65 +3766,64 @@ "dev": true }, "node_modules/@lingui/core": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.14.0.tgz", - "integrity": "sha512-ertREq9oi9B/umxpd/pInm9uFO8FLK2/0FXfDmMqvH5ydswWn/c9nY5YO4W1h4/8LWO45mewypOIyjoue4De1w==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.17.2.tgz", + "integrity": "sha512-YOd068NanznN8lLQqOKPlAY0ill3rrgmiAvPRKuYkrxzJMIHqlIFO/2Kcc/RH5vClOmLfg+wgR4rsHK/kLKelQ==", "dev": true, - "peer": true, "dependencies": { - "@babel/runtime": "^7.11.2", - "make-plural": "^6.2.2", - "messageformat-parser": "^4.1.3" + "@babel/runtime": "^7.20.13", + "@messageformat/parser": "^5.0.0", + "make-plural": "^6.2.2" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" } }, "node_modules/@lingui/detect-locale": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.14.0.tgz", - "integrity": "sha512-IELWULt9I+iyVlxGES21cXoOwTcPSIisElAmr3/KJlqvJ9zXT3s4w4Jxw9j5oHJjdxBDRkifwpnVmGd57wrmzg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.17.2.tgz", + "integrity": "sha512-rqyO16lj05WRfBuppo++mPzB1fQBFDhGqEFz5X97CbWXYp6AadOIkrm+pbn114Y2Yumy9QI7Cm4Ptbfk7CXO3Q==", "dev": true, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" } }, "node_modules/@lingui/loader": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/loader/-/loader-3.14.0.tgz", - "integrity": "sha512-FH14MexRLM8tBgSL1oK5dbaUBbY0P85CSLTNwFqAtFFj8K8wWxfdq4+rIkp/kSD+eggKNDYV4G89N9/3bsm3gQ==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/loader/-/loader-3.17.2.tgz", + "integrity": "sha512-0sZj84y5nyAkDyCKYj3QxhePN1w4egIpUEZANlk3K0o0yo2kJXsmi9pnCeG8Z5/GniuWxF4C/JIJejRn226OmQ==", "dev": true, "dependencies": { - "@babel/runtime": "^7.11.2", - "@lingui/cli": "^3.14.0", - "@lingui/conf": "^3.14.0", - "loader-utils": "^2.0.0", - "ramda": "^0.27.1" + "@babel/runtime": "^7.20.13", + "@lingui/cli": "3.17.2", + "@lingui/conf": "3.17.2", + "loader-utils": "^2.0.0" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { "webpack": "^4.0.0 || ^5.0.0" } }, "node_modules/@lingui/macro": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.14.0.tgz", - "integrity": "sha512-NxTRrhrZ/cUO9PX/4vWys90Ku58+ExxHuE30IuDnnDldWhWlOdycmjDt9tB+yIiUdFym/veSxBs+h114FzG5mA==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.17.2.tgz", + "integrity": "sha512-kk1ZtwYSx5Knu/5LsRGisTqfNoLIeVkJJPn6xjZXcItoxUgRsykyKb3BqCJwxqYUClz4i4A8Ld/aA4xBi4apRQ==", "dev": true, "dependencies": { - "@babel/runtime": "^7.11.2", - "@lingui/conf": "^3.14.0", + "@babel/runtime": "^7.20.13", + "@babel/types": "^7.20.7", + "@lingui/conf": "3.17.2", "ramda": "^0.27.1" }, "engines": { - "node": ">=10.0.0" + "node": ">=14.0.0" }, "peerDependencies": { "@lingui/core": "^3.13.0", "@lingui/react": "^3.13.0", - "babel-plugin-macros": "2 || 3" + "babel-plugin-macros": "2 || 3" } }, "node_modules/@lingui/react": { @@ -3914,6 +3951,15 @@ "url": "https://opencollective.com/unified" } }, + "node_modules/@messageformat/parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.0.0.tgz", + "integrity": "sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==", + "dev": true, + "dependencies": { + "moo": "^0.5.1" + } + }, "node_modules/@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -7734,6 +7780,34 @@ "node": ">=10.13.0" } }, + "node_modules/@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "dev": true, + "peer": true + }, + "node_modules/@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "peer": true + }, + "node_modules/@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "peer": true + }, + "node_modules/@tsconfig/node16": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", + "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", + "dev": true, + "peer": true + }, "node_modules/@types/aria-query": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", @@ -9468,7 +9542,8 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true + "dev": true, + "peer": true }, "node_modules/argparse": { "version": "2.0.1", @@ -12434,6 +12509,22 @@ "node": ">=10" } }, + "node_modules/cosmiconfig-typescript-loader": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", + "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", + "dev": true, + "engines": { + "node": ">=12", + "npm": ">=6" + }, + "peerDependencies": { + "@types/node": "*", + "cosmiconfig": ">=7", + "ts-node": ">=10", + "typescript": ">=3" + } + }, "node_modules/cp-file": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", @@ -12821,7 +12912,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "peer": true }, "node_modules/critters-webpack-plugin": { "version": "2.5.0", @@ -13811,6 +13903,7 @@ "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", "dev": true, + "peer": true, "engines": { "node": ">=0.3.1" } @@ -22650,7 +22743,8 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true + "dev": true, + "peer": true }, "node_modules/make-plural": { "version": "6.2.2", @@ -23013,12 +23107,6 @@ "node": ">= 8" } }, - "node_modules/messageformat-parser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.3.tgz", - "integrity": "sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==", - "dev": true - }, "node_modules/methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -23310,6 +23398,12 @@ "node": ">=10" } }, + "node_modules/moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", + "dev": true + }, "node_modules/move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -28222,9 +28316,9 @@ } }, "node_modules/regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "node_modules/regenerator-transform": { "version": "0.15.0", @@ -31896,39 +31990,57 @@ "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, "node_modules/ts-node": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", - "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", "dev": true, + "peer": true, "dependencies": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.1", "yn": "3.1.1" }, "bin": { "ts-node": "dist/bin.js", + "ts-node-cwd": "dist/bin-cwd.js", + "ts-node-esm": "dist/bin-esm.js", "ts-node-script": "dist/bin-script.js", "ts-node-transpile-only": "dist/bin-transpile.js", "ts-script": "dist/bin-script-deprecated.js" }, - "engines": { - "node": ">=10.0.0" - }, "peerDependencies": { + "@swc/core": ">=1.2.50", + "@swc/wasm": ">=1.2.50", + "@types/node": "*", "typescript": ">=2.7" + }, + "peerDependenciesMeta": { + "@swc/core": { + "optional": true + }, + "@swc/wasm": { + "optional": true + } } }, - "node_modules/ts-node/node_modules/source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "node_modules/ts-node/node_modules/acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true, - "dependencies": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" + "peer": true, + "engines": { + "node": ">=0.4.0" } }, "node_modules/ts-pnp": { @@ -32745,6 +32857,13 @@ "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==", "dev": true }, + "node_modules/v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "peer": true + }, "node_modules/v8-to-istanbul": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", @@ -34823,6 +34942,7 @@ "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", "dev": true, + "peer": true, "engines": { "node": ">=6" } @@ -34939,13 +35059,14 @@ } }, "@babel/generator": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.19.0.tgz", - "integrity": "sha512-S1ahxf1gZ2dpoiFgA+ohK9DIpz50bJ0CWs7Zlzb54Z4sG8qmdIrGrVqmy1sAtTVRb+9CU6U8VqT9L0Zj7hxHVg==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/generator/-/generator-7.21.4.tgz", + "integrity": "sha512-NieM3pVIYW2SwGzKoqfPrQsf4xGs9M9AIG3ThppsSRmO+m7eQhmI6amajKMUeIO37wFfsvnvcxQFx6x6iqxDnA==", "dev": true, "requires": { - "@babel/types": "^7.19.0", + "@babel/types": "^7.21.4", "@jridgewell/gen-mapping": "^0.3.2", + "@jridgewell/trace-mapping": "^0.3.17", "jsesc": "^2.5.1" }, "dependencies": { @@ -35184,9 +35305,9 @@ } }, "@babel/helper-string-parser": { - "version": "7.18.10", - "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.18.10.tgz", - "integrity": "sha512-XtIfWmeNY3i4t7t4D2t02q50HvqHybPqW2ki1kosnvWCwuCMeo81Jf0gwr85jy/neUdg5XDdeFE/80DXiO+njw==", + "version": "7.19.4", + "resolved": "https://registry.npmjs.org/@babel/helper-string-parser/-/helper-string-parser-7.19.4.tgz", + "integrity": "sha512-nHtDoQcuqFmwYNYPz3Rah5ph2p8PFeFCsZk9A/48dPc/rGocJ5J3hAAZ7pb76VWX3fZKu+uEr/FhH5jLx7umrw==", "dev": true }, "@babel/helper-validator-identifier": { @@ -35294,9 +35415,9 @@ } }, "@babel/parser": { - "version": "7.19.1", - "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.19.1.tgz", - "integrity": "sha512-h7RCSorm1DdTVGJf3P2Mhj3kdnkmF/EiysUkzS2TdgAYqyjFdMQJbVuXOBej2SBJaXan/lIVtT6KkGbyyq753A==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/parser/-/parser-7.21.4.tgz", + "integrity": "sha512-alVJj7k7zIxqBZ7BTRhz0IqJFxW1VJbm6N8JbcYhQ186df9ZBPbZBmWSqAMXwHGsCJdYks7z/voa3ibiS5bCIw==", "dev": true }, "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": { @@ -36346,11 +36467,11 @@ } }, "@babel/runtime": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.19.0.tgz", - "integrity": "sha512-eR8Lo9hnDS7tqkO7NsV+mKvCmv5boaXFSZ70DnfhcgiEne8hv9oCEd36Klw74EtizEqLsy4YnW8UWwpBVolHZA==", + "version": "7.21.0", + "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.21.0.tgz", + "integrity": "sha512-xwII0//EObnq89Ji5AKYQaRYiW/nZ3llSv29d49IuxPhKbtJoLP+9QUUZ4nVragQVtaVGeZrpB+ZtG/Pdy/POw==", "requires": { - "regenerator-runtime": "^0.13.4" + "regenerator-runtime": "^0.13.11" } }, "@babel/template": { @@ -36391,13 +36512,13 @@ } }, "@babel/types": { - "version": "7.19.0", - "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.19.0.tgz", - "integrity": "sha512-YuGopBq3ke25BVSiS6fgF49Ul9gH1x70Bcr6bqRLjWCkcX8Hre1/5+z+IiWOIerRMSSEfGZVB9z9kyq7wVs9YA==", + "version": "7.21.4", + "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.21.4.tgz", + "integrity": "sha512-rU2oY501qDxE8Pyo7i/Orqma4ziCOrby0/9mvbDUGEfvZjb279Nk9k19e2fiCxHbRRpY2ZyrgW1eq22mvmOIzA==", "dev": true, "requires": { - "@babel/helper-string-parser": "^7.18.10", - "@babel/helper-validator-identifier": "^7.18.6", + "@babel/helper-string-parser": "^7.19.4", + "@babel/helper-validator-identifier": "^7.19.1", "to-fast-properties": "^2.0.0" } }, @@ -36424,24 +36545,35 @@ "dev": true, "optional": true }, + "@cspotcode/source-map-support": { + "version": "0.8.1", + "resolved": "https://registry.npmjs.org/@cspotcode/source-map-support/-/source-map-support-0.8.1.tgz", + "integrity": "sha512-IchNf6dN4tHoMFIn/7OE8LWZ19Y6q/67Bmf6vnGREv8RSbBVb9LPJxEcnwrcwX6ixSvaiGoomAUvu4YSxXrVgw==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/trace-mapping": "0.3.9" + }, + "dependencies": { + "@jridgewell/trace-mapping": { + "version": "0.3.9", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.9.tgz", + "integrity": "sha512-3Belt6tdc8bPgAtbcmdtNJlirVoTmEb5e2gC94PnkwEW9jI6CAHUeoG85tjWP5WquqfavoMtMwiG4P926ZKKuQ==", + "dev": true, + "peer": true, + "requires": { + "@jridgewell/resolve-uri": "^3.0.3", + "@jridgewell/sourcemap-codec": "^1.4.10" + } + } + } + }, "@discoveryjs/json-ext": { "version": "0.5.7", "resolved": "https://registry.npmjs.org/@discoveryjs/json-ext/-/json-ext-0.5.7.tgz", "integrity": "sha512-dBVuXR082gk3jsFp7Rd/JI4kytwGHecnCoTtXFb7DB6CNHp4rg5k1bhg0nWdLGLnOV71lmDzGQaLMy8iPLY0pw==", "dev": true }, - "@endemolshinegroup/cosmiconfig-typescript-loader": { - "version": "3.0.2", - "resolved": "https://registry.npmjs.org/@endemolshinegroup/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-3.0.2.tgz", - "integrity": "sha512-QRVtqJuS1mcT56oHpVegkKBlgtWjXw/gHNWO3eL9oyB5Sc7HBoc2OLG/nYpVfT/Jejvo3NUrD0Udk7XgoyDKkA==", - "dev": true, - "requires": { - "lodash.get": "^4", - "make-error": "^1", - "ts-node": "^9", - "tslib": "^2" - } - }, "@eslint/eslintrc": { "version": "1.3.2", "resolved": "https://registry.npmjs.org/@eslint/eslintrc/-/eslintrc-1.3.2.tgz", @@ -37309,13 +37441,13 @@ "dev": true }, "@jridgewell/trace-mapping": { - "version": "0.3.15", - "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.15.tgz", - "integrity": "sha512-oWZNOULl+UbhsgB51uuZzglikfIKSUBO/M9W2OfEjn7cmqoAiCgmv9lyACTUacZwBz0ITnJ2NqjU8Tx0DHL88g==", + "version": "0.3.17", + "resolved": "https://registry.npmjs.org/@jridgewell/trace-mapping/-/trace-mapping-0.3.17.tgz", + "integrity": "sha512-MCNzAp77qzKca9+W/+I0+sEpaUnZoeasnghNeVc41VZCEKaCH73Vq3BZZ/SzWIgrqE4H4ceI+p+b6C0mHf9T4g==", "dev": true, "requires": { - "@jridgewell/resolve-uri": "^3.0.3", - "@jridgewell/sourcemap-codec": "^1.4.10" + "@jridgewell/resolve-uri": "3.1.0", + "@jridgewell/sourcemap-codec": "1.4.14" } }, "@leichtgewicht/ip-codec": { @@ -37325,14 +37457,14 @@ "dev": true }, "@lingui/babel-plugin-extract-messages": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.14.0.tgz", - "integrity": "sha512-4lcDgVdjYiObuFdDwnAG3jJxS+d3YLq4i7qywlHgjIqteKUH01S3paJRXhZaPvLGl56HarSq0kt8Pymxw8lOrA==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/babel-plugin-extract-messages/-/babel-plugin-extract-messages-3.17.2.tgz", + "integrity": "sha512-Ovhf8a6dBlIZJFOqk6/+LRgQvSlVMol6hxvnVGLsCr/0xNcKlpGUAJ+bvY6NrmxZubpTvZqNkH23u5nEAdXtfg==", "dev": true, "requires": { - "@babel/generator": "^7.11.6", - "@babel/runtime": "^7.11.2", - "@lingui/conf": "^3.14.0", + "@babel/generator": "^7.20.14", + "@babel/runtime": "^7.20.13", + "@lingui/conf": "3.17.2", "mkdirp": "^1.0.4" } }, @@ -37359,18 +37491,20 @@ } }, "@lingui/cli": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.14.0.tgz", - "integrity": "sha512-QZURsIf7A97tf28b/ffpeL0DekA6tBmcwnj4FBui1SbQqJw1d4IPg2bUM5VRn3/25vhqpi9Uhx5m9x7Vv8QfCQ==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/cli/-/cli-3.17.2.tgz", + "integrity": "sha512-8hPZOfwB7KZolZ01diUqtprKva1RNAUUNdzISN9pmAUGw9zCPRY/dlOvM6obZi8v0VC/JKrcadOs4Z8krIS2QQ==", "dev": true, "requires": { - "@babel/generator": "^7.11.6", - "@babel/parser": "^7.11.5", - "@babel/plugin-syntax-jsx": "^7.10.4", - "@babel/runtime": "^7.11.2", - "@babel/types": "^7.11.5", - "@lingui/babel-plugin-extract-messages": "^3.14.0", - "@lingui/conf": "^3.14.0", + "@babel/generator": "^7.20.14", + "@babel/parser": "^7.20.15", + "@babel/plugin-syntax-jsx": "^7.18.6", + "@babel/runtime": "^7.20.13", + "@babel/types": "^7.20.7", + "@lingui/babel-plugin-extract-messages": "3.17.2", + "@lingui/conf": "3.17.2", + "@lingui/core": "3.17.2", + "@messageformat/parser": "^5.0.0", "babel-plugin-macros": "^3.0.1", "bcp-47": "^1.0.7", "chalk": "^4.1.0", @@ -37383,7 +37517,6 @@ "glob": "^7.1.4", "inquirer": "^7.3.3", "make-plural": "^6.2.2", - "messageformat-parser": "^4.1.3", "micromatch": "4.0.2", "mkdirp": "^1.0.4", "node-gettext": "^3.0.0", @@ -37478,15 +37611,15 @@ } }, "@lingui/conf": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.14.0.tgz", - "integrity": "sha512-5GMAbIRad9FavqYsfZCRAwjcOLzE7tONDJe9lSYE5SSJbbG01RI5kR5P0B84DUhTI6cGXau+1dAcP9K+JbEx+g==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/conf/-/conf-3.17.2.tgz", + "integrity": "sha512-q3ADfpMYCYMgiu/lrYOOvE3ptxXIqYhA1ozyAq6ynguL8ppqfyaTluLoHfVJVWxnTMI/es9s2W9Kg81QH+nuXQ==", "dev": true, "requires": { - "@babel/runtime": "^7.11.2", - "@endemolshinegroup/cosmiconfig-typescript-loader": "^3.0.2", + "@babel/runtime": "^7.20.13", "chalk": "^4.1.0", - "cosmiconfig": "^7.0.0", + "cosmiconfig": "^8.0.0", + "cosmiconfig-typescript-loader": "^4.3.0", "jest-validate": "^26.5.2", "lodash.get": "^4.4.2" }, @@ -37505,9 +37638,9 @@ } }, "@types/yargs": { - "version": "15.0.14", - "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.14.tgz", - "integrity": "sha512-yEJzHoxf6SyQGhBhIYGXQDSCkJjB6HohDShto7m8vaKg9Yp0Yn8+71J9eakh2bnPg6BfsH9PRMhiRTZnd4eXGQ==", + "version": "15.0.15", + "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.15.tgz", + "integrity": "sha512-IziEYMU9XoVj8hWg7k+UJrXALkGFjWJhn5QFEv9q4p+v40oZhSuC135M38st8XPjICL7Ey4TV64ferBGUoJhBg==", "dev": true, "requires": { "@types/yargs-parser": "*" @@ -37519,6 +37652,18 @@ "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==", "dev": true }, + "cosmiconfig": { + "version": "8.1.3", + "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-8.1.3.tgz", + "integrity": "sha512-/UkO2JKI18b5jVMJUp0lvKFMpa/Gye+ZgZjKD+DGEN9y7NRcf/nK1A0sp67ONmKtnDCNMS44E6jrk0Yc3bDuUw==", + "dev": true, + "requires": { + "import-fresh": "^3.2.1", + "js-yaml": "^4.1.0", + "parse-json": "^5.0.0", + "path-type": "^4.0.0" + } + }, "jest-get-type": { "version": "26.3.0", "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-26.3.0.tgz", @@ -37560,44 +37705,43 @@ } }, "@lingui/core": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.14.0.tgz", - "integrity": "sha512-ertREq9oi9B/umxpd/pInm9uFO8FLK2/0FXfDmMqvH5ydswWn/c9nY5YO4W1h4/8LWO45mewypOIyjoue4De1w==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/core/-/core-3.17.2.tgz", + "integrity": "sha512-YOd068NanznN8lLQqOKPlAY0ill3rrgmiAvPRKuYkrxzJMIHqlIFO/2Kcc/RH5vClOmLfg+wgR4rsHK/kLKelQ==", "dev": true, - "peer": true, "requires": { - "@babel/runtime": "^7.11.2", - "make-plural": "^6.2.2", - "messageformat-parser": "^4.1.3" + "@babel/runtime": "^7.20.13", + "@messageformat/parser": "^5.0.0", + "make-plural": "^6.2.2" } }, "@lingui/detect-locale": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.14.0.tgz", - "integrity": "sha512-IELWULt9I+iyVlxGES21cXoOwTcPSIisElAmr3/KJlqvJ9zXT3s4w4Jxw9j5oHJjdxBDRkifwpnVmGd57wrmzg==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/detect-locale/-/detect-locale-3.17.2.tgz", + "integrity": "sha512-rqyO16lj05WRfBuppo++mPzB1fQBFDhGqEFz5X97CbWXYp6AadOIkrm+pbn114Y2Yumy9QI7Cm4Ptbfk7CXO3Q==", "dev": true }, "@lingui/loader": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/loader/-/loader-3.14.0.tgz", - "integrity": "sha512-FH14MexRLM8tBgSL1oK5dbaUBbY0P85CSLTNwFqAtFFj8K8wWxfdq4+rIkp/kSD+eggKNDYV4G89N9/3bsm3gQ==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/loader/-/loader-3.17.2.tgz", + "integrity": "sha512-0sZj84y5nyAkDyCKYj3QxhePN1w4egIpUEZANlk3K0o0yo2kJXsmi9pnCeG8Z5/GniuWxF4C/JIJejRn226OmQ==", "dev": true, "requires": { - "@babel/runtime": "^7.11.2", - "@lingui/cli": "^3.14.0", - "@lingui/conf": "^3.14.0", - "loader-utils": "^2.0.0", - "ramda": "^0.27.1" + "@babel/runtime": "^7.20.13", + "@lingui/cli": "3.17.2", + "@lingui/conf": "3.17.2", + "loader-utils": "^2.0.0" } }, "@lingui/macro": { - "version": "3.14.0", - "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.14.0.tgz", - "integrity": "sha512-NxTRrhrZ/cUO9PX/4vWys90Ku58+ExxHuE30IuDnnDldWhWlOdycmjDt9tB+yIiUdFym/veSxBs+h114FzG5mA==", + "version": "3.17.2", + "resolved": "https://registry.npmjs.org/@lingui/macro/-/macro-3.17.2.tgz", + "integrity": "sha512-kk1ZtwYSx5Knu/5LsRGisTqfNoLIeVkJJPn6xjZXcItoxUgRsykyKb3BqCJwxqYUClz4i4A8Ld/aA4xBi4apRQ==", "dev": true, "requires": { - "@babel/runtime": "^7.11.2", - "@lingui/conf": "^3.14.0", + "@babel/runtime": "^7.20.13", + "@babel/types": "^7.20.7", + "@lingui/conf": "3.17.2", "ramda": "^0.27.1" } }, @@ -37698,6 +37842,15 @@ "integrity": "sha512-H1rQc1ZOHANWBvPcW+JpGwr+juXSxM8Q8YCkm3GhZd8REu1fHR3z99CErO1p9pkcfcxZnMdIZdIsXkOHY0NilA==", "dev": true }, + "@messageformat/parser": { + "version": "5.0.0", + "resolved": "https://registry.npmjs.org/@messageformat/parser/-/parser-5.0.0.tgz", + "integrity": "sha512-WiDKhi8F0zQaFU8cXgqq69eYFarCnTVxKcvhAONufKf0oUxbqLMW6JX6rV4Hqh+BEQWGyKKKHY4g1XA6bCLylA==", + "dev": true, + "requires": { + "moo": "^0.5.1" + } + }, "@mrmlnc/readdir-enhanced": { "version": "2.2.1", "resolved": "https://registry.npmjs.org/@mrmlnc/readdir-enhanced/-/readdir-enhanced-2.2.1.tgz", @@ -40405,6 +40558,34 @@ "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==", "dev": true }, + "@tsconfig/node10": { + "version": "1.0.9", + "resolved": "https://registry.npmjs.org/@tsconfig/node10/-/node10-1.0.9.tgz", + "integrity": "sha512-jNsYVVxU8v5g43Erja32laIDHXeoNvFEpX33OK4d6hljo3jDhCBDhx5dhCCTMWUojscpAagGiRkBKxpdl9fxqA==", + "dev": true, + "peer": true + }, + "@tsconfig/node12": { + "version": "1.0.11", + "resolved": "https://registry.npmjs.org/@tsconfig/node12/-/node12-1.0.11.tgz", + "integrity": "sha512-cqefuRsh12pWyGsIoBKJA9luFu3mRxCA+ORZvA4ktLSzIuCUtWVxGIuXigEwO5/ywWFMZ2QEGKWvkZG1zDMTag==", + "dev": true, + "peer": true + }, + "@tsconfig/node14": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node14/-/node14-1.0.3.tgz", + "integrity": "sha512-ysT8mhdixWK6Hw3i1V2AeRqZ5WfXg1G43mqoYlM2nc6388Fq5jcXyr5mRsqViLx/GJYdoL0bfXD8nmF+Zn/Iow==", + "dev": true, + "peer": true + }, + "@tsconfig/node16": { + "version": "1.0.3", + "resolved": "https://registry.npmjs.org/@tsconfig/node16/-/node16-1.0.3.tgz", + "integrity": "sha512-yOlFc+7UtL/89t2ZhjPvvB/DeAr3r+Dq58IgzsFkOAvVC6NMJXmCGjbptdXdR9qsX7pKcTL+s87FtYREi2dEEQ==", + "dev": true, + "peer": true + }, "@types/aria-query": { "version": "4.2.2", "resolved": "https://registry.npmjs.org/@types/aria-query/-/aria-query-4.2.2.tgz", @@ -41823,7 +42004,8 @@ "version": "4.1.3", "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.3.tgz", "integrity": "sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==", - "dev": true + "dev": true, + "peer": true }, "argparse": { "version": "2.0.1", @@ -44149,6 +44331,13 @@ "yaml": "^1.10.0" } }, + "cosmiconfig-typescript-loader": { + "version": "4.3.0", + "resolved": "https://registry.npmjs.org/cosmiconfig-typescript-loader/-/cosmiconfig-typescript-loader-4.3.0.tgz", + "integrity": "sha512-NTxV1MFfZDLPiBMjxbHRwSh5LaLcPMwNdCutmnHJCKoVnlvldPWlllonKwrsRJ5pYZBIBGRWWU2tfvzxgeSW5Q==", + "dev": true, + "requires": {} + }, "cp-file": { "version": "7.0.0", "resolved": "https://registry.npmjs.org/cp-file/-/cp-file-7.0.0.tgz", @@ -44472,7 +44661,8 @@ "version": "1.1.1", "resolved": "https://registry.npmjs.org/create-require/-/create-require-1.1.1.tgz", "integrity": "sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==", - "dev": true + "dev": true, + "peer": true }, "critters-webpack-plugin": { "version": "2.5.0", @@ -45247,7 +45437,8 @@ "version": "4.0.2", "resolved": "https://registry.npmjs.org/diff/-/diff-4.0.2.tgz", "integrity": "sha512-58lmxKSA4BNyLz+HHMUzlOEpg09FV+ev6ZMe3vJihgdxzgcwZ8VoEEPmALCZG9LmqfVoNMMKpttIYTVG6uDY7A==", - "dev": true + "dev": true, + "peer": true }, "diff-sequences": { "version": "29.0.0", @@ -52176,7 +52367,8 @@ "version": "1.3.6", "resolved": "https://registry.npmjs.org/make-error/-/make-error-1.3.6.tgz", "integrity": "sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==", - "dev": true + "dev": true, + "peer": true }, "make-plural": { "version": "6.2.2", @@ -52475,12 +52667,6 @@ "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==", "dev": true }, - "messageformat-parser": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/messageformat-parser/-/messageformat-parser-4.1.3.tgz", - "integrity": "sha512-2fU3XDCanRqeOCkn7R5zW5VQHWf+T3hH65SzuqRvjatBK7r4uyFa5mEX+k6F9Bd04LVM5G4/BHBTUJsOdW7uyg==", - "dev": true - }, "methods": { "version": "1.1.2", "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz", @@ -52699,6 +52885,12 @@ "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==", "dev": true }, + "moo": { + "version": "0.5.2", + "resolved": "https://registry.npmjs.org/moo/-/moo-0.5.2.tgz", + "integrity": "sha512-iSAJLHYKnX41mKcJKjqvnAN9sf0LMDTXDEvFv+ffuRR9a1MIuXLjMNL6EsnDHSkKLTWNqQQ5uo61P4EbU4NU+Q==", + "dev": true + }, "move-concurrently": { "version": "1.0.1", "resolved": "https://registry.npmjs.org/move-concurrently/-/move-concurrently-1.0.1.tgz", @@ -56442,9 +56634,9 @@ } }, "regenerator-runtime": { - "version": "0.13.9", - "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz", - "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==" + "version": "0.13.11", + "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.11.tgz", + "integrity": "sha512-kY1AZVr2Ra+t+piVaJ4gxaFaReZVH40AKNo7UCX6W+dEwBo/2oZJzqfuN1qLq1oL45o56cPaTXELwrTh8Fpggg==" }, "regenerator-transform": { "version": "0.15.0", @@ -59394,28 +59586,33 @@ "integrity": "sha512-Z86EW+fFFh/IFB1fqQ3/+7Zpf9t2ebOAxNI/V6Wo7r5gqiqtxmgTlQ1qbqQcjLKYeSHPTsEmvlJUDg/EuL0uHQ==" }, "ts-node": { - "version": "9.1.1", - "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-9.1.1.tgz", - "integrity": "sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==", + "version": "10.9.1", + "resolved": "https://registry.npmjs.org/ts-node/-/ts-node-10.9.1.tgz", + "integrity": "sha512-NtVysVPkxxrwFGUUxGYhfux8k78pQB3JqYBXlLRZgdGUqTO5wU/UyHop5p70iEbGhB7q5KmiZiU0Y3KlJrScEw==", "dev": true, + "peer": true, "requires": { + "@cspotcode/source-map-support": "^0.8.0", + "@tsconfig/node10": "^1.0.7", + "@tsconfig/node12": "^1.0.7", + "@tsconfig/node14": "^1.0.0", + "@tsconfig/node16": "^1.0.2", + "acorn": "^8.4.1", + "acorn-walk": "^8.1.1", "arg": "^4.1.0", "create-require": "^1.1.0", "diff": "^4.0.1", "make-error": "^1.1.1", - "source-map-support": "^0.5.17", + "v8-compile-cache-lib": "^3.0.1", "yn": "3.1.1" }, "dependencies": { - "source-map-support": { - "version": "0.5.21", - "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz", - "integrity": "sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==", + "acorn-walk": { + "version": "8.2.0", + "resolved": "https://registry.npmjs.org/acorn-walk/-/acorn-walk-8.2.0.tgz", + "integrity": "sha512-k+iyHEuPgSw6SbuDpGQM+06HQUa04DZ3o+F6CSzXMvvI5KMvnaEqXe+YVe555R9nn6GPt404fos4wcgpw12SDA==", "dev": true, - "requires": { - "buffer-from": "^1.0.0", - "source-map": "^0.6.0" - } + "peer": true } } }, @@ -60027,6 +60224,13 @@ "integrity": "sha512-dsNgbLaTrd6l3MMxTtouOCFw4CBFc/3a+GgYA2YyrJvyQ1u6q4pcu3ktLoUZ/VN/Aw9WsauazbgsgdfVWgAKQg==", "dev": true }, + "v8-compile-cache-lib": { + "version": "3.0.1", + "resolved": "https://registry.npmjs.org/v8-compile-cache-lib/-/v8-compile-cache-lib-3.0.1.tgz", + "integrity": "sha512-wa7YjyUGfNZngI/vtK0UHAN+lgDCxBPCylVXGp0zu59Fz5aiGtNXaq3DhIov063MorB+VfufLh3JlF2KdTK3xg==", + "dev": true, + "peer": true + }, "v8-to-istanbul": { "version": "8.1.1", "resolved": "https://registry.npmjs.org/v8-to-istanbul/-/v8-to-istanbul-8.1.1.tgz", @@ -61699,7 +61903,8 @@ "version": "3.1.1", "resolved": "https://registry.npmjs.org/yn/-/yn-3.1.1.tgz", "integrity": "sha512-Ux4ygGWsu2c7isFWe8Yu1YluJmqVhxqK2cLXNQA5AcC3QfbGNpM7fu0Y8b/z16pXLnFxZYvWhd3fhBY9DLmC6Q==", - "dev": true + "dev": true, + "peer": true }, "yocto-queue": { "version": "0.1.0", diff --git a/package.json b/package.json index 5efaa670..1f99dcd8 100644 --- a/package.json +++ b/package.json @@ -31,10 +31,10 @@ "devDependencies": { "@babel/preset-react": "^7.18.6", "@lingui/babel-preset-react": "^2.9.2", - "@lingui/cli": "^3.14.0", - "@lingui/detect-locale": "^3.14.0", - "@lingui/loader": "^3.14.0", - "@lingui/macro": "^3.14.0", + "@lingui/cli": "^3.17.2", + "@lingui/detect-locale": "^3.17.2", + "@lingui/loader": "^3.17.2", + "@lingui/macro": "^3.17.2", "@storybook/addon-actions": "^6.5.12", "@storybook/addon-controls": "^6.5.12", "@storybook/addon-essentials": "^6.5.12", diff --git a/plugins/lime-plugin-rx/src/components/components.tsx b/plugins/lime-plugin-rx/src/components/components.tsx index 05905eae..88f740cd 100644 --- a/plugins/lime-plugin-rx/src/components/components.tsx +++ b/plugins/lime-plugin-rx/src/components/components.tsx @@ -13,7 +13,9 @@ export const SectionTitle: FunctionalComponent = ({ }) => { return (
+ {/*@ts-ignore*/} {icon} + {/*@ts-ignore*/}

{children}

); diff --git a/plugins/lime-plugin-rx/src/components/internetPathChart.tsx b/plugins/lime-plugin-rx/src/components/internetPathChart.tsx index 9a113764..70f5b621 100644 --- a/plugins/lime-plugin-rx/src/components/internetPathChart.tsx +++ b/plugins/lime-plugin-rx/src/components/internetPathChart.tsx @@ -54,7 +54,7 @@ interface CircleProps { key?: number; ip: string; index: number; - text: string; + text: any; // type error with Trans component internet?: boolean; isLoading?: boolean; className?: string; @@ -103,7 +103,9 @@ const Circle = ({ y={textSpacingY(index)} className={className} > - {text} {isLoading && } + <> + {text} {isLoading && } + ); @@ -185,6 +187,8 @@ const InternetLastHop = ({ const { y1, y2 } = calcLinePositionByIndex(index - 1); + const internetText = Internet; + return ( <> Internet} + text={internetText} internet={true} /> diff --git a/plugins/lime-plugin-rx/src/components/internetStatus.tsx b/plugins/lime-plugin-rx/src/components/internetStatus.tsx index 26a8c6b5..cf85d897 100644 --- a/plugins/lime-plugin-rx/src/components/internetStatus.tsx +++ b/plugins/lime-plugin-rx/src/components/internetStatus.tsx @@ -12,8 +12,8 @@ export const InternetStatus = ({ data }: { data: IGetInternetStatus }) => { const loadiIconClass = "h-10 w-10 stroke-disabled"; return ( -
-

+
+

Internet
@@ -24,7 +24,7 @@ export const InternetStatus = ({ data }: { data: IGetInternetStatus }) => { if (key !== "status") { return (
@@ -44,7 +44,7 @@ export const InternetStatus = ({ data }: { data: IGetInternetStatus }) => { dataTestId={`internet-status-${key}`} /> )} -
+
{key}
diff --git a/plugins/lime-plugin-rx/src/sections/alignment.tsx b/plugins/lime-plugin-rx/src/sections/alignment.tsx index 17a03f3b..83fb487f 100644 --- a/plugins/lime-plugin-rx/src/sections/alignment.tsx +++ b/plugins/lime-plugin-rx/src/sections/alignment.tsx @@ -59,7 +59,7 @@ export const AlignmentCard = ({ status }: { status: StatusResponse }) => { {bathost && bathost.hostname ? ( {stripIface(bathost.hostname)} ) : ( - + Fetching name )} diff --git a/plugins/lime-plugin-rx/src/sections/internetPath.tsx b/plugins/lime-plugin-rx/src/sections/internetPath.tsx index bb17d172..60c56b56 100644 --- a/plugins/lime-plugin-rx/src/sections/internetPath.tsx +++ b/plugins/lime-plugin-rx/src/sections/internetPath.tsx @@ -81,7 +81,7 @@ export const InternetPath = () => {
) : ( - + )} diff --git a/src/components/elements/button.tsx b/src/components/elements/button.tsx index 1407c571..b417dc36 100644 --- a/src/components/elements/button.tsx +++ b/src/components/elements/button.tsx @@ -1,6 +1,6 @@ interface ButtonProps { onClick?: () => void; - children?: string; + children?: any; // type error with Trans component size?: "sm" | "md" | "lg"; color?: "primary" | "secondary"; href?: string; @@ -40,13 +40,8 @@ export const Button = ({ const cls = `cursor-pointer text-white font-semibold rounded-xl text-center place-content-center justify-center border-0 ${sizeClasses} ${colorClasses}`; const Btn = () => ( -
+ // @ts-ignore +
{children}
); diff --git a/src/components/icons/SvgIcon.tsx b/src/components/icons/SvgIcon.tsx index be5aae94..1d01c418 100644 --- a/src/components/icons/SvgIcon.tsx +++ b/src/components/icons/SvgIcon.tsx @@ -8,7 +8,8 @@ export interface IconProps { } interface SvgIconProps { - children?: VNode; + // children?: VNode; + children?: any; // Type 'VNode<{}>' is not assignable to type 'ReactNode'. viewBox?: string; } diff --git a/src/utils/test_utils.js b/src/utils/test_utils.js index ce859c3b..dc6e0846 100644 --- a/src/utils/test_utils.js +++ b/src/utils/test_utils.js @@ -1,3 +1,4 @@ +// @ts-nocheck import { i18n } from "@lingui/core"; // import i18n, { dynamicActivate } from '../i18n'; import { I18nProvider } from "@lingui/react";