andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 00:09:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1432 from proddy/dev

Browse Source 
fix building on osx, some package updates again
This commit is contained in:
Proddy
2023-11-16 22:44:23 +01:00
committed by GitHub
parent e4a899912c a4062f5d84
commit 8cfc540670
9 changed files with 260 additions and 139 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
interface/package.json
View File

@@ -6,6 +6,7 @@
"author": "proddy", "author": "proddy",
"license": "MIT", "license": "MIT",
"private": true, "private": true,
"type": "module",
"scripts": { "scripts": {
"build": "vite build", "build": "vite build",
"preview": "vite preview", "preview": "vite preview",
@@ -42,7 +43,7 @@
"react-dom": "latest", "react-dom": "latest",
"react-dropzone": "^14.2.3", "react-dropzone": "^14.2.3",
"react-icons": "^4.12.0", "react-icons": "^4.12.0",
"react-router-dom": "^6.18.0", "react-router-dom": "^6.19.0",
"react-toastify": "^9.1.3", "react-toastify": "^9.1.3",
"sockette": "^2.0.6", "sockette": "^2.0.6",
"typesafe-i18n": "^5.26.2", "typesafe-i18n": "^5.26.2",
@@ -69,7 +70,7 @@
"prettier": "^3.1.0", "prettier": "^3.1.0",
"rollup-plugin-visualizer": "^5.9.2", "rollup-plugin-visualizer": "^5.9.2",
"terser": "^5.24.0", "terser": "^5.24.0",
"vite": "^4.5.0", "vite": "^5.0.0",
"vite-plugin-imagemin": "^0.6.1", "vite-plugin-imagemin": "^0.6.1",
"vite-tsconfig-paths": "^4.2.1" "vite-tsconfig-paths": "^4.2.1"
}, },

2
interface/src/framework/security/ManageUsersForm.tsx
View File

@@ -12,7 +12,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
import { useTheme } from '@table-library/react-table-library/theme'; import { useTheme } from '@table-library/react-table-library/theme';
import { useContext, useState } from 'react'; import { useContext, useState } from 'react';
import { unstable_useBlocker as useBlocker } from 'react-router-dom'; import { useBlocker } from 'react-router-dom';
import GenerateToken from './GenerateToken'; import GenerateToken from './GenerateToken';
import UserForm from './UserForm'; import UserForm from './UserForm';
import type { FC } from 'react'; import type { FC } from 'react';

2
interface/src/project/SettingsCustomization.tsx
View File

@@ -23,7 +23,7 @@ import { Table, Header, HeaderRow, HeaderCell, Body, Row, Cell } from '@table-li
import { useTheme } from '@table-library/react-table-library/theme'; import { useTheme } from '@table-library/react-table-library/theme';
import { useRequest } from 'alova'; import { useRequest } from 'alova';
import { useState, useEffect, useCallback } from 'react'; import { useState, useEffect, useCallback } from 'react';
import { unstable_useBlocker as useBlocker, useLocation } from 'react-router-dom'; import { useBlocker, useLocation } from 'react-router-dom';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import EntityMaskToggle from './EntityMaskToggle'; import EntityMaskToggle from './EntityMaskToggle';

2
interface/src/project/SettingsEntities.tsx
View File

@@ -7,7 +7,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
// eslint-disable-next-line import/named // eslint-disable-next-line import/named
import { updateState, useRequest } from 'alova'; import { updateState, useRequest } from 'alova';
import { useState, useCallback } from 'react'; import { useState, useCallback } from 'react';
import { unstable_useBlocker as useBlocker } from 'react-router-dom'; import { useBlocker } from 'react-router-dom';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';

2
interface/src/project/SettingsScheduler.tsx
View File

@@ -9,7 +9,7 @@ import { useTheme } from '@table-library/react-table-library/theme';
// eslint-disable-next-line import/named // eslint-disable-next-line import/named
import { updateState, useRequest } from 'alova'; import { updateState, useRequest } from 'alova';
import { useState, useEffect, useCallback } from 'react'; import { useState, useEffect, useCallback } from 'react';
import { unstable_useBlocker as useBlocker } from 'react-router-dom'; import { useBlocker } from 'react-router-dom';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import SettingsSchedulerDialog from './SettingsSchedulerDialog'; import SettingsSchedulerDialog from './SettingsSchedulerDialog';
import * as EMSESP from './api'; import * as EMSESP from './api';

