From f769bbbe42a61ba195a8e19ad14085ce8d9e9470 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 29 Nov 2024 10:17:22 +0100 Subject: [PATCH 1/4] additonal step to build web --- scripts/update_all.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/update_all.sh b/scripts/update_all.sh index a4117cdee..ea0dc4dff 100644 --- a/scripts/update_all.sh +++ b/scripts/update_all.sh @@ -5,6 +5,7 @@ # as well as GNUMake (make) and python3 cd interface +rm -rf yarn.lock node_modules ncu -u yarn set version stable yarn @@ -12,11 +13,16 @@ yarn format yarn lint cd ../mock-api +rm -rf yarn.lock node_modules ncu -u yarn set version stable yarn yarn format +cd .. +cd interface +yarn build; yarn webUI + cd .. npx cspell "**" From 1e5bc9dcc5069a94283d6df41a8b984764203b43 Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 29 Nov 2024 10:17:36 +0100 Subject: [PATCH 2/4] update versions to 3.7.1 stable --- mock-api/rest_server.ts | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/mock-api/rest_server.ts b/mock-api/rest_server.ts index b75473c63..fb477e5ab 100644 --- a/mock-api/rest_server.ts +++ b/mock-api/rest_server.ts @@ -33,9 +33,9 @@ let VERSION_IS_UPGRADEABLE; // Versions // default - on latest stable, no upgrades -let THIS_VERSION = '3.7.0'; -let LATEST_STABLE_VERSION = '3.7.0'; -let LATEST_DEV_VERSION = '3.7.1-dev.1'; +let THIS_VERSION = '3.7.1'; +let LATEST_STABLE_VERSION = '3.7.1'; +let LATEST_DEV_VERSION = '3.7.2-dev.1'; // scenarios for testing, overriding the default const version_test = 0; @@ -48,23 +48,23 @@ switch (version_test as number) { break; case 1: // on latest dev, no update - THIS_VERSION = '3.7.1-dev.12'; - LATEST_STABLE_VERSION = '3.7.0'; - LATEST_DEV_VERSION = '3.7.1-dev.12'; + THIS_VERSION = '3.7.2-dev.12'; + LATEST_STABLE_VERSION = '3.7.1'; + LATEST_DEV_VERSION = '3.7.2-dev.12'; VERSION_IS_UPGRADEABLE = false; break; case 2: // upgrade stable to latest stable THIS_VERSION = '3.6.5'; - LATEST_STABLE_VERSION = '3.7.0'; - LATEST_DEV_VERSION = '3.7.1-dev.12'; + LATEST_STABLE_VERSION = '3.7.1'; + LATEST_DEV_VERSION = '3.7.2-dev.12'; VERSION_IS_UPGRADEABLE = true; break; case 3: // upgrade dev to latest dev - THIS_VERSION = '3.7.0-dev-1'; - LATEST_STABLE_VERSION = '3.7.0'; - LATEST_DEV_VERSION = '3.7.1-dev.12'; + THIS_VERSION = '3.7.1-dev-1'; + LATEST_STABLE_VERSION = '3.7.1'; + LATEST_DEV_VERSION = '3.7.2-dev.12'; VERSION_IS_UPGRADEABLE = true; break; } From 321187d0d25afdce830197d3e7d8c7ad6e13d87f Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 29 Nov 2024 10:17:47 +0100 Subject: [PATCH 3/4] update unity test responses --- test/test_api/test_api.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/test_api/test_api.h b/test/test_api/test_api.h index dc78d37ec..0d6ff3ef4 100644 --- a/test/test_api/test_api.h +++ b/test/test_api/test_api.h @@ -159,7 +159,7 @@ void test_19() { "[{\"system\":{\"version\":\"dev\",\"uptime\":\"000+00:00:00.000\",\"uptimeSec\":0,\"resetReason\":\"Unknown / " "Unknown\"},\"network\":{\"network\":\"WiFi\",\"hostname\":\"ems-esp\",\"RSSI\":-23,\"TxPowerSetting\":0,\"staticIP\":false,\"lowBandwidth\":false," "\"disableSleep\":true,\"enableMDNS\":true,\"enableCORS\":false},\"ntp\":{},\"mqtt\":{\"MQTTStatus\":\"disconnected\",\"MQTTPublishes\":0," - "\"MQTTQueued\":0,\"MQTTPublishFails\":0,\"MQTTConnects\":1,\"enabled\":true,\"clientID\":\"ems-esp\",\"keepAlive\":60,\"cleanSession\":false," + "\"MQTTQueued\":0,\"MQTTPublishFails\":0,\"MQTTReconnects\":0,\"enabled\":true,\"clientID\":\"ems-esp\",\"keepAlive\":60,\"cleanSession\":false," "\"entityFormat\":1,\"base\":\"ems-esp\",\"discoveryPrefix\":\"homeassistant\",\"discoveryType\":0,\"nestedFormat\":1,\"haEnabled\":true,\"mqttQos\":0," "\"mqttRetain\":false,\"publishTimeHeartbeat\":60,\"publishTimeBoiler\":10,\"publishTimeThermostat\":10,\"publishTimeSolar\":10,\"publishTimeMixer\":" "10,\"publishTimeWater\":0,\"publishTimeOther\":10,\"publishTimeSensor\":10,\"publishSingle\":false,\"publish2command\":false,\"sendResponse\":false}," @@ -185,7 +185,7 @@ void test_20() { "[{\"system\":{\"version\":\"dev\",\"uptime\":\"000+00:00:00.000\",\"uptimeSec\":0,\"resetReason\":\"Unknown / " "Unknown\"},\"network\":{\"network\":\"WiFi\",\"hostname\":\"ems-esp\",\"RSSI\":-23,\"TxPowerSetting\":0,\"staticIP\":false,\"lowBandwidth\":false," "\"disableSleep\":true,\"enableMDNS\":true,\"enableCORS\":false},\"ntp\":{},\"mqtt\":{\"MQTTStatus\":\"disconnected\",\"MQTTPublishes\":0," - "\"MQTTQueued\":0,\"MQTTPublishFails\":0,\"MQTTConnects\":1,\"enabled\":true,\"clientID\":\"ems-esp\",\"keepAlive\":60,\"cleanSession\":false," + "\"MQTTQueued\":0,\"MQTTPublishFails\":0,\"MQTTReconnects\":0,\"enabled\":true,\"clientID\":\"ems-esp\",\"keepAlive\":60,\"cleanSession\":false," "\"entityFormat\":1,\"base\":\"ems-esp\",\"discoveryPrefix\":\"homeassistant\",\"discoveryType\":0,\"nestedFormat\":1,\"haEnabled\":true,\"mqttQos\":0," "\"mqttRetain\":false,\"publishTimeHeartbeat\":60,\"publishTimeBoiler\":10,\"publishTimeThermostat\":10,\"publishTimeSolar\":10,\"publishTimeMixer\":" "10,\"publishTimeWater\":0,\"publishTimeOther\":10,\"publishTimeSensor\":10,\"publishSingle\":false,\"publish2command\":false,\"sendResponse\":false}," From be0aba1b599fe0bd6e229242c1632fe8a4a0561d Mon Sep 17 00:00:00 2001 From: proddy Date: Fri, 29 Nov 2024 10:17:54 +0100 Subject: [PATCH 4/4] cleaned lock file --- interface/yarn.lock | 48 +++++++++++++++------------------------------ 1 file changed, 16 insertions(+), 32 deletions(-) diff --git a/interface/yarn.lock b/interface/yarn.lock index a1bf3b973..95a02d8db 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -1447,16 +1447,7 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:*": - version: 22.9.3 - resolution: "@types/node@npm:22.9.3" - dependencies: - undici-types: "npm:~6.19.8" - checksum: 10c0/954ec72bf29436ea62425a9563914a9c1e93f97b18194acd51d74d13998a701977547ed2985ed3a0e97211b785436d28377116e5f613bfcf3182d9bd81d784dc - languageName: node - linkType: hard - -"@types/node@npm:^22.10.1": +"@types/node@npm:*, @types/node@npm:^22.10.1": version: 22.10.1 resolution: "@types/node@npm:22.10.1" dependencies: @@ -2111,9 +2102,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001669": - version: 1.0.30001683 - resolution: "caniuse-lite@npm:1.0.30001683" - checksum: 10c0/0ca7f4f2fbd0c71fde5a14ca2e29bb1dcb84c095d7a3d88e47371e062f276f1dc31da3f10931ec134ef7fb096259c0d67c9ffb843a9ec4a040a85eb2fea0bdec + version: 1.0.30001684 + resolution: "caniuse-lite@npm:1.0.30001684" + checksum: 10c0/446485ca3d9caf408a339a44636a86a2b119ec247492393ae661cd93dccd6668401dd2dfec1e149be4e44563cd1e23351b44453a52fa2c2f19e2bf3287c865f6 languageName: node linkType: hard @@ -2701,9 +2692,9 @@ __metadata: linkType: hard "electron-to-chromium@npm:^1.5.41": - version: 1.5.64 - resolution: "electron-to-chromium@npm:1.5.64" - checksum: 10c0/331c2160cc37ef85317b44f2078af8ff16f068fc95d4af2210fe943b567f20b1445a7faa40c05d290bc229102ef1b662371464ba2725d10ff6c8543af6d40adf + version: 1.5.67 + resolution: "electron-to-chromium@npm:1.5.67" + checksum: 10c0/bcd21c3961267fd733973586045a38d41f697e6821e7624cdd39d48fd744d9bd93ec7db59abbafeb464861218b959a920892cfaa719bff4441d1d49f8dcdff94 languageName: node linkType: hard @@ -5030,11 +5021,11 @@ __metadata: linkType: hard "nanoid@npm:^3.3.7": - version: 3.3.7 - resolution: "nanoid@npm:3.3.7" + version: 3.3.8 + resolution: "nanoid@npm:3.3.8" bin: nanoid: bin/nanoid.cjs - checksum: 10c0/e3fb661aa083454f40500473bb69eedb85dc160e763150b9a2c567c7e9ff560ce028a9f833123b618a6ea742e311138b591910e795614a629029e86e180660f3 + checksum: 10c0/4b1bb29f6cfebf3be3bc4ad1f1296fb0a10a3043a79f34fbffe75d1621b4318319211cd420549459018ea3592f0d2f159247a6f874911d6d26eaaadda2478120 languageName: node linkType: hard @@ -6173,9 +6164,9 @@ __metadata: linkType: hard "shell-quote@npm:^1.8.1": - version: 1.8.1 - resolution: "shell-quote@npm:1.8.1" - checksum: 10c0/8cec6fd827bad74d0a49347057d40dfea1e01f12a6123bf82c4649f3ef152fc2bc6d6176e6376bffcd205d9d0ccb4f1f9acae889384d20baff92186f01ea455a + version: 1.8.2 + resolution: "shell-quote@npm:1.8.2" + checksum: 10c0/85fdd44f2ad76e723d34eb72c753f04d847ab64e9f1f10677e3f518d0e5b0752a176fd805297b30bb8c3a1556ebe6e77d2288dbd7b7b0110c7e941e9e9c20ce1 languageName: node linkType: hard @@ -6678,11 +6669,11 @@ __metadata: linkType: hard "ts-api-utils@npm:^1.3.0": - version: 1.4.0 - resolution: "ts-api-utils@npm:1.4.0" + version: 1.4.3 + resolution: "ts-api-utils@npm:1.4.3" peerDependencies: typescript: ">=4.2.0" - checksum: 10c0/1b2bfa50ea52771d564bb143bb69010d25cda03ed573095fbac9b86f717012426443af6647e00e3db70fca60360482a30c1be7cf73c3521c321f6bf5e3594ea0 + checksum: 10c0/e65dc6e7e8141140c23e1dc94984bf995d4f6801919c71d6dc27cf0cd51b100a91ffcfe5217626193e5bea9d46831e8586febdc7e172df3f1091a7384299e23a languageName: node linkType: hard @@ -6796,13 +6787,6 @@ __metadata: languageName: node linkType: hard -"undici-types@npm:~6.19.8": - version: 6.19.8 - resolution: "undici-types@npm:6.19.8" - checksum: 10c0/078afa5990fba110f6824823ace86073b4638f1d5112ee26e790155f481f2a868cc3e0615505b6f4282bdf74a3d8caad715fd809e870c2bb0704e3ea6082f344 - languageName: node - linkType: hard - "undici-types@npm:~6.20.0": version: 6.20.0 resolution: "undici-types@npm:6.20.0"