From 34ed446cd28076e5627b5313e9d59d231c30babe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 25 Jan 2023 11:40:00 -0500 Subject: [PATCH 01/37] Bump superstruct from 0.15.2 to 1.0.3 (#15190) Bumps [superstruct](https://github.com/ianstormtaylor/superstruct) from 0.15.2 to 1.0.3. - [Release notes](https://github.com/ianstormtaylor/superstruct/releases) - [Changelog](https://github.com/ianstormtaylor/superstruct/blob/main/Changelog.md) - [Commits](https://github.com/ianstormtaylor/superstruct/compare/v0.15.2...v1.0.3) --- updated-dependencies: - dependency-name: superstruct dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8275958cd7..5ff8928eca 100644 --- a/package.json +++ b/package.json @@ -128,7 +128,7 @@ "roboto-fontface": "^0.10.0", "rrule": "^2.7.1", "sortablejs": "^1.14.0", - "superstruct": "^0.15.2", + "superstruct": "^1.0.3", "tinykeys": "^1.1.3", "tsparticles": "^1.34.0", "unfetch": "^4.1.0", diff --git a/yarn.lock b/yarn.lock index 621c90a886..1ca4b6ca31 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9620,7 +9620,7 @@ fsevents@^1.2.7: sinon: ^15.0.1 sortablejs: ^1.14.0 source-map-url: ^0.4.0 - superstruct: ^0.15.2 + superstruct: ^1.0.3 systemjs: ^6.3.2 tar: ^6.1.11 terser-webpack-plugin: ^5.2.4 @@ -14940,10 +14940,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"superstruct@npm:^0.15.2": - version: 0.15.2 - resolution: "superstruct@npm:0.15.2" - checksum: 237b25ed14eda63d9549ef4475508a864304a398c99001cc2436e716b746cddab2be233dc90f93c1b10b4c5d0a08ee7efd7ecdb73b91064276440f2d30f94560 +"superstruct@npm:^1.0.3": + version: 1.0.3 + resolution: "superstruct@npm:1.0.3" + checksum: 761790bb111e6e21ddd608299c252f3be35df543263a7ebbc004e840d01fcf8046794c274bcb351bdf3eae4600f79d317d085cdbb19ca05803a4361840cc9bb1 languageName: node linkType: hard From 25f7a0602ae53271443f2d75e8f0b783eb3ac5b1 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 05:52:16 +0000 Subject: [PATCH 02/37] Bump gulp-merge-json from 1.3.1 to 2.1.2 (#15173) * Bump gulp-merge-json from 1.3.1 to 2.1.2 Bumps [gulp-merge-json](https://github.com/joshswan/gulp-merge-json) from 1.3.1 to 2.1.2. - [Release notes](https://github.com/joshswan/gulp-merge-json/releases) - [Commits](https://github.com/joshswan/gulp-merge-json/compare/1.3.1...v2.1.2) --- updated-dependencies: - dependency-name: gulp-merge-json dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Deduplicate dependencies Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- package.json | 2 +- yarn.lock | 30 +++++++++++------------------- 2 files changed, 12 insertions(+), 20 deletions(-) diff --git a/package.json b/package.json index 5ff8928eca..84aec0726c 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "gulp": "^4.0.2", "gulp-flatmap": "^1.0.2", "gulp-json-transform": "^0.4.6", - "gulp-merge-json": "^1.3.1", + "gulp-merge-json": "^2.1.2", "gulp-rename": "^2.0.0", "gulp-zopfli-green": "^3.0.1", "html-minifier": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index 1ca4b6ca31..86b35c8f08 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7382,13 +7382,6 @@ __metadata: languageName: node linkType: hard -"deprecate@npm:^1.0.0": - version: 1.1.0 - resolution: "deprecate@npm:1.1.0" - checksum: 4931671bb9d1f8d5d29591da4dd2903cb0375d352116f34700145fb1c8d3c581dab827678292e37869c4821bb8b1e8e0bf36dfe62290d38c5a61eba730bfbed4 - languageName: node - linkType: hard - "deprecation@npm:^2.0.0, deprecation@npm:^2.3.1": version: 2.3.1 resolution: "deprecation@npm:2.3.1" @@ -9247,17 +9240,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"gulp-merge-json@npm:^1.3.1": - version: 1.3.1 - resolution: "gulp-merge-json@npm:1.3.1" +"gulp-merge-json@npm:^2.1.2": + version: 2.1.2 + resolution: "gulp-merge-json@npm:2.1.2" dependencies: - deprecate: ^1.0.0 - json5: ^1.0.1 + json5: ^2.2.1 lodash.mergewith: ^4.6.1 plugin-error: ^1.0.1 through: ^2.3.8 - vinyl: ^2.1.0 - checksum: 327b4bd8c385f775e6ead94727506494798118e863c05bcf48760f9ab24cdeb2b5c39d07461f3308698dd24c3bf5a183b046347446d49bfaa5e134dce3c37b01 + vinyl: ^2.2.1 + checksum: 21325538cf882306e13aa4079913eb17d22605b91361d400ea9b7c8917c3b2782020199b219dfbac582205d8104ea283a9c385e32c25125cd456f01e0b0c04e6 languageName: node linkType: hard @@ -9573,7 +9565,7 @@ fsevents@^1.2.7: gulp: ^4.0.2 gulp-flatmap: ^1.0.2 gulp-json-transform: ^0.4.6 - gulp-merge-json: ^1.3.1 + gulp-merge-json: ^2.1.2 gulp-rename: ^2.0.0 gulp-zopfli-green: ^3.0.1 hammerjs: ^2.0.8 @@ -15913,9 +15905,9 @@ typescript@^3.8.3: languageName: node linkType: hard -"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0": - version: 2.2.0 - resolution: "vinyl@npm:2.2.0" +"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0, vinyl@npm:^2.2.1": + version: 2.2.1 + resolution: "vinyl@npm:2.2.1" dependencies: clone: ^2.1.1 clone-buffer: ^1.0.0 @@ -15923,7 +15915,7 @@ typescript@^3.8.3: cloneable-readable: ^1.0.0 remove-trailing-separator: ^1.0.1 replace-ext: ^1.0.0 - checksum: ff24138314485c0a4b3e8a629ae3530a6017e8c2ddeebda1a465f15211197981f953f2670889181090f0abfa82f682297909fb0c2b79e7d38abb92f72591d136 + checksum: 1f663973f1362f2d074b554f79ff7673187667082373b3d3e628beb1fc2a7ff33024f10b492fbd8db421a09ea3b7b22c3d3de4a0f0e73ead7b4685af570b906f languageName: node linkType: hard From be6aabe23e0249d321e48a56b5e98f7f52fb4894 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 02:05:46 -0500 Subject: [PATCH 03/37] Bump @typescript-eslint/parser from 5.44.0 to 5.49.0 (#15210) Bumps [@typescript-eslint/parser](https://github.com/typescript-eslint/typescript-eslint/tree/HEAD/packages/parser) from 5.44.0 to 5.49.0. - [Release notes](https://github.com/typescript-eslint/typescript-eslint/releases) - [Changelog](https://github.com/typescript-eslint/typescript-eslint/blob/main/packages/parser/CHANGELOG.md) - [Commits](https://github.com/typescript-eslint/typescript-eslint/commits/v5.49.0/packages/parser) --- updated-dependencies: - dependency-name: "@typescript-eslint/parser" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 100 +++++++++++++++++++++++++-------------------------- 2 files changed, 51 insertions(+), 51 deletions(-) diff --git a/package.json b/package.json index 84aec0726c..c4e4c628a4 100644 --- a/package.json +++ b/package.json @@ -181,7 +181,7 @@ "@types/tar": "^6", "@types/webspeechapi": "^0.0.29", "@typescript-eslint/eslint-plugin": "^5.46.1", - "@typescript-eslint/parser": "^5.44.0", + "@typescript-eslint/parser": "^5.49.0", "@web/dev-server": "^0.0.24", "@web/dev-server-rollup": "^0.2.11", "babel-loader": "^9.1.0", diff --git a/yarn.lock b/yarn.lock index 86b35c8f08..3aad7c76c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4496,30 +4496,20 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/parser@npm:^5.44.0": - version: 5.44.0 - resolution: "@typescript-eslint/parser@npm:5.44.0" +"@typescript-eslint/parser@npm:^5.49.0": + version: 5.49.0 + resolution: "@typescript-eslint/parser@npm:5.49.0" dependencies: - "@typescript-eslint/scope-manager": 5.44.0 - "@typescript-eslint/types": 5.44.0 - "@typescript-eslint/typescript-estree": 5.44.0 + "@typescript-eslint/scope-manager": 5.49.0 + "@typescript-eslint/types": 5.49.0 + "@typescript-eslint/typescript-estree": 5.49.0 debug: ^4.3.4 peerDependencies: eslint: ^6.0.0 || ^7.0.0 || ^8.0.0 peerDependenciesMeta: typescript: optional: true - checksum: 2d09a1a1547a7ae3f76c9a33a54e11d79a194fbb9dbae69988e7aed3370bdf12bafde669211152769d89db822e0cdee4173affc126664fa6f17abba56daa7261 - languageName: node - linkType: hard - -"@typescript-eslint/scope-manager@npm:5.44.0": - version: 5.44.0 - resolution: "@typescript-eslint/scope-manager@npm:5.44.0" - dependencies: - "@typescript-eslint/types": 5.44.0 - "@typescript-eslint/visitor-keys": 5.44.0 - checksum: 4cfe4b55eb428eda740e6b967e3a87f3e1f9c4bbd8e1d6b8d64a11666abe33ffe7a21e4e614444ccde2da6930fa85f3e0ffca43d6e339943ff7a4fbccb09c8fc + checksum: 87b3760cfc29b3edd3d28fe0d5e9e5a3833d60398d7779ecc657b9e3bfec624cd464176e26b24b0761fb79cc88daddae19560340f91119c4856b91f9663594dd languageName: node linkType: hard @@ -4533,6 +4523,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/scope-manager@npm:5.49.0": + version: 5.49.0 + resolution: "@typescript-eslint/scope-manager@npm:5.49.0" + dependencies: + "@typescript-eslint/types": 5.49.0 + "@typescript-eslint/visitor-keys": 5.49.0 + checksum: 466047e24ff8a4195f14aadde39375f22891bdaced09e58c89f2c32af0aa4a0d87e71a5f006f6ab76858e6f30c4b764b1e0ef7bc26713bb78add30638108c45f + languageName: node + linkType: hard + "@typescript-eslint/type-utils@npm:5.46.1": version: 5.46.1 resolution: "@typescript-eslint/type-utils@npm:5.46.1" @@ -4550,13 +4550,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/types@npm:5.44.0": - version: 5.44.0 - resolution: "@typescript-eslint/types@npm:5.44.0" - checksum: ced7d32abecfc62ccb67cf27e30c0785b9c153ec7b1a05153ced58fa5a2031ab3845bc2e477b83e4cebdcc5881c5845d23053c6739c62549d41ae6208e547e85 - languageName: node - linkType: hard - "@typescript-eslint/types@npm:5.46.1": version: 5.46.1 resolution: "@typescript-eslint/types@npm:5.46.1" @@ -4564,21 +4557,10 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:5.44.0": - version: 5.44.0 - resolution: "@typescript-eslint/typescript-estree@npm:5.44.0" - dependencies: - "@typescript-eslint/types": 5.44.0 - "@typescript-eslint/visitor-keys": 5.44.0 - debug: ^4.3.4 - globby: ^11.1.0 - is-glob: ^4.0.3 - semver: ^7.3.7 - tsutils: ^3.21.0 - peerDependenciesMeta: - typescript: - optional: true - checksum: 758731108497cca7ff81cf0a78d086b5a85757a983979d6bb25ad8252b7acbc738c642ecb5f5df82f925a45926b9846e431d5cf9fee5ed2613300b4d0c5d6c3f +"@typescript-eslint/types@npm:5.49.0": + version: 5.49.0 + resolution: "@typescript-eslint/types@npm:5.49.0" + checksum: 41f72a043007fc3f3356b5a38d7bfa54871545b4a309810a062f044cff25122413a9660ce6d83d1221762f60d067351d020b0cb68f7e1279817f53e77ce8f33d languageName: node linkType: hard @@ -4600,6 +4582,24 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/typescript-estree@npm:5.49.0": + version: 5.49.0 + resolution: "@typescript-eslint/typescript-estree@npm:5.49.0" + dependencies: + "@typescript-eslint/types": 5.49.0 + "@typescript-eslint/visitor-keys": 5.49.0 + debug: ^4.3.4 + globby: ^11.1.0 + is-glob: ^4.0.3 + semver: ^7.3.7 + tsutils: ^3.21.0 + peerDependenciesMeta: + typescript: + optional: true + checksum: f331af9f0ef3ce3157c421b8cc727dec5aa0a60add305aa4c676a02c63ec07799105268af192c5ed193a682b7ed804564d29d49bdbd2019678e495d80e65e29a + languageName: node + linkType: hard + "@typescript-eslint/utils@npm:5.46.1": version: 5.46.1 resolution: "@typescript-eslint/utils@npm:5.46.1" @@ -4618,16 +4618,6 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:5.44.0": - version: 5.44.0 - resolution: "@typescript-eslint/visitor-keys@npm:5.44.0" - dependencies: - "@typescript-eslint/types": 5.44.0 - eslint-visitor-keys: ^3.3.0 - checksum: a012c888209e1d6ae684b2a44fd460ae5a80f5faf07bca4bda6c9c0d8c063ad3297d4c53f7151ae86cf1a43dee09625dc3ee72183323c91089c7288fd573c6f4 - languageName: node - linkType: hard - "@typescript-eslint/visitor-keys@npm:5.46.1": version: 5.46.1 resolution: "@typescript-eslint/visitor-keys@npm:5.46.1" @@ -4638,6 +4628,16 @@ __metadata: languageName: node linkType: hard +"@typescript-eslint/visitor-keys@npm:5.49.0": + version: 5.49.0 + resolution: "@typescript-eslint/visitor-keys@npm:5.49.0" + dependencies: + "@typescript-eslint/types": 5.49.0 + eslint-visitor-keys: ^3.3.0 + checksum: 46dc7bc713e8825d1fccba521fdf7c6e2f8829e491c2afd44dbe4105c6432e3c3dfe7e1ecb221401269d639264bb4af77b60a7b65521fcff9ab02cd31d8ef782 + languageName: node + linkType: hard + "@ungap/promise-all-settled@npm:1.1.2": version: 1.1.2 resolution: "@ungap/promise-all-settled@npm:1.1.2" @@ -9524,7 +9524,7 @@ fsevents@^1.2.7: "@types/tar": ^6 "@types/webspeechapi": ^0.0.29 "@typescript-eslint/eslint-plugin": ^5.46.1 - "@typescript-eslint/parser": ^5.44.0 + "@typescript-eslint/parser": ^5.49.0 "@vaadin/combo-box": ^23.3.5 "@vaadin/vaadin-themable-mixin": ^23.3.5 "@vibrant/color": ^3.2.1-alpha.1 From 3951646c7f83aa34b51ff0a05f73437e629ea550 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 26 Jan 2023 08:38:42 -0500 Subject: [PATCH 04/37] Add link to docs in voice dialog (#15206) --- .../ha-voice-command-dialog.ts | 22 ++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts index 071191ba86..27ff2e15cc 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -1,6 +1,11 @@ /* eslint-disable lit/prefer-static-styles */ import "@material/mwc-button/mwc-button"; -import { mdiClose, mdiMicrophone, mdiSend } from "@mdi/js"; +import { + mdiClose, + mdiHelpCircleOutline, + mdiMicrophone, + mdiSend, +} from "@mdi/js"; import { css, CSSResultGroup, @@ -27,6 +32,7 @@ import { } from "../../data/conversation"; import { haStyleDialog } from "../../resources/styles"; import type { HomeAssistant } from "../../types"; +import { documentationUrl } from "../../util/documentation-url"; interface Message { who: string; @@ -102,6 +108,17 @@ export class HaVoiceCommandDialog extends LitElement { .label=${this.hass.localize("ui.common.close")} .path=${mdiClose} > + + +
@@ -400,6 +417,9 @@ export class HaVoiceCommandDialog extends LitElement { --mdc-theme-on-primary: var(--primary-text-color); --mdc-theme-primary: var(--mdc-theme-surface); } + ha-header-bar a { + color: var(--primary-text-color); + } ha-textfield { display: block; From fcf6bfc45703e75438d90451b321166190bcfa4a Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 10:17:44 -0500 Subject: [PATCH 05/37] Bump intl-messageformat from 9.9.1 to 10.2.5 (#15213) Bumps [intl-messageformat](https://github.com/formatjs/formatjs) from 9.9.1 to 10.2.5. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/intl-messageformat@9.9.1...intl-messageformat@10.2.5) --- updated-dependencies: - dependency-name: intl-messageformat dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 72 ++++++++++++++++++++-------------------------------- 2 files changed, 28 insertions(+), 46 deletions(-) diff --git a/package.json b/package.json index c4e4c628a4..6d031bdf47 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "hls.js": "^1.3.1", "home-assistant-js-websocket": "^8.0.1", "idb-keyval": "^5.1.3", - "intl-messageformat": "^9.9.1", + "intl-messageformat": "^10.2.5", "js-yaml": "^4.1.0", "leaflet": "^1.7.1", "leaflet-draw": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index 3aad7c76c3..ff09976916 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1492,43 +1492,33 @@ __metadata: languageName: node linkType: hard -"@formatjs/ecma402-abstract@npm:1.9.8": - version: 1.9.8 - resolution: "@formatjs/ecma402-abstract@npm:1.9.8" +"@formatjs/fast-memoize@npm:1.2.7": + version: 1.2.7 + resolution: "@formatjs/fast-memoize@npm:1.2.7" dependencies: - "@formatjs/intl-localematcher": 0.2.20 - tslib: ^2.1.0 - checksum: 900e6da123840e52d755bb361e7c075dcaf3242f428ff89c95a548165fdd0be908518e777030b9451f77d94530c021c2098219e734d7a7b494f22a611b1630ca + tslib: ^2.4.0 + checksum: ba372a3e931bd99729d993f5b95aeb43e7d07b9f71e759722cc20c4e2faa0af11a942f0df9023a029b03230dc4dfad5354755be1e385c465750f63e4b3372b7b languageName: node linkType: hard -"@formatjs/fast-memoize@npm:1.2.0": - version: 1.2.0 - resolution: "@formatjs/fast-memoize@npm:1.2.0" +"@formatjs/icu-messageformat-parser@npm:2.1.14": + version: 2.1.14 + resolution: "@formatjs/icu-messageformat-parser@npm:2.1.14" dependencies: - tslib: ^2.1.0 - checksum: fbc94672c4d0abc595c5680052c1fdaa652e7ffca98175a631a19ec44c5b6e2861ce0410c8ea3c4b46827aad5d229f89c0143a2ccf34ca2fbff79bdf63d27377 + "@formatjs/ecma402-abstract": 1.14.3 + "@formatjs/icu-skeleton-parser": 1.3.18 + tslib: ^2.4.0 + checksum: 4d13230af075a353eef4725bee67d46bfc40f4873e561c141a2e62b91e377ffa7fffe61ee6df6bb187a00e15ab6fe242014958d51e4c6056032801178eb7e1c8 languageName: node linkType: hard -"@formatjs/icu-messageformat-parser@npm:2.0.11": - version: 2.0.11 - resolution: "@formatjs/icu-messageformat-parser@npm:2.0.11" +"@formatjs/icu-skeleton-parser@npm:1.3.18": + version: 1.3.18 + resolution: "@formatjs/icu-skeleton-parser@npm:1.3.18" dependencies: - "@formatjs/ecma402-abstract": 1.9.8 - "@formatjs/icu-skeleton-parser": 1.2.12 - tslib: ^2.1.0 - checksum: 7526c19542f87f19718f43708d713fcc30fdc345585e975f2fd3aeeb12e08fbaf2185854d4bb3772b45b0804dedcba392f6a09e4903ec0cf380f97d6a8096428 - languageName: node - linkType: hard - -"@formatjs/icu-skeleton-parser@npm:1.2.12": - version: 1.2.12 - resolution: "@formatjs/icu-skeleton-parser@npm:1.2.12" - dependencies: - "@formatjs/ecma402-abstract": 1.9.8 - tslib: ^2.1.0 - checksum: 8c1abc18bb2255069fb9cd33ab9a909a1f3927f18f432ab1c680ea97eff8c2fbb6f753c920113e6cb73cc4be7142955dba7df9599046b46d6be7361a42b11b11 + "@formatjs/ecma402-abstract": 1.14.3 + tslib: ^2.4.0 + checksum: 19655c452ed3c45db07b03c90fbfe6172655b0babb9579f2d9397ca2b3c56e5e17a3beed1d13af12104313e6ed1f14976d7c996756f1a59c977d6f3228518fad languageName: node linkType: hard @@ -1563,15 +1553,6 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl-localematcher@npm:0.2.20": - version: 0.2.20 - resolution: "@formatjs/intl-localematcher@npm:0.2.20" - dependencies: - tslib: ^2.1.0 - checksum: 758d3678a43828e390b9cdf597d57581e7f0e771d24168fc8dba317a9dd97ab92edd1ee037e19e46ee2a055905590d3c8f25870510e39b792fe4d429d2035a67 - languageName: node - linkType: hard - "@formatjs/intl-localematcher@npm:0.2.21": version: 0.2.21 resolution: "@formatjs/intl-localematcher@npm:0.2.21" @@ -9575,7 +9556,7 @@ fsevents@^1.2.7: husky: ^8.0.3 idb-keyval: ^5.1.3 instant-mocha: ^1.3.1 - intl-messageformat: ^9.9.1 + intl-messageformat: ^10.2.5 js-yaml: ^4.1.0 jszip: ^3.10.1 leaflet: ^1.7.1 @@ -10071,14 +10052,15 @@ fsevents@^1.2.7: languageName: node linkType: hard -"intl-messageformat@npm:^9.9.1": - version: 9.9.1 - resolution: "intl-messageformat@npm:9.9.1" +"intl-messageformat@npm:^10.2.5": + version: 10.2.5 + resolution: "intl-messageformat@npm:10.2.5" dependencies: - "@formatjs/fast-memoize": 1.2.0 - "@formatjs/icu-messageformat-parser": 2.0.11 - tslib: ^2.1.0 - checksum: cec73d5d250d9d6a7a2138ca5566a0d60319ee8029213b28016d4fbc81fecd0bb8b0d417f0337fc4293edeef0555999779cad389575784cd1161031ee84b7c6f + "@formatjs/ecma402-abstract": 1.14.3 + "@formatjs/fast-memoize": 1.2.7 + "@formatjs/icu-messageformat-parser": 2.1.14 + tslib: ^2.4.0 + checksum: 048d6e3e746bff5ea6d745c8cbc2d0049aadb42caf2bad0d47e0bcf9bede285ef48a1fbd3a87711b99587d270d2ab8d9488e51577b24a2227856cdf373dd25df languageName: node linkType: hard From ac075e44ccda6bb7cdcf55d23ce6466bbe0ce9c2 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 26 Jan 2023 16:37:51 +0100 Subject: [PATCH 06/37] Add missing hass to chart base (#15218) --- src/components/chart/statistics-chart.ts | 1 + src/panels/config/hardware/ha-config-hardware.ts | 2 ++ .../lovelace/cards/energy/hui-energy-devices-graph-card.ts | 1 + src/panels/lovelace/cards/energy/hui-energy-gas-graph-card.ts | 1 + src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts | 1 + src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts | 1 + src/panels/lovelace/cards/energy/hui-energy-water-graph-card.ts | 1 + 7 files changed, 8 insertions(+) diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts index 90d3ead65a..2c77389482 100644 --- a/src/components/chart/statistics-chart.ts +++ b/src/components/chart/statistics-chart.ts @@ -133,6 +133,7 @@ class StatisticsChart extends LitElement { return html`
Date: Thu, 26 Jan 2023 17:47:44 +0000 Subject: [PATCH 07/37] Bump qrcode and @types/qrcode (#15207) * Bump qrcode and @types/qrcode Bumps [qrcode](https://github.com/soldair/node-qrcode) and [@types/qrcode](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/qrcode). These dependencies needed to be updated together. Updates `qrcode` from 1.4.4 to 1.5.1 - [Release notes](https://github.com/soldair/node-qrcode/releases) - [Changelog](https://github.com/soldair/node-qrcode/blob/master/CHANGELOG.md) - [Commits](https://github.com/soldair/node-qrcode/compare/v1.4.4...v1.5.1) Updates `@types/qrcode` from 1.4.2 to 1.5.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/qrcode) --- updated-dependencies: - dependency-name: qrcode dependency-type: direct:production update-type: version-update:semver-minor - dependency-name: "@types/qrcode" dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Fix possible null canvas context Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- package.json | 4 +- src/panels/config/tags/dialog-tag-detail.ts | 4 +- .../ha-long-lived-access-token-dialog.ts | 2 +- yarn.lock | 198 +++--------------- 4 files changed, 38 insertions(+), 170 deletions(-) diff --git a/package.json b/package.json index 6d031bdf47..efce004ea1 100644 --- a/package.json +++ b/package.json @@ -122,7 +122,7 @@ "proxy-polyfill": "^0.3.2", "punycode": "^2.3.0", "qr-scanner": "^1.3.0", - "qrcode": "^1.4.4", + "qrcode": "^1.5.1", "regenerator-runtime": "^0.13.11", "resize-observer-polyfill": "^1.5.1", "roboto-fontface": "^0.10.0", @@ -176,7 +176,7 @@ "@types/leaflet-draw": "^1", "@types/marked": "^4", "@types/mocha": "^8", - "@types/qrcode": "^1.4.2", + "@types/qrcode": "^1.5.0", "@types/sortablejs": "^1", "@types/tar": "^6", "@types/webspeechapi": "^0.0.29", diff --git a/src/panels/config/tags/dialog-tag-detail.ts b/src/panels/config/tags/dialog-tag-detail.ts index 995273a1cf..275caa0fc4 100644 --- a/src/panels/config/tags/dialog-tag-detail.ts +++ b/src/panels/config/tags/dialog-tag-detail.ts @@ -96,7 +96,7 @@ class DialogTagDetail > ${!this._params.entry ? html` { imageObj.onload = resolve; }); - context.drawImage( + context?.drawImage( imageObj, canvas.width / 3, canvas.height / 3, diff --git a/src/panels/profile/ha-long-lived-access-token-dialog.ts b/src/panels/profile/ha-long-lived-access-token-dialog.ts index e736509843..b4209b7449 100644 --- a/src/panels/profile/ha-long-lived-access-token-dialog.ts +++ b/src/panels/profile/ha-long-lived-access-token-dialog.ts @@ -77,7 +77,7 @@ export class HaLongLivedAccessTokenDialog extends LitElement { await new Promise((resolve) => { imageObj.onload = resolve; }); - context.drawImage( + context?.drawImage( imageObj, canvas.width / 3, canvas.height / 3, diff --git a/yarn.lock b/yarn.lock index ff09976916..409abd07a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4322,12 +4322,12 @@ __metadata: languageName: node linkType: hard -"@types/qrcode@npm:^1.4.2": - version: 1.4.2 - resolution: "@types/qrcode@npm:1.4.2" +"@types/qrcode@npm:^1.5.0": + version: 1.5.0 + resolution: "@types/qrcode@npm:1.5.0" dependencies: "@types/node": "*" - checksum: 7ac58687aacc688b83dde43dc349dc42106c6c382b62eb1256e35c6cb7de45e79ef8e917e05b02a81272cd0c1ff21147307244fd57401ba19314851f30636283 + checksum: b0ece3834ca5ba6171132928fd1ef764772dc619b45cb4123461ee05e377ad15553a330d234c69db0d0028c6639a99429e88d99192fbba9c5ee97c23f278c48b languageName: node linkType: hard @@ -5464,13 +5464,6 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^4.1.0": - version: 4.1.0 - resolution: "ansi-regex@npm:4.1.0" - checksum: 97aa4659538d53e5e441f5ef2949a3cffcb838e57aeaad42c4194e9d7ddb37246a6526c4ca85d3940a9d1e19b11cc2e114530b54c9d700c8baf163c31779baf8 - languageName: node - linkType: hard - "ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" @@ -5485,7 +5478,7 @@ __metadata: languageName: node linkType: hard -"ansi-styles@npm:^3.2.0, ansi-styles@npm:^3.2.1": +"ansi-styles@npm:^3.2.1": version: 3.2.1 resolution: "ansi-styles@npm:3.2.1" dependencies: @@ -6162,23 +6155,6 @@ __metadata: languageName: node linkType: hard -"buffer-alloc-unsafe@npm:^1.1.0": - version: 1.1.0 - resolution: "buffer-alloc-unsafe@npm:1.1.0" - checksum: c5e18bf51f67754ec843c9af3d4c005051aac5008a3992938dda1344e5cfec77c4b02b4ca303644d1e9a6e281765155ce6356d85c6f5ccc5cd21afc868def396 - languageName: node - linkType: hard - -"buffer-alloc@npm:^1.2.0": - version: 1.2.0 - resolution: "buffer-alloc@npm:1.2.0" - dependencies: - buffer-alloc-unsafe: ^1.1.0 - buffer-fill: ^1.0.0 - checksum: 560cd27f3cbe73c614867da373407d4506309c62fe18de45a1ce191f3785ec6ca2488d802ff82065798542422980ca25f903db078c57822218182c37c3576df5 - languageName: node - linkType: hard - "buffer-equal@npm:0.0.1": version: 0.0.1 resolution: "buffer-equal@npm:0.0.1" @@ -6193,21 +6169,14 @@ __metadata: languageName: node linkType: hard -"buffer-fill@npm:^1.0.0": - version: 1.0.0 - resolution: "buffer-fill@npm:1.0.0" - checksum: c29b4723ddeab01e74b5d3b982a0c6828f2ded49cef049ddca3dac661c874ecdbcecb5dd8380cf0f4adbeb8cff90a7de724126750a1f1e5ebd4eb6c59a1315b1 - languageName: node - linkType: hard - -"buffer-from@npm:^1.0.0, buffer-from@npm:^1.1.1": +"buffer-from@npm:^1.0.0": version: 1.1.1 resolution: "buffer-from@npm:1.1.1" checksum: ccc53b69736008bff764497367c4d24879ba7122bc619ee499ff47eef3a5b885ca496e87272e7ebffa0bec3804c83f84041c616f6e3318f40624e27c1d80f045 languageName: node linkType: hard -"buffer@npm:^5.2.0, buffer@npm:^5.4.3": +"buffer@npm:^5.2.0": version: 5.6.0 resolution: "buffer@npm:5.6.0" dependencies: @@ -6604,17 +6573,6 @@ __metadata: languageName: node linkType: hard -"cliui@npm:^5.0.0": - version: 5.0.0 - resolution: "cliui@npm:5.0.0" - dependencies: - string-width: ^3.1.0 - strip-ansi: ^5.2.0 - wrap-ansi: ^5.1.0 - checksum: 0bb8779efe299b8f3002a73619eaa8add4081eb8d1c17bc4fedc6240557fb4eacdc08fe87c39b002eacb6cfc117ce736b362dbfd8bf28d90da800e010ee97df4 - languageName: node - linkType: hard - "cliui@npm:^6.0.0": version: 6.0.0 resolution: "cliui@npm:6.0.0" @@ -7529,13 +7487,6 @@ __metadata: languageName: node linkType: hard -"emoji-regex@npm:^7.0.1": - version: 7.0.3 - resolution: "emoji-regex@npm:7.0.3" - checksum: 9159b2228b1511f2870ac5920f394c7e041715429a68459ebe531601555f11ea782a8e1718f969df2711d38c66268174407cbca57ce36485544f695c2dfdc96e - languageName: node - linkType: hard - "emoji-regex@npm:^8.0.0": version: 8.0.0 resolution: "emoji-regex@npm:8.0.0" @@ -7550,6 +7501,13 @@ __metadata: languageName: node linkType: hard +"encode-utf8@npm:^1.0.3": + version: 1.0.3 + resolution: "encode-utf8@npm:1.0.3" + checksum: 550224bf2a104b1d355458c8a82e9b4ea07f9fc78387bc3a49c151b940ad26473de8dc9e121eefc4e84561cb0b46de1e4cd2bc766f72ee145e9ea9541482817f + languageName: node + linkType: hard + "encodeurl@npm:^1.0.2, encodeurl@npm:~1.0.2": version: 1.0.2 resolution: "encodeurl@npm:1.0.2" @@ -8561,15 +8519,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^3.0.0": - version: 3.0.0 - resolution: "find-up@npm:3.0.0" - dependencies: - locate-path: ^3.0.0 - checksum: 38eba3fe7a66e4bc7f0f5a1366dc25508b7cfc349f852640e3678d26ad9a6d7e2c43eff0a472287de4a9753ef58f066a0ea892a256fa3636ad51b3fe1e17fae9 - languageName: node - linkType: hard - "find-up@npm:^4.0.0, find-up@npm:^4.1.0": version: 4.1.0 resolution: "find-up@npm:4.1.0" @@ -9500,7 +9449,7 @@ fsevents@^1.2.7: "@types/leaflet-draw": ^1 "@types/marked": ^4 "@types/mocha": ^8 - "@types/qrcode": ^1.4.2 + "@types/qrcode": ^1.5.0 "@types/sortablejs": ^1 "@types/tar": ^6 "@types/webspeechapi": ^0.0.29 @@ -9579,7 +9528,7 @@ fsevents@^1.2.7: proxy-polyfill: ^0.3.2 punycode: ^2.3.0 qr-scanner: ^1.3.0 - qrcode: ^1.4.4 + qrcode: ^1.5.1 regenerator-runtime: ^0.13.11 require-dir: ^1.2.0 resize-observer-polyfill: ^1.5.1 @@ -10603,13 +10552,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"isarray@npm:^2.0.1": - version: 2.0.5 - resolution: "isarray@npm:2.0.5" - checksum: bd5bbe4104438c4196ba58a54650116007fa0262eccef13a4c55b2e09a5b36b59f1e75b9fcc49883dd9d4953892e6fc007eef9e9155648ceea036e184b0f930a - languageName: node - linkType: hard - "isbinaryfile@npm:^4.0.6": version: 4.0.6 resolution: "isbinaryfile@npm:4.0.6" @@ -11257,16 +11199,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"locate-path@npm:^3.0.0": - version: 3.0.0 - resolution: "locate-path@npm:3.0.0" - dependencies: - p-locate: ^3.0.0 - path-exists: ^3.0.0 - checksum: 53db3996672f21f8b0bf2a2c645ae2c13ffdae1eeecfcd399a583bce8516c0b88dcb4222ca6efbbbeb6949df7e46860895be2c02e8d3219abd373ace3bfb4e11 - languageName: node - linkType: hard - "locate-path@npm:^5.0.0": version: 5.0.0 resolution: "locate-path@npm:5.0.0" @@ -12554,7 +12486,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-limit@npm:^2.0.0, p-limit@npm:^2.2.0": +"p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" dependencies: @@ -12581,15 +12513,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-locate@npm:^3.0.0": - version: 3.0.0 - resolution: "p-locate@npm:3.0.0" - dependencies: - p-limit: ^2.0.0 - checksum: 83991734a9854a05fe9dbb29f707ea8a0599391f52daac32b86f08e21415e857ffa60f0e120bfe7ce0cc4faf9274a50239c7895fc0d0579d08411e513b83a4ae - languageName: node - linkType: hard - "p-locate@npm:^4.1.0": version: 4.1.0 resolution: "p-locate@npm:4.1.0" @@ -13071,13 +12994,20 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pngjs@npm:^3.0.0, pngjs@npm:^3.3.0, pngjs@npm:^3.3.3": +"pngjs@npm:^3.0.0, pngjs@npm:^3.3.3": version: 3.4.0 resolution: "pngjs@npm:3.4.0" checksum: 8bd40bd698abd16b72c97b85cb858c80894fbedc76277ce72a784aa441e14795d45d9856e97333ca469b34b67528860ffc8a7317ca6beea349b645366df00bcd languageName: node linkType: hard +"pngjs@npm:^5.0.0": + version: 5.0.0 + resolution: "pngjs@npm:5.0.0" + checksum: 04e912cc45fb9601564e2284efaf0c5d20d131d9b596244f8a6789fc6cdb6b18d2975a6bbf7a001858d7e159d5c5c5dd7b11592e97629b7137f7f5cef05904c8 + languageName: node + linkType: hard + "portfinder@npm:^1.0.28": version: 1.0.28 resolution: "portfinder@npm:1.0.28" @@ -13267,20 +13197,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"qrcode@npm:^1.4.4": - version: 1.4.4 - resolution: "qrcode@npm:1.4.4" +"qrcode@npm:^1.5.1": + version: 1.5.1 + resolution: "qrcode@npm:1.5.1" dependencies: - buffer: ^5.4.3 - buffer-alloc: ^1.2.0 - buffer-from: ^1.1.1 dijkstrajs: ^1.0.1 - isarray: ^2.0.1 - pngjs: ^3.3.0 - yargs: ^13.2.4 + encode-utf8: ^1.0.3 + pngjs: ^5.0.0 + yargs: ^15.3.1 bin: - qrcode: ./bin/qrcode - checksum: 8c1a7ee3092c0ed60f0413594af879ac6dffb897d4921144a8e7ae3dce40c04ba6457ab21664ca43934ba3fe19cced85abaf0b87b07916239d7254d4bb4fcf13 + qrcode: bin/qrcode + checksum: 842f899d95caaad2ac507408b5498be3197e1df16bc6b537b20069d2cb1330e4588b50f672ce4a9ccf01338f7c97b5732ff9b5caaa6eb2338187d3c25a973e79 languageName: node linkType: hard @@ -14706,17 +14633,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"string-width@npm:^3.0.0, string-width@npm:^3.1.0": - version: 3.1.0 - resolution: "string-width@npm:3.1.0" - dependencies: - emoji-regex: ^7.0.1 - is-fullwidth-code-point: ^2.0.0 - strip-ansi: ^5.1.0 - checksum: 57f7ca73d201682816d573dc68bd4bb8e1dff8dc9fcf10470fdfc3474135c97175fec12ea6a159e67339b41e86963112355b64529489af6e7e70f94a7caf08b2 - languageName: node - linkType: hard - "string-width@npm:^4.1.0, string-width@npm:^4.2.0, string-width@npm:^4.2.3": version: 4.2.3 resolution: "string-width@npm:4.2.3" @@ -14822,15 +14738,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"strip-ansi@npm:^5.0.0, strip-ansi@npm:^5.1.0, strip-ansi@npm:^5.2.0": - version: 5.2.0 - resolution: "strip-ansi@npm:5.2.0" - dependencies: - ansi-regex: ^4.1.0 - checksum: bdb5f76ade97062bd88e7723aa019adbfacdcba42223b19ccb528ffb9fb0b89a5be442c663c4a3fb25268eaa3f6ea19c7c3fbae830bd1562d55adccae1fcec46 - languageName: node - linkType: hard - "strip-ansi@npm:^6.0.0, strip-ansi@npm:^6.0.1": version: 6.0.1 resolution: "strip-ansi@npm:6.0.1" @@ -16605,17 +16512,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"wrap-ansi@npm:^5.1.0": - version: 5.1.0 - resolution: "wrap-ansi@npm:5.1.0" - dependencies: - ansi-styles: ^3.2.0 - string-width: ^3.0.0 - strip-ansi: ^5.0.0 - checksum: 9b48c862220e541eb0daa22661b38b947973fc57054e91be5b0f2dcc77741a6875ccab4ebe970a394b4682c8dfc17e888266a105fb8b0a9b23c19245e781ceae - languageName: node - linkType: hard - "wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" @@ -16786,16 +16682,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"yargs-parser@npm:^13.1.2": - version: 13.1.2 - resolution: "yargs-parser@npm:13.1.2" - dependencies: - camelcase: ^5.0.0 - decamelize: ^1.2.0 - checksum: c8bb6f44d39a4acd94462e96d4e85469df865de6f4326e0ab1ac23ae4a835e5dd2ddfe588317ebf80c3a7e37e741bd5cb0dc8d92bcc5812baefb7df7c885e86b - languageName: node - linkType: hard - "yargs-parser@npm:^18.1.2": version: 18.1.3 resolution: "yargs-parser@npm:18.1.3" @@ -16856,24 +16742,6 @@ typescript@^3.8.3: languageName: node linkType: hard -"yargs@npm:^13.2.4": - version: 13.3.2 - resolution: "yargs@npm:13.3.2" - dependencies: - cliui: ^5.0.0 - find-up: ^3.0.0 - get-caller-file: ^2.0.1 - require-directory: ^2.1.1 - require-main-filename: ^2.0.0 - set-blocking: ^2.0.0 - string-width: ^3.0.0 - which-module: ^2.0.0 - y18n: ^4.0.0 - yargs-parser: ^13.1.2 - checksum: 75c13e837eb2bb25717957ba58d277e864efc0cca7f945c98bdf6477e6ec2f9be6afa9ed8a876b251a21423500c148d7b91e88dee7adea6029bdec97af1ef3e8 - languageName: node - linkType: hard - "yargs@npm:^15.3.1": version: 15.4.1 resolution: "yargs@npm:15.4.1" From 89623aa7ecd2d55d47e2e225149e46913418d602 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 26 Jan 2023 21:48:28 +0100 Subject: [PATCH 08/37] Fix margin and title on assist dialog (#15219) --- src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts | 5 +++++ src/translations/en.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts index 27ff2e15cc..dc0cfd1e8b 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -507,6 +507,11 @@ export class HaVoiceCommandDialog extends LitElement { color: var(--text-primary-color); } + .input { + margin-left: 0; + margin-right: 0; + } + .interimTranscript { color: var(--secondary-text-color); } diff --git a/src/translations/en.json b/src/translations/en.json index c063af0864..b893a20476 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -803,7 +803,7 @@ "nothing_found": "Nothing found!" }, "voice_command": { - "title": "Assistant", + "title": "Assist", "did_not_hear": "Home Assistant did not hear anything", "did_not_understand": "Didn't quite get that", "found": "I found the following for you:", From 8b4587785c3604ec5097434ff12a10880edd6a23 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Thu, 26 Jan 2023 23:22:08 -0500 Subject: [PATCH 09/37] Bump fuse.js from 6.0.0 to 6.6.2 (#15209) Bumps [fuse.js](https://github.com/krisk/Fuse) from 6.0.0 to 6.6.2. - [Release notes](https://github.com/krisk/Fuse/releases) - [Changelog](https://github.com/krisk/Fuse/blob/master/CHANGELOG.md) - [Commits](https://github.com/krisk/Fuse/compare/v6.0.0...v6.6.2) --- updated-dependencies: - dependency-name: fuse.js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index efce004ea1..7228c27454 100644 --- a/package.json +++ b/package.json @@ -105,7 +105,7 @@ "date-fns-tz": "^1.3.7", "deep-clone-simple": "^1.1.1", "deep-freeze": "^0.0.1", - "fuse.js": "^6.0.0", + "fuse.js": "^6.6.2", "google-timezones-json": "^1.0.2", "hammerjs": "^2.0.8", "hls.js": "^1.3.1", diff --git a/yarn.lock b/yarn.lock index 409abd07a3..89e87588e9 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8794,10 +8794,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"fuse.js@npm:^6.0.0": - version: 6.0.0 - resolution: "fuse.js@npm:6.0.0" - checksum: 97efcdfac13d2a7a4e8bcf06d161680fe83ddc6e8b2fa7f44230070adce124ee9cc9e3eed84bbe37697e9d20f4c795c55203ca1ab7f32acfc2516434f82e0e78 +"fuse.js@npm:^6.6.2": + version: 6.6.2 + resolution: "fuse.js@npm:6.6.2" + checksum: 17ae758ce205276ebd88bd9c9f088a100be0b4896abac9f6b09847151269d1690f41d7f98ff5813d4a58973162dbd99d0072ce807020fee6f9de60170f6b08eb languageName: node linkType: hard @@ -9489,7 +9489,7 @@ fsevents@^1.2.7: eslint-plugin-wc: ^1.4.0 fancy-log: ^2.0.0 fs-extra: ^11.1.0 - fuse.js: ^6.0.0 + fuse.js: ^6.6.2 glob: ^8.1.0 google-timezones-json: ^1.0.2 gulp: ^4.0.2 From 01facc2254e295561db60f2cafe6a2761d3a0a61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 06:31:28 +0000 Subject: [PATCH 10/37] Bump eslint-config-prettier from 8.5.0 to 8.6.0 (#15226) Bumps [eslint-config-prettier](https://github.com/prettier/eslint-config-prettier) from 8.5.0 to 8.6.0. - [Release notes](https://github.com/prettier/eslint-config-prettier/releases) - [Changelog](https://github.com/prettier/eslint-config-prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/eslint-config-prettier/compare/v8.5.0...v8.6.0) --- updated-dependencies: - dependency-name: eslint-config-prettier dependency-type: direct:development update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 7228c27454..0656eccc89 100644 --- a/package.json +++ b/package.json @@ -190,7 +190,7 @@ "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-typescript": "^14.0.0", - "eslint-config-prettier": "^8.5.0", + "eslint-config-prettier": "^8.6.0", "eslint-import-resolver-webpack": "^0.13.1", "eslint-plugin-disable": "^2.0.1", "eslint-plugin-import": "^2.24.2", diff --git a/yarn.lock b/yarn.lock index 89e87588e9..5d80c294d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7751,14 +7751,14 @@ __metadata: languageName: node linkType: hard -"eslint-config-prettier@npm:^8.5.0": - version: 8.5.0 - resolution: "eslint-config-prettier@npm:8.5.0" +"eslint-config-prettier@npm:^8.6.0": + version: 8.6.0 + resolution: "eslint-config-prettier@npm:8.6.0" peerDependencies: eslint: ">=7.0.0" bin: eslint-config-prettier: bin/cli.js - checksum: 0d0f5c32e7a0ad91249467ce71ca92394ccd343178277d318baf32063b79ea90216f4c81d1065d60f96366fdc60f151d4d68ae7811a58bd37228b84c2083f893 + checksum: ff0d0dfc839a556355422293428637e8d35693de58dabf8638bf0b6529131a109d0b2ade77521aa6e54573bb842d7d9d322e465dd73dd61c7590fa3834c3fa81 languageName: node linkType: hard @@ -9480,7 +9480,7 @@ fsevents@^1.2.7: eslint: ^7.32.0 eslint-config-airbnb-base: ^14.2.1 eslint-config-airbnb-typescript: ^14.0.0 - eslint-config-prettier: ^8.5.0 + eslint-config-prettier: ^8.6.0 eslint-import-resolver-webpack: ^0.13.1 eslint-plugin-disable: ^2.0.1 eslint-plugin-import: ^2.24.2 From b31af60397c8836e2aae77068c9bb8aa6f072b3f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 06:35:13 +0000 Subject: [PATCH 11/37] Bump @octokit/rest from 19.0.5 to 19.0.7 (#15228) Bumps [@octokit/rest](https://github.com/octokit/rest.js) from 19.0.5 to 19.0.7. - [Release notes](https://github.com/octokit/rest.js/releases) - [Commits](https://github.com/octokit/rest.js/compare/v19.0.5...v19.0.7) --- updated-dependencies: - dependency-name: "@octokit/rest" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 50 +++++++++++++++++++++++++++++++++----------------- 2 files changed, 34 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 0656eccc89..d052d2c371 100644 --- a/package.json +++ b/package.json @@ -160,7 +160,7 @@ "@babel/preset-typescript": "^7.18.6", "@koa/cors": "^3.1.0", "@octokit/auth-oauth-device": "^4.0.2", - "@octokit/rest": "^19.0.5", + "@octokit/rest": "^19.0.7", "@open-wc/dev-server-hmr": "^0.0.2", "@rollup/plugin-babel": "^5.2.1", "@rollup/plugin-commonjs": "^11.1.0", diff --git a/yarn.lock b/yarn.lock index 5d80c294d8..8d1fee4c4c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3258,14 +3258,21 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^5.0.0": - version: 5.0.1 - resolution: "@octokit/plugin-paginate-rest@npm:5.0.1" +"@octokit/openapi-types@npm:^16.0.0": + version: 16.0.0 + resolution: "@octokit/openapi-types@npm:16.0.0" + checksum: 844f30a545da380d63c712e0eb733366bc567d1aab34529c79fdfbec3d73810e81d83f06fdab13058a5cbc7dae786db1a9b90b5b61b1e606854ee45d5ec5f194 + languageName: node + linkType: hard + +"@octokit/plugin-paginate-rest@npm:^6.0.0": + version: 6.0.0 + resolution: "@octokit/plugin-paginate-rest@npm:6.0.0" dependencies: - "@octokit/types": ^8.0.0 + "@octokit/types": ^9.0.0 peerDependencies: "@octokit/core": ">=4" - checksum: cfded297d9f66c7607bd34075eb0c5f7278a1617d6be86115997c0757151c9be2fcf7a8849c2a5cebab56931a263b5cc35742b6227935afe77f5ed61b0627a3d + checksum: 4ad89568d883373898b733837cada7d849d51eef32157c11d4a81cef5ce8e509720d79b46918cada3c132f9b29847e383f17b7cd5c39ede7c93cdcd2f850b47f languageName: node linkType: hard @@ -3278,15 +3285,15 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-rest-endpoint-methods@npm:^6.7.0": - version: 6.7.0 - resolution: "@octokit/plugin-rest-endpoint-methods@npm:6.7.0" +"@octokit/plugin-rest-endpoint-methods@npm:^7.0.0": + version: 7.0.1 + resolution: "@octokit/plugin-rest-endpoint-methods@npm:7.0.1" dependencies: - "@octokit/types": ^8.0.0 + "@octokit/types": ^9.0.0 deprecation: ^2.3.1 peerDependencies: "@octokit/core": ">=3" - checksum: 513c6c0717d08f3e85848029bd700412b7d9787750f78cc79a3dede356e94b238bf8a518b108f556a7efe626871720dd0466de9f31091578ea4e0f5a016f0ae7 + checksum: cdb8734ec960f75acc2405284920c58efac9a71b1c3b2a71662b9100ffbc22dac597150acff017a93459c57e9a492d9e1c27872b068387dbb90597de75065fcf languageName: node linkType: hard @@ -3315,15 +3322,15 @@ __metadata: languageName: node linkType: hard -"@octokit/rest@npm:^19.0.5": - version: 19.0.5 - resolution: "@octokit/rest@npm:19.0.5" +"@octokit/rest@npm:^19.0.7": + version: 19.0.7 + resolution: "@octokit/rest@npm:19.0.7" dependencies: "@octokit/core": ^4.1.0 - "@octokit/plugin-paginate-rest": ^5.0.0 + "@octokit/plugin-paginate-rest": ^6.0.0 "@octokit/plugin-request-log": ^1.0.4 - "@octokit/plugin-rest-endpoint-methods": ^6.7.0 - checksum: ed4c36859aafb64e23f7f708086fe7e2ecda17ffd8c1594817d539f766f5855af79f17f5d225d96d34cd9b97cbfea988dac3df39a7cc928b2d2b7b75ed981056 + "@octokit/plugin-rest-endpoint-methods": ^7.0.0 + checksum: 1f970c4de2cf3d1691d3cf5dd4bfa5ac205629e76417b5c51561e1beb5b4a7e6c65ba647f368727e67e5243418e06ca9cdafd9e733173e1529385d4f4d053d3d languageName: node linkType: hard @@ -3345,6 +3352,15 @@ __metadata: languageName: node linkType: hard +"@octokit/types@npm:^9.0.0": + version: 9.0.0 + resolution: "@octokit/types@npm:9.0.0" + dependencies: + "@octokit/openapi-types": ^16.0.0 + checksum: 5c7f5cca8f00f7c4daa0d00f4fe991c1598ec47cd6ced50b1c5fbe9721bb9dee0adc2acdee265a3a715bb984e53ef3dc7f1cfb7326f712c6d809d59fc5c6648d + languageName: node + linkType: hard + "@open-wc/dedupe-mixin@npm:^1.3.0": version: 1.3.0 resolution: "@open-wc/dedupe-mixin@npm:1.3.0" @@ -9418,7 +9434,7 @@ fsevents@^1.2.7: "@mdi/js": 7.1.96 "@mdi/svg": 7.1.96 "@octokit/auth-oauth-device": ^4.0.2 - "@octokit/rest": ^19.0.5 + "@octokit/rest": ^19.0.7 "@open-wc/dev-server-hmr": ^0.0.2 "@polymer/app-layout": ^3.1.0 "@polymer/iron-flex-layout": ^3.0.1 From a4a2e1b99ecd18c801dabe84f79770e19f574fc0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 14:11:08 +0000 Subject: [PATCH 12/37] Bump @codemirror/language from 6.3.2 to 6.4.0 (#15229) * Bump @codemirror/language from 6.3.2 to 6.4.0 Bumps [@codemirror/language](https://github.com/codemirror/language) from 6.3.2 to 6.4.0. - [Release notes](https://github.com/codemirror/language/releases) - [Changelog](https://github.com/codemirror/language/blob/main/CHANGELOG.md) - [Commits](https://github.com/codemirror/language/compare/6.3.2...6.4.0) --- updated-dependencies: - dependency-name: "@codemirror/language" dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] * Deduplicate dependencies Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index d052d2c371..74302c609e 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "@braintree/sanitize-url": "^6.0.0", "@codemirror/autocomplete": "^6.4.0", "@codemirror/commands": "^6.1.3", - "@codemirror/language": "^6.3.2", + "@codemirror/language": "^6.4.0", "@codemirror/legacy-modes": "^6.3.1", "@codemirror/search": "^6.2.3", "@codemirror/state": "^6.2.0", diff --git a/yarn.lock b/yarn.lock index 8d1fee4c4c..f57cb534f4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1396,9 +1396,9 @@ __metadata: languageName: node linkType: hard -"@codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.3.2": - version: 6.3.2 - resolution: "@codemirror/language@npm:6.3.2" +"@codemirror/language@npm:^6.0.0, @codemirror/language@npm:^6.4.0": + version: 6.4.0 + resolution: "@codemirror/language@npm:6.4.0" dependencies: "@codemirror/state": ^6.0.0 "@codemirror/view": ^6.0.0 @@ -1406,7 +1406,7 @@ __metadata: "@lezer/highlight": ^1.0.0 "@lezer/lr": ^1.0.0 style-mod: ^4.0.0 - checksum: b70ed9b85d0bea79181c86e88a1f5c0bada30680ee1fe6a68efc01bc037c3d14f94a83602fc46cc4b4393589605ef7e986ed5174443502f3365dd61f883894fa + checksum: 607072e234db59a9a21eb41b8777b62d68a55ed28298edc4f6aaedfcf52349db1fe3ff3e7747ccfc77f03757bad45ba9a657d59a0e9c67be1231902586dec7a3 languageName: node linkType: hard @@ -9386,7 +9386,7 @@ fsevents@^1.2.7: "@braintree/sanitize-url": ^6.0.0 "@codemirror/autocomplete": ^6.4.0 "@codemirror/commands": ^6.1.3 - "@codemirror/language": ^6.3.2 + "@codemirror/language": ^6.4.0 "@codemirror/legacy-modes": ^6.3.1 "@codemirror/search": ^6.2.3 "@codemirror/state": ^6.2.0 From c9b1b92e70581c2a6456d3aa079ffbd9f3961098 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 27 Jan 2023 10:02:58 -0500 Subject: [PATCH 13/37] Bump webpackbar from 5.0.0-3 to 5.0.2 (#15225) Bumps [webpackbar](https://github.com/unjs/webpackbar) from 5.0.0-3 to 5.0.2. - [Release notes](https://github.com/unjs/webpackbar/releases) - [Changelog](https://github.com/unjs/webpackbar/blob/main/CHANGELOG.md) - [Commits](https://github.com/unjs/webpackbar/compare/v5.0.0-3...v5.0.2) --- updated-dependencies: - dependency-name: webpackbar dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 48 +++++++++++++----------------------------------- 2 files changed, 14 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index 74302c609e..b0ceb28c1d 100644 --- a/package.json +++ b/package.json @@ -240,7 +240,7 @@ "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.11.1", "webpack-manifest-plugin": "^4.0.2", - "webpackbar": "^5.0.0-3", + "webpackbar": "^5.0.2", "workbox-build": "^6.5.4" }, "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch", diff --git a/yarn.lock b/yarn.lock index f57cb534f4..786b542533 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5430,7 +5430,7 @@ __metadata: languageName: node linkType: hard -"ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.1, ansi-escapes@npm:^4.3.2": +"ansi-escapes@npm:^4.3.0, ansi-escapes@npm:^4.3.2": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" dependencies: @@ -6488,13 +6488,6 @@ __metadata: languageName: node linkType: hard -"ci-info@npm:^3.1.1": - version: 3.2.0 - resolution: "ci-info@npm:3.2.0" - checksum: c68995a94e95ce3f233ff845e62dfc56f2e8ff1e3f5c1361bcdd520cbbc9726d8a54cbc1a685cb9ee19c3c5e71a1dade6dda23eb364b59b8e6c32508a9b761bc - languageName: node - linkType: hard - "class-utils@npm:^0.3.5": version: 0.3.6 resolution: "class-utils@npm:0.3.6" @@ -6907,7 +6900,7 @@ __metadata: languageName: node linkType: hard -"consola@npm:^2.15.0": +"consola@npm:^2.15.3": version: 2.15.3 resolution: "consola@npm:2.15.3" checksum: 8ef7a09b703ec67ac5c389a372a33b6dc97eda6c9876443a60d76a3076eea0259e7f67a4e54fd5a52f97df73690822d090cf8b7e102b5761348afef7c6d03e28 @@ -8409,15 +8402,6 @@ __metadata: languageName: node linkType: hard -"figures@npm:^3.2.0": - version: 3.2.0 - resolution: "figures@npm:3.2.0" - dependencies: - escape-string-regexp: ^1.0.5 - checksum: 85a6ad29e9aca80b49b817e7c89ecc4716ff14e3779d9835af554db91bac41c0f289c418923519392a1e582b4d10482ad282021330cd045bb7b80c84152f2a2b - languageName: node - linkType: hard - "file-entry-cache@npm:^6.0.1": version: 6.0.1 resolution: "file-entry-cache@npm:6.0.1" @@ -9577,7 +9561,7 @@ fsevents@^1.2.7: webpack-cli: ^4.8.0 webpack-dev-server: ^4.11.1 webpack-manifest-plugin: ^4.0.2 - webpackbar: ^5.0.0-3 + webpackbar: ^5.0.2 weekstart: ^1.1.0 workbox-build: ^6.5.4 workbox-cacheable-response: ^6.5.4 @@ -14589,12 +14573,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"std-env@npm:^2.2.1": - version: 2.3.1 - resolution: "std-env@npm:2.3.1" - dependencies: - ci-info: ^3.1.1 - checksum: 049be0d6fb7ff544b3061a53ccaddd3ab2f6930f50b432f54dc82b22cb813c6e408ed69807c7c6bc592fccfc92d5c431dcc1aacd7c9ca99d304948f3149a08da +"std-env@npm:^3.0.1": + version: 3.3.1 + resolution: "std-env@npm:3.3.1" + checksum: c4f59ecd2cb52041ce1785776d28a1aa56d346b6c4efcb8473e7e801eed1ac7612332dcee242d0b35948f35f745cceb6e226b5e825b59e588b262dca6be2b8aa languageName: node linkType: hard @@ -16148,21 +16130,17 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpackbar@npm:^5.0.0-3": - version: 5.0.0-3 - resolution: "webpackbar@npm:5.0.0-3" +"webpackbar@npm:^5.0.2": + version: 5.0.2 + resolution: "webpackbar@npm:5.0.2" dependencies: - ansi-escapes: ^4.3.1 chalk: ^4.1.0 - consola: ^2.15.0 - figures: ^3.2.0 + consola: ^2.15.3 pretty-time: ^1.1.0 - std-env: ^2.2.1 - text-table: ^0.2.0 - wrap-ansi: ^7.0.0 + std-env: ^3.0.1 peerDependencies: webpack: 3 || 4 || 5 - checksum: 21cd1a084107538b1803396e004a48f981f9a727be58a670a1154d61f5650ec8cdae6f987f0630519ff566259b56c7dbc81d1eb0d3e1c43d3d287ae7ec973b48 + checksum: 214a734b1d4d391eb8271ed1b11085f0efe6831e93f641229b292abfd6fea871422dce121612511c17ae8047522be6d65c1a2666cabb396c79549816a3612338 languageName: node linkType: hard From ec2d498334d9100bb0b90715fe9f7437e60d4e90 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Sat, 28 Jan 2023 13:42:07 +0100 Subject: [PATCH 14/37] Bumped version to 20230128.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 18f1dac89c..d830918e4d 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20230125.0" +version = "20230128.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From d96bb9cf20e6d25c2c1aae9e6013b9171f33bd7d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 29 Jan 2023 02:01:07 -0500 Subject: [PATCH 15/37] Bump webpack-cli from 4.8.0 to 5.0.1 (#15181) Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.8.0 to 5.0.1. - [Release notes](https://github.com/webpack/webpack-cli/releases) - [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.8.0...webpack-cli@5.0.1) --- updated-dependencies: - dependency-name: webpack-cli dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 108 ++++++++++++++++++++++----------------------------- 2 files changed, 47 insertions(+), 63 deletions(-) diff --git a/package.json b/package.json index b0ceb28c1d..58fd5e4d81 100644 --- a/package.json +++ b/package.json @@ -237,7 +237,7 @@ "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", "webpack": "^5.55.1", - "webpack-cli": "^4.8.0", + "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.11.1", "webpack-manifest-plugin": "^4.0.2", "webpackbar": "^5.0.2", diff --git a/yarn.lock b/yarn.lock index 786b542533..738b4e8edf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5179,36 +5179,36 @@ __metadata: languageName: node linkType: hard -"@webpack-cli/configtest@npm:^1.0.4": - version: 1.0.4 - resolution: "@webpack-cli/configtest@npm:1.0.4" +"@webpack-cli/configtest@npm:^2.0.1": + version: 2.0.1 + resolution: "@webpack-cli/configtest@npm:2.0.1" peerDependencies: - webpack: 4.x.x || 5.x.x - webpack-cli: 4.x.x - checksum: 292c2b79cefa263330547faeb0bfa1858b44b0b60ef7fc01a038802a062b2594f178adcb0b16145ed943e55dfc24f2e0e839526e20b4f0a005eb00fad72e631f + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: 15d0ca835f2e16ec99e9f295f07b676435b9e706d7700df0ad088692fea065e34772fc44b96a4f6a86178b9ca8cf1ff941fbce15269587cf0925d70b18928cea languageName: node linkType: hard -"@webpack-cli/info@npm:^1.3.0": - version: 1.3.0 - resolution: "@webpack-cli/info@npm:1.3.0" - dependencies: - envinfo: ^7.7.3 +"@webpack-cli/info@npm:^2.0.1": + version: 2.0.1 + resolution: "@webpack-cli/info@npm:2.0.1" peerDependencies: - webpack-cli: 4.x.x - checksum: 71ef46462d697020fb053a43adefb9c6d4ccea97c7b990bf7e533c4aaba7609ea67e5e514bd6ddde3d65887324c6e2a1fb0626738e50c195697c5f6083be8b34 + webpack: 5.x.x + webpack-cli: 5.x.x + checksum: b8fba49fee10d297c2affb0b064c9a81e9038d75517c6728fb85f9fb254cae634e5d33e696dac5171e6944ae329d85fddac72f781c7d833f7e9dfe43151ce60d languageName: node linkType: hard -"@webpack-cli/serve@npm:^1.5.2": - version: 1.5.2 - resolution: "@webpack-cli/serve@npm:1.5.2" +"@webpack-cli/serve@npm:^2.0.1": + version: 2.0.1 + resolution: "@webpack-cli/serve@npm:2.0.1" peerDependencies: - webpack-cli: 4.x.x + webpack: 5.x.x + webpack-cli: 5.x.x peerDependenciesMeta: webpack-dev-server: optional: true - checksum: 1666c69606581193574fb5f2cd58fececf933f34725261752d44c8097640474903de8bec4076c717d48838cfc8937fccee699ce74e4c880e1c327157757250fa + checksum: 75c55f8398dd60e4821f81bec6e96287cebb3ab1837ef016779bc2f0c76a1d29c45b99e53daa99ba1fa156b5e2b61c19abf58098de20c2b58391b1f496ecc145 languageName: node linkType: hard @@ -6741,14 +6741,7 @@ __metadata: languageName: node linkType: hard -"colorette@npm:^1.2.1": - version: 1.2.2 - resolution: "colorette@npm:1.2.2" - checksum: 69fec14ddaedd0f5b00e4bae40dc4bc61f7050ebdc82983a595d6fd64e650b9dc3c033fff378775683138e992e0ddd8717ac7c7cec4d089679dcfbe3cd921b04 - languageName: node - linkType: hard - -"colorette@npm:^2.0.10, colorette@npm:^2.0.19": +"colorette@npm:^2.0.10, colorette@npm:^2.0.14, colorette@npm:^2.0.19": version: 2.0.19 resolution: "colorette@npm:2.0.19" checksum: 888cf5493f781e5fcf54ce4d49e9d7d698f96ea2b2ef67906834bb319a392c667f9ec69f4a10e268d2946d13a9503d2d19b3abaaaf174e3451bfe91fb9d82427 @@ -6793,13 +6786,6 @@ __metadata: languageName: node linkType: hard -"commander@npm:^7.0.0": - version: 7.2.0 - resolution: "commander@npm:7.2.0" - checksum: 53501cbeee61d5157546c0bef0fedb6cdfc763a882136284bed9a07225f09a14b82d2a84e7637edfd1a679fb35ed9502fd58ef1d091e6287f60d790147f68ddc - languageName: node - linkType: hard - "commander@npm:^9.4.1": version: 9.5.0 resolution: "commander@npm:9.5.0" @@ -9558,7 +9544,7 @@ fsevents@^1.2.7: vue: ^2.6.12 vue2-daterange-picker: ^0.5.1 webpack: ^5.55.1 - webpack-cli: ^4.8.0 + webpack-cli: ^5.0.1 webpack-dev-server: ^4.11.1 webpack-manifest-plugin: ^4.0.2 webpackbar: ^5.0.2 @@ -9994,10 +9980,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"interpret@npm:^2.2.0": - version: 2.2.0 - resolution: "interpret@npm:2.2.0" - checksum: f51efef7cb8d02da16408ffa3504cd6053014c5aeb7bb8c223727e053e4235bf565e45d67028b0c8740d917c603807aa3c27d7bd2f21bf20b6417e2bb3e5fd6e +"interpret@npm:^3.1.1": + version: 3.1.1 + resolution: "interpret@npm:3.1.1" + checksum: 35cebcf48c7351130437596d9ab8c8fe131ce4038da4561e6d665f25640e0034702a031cf7e3a5cea60ac7ac548bf17465e0571ede126f3d3a6933152171ac82 languageName: node linkType: hard @@ -13382,12 +13368,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rechoir@npm:^0.7.0": - version: 0.7.0 - resolution: "rechoir@npm:0.7.0" +"rechoir@npm:^0.8.0": + version: 0.8.0 + resolution: "rechoir@npm:0.8.0" dependencies: - resolve: ^1.9.0 - checksum: 15f55f55e06c175d98df85d503b139982378e7ca34e157439125e5a6f25a5cbd9cfe2aa2d1052e2c1edf89d7d22dc020c911fc968702c84f669a16a12a1ec7ac + resolve: ^1.20.0 + checksum: ad3caed8afdefbc33fbc30e6d22b86c35b3d51c2005546f4e79bcc03c074df804b3640ad18945e6bef9ed12caedc035655ec1082f64a5e94c849ff939dc0a788 languageName: node linkType: hard @@ -13690,7 +13676,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.4.0, resolve@^1.9.0": +"resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.4.0": version: 1.20.0 resolution: "resolve@npm:1.20.0" dependencies: @@ -13700,7 +13686,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.11.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.4.0#~builtin, resolve@patch:resolve@^1.9.0#~builtin": +"resolve@patch:resolve@^1.1.6#~builtin, resolve@patch:resolve@^1.1.7#~builtin, resolve@patch:resolve@^1.10.0#~builtin, resolve@patch:resolve@^1.11.0#~builtin, resolve@patch:resolve@^1.14.2#~builtin, resolve@patch:resolve@^1.17.0#~builtin, resolve@patch:resolve@^1.19.0#~builtin, resolve@patch:resolve@^1.20.0#~builtin, resolve@patch:resolve@^1.4.0#~builtin": version: 1.20.0 resolution: "resolve@patch:resolve@npm%3A1.20.0#~builtin::version=1.20.0&hash=c3c19d" dependencies: @@ -15692,7 +15678,7 @@ typescript@^3.8.3: languageName: node linkType: hard -"v8-compile-cache@npm:^2.0.3, v8-compile-cache@npm:^2.2.0": +"v8-compile-cache@npm:^2.0.3": version: 2.2.0 resolution: "v8-compile-cache@npm:2.2.0" checksum: b5916ac2079a4d3de003d9d657d37e1b96453603158ccf6f3d2cc64d0018b71f3576fd3534f519829f9641b4588c830b9363dc5821fe213a51c1b1b3728a382a @@ -15961,37 +15947,35 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-cli@npm:^4.8.0": - version: 4.8.0 - resolution: "webpack-cli@npm:4.8.0" +"webpack-cli@npm:^5.0.1": + version: 5.0.1 + resolution: "webpack-cli@npm:5.0.1" dependencies: "@discoveryjs/json-ext": ^0.5.0 - "@webpack-cli/configtest": ^1.0.4 - "@webpack-cli/info": ^1.3.0 - "@webpack-cli/serve": ^1.5.2 - colorette: ^1.2.1 - commander: ^7.0.0 - execa: ^5.0.0 + "@webpack-cli/configtest": ^2.0.1 + "@webpack-cli/info": ^2.0.1 + "@webpack-cli/serve": ^2.0.1 + colorette: ^2.0.14 + commander: ^9.4.1 + cross-spawn: ^7.0.3 + envinfo: ^7.7.3 fastest-levenshtein: ^1.0.12 import-local: ^3.0.2 - interpret: ^2.2.0 - rechoir: ^0.7.0 - v8-compile-cache: ^2.2.0 + interpret: ^3.1.1 + rechoir: ^0.8.0 webpack-merge: ^5.7.3 peerDependencies: - webpack: 4.x.x || 5.x.x + webpack: 5.x.x peerDependenciesMeta: "@webpack-cli/generators": optional: true - "@webpack-cli/migrate": - optional: true webpack-bundle-analyzer: optional: true webpack-dev-server: optional: true bin: webpack-cli: bin/cli.js - checksum: 3ab4b5af09b56bb14d2ef2dd5613a14d01d9b4319bffb854edc379ef0f44e49ec31f96fb8cdd9dc8df54f6c94e9240d647a82d3cd0871fc5c313ab89fc2cd935 + checksum: b1544eea669442e78c3dba9f79c0f8d0136759b8b2fe9cd32c0d410250fd719988ae037778ba88993215d44971169f2c268c0c934068be561711615f1951bd53 languageName: node linkType: hard From bbb9cfb2c25808f880f8c62526cb11010427948c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 01:40:55 -0500 Subject: [PATCH 16/37] Bump @types/chromecast-caf-sender from 1.0.3 to 1.0.5 (#15249) Bumps [@types/chromecast-caf-sender](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/chromecast-caf-sender) from 1.0.3 to 1.0.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/chromecast-caf-sender) --- updated-dependencies: - dependency-name: "@types/chromecast-caf-sender" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 58fd5e4d81..f120f100d1 100644 --- a/package.json +++ b/package.json @@ -168,7 +168,7 @@ "@rollup/plugin-node-resolve": "^7.1.3", "@rollup/plugin-replace": "^2.3.2", "@types/chromecast-caf-receiver": "5.0.12", - "@types/chromecast-caf-sender": "^1.0.3", + "@types/chromecast-caf-sender": "^1.0.5", "@types/glob": "^8", "@types/hammerjs": "^2.0.41", "@types/js-yaml": "^4", diff --git a/yarn.lock b/yarn.lock index 738b4e8edf..4cc43fac17 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4007,12 +4007,12 @@ __metadata: languageName: node linkType: hard -"@types/chromecast-caf-sender@npm:^1.0.3": - version: 1.0.3 - resolution: "@types/chromecast-caf-sender@npm:1.0.3" +"@types/chromecast-caf-sender@npm:^1.0.5": + version: 1.0.5 + resolution: "@types/chromecast-caf-sender@npm:1.0.5" dependencies: "@types/chrome": "*" - checksum: e52ff73db274e2208eee5c4005aaef0c747c8d7707187833e0cce8601d57f62f56dbed6b46e6e49b588b3d4ffcca4eb5f92b794fc5f6360a3ec75f7812eb987d + checksum: eea4016f8bfd90484415aa9109528001d68a55e477593fcfbf27a91842d1ea885ee7796e75755783e94ff55c72f137696df1c8d62dedd61a4c663b7e4b628376 languageName: node linkType: hard @@ -9427,7 +9427,7 @@ fsevents@^1.2.7: "@rollup/plugin-replace": ^2.3.2 "@thomasloven/round-slider": 0.6.0 "@types/chromecast-caf-receiver": 5.0.12 - "@types/chromecast-caf-sender": ^1.0.3 + "@types/chromecast-caf-sender": ^1.0.5 "@types/glob": ^8 "@types/hammerjs": ^2.0.41 "@types/js-yaml": ^4 From 6945f99a342dc8e2df79ff187e56d6af932cd45b Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 30 Jan 2023 06:28:53 -0500 Subject: [PATCH 17/37] Bump fullcalendar to 5.11.4 (#15223) --- .github/dependabot.yml | 11 +++++-- package.json | 12 +++---- yarn.lock | 72 +++++++++++++++++++++--------------------- 3 files changed, 51 insertions(+), 44 deletions(-) diff --git a/.github/dependabot.yml b/.github/dependabot.yml index 8af5d2cf2b..79c8f5c7c4 100644 --- a/.github/dependabot.yml +++ b/.github/dependabot.yml @@ -10,9 +10,16 @@ updates: directory: "/" schedule: interval: "daily" - time: "06:00" - open-pull-requests-limit: 5 + time: "03:00" + open-pull-requests-limit: 10 + labels: + - "dependencies" ignore: # Ignore rollup and plugins until everything else is updated - dependency-name: "*rollup*" - dependency-name: "@rollup/*" + - dependency-name: "serve" + # Wait for fullcalendar v6+ to fix shadow DOM issue + - dependency-name: "@fullcalendar/*" + versions: + - ">=6" diff --git a/package.json b/package.json index f120f100d1..10c318abbc 100644 --- a/package.json +++ b/package.json @@ -38,12 +38,12 @@ "@formatjs/intl-numberformat": "^7.2.5", "@formatjs/intl-pluralrules": "^4.1.5", "@formatjs/intl-relativetimeformat": "^9.3.2", - "@fullcalendar/common": "5.9.0", - "@fullcalendar/core": "5.9.0", - "@fullcalendar/daygrid": "5.9.0", - "@fullcalendar/interaction": "5.9.0", - "@fullcalendar/list": "5.9.0", - "@fullcalendar/timegrid": "5.9.0", + "@fullcalendar/common": "^5.11.4", + "@fullcalendar/core": "^5.11.4", + "@fullcalendar/daygrid": "^5.11.4", + "@fullcalendar/interaction": "^5.11.4", + "@fullcalendar/list": "^5.11.4", + "@fullcalendar/timegrid": "^5.11.4", "@lezer/highlight": "^1.1.3", "@lit-labs/motion": "^1.0.3", "@lit-labs/virtualizer": "^1.0.1", diff --git a/yarn.lock b/yarn.lock index 4cc43fac17..e6e49c3531 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1603,64 +1603,64 @@ __metadata: languageName: node linkType: hard -"@fullcalendar/common@npm:5.9.0, @fullcalendar/common@npm:~5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/common@npm:5.9.0" +"@fullcalendar/common@npm:^5.11.4, @fullcalendar/common@npm:~5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/common@npm:5.11.4" dependencies: tslib: ^2.1.0 - checksum: b53bd70badb233ee31f628e6c03cfe6ba5f4c4b563b008e5de4b81a5c8095385ba9d461a7b0a857afd6350c1bc40de6553050d7c217064f0dd1078b96343bd19 + checksum: 8fc0e05539ba83d310eb5a7163dcd10582d83465393cccb525022b20c954e29e6361b289a2d2eec1ae5b5d950700333739b81cb5e81bc8cb72f682484ca697af languageName: node linkType: hard -"@fullcalendar/core@npm:5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/core@npm:5.9.0" +"@fullcalendar/core@npm:^5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/core@npm:5.11.4" dependencies: - "@fullcalendar/common": ~5.9.0 + "@fullcalendar/common": ~5.11.4 preact: ^10.0.5 tslib: ^2.1.0 - checksum: da187a1fe5fcf76725298b060fb688fccb94c7eb85ff1afae7699f82bcc2f0a0f1c88fc0ca0e01d47cc6d4436ba5a85103b0c718a29b9bbe6a5d2853776c5b13 + checksum: 11652a58dc4a7af2b9c552ca71e4215c56d574f7d639deab0a6604afa0a67c7bfef445d5a6e364b6bc6b0ffb333ba9e7730e184d480e0113dce90c470d988d17 languageName: node linkType: hard -"@fullcalendar/daygrid@npm:5.9.0, @fullcalendar/daygrid@npm:~5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/daygrid@npm:5.9.0" +"@fullcalendar/daygrid@npm:^5.11.4, @fullcalendar/daygrid@npm:~5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/daygrid@npm:5.11.4" dependencies: - "@fullcalendar/common": ~5.9.0 + "@fullcalendar/common": ~5.11.4 tslib: ^2.1.0 - checksum: 4f21cf44c90017d5b7f77211ead1585ff39ee5dd01d112a0c8bf6ffea9d072d4dfa4bbdd467beb8f4cfc9652f69d4847697604de6849b3fd2330093e16e15a37 + checksum: a25d83cfe5b3ac3feeb49af47701c54e858d30b0b53871df2a83aa7edbcc7d49f435d59fdbf3d6e18b5699caced8133e9c4b1c919caca2c8717bd92f57c08ab4 languageName: node linkType: hard -"@fullcalendar/interaction@npm:5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/interaction@npm:5.9.0" +"@fullcalendar/interaction@npm:^5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/interaction@npm:5.11.4" dependencies: - "@fullcalendar/common": ~5.9.0 + "@fullcalendar/common": ~5.11.4 tslib: ^2.1.0 - checksum: 3b2591479a5d42f7dbbb11d840b81669e97daea9a0825badd5776ea1e22bc988fe574c3c2ec22b992dbd1874fa92831c745f0d2741bd127a178bd3fa2af7766e + checksum: 88231b925498b947f5af98fcabf564f7d72ecde6660696e5aec7aa5c4aca7988deab74c9486a30e0e461cdd31913c560bb016f54a61641d13359488e845e053f languageName: node linkType: hard -"@fullcalendar/list@npm:5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/list@npm:5.9.0" +"@fullcalendar/list@npm:^5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/list@npm:5.11.4" dependencies: - "@fullcalendar/common": ~5.9.0 + "@fullcalendar/common": ~5.11.4 tslib: ^2.1.0 - checksum: f71a9ad0a42bebdd46dca0691e2f987596296e09521481f6b7a3c2fc5529b39d3466251830b735cd51748f46488a82ae309402533ae805f7b70159530060fbf9 + checksum: e2cec5e89c57836a9ca4db57fbe67e16f78d91191df39ac0b5d0f18c1fdac9763f04647ae42e5f2d31ffa3cd245423d3aec449ed6c84fafc0195e62079a4eedc languageName: node linkType: hard -"@fullcalendar/timegrid@npm:5.9.0": - version: 5.9.0 - resolution: "@fullcalendar/timegrid@npm:5.9.0" +"@fullcalendar/timegrid@npm:^5.11.4": + version: 5.11.4 + resolution: "@fullcalendar/timegrid@npm:5.11.4" dependencies: - "@fullcalendar/common": ~5.9.0 - "@fullcalendar/daygrid": ~5.9.0 + "@fullcalendar/common": ~5.11.4 + "@fullcalendar/daygrid": ~5.11.4 tslib: ^2.1.0 - checksum: dedef1e1147cd17aa277b159c806e0f927715d67c513d940bec61cb97bfdf97c71b43c03166d8442e9683e2d7d6f03d81619a694de84e04e5995b9e8ef3585b9 + checksum: 3a2fccac65198c5fffa53286fcbb2556b6e3885cfc6f7978b7ee21c57cbc2a58617e6c54eff977f5234163cef3281e50548327a06cf253acc43c6881bed00f2c languageName: node linkType: hard @@ -9367,12 +9367,12 @@ fsevents@^1.2.7: "@formatjs/intl-numberformat": ^7.2.5 "@formatjs/intl-pluralrules": ^4.1.5 "@formatjs/intl-relativetimeformat": ^9.3.2 - "@fullcalendar/common": 5.9.0 - "@fullcalendar/core": 5.9.0 - "@fullcalendar/daygrid": 5.9.0 - "@fullcalendar/interaction": 5.9.0 - "@fullcalendar/list": 5.9.0 - "@fullcalendar/timegrid": 5.9.0 + "@fullcalendar/common": ^5.11.4 + "@fullcalendar/core": ^5.11.4 + "@fullcalendar/daygrid": ^5.11.4 + "@fullcalendar/interaction": ^5.11.4 + "@fullcalendar/list": ^5.11.4 + "@fullcalendar/timegrid": ^5.11.4 "@koa/cors": ^3.1.0 "@lezer/highlight": ^1.1.3 "@lit-labs/motion": ^1.0.3 From 0af92b9bd1447d8a3a1c8ab1c316e668c758333a Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 12:29:25 +0100 Subject: [PATCH 18/37] Use new variable name for light toggle icon in area card (#15259) --- src/panels/lovelace/cards/hui-area-card.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-area-card.ts b/src/panels/lovelace/cards/hui-area-card.ts index b394774462..385e48c6bf 100644 --- a/src/panels/lovelace/cards/hui-area-card.ts +++ b/src/panels/lovelace/cards/hui-area-card.ts @@ -563,7 +563,7 @@ export class HuiAreaCard --mdc-icon-button-size: 44px; } .on { - color: var(--state-light-color); + color: var(--state-light-active-color); } `; } From eb497855571f095638a5e1c6a8f8c69ee758881b Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 12:29:47 +0100 Subject: [PATCH 19/37] Use right name pattern for active binary sensor color (#15255) --- src/resources/ha-style.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resources/ha-style.ts b/src/resources/ha-style.ts index 4dd57f2c7f..0628b3dc59 100644 --- a/src/resources/ha-style.ts +++ b/src/resources/ha-style.ts @@ -135,9 +135,9 @@ documentContainer.innerHTML = ` --state-alarm_control_panel-triggered-color: var(--red-color); --state-alert-off-color: var(--orange-color); --state-alert-on-color: var(--red-color); + --state-binary_sensor-active-color: var(--amber-color); --state-binary_sensor-battery-on-color: var(--red-color); --state-binary_sensor-carbon_monoxide-on-color: var(--red-color); - --state-binary_sensor-color: var(--amber-color); --state-binary_sensor-gas-on-color: var(--red-color); --state-binary_sensor-heat-on-color: var(--red-color); --state-binary_sensor-lock-on-color: var(--red-color); From f332edc87d12907abe23ec187d07e7c39abead07 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 12:33:45 +0100 Subject: [PATCH 20/37] Fixes select input in statistic card editor (#15254) --- .../hui-statistic-card-editor.ts | 42 ++++++++++++------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts index 7583d38fde..aa89edb420 100644 --- a/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-statistic-card-editor.ts @@ -90,9 +90,9 @@ export class HuiStatisticCardEditor if (!config || !config.period) { return config; } - for (const period of Object.values(periods)) { + for (const [periodKey, period] of Object.entries(periods)) { if (deepEqual(period, config.period)) { - return { ...config, period }; + return { ...config, period: periodKey }; } } return config; @@ -102,7 +102,7 @@ export class HuiStatisticCardEditor ( entity: string, icon: string, - periodVal: any, + selectedPeriodKey: string | undefined, entityState: HassEntity, localize: LocalizeFunc, metadata?: StatisticsMetaData @@ -130,22 +130,22 @@ export class HuiStatisticCardEditor { name: "period", required: true, - selector: Object.values(periods).includes(periodVal) - ? { - select: { - multiple: false, - options: Object.entries(periods).map( - ([periodKey, period]) => ({ - value: period, + selector: + selectedPeriodKey && + Object.keys(periods).includes(selectedPeriodKey) + ? { + select: { + multiple: false, + options: Object.keys(periods).map((periodKey) => ({ + value: periodKey, label: localize( `ui.panel.lovelace.editor.card.statistic.periods.${periodKey}` ) || periodKey, - }) - ), - }, - } - : { object: {} }, + })), + }, + } + : { object: {} }, }, { type: "grid", @@ -183,7 +183,7 @@ export class HuiStatisticCardEditor const schema = this._schema( this._config.entity, this._config.icon, - data.period, + typeof data.period === "string" ? data.period : undefined, entityState, this.hass.localize, this._metadata @@ -212,6 +212,14 @@ export class HuiStatisticCardEditor private async _valueChanged(ev: CustomEvent) { const config = ev.detail.value as StatisticCardConfig; Object.keys(config).forEach((k) => config[k] === "" && delete config[k]); + + if (typeof config.period === "string") { + const period = periods[config.period]; + if (period) { + config.period = period; + } + } + if ( config.stat_type && config.entity && @@ -227,12 +235,14 @@ export class HuiStatisticCardEditor config.stat_type = "change"; } } + if (!config.stat_type && config.entity) { const metadata = ( await getStatisticMetadata(this.hass!, [config.entity]) )?.[0]; config.stat_type = metadata?.has_sum ? "change" : "mean"; } + fireEvent(this, "config-changed", { config }); } From 30e6a1a57e3c7caf245b983704a5a4581f623ad0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 11:51:30 +0000 Subject: [PATCH 21/37] Bump babel-loader from 9.1.0 to 9.1.2 (#15264) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 10c318abbc..8c9477498d 100644 --- a/package.json +++ b/package.json @@ -184,7 +184,7 @@ "@typescript-eslint/parser": "^5.49.0", "@web/dev-server": "^0.0.24", "@web/dev-server-rollup": "^0.2.11", - "babel-loader": "^9.1.0", + "babel-loader": "^9.1.2", "chai": "^4.3.4", "del": "^7.0.0", "eslint": "^7.32.0", diff --git a/yarn.lock b/yarn.lock index e6e49c3531..9f00c0727e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5903,16 +5903,16 @@ __metadata: languageName: node linkType: hard -"babel-loader@npm:^9.1.0": - version: 9.1.0 - resolution: "babel-loader@npm:9.1.0" +"babel-loader@npm:^9.1.2": + version: 9.1.2 + resolution: "babel-loader@npm:9.1.2" dependencies: find-cache-dir: ^3.3.2 schema-utils: ^4.0.0 peerDependencies: "@babel/core": ^7.12.0 webpack: ">=5" - checksum: 774758febd1e8ca804abcae3b8f65634330dc688837424d0946f06d1386914de43435cce691710fa144eccdf1292cf883439ac3598ce7320916acfaaa2372641 + checksum: f0edb8e157f9806b810ba3f2c8ca8fa489d377ae5c2b7b00c2ace900a6925641ce4ec520b9c12f70e37b94aa5366e7003e0f6271b26821643e109966ce741cb7 languageName: node linkType: hard @@ -9452,7 +9452,7 @@ fsevents@^1.2.7: "@webcomponents/scoped-custom-element-registry": ^0.0.5 "@webcomponents/webcomponentsjs": ^2.2.10 app-datepicker: ^5.1.0 - babel-loader: ^9.1.0 + babel-loader: ^9.1.2 chai: ^4.3.4 chart.js: ^3.3.2 comlink: ^4.3.1 From 6226a7f28dee1705df6cf845c1eb9f7757a39bce Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 13:08:31 +0100 Subject: [PATCH 22/37] Fixes empty hardware page when no config entries (#15267) --- .../config/hardware/ha-config-hardware.ts | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/src/panels/config/hardware/ha-config-hardware.ts b/src/panels/config/hardware/ha-config-hardware.ts index a76468f8f2..b4578716ba 100644 --- a/src/panels/config/hardware/ha-config-hardware.ts +++ b/src/panels/config/hardware/ha-config-hardware.ts @@ -103,17 +103,21 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { fullUpdate = true; } } else if (message.type === "removed") { - delete this._configEntries![message.entry.entry_id]; + if (this._configEntries) { + delete this._configEntries[message.entry.entry_id]; + } } else if (message.type === "updated") { - const newEntry = message.entry; - this._configEntries![message.entry.entry_id] = newEntry; + if (this._configEntries) { + const newEntry = message.entry; + this._configEntries[message.entry.entry_id] = newEntry; + } } }); if (!newEntries.length && !fullUpdate) { return; } const entries = [ - ...(fullUpdate ? [] : Object.values(this._configEntries!)), + ...(fullUpdate ? [] : Object.values(this._configEntries || {})), ...newEntries, ]; const configEntries: { [id: string]: ConfigEntry } = {}; @@ -220,10 +224,6 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { } protected render(): TemplateResult { - if (!this._configEntries) { - return html``; - } - let boardId: string | undefined; let boardName: string | undefined; let imageURL: string | undefined; @@ -240,14 +240,14 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { (!hw.config_entries.length || hw.config_entries.some( (entryId) => - this._configEntries![entryId] && - !this._configEntries![entryId].disabled_by + this._configEntries?.[entryId] && + !this._configEntries[entryId].disabled_by )) ); if (boardData) { boardConfigEntries = boardData.config_entries - .map((id) => this._configEntries![id]) + .map((id) => this._configEntries?.[id]) .filter( (entry) => entry?.supports_options && !entry.disabled_by ) as ConfigEntry[]; @@ -376,7 +376,7 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { ? html` ${dongles.map((dongle) => { const configEntry = dongle.config_entries - .map((id) => this._configEntries![id]) + .map((id) => this._configEntries?.[id]) .filter( (entry) => entry?.supports_options && !entry.disabled_by )[0]; From 169d8ac75c0cf729f1cbd3d23702c6280d130edd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:10:14 +0000 Subject: [PATCH 23/37] Bump intl-messageformat from 10.2.5 to 10.3.0 (#15266) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 30 +++++++++++++++--------------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/package.json b/package.json index 8c9477498d..6054be2dae 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "hls.js": "^1.3.1", "home-assistant-js-websocket": "^8.0.1", "idb-keyval": "^5.1.3", - "intl-messageformat": "^10.2.5", + "intl-messageformat": "^10.3.0", "js-yaml": "^4.1.0", "leaflet": "^1.7.1", "leaflet-draw": "^1.0.4", diff --git a/yarn.lock b/yarn.lock index 9f00c0727e..6f4aa16c44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1492,23 +1492,23 @@ __metadata: languageName: node linkType: hard -"@formatjs/fast-memoize@npm:1.2.7": - version: 1.2.7 - resolution: "@formatjs/fast-memoize@npm:1.2.7" +"@formatjs/fast-memoize@npm:1.2.8": + version: 1.2.8 + resolution: "@formatjs/fast-memoize@npm:1.2.8" dependencies: tslib: ^2.4.0 - checksum: ba372a3e931bd99729d993f5b95aeb43e7d07b9f71e759722cc20c4e2faa0af11a942f0df9023a029b03230dc4dfad5354755be1e385c465750f63e4b3372b7b + checksum: 19f7f04657363d3ca4854ba3e5ecf4ae5bf0575c12ba8b2b24a7128131b38d91cf2692aeab778d42e9aa2e27cd2ea3b1e23cabf8ce4dff42988dcf65582c3a94 languageName: node linkType: hard -"@formatjs/icu-messageformat-parser@npm:2.1.14": - version: 2.1.14 - resolution: "@formatjs/icu-messageformat-parser@npm:2.1.14" +"@formatjs/icu-messageformat-parser@npm:2.2.0": + version: 2.2.0 + resolution: "@formatjs/icu-messageformat-parser@npm:2.2.0" dependencies: "@formatjs/ecma402-abstract": 1.14.3 "@formatjs/icu-skeleton-parser": 1.3.18 tslib: ^2.4.0 - checksum: 4d13230af075a353eef4725bee67d46bfc40f4873e561c141a2e62b91e377ffa7fffe61ee6df6bb187a00e15ab6fe242014958d51e4c6056032801178eb7e1c8 + checksum: bd457714296a3503d57383ee9ba8c9fb01e0097379c2bcf18c827ff736f64cf83132f2ab539f534b716726d6554beede354c30180d543dd8a1cf8e4c8f842bd7 languageName: node linkType: hard @@ -9491,7 +9491,7 @@ fsevents@^1.2.7: husky: ^8.0.3 idb-keyval: ^5.1.3 instant-mocha: ^1.3.1 - intl-messageformat: ^10.2.5 + intl-messageformat: ^10.3.0 js-yaml: ^4.1.0 jszip: ^3.10.1 leaflet: ^1.7.1 @@ -9987,15 +9987,15 @@ fsevents@^1.2.7: languageName: node linkType: hard -"intl-messageformat@npm:^10.2.5": - version: 10.2.5 - resolution: "intl-messageformat@npm:10.2.5" +"intl-messageformat@npm:^10.3.0": + version: 10.3.0 + resolution: "intl-messageformat@npm:10.3.0" dependencies: "@formatjs/ecma402-abstract": 1.14.3 - "@formatjs/fast-memoize": 1.2.7 - "@formatjs/icu-messageformat-parser": 2.1.14 + "@formatjs/fast-memoize": 1.2.8 + "@formatjs/icu-messageformat-parser": 2.2.0 tslib: ^2.4.0 - checksum: 048d6e3e746bff5ea6d745c8cbc2d0049aadb42caf2bad0d47e0bcf9bede285ef48a1fbd3a87711b99587d270d2ab8d9488e51577b24a2227856cdf373dd25df + checksum: a92b2fec9ed0ba992ecfefbe9968c0f80961d6d23d105b16f3437108c61fe57d6e91e04392c4092335136399e047572996bc45d197ec0899473a3aac3627fed2 languageName: node linkType: hard From 82ed14e7050a90b29d146be6d370d28f62f2e8fe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 07:28:41 -0500 Subject: [PATCH 24/37] Bump @octokit/auth-oauth-device from 4.0.2 to 4.0.4 (#15263) --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 6054be2dae..9a2801e38f 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "@babel/preset-env": "^7.20.2", "@babel/preset-typescript": "^7.18.6", "@koa/cors": "^3.1.0", - "@octokit/auth-oauth-device": "^4.0.2", + "@octokit/auth-oauth-device": "^4.0.4", "@octokit/rest": "^19.0.7", "@open-wc/dev-server-hmr": "^0.0.2", "@rollup/plugin-babel": "^5.2.1", diff --git a/yarn.lock b/yarn.lock index 6f4aa16c44..e59226440e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3166,15 +3166,15 @@ __metadata: languageName: node linkType: hard -"@octokit/auth-oauth-device@npm:^4.0.2": - version: 4.0.2 - resolution: "@octokit/auth-oauth-device@npm:4.0.2" +"@octokit/auth-oauth-device@npm:^4.0.4": + version: 4.0.4 + resolution: "@octokit/auth-oauth-device@npm:4.0.4" dependencies: "@octokit/oauth-methods": ^2.0.0 "@octokit/request": ^6.0.0 - "@octokit/types": ^7.0.0 + "@octokit/types": ^9.0.0 universal-user-agent: ^6.0.0 - checksum: 49cd76ae8644fa537a6dd0155b85321a46a517d2064a0cb69ee2a9cfa5b081cd70a906958e002ee4e63895e966d942a28b2be9c527490f25b8685e229d17addd + checksum: 245e1fd77684d131793a52a45133ad2514dbb14e5bb6af99eeaccff58662b567327196a721e296ef5734c0988e85a7536ef22bbf04613b302eba595995c5c751 languageName: node linkType: hard @@ -9403,7 +9403,7 @@ fsevents@^1.2.7: "@material/top-app-bar": =14.0.0-canary.53b3cad2f.0 "@mdi/js": 7.1.96 "@mdi/svg": 7.1.96 - "@octokit/auth-oauth-device": ^4.0.2 + "@octokit/auth-oauth-device": ^4.0.4 "@octokit/rest": ^19.0.7 "@open-wc/dev-server-hmr": ^0.0.2 "@polymer/app-layout": ^3.1.0 From 7e441b5ade793eb87c934df6ff6c4fc6ec44fafa Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 16:07:43 +0100 Subject: [PATCH 25/37] Fix entity list not updated when using graph card editor (#15217) * Fix entity list not updated when using graph card editor * Do not use async updated * Fix names type * Better error handling * Feedbacks --- .../chart/state-history-chart-line.ts | 2 +- .../chart/state-history-chart-timeline.ts | 2 +- src/components/chart/state-history-charts.ts | 2 +- src/components/chart/statistics-chart.ts | 2 +- .../lovelace/cards/hui-history-graph-card.ts | 81 +++++++++---------- src/translations/en.json | 3 +- 6 files changed, 44 insertions(+), 48 deletions(-) diff --git a/src/components/chart/state-history-chart-line.ts b/src/components/chart/state-history-chart-line.ts index dc24388d13..c4b735d488 100644 --- a/src/components/chart/state-history-chart-line.ts +++ b/src/components/chart/state-history-chart-line.ts @@ -22,7 +22,7 @@ class StateHistoryChartLine extends LitElement { @property({ attribute: false }) public data: LineChartEntity[] = []; - @property() public names: boolean | Record = false; + @property() public names?: Record; @property() public unit?: string; diff --git a/src/components/chart/state-history-chart-timeline.ts b/src/components/chart/state-history-chart-timeline.ts index 78b3831ba0..7b5a25e1ae 100644 --- a/src/components/chart/state-history-chart-timeline.ts +++ b/src/components/chart/state-history-chart-timeline.ts @@ -19,7 +19,7 @@ export class StateHistoryChartTimeline extends LitElement { @property() public narrow!: boolean; - @property() public names: boolean | Record = false; + @property() public names?: Record; @property() public unit?: string; diff --git a/src/components/chart/state-history-charts.ts b/src/components/chart/state-history-charts.ts index 4da124dc90..19421ef9b2 100644 --- a/src/components/chart/state-history-charts.ts +++ b/src/components/chart/state-history-charts.ts @@ -45,7 +45,7 @@ class StateHistoryCharts extends LitElement { @property() public narrow!: boolean; - @property({ type: Boolean }) public names = false; + @property() public names?: Record; @property({ type: Boolean, attribute: "virtualize", reflect: true }) public virtualize = false; diff --git a/src/components/chart/statistics-chart.ts b/src/components/chart/statistics-chart.ts index 2c77389482..9b78e8ab02 100644 --- a/src/components/chart/statistics-chart.ts +++ b/src/components/chart/statistics-chart.ts @@ -66,7 +66,7 @@ class StatisticsChart extends LitElement { StatisticsMetaData >; - @property() public names: boolean | Record = false; + @property() public names?: Record; @property() public unit?: string; diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts index 2e6df7db54..4d145385e3 100644 --- a/src/panels/lovelace/cards/hui-history-graph-card.ts +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -8,18 +8,17 @@ import { } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; -import "../../../components/ha-card"; -import "../../../components/chart/state-history-charts"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; +import "../../../components/chart/state-history-charts"; +import "../../../components/ha-card"; import { + computeHistory, HistoryResult, subscribeHistoryStatesTimeWindow, - computeHistory, } from "../../../data/history"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntitiesChanged } from "../common/has-changed"; import { processConfigEntities } from "../common/process-config-entities"; -import { EntityConfig } from "../entity-rows/types"; import { LovelaceCard } from "../types"; import { HistoryGraphCardConfig } from "./types"; @@ -41,7 +40,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { @state() private _config?: HistoryGraphCardConfig; - private _configEntities?: EntityConfig[]; + @state() private _error?: { code: string; message: string }; private _names: Record = {}; @@ -49,16 +48,12 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { private _hoursToShow = 24; - private _error?: string; - private _interval?: number; private _subscribed?: Promise<(() => Promise) | void>; public getCardSize(): number { - return this._config?.title - ? 2 - : 0 + 2 * (this._configEntities?.length || 1); + return this._config?.title ? 2 : 0 + 2 * (this._entityIds?.length || 1); } public setConfig(config: HistoryGraphCardConfig): void { @@ -70,11 +65,12 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { throw new Error("You must include at least one entity"); } - this._configEntities = config.entities + const configEntities = config.entities ? processConfigEntities(config.entities) : []; - this._configEntities.forEach((entity) => { + this._entityIds = []; + configEntities.forEach((entity) => { this._entityIds.push(entity.entity); if (entity.name) { this._names[entity.entity] = entity.name; @@ -89,16 +85,16 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { public connectedCallback() { super.connectedCallback(); if (this.hasUpdated) { - this._subscribeHistoryTimeWindow(); + this._subscribeHistory(); } } public disconnectedCallback() { super.disconnectedCallback(); - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } - private _subscribeHistoryTimeWindow() { + private async _subscribeHistory() { if (!isComponentLoaded(this.hass!, "history") || this._subscribed) { return; } @@ -136,17 +132,12 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60); } - private _unsubscribeHistoryTimeWindow() { - if (!this._subscribed) { - return; - } + private _unsubscribeHistory() { clearInterval(this._interval); - this._subscribed.then((unsubscribe) => { - if (unsubscribe) { - unsubscribe(); - } + if (this._subscribed) { + this._subscribed.then((unsub) => unsub?.()); this._subscribed = undefined; - }); + } } protected shouldUpdate(changedProps: PropertyValues): boolean { @@ -177,12 +168,11 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { if ( changedProps.has("_config") && - (!this._subscribed || - oldConfig?.entities !== this._config.entities || - oldConfig?.hours_to_show !== this._hoursToShow) + (oldConfig?.entities !== this._config.entities || + oldConfig?.hours_to_show !== this._config.hours_to_show) ) { - this._unsubscribeHistoryTimeWindow(); - this._subscribeHistoryTimeWindow(); + this._unsubscribeHistory(); + this._subscribeHistory(); } } @@ -191,10 +181,6 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { return html``; } - if (this._error) { - return html`
${this._error}
`; - } - return html`
- + ${this._error + ? html` +
+ ${this.hass.localize("ui.components.history_charts.error")} : + ${this._error.message || this._error.code} +
+ ` + : html` + + `}
`; diff --git a/src/translations/en.json b/src/translations/en.json index b893a20476..d9cd6215e1 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -488,7 +488,8 @@ "history_charts": { "history_disabled": "History integration disabled", "loading_history": "Loading state history…", - "no_history_found": "No state history found." + "no_history_found": "No state history found.", + "error": "Unable to load history" }, "statistics_charts": { "loading_statistics": "Loading statistics…", From ac17d0293e4af5b086b9292e54f5a7409b21bb3d Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 15:08:18 +0000 Subject: [PATCH 26/37] Bump @vaadin/vaadin-themable-mixin from 23.3.5 to 23.3.6 (#15260) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 148 +++++++++++++++++++++++++-------------------------- 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/package.json b/package.json index 9a2801e38f..6368cd321f 100644 --- a/package.json +++ b/package.json @@ -88,8 +88,8 @@ "@polymer/paper-tooltip": "^3.0.1", "@polymer/polymer": "3.4.1", "@thomasloven/round-slider": "0.6.0", - "@vaadin/combo-box": "^23.3.5", - "@vaadin/vaadin-themable-mixin": "^23.3.5", + "@vaadin/combo-box": "^23.3.6", + "@vaadin/vaadin-themable-mixin": "^23.3.6", "@vibrant/color": "^3.2.1-alpha.1", "@vibrant/core": "^3.2.1-alpha.1", "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1", diff --git a/yarn.lock b/yarn.lock index e59226440e..74e3ed8697 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4642,110 +4642,110 @@ __metadata: languageName: node linkType: hard -"@vaadin/combo-box@npm:^23.3.5": - version: 23.3.5 - resolution: "@vaadin/combo-box@npm:23.3.5" +"@vaadin/combo-box@npm:^23.3.6": + version: 23.3.6 + resolution: "@vaadin/combo-box@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 - "@vaadin/field-base": ~23.3.5 - "@vaadin/input-container": ~23.3.5 - "@vaadin/item": ~23.3.5 - "@vaadin/lit-renderer": ~23.3.5 - "@vaadin/overlay": ~23.3.5 - "@vaadin/vaadin-lumo-styles": ~23.3.5 - "@vaadin/vaadin-material-styles": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: 8b6db6a902236d3adcc0b9f6694f66b65fd3e4c557b9cfc6aa04971a9eade1063f308d9f39d1ef52e51653934432a39b30a258a21ad859fcd4ebae794c5a1a7d + "@vaadin/component-base": ~23.3.6 + "@vaadin/field-base": ~23.3.6 + "@vaadin/input-container": ~23.3.6 + "@vaadin/item": ~23.3.6 + "@vaadin/lit-renderer": ~23.3.6 + "@vaadin/overlay": ~23.3.6 + "@vaadin/vaadin-lumo-styles": ~23.3.6 + "@vaadin/vaadin-material-styles": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: fdd260a4adf89850fb058bc99a008e970ec7b58a2c576101548640a08577d497dc87778e2b3901f93249e2b21ac2e39d1d5c011762cff98c59fcf7cdc31200c0 languageName: node linkType: hard -"@vaadin/component-base@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/component-base@npm:23.3.5" +"@vaadin/component-base@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/component-base@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 "@polymer/polymer": ^3.0.0 "@vaadin/vaadin-development-mode-detector": ^2.0.0 "@vaadin/vaadin-usage-statistics": ^2.1.0 lit: ^2.0.0 - checksum: c77dff2138ec4140c2620bf8eb6d050d45c97d59ef3cd8eadb3f5cdda99a1443b5e9b4d00c6eb7d67b165ed4bf258109505d25e01a8a5b38d5b4cc0cafbf921c + checksum: d3301f12cbc2c7bc900aef87ccbc3513b58a7a23b846a8dea40a2b91dd82d37f02bc080523f4d9e4413c23a7f2b56fe9f709d9ed72d2d1a214c7205e7d429a6d languageName: node linkType: hard -"@vaadin/field-base@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/field-base@npm:23.3.5" +"@vaadin/field-base@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/field-base@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 + "@vaadin/component-base": ~23.3.6 lit: ^2.0.0 - checksum: 5fc9e4faf875dd4da06bab5927e9a46d88accd067ce0c96f5905af4c90dceb78fc068c64d650d247265326cd9ea71714f527f3436efc60c2235857f3d48704d4 + checksum: cd37f85f2a52a2c0a46bbae959caa28bf2c64394ccdfec911eb9dd07b2cdac733def169738958b8dc421e82752c9fa6e201926d5a967113a8a48ccecdb61a887 languageName: node linkType: hard -"@vaadin/icon@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/icon@npm:23.3.5" +"@vaadin/icon@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/icon@npm:23.3.6" dependencies: "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 - "@vaadin/vaadin-lumo-styles": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 + "@vaadin/component-base": ~23.3.6 + "@vaadin/vaadin-lumo-styles": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 lit: ^2.0.0 - checksum: 8cc3e553b835f3b474ee69dd33b1c0fb545090f2a0e87eff0a9c0eb8000604f20a008772cd2f022ba64a42b9d40947bd93b3e60034544aa7fdd6d2f71da6b339 + checksum: 5c559274e44bcab9aa4683f77a8078ff1f4b7af71f446091f321f1f47c954f918ee306341dd0415c743d78cde40601e3e381b215672d4cb91f92fe37debf44fa languageName: node linkType: hard -"@vaadin/input-container@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/input-container@npm:23.3.5" +"@vaadin/input-container@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/input-container@npm:23.3.6" dependencies: "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 - "@vaadin/vaadin-lumo-styles": ~23.3.5 - "@vaadin/vaadin-material-styles": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: 914c2099321261402827dac8b351fd6a843f944f42b034b56713eb726c2bd575bf103e1a8096de5487358f1bbe2f890d7eb684ecb09e20423c2e0cc17d649271 + "@vaadin/component-base": ~23.3.6 + "@vaadin/vaadin-lumo-styles": ~23.3.6 + "@vaadin/vaadin-material-styles": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: c675f1daf9f51f1fc0987a85be1ed83bffc897be9a694b861a037a9c91438a1f02f232cd026c80ec88ffc409ae147ed415cadd8ed07b34e49b94b15e01753d0e languageName: node linkType: hard -"@vaadin/item@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/item@npm:23.3.5" +"@vaadin/item@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/item@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 - "@vaadin/vaadin-lumo-styles": ~23.3.5 - "@vaadin/vaadin-material-styles": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: e5f930004f0e76d7b6cffcf8038cf008706bfd5363986d421b2ee7bbbf0d863b0200fe82676d24e130ba2cc352e9c84a19a8dac2d3561b78275e4ac5ae75f7a6 + "@vaadin/component-base": ~23.3.6 + "@vaadin/vaadin-lumo-styles": ~23.3.6 + "@vaadin/vaadin-material-styles": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: 92236d255173a22cbbae9b83e521f2037228961bd675eead48c312f0a4311cdd488289418e1c9015559993c8a673f62c09dbdefc4b50bcaaa4b42b357c124073 languageName: node linkType: hard -"@vaadin/lit-renderer@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/lit-renderer@npm:23.3.5" +"@vaadin/lit-renderer@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/lit-renderer@npm:23.3.6" dependencies: lit: ^2.0.0 - checksum: fc39e3678b203ee3db8823aa736bdbd24ba33dd957e96ceb16829aa58fbee3d79456006d5ec9d1e1623eaa1c641de61a2434ec1dc43f40137819fb4bd051418e + checksum: fcd411682943e7a8160c501a0063a1d6de51687d2b08864590c83111ae8ebcf50b471443f62a855bab6debce1520de320b6620ab4bc4a324fcc9c3eeab2bd769 languageName: node linkType: hard -"@vaadin/overlay@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/overlay@npm:23.3.5" +"@vaadin/overlay@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/overlay@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 "@polymer/polymer": ^3.0.0 - "@vaadin/component-base": ~23.3.5 - "@vaadin/vaadin-lumo-styles": ~23.3.5 - "@vaadin/vaadin-material-styles": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: e57b2b7ef295e7bcc5068c4ce2dbe4f3897e9ee23dc89db9726ecb8575cadf56c04bca5d5c22155b77d5b5f0da374243bfeddc1b146bf90bc43b6a1a039c798f + "@vaadin/component-base": ~23.3.6 + "@vaadin/vaadin-lumo-styles": ~23.3.6 + "@vaadin/vaadin-material-styles": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: 9ff90980602bda7a10efe735eff973844e6b30112735389f9be60dee04fd51ab8752345c8a173d1ab6cc5583c26a67cfb4faa301db1b8c2c1a48c6164f4ce3bb languageName: node linkType: hard @@ -4756,36 +4756,36 @@ __metadata: languageName: node linkType: hard -"@vaadin/vaadin-lumo-styles@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/vaadin-lumo-styles@npm:23.3.5" +"@vaadin/vaadin-lumo-styles@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/vaadin-lumo-styles@npm:23.3.6" dependencies: "@polymer/iron-icon": ^3.0.0 "@polymer/iron-iconset-svg": ^3.0.0 "@polymer/polymer": ^3.0.0 - "@vaadin/icon": ~23.3.5 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: 1a7c2ecf9c31799fa89fa5cbc53f1ea83d5ff649befde999d81090cc1670e06804335eb21e1f1a19007e2e9248a053dd5ae50e1ecfe75368a47f4646f5b1f89d + "@vaadin/icon": ~23.3.6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: d3e4d47c0a0e8f786cba38f185a80a08274f1e93020896a1d1a67eff7518c9774c77b15622968128c823c08e7c789f08918aeb8c78f18c60b18078f63f67f7ff languageName: node linkType: hard -"@vaadin/vaadin-material-styles@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/vaadin-material-styles@npm:23.3.5" +"@vaadin/vaadin-material-styles@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/vaadin-material-styles@npm:23.3.6" dependencies: "@polymer/polymer": ^3.0.0 - "@vaadin/vaadin-themable-mixin": ~23.3.5 - checksum: d406232985e4e3e51bb19daf68d9e0667b3b95a8048e7fc2782cf830d25b1c58f59dd01d8816d9e48a7e02a3c2dbade8bc485750ae525c81cfc019eb461396c6 + "@vaadin/vaadin-themable-mixin": ~23.3.6 + checksum: 7725bb7952b75724ac33de8abcca164689c545dad8675155ff72ef9dd2ae6eb082fdcad483e851a4ef6090c2f40834c6e401a304ab38af700eac0442189fa06b languageName: node linkType: hard -"@vaadin/vaadin-themable-mixin@npm:^23.3.5, @vaadin/vaadin-themable-mixin@npm:~23.3.5": - version: 23.3.5 - resolution: "@vaadin/vaadin-themable-mixin@npm:23.3.5" +"@vaadin/vaadin-themable-mixin@npm:^23.3.6, @vaadin/vaadin-themable-mixin@npm:~23.3.6": + version: 23.3.6 + resolution: "@vaadin/vaadin-themable-mixin@npm:23.3.6" dependencies: "@open-wc/dedupe-mixin": ^1.3.0 lit: ^2.0.0 - checksum: b57b7bf29179e62ee6ab380eae3317d3090ce223a3c1f8510aa62b539d43b2d5c7514f49eaa8b252c9a33afcc74f3cf2c10e671a190fc865b4f7ca4501293d33 + checksum: 5cdf75ad20e30d15daaa5f1428613a8c78c0159c61e1607ff3c3a3d374b8c8ae9a7a5c99a718d845228305518863e8ff3a4c86897f3dd350c507a3f317f42637 languageName: node linkType: hard @@ -9441,8 +9441,8 @@ fsevents@^1.2.7: "@types/webspeechapi": ^0.0.29 "@typescript-eslint/eslint-plugin": ^5.46.1 "@typescript-eslint/parser": ^5.49.0 - "@vaadin/combo-box": ^23.3.5 - "@vaadin/vaadin-themable-mixin": ^23.3.5 + "@vaadin/combo-box": ^23.3.6 + "@vaadin/vaadin-themable-mixin": ^23.3.6 "@vibrant/color": ^3.2.1-alpha.1 "@vibrant/core": ^3.2.1-alpha.1 "@vibrant/quantizer-mmcq": ^3.2.1-alpha.1 From 3af808ffa903f34f0f6139de81e1aa7b331f2dc5 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 10:24:40 -0500 Subject: [PATCH 27/37] Bump @formatjs/intl-relativetimeformat from 9.3.2 to 11.1.8 (#15250) Bumps [@formatjs/intl-relativetimeformat](https://github.com/formatjs/formatjs) from 9.3.2 to 11.1.8. - [Release notes](https://github.com/formatjs/formatjs/releases) - [Commits](https://github.com/formatjs/formatjs/compare/@formatjs/intl-relativetimeformat@9.3.2...@formatjs/intl-relativetimeformat@11.1.8) --- updated-dependencies: - dependency-name: "@formatjs/intl-relativetimeformat" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 16 ++++++++-------- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/package.json b/package.json index 6368cd321f..e6883cc075 100644 --- a/package.json +++ b/package.json @@ -37,7 +37,7 @@ "@formatjs/intl-locale": "^3.0.11", "@formatjs/intl-numberformat": "^7.2.5", "@formatjs/intl-pluralrules": "^4.1.5", - "@formatjs/intl-relativetimeformat": "^9.3.2", + "@formatjs/intl-relativetimeformat": "^11.1.8", "@fullcalendar/common": "^5.11.4", "@fullcalendar/core": "^5.11.4", "@fullcalendar/daygrid": "^5.11.4", diff --git a/yarn.lock b/yarn.lock index 74e3ed8697..b194a0a4a3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1592,14 +1592,14 @@ __metadata: languageName: node linkType: hard -"@formatjs/intl-relativetimeformat@npm:^9.3.2": - version: 9.3.2 - resolution: "@formatjs/intl-relativetimeformat@npm:9.3.2" +"@formatjs/intl-relativetimeformat@npm:^11.1.8": + version: 11.1.8 + resolution: "@formatjs/intl-relativetimeformat@npm:11.1.8" dependencies: - "@formatjs/ecma402-abstract": 1.10.0 - "@formatjs/intl-localematcher": 0.2.21 - tslib: ^2.1.0 - checksum: 636a4ab27e003eda6d5310c270787a7622181f9c1be157b79fada3ac1bbf0867fb5d82def3ddf6641c311387d214e4e214b6b7092e3306a960d913b2f5014c12 + "@formatjs/ecma402-abstract": 1.14.3 + "@formatjs/intl-localematcher": 0.2.32 + tslib: ^2.4.0 + checksum: 2ca379c549d5998366e8648843e810ffcba88e42112d6b6a8bd8d5898d1bc84137245ee44f7ef83c3fe85e33c122bb366f261478facd2efd78c98718e53fe404 languageName: node linkType: hard @@ -9366,7 +9366,7 @@ fsevents@^1.2.7: "@formatjs/intl-locale": ^3.0.11 "@formatjs/intl-numberformat": ^7.2.5 "@formatjs/intl-pluralrules": ^4.1.5 - "@formatjs/intl-relativetimeformat": ^9.3.2 + "@formatjs/intl-relativetimeformat": ^11.1.8 "@fullcalendar/common": ^5.11.4 "@fullcalendar/core": ^5.11.4 "@fullcalendar/daygrid": ^5.11.4 From 8642478e8a9c031528c9694a137bfd3510bc0350 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 30 Jan 2023 16:36:50 +0100 Subject: [PATCH 28/37] Fix shortcuts in supervisor search (#15269) --- src/state/quick-bar-mixin.ts | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/state/quick-bar-mixin.ts b/src/state/quick-bar-mixin.ts index 1c4661c397..7f4473f4d4 100644 --- a/src/state/quick-bar-mixin.ts +++ b/src/state/quick-bar-mixin.ts @@ -144,11 +144,14 @@ export default >(superClass: T) => return false; } - if (!(el instanceof HTMLInputElement)) { + if ( + (el as Element).tagName !== "INPUT" && + !(el instanceof HTMLInputElement) + ) { return true; } - switch (el.type) { + switch ((el as HTMLInputElement).type) { case "button": case "checkbox": case "hidden": From a57c15c6f066a4addfe9c3a55bff4425c0aca6d3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 12:25:53 -0500 Subject: [PATCH 29/37] Bump webpack-manifest-plugin from 4.0.2 to 5.0.0 (#15252) Bumps [webpack-manifest-plugin](https://github.com/shellscape/webpack-manifest-plugin) from 4.0.2 to 5.0.0. - [Release notes](https://github.com/shellscape/webpack-manifest-plugin/releases) - [Commits](https://github.com/shellscape/webpack-manifest-plugin/compare/v4.0.2...v5.0.0) --- updated-dependencies: - dependency-name: webpack-manifest-plugin dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index e6883cc075..69f22b4d60 100644 --- a/package.json +++ b/package.json @@ -239,7 +239,7 @@ "webpack": "^5.55.1", "webpack-cli": "^5.0.1", "webpack-dev-server": "^4.11.1", - "webpack-manifest-plugin": "^4.0.2", + "webpack-manifest-plugin": "^5.0.0", "webpackbar": "^5.0.2", "workbox-build": "^6.5.4" }, diff --git a/yarn.lock b/yarn.lock index b194a0a4a3..cac8be2fda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9546,7 +9546,7 @@ fsevents@^1.2.7: webpack: ^5.55.1 webpack-cli: ^5.0.1 webpack-dev-server: ^4.11.1 - webpack-manifest-plugin: ^4.0.2 + webpack-manifest-plugin: ^5.0.0 webpackbar: ^5.0.2 weekstart: ^1.1.0 workbox-build: ^6.5.4 @@ -16038,15 +16038,15 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-manifest-plugin@npm:^4.0.2": - version: 4.0.2 - resolution: "webpack-manifest-plugin@npm:4.0.2" +"webpack-manifest-plugin@npm:^5.0.0": + version: 5.0.0 + resolution: "webpack-manifest-plugin@npm:5.0.0" dependencies: tapable: ^2.0.0 webpack-sources: ^2.2.0 peerDependencies: - webpack: ^4.44.2 || ^5.47.0 - checksum: 7f8a338b977bb9a8be10196d17e033f965b97735d36258513e5104b148c8ad1da8441bb8f9c8580b9455f40201ac2ac2a2edcce6ef60e46f072519c0cc0d1f70 + webpack: ^5.47.0 + checksum: 864d68f90870e194074756e71caf3df36b777d687a50286ba27eb1958480642b125c2cf47a2787beac52eba4b1ccf1fe8141f017c81f1e87e953481f852a7c48 languageName: node linkType: hard From acf9bca038b68cd6e7a235512caf3bec1169319f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 30 Jan 2023 13:41:28 -0500 Subject: [PATCH 30/37] Bump merge-stream from 1.0.1 to 2.0.0 (#15265) Bumps [merge-stream](https://github.com/grncdr/merge-stream) from 1.0.1 to 2.0.0. - [Release notes](https://github.com/grncdr/merge-stream/releases) - [Commits](https://github.com/grncdr/merge-stream/compare/v1.0.1...v2.0.0) --- updated-dependencies: - dependency-name: merge-stream dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 11 +---------- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index 69f22b4d60..f8e1663ff6 100644 --- a/package.json +++ b/package.json @@ -215,7 +215,7 @@ "lodash.template": "^4.5.0", "magic-string": "^0.25.7", "map-stream": "^0.0.7", - "merge-stream": "^1.0.1", + "merge-stream": "^2.0.0", "mocha": "^8.4.0", "object-hash": "^3.0.0", "open": "^8.4.0", diff --git a/yarn.lock b/yarn.lock index cac8be2fda..7b4c84c463 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9504,7 +9504,7 @@ fsevents@^1.2.7: map-stream: ^0.0.7 marked: ^4.0.12 memoize-one: ^6.0.0 - merge-stream: ^1.0.1 + merge-stream: ^2.0.0 mocha: ^8.4.0 node-vibrant: 3.2.1-alpha.1 object-hash: ^3.0.0 @@ -11486,15 +11486,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"merge-stream@npm:^1.0.1": - version: 1.0.1 - resolution: "merge-stream@npm:1.0.1" - dependencies: - readable-stream: ^2.0.1 - checksum: 3be7887dffd8899da0f930c0f85812ab8993252f467dcd61e60a8d085836ebbb23756b8e481a7f71824206342afe1b1a2b80c05a1cd0ed0e792a09c5812a9082 - languageName: node - linkType: hard - "merge-stream@npm:^2.0.0": version: 2.0.0 resolution: "merge-stream@npm:2.0.0" From 9220d65f78d83272e846acc1394bb7145e74d5ca Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 30 Jan 2023 20:08:33 +0100 Subject: [PATCH 31/37] Fixes history unsubcription (#15271) * Fixes history unsubcriptions * Remove async --- src/dialogs/more-info/ha-more-info-history.ts | 17 +++++-------- .../lovelace/cards/hui-history-graph-card.ts | 2 +- src/panels/lovelace/cards/hui-map-card.ts | 25 ++++++++----------- .../header-footer/hui-graph-header-footer.ts | 23 +++++++---------- 4 files changed, 26 insertions(+), 41 deletions(-) diff --git a/src/dialogs/more-info/ha-more-info-history.ts b/src/dialogs/more-info/ha-more-info-history.ts index dd2a5c1165..2fae84f071 100644 --- a/src/dialogs/more-info/ha-more-info-history.ts +++ b/src/dialogs/more-info/ha-more-info-history.ts @@ -113,20 +113,15 @@ export class MoreInfoHistory extends LitElement { public disconnectedCallback() { super.disconnectedCallback(); - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } - private _unsubscribeHistoryTimeWindow() { - if (!this._subscribed) { - return; - } + private _unsubscribeHistory() { clearInterval(this._interval); - this._subscribed.then((unsubscribe) => { - if (unsubscribe) { - unsubscribe(); - } + if (this._subscribed) { + this._subscribed.then((unsub) => unsub?.()); this._subscribed = undefined; - }); + } } private _redrawGraph() { @@ -165,7 +160,7 @@ export class MoreInfoHistory extends LitElement { return; } if (this._subscribed) { - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } this._subscribed = subscribeHistoryStatesTimeWindow( this.hass!, diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts index 4d145385e3..046c0866d5 100644 --- a/src/panels/lovelace/cards/hui-history-graph-card.ts +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -94,7 +94,7 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { this._unsubscribeHistory(); } - private async _subscribeHistory() { + private _subscribeHistory() { if (!isComponentLoaded(this.hass!, "history") || this._subscribed) { return; } diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts index b608e61b3a..917b53e276 100644 --- a/src/panels/lovelace/cards/hui-map-card.ts +++ b/src/panels/lovelace/cards/hui-map-card.ts @@ -191,16 +191,16 @@ class HuiMapCard extends LitElement implements LovelaceCard { public connectedCallback() { super.connectedCallback(); if (this.hasUpdated && this._configEntities?.length) { - this._subscribeHistoryTimeWindow(); + this._subscribeHistory(); } } public disconnectedCallback() { super.disconnectedCallback(); - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } - private _subscribeHistoryTimeWindow() { + private _subscribeHistory() { if (!isComponentLoaded(this.hass!, "history") || this._subscribed) { return; } @@ -223,26 +223,21 @@ class HuiMapCard extends LitElement implements LovelaceCard { }); } - private _unsubscribeHistoryTimeWindow() { - if (!this._subscribed) { - return; - } - this._subscribed.then((unsubscribe) => { - if (unsubscribe) { - unsubscribe(); - } + private _unsubscribeHistory() { + if (this._subscribed) { + this._subscribed.then((unsub) => unsub?.()); this._subscribed = undefined; - }); + } } protected updated(changedProps: PropertyValues): void { if (this._configEntities?.length) { if (!this._subscribed || changedProps.has("_config")) { - this._unsubscribeHistoryTimeWindow(); - this._subscribeHistoryTimeWindow(); + this._unsubscribeHistory(); + this._subscribeHistory(); } } else { - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } if (changedProps.has("_config")) { this._computePadding(); diff --git a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts index 12dbbfdcaf..63ea87d580 100644 --- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts @@ -132,16 +132,16 @@ export class HuiGraphHeaderFooter public connectedCallback() { super.connectedCallback(); if (this.hasUpdated) { - this._subscribeHistoryTimeWindow(); + this._subscribeHistory(); } } public disconnectedCallback() { super.disconnectedCallback(); - this._unsubscribeHistoryTimeWindow(); + this._unsubscribeHistory(); } - private _subscribeHistoryTimeWindow() { + private _subscribeHistory() { if (!isComponentLoaded(this.hass!, "history") || this._subscribed) { return; } @@ -185,17 +185,12 @@ export class HuiGraphHeaderFooter ); } - private _unsubscribeHistoryTimeWindow() { + private _unsubscribeHistory() { clearInterval(this._interval); - if (!this._subscribed) { - return; - } - this._subscribed.then((unsubscribe) => { - if (unsubscribe) { - unsubscribe(); - } + if (this._subscribed) { + this._subscribed.then((unsub) => unsub?.()); this._subscribed = undefined; - }); + } } protected updated(changedProps: PropertyValues) { @@ -209,8 +204,8 @@ export class HuiGraphHeaderFooter !this._subscribed || oldConfig.entity !== this._config.entity ) { - this._unsubscribeHistoryTimeWindow(); - this._subscribeHistoryTimeWindow(); + this._unsubscribeHistory(); + this._subscribeHistory(); } } From 41420c3af35ca24c418f6d336d2a15e042486f8d Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Mon, 30 Jan 2023 13:34:35 -0600 Subject: [PATCH 32/37] Restore default hours to show on map card to 0 (#15220) * Restore default hours to show on map card to 0 fixes #15216 * tweak * always clear this._subscribed right away on unsub * adjust * merge from #15217 * merge from #15217 --- src/panels/lovelace/cards/hui-map-card.ts | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/panels/lovelace/cards/hui-map-card.ts b/src/panels/lovelace/cards/hui-map-card.ts index 917b53e276..ad8ec6cc1d 100644 --- a/src/panels/lovelace/cards/hui-map-card.ts +++ b/src/panels/lovelace/cards/hui-map-card.ts @@ -40,7 +40,7 @@ import { formatTimeWeekday, } from "../../../common/datetime/format_time"; -const DEFAULT_HOURS_TO_SHOW = 24; +const DEFAULT_HOURS_TO_SHOW = 0; @customElement("hui-map-card") class HuiMapCard extends LitElement implements LovelaceCard { @property({ attribute: false }) public hass!: HomeAssistant; @@ -213,7 +213,7 @@ class HuiMapCard extends LitElement implements LovelaceCard { } this._stateHistory = combinedHistory; }, - this._config!.hours_to_show! || DEFAULT_HOURS_TO_SHOW, + this._config!.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW, this._configEntities!, false, false @@ -341,7 +341,7 @@ class HuiMapCard extends LitElement implements LovelaceCard { const p = {} as HaMapPathPoint; p.point = [latitude, longitude] as LatLngTuple; const t = new Date(entityState.lu * 1000); - if (config.hours_to_show! || DEFAULT_HOURS_TO_SHOW > 144) { + if (config.hours_to_show! ?? DEFAULT_HOURS_TO_SHOW > 144) { // if showing > 6 days in the history trail, show the full // date and time p.tooltip = formatDateTime(t, this.hass.locale); From c1ed00a3f14be01c62b2fec9418ac45b89558f4a Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 30 Jan 2023 20:50:57 +0100 Subject: [PATCH 33/37] Only use tagname for shortcut filter (#15273) --- src/state/quick-bar-mixin.ts | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/src/state/quick-bar-mixin.ts b/src/state/quick-bar-mixin.ts index 7f4473f4d4..04659ac940 100644 --- a/src/state/quick-bar-mixin.ts +++ b/src/state/quick-bar-mixin.ts @@ -2,7 +2,6 @@ import type { PropertyValues } from "lit"; import tinykeys from "tinykeys"; import { isComponentLoaded } from "../common/config/is_component_loaded"; import { mainWindow } from "../common/dom/get_main_window"; -import { HaSelect } from "../components/ha-select"; import { QuickBarParams, showQuickBar, @@ -134,20 +133,17 @@ export default >(superClass: T) => } private _canOverrideAlphanumericInput(e: KeyboardEvent) { - const el = e.composedPath()[0]; + const el = e.composedPath()[0] as Element; - if (el instanceof HTMLTextAreaElement) { + if (el.tagName === "TEXTAREA") { return false; } - if (el instanceof Element && el.parentElement instanceof HaSelect) { + if (el.parentElement?.tagName === "HA-SELECT") { return false; } - if ( - (el as Element).tagName !== "INPUT" && - !(el instanceof HTMLInputElement) - ) { + if (el.tagName !== "INPUT") { return true; } From 549d893407ffb2bee3050e6ad2f2a2d0760a2edf Mon Sep 17 00:00:00 2001 From: Yosi Levy <37745463+yosilevy@users.noreply.github.com> Date: Mon, 30 Jan 2023 21:51:37 +0200 Subject: [PATCH 34/37] RTL fixes (#15233) --- src/components/entity/ha-entity-picker.ts | 6 +++--- src/components/ha-check-list-item.ts | 9 +++++++++ src/components/ha-combo-box.ts | 8 ++++---- .../integrations/ha-config-integrations.ts | 17 ++++++++++++++++- 4 files changed, 32 insertions(+), 8 deletions(-) diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index e2f2339c1c..ff26c4a79d 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -1,4 +1,3 @@ -import "@material/mwc-list/mwc-list-item"; import { HassEntity } from "home-assistant-js-websocket"; import { html, LitElement, PropertyValues, TemplateResult } from "lit"; import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit"; @@ -10,6 +9,7 @@ import { computeStateName } from "../../common/entity/compute_state_name"; import { caseInsensitiveStringCompare } from "../../common/string/compare"; import { PolymerChangedEvent } from "../../polymer-types"; import { HomeAssistant } from "../../types"; +import "../ha-list-item"; import "../ha-combo-box"; import type { HaComboBox } from "../ha-combo-box"; import "../ha-icon-button"; @@ -24,13 +24,13 @@ export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean; // eslint-disable-next-line lit/prefer-static-styles const rowRenderer: ComboBoxLitRenderer = (item) => - html` + html` ${item.state ? html`` : ""} ${item.friendly_name} ${item.entity_id} - `; + `; @customElement("ha-entity-picker") export class HaEntityPicker extends LitElement { diff --git a/src/components/ha-check-list-item.ts b/src/components/ha-check-list-item.ts index 63f5827f67..96e62a475e 100644 --- a/src/components/ha-check-list-item.ts +++ b/src/components/ha-check-list-item.ts @@ -13,6 +13,15 @@ export class HaCheckListItem extends CheckListItemBase { :host { --mdc-theme-secondary: var(--primary-color); } + + :host([graphic="avatar"]) .mdc-deprecated-list-item__graphic, + :host([graphic="medium"]) .mdc-deprecated-list-item__graphic, + :host([graphic="large"]) .mdc-deprecated-list-item__graphic, + :host([graphic="control"]) .mdc-deprecated-list-item__graphic { + margin-inline-end: var(--mdc-list-item-graphic-margin, 16px); + margin-inline-start: 0px; + direction: var(--direction); + } `, ]; } diff --git a/src/components/ha-combo-box.ts b/src/components/ha-combo-box.ts index dd4d4289e1..27691d1a5f 100644 --- a/src/components/ha-combo-box.ts +++ b/src/components/ha-combo-box.ts @@ -1,4 +1,3 @@ -import "@material/mwc-list/mwc-list-item"; import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js"; import { ComboBoxLitRenderer, comboBoxRenderer } from "@vaadin/combo-box/lit"; import "@vaadin/combo-box/theme/material/vaadin-combo-box-light"; @@ -15,6 +14,7 @@ import { customElement, property, query } from "lit/decorators"; import { ifDefined } from "lit/directives/if-defined"; import { fireEvent } from "../common/dom/fire_event"; import { HomeAssistant } from "../types"; +import "./ha-list-item"; import "./ha-icon-button"; import "./ha-textfield"; import type { HaTextField } from "./ha-textfield"; @@ -23,7 +23,7 @@ registerStyles( "vaadin-combo-box-item", css` :host { - padding: 0; + padding: 0 !important; } :host([focused]:not([disabled])) { background-color: rgba(var(--rgb-primary-text-color, 0, 0, 0), 0.12); @@ -211,9 +211,9 @@ export class HaComboBox extends LitElement { private _defaultRowRenderer: ComboBoxLitRenderer< string | Record > = (item) => - html` + html` ${this.itemLabelPath ? item[this.itemLabelPath] : item} - `; + `; private _clearValue(ev: Event) { ev.stopPropagation(); diff --git a/src/panels/config/integrations/ha-config-integrations.ts b/src/panels/config/integrations/ha-config-integrations.ts index aaea690b57..9abd05966a 100644 --- a/src/panels/config/integrations/ha-config-integrations.ts +++ b/src/panels/config/integrations/ha-config-integrations.ts @@ -822,6 +822,9 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { } ha-button-menu { margin-left: 8px; + margin-inline-start: 8px; + margin-inline-end: initial; + direction: var(--direction); } .container { display: grid; @@ -850,6 +853,9 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { display: block; color: var(--secondary-text-color); margin-left: 8px; + margin-inline-start: 8px; + margin-inline-end: initial; + direction: var(--direction); --mdc-ripple-color: transparant; } .search { @@ -874,13 +880,22 @@ class HaConfigIntegrations extends SubscribeMixin(LitElement) { position: relative; display: flex; align-items: center; - padding: 2px 2px 2px 8px; + padding-top: 2px; + padding-bottom: 2px; + padding-right: 2px; + padding-left: 8px; + padding-inline-start: 8px; + padding-inline-end: 2px; font-size: 14px; width: max-content; cursor: initial; + direction: var(--direction); } .active-filters mwc-button { margin-left: 8px; + margin-inline-start: 8px; + margin-inline-end: initial; + direction: var(--direction); } .active-filters::before { background-color: var(--primary-color); From cb00535683077e0306d6d84e290971594c5d0c45 Mon Sep 17 00:00:00 2001 From: Philip Allgaier Date: Mon, 30 Jan 2023 21:50:20 +0100 Subject: [PATCH 35/37] Add missing translations to Supervisor Wi-Fi network section (#14606) Co-authored-by: Paul Bottein --- .../dialogs/network/dialog-hassio-network.ts | 15 ++++++++++++--- src/components/ha-dialog-date-picker.ts | 2 +- src/panels/config/network/supervisor-network.ts | 17 ++++++++++++++--- src/translations/en.json | 6 ++++++ 4 files changed, 33 insertions(+), 7 deletions(-) diff --git a/hassio/src/dialogs/network/dialog-hassio-network.ts b/hassio/src/dialogs/network/dialog-hassio-network.ts index 898806009c..103669b18b 100644 --- a/hassio/src/dialogs/network/dialog-hassio-network.ts +++ b/hassio/src/dialogs/network/dialog-hassio-network.ts @@ -138,7 +138,10 @@ export class DialogHassioNetwork )} ${this._interface?.type === "wireless" ? html` - + ${this._interface?.wifi?.ssid ? html`

${this.supervisor.localize( @@ -177,7 +180,11 @@ export class DialogHassioNetwork > ${ap.ssid} - ${ap.mac} - Strength: ${ap.signal} + ${ap.mac} - + ${this.supervisor.localize( + "dialog.network.signal_strength" + )}: + ${ap.signal} ` @@ -241,7 +248,9 @@ export class DialogHassioNetwork class="flex-auto" type="password" id="psk" - label="Password" + .label=${this.supervisor.localize( + "dialog.network.wifi_password" + )} version="wifi" @value-changed=${this ._handleInputValueChangedWifi} diff --git a/src/components/ha-dialog-date-picker.ts b/src/components/ha-dialog-date-picker.ts index e2264e61af..93a5ca85ea 100644 --- a/src/components/ha-dialog-date-picker.ts +++ b/src/components/ha-dialog-date-picker.ts @@ -24,7 +24,7 @@ export class HaDialogDatePicker extends LitElement { @state() private _value?: string; public async showDialog(params: datePickerDialogParams): Promise { - // app-datpicker has a bug, that it removes its handlers when disconnected, but doesnt add them back when reconnected. + // app-datepicker has a bug, that it removes its handlers when disconnected, but doesn't add them back when reconnected. // So we need to wait for the next render to make sure the element is removed and re-created so the handlers are added. await nextRender(); this._params = params; diff --git a/src/panels/config/network/supervisor-network.ts b/src/panels/config/network/supervisor-network.ts index 664092e1d5..bcab99e48a 100644 --- a/src/panels/config/network/supervisor-network.ts +++ b/src/panels/config/network/supervisor-network.ts @@ -106,7 +106,12 @@ export class HassioNetwork extends LitElement { )} ${this._interface?.type === "wireless" ? html` - + ${this._interface?.wifi?.ssid ? html`

${this.hass.localize( @@ -147,7 +152,11 @@ export class HassioNetwork extends LitElement { > ${ap.ssid} - ${ap.mac} - Strength: ${ap.signal} + ${ap.mac} - + ${this.hass.localize( + "ui.panel.config.network.supervisor.signal_strength" + )}: + ${ap.signal} ` @@ -211,7 +220,9 @@ export class HassioNetwork extends LitElement { class="flex-auto" type="password" id="psk" - label="Password" + .label=${this.hass.localize( + "ui.panel.config.network.supervisor.wifi_password" + )} version="wifi" @value-changed=${this ._handleInputValueChangedWifi} diff --git a/src/translations/en.json b/src/translations/en.json index d9cd6215e1..02ba7e2294 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3679,9 +3679,12 @@ "title": "Configure network interfaces", "connected_to": "Connected to {ssid}", "scan_ap": "Scan for access points", + "signal_strength": "Signal strength", "open": "Open", "wep": "WEP", "wpa": "wpa-psk", + "wifi": "Wi-Fi", + "wifi_password": "Wi-Fi password", "warning": "If you are changing the Wi-Fi, IP or gateway addresses, you might lose the connection!", "static": "Static", "dhcp": "DHCP", @@ -5376,9 +5379,12 @@ "title": "Network settings", "connected_to": "Connected to {ssid}", "scan_ap": "Scan for access points", + "signal_strength": "[%key:ui::panel::config::network::supervisor::signal_strength%]", "open": "Open", "wep": "WEP", "wpa": "wpa-psk", + "wifi": "[%key:ui::panel::config::network::supervisor::wifi%]", + "wifi_password": "[%key:ui::panel::config::network::supervisor::wifi_password%]", "warning": "If you are changing the Wi-Fi, IP or gateway addresses, you might lose the connection!", "static": "Static", "dhcp": "DHCP", From 8212a5a48c09965b90d9e06543d1474b44669430 Mon Sep 17 00:00:00 2001 From: Erik Montnemery Date: Mon, 30 Jan 2023 21:55:26 +0100 Subject: [PATCH 36/37] Improve energy settings dialog (#15205) Co-authored-by: Paul Bottein --- .../components/ha-energy-grid-settings.ts | 2 + .../dialogs/dialog-energy-battery-settings.ts | 14 +++ .../dialogs/dialog-energy-device-settings.ts | 11 ++- .../dialogs/dialog-energy-gas-settings.ts | 90 +++++++++++-------- .../dialog-energy-grid-flow-settings.ts | 88 +++++++++++++++--- .../dialogs/dialog-energy-solar-settings.ts | 14 +++ .../dialogs/dialog-energy-water-settings.ts | 84 +++++++++++++---- .../energy/dialogs/show-dialogs-energy.ts | 3 + src/translations/en.json | 70 ++++++++------- 9 files changed, 272 insertions(+), 104 deletions(-) diff --git a/src/panels/config/energy/components/ha-energy-grid-settings.ts b/src/panels/config/energy/components/ha-energy-grid-settings.ts index f55c2d57b0..f07961c98d 100644 --- a/src/panels/config/energy/components/ha-energy-grid-settings.ts +++ b/src/panels/config/energy/components/ha-energy-grid-settings.ts @@ -366,6 +366,7 @@ export class EnergyGridSettings extends LitElement { ev.currentTarget.closest(".row").source; showEnergySettingsGridFlowFromDialog(this, { source: { ...origSource }, + metadata: this.statsMetadata?.[origSource.stat_energy_from], saveCallback: async (source) => { const flowFrom = energySourcesByType(this.preferences).grid![0] .flow_from; @@ -393,6 +394,7 @@ export class EnergyGridSettings extends LitElement { ev.currentTarget.closest(".row").source; showEnergySettingsGridFlowToDialog(this, { source: { ...origSource }, + metadata: this.statsMetadata?.[origSource.stat_energy_to], saveCallback: async (source) => { const flowTo = energySourcesByType(this.preferences).grid![0].flow_to; diff --git a/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts index 2dd5ce4e15..fa628ea6b6 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-battery-settings.ts @@ -13,6 +13,7 @@ import { HomeAssistant } from "../../../../types"; import { EnergySettingsBatteryDialogParams } from "./show-dialogs-energy"; import "@material/mwc-button/mwc-button"; import "../../../../components/entity/ha-statistic-picker"; +import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor"; const energyUnitClasses = ["energy"]; @@ -27,6 +28,8 @@ export class DialogEnergyBatterySettings @state() private _source?: BatterySourceTypeEnergyPreference; + @state() private _energy_units?: string[]; + @state() private _error?: string; public async showDialog( @@ -36,6 +39,9 @@ export class DialogEnergyBatterySettings this._source = params.source ? { ...params.source } : emptyBatteryEnergyPreference(); + this._energy_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "energy") + ).units; } public closeDialog(): void { @@ -50,6 +56,8 @@ export class DialogEnergyBatterySettings return html``; } + const pickableUnit = this._energy_units?.join(", ") || ""; + return html` ${this._error ? html`

${this._error}

` : ""} +
+ ${this.hass.localize( + "ui.panel.config.energy.battery.dialog.entity_para", + { unit: pickableUnit } + )} +
{ this._params = params; + this._energy_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "energy") + ).units; } public closeDialog(): void { @@ -47,6 +53,8 @@ export class DialogEnergyDeviceSettings return html``; } + const pickableUnit = this._energy_units?.join(", ") || ""; + return html` ${this._error}

` : ""}
${this.hass.localize( - `ui.panel.config.energy.device_consumption.dialog.selected_stat_intro` + "ui.panel.config.energy.device_consumption.dialog.selected_stat_intro", + { unit: pickableUnit } )}
diff --git a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts index e616c3a797..fc8dd92502 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-gas-settings.ts @@ -23,6 +23,7 @@ import { getDisplayUnit, isExternalStatistic, } from "../../../../data/recorder"; +import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor"; const gasDeviceClasses = ["gas", "energy"]; const gasUnitClasses = ["volume", "energy"]; @@ -40,10 +41,12 @@ export class DialogEnergyGasSettings @state() private _costs?: "no-costs" | "number" | "entity" | "statistic"; - @state() private _pickableUnit?: string; - @state() private _pickedDisplayUnit?: string | null; + @state() private _energy_units?: string[]; + + @state() private _gas_units?: string[]; + @state() private _error?: string; public async showDialog( @@ -65,12 +68,17 @@ export class DialogEnergyGasSettings : this._source.stat_cost ? "statistic" : "no-costs"; + this._energy_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "energy") + ).units; + this._gas_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "gas") + ).units; } public closeDialog(): void { this._params = undefined; this._source = undefined; - this._pickableUnit = undefined; this._pickedDisplayUnit = undefined; this._error = undefined; fireEvent(this, "dialog-closed", { dialog: this.localName }); @@ -82,15 +90,19 @@ export class DialogEnergyGasSettings } const pickableUnit = - this._pickableUnit || - (this._params.allowedGasUnitClass === undefined - ? "ft³, m³, Wh, kWh, MWh or GJ" + this._params.allowedGasUnitClass === undefined + ? [...(this._gas_units || []), ...(this._energy_units || [])].join(", ") : this._params.allowedGasUnitClass === "energy" - ? "Wh, kWh, MWh or GJ" - : "ft³ or m³"); + ? this._energy_units?.join(", ") || "" + : this._gas_units?.join(", ") || ""; + + const unitPrice = this._pickedDisplayUnit + ? `${this.hass.config.currency}/${this._pickedDisplayUnit}` + : undefined; const externalSource = - this._source.stat_cost && isExternalStatistic(this._source.stat_cost); + this._source.stat_energy_from && + isExternalStatistic(this._source.stat_energy_from); return html` ${this._error ? html`

${this._error}

` : ""} +
+

+ ${this.hass.localize("ui.panel.config.energy.gas.dialog.paragraph")} +

+

+ ${this.hass.localize( + "ui.panel.config.energy.gas.dialog.entity_para", + { unit: pickableUnit } + )} +

+

+ ${this.hass.localize("ui.panel.config.energy.gas.dialog.note_para")} +

+

- ${this.hass.localize(`ui.panel.config.energy.gas.dialog.cost_para`)} + ${this.hass.localize("ui.panel.config.energy.gas.dialog.cost_para")}

@@ -158,15 +177,15 @@ export class DialogEnergyGasSettings .hass=${this.hass} statistic-types="sum" .value=${this._source.stat_cost} - .label=${this.hass.localize( - `ui.panel.config.energy.gas.dialog.cost_stat_input` - )} + .label=${`${this.hass.localize( + "ui.panel.config.energy.gas.dialog.cost_stat_input" + )} (${this.hass.config.currency})`} @value-changed=${this._priceStatChanged} >` : ""} ` : ""} ${this._costs === "number" ? html` ` : ""} diff --git a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts index 68e9879bf8..f2dd0a0012 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-grid-flow-settings.ts @@ -19,6 +19,12 @@ import "../../../../components/ha-radio"; import "../../../../components/ha-formfield"; import type { HaRadio } from "../../../../components/ha-radio"; import "../../../../components/entity/ha-entity-picker"; +import { + getStatisticMetadata, + getDisplayUnit, + isExternalStatistic, +} from "../../../../data/recorder"; +import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor"; const energyUnitClasses = ["energy"]; @@ -37,6 +43,10 @@ export class DialogEnergyGridFlowSettings @state() private _costs?: "no-costs" | "number" | "entity" | "statistic"; + @state() private _pickedDisplayUnit?: string | null; + + @state() private _energy_units?: string[]; + @state() private _error?: string; public async showDialog( @@ -57,11 +67,24 @@ export class DialogEnergyGridFlowSettings ] ? "statistic" : "no-costs"; + this._pickedDisplayUnit = getDisplayUnit( + this.hass, + this._source[ + this._params.direction === "from" + ? "stat_energy_from" + : "stat_energy_to" + ], + params.metadata + ); + this._energy_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "energy") + ).units; } public closeDialog(): void { this._params = undefined; this._source = undefined; + this._pickedDisplayUnit = undefined; this._error = undefined; fireEvent(this, "dialog-closed", { dialog: this.localName }); } @@ -71,6 +94,26 @@ export class DialogEnergyGridFlowSettings return html``; } + const pickableUnit = this._energy_units?.join(", ") || ""; + + const unitPrice = this._pickedDisplayUnit + ? `${this.hass.config.currency}/${this._pickedDisplayUnit}` + : undefined; + + const externalSource = + this._source[ + this._params.direction === "from" + ? "stat_energy_from" + : "stat_energy_to" + ] && + isExternalStatistic( + this._source[ + this._params.direction === "from" + ? "stat_energy_from" + : "stat_energy_to" + ] + ); + return html` ${this._error ? html`

${this._error}

` : ""}
- ${this.hass.localize( - `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.paragraph` - )} +

+ ${this.hass.localize( + `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.paragraph` + )} +

+

+ ${this.hass.localize( + `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.entity_para`, + { unit: pickableUnit } + )} +

` : ""} @@ -160,6 +211,7 @@ export class DialogEnergyGridFlowSettings value="entity" name="costs" .checked=${this._costs === "entity"} + .disabled=${externalSource} @change=${this._handleCostChanged} > @@ -169,9 +221,9 @@ export class DialogEnergyGridFlowSettings .hass=${this.hass} include-domains='["sensor", "input_number"]' .value=${this._source.entity_energy_price} - .label=${this.hass.localize( + .label=${`${this.hass.localize( `ui.panel.config.energy.grid.flow_dialog.${this._params.direction}.cost_entity_input` - )} + )} ${unitPrice ? ` (${unitPrice})` : ""}`} @value-changed=${this._priceEntityChanged} >` : ""} @@ -184,22 +236,20 @@ export class DialogEnergyGridFlowSettings value="number" name="costs" .checked=${this._costs === "number"} + .disabled=${externalSource} @change=${this._handleCostChanged} > ${this._costs === "number" ? html` ` @@ -261,7 +311,17 @@ export class DialogEnergyGridFlowSettings }; } - private _statisticChanged(ev: CustomEvent<{ value: string }>) { + private async _statisticChanged(ev: CustomEvent<{ value: string }>) { + if (ev.detail.value) { + const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]); + this._pickedDisplayUnit = getDisplayUnit( + this.hass, + ev.detail.value, + metadata[0] + ); + } else { + this._pickedDisplayUnit = undefined; + } this._source = { ...this._source!, [this._params!.direction === "from" diff --git a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts index 3423932916..d6a47eefba 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-solar-settings.ts @@ -21,6 +21,7 @@ import type { HaRadio } from "../../../../components/ha-radio"; import { showConfigFlowDialog } from "../../../../dialogs/config-flow/show-dialog-config-flow"; import { ConfigEntry, getConfigEntries } from "../../../../data/config_entries"; import { brandsUrl } from "../../../../util/brands-url"; +import { getSensorDeviceClassConvertibleUnits } from "../../../../data/sensor"; const energyUnitClasses = ["energy"]; @@ -39,6 +40,8 @@ export class DialogEnergySolarSettings @state() private _forecast?: boolean; + @state() private _energy_units?: string[]; + @state() private _error?: string; public async showDialog( @@ -50,6 +53,9 @@ export class DialogEnergySolarSettings ? { ...params.source } : emptySolarEnergyPreference(); this._forecast = this._source.config_entry_solar_forecast !== null; + this._energy_units = ( + await getSensorDeviceClassConvertibleUnits(this.hass, "energy") + ).units; } public closeDialog(): void { @@ -64,6 +70,8 @@ export class DialogEnergySolarSettings return html``; } + const pickableUnit = this._energy_units?.join(", ") || ""; + return html` ${this._error ? html`

${this._error}

` : ""} +
+ ${this.hass.localize( + "ui.panel.config.energy.solar.dialog.entity_para", + { unit: pickableUnit } + )} +
${this._error ? html`

${this._error}

` : ""} +
+

+ ${this.hass.localize( + "ui.panel.config.energy.water.dialog.paragraph" + )} +

+

+ ${this.hass.localize( + "ui.panel.config.energy.water.dialog.entity_para", + { unit: pickableUnit } + )} +

+

- ${this.hass.localize(`ui.panel.config.energy.water.dialog.cost_para`)} + ${this.hass.localize("ui.panel.config.energy.water.dialog.cost_para")}

@@ -125,15 +162,15 @@ export class DialogEnergyWaterSettings .hass=${this.hass} statistic-types="sum" .value=${this._source.stat_cost} - .label=${this.hass.localize( - `ui.panel.config.energy.water.dialog.cost_stat_input` - )} + .label=${`${this.hass.localize( + "ui.panel.config.energy.water.dialog.cost_stat_input" + )} (${this.hass.config.currency})`} @value-changed=${this._priceStatChanged} >` : ""} ` : ""} ${this._costs === "number" ? html` ` : ""} @@ -230,6 +268,16 @@ export class DialogEnergyWaterSettings } private async _statisticChanged(ev: CustomEvent<{ value: string }>) { + if (ev.detail.value) { + const metadata = await getStatisticMetadata(this.hass, [ev.detail.value]); + this._pickedDisplayUnit = getDisplayUnit( + this.hass, + ev.detail.value, + metadata[0] + ); + } else { + this._pickedDisplayUnit = undefined; + } if (isExternalStatistic(ev.detail.value) && this._costs !== "statistic") { this._costs = "no-costs"; } diff --git a/src/panels/config/energy/dialogs/show-dialogs-energy.ts b/src/panels/config/energy/dialogs/show-dialogs-energy.ts index 06eccf7b9c..c9fea02a61 100644 --- a/src/panels/config/energy/dialogs/show-dialogs-energy.ts +++ b/src/panels/config/energy/dialogs/show-dialogs-energy.ts @@ -16,6 +16,7 @@ export interface EnergySettingsGridFlowDialogParams { source?: | FlowFromGridSourceEnergyPreference | FlowToGridSourceEnergyPreference; + metadata?: StatisticsMetaData; direction: "from" | "to"; saveCallback: ( source: @@ -26,11 +27,13 @@ export interface EnergySettingsGridFlowDialogParams { export interface EnergySettingsGridFlowFromDialogParams { source?: FlowFromGridSourceEnergyPreference; + metadata?: StatisticsMetaData; saveCallback: (source: FlowFromGridSourceEnergyPreference) => Promise; } export interface EnergySettingsGridFlowToDialogParams { source?: FlowToGridSourceEnergyPreference; + metadata?: StatisticsMetaData; saveCallback: (source: FlowToGridSourceEnergyPreference) => Promise; } diff --git a/src/translations/en.json b/src/translations/en.json index 02ba7e2294..e6bb023ac1 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1521,30 +1521,30 @@ "from": { "header": "Configure grid consumption", "paragraph": "Grid consumption is the energy that flows from the energy grid to your home.", - "energy_stat": "Consumed Energy (kWh)", + "entity_para": "Pick a sensor which measures grid consumption in either of {unit}.", + "energy_stat": "Consumed Energy", "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.", "no_cost": "Do not track costs", "cost_stat": "Use an entity tracking the total costs", - "cost_stat_input": "Total Costs Entity", + "cost_stat_input": "Entity with the total costs", "cost_entity": "Use an entity with current price", "cost_entity_input": "Entity with the current price", "cost_number": "Use a static price", - "cost_number_input": "Price per kWh", - "cost_number_suffix": "{currency}/kWh" + "cost_number_input": "Price" }, "to": { "header": "Configure grid production", "paragraph": "Grid production is the energy that flows from your solar panels to the grid.", - "energy_stat": "Energy returned to the grid (kWh)", + "entity_para": "Pick a sensor which measures grid production in either of {unit}.", + "energy_stat": "Energy returned to the grid", "cost_para": "Do you get money back when you return energy to the grid?", "no_cost": "I do not get money back", "cost_stat": "Use an entity tracking the total recieved money", - "cost_stat_input": "Total Compensation Entity", + "cost_stat_input": "Entity with the total compensation", "cost_entity": "Use an entity with current rate", "cost_entity_input": "Entity with the current rate", "cost_number": "Use a static rate", - "cost_number_input": "Rate per kWh", - "cost_number_suffix": "{currency}/kWh" + "cost_number_input": "Rate" } } }, @@ -1561,7 +1561,8 @@ "stat_predicted_production": "Prediction of your solar energy production", "dialog": { "header": "Configure solar panels", - "solar_production_energy": "Solar production energy (kWh)", + "entity_para": "Pick a sensor which measures solar energy production in either of {unit}.", + "solar_production_energy": "Solar production energy", "solar_production_forecast": "Solar production forecast", "solar_production_forecast_description": "Adding solar production forecast information will allow you to quickly see your expected production for today.", "dont_forecast_production": "Don't forecast production", @@ -1579,8 +1580,9 @@ "add_battery_system": "Add battery system", "dialog": { "header": "Configure battery system", - "energy_into_battery": "Energy going in to the battery (kWh)", - "energy_out_of_battery": "Energy coming out of the battery (kWh)" + "entity_para": "Pick sensors which measure energy going in to and out of the battery in either of {unit}.", + "energy_into_battery": "Energy going in to the battery", + "energy_out_of_battery": "Energy coming out of the battery" } }, "gas": { @@ -1593,18 +1595,18 @@ "add_gas_source": "Add gas source", "dialog": { "header": "Configure gas consumption", - "paragraph": "Gas consumption is the volume of gas that flows to your home.", - "energy_stat": "Consumed Energy (m³)", - "cost_para": "Select how Home Assistant should keep track of the costs of the consumed energy.", - "no_cost": "Do not track costs", - "cost_stat": "Use an entity tracking the total costs", - "cost_stat_input": "Total Costs Entity", - "cost_entity": "Use an entity with current price", - "cost_entity_input": "Entity with the current price per {unit}", - "cost_number": "Use a static price", - "cost_number_input": "Price per {unit}", - "gas_usage": "Gas usage", - "m3_or_kWh": "ft³, m³, Wh, kWh, MWh or GJ" + "paragraph": "Gas consumption is measured either as the volume of gas that flows to your home or as the amount of energy contained in the gas.", + "entity_para": "Pick a sensor which measures gas consumption in either of {unit}.", + "note_para": "Note: It is not possible to add both sensors measuring a volume of gas and sensors measuring the amount of energy contained in the gas.", + "cost_para": "Select how Home Assistant should keep track of the costs of the consumed gas.", + "no_cost": "[%key:ui::panel::config::energy::grid::flow_dialog::from::no_cost%]", + "cost_stat": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat%]", + "cost_stat_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat_input%]", + "cost_entity": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity%]", + "cost_entity_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity_input%]", + "cost_number": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]", + "cost_number_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]", + "gas_usage": "Gas usage" } }, "water": { @@ -1618,16 +1620,16 @@ "dialog": { "header": "Configure water consumption", "paragraph": "Water consumption is the volume of water that flows to your home.", - "energy_stat": "Consumed water (m³ or gl)", + "entity_para": "Pick a sensor which measures gas consumption in either of {unit}.", "cost_para": "Select how Home Assistant should keep track of the costs of the consumed water.", - "no_cost": "Do not track costs", - "cost_stat": "Use an entity tracking the total costs", - "cost_stat_input": "Total Costs Entity", - "cost_entity": "Use an entity with current price", - "cost_entity_input": "Entity with the current price per m³ or gl", - "cost_number": "Use a static price", - "cost_number_input": "Price per m³ or gl", - "water_usage": "Water usage (m³ or gl)" + "no_cost": "[%key:ui::panel::config::energy::grid::flow_dialog::from::no_cost%]", + "cost_stat": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat%]", + "cost_stat_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_stat_input%]", + "cost_entity": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity%]", + "cost_entity_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_entity_input%]", + "cost_number": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]", + "cost_number_input": "[%key:ui::panel::config::energy::grid::flow_dialog::from::cost_number%]", + "water_usage": "Water usage" } }, "device_consumption": { @@ -1640,8 +1642,8 @@ "add_device": "Add device", "dialog": { "header": "Add a device", - "device_consumption_energy": "Device consumption energy (kWh)", - "selected_stat_intro": "Select the entity that represents the device energy usage." + "device_consumption_energy": "Device consumption energy", + "selected_stat_intro": "Select the energy sensor that measures the device's energy usage in either of {unit}." } } }, From ca20a251b5aab60fa0439cb2edd49604c1208ee8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 30 Jan 2023 21:56:34 +0100 Subject: [PATCH 37/37] Bumped version to 20230130.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index d830918e4d..0f89a7abe2 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20230128.0" +version = "20230130.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md"