2
interface/src/utils/useRest.ts
View File

@@ -1,6 +1,6 @@
import { useRequest, type Method } from 'alova'; import { useRequest, type Method } from 'alova';
import { useState } from 'react'; import { useState } from 'react';
import { unstable_useBlocker as useBlocker } from 'react-router-dom'; import { useBlocker } from 'react-router-dom';
import { toast } from 'react-toastify'; import { toast } from 'react-toastify';
import { useI18nContext } from 'i18n/i18n-react'; import { useI18nContext } from 'i18n/i18n-react';

370
interface/yarn.lock
View File

@@ -550,72 +550,72 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-arm64@npm:0.18.20": "@esbuild/android-arm64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/android-arm64@npm:0.18.20" resolution: "@esbuild/android-arm64@npm:0.19.5"
conditions: os=android & cpu=arm64 conditions: os=android & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-arm@npm:0.18.20": "@esbuild/android-arm@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/android-arm@npm:0.18.20" resolution: "@esbuild/android-arm@npm:0.19.5"
conditions: os=android & cpu=arm conditions: os=android & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/android-x64@npm:0.18.20": "@esbuild/android-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/android-x64@npm:0.18.20" resolution: "@esbuild/android-x64@npm:0.19.5"
conditions: os=android & cpu=x64 conditions: os=android & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/darwin-arm64@npm:0.18.20": "@esbuild/darwin-arm64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/darwin-arm64@npm:0.18.20" resolution: "@esbuild/darwin-arm64@npm:0.19.5"
conditions: os=darwin & cpu=arm64 conditions: os=darwin & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/darwin-x64@npm:0.18.20": "@esbuild/darwin-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/darwin-x64@npm:0.18.20" resolution: "@esbuild/darwin-x64@npm:0.19.5"
conditions: os=darwin & cpu=x64 conditions: os=darwin & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/freebsd-arm64@npm:0.18.20": "@esbuild/freebsd-arm64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/freebsd-arm64@npm:0.18.20" resolution: "@esbuild/freebsd-arm64@npm:0.19.5"
conditions: os=freebsd & cpu=arm64 conditions: os=freebsd & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/freebsd-x64@npm:0.18.20": "@esbuild/freebsd-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/freebsd-x64@npm:0.18.20" resolution: "@esbuild/freebsd-x64@npm:0.19.5"
conditions: os=freebsd & cpu=x64 conditions: os=freebsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-arm64@npm:0.18.20": "@esbuild/linux-arm64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-arm64@npm:0.18.20" resolution: "@esbuild/linux-arm64@npm:0.19.5"
conditions: os=linux & cpu=arm64 conditions: os=linux & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-arm@npm:0.18.20": "@esbuild/linux-arm@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-arm@npm:0.18.20" resolution: "@esbuild/linux-arm@npm:0.19.5"
conditions: os=linux & cpu=arm conditions: os=linux & cpu=arm
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-ia32@npm:0.18.20": "@esbuild/linux-ia32@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-ia32@npm:0.18.20" resolution: "@esbuild/linux-ia32@npm:0.19.5"
conditions: os=linux & cpu=ia32 conditions: os=linux & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
@@ -627,86 +627,86 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-loong64@npm:0.18.20": "@esbuild/linux-loong64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-loong64@npm:0.18.20" resolution: "@esbuild/linux-loong64@npm:0.19.5"
conditions: os=linux & cpu=loong64 conditions: os=linux & cpu=loong64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-mips64el@npm:0.18.20": "@esbuild/linux-mips64el@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-mips64el@npm:0.18.20" resolution: "@esbuild/linux-mips64el@npm:0.19.5"
conditions: os=linux & cpu=mips64el conditions: os=linux & cpu=mips64el
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-ppc64@npm:0.18.20": "@esbuild/linux-ppc64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-ppc64@npm:0.18.20" resolution: "@esbuild/linux-ppc64@npm:0.19.5"
conditions: os=linux & cpu=ppc64 conditions: os=linux & cpu=ppc64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-riscv64@npm:0.18.20": "@esbuild/linux-riscv64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-riscv64@npm:0.18.20" resolution: "@esbuild/linux-riscv64@npm:0.19.5"
conditions: os=linux & cpu=riscv64 conditions: os=linux & cpu=riscv64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-s390x@npm:0.18.20": "@esbuild/linux-s390x@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-s390x@npm:0.18.20" resolution: "@esbuild/linux-s390x@npm:0.19.5"
conditions: os=linux & cpu=s390x conditions: os=linux & cpu=s390x
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/linux-x64@npm:0.18.20": "@esbuild/linux-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/linux-x64@npm:0.18.20" resolution: "@esbuild/linux-x64@npm:0.19.5"
conditions: os=linux & cpu=x64 conditions: os=linux & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/netbsd-x64@npm:0.18.20": "@esbuild/netbsd-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/netbsd-x64@npm:0.18.20" resolution: "@esbuild/netbsd-x64@npm:0.19.5"
conditions: os=netbsd & cpu=x64 conditions: os=netbsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/openbsd-x64@npm:0.18.20": "@esbuild/openbsd-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/openbsd-x64@npm:0.18.20" resolution: "@esbuild/openbsd-x64@npm:0.19.5"
conditions: os=openbsd & cpu=x64 conditions: os=openbsd & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/sunos-x64@npm:0.18.20": "@esbuild/sunos-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/sunos-x64@npm:0.18.20" resolution: "@esbuild/sunos-x64@npm:0.19.5"
conditions: os=sunos & cpu=x64 conditions: os=sunos & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-arm64@npm:0.18.20": "@esbuild/win32-arm64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/win32-arm64@npm:0.18.20" resolution: "@esbuild/win32-arm64@npm:0.19.5"
conditions: os=win32 & cpu=arm64 conditions: os=win32 & cpu=arm64
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-ia32@npm:0.18.20": "@esbuild/win32-ia32@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/win32-ia32@npm:0.18.20" resolution: "@esbuild/win32-ia32@npm:0.19.5"
conditions: os=win32 & cpu=ia32 conditions: os=win32 & cpu=ia32
languageName: node languageName: node
linkType: hard linkType: hard
"@esbuild/win32-x64@npm:0.18.20": "@esbuild/win32-x64@npm:0.19.5":
version: 0.18.20 version: 0.19.5
resolution: "@esbuild/win32-x64@npm:0.18.20" resolution: "@esbuild/win32-x64@npm:0.19.5"
conditions: os=win32 & cpu=x64 conditions: os=win32 & cpu=x64
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1187,10 +1187,10 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@remix-run/router@npm:1.11.0": "@remix-run/router@npm:1.12.0":
version: 1.11.0 version: 1.12.0
resolution: "@remix-run/router@npm:1.11.0" resolution: "@remix-run/router@npm:1.12.0"
checksum: 629ec578b9dfd3c5cb5de64a0798dd7846ec5ba0351aa66f42b1c65efb43da8f30366be59b825303648965b0df55b638c110949b24ef94fd62e98117fdfb0c0f checksum: f984e42cfe855991e1d3067f686f857614f12e8c1c45168a2d98e3fc3a427e232fd0b6cf145173b7cd132faf070702b532c34230a825d933908c54c85077fc69
languageName: node languageName: node
linkType: hard linkType: hard
@@ -1204,6 +1204,90 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"@rollup/rollup-android-arm-eabi@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-android-arm-eabi@npm:4.4.1"
conditions: os=android & cpu=arm
languageName: node
linkType: hard
"@rollup/rollup-android-arm64@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-android-arm64@npm:4.4.1"
conditions: os=android & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-darwin-arm64@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-darwin-arm64@npm:4.4.1"
conditions: os=darwin & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-darwin-x64@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-darwin-x64@npm:4.4.1"
conditions: os=darwin & cpu=x64
languageName: node
linkType: hard
"@rollup/rollup-linux-arm-gnueabihf@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-linux-arm-gnueabihf@npm:4.4.1"
conditions: os=linux & cpu=arm
languageName: node
linkType: hard
"@rollup/rollup-linux-arm64-gnu@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-linux-arm64-gnu@npm:4.4.1"
conditions: os=linux & cpu=arm64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-arm64-musl@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-linux-arm64-musl@npm:4.4.1"
conditions: os=linux & cpu=arm64 & libc=musl
languageName: node
linkType: hard
"@rollup/rollup-linux-x64-gnu@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-linux-x64-gnu@npm:4.4.1"
conditions: os=linux & cpu=x64 & libc=glibc
languageName: node
linkType: hard
"@rollup/rollup-linux-x64-musl@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-linux-x64-musl@npm:4.4.1"
conditions: os=linux & cpu=x64 & libc=musl
languageName: node
linkType: hard
"@rollup/rollup-win32-arm64-msvc@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-win32-arm64-msvc@npm:4.4.1"
conditions: os=win32 & cpu=arm64
languageName: node
linkType: hard
"@rollup/rollup-win32-ia32-msvc@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-win32-ia32-msvc@npm:4.4.1"
conditions: os=win32 & cpu=ia32
languageName: node
linkType: hard
"@rollup/rollup-win32-x64-msvc@npm:4.4.1":
version: 4.4.1
resolution: "@rollup/rollup-win32-x64-msvc@npm:4.4.1"
conditions: os=win32 & cpu=x64
languageName: node
linkType: hard
"@sindresorhus/is@npm:^0.7.0": "@sindresorhus/is@npm:^0.7.0":
version: 0.7.0 version: 0.7.0
resolution: "@sindresorhus/is@npm:0.7.0" resolution: "@sindresorhus/is@npm:0.7.0"
@@ -1691,14 +1775,14 @@ __metadata:
react-dom: "npm:latest" react-dom: "npm:latest"
react-dropzone: "npm:^14.2.3" react-dropzone: "npm:^14.2.3"
react-icons: "npm:^4.12.0" react-icons: "npm:^4.12.0"
react-router-dom: "npm:^6.18.0" react-router-dom: "npm:^6.19.0"
react-toastify: "npm:^9.1.3" react-toastify: "npm:^9.1.3"
rollup-plugin-visualizer: "npm:^5.9.2" rollup-plugin-visualizer: "npm:^5.9.2"
sockette: "npm:^2.0.6" sockette: "npm:^2.0.6"
terser: "npm:^5.24.0" terser: "npm:^5.24.0"
typesafe-i18n: "npm:^5.26.2" typesafe-i18n: "npm:^5.26.2"
typescript: "npm:^5.2.2" typescript: "npm:^5.2.2"
vite: "npm:^4.5.0" vite: "npm:^5.0.0"
vite-plugin-imagemin: "npm:^0.6.1" vite-plugin-imagemin: "npm:^0.6.1"
vite-tsconfig-paths: "npm:^4.2.1" vite-tsconfig-paths: "npm:^4.2.1"
languageName: unknown languageName: unknown
@@ -3416,32 +3500,32 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"esbuild@npm:^0.18.10": "esbuild@npm:^0.19.3":
version: 0.18.20 version: 0.19.5
resolution: "esbuild@npm:0.18.20" resolution: "esbuild@npm:0.19.5"
dependencies: dependencies:
"@esbuild/android-arm": "npm:0.18.20" "@esbuild/android-arm": "npm:0.19.5"
"@esbuild/android-arm64": "npm:0.18.20" "@esbuild/android-arm64": "npm:0.19.5"
"@esbuild/android-x64": "npm:0.18.20" "@esbuild/android-x64": "npm:0.19.5"
"@esbuild/darwin-arm64": "npm:0.18.20" "@esbuild/darwin-arm64": "npm:0.19.5"
"@esbuild/darwin-x64": "npm:0.18.20" "@esbuild/darwin-x64": "npm:0.19.5"
"@esbuild/freebsd-arm64": "npm:0.18.20" "@esbuild/freebsd-arm64": "npm:0.19.5"
"@esbuild/freebsd-x64": "npm:0.18.20" "@esbuild/freebsd-x64": "npm:0.19.5"
"@esbuild/linux-arm": "npm:0.18.20" "@esbuild/linux-arm": "npm:0.19.5"
"@esbuild/linux-arm64": "npm:0.18.20" "@esbuild/linux-arm64": "npm:0.19.5"
"@esbuild/linux-ia32": "npm:0.18.20" "@esbuild/linux-ia32": "npm:0.19.5"
"@esbuild/linux-loong64": "npm:0.18.20" "@esbuild/linux-loong64": "npm:0.19.5"
"@esbuild/linux-mips64el": "npm:0.18.20" "@esbuild/linux-mips64el": "npm:0.19.5"
"@esbuild/linux-ppc64": "npm:0.18.20" "@esbuild/linux-ppc64": "npm:0.19.5"
"@esbuild/linux-riscv64": "npm:0.18.20" "@esbuild/linux-riscv64": "npm:0.19.5"
"@esbuild/linux-s390x": "npm:0.18.20" "@esbuild/linux-s390x": "npm:0.19.5"
"@esbuild/linux-x64": "npm:0.18.20" "@esbuild/linux-x64": "npm:0.19.5"
"@esbuild/netbsd-x64": "npm:0.18.20" "@esbuild/netbsd-x64": "npm:0.19.5"
"@esbuild/openbsd-x64": "npm:0.18.20" "@esbuild/openbsd-x64": "npm:0.19.5"
"@esbuild/sunos-x64": "npm:0.18.20" "@esbuild/sunos-x64": "npm:0.19.5"
"@esbuild/win32-arm64": "npm:0.18.20" "@esbuild/win32-arm64": "npm:0.19.5"
"@esbuild/win32-ia32": "npm:0.18.20" "@esbuild/win32-ia32": "npm:0.19.5"
"@esbuild/win32-x64": "npm:0.18.20" "@esbuild/win32-x64": "npm:0.19.5"
dependenciesMeta: dependenciesMeta:
"@esbuild/android-arm": "@esbuild/android-arm":
optional: true optional: true
@@ -3489,7 +3573,7 @@ __metadata:
optional: true optional: true
bin: bin:
esbuild: bin/esbuild esbuild: bin/esbuild
checksum: 1f723ec71c3aa196473bf3298316eedc3f62d523924652dfeb60701b609792f918fc60db84b420d1d8ba9bfa7d69de2fc1d3157ba47c028bdae5d507a26a3c64 checksum: f8ffe0cbab8a80ec63b6962b7d722da9e3dbe79a57d3cd998e107e35792068facd6f63e58ae19e919891456ed6cb73114a9777f0e7353ec8613b4fc75571d56d
languageName: node languageName: node
linkType: hard linkType: hard
@@ -4285,7 +4369,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"fsevents@npm:~2.3.2": "fsevents@npm:~2.3.2, fsevents@npm:~2.3.3":
version: 2.3.3 version: 2.3.3
resolution: "fsevents@npm:2.3.3" resolution: "fsevents@npm:2.3.3"
dependencies: dependencies:
@@ -4295,7 +4379,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>": "fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin<compat/fsevents>, fsevents@patch:fsevents@npm%3A~2.3.3#optional!builtin<compat/fsevents>":
version: 2.3.3 version: 2.3.3
resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1" resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin<compat/fsevents>::version=2.3.3&hash=df0bf1"
dependencies: dependencies:
@@ -6754,7 +6838,7 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"postcss@npm:^8.4.27": "postcss@npm:^8.4.31":
version: 8.4.31 version: 8.4.31
resolution: "postcss@npm:8.4.31" resolution: "postcss@npm:8.4.31"
dependencies: dependencies:
@@ -6936,27 +7020,27 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"react-router-dom@npm:^6.18.0": "react-router-dom@npm:^6.19.0":
version: 6.18.0 version: 6.19.0
resolution: "react-router-dom@npm:6.18.0" resolution: "react-router-dom@npm:6.19.0"
dependencies: dependencies:
"@remix-run/router": "npm:1.11.0" "@remix-run/router": "npm:1.12.0"
react-router: "npm:6.18.0" react-router: "npm:6.19.0"
peerDependencies: peerDependencies:
react: ">=16.8" react: ">=16.8"
react-dom: ">=16.8" react-dom: ">=16.8"
checksum: b0e72603d73172b6c6662afe2faed326753d5bbd9905aa560e3dade7996fc13d19e34e3ed668d2849efd685e2db2f711129c84b1439870e92c9cc91ddc343cf5 checksum: 38312efc11d3ef688062301479a8257a1495a81cd8dd7039c1f81aba6774963df7d21aaee2ba1a3c152857b70f4fb9966a3ccff47aca12212e854dcd6fc4deab
languageName: node languageName: node
linkType: hard linkType: hard
"react-router@npm:6.18.0": "react-router@npm:6.19.0":
version: 6.18.0 version: 6.19.0
resolution: "react-router@npm:6.18.0" resolution: "react-router@npm:6.19.0"
dependencies: dependencies:
"@remix-run/router": "npm:1.11.0" "@remix-run/router": "npm:1.12.0"
peerDependencies: peerDependencies:
react: ">=16.8" react: ">=16.8"
checksum: a00c8f347b7ffee575f4a7731782e688e3fca458ca5bd970fb41cef66a6851853caa24464155ab438d5879f367b1223a539642a405a865913ffe7e63e53b1245 checksum: 5454f4a4d65401430ded8f1033cebe4ccca771c3c827e8329c77dcfd73618ca9a32488fb58722bf6a07afef7d8e7ef22a710aae0f3337e5c20962bf6473d81a3
languageName: node languageName: node
linkType: hard linkType: hard
@@ -7261,17 +7345,53 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"rollup@npm:^3.27.1": "rollup@npm:^4.2.0":
version: 3.29.4 version: 4.4.1
resolution: "rollup@npm:3.29.4" resolution: "rollup@npm:4.4.1"
dependencies: dependencies:
"@rollup/rollup-android-arm-eabi": "npm:4.4.1"
"@rollup/rollup-android-arm64": "npm:4.4.1"
"@rollup/rollup-darwin-arm64": "npm:4.4.1"
"@rollup/rollup-darwin-x64": "npm:4.4.1"
"@rollup/rollup-linux-arm-gnueabihf": "npm:4.4.1"
"@rollup/rollup-linux-arm64-gnu": "npm:4.4.1"
"@rollup/rollup-linux-arm64-musl": "npm:4.4.1"
"@rollup/rollup-linux-x64-gnu": "npm:4.4.1"
"@rollup/rollup-linux-x64-musl": "npm:4.4.1"
"@rollup/rollup-win32-arm64-msvc": "npm:4.4.1"
"@rollup/rollup-win32-ia32-msvc": "npm:4.4.1"
"@rollup/rollup-win32-x64-msvc": "npm:4.4.1"
fsevents: "npm:~2.3.2" fsevents: "npm:~2.3.2"
dependenciesMeta: dependenciesMeta:
"@rollup/rollup-android-arm-eabi":
optional: true
"@rollup/rollup-android-arm64":
optional: true
"@rollup/rollup-darwin-arm64":
optional: true
"@rollup/rollup-darwin-x64":
optional: true
"@rollup/rollup-linux-arm-gnueabihf":
optional: true
"@rollup/rollup-linux-arm64-gnu":
optional: true
"@rollup/rollup-linux-arm64-musl":
optional: true
"@rollup/rollup-linux-x64-gnu":
optional: true
"@rollup/rollup-linux-x64-musl":
optional: true
"@rollup/rollup-win32-arm64-msvc":
optional: true
"@rollup/rollup-win32-ia32-msvc":
optional: true
"@rollup/rollup-win32-x64-msvc":
optional: true
fsevents: fsevents:
optional: true optional: true
bin: bin:
rollup: dist/bin/rollup rollup: dist/bin/rollup
checksum: 9e39d54e23731a4c4067e9c02910cdf7479a0f9a7584796e2dc6efaa34bb1e5e015c062c87d1e64d96038baca76cefd47681ff22604fae5827147f54123dc6d0 checksum: 128667d4af7703797eab63b802f538f65dcffda7ec9f03709b36d03969738a61d660119fc3e42a01cf420b87039159b09095b4c46382f02fbc94c72b1cfe51e2
languageName: node languageName: node
linkType: hard linkType: hard
@@ -8446,16 +8566,16 @@ __metadata:
languageName: node languageName: node
linkType: hard linkType: hard
"vite@npm:^4.5.0": "vite@npm:^5.0.0":
version: 4.5.0 version: 5.0.0
resolution: "vite@npm:4.5.0" resolution: "vite@npm:5.0.0"
dependencies: dependencies:
esbuild: "npm:^0.18.10" esbuild: "npm:^0.19.3"
fsevents: "npm:~2.3.2" fsevents: "npm:~2.3.3"
postcss: "npm:^8.4.27" postcss: "npm:^8.4.31"
rollup: "npm:^3.27.1" rollup: "npm:^4.2.0"
peerDependencies: peerDependencies:
"@types/node": ">= 14" "@types/node": ^18.0.0 || >=20.0.0
less: "*" less: "*"
lightningcss: ^1.21.0 lightningcss: ^1.21.0
sass: "*" sass: "*"
@@ -8482,7 +8602,7 @@ __metadata:
optional: true optional: true
bin: bin:
vite: bin/vite.js vite: bin/vite.js
checksum: b262ea4880ba7de8a77b0a665c771561ae3cb7f0d6c5b90e65298039755192550bf90cb96a2910d564506e2d499aa20e9becd330b835c34d414249083ac6e40c checksum: 9a247a5657330ede5c131e782f2fb2adda77d493db2d528524378706108c1560ca4fe9ec0a865e5250978f5e2649c4da690834d2aab4dbf6175f1782cff6bd03
languageName: node languageName: node
linkType: hard linkType: hard

