diff --git a/.prettierignore b/interface/.prettierignore similarity index 60% rename from .prettierignore rename to interface/.prettierignore index 370f2dd2b..e3510820a 100644 --- a/.prettierignore +++ b/interface/.prettierignore @@ -2,4 +2,5 @@ node_modules/ build/ dist/ .prettierrc -.yarn/ \ No newline at end of file +.yarn/ +.typesafe-i18n.json \ No newline at end of file diff --git a/interface/package.json b/interface/package.json index 19f5ab30c..a0fbb284f 100644 --- a/interface/package.json +++ b/interface/package.json @@ -29,10 +29,10 @@ "@table-library/react-table-library": "4.1.7", "@types/lodash-es": "^4.17.8", "@types/node": "^20.4.9", - "@types/react": "^18.2.19", + "@types/react": "^18.2.20", "@types/react-dom": "^18.2.7", "@types/react-router-dom": "^5.3.3", - "alova": "^2.9.3", + "alova": "^2.10.0", "async-validator": "^4.2.5", "history": "^5.3.0", "jwt-decode": "^3.1.2", @@ -43,7 +43,7 @@ "react-dom": "latest", "react-dropzone": "^14.2.3", "react-icons": "^4.10.1", - "react-router-dom": "^6.14.2", + "react-router-dom": "^6.15.0", "react-toastify": "^9.1.3", "sockette": "^2.0.6", "typesafe-i18n": "^5.26.0", @@ -55,11 +55,11 @@ "@types/babel__core": "^7", "@typescript-eslint/eslint-plugin": "^6.3.0", "@typescript-eslint/parser": "^6.3.0", - "eslint": "^8.46.0", + "eslint": "^8.47.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.1.0", "eslint-config-prettier": "^9.0.0", - "eslint-import-resolver-typescript": "^3.5.5", + "eslint-import-resolver-typescript": "^3.6.0", "eslint-plugin-autofix": "^1.1.0", "eslint-plugin-import": "^2.28.0", "eslint-plugin-jsx-a11y": "^6.7.1", diff --git a/interface/vite.config.ts b/interface/vite.config.ts index 700091981..b0a3b181d 100644 --- a/interface/vite.config.ts +++ b/interface/vite.config.ts @@ -4,7 +4,6 @@ import svgrPlugin from 'vite-plugin-svgr'; import { visualizer } from 'rollup-plugin-visualizer'; import ProgmemGenerator from './progmem-generator'; import preact from '@preact/preset-vite'; -// import prefresh from '@prefresh/vite'; export default defineConfig(({ command, mode }) => { if (mode === 'hosted') { @@ -19,7 +18,6 @@ export default defineConfig(({ command, mode }) => { preact(), viteTsconfigPaths(), svgrPlugin(), - // prefresh() ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }) ], @@ -52,6 +50,9 @@ export default defineConfig(({ command, mode }) => { server: { open: true, port: 3000, + watch: { + usePolling: true + }, proxy: { '/rest': 'http://localhost:3080', '/api': { @@ -69,6 +70,3 @@ export default defineConfig(({ command, mode }) => { }; } }); -function prefresh(): PluginOption { - throw new Error('Function not implemented.'); -} diff --git a/interface/yarn.lock b/interface/yarn.lock index 40e839e92..b5ca3a137 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -753,9 +753,9 @@ __metadata: languageName: node linkType: hard -"@eslint/eslintrc@npm:^2.1.1": - version: 2.1.1 - resolution: "@eslint/eslintrc@npm:2.1.1" +"@eslint/eslintrc@npm:^2.1.2": + version: 2.1.2 + resolution: "@eslint/eslintrc@npm:2.1.2" dependencies: ajv: ^6.12.4 debug: ^4.3.2 @@ -766,14 +766,14 @@ __metadata: js-yaml: ^4.1.0 minimatch: ^3.1.2 strip-json-comments: ^3.1.1 - checksum: 104ec8997206eabc87de84b87a2852efce0ff98730d377061734da2554c79c9b6d417fbe66248ef5566a0501ef41fddec3a00f79b77731102903586a63b2ed34 + checksum: 00efdc3797e6f05518060522b7788e5f5aff02f13facbd0c83b176c3dee86554023283a5f68542df379c5137685d2d29745c87f62bf2406a1d38d95471f44ce6 languageName: node linkType: hard -"@eslint/js@npm:^8.46.0": - version: 8.46.0 - resolution: "@eslint/js@npm:8.46.0" - checksum: 674c5800e4e9829322aa84195b23c59db326cb42190ac0284bdfe70b2442d544837f3006d8d8c166afaa86ab7072df1b77f7fdb43a60aa2bb1ede90d82e38540 +"@eslint/js@npm:^8.47.0": + version: 8.47.0 + resolution: "@eslint/js@npm:8.47.0" + checksum: fb5b1377f0d7a8299c65baa856b23a7976165b0fc269b6220fd8e6dfb7fa29de83528b16226ccbe3625f24082a53ec8ca19d75d89f057478f17871b4fcdb32a0 languageName: node linkType: hard @@ -1178,10 +1178,10 @@ __metadata: languageName: node linkType: hard -"@remix-run/router@npm:1.7.2": - version: 1.7.2 - resolution: "@remix-run/router@npm:1.7.2" - checksum: 01b1b57cae81c2a87fd2125d19918073c5832171957b958c476fd2b95c9f80aef51b1e54cfbe05da123bd8f4517321b27e9905e4552364925dc5a308e6544cfb +"@remix-run/router@npm:1.8.0": + version: 1.8.0 + resolution: "@remix-run/router@npm:1.8.0" + checksum: 19412054e6d5e2e77e57735b2d937372f9ac164187180fe211c79bee04f1f5db91b859ef72f92055bffee3eb3eaa1aebe5033e366415cc386b4f345b08607eee languageName: node linkType: hard @@ -1522,14 +1522,14 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:^18.2.19": - version: 18.2.19 - resolution: "@types/react@npm:18.2.19" +"@types/react@npm:^18.2.20": + version: 18.2.20 + resolution: "@types/react@npm:18.2.20" dependencies: "@types/prop-types": "*" "@types/scheduler": "*" csstype: ^3.0.2 - checksum: 8ebea4e6e154b32135e54d8ead9ec2d7c99bdeb0b5d51b4a01dfcb0a6eaf0cea566463148abff8755b29e2aea8c3e66dc09e6cfface2161f46fc9a023823ffd3 + checksum: 42bab593f14b202a5ee98073ed579f147de9e4dd4dcdefcba19588cf06c0fff83f0a602db535e9ff0c0896a3aa25759841ebddb59a2c7c293cb6981ddee08fd0 languageName: node linkType: hard @@ -1687,18 +1687,18 @@ __metadata: "@types/babel__core": ^7 "@types/lodash-es": ^4.17.8 "@types/node": ^20.4.9 - "@types/react": ^18.2.19 + "@types/react": ^18.2.20 "@types/react-dom": ^18.2.7 "@types/react-router-dom": ^5.3.3 "@typescript-eslint/eslint-plugin": ^6.3.0 "@typescript-eslint/parser": ^6.3.0 - alova: ^2.9.3 + alova: ^2.10.0 async-validator: ^4.2.5 - eslint: ^8.46.0 + eslint: ^8.47.0 eslint-config-airbnb: ^19.0.4 eslint-config-airbnb-typescript: ^17.1.0 eslint-config-prettier: ^9.0.0 - eslint-import-resolver-typescript: ^3.5.5 + eslint-import-resolver-typescript: ^3.6.0 eslint-plugin-autofix: ^1.1.0 eslint-plugin-import: ^2.28.0 eslint-plugin-jsx-a11y: ^6.7.1 @@ -1717,7 +1717,7 @@ __metadata: react-dom: latest react-dropzone: ^14.2.3 react-icons: ^4.10.1 - react-router-dom: ^6.14.2 + react-router-dom: ^6.15.0 react-toastify: ^9.1.3 rollup-plugin-visualizer: ^5.9.2 sockette: ^2.0.6 @@ -1797,10 +1797,10 @@ __metadata: languageName: node linkType: hard -"alova@npm:^2.9.3": - version: 2.9.3 - resolution: "alova@npm:2.9.3" - checksum: 1b63c2750e1ee027178c64c414c4fe720112f35ca7b13d7b24d3d9573c4ac4a7b17eae7cc06bed4f9f1bc29a45e337df0d638bdd92a92ad43cff0a19d9d77402 +"alova@npm:^2.10.0": + version: 2.10.0 + resolution: "alova@npm:2.10.0" + checksum: 959b68ca90dbf03f4781f412e37617022a4aaa8bb1df50efd018979907fb03aeb3442773b00730687b878cd3eaea48633b3b45e900fd2a0ce8924694a22dfe3f languageName: node linkType: hard @@ -2861,22 +2861,21 @@ __metadata: languageName: node linkType: hard -"eslint-import-resolver-typescript@npm:^3.5.5": - version: 3.5.5 - resolution: "eslint-import-resolver-typescript@npm:3.5.5" +"eslint-import-resolver-typescript@npm:^3.6.0": + version: 3.6.0 + resolution: "eslint-import-resolver-typescript@npm:3.6.0" dependencies: debug: ^4.3.4 enhanced-resolve: ^5.12.0 eslint-module-utils: ^2.7.4 + fast-glob: ^3.3.1 get-tsconfig: ^4.5.0 - globby: ^13.1.3 is-core-module: ^2.11.0 is-glob: ^4.0.3 - synckit: ^0.8.5 peerDependencies: eslint: "*" eslint-plugin-import: "*" - checksum: 6cdbfae5be1087b2f18fd82939697f085a9b766e518494c45efd84b3eba3e2640f00e155b824cff4d1d9d518b46cc86082e7c72a37c784b22f5064d55c634724 + checksum: 4f3b7e629e37c52804da0e4fe3eda5fdd727fd1d945fad5662bcd64a87fafa08b986efe07fb2116c81f2259ba29d6d06b99edafd7d3499cfb78ff71b6e8ca4c1 languageName: node linkType: hard @@ -3031,21 +3030,28 @@ __metadata: languageName: node linkType: hard -"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1, eslint-visitor-keys@npm:^3.4.2": +"eslint-visitor-keys@npm:^3.3.0, eslint-visitor-keys@npm:^3.4.1": version: 3.4.2 resolution: "eslint-visitor-keys@npm:3.4.2" checksum: 4521d1d470490c89fb613aec6fb2f0814b496a4618619ec8dfcc985640fe33c9c64f3dab882f50ebb401b4613f35f2601a9ef9a72b57739af5b0150fecdaf1f1 languageName: node linkType: hard -"eslint@npm:^8.46.0": - version: 8.46.0 - resolution: "eslint@npm:8.46.0" +"eslint-visitor-keys@npm:^3.4.3": + version: 3.4.3 + resolution: "eslint-visitor-keys@npm:3.4.3" + checksum: 92708e882c0a5ffd88c23c0b404ac1628cf20104a108c745f240a13c332a11aac54f49a22d5762efbffc18ecbc9a580d1b7ad034bf5f3cc3307e5cbff2ec9820 + languageName: node + linkType: hard + +"eslint@npm:^8.47.0": + version: 8.47.0 + resolution: "eslint@npm:8.47.0" dependencies: "@eslint-community/eslint-utils": ^4.2.0 "@eslint-community/regexpp": ^4.6.1 - "@eslint/eslintrc": ^2.1.1 - "@eslint/js": ^8.46.0 + "@eslint/eslintrc": ^2.1.2 + "@eslint/js": ^8.47.0 "@humanwhocodes/config-array": ^0.11.10 "@humanwhocodes/module-importer": ^1.0.1 "@nodelib/fs.walk": ^1.2.8 @@ -3056,7 +3062,7 @@ __metadata: doctrine: ^3.0.0 escape-string-regexp: ^4.0.0 eslint-scope: ^7.2.2 - eslint-visitor-keys: ^3.4.2 + eslint-visitor-keys: ^3.4.3 espree: ^9.6.1 esquery: ^1.4.2 esutils: ^2.0.2 @@ -3081,7 +3087,7 @@ __metadata: text-table: ^0.2.0 bin: eslint: bin/eslint.js - checksum: 81abddb21e540dcd509ba08fdf524b494cbda69a62ffce2a61b5adfcdeb3cbf713f72c6cbb42932333decb4b067ae7a89e4cb5e908e0d42e4287d4f357576a72 + checksum: b6c69f2ca34990027cfe7d46c956672583549b2a13d118791ee60ad1fa3e5057ab7781b27c9b0ea76dc67f7e980b33e106ad07d54c83464ab9ba03d2ec832f36 languageName: node linkType: hard @@ -3190,7 +3196,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0": +"fast-glob@npm:^3.2.9, fast-glob@npm:^3.3.0, fast-glob@npm:^3.3.1": version: 3.3.1 resolution: "fast-glob@npm:3.3.1" dependencies: @@ -3530,19 +3536,6 @@ __metadata: languageName: node linkType: hard -"globby@npm:^13.1.3": - version: 13.2.2 - resolution: "globby@npm:13.2.2" - dependencies: - dir-glob: ^3.0.1 - fast-glob: ^3.3.0 - ignore: ^5.2.4 - merge2: ^1.4.1 - slash: ^4.0.0 - checksum: a8d7cc7cbe5e1b2d0f81d467bbc5bc2eac35f74eaded3a6c85fc26d7acc8e6de22d396159db8a2fc340b8a342e74cac58de8f4aee74146d3d146921a76062664 - languageName: node - linkType: hard - "globrex@npm:^0.1.2": version: 0.1.2 resolution: "globrex@npm:0.1.2" @@ -5125,27 +5118,27 @@ __metadata: languageName: node linkType: hard -"react-router-dom@npm:^6.14.2": - version: 6.14.2 - resolution: "react-router-dom@npm:6.14.2" +"react-router-dom@npm:^6.15.0": + version: 6.15.0 + resolution: "react-router-dom@npm:6.15.0" dependencies: - "@remix-run/router": 1.7.2 - react-router: 6.14.2 + "@remix-run/router": 1.8.0 + react-router: 6.15.0 peerDependencies: react: ">=16.8" react-dom: ">=16.8" - checksum: c2025a8d2ddd97438acdee55cdcc6349ad006e17f363c2ea03c2c8f4f82556fb390de287bda7d28f422952d6ab6c91cb058363f214343c26707b194f2eee438b + checksum: 2555468ab38468c7449d617ed2f60f07a310078b71a1a8db907bc354064f6d34e03f5d9d273d3d8528c04dbb51c27bfa40eb2167cff9df4a19438003c4b04280 languageName: node linkType: hard -"react-router@npm:6.14.2": - version: 6.14.2 - resolution: "react-router@npm:6.14.2" +"react-router@npm:6.15.0": + version: 6.15.0 + resolution: "react-router@npm:6.15.0" dependencies: - "@remix-run/router": 1.7.2 + "@remix-run/router": 1.8.0 peerDependencies: react: ">=16.8" - checksum: cd978b947b4df493128e79d0aeebbea58839beee7bbf5ebaa5fb98ead21da5b69d09344c4ee8803a870fff9a99902b1700706d6639f03e637d956b278af0a47d + checksum: 19be638294926e2d6b1ca6de753d3b69ac9cd3e295158f933a2c5d9befe2d6dd84f2b15d45d904ac5009f813901183b0a92d50f9d4c2f496c974192b0b8fb2ec languageName: node linkType: hard @@ -5568,13 +5561,6 @@ __metadata: languageName: node linkType: hard -"slash@npm:^4.0.0": - version: 4.0.0 - resolution: "slash@npm:4.0.0" - checksum: b522ca75d80d107fd30d29df0549a7b2537c83c4c4ecd12cd7d4ea6c8aaca2ab17ada002e7a1d78a9d736a0261509f26ea5b489082ee443a3a810586ef8eff18 - languageName: node - linkType: hard - "smart-buffer@npm:^4.2.0": version: 4.2.0 resolution: "smart-buffer@npm:4.2.0" diff --git a/src/version.h b/src/version.h index dc1290e70..9412a54d6 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.6.0-dev.17" +#define EMSESP_APP_VERSION "3.6.0-dev.18"