From f39deefbb444c0d7358eed044530d4e3d8b55102 Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 8 Aug 2023 15:48:45 +0200 Subject: [PATCH 1/3] add vscode extensions --- .gitignore | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 4d67849f9..7a033d0fb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,6 @@ # vscode .vscode/c_cpp_properties.json -# .vscode/extensions.json +.vscode/extensions.json .vscode/launch.json # .vscode/settings.json From 0924f441cb82b130d43d6fa7007bdeea26875bfc Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 8 Aug 2023 15:48:54 +0200 Subject: [PATCH 2/3] update packages --- interface/package.json | 6 +-- interface/yarn.lock | 95 +++++++++++++++++++++++------------------- 2 files changed, 56 insertions(+), 45 deletions(-) diff --git a/interface/package.json b/interface/package.json index 7de7d4bc6..02f6494ee 100644 --- a/interface/package.json +++ b/interface/package.json @@ -23,13 +23,13 @@ "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", "@mui/icons-material": "^5.14.3", - "@mui/material": "^5.14.3", + "@mui/material": "^5.14.4", "@preact/compat": "^17.1.2", "@prefresh/vite": "^2.4.1", - "@table-library/react-table-library": "4.1.4", + "@table-library/react-table-library": "4.1.6", "@types/lodash-es": "^4.17.8", "@types/node": "^20.4.8", - "@types/react": "^18.2.18", + "@types/react": "^18.2.19", "@types/react-dom": "^18.2.7", "@types/react-router-dom": "^5.3.3", "alova": "^2.9.3", diff --git a/interface/yarn.lock b/interface/yarn.lock index 91fd2cb6b..52ec53c6c 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -357,7 +357,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.5, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7": +"@babel/runtime@npm:^7.0.0, @babel/runtime@npm:^7.12.5, @babel/runtime@npm:^7.18.3, @babel/runtime@npm:^7.20.7, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.22.6, @babel/runtime@npm:^7.5.5, @babel/runtime@npm:^7.7.6, @babel/runtime@npm:^7.8.7": version: 7.22.6 resolution: "@babel/runtime@npm:7.22.6" dependencies: @@ -875,14 +875,14 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.9": - version: 5.0.0-beta.9 - resolution: "@mui/base@npm:5.0.0-beta.9" +"@mui/base@npm:5.0.0-beta.10": + version: 5.0.0-beta.10 + resolution: "@mui/base@npm:5.0.0-beta.10" dependencies: "@babel/runtime": ^7.22.6 "@emotion/is-prop-valid": ^1.2.1 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.3 + "@mui/utils": ^5.14.4 "@popperjs/core": ^2.11.8 clsx: ^2.0.0 prop-types: ^15.8.1 @@ -894,14 +894,14 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: adf4e08b0798266ecf80c50b8898913c46cae829958b938c69a662bd88146a112d15277e257043ab540e95d397710388b7e59d2043f45faef9e6a993415d46a5 + checksum: c7563a107334ef47eff5aa2595b0200f3b4061a0757aa0fb43e5c56e2fba594b20a3a535ea9847fa6e7138f4fcff7e67893193fb647730a2a6b0cb9ea1016c9a languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^5.14.3": - version: 5.14.3 - resolution: "@mui/core-downloads-tracker@npm:5.14.3" - checksum: aa26434efc2e36aeb58f5f56d879a02eb064765bb3c82abe6e9e72330b6778852852e11ecc6166aecf168b1f6f07d81d4ecf84f8b3f2978587485013d5e82c54 +"@mui/core-downloads-tracker@npm:^5.14.4": + version: 5.14.4 + resolution: "@mui/core-downloads-tracker@npm:5.14.4" + checksum: 23d652570020fcba2956dcc53da94da0242a900a3fa5ca4af1bfcb74f4ea6bc6f6725e1908dde232caf3a3a55fc0ab34fcb05832e3a41fbd8070b3d13a6aa6cc languageName: node linkType: hard @@ -921,16 +921,16 @@ __metadata: languageName: node linkType: hard -"@mui/material@npm:^5.14.3": - version: 5.14.3 - resolution: "@mui/material@npm:5.14.3" +"@mui/material@npm:^5.14.4": + version: 5.14.4 + resolution: "@mui/material@npm:5.14.4" dependencies: "@babel/runtime": ^7.22.6 - "@mui/base": 5.0.0-beta.9 - "@mui/core-downloads-tracker": ^5.14.3 - "@mui/system": ^5.14.3 + "@mui/base": 5.0.0-beta.10 + "@mui/core-downloads-tracker": ^5.14.4 + "@mui/system": ^5.14.4 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.3 + "@mui/utils": ^5.14.4 "@types/react-transition-group": ^4.4.6 clsx: ^2.0.0 csstype: ^3.1.2 @@ -950,16 +950,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 29c3122b57423467b8ece41dacffb0bf8bdec5cd498d61ab6c0d320cd2a6d567e78ce3658a2987c2d5ab474b4396104af99308193d51a53c51d0e2ac3e99bb8b + checksum: 653b87fbd92de29a0e37579651333bea078518a81cbbab6f37b807aee10af438a050660b887da81ee5df8d14f688b169573f4f709f0e6c28d4a19c9de2eed502 languageName: node linkType: hard -"@mui/private-theming@npm:^5.13.7": - version: 5.13.7 - resolution: "@mui/private-theming@npm:5.13.7" +"@mui/private-theming@npm:^5.14.4": + version: 5.14.4 + resolution: "@mui/private-theming@npm:5.14.4" dependencies: - "@babel/runtime": ^7.22.5 - "@mui/utils": ^5.13.7 + "@babel/runtime": ^7.22.6 + "@mui/utils": ^5.14.4 prop-types: ^15.8.1 peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 @@ -967,7 +967,7 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: e38b0a441f55651767a8b29d767c9457d368ab0870f76d38d001fd127663796a219f8c50be79a71343faa798e1ae78b4b379d3c1e391fb0910b27fedf5ce3f70 + checksum: 647c19aab6420c4cd5529220c30afa77278badb8cff0251f84bc0d41b566f9c3f3771a59f1100d87a90f420a057679bc9e696da0fcd56272bf3fb4c13769fb8b languageName: node linkType: hard @@ -992,15 +992,15 @@ __metadata: languageName: node linkType: hard -"@mui/system@npm:^5.14.3": - version: 5.14.3 - resolution: "@mui/system@npm:5.14.3" +"@mui/system@npm:^5.14.4": + version: 5.14.4 + resolution: "@mui/system@npm:5.14.4" dependencies: "@babel/runtime": ^7.22.6 - "@mui/private-theming": ^5.13.7 + "@mui/private-theming": ^5.14.4 "@mui/styled-engine": ^5.13.2 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.3 + "@mui/utils": ^5.14.4 clsx: ^2.0.0 csstype: ^3.1.2 prop-types: ^15.8.1 @@ -1016,7 +1016,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: 8fef8203a024ea24b581096cc9a72ef0d6df3bf492949faf603dee242a3d36c74903d5683cda786af228a7ad5c169b40e83f101030dab149e7857cf77c59fed1 + checksum: d8d74d5c05cd73cf859649ca2abbbaccc37bf6b87a122c09f080349f3e22e3d1c4cacc1f6d23a808b19078eba9a68a6ac2781e0783f6ca18d66964306c766f78 languageName: node linkType: hard @@ -1032,9 +1032,9 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.13.7, @mui/utils@npm:^5.14.3": - version: 5.14.3 - resolution: "@mui/utils@npm:5.14.3" +"@mui/utils@npm:^5.14.4": + version: 5.14.4 + resolution: "@mui/utils@npm:5.14.4" dependencies: "@babel/runtime": ^7.22.6 "@types/prop-types": ^15.7.5 @@ -1043,7 +1043,7 @@ __metadata: react-is: ^18.2.0 peerDependencies: react: ^17.0.0 || ^18.0.0 - checksum: 0f713f45639865df7babcd34bd69f5dc7214f27f31a519671f67c98d4b5c971e1e3e5321cca5ffa533f500eb8ebb88b806534202c2800d9395b43cabfb24d42a + checksum: ad0d6ac443cc99c74949bd0cac86034ea2c847419e014e2e49f9bf1d1c648d05649d682145fc7ff632b064bbf9f582a28e313091388ed6e640266c2a0ecf8533 languageName: node linkType: hard @@ -1335,9 +1335,9 @@ __metadata: languageName: node linkType: hard -"@table-library/react-table-library@npm:4.1.4": - version: 4.1.4 - resolution: "@table-library/react-table-library@npm:4.1.4" +"@table-library/react-table-library@npm:4.1.6": + version: 4.1.6 + resolution: "@table-library/react-table-library@npm:4.1.6" dependencies: clsx: 1.1.1 react-virtualized-auto-sizer: 1.0.7 @@ -1346,7 +1346,7 @@ __metadata: "@emotion/react": ">= 11" react: ">=16.8.0" react-dom: ">=16.8.0" - checksum: ace2711b777e596ed5fd1623108ac8fb7403566b108725f97e6710019a11f28f1f86b916932a662ad53ad18c994ba626f0b2fd7e6be91c44dff16d54e0364f0d + checksum: 148b33000353068d2f40ce4e18d5c3314e4d66840822f83abbdc5c3cd9c82c297f28eea3df0ea2231308c56cc5fe34c5d4ab69be38a066cd4fd18e25214a76c0 languageName: node linkType: hard @@ -1511,7 +1511,7 @@ __metadata: languageName: node linkType: hard -"@types/react@npm:*, @types/react@npm:^18.2.18": +"@types/react@npm:*": version: 18.2.18 resolution: "@types/react@npm:18.2.18" dependencies: @@ -1522,6 +1522,17 @@ __metadata: languageName: node linkType: hard +"@types/react@npm:^18.2.19": + version: 18.2.19 + resolution: "@types/react@npm:18.2.19" + dependencies: + "@types/prop-types": "*" + "@types/scheduler": "*" + csstype: ^3.0.2 + checksum: 8ebea4e6e154b32135e54d8ead9ec2d7c99bdeb0b5d51b4a01dfcb0a6eaf0cea566463148abff8755b29e2aea8c3e66dc09e6cfface2161f46fc9a023823ffd3 + languageName: node + linkType: hard + "@types/scheduler@npm:*": version: 0.16.3 resolution: "@types/scheduler@npm:0.16.3" @@ -1668,15 +1679,15 @@ __metadata: "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 "@mui/icons-material": ^5.14.3 - "@mui/material": ^5.14.3 + "@mui/material": ^5.14.4 "@preact/compat": ^17.1.2 "@preact/preset-vite": ^2.5.0 "@prefresh/vite": ^2.4.1 - "@table-library/react-table-library": 4.1.4 + "@table-library/react-table-library": 4.1.6 "@types/babel__core": ^7 "@types/lodash-es": ^4.17.8 "@types/node": ^20.4.8 - "@types/react": ^18.2.18 + "@types/react": ^18.2.19 "@types/react-dom": ^18.2.7 "@types/react-router-dom": ^5.3.3 "@typescript-eslint/eslint-plugin": ^6.3.0 From faa3479f0aa3d74b1b3b0edd139f8a11dacd1065 Mon Sep 17 00:00:00 2001 From: Proddy Date: Tue, 8 Aug 2023 15:49:08 +0200 Subject: [PATCH 3/3] make progmem work again --- interface/vite.config.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/interface/vite.config.ts b/interface/vite.config.ts index bedec9b79..700091981 100644 --- a/interface/vite.config.ts +++ b/interface/vite.config.ts @@ -18,9 +18,9 @@ export default defineConfig(({ command, mode }) => { plugins: [ preact(), viteTsconfigPaths(), - svgrPlugin() + svgrPlugin(), // prefresh() - // ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }) + ProgmemGenerator({ outputPath: '../lib/framework/WWWData.h', bytesPerLine: 20 }) ], build: {