8
platformio.ini
View File

@@ -129,7 +129,7 @@ board_upload.flash_size = 4MB
board_build.partitions = esp32_partition_4M.csv board_build.partitions = esp32_partition_4M.csv
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
-DEMSESP_DEFAULT_BOARD_PROFILE = "C3MINI" '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
; lolin C3 mini v1 needs special wifi init. ; lolin C3 mini v1 needs special wifi init.
; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi ; https://www.wemos.cc/en/latest/c3/c3_mini_1_0_0.html#about-wifi
@@ -141,7 +141,7 @@ board_build.partitions = esp32_partition_4M.csv
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
-DBOARD_C3_MINI_V1 -DBOARD_C3_MINI_V1
-DEMSESP_DEFAULT_BOARD_PROFILE = "C3MINI" '-DEMSESP_DEFAULT_BOARD_PROFILE="C3MINI"'
[env:lolin_s2_mini] [env:lolin_s2_mini]
extends = espressi32_base_tasmota extends = espressi32_base_tasmota
@@ -150,7 +150,7 @@ board_upload.flash_size = 4MB
board_build.partitions = esp32_partition_4M.csv board_build.partitions = esp32_partition_4M.csv
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
-DEMSESP_DEFAULT_BOARD_PROFILE = "S2MINI" '-DEMSESP_DEFAULT_BOARD_PROFILE="S2MINI"'
[env:lolin_s3] [env:lolin_s3]
extends = espressi32_base extends = espressi32_base
@@ -163,7 +163,7 @@ board_upload.wait_for_upload_port = false
build_flags = build_flags =
${common.build_flags} ${common.build_flags}
-O2 -O2
-DEMSESP_DEFAULT_BOARD_PROFILE = "S32S3" '-DEMSESP_DEFAULT_BOARD_PROFILE="S32S3"'
; to build and run: pio run -e standalone -t exec ; to build and run: pio run -e standalone -t exec
[env:standalone] [env:standalone]

2
src/version.h
View File

@@ -1 +1 @@
#define EMSESP_APP_VERSION "3.6.3-dev.9" #define EMSESP_APP_VERSION "3.6.3-dev.10"