From f38e0abf73816247ed17c8feea9e4756f9d9ee85 Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 8 Sep 2023 08:30:05 +0200 Subject: [PATCH 1/5] package updates --- interface/package.json | 16 +- interface/yarn.lock | 391 +++++++++++++++++++++++++++++------------ 2 files changed, 287 insertions(+), 120 deletions(-) diff --git a/interface/package.json b/interface/package.json index 1756ffb68..13a43fbda 100644 --- a/interface/package.json +++ b/interface/package.json @@ -22,13 +22,13 @@ "@alova/adapter-xhr": "^1.0.1", "@emotion/react": "^11.11.1", "@emotion/styled": "^11.11.0", - "@mui/icons-material": "^5.14.7", - "@mui/material": "^5.14.7", + "@mui/icons-material": "^5.14.8", + "@mui/material": "^5.14.8", "@preact/compat": "^17.1.2", "@prefresh/vite": "^2.4.1", "@table-library/react-table-library": "4.1.7", "@types/lodash-es": "^4.17.9", - "@types/node": "^20.5.8", + "@types/node": "^20.5.9", "@types/react": "^18.2.21", "@types/react-dom": "^18.2.7", "@types/react-router-dom": "^5.3.3", @@ -42,7 +42,7 @@ "react": "latest", "react-dom": "latest", "react-dropzone": "^14.2.3", - "react-icons": "^4.10.1", + "react-icons": "^4.11.0", "react-router-dom": "^6.15.0", "react-toastify": "^9.1.3", "sockette": "^2.0.6", @@ -50,11 +50,11 @@ "typescript": "^5.2.2" }, "devDependencies": { - "@babel/core": "^7.22.11", + "@babel/core": "^7.22.15", "@preact/preset-vite": "^2.5.0", "@types/babel__core": "^7", - "@typescript-eslint/eslint-plugin": "^6.5.0", - "@typescript-eslint/parser": "^6.5.0", + "@typescript-eslint/eslint-plugin": "^6.6.0", + "@typescript-eslint/parser": "^6.6.0", "eslint": "^8.48.0", "eslint-config-airbnb": "^19.0.4", "eslint-config-airbnb-typescript": "^17.1.0", @@ -69,7 +69,7 @@ "npm-run-all": "^4.1.5", "prettier": "^3.0.3", "rollup-plugin-visualizer": "^5.9.2", - "terser": "^5.19.3", + "terser": "^5.19.4", "vite": "^4.4.9", "vite-plugin-svgr": "^3.2.0", "vite-tsconfig-paths": "^4.2.0" diff --git a/interface/yarn.lock b/interface/yarn.lock index f5d3d136d..702b5a5c4 100644 --- a/interface/yarn.lock +++ b/interface/yarn.lock @@ -39,6 +39,16 @@ __metadata: languageName: node linkType: hard +"@babel/code-frame@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/code-frame@npm:7.22.13" + dependencies: + "@babel/highlight": ^7.22.13 + chalk: ^2.4.2 + checksum: f4cc8ae1000265677daf4845083b72f88d00d311adb1a93c94eb4b07bf0ed6828a81ae4ac43ee7d476775000b93a28a9cddec18fbdc5796212d8dcccd5de72bd + languageName: node + linkType: hard + "@babel/compat-data@npm:^7.22.9": version: 7.22.9 resolution: "@babel/compat-data@npm:7.22.9" @@ -46,7 +56,7 @@ __metadata: languageName: node linkType: hard -"@babel/core@npm:^7.21.3, @babel/core@npm:^7.22.1, @babel/core@npm:^7.22.11": +"@babel/core@npm:^7.21.3, @babel/core@npm:^7.22.1": version: 7.22.11 resolution: "@babel/core@npm:7.22.11" dependencies: @@ -69,6 +79,29 @@ __metadata: languageName: node linkType: hard +"@babel/core@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/core@npm:7.22.15" + dependencies: + "@ampproject/remapping": ^2.2.0 + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.22.15 + "@babel/helper-compilation-targets": ^7.22.15 + "@babel/helper-module-transforms": ^7.22.15 + "@babel/helpers": ^7.22.15 + "@babel/parser": ^7.22.15 + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.22.15 + "@babel/types": ^7.22.15 + convert-source-map: ^1.7.0 + debug: ^4.1.0 + gensync: ^1.0.0-beta.2 + json5: ^2.2.3 + semver: ^6.3.1 + checksum: fe7457d3b08c478c04003c8b35f23d1718c36152a4524b61b94cd4830d7a5c50c36d3d1155ce258a9fafc37790953b6c7e35a51ddb1079c47890750f1d3db46b + languageName: node + linkType: hard + "@babel/generator@npm:^7.22.10": version: 7.22.10 resolution: "@babel/generator@npm:7.22.10" @@ -81,6 +114,18 @@ __metadata: languageName: node linkType: hard +"@babel/generator@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/generator@npm:7.22.15" + dependencies: + "@babel/types": ^7.22.15 + "@jridgewell/gen-mapping": ^0.3.2 + "@jridgewell/trace-mapping": ^0.3.17 + jsesc: ^2.5.1 + checksum: d5e559584fa43490555eb3aef3480d5bb75069aa045ace638fc86111ff2a53df50d303eeaa5ef4c96e8241896807a77699ec2ff8874ed99f7d31b711660658e7 + languageName: node + linkType: hard + "@babel/helper-annotate-as-pure@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-annotate-as-pure@npm:7.22.5" @@ -103,6 +148,19 @@ __metadata: languageName: node linkType: hard +"@babel/helper-compilation-targets@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-compilation-targets@npm:7.22.15" + dependencies: + "@babel/compat-data": ^7.22.9 + "@babel/helper-validator-option": ^7.22.15 + browserslist: ^4.21.9 + lru-cache: ^5.1.1 + semver: ^6.3.1 + checksum: 45b9286861296e890f674a3abb199efea14a962a27d9b8adeb44970a9fd5c54e73a9e342e8414d2851cf4f98d5994537352fbce7b05ade32e9849bbd327f9ff1 + languageName: node + linkType: hard + "@babel/helper-environment-visitor@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-environment-visitor@npm:7.22.5" @@ -138,6 +196,30 @@ __metadata: languageName: node linkType: hard +"@babel/helper-module-imports@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-module-imports@npm:7.22.15" + dependencies: + "@babel/types": ^7.22.15 + checksum: 4e0d7fc36d02c1b8c8b3006dfbfeedf7a367d3334a04934255de5128115ea0bafdeb3e5736a2559917f0653e4e437400d54542da0468e08d3cbc86d3bbfa8f30 + languageName: node + linkType: hard + +"@babel/helper-module-transforms@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-module-transforms@npm:7.22.15" + dependencies: + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-module-imports": ^7.22.15 + "@babel/helper-simple-access": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/helper-validator-identifier": ^7.22.15 + peerDependencies: + "@babel/core": ^7.0.0 + checksum: a72c7faca63ce6dc21328f4c05857df142aef4dfe47890d9c83baeca464b2aba01a21ac5473cfd3ebe361dc95fde72e56f6a3d838a566376b962f28bd6707ac2 + languageName: node + linkType: hard + "@babel/helper-module-transforms@npm:^7.22.9": version: 7.22.9 resolution: "@babel/helper-module-transforms@npm:7.22.9" @@ -185,6 +267,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-identifier@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-validator-identifier@npm:7.22.15" + checksum: 0473ccfd123cf872206eb916ec506f8963f75db50413560d4d1674aed4cd5d9354826c2514474d6cd40637d3bdc515ba87e8035b4bed683ba62cb607e0081aaf + languageName: node + linkType: hard + "@babel/helper-validator-identifier@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-identifier@npm:7.22.5" @@ -192,6 +281,13 @@ __metadata: languageName: node linkType: hard +"@babel/helper-validator-option@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helper-validator-option@npm:7.22.15" + checksum: e9661bf80ba18e2dd978217b350fb07298e57ac417f4f1ab9fa011505e20e4857f2c3b4b538473516a9dc03af5ce3a831e5ed973311c28326f4c330b6be981c2 + languageName: node + linkType: hard + "@babel/helper-validator-option@npm:^7.22.5": version: 7.22.5 resolution: "@babel/helper-validator-option@npm:7.22.5" @@ -210,6 +306,17 @@ __metadata: languageName: node linkType: hard +"@babel/helpers@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/helpers@npm:7.22.15" + dependencies: + "@babel/template": ^7.22.15 + "@babel/traverse": ^7.22.15 + "@babel/types": ^7.22.15 + checksum: 2f4c270b53cdca4999976ddd4f20b1b8c8be04722f35745d4a0a43d35c6496e1a23d8cbecb21e6bf22502c5e4828de2bea1c1f58bed81c84bfecc8fa96b69483 + languageName: node + linkType: hard + "@babel/highlight@npm:^7.22.10": version: 7.22.10 resolution: "@babel/highlight@npm:7.22.10" @@ -221,6 +328,17 @@ __metadata: languageName: node linkType: hard +"@babel/highlight@npm:^7.22.13": + version: 7.22.13 + resolution: "@babel/highlight@npm:7.22.13" + dependencies: + "@babel/helper-validator-identifier": ^7.22.5 + chalk: ^2.4.2 + js-tokens: ^4.0.0 + checksum: 65f20132c7ada5d82d343dc23ca61bcd040980f7bd59e480532bcd7f7895aa7abe58470ae8a4f851fd244b71b42a7ad915f7c515fef8f1c2e003777721ebdbe6 + languageName: node + linkType: hard + "@babel/parser@npm:^7.1.0, @babel/parser@npm:^7.20.7, @babel/parser@npm:^7.22.11, @babel/parser@npm:^7.22.5": version: 7.22.11 resolution: "@babel/parser@npm:7.22.11" @@ -230,6 +348,15 @@ __metadata: languageName: node linkType: hard +"@babel/parser@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/parser@npm:7.22.15" + bin: + parser: ./bin/babel-parser.js + checksum: 60e0ca5ba9ba1312587367cd155fd074408dd6a6101ceb0f7e23640a5ebcab35e5fad13c0122881ab95746f06ecca6bf273dbbeeeea1e9dcc0d14062458ec72f + languageName: node + linkType: hard + "@babel/plugin-syntax-jsx@npm:^7.22.5": version: 7.22.5 resolution: "@babel/plugin-syntax-jsx@npm:7.22.5" @@ -276,6 +403,17 @@ __metadata: languageName: node linkType: hard +"@babel/template@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/template@npm:7.22.15" + dependencies: + "@babel/code-frame": ^7.22.13 + "@babel/parser": ^7.22.15 + "@babel/types": ^7.22.15 + checksum: 9312edd37cf1311d738907003f2aa321a88a42ba223c69209abe4d7111db019d321805504f606c7fd75f21c6cf9d24d0a8223104cd21ebd207e241b6c551f454 + languageName: node + linkType: hard + "@babel/template@npm:^7.22.5": version: 7.22.5 resolution: "@babel/template@npm:7.22.5" @@ -305,6 +443,24 @@ __metadata: languageName: node linkType: hard +"@babel/traverse@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/traverse@npm:7.22.15" + dependencies: + "@babel/code-frame": ^7.22.13 + "@babel/generator": ^7.22.15 + "@babel/helper-environment-visitor": ^7.22.5 + "@babel/helper-function-name": ^7.22.5 + "@babel/helper-hoist-variables": ^7.22.5 + "@babel/helper-split-export-declaration": ^7.22.6 + "@babel/parser": ^7.22.15 + "@babel/types": ^7.22.15 + debug: ^4.1.0 + globals: ^11.1.0 + checksum: 427e52e7393628c447a4a7bd5ede45c47c7cfa0ef8bc4c861fee8957fb98e2ab2b86299919056377e49a511d85672798f186b18520ee74d4a79a6ba772984e4f + languageName: node + linkType: hard + "@babel/types@npm:^7.0.0, @babel/types@npm:^7.20.7, @babel/types@npm:^7.21.3, @babel/types@npm:^7.22.10, @babel/types@npm:^7.22.11, @babel/types@npm:^7.22.5, @babel/types@npm:^7.8.3": version: 7.22.11 resolution: "@babel/types@npm:7.22.11" @@ -316,6 +472,17 @@ __metadata: languageName: node linkType: hard +"@babel/types@npm:^7.22.15": + version: 7.22.15 + resolution: "@babel/types@npm:7.22.15" + dependencies: + "@babel/helper-string-parser": ^7.22.5 + "@babel/helper-validator-identifier": ^7.22.15 + to-fast-properties: ^2.0.0 + checksum: 9324743c1586c59737b7590bbc44acc0b46317b66971fd98867ef4cfa1252ecdab2237a1a62437f579af8a2b41d998aa3efb9e8f0939d7de5f0781e91c7ac1ae + languageName: node + linkType: hard + "@emotion/babel-plugin@npm:^11.11.0": version: 11.11.0 resolution: "@emotion/babel-plugin@npm:11.11.0" @@ -787,15 +954,15 @@ __metadata: languageName: node linkType: hard -"@mui/base@npm:5.0.0-beta.13": - version: 5.0.0-beta.13 - resolution: "@mui/base@npm:5.0.0-beta.13" +"@mui/base@npm:5.0.0-beta.14": + version: 5.0.0-beta.14 + resolution: "@mui/base@npm:5.0.0-beta.14" dependencies: "@babel/runtime": ^7.22.10 "@emotion/is-prop-valid": ^1.2.1 "@floating-ui/react-dom": ^2.0.1 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.7 + "@mui/utils": ^5.14.8 "@popperjs/core": ^2.11.8 clsx: ^2.0.0 prop-types: ^15.8.1 @@ -807,20 +974,20 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: c73ac225417ae8f0eab7b57939e6d728148c4dc4a648450801c90aeadba93c1422ce07052dc3ca584f5d8f98bb3602d2fdb0b581df34a7bee5400afa07bad0b8 + checksum: 9e1bfb7a45b0fd2e39f6175fc3a792bee3344b75903e0de965f12f8f3703efdeb9a06f8712a10de1cea1fe9c438820b98d21f9c32968cfcbe09d720a148b1d19 languageName: node linkType: hard -"@mui/core-downloads-tracker@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/core-downloads-tracker@npm:5.14.7" - checksum: 8e1e91dc546ed5060524097ec72f288358c65d0da6245b3220f9fed885a519a7c04ed461de78c7bba8245a6cdb353ab8ee991838a9015a99e947c5a98ea2a5c7 +"@mui/core-downloads-tracker@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/core-downloads-tracker@npm:5.14.8" + checksum: 93d22affbc826e8e60c190548bb178bf1f616c21e1d3cbc8bef097fdefc0fd4f4788e7327063205816536886d0131064f94ff3d42eaf957a46f2234be6e1d040 languageName: node linkType: hard -"@mui/icons-material@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/icons-material@npm:5.14.7" +"@mui/icons-material@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/icons-material@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 peerDependencies: @@ -830,20 +997,20 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: 4426d57300d3c0e971b529b895b5a07ccda4cc7a48c07c7244e834f1b3e6198398d9c02b7928d7d49e15ea7e141f8ccd9fc913275251a9f49d4ce01e3fb5ba3e + checksum: 212e5563d3aa1918ec27dd4d5e4134e043bd002b078e2802e39841c1cce31e1eb2f5fbf13529b86995f402edbfc5f9cd9cb62625a43f8565928860eac537919f languageName: node linkType: hard -"@mui/material@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/material@npm:5.14.7" +"@mui/material@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/material@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 - "@mui/base": 5.0.0-beta.13 - "@mui/core-downloads-tracker": ^5.14.7 - "@mui/system": ^5.14.7 + "@mui/base": 5.0.0-beta.14 + "@mui/core-downloads-tracker": ^5.14.8 + "@mui/system": ^5.14.8 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.7 + "@mui/utils": ^5.14.8 "@types/react-transition-group": ^4.4.6 clsx: ^2.0.0 csstype: ^3.1.2 @@ -863,16 +1030,16 @@ __metadata: optional: true "@types/react": optional: true - checksum: 662bd13ceed725a31f3fab6e67530d8e0e64b145c007c07492e8a370452c613685f0a22ce205ed53e75271a2088ca0d98292b85cf7e45d688c41a10251fb0fad + checksum: b26fb4966c005cb6bbc6195d0b22f254bf8f34d81e47ea10f459c06b893122958b16f438102ce56f105abc89f21b5705cad0b13d8d4401f2c8f672ed61519861 languageName: node linkType: hard -"@mui/private-theming@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/private-theming@npm:5.14.7" +"@mui/private-theming@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/private-theming@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 - "@mui/utils": ^5.14.7 + "@mui/utils": ^5.14.8 prop-types: ^15.8.1 peerDependencies: "@types/react": ^17.0.0 || ^18.0.0 @@ -880,13 +1047,13 @@ __metadata: peerDependenciesMeta: "@types/react": optional: true - checksum: a918328930cd4f6f18eb7e6d9e7254c046895e7b129bd5e8807ecf05206859a5aef662a83d0c457319fd17c2475a6e084e44c7d833037b976b60b2a89cfa180d + checksum: 5d92f9afaf31ff2610cc455277f3ff1be5ce5de5b40d0747a60de7fef7ec82127d167cade843054318885dec634a1fe070757f269045c5fd9ac3610be9ede31a languageName: node linkType: hard -"@mui/styled-engine@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/styled-engine@npm:5.14.7" +"@mui/styled-engine@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/styled-engine@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 "@emotion/cache": ^11.11.0 @@ -901,19 +1068,19 @@ __metadata: optional: true "@emotion/styled": optional: true - checksum: a0f0abacd77dca4330471c6a30bc4f9e14248ea7b92b82ffd303733562e5dcea82c7c65cee95605389a039f80761b06c95c0f547eb977ee17f4453c306eb7978 + checksum: d1848e34239a2fa4c833d27816845f730cf57481f815212094bcb5fd9f2040efd1e790de7f7b867bfdd6de3d7a5f9406607f853db399129d2789e6a408cb7f87 languageName: node linkType: hard -"@mui/system@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/system@npm:5.14.7" +"@mui/system@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/system@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 - "@mui/private-theming": ^5.14.7 - "@mui/styled-engine": ^5.14.7 + "@mui/private-theming": ^5.14.8 + "@mui/styled-engine": ^5.14.8 "@mui/types": ^7.2.4 - "@mui/utils": ^5.14.7 + "@mui/utils": ^5.14.8 clsx: ^2.0.0 csstype: ^3.1.2 prop-types: ^15.8.1 @@ -929,7 +1096,7 @@ __metadata: optional: true "@types/react": optional: true - checksum: f1cbcb54ed9c91abbcb8f01bc2443552adf76e154404116b7bef7b6199da3123cd4f0013318680d86490172b68381184eed97a96863a461a7c25523855bbfbfb + checksum: 3333b2a8af50c3b9cbf8a4955af911635a49151a2ff75f32cd677becaa69d6a3a9814ae798e3aeb4c439ea5f1e24c66747f2434ddab70f7ff690700e69417bdb languageName: node linkType: hard @@ -945,9 +1112,9 @@ __metadata: languageName: node linkType: hard -"@mui/utils@npm:^5.14.7": - version: 5.14.7 - resolution: "@mui/utils@npm:5.14.7" +"@mui/utils@npm:^5.14.8": + version: 5.14.8 + resolution: "@mui/utils@npm:5.14.8" dependencies: "@babel/runtime": ^7.22.10 "@types/prop-types": ^15.7.5 @@ -956,7 +1123,7 @@ __metadata: react-is: ^18.2.0 peerDependencies: react: ^17.0.0 || ^18.0.0 - checksum: ec929f6e6e52953f5ae414dab185bca82c70804a7b4243f2825903f89752fbf979f19ca04ed3daf0047df6813b2d3c4acbe2dda1432b9f992ec1e4dd47fd6dda + checksum: 1949563a793a36eb31df0bc2f7cad3cffd5537cd18a130d4245e00e9f83deb9e8dccb99c530aec661a9e62262b219a4b19f0cfdaaf09ab31f3df2f28fb7f1201 languageName: node linkType: hard @@ -1355,10 +1522,10 @@ __metadata: languageName: node linkType: hard -"@types/node@npm:^20.5.8": - version: 20.5.8 - resolution: "@types/node@npm:20.5.8" - checksum: 5d4af299b4499c4658d5fed3475ad1039828c5a8a44cd15494d45d8d1097965b59246f140af43a9e94277007082e8d04bc4f7771a4b97a8292ffd7442240cffd +"@types/node@npm:^20.5.9": + version: 20.5.9 + resolution: "@types/node@npm:20.5.9" + checksum: a071a19019b4045ba65cbacb3a24fcdf1ef41474fd15fb160a082a4c7aba7643b69c5d681637d2b0ce081f2127ce4332ea4d8bf007595efe8e82ba795872c7d0 languageName: node linkType: hard @@ -1449,15 +1616,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:^6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/eslint-plugin@npm:6.5.0" +"@typescript-eslint/eslint-plugin@npm:^6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/eslint-plugin@npm:6.6.0" dependencies: "@eslint-community/regexpp": ^4.5.1 - "@typescript-eslint/scope-manager": 6.5.0 - "@typescript-eslint/type-utils": 6.5.0 - "@typescript-eslint/utils": 6.5.0 - "@typescript-eslint/visitor-keys": 6.5.0 + "@typescript-eslint/scope-manager": 6.6.0 + "@typescript-eslint/type-utils": 6.6.0 + "@typescript-eslint/utils": 6.6.0 + "@typescript-eslint/visitor-keys": 6.6.0 debug: ^4.3.4 graphemer: ^1.4.0 ignore: ^5.2.4 @@ -1470,44 +1637,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 1569ce7c6a1f578523349daaa8646435f7ea290912ece987030c9b38de96f804b3fbe293b2c87b342f42fc8f4233bd2ec837565da196748048bb097b30322052 + checksum: be6d0b4e79cb5890c3786cd87870db394914cf980cb60b756b5a2395c62743cf4c19cf81c57548ff19d141f1c967b6ab1a2c73eb7ddee261154b81d9041da923 languageName: node linkType: hard -"@typescript-eslint/parser@npm:^6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/parser@npm:6.5.0" +"@typescript-eslint/parser@npm:^6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/parser@npm:6.6.0" dependencies: - "@typescript-eslint/scope-manager": 6.5.0 - "@typescript-eslint/types": 6.5.0 - "@typescript-eslint/typescript-estree": 6.5.0 - "@typescript-eslint/visitor-keys": 6.5.0 + "@typescript-eslint/scope-manager": 6.6.0 + "@typescript-eslint/types": 6.6.0 + "@typescript-eslint/typescript-estree": 6.6.0 + "@typescript-eslint/visitor-keys": 6.6.0 debug: ^4.3.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 0b725eed37303028dc92db18d1ce2310111b606c0a9ed84b4fdf13480d580b2e05e9faed7dc1784752f609080ce1463fd3a8858b8412cce2eddb017bee907f59 + checksum: 869601abdd8a70d4cb823bda7ba838fe6ce28f908e25b8028c07cf2cc56bfe5b79f5a4b2421d5f7027bcdb2ad56df6d4eddf7903182caa384ea8b0353ca3a64e languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/scope-manager@npm:6.5.0" +"@typescript-eslint/scope-manager@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/scope-manager@npm:6.6.0" dependencies: - "@typescript-eslint/types": 6.5.0 - "@typescript-eslint/visitor-keys": 6.5.0 - checksum: aaec7d7260eef0f36e09ab54050184223b24d5c10a915ef857af49658ec910c004dfe8c799866c0f49542b36d6218610d5dff97e642e8b3b0fb0de3c53ca1b8b + "@typescript-eslint/types": 6.6.0 + "@typescript-eslint/visitor-keys": 6.6.0 + checksum: 881dc83a6cc0770bff5dd1f709883c829801241486f96e4fc38ca3e817cc33b4e09238c724974004ab2e3ffd31f1423d20e309d1c34e9bdb07e008a6f8fdee21 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/type-utils@npm:6.5.0" +"@typescript-eslint/type-utils@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/type-utils@npm:6.6.0" dependencies: - "@typescript-eslint/typescript-estree": 6.5.0 - "@typescript-eslint/utils": 6.5.0 + "@typescript-eslint/typescript-estree": 6.6.0 + "@typescript-eslint/utils": 6.6.0 debug: ^4.3.4 ts-api-utils: ^1.0.1 peerDependencies: @@ -1515,23 +1682,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: a17143e4e202a5d9e735577593285062dfc0899f91584dbd281d759f5808a39e69b3eac93ed8cd32cf14aaafac2fddbeeea0d89bb47d2e3d6960e94077dff824 + checksum: 9365b4b6f7200a86c7f78c462845e1cf252b0ce46a358de850f9d7d37afd9e34d40ac144760dcff6b3d6fe536310fa76cfc21acb680e2d98c7c6222ea8612892 languageName: node linkType: hard -"@typescript-eslint/types@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/types@npm:6.5.0" - checksum: df34f04fb22a6daf182d245c6943aa01c1696ca891edcd5e039bfa3ce5d0f917ed78f677fb006df5c9fbb1dabeb6ff4f0b80573debdfeacdd0dde1d52cacacc0 +"@typescript-eslint/types@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/types@npm:6.6.0" + checksum: b48fa3574e0c6498cffb0fda0836a1e7cc10d19dca4e0fd0718feb233da1b428f49645324dc65173385c2b7f81bb42348aa376fe47fbb15664315b7429cc7223 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/typescript-estree@npm:6.5.0" +"@typescript-eslint/typescript-estree@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/typescript-estree@npm:6.6.0" dependencies: - "@typescript-eslint/types": 6.5.0 - "@typescript-eslint/visitor-keys": 6.5.0 + "@typescript-eslint/types": 6.6.0 + "@typescript-eslint/visitor-keys": 6.6.0 debug: ^4.3.4 globby: ^11.1.0 is-glob: ^4.0.3 @@ -1540,34 +1707,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 6b5cff285a61ce1163efb257d2ba62c0c8cadff9ac3fde4cf5b4ac62ac14c76d33bf4e5b7ee920ebbfe92acaf79ed14fd9288585eedbc699083fa3a0dccd2e44 + checksum: bacdc5ea194c0bf3defa61f5be1e2367bcbf3457277e4e17d3fb1bfefa191431df6bb456d3625670cd80dd2184184bea61fa9afbba056ea590f9abcbdd665fec languageName: node linkType: hard -"@typescript-eslint/utils@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/utils@npm:6.5.0" +"@typescript-eslint/utils@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/utils@npm:6.6.0" dependencies: "@eslint-community/eslint-utils": ^4.4.0 "@types/json-schema": ^7.0.12 "@types/semver": ^7.5.0 - "@typescript-eslint/scope-manager": 6.5.0 - "@typescript-eslint/types": 6.5.0 - "@typescript-eslint/typescript-estree": 6.5.0 + "@typescript-eslint/scope-manager": 6.6.0 + "@typescript-eslint/types": 6.6.0 + "@typescript-eslint/typescript-estree": 6.6.0 semver: ^7.5.4 peerDependencies: eslint: ^7.0.0 || ^8.0.0 - checksum: 10ed3832b71262b99d5b103ed232771abf2680e1110cd0a4b97899488462e86a76a0e2dbc2419b7ef945b1f1c22a91607b05074a04fc811ad33ef6f03fb5a3cd + checksum: b24db4396a2a796f57565f3dd9fd60c38fb2b64d62c9df5e145b246d2ddab53503cd96f77d0005155160fa8b94699b4c458ea7b41bbe12c4ea2f5c92487abf1b languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:6.5.0": - version: 6.5.0 - resolution: "@typescript-eslint/visitor-keys@npm:6.5.0" +"@typescript-eslint/visitor-keys@npm:6.6.0": + version: 6.6.0 + resolution: "@typescript-eslint/visitor-keys@npm:6.6.0" dependencies: - "@typescript-eslint/types": 6.5.0 + "@typescript-eslint/types": 6.6.0 eslint-visitor-keys: ^3.4.1 - checksum: 1b7d06b933aa36a89957e89c38d8ec437df63df2ce1a76d5f5b0e293b62a758f30b44799458f189aa01c426e822a3c7ee884545e20af3a61716c94c782f84307 + checksum: 916331900aa39f91eb509954169b1230ba979577343ab6d4e380862c29408053c3325c852501241ff17c4e46ffb80ca28217f9781f627db2d20b3c4d9691ab69 languageName: node linkType: hard @@ -1576,23 +1743,23 @@ __metadata: resolution: "EMS-ESP@workspace:." dependencies: "@alova/adapter-xhr": ^1.0.1 - "@babel/core": ^7.22.11 + "@babel/core": ^7.22.15 "@emotion/react": ^11.11.1 "@emotion/styled": ^11.11.0 - "@mui/icons-material": ^5.14.7 - "@mui/material": ^5.14.7 + "@mui/icons-material": ^5.14.8 + "@mui/material": ^5.14.8 "@preact/compat": ^17.1.2 "@preact/preset-vite": ^2.5.0 "@prefresh/vite": ^2.4.1 "@table-library/react-table-library": 4.1.7 "@types/babel__core": ^7 "@types/lodash-es": ^4.17.9 - "@types/node": ^20.5.8 + "@types/node": ^20.5.9 "@types/react": ^18.2.21 "@types/react-dom": ^18.2.7 "@types/react-router-dom": ^5.3.3 - "@typescript-eslint/eslint-plugin": ^6.5.0 - "@typescript-eslint/parser": ^6.5.0 + "@typescript-eslint/eslint-plugin": ^6.6.0 + "@typescript-eslint/parser": ^6.6.0 alova: ^2.11.1 async-validator: ^4.2.5 eslint: ^8.48.0 @@ -1616,12 +1783,12 @@ __metadata: react: latest react-dom: latest react-dropzone: ^14.2.3 - react-icons: ^4.10.1 + react-icons: ^4.11.0 react-router-dom: ^6.15.0 react-toastify: ^9.1.3 rollup-plugin-visualizer: ^5.9.2 sockette: ^2.0.6 - terser: ^5.19.3 + terser: ^5.19.4 typesafe-i18n: ^5.26.2 typescript: ^5.2.2 vite: ^4.4.9 @@ -4977,12 +5144,12 @@ __metadata: languageName: node linkType: hard -"react-icons@npm:^4.10.1": - version: 4.10.1 - resolution: "react-icons@npm:4.10.1" +"react-icons@npm:^4.11.0": + version: 4.11.0 + resolution: "react-icons@npm:4.11.0" peerDependencies: react: "*" - checksum: aa4ecd390751bf61fc7967c2256eace1351c4af9a941ea4459464ac5cae012fe99970430ab659ad38a633ca55b0392d9ea5624ab3953c0bc86e1809199d6e2e2 + checksum: 95e837e11ece80cc39ef1beac026d10f96cd7e567afc718e717517beb35b82dd59307a758c10b3a449dc15d6682d6551ecc630b2821d9365819af921fa279a73 languageName: node linkType: hard @@ -5769,9 +5936,9 @@ __metadata: languageName: node linkType: hard -"terser@npm:^5.19.3": - version: 5.19.3 - resolution: "terser@npm:5.19.3" +"terser@npm:^5.19.4": + version: 5.19.4 + resolution: "terser@npm:5.19.4" dependencies: "@jridgewell/source-map": ^0.3.3 acorn: ^8.8.2 @@ -5779,7 +5946,7 @@ __metadata: source-map-support: ~0.5.20 bin: terser: bin/terser - checksum: 959d0c96552e2bcfcb2ff092295453b5163769184bbbc6ecf0e0f1c59d472a45601f1a10f9820396ac4a3facfa1a101443324d2576f75756b4c5966cef6d6408 + checksum: 39c6687609f5b9061f2fb82bee02d2f9d7756fcb5bd50c67da1482f52cf5977e03e0c5df5cb4ce17e549428024c8859075137c461ec4a9ae8cf91a505759255a languageName: node linkType: hard From b3ada4a01f128ec09cddc744e1eb677bb115487f Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 8 Sep 2023 08:30:17 +0200 Subject: [PATCH 2/5] 3.6.1-dev.2 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index d92033ee2..62f37d1be 100644 --- a/src/version.h +++ b/src/version.h @@ -1 +1 @@ -#define EMSESP_APP_VERSION "3.6.1-dev.1" +#define EMSESP_APP_VERSION "3.6.1-dev.2" From 6db5058e3d5cf2ed3361f22e8882c56d8955ffc4 Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 8 Sep 2023 08:30:24 +0200 Subject: [PATCH 3/5] updated to 3.6.1-dev.2 --- CHANGELOG_LATEST.md | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/CHANGELOG_LATEST.md b/CHANGELOG_LATEST.md index 8239fa27f..a2ca151d1 100644 --- a/CHANGELOG_LATEST.md +++ b/CHANGELOG_LATEST.md @@ -1,21 +1,22 @@ # Changelog -# [3.6.1] +## [3.6.1] ## **IMPORTANT! BREAKING CHANGES** -- shower_data MQTT topic shows duration is seconds (was previously an English string) +- `shower_data` MQTT topic shows duration is seconds (was previously a full english sentence) ## Added -- rssi in Network Status Page +- show WiFi rssi in Network Status Page ## Fixed -- issue in espMqttClient on low mem +- Issue in espMqttClient causing a memory leak when MQTT broker is disconnected due to network unavailability [#1264](https://github.com/emsesp/EMS-ESP32/issues/1264) +- Using MQTT enum values correctly formatted in MQTT Discovery [#1280](https://github.com/emsesp/EMS-ESP32/issues/1280) ## Changed -- mqtt free mem check 60k +- mqtt free mem check set to 60 kb - small cosmetic changes to Searching in Customization web page -- update to espressif32@6.4.0 +- updated to espressif32@6.4.0 From 98e29516b0f3263f972ef859275a4fc91d9d3a5b Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 8 Sep 2023 08:30:51 +0200 Subject: [PATCH 4/5] fix mqtt enum in discovery #1280 --- src/mqtt.cpp | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 7fc766964..1205dd030 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -915,10 +915,20 @@ bool Mqtt::publish_ha_sensor_config(uint8_t type, // EMSdev // for enums, add options if (type == DeviceValueType::ENUM) { JsonArray option_list = doc.createNestedArray("ops"); // options - for (uint8_t i = 0; i < options_size; i++) { - option_list.add(Helpers::translated_word(options[i])); + if (EMSESP::system_.enum_format() == ENUM_FORMAT_INDEX) { + // use index numbers + for (uint8_t i = 0; i < options_size; i++) { + option_list.add(i); + } + snprintf(sample_val, sizeof(sample_val), "0"); + } else { + // use strings + for (uint8_t i = 0; i < options_size; i++) { + option_list.add(Helpers::translated_word(options[i])); + } + snprintf(sample_val, sizeof(sample_val), "'%s'", Helpers::translated_word(options[0])); } - snprintf(sample_val, sizeof(sample_val), "'%s'", Helpers::translated_word(options[0])); + } else if (type != DeviceValueType::STRING && type != DeviceValueType::BOOL) { // Must be Numeric.... doc["mode"] = "box"; // auto, slider or box From 6e3c2b2ec90a16cecb3c91bbe095a61dbde5c64a Mon Sep 17 00:00:00 2001 From: Proddy Date: Fri, 8 Sep 2023 08:34:19 +0200 Subject: [PATCH 5/5] update example for debug --- pio_local.ini_example | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/pio_local.ini_example b/pio_local.ini_example index 1e70e81db..5180d1c53 100644 --- a/pio_local.ini_example +++ b/pio_local.ini_example @@ -18,6 +18,7 @@ default_envs = esp32_4M ; default_envs = esp32_16M ; default_envs = lolin_s3 ; default_envs = standalone +; default_envs = debug [env:esp32_4M] ; if using OTA enter your details below @@ -33,6 +34,8 @@ upload_port = /dev/ttyUSB* ; override arduino espressif core platform = espressif32 ; take latest ; platform = espressif32@5.3.0 +; platform = espressif32@6.3.2 +; platform = espressif32@6.4.0 extra_scripts = pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time @@ -52,13 +55,21 @@ extra_scripts = ; options for debugging are: EMSESP_DEBUG EMSESP_UART_DEBUG EMSESP_DEBUG_SENSOR [env:debug] board = esp32dev +framework = arduino platform = espressif32 board_build.partitions = esp32_partition_debug.csv +; board_build.partitions = esp32_partition_4M.csv +board_upload.flash_size = 4MB +board_build.filesystem = littlefs upload_protocol = esptool build_type = debug monitor_raw = no monitor_filters = esp32_exception_decoder debug_tool = esp-prog debug_init_break = tbreak setup -build_flags = ${factory_settings.build_flags} -DONEWIRE_CRC16=0 -DNO_GLOBAL_ARDUINOOTA -DARDUINOJSON_ENABLE_STD_STRING=1 -DESP32=1 -DARDUINO_ARCH_ESP32=1 -extra_scripts = pre:scripts/build_interface.py +build_flags = ${factory_settings.build_flags} -DEMSESP_EN_ONLY -DCORE_DEBUG_LEVEL=5 -DONEWIRE_CRC16=0 -DNO_GLOBAL_ARDUINOOTA -DARDUINOJSON_ENABLE_STD_STRING=1 -DESP32=1 -DARDUINO_ARCH_ESP32=1 +upload_port = /dev/ttyUSB0 +extra_scripts = + ; pre:scripts/build_interface.py ; comment out if you don't want to re-build the WebUI each time + scripts/rename_fw.py + ; post:scripts/app-tls-size.py