Merge pull request #3154 from proddy/core3

core3 updates

interface/package.json

@@ -19,25 +19,25 @@
     "typesafe-i18n": "typesafe-i18n --no-watch",
     "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js",
     "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'",
-    "lint": "typesafe-i18n --no-watch && eslint . --fix",
+    "lint": "eslint . --fix",
     "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\""
   },
   "dependencies": {
     "@alova/adapter-xhr": "2.3.1",
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@mui/icons-material": "^9.1.1",
+    "@mui/icons-material": "^9.2.0",
-    "@mui/material": "^9.1.2",
+    "@mui/material": "^9.2.0",
     "@table-library/react-table-library": "4.1.15",
     "alova": "^3.5.1",
     "etag": "^1.8.1",
     "jwt-decode": "^4.0.0",
     "mime-types": "^3.0.2",
-    "preact": "^10.29.3",
+    "preact": "^10.29.7",
     "react": "^19.2.7",
     "react-dom": "^19.2.7",
-    "react-icons": "^5.6.0",
+    "react-icons": "^5.7.0",
-    "react-router": "^8.0.1",
+    "react-router": "^8.2.0",
     "typesafe-i18n": "^5.27.1",
     "typescript": "^6.0.3"
   },
@@ -45,18 +45,18 @@
     "@eslint/js": "^10.0.1",
     "@preact/preset-vite": "^2.10.5",
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
-    "@types/node": "^26.0.1",
+    "@types/node": "^26.1.1",
     "@types/react": "^19.2.17",
     "@types/react-dom": "^19.2.3",
     "concurrently": "^10.0.3",
     "eslint": "^10.6.0",
     "eslint-config-prettier": "^10.1.8",
-    "prettier": "^3.9.0",
+    "prettier": "^3.9.5",
     "rollup-plugin-visualizer": "^7.0.1",
-    "terser": "^5.48.0",
+    "terser": "^5.49.0",
-    "typescript-eslint": "^8.62.0",
+    "typescript-eslint": "^8.63.0",
-    "vite": "^8.1.0",
+    "vite": "^8.1.4",
     "vite-plugin-imagemin": "^0.6.1"
   },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b"
+  "packageManager": "pnpm@11.11.0+sha512.4463f65fd80ed80d69bc1d4bf163ee94f605c7380fc318bb5b2ebe15f8cd12d49c51a4d59e951b401e764d3b6ca751cbf51bc50ed7001a6bcb4935e684c34882"
 }

interface/pnpm-workspace.yaml

@@ -10,3 +10,13 @@ minimumReleaseAgeExclude:
   - '@types/node@25.9.2'
   - '@types/react@19.2.17'
   - react-router@8.0.1
+overrides:
+  # pin browserslist to one exact version so `pnpm update` can't re-resolve it to a
+  # newer release it then fails to link (spurious "Failed to create bin ... ENOENT")
+  browserslist: 4.28.5
+updateConfig:
+  # typesafe-i18n / typescript-eslint rely on the classic compiler API that the
+  # native TS 7 rewrite removes. TS 6.x still has it, so stay on 6.x by excluding
+  # typescript from `pnpm update --latest` (which would otherwise jump it to 7).
+  ignoreDependencies:
+    - typescript

mock-api/package.json

@@ -13,7 +13,7 @@
     "@trivago/prettier-plugin-sort-imports": "^6.0.2",
     "formidable": "^3.5.4",
     "itty-router": "^5.0.24",
-    "prettier": "^3.9.0"
+    "prettier": "^3.9.5"
   },
-  "packageManager": "pnpm@11.9.0+sha512.bd682d5d03fe525ef7c9fd6780c6884d1e756ac4c9c9fe00c538782824310dcf90e3ddc4f53835f06dfaebd5085e41855e0bcbb3b60de2ac5bbab89e5036f03b"
+  "packageManager": "pnpm@11.11.0+sha512.4463f65fd80ed80d69bc1d4bf163ee94f605c7380fc318bb5b2ebe15f8cd12d49c51a4d59e951b401e764d3b6ca751cbf51bc50ed7001a6bcb4935e684c34882"
 }

mock-api/pnpm-lock.yaml

@@ -13,7 +13,7 @@ importers:
         version: 3.1.3
       '@trivago/prettier-plugin-sort-imports':
         specifier: ^6.0.2
-        version: 6.0.2(prettier@3.9.0)
+        version: 6.0.2(prettier@3.9.5)
       formidable:
         specifier: ^3.5.4
         version: 3.5.4
@@ -21,8 +21,8 @@ importers:
         specifier: ^5.0.24
         version: 5.0.24
       prettier:
-        specifier: ^3.9.0
+        specifier: ^3.9.5
-        version: 3.9.0
+        version: 3.9.5
 
 packages:
 
@@ -112,8 +112,8 @@ packages:
   balanced-match@1.0.2:
     resolution: {integrity: sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==}
 
