From 1dec411dd342ca2001d8a276bd4076d1b89a59fe Mon Sep 17 00:00:00 2001 From: moonrailgun Date: Sun, 14 Apr 2024 21:00:26 +0800 Subject: [PATCH] chore: upgrade i18next-toolkit and ant design icons, and update translation --- pnpm-lock.yaml | 74 +++++++++---------- src/client/components/ui/button.tsx | 2 +- src/client/package.json | 4 +- src/client/public/locales/de/translation.json | 10 +-- src/client/public/locales/fr/translation.json | 4 +- src/client/public/locales/ru/translation.json | 2 +- 6 files changed, 48 insertions(+), 48 deletions(-) diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml index 930b3db..9b100bd 100644 --- a/pnpm-lock.yaml +++ b/pnpm-lock.yaml @@ -87,10 +87,10 @@ importers: dependencies: '@ant-design/charts': specifier: ^1.4.2 - version: 1.4.2(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) + version: 1.4.2(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) '@ant-design/icons': - specifier: ^5.2.6 - version: 5.2.6(react-dom@18.2.0)(react@18.2.0) + specifier: ^5.3.6 + version: 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/l7': specifier: ^2.20.14 version: 2.20.14 @@ -294,8 +294,8 @@ importers: version: 4.4.1(@types/react@18.2.78)(react@18.2.0) devDependencies: '@i18next-toolkit/cli': - specifier: ^1.1.0 - version: 1.1.0(typescript@5.2.2) + specifier: ^1.2.0 + version: 1.2.0(typescript@5.2.2) '@tanstack/router-vite-plugin': specifier: ^1.20.5 version: 1.20.5 @@ -820,7 +820,7 @@ packages: '@jridgewell/gen-mapping': 0.3.5 '@jridgewell/trace-mapping': 0.3.25 - /@ant-design/charts@1.4.2(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): + /@ant-design/charts@1.4.2(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-BcVx6AAnwxSdzAVUZReSuvUVtnT5AkJivq3wmcYj17scll26HHficg35yimGskAj3Gu1upYjBQBz6Tk7GEMJsQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -829,9 +829,9 @@ packages: react: '>=16.8.4' react-dom: '>=16.8.4' dependencies: - '@ant-design/flowchart': 1.2.2(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) + '@ant-design/flowchart': 1.2.2(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) '@ant-design/graphs': 1.4.1(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/maps': 1.0.8(react-dom@18.2.0)(react@18.2.0) '@ant-design/plots': 1.2.6(react-dom@18.2.0)(react@18.2.0) antd: 5.13.1(react-dom@18.2.0)(react@18.2.0) @@ -891,7 +891,7 @@ packages: stylis: 4.3.0 dev: false - /@ant-design/flowchart@1.2.2(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): + /@ant-design/flowchart@1.2.2(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-bzHZ81qqHjWIrXcCMInDB6eMTzbswaVCOAdUTCQJ+B45aybkVsU9LMCKquyOwRM7U7PWNfPC9S/lAlx2i2BvBQ==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -900,12 +900,12 @@ packages: react: '>=16.8.4' react-dom: '>=16.8.4' dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/layout': 0.1.31 '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.13.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow': 1.1.52(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) + '@antv/xflow': 1.1.52(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) antd: 5.13.1(react-dom@18.2.0)(react@18.2.0) lodash: 4.17.21 react: 18.2.0 @@ -933,36 +933,36 @@ packages: react-dom: 18.2.0(react@18.2.0) dev: false - /@ant-design/icons-svg@4.3.1: - resolution: {integrity: sha512-4QBZg8ccyC6LPIRii7A0bZUk3+lEDCLnhB+FVsflGdcWPPmV+j3fire4AwwoqHV/BibgvBmR9ZIo4s867smv+g==} + /@ant-design/icons-svg@4.4.2: + resolution: {integrity: sha512-vHbT+zJEVzllwP+CM+ul7reTEfBR0vgxFe7+lREAsAA7YGsYpboiq2sQNeQeRvh09GfQgs/GyFEvZpJ9cLXpXA==} dev: false - /@ant-design/icons@5.2.6(react-dom@17.0.2)(react@17.0.2): - resolution: {integrity: sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==} + /@ant-design/icons@5.3.6(react-dom@17.0.2)(react@17.0.2): + resolution: {integrity: sha512-JeWsgNjvkTTC73YDPgWOgdScRku/iHN9JU0qk39OSEmJSCiRghQMLlxGTCY5ovbRRoXjxHXnUKgQEgBDnQfKmA==} engines: {node: '>=8'} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: '@ant-design/colors': 7.0.2 - '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.23.8 + '@ant-design/icons-svg': 4.4.2 + '@babel/runtime': 7.24.0 classnames: 2.5.1 rc-util: 5.38.1(react-dom@17.0.2)(react@17.0.2) react: 17.0.2 react-dom: 17.0.2(react@17.0.2) dev: false - /@ant-design/icons@5.2.6(react-dom@18.2.0)(react@18.2.0): - resolution: {integrity: sha512-4wn0WShF43TrggskBJPRqCD0fcHbzTYjnaoskdiJrVHg86yxoZ8ZUqsXvyn4WUqehRiFKnaclOhqk9w4Ui2KVw==} + /@ant-design/icons@5.3.6(react-dom@18.2.0)(react@18.2.0): + resolution: {integrity: sha512-JeWsgNjvkTTC73YDPgWOgdScRku/iHN9JU0qk39OSEmJSCiRghQMLlxGTCY5ovbRRoXjxHXnUKgQEgBDnQfKmA==} engines: {node: '>=8'} peerDependencies: react: '>=16.0.0' react-dom: '>=16.0.0' dependencies: '@ant-design/colors': 7.0.2 - '@ant-design/icons-svg': 4.3.1 - '@babel/runtime': 7.23.8 + '@ant-design/icons-svg': 4.4.2 + '@babel/runtime': 7.24.0 classnames: 2.5.1 rc-util: 5.38.1(react-dom@18.2.0)(react@18.2.0) react: 18.2.0 @@ -1725,7 +1725,7 @@ packages: utility-types: 3.10.0 dev: false - /@antv/xflow-core@1.1.52(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0): + /@antv/xflow-core@1.1.52(@ant-design/icons@5.3.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0): resolution: {integrity: sha512-62CZeOLMXvDpKOqbq/8zoDt7MUjOkGh9dKBDbxL744UgZCN5Fx4SE+qRhK5purGixTq35XzZ+b9G5wdAX4rLjw==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -1737,7 +1737,7 @@ packages: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.13.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) @@ -1754,7 +1754,7 @@ packages: rxjs: 6.6.7 dev: false - /@antv/xflow-extension@1.1.52(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): + /@antv/xflow-extension@1.1.52(@ant-design/icons@5.3.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-pPpx00xwucAkl5+QyxxWiOaRpKGnu0Z1+IDUEYuDvEKxms7+Ml0nDc4+CnDi1e1wr4hB3QgxgLOb0JpUTgBCfg==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -1767,11 +1767,11 @@ packages: react-dom: ^16.8.0 || ^17.0.0 reflect-metadata: ^0.1.13 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.13.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-core': 1.1.52(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) + '@antv/xflow-core': 1.1.52(@ant-design/icons@5.3.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) '@antv/xflow-hook': 1.0.52 antd: 5.13.1(react-dom@18.2.0)(react@18.2.0) classnames: 2.5.1 @@ -1798,7 +1798,7 @@ packages: toposort: 2.0.2 dev: false - /@antv/xflow@1.1.52(@ant-design/icons@5.2.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): + /@antv/xflow@1.1.52(@ant-design/icons@5.3.6)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14): resolution: {integrity: sha512-B2IApV4vG2DmMubbfXGjE+oKi2eXvPuijdHhbxwQheIWcm+VtVQscaFvwUexb4CHH5tBSnjtUeKrhRIkXop70w==} peerDependencies: '@ant-design/icons': ^4.6.0 @@ -1807,13 +1807,13 @@ packages: react: ^16.8.0 || ^17.0.0 react-dom: ^16.8.0 || ^17.0.0 dependencies: - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@antv/layout': 0.1.31 '@antv/x6': 1.35.0 '@antv/x6-react-components': 1.1.20(antd@5.13.1)(react-dom@18.2.0)(react@18.2.0) '@antv/x6-react-shape': 1.6.5(@antv/x6@1.35.0)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-core': 1.1.52(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) - '@antv/xflow-extension': 1.1.52(@ant-design/icons@5.2.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) + '@antv/xflow-core': 1.1.52(@ant-design/icons@5.3.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0) + '@antv/xflow-extension': 1.1.52(@ant-design/icons@5.3.6)(@antv/x6-react-components@1.1.20)(@antv/x6-react-shape@1.6.5)(@antv/x6@1.35.0)(antd@5.13.1)(classnames@2.5.1)(lodash@4.17.21)(react-dom@18.2.0)(react@18.2.0)(reflect-metadata@0.1.14) '@antv/xflow-hook': 1.1.52 antd: 5.13.1(react-dom@18.2.0)(react@18.2.0) lodash: 4.17.21 @@ -6325,11 +6325,11 @@ packages: engines: {node: '>=10.13.0'} dev: true - /@i18next-toolkit/cli@1.1.0(typescript@5.2.2): - resolution: {integrity: sha512-Pcz+rC6STHtj/RPj5vzWCXsltvQTvznoAm3mzOeGCXpInflCmjavNu+Cd5ZX7kzvht5TMkUikad63twlvu1+tA==} + /@i18next-toolkit/cli@1.2.0(typescript@5.2.2): + resolution: {integrity: sha512-9ATvUvZqxM/yKj1pfu2PBQf5fxViwF/bendzQrXygnMo53Ss3HZnnH5XKsFlMcSaPJ3FDlWYeXsNivPqocvASA==} hasBin: true dependencies: - '@i18next-toolkit/extractor': 1.0.2 + '@i18next-toolkit/extractor': 1.1.0 '@i18next-toolkit/scanner': 1.0.0 '@langchain/core': 0.1.52 '@langchain/openai': 0.0.24 @@ -6345,8 +6345,8 @@ packages: - typescript dev: true - /@i18next-toolkit/extractor@1.0.2: - resolution: {integrity: sha512-7InNW87Dzyyh2/OibFyPL+HDLp+b6AT2O5LaanApxDIuy19Ih6oyjCnk3Z6Dc4HxSlh0M21GUukxMHF5dwOTng==} + /@i18next-toolkit/extractor@1.1.0: + resolution: {integrity: sha512-USq83a1XKKCRGqlaKBoNRuCImD1IDFCHMgDHs9686v3IpZ2wQdj/e11+cPaGX1UIjndZKULdQq4b0aZJyMrBfg==} dependencies: crc: 4.3.2 esbuild: 0.20.1 @@ -10996,7 +10996,7 @@ packages: dependencies: '@ant-design/colors': 7.0.2 '@ant-design/cssinjs': 1.18.2(react-dom@17.0.2)(react@17.0.2) - '@ant-design/icons': 5.2.6(react-dom@17.0.2)(react@17.0.2) + '@ant-design/icons': 5.3.6(react-dom@17.0.2)(react@17.0.2) '@ant-design/react-slick': 1.0.2(react@17.0.2) '@babel/runtime': 7.23.8 '@ctrl/tinycolor': 3.6.1 @@ -11058,7 +11058,7 @@ packages: dependencies: '@ant-design/colors': 7.0.2 '@ant-design/cssinjs': 1.18.2(react-dom@18.2.0)(react@18.2.0) - '@ant-design/icons': 5.2.6(react-dom@18.2.0)(react@18.2.0) + '@ant-design/icons': 5.3.6(react-dom@18.2.0)(react@18.2.0) '@ant-design/react-slick': 1.0.2(react@18.2.0) '@ctrl/tinycolor': 3.6.1 '@rc-component/color-picker': 1.5.1(react-dom@18.2.0)(react@18.2.0) diff --git a/src/client/components/ui/button.tsx b/src/client/components/ui/button.tsx index 1203563..5bff94c 100644 --- a/src/client/components/ui/button.tsx +++ b/src/client/components/ui/button.tsx @@ -63,7 +63,7 @@ const Button = React.forwardRef( const Comp = asChild ? Slot : 'button'; const icon = Icon ? ( - + ) : undefined; const children = ( <> diff --git a/src/client/package.json b/src/client/package.json index 38da36f..9994934 100644 --- a/src/client/package.json +++ b/src/client/package.json @@ -18,7 +18,7 @@ "author": "moonrailgun ", "dependencies": { "@ant-design/charts": "^1.4.2", - "@ant-design/icons": "^5.2.6", + "@ant-design/icons": "^5.3.6", "@antv/l7": "^2.20.14", "@antv/larkmap": "^1.4.13", "@hookform/resolvers": "^3.3.4", @@ -88,7 +88,7 @@ "zustand": "^4.4.1" }, "devDependencies": { - "@i18next-toolkit/cli": "^1.1.0", + "@i18next-toolkit/cli": "^1.2.0", "@tanstack/router-vite-plugin": "^1.20.5", "@types/leaflet": "^1.9.8", "@types/loadable__component": "^5.13.8", diff --git a/src/client/public/locales/de/translation.json b/src/client/public/locales/de/translation.json index de46c02..37634ac 100644 --- a/src/client/public/locales/de/translation.json +++ b/src/client/public/locales/de/translation.json @@ -20,7 +20,7 @@ "k1bd89236": "Reporter mit ausführen", "k1c33c293": "Einstellungen", "k1eb5b3ed": "Übersicht", - "k20edf271": "24h", + "k20edf271": "24 Stunden", "k21077124": "Bearbeiten", "k2264aac": "Dieses Jahr", "k246063be": "Chat-ID", @@ -42,7 +42,7 @@ "k310fee": "Letzte 30 Tage", "k32344f64": "Daten löschen", "k3260f019": "Abmelden", - "k340547f0": "Sorry, but something went wrong", + "k340547f0": "Entschuldigung, aber etwas ist schief gelaufen", "k3471e956": "Neues Passwort wiederholen", "k3542f88c": "Telemetrie-Name: {{name}} | Ereignisse: {{num}}", "k3834d1a6": "Seite hinzufügen", @@ -67,7 +67,7 @@ "k48186ce": "Zurück zur Startseite", "k4905ed7b": "KEINE", "k490ada32": "Website hinzufügen", - "k49e5f1d2": "1w", + "k49e5f1d2": "1 Woche", "k4a369f75": "Es wird die relevanten Daten dauerhaft löschen", "k4ac4dd36": "Verweisende Seiten", "k4de48e75": "Maximale Wiederholungen", @@ -128,7 +128,7 @@ "k89056082": "(30 Tage)", "k89d54f7a": "Überwachung der Ausführungszählung", "k8a44833f": "Dienste", - "k8bac6ae0": "6h", + "k8bac6ae0": "6 Stunden", "k8ef56a20": "Maximale Wiederholungen, bevor der Dienst als ausgefallen markiert wird und eine Benachrichtigung gesendet wird", "k8f8fbf6": "Teilen mit...", "k8ff3a55a": "Warnung", @@ -253,7 +253,7 @@ "kf55495e0": "Speichern", "kf5bbb568": "Besucherkarte von", "kf6bc1610": "Monitortyp", - "kf6db9ea5": "3h", + "kf6db9ea5": "3 Stunden", "kf7878d19": "Website-Übersicht", "kf7d5dbf8": "Mehr lesen", "kf85b9b7d": "Befehl eingeben oder suchen...", diff --git a/src/client/public/locales/fr/translation.json b/src/client/public/locales/fr/translation.json index 490b722..05d4201 100644 --- a/src/client/public/locales/fr/translation.json +++ b/src/client/public/locales/fr/translation.json @@ -42,7 +42,7 @@ "k310fee": "30 derniers jours", "k32344f64": "Effacer les données", "k3260f019": "Déconnexion", - "k340547f0": "Sorry, but something went wrong", + "k340547f0": "Désolé, mais quelque chose s'est mal passé", "k3471e956": "Répéter le nouveau mot de passe", "k3542f88c": "Nom de la télémétrie: {{name}} | événements: {{num}}", "k3834d1a6": "Ajouter une page", @@ -209,7 +209,7 @@ "kd031b383": "Vues", "kd1f7e695": "Confirmer la déconnexion", "kd211e2d4": "Page des versions", - "kd3262a4a": "Config", + "kd3262a4a": "Configuration", "kd3396544": "Généralement, nous utiliserons une image vide d'un pixel de sorte qu'elle n'affecte pas l'utilisation normale de l'utilisateur.", "kd37efb26": "Notifications", "kd46ab159": "Aucun événement", diff --git a/src/client/public/locales/ru/translation.json b/src/client/public/locales/ru/translation.json index 26a2962..ae05b14 100644 --- a/src/client/public/locales/ru/translation.json +++ b/src/client/public/locales/ru/translation.json @@ -42,7 +42,7 @@ "k310fee": "Последние 30 дней", "k32344f64": "Очистить данные", "k3260f019": "Выйти", - "k340547f0": "Sorry, but something went wrong", + "k340547f0": "Извините, но что-то пошло не так", "k3471e956": "Повтор нового пароля", "k3542f88c": "Название телеметрии: {{name}} | события: {{num}}", "k3834d1a6": "Добавить страницу",