andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2026-03-22 09:36:32 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'dev' into core3, fix #2988

Browse Source
This commit is contained in:
MichaelDvP
2026-03-18 11:47:16 +01:00
parent 0fe45a2405 cc60062678
commit 8244af2940
5 changed files with 3488 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
interface/eslint.config.js
View File

@@ -1,9 +1,10 @@
// @ts-check // @ts-check
import eslint from '@eslint/js'; import eslint from '@eslint/js';
import prettierConfig from 'eslint-config-prettier'; import prettierConfig from 'eslint-config-prettier';
import { defineConfig } from 'eslint/config';
import tseslint from 'typescript-eslint'; import tseslint from 'typescript-eslint';
export default tseslint.config( export default defineConfig(
eslint.configs.recommended, eslint.configs.recommended,
...tseslint.configs.recommendedTypeChecked, ...tseslint.configs.recommendedTypeChecked,
prettierConfig, prettierConfig,

2
interface/package.json
View File

@@ -49,7 +49,7 @@
"devDependencies": { "devDependencies": {
"@babel/core": "^7.29.0", "@babel/core": "^7.29.0",
"@eslint/js": "^10.0.1", "@eslint/js": "^10.0.1",
"@preact/compat": "^18.3.1", "@preact/compat": "^18.3.2",
"@preact/preset-vite": "^2.10.4", "@preact/preset-vite": "^2.10.4",
"@trivago/prettier-plugin-sort-imports": "^6.0.2", "@trivago/prettier-plugin-sort-imports": "^6.0.2",
"@types/node": "^25.5.0", "@types/node": "^25.5.0",

4723
interface/pnpm-lock.yaml generated
View File

File diff suppressed because it is too large Load Diff

3
platformio.ini
View File

@@ -91,11 +91,12 @@ board_build.filesystem = littlefs
lib_deps = lib_deps =
bblanchon/ArduinoJson @ 7.4.2 bblanchon/ArduinoJson @ 7.4.2
ESP32Async/AsyncTCP @ 3.4.10 ESP32Async/AsyncTCP @ 3.4.10
ESP32Async/ESPAsyncWebServer @ 3.10.1 ESP32Async/ESPAsyncWebServer @ 3.10.2
https://github.com/mobizt/ReadyMail.git @ 0.3.8 https://github.com/mobizt/ReadyMail.git @ 0.3.8
https://github.com/mobizt/ESP_SSLClient.git @ 3.1.3 https://github.com/mobizt/ESP_SSLClient.git @ 3.1.3
; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8 ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8
; builds the web interface only, not the firmware ; builds the web interface only, not the firmware
[env:build_webUI] [env:build_webUI]
platform = native platform = native

2
src/emsesp_version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.8.2-dev.10" #define EMSESP_APP_VERSION "3.8.2-dev.11"