-  brace-expansion@2.1.1:
+  brace-expansion@2.1.2:
-    resolution: {integrity: sha512-WR1cURNjuvBLMZBMbqM0UoE+WAfdUcEV1ccD8PVBVOI+Z3ND4+SZbN8RsfT2bMuG1qwz5RFvPukSZm5fF2D5eA==}
+    resolution: {integrity: sha512-w5JZcKgdhDOgOwm8H+KgbosopHMuGcl6qbulwjtz3SM7I7P3yW1eAjzMPLrIE+NQ9vjgANKHWeMHnrT0OXW1oA==}
 
   debug@4.4.3:
     resolution: {integrity: sha512-RGwwWnwQvkVfavKVt22FGLw+xYSdzARwm0ru6DhTVA3umU5hZc28V3kO4stgYryrTlLpuvgI9GiijltAjNbcqA==}
@@ -167,8 +167,8 @@ packages:
   picocolors@1.1.1:
     resolution: {integrity: sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA==}
 
-  prettier@3.9.0:
+  prettier@3.9.5:
-    resolution: {integrity: sha512-LjIqSIC5VYLzs9WedVmJ2ljNAGnU+DteIClbahu4L/DBeWjZ6iT/k1lAYyu9JUh+1xINxWadaPw/Pl63y/agAw==}
+    resolution: {integrity: sha512-/FVl766LpUfB5vXgCYOYa0MeV/441Ia99AeICQIQFTY/Nw0roZwULcXpku5i1/m5kt/baz+s4Zogspd839HSMg==}
     engines: {node: '>=14'}
     hasBin: true
 
@@ -246,7 +246,7 @@ snapshots:
     dependencies:
       '@noble/hashes': 1.8.0
 
-  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.9.0)':
+  '@trivago/prettier-plugin-sort-imports@6.0.2(prettier@3.9.5)':
     dependencies:
       '@babel/generator': 7.29.7
       '@babel/parser': 7.29.7
@@ -256,7 +256,7 @@ snapshots:
       lodash-es: 4.18.1
       minimatch: 9.0.9
       parse-imports-exports: 0.2.4
-      prettier: 3.9.0
+      prettier: 3.9.5
     transitivePeerDependencies:
       - supports-color
 
@@ -264,7 +264,7 @@ snapshots:
 
   balanced-match@1.0.2: {}
 
-  brace-expansion@2.1.1:
+  brace-expansion@2.1.2:
     dependencies:
       balanced-match: 1.0.2
 
@@ -295,7 +295,7 @@ snapshots:
 
   minimatch@9.0.9:
     dependencies:
-      brace-expansion: 2.1.1
+      brace-expansion: 2.1.2
 
   ms@2.1.3: {}
 
@@ -311,6 +311,6 @@ snapshots:
 
   picocolors@1.1.1: {}
 
-  prettier@3.9.0: {}
+  prettier@3.9.5: {}
 
   wrappy@1.0.2: {}

platformio.ini

@@ -90,7 +90,7 @@ board_build.littlefs_version = 2.0
 lib_deps =
   bblanchon/ArduinoJson @ 7.4.3
   ESP32Async/AsyncTCP @ 3.4.10
-  ESP32Async/ESPAsyncWebServer @ 3.11.1
+  ESP32Async/ESPAsyncWebServer @ 3.11.2
   https://github.com/mobizt/ReadyMail.git @ 0.4.2
   https://github.com/mobizt/ESP_SSLClient.git @ 3.1.3
   ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8

scripts/update_all.sh

@@ -3,25 +3,25 @@
 # run from root folder, like `sh ./scripts/update_all.sh`
 # as well as GNUMake (make) and python3
 
+# abort on first error so a failed lint/build isn't silently swallowed
+set -e
+
 cd interface
 rm -rf node_modules
 corepack use pnpm@latest
-pnpm update --latest
+pnpm update
 pnpm install
 pnpm format
 pnpm lint
+pnpm build-webUI
 
 cd ../mock-api
 rm -rf node_modules
 corepack use pnpm@latest
-pnpm update --latest
+pnpm update
 pnpm install
 pnpm format
 
-cd ..
-cd interface
-pnpm build-webUI
-
 cd ..
 npx cspell "**"
 

src/devices/water.cpp

@@ -361,7 +361,7 @@ bool Water::set_wwCircTc(const char * value, const int8_t id) {
     if (!Helpers::value2bool(value, b)) {
         return false;
     }
-    write_command(0x33B + dhw_, 4, b ? 0x01 : 0x00, 0x33B + dhw_);
+    write_command(0x7A5, 4, b ? 0xFF : 0x00, 0x7A5);
     return true;
 }
 

src/emsesp_version.h

@@ -1 +1 @@
-#define EMSESP_APP_VERSION "3.9.0-dev.15"
+#define EMSESP_APP_VERSION "3.9.0-dev.16"