From 932614e31aeb1c9973cf11c61ade558c909e443f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 06:05:38 +0000 Subject: [PATCH 01/28] Bump @babel/plugin-proposal-decorators from 7.20.2 to 7.20.7 (#15053) * Bump @babel/plugin-proposal-decorators from 7.20.2 to 7.20.7 Bumps [@babel/plugin-proposal-decorators](https://github.com/babel/babel/tree/HEAD/packages/babel-plugin-proposal-decorators) from 7.20.2 to 7.20.7. - [Release notes](https://github.com/babel/babel/releases) - [Changelog](https://github.com/babel/babel/blob/main/CHANGELOG.md) - [Commits](https://github.com/babel/babel/commits/v7.20.7/packages/babel-plugin-proposal-decorators) --- updated-dependencies: - dependency-name: "@babel/plugin-proposal-decorators" dependency-type: direct:development update-type: version-update:semver-patch ... 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 | 106 ++++++++++++++++++++++++++------------------------- 2 files changed, 55 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 7900bc02b1..154df6a13e 100644 --- a/package.json +++ b/package.json @@ -149,7 +149,7 @@ "@babel/core": "^7.20.2", "@babel/plugin-external-helpers": "^7.18.6", "@babel/plugin-proposal-class-properties": "^7.18.6", - "@babel/plugin-proposal-decorators": "^7.20.2", + "@babel/plugin-proposal-decorators": "^7.20.7", "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6", "@babel/plugin-proposal-object-rest-spread": "^7.20.2", "@babel/plugin-proposal-optional-chaining": "^7.18.9", diff --git a/yarn.lock b/yarn.lock index 36a0fbcc63..9f9c02a517 100644 --- a/yarn.lock +++ b/yarn.lock @@ -76,14 +76,14 @@ __metadata: languageName: node linkType: hard -"@babel/generator@npm:^7.20.1, @babel/generator@npm:^7.20.2": - version: 7.20.4 - resolution: "@babel/generator@npm:7.20.4" +"@babel/generator@npm:^7.20.2, @babel/generator@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/generator@npm:7.20.7" dependencies: - "@babel/types": ^7.20.2 + "@babel/types": ^7.20.7 "@jridgewell/gen-mapping": ^0.3.2 jsesc: ^2.5.1 - checksum: 967b59f18e5ce999e5a741825bcecb2be4bbfc1824a92c21b47d0b5694e0eb09314a70f8b9142e9591c149c7fb83d51f73ae8fbd96d30a42666425889e51ceb1 + checksum: 84b6983ffdb50c80c1c2e3f3c32617a7133d8effd1065f3e0f9bba188a7d54ab42a4dd5e42b61b843c65f9dd1aa870036ff0f848ebd42707aaa8a2b6d31d04f5 languageName: node linkType: hard @@ -120,20 +120,21 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/helper-create-class-features-plugin@npm:7.20.2" +"@babel/helper-create-class-features-plugin@npm:^7.18.6, @babel/helper-create-class-features-plugin@npm:^7.20.2, @babel/helper-create-class-features-plugin@npm:^7.20.7": + version: 7.20.12 + resolution: "@babel/helper-create-class-features-plugin@npm:7.20.12" dependencies: "@babel/helper-annotate-as-pure": ^7.18.6 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 - "@babel/helper-member-expression-to-functions": ^7.18.9 + "@babel/helper-member-expression-to-functions": ^7.20.7 "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/helper-replace-supers": ^7.19.1 + "@babel/helper-replace-supers": ^7.20.7 + "@babel/helper-skip-transparent-expression-wrappers": ^7.20.0 "@babel/helper-split-export-declaration": ^7.18.6 peerDependencies: "@babel/core": ^7.0.0 - checksum: e89a8841db3f6340996f395fc372ee4bec361230eb9345b763314f768e68421d43461918fdedfb9a69b71f1d0433439f3e318d1b1b9ba04fbd7aac1c84959e37 + checksum: 1e9ed4243b75278fa24deb40dc62bf537b79307987223a2d2d2ae5abf7ba6dc8435d6e3bb55d52ceb30d3e1eba88e7eb6a1885a8bb519e5cfc3e9dedb97d43e6 languageName: node linkType: hard @@ -200,12 +201,12 @@ __metadata: languageName: node linkType: hard -"@babel/helper-member-expression-to-functions@npm:^7.18.9": - version: 7.18.9 - resolution: "@babel/helper-member-expression-to-functions@npm:7.18.9" +"@babel/helper-member-expression-to-functions@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helper-member-expression-to-functions@npm:7.20.7" dependencies: - "@babel/types": ^7.18.9 - checksum: fcf8184e3b55051c4286b2cbedf0eccc781d0f3c9b5cbaba582eca19bf0e8d87806cdb7efc8554fcb969ceaf2b187d5ea748d40022d06ec7739fbb18c1b19a7a + "@babel/types": ^7.20.7 + checksum: cec17aab7e964830b0146e575bd141127032319f26ed864a65b35abd75ad618d264d3e11449b9b4e29cfd95bb1a7e774afddd4884fdcc29c36ac9cbd2b66359f languageName: node linkType: hard @@ -264,16 +265,17 @@ __metadata: languageName: node linkType: hard -"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.19.1": - version: 7.19.1 - resolution: "@babel/helper-replace-supers@npm:7.19.1" +"@babel/helper-replace-supers@npm:^7.18.6, @babel/helper-replace-supers@npm:^7.19.1, @babel/helper-replace-supers@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/helper-replace-supers@npm:7.20.7" dependencies: "@babel/helper-environment-visitor": ^7.18.9 - "@babel/helper-member-expression-to-functions": ^7.18.9 + "@babel/helper-member-expression-to-functions": ^7.20.7 "@babel/helper-optimise-call-expression": ^7.18.6 - "@babel/traverse": ^7.19.1 - "@babel/types": ^7.19.0 - checksum: a0e4bf79ebe7d2bb5947169e47a0b4439c73fb0ec57d446cf3ea81b736721129ec373c3f94d2ebd2716b26dd65f8e6c083dac898170d42905e7ba815a2f52c25 + "@babel/template": ^7.20.7 + "@babel/traverse": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: b8e0087c9b0c1446e3c6f3f72b73b7e03559c6b570e2cfbe62c738676d9ebd8c369a708cf1a564ef88113b4330750a50232ee1131d303d478b7a5e65e46fbc7c languageName: node linkType: hard @@ -286,7 +288,7 @@ __metadata: languageName: node linkType: hard -"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9": +"@babel/helper-skip-transparent-expression-wrappers@npm:^7.18.9, @babel/helper-skip-transparent-expression-wrappers@npm:^7.20.0": version: 7.20.0 resolution: "@babel/helper-skip-transparent-expression-wrappers@npm:7.20.0" dependencies: @@ -359,12 +361,12 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.18.10, @babel/parser@npm:^7.20.1, @babel/parser@npm:^7.20.2": - version: 7.20.3 - resolution: "@babel/parser@npm:7.20.3" +"@babel/parser@npm:^7.20.2, @babel/parser@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/parser@npm:7.20.7" bin: parser: ./bin/babel-parser.js - checksum: 33bcdb45de65a3cf27ed376cb34f32be3c3485a10e3252f8d0126f6a034efc3145c0d219e57fcd5a8956361552008bc30b9bae4a723823fb3633027071be8a45 + checksum: 25b5266e3bd4be837092685f6b7ef886f1308ff72659a24342eb646ae5014f61ed1771ce8fc20636c890fcae19304fc72c069564ca6075207b7fbf3f75367275 languageName: node linkType: hard @@ -442,18 +444,18 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-proposal-decorators@npm:^7.20.2": - version: 7.20.2 - resolution: "@babel/plugin-proposal-decorators@npm:7.20.2" +"@babel/plugin-proposal-decorators@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/plugin-proposal-decorators@npm:7.20.7" dependencies: - "@babel/helper-create-class-features-plugin": ^7.20.2 + "@babel/helper-create-class-features-plugin": ^7.20.7 "@babel/helper-plugin-utils": ^7.20.2 - "@babel/helper-replace-supers": ^7.19.1 + "@babel/helper-replace-supers": ^7.20.7 "@babel/helper-split-export-declaration": ^7.18.6 "@babel/plugin-syntax-decorators": ^7.19.0 peerDependencies: "@babel/core": ^7.0.0-0 - checksum: bb00e2172a8c0b169f262222b7ca1a9cda4f7a3bc458bb71b39c9209aa261450c077f38c9b51e79fadd4d1962a993e7fd8712042d82658b1a052a084c53e32cd + checksum: 0de9134d71a60b165df9b6e66b7c270fb2fa940ad28d7672e5c73fe5e4300a798cbb28d845477e3265a356d5254758735f28d13452f448dd12988ea299cf7e16 languageName: node linkType: hard @@ -1318,43 +1320,43 @@ __metadata: languageName: node linkType: hard -"@babel/template@npm:^7.18.10": - version: 7.18.10 - resolution: "@babel/template@npm:7.18.10" +"@babel/template@npm:^7.18.10, @babel/template@npm:^7.20.7": + version: 7.20.7 + resolution: "@babel/template@npm:7.20.7" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/parser": ^7.18.10 - "@babel/types": ^7.18.10 - checksum: 93a6aa094af5f355a72bd55f67fa1828a046c70e46f01b1606e6118fa1802b6df535ca06be83cc5a5e834022be95c7b714f0a268b5f20af984465a71e28f1473 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 + checksum: 2eb1a0ab8d415078776bceb3473d07ab746e6bb4c2f6ca46ee70efb284d75c4a32bb0cd6f4f4946dec9711f9c0780e8e5d64b743208deac6f8e9858afadc349e languageName: node linkType: hard -"@babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.19.1, @babel/traverse@npm:^7.20.1": - version: 7.20.1 - resolution: "@babel/traverse@npm:7.20.1" +"@babel/traverse@npm:^7.19.0, @babel/traverse@npm:^7.20.1, @babel/traverse@npm:^7.20.7": + version: 7.20.12 + resolution: "@babel/traverse@npm:7.20.12" dependencies: "@babel/code-frame": ^7.18.6 - "@babel/generator": ^7.20.1 + "@babel/generator": ^7.20.7 "@babel/helper-environment-visitor": ^7.18.9 "@babel/helper-function-name": ^7.19.0 "@babel/helper-hoist-variables": ^7.18.6 "@babel/helper-split-export-declaration": ^7.18.6 - "@babel/parser": ^7.20.1 - "@babel/types": ^7.20.0 + "@babel/parser": ^7.20.7 + "@babel/types": ^7.20.7 debug: ^4.1.0 globals: ^11.1.0 - checksum: 6696176d574b7ff93466848010bc7e94b250169379ec2a84f1b10da46a7cc2018ea5e3a520c3078487db51e3a4afab9ecff48f25d1dbad8c1319362f4148fb4b + checksum: d758b355ab4f1e87984524b67785fa23d74e8a45d2ceb8bcf4d5b2b0cd15ee160db5e68c7078808542805774ca3802e2eafb1b9638afa4cd7f9ecabd0ca7fd56 languageName: node linkType: hard -"@babel/types@npm:^7.18.10, @babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": - version: 7.20.2 - resolution: "@babel/types@npm:7.20.2" +"@babel/types@npm:^7.18.6, @babel/types@npm:^7.18.9, @babel/types@npm:^7.19.0, @babel/types@npm:^7.20.0, @babel/types@npm:^7.20.2, @babel/types@npm:^7.20.7, @babel/types@npm:^7.4.4, @babel/types@npm:^7.8.3": + version: 7.20.7 + resolution: "@babel/types@npm:7.20.7" dependencies: "@babel/helper-string-parser": ^7.19.4 "@babel/helper-validator-identifier": ^7.19.1 to-fast-properties: ^2.0.0 - checksum: 57e76e5f21876135f481bfd4010c87f2d38196bb0a2bc60a28d6e55e3afa90cdd9accf164e4cb71bdfb620517fa0a0cb5600cdce36c21d59fdaccfbb899c024c + checksum: b39af241f0b72bba67fd6d0d23914f6faec8c0eba8015c181cbd5ea92e59fc91a52a1ab490d3520c7dbd19ddb9ebb76c476308f6388764f16d8201e37fae6811 languageName: node linkType: hard @@ -9261,7 +9263,7 @@ fsevents@^1.2.7: "@babel/core": ^7.20.2 "@babel/plugin-external-helpers": ^7.18.6 "@babel/plugin-proposal-class-properties": ^7.18.6 - "@babel/plugin-proposal-decorators": ^7.20.2 + "@babel/plugin-proposal-decorators": ^7.20.7 "@babel/plugin-proposal-nullish-coalescing-operator": ^7.18.6 "@babel/plugin-proposal-object-rest-spread": ^7.20.2 "@babel/plugin-proposal-optional-chaining": ^7.18.9 From 21f3eb91033e7ddcdf886ccc8d7eae8e3037194b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 16 Jan 2023 07:10:36 +0100 Subject: [PATCH 02/28] filter disabled hardware integrations (#14964) --- .../config/hardware/ha-config-hardware.ts | 30 +++++++++++++++---- 1 file changed, 25 insertions(+), 5 deletions(-) diff --git a/src/panels/config/hardware/ha-config-hardware.ts b/src/panels/config/hardware/ha-config-hardware.ts index c3a0524735..40b181441e 100644 --- a/src/panels/config/hardware/ha-config-hardware.ts +++ b/src/panels/config/hardware/ha-config-hardware.ts @@ -39,6 +39,7 @@ import { rebootHost, shutdownHost, } from "../../../data/hassio/host"; +import { scanUSBDevices } from "../../../data/usb"; import { showOptionsFlowDialog } from "../../../dialogs/config-flow/show-dialog-options-flow"; import { showAlertDialog, @@ -219,6 +220,10 @@ 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; @@ -230,13 +235,22 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { ); const dongles = this._hardwareInfo?.hardware.filter( - (hw) => hw.dongle !== null + (hw) => + hw.dongle !== null && + (!hw.config_entries.length || + hw.config_entries.some( + (entryId) => + this._configEntries![entryId] && + !this._configEntries![entryId].disabled_by + )) ); if (boardData) { boardConfigEntries = boardData.config_entries - .map((id) => this._configEntries?.[id]) - .filter((entry) => entry?.supports_options) as ConfigEntry[]; + .map((id) => this._configEntries![id]) + .filter( + (entry) => entry?.supports_options && !entry.disabled_by + ) as ConfigEntry[]; boardId = boardData.board!.hassio_board_id; boardName = boardData.name; documentationURL = boardData.url; @@ -362,8 +376,10 @@ class HaConfigHardware extends SubscribeMixin(LitElement) { ? html` ${dongles.map((dongle) => { const configEntry = dongle.config_entries - .map((id) => this._configEntries?.[id]) - .filter((entry) => entry?.supports_options)[0]; + .map((id) => this._configEntries![id]) + .filter( + (entry) => entry?.supports_options && !entry.disabled_by + )[0]; return html`
${dongle.name}${configEntry ? html` Date: Mon, 16 Jan 2023 07:24:21 +0000 Subject: [PATCH 03/28] Bump xss from 1.0.9 to 1.0.14 (#15115) * Bump xss from 1.0.9 to 1.0.14 Bumps [xss](https://github.com/leizongmin/js-xss) from 1.0.9 to 1.0.14. - [Release notes](https://github.com/leizongmin/js-xss/releases) - [Changelog](https://github.com/leizongmin/js-xss/blob/master/CHANGELOG.md) - [Commits](https://github.com/leizongmin/js-xss/compare/v1.0.9...v1.0.14) --- updated-dependencies: - dependency-name: xss dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * Use whitelist type from package 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 +- src/resources/markdown_worker.ts | 14 +++++--------- yarn.lock | 10 +++++----- 3 files changed, 11 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 154df6a13e..3383380949 100644 --- a/package.json +++ b/package.json @@ -143,7 +143,7 @@ "workbox-precaching": "^6.5.4", "workbox-routing": "^6.5.4", "workbox-strategies": "^6.5.4", - "xss": "^1.0.9" + "xss": "^1.0.14" }, "devDependencies": { "@babel/core": "^7.20.2", diff --git a/src/resources/markdown_worker.ts b/src/resources/markdown_worker.ts index a69bd9c02e..95c3f6cd07 100644 --- a/src/resources/markdown_worker.ts +++ b/src/resources/markdown_worker.ts @@ -2,14 +2,10 @@ import { expose } from "comlink"; import { marked } from "marked"; import "proxy-polyfill"; -import { filterXSS, getDefaultWhiteList } from "xss"; +import { filterXSS, getDefaultWhiteList, IWhiteList } from "xss"; -interface WhiteList { - [tag: string]: string[]; -} - -let whiteListNormal: WhiteList | undefined; -let whiteListSvg: WhiteList | undefined; +let whiteListNormal: IWhiteList | undefined; +let whiteListSvg: IWhiteList | undefined; // Override the default `onTagAttr` behavior to only render // our markdown checkboxes. @@ -43,7 +39,7 @@ const renderMarkdown = ( ): string => { if (!whiteListNormal) { whiteListNormal = { - ...(getDefaultWhiteList() as WhiteList), + ...getDefaultWhiteList(), input: ["type", "disabled", "checked"], "ha-icon": ["icon"], "ha-svg-icon": ["path"], @@ -51,7 +47,7 @@ const renderMarkdown = ( }; } - let whiteList: WhiteList | undefined; + let whiteList: IWhiteList | undefined; if (hassOptions.allowSvg) { if (!whiteListSvg) { diff --git a/yarn.lock b/yarn.lock index 9f9c02a517..0d8090ebee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9475,7 +9475,7 @@ fsevents@^1.2.7: workbox-precaching: ^6.5.4 workbox-routing: ^6.5.4 workbox-strategies: ^6.5.4 - xss: ^1.0.9 + xss: ^1.0.14 languageName: unknown linkType: soft @@ -16608,15 +16608,15 @@ typescript@^3.8.3: languageName: node linkType: hard -"xss@npm:^1.0.9": - version: 1.0.9 - resolution: "xss@npm:1.0.9" +"xss@npm:^1.0.14": + version: 1.0.14 + resolution: "xss@npm:1.0.14" dependencies: commander: ^2.20.3 cssfilter: 0.0.10 bin: xss: bin/xss - checksum: fdb5e60e51be4edd3a694f92a910f3cd55e3d4746fcf53133863e4d40572c9b4ab1ce8e0011645c776c61f86c5a2ff9fc3e02554766e987bc0bf27d16cd3b407 + checksum: 77c6a60a5f96490098ef837c3b49321c0f31963f323c748cb0a01bc02fc6e465a6accbe4c54cad62f8d6ffe647d984be173879433af861883f6213d9416d3f53 languageName: node linkType: hard From f09859ab40d299548d12fc30f4a33c64e0905bf5 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 16 Jan 2023 01:35:38 -0800 Subject: [PATCH 04/28] Fix select box overflowing entities-row (#15105) --- src/panels/lovelace/entity-rows/hui-select-entity-row.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/lovelace/entity-rows/hui-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-select-entity-row.ts index d11f473aa4..39da53414e 100644 --- a/src/panels/lovelace/entity-rows/hui-select-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-select-entity-row.ts @@ -102,6 +102,7 @@ class HuiSelectEntityRow extends LitElement implements LovelaceRow { } ha-select { width: 100%; + --ha-select-min-width: 0; } `; } From 8294e0e2717956ea6092c7f6f4675347e5de93b9 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 16 Jan 2023 18:51:18 -0500 Subject: [PATCH 05/28] Bump object-hash from 2.0.3 to 3.0.0 (#15114) Bumps [object-hash](https://github.com/puleos/object-hash) from 2.0.3 to 3.0.0. - [Release notes](https://github.com/puleos/object-hash/releases) - [Commits](https://github.com/puleos/object-hash/compare/v2.0.3...v3.0.0) --- updated-dependencies: - dependency-name: object-hash dependency-type: direct:development 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 3383380949..967f33737c 100644 --- a/package.json +++ b/package.json @@ -217,7 +217,7 @@ "map-stream": "^0.0.7", "merge-stream": "^1.0.1", "mocha": "^8.4.0", - "object-hash": "^2.0.3", + "object-hash": "^3.0.0", "open": "^8.4.0", "pinst": "^3.0.0", "prettier": "^2.8.1", diff --git a/yarn.lock b/yarn.lock index 0d8090ebee..1e019765b2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9426,7 +9426,7 @@ fsevents@^1.2.7: merge-stream: ^1.0.1 mocha: ^8.4.0 node-vibrant: 3.2.1-alpha.1 - object-hash: ^2.0.3 + object-hash: ^3.0.0 open: ^8.4.0 pinst: ^3.0.0 prettier: ^2.8.1 @@ -12170,10 +12170,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"object-hash@npm:^2.0.3": - version: 2.0.3 - resolution: "object-hash@npm:2.0.3" - checksum: ba6a1e48534adafafc98e2f5ea65833dbb721a4945932e2e6cf1710cfe2f9a2fdbc7c037d3a7d8d0c2d5195efc8b11b7b6e57884e3fb1333f377d90e44299b86 +"object-hash@npm:^3.0.0": + version: 3.0.0 + resolution: "object-hash@npm:3.0.0" + checksum: 80b4904bb3857c52cc1bfd0b52c0352532ca12ed3b8a6ff06a90cd209dfda1b95cee059a7625eb9da29537027f68ac4619363491eedb2f5d3dddbba97494fd6c languageName: node linkType: hard From 2f2cde328cbc916b5c8ce75afbf98ba0bb7a8fb4 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Mon, 16 Jan 2023 22:57:32 -0500 Subject: [PATCH 06/28] How can I assist (#15118) --- src/translations/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/translations/en.json b/src/translations/en.json index 7de8a95054..319dff5b71 100755 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -808,7 +808,7 @@ "did_not_understand": "Didn't quite get that", "found": "I found the following for you:", "error": "Oops, an error has occurred", - "how_can_i_help": "How can I help?", + "how_can_i_help": "How can I assist?", "input_label": "Enter a request", "send_text": "Send text", "start_listening": "Start listening" From 9b95814f1b853847a32b129de759673e1629128f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 00:45:58 -0500 Subject: [PATCH 07/28] Bump webpack-dev-server from 4.3.0 to 4.11.1 (#15081) * Bump webpack-dev-server from 4.3.0 to 4.11.1 Bumps [webpack-dev-server](https://github.com/webpack/webpack-dev-server) from 4.3.0 to 4.11.1. - [Release notes](https://github.com/webpack/webpack-dev-server/releases) - [Changelog](https://github.com/webpack/webpack-dev-server/blob/master/CHANGELOG.md) - [Commits](https://github.com/webpack/webpack-dev-server/compare/v4.3.0...v4.11.1) --- updated-dependencies: - dependency-name: webpack-dev-server dependency-type: direct:development 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 | 381 +++++++++++++++++++++++---------------------------- 2 files changed, 175 insertions(+), 208 deletions(-) diff --git a/package.json b/package.json index 967f33737c..f486b73419 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "vinyl-source-stream": "^2.0.0", "webpack": "^5.55.1", "webpack-cli": "^4.8.0", - "webpack-dev-server": "^4.3.0", + "webpack-dev-server": "^4.11.1", "webpack-manifest-plugin": "^4.0.2", "webpackbar": "^5.0.0-3", "workbox-build": "^6.5.4" diff --git a/yarn.lock b/yarn.lock index 1e019765b2..7c59c7226f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1915,6 +1915,13 @@ __metadata: languageName: node linkType: hard +"@leichtgewicht/ip-codec@npm:^2.0.1": + version: 2.0.4 + resolution: "@leichtgewicht/ip-codec@npm:2.0.4" + checksum: 468de1f04d33de6d300892683d7c8aecbf96d1e2c5fe084f95f816e50a054d45b7c1ebfb141a1447d844b86a948733f6eebd92234da8581c84a1ad4de2946a2d + languageName: node + linkType: hard + "@lezer/common@npm:^1.0.0": version: 1.0.2 resolution: "@lezer/common@npm:1.0.2" @@ -3859,6 +3866,15 @@ __metadata: languageName: node linkType: hard +"@types/bonjour@npm:^3.5.9": + version: 3.5.10 + resolution: "@types/bonjour@npm:3.5.10" + dependencies: + "@types/node": "*" + checksum: bfcadb042a41b124c4e3de4925e3be6d35b78f93f27c4535d5ff86980dc0f8bc407ed99b9b54528952dc62834d5a779392f7a12c2947dd19330eb05a6bcae15a + languageName: node + linkType: hard + "@types/chrome@npm:*": version: 0.0.119 resolution: "@types/chrome@npm:0.0.119" @@ -3892,6 +3908,16 @@ __metadata: languageName: node linkType: hard +"@types/connect-history-api-fallback@npm:^1.3.5": + version: 1.3.5 + resolution: "@types/connect-history-api-fallback@npm:1.3.5" + dependencies: + "@types/express-serve-static-core": "*" + "@types/node": "*" + checksum: 464d06e5ab00f113fa89978633d5eb00d225aeb4ebbadc07f6f3bc337aa7cbfcd74957b2a539d6d47f2e128e956a17819973ec7ae62ade2e16e367a6c38b8d3a + languageName: node + linkType: hard + "@types/connect@npm:*": version: 3.4.33 resolution: "@types/connect@npm:3.4.33" @@ -3954,26 +3980,26 @@ __metadata: languageName: node linkType: hard -"@types/express-serve-static-core@npm:*": - version: 4.17.13 - resolution: "@types/express-serve-static-core@npm:4.17.13" +"@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.31": + version: 4.17.32 + resolution: "@types/express-serve-static-core@npm:4.17.32" dependencies: "@types/node": "*" "@types/qs": "*" "@types/range-parser": "*" - checksum: 9e8f75956c214fccaac8e4370a19cc4494f9f6c0326360a8a198161f92e9845c6a845002978b1e57a4bd6c0c1a5820d6be58b6796214bd7fcc6216baa7366d7b + checksum: 70ec1b8f386628850b315a7b9fd4240a5a70297b41ef1c39af65c8b9661d2c775cfff4686b491fd90e5b6eef43088af203700c5541aec0d063db0c6cbeff254c languageName: node linkType: hard -"@types/express@npm:*": - version: 4.17.9 - resolution: "@types/express@npm:4.17.9" +"@types/express@npm:*, @types/express@npm:^4.17.13": + version: 4.17.15 + resolution: "@types/express@npm:4.17.15" dependencies: "@types/body-parser": "*" - "@types/express-serve-static-core": "*" + "@types/express-serve-static-core": ^4.17.31 "@types/qs": "*" "@types/serve-static": "*" - checksum: e1d6388ec28ab67db5559011d16c63d6fcfb128f27daf217a02ecdb2ede968d2187e83ef3f7c54cbd050686aaed4c80585b64f055c76e79c055d7d4efb7bc3b1 + checksum: b4acd8a836d4f6409cdf79b12d6e660485249b62500cccd61e7997d2f520093edf77d7f8498ca79d64a112c6434b6de5ca48039b8fde2c881679eced7e96979b languageName: node linkType: hard @@ -4038,12 +4064,12 @@ __metadata: languageName: node linkType: hard -"@types/http-proxy@npm:^1.17.5": - version: 1.17.7 - resolution: "@types/http-proxy@npm:1.17.7" +"@types/http-proxy@npm:^1.17.8": + version: 1.17.9 + resolution: "@types/http-proxy@npm:1.17.9" dependencies: "@types/node": "*" - checksum: 88f9c75ca65378d0287d8d0b1dbeed372c8267f4841fe2f6f2d759522494382d3943bc6cc774bef7dd125464a266bafeda813d3658b17a2d1e74acc4efb6e21c + checksum: 7a6746d00729b2a9fe9f9dd3453430b099931df879ec8f7a7b5f07b1795f6d99b0512640c45a67390b1e4bacb9401e36824952aeeaf089feba8627a063cf8e00 languageName: node linkType: hard @@ -4252,13 +4278,31 @@ __metadata: languageName: node linkType: hard -"@types/serve-static@npm:*": - version: 1.13.7 - resolution: "@types/serve-static@npm:1.13.7" +"@types/serve-index@npm:^1.9.1": + version: 1.9.1 + resolution: "@types/serve-index@npm:1.9.1" + dependencies: + "@types/express": "*" + checksum: 026f3995fb500f6df7c3fe5009e53bad6d739e20b84089f58ebfafb2f404bbbb6162bbe33f72d2f2af32d5b8d3799c8e179793f90d9ed5871fb8591190bb6056 + languageName: node + linkType: hard + +"@types/serve-static@npm:*, @types/serve-static@npm:^1.13.10": + version: 1.15.0 + resolution: "@types/serve-static@npm:1.15.0" dependencies: "@types/mime": "*" "@types/node": "*" - checksum: 44adb2da288f84e15bd025cb16b94d99e20008809a4eb8429788f9e66440783c2900eef665ef9451ea76866156ea28770f14ae678bf7865ee586c12719fc2f88 + checksum: b6ac93d471fb0f53ddcac1f9b67572a09cd62806f7db5855244b28f6f421139626f24799392566e97d1ffc61b12f9de7f30380c39fcae3c8a161fe161d44edf2 + languageName: node + linkType: hard + +"@types/sockjs@npm:^0.3.33": + version: 0.3.33 + resolution: "@types/sockjs@npm:0.3.33" + dependencies: + "@types/node": "*" + checksum: b9bbb2b5c5ead2fb884bb019f61a014e37410bddd295de28184e1b2e71ee6b04120c5ba7b9954617f0bdf962c13d06249ce65004490889c747c80d3f628ea842 languageName: node linkType: hard @@ -4302,6 +4346,15 @@ __metadata: languageName: node linkType: hard +"@types/ws@npm:^8.5.1": + version: 8.5.4 + resolution: "@types/ws@npm:8.5.4" + dependencies: + "@types/node": "*" + checksum: fefbad20d211929bb996285c4e6f699b12192548afedbe4930ab4384f8a94577c9cd421acaad163cacd36b88649509970a05a0b8f20615b30c501ed5269038d1 + languageName: node + linkType: hard + "@typescript-eslint/eslint-plugin@npm:^5.46.1": version: 5.46.1 resolution: "@typescript-eslint/eslint-plugin@npm:5.46.1" @@ -5554,7 +5607,7 @@ __metadata: languageName: node linkType: hard -"array-flatten@npm:^2.1.0": +"array-flatten@npm:^2.1.2": version: 2.1.2 resolution: "array-flatten@npm:2.1.2" checksum: e8988aac1fbfcdaae343d08c9a06a6fddd2c6141721eeeea45c3cf523bf4431d29a46602929455ed548c7a3e0769928cdc630405427297e7081bd118fdec9262 @@ -5914,17 +5967,15 @@ __metadata: languageName: node linkType: hard -"bonjour@npm:^3.5.0": - version: 3.5.0 - resolution: "bonjour@npm:3.5.0" +"bonjour-service@npm:^1.0.11": + version: 1.0.14 + resolution: "bonjour-service@npm:1.0.14" dependencies: - array-flatten: ^2.1.0 - deep-equal: ^1.0.1 + array-flatten: ^2.1.2 dns-equal: ^1.0.0 - dns-txt: ^2.0.2 - multicast-dns: ^6.0.1 - multicast-dns-service-types: ^1.1.0 - checksum: 2cfbe9fa861f4507b5ff3853eeae3ef03a231ede2b7363efedd80880ea3c0576f64416f98056c96e429ed68ff38dc4a70c0583d1eb4dab72e491ca44a0f03444 + fast-deep-equal: ^3.1.3 + multicast-dns: ^7.2.5 + checksum: 4a825bbf1824147ba8295a182fb3e86a8bae5159a08e2f118e829a0c988043a559f1f6e4eab425fe17ee9a1f080115d30430e78962e53f75bb03e2021ee7c5b2 languageName: node linkType: hard @@ -6053,13 +6104,6 @@ __metadata: languageName: node linkType: hard -"buffer-indexof@npm:^1.0.0": - version: 1.1.1 - resolution: "buffer-indexof@npm:1.1.1" - checksum: 0967abc2981a8e7d776324c6b84811e4d84a7ead89b54a3bb8791437f0c4751afd060406b06db90a436f1cf771867331b5ecf5c4aca95b4ccb9f6cb146c22ebc - languageName: node - linkType: hard - "buffer@npm:^5.2.0, buffer@npm:^5.4.3": version: 5.6.0 resolution: "buffer@npm:5.6.0" @@ -6314,9 +6358,9 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.4.3, chokidar@npm:^3.5.1": - version: 3.5.2 - resolution: "chokidar@npm:3.5.2" +"chokidar@npm:^3.4.3, chokidar@npm:^3.5.3": + version: 3.5.3 + resolution: "chokidar@npm:3.5.3" dependencies: anymatch: ~3.1.2 braces: ~3.0.2 @@ -6329,7 +6373,7 @@ __metadata: dependenciesMeta: fsevents: optional: true - checksum: d1fda32fcd67d9f6170a8468ad2630a3c6194949c9db3f6a91b16478c328b2800f433fb5d2592511b6cb145a47c013ea1cce60b432b1a001ae3ee978a8bffc2d + checksum: b49fcde40176ba007ff361b198a2d35df60d9bb2a5aab228279eb810feae9294a6b4649ab15981304447afe1e6ffbf4788ad5db77235dc770ab777c6e771980c languageName: node linkType: hard @@ -6770,10 +6814,10 @@ __metadata: languageName: node linkType: hard -"connect-history-api-fallback@npm:^1.6.0": - version: 1.6.0 - resolution: "connect-history-api-fallback@npm:1.6.0" - checksum: 804ca2be28c999032ecd37a9f71405e5d7b7a4b3defcebbe41077bb8c5a0a150d7b59f51dcc33b2de30bc7e217a31d10f8cfad27e8e74c2fc7655eeba82d6e7e +"connect-history-api-fallback@npm:^2.0.0": + version: 2.0.0 + resolution: "connect-history-api-fallback@npm:2.0.0" + checksum: dc5368690f4a5c413889792f8df70d5941ca9da44523cde3f87af0745faee5ee16afb8195434550f0504726642734f2683d6c07f8b460f828a12c45fbd4c9a68 languageName: node linkType: hard @@ -7057,7 +7101,7 @@ __metadata: languageName: node linkType: hard -"deep-equal@npm:^1.0.1, deep-equal@npm:~1.0.1": +"deep-equal@npm:~1.0.1": version: 1.0.1 resolution: "deep-equal@npm:1.0.1" checksum: 5af8cbfcebf190491878a498caccc7dc9592f8ebd1685b976eacc3825619d222b5e929923163b92c4f414494e2b884f7ebf00c022e8198e8292deb70dd9785f4 @@ -7101,7 +7145,7 @@ __metadata: languageName: node linkType: hard -"default-gateway@npm:^6.0.0": +"default-gateway@npm:^6.0.3": version: 6.0.3 resolution: "default-gateway@npm:6.0.3" dependencies: @@ -7185,22 +7229,6 @@ __metadata: languageName: node linkType: hard -"del@npm:^6.0.0": - version: 6.0.0 - resolution: "del@npm:6.0.0" - dependencies: - globby: ^11.0.1 - graceful-fs: ^4.2.4 - is-glob: ^4.0.1 - is-path-cwd: ^2.2.0 - is-path-inside: ^3.0.2 - p-map: ^4.0.0 - rimraf: ^3.0.2 - slash: ^3.0.0 - checksum: 5742891627e91aaf62385714025233f4664da28bc55b6ab825649dcdea4691fed3cf329a2b1913fd2d2612e693e99e08a03c84cac7f36ef54bacac9390520192 - languageName: node - linkType: hard - "delegates@npm:^1.0.0": version: 1.0.0 resolution: "delegates@npm:1.0.0" @@ -7307,22 +7335,12 @@ __metadata: languageName: node linkType: hard -"dns-packet@npm:^1.3.1": - version: 1.3.4 - resolution: "dns-packet@npm:1.3.4" +"dns-packet@npm:^5.2.2": + version: 5.4.0 + resolution: "dns-packet@npm:5.4.0" dependencies: - ip: ^1.1.0 - safe-buffer: ^5.0.1 - checksum: 7dd87f85cb4f9d1a99c03470730e3d9385e67dc94f6c13868c4034424a5378631e492f9f1fbc43d3c42f319fbbfe18b6488bb9527c32d34692c52bf1f5eedf69 - languageName: node - linkType: hard - -"dns-txt@npm:^2.0.2": - version: 2.0.2 - resolution: "dns-txt@npm:2.0.2" - dependencies: - buffer-indexof: ^1.0.0 - checksum: 80130b665379ecd991687ae079fbee25d091e03e4c4cef41e7643b977849ac48c2f56bfcb3727e53594d29029b833749811110d9f3fbee1b26a6e6f8096a5cef + "@leichtgewicht/ip-codec": ^2.0.1 + checksum: a169963848e8539dfd8a19058562f9e1c15c0f82cbf76fa98942f11c46f3c74e7e7c82e3a8a5182d4c9e6ff19e21be738dbd098a876dde755d3aedd2cc730880 languageName: node linkType: hard @@ -8097,7 +8115,7 @@ __metadata: languageName: node linkType: hard -"express@npm:^4.17.1": +"express@npm:^4.17.3": version: 4.18.2 resolution: "express@npm:4.18.2" dependencies: @@ -8636,7 +8654,7 @@ __metadata: languageName: node linkType: hard -"fs-monkey@npm:1.0.3": +"fs-monkey@npm:^1.0.3": version: 1.0.3 resolution: "fs-monkey@npm:1.0.3" checksum: cf50804833f9b88a476911ae911fe50f61a98d986df52f890bd97e7262796d023698cb2309fa9b74fdd8974f04315b648748a0a8ee059e7d5257b293bfc409c0 @@ -8965,7 +8983,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"globby@npm:^11.0.1, globby@npm:^11.1.0": +"globby@npm:^11.1.0": version: 11.1.0 resolution: "globby@npm:11.1.0" dependencies: @@ -9464,7 +9482,7 @@ fsevents@^1.2.7: vue2-daterange-picker: ^0.5.1 webpack: ^5.55.1 webpack-cli: ^4.8.0 - webpack-dev-server: ^4.3.0 + webpack-dev-server: ^4.11.1 webpack-manifest-plugin: ^4.0.2 webpackbar: ^5.0.0-3 weekstart: ^1.1.0 @@ -9631,16 +9649,21 @@ fsevents@^1.2.7: languageName: node linkType: hard -"http-proxy-middleware@npm:^2.0.0": - version: 2.0.1 - resolution: "http-proxy-middleware@npm:2.0.1" +"http-proxy-middleware@npm:^2.0.3": + version: 2.0.6 + resolution: "http-proxy-middleware@npm:2.0.6" dependencies: - "@types/http-proxy": ^1.17.5 + "@types/http-proxy": ^1.17.8 http-proxy: ^1.18.1 is-glob: ^4.0.1 is-plain-obj: ^3.0.0 micromatch: ^4.0.2 - checksum: 0de65bc6644b6efae5d26cd3bec071ceaeb92f26856ffee5ecdde9c702ea1435936e7dfb09da2ac0883eada80fdc993e9925902fc10bf6625565d6365f8cb30f + peerDependencies: + "@types/express": ^4.17.13 + peerDependenciesMeta: + "@types/express": + optional: true + checksum: 2ee85bc878afa6cbf34491e972ece0f5be0a3e5c98a60850cf40d2a9a5356e1fc57aab6cff33c1fc37691b0121c3a42602d2b1956c52577e87a5b77b62ae1c3a languageName: node linkType: hard @@ -9869,18 +9892,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"internal-ip@npm:^6.2.0": - version: 6.2.0 - resolution: "internal-ip@npm:6.2.0" - dependencies: - default-gateway: ^6.0.0 - ipaddr.js: ^1.9.1 - is-ip: ^3.1.0 - p-event: ^4.2.0 - checksum: 6d08299c052c4ec926fa4e3643049d81daacbc33d3ab90fc30cd59cd7f12902152107bc75778e1202a269eb82cab0c412ff04a78f0361e056de0c5c2628881fa - languageName: node - linkType: hard - "internal-slot@npm:^1.0.3": version: 1.0.3 resolution: "internal-slot@npm:1.0.3" @@ -9934,21 +9945,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"ip-regex@npm:^4.0.0": - version: 4.3.0 - resolution: "ip-regex@npm:4.3.0" - checksum: 7ff904b891221b1847f3fdf3dbb3e6a8660dc39bc283f79eb7ed88f5338e1a3d1104b779bc83759159be266249c59c2160e779ee39446d79d4ed0890dfd06f08 - languageName: node - linkType: hard - -"ip@npm:^1.1.0, ip@npm:^1.1.5": +"ip@npm:^1.1.5": version: 1.1.5 resolution: "ip@npm:1.1.5" checksum: 30133981f082a060a32644f6a7746e9ba7ac9e2bc07ecc8bbdda3ee8ca9bec1190724c390e45a1ee7695e7edfd2a8f7dda2c104ec5f7ac5068c00648504c7e5a languageName: node linkType: hard -"ipaddr.js@npm:1.9.1, ipaddr.js@npm:^1.9.1": +"ipaddr.js@npm:1.9.1": version: 1.9.1 resolution: "ipaddr.js@npm:1.9.1" checksum: f88d3825981486f5a1942414c8d77dd6674dd71c065adcfa46f578d677edcb99fda25af42675cb59db492fdf427b34a5abfcde3982da11a8fd83a500b41cfe77 @@ -10195,15 +10199,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-ip@npm:^3.1.0": - version: 3.1.0 - resolution: "is-ip@npm:3.1.0" - dependencies: - ip-regex: ^4.0.0 - checksum: da2c2b282407194adf2320bade0bad94be9c9d0bdab85ff45b1b62d8185f31c65dff3884519d57bf270277e5ea2046c7916a6e5a6db22fe4b7ddcdd3760f23eb - languageName: node - linkType: hard - "is-lambda@npm:^1.0.1": version: 1.0.1 resolution: "is-lambda@npm:1.0.1" @@ -10269,7 +10264,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-path-cwd@npm:^2.0.0, is-path-cwd@npm:^2.2.0": +"is-path-cwd@npm:^2.0.0": version: 2.2.0 resolution: "is-path-cwd@npm:2.2.0" checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048 @@ -10294,13 +10289,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-path-inside@npm:^3.0.2": - version: 3.0.3 - resolution: "is-path-inside@npm:3.0.3" - checksum: abd50f06186a052b349c15e55b182326f1936c89a78bf6c8f2b707412517c097ce04bc49a0ca221787bc44e1049f51f09a2ffb63d22899051988d3a618ba13e9 - languageName: node - linkType: hard - "is-plain-obj@npm:^2.1.0": version: 2.1.0 resolution: "is-plain-obj@npm:2.1.0" @@ -11425,12 +11413,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"memfs@npm:^3.2.2": - version: 3.3.0 - resolution: "memfs@npm:3.3.0" +"memfs@npm:^3.2.2, memfs@npm:^3.4.3": + version: 3.4.13 + resolution: "memfs@npm:3.4.13" dependencies: - fs-monkey: 1.0.3 - checksum: 9e9eb71cfc077fd5e14ad2f497f5a8791689b64f307cf379ed6737c5781652a7af0509395c0dfba43c4e413dbc7cd7010e9ca002168ec329e6df178414b96268 + fs-monkey: ^1.0.3 + checksum: 3f9717d6f060919d53f211acb6096a0ea2f566a8cbcc4ef7e1f2561e31e33dc456053fdf951c90a49c8ec55402de7f01b006b81683ab7bd4bdbbd8c9b9cdae5f languageName: node linkType: hard @@ -11779,22 +11767,15 @@ fsevents@^1.2.7: languageName: node linkType: hard -"multicast-dns-service-types@npm:^1.1.0": - version: 1.1.0 - resolution: "multicast-dns-service-types@npm:1.1.0" - checksum: 0979fca1cce85484d256e4db3af591d941b41a61f134da3607213d2624c12ed5b8a246565cb19a9b3cb542819e8fbc71a90b07e77023ee6a9515540fe1d371f7 - languageName: node - linkType: hard - -"multicast-dns@npm:^6.0.1": - version: 6.2.3 - resolution: "multicast-dns@npm:6.2.3" +"multicast-dns@npm:^7.2.5": + version: 7.2.5 + resolution: "multicast-dns@npm:7.2.5" dependencies: - dns-packet: ^1.3.1 + dns-packet: ^5.2.2 thunky: ^1.0.2 bin: multicast-dns: cli.js - checksum: f515b49ca964429ab48a4ac8041fcf969c927aeb49ab65288bd982e52c849a870fc3b03565780b0d194a1a02da8821f28b6425e48e95b8107bc9fcc92f571a6f + checksum: 00b8a57df152d4cd0297946320a94b7c3cdf75a46a2247f32f958a8927dea42958177f9b7fdae69fab2e4e033fb3416881af1f5e9055a3e1542888767139e2fb languageName: node linkType: hard @@ -11937,10 +11918,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"node-forge@npm:^0.10.0": - version: 0.10.0 - resolution: "node-forge@npm:0.10.0" - checksum: 5aa6dc9922e424a20ef101d2f517418e2bc9cfc0255dd22e0701c0fad1568445f510ee67f6f3fcdf085812c4ca1b847b8ba45683b34776828e41f5c1794e42e1 +"node-forge@npm:^1": + version: 1.3.1 + resolution: "node-forge@npm:1.3.1" + checksum: 08fb072d3d670599c89a1704b3e9c649ff1b998256737f0e06fbd1a5bf41cae4457ccaee32d95052d80bbafd9ffe01284e078c8071f0267dc9744e51c5ed42a9 languageName: node linkType: hard @@ -12416,15 +12397,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-event@npm:^4.2.0": - version: 4.2.0 - resolution: "p-event@npm:4.2.0" - dependencies: - p-timeout: ^3.1.0 - checksum: 8a3588f7a816a20726a3262dfeee70a631e3997e4773d23219176333eda55cce9a76219e3d2b441b331eb746e14fdb381eb2694ab9ff2fcf87c846462696fe89 - languageName: node - linkType: hard - "p-finally@npm:^1.0.0": version: 1.0.0 resolution: "p-finally@npm:1.0.0" @@ -12528,15 +12500,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-timeout@npm:^3.1.0": - version: 3.2.0 - resolution: "p-timeout@npm:3.2.0" - dependencies: - p-finally: ^1.0.0 - checksum: 3dd0eaa048780a6f23e5855df3dd45c7beacff1f820476c1d0d1bcd6648e3298752ba2c877aa1c92f6453c7dd23faaf13d9f5149fc14c0598a142e2c5e8d649c - languageName: node - linkType: hard - "p-try@npm:^1.0.0": version: 1.0.0 resolution: "p-try@npm:1.0.0" @@ -13944,12 +13907,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"selfsigned@npm:^1.10.11": - version: 1.10.11 - resolution: "selfsigned@npm:1.10.11" +"selfsigned@npm:^2.1.1": + version: 2.1.1 + resolution: "selfsigned@npm:2.1.1" dependencies: - node-forge: ^0.10.0 - checksum: 1fd8fd317dc0b7d713d12d828131ac03c53abf41c4538b263fecd37bbc15688526c631654049ff00806b757ccb85492de6a13d6fefcad5cb54926631e48a76e1 + node-forge: ^1 + checksum: aa9ce2150a54838978d5c0aee54d7ebe77649a32e4e690eb91775f71fdff773874a4fbafd0ac73d8ec3b702ff8a395c604df4f8e8868528f36fd6c15076fb43a languageName: node linkType: hard @@ -14310,14 +14273,14 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sockjs@npm:^0.3.21": - version: 0.3.21 - resolution: "sockjs@npm:0.3.21" +"sockjs@npm:^0.3.24": + version: 0.3.24 + resolution: "sockjs@npm:0.3.24" dependencies: faye-websocket: ^0.11.3 - uuid: ^3.4.0 + uuid: ^8.3.2 websocket-driver: ^0.7.4 - checksum: 9614e5dded95d38c08c42bba3505638801d0e88d9fec03dc1ae37296286ad5c31dff503b8c81a11e573bd0bea76b295db93d4f00cc336e749bc89f9f7cc7e6c9 + checksum: 355309b48d2c4e9755349daa29cea1c0d9ee23e49b983841c6bf7a20276b00d3c02343f9f33f26d2ee8b261a5a02961b52a25c8da88b2538c5b68d3071b4934c languageName: node linkType: hard @@ -14741,7 +14704,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"strip-ansi@npm:^7.0.0, strip-ansi@npm:^7.0.1": +"strip-ansi@npm:^7.0.1": version: 7.0.1 resolution: "strip-ansi@npm:7.0.1" dependencies: @@ -15679,12 +15642,12 @@ typescript@^3.8.3: languageName: node linkType: hard -"uuid@npm:^3.4.0": - version: 3.4.0 - resolution: "uuid@npm:3.4.0" +"uuid@npm:^8.3.2": + version: 8.3.2 + resolution: "uuid@npm:8.3.2" bin: - uuid: ./bin/uuid - checksum: 58de2feed61c59060b40f8203c0e4ed7fd6f99d42534a499f1741218a1dd0c129f4aa1de797bcf822c8ea5da7e4137aa3673431a96dae729047f7aca7b27866f + uuid: dist/bin/uuid + checksum: 5575a8a75c13120e2f10e6ddc801b2c7ed7d8f3c8ac22c7ed0c7b2ba6383ec0abda88c905085d630e251719e0777045ae3236f04c812184b7c765f63a70e58df languageName: node linkType: hard @@ -15991,50 +15954,54 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-dev-middleware@npm:^5.2.1": - version: 5.2.1 - resolution: "webpack-dev-middleware@npm:5.2.1" +"webpack-dev-middleware@npm:^5.3.1": + version: 5.3.3 + resolution: "webpack-dev-middleware@npm:5.3.3" dependencies: colorette: ^2.0.10 - memfs: ^3.2.2 + memfs: ^3.4.3 mime-types: ^2.1.31 range-parser: ^1.2.1 - schema-utils: ^3.1.0 + schema-utils: ^4.0.0 peerDependencies: webpack: ^4.0.0 || ^5.0.0 - checksum: 06f3ef14ec983d115d7109f37312fc691c867c95fe7579784c7b80db0a2be77392fa27de444d0a937546da68c7e99640c13df73dc1351bbed7ebab4cc5569f14 + checksum: dd332cc6da61222c43d25e5a2155e23147b777ff32fdf1f1a0a8777020c072fbcef7756360ce2a13939c3f534c06b4992a4d659318c4a7fe2c0530b52a8a6621 languageName: node linkType: hard -"webpack-dev-server@npm:^4.3.0": - version: 4.3.0 - resolution: "webpack-dev-server@npm:4.3.0" +"webpack-dev-server@npm:^4.11.1": + version: 4.11.1 + resolution: "webpack-dev-server@npm:4.11.1" dependencies: + "@types/bonjour": ^3.5.9 + "@types/connect-history-api-fallback": ^1.3.5 + "@types/express": ^4.17.13 + "@types/serve-index": ^1.9.1 + "@types/serve-static": ^1.13.10 + "@types/sockjs": ^0.3.33 + "@types/ws": ^8.5.1 ansi-html-community: ^0.0.8 - bonjour: ^3.5.0 - chokidar: ^3.5.1 + bonjour-service: ^1.0.11 + chokidar: ^3.5.3 colorette: ^2.0.10 compression: ^1.7.4 - connect-history-api-fallback: ^1.6.0 - del: ^6.0.0 - express: ^4.17.1 + connect-history-api-fallback: ^2.0.0 + default-gateway: ^6.0.3 + express: ^4.17.3 graceful-fs: ^4.2.6 html-entities: ^2.3.2 - http-proxy-middleware: ^2.0.0 - internal-ip: ^6.2.0 + http-proxy-middleware: ^2.0.3 ipaddr.js: ^2.0.1 open: ^8.0.9 p-retry: ^4.5.0 - portfinder: ^1.0.28 - schema-utils: ^3.1.0 - selfsigned: ^1.10.11 + rimraf: ^3.0.2 + schema-utils: ^4.0.0 + selfsigned: ^2.1.1 serve-index: ^1.9.1 - sockjs: ^0.3.21 + sockjs: ^0.3.24 spdy: ^4.0.2 - strip-ansi: ^7.0.0 - url: ^0.11.0 - webpack-dev-middleware: ^5.2.1 - ws: ^8.1.0 + webpack-dev-middleware: ^5.3.1 + ws: ^8.4.2 peerDependencies: webpack: ^4.37.0 || ^5.0.0 peerDependenciesMeta: @@ -16042,7 +16009,7 @@ typescript@^3.8.3: optional: true bin: webpack-dev-server: bin/webpack-dev-server.js - checksum: 7ee8ae969a1eff65caedc7dd935a3bf62f0ca21fdd5d169884cba525d9c970e551fa250f230bda0c57a76cd61411fae5bfcbc104bafff14c9cad7f4a6f9b0022 + checksum: b7601a39ee0f413988259e29a36835b0a68522cfaa161de5b7ec99b3399acdd99d44189add4aaf4a5191258bb130f9cf3e68919324a1955c7557f5fe6ab0d96c languageName: node linkType: hard @@ -16557,18 +16524,18 @@ typescript@^3.8.3: languageName: node linkType: hard -"ws@npm:^8.1.0": - version: 8.2.2 - resolution: "ws@npm:8.2.2" +"ws@npm:^8.4.2": + version: 8.12.0 + resolution: "ws@npm:8.12.0" peerDependencies: bufferutil: ^4.0.1 - utf-8-validate: ^5.0.2 + utf-8-validate: ">=5.0.2" peerDependenciesMeta: bufferutil: optional: true utf-8-validate: optional: true - checksum: 25e764c631141bdca45badc86e69437b8791e57e461f9a16c0f7cd779baf70c3fbba07ecdd9e0d34fea1155ddcf62ef165cd7f81b68ed545bc7d455c15a85fb0 + checksum: 818ff3f8749c172a95a114cceb8b89cedd27e43a82d65c7ad0f7882b1e96a2ee6709e3746a903c3fa88beec0c8bae9a9fcd75f20858b32a166dfb7519316a5d7 languageName: node linkType: hard From 64fabbbf05b334a6e286379748d72280b1ebbebe Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 06:03:39 +0000 Subject: [PATCH 08/28] Bump follow-redirects from 1.13.0 to 1.15.2 (#15119) Bumps [follow-redirects](https://github.com/follow-redirects/follow-redirects) from 1.13.0 to 1.15.2. - [Release notes](https://github.com/follow-redirects/follow-redirects/releases) - [Commits](https://github.com/follow-redirects/follow-redirects/compare/v1.13.0...v1.15.2) --- updated-dependencies: - dependency-name: follow-redirects dependency-type: indirect ... Signed-off-by: dependabot[bot] Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- yarn.lock | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 7c59c7226f..65ee2ff475 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8548,9 +8548,12 @@ __metadata: linkType: hard "follow-redirects@npm:^1.0.0": - version: 1.13.0 - resolution: "follow-redirects@npm:1.13.0" - checksum: 684165a78370ae21ccb9495d1e99eb3bd9a63a51f8686f3b5117d92e28435a283b39e07014bc959287314979ecd496027e4baca8854f757439b7ac0b185e5f2d + version: 1.15.2 + resolution: "follow-redirects@npm:1.15.2" + peerDependenciesMeta: + debug: + optional: true + checksum: faa66059b66358ba65c234c2f2a37fcec029dc22775f35d9ad6abac56003268baf41e55f9ee645957b32c7d9f62baf1f0b906e68267276f54ec4b4c597c2b190 languageName: node linkType: hard From f6a508683c6c6513407796f99b911432aff09a25 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 17 Jan 2023 08:56:39 -0500 Subject: [PATCH 09/28] Bump memoize-one from 5.2.1 to 6.0.0 (#15122) Bumps [memoize-one](https://github.com/alexreardon/memoize-one) from 5.2.1 to 6.0.0. - [Release notes](https://github.com/alexreardon/memoize-one/releases) - [Commits](https://github.com/alexreardon/memoize-one/compare/v5.2.1...v6.0.0) --- updated-dependencies: - dependency-name: memoize-one 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 f486b73419..c78151d0a3 100644 --- a/package.json +++ b/package.json @@ -117,7 +117,7 @@ "leaflet-draw": "^1.0.4", "lit": "^2.1.2", "marked": "^4.0.12", - "memoize-one": "^5.2.1", + "memoize-one": "^6.0.0", "node-vibrant": "3.2.1-alpha.1", "proxy-polyfill": "^0.3.2", "punycode": "^2.1.1", diff --git a/yarn.lock b/yarn.lock index 65ee2ff475..7909b5490a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9443,7 +9443,7 @@ fsevents@^1.2.7: magic-string: ^0.25.7 map-stream: ^0.0.7 marked: ^4.0.12 - memoize-one: ^5.2.1 + memoize-one: ^6.0.0 merge-stream: ^1.0.1 mocha: ^8.4.0 node-vibrant: 3.2.1-alpha.1 @@ -11425,10 +11425,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"memoize-one@npm:^5.2.1": - version: 5.2.1 - resolution: "memoize-one@npm:5.2.1" - checksum: a3cba7b824ebcf24cdfcd234aa7f86f3ad6394b8d9be4c96ff756dafb8b51c7f71320785fbc2304f1af48a0467cbbd2a409efc9333025700ed523f254cb52e3d +"memoize-one@npm:^6.0.0": + version: 6.0.0 + resolution: "memoize-one@npm:6.0.0" + checksum: f185ea69f7cceae5d1cb596266dcffccf545e8e7b4106ec6aa93b71ab9d16460dd118ac8b12982c55f6d6322fcc1485de139df07eacffaae94888b9b3ad7675f languageName: node linkType: hard From 468aeda74a9af5d8728d25b7dd6e23caf92f1b0b Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Tue, 17 Jan 2023 09:25:43 -0500 Subject: [PATCH 10/28] Bump @material components to 0.27 (#15000) --- .gitignore | 4 +- .../mwc-icon-button/remove-icon.patch | 12 - package.json | 48 +- yarn.lock | 1343 +++++++++-------- 4 files changed, 763 insertions(+), 644 deletions(-) delete mode 100644 .yarn/patches/@material/mwc-icon-button/remove-icon.patch diff --git a/.gitignore b/.gitignore index 728c403c50..203f48cc0a 100644 --- a/.gitignore +++ b/.gitignore @@ -8,7 +8,7 @@ dist/ /translations/ # yarn -.yarn/** +.yarn/* !.yarn/patches !.yarn/releases !.yarn/plugins @@ -31,7 +31,7 @@ pip-selfcheck.json .venv # vscode -.vscode/** +.vscode/* !.vscode/extensions.json !.vscode/launch.json !.vscode/tasks.json diff --git a/.yarn/patches/@material/mwc-icon-button/remove-icon.patch b/.yarn/patches/@material/mwc-icon-button/remove-icon.patch deleted file mode 100644 index b724248eb0..0000000000 --- a/.yarn/patches/@material/mwc-icon-button/remove-icon.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/mwc-icon-button-base.js b/mwc-icon-button-base.js -index 45cdaab93ccc0a6daaaaabc01266dcdc32e46bfd..b3ea5b541597308d85f86ce6c23fd00785fda835 100644 ---- a/mwc-icon-button-base.js -+++ b/mwc-icon-button-base.js -@@ -63,7 +63,6 @@ export class IconButtonBase extends LitElement { - @touchend="${this.handleRippleDeactivate}" - @touchcancel="${this.handleRippleDeactivate}" - >${this.renderRipple()} -- ${this.icon} - \ No newline at end of file diff --git a/package.json b/package.json index c78151d0a3..a02d465af1 100644 --- a/package.json +++ b/package.json @@ -47,30 +47,30 @@ "@lezer/highlight": "^1.1.3", "@lit-labs/motion": "^1.0.2", "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch", - "@material/chips": "14.0.0-canary.261f2db59.0", - "@material/data-table": "14.0.0-canary.261f2db59.0", - "@material/mwc-button": "0.25.3", - "@material/mwc-checkbox": "0.25.3", - "@material/mwc-circular-progress": "0.25.3", - "@material/mwc-dialog": "0.25.3", - "@material/mwc-drawer": "^0.25.3", - "@material/mwc-fab": "0.25.3", - "@material/mwc-formfield": "0.25.3", - "@material/mwc-icon-button": "patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch", - "@material/mwc-linear-progress": "0.25.3", - "@material/mwc-list": "^0.25.3", - "@material/mwc-menu": "0.25.3", - "@material/mwc-radio": "0.25.3", - "@material/mwc-ripple": "0.25.3", - "@material/mwc-select": "0.25.3", - "@material/mwc-slider": "0.25.3", - "@material/mwc-switch": "0.25.3", - "@material/mwc-tab": "0.25.3", - "@material/mwc-tab-bar": "0.25.3", - "@material/mwc-textarea": "^0.25.3", - "@material/mwc-textfield": "0.25.3", - "@material/mwc-top-app-bar-fixed": "^0.25.3", - "@material/top-app-bar": "14.0.0-canary.261f2db59.0", + "@material/chips": "=14.0.0-canary.53b3cad2f.0", + "@material/data-table": "=14.0.0-canary.53b3cad2f.0", + "@material/mwc-button": "^0.27.0", + "@material/mwc-checkbox": "^0.27.0", + "@material/mwc-circular-progress": "^0.27.0", + "@material/mwc-dialog": "^0.27.0", + "@material/mwc-drawer": "^0.27.0", + "@material/mwc-fab": "^0.27.0", + "@material/mwc-formfield": "^0.27.0", + "@material/mwc-icon-button": "^0.27.0", + "@material/mwc-linear-progress": "^0.27.0", + "@material/mwc-list": "^0.27.0", + "@material/mwc-menu": "^0.27.0", + "@material/mwc-radio": "^0.27.0", + "@material/mwc-ripple": "^0.27.0", + "@material/mwc-select": "^0.27.0", + "@material/mwc-slider": "^0.27.0", + "@material/mwc-switch": "^0.27.0", + "@material/mwc-tab": "^0.27.0", + "@material/mwc-tab-bar": "^0.27.0", + "@material/mwc-textarea": "^0.27.0", + "@material/mwc-textfield": "^0.27.0", + "@material/mwc-top-app-bar-fixed": "^0.27.0", + "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0", "@mdi/js": "7.1.96", "@mdi/svg": "7.1.96", "@polymer/app-layout": "^3.1.0", diff --git a/yarn.lock b/yarn.lock index 7909b5490a..d83feea106 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1994,6 +1994,15 @@ __metadata: languageName: node linkType: hard +"@material/animation@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/animation@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + tslib: ^2.1.0 + checksum: 9b5190654c3752468db00345d947ce68b95877734846cc33e73f85e3b13f9bc41bc8fdf588cbf22e17bec80d021d43597f638f811946555d2e11b383f4cb3812 + languageName: node + linkType: hard + "@material/base@npm:14.0.0-canary.261f2db59.0, @material/base@npm:=14.0.0-canary.261f2db59.0": version: 14.0.0-canary.261f2db59.0 resolution: "@material/base@npm:14.0.0-canary.261f2db59.0" @@ -2003,136 +2012,148 @@ __metadata: languageName: node linkType: hard -"@material/button@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/button@npm:14.0.0-canary.261f2db59.0" +"@material/base@npm:14.0.0-canary.53b3cad2f.0, @material/base@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/base@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/tokens": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 tslib: ^2.1.0 - checksum: 531816597f916e7b0d0b57fd9aef8b6900be17062b3e39a3ac05be5cad0c2570838f7623211db66511c9622f626284688922ea75e2298e85a4cf017b2f1c73cf + checksum: 9f4928d115809d4eac7688b1bc77f961b057ea4c1b494b9ff23d561aaccb8c6b2be00e0afce295a5447fae870b7946d6955726b5c3732a9299abdb18e7bf0f4f languageName: node linkType: hard -"@material/checkbox@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/checkbox@npm:14.0.0-canary.261f2db59.0" +"@material/button@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/button@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 73d01d892006f7241a5fba9db9d6324528a844d50ebd76d16abbe0e579c07c5412e1b26f3e2c2671bda1bb392d9f5bdcf439e090a018876e09cd6161d07429e5 + checksum: 873295c56aca2d22b71b829d2236d734057e6e1b2a289d5193bfbe799f5ea5554170cbb2c579f9c6afeaf812cd2bff396c3e00e168c5fbf51f17dbe6a37c3cb7 languageName: node linkType: hard -"@material/chips@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/chips@npm:14.0.0-canary.261f2db59.0" +"@material/checkbox@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/checkbox@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/checkbox": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/tokens": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: cd11c71bc8e652620b94123d28a8e805380ec436429713e167f56a6b7fbe571e63a93c476c9166cbe645c5a7cc97c84516dfab731caf32b716a75a434bba6857 + checksum: 138c8af41c5f3fac80bbfb3fd7543c7e8fd33adda58b1a285b9a06a64cf195ae8cdd963d5b7f72f1da32dfa66d7508cd842a5e6f7b1737e078b26b72b469fb77 languageName: node linkType: hard -"@material/circular-progress@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/circular-progress@npm:14.0.0-canary.261f2db59.0" +"@material/chips@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/chips@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/progress-indicator": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/checkbox": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 075820f8535d0a89d76d6bb9c3458108d3e98c980cc90ab767d579d31e04b14e11a4ad31ec9e46b2b95fd51aabd6abae2be116cff6bb728a72ec2096d2427b5c + checksum: d5eedea97ad12f71fcde4461a8954067cc640facc0f0bde19edb8f9ce59dfa5048edd3152458dfd40e8f38ef28e227900de083f90df923cb4874e8c208952818 languageName: node linkType: hard -"@material/data-table@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/data-table@npm:14.0.0-canary.261f2db59.0" +"@material/circular-progress@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/circular-progress@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/checkbox": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/icon-button": 14.0.0-canary.261f2db59.0 - "@material/linear-progress": 14.0.0-canary.261f2db59.0 - "@material/list": 14.0.0-canary.261f2db59.0 - "@material/menu": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/select": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/progress-indicator": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 0ebb35f5fffdc6d5d6de2e733e48aa9ebe9d3fc36a733e2d3c3781ca9468f385d77bedfda1e7193e58cd0b7abd6805905df404d9fa67200095fa7a4340b37d62 + checksum: f1acad861ec7e9433de10f417718560fd441fa2ea5b6ce1f3483454ffb9837f42bfdd09f849fae03f03bf6f07a3c902ee88bf2619b0772db237ede105c93e1be languageName: node linkType: hard -"@material/density@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/density@npm:14.0.0-canary.261f2db59.0" +"@material/data-table@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/data-table@npm:14.0.0-canary.53b3cad2f.0" dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/checkbox": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/icon-button": 14.0.0-canary.53b3cad2f.0 + "@material/linear-progress": 14.0.0-canary.53b3cad2f.0 + "@material/list": 14.0.0-canary.53b3cad2f.0 + "@material/menu": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/select": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 46f7672357e85b6e85123e42b3b8e788a5310e3753eac0652497c8876b6ec84f8eff93ba770835e34d91be3b51ad364790a9af502b6a3ff7a336e52654e5d780 + checksum: 0822a9d714939656ce0af7fbac5941bfcab750ad6ac83a84863ef4c85288058a6dcbad4b25c6c5c20f8c3cc5beb24138232122c5267bc4ca0bc0c49eae1b44b4 languageName: node linkType: hard -"@material/dialog@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/dialog@npm:14.0.0-canary.261f2db59.0" +"@material/density@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/density@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/button": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/icon-button": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/tokens": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 tslib: ^2.1.0 - checksum: 091e0dcdd7c304acaeb3ade05291e699bc047ae953c90fc0e5f0ad03258a014c7723676ef5ad788a00470bd05ea6730a74240f51c0f0cb81fbadfea38bc701c3 + checksum: a23f00edfe649013a6f4fa0bb18406d346a00388d30d724fabedd208178f53210e0d7f6e676b5636dbd54257ded7cddc71104ae5f931c5bd8d7c2fa8919cc611 + languageName: node + linkType: hard + +"@material/dialog@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/dialog@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/button": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/icon-button": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: c1a498b81a315f5cafb6104ce0571d951893b8eeb5a3eab1c964cf3fca309bae85d64aa18cf2ce013925838a479536fe4a76b5cf58571b8293a7d78ac63539e4 languageName: node linkType: hard @@ -2146,37 +2167,47 @@ __metadata: languageName: node linkType: hard -"@material/drawer@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/drawer@npm:14.0.0-canary.261f2db59.0" +"@material/dom@npm:14.0.0-canary.53b3cad2f.0, @material/dom@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/dom@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/list": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 92146c61e00220f7aab80e3631c752e11147bee22e4a09e7bac21d233ae0aeff9545efe4d4a0fb10e889161ba06433ce9222bdcfda73de3ea54027cdadb3571a + checksum: f5817f76dd2bed58dbbc3c13678b25d8b25b73e199bff92bb7ef57677afd71fe084c6c4b26fa82645a585b77ac86458455170cfb4e44389e7cbc9c8a664f0533 languageName: node linkType: hard -"@material/elevation@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/elevation@npm:14.0.0-canary.261f2db59.0" +"@material/drawer@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/drawer@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/list": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: b193d96b39538d23e54116c65efe2ad8459250ba59d102360b6499a39a999993cda3d3711ba02c2dba6ef44a731cfe13391a754adf36be7c1aeb77d62f788401 + checksum: 46757e34096792b4f02f84a80b56be9c4907bbc2589ea21508031c3434f58b8ae0144c4d9329102c1a72a18747fe51b2cb1a129772d0fe78135fde89d8d21582 + languageName: node + linkType: hard + +"@material/elevation@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/elevation@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: 2f8945c7b64cc2b6f9786e17ecddf3edcb9e5b4dd11e8bd451be57aaf439c755864ee09c3f62c671cb52d128d50f5da0a1f817a40d4d0b573915343d4505a238 languageName: node linkType: hard @@ -2189,131 +2220,154 @@ __metadata: languageName: node linkType: hard -"@material/floating-label@npm:14.0.0-canary.261f2db59.0, @material/floating-label@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/floating-label@npm:14.0.0-canary.261f2db59.0" +"@material/feature-targeting@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/feature-targeting@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 tslib: ^2.1.0 - checksum: a01c0ca77154a93031b6838aa7b40dfee683b202893f9df0eabd77214b655510f66ac37fa48af73e72d17b0cf2b0e99c764084f6e9b8236b61f157b436a39102 + checksum: e7a1ed68f9d7685940849abaea5e66eb6ba51b142dadd63f0ba15fcece9ae0f0439939ebf7eac83ed1ac546adb04a7d3cb1952c55bc7a75ce33e9d8485d5ff37 languageName: node linkType: hard -"@material/form-field@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/form-field@npm:14.0.0-canary.261f2db59.0" +"@material/floating-label@npm:14.0.0-canary.53b3cad2f.0, @material/floating-label@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/floating-label@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 6ecd0dfc523f01d93dda4e354d967de42b66f212970980e12fc378ed2251cd3bcc88aee35be844e3a9db76a932c576af315eceac52edcb69a72f6c50d985c209 + checksum: 5295dc481d5fb6040b6ee44afdbba0141cbe1d65f2365c8ea9b215748118ebfdc4f9b73d481a28137b5625598540f52ae369cd8b9fc7321f27a399960c833de7 languageName: node linkType: hard -"@material/icon-button@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/icon-button@npm:14.0.0-canary.261f2db59.0" +"@material/focus-ring@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/focus-ring@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 - tslib: ^2.1.0 - checksum: 3981f52e17af1e93f0b6f3bb65d82bb6f4d378052333239317cddecde1e7c9ccd1e46af969b71350bceb600140ee23dfabce1da3c3ea75ccb59d37040fa9556f + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + checksum: 92273b1247705d8d6e2e435c2e7a30dc74be02c2a5af89ac546542ae39f26c8a49c68bcce846948342ac55ed1b4b2288750b9f8afb63de9415834a52310de29b languageName: node linkType: hard -"@material/line-ripple@npm:14.0.0-canary.261f2db59.0, @material/line-ripple@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/line-ripple@npm:14.0.0-canary.261f2db59.0" +"@material/form-field@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/form-field@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: a74972753e6ad5556d07a2ed515f776161fcdc8f2c2bdac7e2a96e4472bbd80b8a3152fefdff198b024973e2c3b69691ce8d9a0d3b9d7e972bfa2d77d26969e3 + checksum: d5538d3784e5df5ecae75f776db4dd061c3f3fef5f54af7d835e36bb4ac733544d0971faeb99c6d1573d22a2a5eb3cd7a1459a064d54f08764ce6ba7c8df5bd5 languageName: node linkType: hard -"@material/linear-progress@npm:14.0.0-canary.261f2db59.0, @material/linear-progress@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/linear-progress@npm:14.0.0-canary.261f2db59.0" +"@material/icon-button@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/icon-button@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/progress-indicator": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 6fdb8112ac9dda2ce5225888ff9a6c0f312d34cd6069d8754544da511f6eca8afd88a90f23cffe52bb1880062b4e492aed2c50430e058eb025bbb94521fb2389 + checksum: 19b51665f29e01f267163b1ddbef1fd3bb20ab884b829c89d147a54f29711e2df07ac3e41a0c1128ada307c40862332f7286ee6d68dbddf9da55b99ec0d04dad languageName: node linkType: hard -"@material/list@npm:14.0.0-canary.261f2db59.0, @material/list@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/list@npm:14.0.0-canary.261f2db59.0" +"@material/line-ripple@npm:14.0.0-canary.53b3cad2f.0, @material/line-ripple@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/line-ripple@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: fc6864169d49dab2eeaed1bdf9d7fb137fb4840a480450ad6423a962e962c7f3e3dcf9ca4c1c871cdbfc3cfbb873a04461cab2866b9ea60f5b296e935ab7695b + checksum: 65189614872fa11e6bb293c92f37f3543c1baac553bd35bff13e3d1c7d4192b78d5d682e470c2af1c9472844c4ec92397843e400e76c58ed5bb3eb6f69070bf5 languageName: node linkType: hard -"@material/menu-surface@npm:14.0.0-canary.261f2db59.0, @material/menu-surface@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/menu-surface@npm:14.0.0-canary.261f2db59.0" +"@material/linear-progress@npm:14.0.0-canary.53b3cad2f.0, @material/linear-progress@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/linear-progress@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/progress-indicator": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: f4bdf8d13e2533ae1cfc0ae0c7e6c50b2b4c44478ddabf05b80e3d3e9768b07c71441887c13fd02c00e932ad3f16acc6a7a017cb8e18e587f59030ef9826e2d1 + checksum: f2e9bc0a2ec6e360955346cfa72612bf8aef04cf0e0e2f264eab9e190e78c790c470630865ff29a01bbdc308692a1d0c6c5fba45ed4a1baa74a12f7a5ffc5507 languageName: node linkType: hard -"@material/menu@npm:14.0.0-canary.261f2db59.0, @material/menu@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/menu@npm:14.0.0-canary.261f2db59.0" +"@material/list@npm:14.0.0-canary.53b3cad2f.0, @material/list@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/list@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/list": 14.0.0-canary.261f2db59.0 - "@material/menu-surface": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 2c1ee36931096dcf39638ac5286d2695a012fdd51c99f0fd7375097e1ec1f3a612fb8eced5b46f48a58f53f4490839d04fdd858eccce8432966ade8f2225c9ae + checksum: 6c977f518d8869b9a4bb6cf498dabb2d45179048cc529f5358365229a851b715ded99b341161b6500f9c472c0d1506f44e5ea57b10f90084d63107616d626cf2 + languageName: node + linkType: hard + +"@material/menu-surface@npm:14.0.0-canary.53b3cad2f.0, @material/menu-surface@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/menu-surface@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: ad48e168caaaa0a586bf339bd27ed882a51e57809ecdb680bc92da323daf085b46077994a3205513e176232c802e3b877ceec0999fa422c00a36d9bea90b1772 + languageName: node + linkType: hard + +"@material/menu@npm:14.0.0-canary.53b3cad2f.0, @material/menu@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/menu@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/list": 14.0.0-canary.53b3cad2f.0 + "@material/menu-surface": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: 71b6a1f4dd31c521bd494168e14d12a42626b52db28ca27dcd3a3aefad5806263a1105210c920bb694fc2933d881ff6145cf1493a455d968077725a6cfe49d78 languageName: node linkType: hard @@ -2330,7 +2384,19 @@ __metadata: languageName: node linkType: hard -"@material/mwc-button@npm:0.25.3, @material/mwc-button@npm:^0.25.3": +"@material/mwc-base@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-base@npm:0.27.0" + dependencies: + "@material/base": =14.0.0-canary.53b3cad2f.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + lit: ^2.0.0 + tslib: ^2.0.1 + checksum: 07af17edfc7d6a9e2e4dc471b02792deccb6ddb28b09177202807c58aa165baebad4619c545995f8589a001ca24dc4f3fc1443a6d384f6390d092d3fa0fe7e7a + languageName: node + linkType: hard + +"@material/mwc-button@npm:^0.25.3": version: 0.25.3 resolution: "@material/mwc-button@npm:0.25.3" dependencies: @@ -2342,114 +2408,115 @@ __metadata: languageName: node linkType: hard -"@material/mwc-checkbox@npm:0.25.3, @material/mwc-checkbox@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-checkbox@npm:0.25.3" +"@material/mwc-button@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-button@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 + "@material/mwc-icon": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: a93fd4a05004c8e0be907038c2782eea54274eab98cf2a6da569bc16d0177dabe2714f50ab478ba72091be7e863c0837662701e648f4f2d76be9318f7b6ccc51 + checksum: 2ef5cc09515540ada2b132ff614e894ad9f184790b6ae5c4254ce39383b6c16bbf3e823f945e4e57bd93597992469c40a3be4eca40f7bc08cd13f7bcf8abf9b2 languageName: node linkType: hard -"@material/mwc-circular-progress@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-circular-progress@npm:0.25.3" +"@material/mwc-checkbox@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-checkbox@npm:0.27.0" dependencies: - "@material/circular-progress": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/theme": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 1298514d631e095aee3f6f54d10cab55b9985b754d25744d8737ac5cf5d645e134eb3aac8cf56283a4c8808db5164cf3e213f3a66c10efca1205387bf603c4dd + checksum: ba53a6ea8ca7d8729f1e3abd5d5ba52573e73e84725c57fe1033d278f4413d41a78fb352603afafac71c8fe5b352b80698887869052c5b971c10bb2b20ba8b3a languageName: node linkType: hard -"@material/mwc-dialog@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-dialog@npm:0.25.3" +"@material/mwc-circular-progress@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-circular-progress@npm:0.27.0" dependencies: - "@material/dialog": =14.0.0-canary.261f2db59.0 - "@material/dom": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-button": ^0.25.3 + "@material/circular-progress": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/theme": =14.0.0-canary.53b3cad2f.0 + lit: ^2.0.0 + tslib: ^2.0.1 + checksum: 947606ba8e3c50a873d7470c465510fcaa7722ac4b512144f754ee03783f54a35d262d2693865ed7851795109f0dd15f928c3647e97dad42fe286977630ba217 + languageName: node + linkType: hard + +"@material/mwc-dialog@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-dialog@npm:0.27.0" + dependencies: + "@material/dialog": =14.0.0-canary.53b3cad2f.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-button": ^0.27.0 blocking-elements: ^0.1.0 lit: ^2.0.0 tslib: ^2.0.1 wicg-inert: ^3.0.0 - checksum: f9df62861ee81c010d7e5b0fcb7b18df1896a6ff60f4e00eca5a8f153da47ca4dd500bf97a727b06b3324a5d7afe738b6ce5604b605a51013afa5ebdbfa1e9a0 + checksum: ffab528e8e32b1097bae77692d02504c4583665eb7d9ebd149e50a9e2a89cfd46ecb3acaaba1953294565ffdd2ffbf5b4bf351dacc6cb26539d0d6c64cdd43a2 languageName: node linkType: hard -"@material/mwc-drawer@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-drawer@npm:0.25.3" +"@material/mwc-drawer@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-drawer@npm:0.27.0" dependencies: - "@material/drawer": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 + "@material/drawer": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 blocking-elements: ^0.1.0 lit: ^2.0.0 tslib: ^2.0.1 wicg-inert: ^3.0.0 - checksum: 1195301cd943c1f7dae92ef33c383f5a2c3238d26fa44dd006d3c90d1c101cf17a5e67e491ef6ec49889a5cef682ea2f410397ac76be556cde1c8cb79f06874d + checksum: 422cca9743a55a360bdfc35cb67eb9cdc67d07628597b24be3f6da03e7b0c9667fc09cb2afa8426354e873d5eeb8c5950658b1e6617fcf9348fb514b65f36e6d languageName: node linkType: hard -"@material/mwc-fab@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-fab@npm:0.25.3" +"@material/mwc-fab@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-fab@npm:0.27.0" dependencies: - "@material/mwc-ripple": ^0.25.3 + "@material/mwc-ripple": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: d8ff3494755fccb4f62c1bc81194d262b7a99d49a17494531948d3119f76d6c8141b296a8bcd9d84a4453ca94e311e781edba7217e4832298d9bdac1a79ea218 + checksum: 86c68a6c0b3a14c141e7409c9d82b0d2a88b89c102d9b71691f2f8da62c2cceef649fcc275054cca3adfd69c0f98be098f6053a9b97abf2ce64216b83ae258b8 languageName: node linkType: hard -"@material/mwc-floating-label@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-floating-label@npm:0.25.3" +"@material/mwc-floating-label@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-floating-label@npm:0.27.0" dependencies: - "@material/floating-label": =14.0.0-canary.261f2db59.0 + "@material/floating-label": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 6b1237ef08ae8b560ee69a6d23e0bce5c514a88852c996805f7891d64af70d33ed35acb307ba8875695eed9c48f98060bb31250c43862d9406905846521b9464 + checksum: fbbf4f2e42b43426d888ce955620bb35f4f11a11a7f683e59010db1d4cfe083260e8880809aa23ff8e6532708e4170d511da103a0081c92b211d579139bef590 languageName: node linkType: hard -"@material/mwc-formfield@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-formfield@npm:0.25.3" +"@material/mwc-formfield@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-formfield@npm:0.27.0" dependencies: - "@material/form-field": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 + "@material/form-field": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 8b66d084555f0a1772c81dbc700725d28626e01858012f4e45c07f1fd60722605c7b94c474927b6502c62a975fcab950e4ca63f80bb1f45c72e48a7abcd312cd + checksum: fc380ff86be4b5756bb7ac3098be3048f99b3bfede2391422c45dbb0b89e4e389b713e76681805361350e07deec544804b8477efe1616d0c200739dd3d66fe89 languageName: node linkType: hard -"@material/mwc-icon-button@0.25.3": - version: 0.25.3 - resolution: "@material/mwc-icon-button@npm:0.25.3" +"@material/mwc-icon-button@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-icon-button@npm:0.27.0" dependencies: - "@material/mwc-ripple": ^0.25.3 + "@material/mwc-ripple": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: f756099514838e82502034abce196941b9ab43a70cefb39295385a12416557f6d68c316a036d7e79cf222aee74d9fa26572b371558cb6a88ff2c1b6f4bee1da5 - languageName: node - linkType: hard - -"@material/mwc-icon-button@patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch::locator=home-assistant-frontend%40workspace%3A.": - version: 0.25.3 - resolution: "@material/mwc-icon-button@patch:@material/mwc-icon-button@npm%3A0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch::version=0.25.3&hash=3f41c5&locator=home-assistant-frontend%40workspace%3A." - dependencies: - "@material/mwc-ripple": ^0.25.3 - lit: ^2.0.0 - tslib: ^2.0.1 - checksum: 56372d03512f9e627d3d605f2ad696fcbcfa6e0aaf922b0fb0904f653eade798cdd949984b325d3c7598bf6ebf922daf4bcaddec192b9eae23a41ac7f9f7b563 + checksum: 7315c0735ba40559d447297e81960b39ad94e86436a2360b7123ea2b70d70ece391b106d1564964f522c75e1f6e73c1133fc76f621a9909b2d1d9f097a5fd22c languageName: node linkType: hard @@ -2463,89 +2530,99 @@ __metadata: languageName: node linkType: hard -"@material/mwc-line-ripple@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-line-ripple@npm:0.25.3" +"@material/mwc-icon@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-icon@npm:0.27.0" dependencies: - "@material/line-ripple": =14.0.0-canary.261f2db59.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: d452551a1988d8f56b6c5fa2cecaaf543cad2f8317945afe82347d0563e99c16a893c190850cab2ff6d5c435dfe302804bb3037a2fc4d26b8fc27cbce35b57dd + checksum: 6dfa5115d5369fdf6062316e4b1238c588a515f212c573ef1bb162f92b67e22cd8ddd75ecde33eb7090e8d61cfea0da3ab18b1c311bdd0a03f19955e6121ba7d languageName: node linkType: hard -"@material/mwc-linear-progress@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-linear-progress@npm:0.25.3" +"@material/mwc-line-ripple@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-line-ripple@npm:0.27.0" dependencies: - "@material/linear-progress": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/theme": =14.0.0-canary.261f2db59.0 + "@material/line-ripple": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: a825a91e5b48cad41af80b773c4d3dbc09757c5450c827a6061b26db8e27db68e7fa49d6cefcf7389c0ce9949aca698bd05dc935126932647e4d39a43a89d71c + checksum: 6862ede0f4aa03f5d079a92e3b3d29703bca6630f7c100da9d36dfee441dc59cddaee5a14bb670a5190ba32b15a81e10a9857ae39c76da10b710b53df84c393a languageName: node linkType: hard -"@material/mwc-list@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-list@npm:0.25.3" +"@material/mwc-linear-progress@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-linear-progress@npm:0.27.0" dependencies: - "@material/base": =14.0.0-canary.261f2db59.0 - "@material/dom": =14.0.0-canary.261f2db59.0 - "@material/list": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-checkbox": ^0.25.3 - "@material/mwc-radio": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 + "@material/linear-progress": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/theme": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 88c4d7a8dc8190c9e80b20ee0a3a1f26253fda24327e159987dbe4564494ec7f355295a980eb538e51e4ec2242a278ca40cb1339d4d1b8d8dc6e369872d8e847 + checksum: 485e847ff996eff8627dccf48c7fc3494e84d75677a8bb5f65a9b95da06a3e27f95c3d0e658fe6ad60c6591e3b89bd7cfaf4d90e0cccffe6fec65f7bf66f92f2 languageName: node linkType: hard -"@material/mwc-menu@npm:0.25.3, @material/mwc-menu@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-menu@npm:0.25.3" +"@material/mwc-list@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-list@npm:0.27.0" dependencies: - "@material/menu": =14.0.0-canary.261f2db59.0 - "@material/menu-surface": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-list": ^0.25.3 - "@material/shape": =14.0.0-canary.261f2db59.0 - "@material/theme": =14.0.0-canary.261f2db59.0 + "@material/base": =14.0.0-canary.53b3cad2f.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/list": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-checkbox": ^0.27.0 + "@material/mwc-radio": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: f355b343c34e3798c3ce1f80c64c6b628e1b0d290f4acd82c674041fa9107860ba9d493ac8715c1c05ea0a198ea5a8a66d197b0297ebd690b2d89714e7def508 + checksum: 6c2ae4f1c6300d8fa7a09c132c265c9c6e3955a36599eec384c69537c4bd988f40ea3bafc045ed06bb1ea4f4513429e06810d079dd0f97c1e4e32a73f9a8c63e languageName: node linkType: hard -"@material/mwc-notched-outline@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-notched-outline@npm:0.25.3" +"@material/mwc-menu@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-menu@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/notched-outline": =14.0.0-canary.261f2db59.0 + "@material/menu": =14.0.0-canary.53b3cad2f.0 + "@material/menu-surface": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-list": ^0.27.0 + "@material/shape": =14.0.0-canary.53b3cad2f.0 + "@material/theme": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: f039b87e8e227d9522fc0dd14b1a8296fa8aeefaaac3b077cb834f774936c106a50ba519ed284673ec99adf627a22710c42a64119d5bf0e52f7c85b9f2cc75d6 + checksum: 126f733659f6881a65c99acded299f7da9cdcd19ef464676a1d335c9144e5ff590d668c6f33bec8033b30d47826de37b6fb60589d7eec7364ce9f332de9d7755 languageName: node linkType: hard -"@material/mwc-radio@npm:0.25.3, @material/mwc-radio@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-radio@npm:0.25.3" +"@material/mwc-notched-outline@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-notched-outline@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 - "@material/radio": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/notched-outline": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: edb97d317f94cfd18a5868cdf2ed2f246edfe8ece519a225f8bc3912d2106c0d554bf387a60ef329ed8b9839f3f425d40db96ad5bc156ae3ea4a46a4e211519d + checksum: 2739032f76f3f24bb3e578dc6949ae153c2e7009a9c920927aa4b255b58a1a42362c8321c02a31d8db8e613c53b7074a5314191cf58f7b22eee71b08d14294d5 languageName: node linkType: hard -"@material/mwc-ripple@npm:0.25.3, @material/mwc-ripple@npm:^0.25.3": +"@material/mwc-radio@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-radio@npm:0.27.0" + dependencies: + "@material/mwc-base": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 + "@material/radio": =14.0.0-canary.53b3cad2f.0 + lit: ^2.0.0 + tslib: ^2.0.1 + checksum: 0b0a0a6b99f869c68bbd9c2cc66cc7e47ac6dfb276e012cc1fd04a50622a8f340b9582ee818aeff93adf7e1c3732b5e3b73011a28a505377f24af5c928c295a9 + languageName: node + linkType: hard + +"@material/mwc-ripple@npm:^0.25.3": version: 0.25.3 resolution: "@material/mwc-ripple@npm:0.25.3" dependencies: @@ -2558,204 +2635,233 @@ __metadata: languageName: node linkType: hard -"@material/mwc-select@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-select@npm:0.25.3" +"@material/mwc-ripple@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-ripple@npm:0.27.0" dependencies: - "@material/dom": =14.0.0-canary.261f2db59.0 - "@material/floating-label": =14.0.0-canary.261f2db59.0 - "@material/line-ripple": =14.0.0-canary.261f2db59.0 - "@material/list": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-floating-label": ^0.25.3 - "@material/mwc-icon": ^0.25.3 - "@material/mwc-line-ripple": ^0.25.3 - "@material/mwc-list": ^0.25.3 - "@material/mwc-menu": ^0.25.3 - "@material/mwc-notched-outline": ^0.25.3 - "@material/select": =14.0.0-canary.261f2db59.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/ripple": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 7a32daf2f7657f40f2ac9717dab616942d6c6b66c77adce66db23096d76331d140c255cba5735084ef415801fb5e2a4c805ca7f876379249a85d77e53c77feb5 + checksum: 9cd73fdfe46f92b97991323489cea644d9d7b1dccb94145ee3398b73ef540d99a9253664690779714d070312c8aec513d562a395fdb1d8033d75b66b6d26bdd7 languageName: node linkType: hard -"@material/mwc-slider@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-slider@npm:0.25.3" +"@material/mwc-select@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-select@npm:0.27.0" dependencies: - "@material/dom": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 - "@material/slider": =14.0.0-canary.261f2db59.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/floating-label": =14.0.0-canary.53b3cad2f.0 + "@material/line-ripple": =14.0.0-canary.53b3cad2f.0 + "@material/list": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-floating-label": ^0.27.0 + "@material/mwc-icon": ^0.27.0 + "@material/mwc-line-ripple": ^0.27.0 + "@material/mwc-list": ^0.27.0 + "@material/mwc-menu": ^0.27.0 + "@material/mwc-notched-outline": ^0.27.0 + "@material/select": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 70950729f2ee4724024f3e04ca4890b844087e793318841c8e98993350c839106ed6efdd4b68c2bf2058d4e439001969b188721f051fde67050d1d27bcfa6c32 + checksum: d82f0b870f76cd569a83bc86b078cb1a88ba3bef2d501f99a74e3a587013b849b4f1e9a04027ad68889953993de06927ff4d2ac11ca6d0f88f634000342088f1 languageName: node linkType: hard -"@material/mwc-switch@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-switch@npm:0.25.3" +"@material/mwc-slider@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-slider@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 - "@material/switch": =14.0.0-canary.261f2db59.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 + "@material/slider": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 658ac57eba792cb3d7f03e174dc4e9b0572a884896a9926cee831e9898510480501140cdb37a6b2a07394aaef527ef8524813e4da82eb20c4cb3789651eadab7 + checksum: 0e7f9d0d418731fb9ba1ffe99cc88e79a4116e92d048476dc24fa87688f13335945fcdc9fef6d6f699e0c6b16fea5ed7527f71193bcf1365177e7ba7a865b140 languageName: node linkType: hard -"@material/mwc-tab-bar@npm:0.25.3": - version: 0.25.3 - resolution: "@material/mwc-tab-bar@npm:0.25.3" +"@material/mwc-switch@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-switch@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-tab": ^0.25.3 - "@material/mwc-tab-scroller": ^0.25.3 - "@material/tab": =14.0.0-canary.261f2db59.0 - "@material/tab-bar": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 + "@material/switch": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: a67aa000290e70018b105547d2119357f2c73a1f5f0589c918396ca6043558862edf722ba05542556cefd85ef66e239bdd025433069efd322e36c595e665afdc + checksum: edf2e9ae29c0c07b7bcd6d3e05697e308bb996748968d8a4a5fd622f2b04d2f4713412e1ac7cbf0be018da88243c8785f6c1b0185028027a89b0b4dddc6ed847 languageName: node linkType: hard -"@material/mwc-tab-indicator@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-tab-indicator@npm:0.25.3" +"@material/mwc-tab-bar@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-tab-bar@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/tab-indicator": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-tab": ^0.27.0 + "@material/mwc-tab-scroller": ^0.27.0 + "@material/tab": =14.0.0-canary.53b3cad2f.0 + "@material/tab-bar": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 4f8b31428b2aa1f26159ba67a5c9b2b31dd0f09ba12a43c1fdd8bb72eda073f69b83037533a02e4f9ee684ff7d2b08e4d023c909ee23e0c0fd5ea0f638e36b14 + checksum: c36ea2ebee72d1ff4c93cf6eb7eff051af0bfb5b9660333feb5594471f5c3c6a25870698f27c1e9972bce48de03d176070f8c74ffd937022fd7553f49442a1dc languageName: node linkType: hard -"@material/mwc-tab-scroller@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-tab-scroller@npm:0.25.3" +"@material/mwc-tab-indicator@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-tab-indicator@npm:0.27.0" dependencies: - "@material/dom": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/tab-scroller": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/tab-indicator": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 76ad9c249386da63135614abd4f3618bc516af9c01f46b2b43fe18167075983c701b461d8b741fdb0e1cbd7ad97b5b69b6760f01af0562464c57eff40a6bf5f4 + checksum: 8304f18cea0e043ecacfb3dba245f1c9b7d0aa6da1d36b29168f7e43af5313091b42e297c72e2bbd40e7eed219905a93eb38e7e8b0df6411104c5a1064d4b126 languageName: node linkType: hard -"@material/mwc-tab@npm:0.25.3, @material/mwc-tab@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-tab@npm:0.25.3" +"@material/mwc-tab-scroller@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-tab-scroller@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-ripple": ^0.25.3 - "@material/mwc-tab-indicator": ^0.25.3 - "@material/tab": =14.0.0-canary.261f2db59.0 + "@material/dom": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/tab-scroller": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: bb26cf81121ca23695329c09f27bab3d10b8878b5c5c6bf1d15ee5c2798faee3f984f5e98650f1d0343340f5e86fc948576d9e1b694c58f347fbb3d2a6f0c706 + checksum: e3746bfe6dc55219774372b055c54a49d0aba0dffdff1059a6d8fd7e4e95103f9c7ad3208b430b0c1ae43215c60c06d3dfed6286b84b2f62868c0917f1be7db7 languageName: node linkType: hard -"@material/mwc-textarea@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-textarea@npm:0.25.3" +"@material/mwc-tab@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-tab@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/mwc-textfield": ^0.25.3 + "@material/mwc-base": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 + "@material/mwc-tab-indicator": ^0.27.0 + "@material/tab": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 918e28b72f7c687c481cd9ee00f652cd6c212d37cd281197cb02c87f04153792c5a60a86276e82f44684e7c7b4947e0e2e5fceaa08fc075a030ea769c1501d8e + checksum: ee3652935d3e509522a689e43a2ad3cab34bc233993d34e7b88da86356812f8ac7ce164d6461bab74f57bd35b0e6217bb41c87a9d1ed10d86c6e10eba9e33c27 languageName: node linkType: hard -"@material/mwc-textfield@npm:0.25.3, @material/mwc-textfield@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-textfield@npm:0.25.3" +"@material/mwc-textarea@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-textarea@npm:0.27.0" dependencies: - "@material/floating-label": =14.0.0-canary.261f2db59.0 - "@material/line-ripple": =14.0.0-canary.261f2db59.0 - "@material/mwc-base": ^0.25.3 - "@material/mwc-floating-label": ^0.25.3 - "@material/mwc-line-ripple": ^0.25.3 - "@material/mwc-notched-outline": ^0.25.3 - "@material/textfield": =14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-textfield": ^0.27.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: 6877213e5ac38a2c94574462f7a21d38a1be9d7efe686dcce96fd341c4709768bf604ced00eafede2b6be532ee87e99182d1f617378d0492d6b0df84a9711db7 + checksum: 709164b0b7c1fee4f451e013ccebf3992c449aabbbfb0a4b2108cc7b92ff1c4a04b218fef56e0b53c4b561072136c014254ec457fd1a75ce68ca5d864064c1cd languageName: node linkType: hard -"@material/mwc-top-app-bar-fixed@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-top-app-bar-fixed@npm:0.25.3" +"@material/mwc-textfield@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-textfield@npm:0.27.0" dependencies: - "@material/mwc-top-app-bar": ^0.25.3 - "@material/top-app-bar": =14.0.0-canary.261f2db59.0 + "@material/floating-label": =14.0.0-canary.53b3cad2f.0 + "@material/line-ripple": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-base": ^0.27.0 + "@material/mwc-floating-label": ^0.27.0 + "@material/mwc-line-ripple": ^0.27.0 + "@material/mwc-notched-outline": ^0.27.0 + "@material/textfield": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: f142b0625b0b5bd9335b43db977a20502da49707415c69bb8df8ba3626f81cc4c8283aeeece6f20d3a401f370b33ac88a41ebdcaa04fe90d5b2067142b1c460c + checksum: 978c893aca5ef71b874a82ce6dc5088775a39a5ac5dd4a6b6ef49181b7654b0aeb16fe4a6dec4db51f1a0c9f1b1198fa8867bc75deb5acd75a73ed766f07781d languageName: node linkType: hard -"@material/mwc-top-app-bar@npm:^0.25.3": - version: 0.25.3 - resolution: "@material/mwc-top-app-bar@npm:0.25.3" +"@material/mwc-top-app-bar-fixed@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-top-app-bar-fixed@npm:0.27.0" dependencies: - "@material/mwc-base": ^0.25.3 - "@material/top-app-bar": =14.0.0-canary.261f2db59.0 + "@material/mwc-top-app-bar": ^0.27.0 + "@material/top-app-bar": =14.0.0-canary.53b3cad2f.0 lit: ^2.0.0 tslib: ^2.0.1 - checksum: c71ad8f557232827bab4b0cdf69fc3aa8caa9aa84193a9b085d3504c7d5c7a8d1e17aab7ebcf84cd0983e2ada8c88cc28de3f1d3a824c0b4fb9ce2ba96b48912 + checksum: 41f6aba9dc45a3cce631a580de86e451d254bf3c113727b27a32da0245b0801743e50d1d0d0c28b04875756c31d8bff097162aae4f63519574118b94c8cf7854 languageName: node linkType: hard -"@material/notched-outline@npm:14.0.0-canary.261f2db59.0, @material/notched-outline@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/notched-outline@npm:14.0.0-canary.261f2db59.0" +"@material/mwc-top-app-bar@npm:^0.27.0": + version: 0.27.0 + resolution: "@material/mwc-top-app-bar@npm:0.27.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/floating-label": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/mwc-base": ^0.27.0 + "@material/top-app-bar": =14.0.0-canary.53b3cad2f.0 + lit: ^2.0.0 + tslib: ^2.0.1 + checksum: 630e5f0168e96979ccb09cbb89a9e29f7faad094ed2460911b128995d325b31f7b0c40bc512fa216efe8d244e1a2efdc17cb024c7da9a1c3149686297608a060 + languageName: node + linkType: hard + +"@material/notched-outline@npm:14.0.0-canary.53b3cad2f.0, @material/notched-outline@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/notched-outline@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/floating-label": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 364b81f6b25b1b703661680c0cf2c7018a384e0c67169a4259d8ca9f36335931f7abc2bfaa53e81d7676313040d8ff3a5832e7b5144b75fc1bc7d0fc14ceeb4d + checksum: 1a9f8db4d80ff7411fda14c63fdf180669a187f8113616a529c90895481771a12cadc6be054f0d2e94d7b38c4504a085af9433b1d3d62474fd4e48d36efc82e7 languageName: node linkType: hard -"@material/progress-indicator@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/progress-indicator@npm:14.0.0-canary.261f2db59.0" +"@material/progress-indicator@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/progress-indicator@npm:14.0.0-canary.53b3cad2f.0" dependencies: tslib: ^2.1.0 - checksum: 3561b26ce0437bf73c40a172eda97e7361a26befb615b60388306de4002e709b93015f825b0da31037f1c690281f3f193c3ffcaead4b5b0371aac4d1c347197b + checksum: 9b627a1cb2bce91cae43b17f361c5148cceb84ba58ddd22d7f8bfa7904fa68ed977181a7f361acb3d493dc9a206270de3449531ea77ca9e2f8ca449fce64f2be languageName: node linkType: hard -"@material/radio@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/radio@npm:14.0.0-canary.261f2db59.0" +"@material/radio@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/radio@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/touch-target": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/touch-target": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: a7f89f0c151acf3b81f2d92bb6b451471ad3a3eadf526b8c1a14dbbf969e020679b1a1c7958d8354044e4e542370fbe3e55213883091288387123af5569dae0e + checksum: 898554f2b37a36c5daf7716cef4d26272cf7d668cbedd51c5d0805901754d7ee83b45ce67a4e9a67941efc04f0e5c58f6ebc82736ef4f1631a5799be06877c92 languageName: node linkType: hard -"@material/ripple@npm:14.0.0-canary.261f2db59.0, @material/ripple@npm:=14.0.0-canary.261f2db59.0": +"@material/ripple@npm:14.0.0-canary.53b3cad2f.0, @material/ripple@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/ripple@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: 08b71917e237803bd75de147018ee6fe321e84d13cfa8d7e0f5aa391b54a7aea50d9005f12d26692331affba676cf4b7de987ca7dc234f87f5ae25d72f80b9cd + languageName: node + linkType: hard + +"@material/ripple@npm:=14.0.0-canary.261f2db59.0": version: 14.0.0-canary.261f2db59.0 resolution: "@material/ripple@npm:14.0.0-canary.261f2db59.0" dependencies: @@ -2780,167 +2886,182 @@ __metadata: languageName: node linkType: hard -"@material/select@npm:14.0.0-canary.261f2db59.0, @material/select@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/select@npm:14.0.0-canary.261f2db59.0" +"@material/rtl@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/rtl@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/floating-label": 14.0.0-canary.261f2db59.0 - "@material/line-ripple": 14.0.0-canary.261f2db59.0 - "@material/list": 14.0.0-canary.261f2db59.0 - "@material/menu": 14.0.0-canary.261f2db59.0 - "@material/menu-surface": 14.0.0-canary.261f2db59.0 - "@material/notched-outline": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: a67169e6fa8388e4789c07672eae6b49011ac4bf7c582d6df32db27455501b6c28ebd1b2b45a3adc9c66e186149c735e8bf55d42ecaa6bf4d1e1517973a58611 + checksum: 3c1b8b48c675a7d5b119e4880f32a808d07f45ab7f358b439a04c69a75b7216e979b76aaee98033a39858b8cf25abb177eaf5550cdf063c423e8f6cc7b02ed09 languageName: node linkType: hard -"@material/shape@npm:14.0.0-canary.261f2db59.0, @material/shape@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/shape@npm:14.0.0-canary.261f2db59.0" +"@material/select@npm:14.0.0-canary.53b3cad2f.0, @material/select@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/select@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/floating-label": 14.0.0-canary.53b3cad2f.0 + "@material/line-ripple": 14.0.0-canary.53b3cad2f.0 + "@material/list": 14.0.0-canary.53b3cad2f.0 + "@material/menu": 14.0.0-canary.53b3cad2f.0 + "@material/menu-surface": 14.0.0-canary.53b3cad2f.0 + "@material/notched-outline": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 49086de104b256497bd7affeb3f66a09a3e1c35f7727a24846d2ff2a7860d970f044de6e2e995aa6ed886ea992fb5f258e5721bf8500633ec21eb5a5415d727f + checksum: 47e4dc35ce645c3b8f58dfb34dbdff6ba8102e17f1b94038cb733c80cca81cf11d890db67c80d3c66617a3374ce721a3e9cbaa9b762b6136c9ad9f16f7f87afc languageName: node linkType: hard -"@material/slider@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/slider@npm:14.0.0-canary.261f2db59.0" +"@material/shape@npm:14.0.0-canary.53b3cad2f.0, @material/shape@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/shape@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 37286fd9568acae0905eb10b48267e08ae8d024dd5009f3c3e1dfb7e41148d559a4e1e2fafca2e46edac0845ae21a4d0a5384ac9d296a241c35c69e89bf19097 + checksum: 6ad9b020c09e9ba402441d7b648f9c250e88f0243a6154d587c889b2d2312d1a13532bb0c7a1dc487193faa33ba8a5e4185cc6e156b8d5421bc71839be0306ad languageName: node linkType: hard -"@material/switch@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/switch@npm:14.0.0-canary.261f2db59.0" +"@material/slider@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/slider@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/tokens": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 84193bade4dc3ba9dd306c3cb79fcaa5dfe1f3ddb1a849840744412dc54934844519ac64e8efe9ddf44c5441efc79ee5a218e18de04f2d413ff3c45ebf70a76b + checksum: 136d6c6f77e4fa586ac375b5a108be06a394f0c55fbb10e73eaa990cd6cb38d2787e278911705571b5336402690e0b88b5fe9de9916704db948247a6b6b0c1fb languageName: node linkType: hard -"@material/tab-bar@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/tab-bar@npm:14.0.0-canary.261f2db59.0" +"@material/switch@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/switch@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/tab": 14.0.0-canary.261f2db59.0 - "@material/tab-indicator": 14.0.0-canary.261f2db59.0 - "@material/tab-scroller": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 858c06b712adab76b16761f6d7153479c51e65a3a7c2c364d4b6297cdaf33190f88751c9d7e0481fba1dc903dde6e5808853ddbc70ce703523660e0b1ff75513 + checksum: a5f2f5e5d5a25b71c80ff8841e3b875cb50dfabdfd53caa640ba13a7c5613f9a57e8bee5a87c6527b61fe6ca8bf53986720d42a04be7578b21c63b1d18877e43 languageName: node linkType: hard -"@material/tab-indicator@npm:14.0.0-canary.261f2db59.0, @material/tab-indicator@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/tab-indicator@npm:14.0.0-canary.261f2db59.0" +"@material/tab-bar@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/tab-bar@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/tab": 14.0.0-canary.53b3cad2f.0 + "@material/tab-indicator": 14.0.0-canary.53b3cad2f.0 + "@material/tab-scroller": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: f825df4f971051b216480ca44b6ed8f871e5f9943f3e1b5c94ff207b27121c76a025b0f558c8c02f3653389b7833f54590336a6563ec87e5275158512998e00a + checksum: 22861ae5aeae8e4239639ad0accedd2137b1feb26135ce9fa688b4c1df20f7699ff80cb508d5692b895de3721922268512e462a0231bf356074d2e5fccb6ba10 languageName: node linkType: hard -"@material/tab-scroller@npm:14.0.0-canary.261f2db59.0, @material/tab-scroller@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/tab-scroller@npm:14.0.0-canary.261f2db59.0" +"@material/tab-indicator@npm:14.0.0-canary.53b3cad2f.0, @material/tab-indicator@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/tab-indicator@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/tab": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: a2d93ba8955396e33a7076cff2c23627872c6a2049acca29e8b87a8fee2015edd5a4004f65683da2650d0143dc0ddf1454d9ce543d54af009a3a411ca850fdde + checksum: 1cea690899e1ba2513b8439edc3fb1e7ada1dc5a03b6551817b67b6ff07c0a4d9770473e87d1a29ccd6e6e9c5271a0702754b2f4d1ce6eed437c3d553d7e1eb3 languageName: node linkType: hard -"@material/tab@npm:14.0.0-canary.261f2db59.0, @material/tab@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/tab@npm:14.0.0-canary.261f2db59.0" +"@material/tab-scroller@npm:14.0.0-canary.53b3cad2f.0, @material/tab-scroller@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/tab-scroller@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/tab-indicator": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/tab": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: 19bf7d8398d5727486989552e97b7a3b500adc792254aa366e4da090d6164db82c19064579b2712efffbed7d6cc064f211cf3c7d909ce3e21ea2bd95ef320b08 + checksum: f3a801c397ffc6fc5811d4c33a2c135067ffd1f5ecc756b5315842b1ac81482cdaff7ebe2dbec5bc341f620031fb4206913a25d2f517c5003ebe1018c9bb3d24 languageName: node linkType: hard -"@material/textfield@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/textfield@npm:14.0.0-canary.261f2db59.0" +"@material/tab@npm:14.0.0-canary.53b3cad2f.0, @material/tab@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/tab@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/density": 14.0.0-canary.261f2db59.0 - "@material/dom": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/floating-label": 14.0.0-canary.261f2db59.0 - "@material/line-ripple": 14.0.0-canary.261f2db59.0 - "@material/notched-outline": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/focus-ring": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/tab-indicator": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: cf5556b1499bdeec2853fa245ebe76f5cfddab5234a02241552e856bcd94f59d0c9ae1fa540c78b01feb70be61cbefaf292ae6c9a57569fe74bce1336e00874b + checksum: 69e5822392c1c08506908a19fd6effd60477fdf88a937eaa3b26d85188979a643bee9ecd21e83181e9fd23c4899e406c566879dbfde839a58fad3c510c28b4d7 languageName: node linkType: hard -"@material/theme@npm:14.0.0-canary.261f2db59.0, @material/theme@npm:=14.0.0-canary.261f2db59.0": +"@material/textfield@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/textfield@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/density": 14.0.0-canary.53b3cad2f.0 + "@material/dom": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/floating-label": 14.0.0-canary.53b3cad2f.0 + "@material/line-ripple": 14.0.0-canary.53b3cad2f.0 + "@material/notched-outline": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/tokens": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: 7072e3c9dfa80c69659cdf16c687fdb0ca58c29eba47c966d1bebd90a70eeb6b068a0ec337cb4c26b09477561c72b66601280ccc47026a864afb9fb1877ca18d + languageName: node + linkType: hard + +"@material/theme@npm:14.0.0-canary.261f2db59.0": version: 14.0.0-canary.261f2db59.0 resolution: "@material/theme@npm:14.0.0-canary.261f2db59.0" dependencies: @@ -2950,52 +3071,62 @@ __metadata: languageName: node linkType: hard -"@material/tokens@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/tokens@npm:14.0.0-canary.261f2db59.0" +"@material/theme@npm:14.0.0-canary.53b3cad2f.0, @material/theme@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/theme@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/elevation": 14.0.0-canary.261f2db59.0 - checksum: 1ab953ae318b03ef866c8bcaa1d5ad7713721a1d034fd67d7a550661463c3557736d53d91ea1f0b0218ee7fcfb50a0c34f012176d7bfe921cc6bd02e93760ea7 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: fd44e929171863ceaafb991e289d893d5273c5262a234dfd85fc5d9ac7e6fc7e190631919ea309cdfcbf78317070fa7bda4782f4eaf9453eed942767bfd9086d languageName: node linkType: hard -"@material/top-app-bar@npm:14.0.0-canary.261f2db59.0, @material/top-app-bar@npm:=14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/top-app-bar@npm:14.0.0-canary.261f2db59.0" +"@material/tokens@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/tokens@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/animation": 14.0.0-canary.261f2db59.0 - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/elevation": 14.0.0-canary.261f2db59.0 - "@material/ripple": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 - "@material/shape": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 - "@material/typography": 14.0.0-canary.261f2db59.0 - tslib: ^2.1.0 - checksum: 2a7fb0fc37ce944b594abe26813a636c6eb51cf1fc949b456d2dfc5bc8b13f84da392f8c49860a19fc947aa1ab37894556243ea52153cb682762d03709665e83 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + checksum: efa909f86134ba10d668e52b9c39de48e8bc189b60004b49e6a23bf5b126e9c995acfd794885376955e7efc65d8f516cd73c58228d8ec5a82b26560718f65f26 languageName: node linkType: hard -"@material/touch-target@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/touch-target@npm:14.0.0-canary.261f2db59.0" +"@material/top-app-bar@npm:=14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/top-app-bar@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/base": 14.0.0-canary.261f2db59.0 - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/rtl": 14.0.0-canary.261f2db59.0 + "@material/animation": 14.0.0-canary.53b3cad2f.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/elevation": 14.0.0-canary.53b3cad2f.0 + "@material/ripple": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 + "@material/shape": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + "@material/typography": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: a9ecd0e6342012f524504130d5ca2d6d01d1e999540f815c93dea7288849e4ffe42e275568b586f2fdeb355c67a57a16839fc977329aab346e6c0ea711946135 + checksum: 97dc170f5e7b1d963e9b98fae940f928db42b3f7a401e67bbd6c2b4dca74841331f2aa3765ffbdc603257379326653369bdcdf36b73f6ed3ebf83cd7f685d871 languageName: node linkType: hard -"@material/typography@npm:14.0.0-canary.261f2db59.0": - version: 14.0.0-canary.261f2db59.0 - resolution: "@material/typography@npm:14.0.0-canary.261f2db59.0" +"@material/touch-target@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/touch-target@npm:14.0.0-canary.53b3cad2f.0" dependencies: - "@material/feature-targeting": 14.0.0-canary.261f2db59.0 - "@material/theme": 14.0.0-canary.261f2db59.0 + "@material/base": 14.0.0-canary.53b3cad2f.0 + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/rtl": 14.0.0-canary.53b3cad2f.0 tslib: ^2.1.0 - checksum: ab54b9440efca6ca93e57865033a45b6ea2dbbc4e6566c53cefdfe8d1553a2eb33261ebd3d0b386a16c5f36e388b576e2288512f0135a7ef355381b1242bbb5a + checksum: dbc13cbe7a67a599ffbbbf297c150f13e2b31c24287fdbe9231e6e4549ead5e55345d122f83fe89de712247de16377a694c09e90ff06c5cba500c098942a7355 + languageName: node + linkType: hard + +"@material/typography@npm:14.0.0-canary.53b3cad2f.0": + version: 14.0.0-canary.53b3cad2f.0 + resolution: "@material/typography@npm:14.0.0-canary.53b3cad2f.0" + dependencies: + "@material/feature-targeting": 14.0.0-canary.53b3cad2f.0 + "@material/theme": 14.0.0-canary.53b3cad2f.0 + tslib: ^2.1.0 + checksum: fa2671df40aded95794a0a899f1a2dcb73a84f4c8c78476028a1f09642164c9eac27cd43a41118c2772ac0f01fb5c7e06de6cfa54e474c715fc38f6514332978 languageName: node linkType: hard @@ -9317,30 +9448,30 @@ fsevents@^1.2.7: "@lezer/highlight": ^1.1.3 "@lit-labs/motion": ^1.0.2 "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch" - "@material/chips": 14.0.0-canary.261f2db59.0 - "@material/data-table": 14.0.0-canary.261f2db59.0 - "@material/mwc-button": 0.25.3 - "@material/mwc-checkbox": 0.25.3 - "@material/mwc-circular-progress": 0.25.3 - "@material/mwc-dialog": 0.25.3 - "@material/mwc-drawer": ^0.25.3 - "@material/mwc-fab": 0.25.3 - "@material/mwc-formfield": 0.25.3 - "@material/mwc-icon-button": "patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch" - "@material/mwc-linear-progress": 0.25.3 - "@material/mwc-list": ^0.25.3 - "@material/mwc-menu": 0.25.3 - "@material/mwc-radio": 0.25.3 - "@material/mwc-ripple": 0.25.3 - "@material/mwc-select": 0.25.3 - "@material/mwc-slider": 0.25.3 - "@material/mwc-switch": 0.25.3 - "@material/mwc-tab": 0.25.3 - "@material/mwc-tab-bar": 0.25.3 - "@material/mwc-textarea": ^0.25.3 - "@material/mwc-textfield": 0.25.3 - "@material/mwc-top-app-bar-fixed": ^0.25.3 - "@material/top-app-bar": 14.0.0-canary.261f2db59.0 + "@material/chips": =14.0.0-canary.53b3cad2f.0 + "@material/data-table": =14.0.0-canary.53b3cad2f.0 + "@material/mwc-button": ^0.27.0 + "@material/mwc-checkbox": ^0.27.0 + "@material/mwc-circular-progress": ^0.27.0 + "@material/mwc-dialog": ^0.27.0 + "@material/mwc-drawer": ^0.27.0 + "@material/mwc-fab": ^0.27.0 + "@material/mwc-formfield": ^0.27.0 + "@material/mwc-icon-button": ^0.27.0 + "@material/mwc-linear-progress": ^0.27.0 + "@material/mwc-list": ^0.27.0 + "@material/mwc-menu": ^0.27.0 + "@material/mwc-radio": ^0.27.0 + "@material/mwc-ripple": ^0.27.0 + "@material/mwc-select": ^0.27.0 + "@material/mwc-slider": ^0.27.0 + "@material/mwc-switch": ^0.27.0 + "@material/mwc-tab": ^0.27.0 + "@material/mwc-tab-bar": ^0.27.0 + "@material/mwc-textarea": ^0.27.0 + "@material/mwc-textfield": ^0.27.0 + "@material/mwc-top-app-bar-fixed": ^0.27.0 + "@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 From 9d529d8f131c13cfc678162062730a9c31b420d0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 06:11:05 +0000 Subject: [PATCH 11/28] Bump sinon from 11.0.0 to 15.0.1 (#15121) * Bump sinon from 11.0.0 to 15.0.1 Bumps [sinon](https://github.com/sinonjs/sinon) from 11.0.0 to 15.0.1. - [Release notes](https://github.com/sinonjs/sinon/releases) - [Changelog](https://github.com/sinonjs/sinon/blob/main/docs/changelog.md) - [Commits](https://github.com/sinonjs/sinon/compare/v11.0.0...v15.0.1) --- updated-dependencies: - dependency-name: sinon 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 | 70 ++++++++++++++++++++++++++-------------------------- 2 files changed, 36 insertions(+), 36 deletions(-) diff --git a/package.json b/package.json index a02d465af1..62342a25f1 100644 --- a/package.json +++ b/package.json @@ -227,7 +227,7 @@ "rollup-plugin-terser": "^5.3.0", "rollup-plugin-visualizer": "^5.9.0", "serve": "^11.3.2", - "sinon": "^11.0.0", + "sinon": "^15.0.1", "source-map-url": "^0.4.0", "systemjs": "^6.3.2", "tar": "^6.1.11", diff --git a/yarn.lock b/yarn.lock index d83feea106..14baa26362 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3913,32 +3913,32 @@ __metadata: languageName: node linkType: hard -"@sinonjs/commons@npm:^1.6.0, @sinonjs/commons@npm:^1.7.0, @sinonjs/commons@npm:^1.8.3": - version: 1.8.3 - resolution: "@sinonjs/commons@npm:1.8.3" +"@sinonjs/commons@npm:^2.0.0": + version: 2.0.0 + resolution: "@sinonjs/commons@npm:2.0.0" dependencies: type-detect: 4.0.8 - checksum: 6159726db5ce6bf9f2297f8427f7ca5b3dff45b31e5cee23496f1fa6ef0bb4eab878b23fb2c5e6446381f6a66aba4968ef2fc255c1180d753d4b8c271636a2e5 + checksum: 5023ba17edf2b85ed58262313b8e9b59e23c6860681a9af0200f239fe939e2b79736d04a260e8270ddd57196851dde3ba754d7230be5c5234e777ae2ca8af137 languageName: node linkType: hard -"@sinonjs/fake-timers@npm:^7.0.4, @sinonjs/fake-timers@npm:^7.1.0": - version: 7.1.0 - resolution: "@sinonjs/fake-timers@npm:7.1.0" +"@sinonjs/fake-timers@npm:10.0.2, @sinonjs/fake-timers@npm:^10.0.2": + version: 10.0.2 + resolution: "@sinonjs/fake-timers@npm:10.0.2" dependencies: - "@sinonjs/commons": ^1.7.0 - checksum: 8f3af2426eee1e0464b3a20c676ca195db794979af289f04b9091d7262646683a2f08f246616b45cc91aa6c3215e0dd4244ad06d78dee44a4c5ffc7a655e052e + "@sinonjs/commons": ^2.0.0 + checksum: c62aa98e7cefda8dedc101ce227abc888dc46b8ff9706c5f0a8dfd9c3ada97d0a5611384738d9ba0b26b59f99c2ba24efece8e779bb08329e9e87358fa309824 languageName: node linkType: hard -"@sinonjs/samsam@npm:^6.0.2": - version: 6.0.2 - resolution: "@sinonjs/samsam@npm:6.0.2" +"@sinonjs/samsam@npm:^7.0.1": + version: 7.0.1 + resolution: "@sinonjs/samsam@npm:7.0.1" dependencies: - "@sinonjs/commons": ^1.6.0 + "@sinonjs/commons": ^2.0.0 lodash.get: ^4.4.2 type-detect: ^4.0.8 - checksum: bc1514edf15f4fa42a1bf27024b15f87654deb2999045c0e427659ff3c734eba44661fceae3624be23cc15ee9c6ddafe5209af2192845c6b267350b54eed1495 + checksum: 291efb158d54c67dee23ddabcb28873d22063449b692aaa3b2a4f1826d2f79d38695574063c92e9c17573cc805cd6acbf0ab0c66c9f3aed7afd0f12a2b905615 languageName: node linkType: hard @@ -9596,7 +9596,7 @@ fsevents@^1.2.7: rollup-plugin-visualizer: ^5.9.0 rrule: ^2.7.1 serve: ^11.3.2 - sinon: ^11.0.0 + sinon: ^15.0.1 sortablejs: ^1.14.0 source-map-url: ^0.4.0 superstruct: ^0.15.2 @@ -12016,16 +12016,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"nise@npm:^5.0.4": - version: 5.1.0 - resolution: "nise@npm:5.1.0" +"nise@npm:^5.1.2": + version: 5.1.4 + resolution: "nise@npm:5.1.4" dependencies: - "@sinonjs/commons": ^1.7.0 - "@sinonjs/fake-timers": ^7.0.4 + "@sinonjs/commons": ^2.0.0 + "@sinonjs/fake-timers": ^10.0.2 "@sinonjs/text-encoding": ^0.7.1 just-extend: ^4.0.2 path-to-regexp: ^1.7.0 - checksum: e3843cc125163ce99b7fb0328edf427b981be32c6c719684582cf0a46fb5206173835a9a14dedac3c4833e415ab0e0493f9f4d4163572a3a0c95db39b093166d + checksum: bc57c10eaec28a6a7ddfb2e1e9b21d5e1fe22710e514f8858ae477cf9c7e9c891475674d5241519193403db43d16c3675f4207bc094a7a27b7e4f56584a78c1b languageName: node linkType: hard @@ -14311,17 +14311,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"sinon@npm:^11.0.0": - version: 11.0.0 - resolution: "sinon@npm:11.0.0" +"sinon@npm:^15.0.1": + version: 15.0.1 + resolution: "sinon@npm:15.0.1" dependencies: - "@sinonjs/commons": ^1.8.3 - "@sinonjs/fake-timers": ^7.1.0 - "@sinonjs/samsam": ^6.0.2 + "@sinonjs/commons": ^2.0.0 + "@sinonjs/fake-timers": 10.0.2 + "@sinonjs/samsam": ^7.0.1 diff: ^5.0.0 - nise: ^5.0.4 - supports-color: ^8.1.1 - checksum: 52938fbc6e37194615dc77bb9de70cc05babec97c9b7f46f0afa60707537ff5be1e79cb19a864ee2b41f38d4ac1ca511c9d5dd61f51f6fed6f3ed29b55899d37 + nise: ^5.1.2 + supports-color: ^7.2.0 + checksum: 4b5acff291b4650cf736bf45fc9eceed44dceca63b663cbd55926dd688fe8e9baa4b4629e296ee5d5b64245aedec5c540fea0416b8bb35bccfb98ca9e9ed87f3 languageName: node linkType: hard @@ -14919,7 +14919,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"supports-color@npm:8.1.1, supports-color@npm:^8.0.0, supports-color@npm:^8.1.1": +"supports-color@npm:8.1.1, supports-color@npm:^8.0.0": version: 8.1.1 resolution: "supports-color@npm:8.1.1" dependencies: @@ -14946,12 +14946,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0": - version: 7.1.0 - resolution: "supports-color@npm:7.1.0" +"supports-color@npm:^7.0.0, supports-color@npm:^7.1.0, supports-color@npm:^7.2.0": + version: 7.2.0 + resolution: "supports-color@npm:7.2.0" dependencies: has-flag: ^4.0.0 - checksum: 899480ac858a650abcca4a02ae655555270e6ace833b15a74e4a2d3456f54cd19b6b12ce14e9bac997c18dd69a0596ee65b95ba013f209dd0f99ebfe87783e41 + checksum: 3dda818de06ebbe5b9653e07842d9479f3555ebc77e9a0280caf5a14fb877ffee9ed57007c3b78f5a6324b8dbeec648d9e97a24e2ed9fdb81ddc69ea07100f4a languageName: node linkType: hard From 6d527d5ebe5945c752645951f8efd21869a2cdd3 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 18 Jan 2023 11:33:05 +0100 Subject: [PATCH 12/28] Add required style to required select selector (#15082) --- src/components/ha-selector/ha-selector-select.ts | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/components/ha-selector/ha-selector-select.ts b/src/components/ha-selector/ha-selector-select.ts index ac2ba9d63b..aeff5d52a7 100644 --- a/src/components/ha-selector/ha-selector-select.ts +++ b/src/components/ha-selector/ha-selector-select.ts @@ -164,10 +164,11 @@ export class HaSelectSelector extends LitElement { From c7da1a95daff55d978a18e5849578b8759d9d028 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 18 Jan 2023 11:34:23 +0100 Subject: [PATCH 13/28] Exclude selected items for entities picker (#15057) --- src/components/entity/ha-entities-picker.ts | 22 ++++++++++++++------- 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/components/entity/ha-entities-picker.ts b/src/components/entity/ha-entities-picker.ts index 039eaa8261..e0a8b5ae41 100644 --- a/src/components/entity/ha-entities-picker.ts +++ b/src/components/entity/ha-entities-picker.ts @@ -1,6 +1,7 @@ import type { HassEntity } from "home-assistant-js-websocket"; import { css, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; +import memoizeOne from "memoize-one"; import { fireEvent } from "../../common/dom/fire_event"; import { isValidEntityId } from "../../common/entity/valid_entity_id"; import type { PolymerChangedEvent } from "../../polymer-types"; @@ -95,7 +96,10 @@ class HaEntitiesPickerLight extends LitElement { .excludeEntities=${this.excludeEntities} .includeDeviceClasses=${this.includeDeviceClasses} .includeUnitOfMeasurement=${this.includeUnitOfMeasurement} - .entityFilter=${this._entityFilter} + .entityFilter=${this._getEntityFilter( + this.value, + this.entityFilter + )} .value=${entityId} .label=${this.pickedEntityLabel} .disabled=${this.disabled} @@ -114,7 +118,7 @@ class HaEntitiesPickerLight extends LitElement { .excludeEntities=${this.excludeEntities} .includeDeviceClasses=${this.includeDeviceClasses} .includeUnitOfMeasurement=${this.includeUnitOfMeasurement} - .entityFilter=${this._entityFilter} + .entityFilter=${this._getEntityFilter(this.value, this.entityFilter)} .label=${this.pickEntityLabel} .helper=${this.helper} .disabled=${this.disabled} @@ -125,11 +129,15 @@ class HaEntitiesPickerLight extends LitElement { `; } - private _entityFilter: HaEntityPickerEntityFilterFunc = ( - stateObj: HassEntity - ) => - (!this.value || !this.value.includes(stateObj.entity_id)) && - (!this.entityFilter || this.entityFilter(stateObj)); + private _getEntityFilter = memoizeOne( + ( + value: string[] | undefined, + entityFilter: HaEntityPickerEntityFilterFunc | undefined + ): HaEntityPickerEntityFilterFunc => + (stateObj: HassEntity) => + (!value || !value.includes(stateObj.entity_id)) && + (!entityFilter || entityFilter(stateObj)) + ); private get _currentEntities() { return this.value || []; From 789a69fea548366d353d2279e9b21ab924586c77 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 18 Jan 2023 11:34:57 +0100 Subject: [PATCH 14/28] Improve slider/switch bar focus style (#15009) Improve bar input focus style --- src/components/ha-bar-slider.ts | 5 +++++ src/components/ha-bar-switch.ts | 8 ++++++++ 2 files changed, 13 insertions(+) diff --git a/src/components/ha-bar-slider.ts b/src/components/ha-bar-slider.ts index 11b8558cda..ccbf1dbf55 100644 --- a/src/components/ha-bar-slider.ts +++ b/src/components/ha-bar-slider.ts @@ -278,6 +278,11 @@ export class HaBarSlider extends LitElement { --slider-bar-border-radius: 10px; height: var(--slider-bar-thickness); width: 100%; + border-radius: var(--slider-bar-border-radius); + outline: none; + } + :host(:focus-visible) { + box-shadow: 0 0 0 2px var(--slider-bar-color); } :host([vertical]) { width: var(--slider-bar-thickness); diff --git a/src/components/ha-bar-switch.ts b/src/components/ha-bar-switch.ts index 7c0f687e59..5b20e0bfa7 100644 --- a/src/components/ha-bar-switch.ts +++ b/src/components/ha-bar-switch.ts @@ -104,6 +104,14 @@ export class HaBarSwitch extends LitElement { box-sizing: border-box; user-select: none; cursor: pointer; + border-radius: var(--switch-bar-border-radius); + outline: none; + } + :host(:focus-visible) { + box-shadow: 0 0 0 2px var(--switch-bar-off-color); + } + :host([checked]:focus-visible) { + box-shadow: 0 0 0 2px var(--switch-bar-on-color); } .switch { box-sizing: border-box; From 9e5442db18e547394cddccc8dfa627d729f98b55 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Wed, 18 Jan 2023 11:35:54 +0100 Subject: [PATCH 15/28] Use ripple effect for tile card (#15007) * Use ripple effect for tile card * Use border for focus --- src/panels/lovelace/cards/hui-tile-card.ts | 89 +++++++++++++++------- 1 file changed, 61 insertions(+), 28 deletions(-) diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index ae5c588a5a..981846ac5b 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -1,8 +1,16 @@ import { memoize } from "@fullcalendar/common"; +import { Ripple } from "@material/mwc-ripple"; +import { RippleHandlers } from "@material/mwc-ripple/ripple-handlers"; import { mdiExclamationThick, mdiHelp } from "@mdi/js"; import { HassEntity } from "home-assistant-js-websocket"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; -import { customElement, property, state } from "lit/decorators"; +import { + customElement, + eventOptions, + property, + queryAsync, + state, +} from "lit/decorators"; import { styleMap } from "lit/directives/style-map"; import { computeCssColor } from "../../../common/color/compute-color"; import { hsv2rgb, rgb2hsv } from "../../../common/color/convert-color"; @@ -105,7 +113,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard { handleAction(this, this.hass!, this._config!, ev.detail.action!); } - private _handleIconAction() { + private _handleIconAction(ev: CustomEvent) { + ev.stopPropagation(); const config = { entity: this._config!.entity, tap_action: this._config!.icon_tap_action, @@ -219,6 +228,32 @@ export class HuiTileCard extends LitElement implements LovelaceCard { return stateDisplay; } + @queryAsync("mwc-ripple") private _ripple!: Promise; + + @state() private _shouldRenderRipple = false; + + private _rippleHandlers: RippleHandlers = new RippleHandlers(() => { + this._shouldRenderRipple = true; + return this._ripple; + }); + + @eventOptions({ passive: true }) + private handleRippleActivate(evt?: Event) { + this._rippleHandlers.startPress(evt); + } + + private handleRippleDeactivate() { + this._rippleHandlers.endPress(); + } + + private handleRippleMouseEnter() { + this._rippleHandlers.startHover(); + } + + private handleRippleMouseLeave() { + this._rippleHandlers.endHover(); + } + protected render(): TemplateResult { if (!this._config || !this.hass) { return html``; @@ -274,6 +309,7 @@ export class HuiTileCard extends LitElement implements LovelaceCard { return html` + ${this._shouldRenderRipple ? html`` : null}
${supportedFeatures?.length @@ -365,11 +408,18 @@ export class HuiTileCard extends LitElement implements LovelaceCard { return css` :host { --tile-color: rgb(var(--rgb-state-inactive-color)); - --tile-tap-padding: 6px; -webkit-tap-highlight-color: transparent; } + ha-card:has(ha-tile-info:focus-visible) { + border-color: var(--tile-color); + box-shadow: 0 0 0 1px var(--tile-color); + } ha-card { + --mdc-ripple-color: var(--tile-color); height: 100%; + overflow: hidden; + // For safari overflow hidden + z-index: 0; } ha-card.disabled { --tile-color: rgb(var(--rgb-disabled-color)); @@ -381,18 +431,16 @@ export class HuiTileCard extends LitElement implements LovelaceCard { outline: none; } .tile { - padding: calc(12px - var(--tile-tap-padding)); display: flex; flex-direction: row; align-items: center; } .icon-container { position: relative; - padding: var(--tile-tap-padding); flex: none; - margin-right: calc(12px - 2 * var(--tile-tap-padding)); - margin-inline-end: calc(12px - 2 * var(--tile-tap-padding)); - margin-inline-start: initial; + margin-right: 12px; + margin-inline-start: 12px; + margin-inline-end: initial; direction: var(--direction); transition: transform 180ms ease-in-out; } @@ -401,8 +449,8 @@ export class HuiTileCard extends LitElement implements LovelaceCard { } .icon-container .badge { position: absolute; - top: calc(-3px + var(--tile-tap-padding)); - right: calc(-3px + var(--tile-tap-padding)); + top: -3px; + right: -3px; } .icon-container[role="button"]:focus-visible, .icon-container[role="button"]:active { @@ -410,27 +458,12 @@ export class HuiTileCard extends LitElement implements LovelaceCard { } .info { position: relative; - padding: var(--tile-tap-padding); + padding: 12px; flex: 1; min-width: 0; min-height: 40px; transition: background-color 180ms ease-in-out; } - .info::before { - content: ""; - position: absolute; - top: 0; - left: 0; - height: 100%; - width: 100%; - border-radius: calc(var(--ha-card-border-radius, 10px) - 2px); - background-color: transparent; - opacity: 0.1; - transition: background-color ease-in-out 180ms; - } - .info:focus-visible::before { - background-color: var(--tile-color); - } `; } } From 014ae06e855ad71f5cef773f0ca79fd6c9a35e41 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 18:21:41 +0000 Subject: [PATCH 16/28] Bump del from 4.1.1 to 7.0.0 (#15120) * Bump del from 4.1.1 to 7.0.0 Bumps [del](https://github.com/sindresorhus/del) from 4.1.1 to 7.0.0. - [Release notes](https://github.com/sindresorhus/del/releases) - [Commits](https://github.com/sindresorhus/del/compare/v4.1.1...v7.0.0) --- updated-dependencies: - dependency-name: del dependency-type: direct:development update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] * Deduplicate dependencies * Adjust to ESM-only and API changes Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- build-scripts/gulp/clean.js | 26 +-- ...tions.js => fetch-nightly-translations.js} | 12 +- build-scripts/gulp/locale-data.js | 4 +- build-scripts/gulp/translations.js | 6 +- package.json | 2 +- yarn.lock | 167 +++++++++--------- 6 files changed, 117 insertions(+), 100 deletions(-) rename build-scripts/gulp/{fetch-nightly_translations.js => fetch-nightly-translations.js} (95%) diff --git a/build-scripts/gulp/clean.js b/build-scripts/gulp/clean.js index 7bc0ed9e83..726e932ced 100644 --- a/build-scripts/gulp/clean.js +++ b/build-scripts/gulp/clean.js @@ -1,36 +1,40 @@ -const del = require("del"); +const del = import("del"); const gulp = require("gulp"); const paths = require("../paths"); require("./translations"); gulp.task( "clean", - gulp.parallel("clean-translations", () => - del([paths.app_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.app_output_root, paths.build_dir]) ) ); gulp.task( "clean-demo", - gulp.parallel("clean-translations", () => - del([paths.demo_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.demo_output_root, paths.build_dir]) ) ); gulp.task( "clean-cast", - gulp.parallel("clean-translations", () => - del([paths.cast_output_root, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([paths.cast_output_root, paths.build_dir]) ) ); -gulp.task("clean-hassio", () => - del([paths.hassio_output_root, paths.build_dir]) +gulp.task("clean-hassio", async () => + (await del).deleteSync([paths.hassio_output_root, paths.build_dir]) ); gulp.task( "clean-gallery", - gulp.parallel("clean-translations", () => - del([paths.gallery_output_root, paths.gallery_build, paths.build_dir]) + gulp.parallel("clean-translations", async () => + (await del).deleteSync([ + paths.gallery_output_root, + paths.gallery_build, + paths.build_dir, + ]) ) ); diff --git a/build-scripts/gulp/fetch-nightly_translations.js b/build-scripts/gulp/fetch-nightly-translations.js similarity index 95% rename from build-scripts/gulp/fetch-nightly_translations.js rename to build-scripts/gulp/fetch-nightly-translations.js index 87e3e43112..13795995e1 100644 --- a/build-scripts/gulp/fetch-nightly_translations.js +++ b/build-scripts/gulp/fetch-nightly-translations.js @@ -1,9 +1,9 @@ // Task to download the latest Lokalise translations from the nightly workflow artifacts +const del = import("del"); const fs = require("fs/promises"); const path = require("path"); const process = require("process"); -const del = require("del"); const gulp = require("gulp"); const jszip = require("jszip"); const tar = require("tar"); @@ -17,8 +17,8 @@ const WORKFLOW_NAME = "nightly.yaml"; const ARTIFACT_NAME = "translations"; const CLIENT_ID = "Iv1.3914e28cb27834d1"; const EXTRACT_DIR = "translations"; -const TOKEN_FILE = path.join(EXTRACT_DIR, "token.json"); -const ARTIFACT_FILE = path.join(EXTRACT_DIR, "artifact.json"); +const TOKEN_FILE = path.posix.join(EXTRACT_DIR, "token.json"); +const ARTIFACT_FILE = path.posix.join(EXTRACT_DIR, "artifact.json"); let allowTokenSetup = false; gulp.task("allow-setup-fetch-nightly-translations", (done) => { @@ -137,7 +137,11 @@ gulp.task("fetch-nightly-translations", async function () { // Remove the current translations const deleteCurrent = Promise.all(writings).then( - del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`]) + (await del).deleteAsync([ + `${EXTRACT_DIR}/*`, + `!${ARTIFACT_FILE}`, + `!${TOKEN_FILE}`, + ]) ); // Get the download URL and follow the redirect to download (stored as ArrayBuffer) diff --git a/build-scripts/gulp/locale-data.js b/build-scripts/gulp/locale-data.js index fbb0131ca5..328ddccf31 100755 --- a/build-scripts/gulp/locale-data.js +++ b/build-scripts/gulp/locale-data.js @@ -1,4 +1,4 @@ -const del = require("del"); +const del = import("del"); const path = require("path"); const gulp = require("gulp"); const fs = require("fs"); @@ -6,7 +6,7 @@ const paths = require("../paths"); const outDir = "build/locale-data"; -gulp.task("clean-locale-data", () => del([outDir])); +gulp.task("clean-locale-data", async () => (await del).deleteSync([outDir])); gulp.task("ensure-locale-data-build-dir", (done) => { if (!fs.existsSync(outDir)) { diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js index 80802cdafc..d3f9b7e1d2 100755 --- a/build-scripts/gulp/translations.js +++ b/build-scripts/gulp/translations.js @@ -1,5 +1,5 @@ +const del = import("del"); const crypto = require("crypto"); -const del = require("del"); const path = require("path"); const source = require("vinyl-source-stream"); const vinylBuffer = require("vinyl-buffer"); @@ -13,7 +13,7 @@ const { mapFiles } = require("../util"); const env = require("../env"); const paths = require("../paths"); -require("./fetch-nightly_translations"); +require("./fetch-nightly-translations"); const inFrontendDir = "translations/frontend"; const inBackendDir = "translations/backend"; @@ -120,7 +120,7 @@ function lokaliseTransform(data, original, file) { return output; } -gulp.task("clean-translations", () => del([workDir])); +gulp.task("clean-translations", async () => (await del).deleteSync([workDir])); gulp.task("ensure-translations-build-dir", (done) => { if (!fs.existsSync(workDir)) { diff --git a/package.json b/package.json index 62342a25f1..6a1adb0b6c 100644 --- a/package.json +++ b/package.json @@ -186,7 +186,7 @@ "@web/dev-server-rollup": "^0.2.11", "babel-loader": "^9.1.0", "chai": "^4.3.4", - "del": "^4.0.0", + "del": "^7.0.0", "eslint": "^7.32.0", "eslint-config-airbnb-base": "^14.2.1", "eslint-config-airbnb-typescript": "^14.0.0", diff --git a/yarn.lock b/yarn.lock index 14baa26362..11e1a01f78 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4157,7 +4157,7 @@ __metadata: languageName: node linkType: hard -"@types/glob@npm:^7, @types/glob@npm:^7.1.1": +"@types/glob@npm:^7": version: 7.2.0 resolution: "@types/glob@npm:7.2.0" dependencies: @@ -5331,6 +5331,16 @@ __metadata: languageName: node linkType: hard +"aggregate-error@npm:^4.0.0": + version: 4.0.1 + resolution: "aggregate-error@npm:4.0.1" + dependencies: + clean-stack: ^4.0.0 + indent-string: ^5.0.0 + checksum: bb3ffdfd13447800fff237c2cba752c59868ee669104bb995dfbbe0b8320e967d679e683dabb640feb32e4882d60258165cde0baafc4cd467cc7d275a13ad6b5 + languageName: node + linkType: hard + "ajv-formats@npm:^2.1.1": version: 2.1.1 resolution: "ajv-formats@npm:2.1.1" @@ -5802,15 +5812,6 @@ __metadata: languageName: node linkType: hard -"array-union@npm:^1.0.1": - version: 1.0.2 - resolution: "array-union@npm:1.0.2" - dependencies: - array-uniq: ^1.0.1 - checksum: 82cec6421b6e6766556c484835a6d476a873f1b71cace5ab2b4f1b15b1e3162dc4da0d16f7a2b04d4aec18146c6638fe8f661340b31ba8e469fd811a1b45dc8d - languageName: node - linkType: hard - "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -5818,13 +5819,6 @@ __metadata: languageName: node linkType: hard -"array-uniq@npm:^1.0.1": - version: 1.0.3 - resolution: "array-uniq@npm:1.0.3" - checksum: 1625f06b093d8bf279b81adfec6e72951c0857d65b5e3f65f053fffe9f9dd61c2fc52cff57e38a4700817e7e3f01a4faa433d505ea9e33cdae4514c334e0bf9e - languageName: node - linkType: hard - "array-unique@npm:^0.3.2": version: 0.3.2 resolution: "array-unique@npm:0.3.2" @@ -6566,6 +6560,15 @@ __metadata: languageName: node linkType: hard +"clean-stack@npm:^4.0.0": + version: 4.2.0 + resolution: "clean-stack@npm:4.2.0" + dependencies: + escape-string-regexp: 5.0.0 + checksum: 373f656a31face5c615c0839213b9b542a0a48057abfb1df66900eab4dc2a5c6097628e4a0b5aa559cdfc4e66f8a14ea47be9681773165a44470ef5fb8ccc172 + languageName: node + linkType: hard + "cli-boxes@npm:^1.0.0": version: 1.0.0 resolution: "cli-boxes@npm:1.0.0" @@ -7345,18 +7348,19 @@ __metadata: languageName: node linkType: hard -"del@npm:^4.0.0": - version: 4.1.1 - resolution: "del@npm:4.1.1" +"del@npm:^7.0.0": + version: 7.0.0 + resolution: "del@npm:7.0.0" dependencies: - "@types/glob": ^7.1.1 - globby: ^6.1.0 - is-path-cwd: ^2.0.0 - is-path-in-cwd: ^2.0.0 - p-map: ^2.0.0 - pify: ^4.0.1 - rimraf: ^2.6.3 - checksum: 521f7da44bd79da841c06d573923d1f64f423aee8b8219c973478d3150ce1dcc024d03ad605929292adbff56d6448bca60d96dcdd2d8a53b46dbcb27e265c94b + globby: ^13.1.2 + graceful-fs: ^4.2.10 + is-glob: ^4.0.3 + is-path-cwd: ^3.0.0 + is-path-inside: ^4.0.0 + p-map: ^5.5.0 + rimraf: ^3.0.2 + slash: ^4.0.0 + checksum: 33e5077f18b5dfbe81971d1f8a2cd8bf676dd5ede491bab85ec17a4a1d59001bd3ec47fd38e9a4ae01a3c98c07b98c7b3dc56190b86d88926798802d7858d827 languageName: node linkType: hard @@ -7780,6 +7784,13 @@ __metadata: languageName: node linkType: hard +"escape-string-regexp@npm:5.0.0": + version: 5.0.0 + resolution: "escape-string-regexp@npm:5.0.0" + checksum: 20daabe197f3cb198ec28546deebcf24b3dbb1a5a269184381b3116d12f0532e06007f4bc8da25669d6a7f8efb68db0758df4cd981f57bc5b57f521a3e12c59e + languageName: node + linkType: hard + "escape-string-regexp@npm:^1.0.5": version: 1.0.5 resolution: "escape-string-regexp@npm:1.0.5" @@ -8385,7 +8396,7 @@ __metadata: languageName: node linkType: hard -"fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9": +"fast-glob@npm:^3.2.11, fast-glob@npm:^3.2.2, fast-glob@npm:^3.2.9": version: 3.2.12 resolution: "fast-glob@npm:3.2.12" dependencies: @@ -9053,7 +9064,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"glob@npm:^7.0.3, glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: @@ -9131,16 +9142,16 @@ fsevents@^1.2.7: languageName: node linkType: hard -"globby@npm:^6.1.0": - version: 6.1.0 - resolution: "globby@npm:6.1.0" +"globby@npm:^13.1.2": + version: 13.1.3 + resolution: "globby@npm:13.1.3" dependencies: - array-union: ^1.0.1 - glob: ^7.0.3 - object-assign: ^4.0.1 - pify: ^2.0.0 - pinkie-promise: ^2.0.0 - checksum: 18109d6b9d55643d2b98b59c3cfae7073ccfe39829632f353d516cc124d836c2ddebe48a23f04af63d66a621b6d86dd4cbd7e6af906f2458a7fe510ffc4bd424 + dir-glob: ^3.0.1 + fast-glob: ^3.2.11 + ignore: ^5.2.0 + merge2: ^1.4.1 + slash: ^4.0.0 + checksum: 93f06e02002cdf368f7e3d55bd59e7b00784c7cc8fe92c7ee5082cc7171ff6109fda45e1c97a80bb48bc811dedaf7843c7c9186f5f84bde4883ab630e13c43df languageName: node linkType: hard @@ -9160,10 +9171,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": - version: 4.2.6 - resolution: "graceful-fs@npm:4.2.6" - checksum: 792e64aafda05a151289f83eaa16aff34ef259658cefd65393883d959409f5a2389b0ec9ebf28f3d21f1b0ddc8f594a1162ae9b18e2b507a6799a70706ec573d +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": + version: 4.2.10 + resolution: "graceful-fs@npm:4.2.10" + checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da languageName: node linkType: hard @@ -9533,7 +9544,7 @@ fsevents@^1.2.7: date-fns-tz: ^1.3.7 deep-clone-simple: ^1.1.1 deep-freeze: ^0.0.1 - del: ^4.0.0 + del: ^7.0.0 eslint: ^7.32.0 eslint-config-airbnb-base: ^14.2.1 eslint-config-airbnb-typescript: ^14.0.0 @@ -9968,6 +9979,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"indent-string@npm:^5.0.0": + version: 5.0.0 + resolution: "indent-string@npm:5.0.0" + checksum: e466c27b6373440e6d84fbc19e750219ce25865cb82d578e41a6053d727e5520dc5725217d6eb1cc76005a1bb1696a0f106d84ce7ebda3033b963a38583fb3b3 + languageName: node + linkType: hard + "infer-owner@npm:^1.0.4": version: 1.0.4 resolution: "infer-owner@npm:1.0.4" @@ -10398,28 +10416,17 @@ fsevents@^1.2.7: languageName: node linkType: hard -"is-path-cwd@npm:^2.0.0": - version: 2.2.0 - resolution: "is-path-cwd@npm:2.2.0" - checksum: 46a840921bb8cc0dc7b5b423a14220e7db338072a4495743a8230533ce78812dc152548c86f4b828411fe98c5451959f07cf841c6a19f611e46600bd699e8048 +"is-path-cwd@npm:^3.0.0": + version: 3.0.0 + resolution: "is-path-cwd@npm:3.0.0" + checksum: bc34d13b6a03dfca4a3ab6a8a5ba78ae4b24f4f1db4b2b031d2760c60d0913bd16a4b980dcb4e590adfc906649d5f5132684079a3972bd219da49deebb9adea8 languageName: node linkType: hard -"is-path-in-cwd@npm:^2.0.0": - version: 2.0.0 - resolution: "is-path-in-cwd@npm:2.0.0" - dependencies: - is-path-inside: ^1.0.0 - checksum: 02ee5f8eba591871f94afeab1eb91133cbb209843d2b66beab2c70d111e57b6ab1351db5a235f956f1e084a36f609b4dcc70a163fceec07f748b259ba903d79b - languageName: node - linkType: hard - -"is-path-inside@npm:^1.0.0": - version: 1.0.1 - resolution: "is-path-inside@npm:1.0.1" - dependencies: - path-is-inside: ^1.0.1 - checksum: 07e52c81163937ff89b4700b7ad474de3b396846b55ed87530fb0a22cb9103926152939f673bc1a0592448e7e4e9d75eb734be21b4ad411311065c6a509fae54 +"is-path-inside@npm:^4.0.0": + version: 4.0.0 + resolution: "is-path-inside@npm:4.0.0" + checksum: 8810fa11c58e6360b82c3e0d6cd7d9c7d0392d3ac9eb10f980b81f9839f40ac6d1d6d6f05d069db0d227759801228f0b072e1b6c343e4469b065ab5fe0b68fe5 languageName: node linkType: hard @@ -12608,13 +12615,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"p-map@npm:^2.0.0": - version: 2.0.0 - resolution: "p-map@npm:2.0.0" - checksum: 2cd16168e2b6dc54cedbdb414809b486fbba05157eeaa657eb78f8f3987a3a3ee39c256ff9f612d9d295fabee5f0d7cfcbd9b8fe500e470ef598bc22e1d6f0fd - languageName: node - linkType: hard - "p-map@npm:^4.0.0": version: 4.0.0 resolution: "p-map@npm:4.0.0" @@ -12624,6 +12624,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"p-map@npm:^5.5.0": + version: 5.5.0 + resolution: "p-map@npm:5.5.0" + dependencies: + aggregate-error: ^4.0.0 + checksum: 065cb6fca6b78afbd070dd9224ff160dc23eea96e57863c09a0c8ea7ce921043f76854be7ee0abc295cff1ac9adcf700e79a1fbe3b80b625081087be58e7effb + languageName: node + linkType: hard + "p-retry@npm:^4.5.0": version: 4.6.1 resolution: "p-retry@npm:4.6.1" @@ -12822,7 +12831,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"path-is-inside@npm:1.0.2, path-is-inside@npm:^1.0.1": +"path-is-inside@npm:1.0.2": version: 1.0.2 resolution: "path-is-inside@npm:1.0.2" checksum: 0b5b6c92d3018b82afb1f74fe6de6338c4c654de4a96123cb343f2b747d5606590ac0c890f956ed38220a4ab59baddfd7b713d78a62d240b20b14ab801fa02cb @@ -12981,13 +12990,6 @@ fsevents@^1.2.7: languageName: node linkType: hard -"pify@npm:^4.0.1": - version: 4.0.1 - resolution: "pify@npm:4.0.1" - checksum: 9c4e34278cb09987685fa5ef81499c82546c033713518f6441778fbec623fc708777fe8ac633097c72d88470d5963094076c7305cafc7ad340aae27cfacd856b - languageName: node - linkType: hard - "pinkie-promise@npm:^2.0.0": version: 2.0.1 resolution: "pinkie-promise@npm:2.0.1" @@ -13833,7 +13835,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"rimraf@npm:^2.6.1, rimraf@npm:^2.6.3": +"rimraf@npm:^2.6.1": version: 2.7.1 resolution: "rimraf@npm:2.7.1" dependencies: @@ -14332,6 +14334,13 @@ fsevents@^1.2.7: languageName: node linkType: hard +"slash@npm:^4.0.0": + version: 4.0.0 + resolution: "slash@npm:4.0.0" + checksum: da8e4af73712253acd21b7853b7e0dbba776b786e82b010a5bfc8b5051a1db38ed8aba8e1e8f400dd2c9f373be91eb1c42b66e91abb407ff42b10feece5e1d2d + languageName: node + linkType: hard + "slice-ansi@npm:^3.0.0": version: 3.0.0 resolution: "slice-ansi@npm:3.0.0" From 282823ee83f93a23db482e9e6f2f30f230a9c587 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 14:16:42 -0500 Subject: [PATCH 17/28] Bump prettier from 2.8.1 to 2.8.3 (#15129) * Bump prettier from 2.8.1 to 2.8.3 Bumps [prettier](https://github.com/prettier/prettier) from 2.8.1 to 2.8.3. - [Release notes](https://github.com/prettier/prettier/releases) - [Changelog](https://github.com/prettier/prettier/blob/main/CHANGELOG.md) - [Commits](https://github.com/prettier/prettier/compare/2.8.1...2.8.3) --- updated-dependencies: - dependency-name: prettier dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] * apply rules Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: Paul Bottein --- package.json | 2 +- src/common/dom/scroll-to-target.ts | 2 +- src/components/entity/ha-state-label-badge.ts | 4 ++-- src/data/automation.ts | 4 ++-- src/data/energy.ts | 2 +- src/data/humidifier.ts | 4 ++-- src/data/recorder.ts | 2 +- src/data/schedule.ts | 2 +- src/data/script.ts | 4 ++-- .../automation-mode-dialog/dialog-automation-mode.ts | 2 +- src/panels/config/helpers/const.ts | 2 +- .../integration-panels/zha/zha-manage-clusters.ts | 2 +- src/panels/config/script/ha-script-editor.ts | 4 ++-- src/panels/lovelace/common/generate-lovelace-config.ts | 2 +- src/panels/lovelace/components/types.ts | 2 +- .../config-elements/hui-statistic-card-editor.ts | 2 +- src/panels/lovelace/tile-features/types.ts | 2 +- yarn.lock | 10 +++++----- 18 files changed, 27 insertions(+), 27 deletions(-) diff --git a/package.json b/package.json index 6a1adb0b6c..ed2cc45f66 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,7 @@ "object-hash": "^3.0.0", "open": "^8.4.0", "pinst": "^3.0.0", - "prettier": "^2.8.1", + "prettier": "^2.8.3", "require-dir": "^1.2.0", "rollup": "^2.8.2", "rollup-plugin-string": "^3.0.0", diff --git a/src/common/dom/scroll-to-target.ts b/src/common/dom/scroll-to-target.ts index f558974522..3feabad86c 100644 --- a/src/common/dom/scroll-to-target.ts +++ b/src/common/dom/scroll-to-target.ts @@ -39,5 +39,5 @@ export default function scrollToTarget(element, target) { ); requestAnimationFrame(updateFrame.bind(element)); } - }.call(element)); + }).call(element); } diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index 155294ef75..6af024518d 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -35,9 +35,9 @@ const TRUNCATED_DOMAINS = [ "person", ] as const satisfies ReadonlyArray; -type TruncatedDomain = typeof TRUNCATED_DOMAINS[number]; +type TruncatedDomain = (typeof TRUNCATED_DOMAINS)[number]; type TruncatedKey = { - [T in TruncatedDomain]: `${T}.${typeof FIXED_DOMAIN_STATES[T][number]}`; + [T in TruncatedDomain]: `${T}.${(typeof FIXED_DOMAIN_STATES)[T][number]}`; }[TruncatedDomain]; const getTruncatedKey = (domainKey: string, stateKey: string) => { diff --git a/src/data/automation.ts b/src/data/automation.ts index 1afa5a5184..b3dba670f6 100644 --- a/src/data/automation.ts +++ b/src/data/automation.ts @@ -8,7 +8,7 @@ import { BlueprintInput } from "./blueprint"; import { DeviceCondition, DeviceTrigger } from "./device_automation"; import { Action, MODES } from "./script"; -export const AUTOMATION_DEFAULT_MODE: typeof MODES[number] = "single"; +export const AUTOMATION_DEFAULT_MODE: (typeof MODES)[number] = "single"; export const AUTOMATION_DEFAULT_MAX = 10; export interface AutomationEntity extends HassEntityBase { @@ -29,7 +29,7 @@ export interface ManualAutomationConfig { trigger: Trigger | Trigger[]; condition?: Condition | Condition[]; action: Action | Action[]; - mode?: typeof MODES[number]; + mode?: (typeof MODES)[number]; max?: number; max_exceeded?: | "silent" diff --git a/src/data/energy.ts b/src/data/energy.ts index d7a8bf63d4..ba369bded0 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -671,7 +671,7 @@ export const getEnergySolarForecasts = (hass: HomeAssistant) => }); const energyGasUnitClass = ["volume", "energy"] as const; -export type EnergyGasUnitClass = typeof energyGasUnitClass[number]; +export type EnergyGasUnitClass = (typeof energyGasUnitClass)[number]; export const getEnergyGasUnitClass = ( prefs: EnergyPreferences, diff --git a/src/data/humidifier.ts b/src/data/humidifier.ts index 5f0fed7a5f..aaecf77e06 100644 --- a/src/data/humidifier.ts +++ b/src/data/humidifier.ts @@ -7,8 +7,8 @@ import { TranslationDict } from "../types"; import { UNAVAILABLE_STATES } from "./entity"; type HumidifierState = - | typeof FIXED_DOMAIN_STATES.humidifier[number] - | typeof UNAVAILABLE_STATES[number]; + | (typeof FIXED_DOMAIN_STATES.humidifier)[number] + | (typeof UNAVAILABLE_STATES)[number]; type HumidifierMode = keyof TranslationDict["state_attributes"]["humidifier"]["mode"]; diff --git a/src/data/recorder.ts b/src/data/recorder.ts index 1f12f5e9e2..7d93854db5 100644 --- a/src/data/recorder.ts +++ b/src/data/recorder.ts @@ -98,7 +98,7 @@ const statisticTypes = [ "state", "sum", ] as const; -export type StatisticsTypes = typeof statisticTypes[number][]; +export type StatisticsTypes = (typeof statisticTypes)[number][]; export interface StatisticsValidationResults { [statisticId: string]: StatisticsValidationResult[]; diff --git a/src/data/schedule.ts b/src/data/schedule.ts index c073795650..7de8111354 100644 --- a/src/data/schedule.ts +++ b/src/data/schedule.ts @@ -15,7 +15,7 @@ export interface ScheduleDay { to: string; } -type ScheduleDays = { [K in typeof weekdays[number]]?: ScheduleDay[] }; +type ScheduleDays = { [K in (typeof weekdays)[number]]?: ScheduleDay[] }; export interface Schedule extends ScheduleDays { id: string; diff --git a/src/data/script.ts b/src/data/script.ts index ed0a2c8e6a..a1288158db 100644 --- a/src/data/script.ts +++ b/src/data/script.ts @@ -77,7 +77,7 @@ const activateSceneActionStruct: Describe = assign( export interface ScriptEntity extends HassEntityBase { attributes: HassEntityAttributeBase & { last_triggered: string; - mode: typeof MODES[number]; + mode: (typeof MODES)[number]; current?: number; max?: number; }; @@ -89,7 +89,7 @@ export interface ManualScriptConfig { alias: string; sequence: Action | Action[]; icon?: string; - mode?: typeof MODES[number]; + mode?: (typeof MODES)[number]; max?: number; } diff --git a/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts b/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts index 270eaed01e..a8e1ce3aab 100644 --- a/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts +++ b/src/panels/config/automation/automation-mode-dialog/dialog-automation-mode.ts @@ -26,7 +26,7 @@ class DialogAutomationMode extends LitElement implements HassDialog { private _params!: AutomationModeDialog; - @state() private _newMode: typeof MODES[number] = AUTOMATION_DEFAULT_MODE; + @state() private _newMode: (typeof MODES)[number] = AUTOMATION_DEFAULT_MODE; @state() private _newMax?: number; diff --git a/src/panels/config/helpers/const.ts b/src/panels/config/helpers/const.ts index 82992ca6b4..43d6c7be78 100644 --- a/src/panels/config/helpers/const.ts +++ b/src/panels/config/helpers/const.ts @@ -21,7 +21,7 @@ export const HELPER_DOMAINS = [ "schedule", ] as const; -export type HelperDomain = typeof HELPER_DOMAINS[number]; +export type HelperDomain = (typeof HELPER_DOMAINS)[number]; export const isHelperDomain = arrayLiteralIncludes(HELPER_DOMAINS); export type Helper = diff --git a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts index d956723242..db9aff319b 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-manage-clusters.ts @@ -50,7 +50,7 @@ export class ZHAManageClusters extends LitElement { @state() private _selectedCluster?: Cluster; - @state() private _currTab: typeof tabs[number] = "attributes"; + @state() private _currTab: (typeof tabs)[number] = "attributes"; @state() private _clustersLoaded = false; diff --git a/src/panels/config/script/ha-script-editor.ts b/src/panels/config/script/ha-script-editor.ts index 167b0f6d95..829e762cbf 100644 --- a/src/panels/config/script/ha-script-editor.ts +++ b/src/panels/config/script/ha-script-editor.ts @@ -95,7 +95,7 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { ( hasID: boolean, useBluePrint?: boolean, - currentMode?: typeof MODES[number] + currentMode?: (typeof MODES)[number] ) => [ { @@ -528,7 +528,7 @@ export class HaScriptEditor extends KeyboardShortcutMixin(LitElement) { // Mode must be one of max modes per schema definition above return this.hass.localize( `ui.panel.config.script.editor.max.${ - data.mode as typeof MODES_MAX[number] + data.mode as (typeof MODES_MAX)[number] }` ); default: diff --git a/src/panels/lovelace/common/generate-lovelace-config.ts b/src/panels/lovelace/common/generate-lovelace-config.ts index 661334392d..f1343842c0 100644 --- a/src/panels/lovelace/common/generate-lovelace-config.ts +++ b/src/panels/lovelace/common/generate-lovelace-config.ts @@ -161,7 +161,7 @@ export const computeCards = ( renderFooterEntities && (domain === "scene" || domain === "script") ) { - const conf: typeof footerEntities[0] = { + const conf: (typeof footerEntities)[0] = { entity: entityId, show_icon: true, show_name: true, diff --git a/src/panels/lovelace/components/types.ts b/src/panels/lovelace/components/types.ts index 8c0684881e..ecdedbd423 100644 --- a/src/panels/lovelace/components/types.ts +++ b/src/panels/lovelace/components/types.ts @@ -16,4 +16,4 @@ export const TIMESTAMP_RENDERING_FORMATS = [ ] as const; export type TimestampRenderingFormat = - typeof TIMESTAMP_RENDERING_FORMATS[number]; + (typeof TIMESTAMP_RENDERING_FORMATS)[number]; 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 f37f1a2b17..7583d38fde 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 @@ -38,7 +38,7 @@ const cardConfigStruct = assign( const stat_types = ["mean", "min", "max", "change"] as const; -const statTypeMap: Record = { +const statTypeMap: Record<(typeof stat_types)[number], StatisticType> = { mean: "mean", min: "min", max: "max", diff --git a/src/panels/lovelace/tile-features/types.ts b/src/panels/lovelace/tile-features/types.ts index d7186e6f19..b741503969 100644 --- a/src/panels/lovelace/tile-features/types.ts +++ b/src/panels/lovelace/tile-features/types.ts @@ -18,7 +18,7 @@ export const VACUUM_COMMANDS = [ "return_home", ] as const; -export type VacuumCommand = typeof VACUUM_COMMANDS[number]; +export type VacuumCommand = (typeof VACUUM_COMMANDS)[number]; export interface VacuumCommandsTileFeatureConfig { type: "vacuum-commands"; diff --git a/yarn.lock b/yarn.lock index 11e1a01f78..9b35f426fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9592,7 +9592,7 @@ fsevents@^1.2.7: object-hash: ^3.0.0 open: ^8.4.0 pinst: ^3.0.0 - prettier: ^2.8.1 + prettier: ^2.8.3 proxy-polyfill: ^0.3.2 punycode: ^2.1.1 qr-scanner: ^1.3.0 @@ -13117,12 +13117,12 @@ fsevents@^1.2.7: languageName: node linkType: hard -"prettier@npm:^2.8.1": - version: 2.8.1 - resolution: "prettier@npm:2.8.1" +"prettier@npm:^2.8.3": + version: 2.8.3 + resolution: "prettier@npm:2.8.3" bin: prettier: bin-prettier.js - checksum: 4f21a0f1269f76fb36f54e9a8a1ea4c11e27478958bf860661fb4b6d7ac69aac1581f8724fa98ea3585e56d42a2ea317a17ff6e3324f40cb11ff9e20b73785cc + checksum: 92f2ceb522d454370e02082aa74ad27388672f7cee8975028b59517c069fe643bdc73e322675c8faf2ff173d7a626d1a6389f26b474000308e793aa25fff46e5 languageName: node linkType: hard From c7f4693f0ab6d7588bf07bc5979dae42aafbf444 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Wed, 18 Jan 2023 15:27:38 -0500 Subject: [PATCH 18/28] Bump webpack from 5.55.1 to 5.75.0 (#15080) * Bump webpack from 5.55.1 to 5.75.0 Bumps [webpack](https://github.com/webpack/webpack) from 5.55.1 to 5.75.0. - [Release notes](https://github.com/webpack/webpack/releases) - [Commits](https://github.com/webpack/webpack/compare/v5.55.1...v5.75.0) --- updated-dependencies: - dependency-name: webpack dependency-type: direct:development 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 | 85 ++++++++++++++++++++++++++++------------------------ 2 files changed, 47 insertions(+), 40 deletions(-) diff --git a/package.json b/package.json index ed2cc45f66..07962d81ae 100644 --- a/package.json +++ b/package.json @@ -236,7 +236,7 @@ "typescript": "^4.9.4", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "webpack": "^5.55.1", + "webpack": "^5.75.0", "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.11.1", "webpack-manifest-plugin": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index 9b35f426fa..6e55c91426 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4077,13 +4077,13 @@ __metadata: languageName: node linkType: hard -"@types/eslint-scope@npm:^3.7.0": - version: 3.7.0 - resolution: "@types/eslint-scope@npm:3.7.0" +"@types/eslint-scope@npm:^3.7.3": + version: 3.7.4 + resolution: "@types/eslint-scope@npm:3.7.4" dependencies: "@types/eslint": "*" "@types/estree": "*" - checksum: 86b54f375259fe97955660b08215895b38769cd5c054d6120ded129ee94d36115d7e3bca31ca61bddcd8fc7bd168bc6fb74ccf25521c9744d9e47682c047d876 + checksum: ea6a9363e92f301cd3888194469f9ec9d0021fe0a397a97a6dd689e7545c75de0bd2153dfb13d3ab532853a278b6572c6f678ce846980669e41029d205653460 languageName: node linkType: hard @@ -4097,10 +4097,10 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^0.0.50": - version: 0.0.50 - resolution: "@types/estree@npm:0.0.50" - checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922 +"@types/estree@npm:*, @types/estree@npm:^0.0.51": + version: 0.0.51 + resolution: "@types/estree@npm:0.0.51" + checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189 languageName: node linkType: hard @@ -5292,12 +5292,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.4.1, acorn@npm:^8.5.0": - version: 8.7.0 - resolution: "acorn@npm:8.7.0" +"acorn@npm:^8.5.0, acorn@npm:^8.7.1": + version: 8.8.1 + resolution: "acorn@npm:8.8.1" bin: acorn: bin/acorn - checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 + checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f languageName: node linkType: hard @@ -7615,13 +7615,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.8.3": - version: 5.8.3 - resolution: "enhanced-resolve@npm:5.8.3" +"enhanced-resolve@npm:^5.10.0": + version: 5.12.0 + resolution: "enhanced-resolve@npm:5.12.0" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: d79fbe531106448b768bb0673fb623ec0202d7ee70373ab7d4f4745d5dfe0806f38c9db7e7da8c941288fe475ab3d538db3791fce522056eeea40ca398c9e287 + checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174 languageName: node linkType: hard @@ -9171,7 +9171,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -9625,7 +9625,7 @@ fsevents@^1.2.7: vis-network: ^8.5.4 vue: ^2.6.12 vue2-daterange-picker: ^0.5.1 - webpack: ^5.55.1 + webpack: ^5.75.0 webpack-cli: ^4.8.0 webpack-dev-server: ^4.11.1 webpack-manifest-plugin: ^4.0.2 @@ -10775,13 +10775,20 @@ fsevents@^1.2.7: languageName: node linkType: hard -"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": +"json-parse-better-errors@npm:^1.0.1": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d languageName: node linkType: hard +"json-parse-even-better-errors@npm:^2.3.1": + version: 2.3.1 + resolution: "json-parse-even-better-errors@npm:2.3.1" + checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f + languageName: node + linkType: hard + "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -16008,13 +16015,13 @@ typescript@^3.8.3: languageName: node linkType: hard -"watchpack@npm:^2.2.0": - version: 2.2.0 - resolution: "watchpack@npm:2.2.0" +"watchpack@npm:^2.4.0": + version: 2.4.0 + resolution: "watchpack@npm:2.4.0" dependencies: glob-to-regexp: ^0.4.1 graceful-fs: ^4.1.2 - checksum: e275f48fae29edee3195c51a8312b609581b9be5ce323d3102ffd082cb124f48d7a393ce05e4110239e4354379e04d78a97ceb26ae367746e7e218bf258135c8 + checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131 languageName: node linkType: hard @@ -16188,47 +16195,47 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-sources@npm:^3.2.0": - version: 3.2.1 - resolution: "webpack-sources@npm:3.2.1" - checksum: 438ee4759f70ee2d5ae17a2fc5e66a1f71f0ba8ad9de77edfaf4180c82925f6504790c5a1ddfa2a6d409212cd9e7332a6822d6acabb0f39303bc3b14354872e6 +"webpack-sources@npm:^3.2.3": + version: 3.2.3 + resolution: "webpack-sources@npm:3.2.3" + checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607 languageName: node linkType: hard -"webpack@npm:^5.55.1": - version: 5.55.1 - resolution: "webpack@npm:5.55.1" +"webpack@npm:^5.75.0": + version: 5.75.0 + resolution: "webpack@npm:5.75.0" dependencies: - "@types/eslint-scope": ^3.7.0 - "@types/estree": ^0.0.50 + "@types/eslint-scope": ^3.7.3 + "@types/estree": ^0.0.51 "@webassemblyjs/ast": 1.11.1 "@webassemblyjs/wasm-edit": 1.11.1 "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.4.1 + acorn: ^8.7.1 acorn-import-assertions: ^1.7.6 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.8.3 + enhanced-resolve: ^5.10.0 es-module-lexer: ^0.9.0 eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 - graceful-fs: ^4.2.4 - json-parse-better-errors: ^1.0.2 + graceful-fs: ^4.2.9 + json-parse-even-better-errors: ^2.3.1 loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 schema-utils: ^3.1.0 tapable: ^2.1.1 terser-webpack-plugin: ^5.1.3 - watchpack: ^2.2.0 - webpack-sources: ^3.2.0 + watchpack: ^2.4.0 + webpack-sources: ^3.2.3 peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 70b447f76d4320bd82229cf7b787c6067c40d35142295408dd662eaa3bdf0d97f587d7913b981e4cc25cff08bb14307b85c18ed4a7b270b22e6586c5770d3f1e + checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a languageName: node linkType: hard From 558f5232076544d3882d480e1e4ab8bf1291618a Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 19 Jan 2023 03:35:33 -0500 Subject: [PATCH 19/28] Add initial Thread panel (#15126) * Add initial Thread panel * Add link to Matter panel --- src/data/thread.ts | 11 +++ src/panels/config/ha-panel-config.ts | 7 ++ .../integrations/ha-integration-card.ts | 1 + .../matter/matter-config-panel.ts | 26 +++++-- .../thread/thread-config-panel.ts | 73 +++++++++++++++++++ 5 files changed, 112 insertions(+), 6 deletions(-) create mode 100644 src/data/thread.ts create mode 100644 src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts diff --git a/src/data/thread.ts b/src/data/thread.ts new file mode 100644 index 0000000000..e58111ee12 --- /dev/null +++ b/src/data/thread.ts @@ -0,0 +1,11 @@ +import { HomeAssistant } from "../types"; + +export interface ThreadInfo { + url: string; + active_dataset_tlvs: string; +} + +export const threadGetInfo = (hass: HomeAssistant): Promise => + hass.callWS({ + type: "otbr/info", + }); diff --git a/src/panels/config/ha-panel-config.ts b/src/panels/config/ha-panel-config.ts index 71c452a02c..6e3714bbfe 100644 --- a/src/panels/config/ha-panel-config.ts +++ b/src/panels/config/ha-panel-config.ts @@ -485,6 +485,13 @@ class HaPanelConfig extends HassRouterPage { "./integrations/integration-panels/matter/matter-config-panel" ), }, + thread: { + tag: "thread-config-panel", + load: () => + import( + "./integrations/integration-panels/thread/thread-config-panel" + ), + }, application_credentials: { tag: "ha-config-application-credentials", load: () => diff --git a/src/panels/config/integrations/ha-integration-card.ts b/src/panels/config/integrations/ha-integration-card.ts index 5d3b7096c7..5fa1fba1d1 100644 --- a/src/panels/config/integrations/ha-integration-card.ts +++ b/src/panels/config/integrations/ha-integration-card.ts @@ -79,6 +79,7 @@ const integrationsWithPanel = { zha: "/config/zha/dashboard", zwave_js: "/config/zwave_js/dashboard", matter: "/config/matter", + otbr: "/config/thread", }; @customElement("ha-integration-card") diff --git a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts index 77fa19ca74..eeb35d3e84 100644 --- a/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts +++ b/src/panels/config/integrations/integration-panels/matter/matter-config-panel.ts @@ -14,6 +14,7 @@ import { HomeAssistant } from "../../../../../types"; import "../../../../../components/ha-alert"; import { showPromptDialog } from "../../../../../dialogs/generic/show-dialog-box"; import { navigate } from "../../../../../common/navigate"; +import { isComponentLoaded } from "../../../../../common/config/is_component_loaded"; @customElement("matter-config-panel") export class MatterConfigPanel extends LitElement { @@ -32,18 +33,24 @@ export class MatterConfigPanel extends LitElement { protected render(): TemplateResult { return html` + ${isComponentLoaded(this.hass, "otbr") + ? html` + + Visit Thread Panel + + ` + : ""}
+ Matter is still in the early phase of development, it is not + meant to be used in production. This panel is for development + only.
${this._error ? html`${this._error}` : ""} - Matter is still in the early phase of development, it is not - meant to be used in production. This panel is for development - only. - You can add Matter devices by commissing them if they are not setup yet, or share them from another controller and enter the share code. @@ -199,6 +206,10 @@ export class MatterConfigPanel extends LitElement { static styles = [ haStyle, css` + ha-alert[alert-type="warning"] { + position: relative; + top: -16px; + } .content { padding: 24px 0 32px; max-width: 600px; @@ -208,6 +219,9 @@ export class MatterConfigPanel extends LitElement { ha-card:first-child { margin-bottom: 16px; } + a[slot="toolbar-icon"] { + text-decoration: none; + } `, ]; } diff --git a/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts new file mode 100644 index 0000000000..138318511e --- /dev/null +++ b/src/panels/config/integrations/integration-panels/thread/thread-config-panel.ts @@ -0,0 +1,73 @@ +import "@material/mwc-button"; +import { css, html, LitElement, PropertyValues, TemplateResult } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import "../../../../../components/ha-card"; +import "../../../../../layouts/hass-subpage"; +import { haStyle } from "../../../../../resources/styles"; +import { HomeAssistant } from "../../../../../types"; +import { threadGetInfo, ThreadInfo } from "../../../../../data/thread"; + +@customElement("thread-config-panel") +export class ThreadConfigPanel extends LitElement { + @property({ attribute: false }) public hass!: HomeAssistant; + + @property({ type: Boolean }) public narrow!: boolean; + + @state() private _info?: ThreadInfo; + + protected render(): TemplateResult { + return html` + +
+ +
+ ${!this._info + ? html`` + : html` + + + + + + + + + +
URL${this._info.url}
Active Dataset TLVs${this._info.active_dataset_tlvs || "-"}
+ `} +
+
+
+
+ `; + } + + protected override firstUpdated(changedProps: PropertyValues) { + super.firstUpdated(changedProps); + + threadGetInfo(this.hass).then((info) => { + this._info = info; + }); + } + + static styles = [ + haStyle, + css` + .content { + padding: 24px 0 32px; + max-width: 600px; + margin: 0 auto; + direction: ltr; + } + ha-card:first-child { + margin-bottom: 16px; + } + `, + ]; +} + +declare global { + interface HTMLElementTagNameMap { + "thread-config-panel": ThreadConfigPanel; + } +} From 2f1d783d2212ca9a764ac71dabbbaf6a81ebefa2 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Thu, 19 Jan 2023 09:48:34 +0100 Subject: [PATCH 20/28] Revert "Bump webpack from 5.55.1 to 5.75.0" (#15142) Revert "Bump webpack from 5.55.1 to 5.75.0 (#15080)" This reverts commit c7f4693f0ab6d7588bf07bc5979dae42aafbf444. --- package.json | 2 +- yarn.lock | 85 ++++++++++++++++++++++++---------------------------- 2 files changed, 40 insertions(+), 47 deletions(-) diff --git a/package.json b/package.json index 07962d81ae..ed2cc45f66 100644 --- a/package.json +++ b/package.json @@ -236,7 +236,7 @@ "typescript": "^4.9.4", "vinyl-buffer": "^1.0.1", "vinyl-source-stream": "^2.0.0", - "webpack": "^5.75.0", + "webpack": "^5.55.1", "webpack-cli": "^4.8.0", "webpack-dev-server": "^4.11.1", "webpack-manifest-plugin": "^4.0.2", diff --git a/yarn.lock b/yarn.lock index 6e55c91426..9b35f426fa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4077,13 +4077,13 @@ __metadata: languageName: node linkType: hard -"@types/eslint-scope@npm:^3.7.3": - version: 3.7.4 - resolution: "@types/eslint-scope@npm:3.7.4" +"@types/eslint-scope@npm:^3.7.0": + version: 3.7.0 + resolution: "@types/eslint-scope@npm:3.7.0" dependencies: "@types/eslint": "*" "@types/estree": "*" - checksum: ea6a9363e92f301cd3888194469f9ec9d0021fe0a397a97a6dd689e7545c75de0bd2153dfb13d3ab532853a278b6572c6f678ce846980669e41029d205653460 + checksum: 86b54f375259fe97955660b08215895b38769cd5c054d6120ded129ee94d36115d7e3bca31ca61bddcd8fc7bd168bc6fb74ccf25521c9744d9e47682c047d876 languageName: node linkType: hard @@ -4097,10 +4097,10 @@ __metadata: languageName: node linkType: hard -"@types/estree@npm:*, @types/estree@npm:^0.0.51": - version: 0.0.51 - resolution: "@types/estree@npm:0.0.51" - checksum: e56a3bcf759fd9185e992e7fdb3c6a5f81e8ff120e871641607581fb3728d16c811702a7d40fa5f869b7f7b4437ab6a87eb8d98ffafeee51e85bbe955932a189 +"@types/estree@npm:*, @types/estree@npm:^0.0.50": + version: 0.0.50 + resolution: "@types/estree@npm:0.0.50" + checksum: 9a2b6a4a8c117f34d08fbda5e8f69b1dfb109f7d149b60b00fd7a9fb6ac545c078bc590aa4ec2f0a256d680cf72c88b3b28b60c326ee38a7bc8ee1ee95624922 languageName: node linkType: hard @@ -5292,12 +5292,12 @@ __metadata: languageName: node linkType: hard -"acorn@npm:^8.5.0, acorn@npm:^8.7.1": - version: 8.8.1 - resolution: "acorn@npm:8.8.1" +"acorn@npm:^8.4.1, acorn@npm:^8.5.0": + version: 8.7.0 + resolution: "acorn@npm:8.7.0" bin: acorn: bin/acorn - checksum: 4079b67283b94935157698831967642f24a075c52ce3feaaaafe095776dfbe15d86a1b33b1e53860fc0d062ed6c83f4284a5c87c85b9ad51853a01173da6097f + checksum: e0f79409d68923fbf1aa6d4166f3eedc47955320d25c89a20cc822e6ba7c48c5963d5bc657bc242d68f7a4ac9faf96eef033e8f73656da6c640d4219935fdfd0 languageName: node linkType: hard @@ -7615,13 +7615,13 @@ __metadata: languageName: node linkType: hard -"enhanced-resolve@npm:^5.10.0": - version: 5.12.0 - resolution: "enhanced-resolve@npm:5.12.0" +"enhanced-resolve@npm:^5.8.3": + version: 5.8.3 + resolution: "enhanced-resolve@npm:5.8.3" dependencies: graceful-fs: ^4.2.4 tapable: ^2.2.0 - checksum: bf3f787facaf4ce3439bef59d148646344e372bef5557f0d37ea8aa02c51f50a925cd1f07b8d338f18992c29f544ec235a8c64bcdb56030196c48832a5494174 + checksum: d79fbe531106448b768bb0673fb623ec0202d7ee70373ab7d4f4745d5dfe0806f38c9db7e7da8c941288fe475ab3d538db3791fce522056eeea40ca398c9e287 languageName: node linkType: hard @@ -9171,7 +9171,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.9": +"graceful-fs@npm:^4.0.0, graceful-fs@npm:^4.1.11, graceful-fs@npm:^4.1.2, graceful-fs@npm:^4.1.6, graceful-fs@npm:^4.2.0, graceful-fs@npm:^4.2.10, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": version: 4.2.10 resolution: "graceful-fs@npm:4.2.10" checksum: 3f109d70ae123951905d85032ebeae3c2a5a7a997430df00ea30df0e3a6c60cf6689b109654d6fdacd28810a053348c4d14642da1d075049e6be1ba5216218da @@ -9625,7 +9625,7 @@ fsevents@^1.2.7: vis-network: ^8.5.4 vue: ^2.6.12 vue2-daterange-picker: ^0.5.1 - webpack: ^5.75.0 + webpack: ^5.55.1 webpack-cli: ^4.8.0 webpack-dev-server: ^4.11.1 webpack-manifest-plugin: ^4.0.2 @@ -10775,20 +10775,13 @@ fsevents@^1.2.7: languageName: node linkType: hard -"json-parse-better-errors@npm:^1.0.1": +"json-parse-better-errors@npm:^1.0.1, json-parse-better-errors@npm:^1.0.2": version: 1.0.2 resolution: "json-parse-better-errors@npm:1.0.2" checksum: ff2b5ba2a70e88fd97a3cb28c1840144c5ce8fae9cbeeddba15afa333a5c407cf0e42300cd0a2885dbb055227fe68d405070faad941beeffbfde9cf3b2c78c5d languageName: node linkType: hard -"json-parse-even-better-errors@npm:^2.3.1": - version: 2.3.1 - resolution: "json-parse-even-better-errors@npm:2.3.1" - checksum: 798ed4cf3354a2d9ccd78e86d2169515a0097a5c133337807cdf7f1fc32e1391d207ccfc276518cc1d7d8d4db93288b8a50ba4293d212ad1336e52a8ec0a941f - languageName: node - linkType: hard - "json-schema-traverse@npm:^0.4.1": version: 0.4.1 resolution: "json-schema-traverse@npm:0.4.1" @@ -16015,13 +16008,13 @@ typescript@^3.8.3: languageName: node linkType: hard -"watchpack@npm:^2.4.0": - version: 2.4.0 - resolution: "watchpack@npm:2.4.0" +"watchpack@npm:^2.2.0": + version: 2.2.0 + resolution: "watchpack@npm:2.2.0" dependencies: glob-to-regexp: ^0.4.1 graceful-fs: ^4.1.2 - checksum: 23d4bc58634dbe13b86093e01c6a68d8096028b664ab7139d58f0c37d962d549a940e98f2f201cecdabd6f9c340338dc73ef8bf094a2249ef582f35183d1a131 + checksum: e275f48fae29edee3195c51a8312b609581b9be5ce323d3102ffd082cb124f48d7a393ce05e4110239e4354379e04d78a97ceb26ae367746e7e218bf258135c8 languageName: node linkType: hard @@ -16195,47 +16188,47 @@ typescript@^3.8.3: languageName: node linkType: hard -"webpack-sources@npm:^3.2.3": - version: 3.2.3 - resolution: "webpack-sources@npm:3.2.3" - checksum: 989e401b9fe3536529e2a99dac8c1bdc50e3a0a2c8669cbafad31271eadd994bc9405f88a3039cd2e29db5e6d9d0926ceb7a1a4e7409ece021fe79c37d9c4607 +"webpack-sources@npm:^3.2.0": + version: 3.2.1 + resolution: "webpack-sources@npm:3.2.1" + checksum: 438ee4759f70ee2d5ae17a2fc5e66a1f71f0ba8ad9de77edfaf4180c82925f6504790c5a1ddfa2a6d409212cd9e7332a6822d6acabb0f39303bc3b14354872e6 languageName: node linkType: hard -"webpack@npm:^5.75.0": - version: 5.75.0 - resolution: "webpack@npm:5.75.0" +"webpack@npm:^5.55.1": + version: 5.55.1 + resolution: "webpack@npm:5.55.1" dependencies: - "@types/eslint-scope": ^3.7.3 - "@types/estree": ^0.0.51 + "@types/eslint-scope": ^3.7.0 + "@types/estree": ^0.0.50 "@webassemblyjs/ast": 1.11.1 "@webassemblyjs/wasm-edit": 1.11.1 "@webassemblyjs/wasm-parser": 1.11.1 - acorn: ^8.7.1 + acorn: ^8.4.1 acorn-import-assertions: ^1.7.6 browserslist: ^4.14.5 chrome-trace-event: ^1.0.2 - enhanced-resolve: ^5.10.0 + enhanced-resolve: ^5.8.3 es-module-lexer: ^0.9.0 eslint-scope: 5.1.1 events: ^3.2.0 glob-to-regexp: ^0.4.1 - graceful-fs: ^4.2.9 - json-parse-even-better-errors: ^2.3.1 + graceful-fs: ^4.2.4 + json-parse-better-errors: ^1.0.2 loader-runner: ^4.2.0 mime-types: ^2.1.27 neo-async: ^2.6.2 schema-utils: ^3.1.0 tapable: ^2.1.1 terser-webpack-plugin: ^5.1.3 - watchpack: ^2.4.0 - webpack-sources: ^3.2.3 + watchpack: ^2.2.0 + webpack-sources: ^3.2.0 peerDependenciesMeta: webpack-cli: optional: true bin: webpack: bin/webpack.js - checksum: 2bcc5f3c195f375944e8af2f00bf2feea39cb9fda5f763b0d1b00077f1c51783db25c94d3fae96a07dead9fa085e6ae7474417e5ab31719c9776ea5969ceb83a + checksum: 70b447f76d4320bd82229cf7b787c6067c40d35142295408dd662eaa3bdf0d97f587d7913b981e4cc25cff08bb14307b85c18ed4a7b270b22e6586c5770d3f1e languageName: node linkType: hard From d3e20429a46633a85e671a955c3efaa4d01a7431 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Thu, 19 Jan 2023 10:28:03 -0500 Subject: [PATCH 21/28] Prepare conversation agent (#15135) --- src/data/conversation.ts | 9 +++++++++ .../voice-command-dialog/ha-voice-command-dialog.ts | 2 ++ 2 files changed, 11 insertions(+) diff --git a/src/data/conversation.ts b/src/data/conversation.ts index b448876dfd..62b653ea30 100644 --- a/src/data/conversation.ts +++ b/src/data/conversation.ts @@ -84,3 +84,12 @@ export const setConversationOnboarding = ( type: "conversation/onboarding/set", shown: value, }); + +export const prepareConversation = ( + hass: HomeAssistant, + language?: string +): Promise => + hass.callWS({ + type: "conversation/prepare", + language, + }); 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 2a6dacdd83..927ef9df53 100644 --- a/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts +++ b/src/dialogs/voice-command-dialog/ha-voice-command-dialog.ts @@ -22,6 +22,7 @@ import type { HaTextField } from "../../components/ha-textfield"; import { AgentInfo, getAgentInfo, + prepareConversation, processConversationInput, setConversationOnboarding, } from "../../data/conversation"; @@ -220,6 +221,7 @@ export class HaVoiceCommandDialog extends LitElement { text: this.hass.localize("ui.dialogs.voice_command.how_can_i_help"), }, ]; + prepareConversation(this.hass, this.hass.language); } protected updated(changedProps: PropertyValues) { From a5c77928d2c004b7f0e014c0ee1bd4082032b5dd Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 09:17:34 -0500 Subject: [PATCH 22/28] Bump eslint-plugin-wc from 1.3.2 to 1.4.0 (#15139) Bumps [eslint-plugin-wc](https://github.com/43081j/eslint-plugin-wc) from 1.3.2 to 1.4.0. - [Release notes](https://github.com/43081j/eslint-plugin-wc/releases) - [Changelog](https://github.com/43081j/eslint-plugin-wc/blob/master/CHANGELOG.md) - [Commits](https://github.com/43081j/eslint-plugin-wc/commits) --- updated-dependencies: - dependency-name: eslint-plugin-wc 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 ed2cc45f66..41bfe1520c 100644 --- a/package.json +++ b/package.json @@ -196,7 +196,7 @@ "eslint-plugin-import": "^2.24.2", "eslint-plugin-lit": "^1.6.1", "eslint-plugin-unused-imports": "^1.1.5", - "eslint-plugin-wc": "^1.3.2", + "eslint-plugin-wc": "^1.4.0", "fancy-log": "^2.0.0", "fs-extra": "^11.1.0", "glob": "^7.2.0", diff --git a/yarn.lock b/yarn.lock index 9b35f426fa..3c9d2420e1 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7940,15 +7940,15 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-wc@npm:^1.3.2": - version: 1.3.2 - resolution: "eslint-plugin-wc@npm:1.3.2" +"eslint-plugin-wc@npm:^1.4.0": + version: 1.4.0 + resolution: "eslint-plugin-wc@npm:1.4.0" dependencies: is-valid-element-name: ^1.0.0 js-levenshtein-esm: ^1.2.0 peerDependencies: eslint: ">=5" - checksum: 0661d8b61abc3e29396de3b78cbaa71517dca769f6ad19d43db3055659667b941b2a4e7757865c71924ea5febb2fde7ee4ff6d0f7ba41587ff5136f60f661503 + checksum: 64e7174f47197c91e57702a739db94d6803a817bd40ad6ac82260653430442649140e20f7fbc789ec6758da3ce3eaefd15266e5cbeb344b6500fcbcec596ba05 languageName: node linkType: hard @@ -9554,7 +9554,7 @@ fsevents@^1.2.7: eslint-plugin-import: ^2.24.2 eslint-plugin-lit: ^1.6.1 eslint-plugin-unused-imports: ^1.1.5 - eslint-plugin-wc: ^1.3.2 + eslint-plugin-wc: ^1.4.0 fancy-log: ^2.0.0 fs-extra: ^11.1.0 fuse.js: ^6.0.0 From 4c76a2549bbac4110284000c881f505f8d83cb6c Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 14:39:06 +0000 Subject: [PATCH 23/28] Bump glob and @types/glob (#15138) Bumps [glob](https://github.com/isaacs/node-glob) and [@types/glob](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/glob). These dependencies needed to be updated together. Updates `glob` from 7.2.0 to 8.1.0 - [Release notes](https://github.com/isaacs/node-glob/releases) - [Changelog](https://github.com/isaacs/node-glob/blob/main/changelog.md) - [Commits](https://github.com/isaacs/node-glob/compare/v7.2.0...v8.1.0) Updates `@types/glob` from 7.2.0 to 8.0.0 - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/glob) --- updated-dependencies: - dependency-name: glob dependency-type: direct:development update-type: version-update:semver-major - dependency-name: "@types/glob" dependency-type: direct:development 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 | 4 ++-- yarn.lock | 55 ++++++++++++++++++++++++++++++++++++++++------------ 2 files changed, 45 insertions(+), 14 deletions(-) diff --git a/package.json b/package.json index 41bfe1520c..2bfe4a7882 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "@rollup/plugin-replace": "^2.3.2", "@types/chromecast-caf-receiver": "5.0.12", "@types/chromecast-caf-sender": "^1.0.3", - "@types/glob": "^7", + "@types/glob": "^8", "@types/hammerjs": "^2.0.41", "@types/js-yaml": "^4", "@types/leaflet": "^1", @@ -199,7 +199,7 @@ "eslint-plugin-wc": "^1.4.0", "fancy-log": "^2.0.0", "fs-extra": "^11.1.0", - "glob": "^7.2.0", + "glob": "^8.1.0", "gulp": "^4.0.2", "gulp-flatmap": "^1.0.2", "gulp-json-transform": "^0.4.6", diff --git a/yarn.lock b/yarn.lock index 3c9d2420e1..668325bb16 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4157,13 +4157,13 @@ __metadata: languageName: node linkType: hard -"@types/glob@npm:^7": - version: 7.2.0 - resolution: "@types/glob@npm:7.2.0" +"@types/glob@npm:^8": + version: 8.0.1 + resolution: "@types/glob@npm:8.0.1" dependencies: - "@types/minimatch": "*" + "@types/minimatch": ^5.1.2 "@types/node": "*" - checksum: 6ae717fedfdfdad25f3d5a568323926c64f52ef35897bcac8aca8e19bc50c0bd84630bbd063e5d52078b2137d8e7d3c26eabebd1a2f03ff350fff8a91e79fc19 + checksum: 98f3d0403c09638348a2f3b30aac2a3d6bdc306bce3ceb868f4794fef4f02727ccdf0dab0c7b7d65fd38a1afa1e48f02de56d29d2babe94ee9b204ca54acb31f languageName: node linkType: hard @@ -4305,10 +4305,10 @@ __metadata: languageName: node linkType: hard -"@types/minimatch@npm:*": - version: 3.0.3 - resolution: "@types/minimatch@npm:3.0.3" - checksum: b80259d55b96ef24cb3bb961b6dc18b943f2bb8838b4d8e7bead204f3173e551a416ffa49f9aaf1dc431277fffe36214118628eacf4aea20119df8835229901b +"@types/minimatch@npm:^5.1.2": + version: 5.1.2 + resolution: "@types/minimatch@npm:5.1.2" + checksum: 0391a282860c7cb6fe262c12b99564732401bdaa5e395bee9ca323c312c1a0f45efbf34dce974682036e857db59a5c9b1da522f3d6055aeead7097264c8705a8 languageName: node linkType: hard @@ -6129,6 +6129,15 @@ __metadata: languageName: node linkType: hard +"brace-expansion@npm:^2.0.1": + version: 2.0.1 + resolution: "brace-expansion@npm:2.0.1" + dependencies: + balanced-match: ^1.0.0 + checksum: a61e7cd2e8a8505e9f0036b3b6108ba5e926b4b55089eeb5550cd04a471fe216c96d4fe7e4c7f995c728c554ae20ddfc4244cad10aef255e72b62930afd233d1 + languageName: node + linkType: hard + "braces@npm:^2.3.1, braces@npm:^2.3.2": version: 2.3.2 resolution: "braces@npm:2.3.2" @@ -9064,7 +9073,7 @@ fsevents@^1.2.7: languageName: node linkType: hard -"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6, glob@npm:^7.2.0": +"glob@npm:^7.1.1, glob@npm:^7.1.2, glob@npm:^7.1.3, glob@npm:^7.1.4, glob@npm:^7.1.6": version: 7.2.0 resolution: "glob@npm:7.2.0" dependencies: @@ -9078,6 +9087,19 @@ fsevents@^1.2.7: languageName: node linkType: hard +"glob@npm:^8.1.0": + version: 8.1.0 + resolution: "glob@npm:8.1.0" + dependencies: + fs.realpath: ^1.0.0 + inflight: ^1.0.4 + inherits: 2 + minimatch: ^5.0.1 + once: ^1.3.0 + checksum: 92fbea3221a7d12075f26f0227abac435de868dd0736a17170663783296d0dd8d3d532a5672b4488a439bf5d7fb85cdd07c11185d6cd39184f0385cbdfb86a47 + languageName: node + linkType: hard + "global-modules@npm:^1.0.0": version: 1.0.0 resolution: "global-modules@npm:1.0.0" @@ -9510,7 +9532,7 @@ fsevents@^1.2.7: "@thomasloven/round-slider": 0.6.0 "@types/chromecast-caf-receiver": 5.0.12 "@types/chromecast-caf-sender": ^1.0.3 - "@types/glob": ^7 + "@types/glob": ^8 "@types/hammerjs": ^2.0.41 "@types/js-yaml": ^4 "@types/leaflet": ^1 @@ -9558,7 +9580,7 @@ fsevents@^1.2.7: fancy-log: ^2.0.0 fs-extra: ^11.1.0 fuse.js: ^6.0.0 - glob: ^7.2.0 + glob: ^8.1.0 google-timezones-json: ^1.0.2 gulp: ^4.0.2 gulp-flatmap: ^1.0.2 @@ -11725,6 +11747,15 @@ fsevents@^1.2.7: languageName: node linkType: hard +"minimatch@npm:^5.0.1": + version: 5.1.6 + resolution: "minimatch@npm:5.1.6" + dependencies: + brace-expansion: ^2.0.1 + checksum: 7564208ef81d7065a370f788d337cd80a689e981042cb9a1d0e6580b6c6a8c9279eba80010516e258835a988363f99f54a6f711a315089b8b42694f5da9d0d77 + languageName: node + linkType: hard + "minimist@npm:^1.2.0, minimist@npm:^1.2.5": version: 1.2.7 resolution: "minimist@npm:1.2.7" From dc140f132d0bae5f368bc5c86966dc37b5dc3529 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 20 Jan 2023 10:08:16 -0500 Subject: [PATCH 24/28] Bump @types/js-yaml from 4.0.3 to 4.0.5 (#15140) Bumps [@types/js-yaml](https://github.com/DefinitelyTyped/DefinitelyTyped/tree/HEAD/types/js-yaml) from 4.0.3 to 4.0.5. - [Release notes](https://github.com/DefinitelyTyped/DefinitelyTyped/releases) - [Commits](https://github.com/DefinitelyTyped/DefinitelyTyped/commits/HEAD/types/js-yaml) --- updated-dependencies: - dependency-name: "@types/js-yaml" 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> --- yarn.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/yarn.lock b/yarn.lock index 668325bb16..f4d77e3f0e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4205,9 +4205,9 @@ __metadata: linkType: hard "@types/js-yaml@npm:^4": - version: 4.0.3 - resolution: "@types/js-yaml@npm:4.0.3" - checksum: 4be74c029f3fe4ab01f382481521c15bc79c96589747f588f8d3b92e97b8e04ffbe208451d24c99fd289593ff5325710eb83d267c8f2449d3248299f909003d7 + version: 4.0.5 + resolution: "@types/js-yaml@npm:4.0.5" + checksum: 7dcac8c50fec31643cc9d6444b5503239a861414cdfaa7ae9a38bc22597c4d850c4b8cec3d82d73b3fbca408348ce223b0408d598b32e094470dfffc6d486b4d languageName: node linkType: hard From 522c7c08a9b20260750b7a05be3007a20841c7a3 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 21 Jan 2023 01:48:22 -0500 Subject: [PATCH 25/28] Bump hls.js from 1.2.5 to 1.3.1 (#15128) Bumps [hls.js](https://github.com/video-dev/hls.js) from 1.2.5 to 1.3.1. - [Release notes](https://github.com/video-dev/hls.js/releases) - [Changelog](https://github.com/video-dev/hls.js/blob/master/docs/release-process.md) - [Commits](https://github.com/video-dev/hls.js/compare/v1.2.5...v1.3.1) --- updated-dependencies: - dependency-name: hls.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 2bfe4a7882..e66b12eb27 100644 --- a/package.json +++ b/package.json @@ -108,7 +108,7 @@ "fuse.js": "^6.0.0", "google-timezones-json": "^1.0.2", "hammerjs": "^2.0.8", - "hls.js": "^1.2.5", + "hls.js": "^1.3.1", "home-assistant-js-websocket": "^8.0.1", "idb-keyval": "^5.1.3", "intl-messageformat": "^9.9.1", diff --git a/yarn.lock b/yarn.lock index f4d77e3f0e..8602de1a44 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9434,10 +9434,10 @@ fsevents@^1.2.7: languageName: node linkType: hard -"hls.js@npm:^1.2.5": - version: 1.2.5 - resolution: "hls.js@npm:1.2.5" - checksum: f143d854fd2eba3814f2fb3b7aefc1fe5e3faedce07884a52f079e65bf86e5fd99544ba76abd9fe33779c81f42b68e630eb95912e090af18cc061942ef1a4868 +"hls.js@npm:^1.3.1": + version: 1.3.1 + resolution: "hls.js@npm:1.3.1" + checksum: 10f40e8d7acf762b715575d6a34b0dfea3404f2e8b45c56eb2822791128b1ecb6978c0643a7dc027a9e434682e79686a860649a01ff1c9eed1957024ff037ee6 languageName: node linkType: hard @@ -9589,7 +9589,7 @@ fsevents@^1.2.7: gulp-rename: ^2.0.0 gulp-zopfli-green: ^3.0.1 hammerjs: ^2.0.8 - hls.js: ^1.2.5 + hls.js: ^1.3.1 home-assistant-js-websocket: ^8.0.1 html-minifier: ^4.0.0 husky: ^8.0.1 From fd22afedd0415e6ff67c32324bbab4c8e0d4a54f Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Sat, 21 Jan 2023 22:23:14 -0500 Subject: [PATCH 26/28] Fix uncaught exception in quick-bar mixin (#15061) --- src/state/quick-bar-mixin.ts | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/src/state/quick-bar-mixin.ts b/src/state/quick-bar-mixin.ts index 8882cbcd3b..1c4661c397 100644 --- a/src/state/quick-bar-mixin.ts +++ b/src/state/quick-bar-mixin.ts @@ -2,6 +2,7 @@ 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, @@ -133,17 +134,17 @@ export default >(superClass: T) => } private _canOverrideAlphanumericInput(e: KeyboardEvent) { - const el = e.composedPath()[0] as any; + const el = e.composedPath()[0]; - if (el.tagName === "TEXTAREA") { + if (el instanceof HTMLTextAreaElement) { return false; } - if (el.parentElement.tagName === "HA-SELECT") { + if (el instanceof Element && el.parentElement instanceof HaSelect) { return false; } - if (el.tagName !== "INPUT") { + if (!(el instanceof HTMLInputElement)) { return true; } From 815d4c165dd27e9c826f459982c58c1e272b6451 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 21 Jan 2023 17:41:41 -1000 Subject: [PATCH 27/28] Add support for streaming history (#15112) * Add support for streaming history * Add support for streaming history * Add support for streaming history * Add support for streaming history * fixes * cleanup * redraw * naming is hard * drop cached history * backport * Update src/data/history.ts Co-authored-by: Paulus Schoutsen * Update src/data/history.ts Co-authored-by: Paulus Schoutsen * review * review * review * review * review * review * review * review * adjust * Revert "adjust" This reverts commit 6ba31da4a5a619a0da1bfbcfe18723de595e19aa. Co-authored-by: Paulus Schoutsen --- src/data/cached-history.ts | 200 ------------------ src/data/history.ts | 139 +++++++++++- src/dialogs/more-info/ha-more-info-history.ts | 98 ++++++--- .../lovelace/cards/hui-history-graph-card.ts | 134 ++++++++---- 4 files changed, 296 insertions(+), 275 deletions(-) delete mode 100644 src/data/cached-history.ts diff --git a/src/data/cached-history.ts b/src/data/cached-history.ts deleted file mode 100644 index 2e4bf825f4..0000000000 --- a/src/data/cached-history.ts +++ /dev/null @@ -1,200 +0,0 @@ -import { LocalizeFunc } from "../common/translations/localize"; -import { HomeAssistant } from "../types"; -import { - computeHistory, - HistoryStates, - HistoryResult, - LineChartUnit, - TimelineEntity, - entityIdHistoryNeedsAttributes, - fetchRecentWS, -} from "./history"; - -export interface CacheConfig { - cacheKey: string; - hoursToShow: number; -} - -interface CachedResults { - prom: Promise; - startTime: Date; - endTime: Date; - language: string; - data: HistoryResult; -} - -const stateHistoryCache: { [cacheKey: string]: CachedResults } = {}; - -// Cache type 2 functionality -function getEmptyCache( - language: string, - startTime: Date, - endTime: Date -): CachedResults { - return { - prom: Promise.resolve({ line: [], timeline: [] }), - language, - startTime, - endTime, - data: { line: [], timeline: [] }, - }; -} - -export const getRecentWithCache = ( - hass: HomeAssistant, - entityIds: string[], - cacheConfig: CacheConfig, - localize: LocalizeFunc, - language: string -) => { - const cacheKey = cacheConfig.cacheKey; - const fullCacheKey = cacheKey + `_${cacheConfig.hoursToShow}`; - const endTime = new Date(); - const startTime = new Date(endTime); - startTime.setHours(startTime.getHours() - cacheConfig.hoursToShow); - let toFetchStartTime = startTime; - let appendingToCache = false; - - let cache = stateHistoryCache[fullCacheKey]; - if ( - cache && - toFetchStartTime >= cache.startTime && - toFetchStartTime <= cache.endTime && - cache.language === language - ) { - toFetchStartTime = cache.endTime; - appendingToCache = true; - // This pretty much never happens as endTime is usually set to now - if (endTime <= cache.endTime) { - return cache.prom; - } - } else { - cache = stateHistoryCache[fullCacheKey] = getEmptyCache( - language, - startTime, - endTime - ); - } - - const curCacheProm = cache.prom; - const noAttributes = !entityIds.some((entityId) => - entityIdHistoryNeedsAttributes(hass, entityId) - ); - - const genProm = async () => { - let fetchedHistory: HistoryStates; - - try { - const results = await Promise.all([ - curCacheProm, - fetchRecentWS( - hass, - entityIds, - toFetchStartTime, - endTime, - appendingToCache, - undefined, - true, - noAttributes - ), - ]); - fetchedHistory = results[1]; - } catch (err: any) { - delete stateHistoryCache[fullCacheKey]; - throw err; - } - const stateHistory = computeHistory(hass, fetchedHistory, localize); - if (appendingToCache) { - if (stateHistory.line.length) { - mergeLine(stateHistory.line, cache.data.line); - } - if (stateHistory.timeline.length) { - mergeTimeline(stateHistory.timeline, cache.data.timeline); - // Replace the timeline array to force an update - cache.data.timeline = [...cache.data.timeline]; - } - pruneStartTime(startTime, cache.data); - } else { - cache.data = stateHistory; - } - return cache.data; - }; - - cache.prom = genProm(); - cache.startTime = startTime; - cache.endTime = endTime; - return cache.prom; -}; - -const mergeLine = ( - historyLines: LineChartUnit[], - cacheLines: LineChartUnit[] -) => { - historyLines.forEach((line) => { - const unit = line.unit; - const oldLine = cacheLines.find((cacheLine) => cacheLine.unit === unit); - if (oldLine) { - line.data.forEach((entity) => { - const oldEntity = oldLine.data.find( - (cacheEntity) => entity.entity_id === cacheEntity.entity_id - ); - if (oldEntity) { - oldEntity.states = oldEntity.states.concat(entity.states); - } else { - oldLine.data.push(entity); - } - }); - // Replace the cached line data to force an update - oldLine.data = [...oldLine.data]; - } else { - cacheLines.push(line); - } - }); -}; - -const mergeTimeline = ( - historyTimelines: TimelineEntity[], - cacheTimelines: TimelineEntity[] -) => { - historyTimelines.forEach((timeline) => { - const oldTimeline = cacheTimelines.find( - (cacheTimeline) => cacheTimeline.entity_id === timeline.entity_id - ); - if (oldTimeline) { - oldTimeline.data = oldTimeline.data.concat(timeline.data); - } else { - cacheTimelines.push(timeline); - } - }); -}; - -const pruneArray = (originalStartTime: Date, arr) => { - if (arr.length === 0) { - return arr; - } - const changedAfterStartTime = arr.findIndex( - (state) => new Date(state.last_changed) > originalStartTime - ); - if (changedAfterStartTime === 0) { - // If all changes happened after originalStartTime then we are done. - return arr; - } - - // If all changes happened at or before originalStartTime. Use last index. - const updateIndex = - changedAfterStartTime === -1 ? arr.length - 1 : changedAfterStartTime - 1; - arr[updateIndex].last_changed = originalStartTime; - return arr.slice(updateIndex); -}; - -const pruneStartTime = (originalStartTime: Date, cacheData: HistoryResult) => { - cacheData.line.forEach((line) => { - line.data.forEach((entity) => { - entity.states = pruneArray(originalStartTime, entity.states); - }); - }); - - cacheData.timeline.forEach((timeline) => { - timeline.data = pruneArray(originalStartTime, timeline.data); - }); -}; diff --git a/src/data/history.ts b/src/data/history.ts index 73688d4057..1f95af2552 100644 --- a/src/data/history.ts +++ b/src/data/history.ts @@ -17,6 +17,8 @@ const NEED_ATTRIBUTE_DOMAINS = [ "input_datetime", "thermostat", "water_heater", + "person", + "device_tracker", ]; const LINE_ATTRIBUTES_TO_KEEP = [ "temperature", @@ -68,7 +70,7 @@ export interface HistoryStates { [entityId: string]: EntityHistoryState[]; } -interface EntityHistoryState { +export interface EntityHistoryState { /** state */ s: string; /** attributes */ @@ -79,6 +81,12 @@ interface EntityHistoryState { lu: number; } +export interface HistoryStreamMessage { + states: HistoryStates; + start_time?: number; // Start time of this historical chunk + end_time?: number; // End time of this historical chunk +} + export const entityIdHistoryNeedsAttributes = ( hass: HomeAssistant, entityId: string @@ -174,6 +182,135 @@ export const fetchDateWS = ( return hass.callWS(params); }; +export const subscribeHistory = ( + hass: HomeAssistant, + callbackFunction: (message: HistoryStreamMessage) => void, + startTime: Date, + endTime: Date, + entityIds: string[] +): Promise<() => Promise> => { + const params = { + type: "history/stream", + entity_ids: entityIds, + start_time: startTime.toISOString(), + end_time: endTime.toISOString(), + minimal_response: true, + no_attributes: !entityIds.some((entityId) => + entityIdHistoryNeedsAttributes(hass, entityId) + ), + }; + return hass.connection.subscribeMessage( + (message) => callbackFunction(message), + params + ); +}; + +class HistoryStream { + hass: HomeAssistant; + + hoursToShow: number; + + combinedHistory: HistoryStates; + + constructor(hass: HomeAssistant, hoursToShow: number) { + this.hass = hass; + this.hoursToShow = hoursToShow; + this.combinedHistory = {}; + } + + processMessage(streamMessage: HistoryStreamMessage): HistoryStates { + if (!this.combinedHistory || !Object.keys(this.combinedHistory).length) { + this.combinedHistory = streamMessage.states; + return this.combinedHistory; + } + if (!Object.keys(streamMessage.states).length) { + // Empty messages are still sent to + // indicate no more historical events + return this.combinedHistory; + } + const purgeBeforePythonTime = + (new Date().getTime() - 60 * 60 * this.hoursToShow * 1000) / 1000; + const newHistory: HistoryStates = {}; + for (const entityId of Object.keys(this.combinedHistory)) { + newHistory[entityId] = []; + } + for (const entityId of Object.keys(streamMessage.states)) { + newHistory[entityId] = []; + } + for (const entityId of Object.keys(newHistory)) { + if ( + entityId in this.combinedHistory && + entityId in streamMessage.states + ) { + const entityCombinedHistory = this.combinedHistory[entityId]; + const lastEntityCombinedHistory = + entityCombinedHistory[entityCombinedHistory.length - 1]; + newHistory[entityId] = entityCombinedHistory.concat( + streamMessage.states[entityId] + ); + if ( + streamMessage.states[entityId][0].lu < lastEntityCombinedHistory.lu + ) { + // If the history is out of order we have to sort it. + newHistory[entityId] = newHistory[entityId].sort( + (a, b) => a.lu - b.lu + ); + } + } else if (entityId in this.combinedHistory) { + newHistory[entityId] = this.combinedHistory[entityId]; + } else { + newHistory[entityId] = streamMessage.states[entityId]; + } + // Remove old history + if (entityId in this.combinedHistory) { + const entityHistory = newHistory[entityId]; + while (entityHistory[0].lu < purgeBeforePythonTime) { + if (entityHistory.length > 1) { + if (entityHistory[1].lu < purgeBeforePythonTime) { + newHistory[entityId].shift(); + continue; + } + } + // Update the first entry to the start time state + // as we need to preserve the start time state and + // only expire the rest of the history as it ages. + entityHistory[0].lu = purgeBeforePythonTime; + break; + } + } + } + this.combinedHistory = newHistory; + return this.combinedHistory; + } +} + +export const subscribeHistoryStatesTimeWindow = ( + hass: HomeAssistant, + callbackFunction: (data: HistoryStates) => void, + hoursToShow: number, + entityIds: string[], + minimalResponse = true, + significantChangesOnly = true +): Promise<() => Promise> => { + const params = { + type: "history/stream", + entity_ids: entityIds, + start_time: new Date( + new Date().getTime() - 60 * 60 * hoursToShow * 1000 + ).toISOString(), + minimal_response: minimalResponse, + significant_changes_only: significantChangesOnly, + no_attributes: !entityIds.some((entityId) => + entityIdHistoryNeedsAttributes(hass, entityId) + ), + }; + const stream = new HistoryStream(hass, hoursToShow); + return hass.connection.subscribeMessage( + (message) => callbackFunction(stream.processMessage(message)), + params + ); +}; + const equalState = (obj1: LineChartState, obj2: LineChartState) => obj1.state === obj2.state && // Only compare attributes if both states have an attributes object. diff --git a/src/dialogs/more-info/ha-more-info-history.ts b/src/dialogs/more-info/ha-more-info-history.ts index 73061a09b9..dd2a5c1165 100644 --- a/src/dialogs/more-info/ha-more-info-history.ts +++ b/src/dialogs/more-info/ha-more-info-history.ts @@ -3,10 +3,12 @@ import { css, html, LitElement, PropertyValues, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; import { isComponentLoaded } from "../../common/config/is_component_loaded"; import { fireEvent } from "../../common/dom/fire_event"; -import { throttle } from "../../common/util/throttle"; import "../../components/chart/state-history-charts"; -import { getRecentWithCache } from "../../data/cached-history"; -import { HistoryResult } from "../../data/history"; +import { + HistoryResult, + subscribeHistoryStatesTimeWindow, + computeHistory, +} from "../../data/history"; import { fetchStatistics, getStatisticMetadata, @@ -39,9 +41,11 @@ export class MoreInfoHistory extends LitElement { private _statNames?: Record; - private _throttleGetStateHistory = throttle(() => { - this._getStateHistory(); - }, 10000); + private _interval?: number; + + private _subscribed?: Promise<(() => Promise) | void>; + + private _error?: string; protected render(): TemplateResult { if (!this.entityId) { @@ -59,7 +63,9 @@ export class MoreInfoHistory extends LitElement { )}
- ${this._statistics + ${this._error + ? html`
${this._error}
` + : this._statistics ? html` { + if (unsubscribe) { + unsubscribe(); + } + this._subscribed = undefined; + }); + } - if (this._statistics || !this.entityId || !changedProps.has("hass")) { - // Don't update statistics on a state update, as they only update every 5 minutes. - return; + private _redrawGraph() { + if (this._stateHistory) { + this._stateHistory = { ...this._stateHistory }; } + } - const oldHass = changedProps.get("hass") as HomeAssistant | undefined; - - if ( - oldHass && - this.hass.states[this.entityId] !== oldHass?.states[this.entityId] - ) { - // wait for commit of data (we only account for the default setting of 1 sec) - setTimeout(this._throttleGetStateHistory, 1000); - } + private _setRedrawTimer() { + // redraw the graph every minute to update the time axis + clearInterval(this._interval); + this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60); } private async _getStateHistory(): Promise { @@ -134,19 +161,32 @@ export class MoreInfoHistory extends LitElement { return; } } - if (!isComponentLoaded(this.hass, "history")) { + if (!isComponentLoaded(this.hass, "history") || this._subscribed) { return; } - this._stateHistory = await getRecentWithCache( + if (this._subscribed) { + this._unsubscribeHistoryTimeWindow(); + } + this._subscribed = subscribeHistoryStatesTimeWindow( this.hass!, - [this.entityId], - { - cacheKey: `more_info.${this.entityId}`, - hoursToShow: 24, + (combinedHistory) => { + if (!this._subscribed) { + // Message came in before we had a chance to unload + return; + } + this._stateHistory = computeHistory( + this.hass!, + combinedHistory, + this.hass!.localize + ); }, - this.hass!.localize, - this.hass!.language - ); + 24, + [this.entityId] + ).catch((err) => { + this._subscribed = undefined; + this._error = err; + }); + this._setRedrawTimer(); } private _close(): void { diff --git a/src/panels/lovelace/cards/hui-history-graph-card.ts b/src/panels/lovelace/cards/hui-history-graph-card.ts index c5bf22d9fb..2e6df7db54 100644 --- a/src/panels/lovelace/cards/hui-history-graph-card.ts +++ b/src/panels/lovelace/cards/hui-history-graph-card.ts @@ -8,11 +8,14 @@ import { } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; -import { throttle } from "../../../common/util/throttle"; import "../../../components/ha-card"; import "../../../components/chart/state-history-charts"; -import { CacheConfig, getRecentWithCache } from "../../../data/cached-history"; -import { HistoryResult } from "../../../data/history"; +import { isComponentLoaded } from "../../../common/config/is_component_loaded"; +import { + HistoryResult, + subscribeHistoryStatesTimeWindow, + computeHistory, +} from "../../../data/history"; import { HomeAssistant } from "../../../types"; import { hasConfigOrEntitiesChanged } from "../common/has-changed"; import { processConfigEntities } from "../common/process-config-entities"; @@ -42,11 +45,15 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { private _names: Record = {}; - private _cacheConfig?: CacheConfig; + private _entityIds: string[] = []; - private _fetching = false; + private _hoursToShow = 24; - private _throttleGetStateHistory?: () => void; + private _error?: string; + + private _interval?: number; + + private _subscribed?: Promise<(() => Promise) | void>; public getCardSize(): number { return this._config?.title @@ -67,27 +74,81 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { ? processConfigEntities(config.entities) : []; - const _entities: string[] = []; - this._configEntities.forEach((entity) => { - _entities.push(entity.entity); + this._entityIds.push(entity.entity); if (entity.name) { this._names[entity.entity] = entity.name; } }); - this._throttleGetStateHistory = throttle(() => { - this._getStateHistory(); - }, config.refresh_interval || 10 * 1000); - - this._cacheConfig = { - cacheKey: _entities.join(), - hoursToShow: config.hours_to_show || 24, - }; + this._hoursToShow = config.hours_to_show || 24; this._config = config; } + public connectedCallback() { + super.connectedCallback(); + if (this.hasUpdated) { + this._subscribeHistoryTimeWindow(); + } + } + + public disconnectedCallback() { + super.disconnectedCallback(); + this._unsubscribeHistoryTimeWindow(); + } + + private _subscribeHistoryTimeWindow() { + if (!isComponentLoaded(this.hass!, "history") || this._subscribed) { + return; + } + this._subscribed = subscribeHistoryStatesTimeWindow( + this.hass!, + (combinedHistory) => { + if (!this._subscribed) { + // Message came in before we had a chance to unload + return; + } + this._stateHistory = computeHistory( + this.hass!, + combinedHistory, + this.hass!.localize + ); + }, + this._hoursToShow, + this._entityIds + ).catch((err) => { + this._subscribed = undefined; + this._error = err; + }); + this._setRedrawTimer(); + } + + private _redrawGraph() { + if (this._stateHistory) { + this._stateHistory = { ...this._stateHistory }; + } + } + + private _setRedrawTimer() { + // redraw the graph every minute to update the time axis + clearInterval(this._interval); + this._interval = window.setInterval(() => this._redrawGraph(), 1000 * 60); + } + + private _unsubscribeHistoryTimeWindow() { + if (!this._subscribed) { + return; + } + clearInterval(this._interval); + this._subscribed.then((unsubscribe) => { + if (unsubscribe) { + unsubscribe(); + } + this._subscribed = undefined; + }); + } + protected shouldUpdate(changedProps: PropertyValues): boolean { if (changedProps.has("_stateHistory")) { return true; @@ -100,8 +161,8 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { if ( !this._config || !this.hass || - !this._throttleGetStateHistory || - !this._cacheConfig + !this._hoursToShow || + !this._entityIds.length ) { return; } @@ -116,13 +177,12 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { if ( changedProps.has("_config") && - (oldConfig?.entities !== this._config.entities || - oldConfig?.hours_to_show !== this._config.hours_to_show) + (!this._subscribed || + oldConfig?.entities !== this._config.entities || + oldConfig?.hours_to_show !== this._hoursToShow) ) { - this._throttleGetStateHistory(); - } else if (changedProps.has("hass")) { - // wait for commit of data (we only account for the default setting of 1 sec) - setTimeout(this._throttleGetStateHistory, 1000); + this._unsubscribeHistoryTimeWindow(); + this._subscribeHistoryTimeWindow(); } } @@ -131,6 +191,10 @@ export class HuiHistoryGraphCard extends LitElement implements LovelaceCard { return html``; } + if (this._error) { + return html`
${this._error}
`; + } + return html`
{ - if (this._fetching) { - return; - } - this._fetching = true; - try { - this._stateHistory = { - ...(await getRecentWithCache( - this.hass!, - this._configEntities!.map((config) => config.entity), - this._cacheConfig!, - this.hass!.localize, - this.hass!.language - )), - }; - } finally { - this._fetching = false; - } - } - static get styles(): CSSResultGroup { return css` ha-card { From 265ca40df1525f97c6819a01cd2865a75da73dd4 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Sat, 21 Jan 2023 17:45:29 -1000 Subject: [PATCH 28/28] move setInterval --- src/panels/lovelace/header-footer/hui-graph-header-footer.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 f2264a3056..12dbbfdcaf 100644 --- a/src/panels/lovelace/header-footer/hui-graph-header-footer.ts +++ b/src/panels/lovelace/header-footer/hui-graph-header-footer.ts @@ -186,10 +186,10 @@ export class HuiGraphHeaderFooter } private _unsubscribeHistoryTimeWindow() { + clearInterval(this._interval); if (!this._subscribed) { return; } - clearInterval(this._interval); this._subscribed.then((unsubscribe) => { if (unsubscribe) { unsubscribe();