From e53dcb77686cd2aba04d971182c98c1c027313f4 Mon Sep 17 00:00:00 2001 From: Ticktock Depbot Date: Thu, 12 Jun 2025 14:10:31 +0000 Subject: [PATCH 1/3] chore(deps): update dependency @sveltejs/kit to v2.21.4 --- yarn.lock | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 2394570..5c3a5f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -894,9 +894,7 @@ integrity sha512-YaDrquRpZwfcXbnlDsSrBQNCChVOT9MGuSg+dMAyfsAa1SmiAhrA5jUYUiIMC59G92kIbY/AaQOWcBdq+lh+zg== "@sveltejs/kit@^2.0.0": - version "2.20.8" - resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-2.20.8.tgz#c4cb1487ec765bfd7c3d1d06f45164d5edbc4d90" - integrity sha512-ep9qTxL7WALhfm0kFecL3VHeuNew8IccbYGqv5TqL/KSqWRKzEgDG8blNlIu1CkLTTua/kHjI+f5T8eCmWIxKw== + version "2.21.4" dependencies: "@types/cookie" "^0.6.0" cookie "^0.6.0" From f5a9133cabfbab82325275575545c12f7aacf8f2 Mon Sep 17 00:00:00 2001 From: Djuri Baars Date: Thu, 12 Jun 2025 16:18:24 +0200 Subject: [PATCH 2/3] feat: Add warning when there is a mismatch between WebUI and firmware --- src/lib/locales/de.json | 3 ++- src/lib/locales/en.json | 3 ++- src/lib/locales/es.json | 3 ++- src/lib/locales/nl.json | 3 ++- src/routes/Control.svelte | 8 +++++++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/src/lib/locales/de.json b/src/lib/locales/de.json index 7521927..6671619 100644 --- a/src/lib/locales/de.json +++ b/src/lib/locales/de.json @@ -89,7 +89,8 @@ "hostname": "Hostname", "frontlight": "Displaybeleuchtung", "turnOn": "Einschalten", - "flashFrontlight": "Blinken" + "flashFrontlight": "Blinken", + "fwCommitMismatch": "Die Firmware -Version unterscheidet sich von der WebUI -Version, dies kann zu Problemen führen." }, "status": { "title": "Status", diff --git a/src/lib/locales/en.json b/src/lib/locales/en.json index 9b84e4f..40476d8 100644 --- a/src/lib/locales/en.json +++ b/src/lib/locales/en.json @@ -108,7 +108,8 @@ "turnOn": "Turn on", "flashFrontlight": "Flash", "firmwareUpdate": "Firmware update", - "fwCommit": "Firmware commit" + "fwCommit": "Firmware commit", + "fwCommitMismatch": "The firmware version is different from the WebUI version, this might cause problems. " }, "status": { "title": "Status", diff --git a/src/lib/locales/es.json b/src/lib/locales/es.json index d4f4d32..e9edba5 100644 --- a/src/lib/locales/es.json +++ b/src/lib/locales/es.json @@ -88,7 +88,8 @@ "hostname": "Nombre del host", "turnOn": "Encender", "frontlight": "Luz de la pantalla", - "flashFrontlight": "Luz intermitente" + "flashFrontlight": "Luz intermitente", + "fwCommitMismatch": "La versión de firmware es diferente de la versión WebUI, esto podría causar problemas." }, "status": { "memoryFree": "Memoria RAM libre", diff --git a/src/lib/locales/nl.json b/src/lib/locales/nl.json index d7d9016..8b6bd64 100644 --- a/src/lib/locales/nl.json +++ b/src/lib/locales/nl.json @@ -79,7 +79,8 @@ "title": "Besturing", "frontlight": "Displaylicht", "turnOn": "Aanzetten", - "flashFrontlight": "Knipper" + "flashFrontlight": "Knipper", + "fwCommitMismatch": "De firmwareversie verschilt van de WebUI -versie, dit kan problemen veroorzaken." }, "status": { "title": "Status", diff --git a/src/routes/Control.svelte b/src/routes/Control.svelte index fc3d76e..c4e96c1 100644 --- a/src/routes/Control.svelte +++ b/src/routes/Control.svelte @@ -13,7 +13,8 @@ Form, Input, Label, - Row + Row, + Alert } from '@sveltestrap/sveltestrap'; import FirmwareUpdater from './FirmwareUpdater.svelte'; import { uiSettings } from '$lib/uiSettings'; @@ -226,6 +227,11 @@
  • WebUI commit:
  • {$_('section.control.hostname')}:
    • + {#if $settings.gitRev != $settings.fsRev} + + ⚠️ {$_('warning')}: {$_('section.control.fwCommitMismatch')} + + {/if}