Skip to content

Commit b7611c6

Browse files
committed
Merge branch 'dev' of https://github.com/emsesp/EMS-ESP32 into dev
2 parents d17582d + d6ae552 commit b7611c6

21 files changed

+519
-1794
lines changed

.vscode/settings.json

+2-1
Original file line numberDiff line numberDiff line change
@@ -41,5 +41,6 @@
4141
"**/*.min.*",
4242
"**/*.map",
4343
"**/ArduinoJson/**"
44-
]
44+
],
45+
"cSpell.enableFiletypes": ["!cpp"]
4546
}

interface/package.json

+5-6
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"build-hosted": "vite build --mode hosted",
1313
"preview": "vite preview",
1414
"preview-standalone": "npm-run-all -p preview typesafe-i18n mock-api",
15-
"mock-api": "nodemon --watch ../mock-api ../mock-api/server.js",
15+
"mock-api": "node --watch ../mock-api ../mock-api/server.js",
1616
"standalone": "npm-run-all -p dev typesafe-i18n mock-api",
1717
"typesafe-i18n": "typesafe-i18n",
1818
"format": "prettier --write '**/*.{ts,tsx,js,css,json,md}'",
@@ -22,8 +22,8 @@
2222
"@alova/adapter-xhr": "^1.0.1",
2323
"@emotion/react": "^11.11.1",
2424
"@emotion/styled": "^11.11.0",
25-
"@mui/icons-material": "^5.14.6",
26-
"@mui/material": "^5.14.6",
25+
"@mui/icons-material": "^5.14.7",
26+
"@mui/material": "^5.14.7",
2727
"@preact/compat": "^17.1.2",
2828
"@prefresh/vite": "^2.4.1",
2929
"@table-library/react-table-library": "4.1.7",
@@ -66,11 +66,10 @@
6666
"eslint-plugin-prettier": "alpha",
6767
"eslint-plugin-react": "^7.33.2",
6868
"eslint-plugin-react-hooks": "^4.6.0",
69-
"nodemon": "^3.0.1",
7069
"npm-run-all": "^4.1.5",
71-
"prettier": "^3.0.2",
70+
"prettier": "^3.0.3",
7271
"rollup-plugin-visualizer": "^5.9.2",
73-
"terser": "^5.19.2",
72+
"terser": "^5.19.3",
7473
"vite": "^4.4.9",
7574
"vite-plugin-svgr": "^3.2.0",
7675
"vite-tsconfig-paths": "^4.2.0"

interface/vite.config.ts

+3-3
Original file line numberDiff line numberDiff line change
@@ -50,9 +50,9 @@ export default defineConfig(({ command, mode }) => {
5050
server: {
5151
open: true,
5252
port: 3000,
53-
watch: {
54-
usePolling: true
55-
},
53+
// watch: {
54+
// usePolling: true
55+
// },
5656
proxy: {
5757
'/rest': 'http://localhost:3080',
5858
'/api': {

0 commit comments

Comments
 (0)