diff --git a/.github/workflows/dev_release.yml b/.github/workflows/dev_release.yml index 3c3dcf7ea..e68ac55b4 100644 --- a/.github/workflows/dev_release.yml +++ b/.github/workflows/dev_release.yml @@ -47,7 +47,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/.github/workflows/stable_release.yml b/.github/workflows/stable_release.yml index 76fb12038..6286e6ea3 100644 --- a/.github/workflows/stable_release.yml +++ b/.github/workflows/stable_release.yml @@ -39,7 +39,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml index a9da6a564..3fb4ce3fc 100644 --- a/.github/workflows/test_release.yml +++ b/.github/workflows/test_release.yml @@ -47,7 +47,7 @@ jobs: - name: Build webUI run: | - platformio run -e build_webUI + platformio run -e build-webUI - name: Build modbus run: | diff --git a/interface/package.json b/interface/package.json index 70bea52c5..80ce3ced3 100644 --- a/interface/package.json +++ b/interface/package.json @@ -17,7 +17,7 @@ "preview-standalone": "typesafe-i18n --no-watch && vite build && concurrently -c \"auto\" \"pnpm:mock-rest\" \"vite preview\"", "standalone": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite dev\"", "typesafe-i18n": "typesafe-i18n --no-watch", - "build_webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js", + "build-webUI": "typesafe-i18n --no-watch && vite build && node progmem-generator.js", "format": "prettier -l -w '**/*.{ts,tsx,js,css,json,md}'", "lint": "eslint . --fix", "standalone-devcontainer": "concurrently -c \"auto\" \"typesafe-i18n\" \"pnpm:mock-rest\" \"vite --host\"" diff --git a/interface/pnpm-lock.yaml b/interface/pnpm-lock.yaml index ce34a3c30..8b4040ec6 100644 --- a/interface/pnpm-lock.yaml +++ b/interface/pnpm-lock.yaml @@ -1523,8 +1523,8 @@ packages: duplexer3@0.1.5: resolution: {integrity: sha512-1A8za6ws41LQgv9HrE/66jyC5yuSjQ3L/KOpFtoBilsAK2iA2wuS5rTt1OCzIvtS2V7nVmedsUU+DGRcjBmOYA==} - electron-to-chromium@1.5.341: - resolution: {integrity: sha512-1sZTssferjgDgaqRTc0ieP+ozzpOy7LQTPTtEW3yQFn4+ORdIAZWV5BthXPyHF7YqLvFJCUPhNhdAJQYlYUgiw==} + electron-to-chromium@1.5.343: + resolution: {integrity: sha512-YHnQ3MXI08icvL9ZKnEBy05F2EQ8ob01UaMOuMbM8l+4UcAq6MPPbBTJBbsBUg3H8JeZNt+O4fjsoWth3p6IFg==} emoji-regex@10.6.0: resolution: {integrity: sha512-toUI84YS5YmxW219erniWD0CIVOo46xGKColeNQRgOzDorgBi1v4D71/OFzgD9GO2UGKIv1C3Sp8DAn0+j5w7A==} @@ -2517,8 +2517,8 @@ packages: node-html-parser@6.1.13: resolution: {integrity: sha512-qIsTMOY4C/dAa5Q5vsobRpOOvPfC4pB61UVW2uSwZNUp0QU/jCekTal1vMmbO0DgdHeLUJpv/ARmDqErVxA3Sg==} - node-releases@2.0.37: - resolution: {integrity: sha512-1h5gKZCF+pO/o3Iqt5Jp7wc9rH3eJJ0+nh/CIoiRwjRxde/hAHyLPXYN4V3CqKAbiZPSeJFSWHmJsbkicta0Eg==} + node-releases@2.0.38: + resolution: {integrity: sha512-3qT/88Y3FbH/Kx4szpQQ4HzUbVrHPKTLVpVocKiLfoYvw9XSGOX2FmD2d6DrXbVYyAQTF2HeF6My8jmzx7/CRw==} normalize-package-data@2.5.0: resolution: {integrity: sha512-/5CMN3T0R4XTj4DcGaexo+roZSdSFW/0AOOTROrjxzCG1wrWXEsGbRKevjlIL+ZDE4sZlJr5ED4YW0yqmkK+eA==} @@ -4418,8 +4418,8 @@ snapshots: dependencies: baseline-browser-mapping: 2.10.20 caniuse-lite: 1.0.30001788 - electron-to-chromium: 1.5.341 - node-releases: 2.0.37 + electron-to-chromium: 1.5.343 + node-releases: 2.0.38 update-browserslist-db: 1.2.3(browserslist@4.28.2) buffer-alloc-unsafe@1.1.0: {} @@ -4782,7 +4782,7 @@ snapshots: duplexer3@0.1.5: {} - electron-to-chromium@1.5.341: {} + electron-to-chromium@1.5.343: {} emoji-regex@10.6.0: {} @@ -5754,7 +5754,7 @@ snapshots: css-select: 5.2.2 he: 1.2.0 - node-releases@2.0.37: {} + node-releases@2.0.38: {} normalize-package-data@2.5.0: dependencies: diff --git a/pio_local.ini_example b/pio_local.ini_example index 5b976e0f8..29a40d240 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -20,7 +20,7 @@ my_build_flags = [platformio] default_envs = s_16M_P ; BBQKees E32V2 -; default_envs = build_webUI ; build the web interface only +; default_envs = build-webUI ; build the web interface only ; default_envs = s3_16M_P ; BBQKees S3 ; default_envs = s_4M ; BBQKees older S32, 4MB no psram ; default_envs = s_16M ; BBQKees newer S32 V2, 16MB no psram diff --git a/platformio.ini b/platformio.ini index c649d5e8d..c94e1383f 100644 --- a/platformio.ini +++ b/platformio.ini @@ -109,7 +109,7 @@ lib_deps = ; https://github.com/emsesp/EMS-ESP-Modules.git @ 1.0.8 ; builds the web interface only, not the firmware -[env:build_webUI] +[env:build-webUI] platform = native targets = build extra_scripts = pre:scripts/build_interface.py diff --git a/scripts/build_interface.py b/scripts/build_interface.py index 069e8c774..0be356f58 100755 --- a/scripts/build_interface.py +++ b/scripts/build_interface.py @@ -74,7 +74,7 @@ def buildWeb(): # Run pnpm commands in the interface directory commands = [ f"{pnpm_exe} install", - f"{pnpm_exe} build_webUI" + f"{pnpm_exe} build-webUI" ] for command in commands: diff --git a/scripts/update_all.sh b/scripts/update_all.sh index 31992ecd8..283e892c5 100644 --- a/scripts/update_all.sh +++ b/scripts/update_all.sh @@ -20,7 +20,7 @@ pnpm format cd .. cd interface -pnpm build_webUI +pnpm build-webUI cd .. npx cspell "**"