From c4af3d15799c13a236cb192ed6af805f8bfac5b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 5 Apr 2024 11:36:28 +0200 Subject: [PATCH 01/98] Update typescript-eslint monorepo to v7.5.0 (#20426) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index 95e64ad94fcb..728cac703227 100644 --- a/package.json +++ b/package.json @@ -185,8 +185,8 @@ "@types/tar": "6.1.11", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "7.4.0", - "@typescript-eslint/parser": "7.4.0", + "@typescript-eslint/eslint-plugin": "7.5.0", + "@typescript-eslint/parser": "7.5.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index f1095039280a..b0b0f33e3744 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4543,15 +4543,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.4.0" +"@typescript-eslint/eslint-plugin@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.5.0" dependencies: "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:7.4.0" - "@typescript-eslint/type-utils": "npm:7.4.0" - "@typescript-eslint/utils": "npm:7.4.0" - "@typescript-eslint/visitor-keys": "npm:7.4.0" + "@typescript-eslint/scope-manager": "npm:7.5.0" + "@typescript-eslint/type-utils": "npm:7.5.0" + "@typescript-eslint/utils": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.2.4" @@ -4564,44 +4564,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/9bd8852c7e4e9608c3fded94f7c60506cc7d2b6d8a8c1cad6d48969a7363751b20282874e55ccdf180635cf204cb10b3e1e5c3d1cff34d4fcd07762be3fc138e + checksum: 10/5469900a0c2f485dcae10fc8509e2e1d981538d4c90a13330672fbd10cb7b9bb6d55445d6edea876e2c1719f1f0e25f6af0eb2d413e0c458a8930a371481b9e6 languageName: node linkType: hard -"@typescript-eslint/parser@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/parser@npm:7.4.0" +"@typescript-eslint/parser@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/parser@npm:7.5.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.4.0" - "@typescript-eslint/types": "npm:7.4.0" - "@typescript-eslint/typescript-estree": "npm:7.4.0" - "@typescript-eslint/visitor-keys": "npm:7.4.0" + "@typescript-eslint/scope-manager": "npm:7.5.0" + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/typescript-estree": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/142a9e1187d305ed43b4fef659c36fa4e28359467198c986f0955c70b4067c9799f4c85d9881fbf099c55dfb265e30666e28b3ef290520e242b45ca7cb8e4ca9 + checksum: 10/a5414fb2fbd78bf7337125f4a3040318bdffa996a94e27b4f791d51535d5d9286c3e0ae43652b251c48549bbfece0e3a33553b30ed986af6b4f715d76361d6bb languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/scope-manager@npm:7.4.0" +"@typescript-eslint/scope-manager@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/scope-manager@npm:7.5.0" dependencies: - "@typescript-eslint/types": "npm:7.4.0" - "@typescript-eslint/visitor-keys": "npm:7.4.0" - checksum: 10/8cf9292444f9731017a707cac34bef5ae0eb33b5cd42ed07fcd046e981d97889d9201d48e02f470f2315123f53771435e10b1dc81642af28a11df5352a8e8be2 + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" + checksum: 10/9446c07290a7f7f539a0bdaaf2fb97ae57095a01cd0baad9ecac532da88e7d0d207e5180131c0608542aee2fd1270caf700a2788fa460ffc6e65e966baf34135 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/type-utils@npm:7.4.0" +"@typescript-eslint/type-utils@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/type-utils@npm:7.5.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.4.0" - "@typescript-eslint/utils": "npm:7.4.0" + "@typescript-eslint/typescript-estree": "npm:7.5.0" + "@typescript-eslint/utils": "npm:7.5.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.0.1" peerDependencies: @@ -4609,23 +4609,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/a8bd0929d8237679b2b8a7817f070a4b9658ee976882fba8ff37e4a70dd33f87793e1b157771104111fe8054eaa8ad437a010b6aa465072fbdb932647125db2d + checksum: 10/257730553760fa943538db9648a11f4253efb722ab3394cd325bd775ee0c9d93af84c62540dee9377d4a669eb1cd801faed5e1bcb673d1606c9225eee82b420a languageName: node linkType: hard -"@typescript-eslint/types@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/types@npm:7.4.0" - checksum: 10/2782c5bf65cd3dfa9cd32bc3023676bbca22144987c3f6c6b67fd96c73d4a60b85a57458c49fd11b9971ac6531824bb3ae0664491e7a6de25d80c523c9be92b7 +"@typescript-eslint/types@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/types@npm:7.5.0" + checksum: 10/12eac46d0dfbbeb1db7d0658b841d554d38365420f42b699dea531e0c475b77d6fd838ac4046b7672e53d9bb76a021eaf6198cf3210fe1ecf1056ea44b6699a9 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.4.0" +"@typescript-eslint/typescript-estree@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" dependencies: - "@typescript-eslint/types": "npm:7.4.0" - "@typescript-eslint/visitor-keys": "npm:7.4.0" + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/visitor-keys": "npm:7.5.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4635,34 +4635,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/162ec9d7582f45588342e1be36fdb60e41f50bbdfbc3035c91b517ff5d45244f776921c88d88e543e1c7d0f1e6ada5474a8316b78f1b0e6d2233b101bc45b166 + checksum: 10/7487293a9ab9459b133322e695435b4540ffcad89f2bea917c3389676d68283297a663c77d6bda298144d3581361733ae4af632213fa7ef48be67e9aa792b4cc languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/utils@npm:7.4.0" +"@typescript-eslint/utils@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/utils@npm:7.5.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.12" "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:7.4.0" - "@typescript-eslint/types": "npm:7.4.0" - "@typescript-eslint/typescript-estree": "npm:7.4.0" + "@typescript-eslint/scope-manager": "npm:7.5.0" + "@typescript-eslint/types": "npm:7.5.0" + "@typescript-eslint/typescript-estree": "npm:7.5.0" semver: "npm:^7.5.4" peerDependencies: eslint: ^8.56.0 - checksum: 10/ffed27e770c486cd000ff892d9049b0afe8b9d6318452a5355b78a37436cbb414bceacae413a2ac813f3e584684825d5e0baa2e6376b7ad6013a108ac91bc19d + checksum: 10/a0b2f206a1c35dd77b292d1cd385443f42d00ccf8a5151811fe6bdd6b5f3a450372bf99b8757c307988d14d99587424c59ed59e78cf56c17b43c9c3fd8932871 languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.4.0": - version: 7.4.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.4.0" +"@typescript-eslint/visitor-keys@npm:7.5.0": + version: 7.5.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" dependencies: - "@typescript-eslint/types": "npm:7.4.0" + "@typescript-eslint/types": "npm:7.5.0" eslint-visitor-keys: "npm:^3.4.1" - checksum: 10/70dc99f2ad116c6e2d9e55af249e4453e06bba2ceea515adef2d2e86e97e557865bb1b1d467667462443eb0d624baba36f7442fd1082f3874339bbc381c26e93 + checksum: 10/ba83113110b13bc65120ea3d1e21e1dcea6010b0a1a3d07da2fd274bb0feb552a92276b6052e659d2fe40178938b17368ede64752c4937f41685c53bdf9d2634 languageName: node linkType: hard @@ -9688,8 +9688,8 @@ __metadata: "@types/tar": "npm:6.1.11" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:7.4.0" - "@typescript-eslint/parser": "npm:7.4.0" + "@typescript-eslint/eslint-plugin": "npm:7.5.0" + "@typescript-eslint/parser": "npm:7.5.0" "@vaadin/combo-box": "npm:24.3.10" "@vaadin/vaadin-themable-mixin": "npm:24.3.10" "@vibrant/color": "npm:3.2.1-alpha.1" From dd082c204b45df55663dc257ee83f5efe1a9ab88 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 5 Apr 2024 12:22:47 +0200 Subject: [PATCH 02/98] Remove unused type (#20429) --- src/panels/lovelace/cards/types.ts | 55 ------------------------------ 1 file changed, 55 deletions(-) diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts index 8fcf28ab4e42..374aea09ae19 100644 --- a/src/panels/lovelace/cards/types.ts +++ b/src/panels/lovelace/cards/types.ts @@ -487,61 +487,6 @@ export interface WeatherForecastCardConfig extends LovelaceCardConfig { double_tap_action?: ActionConfig; } -export interface EnergyFlowCardConfig extends LovelaceCardConfig { - type: string; - name?: string; - show_header_toggle?: boolean; - - show_warning?: boolean; - show_error?: boolean; - test_gui?: boolean; - show_w_not_kw?: any; - hide_inactive_lines?: boolean; - threshold_in_k?: number; - energy_flow_diagramm?: boolean; - energy_flow_diagramm_lines_factor?: number; - change_house_bubble_color_with_flow?: boolean; - - grid_icon?: string; - generation_icon?: string; - house_icon?: string; - battery_icon?: string; - appliance1_icon?: string; - appliance2_icon?: string; - - icon_entities?: Map; - line_entities?: Map; - - house_entity?: string; - battery_entity?: string; - generation_entity?: string; - grid_entity?: string; - - grid_to_house_entity?: string; - grid_to_battery_entity?: string; - - generation_to_grid_entity?: string; - generation_to_battery_entity?: string; - generation_to_house_entity?: string; - - battery_to_house_entity?: string; - battery_to_grid_entity?: string; - - grid_extra_entity?: string; - generation_extra_entity?: string; - house_extra_entity?: string; - battery_extra_entity?: string; - - appliance1_consumption_entity?: string; - appliance1_extra_entity?: string; - appliance2_consumption_entity?: string; - appliance2_extra_entity?: string; - - tap_action?: ActionConfig; - hold_action?: ActionConfig; - double_tap_action?: ActionConfig; -} - export interface TileCardConfig extends LovelaceCardConfig { entity: string; name?: string; From c7a87d02b27ed09c78a777e43519bebb70af17b3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 7 Apr 2024 20:37:42 +0200 Subject: [PATCH 03/98] Update dependency @types/leaflet to v1.9.9 (#20452) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 728cac703227..298fe82bf671 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/glob": "8.1.0", "@types/html-minifier-terser": "7.0.2", "@types/js-yaml": "4.0.9", - "@types/leaflet": "1.9.8", + "@types/leaflet": "1.9.9", "@types/leaflet-draw": "1.0.11", "@types/luxon": "3.4.2", "@types/mocha": "10.0.6", diff --git a/yarn.lock b/yarn.lock index b0b0f33e3744..c077aaf6a940 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4264,12 +4264,12 @@ __metadata: languageName: node linkType: hard -"@types/leaflet@npm:*, @types/leaflet@npm:1.9.8": - version: 1.9.8 - resolution: "@types/leaflet@npm:1.9.8" +"@types/leaflet@npm:*, @types/leaflet@npm:1.9.9": + version: 1.9.9 + resolution: "@types/leaflet@npm:1.9.9" dependencies: "@types/geojson": "npm:*" - checksum: 10/c0c68ae0d1ccbed60e08ad82670df48f8bb6f19e3abaf84a9cd0a6cbc6d6efdd46852ee7be56744dfa7f3d8665adb56bb06ab02d09f979d3367c941a1fd90f2f + checksum: 10/7f1de85f4fa16f6feb3b19f80a8b9db092710e1b8695950a4c7d35b32e1b0bb4bdcd0f179d6c2e0aee49d1c725ab6c7a25ea48c5ea53bd15eb0a02296d4d87d0 languageName: node linkType: hard @@ -9678,7 +9678,7 @@ __metadata: "@types/glob": "npm:8.1.0" "@types/html-minifier-terser": "npm:7.0.2" "@types/js-yaml": "npm:4.0.9" - "@types/leaflet": "npm:1.9.8" + "@types/leaflet": "npm:1.9.9" "@types/leaflet-draw": "npm:1.0.11" "@types/luxon": "npm:3.4.2" "@types/mocha": "npm:10.0.6" From 0d3e730c9c37d654c2ee37572542d41d740de55c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 09:33:26 +0200 Subject: [PATCH 04/98] Update dependency magic-string to v0.30.9 (#20465) Co-authored-by: renovate[bot] <29139614+renovate[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 298fe82bf671..b1845eab5f43 100644 --- a/package.json +++ b/package.json @@ -220,7 +220,7 @@ "lint-staged": "15.2.2", "lit-analyzer": "2.0.3", "lodash.template": "4.5.0", - "magic-string": "0.30.8", + "magic-string": "0.30.9", "map-stream": "0.0.7", "mocha": "10.3.0", "object-hash": "3.0.0", diff --git a/yarn.lock b/yarn.lock index c077aaf6a940..60150adbcdc8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9753,7 +9753,7 @@ __metadata: lit-analyzer: "npm:2.0.3" lodash.template: "npm:4.5.0" luxon: "npm:3.4.4" - magic-string: "npm:0.30.8" + magic-string: "npm:0.30.9" map-stream: "npm:0.0.7" marked: "npm:12.0.1" memoize-one: "npm:6.0.0" @@ -11679,12 +11679,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:0.30.8, magic-string@npm:^0.30.3": - version: 0.30.8 - resolution: "magic-string@npm:0.30.8" +"magic-string@npm:0.30.9, magic-string@npm:^0.30.3": + version: 0.30.9 + resolution: "magic-string@npm:0.30.9" dependencies: "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: 10/72ab63817af600e92c19dc8489c1aa4a9599da00cfd59b2319709bd48fb0cf533fdf354bf140ac86e598dbd63e6b2cc83647fe8448f864a3eb6061c62c94e784 + checksum: 10/a49b7f848e36914c2794e443d4da6579abebb3e57a5e98b1603958f4672d1435dc15261f70c2793e9b6d6c891191c83b9608322b48d0d76a9be32e73e039cc8a languageName: node linkType: hard From 516b9a54c4b1af3d6df573ee05956e4de5f7e74c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:21:33 -0400 Subject: [PATCH 05/98] Update dependency typescript to v5.4.4 (#20468) --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index b1845eab5f43..84574fd849d3 100644 --- a/package.json +++ b/package.json @@ -239,7 +239,7 @@ "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.0.4", "ts-lit-plugin": "2.0.2", - "typescript": "5.4.3", + "typescript": "5.4.4", "vinyl-buffer": "1.0.1", "vinyl-source-stream": "2.0.0", "webpack": "5.91.0", diff --git a/yarn.lock b/yarn.lock index 60150adbcdc8..be90224df1aa 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9787,7 +9787,7 @@ __metadata: ts-lit-plugin: "npm:2.0.2" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" - typescript: "npm:5.4.3" + typescript: "npm:5.4.4" ua-parser-js: "npm:1.0.37" unfetch: "npm:5.0.0" vinyl-buffer: "npm:1.0.1" @@ -15700,13 +15700,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.3": - version: 5.4.3 - resolution: "typescript@npm:5.4.3" +"typescript@npm:5.4.4": + version: 5.4.4 + resolution: "typescript@npm:5.4.4" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/de4c69f49a7ad4b1ea66a6dcc8b055ac34eb56af059a069d8988dd811c5e649be07e042e5bf573e8d0ac3ec2f30e6c999aa651cd09f6e9cbc6113749e8b6be20 + checksum: 10/bade322d88fd93c8179e262aca9ba7f7b4417c09117879819c87946578c782ab123e3acb4733046a6e38714c47ef927360045a1f9292a1bff3a05a6577d27ca2 languageName: node linkType: hard @@ -15720,13 +15720,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.3#optional!builtin": - version: 5.4.3 - resolution: "typescript@patch:typescript@npm%3A5.4.3#optional!builtin::version=5.4.3&hash=5adc0c" +"typescript@patch:typescript@npm%3A5.4.4#optional!builtin": + version: 5.4.4 + resolution: "typescript@patch:typescript@npm%3A5.4.4#optional!builtin::version=5.4.4&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/5aedd97595582b08aadb8a70e8e3ddebaf5a9c1e5ad4d6503c2fcfc15329b5cf8d01145b09913e9555683ac16c5123a96be32b6d72614098ebd42df520eed9b1 + checksum: 10/88aff3244c31d4c6ede05b4fd28732fc8935a7fc638f2a3dcbbb767d1ac98e4b077f21ec74bc97f43c9307bc3f27e2359def1d793f9918c3429a744408fd75b4 languageName: node linkType: hard From 8c0839ad5752eb9c3ebd2ef080e9454c6d268d10 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:22:31 -0400 Subject: [PATCH 06/98] Update dependency @types/tar to v6.1.12 (#20457) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 84574fd849d3..d9ab25d57846 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", "@types/sortablejs": "1.15.8", - "@types/tar": "6.1.11", + "@types/tar": "6.1.12", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", "@typescript-eslint/eslint-plugin": "7.5.0", diff --git a/yarn.lock b/yarn.lock index be90224df1aa..ac530c93907d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4494,13 +4494,13 @@ __metadata: languageName: node linkType: hard -"@types/tar@npm:6.1.11": - version: 6.1.11 - resolution: "@types/tar@npm:6.1.11" +"@types/tar@npm:6.1.12": + version: 6.1.12 + resolution: "@types/tar@npm:6.1.12" dependencies: "@types/node": "npm:*" minipass: "npm:^4.0.0" - checksum: 10/0d54b8acbd7d2fc43bd1097eef5058604a6b0e3a394cf485038303ca3ef39ecb42451c7dc5a2b9b18420e137ef5b2c76ec504e94c2f45010b2c8e8c3a49d9de7 + checksum: 10/5cd6d3a9867f5fbf6cc045752d439b2b9967c1cf5b389e9ea8afde7fdd749dd6f0a7ca879e7bfaf6f1bc242874ac7a923a319fc0caf5caed96e48cc2b6c58a1e languageName: node linkType: hard @@ -9685,7 +9685,7 @@ __metadata: "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" "@types/sortablejs": "npm:1.15.8" - "@types/tar": "npm:6.1.11" + "@types/tar": "npm:6.1.12" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" "@typescript-eslint/eslint-plugin": "npm:7.5.0" From 2007a74a2093060d5fa632139c290da3576ec0f2 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:23:53 -0400 Subject: [PATCH 07/98] Update babel monorepo to v7.24.4 (#20451) --- package.json | 6 +-- yarn.lock | 113 ++++++++++++++++++++++++++++----------------------- 2 files changed, 66 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index d9ab25d57846..b04762676681 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "license": "Apache-2.0", "type": "module", "dependencies": { - "@babel/runtime": "7.24.1", + "@babel/runtime": "7.24.4", "@braintree/sanitize-url": "7.0.1", "@codemirror/autocomplete": "6.15.0", "@codemirror/commands": "6.3.3", @@ -150,11 +150,11 @@ "xss": "1.0.15" }, "devDependencies": { - "@babel/core": "7.24.3", + "@babel/core": "7.24.4", "@babel/helper-define-polyfill-provider": "0.6.1", "@babel/plugin-proposal-decorators": "7.24.1", "@babel/plugin-transform-runtime": "7.24.3", - "@babel/preset-env": "7.24.3", + "@babel/preset-env": "7.24.4", "@babel/preset-typescript": "7.24.1", "@bundle-stats/plugin-webpack-filter": "4.12.2", "@koa/cors": "5.0.0", diff --git a/yarn.lock b/yarn.lock index ac530c93907d..95df0670423a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -55,24 +55,24 @@ __metadata: languageName: node linkType: hard -"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/compat-data@npm:7.24.1" - checksum: 10/d5460b99c07ff8487467c52f742a219c7e3bcdcaa2882456a13c0d0c8116405f0c85a651fb60511284dc64ed627a5e989f24c3cd6e71d07a9947e7c8954b433c +"@babel/compat-data@npm:^7.22.6, @babel/compat-data@npm:^7.23.5, @babel/compat-data@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/compat-data@npm:7.24.4" + checksum: 10/e51faec0ac8259f03cc5029d2b4a944b4fee44cb5188c11530769d5beb81f384d031dba951febc3e33dbb48ceb8045b1184f5c1ac4c5f86ab1f5e951e9aaf7af languageName: node linkType: hard -"@babel/core@npm:7.24.3, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.0": - version: 7.24.3 - resolution: "@babel/core@npm:7.24.3" +"@babel/core@npm:7.24.4, @babel/core@npm:^7.11.1, @babel/core@npm:^7.12.3, @babel/core@npm:^7.13.0": + version: 7.24.4 + resolution: "@babel/core@npm:7.24.4" dependencies: "@ampproject/remapping": "npm:^2.2.0" "@babel/code-frame": "npm:^7.24.2" - "@babel/generator": "npm:^7.24.1" + "@babel/generator": "npm:^7.24.4" "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-module-transforms": "npm:^7.23.3" - "@babel/helpers": "npm:^7.24.1" - "@babel/parser": "npm:^7.24.1" + "@babel/helpers": "npm:^7.24.4" + "@babel/parser": "npm:^7.24.4" "@babel/template": "npm:^7.24.0" "@babel/traverse": "npm:^7.24.1" "@babel/types": "npm:^7.24.0" @@ -81,19 +81,19 @@ __metadata: gensync: "npm:^1.0.0-beta.2" json5: "npm:^2.2.3" semver: "npm:^6.3.1" - checksum: 10/3a7b9931fe0d93c500dcdb6b36f038b0f9d5090c048818e62aa8321c8f6e8ccc3d47373f0b40591c1fe3b13e5096bacabb1ade83f9f4d86f57878c39a9d1ade1 + checksum: 10/1e049f8df26be0fe5be36173fd7c33dfb004eeeec28152fea83c90e71784f9a6f2237296f43a2ee7d9041e2a33a05f43da48ce2d4e0cd473a682328ca07ce7e0 languageName: node linkType: hard -"@babel/generator@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/generator@npm:7.24.1" +"@babel/generator@npm:^7.24.1, @babel/generator@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/generator@npm:7.24.4" dependencies: "@babel/types": "npm:^7.24.0" "@jridgewell/gen-mapping": "npm:^0.3.5" "@jridgewell/trace-mapping": "npm:^0.3.25" jsesc: "npm:^2.5.1" - checksum: 10/c6160e9cd63d7ed7168dee27d827f9c46fab820c45861a5df56cd5c78047f7c3fc97c341e9ccfa1a6f97c87ec2563d9903380b5f92794e3540a6c5f99eb8f075 + checksum: 10/69e1772dcf8f95baec951f422cca091d59a3f29b5eedc989ad87f7262289b94625983f6fe654302ca17aae0a32f9232332b83fcc85533311d6267b09c58b1061 languageName: node linkType: hard @@ -128,9 +128,9 @@ __metadata: languageName: node linkType: hard -"@babel/helper-create-class-features-plugin@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/helper-create-class-features-plugin@npm:7.24.1" +"@babel/helper-create-class-features-plugin@npm:^7.24.1, @babel/helper-create-class-features-plugin@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/helper-create-class-features-plugin@npm:7.24.4" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" "@babel/helper-environment-visitor": "npm:^7.22.20" @@ -143,7 +143,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0 - checksum: 10/c48e9ce842cbd55099a6b9893df1b4fb08c88061d6c20c37a5279b95249879be478210b587295b55d3675428d2ce4306c790cf6332f478ab2af0061f940156f3 + checksum: 10/86153719d98e4402f92f24d6b1be94e6b59c0236a6cc36b173a570a64b5156dbc2f16ccfe3c8485dc795524ca88acca65b14863be63049586668c45567f2acd4 languageName: node linkType: hard @@ -335,14 +335,14 @@ __metadata: languageName: node linkType: hard -"@babel/helpers@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/helpers@npm:7.24.1" +"@babel/helpers@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/helpers@npm:7.24.4" dependencies: "@babel/template": "npm:^7.24.0" "@babel/traverse": "npm:^7.24.1" "@babel/types": "npm:^7.24.0" - checksum: 10/82d3cdd3beafc4583f237515ef220bc205ced8b0540c6c6e191fc367a9589bd7304b8f9800d3d7574d4db9f079bd555979816b1874c86e53b3e7dd2032ad6c7c + checksum: 10/54a9d0f86f2803fcc216cfa23b66b871ea0fa0a892af1c9a79075872c2437de71afbb150ed8216f30e00b19a0b9c5c9d5845173d170e1ebfbbf8887839b89dde languageName: node linkType: hard @@ -358,12 +358,24 @@ __metadata: languageName: node linkType: hard -"@babel/parser@npm:^7.23.5, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/parser@npm:7.24.1" +"@babel/parser@npm:^7.23.5, @babel/parser@npm:^7.24.0, @babel/parser@npm:^7.24.1, @babel/parser@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/parser@npm:7.24.4" bin: parser: ./bin/babel-parser.js - checksum: 10/561d9454091e07ecfec3828ce79204c0fc9d24e17763f36181c6984392be4ca6b79c8225f2224fdb7b1b3b70940e243368c8f83ac77ec2dc20f46d3d06bd6795 + checksum: 10/3742cc5068036287e6395269dce5a2735e6349cdc8d4b53297c75f98c580d7e1c8cb43235623999d151f2ef975d677dbc2c2357573a1855caa71c271bf3046c9 + languageName: node + linkType: hard + +"@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/plugin-bugfix-firefox-class-in-computed-class-key@npm:7.24.4" + dependencies: + "@babel/helper-environment-visitor": "npm:^7.22.20" + "@babel/helper-plugin-utils": "npm:^7.24.0" + peerDependencies: + "@babel/core": ^7.0.0 + checksum: 10/1439e2ceec512b72f05f036503bf2c31e807d1b75ae22cf2676145e9f20740960a1c9575ea3065c6fb9f44f6b46163aab76eac513694ffa10de674e3cdd6219e languageName: node linkType: hard @@ -706,14 +718,14 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-block-scoping@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/plugin-transform-block-scoping@npm:7.24.1" +"@babel/plugin-transform-block-scoping@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/plugin-transform-block-scoping@npm:7.24.4" dependencies: "@babel/helper-plugin-utils": "npm:^7.24.0" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/443069c6410079c007c40425254a5d0416e4fefe38c1cb354884694a3029dfa6ea8c196398726d2bd4ec3e5c4559ef85efc1ad0b068f1330df4aa03b414781e0 + checksum: 10/4093fa109cd256e8ad0b26e3ffa67ec6dac4078a1a24b7755bed63e650cf938b2a315e01696c35b221db1a37606f93cb82696c8d1bf563c2a9845620e551736e languageName: node linkType: hard @@ -729,16 +741,16 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-class-static-block@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/plugin-transform-class-static-block@npm:7.24.1" +"@babel/plugin-transform-class-static-block@npm:^7.24.4": + version: 7.24.4 + resolution: "@babel/plugin-transform-class-static-block@npm:7.24.4" dependencies: - "@babel/helper-create-class-features-plugin": "npm:^7.24.1" + "@babel/helper-create-class-features-plugin": "npm:^7.24.4" "@babel/helper-plugin-utils": "npm:^7.24.0" "@babel/plugin-syntax-class-static-block": "npm:^7.14.5" peerDependencies: "@babel/core": ^7.12.0 - checksum: 10/253c627c11d9df79e3b32e78bfa1fe0dd1f91c3579da52bf73f76c83de53b140dcb1c9cc5f4c65ff1505754a01b59bc83987c35bcc8f89492b63dae46adef78f + checksum: 10/3b1db3308b57ba21d47772a9f183804234c23fd64c9ca40915d2d65c5dc7a48b49a6de16b8b90b7a354eacbb51232a862f0fca3dbd23e27d34641f511decddab languageName: node linkType: hard @@ -1266,14 +1278,15 @@ __metadata: languageName: node linkType: hard -"@babel/preset-env@npm:7.24.3, @babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.13.0": - version: 7.24.3 - resolution: "@babel/preset-env@npm:7.24.3" +"@babel/preset-env@npm:7.24.4, @babel/preset-env@npm:^7.11.0, @babel/preset-env@npm:^7.13.0": + version: 7.24.4 + resolution: "@babel/preset-env@npm:7.24.4" dependencies: - "@babel/compat-data": "npm:^7.24.1" + "@babel/compat-data": "npm:^7.24.4" "@babel/helper-compilation-targets": "npm:^7.23.6" "@babel/helper-plugin-utils": "npm:^7.24.0" "@babel/helper-validator-option": "npm:^7.23.5" + "@babel/plugin-bugfix-firefox-class-in-computed-class-key": "npm:^7.24.4" "@babel/plugin-bugfix-safari-id-destructuring-collision-in-function-expression": "npm:^7.24.1" "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining": "npm:^7.24.1" "@babel/plugin-bugfix-v8-static-class-fields-redefine-readonly": "npm:^7.24.1" @@ -1300,9 +1313,9 @@ __metadata: "@babel/plugin-transform-async-generator-functions": "npm:^7.24.3" "@babel/plugin-transform-async-to-generator": "npm:^7.24.1" "@babel/plugin-transform-block-scoped-functions": "npm:^7.24.1" - "@babel/plugin-transform-block-scoping": "npm:^7.24.1" + "@babel/plugin-transform-block-scoping": "npm:^7.24.4" "@babel/plugin-transform-class-properties": "npm:^7.24.1" - "@babel/plugin-transform-class-static-block": "npm:^7.24.1" + "@babel/plugin-transform-class-static-block": "npm:^7.24.4" "@babel/plugin-transform-classes": "npm:^7.24.1" "@babel/plugin-transform-computed-properties": "npm:^7.24.1" "@babel/plugin-transform-destructuring": "npm:^7.24.1" @@ -1352,7 +1365,7 @@ __metadata: semver: "npm:^6.3.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/42de398cb7655f3748a03f9f5ca6132dd8e84315ccf286e47740455dfb5be6358df7cfcbecf84426c14176a4d02d0b0b3c97ddf6c5c4c8fb7f1f307692a103ee + checksum: 10/3d5cbdc2501bc1959fc76ed9d409d0ee5264bc475fa809958fd2e8e7db9b12f8eccdae750a0e05d25207373c42ca115b42bb3d5c743bc770cb12b6af05bf3bd8 languageName: node linkType: hard @@ -1391,12 +1404,12 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.24.1, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": - version: 7.24.1 - resolution: "@babel/runtime@npm:7.24.1" +"@babel/runtime@npm:7.24.4, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": + version: 7.24.4 + resolution: "@babel/runtime@npm:7.24.4" dependencies: regenerator-runtime: "npm:^0.14.0" - checksum: 10/3a8d61400c636d1ce3a42895a106cd4dfb4e9b88832a8a754a724c68652f821d7a46dce394305d7623f9f0d3597bf0a98aeb5f9c150ef60e14bbbf66caab4654 + checksum: 10/8ec8ce2c145bc7e31dd39ab66df124f357f65c11489aefacb30f431bae913b9aaa66aa5efe5321ea2bf8878af3fcee338c87e7599519a952e3a6f83aa1b03308 languageName: node linkType: hard @@ -9589,13 +9602,13 @@ __metadata: version: 0.0.0-use.local resolution: "home-assistant-frontend@workspace:." dependencies: - "@babel/core": "npm:7.24.3" + "@babel/core": "npm:7.24.4" "@babel/helper-define-polyfill-provider": "npm:0.6.1" "@babel/plugin-proposal-decorators": "npm:7.24.1" "@babel/plugin-transform-runtime": "npm:7.24.3" - "@babel/preset-env": "npm:7.24.3" + "@babel/preset-env": "npm:7.24.4" "@babel/preset-typescript": "npm:7.24.1" - "@babel/runtime": "npm:7.24.1" + "@babel/runtime": "npm:7.24.4" "@braintree/sanitize-url": "npm:7.0.1" "@bundle-stats/plugin-webpack-filter": "npm:4.12.2" "@codemirror/autocomplete": "npm:6.15.0" From 1d4f02df2ec2a3842ddf3b376991817304f60369 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:28:30 -0400 Subject: [PATCH 08/98] Update dependency glob to v10.3.12 (#20298) --- package.json | 2 +- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/package.json b/package.json index b04762676681..4cf23dc9d928 100644 --- a/package.json +++ b/package.json @@ -206,7 +206,7 @@ "eslint-plugin-wc": "2.0.4", "fancy-log": "2.0.0", "fs-extra": "11.2.0", - "glob": "10.3.10", + "glob": "10.3.12", "gulp": "4.0.2", "gulp-flatmap": "1.0.2", "gulp-json-transform": "0.5.0", diff --git a/yarn.lock b/yarn.lock index 95df0670423a..6de7543d8d01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9190,18 +9190,18 @@ __metadata: languageName: node linkType: hard -"glob@npm:10.3.10, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": - version: 10.3.10 - resolution: "glob@npm:10.3.10" +"glob@npm:10.3.12, glob@npm:^10.2.2, glob@npm:^10.3.10, glob@npm:^10.3.7": + version: 10.3.12 + resolution: "glob@npm:10.3.12" dependencies: foreground-child: "npm:^3.1.0" - jackspeak: "npm:^2.3.5" + jackspeak: "npm:^2.3.6" minimatch: "npm:^9.0.1" - minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - path-scurry: "npm:^1.10.1" + minipass: "npm:^7.0.4" + path-scurry: "npm:^1.10.2" bin: glob: dist/esm/bin.mjs - checksum: 10/38bdb2c9ce75eb5ed168f309d4ed05b0798f640b637034800a6bf306f39d35409bf278b0eaaffaec07591085d3acb7184a201eae791468f0f617771c2486a6a8 + checksum: 10/9e8186abc22dc824b5dd86cefd8e6b5621a72d1be7f68bacc0fd681e8c162ec5546660a6ec0553d6a74757a585e655956c7f8f1a6d24570e8d865c307323d178 languageName: node linkType: hard @@ -9742,7 +9742,7 @@ __metadata: fancy-log: "npm:2.0.0" fs-extra: "npm:11.2.0" fuse.js: "npm:7.0.0" - glob: "npm:10.3.10" + glob: "npm:10.3.12" google-timezones-json: "npm:1.2.0" gulp: "npm:4.0.2" gulp-flatmap: "npm:1.0.2" @@ -10883,7 +10883,7 @@ __metadata: languageName: node linkType: hard -"jackspeak@npm:^2.3.5": +"jackspeak@npm:^2.3.6": version: 2.3.6 resolution: "jackspeak@npm:2.3.6" dependencies: @@ -11660,7 +11660,7 @@ __metadata: languageName: node linkType: hard -"lru-cache@npm:^10.0.1, lru-cache@npm:^9.1.1 || ^10.0.0": +"lru-cache@npm:^10.0.1, lru-cache@npm:^10.2.0": version: 10.2.0 resolution: "lru-cache@npm:10.2.0" checksum: 10/502ec42c3309c0eae1ce41afca471f831c278566d45a5273a0c51102dee31e0e250a62fa9029c3370988df33a14188a38e682c16143b794de78668de3643e302 @@ -12077,7 +12077,7 @@ __metadata: languageName: node linkType: hard -"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3": +"minipass@npm:^5.0.0 || ^6.0.2 || ^7.0.0, minipass@npm:^7.0.2, minipass@npm:^7.0.3, minipass@npm:^7.0.4": version: 7.0.4 resolution: "minipass@npm:7.0.4" checksum: 10/e864bd02ceb5e0707696d58f7ce3a0b89233f0d686ef0d447a66db705c0846a8dc6f34865cd85256c1472ff623665f616b90b8ff58058b2ad996c5de747d2d18 @@ -13018,13 +13018,13 @@ __metadata: languageName: node linkType: hard -"path-scurry@npm:^1.10.1": - version: 1.10.1 - resolution: "path-scurry@npm:1.10.1" +"path-scurry@npm:^1.10.2": + version: 1.10.2 + resolution: "path-scurry@npm:1.10.2" dependencies: - lru-cache: "npm:^9.1.1 || ^10.0.0" + lru-cache: "npm:^10.2.0" minipass: "npm:^5.0.0 || ^6.0.2 || ^7.0.0" - checksum: 10/eebfb8304fef1d4f7e1486df987e4fd77413de4fce16508dea69fcf8eb318c09a6b15a7a2f4c22877cec1cb7ecbd3071d18ca9de79eeece0df874a00f1f0bdc8 + checksum: 10/a2bbbe8dc284c49dd9be78ca25f3a8b89300e0acc24a77e6c74824d353ef50efbf163e64a69f4330b301afca42d0e2229be0560d6d616ac4e99d48b4062016b1 languageName: node linkType: hard From 7c944d3767ddf9876edcece4c2280497d0d6d600 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:29:48 -0400 Subject: [PATCH 09/98] Update dependency mocha to v10.4.0 (#20279) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 4cf23dc9d928..6aedd48bc837 100644 --- a/package.json +++ b/package.json @@ -222,7 +222,7 @@ "lodash.template": "4.5.0", "magic-string": "0.30.9", "map-stream": "0.0.7", - "mocha": "10.3.0", + "mocha": "10.4.0", "object-hash": "3.0.0", "open": "10.1.0", "pinst": "3.0.0", diff --git a/yarn.lock b/yarn.lock index 6de7543d8d01..801cfb30e30d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9770,7 +9770,7 @@ __metadata: map-stream: "npm:0.0.7" marked: "npm:12.0.1" memoize-one: "npm:6.0.0" - mocha: "npm:10.3.0" + mocha: "npm:10.4.0" node-vibrant: "npm:3.2.1-alpha.1" object-hash: "npm:3.0.0" open: "npm:10.1.0" @@ -12124,9 +12124,9 @@ __metadata: languageName: node linkType: hard -"mocha@npm:10.3.0": - version: 10.3.0 - resolution: "mocha@npm:10.3.0" +"mocha@npm:10.4.0": + version: 10.4.0 + resolution: "mocha@npm:10.4.0" dependencies: ansi-colors: "npm:4.1.1" browser-stdout: "npm:1.3.1" @@ -12151,7 +12151,7 @@ __metadata: bin: _mocha: bin/_mocha mocha: bin/mocha.js - checksum: 10/8b30b3fdb3f365fca7e069fce732e13db4192e1bf8f49e63ec67a3b7857c41cbcd162289ad22178db6ef405fb251b8a0dbb54e942d08c72abf45e1ec3fcdd052 + checksum: 10/0147b2a86c8a3b134b3bda949006aa5f2b08db606b9394e38eb3fa0d97dd2f54f06eb4afb270d4ae08aa6fb7674282737ed556b9a8bc407f9b8488380852eca4 languageName: node linkType: hard From be2c68c0bbfece2b721dd7550a4d5a9cfa18caa7 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:32:57 -0400 Subject: [PATCH 10/98] Update octokit monorepo (#20453) --- package.json | 6 +-- yarn.lock | 122 +++++++++++++++++++++++++++++---------------------- 2 files changed, 72 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index 6aedd48bc837..b605bcdfc4b5 100644 --- a/package.json +++ b/package.json @@ -159,9 +159,9 @@ "@bundle-stats/plugin-webpack-filter": "4.12.2", "@koa/cors": "5.0.0", "@lokalise/node-api": "12.3.0", - "@octokit/auth-oauth-device": "7.0.1", - "@octokit/plugin-retry": "7.0.3", - "@octokit/rest": "20.0.2", + "@octokit/auth-oauth-device": "7.1.0", + "@octokit/plugin-retry": "7.1.0", + "@octokit/rest": "20.1.0", "@open-wc/dev-server-hmr": "0.1.4", "@rollup/plugin-babel": "6.0.4", "@rollup/plugin-commonjs": "25.0.7", diff --git a/yarn.lock b/yarn.lock index 801cfb30e30d..e56404f0a1c3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3251,15 +3251,15 @@ __metadata: languageName: node linkType: hard -"@octokit/auth-oauth-device@npm:7.0.1": - version: 7.0.1 - resolution: "@octokit/auth-oauth-device@npm:7.0.1" +"@octokit/auth-oauth-device@npm:7.1.0": + version: 7.1.0 + resolution: "@octokit/auth-oauth-device@npm:7.1.0" dependencies: "@octokit/oauth-methods": "npm:^5.0.0" "@octokit/request": "npm:^9.0.0" - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.0.0" universal-user-agent: "npm:^7.0.0" - checksum: 10/410051ec666bc9792a9080f9c15c035adda113539db6bd9783e30046bae0297b92b8faab83e04e8ae5c0d9f7260fd516de733b6a4f3ac0cce80fa7462e2b322b + checksum: 10/117cf1ea6f2bafade404cfd0b198871e4834240810e16cd358a74065ef56c8b550ea6f84889f31be06b0235575e496a7d9ac6e163e756637fc435d08721bfa51 languageName: node linkType: hard @@ -3270,18 +3270,18 @@ __metadata: languageName: node linkType: hard -"@octokit/core@npm:^5.0.0": - version: 5.1.0 - resolution: "@octokit/core@npm:5.1.0" +"@octokit/core@npm:^5.0.2": + version: 5.2.0 + resolution: "@octokit/core@npm:5.2.0" dependencies: "@octokit/auth-token": "npm:^4.0.0" - "@octokit/graphql": "npm:^7.0.0" - "@octokit/request": "npm:^8.0.2" - "@octokit/request-error": "npm:^5.0.0" - "@octokit/types": "npm:^12.0.0" + "@octokit/graphql": "npm:^7.1.0" + "@octokit/request": "npm:^8.3.1" + "@octokit/request-error": "npm:^5.1.0" + "@octokit/types": "npm:^13.0.0" before-after-hook: "npm:^2.2.0" universal-user-agent: "npm:^6.0.0" - checksum: 10/8062e86a3088f24a691b36d2c3e9f33e864cefcb5f544b0633650358bce280708b111551cbe855ecf6a5190d6fc4fec1220117c329a2c27525940dd97b868614 + checksum: 10/2e40baf0b5c6949922436a653c213be43befd9690c43dd89872f669f3ac23117ae8ae5e5d6c18094813756c71c3f4fbedd575a891f0b89e12f58b2c38b7f3c13 languageName: node linkType: hard @@ -3295,24 +3295,24 @@ __metadata: languageName: node linkType: hard -"@octokit/endpoint@npm:^9.0.0": - version: 9.0.4 - resolution: "@octokit/endpoint@npm:9.0.4" +"@octokit/endpoint@npm:^9.0.1": + version: 9.0.5 + resolution: "@octokit/endpoint@npm:9.0.5" dependencies: - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.1.0" universal-user-agent: "npm:^6.0.0" - checksum: 10/7df35c96f2b5628fe5b3f44a72614be9b439779c06b4dd1bb72283b3cb2ea53e59e1f9a108798efe5404b6856f4380a4c5be12d93255d854f0683cd6e22f3a27 + checksum: 10/212122f653bf076ec37dd7de44bd54db74aa3cd16be4c395c91444488331becd83351e26b30248168e2cc28fc07b1a96e8f74adbbab02826f76de92e069f391f languageName: node linkType: hard -"@octokit/graphql@npm:^7.0.0": - version: 7.0.2 - resolution: "@octokit/graphql@npm:7.0.2" +"@octokit/graphql@npm:^7.1.0": + version: 7.1.0 + resolution: "@octokit/graphql@npm:7.1.0" dependencies: - "@octokit/request": "npm:^8.0.1" - "@octokit/types": "npm:^12.0.0" + "@octokit/request": "npm:^8.3.0" + "@octokit/types": "npm:^13.0.0" universal-user-agent: "npm:^6.0.0" - checksum: 10/f5dcc51fed5304f65dab83fcea4c2a569107d3b71e8d084199dc44f0d0cfc852c9e1f341b06ae66601f9da4af3aad416b0c62dcd0567ac7568f072d8d90d502e + checksum: 10/da6857a69dc93cd20a11d3a905db4214d269d246a6aaee1d8734f922024b08ffdef0b3cba2ac79917633043b4f50464242b0bd92a265c960083dfff5b833dbbe languageName: node linkType: hard @@ -3342,7 +3342,14 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-paginate-rest@npm:^9.0.0": +"@octokit/openapi-types@npm:^21.0.0": + version: 21.2.0 + resolution: "@octokit/openapi-types@npm:21.2.0" + checksum: 10/93bd5b188b7bd6e9ee40893594df4a4a65f4f8f6f46f145625fc990c1ad04c42de21ef6297678fac6e9256316ab2976f895b4e3eb504035c7a8656371e9dac7d + languageName: node + linkType: hard + +"@octokit/plugin-paginate-rest@npm:^9.1.5": version: 9.2.1 resolution: "@octokit/plugin-paginate-rest@npm:9.2.1" dependencies: @@ -3362,7 +3369,7 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-rest-endpoint-methods@npm:^10.0.0": +"@octokit/plugin-rest-endpoint-methods@npm:^10.2.0": version: 10.4.1 resolution: "@octokit/plugin-rest-endpoint-methods@npm:10.4.1" dependencies: @@ -3373,27 +3380,27 @@ __metadata: languageName: node linkType: hard -"@octokit/plugin-retry@npm:7.0.3": - version: 7.0.3 - resolution: "@octokit/plugin-retry@npm:7.0.3" +"@octokit/plugin-retry@npm:7.1.0": + version: 7.1.0 + resolution: "@octokit/plugin-retry@npm:7.1.0" dependencies: "@octokit/request-error": "npm:^6.0.0" - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.0.0" bottleneck: "npm:^2.15.3" peerDependencies: "@octokit/core": ">=6" - checksum: 10/dd04be30d9b5814777b9c029ff94cc7962507e5a4708899498d98d78e79830e1746680734465af85c1fa83abe06e303831ab0afa4e54faaf4ddf5bed40779484 + checksum: 10/c445c76daa37c38fd095a280f28c6e9afbfdaab8290f0ca17253e3553b3fcf55f028ae72c923440e1a06b87e4e04f24d8a5a4976f6a7494d33d368ec4518a7de languageName: node linkType: hard -"@octokit/request-error@npm:^5.0.0": - version: 5.0.1 - resolution: "@octokit/request-error@npm:5.0.1" +"@octokit/request-error@npm:^5.1.0": + version: 5.1.0 + resolution: "@octokit/request-error@npm:5.1.0" dependencies: - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.1.0" deprecation: "npm:^2.0.0" once: "npm:^1.4.0" - checksum: 10/a21a4614c46cb173e4ba73fa048576204f1ddc541dee3e7c938ef36088566e3b25e04ca1f96f375ec2e3cc29b7ba970b3b078a89a20bc50cdcdbed879db94573 + checksum: 10/d03f9f7a408af673cd991eeb450b6f4a5cee6c368f6349eb0211dfc0404fddfcff8b5225ef186020a2a1829adba0aa8c9174155b49ab2ed00a94fb9a886a1dd3 languageName: node linkType: hard @@ -3406,15 +3413,15 @@ __metadata: languageName: node linkType: hard -"@octokit/request@npm:^8.0.1, @octokit/request@npm:^8.0.2": - version: 8.2.0 - resolution: "@octokit/request@npm:8.2.0" +"@octokit/request@npm:^8.3.0, @octokit/request@npm:^8.3.1": + version: 8.3.1 + resolution: "@octokit/request@npm:8.3.1" dependencies: - "@octokit/endpoint": "npm:^9.0.0" - "@octokit/request-error": "npm:^5.0.0" - "@octokit/types": "npm:^12.0.0" + "@octokit/endpoint": "npm:^9.0.1" + "@octokit/request-error": "npm:^5.1.0" + "@octokit/types": "npm:^13.0.0" universal-user-agent: "npm:^6.0.0" - checksum: 10/553ba8b99ea6fe2d3b66b2be6df06f7fe62a0b81e441d334ef25388cf0fcdab4a888fcfe2c1fb1ada262c233bcf7169da3ad5e03f024060ea5723f7753b0de3e + checksum: 10/9df92d1e2c739cdfc01eef11ffa88e36a6dbd2b52f950b27fe5e47f5b795f9df2e99318adab28e16ff360197e7db49f2d34dad25d432abe77c7f4657fc8c681e languageName: node linkType: hard @@ -3430,15 +3437,15 @@ __metadata: languageName: node linkType: hard -"@octokit/rest@npm:20.0.2": - version: 20.0.2 - resolution: "@octokit/rest@npm:20.0.2" +"@octokit/rest@npm:20.1.0": + version: 20.1.0 + resolution: "@octokit/rest@npm:20.1.0" dependencies: - "@octokit/core": "npm:^5.0.0" - "@octokit/plugin-paginate-rest": "npm:^9.0.0" + "@octokit/core": "npm:^5.0.2" + "@octokit/plugin-paginate-rest": "npm:^9.1.5" "@octokit/plugin-request-log": "npm:^4.0.0" - "@octokit/plugin-rest-endpoint-methods": "npm:^10.0.0" - checksum: 10/527e1806ca274209a2a7daa485010dafb2ebb6c9b0b44c1d33a8f1f16f10e54a96386a4f642dc416160842a4b367d3953d27f8b827b9a94600709d2ac5e95d21 + "@octokit/plugin-rest-endpoint-methods": "npm:^10.2.0" + checksum: 10/a34ef12f066128dcac2680ba3a3fad8b2eb1ce0f278b613bf4497310701a752148c0a9703a6fb35326dcfb9a1958c541a6722d5c6eaf2e1612c8b935dfed8eb3 languageName: node linkType: hard @@ -3451,6 +3458,15 @@ __metadata: languageName: node linkType: hard +"@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0": + version: 13.1.0 + resolution: "@octokit/types@npm:13.1.0" + dependencies: + "@octokit/openapi-types": "npm:^21.0.0" + checksum: 10/3ca6bf76ee1e07ba5bf5aea911948878f82dc0ca5295902f1a3bb405ea008b927bf9dd6c2b3d6e875a7ecfbd7f5b6dc00be3e23adc89ba6fa015c1a00836f920 + languageName: node + linkType: hard + "@open-wc/dedupe-mixin@npm:^1.3.0": version: 1.4.0 resolution: "@open-wc/dedupe-mixin@npm:1.4.0" @@ -9670,9 +9686,9 @@ __metadata: "@material/web": "npm:=1.3.0" "@mdi/js": "npm:7.4.47" "@mdi/svg": "npm:7.4.47" - "@octokit/auth-oauth-device": "npm:7.0.1" - "@octokit/plugin-retry": "npm:7.0.3" - "@octokit/rest": "npm:20.0.2" + "@octokit/auth-oauth-device": "npm:7.1.0" + "@octokit/plugin-retry": "npm:7.1.0" + "@octokit/rest": "npm:20.1.0" "@open-wc/dev-server-hmr": "npm:0.1.4" "@polymer/paper-item": "npm:3.0.1" "@polymer/paper-listbox": "npm:3.0.1" From 7141ef17be9f3857863ad2b2dc3da9a8dd414011 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:36:26 -0400 Subject: [PATCH 11/98] Update dependency @codemirror/legacy-modes to v6.4.0 (#20475) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index b605bcdfc4b5..c9deb2d6d2a2 100644 --- a/package.json +++ b/package.json @@ -30,7 +30,7 @@ "@codemirror/autocomplete": "6.15.0", "@codemirror/commands": "6.3.3", "@codemirror/language": "6.10.1", - "@codemirror/legacy-modes": "6.3.3", + "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", "@codemirror/view": "6.26.1", diff --git a/yarn.lock b/yarn.lock index e56404f0a1c3..7eafa0beaec7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1512,12 +1512,12 @@ __metadata: languageName: node linkType: hard -"@codemirror/legacy-modes@npm:6.3.3": - version: 6.3.3 - resolution: "@codemirror/legacy-modes@npm:6.3.3" +"@codemirror/legacy-modes@npm:6.4.0": + version: 6.4.0 + resolution: "@codemirror/legacy-modes@npm:6.4.0" dependencies: "@codemirror/language": "npm:^6.0.0" - checksum: 10/248a11a7fd43561ec85a8bd6dad26414f786bb9e46dcbd15394b3e5ed3b0f177eade39f1aad6f043af9a58396f68e092ee674d592ee434ebdc9f46de0bf4385c + checksum: 10/0f3f47cd867c95704ee7648eeb41b991f736ccd9ef4f6668210a82386333d3bc5e1beb6fa60391f6064327d6ac2037b17428decdee440c115a553f280a75bf61 languageName: node linkType: hard @@ -9630,7 +9630,7 @@ __metadata: "@codemirror/autocomplete": "npm:6.15.0" "@codemirror/commands": "npm:6.3.3" "@codemirror/language": "npm:6.10.1" - "@codemirror/legacy-modes": "npm:6.3.3" + "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" "@codemirror/state": "npm:6.4.1" "@codemirror/view": "npm:6.26.1" From 35cf3063cb09e583c607239cd3658621a2e04312 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 8 Apr 2024 20:49:48 -0400 Subject: [PATCH 12/98] Update dependency @lokalise/node-api to v12.4.0 (#20252) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index c9deb2d6d2a2..e2fc86da013d 100644 --- a/package.json +++ b/package.json @@ -158,7 +158,7 @@ "@babel/preset-typescript": "7.24.1", "@bundle-stats/plugin-webpack-filter": "4.12.2", "@koa/cors": "5.0.0", - "@lokalise/node-api": "12.3.0", + "@lokalise/node-api": "12.4.0", "@octokit/auth-oauth-device": "7.1.0", "@octokit/plugin-retry": "7.1.0", "@octokit/rest": "20.1.0", diff --git a/yarn.lock b/yarn.lock index 7eafa0beaec7..6294be06ec66 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2164,10 +2164,10 @@ __metadata: languageName: node linkType: hard -"@lokalise/node-api@npm:12.3.0": - version: 12.3.0 - resolution: "@lokalise/node-api@npm:12.3.0" - checksum: 10/934d868f606de63e97bc293ae1d9b80126949a3df9a184f24051b6b534db13d284ad8adf62bf761bb9cc935911921ef522f8a3f140ddf7f0608db864517ea0cb +"@lokalise/node-api@npm:12.4.0": + version: 12.4.0 + resolution: "@lokalise/node-api@npm:12.4.0" + checksum: 10/5e44b23e7139487961f291dcea4f7082fe86d8b017142890831f0ac83338d7f749565e7f96a628eb0f594d894abd905dfec1c31c140fd07bcf0c120db118ee15 languageName: node linkType: hard @@ -9655,7 +9655,7 @@ __metadata: "@lit-labs/motion": "npm:1.0.7" "@lit-labs/observers": "npm:2.0.2" "@lit-labs/virtualizer": "npm:2.0.12" - "@lokalise/node-api": "npm:12.3.0" + "@lokalise/node-api": "npm:12.4.0" "@lrnwebcomponents/simple-tooltip": "npm:8.0.2" "@material/chips": "npm:=14.0.0-canary.53b3cad2f.0" "@material/data-table": "npm:=14.0.0-canary.53b3cad2f.0" From b091d4f298e435ee70fa419e61a9bd7554af275c Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 9 Apr 2024 13:25:27 +0200 Subject: [PATCH 13/98] Write log on translation error (#20430) * Write log on translation error * Update ha-config-devices-dashboard.ts --------- Co-authored-by: Franck Nijhof --- src/common/translations/localize.ts | 15 ++++++++++++--- src/layouts/hass-tabs-subpage-data-table.ts | 8 ++------ 2 files changed, 14 insertions(+), 9 deletions(-) diff --git a/src/common/translations/localize.ts b/src/common/translations/localize.ts index ac1d759efde4..f88e03691b05 100644 --- a/src/common/translations/localize.ts +++ b/src/common/translations/localize.ts @@ -2,6 +2,7 @@ import IntlMessageFormat from "intl-messageformat"; import type { HTMLTemplateResult } from "lit"; import { polyfillLocaleData } from "../../resources/locale-data-polyfill"; import { Resources, TranslationDict } from "../../types"; +import { fireEvent } from "../dom/fire_event"; // Exclude some patterns from key type checking for now // These are intended to be removed as errors are fixed @@ -81,7 +82,9 @@ export interface FormatsType { */ export const computeLocalize = async ( - cache: any, + cache: HTMLElement & { + _localizationCache?: Record; + }, language: string, resources: Resources, formats?: FormatsType @@ -107,7 +110,7 @@ export const computeLocalize = async ( } const messageKey = key + translatedValue; - let translatedMessage = cache._localizationCache[messageKey] as + let translatedMessage = cache._localizationCache![messageKey] as | IntlMessageFormat | undefined; @@ -121,7 +124,7 @@ export const computeLocalize = async ( } catch (err: any) { return "Translation error: " + err.message; } - cache._localizationCache[messageKey] = translatedMessage; + cache._localizationCache![messageKey] = translatedMessage; } let argObject = {}; @@ -137,6 +140,12 @@ export const computeLocalize = async ( try { return translatedMessage.format(argObject) as string; } catch (err: any) { + // eslint-disable-next-line no-console + console.error("Translation error", key, language, err); + fireEvent(cache, "write_log", { + level: "error", + message: `Failed to format translation for key '${key}' in language '${language}'. ${err}`, + }); return "Translation " + err; } }; diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 2c7aab1dc1f8..9880503faf7b 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -496,9 +496,7 @@ export class HaTabsSubpageDataTable extends LitElement { ${this.showFilters && !showPane ? html` ${localize("ui.components.subpage-data-table.filters", { - number: this.data.length, - })}${localize("ui.components.subpage-data-table.filters")} ${this.filters ? html` Date: Tue, 9 Apr 2024 08:09:21 -0400 Subject: [PATCH 14/98] Don't duplicate the label as the description in Z-Wave Config (#20454) Don'tduplicate the label as the description --- .../integration-panels/zwave_js/zwave_js-node-config.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts index a8a3d6cbd80c..90b440dcfffe 100644 --- a/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts +++ b/src/panels/config/integrations/integration-panels/zwave_js/zwave_js-node-config.ts @@ -235,7 +235,7 @@ class ZWaveJSNodeConfig extends SubscribeMixin(LitElement) { ${item.metadata.label} - ${item.metadata.description || item.metadata.label} + ${item.metadata.description} ${item.metadata.description !== null && !item.metadata.writeable ? html`
` : nothing} From 1e0f7d9629cf007848f7b8dc69042ec558f46615 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Tue, 9 Apr 2024 14:10:59 +0200 Subject: [PATCH 15/98] Don't display keyboard shortcut hints if keyboard shortcuts are disabled (#20456) * Shortcut hints * Prettier --- .../config/dashboard/ha-config-dashboard.ts | 17 ++++++++++++++--- .../state/developer-tools-state.ts | 8 +++++--- 2 files changed, 19 insertions(+), 6 deletions(-) diff --git a/src/panels/config/dashboard/ha-config-dashboard.ts b/src/panels/config/dashboard/ha-config-dashboard.ts index 918b8c888e2a..9e4562f9a4ec 100644 --- a/src/panels/config/dashboard/ha-config-dashboard.ts +++ b/src/panels/config/dashboard/ha-config-dashboard.ts @@ -93,10 +93,19 @@ const randomTip = (hass: HomeAssistant, narrow: boolean) => { weight: 2, narrow: true, }, - { content: hass.localize("ui.tips.key_c_hint"), weight: 1, narrow: false }, - { content: hass.localize("ui.tips.key_m_hint"), weight: 1, narrow: false }, ]; + if (hass?.enableShortcuts) { + tips.push( + { + content: hass.localize("ui.tips.key_c_hint"), + weight: 1, + narrow: false, + }, + { content: hass.localize("ui.tips.key_m_hint"), weight: 1, narrow: false } + ); + } + if (narrow) { tips = tips.filter((tip) => tip.narrow); } @@ -310,7 +319,9 @@ class HaConfigDashboard extends SubscribeMixin(LitElement) { private _showQuickBar(): void { showQuickBar(this, { commandMode: true, - hint: this.hass.localize("ui.dialogs.quick-bar.key_c_hint"), + hint: this.hass.enableShortcuts + ? this.hass.localize("ui.dialogs.quick-bar.key_c_hint") + : undefined, }); } diff --git a/src/panels/developer-tools/state/developer-tools-state.ts b/src/panels/developer-tools/state/developer-tools-state.ts index dc7f04ed6abc..046efa310af1 100644 --- a/src/panels/developer-tools/state/developer-tools-state.ts +++ b/src/panels/developer-tools/state/developer-tools-state.ts @@ -128,9 +128,11 @@ class HaPanelDevState extends LitElement { allow-custom-entity item-label-path="entity_id" > - ${this.hass.localize("ui.tips.key_e_hint")} + ${this.hass.enableShortcuts + ? html`${this.hass.localize("ui.tips.key_e_hint")}` + : nothing} Date: Tue, 9 Apr 2024 15:11:58 +0300 Subject: [PATCH 16/98] Change tile to display "last triggered" in relative time (#20463) --- src/panels/lovelace/cards/hui-tile-card.ts | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/panels/lovelace/cards/hui-tile-card.ts b/src/panels/lovelace/cards/hui-tile-card.ts index abb180dd35d5..2a08ce8f7500 100644 --- a/src/panels/lovelace/cards/hui-tile-card.ts +++ b/src/panels/lovelace/cards/hui-tile-card.ts @@ -245,6 +245,14 @@ export class HuiTileCard extends LitElement implements LovelaceCard { > `; } + if (content === "last_triggered") { + return html` + + `; + } if (stateObj.attributes[content] == null) { return undefined; } From bf176ac314c447f57509f15fd33713f3f200b88d Mon Sep 17 00:00:00 2001 From: Adam Kapos Date: Wed, 10 Apr 2024 12:37:35 +0300 Subject: [PATCH 17/98] Make it possible for themes to blur backgrounds (#20447) * Make it possible for themes to blur card backgrounds * Make it possible for themes to blur dialog backgrounds * Add ha prefix Co-authored-by: Bram Kragten * Rename dialog-backdrop-filter to ha-dialog-scrim-backdrop-filter With backwards compatibility * Run prettier --------- Co-authored-by: Bram Kragten --- src/components/ha-card.ts | 2 ++ src/components/ha-dialog.ts | 12 ++++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/src/components/ha-card.ts b/src/components/ha-card.ts index fc95aa118d6a..38a154a768b3 100644 --- a/src/components/ha-card.ts +++ b/src/components/ha-card.ts @@ -14,6 +14,8 @@ export class HaCard extends LitElement { --ha-card-background, var(--card-background-color, white) ); + -webkit-backdrop-filter: var(--ha-card-backdrop-filter, none); + backdrop-filter: var(--ha-card-backdrop-filter, none); box-shadow: var(--ha-card-box-shadow, none); box-sizing: border-box; border-radius: var(--ha-card-border-radius, 12px); diff --git a/src/components/ha-dialog.ts b/src/components/ha-dialog.ts index 19401d826d86..6930afb2bfd5 100644 --- a/src/components/ha-dialog.ts +++ b/src/components/ha-dialog.ts @@ -75,8 +75,14 @@ export class HaDialog extends DialogBase { var(--divider-color) ); z-index: var(--dialog-z-index, 8); - -webkit-backdrop-filter: var(--dialog-backdrop-filter, none); - backdrop-filter: var(--dialog-backdrop-filter, none); + -webkit-backdrop-filter: var( + --ha-dialog-scrim-backdrop-filter, + var(--dialog-backdrop-filter, none) + ); + backdrop-filter: var( + --ha-dialog-scrim-backdrop-filter, + var(--dialog-backdrop-filter, none) + ); --mdc-dialog-box-shadow: var(--dialog-box-shadow, none); --mdc-typography-headline6-font-weight: 400; --mdc-typography-headline6-font-size: 1.574rem; @@ -119,6 +125,8 @@ export class HaDialog extends DialogBase { margin-top: var(--dialog-surface-margin-top); min-height: var(--mdc-dialog-min-height, auto); border-radius: var(--ha-dialog-border-radius, 28px); + -webkit--filter: var(--ha-dialog-surface--filter, none); + -filter: var(--ha-dialog-surface--filter, none); } :host([flexContent]) .mdc-dialog .mdc-dialog__content { display: flex; From 7556ab950652d909578ac3d7e49291ec322a4eb6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bruno=20Pantale=C3=A3o=20Gon=C3=A7alves?= Date: Wed, 10 Apr 2024 11:40:44 +0200 Subject: [PATCH 18/98] Add css var for header webkit backdrop filter (#20473) * Add CSS var for header -webkit-backdrop-filter * Add backdrop to energy and developer tools --- src/panels/developer-tools/ha-panel-developer-tools.ts | 2 ++ src/panels/energy/ha-panel-energy.ts | 2 ++ src/panels/lovelace/hui-root.ts | 2 ++ 3 files changed, 6 insertions(+) diff --git a/src/panels/developer-tools/ha-panel-developer-tools.ts b/src/panels/developer-tools/ha-panel-developer-tools.ts index 52e98b377077..667f016ea57c 100644 --- a/src/panels/developer-tools/ha-panel-developer-tools.ts +++ b/src/panels/developer-tools/ha-panel-developer-tools.ts @@ -131,6 +131,8 @@ class PanelDeveloperTools extends LitElement { padding-top: env(safe-area-inset-top); color: var(--app-header-text-color, white); border-bottom: var(--app-header-border-bottom, none); + -webkit-backdrop-filter: var(--app-header-backdrop-filter, none); + backdrop-filter: var(--app-header-backdrop-filter, none); } .toolbar { height: var(--header-height); diff --git a/src/panels/energy/ha-panel-energy.ts b/src/panels/energy/ha-panel-energy.ts index 4dd6498ae452..c033f7c2f3d6 100644 --- a/src/panels/energy/ha-panel-energy.ts +++ b/src/panels/energy/ha-panel-energy.ts @@ -363,6 +363,8 @@ class PanelEnergy extends LitElement { transition: box-shadow 200ms linear; display: flex; flex-direction: row; + -webkit-backdrop-filter: var(--app-header-backdrop-filter, none); + backdrop-filter: var(--app-header-backdrop-filter, none); } :host([scrolled]) .header { box-shadow: var( diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts index b0115082bb8a..ce1d4d3d43b1 100644 --- a/src/panels/lovelace/hui-root.ts +++ b/src/panels/lovelace/hui-root.ts @@ -908,6 +908,8 @@ class HUIRoot extends LitElement { position: fixed; top: 0; width: var(--mdc-top-app-bar-width, 100%); + -webkit-backdrop-filter: var(--app-header-backdrop-filter, none); + backdrop-filter: var(--app-header-backdrop-filter, none); padding-top: env(safe-area-inset-top); z-index: 4; transition: box-shadow 200ms linear; From 9f5bc5b1965a17abefc7adb38e2aabdd19c7c151 Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Wed, 10 Apr 2024 05:41:12 -0400 Subject: [PATCH 19/98] Match on correct entity ID of HA conversation agent (#20484) --- src/panels/developer-tools/assist/developer-tools-assist.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/panels/developer-tools/assist/developer-tools-assist.ts b/src/panels/developer-tools/assist/developer-tools-assist.ts index 5d050d4ceb32..ed99e6bb7942 100644 --- a/src/panels/developer-tools/assist/developer-tools-assist.ts +++ b/src/panels/developer-tools/assist/developer-tools-assist.ts @@ -92,7 +92,9 @@ class HaPanelDevAssist extends SubscribeMixin(LitElement) { private async _fetchLanguages() { const { agents } = await listAgents(this.hass); - const assistAgent = agents.find((agent) => agent.id === "homeassistant"); + const assistAgent = agents.find( + (agent) => agent.id === "conversation.home_assistant" + ); this.supportedLanguages = assistAgent?.supported_languages === "*" ? undefined From a8502fcc118a44585c3fb7f5b44b9756dbc5ca47 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Thu, 11 Apr 2024 11:10:02 +0200 Subject: [PATCH 20/98] Fix missing argument in voice assistant expose search label (#20491) --- .../voice-assistants/ha-config-voice-assistants-expose.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index 72820db82e1e..c64ea12cef29 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -496,7 +496,10 @@ export class VoiceAssistantsExpose extends LitElement { )} .data=${filteredEntities} .searchLabel=${this.hass.localize( - "ui.panel.config.entities.picker.search" + "ui.panel.config.entities.picker.search", + { + number: filteredEntities.length, + } )} .filter=${this._filter} selectable From 7ca8dabc44b64c8e9fbe80ee69d23dba5fa6ce2c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 11 Apr 2024 16:32:52 -0400 Subject: [PATCH 21/98] Update typescript-eslint monorepo to v7.6.0 (#20497) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 156 +++++++++++++++++++++++++-------------------------- 2 files changed, 80 insertions(+), 80 deletions(-) diff --git a/package.json b/package.json index e2fc86da013d..ba943b720537 100644 --- a/package.json +++ b/package.json @@ -185,8 +185,8 @@ "@types/tar": "6.1.12", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "7.5.0", - "@typescript-eslint/parser": "7.5.0", + "@typescript-eslint/eslint-plugin": "7.6.0", + "@typescript-eslint/parser": "7.6.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index 6294be06ec66..feb86a188b34 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1586,7 +1586,7 @@ __metadata: languageName: node linkType: hard -"@eslint-community/regexpp@npm:^4.5.1, @eslint-community/regexpp@npm:^4.6.1": +"@eslint-community/regexpp@npm:^4.10.0, @eslint-community/regexpp@npm:^4.6.1": version: 4.10.0 resolution: "@eslint-community/regexpp@npm:4.10.0" checksum: 10/8c36169c815fc5d726078e8c71a5b592957ee60d08c6470f9ce0187c8046af1a00afbda0a065cc40ff18d5d83f82aed9793c6818f7304a74a7488dc9f3ecbd42 @@ -4238,7 +4238,7 @@ __metadata: languageName: node linkType: hard -"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.12, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": +"@types/json-schema@npm:*, @types/json-schema@npm:^7.0.15, @types/json-schema@npm:^7.0.8, @types/json-schema@npm:^7.0.9": version: 7.0.15 resolution: "@types/json-schema@npm:7.0.15" checksum: 10/1a3c3e06236e4c4aab89499c428d585527ce50c24fe8259e8b3926d3df4cfbbbcf306cfc73ddfb66cbafc973116efd15967020b0f738f63e09e64c7d260519e7 @@ -4461,7 +4461,7 @@ __metadata: languageName: node linkType: hard -"@types/semver@npm:^7.5.0": +"@types/semver@npm:^7.5.8": version: 7.5.8 resolution: "@types/semver@npm:7.5.8" checksum: 10/3496808818ddb36deabfe4974fd343a78101fa242c4690044ccdc3b95dcf8785b494f5d628f2f47f38a702f8db9c53c67f47d7818f2be1b79f2efb09692e1178 @@ -4572,126 +4572,126 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.5.0" +"@typescript-eslint/eslint-plugin@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.6.0" dependencies: - "@eslint-community/regexpp": "npm:^4.5.1" - "@typescript-eslint/scope-manager": "npm:7.5.0" - "@typescript-eslint/type-utils": "npm:7.5.0" - "@typescript-eslint/utils": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" + "@eslint-community/regexpp": "npm:^4.10.0" + "@typescript-eslint/scope-manager": "npm:7.6.0" + "@typescript-eslint/type-utils": "npm:7.6.0" + "@typescript-eslint/utils": "npm:7.6.0" + "@typescript-eslint/visitor-keys": "npm:7.6.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" - ignore: "npm:^5.2.4" + ignore: "npm:^5.3.1" natural-compare: "npm:^1.4.0" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependencies: "@typescript-eslint/parser": ^7.0.0 eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/5469900a0c2f485dcae10fc8509e2e1d981538d4c90a13330672fbd10cb7b9bb6d55445d6edea876e2c1719f1f0e25f6af0eb2d413e0c458a8930a371481b9e6 + checksum: 10/6977c5fb5397ac6c9fda8786b149130321ffba45a71b813ca8a800fe711ac626bcbe05d5ace2ef6245eb8f0c4b6feb2b505a0e0e398fa37ce088731e78478b20 languageName: node linkType: hard -"@typescript-eslint/parser@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/parser@npm:7.5.0" +"@typescript-eslint/parser@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/parser@npm:7.6.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.5.0" - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/typescript-estree": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" + "@typescript-eslint/scope-manager": "npm:7.6.0" + "@typescript-eslint/types": "npm:7.6.0" + "@typescript-eslint/typescript-estree": "npm:7.6.0" + "@typescript-eslint/visitor-keys": "npm:7.6.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/a5414fb2fbd78bf7337125f4a3040318bdffa996a94e27b4f791d51535d5d9286c3e0ae43652b251c48549bbfece0e3a33553b30ed986af6b4f715d76361d6bb + checksum: 10/245b975280691c6c7bd3fe3e9d57943220e0400df62738274b98dffcbd3011b7191fd54c950cb4d0b6328699f3b1a45cea5e46cc5c86528e7f14e533277616c8 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/scope-manager@npm:7.5.0" +"@typescript-eslint/scope-manager@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/scope-manager@npm:7.6.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" - checksum: 10/9446c07290a7f7f539a0bdaaf2fb97ae57095a01cd0baad9ecac532da88e7d0d207e5180131c0608542aee2fd1270caf700a2788fa460ffc6e65e966baf34135 + "@typescript-eslint/types": "npm:7.6.0" + "@typescript-eslint/visitor-keys": "npm:7.6.0" + checksum: 10/1daa0b84f751e740df39abf7303e63dcff26883242a616712d338edb11d24a05a03156d8f5d6b2c42ef01a28c540dbfc5c83853e159f341189870320e4c4acef languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/type-utils@npm:7.5.0" +"@typescript-eslint/type-utils@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/type-utils@npm:7.6.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.5.0" - "@typescript-eslint/utils": "npm:7.5.0" + "@typescript-eslint/typescript-estree": "npm:7.6.0" + "@typescript-eslint/utils": "npm:7.6.0" debug: "npm:^4.3.4" - ts-api-utils: "npm:^1.0.1" + ts-api-utils: "npm:^1.3.0" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/257730553760fa943538db9648a11f4253efb722ab3394cd325bd775ee0c9d93af84c62540dee9377d4a669eb1cd801faed5e1bcb673d1606c9225eee82b420a + checksum: 10/1011e1d3ff15f0167f653652865c5b850a1acb21627abff30b0cf1e15865dd490bfb7e9334fa2f4123477fc1eea1ebf4a5c3c8c5cc1972e3b195a39bd8c03aa8 languageName: node linkType: hard -"@typescript-eslint/types@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/types@npm:7.5.0" - checksum: 10/12eac46d0dfbbeb1db7d0658b841d554d38365420f42b699dea531e0c475b77d6fd838ac4046b7672e53d9bb76a021eaf6198cf3210fe1ecf1056ea44b6699a9 +"@typescript-eslint/types@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/types@npm:7.6.0" + checksum: 10/830c1b12d8a9242285516e9b7e46bf434b52ad835da4fc5cdac19e79f02bf637c9458923d72cc0babe20d474ddcafcdd4dcd8991c2280d00084a014de3d32da0 languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.5.0" +"@typescript-eslint/typescript-estree@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.6.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/visitor-keys": "npm:7.5.0" + "@typescript-eslint/types": "npm:7.6.0" + "@typescript-eslint/visitor-keys": "npm:7.6.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" - minimatch: "npm:9.0.3" - semver: "npm:^7.5.4" - ts-api-utils: "npm:^1.0.1" + minimatch: "npm:^9.0.4" + semver: "npm:^7.6.0" + ts-api-utils: "npm:^1.3.0" peerDependenciesMeta: typescript: optional: true - checksum: 10/7487293a9ab9459b133322e695435b4540ffcad89f2bea917c3389676d68283297a663c77d6bda298144d3581361733ae4af632213fa7ef48be67e9aa792b4cc + checksum: 10/a10ae981669180d7c09acdd01e1c3b3dcb544edb8fa44d0c82586c2915d3001e6e15c792ef6b0b75774d6ff705613ec213f2316a7d9477a122e68c5913545a2b languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/utils@npm:7.5.0" +"@typescript-eslint/utils@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/utils@npm:7.6.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" - "@types/json-schema": "npm:^7.0.12" - "@types/semver": "npm:^7.5.0" - "@typescript-eslint/scope-manager": "npm:7.5.0" - "@typescript-eslint/types": "npm:7.5.0" - "@typescript-eslint/typescript-estree": "npm:7.5.0" - semver: "npm:^7.5.4" + "@types/json-schema": "npm:^7.0.15" + "@types/semver": "npm:^7.5.8" + "@typescript-eslint/scope-manager": "npm:7.6.0" + "@typescript-eslint/types": "npm:7.6.0" + "@typescript-eslint/typescript-estree": "npm:7.6.0" + semver: "npm:^7.6.0" peerDependencies: eslint: ^8.56.0 - checksum: 10/a0b2f206a1c35dd77b292d1cd385443f42d00ccf8a5151811fe6bdd6b5f3a450372bf99b8757c307988d14d99587424c59ed59e78cf56c17b43c9c3fd8932871 + checksum: 10/45bcc1b00ec281cfc997aeff4bca3b3e169f49c656ddfcfad909b18ecdcd8b0d27776df1c452d47d9291cd1346023e0a2d7c8aa67bf3ad917f530033f6b193aa languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.5.0": - version: 7.5.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.5.0" +"@typescript-eslint/visitor-keys@npm:7.6.0": + version: 7.6.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.6.0" dependencies: - "@typescript-eslint/types": "npm:7.5.0" - eslint-visitor-keys: "npm:^3.4.1" - checksum: 10/ba83113110b13bc65120ea3d1e21e1dcea6010b0a1a3d07da2fd274bb0feb552a92276b6052e659d2fe40178938b17368ede64752c4937f41685c53bdf9d2634 + "@typescript-eslint/types": "npm:7.6.0" + eslint-visitor-keys: "npm:^3.4.3" + checksum: 10/2703629f1359f08e7a20706e225f2d83bf12292c282d2effa431eae441b12d4af1fe8c692535f6ef32d5b6d0c15ad61c4c102e4dd157c8fe30eefb94222ba239 languageName: node linkType: hard @@ -9717,8 +9717,8 @@ __metadata: "@types/tar": "npm:6.1.12" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:7.5.0" - "@typescript-eslint/parser": "npm:7.5.0" + "@typescript-eslint/eslint-plugin": "npm:7.6.0" + "@typescript-eslint/parser": "npm:7.6.0" "@vaadin/combo-box": "npm:24.3.10" "@vaadin/vaadin-themable-mixin": "npm:24.3.10" "@vibrant/color": "npm:3.2.1-alpha.1" @@ -10099,7 +10099,7 @@ __metadata: languageName: node linkType: hard -"ignore@npm:^5.2.0, ignore@npm:^5.2.4": +"ignore@npm:^5.2.0, ignore@npm:^5.2.4, ignore@npm:^5.3.1": version: 5.3.1 resolution: "ignore@npm:5.3.1" checksum: 10/0a884c2fbc8c316f0b9f92beaf84464253b73230a4d4d286697be45fca081199191ca33e1c2e82d9e5f851f5e9a48a78e25a35c951e7eb41e59f150db3530065 @@ -11994,21 +11994,21 @@ __metadata: languageName: node linkType: hard -"minimatch@npm:9.0.3, minimatch@npm:^9.0.1": - version: 9.0.3 - resolution: "minimatch@npm:9.0.3" +"minimatch@npm:^5.0.1": + version: 5.1.6 + resolution: "minimatch@npm:5.1.6" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10/c81b47d28153e77521877649f4bab48348d10938df9e8147a58111fe00ef89559a2938de9f6632910c4f7bf7bb5cd81191a546167e58d357f0cfb1e18cecc1c5 + checksum: 10/126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429 languageName: node linkType: hard -"minimatch@npm:^5.0.1": - version: 5.1.6 - resolution: "minimatch@npm:5.1.6" +"minimatch@npm:^9.0.1, minimatch@npm:^9.0.4": + version: 9.0.4 + resolution: "minimatch@npm:9.0.4" dependencies: brace-expansion: "npm:^2.0.1" - checksum: 10/126b36485b821daf96d33b5c821dac600cc1ab36c87e7a532594f9b1652b1fa89a1eebcaad4dff17c764dce1a7ac1531327f190fed5f97d8f6e5f889c116c429 + checksum: 10/4cdc18d112b164084513e890d6323370db14c22249d536ad1854539577a895e690a27513dc346392f61a4a50afbbd8abc88f3f25558bfbbbb862cd56508b20f5 languageName: node linkType: hard @@ -14196,7 +14196,7 @@ __metadata: languageName: node linkType: hard -"semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.5.4": +"semver@npm:^7.3.4, semver@npm:^7.3.5, semver@npm:^7.6.0": version: 7.6.0 resolution: "semver@npm:7.6.0" dependencies: @@ -15461,7 +15461,7 @@ __metadata: languageName: node linkType: hard -"ts-api-utils@npm:^1.0.1": +"ts-api-utils@npm:^1.3.0": version: 1.3.0 resolution: "ts-api-utils@npm:1.3.0" peerDependencies: From 8dc2797b16bb22796f2e6f36d1252494815ef256 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Fri, 12 Apr 2024 11:10:23 +0200 Subject: [PATCH 22/98] Fix issues with application credentials (#20495) --- .../ha-config-application-credentials.ts | 99 ++++++++----------- 1 file changed, 40 insertions(+), 59 deletions(-) diff --git a/src/panels/config/application_credentials/ha-config-application-credentials.ts b/src/panels/config/application_credentials/ha-config-application-credentials.ts index c606e4f158bd..1431491f3bb4 100644 --- a/src/panels/config/application_credentials/ha-config-application-credentials.ts +++ b/src/panels/config/application_credentials/ha-config-application-credentials.ts @@ -1,14 +1,6 @@ import { mdiDelete, mdiPlus } from "@mdi/js"; -import { - css, - CSSResultGroup, - html, - LitElement, - PropertyValues, - nothing, -} from "lit"; +import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit"; import { customElement, property, query, state } from "lit/decorators"; -import { classMap } from "lit/directives/class-map"; import memoizeOne from "memoize-one"; import type { HASSDomEvent } from "../../../common/dom/fire_event"; import { LocalizeFunc } from "../../../common/translations/localize"; @@ -59,27 +51,24 @@ export class HaConfigApplicationCredentials extends LitElement { title: localize( "ui.panel.config.application_credentials.picker.headers.name" ), + sortable: true, direction: "asc", grows: true, - template: (entry) => html`${entry.name}`, }, client_id: { title: localize( "ui.panel.config.application_credentials.picker.headers.client_id" ), width: "30%", - direction: "asc", hidden: narrow, - template: (entry) => html`${entry.client_id}`, }, - application: { + localizedDomain: { title: localize( "ui.panel.config.application_credentials.picker.headers.application" ), sortable: true, width: "30%", direction: "asc", - template: (entry) => html`${domainToName(localize, entry.domain)}`, }, }; @@ -87,6 +76,14 @@ export class HaConfigApplicationCredentials extends LitElement { } ); + private _getApplicationCredentials = memoizeOne( + (applicationCredentials: ApplicationCredential[], localize: LocalizeFunc) => + applicationCredentials.map((credential) => ({ + ...credential, + localizedDomain: domainToName(localize, credential.domain), + })) + ); + protected firstUpdated(changedProperties: PropertyValues) { super.firstUpdated(changedProperties); this._loadTranslations(); @@ -102,56 +99,40 @@ export class HaConfigApplicationCredentials extends LitElement { backPath="/config" .tabs=${configSections.devices} .columns=${this._columns(this.narrow, this.hass.localize)} - .data=${this._applicationCredentials} + .data=${this._getApplicationCredentials( + this._applicationCredentials, + this.hass.localize + )} hasFab selectable + .selected=${this._selected.length} @selection-changed=${this._handleSelectionChanged} > - ${this._selected.length - ? html` -
-

- ${this.hass.localize( - "ui.panel.config.application_credentials.picker.selected", - { number: this._selected.length } +

+ ${!this.narrow + ? html` + ${this.hass.localize( + "ui.panel.config.application_credentials.picker.remove_selected.button" + )} + ` + : html` + + -
- ${!this.narrow - ? html` - ${this.hass.localize( - "ui.panel.config.application_credentials.picker.remove_selected.button" - )} - ` - : html` - - - - `} -
-
- ` - : nothing} + > + + `} +
Date: Fri, 12 Apr 2024 11:15:15 +0200 Subject: [PATCH 23/98] Handle errors in multi select (#20494) --- .../util/promise-all-settled-results.ts | 9 +++ .../config/automation/ha-automation-picker.ts | 65 +++++++++++++++++-- .../devices/ha-config-devices-dashboard.ts | 20 +++++- .../config/entities/ha-config-entities.ts | 55 +++++++++++++--- .../config/helpers/ha-config-helpers.ts | 34 +++++++++- src/panels/config/scene/ha-scene-dashboard.ts | 35 +++++++++- src/panels/config/script/ha-script-picker.ts | 35 +++++++++- src/translations/en.json | 1 + 8 files changed, 235 insertions(+), 19 deletions(-) create mode 100644 src/common/util/promise-all-settled-results.ts diff --git a/src/common/util/promise-all-settled-results.ts b/src/common/util/promise-all-settled-results.ts new file mode 100644 index 000000000000..459febb453c5 --- /dev/null +++ b/src/common/util/promise-all-settled-results.ts @@ -0,0 +1,9 @@ +export const hasRejectedItems = (results: PromiseSettledResult[]) => + results.some((result) => result.status === "rejected"); + +export const rejectedItems = ( + results: PromiseSettledResult[] +): PromiseRejectedResult[] => + results.filter( + (result) => result.status === "rejected" + ) as PromiseRejectedResult[]; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index df56a6317a96..b48a6dc20f37 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -105,6 +105,10 @@ import { showCategoryRegistryDetailDialog } from "../category/show-dialog-catego import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; import { showNewAutomationDialog } from "./show-dialog-new-automation"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; type AutomationItem = AutomationEntity & { name: string; @@ -196,6 +200,7 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { labels: (labels || []).map( (lbl) => labelReg!.find((label) => label.label_id === lbl)! ), + selectable: entityRegEntry !== undefined, }; }); } @@ -1112,7 +1117,20 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkLabel(ev) { @@ -1135,7 +1153,20 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkEnable() { @@ -1143,7 +1174,20 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { this._selected.forEach((entityId) => { promises.push(turnOnOffEntity(this.hass, entityId, true)); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkDisable() { @@ -1151,7 +1195,20 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { this._selected.forEach((entityId) => { promises.push(turnOnOffEntity(this.hass, entityId, false)); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _bulkCreateCategory() { diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index 68c402ee5c95..e834e453fc1d 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -69,6 +69,11 @@ import { configSections } from "../ha-panel-config"; import "../integrations/ha-integration-overflow-menu"; import { showAddIntegrationDialog } from "../integrations/show-add-integration-dialog"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; +import { showAlertDialog } from "../../lovelace/custom-card-helpers"; interface DeviceRowData extends DeviceRegistryEntry { device?: DeviceRowData; @@ -824,7 +829,20 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private _bulkCreateLabel() { diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index e98bc7b03733..50aa67a862a5 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -90,6 +90,10 @@ import { EntitySources, fetchEntitySourcesWithCache, } from "../../../data/entity_sources"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; export interface StateEntity extends Omit { @@ -957,19 +961,41 @@ ${ confirm: async () => { let require_restart = false; let reload_delay = 0; - await Promise.all( + const result = await Promise.allSettled( this._selected.map(async (entity) => { - const result = await updateEntityRegistryEntry(this.hass, entity, { - disabled_by: null, - }); - if (result.require_restart) { + const updateResult = await updateEntityRegistryEntry( + this.hass, + entity, + { + disabled_by: null, + } + ); + if (updateResult.require_restart) { require_restart = true; } - if (result.reload_delay) { - reload_delay = Math.max(reload_delay, result.reload_delay); + if (updateResult.reload_delay) { + reload_delay = Math.max(reload_delay, updateResult.reload_delay); } }) ); + + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize( + "ui.panel.config.common.multiselect.failed", + { + number: rejected.length, + } + ), + text: html`
+    ${rejected
+                .map((r) => r.reason.message || r.reason.code || r.reason)
+                .join("\r\n")}
`, + }); + } + this._clearSelection(); // If restart is required by any entity, show a dialog. // Otherwise, show a dialog explaining that some patience is needed @@ -1068,7 +1094,20 @@ ${ }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private _bulkCreateLabel() { diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index e44659e34b8f..14149c7d1914 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -32,6 +32,10 @@ import { LocalizeKeys, } from "../../../common/translations/localize"; import { extractSearchParam } from "../../../common/url/search-params"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import { DataTableColumnContainer, RowClickedEvent, @@ -801,7 +805,20 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkLabel(ev) { @@ -824,7 +841,20 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private _handleSelectionChanged( diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index e357bb00fed6..fbbe1cc334af 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -95,6 +95,10 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; type SceneItem = SceneEntity & { name: string; @@ -178,6 +182,7 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) { labels: (labels || []).map( (lbl) => labelReg!.find((label) => label.label_id === lbl)! ), + selectable: entityRegEntry !== undefined, }; }); } @@ -798,7 +803,20 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkLabel(ev) { @@ -821,7 +839,20 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private _editCategory(scene: any) { diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index 944c7dc84457..b6ae00c01235 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -97,6 +97,10 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; type ScriptItem = ScriptEntity & { name: string; @@ -185,6 +189,7 @@ class HaScriptPicker extends SubscribeMixin(LitElement) { labels: (labels || []).map( (lbl) => labelReg!.find((label) => label.label_id === lbl)! ), + selectable: entityRegEntry !== undefined, }; }); } @@ -867,7 +872,20 @@ class HaScriptPicker extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private async _handleBulkLabel(ev) { @@ -890,7 +908,20 @@ class HaScriptPicker extends SubscribeMixin(LitElement) { }) ); }); - await Promise.all(promises); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
+${rejected
+            .map((r) => r.reason.message || r.reason.code || r.reason)
+            .join("\r\n")}
`, + }); + } } private _handleRowClicked(ev: HASSDomEvent) { diff --git a/src/translations/en.json b/src/translations/en.json index bf3e8b90537f..21e30b9e0b89 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -1867,6 +1867,7 @@ "editor": { "confirm_unsaved": "You have unsaved changes. Are you sure you want to leave?" }, + "multiselect": { "failed": "Failed to update {number} items." }, "learn_more": "Learn more" }, "updates": { From 27d2b244a41f986046fb026c44e2746592852bca Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:17:51 +0200 Subject: [PATCH 24/98] Add spacing between icon and name in entity button bar (#20492) * Fix width between icon and name * Remove no-text --- .../lovelace/components/hui-buttons-base.ts | 20 ------------------- 1 file changed, 20 deletions(-) diff --git a/src/panels/lovelace/components/hui-buttons-base.ts b/src/panels/lovelace/components/hui-buttons-base.ts index 4fa798a8e590..2b1f9a11524d 100644 --- a/src/panels/lovelace/components/hui-buttons-base.ts +++ b/src/panels/lovelace/components/hui-buttons-base.ts @@ -52,7 +52,6 @@ export class HuiButtonsBase extends LitElement { .stateObj=${stateObj} .overrideIcon=${entityConf.icon} .overrideImage=${entityConf.image} - class=${name ? "" : "no-text"} .stateColor=${true} slot="icon" > @@ -92,27 +91,8 @@ export class HuiButtonsBase extends LitElement { color: var(--secondary-text-color); align-items: center; justify-content: center; - width: 24px; - height: 24px; - margin-left: -4px; - margin-inline-start: -4px; - margin-inline-end: initial; margin-top: -2px; } - state-badge.no-text { - width: 26px; - height: 26px; - margin-left: -3px; - margin-inline-start: -3px; - margin-inline-end: initial; - margin-top: -3px; - } - ha-assist-chip state-badge { - margin-right: -4px; - margin-inline-end: -4px; - margin-inline-start: initial; - --mdc-icon-size: 18px; - } @media all and (max-width: 450px), all and (max-height: 500px) { .ha-scrollbar { flex-wrap: nowrap; From dc8a50965c545a107570bbdd953561132f610b2a Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Fri, 12 Apr 2024 06:22:18 -0400 Subject: [PATCH 25/98] Group date-fns packages (#20499) --- renovate.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/renovate.json b/renovate.json index 741ef2c4998c..f6348e5a1d35 100644 --- a/renovate.json +++ b/renovate.json @@ -40,6 +40,11 @@ "matchPackageNames": ["tsparticles-engine"], "matchPackagePrefixes": ["tsparticles-preset-"] }, + { + "description": "Group date-fns with dependent timezone package", + "groupName": "date-fns", + "matchPackageNames": ["date-fns", "date-fns-tz"] + }, { "description": "Group and temporarily disable WDS packages", "groupName": "Web Dev Server", From e22e3e88a040852acfe04135160972ab8b367d9b Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Fri, 12 Apr 2024 06:49:18 -0400 Subject: [PATCH 26/98] Speed up and simplify translations build (#19988) * Speed up and simplify translations build - Remove use of gulp-flatmap for merges (wasted input) and just loop over translation files. - Parse and buffer master only once for all merges. - Remove lokalise key reference transform from non-English files. This is already done by Lokalise when they are downloaded. - Remove tabs from merged output to minimize buffer sizes. - Pipe merges to a hashing stream, removing extra tasks and intermediate file I/O. - Pipe hashed files to a single custom asynchronous transform stream to fragmentize the files. It expands the stream to push a new file for each fragment. - Incorporate flattening into fragmentization. - Delete entire ui.panel key for base translation (instead of leaving an empty object). - Optimize flatten method to stop copying output over and over. - Convert empty and test filters to JSON.parse() revivers for simplicity and better performance. - Incorporate supervisor builds into main tasks using a simple toggle (i.e. remove duplicate code). - Funcify local tasks and simplify exported tasks. - Incorporate test metadata task into a simplified metadata task. * Fix Lokalise key reference link Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com> --------- Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com> --- build-scripts/gulp/translations.js | 526 +++++++++++------------------ build-scripts/gulp/webpack.js | 2 +- build-scripts/util.cjs | 16 - gulpfile.js | 3 + package.json | 3 - yarn.lock | 126 +------ 6 files changed, 198 insertions(+), 478 deletions(-) delete mode 100644 build-scripts/util.cjs diff --git a/build-scripts/gulp/translations.js b/build-scripts/gulp/translations.js index fd4cccc013a8..7b670ccc6b67 100755 --- a/build-scripts/gulp/translations.js +++ b/build-scripts/gulp/translations.js @@ -1,92 +1,76 @@ -import { createHash } from "crypto"; -import { deleteSync } from "del"; -import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs"; -import { writeFile } from "node:fs/promises"; +import { deleteAsync } from "del"; +import { glob } from "glob"; import gulp from "gulp"; -import flatmap from "gulp-flatmap"; -import transform from "gulp-json-transform"; import merge from "gulp-merge-json"; import rename from "gulp-rename"; -import path from "path"; -import vinylBuffer from "vinyl-buffer"; -import source from "vinyl-source-stream"; +import { createHash } from "node:crypto"; +import { mkdir, readFile } from "node:fs/promises"; +import { basename, join } from "node:path"; +import { Transform } from "node:stream"; +import { finished } from "node:stream/promises"; import env from "../env.cjs"; import paths from "../paths.cjs"; -import { mapFiles } from "../util.cjs"; import "./fetch-nightly-translations.js"; const inFrontendDir = "translations/frontend"; const inBackendDir = "translations/backend"; const workDir = "build/translations"; -const fullDir = workDir + "/full"; -const coreDir = workDir + "/core"; -const outDir = workDir + "/output"; +const outDir = join(workDir, "output"); +const EN_SRC = join(paths.translations_src, "en.json"); + let mergeBackend = false; gulp.task( "translations-enable-merge-backend", - gulp.parallel((done) => { + gulp.parallel(async () => { mergeBackend = true; - done(); }, "allow-setup-fetch-nightly-translations") ); -// Panel translations which should be split from the core translations. -const TRANSLATION_FRAGMENTS = Object.keys( - JSON.parse( - readFileSync( - path.resolve(paths.polymer_dir, "src/translations/en.json"), - "utf-8" - ) - ).ui.panel -); - -function recursiveFlatten(prefix, data) { - let output = {}; - Object.keys(data).forEach((key) => { - if (typeof data[key] === "object") { - output = { - ...output, - ...recursiveFlatten(prefix + key + ".", data[key]), - }; - } else { - output[prefix + key] = data[key]; - } - }); - return output; -} - -function flatten(data) { - return recursiveFlatten("", data); -} +// Transform stream to apply a function on Vinyl JSON files (buffer mode only). +// The provided function can either return a new object, or an array of +// [object, subdirectory] pairs for fragmentizing the JSON. +class CustomJSON extends Transform { + constructor(func, reviver = null) { + super({ objectMode: true }); + this._func = func; + this._reviver = reviver; + } -function emptyFilter(data) { - const newData = {}; - Object.keys(data).forEach((key) => { - if (data[key]) { - if (typeof data[key] === "object") { - newData[key] = emptyFilter(data[key]); - } else { - newData[key] = data[key]; + async _transform(file, _, callback) { + try { + let obj = JSON.parse(file.contents.toString(), this._reviver); + if (this._func) obj = this._func(obj, file.path); + for (const [outObj, dir] of Array.isArray(obj) ? obj : [[obj, ""]]) { + const outFile = file.clone({ contents: false }); + outFile.contents = Buffer.from(JSON.stringify(outObj)); + outFile.dirname += `/${dir}`; + this.push(outFile); } + callback(null); + } catch (err) { + callback(err); } - }); - return newData; + } } -function recursiveEmpty(data) { - const newData = {}; - Object.keys(data).forEach((key) => { - if (data[key]) { - if (typeof data[key] === "object") { - newData[key] = recursiveEmpty(data[key]); - } else { - newData[key] = "TRANSLATED"; - } +// Utility to flatten object keys to single level using separator +const flatten = (data, prefix = "", sep = ".") => { + const output = {}; + for (const [key, value] of Object.entries(data)) { + if (typeof value === "object") { + Object.assign(output, flatten(value, prefix + key + sep, sep)); + } else { + output[prefix + key] = value; } - }); - return newData; -} + } + return output; +}; + +// Filter functions that can be passed directly to JSON.parse() +const emptyReviver = (_key, value) => value || undefined; +const testReviver = (_key, value) => + value && typeof value === "string" ? "TRANSLATED" : value; /** * Replace Lokalise key placeholders with their actual values. @@ -95,60 +79,44 @@ function recursiveEmpty(data) { * be included in src/translations/en.json, but still be usable while * developing locally. * - * @link https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing + * @link https://docs.lokalise.com/en/articles/1400528-key-referencing */ -const re_key_reference = /\[%key:([^%]+)%\]/; -function lokaliseTransform(data, original, file) { +const KEY_REFERENCE = /\[%key:([^%]+)%\]/; +const lokaliseTransform = (data, path, original = data) => { const output = {}; - Object.entries(data).forEach(([key, value]) => { - if (value instanceof Object) { - output[key] = lokaliseTransform(value, original, file); + for (const [key, value] of Object.entries(data)) { + if (typeof value === "object") { + output[key] = lokaliseTransform(value, path, original); } else { - output[key] = value.replace(re_key_reference, (_match, lokalise_key) => { + output[key] = value.replace(KEY_REFERENCE, (_match, lokalise_key) => { const replace = lokalise_key.split("::").reduce((tr, k) => { if (!tr) { - throw Error( - `Invalid key placeholder ${lokalise_key} in ${file.path}` - ); + throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`); } return tr[k]; }, original); if (typeof replace !== "string") { - throw Error( - `Invalid key placeholder ${lokalise_key} in ${file.path}` - ); + throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`); } return replace; }); } - }); + } return output; -} +}; -gulp.task("clean-translations", async () => deleteSync([workDir])); +gulp.task("clean-translations", () => deleteAsync([workDir])); -gulp.task("ensure-translations-build-dir", async () => { - mkdirSync(workDir, { recursive: true }); -}); +const makeWorkDir = () => mkdir(workDir, { recursive: true }); -gulp.task("create-test-metadata", () => - env.isProdBuild() - ? Promise.resolve() - : writeFile( - workDir + "/testMetadata.json", - JSON.stringify({ test: { nativeName: "Test" } }) - ) -); - -gulp.task("create-test-translation", () => +const createTestTranslation = () => env.isProdBuild() ? Promise.resolve() : gulp - .src(path.join(paths.translations_src, "en.json")) - .pipe(transform((data, _file) => recursiveEmpty(data))) + .src(EN_SRC) + .pipe(new CustomJSON(null, testReviver)) .pipe(rename("test.json")) - .pipe(gulp.dest(workDir)) -); + .pipe(gulp.dest(workDir)); /** * This task will build a master translation file, to be used as the base for @@ -159,279 +127,171 @@ gulp.task("create-test-translation", () => * project is buildable immediately after merging new translation keys, since * the Lokalise update to translations/en.json will not happen immediately. */ -gulp.task("build-master-translation", () => { - const src = [path.join(paths.translations_src, "en.json")]; - - if (mergeBackend) { - src.push(path.join(inBackendDir, "en.json")); - } - - return gulp - .src(src) - .pipe(transform((data, file) => lokaliseTransform(data, data, file))) +const createMasterTranslation = () => + gulp + .src([EN_SRC, ...(mergeBackend ? [`${inBackendDir}/en.json`] : [])]) + .pipe(new CustomJSON(lokaliseTransform)) .pipe( merge({ fileName: "en.json", + jsonSpace: undefined, }) ) - .pipe(gulp.dest(fullDir)); -}); + .pipe(gulp.dest(workDir)); -gulp.task("build-merged-translations", () => - gulp - .src([ - inFrontendDir + "/*.json", - "!" + inFrontendDir + "/en.json", - ...(env.isProdBuild() ? [] : [workDir + "/test.json"]), - ]) - .pipe(transform((data, file) => lokaliseTransform(data, data, file))) - .pipe( - flatmap((stream, file) => { - // For each language generate a merged json file. It begins with the master - // translation as a failsafe for untranslated strings, and merges all parent - // tags into one file for each specific subtag - // - // TODO: This is a naive interpretation of BCP47 that should be improved. - // Will be OK for now as long as we don't have anything more complicated - // than a base translation + region. - const tr = path.basename(file.history[0], ".json"); - const subtags = tr.split("-"); - const src = [fullDir + "/en.json"]; - for (let i = 1; i <= subtags.length; i++) { - const lang = subtags.slice(0, i).join("-"); - if (lang === "test") { - src.push(workDir + "/test.json"); - } else if (lang !== "en") { - src.push(inFrontendDir + "/" + lang + ".json"); - if (mergeBackend) { - src.push(inBackendDir + "/" + lang + ".json"); - } - } - } - return gulp - .src(src, { allowEmpty: true }) - .pipe(transform((data) => emptyFilter(data))) - .pipe( - merge({ - fileName: tr + ".json", - }) - ) - .pipe(gulp.dest(fullDir)); - }) - ) -); +const FRAGMENTS = ["base"]; -let taskName; +const toggleSupervisorFragment = async () => { + FRAGMENTS[0] = "supervisor"; +}; -const splitTasks = []; -TRANSLATION_FRAGMENTS.forEach((fragment) => { - taskName = "build-translation-fragment-" + fragment; - gulp.task(taskName, () => - // Return only the translations for this fragment. - gulp - .src(fullDir + "/*.json") - .pipe( - transform((data) => ({ - ui: { - panel: { - [fragment]: data.ui.panel[fragment], - }, - }, - })) - ) - .pipe(gulp.dest(workDir + "/" + fragment)) - ); - splitTasks.push(taskName); -}); +const panelFragment = (fragment) => + fragment !== "base" && fragment !== "supervisor"; -taskName = "build-translation-core"; -gulp.task(taskName, () => - // Remove the fragment translations from the core translation. - gulp - .src(fullDir + "/*.json") - .pipe( - transform((data, _file) => { - TRANSLATION_FRAGMENTS.forEach((fragment) => { - delete data.ui.panel[fragment]; - }); - delete data.supervisor; - return data; - }) - ) - .pipe(gulp.dest(coreDir)) -); +const HASHES = new Map(); -splitTasks.push(taskName); +const createTranslations = async () => { + // Parse and store the master to avoid repeating this for each locale, then + // add the panel fragments when processing the app. + const enMaster = JSON.parse(await readFile(`${workDir}/en.json`, "utf-8")); + if (FRAGMENTS[0] === "base") { + FRAGMENTS.push(...Object.keys(enMaster.ui.panel)); + } -gulp.task("build-flattened-translations", () => - // Flatten the split versions of our translations, and move them into outDir - gulp - .src( - TRANSLATION_FRAGMENTS.map( - (fragment) => workDir + "/" + fragment + "/*.json" - ).concat(coreDir + "/*.json"), - { base: workDir } - ) + // The downstream pipeline is setup first. It hashes the merged data for + // each locale, then fragmentizes and flattens the data for final output. + const translationFiles = await glob([ + `${inFrontendDir}/!(en).json`, + ...(env.isProdBuild() ? [] : [`${workDir}/test.json`]), + ]); + const hashStream = new Transform({ + objectMode: true, + transform: async (file, _, callback) => { + const hash = env.isProdBuild() + ? createHash("md5").update(file.contents).digest("hex") + : "dev"; + HASHES.set(file.stem, hash); + file.stem += `-${hash}`; + callback(null, file); + }, + }).setMaxListeners(translationFiles.length + 1); + const fragmentsStream = hashStream .pipe( - transform((data) => - // Polymer.AppLocalizeBehavior requires flattened json - flatten(data) + new CustomJSON((data) => + FRAGMENTS.map((fragment) => { + switch (fragment) { + case "base": + // Remove the panels and supervisor to create the base translations + return [ + flatten({ + ...data, + ui: { ...data.ui, panel: undefined }, + supervisor: undefined, + }), + "", + ]; + case "supervisor": + // Supervisor key is at the top level + return [flatten(data.supervisor), ""]; + default: + // Create a fragment with only the given panel + return [ + flatten(data.ui.panel[fragment], `ui.panel.${fragment}.`), + fragment, + ]; + } + }) ) ) - .pipe( - rename((filePath) => { - if (filePath.dirname === "core") { - filePath.dirname = ""; + .pipe(gulp.dest(outDir)); + + // Send the English master downstream first, then for each other locale + // generate merged JSON data to continue piping. It begins with the master + // translation as a failsafe for untranslated strings, and merges all parent + // tags into one file for each specific subtag + // + // TODO: This is a naive interpretation of BCP47 that should be improved. + // Will be OK for now as long as we don't have anything more complicated + // than a base translation + region. + gulp.src(`${workDir}/en.json`).pipe(hashStream, { end: false }); + const mergesFinished = []; + for (const translationFile of translationFiles) { + const locale = basename(translationFile, ".json"); + const subtags = locale.split("-"); + const mergeFiles = []; + for (let i = 1; i <= subtags.length; i++) { + const lang = subtags.slice(0, i).join("-"); + if (lang === "test") { + mergeFiles.push(`${workDir}/test.json`); + } else if (lang !== "en") { + mergeFiles.push(`${inFrontendDir}/${lang}.json`); + if (mergeBackend) { + mergeFiles.push(`${inBackendDir}/${lang}.json`); } - // In dev we create the file with the fake hash in the filename - if (!env.isProdBuild()) { - filePath.basename += "-dev"; - } - }) - ) - .pipe(gulp.dest(outDir)) -); - -const fingerprints = {}; - -gulp.task("build-translation-fingerprints", () => { - // Fingerprint full file of each language - const files = readdirSync(fullDir); - - for (let i = 0; i < files.length; i++) { - fingerprints[files[i].split(".")[0]] = { - // In dev we create fake hashes - hash: env.isProdBuild() - ? createHash("md5") - .update(readFileSync(path.join(fullDir, files[i]), "utf-8")) - .digest("hex") - : "dev", - }; - } - - // In dev we create the file with the fake hash in the filename - if (env.isProdBuild()) { - mapFiles(outDir, ".json", (filename) => { - const parsed = path.parse(filename); - - // nl.json -> nl-.json - if (!(parsed.name in fingerprints)) { - throw new Error(`Unable to find hash for ${filename}`); } - - renameSync( - filename, - `${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${ - parsed.ext - }` - ); - }); + } + const mergeStream = gulp.src(mergeFiles, { allowEmpty: true }).pipe( + merge({ + fileName: `${locale}.json`, + startObj: enMaster, + jsonReviver: emptyReviver, + jsonSpace: undefined, + }) + ); + mergesFinished.push(finished(mergeStream)); + mergeStream.pipe(hashStream, { end: false }); } - const stream = source("translationFingerprints.json"); - stream.write(JSON.stringify(fingerprints)); - process.nextTick(() => stream.end()); - return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir)); -}); + // Wait for all merges to finish, then it's safe to end writing to the + // downstream pipeline and wait for all fragments to finish writing. + await Promise.all(mergesFinished); + hashStream.end(); + await finished(fragmentsStream); +}; -gulp.task("build-translation-fragment-supervisor", () => +const writeTranslationMetaData = () => gulp - .src(fullDir + "/*.json") - .pipe(transform((data) => data.supervisor)) + .src([`${paths.translations_src}/translationMetadata.json`]) .pipe( - rename((filePath) => { - // In dev we create the file with the fake hash in the filename + new CustomJSON((meta) => { + // Add the test translation in development. if (!env.isProdBuild()) { - filePath.basename += "-dev"; + meta.test = { nativeName: "Test" }; } - }) - ) - .pipe(gulp.dest(workDir + "/supervisor")) -); - -gulp.task("build-translation-flatten-supervisor", () => - gulp - .src(workDir + "/supervisor/*.json") - .pipe( - transform((data) => - // Polymer.AppLocalizeBehavior requires flattened json - flatten(data) - ) - ) - .pipe(gulp.dest(outDir)) -); - -gulp.task("build-translation-write-metadata", () => - gulp - .src([ - path.join(paths.translations_src, "translationMetadata.json"), - ...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]), - workDir + "/translationFingerprints.json", - ]) - .pipe(merge({})) - .pipe( - transform((data) => { - const newData = {}; - Object.entries(data).forEach(([key, value]) => { - // Filter out translations without native name. - if (value.nativeName) { - newData[key] = value; - } else { + // Filter out locales without a native name, and add the hashes. + for (const locale of Object.keys(meta)) { + if (!meta[locale].nativeName) { + meta[locale] = undefined; console.warn( - `Skipping language ${key}. Native name was not translated.` + `Skipping locale ${locale} because native name is not translated.` ); + } else { + meta[locale].hash = HASHES.get(locale); } - }); - return newData; + } + return { + fragments: FRAGMENTS.filter(panelFragment), + translations: meta, + }; }) ) - .pipe( - transform((data) => ({ - fragments: TRANSLATION_FRAGMENTS, - translations: data, - })) - ) - .pipe(rename("translationMetadata.json")) - .pipe(gulp.dest(workDir)) -); - -gulp.task( - "create-translations", - gulp.series( - gulp.parallel("create-test-metadata", "create-test-translation"), - "build-master-translation", - "build-merged-translations", - gulp.parallel(...splitTasks), - "build-flattened-translations" - ) -); + .pipe(gulp.dest(workDir)); gulp.task( "build-translations", gulp.series( gulp.parallel( "fetch-nightly-translations", - gulp.series("clean-translations", "ensure-translations-build-dir") + gulp.series("clean-translations", makeWorkDir) ), - "create-translations", - "build-translation-fingerprints", - "build-translation-write-metadata" + createTestTranslation, + createMasterTranslation, + createTranslations, + writeTranslationMetaData ) ); gulp.task( "build-supervisor-translations", - gulp.series( - gulp.parallel( - "fetch-nightly-translations", - gulp.series("clean-translations", "ensure-translations-build-dir") - ), - gulp.parallel("create-test-metadata", "create-test-translation"), - "build-master-translation", - "build-merged-translations", - "build-translation-fragment-supervisor", - "build-translation-flatten-supervisor", - "build-translation-fingerprints", - "build-translation-write-metadata" - ) + gulp.series(toggleSupervisorFragment, "build-translations") ); diff --git a/build-scripts/gulp/webpack.js b/build-scripts/gulp/webpack.js index f55d77f345ee..51f062f316e1 100644 --- a/build-scripts/gulp/webpack.js +++ b/build-scripts/gulp/webpack.js @@ -99,7 +99,7 @@ gulp.task("webpack-watch-app", () => { ).watch({ poll: isWsl }, doneHandler()); gulp.watch( path.join(paths.translations_src, "en.json"), - gulp.series("create-translations", "copy-translations-app") + gulp.series("build-translations", "copy-translations-app") ); }); diff --git a/build-scripts/util.cjs b/build-scripts/util.cjs deleted file mode 100644 index 23efdfb22993..000000000000 --- a/build-scripts/util.cjs +++ /dev/null @@ -1,16 +0,0 @@ -const path = require("path"); -const fs = require("fs"); - -// Helper function to map recursively over files in a folder and it's subfolders -module.exports.mapFiles = function mapFiles(startPath, filter, mapFunc) { - const files = fs.readdirSync(startPath); - for (let i = 0; i < files.length; i++) { - const filename = path.join(startPath, files[i]); - const stat = fs.lstatSync(filename); - if (stat.isDirectory()) { - mapFiles(filename, filter, mapFunc); - } else if (filename.indexOf(filter) >= 0) { - mapFunc(filename); - } - } -}; diff --git a/gulpfile.js b/gulpfile.js index 6178d2779dab..45e068050412 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -1,4 +1,7 @@ import { globIterate } from "glob"; +import { availableParallelism } from "node:os"; + +process.env.UV_THREADPOOL_SIZE = availableParallelism(); const gulpImports = []; diff --git a/package.json b/package.json index ba943b720537..5c017a912fc0 100644 --- a/package.json +++ b/package.json @@ -208,7 +208,6 @@ "fs-extra": "11.2.0", "glob": "10.3.12", "gulp": "4.0.2", - "gulp-flatmap": "1.0.2", "gulp-json-transform": "0.5.0", "gulp-merge-json": "2.2.1", "gulp-rename": "2.0.0", @@ -240,8 +239,6 @@ "transform-async-modules-webpack-plugin": "1.0.4", "ts-lit-plugin": "2.0.2", "typescript": "5.4.4", - "vinyl-buffer": "1.0.1", - "vinyl-source-stream": "2.0.0", "webpack": "5.91.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", diff --git a/yarn.lock b/yarn.lock index feb86a188b34..274de8dfd71c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5474,15 +5474,6 @@ __metadata: languageName: node linkType: hard -"ansi-cyan@npm:^0.1.1": - version: 0.1.1 - resolution: "ansi-cyan@npm:0.1.1" - dependencies: - ansi-wrap: "npm:0.1.0" - checksum: 10/5fb11d52bc4d7ab319913b56f876f8e7aff60edd1c119c3d754a33b14d126b7360df70b2d53c5967c29bae03e85149ebaa32f55c33e089e6d06330230983038e - languageName: node - linkType: hard - "ansi-escapes@npm:^4.3.2": version: 4.3.2 resolution: "ansi-escapes@npm:4.3.2" @@ -5519,15 +5510,6 @@ __metadata: languageName: node linkType: hard -"ansi-red@npm:^0.1.1": - version: 0.1.1 - resolution: "ansi-red@npm:0.1.1" - dependencies: - ansi-wrap: "npm:0.1.0" - checksum: 10/84442078e6ae34c79ada32d43d40956e0f953204626be4c562431761407b4388a573cfff950c78a6c8fa20e9eed12441ac8d1c89864d6a35df53e9ef7fce2b98 - languageName: node - linkType: hard - "ansi-regex@npm:^2.0.0": version: 2.1.1 resolution: "ansi-regex@npm:2.1.1" @@ -5659,16 +5641,6 @@ __metadata: languageName: node linkType: hard -"arr-diff@npm:^1.0.1": - version: 1.1.0 - resolution: "arr-diff@npm:1.1.0" - dependencies: - arr-flatten: "npm:^1.0.1" - array-slice: "npm:^0.2.3" - checksum: 10/6fa5aade29ff80a8b704bcb6ae582ad718ea9dc31f213f616ba6185e2e033ce2082f9efead3ebc7d35a992852c74f052823c8a51248f15a535f84f346aa2f402 - languageName: node - linkType: hard - "arr-diff@npm:^4.0.0": version: 4.0.0 resolution: "arr-diff@npm:4.0.0" @@ -5701,13 +5673,6 @@ __metadata: languageName: node linkType: hard -"arr-union@npm:^2.0.1": - version: 2.1.0 - resolution: "arr-union@npm:2.1.0" - checksum: 10/19e21d0a8d184eb86c597541eaf90d9912470ce311b9e14b7b3f1be4fd18535ba3511db046565fb190f8be4f7a9ad3216b670cded3c765e03a0e3928a72085ea - languageName: node - linkType: hard - "arr-union@npm:^3.1.0": version: 3.1.0 resolution: "arr-union@npm:3.1.0" @@ -5785,13 +5750,6 @@ __metadata: languageName: node linkType: hard -"array-slice@npm:^0.2.3": - version: 0.2.3 - resolution: "array-slice@npm:0.2.3" - checksum: 10/9d35c15d05a160c9a85bbdfe79cb6c291d3c84bd46c4da632d235a4f5102e6f8b0b844a3082aeaf33cbb3ba54513b7732990788e7a6a62b55e800ca180180390 - languageName: node - linkType: hard - "array-slice@npm:^1.0.0": version: 1.1.0 resolution: "array-slice@npm:1.1.0" @@ -6136,16 +6094,6 @@ __metadata: languageName: node linkType: hard -"bl@npm:^1.2.1": - version: 1.2.3 - resolution: "bl@npm:1.2.3" - dependencies: - readable-stream: "npm:^2.3.5" - safe-buffer: "npm:^5.1.1" - checksum: 10/11d775b09ebd7d8c0df1ed7efd03cc8a2b1283c804a55153c81a0b586728a085fa24240647cac9a60163eb6f36a28cf8c45b80bf460a46336d4c84c40205faff - languageName: node - linkType: hard - "blocking-elements@npm:^0.1.0": version: 0.1.1 resolution: "blocking-elements@npm:0.1.1" @@ -8446,15 +8394,6 @@ __metadata: languageName: node linkType: hard -"extend-shallow@npm:^1.1.2": - version: 1.1.4 - resolution: "extend-shallow@npm:1.1.4" - dependencies: - kind-of: "npm:^1.1.0" - checksum: 10/437ebb676d031cf98b9952220ef026593bde81f8f100b9f3793b4872a8cc6905d1ef9301c8f8958aed6bc0c5472872f96f43cf417b43446a84a28e67d984a0a6 - languageName: node - linkType: hard - "extend-shallow@npm:^2.0.1": version: 2.0.1 resolution: "extend-shallow@npm:2.0.1" @@ -9401,16 +9340,6 @@ __metadata: languageName: node linkType: hard -"gulp-flatmap@npm:1.0.2": - version: 1.0.2 - resolution: "gulp-flatmap@npm:1.0.2" - dependencies: - plugin-error: "npm:0.1.2" - through2: "npm:2.0.3" - checksum: 10/31db36c97d74ee0572e269b029e5968e99b820ed39a8d5624147ecba94db1e297258895ecd3f3187dac394b585796f6cf66cd2a120b734a6953bb4020defd1b2 - languageName: node - linkType: hard - "gulp-json-transform@npm:0.5.0": version: 0.5.0 resolution: "gulp-json-transform@npm:0.5.0" @@ -9761,7 +9690,6 @@ __metadata: glob: "npm:10.3.12" google-timezones-json: "npm:1.2.0" gulp: "npm:4.0.2" - gulp-flatmap: "npm:1.0.2" gulp-json-transform: "npm:0.5.0" gulp-merge-json: "npm:2.2.1" gulp-rename: "npm:2.0.0" @@ -9819,8 +9747,6 @@ __metadata: typescript: "npm:5.4.4" ua-parser-js: "npm:1.0.37" unfetch: "npm:5.0.0" - vinyl-buffer: "npm:1.0.1" - vinyl-source-stream: "npm:2.0.0" vis-data: "npm:7.1.9" vis-network: "npm:9.1.9" vue: "npm:2.7.16" @@ -11131,13 +11057,6 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^1.1.0": - version: 1.1.0 - resolution: "kind-of@npm:1.1.0" - checksum: 10/29a95ed9d72d2bc8e3cc86dc461b5a61bde9e931f39158c183d76c5c9b83a0659766520f202473f45b06bce517eece7af061e04ba5fcdfbffe7eb80aedf4743a - languageName: node - linkType: hard - "kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0": version: 3.2.2 resolution: "kind-of@npm:3.2.2" @@ -13188,19 +13107,6 @@ __metadata: languageName: node linkType: hard -"plugin-error@npm:0.1.2": - version: 0.1.2 - resolution: "plugin-error@npm:0.1.2" - dependencies: - ansi-cyan: "npm:^0.1.1" - ansi-red: "npm:^0.1.1" - arr-diff: "npm:^1.0.1" - arr-union: "npm:^2.0.1" - extend-shallow: "npm:^1.1.2" - checksum: 10/e363d3b644753ef468fc069fd8a76a67a077ece85320e434386e0889e10bbbc507d9733f8f6d6ef1cfda272a6c7f0d03cd70340a0a1f8014fe41a4d0d1ce59d0 - languageName: node - linkType: hard - "plugin-error@npm:^1.0.1": version: 1.0.1 resolution: "plugin-error@npm:1.0.1" @@ -14088,7 +13994,7 @@ __metadata: languageName: node linkType: hard -"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:^5.1.1, safe-buffer@npm:~5.2.0": +"safe-buffer@npm:5.2.1, safe-buffer@npm:>=5.1.0, safe-buffer@npm:^5.1.0, safe-buffer@npm:~5.2.0": version: 5.2.1 resolution: "safe-buffer@npm:5.2.1" checksum: 10/32872cd0ff68a3ddade7a7617b8f4c2ae8764d8b7d884c651b74457967a9e0e886267d3ecc781220629c44a865167b61c375d2da6c720c840ecd73f45d5d9451 @@ -15275,16 +15181,6 @@ __metadata: languageName: node linkType: hard -"through2@npm:2.0.3": - version: 2.0.3 - resolution: "through2@npm:2.0.3" - dependencies: - readable-stream: "npm:^2.1.5" - xtend: "npm:~4.0.1" - checksum: 10/d0783560d7b346a1ac595000409a6a3161ad42a3e84309c070da4ee8ecf0a40a7c9c976a5c9a5262cdeae88ead3641dc8ffc14d4a8f64e1c0f06939632c8b96a - languageName: node - linkType: hard - "through2@npm:^2.0.0, through2@npm:^2.0.3, through2@npm:~2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" @@ -16085,16 +15981,6 @@ __metadata: languageName: node linkType: hard -"vinyl-buffer@npm:1.0.1": - version: 1.0.1 - resolution: "vinyl-buffer@npm:1.0.1" - dependencies: - bl: "npm:^1.2.1" - through2: "npm:^2.0.3" - checksum: 10/07c7775e0157b79553ffd901d14821e50bc30bc5d65b77abad648f469f19eee896b60bad12923f3ddf2964a965461c8f59498083fc09752ac3036e212f945581 - languageName: node - linkType: hard - "vinyl-fs@npm:^3.0.0": version: 3.0.3 resolution: "vinyl-fs@npm:3.0.3" @@ -16120,16 +16006,6 @@ __metadata: languageName: node linkType: hard -"vinyl-source-stream@npm:2.0.0": - version: 2.0.0 - resolution: "vinyl-source-stream@npm:2.0.0" - dependencies: - through2: "npm:^2.0.3" - vinyl: "npm:^2.1.0" - checksum: 10/7d88f30fb98237fb0187b13ed6cc9124f1728168ede7812f8bc10f47a78273c87eb207d21fb3290f4c98572e305ad4d577c4afdbff503a439e9fff7048b4fa45 - languageName: node - linkType: hard - "vinyl-sourcemap@npm:^1.1.0": version: 1.1.0 resolution: "vinyl-sourcemap@npm:1.1.0" From ad6e041c044dfcfe36b6ebf6c79ede60055146da Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 13:10:15 +0200 Subject: [PATCH 27/98] Update dependency @codemirror/view to v6.26.2 (#20505) Co-authored-by: renovate[bot] <29139614+renovate[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 5c017a912fc0..d2a6ae1d026a 100644 --- a/package.json +++ b/package.json @@ -33,7 +33,7 @@ "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.26.1", + "@codemirror/view": "6.26.2", "@egjs/hammerjs": "2.0.17", "@formatjs/intl-datetimeformat": "6.12.3", "@formatjs/intl-displaynames": "6.6.6", diff --git a/yarn.lock b/yarn.lock index 274de8dfd71c..6edcf7d45210 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1539,14 +1539,14 @@ __metadata: languageName: node linkType: hard -"@codemirror/view@npm:6.26.1, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": - version: 6.26.1 - resolution: "@codemirror/view@npm:6.26.1" +"@codemirror/view@npm:6.26.2, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": + version: 6.26.2 + resolution: "@codemirror/view@npm:6.26.2" dependencies: "@codemirror/state": "npm:^6.4.0" style-mod: "npm:^4.1.0" w3c-keyname: "npm:^2.2.4" - checksum: 10/6d2b19b2439c36b2712d3560eeb0c198ad2ee442ad22641c2b4bce94077812cffbb52ca12328219d3b9663b2dd0ffc63481432a2550839e5c7a7a53704e82a9a + checksum: 10/1507730d1aa3a886ae6798fdc002ea435af39827d5312f4784bb75684aa3780185277724341209ffba876be8eeb89ce7eb2d198a979f0ffc7bcee96948050af7 languageName: node linkType: hard @@ -9562,7 +9562,7 @@ __metadata: "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" "@codemirror/state": "npm:6.4.1" - "@codemirror/view": "npm:6.26.1" + "@codemirror/view": "npm:6.26.2" "@egjs/hammerjs": "npm:2.0.17" "@formatjs/intl-datetimeformat": "npm:6.12.3" "@formatjs/intl-displaynames": "npm:6.6.6" From 16de57342e0b47cee15091ab90842f87b6c042ac Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 08:23:48 -0400 Subject: [PATCH 28/98] Update dependency eslint-plugin-wc to v2.1.0 (#20500) Co-authored-by: renovate[bot] <29139614+renovate[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 d2a6ae1d026a..0c7d3e8ca827 100644 --- a/package.json +++ b/package.json @@ -203,7 +203,7 @@ "eslint-plugin-lit": "1.11.0", "eslint-plugin-lit-a11y": "4.1.2", "eslint-plugin-unused-imports": "3.1.0", - "eslint-plugin-wc": "2.0.4", + "eslint-plugin-wc": "2.1.0", "fancy-log": "2.0.0", "fs-extra": "11.2.0", "glob": "10.3.12", diff --git a/yarn.lock b/yarn.lock index 6edcf7d45210..0d667c41aec5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -8052,15 +8052,15 @@ __metadata: languageName: node linkType: hard -"eslint-plugin-wc@npm:2.0.4": - version: 2.0.4 - resolution: "eslint-plugin-wc@npm:2.0.4" +"eslint-plugin-wc@npm:2.1.0": + version: 2.1.0 + resolution: "eslint-plugin-wc@npm:2.1.0" dependencies: is-valid-element-name: "npm:^1.0.0" js-levenshtein-esm: "npm:^1.2.0" peerDependencies: eslint: ">=5" - checksum: 10/fcdbf34946009ee58cd43a520ed53a16a4eb208cca26449e48d3ce32fcecb75fea31887cca1986ce9d71c011ecd3b8785c6bed464e0902e5f59bb093bc01a511 + checksum: 10/d0d7e8377103282dc8836a347dde923b24075e910d85dc32767bb118d82b31a2597ad57b4eb2359ac4322e5239e6ca064c3be7ab8e82eeb6aff4684a472625a0 languageName: node linkType: hard @@ -9683,7 +9683,7 @@ __metadata: eslint-plugin-lit: "npm:1.11.0" eslint-plugin-lit-a11y: "npm:4.1.2" eslint-plugin-unused-imports: "npm:3.1.0" - eslint-plugin-wc: "npm:2.0.4" + eslint-plugin-wc: "npm:2.1.0" fancy-log: "npm:2.0.0" fs-extra: "npm:11.2.0" fuse.js: "npm:7.0.0" From fb8312110b3c4a42ba22032c6e89bf43f6f25f82 Mon Sep 17 00:00:00 2001 From: Charles Garwood Date: Fri, 12 Apr 2024 09:49:07 -0400 Subject: [PATCH 29/98] Add support for setting label description (#20421) * Add support for setting label description --- gallery/src/pages/components/ha-selector.ts | 2 ++ src/components/ha-label-picker.ts | 2 ++ src/data/label_registry.ts | 2 ++ .../config/labels/dialog-label-detail.ts | 18 +++++++++++++++++- src/panels/config/labels/ha-config-labels.ts | 6 ++++++ 5 files changed, 29 insertions(+), 1 deletion(-) diff --git a/gallery/src/pages/components/ha-selector.ts b/gallery/src/pages/components/ha-selector.ts index 3824d9bb18a5..0fb6d8326304 100644 --- a/gallery/src/pages/components/ha-selector.ts +++ b/gallery/src/pages/components/ha-selector.ts @@ -161,12 +161,14 @@ const LABELS: LabelRegistryEntry[] = [ name: "Energy", icon: null, color: "yellow", + description: null, }, { label_id: "entertainment", name: "Entertainment", icon: "mdi:popcorn", color: "blue", + description: null, }, ]; diff --git a/src/components/ha-label-picker.ts b/src/components/ha-label-picker.ts index 289b7ba269c1..fd0239d176c2 100644 --- a/src/components/ha-label-picker.ts +++ b/src/components/ha-label-picker.ts @@ -302,6 +302,7 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) { name: this.hass.localize("ui.components.label-picker.no_match"), icon: null, color: null, + description: null, }, ]; } @@ -315,6 +316,7 @@ export class HaLabelPicker extends SubscribeMixin(LitElement) { name: this.hass.localize("ui.components.label-picker.add_new"), icon: "mdi:plus", color: null, + description: null, }, ]; } diff --git a/src/data/label_registry.ts b/src/data/label_registry.ts index ca3512cd9376..cc6b31835492 100644 --- a/src/data/label_registry.ts +++ b/src/data/label_registry.ts @@ -9,12 +9,14 @@ export interface LabelRegistryEntry { name: string; icon: string | null; color: string | null; + description: string | null; } export interface LabelRegistryEntryMutableParams { name: string; icon?: string | null; color?: string | null; + description?: string | null; } export const fetchLabelRegistry = (conn: Connection) => diff --git a/src/panels/config/labels/dialog-label-detail.ts b/src/panels/config/labels/dialog-label-detail.ts index b0e06386272b..bffc5d79c000 100644 --- a/src/panels/config/labels/dialog-label-detail.ts +++ b/src/panels/config/labels/dialog-label-detail.ts @@ -7,6 +7,7 @@ import { createCloseHeading } from "../../../components/ha-dialog"; import "../../../components/ha-formfield"; import "../../../components/ha-switch"; import "../../../components/ha-textfield"; +import "../../../components/ha-textarea"; import "../../../components/ha-icon-picker"; import "../../../components/ha-color-picker"; import { HassDialog } from "../../../dialogs/make-dialog-manager"; @@ -31,6 +32,8 @@ class DialogLabelDetail @state() private _color!: string; + @state() private _description!: string; + @state() private _error?: string; @state() private _params?: LabelDetailDialogParams; @@ -44,10 +47,12 @@ class DialogLabelDetail this._name = this._params.entry.name || ""; this._icon = this._params.entry.icon || ""; this._color = this._params.entry.color || ""; + this._description = this._params.entry.description || ""; } else { this._name = this._params.suggestedName || ""; this._icon = ""; this._color = ""; + this._description = ""; } document.body.addEventListener("keydown", this._handleKeyPress); } @@ -118,6 +123,14 @@ class DialogLabelDetail "ui.panel.config.labels.detail.color" )} > + ${this._params.entry && this._params.removeEntry @@ -169,6 +182,7 @@ class DialogLabelDetail name: this._name.trim(), icon: this._icon.trim() || null, color: this._color.trim() || null, + description: this._description.trim() || null, }; if (this._params!.entry) { newValue = await this._params!.updateEntry!(values); @@ -202,12 +216,14 @@ class DialogLabelDetail a { color: var(--primary-color); } + ha-textarea, ha-textfield, ha-icon-picker, ha-color-picker { display: block; } - ha-color-picker { + ha-color-picker, + ha-textarea { margin-top: 16px; } `, diff --git a/src/panels/config/labels/ha-config-labels.ts b/src/panels/config/labels/ha-config-labels.ts index f8396ada5e52..5e05b468aee4 100644 --- a/src/panels/config/labels/ha-config-labels.ts +++ b/src/panels/config/labels/ha-config-labels.ts @@ -79,6 +79,12 @@ export class HaConfigLabels extends LitElement { sortable: true, filterable: true, grows: true, + template: (label) => html` +
${label.name}
+ ${label.description + ? html`
${label.description}
` + : nothing} + `, }, actions: { title: "", From c2d3e7900ed174933746898fc7b1b096d33a3b41 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 17:03:30 +0200 Subject: [PATCH 30/98] Update date-fns to v3 (major) (#20504) * Update date-fns to v3 * update imports * breaking changes --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bram Kragten --- demo/src/stubs/energy.ts | 2 +- package.json | 4 +-- src/common/datetime/calc_date.ts | 8 +++--- src/common/util/select-unit.ts | 2 +- src/components/chart/chart-date-adapter.ts | 2 +- src/data/energy.ts | 2 +- src/dialogs/more-info/ha-more-info-history.ts | 2 +- src/dialogs/more-info/ha-more-info-logbook.ts | 2 +- .../calendar/dialog-calendar-event-detail.ts | 2 +- .../calendar/dialog-calendar-event-editor.ts | 2 +- .../config/automation/ha-automation-picker.ts | 2 +- .../config/helpers/forms/ha-schedule-form.ts | 2 +- src/panels/config/scene/ha-scene-dashboard.ts | 2 +- src/panels/config/script/ha-script-picker.ts | 2 +- .../state/developer-tools-state.ts | 2 +- .../dialog-statistics-adjust-sum.ts | 6 ++-- src/panels/history/ha-panel-history.ts | 2 +- .../energy/common/energy-chart-options.ts | 2 +- .../hui-energy-devices-detail-graph-card.ts | 2 +- .../energy/hui-energy-solar-graph-card.ts | 7 +---- .../energy/hui-energy-usage-graph-card.ts | 2 +- .../components/hui-energy-period-selector.ts | 2 +- yarn.lock | 28 +++++++++---------- 23 files changed, 42 insertions(+), 47 deletions(-) diff --git a/demo/src/stubs/energy.ts b/demo/src/stubs/energy.ts index b459a9f95c45..57b07d096848 100644 --- a/demo/src/stubs/energy.ts +++ b/demo/src/stubs/energy.ts @@ -1,4 +1,4 @@ -import { format, startOfToday, startOfTomorrow } from "date-fns/esm"; +import { format, startOfToday, startOfTomorrow } from "date-fns"; import { EnergyInfo, EnergyPreferences, diff --git a/package.json b/package.json index 0c7d3e8ca827..b96b93510716 100644 --- a/package.json +++ b/package.json @@ -103,8 +103,8 @@ "comlink": "4.4.1", "core-js": "3.36.1", "cropperjs": "1.6.1", - "date-fns": "2.30.0", - "date-fns-tz": "2.0.1", + "date-fns": "3.6.0", + "date-fns-tz": "3.0.0", "deep-clone-simple": "1.1.1", "deep-freeze": "0.0.1", "element-internals-polyfill": "1.3.10", diff --git a/src/common/datetime/calc_date.ts b/src/common/datetime/calc_date.ts index aa2c0e2eaeb0..3c8635fdc048 100644 --- a/src/common/datetime/calc_date.ts +++ b/src/common/datetime/calc_date.ts @@ -1,4 +1,4 @@ -import { utcToZonedTime, zonedTimeToUtc } from "date-fns-tz"; +import { toZonedTime, fromZonedTime } from "date-fns-tz"; import { HassConfig } from "home-assistant-js-websocket"; import { FrontendLocaleData, TimeZone } from "../../data/translation"; @@ -8,10 +8,10 @@ const calcZonedDate = ( fn: (date: Date, options?: any) => Date | number | boolean, options? ) => { - const inputZoned = utcToZonedTime(date, tz); + const inputZoned = toZonedTime(date, tz); const fnZoned = fn(inputZoned, options); if (fnZoned instanceof Date) { - return zonedTimeToUtc(fnZoned, tz) as Date; + return fromZonedTime(fnZoned, tz) as Date; } return fnZoned; }; @@ -51,6 +51,6 @@ export const calcDateDifferenceProperty = ( locale, config, locale.time_zone === TimeZone.server - ? utcToZonedTime(startDate, config.time_zone) + ? toZonedTime(startDate, config.time_zone) : startDate ); diff --git a/src/common/util/select-unit.ts b/src/common/util/select-unit.ts index 7e388a2ddbc9..8e49c463d4fb 100644 --- a/src/common/util/select-unit.ts +++ b/src/common/util/select-unit.ts @@ -1,4 +1,4 @@ -import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns/esm"; +import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns"; import { FrontendLocaleData } from "../../data/translation"; import { firstWeekdayIndex } from "../datetime/first_weekday"; diff --git a/src/components/chart/chart-date-adapter.ts b/src/components/chart/chart-date-adapter.ts index fac781945383..875282985a4c 100644 --- a/src/components/chart/chart-date-adapter.ts +++ b/src/components/chart/chart-date-adapter.ts @@ -34,7 +34,7 @@ import { endOfMonth, endOfQuarter, endOfYear, -} from "date-fns/esm"; +} from "date-fns"; import { formatDate, formatDateMonth, diff --git a/src/data/energy.ts b/src/data/energy.ts index d322723ae264..48e28fa6c4cb 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -9,7 +9,7 @@ import { startOfDay, isFirstDayOfMonth, isLastDayOfMonth, -} from "date-fns/esm"; +} from "date-fns"; import { Collection, getCollection } from "home-assistant-js-websocket"; import { calcDate, diff --git a/src/dialogs/more-info/ha-more-info-history.ts b/src/dialogs/more-info/ha-more-info-history.ts index 8917054a1388..878e82181444 100644 --- a/src/dialogs/more-info/ha-more-info-history.ts +++ b/src/dialogs/more-info/ha-more-info-history.ts @@ -1,4 +1,4 @@ -import { startOfYesterday, subHours } from "date-fns/esm"; +import { startOfYesterday, subHours } from "date-fns"; import { LitElement, PropertyValues, css, html, nothing } from "lit"; import { customElement, property, query, state } from "lit/decorators"; import { isComponentLoaded } from "../../common/config/is_component_loaded"; diff --git a/src/dialogs/more-info/ha-more-info-logbook.ts b/src/dialogs/more-info/ha-more-info-logbook.ts index c42f72c57dab..59d81327d1d9 100644 --- a/src/dialogs/more-info/ha-more-info-logbook.ts +++ b/src/dialogs/more-info/ha-more-info-logbook.ts @@ -1,4 +1,4 @@ -import { startOfYesterday } from "date-fns/esm"; +import { startOfYesterday } from "date-fns"; import { css, html, LitElement, PropertyValues, nothing } from "lit"; import { customElement, property } from "lit/decorators"; import memoizeOne from "memoize-one"; diff --git a/src/panels/calendar/dialog-calendar-event-detail.ts b/src/panels/calendar/dialog-calendar-event-detail.ts index 4080c02237ab..8340b79ba054 100644 --- a/src/panels/calendar/dialog-calendar-event-detail.ts +++ b/src/panels/calendar/dialog-calendar-event-detail.ts @@ -1,7 +1,7 @@ import "@material/mwc-button"; import { mdiCalendarClock } from "@mdi/js"; import { toDate } from "date-fns-tz"; -import { addDays, isSameDay } from "date-fns/esm"; +import { addDays, isSameDay } from "date-fns"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { property, state } from "lit/decorators"; import { formatDate } from "../../common/datetime/format_date"; diff --git a/src/panels/calendar/dialog-calendar-event-editor.ts b/src/panels/calendar/dialog-calendar-event-editor.ts index c72d3a6b0e02..ad9dfbe9f902 100644 --- a/src/panels/calendar/dialog-calendar-event-editor.ts +++ b/src/panels/calendar/dialog-calendar-event-editor.ts @@ -6,7 +6,7 @@ import { addMilliseconds, differenceInMilliseconds, startOfHour, -} from "date-fns/esm"; +} from "date-fns"; import { HassEntity } from "home-assistant-js-websocket"; import { CSSResultGroup, LitElement, css, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index b48a6dc20f37..0d1d506d6a5d 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -19,7 +19,7 @@ import { mdiToggleSwitchOffOutline, mdiTransitConnection, } from "@mdi/js"; -import { differenceInDays } from "date-fns/esm"; +import { differenceInDays } from "date-fns"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { CSSResultGroup, diff --git a/src/panels/config/helpers/forms/ha-schedule-form.ts b/src/panels/config/helpers/forms/ha-schedule-form.ts index 43fded379bb6..44614e8316ac 100644 --- a/src/panels/config/helpers/forms/ha-schedule-form.ts +++ b/src/panels/config/helpers/forms/ha-schedule-form.ts @@ -2,7 +2,7 @@ import { Calendar, CalendarOptions } from "@fullcalendar/core"; import allLocales from "@fullcalendar/core/locales-all"; import interactionPlugin from "@fullcalendar/interaction"; import timeGridPlugin from "@fullcalendar/timegrid"; -import { addDays, isSameDay, isSameWeek, nextDay } from "date-fns"; +import { Day, addDays, isSameDay, isSameWeek, nextDay } from "date-fns"; import { CSSResultGroup, LitElement, diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index fbbe1cc334af..9a0402f6a99b 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -16,7 +16,7 @@ import { mdiPlus, mdiTag, } from "@mdi/js"; -import { differenceInDays } from "date-fns/esm"; +import { differenceInDays } from "date-fns"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { CSSResultGroup, diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index b6ae00c01235..8282abf6b7c9 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -15,7 +15,7 @@ import { mdiTag, mdiTransitConnection, } from "@mdi/js"; -import { differenceInDays } from "date-fns/esm"; +import { differenceInDays } from "date-fns"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { CSSResultGroup, diff --git a/src/panels/developer-tools/state/developer-tools-state.ts b/src/panels/developer-tools/state/developer-tools-state.ts index 046efa310af1..ebeb324f2a0d 100644 --- a/src/panels/developer-tools/state/developer-tools-state.ts +++ b/src/panels/developer-tools/state/developer-tools-state.ts @@ -3,7 +3,7 @@ import { mdiInformationOutline, mdiRefresh, } from "@mdi/js"; -import { addHours } from "date-fns/esm"; +import { addHours } from "date-fns"; import { HassEntities, HassEntity, diff --git a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts index b32666bde6de..c29b5dedd92d 100644 --- a/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts +++ b/src/panels/developer-tools/statistics/dialog-statistics-adjust-sum.ts @@ -1,5 +1,5 @@ import "@material/mwc-button/mwc-button"; -import formatISO9075 from "date-fns/formatISO9075"; +import { formatISO9075 } from "date-fns"; import { css, CSSResultGroup, @@ -16,11 +16,11 @@ import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/ha-circular-progress"; import "../../../components/ha-dialog"; import "../../../components/ha-form/ha-form"; +import "../../../components/ha-icon-next"; +import "../../../components/ha-list-item"; import "../../../components/ha-selector/ha-selector-datetime"; import "../../../components/ha-selector/ha-selector-number"; import "../../../components/ha-svg-icon"; -import "../../../components/ha-icon-next"; -import "../../../components/ha-list-item"; import { adjustStatisticsSum, fetchStatistics, diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts index 0fe7fc98c581..9efaf89672a9 100644 --- a/src/panels/history/ha-panel-history.ts +++ b/src/panels/history/ha-panel-history.ts @@ -1,5 +1,5 @@ import { mdiDownload, mdiFilterRemove } from "@mdi/js"; -import { differenceInHours } from "date-fns/esm"; +import { differenceInHours } from "date-fns"; import { HassServiceTarget, UnsubscribeFunc, diff --git a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts index ef6c04677e7e..5063de0215ff 100644 --- a/src/panels/lovelace/cards/energy/common/energy-chart-options.ts +++ b/src/panels/lovelace/cards/energy/common/energy-chart-options.ts @@ -5,7 +5,7 @@ import { subHours, differenceInDays, differenceInHours, -} from "date-fns/esm"; +} from "date-fns"; import { FrontendLocaleData } from "../../../../../data/translation"; import { formatNumber, diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts index c2565d7c9700..7c227455ad9f 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts @@ -4,7 +4,7 @@ import { ChartOptions, ScatterDataPoint, } from "chart.js"; -import { endOfToday, startOfToday } from "date-fns/esm"; +import { endOfToday, startOfToday } from "date-fns"; import { HassConfig, UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, diff --git a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts index 40d91584dcbb..f6abc48b1855 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-solar-graph-card.ts @@ -4,12 +4,7 @@ import { ChartOptions, ScatterDataPoint, } from "chart.js"; -import { - differenceInDays, - endOfToday, - isToday, - startOfToday, -} from "date-fns/esm"; +import { differenceInDays, endOfToday, isToday, startOfToday } from "date-fns"; import { HassConfig, UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, diff --git a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts index 4cdd7eb1b0ec..573afe4bdef7 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-usage-graph-card.ts @@ -4,7 +4,7 @@ import { ChartOptions, ScatterDataPoint, } from "chart.js"; -import { endOfToday, isToday, startOfToday } from "date-fns/esm"; +import { endOfToday, isToday, startOfToday } from "date-fns"; import { HassConfig, UnsubscribeFunc } from "home-assistant-js-websocket"; import { css, diff --git a/src/panels/lovelace/components/hui-energy-period-selector.ts b/src/panels/lovelace/components/hui-energy-period-selector.ts index 0da7b839070a..11e863560750 100644 --- a/src/panels/lovelace/components/hui-energy-period-selector.ts +++ b/src/panels/lovelace/components/hui-energy-period-selector.ts @@ -20,7 +20,7 @@ import { startOfWeek, startOfYear, subDays, -} from "date-fns/esm"; +} from "date-fns"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { CSSResultGroup, diff --git a/yarn.lock b/yarn.lock index 0d667c41aec5..f69413110f32 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1404,7 +1404,7 @@ __metadata: languageName: node linkType: hard -"@babel/runtime@npm:7.24.4, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.21.0, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": +"@babel/runtime@npm:7.24.4, @babel/runtime@npm:^7.10.2, @babel/runtime@npm:^7.11.2, @babel/runtime@npm:^7.7.2, @babel/runtime@npm:^7.8.4": version: 7.24.4 resolution: "@babel/runtime@npm:7.24.4" dependencies: @@ -7100,21 +7100,21 @@ __metadata: languageName: node linkType: hard -"date-fns-tz@npm:2.0.1": - version: 2.0.1 - resolution: "date-fns-tz@npm:2.0.1" +"date-fns-tz@npm:3.0.0": + version: 3.0.0 + resolution: "date-fns-tz@npm:3.0.0" + dependencies: + lodash.clonedeep: "npm:^4.5.0" peerDependencies: - date-fns: 2.x - checksum: 10/f12e684bc13c9fe7ef7910c5b25437e15290a655d45102b7420f046cecdf9fa5715bf333d6dfb6bab6c382c7abc6b58241a50c216e9ab0b60d6fdb388f473d6b + date-fns: ^3.0.0 + checksum: 10/0a20196abd2519eb56bed0ba8fa838d60374db7bffa37d0d9284b29b6eed1b84369560d59688236479ed0bda923057fec2faef71caf09bc246d5f567c23308a8 languageName: node linkType: hard -"date-fns@npm:2.30.0": - version: 2.30.0 - resolution: "date-fns@npm:2.30.0" - dependencies: - "@babel/runtime": "npm:^7.21.0" - checksum: 10/70b3e8ea7aaaaeaa2cd80bd889622a4bcb5d8028b4de9162cbcda359db06e16ff6e9309e54eead5341e71031818497f19aaf9839c87d1aba1e27bb4796e758a9 +"date-fns@npm:3.6.0": + version: 3.6.0 + resolution: "date-fns@npm:3.6.0" + checksum: 10/cac35c58926a3b5d577082ff2b253612ec1c79eb6754fddef46b6a8e826501ea2cb346ecbd211205f1ba382ddd1f9d8c3f00bf433ad63cc3063454d294e3a6b8 languageName: node linkType: hard @@ -9667,8 +9667,8 @@ __metadata: comlink: "npm:4.4.1" core-js: "npm:3.36.1" cropperjs: "npm:1.6.1" - date-fns: "npm:2.30.0" - date-fns-tz: "npm:2.0.1" + date-fns: "npm:3.6.0" + date-fns-tz: "npm:3.0.0" deep-clone-simple: "npm:1.1.1" deep-freeze: "npm:0.0.1" del: "npm:7.1.0" From e0087bd14278ea8194976470179eefb43b1edb8f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 15:15:33 +0000 Subject: [PATCH 31/98] Update dependency @material/web to v1.4.0 (#20177) * Update dependency @material/web to v1.4.0 Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com> --- package.json | 2 +- src/components/ha-circular-progress.ts | 22 +++++++++---------- src/components/ha-list-item-new.ts | 30 ++++++++++++-------------- src/components/ha-list-new.ts | 20 ++++++++--------- src/components/ha-menu-item.ts | 6 +++--- src/components/ha-menu.ts | 6 +++--- src/components/ha-slider.ts | 6 +++--- src/components/ha-sub-menu.ts | 7 +++--- yarn.lock | 10 ++++----- 9 files changed, 51 insertions(+), 58 deletions(-) diff --git a/package.json b/package.json index b96b93510716..f0327aff1c9f 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@material/mwc-top-app-bar": "0.27.0", "@material/mwc-top-app-bar-fixed": "0.27.0", "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0", - "@material/web": "=1.3.0", + "@material/web": "1.4.0", "@mdi/js": "7.4.47", "@mdi/svg": "7.4.47", "@polymer/paper-item": "3.0.1", diff --git a/src/components/ha-circular-progress.ts b/src/components/ha-circular-progress.ts index 480b0ec1cc5e..6d53057b925a 100644 --- a/src/components/ha-circular-progress.ts +++ b/src/components/ha-circular-progress.ts @@ -1,6 +1,6 @@ import "element-internals-polyfill"; import { MdCircularProgress } from "@material/web/progress/circular-progress"; -import { CSSResult, PropertyValues, css } from "lit"; +import { PropertyValues, css } from "lit"; import { customElement, property } from "lit/decorators"; @customElement("ha-circular-progress") @@ -32,17 +32,15 @@ export class HaCircularProgress extends MdCircularProgress { } } - static get styles(): CSSResult[] { - return [ - ...super.styles, - css` - :host { - --md-sys-color-primary: var(--primary-color); - --md-circular-progress-size: 48px; - } - `, - ]; - } + static override styles = [ + ...super.styles, + css` + :host { + --md-sys-color-primary: var(--primary-color); + --md-circular-progress-size: 48px; + } + `, + ]; } declare global { diff --git a/src/components/ha-list-item-new.ts b/src/components/ha-list-item-new.ts index 980c28479ae6..00af92be1295 100644 --- a/src/components/ha-list-item-new.ts +++ b/src/components/ha-list-item-new.ts @@ -1,25 +1,23 @@ import { customElement } from "lit/decorators"; import "element-internals-polyfill"; import { MdListItem } from "@material/web/list/list-item"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; @customElement("ha-list-item-new") export class HaListItemNew extends MdListItem { - static get styles(): CSSResult[] { - return [ - ...MdListItem.styles, - css` - :host { - --ha-icon-display: block; - --md-sys-color-primary: var(--primary-text-color); - --md-sys-color-secondary: var(--secondary-text-color); - --md-sys-color-surface: var(--card-background-color); - --md-sys-color-on-surface: var(--primary-text-color); - --md-sys-color-on-surface-variant: var(--secondary-text-color); - } - `, - ]; - } + static override styles = [ + ...super.styles, + css` + :host { + --ha-icon-display: block; + --md-sys-color-primary: var(--primary-text-color); + --md-sys-color-secondary: var(--secondary-text-color); + --md-sys-color-surface: var(--card-background-color); + --md-sys-color-on-surface: var(--primary-text-color); + --md-sys-color-on-surface-variant: var(--secondary-text-color); + } + `, + ]; } declare global { diff --git a/src/components/ha-list-new.ts b/src/components/ha-list-new.ts index b88ef32e1a17..56b2f193abcd 100644 --- a/src/components/ha-list-new.ts +++ b/src/components/ha-list-new.ts @@ -1,20 +1,18 @@ import { customElement } from "lit/decorators"; import "element-internals-polyfill"; import { MdList } from "@material/web/list/list"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; @customElement("ha-list-new") export class HaListNew extends MdList { - static get styles(): CSSResult[] { - return [ - ...MdList.styles, - css` - :host { - --md-sys-color-surface: var(--card-background-color); - } - `, - ]; - } + static override styles = [ + ...super.styles, + css` + :host { + --md-sys-color-surface: var(--card-background-color); + } + `, + ]; } declare global { diff --git a/src/components/ha-menu-item.ts b/src/components/ha-menu-item.ts index 9c03e4e7f567..7b5b32e7d3a6 100644 --- a/src/components/ha-menu-item.ts +++ b/src/components/ha-menu-item.ts @@ -1,12 +1,12 @@ import { MdMenuItem } from "@material/web/menu/menu-item"; import "element-internals-polyfill"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; import { customElement } from "lit/decorators"; @customElement("ha-menu-item") export class HaMenuItem extends MdMenuItem { - static override styles: CSSResult[] = [ - ...MdMenuItem.styles, + static override styles = [ + ...super.styles, css` :host { --ha-icon-display: block; diff --git a/src/components/ha-menu.ts b/src/components/ha-menu.ts index d1a414698427..885954ba4609 100644 --- a/src/components/ha-menu.ts +++ b/src/components/ha-menu.ts @@ -1,12 +1,12 @@ import { customElement } from "lit/decorators"; import "element-internals-polyfill"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; import { MdMenu } from "@material/web/menu/menu"; @customElement("ha-menu") export class HaMenu extends MdMenu { - static override styles: CSSResult[] = [ - ...MdMenu.styles, + static override styles = [ + ...super.styles, css` :host { --md-sys-color-surface-container: var(--card-background-color); diff --git a/src/components/ha-slider.ts b/src/components/ha-slider.ts index 31607a62f568..5c4d40d0b868 100644 --- a/src/components/ha-slider.ts +++ b/src/components/ha-slider.ts @@ -1,7 +1,7 @@ import { customElement } from "lit/decorators"; import "element-internals-polyfill"; import { MdSlider } from "@material/web/slider/slider"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; import { mainWindow } from "../common/dom/get_main_window"; @customElement("ha-slider") @@ -11,8 +11,8 @@ export class HaSlider extends MdSlider { this.dir = mainWindow.document.dir; } - static override styles: CSSResult[] = [ - ...MdSlider.styles, + static override styles = [ + ...super.styles, css` :host { --md-sys-color-primary: var(--primary-color); diff --git a/src/components/ha-sub-menu.ts b/src/components/ha-sub-menu.ts index 9d01b2019f5b..584d30dfa730 100644 --- a/src/components/ha-sub-menu.ts +++ b/src/components/ha-sub-menu.ts @@ -1,18 +1,17 @@ import { customElement } from "lit/decorators"; import "element-internals-polyfill"; -import { CSSResult, css } from "lit"; +import { css } from "lit"; import { MdSubMenu } from "@material/web/menu/sub-menu"; @customElement("ha-sub-menu") -// @ts-expect-error export class HaSubMenu extends MdSubMenu { async show() { super.show(); this.menu.hasOverflow = false; } - static override styles: CSSResult[] = [ - MdSubMenu.styles, + static override styles = [ + ...super.styles, css` :host { --ha-icon-display: block; diff --git a/yarn.lock b/yarn.lock index f69413110f32..43d92d0a3d01 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3178,13 +3178,13 @@ __metadata: languageName: node linkType: hard -"@material/web@npm:=1.3.0": - version: 1.3.0 - resolution: "@material/web@npm:1.3.0" +"@material/web@npm:1.4.0": + version: 1.4.0 + resolution: "@material/web@npm:1.4.0" dependencies: lit: "npm:^2.7.4 || ^3.0.0" tslib: "npm:^2.4.0" - checksum: 10/7c3427747eccb69628807bed115dca96bb4a8e360e5cb97170a42ab7d469d17f0c925defa417a212ef3237c252f0b06dac9499b56c42945214f9bdeb7f7e5a0b + checksum: 10/226571fd96d77f9baa48a77dfe48d88ad26efe6993724d5370e78ed1f82cb3b3882d631fb474d0289e188b58c746e162d9ac5157fefc868d86db5f5ee0a123d8 languageName: node linkType: hard @@ -9612,7 +9612,7 @@ __metadata: "@material/mwc-top-app-bar": "npm:0.27.0" "@material/mwc-top-app-bar-fixed": "npm:0.27.0" "@material/top-app-bar": "npm:=14.0.0-canary.53b3cad2f.0" - "@material/web": "npm:=1.3.0" + "@material/web": "npm:1.4.0" "@mdi/js": "npm:7.4.47" "@mdi/svg": "npm:7.4.47" "@octokit/auth-oauth-device": "npm:7.1.0" From 0118a5bf4c7447ca9eb75474051f3ce815b91e83 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:31:59 -0700 Subject: [PATCH 32/98] Allow customizing display name for energy device (#20033) * Allow customizing display name for energy device * use display name in device settings list --- src/data/energy.ts | 1 + .../components/ha-energy-device-settings.ts | 30 ++++++++++++++-- .../dialogs/dialog-energy-device-settings.ts | 34 +++++++++++++++++-- .../energy/dialogs/show-dialogs-energy.ts | 1 + .../hui-energy-devices-detail-graph-card.ts | 12 ++++--- .../energy/hui-energy-devices-graph-card.ts | 25 ++++++++------ src/translations/en.json | 1 + 7 files changed, 83 insertions(+), 21 deletions(-) diff --git a/src/data/energy.ts b/src/data/energy.ts index 48e28fa6c4cb..61d23aca0e53 100644 --- a/src/data/energy.ts +++ b/src/data/energy.ts @@ -95,6 +95,7 @@ export type EnergySolarForecasts = { export interface DeviceConsumptionEnergyPreference { // This is an ever increasing value stat_consumption: string; + name?: string; } export interface FlowFromGridSourceEnergyPreference { diff --git a/src/panels/config/energy/components/ha-energy-device-settings.ts b/src/panels/config/energy/components/ha-energy-device-settings.ts index a9e3e41a77a4..8c6d3506e759 100644 --- a/src/panels/config/energy/components/ha-energy-device-settings.ts +++ b/src/panels/config/energy/components/ha-energy-device-settings.ts @@ -1,5 +1,5 @@ import "@material/mwc-button/mwc-button"; -import { mdiDelete, mdiDevices } from "@mdi/js"; +import { mdiDelete, mdiDevices, mdiPencil } from "@mdi/js"; import { CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { customElement, property } from "lit/decorators"; import { fireEvent } from "../../../../common/dom/fire_event"; @@ -83,18 +83,24 @@ export class EnergyDeviceSettings extends LitElement { ${this.preferences.device_consumption.map((device) => { const entityState = this.hass.states[device.stat_consumption]; return html` -
+
${getStatisticLabel( + >${device.name || + getStatisticLabel( this.hass, device.stat_consumption, this.statsMetadata?.[device.stat_consumption] )} + { + await this._savePreferences({ + ...this.preferences, + device_consumption: this.preferences.device_consumption.map((d) => + d === origDevice ? newDevice : d + ), + }); + }, + }); + } + private _addDevice() { showEnergySettingsDeviceDialog(this, { device_consumptions: this.preferences diff --git a/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts b/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts index fba35d833403..1362dfbdb3b7 100644 --- a/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts +++ b/src/panels/config/energy/dialogs/dialog-energy-device-settings.ts @@ -44,9 +44,10 @@ export class DialogEnergyDeviceSettings this._energy_units = ( await getSensorDeviceClassConvertibleUnits(this.hass, "energy") ).units; - this._excludeList = this._params.device_consumptions.map( - (entry) => entry.stat_consumption - ); + this._device = this._params.device; + this._excludeList = this._params.device_consumptions + .map((entry) => entry.stat_consumption) + .filter((id) => id !== this._device?.stat_consumption); } public closeDialog(): void { @@ -88,6 +89,7 @@ export class DialogEnergyDeviceSettings .hass=${this.hass} .helpMissingEntityUrl=${energyStatisticHelpUrl} .includeUnitClass=${energyUnitClasses} + .value=${this._device?.stat_consumption} .label=${this.hass.localize( "ui.panel.config.energy.device_consumption.dialog.device_consumption_energy" )} @@ -96,6 +98,17 @@ export class DialogEnergyDeviceSettings dialogInitialFocus > + + + ${this.hass.localize("ui.common.cancel")} @@ -118,6 +131,17 @@ export class DialogEnergyDeviceSettings this._device = { stat_consumption: ev.detail.value }; } + private _nameChanged(ev) { + const newDevice = { + ...this._device!, + name: ev.target!.value, + } as DeviceConsumptionEnergyPreference; + if (!newDevice.name) { + delete newDevice.name; + } + this._device = newDevice; + } + private async _save() { try { await this._params!.saveCallback(this._device!); @@ -134,6 +158,10 @@ export class DialogEnergyDeviceSettings ha-statistic-picker { width: 100%; } + ha-textfield { + margin-top: 16px; + width: 100%; + } `, ]; } diff --git a/src/panels/config/energy/dialogs/show-dialogs-energy.ts b/src/panels/config/energy/dialogs/show-dialogs-energy.ts index 997999a69c4e..246ac05c2379 100644 --- a/src/panels/config/energy/dialogs/show-dialogs-energy.ts +++ b/src/panels/config/energy/dialogs/show-dialogs-energy.ts @@ -70,6 +70,7 @@ export interface EnergySettingsWaterDialogParams { } export interface EnergySettingsDeviceDialogParams { + device?: DeviceConsumptionEnergyPreference; device_consumptions: DeviceConsumptionEnergyPreference[]; saveCallback: (device: DeviceConsumptionEnergyPreference) => Promise; } diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts index 7c227455ad9f..95944eff0a8b 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-detail-graph-card.ts @@ -333,11 +333,13 @@ export class HuiEnergyDevicesDetailGraphCard ); data.push({ - label: getStatisticLabel( - this.hass, - source.stat_consumption, - statisticsMetaData[source.stat_consumption] - ), + label: + source.name || + getStatisticLabel( + this.hass, + source.stat_consumption, + statisticsMetaData[source.stat_consumption] + ), hidden: this._hiddenStats.has(source.stat_consumption) || itemExceedsMax, borderColor: compare ? color + "7F" : color, diff --git a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts index 95604e45bb35..83d287b8ea61 100644 --- a/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts +++ b/src/panels/lovelace/cards/energy/hui-energy-devices-graph-card.ts @@ -127,11 +127,7 @@ export class HuiEnergyDevicesGraphCard const statisticId = ( this._chartData.datasets[0].data[index] as ScatterDataPoint ).y; - return getStatisticLabel( - this.hass, - statisticId as any, - this._data?.statsMetadata[statisticId] - ); + return this.getDeviceName(statisticId as any as string); }, }, }, @@ -149,11 +145,7 @@ export class HuiEnergyDevicesGraphCard callbacks: { title: (item) => { const statisticId = item[0].label; - return getStatisticLabel( - this.hass, - statisticId, - this._data?.statsMetadata[statisticId] - ); + return this.getDeviceName(statisticId); }, label: (context) => `${context.dataset.label}: ${formatNumber( @@ -181,6 +173,19 @@ export class HuiEnergyDevicesGraphCard }) ); + private getDeviceName(statisticId: string): string { + return ( + this._data?.prefs.device_consumption.find( + (d) => d.stat_consumption === statisticId + )?.name || + getStatisticLabel( + this.hass, + statisticId, + this._data?.statsMetadata[statisticId] + ) + ); + } + private async _getStatistics(energyData: EnergyData): Promise { const data = energyData.stats; const compareData = energyData.statsCompare; diff --git a/src/translations/en.json b/src/translations/en.json index 21e30b9e0b89..67330909947d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -2243,6 +2243,7 @@ "add_device": "Add device", "dialog": { "header": "Add a device", + "display_name": "Display name", "device_consumption_energy": "Device consumption energy", "selected_stat_intro": "Select the energy sensor that measures the device's energy usage in either of {unit}." } From 178feb733012f151d6f33f37204ff15270a7f7c1 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:38:39 -0700 Subject: [PATCH 33/98] Create helpers from automation editor (#19287) * Create helpers from automation editor * support multiple createDomains * localization * fix lint * Move multi domain to entity picker * Update dialog-helper-detail.ts * Update ha-config-helpers.ts * optimize a little --------- Co-authored-by: Bram Kragten --- src/components/entity/ha-entity-picker.ts | 72 ++++- .../ha-selector/ha-selector-target.ts | 1 + src/components/ha-service-control.ts | 302 +++++++++--------- src/components/ha-target-picker.ts | 3 + src/data/selector.ts | 1 + .../config/helpers/dialog-helper-detail.ts | 47 ++- .../helpers/show-dialog-helper-detail.ts | 11 +- src/translations/en.json | 4 +- 8 files changed, 270 insertions(+), 171 deletions(-) diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index 1ae47cb99a87..680910d8b8f5 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -18,6 +18,12 @@ import "../ha-icon-button"; import "../ha-svg-icon"; import "./state-badge"; import { caseInsensitiveStringCompare } from "../../common/string/compare"; +import { showHelperDetailDialog } from "../../panels/config/helpers/show-dialog-helper-detail"; +import { domainToName } from "../../data/integration"; +import { + isHelperDomain, + HelperDomain, +} from "../../panels/config/helpers/const"; interface HassEntityWithCachedName extends HassEntity, ScorableTextItem { friendly_name: string; @@ -25,6 +31,8 @@ interface HassEntityWithCachedName extends HassEntity, ScorableTextItem { export type HaEntityPickerEntityFilterFunc = (entity: HassEntity) => boolean; +const CREATE_ID = "___create-new-entity___"; + @customElement("ha-entity-picker") export class HaEntityPicker extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -44,6 +52,8 @@ export class HaEntityPicker extends LitElement { @property() public helper?: string; + @property({ type: Array }) public createDomains?: string[]; + /** * Show entities from specific domains. * @type {Array} @@ -130,7 +140,11 @@ export class HaEntityPicker extends LitElement { >` : ""} ${item.friendly_name} - ${item.entity_id} + ${item.entity_id.startsWith(CREATE_ID) + ? this.hass.localize("ui.components.entity.entity-picker.new_entity") + : item.entity_id} `; private _getStates = memoizeOne( @@ -143,7 +157,8 @@ export class HaEntityPicker extends LitElement { includeDeviceClasses: this["includeDeviceClasses"], includeUnitOfMeasurement: this["includeUnitOfMeasurement"], includeEntities: this["includeEntities"], - excludeEntities: this["excludeEntities"] + excludeEntities: this["excludeEntities"], + createDomains: this["createDomains"] ): HassEntityWithCachedName[] => { let states: HassEntityWithCachedName[] = []; @@ -152,6 +167,34 @@ export class HaEntityPicker extends LitElement { } let entityIds = Object.keys(hass.states); + const createItems = createDomains?.length + ? createDomains.map((domain) => { + const newFriendlyName = hass.localize( + "ui.components.entity.entity-picker.create_helper", + { + domain: isHelperDomain(domain) + ? hass.localize( + `ui.panel.config.helpers.types.${domain as HelperDomain}` + ) + : domainToName(hass.localize, domain), + } + ); + + return { + entity_id: CREATE_ID + domain, + state: "on", + last_changed: "", + last_updated: "", + context: { id: "", user_id: null, parent_id: null }, + friendly_name: newFriendlyName, + attributes: { + icon: "mdi:plus", + }, + strings: [domain, newFriendlyName], + }; + }) + : []; + if (!entityIds.length) { return [ { @@ -171,6 +214,7 @@ export class HaEntityPicker extends LitElement { }, strings: [], }, + ...createItems, ]; } @@ -281,9 +325,14 @@ export class HaEntityPicker extends LitElement { }, strings: [], }, + ...createItems, ]; } + if (createItems?.length) { + states.push(...createItems); + } + return states; } ); @@ -310,13 +359,18 @@ export class HaEntityPicker extends LitElement { this.includeDeviceClasses, this.includeUnitOfMeasurement, this.includeEntities, - this.excludeEntities + this.excludeEntities, + this.createDomains ); if (this._initedStates) { this.comboBox.filteredItems = this._states; } this._initedStates = true; } + + if (changedProps.has("createDomains") && this.createDomains?.length) { + this.hass.loadFragmentTranslation("config"); + } } protected render(): TemplateResult { @@ -354,6 +408,18 @@ export class HaEntityPicker extends LitElement { private _valueChanged(ev: ValueChangedEvent) { ev.stopPropagation(); const newValue = ev.detail.value; + + if (newValue.startsWith(CREATE_ID)) { + const domain = newValue.substring(CREATE_ID.length); + showHelperDetailDialog(this, { + domain, + dialogClosedCallback: (item) => { + if (item.entityId) this._setValue(item.entityId); + }, + }); + return; + } + if (newValue !== this._value) { this._setValue(newValue); } diff --git a/src/components/ha-selector/ha-selector-target.ts b/src/components/ha-selector/ha-selector-target.ts index fafc97b62beb..a37557c1bd91 100644 --- a/src/components/ha-selector/ha-selector-target.ts +++ b/src/components/ha-selector/ha-selector-target.ts @@ -82,6 +82,7 @@ export class HaTargetSelector extends LitElement { .deviceFilter=${this._filterDevices} .entityFilter=${this._filterEntities} .disabled=${this.disabled} + .createDomains=${this.selector.target?.create_domains} >`; } diff --git a/src/components/ha-service-control.ts b/src/components/ha-service-control.ts index 8310aee8f4c5..83da022e296a 100644 --- a/src/components/ha-service-control.ts +++ b/src/components/ha-service-control.ts @@ -33,6 +33,7 @@ import { expandFloorTarget, expandLabelTarget, Selector, + TargetSelector, } from "../data/selector"; import { HomeAssistant, ValueChangedEvent } from "../types"; import { documentationUrl } from "../util/documentation-url"; @@ -43,6 +44,7 @@ import "./ha-service-picker"; import "./ha-settings-row"; import "./ha-yaml-editor"; import type { HaYamlEditor } from "./ha-yaml-editor"; +import { isHelperDomain } from "../panels/config/helpers/const"; const attributeFilter = (values: any[], attribute: any) => { if (typeof attribute === "object") { @@ -363,6 +365,15 @@ export class HaServiceControl extends LitElement { return false; } + private _targetSelector = memoizeOne( + (targetSelector: TargetSelector | null | undefined, domain?: string) => { + const create_domains = isHelperDomain(domain) ? [domain] : undefined; + return targetSelector + ? { target: { ...targetSelector, create_domains } } + : { target: { create_domains } }; + } + ); + protected render() { const serviceData = this._getServiceInfo( this._value?.service, @@ -401,157 +412,152 @@ export class HaServiceControl extends LitElement { )) || serviceData?.description; - return html` - ${this.hidePicker - ? nothing - : html``} + ${this.hideDescription + ? nothing + : html` +
+ ${description ? html`

${description}

` : ""} + ${this._manifest + ? html` + + ` + : nothing} +
+ `} + ${serviceData && "target" in serviceData + ? html` + ${hasOptional + ? html`
` + : ""} + ${this.hass.localize("ui.components.service-control.target")} + ${this.hass.localize( + "ui.components.service-control.target_description" + )}`} - ${this.hideDescription - ? nothing - : html` -
- ${description ? html`

${description}

` : ""} - ${this._manifest - ? html` - - ` - : nothing} -
- `} - ${serviceData && "target" in serviceData - ? html` - ${hasOptional - ? html`
` - : ""} - ${this.hass.localize( - "ui.components.service-control.target" - )} - ${this.hass.localize( - "ui.components.service-control.target_description" - )}
` - : entityId - ? html`` - : ""} - ${shouldRenderServiceDataYaml - ? html`
` + : entityId + ? html`` - : filteredFields?.map((dataField) => { - const selector = dataField?.selector ?? { text: undefined }; - const type = Object.keys(selector)[0]; - const enhancedSelector = [ - "action", - "condition", - "trigger", - ].includes(type) - ? { - [type]: { - ...selector[type], - path: [dataField.key], - }, - } - : selector; - - const showOptional = showOptionalToggle(dataField); - - return dataField.selector && - (!dataField.advanced || - this.showAdvanced || - (this._value?.data && - this._value.data[dataField.key] !== undefined)) - ? html` - ${!showOptional - ? hasOptional - ? html`
` - : "" - : html``} - ${this.hass.localize( - `component.${domain}.services.${serviceName}.fields.${dataField.key}.name` - ) || - dataField.name || - dataField.key} - ${this.hass.localize( - `component.${domain}.services.${serviceName}.fields.${dataField.key}.description` - ) || dataField?.description} - -
` - : ""; - })} - `; + .disabled=${this.disabled} + .value=${this._value?.data?.entity_id} + .label=${this.hass.localize( + `component.${domain}.services.${serviceName}.fields.entity_id.description` + ) || entityId.description} + @value-changed=${this._entityPicked} + allow-custom-entity + >
` + : ""} + ${shouldRenderServiceDataYaml + ? html`` + : filteredFields?.map((dataField) => { + const selector = dataField?.selector ?? { text: undefined }; + const type = Object.keys(selector)[0]; + const enhancedSelector = ["action", "condition", "trigger"].includes( + type + ) + ? { + [type]: { + ...selector[type], + path: [dataField.key], + }, + } + : selector; + + const showOptional = showOptionalToggle(dataField); + + return dataField.selector && + (!dataField.advanced || + this.showAdvanced || + (this._value?.data && + this._value.data[dataField.key] !== undefined)) + ? html` + ${!showOptional + ? hasOptional + ? html`
` + : "" + : html``} + ${this.hass.localize( + `component.${domain}.services.${serviceName}.fields.${dataField.key}.name` + ) || + dataField.name || + dataField.key} + ${this.hass.localize( + `component.${domain}.services.${serviceName}.fields.${dataField.key}.description` + ) || dataField?.description} + +
` + : ""; + })} `; } private _localizeValueCallback = (key: string) => { diff --git a/src/components/ha-target-picker.ts b/src/components/ha-target-picker.ts index 21d32d3ea3bc..c20a465e442e 100644 --- a/src/components/ha-target-picker.ts +++ b/src/components/ha-target-picker.ts @@ -65,6 +65,8 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) { @property() public helper?: string; + @property({ type: Array }) public createDomains?: string[]; + /** * Show only targets with entities from specific domains. * @type {Array} @@ -468,6 +470,7 @@ export class HaTargetPicker extends SubscribeMixin(LitElement) { .includeDeviceClasses=${this.includeDeviceClasses} .includeDomains=${this.includeDomains} .excludeEntities=${ensureArray(this.value?.entity_id)} + .createDomains=${this.createDomains} @value-changed=${this._targetPicked} @click=${this._preventDefault} allow-custom-entity diff --git a/src/data/selector.ts b/src/data/selector.ts index 3abb7ae6fc71..557650635a12 100644 --- a/src/data/selector.ts +++ b/src/data/selector.ts @@ -401,6 +401,7 @@ export interface TargetSelector { target: { entity?: EntitySelectorFilter | readonly EntitySelectorFilter[]; device?: DeviceSelectorFilter | readonly DeviceSelectorFilter[]; + create_domains?: string[]; } | null; } diff --git a/src/panels/config/helpers/dialog-helper-detail.ts b/src/panels/config/helpers/dialog-helper-detail.ts index 5e9a6e07d63c..54488dccec60 100644 --- a/src/panels/config/helpers/dialog-helper-detail.ts +++ b/src/panels/config/helpers/dialog-helper-detail.ts @@ -32,7 +32,7 @@ import { showConfigFlowDialog } from "../../../dialogs/config-flow/show-dialog-c import { haStyleDialog } from "../../../resources/styles"; import { HomeAssistant } from "../../../types"; import { brandsUrl } from "../../../util/brands-url"; -import { Helper, HelperDomain } from "./const"; +import { Helper, HelperDomain, isHelperDomain } from "./const"; import type { ShowDialogHelperDetailParams } from "./show-dialog-helper-detail"; type HelperCreators = { @@ -96,7 +96,7 @@ export class DialogHelperDetail extends LitElement { @state() private _opened = false; - @state() private _domain?: HelperDomain; + @state() private _domain?: string; @state() private _error?: string; @@ -114,8 +114,12 @@ export class DialogHelperDetail extends LitElement { this._params = params; this._domain = params.domain; this._item = undefined; + if (this._domain && this._domain in HELPERS) { + await HELPERS[this._domain].import(); + } this._opened = true; await this.updateComplete; + this.hass.loadFragmentTranslation("config"); Promise.all([ getConfigFlowHandlers(this.hass, ["helper"]), // Ensure the titles are loaded before we render the flows. @@ -141,7 +145,7 @@ export class DialogHelperDetail extends LitElement { if (this._domain) { content = html`
- ${this._error ? html`
${this._error}
` : ""} + ${this._error ? html`
${this._error}
` : ""} ${dynamicElement(`ha-${this._domain}-form`, { hass: this.hass, item: this._item, @@ -155,13 +159,15 @@ export class DialogHelperDetail extends LitElement { > ${this.hass!.localize("ui.panel.config.helpers.dialog.create")} - - ${this.hass!.localize("ui.common.back")} - + ${this._params?.domain + ? nothing + : html` + ${this.hass!.localize("ui.common.back")} + `} `; } else if (this._loading || this._helperFlows === undefined) { content = html` import("./dialog-helper-detail"); export interface ShowDialogHelperDetailParams { - domain?: HelperDomain; - // Only used for config entries - dialogClosedCallback?: DataEntryFlowDialogParams["dialogClosedCallback"]; + domain?: string; + dialogClosedCallback?: (params: { + flowFinished: boolean; + entryId?: string; + entityId?: string; + }) => void; } export const showHelperDetailDialog = ( diff --git a/src/translations/en.json b/src/translations/en.json index 67330909947d..3e5142ff565b 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -472,7 +472,9 @@ "clear": "Clear", "no_entities": "You don't have any entities", "no_match": "No matching entities found", - "show_entities": "Show entities" + "show_entities": "Show entities", + "new_entity": "Create a new entity", + "create_helper": "Create a new {domain, select, \n undefined {} \n other {{domain} }\n } helper." }, "entity-attribute-picker": { "attribute": "Attribute", From b82f1128fecacaa0e71dd8137d2c50509f7bd2a0 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:51:23 -0700 Subject: [PATCH 34/98] Location/zone editor updates (#19994) --- .../ha-selector/ha-selector-location.ts | 86 +++++++++- src/data/selector.ts | 6 +- src/data/zone.ts | 5 + .../config/core/ha-config-section-general.ts | 40 ++--- .../config/zone/dialog-home-zone-detail.ts | 150 ++++++++++++++++++ src/panels/config/zone/dialog-zone-detail.ts | 34 +--- src/panels/config/zone/ha-config-zone.ts | 22 ++- .../zone/show-dialog-home-zone-detail.ts | 20 +++ src/translations/en.json | 12 +- 9 files changed, 308 insertions(+), 67 deletions(-) create mode 100644 src/panels/config/zone/dialog-home-zone-detail.ts create mode 100644 src/panels/config/zone/show-dialog-home-zone-detail.ts diff --git a/src/components/ha-selector/ha-selector-location.ts b/src/components/ha-selector/ha-selector-location.ts index 96d9d6629802..01fc052cb266 100644 --- a/src/components/ha-selector/ha-selector-location.ts +++ b/src/components/ha-selector/ha-selector-location.ts @@ -7,8 +7,10 @@ import type { LocationSelectorValue, } from "../../data/selector"; import type { HomeAssistant } from "../../types"; +import type { SchemaUnion } from "../ha-form/types"; import type { MarkerLocation } from "../map/ha-locations-editor"; import "../map/ha-locations-editor"; +import "../ha-form/ha-form"; @customElement("ha-selector-location") export class HaLocationSelector extends LitElement { @@ -24,6 +26,49 @@ export class HaLocationSelector extends LitElement { @property({ type: Boolean, reflect: true }) public disabled = false; + private _schema = memoizeOne( + (radius?: boolean, radius_readonly?: boolean) => + [ + { + name: "", + type: "grid", + schema: [ + { + name: "latitude", + required: true, + selector: { number: { step: "any" } }, + }, + { + name: "longitude", + required: true, + selector: { number: { step: "any" } }, + }, + ], + }, + ...(radius + ? [ + { + name: "radius", + required: true, + default: 1000, + disabled: !!radius_readonly, + selector: { number: { min: 0, step: 1, mode: "box" } as const }, + } as const, + ] + : []), + ] as const + ); + + protected willUpdate() { + if (!this.value) { + this.value = { + latitude: this.hass.config.latitude, + longitude: this.hass.config.longitude, + radius: this.selector.location?.radius ? 1000 : undefined, + }; + } + } + protected render() { return html`

${this.label ? this.label : ""}

@@ -35,6 +80,17 @@ export class HaLocationSelector extends LitElement { @location-updated=${this._locationChanged} @radius-updated=${this._radiusChanged} > + `; } @@ -66,7 +122,8 @@ export class HaLocationSelector extends LitElement { ? "mdi:map-marker-radius" : "mdi:map-marker", location_editable: true, - radius_editable: true, + radius_editable: + !!selector.location?.radius && !selector.location?.radius_readonly, }, ]; } @@ -80,14 +137,39 @@ export class HaLocationSelector extends LitElement { } private _radiusChanged(ev: CustomEvent) { - const radius = ev.detail.radius; + const radius = Math.round(ev.detail.radius); fireEvent(this, "value-changed", { value: { ...this.value, radius } }); } + private _valueChanged(ev: CustomEvent) { + ev.stopPropagation(); + const value = ev.detail.value; + const radius = Math.round(ev.detail.value.radius); + + fireEvent(this, "value-changed", { + value: { + latitude: value.latitude, + longitude: value.longitude, + ...(this.selector.location?.radius && + !this.selector.location?.radius_readonly + ? { + radius, + } + : {}), + }, + }); + } + + private _computeLabel = ( + entry: SchemaUnion> + ): string => + this.hass.localize(`ui.components.selectors.location.${entry.name}`); + static styles = css` ha-locations-editor { display: block; height: 400px; + margin-bottom: 16px; } p { margin-top: 0; diff --git a/src/data/selector.ts b/src/data/selector.ts index 557650635a12..f49eae11a1c3 100644 --- a/src/data/selector.ts +++ b/src/data/selector.ts @@ -270,7 +270,11 @@ export interface LanguageSelector { } export interface LocationSelector { - location: { radius?: boolean; icon?: string } | null; + location: { + radius?: boolean; + radius_readonly?: boolean; + icon?: string; + } | null; } export interface LocationSelectorValue { diff --git a/src/data/zone.ts b/src/data/zone.ts index 52ea733317b4..d59e33e87f6f 100644 --- a/src/data/zone.ts +++ b/src/data/zone.ts @@ -11,6 +11,11 @@ export interface Zone { radius?: number; } +export interface HomeZoneMutableParams { + latitude: number; + longitude: number; +} + export interface ZoneMutableParams { name: string; icon?: string; diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts index 1a8b4a7263ae..438ff479b2c0 100644 --- a/src/panels/config/core/ha-config-section-general.ts +++ b/src/panels/config/core/ha-config-section-general.ts @@ -18,18 +18,20 @@ import "../../../components/ha-language-picker"; import "../../../components/ha-radio"; import type { HaRadio } from "../../../components/ha-radio"; import "../../../components/ha-select"; +import "../../../components/ha-selector/ha-selector-location"; +import type { LocationSelectorValue } from "../../../data/selector"; import "../../../components/ha-settings-row"; import "../../../components/ha-textfield"; import type { HaTextField } from "../../../components/ha-textfield"; import "../../../components/ha-timezone-picker"; -import "../../../components/map/ha-locations-editor"; -import type { MarkerLocation } from "../../../components/map/ha-locations-editor"; import { ConfigUpdateValues, saveCoreConfig } from "../../../data/core"; import { showConfirmationDialog } from "../../../dialogs/generic/show-dialog-box"; import "../../../layouts/hass-subpage"; import { haStyle } from "../../../resources/styles"; import type { HomeAssistant, ValueChangedEvent } from "../../../types"; +const LOCATION_SELECTOR = { location: {} }; + @customElement("ha-config-section-general") class HaConfigSectionGeneral extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -244,15 +246,16 @@ class HaConfigSectionGeneral extends LitElement {
${this.narrow ? html` - + @value-changed=${this._locationChanged} + > ` : html` @@ -320,7 +323,7 @@ class HaConfigSectionGeneral extends LitElement { } private _locationChanged(ev: CustomEvent) { - this._location = ev.detail.location; + this._location = [ev.detail.value.latitude, ev.detail.value.longitude]; } private async _updateEntry(ev: CustomEvent) { @@ -381,19 +384,15 @@ class HaConfigSectionGeneral extends LitElement { } } - private _markerLocation = memoizeOne( + private _selectorLocation = memoizeOne( ( - lat: number, - lng: number, + latDefault: number, + lngDefault: number, location?: [number, number] - ): MarkerLocation[] => [ - { - id: "location", - latitude: location ? location[0] : lat, - longitude: location ? location[1] : lng, - location_editable: true, - }, - ] + ): LocationSelectorValue => ({ + latitude: location != null ? location[0] : latDefault, + longitude: location != null ? location[1] : lngDefault, + }) ); private _editLocation() { @@ -441,11 +440,6 @@ class HaConfigSectionGeneral extends LitElement { margin-top: 8px; display: inline-block; } - ha-locations-editor { - display: block; - height: 400px; - padding: 16px; - } `, ]; } diff --git a/src/panels/config/zone/dialog-home-zone-detail.ts b/src/panels/config/zone/dialog-home-zone-detail.ts new file mode 100644 index 000000000000..2786cca3cb53 --- /dev/null +++ b/src/panels/config/zone/dialog-home-zone-detail.ts @@ -0,0 +1,150 @@ +import "@material/mwc-button"; +import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; +import { property, state } from "lit/decorators"; +import memoizeOne from "memoize-one"; +import { fireEvent } from "../../../common/dom/fire_event"; +import { createCloseHeading } from "../../../components/ha-dialog"; +import "../../../components/ha-form/ha-form"; +import { HomeZoneMutableParams } from "../../../data/zone"; +import { haStyleDialog } from "../../../resources/styles"; +import { HomeAssistant } from "../../../types"; +import { HomeZoneDetailDialogParams } from "./show-dialog-home-zone-detail"; + +const SCHEMA = [ + { + name: "location", + required: true, + selector: { location: { radius: true, radius_readonly: true } }, + }, +]; + +class DialogHomeZoneDetail extends LitElement { + @property({ attribute: false }) public hass!: HomeAssistant; + + @state() private _error?: Record; + + @state() private _data?: HomeZoneMutableParams; + + @state() private _params?: HomeZoneDetailDialogParams; + + @state() private _submitting = false; + + public showDialog(params: HomeZoneDetailDialogParams): void { + this._params = params; + this._error = undefined; + this._data = { + latitude: this.hass.config.latitude, + longitude: this.hass.config.longitude, + }; + } + + public closeDialog(): void { + this._params = undefined; + this._data = undefined; + fireEvent(this, "dialog-closed", { dialog: this.localName }); + } + + protected render() { + if (!this._params || !this._data) { + return nothing; + } + const latInvalid = String(this._data.latitude) === ""; + const lngInvalid = String(this._data.longitude) === ""; + + const valid = !latInvalid && !lngInvalid; + + return html` + +
+ +

+ ${this.hass!.localize( + "ui.panel.config.zone.detail.no_edit_home_zone_radius" + )} +

+
+ + ${this.hass!.localize("ui.panel.config.zone.detail.update")} + +
+ `; + } + + private _formData = memoizeOne((data: HomeZoneMutableParams) => ({ + ...data, + location: { + latitude: data.latitude, + longitude: data.longitude, + radius: this.hass.states["zone.home"]?.attributes?.radius || 100, + }, + })); + + private _valueChanged(ev: CustomEvent) { + this._error = undefined; + const value = { ...ev.detail.value }; + value.latitude = value.location.latitude; + value.longitude = value.location.longitude; + delete value.location; + this._data = value; + } + + private _computeLabel = (): string => ""; + + private async _updateEntry() { + this._submitting = true; + try { + await this._params!.updateEntry!(this._data!); + this.closeDialog(); + } catch (err: any) { + this._error = { base: err ? err.message : "Unknown error" }; + } finally { + this._submitting = false; + } + } + + static get styles(): CSSResultGroup { + return [ + haStyleDialog, + css` + ha-dialog { + --mdc-dialog-min-width: min(600px, 95vw); + } + @media all and (max-width: 450px), all and (max-height: 500px) { + ha-dialog { + --mdc-dialog-min-width: calc( + 100vw - env(safe-area-inset-right) - env(safe-area-inset-left) + ); + } + } + `, + ]; + } +} + +declare global { + interface HTMLElementTagNameMap { + "dialog-home-zone-detail": DialogHomeZoneDetail; + } +} + +customElements.define("dialog-home-zone-detail", DialogHomeZoneDetail); diff --git a/src/panels/config/zone/dialog-zone-detail.ts b/src/panels/config/zone/dialog-zone-detail.ts index 37432c6b8f89..064bf61fa798 100644 --- a/src/panels/config/zone/dialog-zone-detail.ts +++ b/src/panels/config/zone/dialog-zone-detail.ts @@ -145,30 +145,8 @@ class DialogZoneDetail extends LitElement { required: true, selector: { location: { radius: true, icon } }, }, - { - name: "", - type: "grid", - schema: [ - { - name: "latitude", - required: true, - selector: { number: {} }, - }, - { - name: "longitude", - required: true, - - selector: { number: {} }, - }, - ], - }, { name: "passive_note", type: "constant" }, { name: "passive", selector: { boolean: {} } }, - { - name: "radius", - required: false, - selector: { number: { min: 0, max: 999999, mode: "box" } }, - }, ] as const ); @@ -184,15 +162,9 @@ class DialogZoneDetail extends LitElement { private _valueChanged(ev: CustomEvent) { this._error = undefined; const value = { ...ev.detail.value }; - if ( - value.location.latitude !== this._data!.latitude || - value.location.longitude !== this._data!.longitude || - value.location.radius !== this._data!.radius - ) { - value.latitude = value.location.latitude; - value.longitude = value.location.longitude; - value.radius = Math.round(value.location.radius); - } + value.latitude = value.location.latitude; + value.longitude = value.location.longitude; + value.radius = value.location.radius; delete value.location; if (!value.icon) { delete value.icon; diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index 2455bf2b4818..46c9ea5c719c 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -1,4 +1,4 @@ -import { mdiCog, mdiPencil, mdiPencilOff, mdiPlus } from "@mdi/js"; +import { mdiPencil, mdiPencilOff, mdiPlus } from "@mdi/js"; import "@polymer/paper-item/paper-icon-item"; import "@polymer/paper-item/paper-item-body"; import "@polymer/paper-listbox/paper-listbox"; @@ -35,6 +35,7 @@ import { updateZone, Zone, ZoneMutableParams, + HomeZoneMutableParams, } from "../../../data/zone"; import { showAlertDialog, @@ -47,6 +48,7 @@ import type { HomeAssistant, Route } from "../../../types"; import "../ha-config-section"; import { configSections } from "../ha-panel-config"; import { showZoneDetailDialog } from "./show-dialog-zone-detail"; +import { showHomeZoneDetailDialog } from "./show-dialog-home-zone-detail"; @customElement("ha-config-zone") export class HaConfigZone extends SubscribeMixin(LitElement) { @@ -193,12 +195,12 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { !this._canEditCore} .path=${stateObject.entity_id === "zone.home" && this._canEditCore - ? mdiCog + ? mdiPencil : mdiPencilOff} .label=${stateObject.entity_id === "zone.home" ? hass.localize("ui.panel.config.zone.edit_home") : hass.localize("ui.panel.config.zone.edit_zone")} - @click=${this._openCoreConfig} + @click=${this._editHomeZone} >
${stateObject.entity_id !== "zone.home" ? html` @@ -400,7 +402,7 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { this._openDialog(entry); } - private async _openCoreConfig(ev) { + private async _editHomeZone(ev) { if (ev.currentTarget.noEdit) { showAlertDialog(this, { title: this.hass.localize("ui.panel.config.zone.can_not_edit"), @@ -409,7 +411,9 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { }); return; } - navigate("/config/general"); + showHomeZoneDetailDialog(this, { + updateEntry: (values) => this._updateHomeZoneEntry(values), + }); } private async _createEntry(values: ZoneMutableParams) { @@ -427,6 +431,14 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { this._map?.fitMarker(created.id); } + private async _updateHomeZoneEntry(values: HomeZoneMutableParams) { + await saveCoreConfig(this.hass, { + latitude: values.latitude, + longitude: values.longitude, + }); + this._zoomZone("zone.home"); + } + private async _updateEntry( entry: Zone, values: Partial, diff --git a/src/panels/config/zone/show-dialog-home-zone-detail.ts b/src/panels/config/zone/show-dialog-home-zone-detail.ts new file mode 100644 index 000000000000..a4dc6c12c647 --- /dev/null +++ b/src/panels/config/zone/show-dialog-home-zone-detail.ts @@ -0,0 +1,20 @@ +import { fireEvent } from "../../../common/dom/fire_event"; +import { HomeZoneMutableParams } from "../../../data/zone"; + +export interface HomeZoneDetailDialogParams { + updateEntry?: (updates: HomeZoneMutableParams) => Promise; +} + +export const loadHomeZoneDetailDialog = () => + import("./dialog-home-zone-detail"); + +export const showHomeZoneDetailDialog = ( + element: HTMLElement, + params: HomeZoneDetailDialogParams +): void => { + fireEvent(element, "show-dialog", { + dialogTag: "dialog-home-zone-detail", + dialogImport: loadHomeZoneDetailDialog, + dialogParams: params, + }); +}; diff --git a/src/translations/en.json b/src/translations/en.json index 3e5142ff565b..6478c5a339f7 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -377,6 +377,11 @@ "upload_failed": "Upload failed", "unknown_file": "Unknown file" }, + "location": { + "latitude": "[%key:ui::panel::config::zone::detail::latitude%]", + "longitude": "[%key:ui::panel::config::zone::detail::longitude%]", + "radius": "[%key:ui::panel::config::zone::detail::radius%]" + }, "selector": { "options": "Selector Options", "types": { @@ -4122,10 +4127,6 @@ "confirm_delete": "Are you sure you want to delete this zone?", "can_not_edit": "Unable to edit zone", "configured_in_yaml": "Zones configured via configuration.yaml cannot be edited via the UI.", - "edit_home_zone": "The radius of the Home zone can't be edited from the frontend yet. Drag the marker on the map to move the home zone.", - "edit_home_zone_narrow": "The radius of the Home zone can't be edited from the frontend yet. The location can be changed from the general configuration.", - "go_to_core_config": "Go to general configuration?", - "home_zone_core_config": "The location of your home zone is editable from the general configuration page. The radius of the Home zone can't be edited from the frontend yet. Do you want to go to the general configuration?", "detail": { "new_zone": "New zone", "name": "Name", @@ -4140,7 +4141,8 @@ "required_error_msg": "This field is required", "delete": "Delete", "create": "Add", - "update": "Update" + "update": "Update", + "no_edit_home_zone_radius": "The radius of the home zone is not editable in the UI." }, "core_location_dialog": "Home Assistant location" }, From b35c325f434bf5f35c424628c847dd225aa257ce Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Fri, 12 Apr 2024 11:53:04 -0700 Subject: [PATCH 35/98] Rebuild stack card when a child card rebuilds (#19861) --- src/panels/lovelace/cards/hui-stack-card.ts | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts index b7b8e7758ce0..7a9940e635ac 100644 --- a/src/panels/lovelace/cards/hui-stack-card.ts +++ b/src/panels/lovelace/cards/hui-stack-card.ts @@ -7,6 +7,7 @@ import { nothing, } from "lit"; import { property, state } from "lit/decorators"; +import { fireEvent } from "../../../common/dom/fire_event"; import { LovelaceCardConfig } from "../../../data/lovelace/config/card"; import { HomeAssistant } from "../../../types"; import { createCardElement } from "../create-element/create-card-element"; @@ -119,6 +120,7 @@ export abstract class HuiStackCard (ev) => { ev.stopPropagation(); this._rebuildCard(element, cardConfig); + fireEvent(this, "ll-rebuild"); }, { once: true } ); From f9c02ed099347418c11c66145816bb04371f1f73 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 20:38:12 -0400 Subject: [PATCH 36/98] Update dependency date-fns-tz to v3.0.1 (#20509) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index f0327aff1c9f..1306a4ee72e4 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "core-js": "3.36.1", "cropperjs": "1.6.1", "date-fns": "3.6.0", - "date-fns-tz": "3.0.0", + "date-fns-tz": "3.0.1", "deep-clone-simple": "1.1.1", "deep-freeze": "0.0.1", "element-internals-polyfill": "1.3.10", diff --git a/yarn.lock b/yarn.lock index 43d92d0a3d01..55b57e3963c7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7100,14 +7100,14 @@ __metadata: languageName: node linkType: hard -"date-fns-tz@npm:3.0.0": - version: 3.0.0 - resolution: "date-fns-tz@npm:3.0.0" +"date-fns-tz@npm:3.0.1": + version: 3.0.1 + resolution: "date-fns-tz@npm:3.0.1" dependencies: lodash.clonedeep: "npm:^4.5.0" peerDependencies: date-fns: ^3.0.0 - checksum: 10/0a20196abd2519eb56bed0ba8fa838d60374db7bffa37d0d9284b29b6eed1b84369560d59688236479ed0bda923057fec2faef71caf09bc246d5f567c23308a8 + checksum: 10/d34eaf95510473cd6f22728a24a6d5ee191a6faa9d059d8ee659708936f1f4ae56dfe82b9d40ee983ca20e5d1a6950119e046d717f0a9f22e589f01975a1dea1 languageName: node linkType: hard @@ -9668,7 +9668,7 @@ __metadata: core-js: "npm:3.36.1" cropperjs: "npm:1.6.1" date-fns: "npm:3.6.0" - date-fns-tz: "npm:3.0.0" + date-fns-tz: "npm:3.0.1" deep-clone-simple: "npm:1.1.1" deep-freeze: "npm:0.0.1" del: "npm:7.1.0" From 919befa961104603fc50d8f57113a727aedb4e26 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 13 Apr 2024 20:43:27 -0400 Subject: [PATCH 37/98] Update dependency typescript to v5.4.5 (#20510) --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 1306a4ee72e4..3c8e648dcb4a 100644 --- a/package.json +++ b/package.json @@ -238,7 +238,7 @@ "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.0.4", "ts-lit-plugin": "2.0.2", - "typescript": "5.4.4", + "typescript": "5.4.5", "webpack": "5.91.0", "webpack-cli": "5.1.4", "webpack-dev-server": "5.0.4", diff --git a/yarn.lock b/yarn.lock index 55b57e3963c7..39ee714d68f8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9744,7 +9744,7 @@ __metadata: ts-lit-plugin: "npm:2.0.2" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" - typescript: "npm:5.4.4" + typescript: "npm:5.4.5" ua-parser-js: "npm:1.0.37" unfetch: "npm:5.0.0" vis-data: "npm:7.1.9" @@ -15625,13 +15625,13 @@ __metadata: languageName: node linkType: hard -"typescript@npm:5.4.4": - version: 5.4.4 - resolution: "typescript@npm:5.4.4" +"typescript@npm:5.4.5": + version: 5.4.5 + resolution: "typescript@npm:5.4.5" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/bade322d88fd93c8179e262aca9ba7f7b4417c09117879819c87946578c782ab123e3acb4733046a6e38714c47ef927360045a1f9292a1bff3a05a6577d27ca2 + checksum: 10/d04a9e27e6d83861f2126665aa8d84847e8ebabcea9125b9ebc30370b98cb38b5dff2508d74e2326a744938191a83a69aa9fddab41f193ffa43eabfdf3f190a5 languageName: node linkType: hard @@ -15645,13 +15645,13 @@ __metadata: languageName: node linkType: hard -"typescript@patch:typescript@npm%3A5.4.4#optional!builtin": - version: 5.4.4 - resolution: "typescript@patch:typescript@npm%3A5.4.4#optional!builtin::version=5.4.4&hash=5adc0c" +"typescript@patch:typescript@npm%3A5.4.5#optional!builtin": + version: 5.4.5 + resolution: "typescript@patch:typescript@npm%3A5.4.5#optional!builtin::version=5.4.5&hash=5adc0c" bin: tsc: bin/tsc tsserver: bin/tsserver - checksum: 10/88aff3244c31d4c6ede05b4fd28732fc8935a7fc638f2a3dcbbb767d1ac98e4b077f21ec74bc97f43c9307bc3f27e2359def1d793f9918c3429a744408fd75b4 + checksum: 10/760f7d92fb383dbf7dee2443bf902f4365db2117f96f875cf809167f6103d55064de973db9f78fe8f31ec08fff52b2c969aee0d310939c0a3798ec75d0bca2e1 languageName: node linkType: hard From 27c53b324140dc0121c851c6b0ba0e3b11b2fbc0 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:46:38 +0200 Subject: [PATCH 38/98] Replace paper-listbox in zone area (#19955) * ha-config-zone * Fixes * add selected event back * Fixes * remove leftover paper-item css rule * Fixup merge conflict --- src/panels/config/zone/ha-config-zone.ts | 122 +++++++++++------------ 1 file changed, 57 insertions(+), 65 deletions(-) diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index 46c9ea5c719c..11af8b847447 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -1,7 +1,5 @@ +import "@material/mwc-list/mwc-list"; import { mdiPencil, mdiPencilOff, mdiPlus } from "@mdi/js"; -import "@polymer/paper-item/paper-icon-item"; -import "@polymer/paper-item/paper-item-body"; -import "@polymer/paper-listbox/paper-listbox"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; import { @@ -48,6 +46,8 @@ import type { HomeAssistant, Route } from "../../../types"; import "../ha-config-section"; import { configSections } from "../ha-panel-config"; import { showZoneDetailDialog } from "./show-dialog-zone-detail"; +import "../../../components/ha-list-item"; +import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { showHomeZoneDetailDialog } from "./show-dialog-home-zone-detail"; @customElement("ha-config-zone") @@ -145,50 +145,54 @@ export class HaConfigZone extends SubscribeMixin(LitElement) {
` : html` - + ${this._storageItems.map( (entry) => html` - - - ${entry.name} + + ${entry.name} ${!this.narrow ? html` - +
+ +
` : ""} -
+ ` )} ${this._stateItems.map( (stateObject) => html` - - - ${stateObject.attributes.friendly_name || - stateObject.entity_id} - -
+ + ${stateObject.attributes.friendly_name || + stateObject.entity_id} +
- + ` )} - + `; return html` @@ -377,20 +381,28 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { this._openDialog(); } - private _itemClicked(ev: Event) { + private _itemClicked(ev: CustomEvent) { + if (!shouldHandleRequestSelectedEvent(ev)) { + return; + } + if (this.narrow) { this._openEditEntry(ev); return; } - const entry: Zone = (ev.currentTarget! as any).entry; - this._zoomZone(entry.id); + const entryId: string = (ev.currentTarget! as any).value; + this._zoomZone(entryId); + this._activeEntry = entryId; } - private _stateItemClicked(ev: Event) { - const entityId = (ev.currentTarget! as HTMLElement).getAttribute( - "data-id" - )!; - this._zoomZone(entityId); + private _stateItemClicked(ev: CustomEvent) { + if (!shouldHandleRequestSelectedEvent(ev)) { + return; + } + + const entryId: string = (ev.currentTarget! as any).value; + this._zoomZone(entryId); + this._activeEntry = entryId; } private async _zoomZone(id: string) { @@ -400,6 +412,7 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { private _openEditEntry(ev: Event) { const entry: Zone = (ev.currentTarget! as any).entry; this._openDialog(entry); + ev.stopPropagation(); } private async _editHomeZone(ev) { @@ -497,6 +510,9 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { --app-header-background-color: var(--sidebar-background-color); --app-header-text-color: var(--sidebar-text-color); } + ha-list-item { + --mdc-list-item-meta-size: 48px; + } a { color: var(--primary-color); } @@ -527,40 +543,16 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { flex-grow: 1; height: 100%; } - .flex paper-listbox, + .flex mwc-list, .flex .empty { border-left: 1px solid var(--divider-color); width: 250px; min-height: 100%; box-sizing: border-box; } - paper-icon-item { - padding-top: 4px; - padding-bottom: 4px; - cursor: pointer; - } - .overflow paper-icon-item:last-child { - margin-bottom: 80px; - } - paper-icon-item.iron-selected:before { - position: absolute; - top: 0; - right: 0; - bottom: 0; - left: 0; - pointer-events: none; - content: ""; - background-color: var(--sidebar-selected-icon-color); - opacity: 0.12; - transition: opacity 15ms linear; - will-change: opacity; - } ha-card { margin-bottom: 100px; } - ha-card paper-item { - cursor: pointer; - } `; } } From 5317a11c396b9727c1e46aafe5598296b95205f9 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sun, 14 Apr 2024 13:32:35 -0700 Subject: [PATCH 39/98] Sort custom cards in card picker (#20517) --- .../editor/card-editor/hui-card-picker.ts | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts index 2577822756e9..e92aba044dbe 100644 --- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts +++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts @@ -278,13 +278,21 @@ export class HuiCardPicker extends LitElement { if (customCards.length > 0) { cards = cards.concat( - customCards.map((ccard: CustomCardEntry) => ({ - type: ccard.type, - name: ccard.name, - description: ccard.description, - showElement: ccard.preview, - isCustom: true, - })) + customCards + .map((ccard: CustomCardEntry) => ({ + type: ccard.type, + name: ccard.name, + description: ccard.description, + showElement: ccard.preview, + isCustom: true, + })) + .sort((a, b) => + stringCompare( + a.name || a.type, + b.name || b.type, + this.hass?.language + ) + ) ); } this._cards = cards.map((card: Card) => ({ From 29816e6c5ec3a9d55125abae1c4a988ad5c2cf17 Mon Sep 17 00:00:00 2001 From: Adam Kapos Date: Mon, 15 Apr 2024 12:06:07 +0300 Subject: [PATCH 40/98] Fix malformed CSS in dialog surface (#20519) --- src/components/ha-dialog.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/components/ha-dialog.ts b/src/components/ha-dialog.ts index 6930afb2bfd5..4d8980a0378e 100644 --- a/src/components/ha-dialog.ts +++ b/src/components/ha-dialog.ts @@ -125,8 +125,8 @@ export class HaDialog extends DialogBase { margin-top: var(--dialog-surface-margin-top); min-height: var(--mdc-dialog-min-height, auto); border-radius: var(--ha-dialog-border-radius, 28px); - -webkit--filter: var(--ha-dialog-surface--filter, none); - -filter: var(--ha-dialog-surface--filter, none); + -webkit-backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none); + backdrop-filter: var(--ha-dialog-surface-backdrop-filter, none); } :host([flexContent]) .mdc-dialog .mdc-dialog__content { display: flex; From 4faba159c090911f8e3f97dd8c305532adc6c3e9 Mon Sep 17 00:00:00 2001 From: Cougar Date: Mon, 15 Apr 2024 12:09:16 +0300 Subject: [PATCH 41/98] ZHA (Zigbee) visualization enhancement (#20511) --- .../zha/zha-network-visualization-page.ts | 42 ++++++++++++++----- 1 file changed, 32 insertions(+), 10 deletions(-) diff --git a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts index 575587aeaa25..7520d9550228 100644 --- a/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts +++ b/src/panels/config/integrations/integration-panels/zha/zha-network-visualization-page.ts @@ -238,6 +238,9 @@ export class ZHANetworkVisualizationPage extends LitElement { label: this._buildLabel(device), shape: this._getShape(device), mass: this._getMass(device), + color: { + background: device.available ? "#66FF99" : "#FF9999", + }, }); if (device.neighbors && device.neighbors.length > 0) { device.neighbors.forEach((neighbor) => { @@ -249,13 +252,29 @@ export class ZHANetworkVisualizationPage extends LitElement { from: device.ieee, to: neighbor.ieee, label: neighbor.lqi + "", - color: this._getLQI(parseInt(neighbor.lqi)), + color: this._getLQI(parseInt(neighbor.lqi)).color, + width: this._getLQI(parseInt(neighbor.lqi)).width, + length: 2000 - 4 * parseInt(neighbor.lqi), + arrows: { + from: { + enabled: neighbor.relationship !== "Child", + }, + }, + dashes: neighbor.relationship !== "Child", }); } else { edges[idx].color = this._getLQI( (parseInt(edges[idx].label!) + parseInt(neighbor.lqi)) / 2 - ); + ).color; + edges[idx].width = this._getLQI( + (parseInt(edges[idx].label!) + parseInt(neighbor.lqi)) / 2 + ).width; + edges[idx].length = + 2000 - + 6 * ((parseInt(edges[idx].label!) + parseInt(neighbor.lqi)) / 2); edges[idx].label += "/" + neighbor.lqi; + delete edges[idx].arrows; + delete edges[idx].dashes; } }); } @@ -264,20 +283,23 @@ export class ZHANetworkVisualizationPage extends LitElement { this._network?.setData({ nodes: this._nodes, edges: edges }); } - private _getLQI(lqi: number): EdgeOptions["color"] { + private _getLQI(lqi: number): EdgeOptions { if (lqi > 192) { - return { color: "#17ab00", highlight: "#17ab00" }; + return { color: { color: "#17ab00", highlight: "#17ab00" }, width: 4 }; } if (lqi > 128) { - return { color: "#e6b402", highlight: "#e6b402" }; + return { color: { color: "#e6b402", highlight: "#e6b402" }, width: 3 }; } if (lqi > 80) { - return { color: "#fc4c4c", highlight: "#fc4c4c" }; + return { color: { color: "#fc4c4c", highlight: "#fc4c4c" }, width: 2 }; } - return { color: "#bfbfbf", highlight: "#bfbfbf" }; + return { color: { color: "#bfbfbf", highlight: "#bfbfbf" }, width: 1 }; } private _getMass(device: ZHADevice): number { + if (!device.available) { + return 6; + } if (device.device_type === "Coordinator") { return 2; } @@ -312,8 +334,8 @@ export class ZHANetworkVisualizationPage extends LitElement { } else { label += "\nDevice is not in 'zigbee.db'"; } - if (!device.available) { - label += "\nDevice is Offline"; + if (device.area_id) { + label += `\nArea ID: ${device.area_id}`; } return label; } @@ -402,7 +424,7 @@ export class ZHANetworkVisualizationPage extends LitElement { ? { physics: { barnesHut: { - springConstant: 0, + springConstant: 0.05, avoidOverlap: 10, damping: 0.09, }, From 02cc4189693d254a1b1e076d9dd3de2b564b1288 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 09:21:07 +0000 Subject: [PATCH 42/98] Update CodeMirror (#20520) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 ++-- yarn.lock | 20 ++++++++++---------- 2 files changed, 12 insertions(+), 12 deletions(-) diff --git a/package.json b/package.json index 3c8e648dcb4a..381eb5445d6f 100644 --- a/package.json +++ b/package.json @@ -27,13 +27,13 @@ "dependencies": { "@babel/runtime": "7.24.4", "@braintree/sanitize-url": "7.0.1", - "@codemirror/autocomplete": "6.15.0", + "@codemirror/autocomplete": "6.16.0", "@codemirror/commands": "6.3.3", "@codemirror/language": "6.10.1", "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", "@codemirror/state": "6.4.1", - "@codemirror/view": "6.26.2", + "@codemirror/view": "6.26.3", "@egjs/hammerjs": "2.0.17", "@formatjs/intl-datetimeformat": "6.12.3", "@formatjs/intl-displaynames": "6.6.6", diff --git a/yarn.lock b/yarn.lock index 39ee714d68f8..268b9dc7946d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1469,9 +1469,9 @@ __metadata: languageName: node linkType: hard -"@codemirror/autocomplete@npm:6.15.0": - version: 6.15.0 - resolution: "@codemirror/autocomplete@npm:6.15.0" +"@codemirror/autocomplete@npm:6.16.0": + version: 6.16.0 + resolution: "@codemirror/autocomplete@npm:6.16.0" dependencies: "@codemirror/language": "npm:^6.0.0" "@codemirror/state": "npm:^6.0.0" @@ -1482,7 +1482,7 @@ __metadata: "@codemirror/state": ^6.0.0 "@codemirror/view": ^6.0.0 "@lezer/common": ^1.0.0 - checksum: 10/5ef009826113459532b836347afd73759588edb1cbe507834b2b06de665c8b36fdf6de0685bcae4b1204fbb0ba4294af732da57a44b57b350339228164ba49e1 + checksum: 10/a29e27f69d17bce014d1d34ab4cd7c607b139cb3cd529aad554f2b0badb9d2924412b0ab3f4eb44901ea4250cdb033e0c6b81134ee8991bdbcd128ecb3b94d75 languageName: node linkType: hard @@ -1539,14 +1539,14 @@ __metadata: languageName: node linkType: hard -"@codemirror/view@npm:6.26.2, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": - version: 6.26.2 - resolution: "@codemirror/view@npm:6.26.2" +"@codemirror/view@npm:6.26.3, @codemirror/view@npm:^6.0.0, @codemirror/view@npm:^6.17.0, @codemirror/view@npm:^6.23.0": + version: 6.26.3 + resolution: "@codemirror/view@npm:6.26.3" dependencies: "@codemirror/state": "npm:^6.4.0" style-mod: "npm:^4.1.0" w3c-keyname: "npm:^2.2.4" - checksum: 10/1507730d1aa3a886ae6798fdc002ea435af39827d5312f4784bb75684aa3780185277724341209ffba876be8eeb89ce7eb2d198a979f0ffc7bcee96948050af7 + checksum: 10/fa7cb5aa37db2d252ffd7cdbfb858b23a525ce9835648070b3c99eaaa361f686fa1997576bb258b7c34b6d6bd7a251a2294158e952239616102f783da1025fe4 languageName: node linkType: hard @@ -9556,13 +9556,13 @@ __metadata: "@babel/runtime": "npm:7.24.4" "@braintree/sanitize-url": "npm:7.0.1" "@bundle-stats/plugin-webpack-filter": "npm:4.12.2" - "@codemirror/autocomplete": "npm:6.15.0" + "@codemirror/autocomplete": "npm:6.16.0" "@codemirror/commands": "npm:6.3.3" "@codemirror/language": "npm:6.10.1" "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" "@codemirror/state": "npm:6.4.1" - "@codemirror/view": "npm:6.26.2" + "@codemirror/view": "npm:6.26.3" "@egjs/hammerjs": "npm:2.0.17" "@formatjs/intl-datetimeformat": "npm:6.12.3" "@formatjs/intl-displaynames": "npm:6.6.6" From f21c89cf1a639942c567fb83965bf08e2fea2a8b Mon Sep 17 00:00:00 2001 From: Thomas Steiner Date: Mon, 15 Apr 2024 14:48:57 +0200 Subject: [PATCH 43/98] Make `allow` attribute configurable in iframe panel (#19087) * Make allow attribute configurable in iframe panel * Delete .vscode/settings.json * Update ha-panel-iframe.ts * Don't quote * Update src/panels/iframe/ha-panel-iframe.ts Co-authored-by: Quentame * Make `allow` configurable for `hui-iframe-card` * Update src/panels/iframe/ha-panel-iframe.ts Co-authored-by: Quentame * Update src/panels/lovelace/cards/hui-iframe-card.ts Co-authored-by: Quentame * Update src/panels/iframe/ha-panel-iframe.ts Co-authored-by: Quentame * Update src/panels/lovelace/cards/hui-iframe-card.ts Co-authored-by: Bram Kragten * Delete src/panels/iframe/ha-panel-iframe.ts * Restore dev * Update ha-panel-iframe.ts * Prettier --------- Co-authored-by: Quentame Co-authored-by: Bram Kragten --- src/panels/lovelace/cards/hui-iframe-card.ts | 2 +- src/panels/lovelace/cards/types.ts | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts index c64cb2bf243e..7b4888819100 100644 --- a/src/panels/lovelace/cards/hui-iframe-card.ts +++ b/src/panels/lovelace/cards/hui-iframe-card.ts @@ -98,7 +98,7 @@ export class HuiIframeCard extends LitElement implements LovelaceCard { title=${ifDefined(this._config.title)} src=${this._config.url} .sandbox=${`${sandbox_user_params} ${IFRAME_SANDBOX}`} - allow="fullscreen" + allow=${this._config.allow ?? "fullscreen"} >
diff --git a/src/panels/lovelace/cards/types.ts b/src/panels/lovelace/cards/types.ts index 374aea09ae19..0ae62e6aea78 100644 --- a/src/panels/lovelace/cards/types.ts +++ b/src/panels/lovelace/cards/types.ts @@ -281,6 +281,7 @@ export interface IframeCardConfig extends LovelaceCardConfig { allow_open_top_navigation?: boolean; aspect_ratio?: string; title?: string; + allow?: string; url: string; } From 569fef38a4155ee3955b1caf96451c64e6fea0aa Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:03:46 +0200 Subject: [PATCH 44/98] Update vaadinWebComponents monorepo to v24.3.11 (#20523) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 4 +- yarn.lock | 170 +++++++++++++++++++++++++-------------------------- 2 files changed, 87 insertions(+), 87 deletions(-) diff --git a/package.json b/package.json index 381eb5445d6f..47d94676169e 100644 --- a/package.json +++ b/package.json @@ -89,8 +89,8 @@ "@polymer/paper-tabs": "3.1.0", "@polymer/polymer": "3.5.1", "@thomasloven/round-slider": "0.6.0", - "@vaadin/combo-box": "24.3.10", - "@vaadin/vaadin-themable-mixin": "24.3.10", + "@vaadin/combo-box": "24.3.11", + "@vaadin/vaadin-themable-mixin": "24.3.11", "@vibrant/color": "3.2.1-alpha.1", "@vibrant/core": "3.2.1-alpha.1", "@vibrant/quantizer-mmcq": "3.2.1-alpha.1", diff --git a/yarn.lock b/yarn.lock index 268b9dc7946d..076b83353009 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4702,128 +4702,128 @@ __metadata: languageName: node linkType: hard -"@vaadin/a11y-base@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/a11y-base@npm:24.3.10" +"@vaadin/a11y-base@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/a11y-base@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.10" + "@vaadin/component-base": "npm:~24.3.11" lit: "npm:^3.0.0" - checksum: 10/8c1bb67fea2b6896ea9ec8e54e89432b3a2ced34dc05cd1d106beba80e584bdc4dd9669e013ee44162711c42aa98291378f1308ec4bc1bc9940e185a52149472 + checksum: 10/751dbf6469303a507d81af58725e6eaa858c1924fc5383b26aefadb92b872f2a877588362c5844773be6758cdb436036f1dab259c4dfa78d3d874cce704787c3 languageName: node linkType: hard -"@vaadin/combo-box@npm:24.3.10": - version: 24.3.10 - resolution: "@vaadin/combo-box@npm:24.3.10" +"@vaadin/combo-box@npm:24.3.11": + version: 24.3.11 + resolution: "@vaadin/combo-box@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.10" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/field-base": "npm:~24.3.10" - "@vaadin/input-container": "npm:~24.3.10" - "@vaadin/item": "npm:~24.3.10" - "@vaadin/lit-renderer": "npm:~24.3.10" - "@vaadin/overlay": "npm:~24.3.10" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.10" - "@vaadin/vaadin-material-styles": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" - checksum: 10/66b276a2a21e8a96080a73bb891b81026e6e0e28939b71543952d45d41f2eafc62b6f7240b48d1b46aaeffe96a1e8542ff04bde2fe0d70a231a88b485d12e8ac + "@vaadin/a11y-base": "npm:~24.3.11" + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/field-base": "npm:~24.3.11" + "@vaadin/input-container": "npm:~24.3.11" + "@vaadin/item": "npm:~24.3.11" + "@vaadin/lit-renderer": "npm:~24.3.11" + "@vaadin/overlay": "npm:~24.3.11" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.11" + "@vaadin/vaadin-material-styles": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" + checksum: 10/0ea4ccef7ac038eea876a110839e98b6eb58401c4b7783b03c3d6e844828c0bad71529f67905b8bc153058a6d7bd93895333e1642b37aa7765e019d498ea4925 languageName: node linkType: hard -"@vaadin/component-base@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/component-base@npm:24.3.10" +"@vaadin/component-base@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/component-base@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" "@vaadin/vaadin-development-mode-detector": "npm:^2.0.0" "@vaadin/vaadin-usage-statistics": "npm:^2.1.0" lit: "npm:^3.0.0" - checksum: 10/20fae1c91f4c7ea2736840b5a241a955ec7c78e41f4219d41b90fc577e53a6cd8034183be63de3fef0a87fb4f2370075d0e20fc6ff13611231ae858f31f81581 + checksum: 10/b6ca4a2ce1ded0f81cab7f2ff18e456bed8c0e2927ca31adceedbb3dac9a9378b221a240ccc745a2c33f4f785a49d4916524e1bed36091059a77dd8f4798022f languageName: node linkType: hard -"@vaadin/field-base@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/field-base@npm:24.3.10" +"@vaadin/field-base@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/field-base@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.10" - "@vaadin/component-base": "npm:~24.3.10" + "@vaadin/a11y-base": "npm:~24.3.11" + "@vaadin/component-base": "npm:~24.3.11" lit: "npm:^3.0.0" - checksum: 10/a98c228201574cbb7d962e9c9b980c27d2c865474617913da71f628354df751e04c7a33c1c6ba0ea44c0082ff52aff682fd4187c3efa32f4c6a6762014cab7dd + checksum: 10/3ef6ad677eb2c0a473577eb5a08b620fa1bf961cdb0b3b61adb5f23be839d6fe4ef498b57ff5976b19b2b556c9f39d5ea479141eac0adaeb81e935132cd50481 languageName: node linkType: hard -"@vaadin/icon@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/icon@npm:24.3.10" +"@vaadin/icon@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/icon@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" lit: "npm:^3.0.0" - checksum: 10/acc722b27adb123e5456340e1ac70b3ac6976e5a56a814c483261216aa7ea700e3ba6609dc5a1013e49a5030bca83088832979e254de1b1682fb73731074091b + checksum: 10/73b7b4c2c400d430aad1d670b3d5b0f6ebabbd0115f318789cac38929d419f0e007b73c2f358aa72226153a865b7de410da0ddc22e93732ee17bb3b79810a64b languageName: node linkType: hard -"@vaadin/input-container@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/input-container@npm:24.3.10" +"@vaadin/input-container@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/input-container@npm:24.3.11" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.10" - "@vaadin/vaadin-material-styles": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.11" + "@vaadin/vaadin-material-styles": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" lit: "npm:^3.0.0" - checksum: 10/0b62888095c36bb2201b7b91903d02a003ba13db3894ae32c78b863eda883bd799e34084600888b1e7091af2566f2d20c3c7908f1665e411da256a751174c0ef + checksum: 10/e2382dacd1221f8b0ee0996f3fe836370a2a99127514fd155fc671beb4f3f7240d1ce5f20394b6e450a7e73513bf4040b66f474e4caa7df30ed87beda6d39fa0 languageName: node linkType: hard -"@vaadin/item@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/item@npm:24.3.10" +"@vaadin/item@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/item@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.10" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.10" - "@vaadin/vaadin-material-styles": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" - checksum: 10/e2ec3916f20f6dcdc6d359b0a8affe937845e09f9ef3decb15f00a88bb372d485e376434d284fee739f7c8c7dbb6983c02a2ef406398cbc62088da060fe8663e + "@vaadin/a11y-base": "npm:~24.3.11" + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.11" + "@vaadin/vaadin-material-styles": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" + checksum: 10/dc05b64399f9d943f90d9e6ad1feaf3783618d933a85f33ab7075431b8a8d12673f98f797856300887cf09cefdeebde8225f6a7509708da801be40f91f124c0f languageName: node linkType: hard -"@vaadin/lit-renderer@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/lit-renderer@npm:24.3.10" +"@vaadin/lit-renderer@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/lit-renderer@npm:24.3.11" dependencies: lit: "npm:^3.0.0" - checksum: 10/a1449affcb6df2ead9443e1be0f07a935388986496c7d6f2401ea72d4ecb6c6bcb7333e90a6699fb3b9b7e3a4736e29ab2a278da0681446d84ece36024a0964c + checksum: 10/14b3049c5a25a2540b68c7d4f6b2be0e3e397e460f246250bf5d0483c73ac4a375add01d1b8f987805ef89e0bfe6c658f4e8dcefd6951cb495be906044afa4d7 languageName: node linkType: hard -"@vaadin/overlay@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/overlay@npm:24.3.10" +"@vaadin/overlay@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/overlay@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" "@polymer/polymer": "npm:^3.0.0" - "@vaadin/a11y-base": "npm:~24.3.10" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/vaadin-lumo-styles": "npm:~24.3.10" - "@vaadin/vaadin-material-styles": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" - checksum: 10/fd55a60a81f34ff3d088360bf9014f99a804c14dfaea8436f1adf92bcc4a0080dd7e164775eb02c79dd2e109dd94b544de8af12e1696150b4d73df8826dfd7f1 + "@vaadin/a11y-base": "npm:~24.3.11" + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/vaadin-lumo-styles": "npm:~24.3.11" + "@vaadin/vaadin-material-styles": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" + checksum: 10/2b79099e87e5cfa1500dbe4c48a8b30759dbe69bba28cc8e6991f121f93f8a959b3f62952f14ed14b9cedcc0a6fa7cddab19a5bfb51556c221483629574519ff languageName: node linkType: hard @@ -4834,36 +4834,36 @@ __metadata: languageName: node linkType: hard -"@vaadin/vaadin-lumo-styles@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.10" +"@vaadin/vaadin-lumo-styles@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/vaadin-lumo-styles@npm:24.3.11" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/icon": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" - checksum: 10/962dbb77139931774d9cc190fc29a44294f72db0b6abc08bcbc37742f6d2e53b5cec4cf69653b58bc1e1cff657aaefa7fd3a63191c68101e9f59b29b02d7033a + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/icon": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" + checksum: 10/b493736672291de9a7357faf99413191c905b8aa3efcb6fddbc3f7c83102fc1ef4ffaa6ebf1883effd2c41cf3ceba9ad51e54558bea42fb0c2e35aa154cd128b languageName: node linkType: hard -"@vaadin/vaadin-material-styles@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/vaadin-material-styles@npm:24.3.10" +"@vaadin/vaadin-material-styles@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/vaadin-material-styles@npm:24.3.11" dependencies: "@polymer/polymer": "npm:^3.0.0" - "@vaadin/component-base": "npm:~24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:~24.3.10" - checksum: 10/f944723a5b569786febc496f47224fe06ce6b49b78a973a7e462ef64023a9f8870735c1e186e32299a589c2f9159335cbd636b9acbaad9ef1ce0580ded9f627d + "@vaadin/component-base": "npm:~24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:~24.3.11" + checksum: 10/f3c718894e56f3705a05d978bde86bbe9ff6f70f317d96f94fb5d495a801ca23065fadf517569fad082d5e024570157c8c265497e3ef21e2d05ab752dedf1115 languageName: node linkType: hard -"@vaadin/vaadin-themable-mixin@npm:24.3.10, @vaadin/vaadin-themable-mixin@npm:~24.3.10": - version: 24.3.10 - resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.10" +"@vaadin/vaadin-themable-mixin@npm:24.3.11, @vaadin/vaadin-themable-mixin@npm:~24.3.11": + version: 24.3.11 + resolution: "@vaadin/vaadin-themable-mixin@npm:24.3.11" dependencies: "@open-wc/dedupe-mixin": "npm:^1.3.0" lit: "npm:^3.0.0" - checksum: 10/28eaf3e9126180b188a7fc29d9c4f17474572fbdb5ff58ae653325e752bfc20f1304073ec1a5a9586f090bcf3b535ab5e5c003db9ef57548ced9e12799aa67e3 + checksum: 10/d18adde6a9c4fa5adf31a9366dc9d55170835b332150741d4e62eca71f0a6d16b7554a07ca788268508b654cf003567e0ff6f1a926b7c26bfba91f578fcd83fa languageName: node linkType: hard @@ -9648,8 +9648,8 @@ __metadata: "@types/webspeechapi": "npm:0.0.29" "@typescript-eslint/eslint-plugin": "npm:7.6.0" "@typescript-eslint/parser": "npm:7.6.0" - "@vaadin/combo-box": "npm:24.3.10" - "@vaadin/vaadin-themable-mixin": "npm:24.3.10" + "@vaadin/combo-box": "npm:24.3.11" + "@vaadin/vaadin-themable-mixin": "npm:24.3.11" "@vibrant/color": "npm:3.2.1-alpha.1" "@vibrant/core": "npm:3.2.1-alpha.1" "@vibrant/quantizer-mmcq": "npm:3.2.1-alpha.1" From bd7217145ade967c8ce39a4ce4e38a6a62028bb3 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 15:07:09 +0200 Subject: [PATCH 45/98] Update dependency element-internals-polyfill to v1.3.11 (#20512) Co-authored-by: renovate[bot] <29139614+renovate[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 47d94676169e..6ed2bf72fb64 100644 --- a/package.json +++ b/package.json @@ -107,7 +107,7 @@ "date-fns-tz": "3.0.1", "deep-clone-simple": "1.1.1", "deep-freeze": "0.0.1", - "element-internals-polyfill": "1.3.10", + "element-internals-polyfill": "1.3.11", "fuse.js": "7.0.0", "google-timezones-json": "1.2.0", "hls.js": "patch:hls.js@npm%3A1.5.7#~/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch", diff --git a/yarn.lock b/yarn.lock index 076b83353009..624fbc725e1a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -7555,10 +7555,10 @@ __metadata: languageName: node linkType: hard -"element-internals-polyfill@npm:1.3.10": - version: 1.3.10 - resolution: "element-internals-polyfill@npm:1.3.10" - checksum: 10/156fed2c83b309714d7241d73d741798bfd4177e73cef0f105735b87a5fd0791d8e09d44eddfda5bc4b6ba411777d43994894e2f2ec352d4b144454cb7c2e07f +"element-internals-polyfill@npm:1.3.11": + version: 1.3.11 + resolution: "element-internals-polyfill@npm:1.3.11" + checksum: 10/8e86562c84cac451801c8d1593e8d8d7224a91e85037f0b651072a628f7e3b23155c3d520d369be9a733e9675f7fc0763a6ca61f54f5485f6840eb5709bf269e languageName: node linkType: hard @@ -9672,7 +9672,7 @@ __metadata: deep-clone-simple: "npm:1.1.1" deep-freeze: "npm:0.0.1" del: "npm:7.1.0" - element-internals-polyfill: "npm:1.3.10" + element-internals-polyfill: "npm:1.3.11" eslint: "npm:8.57.0" eslint-config-airbnb-base: "npm:15.0.0" eslint-config-airbnb-typescript: "npm:18.0.0" From 1df9c38a8c2c9d0c278c66bbc4471fca51eb9a74 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Apr 2024 13:40:38 +0000 Subject: [PATCH 46/98] Update dependency tar to v7 (#20513) * Update dependency tar to v7 * Update fetch-nightly-translations.js --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Bram Kragten --- .../gulp/fetch-nightly-translations.js | 4 +- package.json | 2 +- yarn.lock | 60 ++++++++++++++++++- 3 files changed, 61 insertions(+), 5 deletions(-) diff --git a/build-scripts/gulp/fetch-nightly-translations.js b/build-scripts/gulp/fetch-nightly-translations.js index 52da690152f7..a19409b07626 100644 --- a/build-scripts/gulp/fetch-nightly-translations.js +++ b/build-scripts/gulp/fetch-nightly-translations.js @@ -9,7 +9,7 @@ import gulp from "gulp"; import jszip from "jszip"; import path from "path"; import process from "process"; -import tar from "tar"; +import { extract } from "tar"; const MAX_AGE = 24; // hours const OWNER = "home-assistant"; @@ -156,7 +156,7 @@ gulp.task("fetch-nightly-translations", async function () { console.log("Unpacking downloaded translations..."); const zip = await jszip.loadAsync(downloadResponse.data); await deleteCurrent; - const extractStream = zip.file(/.*/)[0].nodeStream().pipe(tar.extract()); + const extractStream = zip.file(/.*/)[0].nodeStream().pipe(extract()); await new Promise((resolve, reject) => { extractStream.on("close", resolve).on("error", reject); }); diff --git a/package.json b/package.json index 6ed2bf72fb64..b9b4a8ff6176 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,7 @@ "sinon": "17.0.1", "source-map-url": "0.4.1", "systemjs": "6.14.3", - "tar": "6.2.1", + "tar": "7.0.0", "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.0.4", "ts-lit-plugin": "2.0.2", diff --git a/yarn.lock b/yarn.lock index 624fbc725e1a..29a7368658ea 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1867,6 +1867,15 @@ __metadata: languageName: node linkType: hard +"@isaacs/fs-minipass@npm:^4.0.0": + version: 4.0.0 + resolution: "@isaacs/fs-minipass@npm:4.0.0" + dependencies: + minipass: "npm:^7.0.4" + checksum: 10/7444d7a3c9211c27494630e2bff8545e3494a1598624a4871ee7ef3a9e592a61fed3abd85d118f966673bd0b4401c266d45441f89c00c420e9d0cfbf1042dbd5 + languageName: node + linkType: hard + "@jimp/bmp@npm:^0.16.13": version: 0.16.13 resolution: "@jimp/bmp@npm:0.16.13" @@ -6512,6 +6521,13 @@ __metadata: languageName: node linkType: hard +"chownr@npm:^3.0.0": + version: 3.0.0 + resolution: "chownr@npm:3.0.0" + checksum: 10/b63cb1f73d171d140a2ed8154ee6566c8ab775d3196b0e03a2a94b5f6a0ce7777ee5685ca56849403c8d17bd457a6540672f9a60696a6137c7a409097495b82c + languageName: node + linkType: hard + "chrome-trace-event@npm:^1.0.2": version: 1.0.3 resolution: "chrome-trace-event@npm:1.0.3" @@ -9737,7 +9753,7 @@ __metadata: stacktrace-js: "npm:2.0.2" superstruct: "npm:1.0.4" systemjs: "npm:6.14.3" - tar: "npm:6.2.1" + tar: "npm:7.0.0" terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" transform-async-modules-webpack-plugin: "npm:1.0.4" @@ -12029,6 +12045,16 @@ __metadata: languageName: node linkType: hard +"minizlib@npm:^3.0.1": + version: 3.0.1 + resolution: "minizlib@npm:3.0.1" + dependencies: + minipass: "npm:^7.0.4" + rimraf: "npm:^5.0.5" + checksum: 10/622cb85f51e5c206a080a62d20db0d7b4066f308cb6ce82a9644da112367c3416ae7062017e631eb7ac8588191cfa4a9a279b8651c399265202b298e98c4acef + languageName: node + linkType: hard + "mixin-deep@npm:^1.2.0": version: 1.3.2 resolution: "mixin-deep@npm:1.3.2" @@ -12059,6 +12085,15 @@ __metadata: languageName: node linkType: hard +"mkdirp@npm:^3.0.1": + version: 3.0.1 + resolution: "mkdirp@npm:3.0.1" + bin: + mkdirp: dist/cjs/src/bin.js + checksum: 10/16fd79c28645759505914561e249b9a1f5fe3362279ad95487a4501e4467abeb714fd35b95307326b8fd03f3c7719065ef11a6f97b7285d7888306d1bd2232ba + languageName: node + linkType: hard + "mocha@npm:10.4.0": version: 10.4.0 resolution: "mocha@npm:10.4.0" @@ -15073,7 +15108,21 @@ __metadata: languageName: node linkType: hard -"tar@npm:6.2.1, tar@npm:^6.1.11, tar@npm:^6.1.2": +"tar@npm:7.0.0": + version: 7.0.0 + resolution: "tar@npm:7.0.0" + dependencies: + "@isaacs/fs-minipass": "npm:^4.0.0" + chownr: "npm:^3.0.0" + minipass: "npm:^5.0.0" + minizlib: "npm:^3.0.1" + mkdirp: "npm:^3.0.1" + yallist: "npm:^5.0.0" + checksum: 10/f4850dc337f5b5ba0ef3121536fbf7ed723bac0f49bc1d38df24f13147ce58aa7209d06da68f52766a43237e68b76c401c5e6780bacc5558a47439d05f91772b + languageName: node + linkType: hard + +"tar@npm:^6.1.11, tar@npm:^6.1.2": version: 6.2.1 resolution: "tar@npm:6.2.1" dependencies: @@ -16916,6 +16965,13 @@ __metadata: languageName: node linkType: hard +"yallist@npm:^5.0.0": + version: 5.0.0 + resolution: "yallist@npm:5.0.0" + checksum: 10/1884d272d485845ad04759a255c71775db0fac56308764b4c77ea56a20d56679fad340213054c8c9c9c26fcfd4c4b2a90df993b7e0aaf3cdb73c618d1d1a802a + languageName: node + linkType: hard + "yaml@npm:2.3.4": version: 2.3.4 resolution: "yaml@npm:2.3.4" From 6516597c933c02a361d567289ae61136cf6bb4d4 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 15 Apr 2024 20:20:14 +0200 Subject: [PATCH 47/98] Fix zones on mobile, align mobile and non mobile view (#20525) * Fix zones on mobile, align mobile and non mobile view * Fix CI --------- Co-authored-by: Simon Lamon <32477463+silamon@users.noreply.github.com> --- .../config/core/ha-config-section-general.ts | 66 +++---------- src/panels/config/zone/ha-config-zone.ts | 98 ++++++++++++------- 2 files changed, 80 insertions(+), 84 deletions(-) diff --git a/src/panels/config/core/ha-config-section-general.ts b/src/panels/config/core/ha-config-section-general.ts index 438ff479b2c0..3ccadf595d8e 100644 --- a/src/panels/config/core/ha-config-section-general.ts +++ b/src/panels/config/core/ha-config-section-general.ts @@ -1,7 +1,6 @@ import "@material/mwc-list/mwc-list-item"; import { css, html, LitElement, TemplateResult } from "lit"; import { customElement, property, state } from "lit/decorators"; -import memoizeOne from "memoize-one"; import { UNIT_C } from "../../../common/const"; import { stopPropagation } from "../../../common/dom/stop_propagation"; import { navigate } from "../../../common/navigate"; @@ -18,8 +17,6 @@ import "../../../components/ha-language-picker"; import "../../../components/ha-radio"; import type { HaRadio } from "../../../components/ha-radio"; import "../../../components/ha-select"; -import "../../../components/ha-selector/ha-selector-location"; -import type { LocationSelectorValue } from "../../../data/selector"; import "../../../components/ha-settings-row"; import "../../../components/ha-textfield"; import type { HaTextField } from "../../../components/ha-textfield"; @@ -30,8 +27,6 @@ import "../../../layouts/hass-subpage"; import { haStyle } from "../../../resources/styles"; import type { HomeAssistant, ValueChangedEvent } from "../../../types"; -const LOCATION_SELECTOR = { location: {} }; - @customElement("ha-config-section-general") class HaConfigSectionGeneral extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -244,36 +239,22 @@ class HaConfigSectionGeneral extends LitElement { >
- ${this.narrow - ? html` - - ` - : html` - -
- ${this.hass.localize( - "ui.panel.config.core.section.core.core_config.edit_location" - )} -
-
- ${this.hass.localize( - "ui.panel.config.core.section.core.core_config.edit_location_description" - )} -
- ${this.hass.localize("ui.common.edit")} -
- `} + + +
+ ${this.hass.localize( + "ui.panel.config.core.section.core.core_config.edit_location" + )} +
+
+ ${this.hass.localize( + "ui.panel.config.core.section.core.core_config.edit_location_description" + )} +
+ ${this.hass.localize("ui.common.edit")} +
${this.hass!.localize("ui.panel.config.zone.detail.update")} @@ -322,10 +303,6 @@ class HaConfigSectionGeneral extends LitElement { this._updateUnits = (ev.target as HaCheckbox).checked; } - private _locationChanged(ev: CustomEvent) { - this._location = [ev.detail.value.latitude, ev.detail.value.longitude]; - } - private async _updateEntry(ev: CustomEvent) { const button = ev.target as HaProgressButton; if (button.progress) { @@ -384,17 +361,6 @@ class HaConfigSectionGeneral extends LitElement { } } - private _selectorLocation = memoizeOne( - ( - latDefault: number, - lngDefault: number, - location?: [number, number] - ): LocationSelectorValue => ({ - latitude: location != null ? location[0] : latDefault, - longitude: location != null ? location[1] : lngDefault, - }) - ); - private _editLocation() { navigate("/config/zone/edit/zone.home"); } diff --git a/src/panels/config/zone/ha-config-zone.ts b/src/panels/config/zone/ha-config-zone.ts index 11af8b847447..8e8b4c24148f 100644 --- a/src/panels/config/zone/ha-config-zone.ts +++ b/src/panels/config/zone/ha-config-zone.ts @@ -1,23 +1,26 @@ +import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import "@material/mwc-list/mwc-list"; import { mdiPencil, mdiPencilOff, mdiPlus } from "@mdi/js"; -import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket"; import { - css, CSSResultGroup, - html, LitElement, PropertyValues, TemplateResult, + css, + html, + nothing, } from "lit"; import { customElement, property, query, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { computeStateDomain } from "../../../common/entity/compute_state_domain"; +import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { navigate } from "../../../common/navigate"; import { stringCompare } from "../../../common/string/compare"; import "../../../components/ha-card"; import "../../../components/ha-fab"; import "../../../components/ha-icon-button"; +import "../../../components/ha-list-item"; import "../../../components/ha-svg-icon"; import "../../../components/map/ha-locations-editor"; import type { @@ -27,13 +30,13 @@ import type { import { saveCoreConfig } from "../../../data/core"; import { subscribeEntityRegistry } from "../../../data/entity_registry"; import { + HomeZoneMutableParams, + Zone, + ZoneMutableParams, createZone, deleteZone, fetchZones, updateZone, - Zone, - ZoneMutableParams, - HomeZoneMutableParams, } from "../../../data/zone"; import { showAlertDialog, @@ -45,10 +48,8 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import type { HomeAssistant, Route } from "../../../types"; import "../ha-config-section"; import { configSections } from "../ha-panel-config"; -import { showZoneDetailDialog } from "./show-dialog-zone-detail"; -import "../../../components/ha-list-item"; -import { shouldHandleRequestSelectedEvent } from "../../../common/mwc/handle-request-selected-event"; import { showHomeZoneDetailDialog } from "./show-dialog-home-zone-detail"; +import { showZoneDetailDialog } from "./show-dialog-zone-detail"; @customElement("ha-config-zone") export class HaConfigZone extends SubscribeMixin(LitElement) { @@ -150,6 +151,7 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { (entry) => html` html` - - ${stateObject.entity_id !== "zone.home" - ? html` - - ${hass.localize( - "ui.panel.config.zone.configured_in_yaml" - )} - - ` - : ""} -
+ ${this.narrow && + stateObject.entity_id === "zone.home" && + !this._canEditCore + ? nothing + : html`
+ + ${stateObject.entity_id !== "zone.home" + ? html` + + ${hass.localize( + "ui.panel.config.zone.configured_in_yaml" + )} + + ` + : ""} +
`} ` )} @@ -292,7 +307,11 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { return; } const id = this.route.path.slice(6); + this._editZone(id); navigate("/config/zone", { replace: true }); + if (this.narrow) { + return; + } this._zoomZone(id); } @@ -401,6 +420,12 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { } const entryId: string = (ev.currentTarget! as any).value; + + if (this.narrow && entryId === "zone.home") { + this._editHomeZone(ev); + return; + } + this._zoomZone(entryId); this._activeEntry = entryId; } @@ -409,6 +434,11 @@ export class HaConfigZone extends SubscribeMixin(LitElement) { this._map?.fitMarker(id); } + private async _editZone(id: string) { + await this.updateComplete; + (this.shadowRoot?.querySelector(`[id="${id}"]`) as HTMLElement)?.click(); + } + private _openEditEntry(ev: Event) { const entry: Zone = (ev.currentTarget! as any).entry; this._openDialog(entry); From 25c702ad2bb1fb7d1f93a2237b2e0035e81d3dc4 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Mon, 15 Apr 2024 20:20:45 +0200 Subject: [PATCH 48/98] Don't display keyboard shortcut hints in quickbar if keyboard shortcuts are disabled (#20527) Fix forgotten hint shortcut tip --- src/panels/lovelace/hui-root.ts | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts index ce1d4d3d43b1..6226897809a3 100644 --- a/src/panels/lovelace/hui-root.ts +++ b/src/panels/lovelace/hui-root.ts @@ -640,7 +640,9 @@ class HUIRoot extends LitElement { private _showQuickBar(): void { showQuickBar(this, { commandMode: false, - hint: this.hass.localize("ui.tips.key_e_hint"), + hint: this.hass.enableShortcuts + ? this.hass.localize("ui.tips.key_e_hint") + : undefined, }); } From 9e67d6add88898e11bdb1b9665fb189e7782195d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:21:59 +0200 Subject: [PATCH 49/98] Update dependency @types/leaflet to v1.9.11 (#20538) Co-authored-by: renovate[bot] <29139614+renovate[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 b9b4a8ff6176..5f335128611d 100644 --- a/package.json +++ b/package.json @@ -175,7 +175,7 @@ "@types/glob": "8.1.0", "@types/html-minifier-terser": "7.0.2", "@types/js-yaml": "4.0.9", - "@types/leaflet": "1.9.9", + "@types/leaflet": "1.9.11", "@types/leaflet-draw": "1.0.11", "@types/luxon": "3.4.2", "@types/mocha": "10.0.6", diff --git a/yarn.lock b/yarn.lock index 29a7368658ea..93db263e378d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4302,12 +4302,12 @@ __metadata: languageName: node linkType: hard -"@types/leaflet@npm:*, @types/leaflet@npm:1.9.9": - version: 1.9.9 - resolution: "@types/leaflet@npm:1.9.9" +"@types/leaflet@npm:*, @types/leaflet@npm:1.9.11": + version: 1.9.11 + resolution: "@types/leaflet@npm:1.9.11" dependencies: "@types/geojson": "npm:*" - checksum: 10/7f1de85f4fa16f6feb3b19f80a8b9db092710e1b8695950a4c7d35b32e1b0bb4bdcd0f179d6c2e0aee49d1c725ab6c7a25ea48c5ea53bd15eb0a02296d4d87d0 + checksum: 10/a7f3936b83f1007fa74f65eee7a905e582966c3218d3a45ad1c713445038e69cdefeb668c8f0cb70bc293e77d3d801b299a90bc2fd33e52ff90fd93f342108a2 languageName: node linkType: hard @@ -9652,7 +9652,7 @@ __metadata: "@types/glob": "npm:8.1.0" "@types/html-minifier-terser": "npm:7.0.2" "@types/js-yaml": "npm:4.0.9" - "@types/leaflet": "npm:1.9.9" + "@types/leaflet": "npm:1.9.11" "@types/leaflet-draw": "npm:1.0.11" "@types/luxon": "npm:3.4.2" "@types/mocha": "npm:10.0.6" From fbef0b0186657effc4df418acf237b24c0548b9f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 12:31:10 -0400 Subject: [PATCH 50/98] Update dependency gulp to v5 (#20305) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 2201 ++++++++------------------------------------------ 2 files changed, 327 insertions(+), 1876 deletions(-) diff --git a/package.json b/package.json index 5f335128611d..5c08c4142174 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "fancy-log": "2.0.0", "fs-extra": "11.2.0", "glob": "10.3.12", - "gulp": "4.0.2", + "gulp": "5.0.0", "gulp-json-transform": "0.5.0", "gulp-merge-json": "2.2.1", "gulp-rename": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 93db263e378d..7984b04300ee 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1828,6 +1828,22 @@ __metadata: languageName: node linkType: hard +"@gulpjs/messages@npm:^1.1.0": + version: 1.1.0 + resolution: "@gulpjs/messages@npm:1.1.0" + checksum: 10/fa23de4f369cee6aec990a3795db0d1b109edca503ccd6c7551986e4936b1f08bdc5b6a2f3022e5828e478b4488ed3ac5677304bc2b691b03c575c9ac4042182 + languageName: node + linkType: hard + +"@gulpjs/to-absolute-glob@npm:^4.0.0": + version: 4.0.0 + resolution: "@gulpjs/to-absolute-glob@npm:4.0.0" + dependencies: + is-negated-glob: "npm:^1.0.0" + checksum: 10/30ec7825064422b6f02c1975ab6c779ff73409411c37bec2e984262459935afd196c1dbe960075e914967a047743ccf726fce3d3ebb4417ca2e3c34538fbceb8 + languageName: node + linkType: hard + "@humanwhocodes/config-array@npm:^0.11.14": version: 0.11.14 resolution: "@humanwhocodes/config-array@npm:0.11.14" @@ -5519,13 +5535,6 @@ __metadata: languageName: node linkType: hard -"ansi-regex@npm:^2.0.0": - version: 2.1.1 - resolution: "ansi-regex@npm:2.1.1" - checksum: 10/190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1 - languageName: node - linkType: hard - "ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" @@ -5586,17 +5595,7 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:^2.0.0": - version: 2.0.0 - resolution: "anymatch@npm:2.0.0" - dependencies: - micromatch: "npm:^3.1.4" - normalize-path: "npm:^2.1.1" - checksum: 10/f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6 - languageName: node - linkType: hard - -"anymatch@npm:~3.1.2": +"anymatch@npm:^3.1.3, anymatch@npm:~3.1.2": version: 3.1.3 resolution: "anymatch@npm:3.1.3" dependencies: @@ -5618,22 +5617,6 @@ __metadata: languageName: node linkType: hard -"append-buffer@npm:^1.0.2": - version: 1.0.2 - resolution: "append-buffer@npm:1.0.2" - dependencies: - buffer-equal: "npm:^1.0.0" - checksum: 10/e809940b5137c0bfa6f6d4aefcae45b5a15a28938749c0ef50eb39e4d877978fcabf08ceba10d6f214fc15f021681f308fe24865d6557126e2923c58e9c3a134 - languageName: node - linkType: hard - -"archy@npm:^1.0.0": - version: 1.0.0 - resolution: "archy@npm:1.0.0" - checksum: 10/d7928049a57988b86df3f4de75ca16a4252ccee591d085c627e649fc54c5ae5daa833f17aa656bd825bd00bc0a2756ae03d2b983050bdbda1046b6d832bf7303 - languageName: node - linkType: hard - "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -5657,31 +5640,6 @@ __metadata: languageName: node linkType: hard -"arr-filter@npm:^1.1.1": - version: 1.1.2 - resolution: "arr-filter@npm:1.1.2" - dependencies: - make-iterator: "npm:^1.0.0" - checksum: 10/952254f0caff460bf62ca356abecb78013c578db9c5a9a688861a5c87debdae6c22097e17e58cd59aaa2d96ac95254757e0e0bd4125bea38e6a160754b5fa6b1 - languageName: node - linkType: hard - -"arr-flatten@npm:^1.0.1, arr-flatten@npm:^1.1.0": - version: 1.1.0 - resolution: "arr-flatten@npm:1.1.0" - checksum: 10/963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22 - languageName: node - linkType: hard - -"arr-map@npm:^2.0.0, arr-map@npm:^2.0.2": - version: 2.0.2 - resolution: "arr-map@npm:2.0.2" - dependencies: - make-iterator: "npm:^1.0.0" - checksum: 10/51861a8a10b3f9d417468154c0b43a1fd85bbccfeca365f3cafe9d8c81218dc9b5ea9f923f9417365deface95111b36d06d5f348d0214bc9e277dfd2802f3acc - languageName: node - linkType: hard - "arr-union@npm:^3.1.0": version: 3.1.0 resolution: "arr-union@npm:3.1.0" @@ -5713,7 +5671,7 @@ __metadata: languageName: node linkType: hard -"array-each@npm:^1.0.0, array-each@npm:^1.0.1": +"array-each@npm:^1.0.1": version: 1.0.1 resolution: "array-each@npm:1.0.1" checksum: 10/eb2393c1200003993d97dab2b280aa01e6ca339b383198e5d250cc8cd31f8012a0c22b66f275401a80e89e21bfab420e0f4c77c295637dea525fe0e152ba2300 @@ -5740,25 +5698,6 @@ __metadata: languageName: node linkType: hard -"array-initial@npm:^1.0.0": - version: 1.1.0 - resolution: "array-initial@npm:1.1.0" - dependencies: - array-slice: "npm:^1.0.0" - is-number: "npm:^4.0.0" - checksum: 10/8fc7c2cbc6238fc0c4207ff63e15d651cad667c044e1ed53838fc530b8bde49a29445de73d58e909de5e8609bf5c61f4389b35b461c3ed282f79a0265c86a824 - languageName: node - linkType: hard - -"array-last@npm:^1.1.1": - version: 1.3.0 - resolution: "array-last@npm:1.3.0" - dependencies: - is-number: "npm:^4.0.0" - checksum: 10/7631c7df9b44ea26f49e2f6eeb7a7d4d95b3798586b917e1efae4a321b6362e449e00b011e88eb0260959fbfc940fbdfce1d2a35765ea080de6d71e3fc3cf1dd - languageName: node - linkType: hard - "array-slice@npm:^1.0.0": version: 1.1.0 resolution: "array-slice@npm:1.1.0" @@ -5766,17 +5705,6 @@ __metadata: languageName: node linkType: hard -"array-sort@npm:^1.0.0": - version: 1.0.0 - resolution: "array-sort@npm:1.0.0" - dependencies: - default-compare: "npm:^1.0.0" - get-value: "npm:^2.0.6" - kind-of: "npm:^5.0.2" - checksum: 10/e2346e58320e3c91ffbf6983526f84cfa4f07f5a135300c18ab22898b42351183a1e8a46fddecb9cd48e8ed697d577ba7c175ff3df36ea6ed2834d11441ee1a4 - languageName: node - linkType: hard - "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -5784,13 +5712,6 @@ __metadata: languageName: node linkType: hard -"array-unique@npm:^0.3.2": - version: 0.3.2 - resolution: "array-unique@npm:0.3.2" - checksum: 10/da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888 - languageName: node - linkType: hard - "array.prototype.find@npm:^2.2.2": version: 2.2.2 resolution: "array.prototype.find@npm:2.2.2" @@ -5870,31 +5791,23 @@ __metadata: languageName: node linkType: hard -"async-done@npm:^1.2.0, async-done@npm:^1.2.2": - version: 1.3.2 - resolution: "async-done@npm:1.3.2" +"async-done@npm:^2.0.0": + version: 2.0.0 + resolution: "async-done@npm:2.0.0" dependencies: - end-of-stream: "npm:^1.1.0" - once: "npm:^1.3.2" - process-nextick-args: "npm:^2.0.0" - stream-exhaust: "npm:^1.0.1" - checksum: 10/fc23b7752fdd78de3e2cc302b06d51c1e35eb068e9ccf55f5d5da74da32386eb8b70a5d688c5bc46b2e28016078493804a836e00150bdd50d7e009ac27705a10 - languageName: node - linkType: hard - -"async-each@npm:^1.0.1": - version: 1.0.6 - resolution: "async-each@npm:1.0.6" - checksum: 10/d237e8c39348d5f1441edbd3893692912afbacaf83a2ccce8978ebeea804529a8838654b12208fbbc08c8b0411a1248948ee9bf9291ebe1921aabd5b613bc5db + end-of-stream: "npm:^1.4.4" + once: "npm:^1.4.0" + stream-exhaust: "npm:^1.0.2" + checksum: 10/70d275c7ee8808e356b14fd10036d1667e778d6b3b3d3ad861d3602cbe5071931d8ec7379c01b15bf1883d04d42d0e790ceffde3ba96858f6b7cbeaf9142a23d languageName: node linkType: hard -"async-settle@npm:^1.0.0": - version: 1.0.0 - resolution: "async-settle@npm:1.0.0" +"async-settle@npm:^2.0.0": + version: 2.0.0 + resolution: "async-settle@npm:2.0.0" dependencies: - async-done: "npm:^1.2.2" - checksum: 10/d2382ad4b9137b5cee7a21ba5d573af4b3458ba7e104e46acda035168d1a58f5715509ad046006a561586ae0106c11836d90bbe269c85928fdd24ee5bd71fbb4 + async-done: "npm:^2.0.0" + checksum: 10/69398507b20e7d7628ee6756ca1547c80744eb5b33cc9b1a22e0a8a38a6b864be96b93e0940de45113afa33cb34d89151ee9c85dbffcd51e741c8146cf695d15 languageName: node linkType: hard @@ -5921,15 +5834,6 @@ __metadata: languageName: node linkType: hard -"atob@npm:^2.1.2": - version: 2.1.2 - resolution: "atob@npm:2.1.2" - bin: - atob: bin/atob.js - checksum: 10/0624406cc0295533b38b60ab2e3b028aa7b8225f37e0cde6be3bc5c13a8015c889b192e874fd7660671179cef055f2e258855f372b0e495bd4096cf0b4785c25 - languageName: node - linkType: hard - "available-typed-arrays@npm:^1.0.7": version: 1.0.7 resolution: "available-typed-arrays@npm:1.0.7" @@ -6013,20 +5917,14 @@ __metadata: languageName: node linkType: hard -"bach@npm:^1.0.0": - version: 1.2.0 - resolution: "bach@npm:1.2.0" +"bach@npm:^2.0.1": + version: 2.0.1 + resolution: "bach@npm:2.0.1" dependencies: - arr-filter: "npm:^1.1.1" - arr-flatten: "npm:^1.0.1" - arr-map: "npm:^2.0.0" - array-each: "npm:^1.0.0" - array-initial: "npm:^1.0.0" - array-last: "npm:^1.1.1" - async-done: "npm:^1.2.2" - async-settle: "npm:^1.0.0" - now-and-later: "npm:^2.0.0" - checksum: 10/c37fac684744ca2783b14c0e26a2d9700068ef5f14ea7a5808e402a4c47cdaf7c2ef72bd5af2edd83938d667626833ecd1be59cbbd1d0a5bffd92b6fb4705434 + async-done: "npm:^2.0.0" + async-settle: "npm:^2.0.0" + now-and-later: "npm:^3.0.0" + checksum: 10/e1356946290225e88151e7af5155f6d75c2daf9797de0de380cf9e40004ba54face99249cc99c965acd31cf7754d85b5249ec622fffcacb5c5ef11667f8fccd5 languageName: node linkType: hard @@ -6051,21 +5949,6 @@ __metadata: languageName: node linkType: hard -"base@npm:^0.11.1": - version: 0.11.2 - resolution: "base@npm:0.11.2" - dependencies: - cache-base: "npm:^1.0.1" - class-utils: "npm:^0.3.5" - component-emitter: "npm:^1.2.1" - define-property: "npm:^1.0.0" - isobject: "npm:^3.0.1" - mixin-deep: "npm:^1.2.0" - pascalcase: "npm:^0.1.1" - checksum: 10/33b0c5d570840873cf370248e653d43e8d82ce4f03161ad3c58b7da6238583cfc65bf4bbb06b27050d6c2d8f40628777f3933f483c0a7c0274fcef4c51f70a7e - languageName: node - linkType: hard - "batch@npm:0.6.1": version: 0.6.1 resolution: "batch@npm:0.6.1" @@ -6080,13 +5963,6 @@ __metadata: languageName: node linkType: hard -"binary-extensions@npm:^1.0.0": - version: 1.13.1 - resolution: "binary-extensions@npm:1.13.1" - checksum: 10/ad7747f33c07e94ba443055de130b50c8b8b130a358bca064c580d91769ca6a69c7ac65ca008ff044ed4541d2c6ad45496e1fadbef5218a68770996b6a2194d7 - languageName: node - linkType: hard - "binary-extensions@npm:^2.0.0": version: 2.3.0 resolution: "binary-extensions@npm:2.3.0" @@ -6094,12 +5970,14 @@ __metadata: languageName: node linkType: hard -"bindings@npm:^1.5.0": - version: 1.5.0 - resolution: "bindings@npm:1.5.0" +"bl@npm:^5.0.0": + version: 5.1.0 + resolution: "bl@npm:5.1.0" dependencies: - file-uri-to-path: "npm:1.0.0" - checksum: 10/593d5ae975ffba15fbbb4788fe5abd1e125afbab849ab967ab43691d27d6483751805d98cb92f7ac24a2439a8a8678cd0131c535d5d63de84e383b0ce2786133 + buffer: "npm:^6.0.3" + inherits: "npm:^2.0.4" + readable-stream: "npm:^3.4.0" + checksum: 10/0340d3d70def4213cd9cbcd8592f7c5922d3668e7b231286c354613fac4a8411ad373cff26e06162da7423035bbd5caafce3e140a5f397be72fcd1e9d86f1179 languageName: node linkType: hard @@ -6173,24 +6051,6 @@ __metadata: languageName: node linkType: hard -"braces@npm:^2.3.1, braces@npm:^2.3.2": - version: 2.3.2 - resolution: "braces@npm:2.3.2" - dependencies: - arr-flatten: "npm:^1.1.0" - array-unique: "npm:^0.3.2" - extend-shallow: "npm:^2.0.1" - fill-range: "npm:^4.0.0" - isobject: "npm:^3.0.1" - repeat-element: "npm:^1.1.2" - snapdragon: "npm:^0.8.1" - snapdragon-node: "npm:^2.0.1" - split-string: "npm:^3.0.2" - to-regex: "npm:^3.0.1" - checksum: 10/7c0f0d962570812009b050ee2e6243fd425ea80d3136aace908d0038bde9e7a43e9326fa35538cebf7c753f0482655f08ea11be074c9a140394287980a5c66c9 - languageName: node - linkType: hard - "braces@npm:^3.0.2, braces@npm:~3.0.2": version: 3.0.2 resolution: "braces@npm:3.0.2" @@ -6228,13 +6088,6 @@ __metadata: languageName: node linkType: hard -"buffer-equal@npm:^1.0.0": - version: 1.0.1 - resolution: "buffer-equal@npm:1.0.1" - checksum: 10/0d56dbeec3d862b16f07fe1cc27751adab26219ff37b90fb0be1fe5c870ce1ce3ed45aad9d9b8c631dfc0e147315d02385ddefaf7f6cb24f067f91a2f8def324 - languageName: node - linkType: hard - "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -6252,6 +6105,16 @@ __metadata: languageName: node linkType: hard +"buffer@npm:^6.0.3": + version: 6.0.3 + resolution: "buffer@npm:6.0.3" + dependencies: + base64-js: "npm:^1.3.1" + ieee754: "npm:^1.2.1" + checksum: 10/b6bc68237ebf29bdacae48ce60e5e28fc53ae886301f2ad9496618efac49427ed79096750033e7eab1897a4f26ae374ace49106a5758f38fb70c78c9fda2c3b1 + languageName: node + linkType: hard + "builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" @@ -6302,23 +6165,6 @@ __metadata: languageName: node linkType: hard -"cache-base@npm:^1.0.1": - version: 1.0.1 - resolution: "cache-base@npm:1.0.1" - dependencies: - collection-visit: "npm:^1.0.0" - component-emitter: "npm:^1.2.1" - get-value: "npm:^2.0.6" - has-value: "npm:^1.0.0" - isobject: "npm:^3.0.1" - set-value: "npm:^2.0.0" - to-object-path: "npm:^0.3.0" - union-value: "npm:^1.0.0" - unset-value: "npm:^1.0.0" - checksum: 10/50dd11af5ce4aaa8a8bff190a870c940db80234cf087cd47dd177be8629c36ad8cd0716e62418ec1e135f2d01b28aafff62cd22d33412c3d18b2109dd9073711 - languageName: node - linkType: hard - "cache-content-type@npm:^1.0.0": version: 1.0.1 resolution: "cache-content-type@npm:1.0.1" @@ -6359,13 +6205,6 @@ __metadata: languageName: node linkType: hard -"camelcase@npm:^3.0.0": - version: 3.0.0 - resolution: "camelcase@npm:3.0.0" - checksum: 10/ae4fe1c17c8442a3a345a6b7d2393f028ab7a7601af0c352ad15d1ab97ca75112e19e29c942b2a214898e160194829b68923bce30e018d62149c6d84187f1673 - languageName: node - linkType: hard - "camelcase@npm:^5.0.0": version: 5.3.1 resolution: "camelcase@npm:5.3.1" @@ -6472,30 +6311,7 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^2.0.0": - version: 2.1.8 - resolution: "chokidar@npm:2.1.8" - dependencies: - anymatch: "npm:^2.0.0" - async-each: "npm:^1.0.1" - braces: "npm:^2.3.2" - fsevents: "npm:^1.2.7" - glob-parent: "npm:^3.1.0" - inherits: "npm:^2.0.3" - is-binary-path: "npm:^1.0.0" - is-glob: "npm:^4.0.0" - normalize-path: "npm:^3.0.0" - path-is-absolute: "npm:^1.0.0" - readdirp: "npm:^2.2.1" - upath: "npm:^1.1.1" - dependenciesMeta: - fsevents: - optional: true - checksum: 10/567c319dd2a9078fddb5a64df46163d87b104857c1b50c2ef6f9b41b3ab28867c48dbc5f0c6ddaafd3c338b147ea33a6498eb9b906c71006cba1e486a0e9350d - languageName: node - linkType: hard - -"chokidar@npm:^3.4.3, chokidar@npm:^3.6.0": +"chokidar@npm:^3.4.3, chokidar@npm:^3.5.3, chokidar@npm:^3.6.0": version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -6535,18 +6351,6 @@ __metadata: languageName: node linkType: hard -"class-utils@npm:^0.3.5": - version: 0.3.6 - resolution: "class-utils@npm:0.3.6" - dependencies: - arr-union: "npm:^3.1.0" - define-property: "npm:^0.2.5" - isobject: "npm:^3.0.0" - static-extend: "npm:^0.1.1" - checksum: 10/b236d9deb6594828966e45c5f48abac9a77453ee0dbdb89c635ce876f59755d7952309d554852b6f7d909198256c335a4bd51b09c1d238b36b92152eb2b9d47a - languageName: node - linkType: hard - "clean-css@npm:5.3.3": version: 5.3.3 resolution: "clean-css@npm:5.3.3" @@ -6591,17 +6395,6 @@ __metadata: languageName: node linkType: hard -"cliui@npm:^3.2.0": - version: 3.2.0 - resolution: "cliui@npm:3.2.0" - dependencies: - string-width: "npm:^1.0.1" - strip-ansi: "npm:^3.0.1" - wrap-ansi: "npm:^2.0.0" - checksum: 10/a8acc1a2e5f6307bb3200738a55b353ae5ca13d7a9a8001e40bdf2449c228104daf245e29cdfe60652ffafc3e70096fc1624cd9cf8651bb322903dbbb22a4ac3 - languageName: node - linkType: hard - "cliui@npm:^6.0.0": version: 6.0.0 resolution: "cliui@npm:6.0.0" @@ -6692,34 +6485,6 @@ __metadata: languageName: node linkType: hard -"code-point-at@npm:^1.0.0": - version: 1.1.0 - resolution: "code-point-at@npm:1.1.0" - checksum: 10/17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681 - languageName: node - linkType: hard - -"collection-map@npm:^1.0.0": - version: 1.0.0 - resolution: "collection-map@npm:1.0.0" - dependencies: - arr-map: "npm:^2.0.2" - for-own: "npm:^1.0.0" - make-iterator: "npm:^1.0.0" - checksum: 10/770b5eb244870a699b4d16549684b54235f5e6e829d10771a09f089fc96ec0d5563ca0aa3a27511fe1bca36fdad156c9b7b2876437bcdf02c355f69046b3fd2f - languageName: node - linkType: hard - -"collection-visit@npm:^1.0.0": - version: 1.0.0 - resolution: "collection-visit@npm:1.0.0" - dependencies: - map-visit: "npm:^1.0.0" - object-visit: "npm:^1.0.0" - checksum: 10/15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9 - languageName: node - linkType: hard - "color-convert@npm:^1.9.0": version: 1.9.3 resolution: "color-convert@npm:1.9.3" @@ -6855,13 +6620,6 @@ __metadata: languageName: node linkType: hard -"component-emitter@npm:^1.2.1": - version: 1.3.1 - resolution: "component-emitter@npm:1.3.1" - checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d - languageName: node - linkType: hard - "compressible@npm:~2.0.16": version: 2.0.18 resolution: "compressible@npm:2.0.18" @@ -6893,18 +6651,6 @@ __metadata: languageName: node linkType: hard -"concat-stream@npm:^1.6.0": - version: 1.6.2 - resolution: "concat-stream@npm:1.6.2" - dependencies: - buffer-from: "npm:^1.0.0" - inherits: "npm:^2.0.3" - readable-stream: "npm:^2.2.2" - typedarray: "npm:^0.0.6" - checksum: 10/71db903c84fc073ca35a274074e8d26c4330713d299f8623e993c448c1f6bf8b967806dd1d1a7b0f8add6f15ab1af7435df21fe79b4fe7efd78420c89e054e28 - languageName: node - linkType: hard - "confusing-browser-globals@npm:^1.0.10": version: 1.0.11 resolution: "confusing-browser-globals@npm:1.0.11" @@ -6949,13 +6695,6 @@ __metadata: languageName: node linkType: hard -"convert-source-map@npm:^1.5.0": - version: 1.9.0 - resolution: "convert-source-map@npm:1.9.0" - checksum: 10/dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 - languageName: node - linkType: hard - "convert-source-map@npm:^2.0.0": version: 2.0.0 resolution: "convert-source-map@npm:2.0.0" @@ -6987,20 +6726,13 @@ __metadata: languageName: node linkType: hard -"copy-descriptor@npm:^0.1.0": - version: 0.1.1 - resolution: "copy-descriptor@npm:0.1.1" - checksum: 10/edf4651bce36166c7fcc60b5c1db2c5dad1d87820f468507331dd154b686ece8775f5d383127d44aeef813462520c866f83908aa2d4291708f898df776816860 - languageName: node - linkType: hard - -"copy-props@npm:^2.0.1": - version: 2.0.5 - resolution: "copy-props@npm:2.0.5" +"copy-props@npm:^4.0.0": + version: 4.0.0 + resolution: "copy-props@npm:4.0.0" dependencies: - each-props: "npm:^1.3.2" + each-props: "npm:^3.0.0" is-plain-object: "npm:^5.0.0" - checksum: 10/eba7486dc0ba0b5bbb0e98805849a60e0a0c14c362b1baece69d86c8460aabe03d4f271d34ac41d8f5f9b3302703ca75bab34227ff6fbfedc47646f47288aaa0 + checksum: 10/86ea7f2c60e5502ba215b81f5094199a4d6f7e285a4c45800b0c292a7fda04e8c6852fbcb99745f4eaa0e33b04c34fc3cfa2cb4c15a01ccbcb39b6fc0f72e878 languageName: node linkType: hard @@ -7073,16 +6805,6 @@ __metadata: languageName: node linkType: hard -"d@npm:1, d@npm:^1.0.1, d@npm:^1.0.2": - version: 1.0.2 - resolution: "d@npm:1.0.2" - dependencies: - es5-ext: "npm:^0.10.64" - type: "npm:^2.7.2" - checksum: 10/a3f45ef964622f683f6a1cb9b8dcbd75ce490cd2f4ac9794099db3d8f0e2814d412d84cd3fe522e58feb1f273117bb480f29c5381f6225f0abca82517caaa77a - languageName: node - linkType: hard - "data-view-buffer@npm:^1.0.1": version: 1.0.1 resolution: "data-view-buffer@npm:1.0.1" @@ -7141,7 +6863,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3": +"debug@npm:2.6.9": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -7171,7 +6893,7 @@ __metadata: languageName: node linkType: hard -"decamelize@npm:^1.1.1, decamelize@npm:^1.2.0": +"decamelize@npm:^1.2.0": version: 1.2.0 resolution: "decamelize@npm:1.2.0" checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa @@ -7185,13 +6907,6 @@ __metadata: languageName: node linkType: hard -"decode-uri-component@npm:^0.2.0": - version: 0.2.2 - resolution: "decode-uri-component@npm:0.2.2" - checksum: 10/17a0e5fa400bf9ea84432226e252aa7b5e72793e16bf80b907c99b46a799aeacc139ec20ea57121e50c7bd875a1a4365928f884e92abf02e21a5a13790a0f33e - languageName: node - linkType: hard - "deep-clone-simple@npm:1.1.1": version: 1.1.1 resolution: "deep-clone-simple@npm:1.1.1" @@ -7251,15 +6966,6 @@ __metadata: languageName: node linkType: hard -"default-compare@npm:^1.0.0": - version: 1.0.0 - resolution: "default-compare@npm:1.0.0" - dependencies: - kind-of: "npm:^5.0.2" - checksum: 10/e638d86e65655af04471b0865b4ae1c8886c342cb6ca035748701413ef6ff2cc0a53f273b103f55565fb50e338ff32da10998ae232c3d06fd0251fb6e852a455 - languageName: node - linkType: hard - "default-gateway@npm:^6.0.3": version: 6.0.3 resolution: "default-gateway@npm:6.0.3" @@ -7269,13 +6975,6 @@ __metadata: languageName: node linkType: hard -"default-resolution@npm:^2.0.0": - version: 2.0.0 - resolution: "default-resolution@npm:2.0.0" - checksum: 10/68a9925e2826b52b5c2b0206372a99ab438fdb16606561bc36cf02bc42c10870862dd3e69f2d79d9ac3959be7140649e9a92fd4e476808dac8c959f35328f0aa - languageName: node - linkType: hard - "defaults@npm:^1.0.4": version: 1.0.4 resolution: "defaults@npm:1.0.4" @@ -7321,34 +7020,6 @@ __metadata: languageName: node linkType: hard -"define-property@npm:^0.2.5": - version: 0.2.5 - resolution: "define-property@npm:0.2.5" - dependencies: - is-descriptor: "npm:^0.1.0" - checksum: 10/85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394 - languageName: node - linkType: hard - -"define-property@npm:^1.0.0": - version: 1.0.0 - resolution: "define-property@npm:1.0.0" - dependencies: - is-descriptor: "npm:^1.0.0" - checksum: 10/5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a - languageName: node - linkType: hard - -"define-property@npm:^2.0.2": - version: 2.0.2 - resolution: "define-property@npm:2.0.2" - dependencies: - is-descriptor: "npm:^1.0.2" - isobject: "npm:^3.0.1" - checksum: 10/3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99 - languageName: node - linkType: hard - "del@npm:7.1.0": version: 7.1.0 resolution: "del@npm:7.1.0" @@ -7517,25 +7188,13 @@ __metadata: languageName: node linkType: hard -"duplexify@npm:^3.6.0": - version: 3.7.1 - resolution: "duplexify@npm:3.7.1" - dependencies: - end-of-stream: "npm:^1.0.0" - inherits: "npm:^2.0.1" - readable-stream: "npm:^2.0.0" - stream-shift: "npm:^1.0.0" - checksum: 10/7799984d178fb57e11c43f5f172a10f795322ec85ff664c2a98d2c2de6deeb9d7a30b810f83923dcd7ebe0f1786724b8aee2b62ca4577522141f93d6d48fb31c - languageName: node - linkType: hard - -"each-props@npm:^1.3.2": - version: 1.3.2 - resolution: "each-props@npm:1.3.2" +"each-props@npm:^3.0.0": + version: 3.0.0 + resolution: "each-props@npm:3.0.0" dependencies: - is-plain-object: "npm:^2.0.1" + is-plain-object: "npm:^5.0.0" object.defaults: "npm:^1.1.0" - checksum: 10/81ac0ede3d9264b0e43c371a410fca850ad3931e21cc83b817b9715901fb60d4b86e1602eae3d24ca91558508aa16e9e5dfbf2bbe41e159eb0450c829111f721 + checksum: 10/69d493f84692161898956a1251ceadc52fef35b6c4734af55a2de9d344fbf1b4e5643e160095c4a3a8808d893f5ebc5a2178d51039c8716864c6aa0ddf007029 languageName: node linkType: hard @@ -7622,7 +7281,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0": +"end-of-stream@npm:^1.4.4": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -7682,15 +7341,6 @@ __metadata: languageName: node linkType: hard -"error-ex@npm:^1.2.0": - version: 1.3.2 - resolution: "error-ex@npm:1.3.2" - dependencies: - is-arrayish: "npm:^0.2.1" - checksum: 10/d547740aa29c34e753fb6fed2c5de81802438529c12b3673bd37b6bb1fe49b9b7abdc3c11e6062fe625d8a296b3cf769a80f878865e25e685f787763eede3ffb - languageName: node - linkType: hard - "error-stack-parser@npm:^2.0.6": version: 2.1.4 resolution: "error-stack-parser@npm:2.1.4" @@ -7817,51 +7467,6 @@ __metadata: languageName: node linkType: hard -"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14": - version: 0.10.64 - resolution: "es5-ext@npm:0.10.64" - dependencies: - es6-iterator: "npm:^2.0.3" - es6-symbol: "npm:^3.1.3" - esniff: "npm:^2.0.1" - next-tick: "npm:^1.1.0" - checksum: 10/0c5d8657708b1695ddc4b06f4e0b9fbdda4d2fe46d037b6bedb49a7d1931e542ec9eecf4824d59e1d357e93229deab014bb4b86485db2d41b1d68e54439689ce - languageName: node - linkType: hard - -"es6-iterator@npm:^2.0.1, es6-iterator@npm:^2.0.3": - version: 2.0.3 - resolution: "es6-iterator@npm:2.0.3" - dependencies: - d: "npm:1" - es5-ext: "npm:^0.10.35" - es6-symbol: "npm:^3.1.1" - checksum: 10/dbadecf3d0e467692815c2b438dfa99e5a97cbbecf4a58720adcb467a04220e0e36282399ba297911fd472c50ae4158fffba7ed0b7d4273fe322b69d03f9e3a5 - languageName: node - linkType: hard - -"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3": - version: 3.1.4 - resolution: "es6-symbol@npm:3.1.4" - dependencies: - d: "npm:^1.0.2" - ext: "npm:^1.7.0" - checksum: 10/3743119fe61f89e2f049a6ce52bd82fab5f65d13e2faa72453b73f95c15292c3cb9bdf3747940d504517e675e45fd375554c6b5d35d2bcbefd35f5489ecba546 - languageName: node - linkType: hard - -"es6-weak-map@npm:^2.0.1": - version: 2.0.3 - resolution: "es6-weak-map@npm:2.0.3" - dependencies: - d: "npm:1" - es5-ext: "npm:^0.10.46" - es6-iterator: "npm:^2.0.3" - es6-symbol: "npm:^3.1.1" - checksum: 10/5958a321cf8dfadc82b79eeaa57dc855893a4afd062b4ef5c9ded0010d3932099311272965c3d3fdd3c85df1d7236013a570e704fa6c1f159bbf979c203dd3a3 - languageName: node - linkType: hard - "escalade@npm:^3.1.1": version: 3.1.2 resolution: "escalade@npm:3.1.2" @@ -8169,18 +7774,6 @@ __metadata: languageName: node linkType: hard -"esniff@npm:^2.0.1": - version: 2.0.1 - resolution: "esniff@npm:2.0.1" - dependencies: - d: "npm:^1.0.1" - es5-ext: "npm:^0.10.62" - event-emitter: "npm:^0.3.5" - type: "npm:^2.7.2" - checksum: 10/f6a2abd2f8c5fe57c5fcf53e5407c278023313d0f6c3a92688e7122ab9ac233029fd424508a196ae5bc561aa1f67d23f4e2435b1a0d378030f476596129056ac - languageName: node - linkType: hard - "espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" @@ -8259,16 +7852,6 @@ __metadata: languageName: node linkType: hard -"event-emitter@npm:^0.3.5": - version: 0.3.5 - resolution: "event-emitter@npm:0.3.5" - dependencies: - d: "npm:1" - es5-ext: "npm:~0.10.14" - checksum: 10/a7f5ea80029193f4869782d34ef7eb43baa49cd397013add1953491b24588468efbe7e3cc9eb87d53f33397e7aab690fd74c079ec440bf8b12856f6bdb6e9396 - languageName: node - linkType: hard - "eventemitter3@npm:^4.0.0": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -8331,21 +7914,6 @@ __metadata: languageName: node linkType: hard -"expand-brackets@npm:^2.1.4": - version: 2.1.4 - resolution: "expand-brackets@npm:2.1.4" - dependencies: - debug: "npm:^2.3.3" - define-property: "npm:^0.2.5" - extend-shallow: "npm:^2.0.1" - posix-character-classes: "npm:^0.1.0" - regex-not: "npm:^1.0.0" - snapdragon: "npm:^0.8.1" - to-regex: "npm:^3.0.1" - checksum: 10/aa4acc62084638c761ecdbe178bd3136f01121939f96bbfc3be27c46c66625075f77fe0a446b627c9071b1aaf6d93ccf5bde5ff34b7ef883e4f46067a8e63e41 - languageName: node - linkType: hard - "expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2": version: 2.0.2 resolution: "expand-tilde@npm:2.0.2" @@ -8401,27 +7969,9 @@ __metadata: languageName: node linkType: hard -"ext@npm:^1.7.0": - version: 1.7.0 - resolution: "ext@npm:1.7.0" - dependencies: - type: "npm:^2.7.2" - checksum: 10/666a135980b002df0e75c8ac6c389140cdc59ac953db62770479ee2856d58ce69d2f845e5f2586716350b725400f6945e51e9159573158c39f369984c72dcd84 - languageName: node - linkType: hard - -"extend-shallow@npm:^2.0.1": - version: 2.0.1 - resolution: "extend-shallow@npm:2.0.1" - dependencies: - is-extendable: "npm:^0.1.0" - checksum: 10/8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8 - languageName: node - linkType: hard - -"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2": - version: 3.0.2 - resolution: "extend-shallow@npm:3.0.2" +"extend-shallow@npm:^3.0.2": + version: 3.0.2 + resolution: "extend-shallow@npm:3.0.2" dependencies: assign-symbols: "npm:^1.0.0" is-extendable: "npm:^1.0.1" @@ -8429,29 +7979,13 @@ __metadata: languageName: node linkType: hard -"extend@npm:^3.0.0": +"extend@npm:^3.0.2": version: 3.0.2 resolution: "extend@npm:3.0.2" checksum: 10/59e89e2dc798ec0f54b36d82f32a27d5f6472c53974f61ca098db5d4648430b725387b53449a34df38fd0392045434426b012f302b3cc049a6500ccf82877e4e languageName: node linkType: hard -"extglob@npm:^2.0.4": - version: 2.0.4 - resolution: "extglob@npm:2.0.4" - dependencies: - array-unique: "npm:^0.3.2" - define-property: "npm:^1.0.0" - expand-brackets: "npm:^2.1.4" - extend-shallow: "npm:^2.0.1" - fragment-cache: "npm:^0.2.1" - regex-not: "npm:^1.0.0" - snapdragon: "npm:^0.8.1" - to-regex: "npm:^3.0.1" - checksum: 10/6869edd48d40c322e1cda9bf494ed2407c69a19063fd2897184cb62d6d35c14fa7402b01d9dedd65d77ed1ccc74a291235a702c68b4f28a7314da0cdee97c85b - languageName: node - linkType: hard - "fancy-log@npm:2.0.0, fancy-log@npm:^2.0.0": version: 2.0.0 resolution: "fancy-log@npm:2.0.0" @@ -8507,13 +8041,6 @@ __metadata: languageName: node linkType: hard -"fast-levenshtein@npm:^1.0.0": - version: 1.1.4 - resolution: "fast-levenshtein@npm:1.1.4" - checksum: 10/3b8cd791635d4105a423ea4e023aa1a0b896fef648104107851a3372aa0e62edd0f2b1e30bd6fd50d4d69c1023c3e5ed3dadb81030f01c6fc58a3d184e1cbbfb - languageName: node - linkType: hard - "fast-levenshtein@npm:^2.0.6": version: 2.0.6 resolution: "fast-levenshtein@npm:2.0.6" @@ -8521,6 +8048,15 @@ __metadata: languageName: node linkType: hard +"fast-levenshtein@npm:^3.0.0": + version: 3.0.0 + resolution: "fast-levenshtein@npm:3.0.0" + dependencies: + fastest-levenshtein: "npm:^1.0.7" + checksum: 10/df98841b262eb345335043ae42f0219f1acf1a88f2e0959ca94c4a46df44e40455d9ee11a3f1c730dee2b1b87dc8b20d4184e71712b30b229df5b40c944ea649 + languageName: node + linkType: hard + "fast-url-parser@npm:1.1.3": version: 1.1.3 resolution: "fast-url-parser@npm:1.1.3" @@ -8530,14 +8066,14 @@ __metadata: languageName: node linkType: hard -"fastest-levenshtein@npm:^1.0.12": +"fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.7": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" checksum: 10/ee85d33b5cef592033f70e1c13ae8624055950b4eb832435099cd56aa313d7f251b873bedbc06a517adfaff7b31756d139535991e2406967438e03a1bf1b008e languageName: node linkType: hard -"fastq@npm:^1.6.0": +"fastq@npm:^1.13.0, fastq@npm:^1.6.0": version: 1.17.1 resolution: "fastq@npm:1.17.1" dependencies: @@ -8584,13 +8120,6 @@ __metadata: languageName: node linkType: hard -"file-uri-to-path@npm:1.0.0": - version: 1.0.0 - resolution: "file-uri-to-path@npm:1.0.0" - checksum: 10/b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144 - languageName: node - linkType: hard - "filelist@npm:^1.0.4": version: 1.0.4 resolution: "filelist@npm:1.0.4" @@ -8600,18 +8129,6 @@ __metadata: languageName: node linkType: hard -"fill-range@npm:^4.0.0": - version: 4.0.0 - resolution: "fill-range@npm:4.0.0" - dependencies: - extend-shallow: "npm:^2.0.1" - is-number: "npm:^3.0.0" - repeat-string: "npm:^1.6.1" - to-regex-range: "npm:^2.1.0" - checksum: 10/68be23b3c40d5a3fd2847ce18e3a5eac25d9f4c05627291e048ba1346ed0e429668b58a3429e61c0db9fa5954c4402fe99322a65d8a0eb06ebed8d3a18fbb09a - languageName: node - linkType: hard - "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -8672,16 +8189,6 @@ __metadata: languageName: node linkType: hard -"find-up@npm:^1.0.0": - version: 1.1.2 - resolution: "find-up@npm:1.1.2" - dependencies: - path-exists: "npm:^2.0.0" - pinkie-promise: "npm:^2.0.0" - checksum: 10/a2cb9f4c9f06ee3a1e92ed71d5aed41ac8ae30aefa568132f6c556fac7678a5035126153b59eaec68da78ac409eef02503b2b059706bdbf232668d7245e3240a - languageName: node - linkType: hard - "find-up@npm:^4.0.0, find-up@npm:^4.1.0": version: 4.1.0 resolution: "find-up@npm:4.1.0" @@ -8702,47 +8209,35 @@ __metadata: languageName: node linkType: hard -"findup-sync@npm:^2.0.0": - version: 2.0.0 - resolution: "findup-sync@npm:2.0.0" - dependencies: - detect-file: "npm:^1.0.0" - is-glob: "npm:^3.1.0" - micromatch: "npm:^3.0.4" - resolve-dir: "npm:^1.0.1" - checksum: 10/af2849f4006208c7c0940ab87a5f816187becf30c430a735377f6163cff8e95f405db504f5435728663099878f2e8002da1bf1976132458c23f5d73f540b1fcc - languageName: node - linkType: hard - -"findup-sync@npm:^3.0.0": - version: 3.0.0 - resolution: "findup-sync@npm:3.0.0" +"findup-sync@npm:^5.0.0": + version: 5.0.0 + resolution: "findup-sync@npm:5.0.0" dependencies: detect-file: "npm:^1.0.0" - is-glob: "npm:^4.0.0" - micromatch: "npm:^3.0.4" + is-glob: "npm:^4.0.3" + micromatch: "npm:^4.0.4" resolve-dir: "npm:^1.0.1" - checksum: 10/cafd706255f3c0e3491e4ee2eb9e585e6e76999bdc50e1ecde6d4ef7316d8dbcae77eb49d27b1f61ff011971933de43e90cb7cb535620b2616eb2ff89baf9347 + checksum: 10/576716c77a0e8330b17ae9cba27d1fda8907c8cda7bf33a47f1999e16e089bfc6df4dd62933e0760f430736183c054348c34aa45dd882d49c8c098f55b89ee1d languageName: node linkType: hard -"fined@npm:^1.0.1": - version: 1.2.0 - resolution: "fined@npm:1.2.0" +"fined@npm:^2.0.0": + version: 2.0.0 + resolution: "fined@npm:2.0.0" dependencies: expand-tilde: "npm:^2.0.2" - is-plain-object: "npm:^2.0.3" + is-plain-object: "npm:^5.0.0" object.defaults: "npm:^1.1.0" - object.pick: "npm:^1.2.0" - parse-filepath: "npm:^1.0.1" - checksum: 10/9c76fb17e9f7e3f21e65b563cf49aed944c6b257a46b04306cef8883d60e295e904f57514443e60c64874914d13557b2f464071181d8d80a37cd9d8565075b7f + object.pick: "npm:^1.3.0" + parse-filepath: "npm:^1.0.2" + checksum: 10/3c5125a5b4eabb9a9569a9bc55a629d4f463ea8926cca9ee0b54d0e0351715aaed7f245a5372defbb59a0aaccdfefae9dc1a9ac0c7b1167ba8537284db956852 languageName: node linkType: hard -"flagged-respawn@npm:^1.0.0": - version: 1.0.1 - resolution: "flagged-respawn@npm:1.0.1" - checksum: 10/0b9bd79fd98426283e7ba9cccdf5bb29961fe7ec913f0c616984902d8d6a4570c312b439ff2fa6879c26a64cc585e49c9519ffe73a2bc3acc0483728b396e63f +"flagged-respawn@npm:^2.0.0": + version: 2.0.0 + resolution: "flagged-respawn@npm:2.0.0" + checksum: 10/1b48b1aca4614833bc1c1aa5a7af09232bc284168334b85492e580b51f9bc5ee1a59e4d830934ca91f6dc483300043ac8fe17f88f97f289153f6fcbd8dc9171b languageName: node linkType: hard @@ -8773,16 +8268,6 @@ __metadata: languageName: node linkType: hard -"flush-write-stream@npm:^1.0.2": - version: 1.1.1 - resolution: "flush-write-stream@npm:1.1.1" - dependencies: - inherits: "npm:^2.0.3" - readable-stream: "npm:^2.3.6" - checksum: 10/649dae597c1ab6292eae1ce103cfe5a2d46317b21c9a14a1900d285227869a6181b32aca51b78660191884059732849db41694807e28bf07f61233fd2d5309f5 - languageName: node - linkType: hard - "follow-redirects@npm:^1.0.0": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" @@ -8802,7 +8287,7 @@ __metadata: languageName: node linkType: hard -"for-in@npm:^1.0.1, for-in@npm:^1.0.2": +"for-in@npm:^1.0.1": version: 1.0.2 resolution: "for-in@npm:1.0.2" checksum: 10/09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d @@ -8835,15 +8320,6 @@ __metadata: languageName: node linkType: hard -"fragment-cache@npm:^0.2.1": - version: 0.2.1 - resolution: "fragment-cache@npm:0.2.1" - dependencies: - map-cache: "npm:^0.2.2" - checksum: 10/1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc - languageName: node - linkType: hard - "fresh@npm:0.5.2, fresh@npm:~0.5.2": version: 0.5.2 resolution: "fresh@npm:0.5.2" @@ -8892,13 +8368,13 @@ __metadata: languageName: node linkType: hard -"fs-mkdirp-stream@npm:^1.0.0": - version: 1.0.0 - resolution: "fs-mkdirp-stream@npm:1.0.0" +"fs-mkdirp-stream@npm:^2.0.1": + version: 2.0.1 + resolution: "fs-mkdirp-stream@npm:2.0.1" dependencies: - graceful-fs: "npm:^4.1.11" - through2: "npm:^2.0.3" - checksum: 10/af3c817bffa69413125fbefbb4b18b0c7d80a38f2620d4b07423d312863514f12075b5b132b78fadf7d1f8f71f322be53584b48824af6fb2ce6ac3f86132463a + graceful-fs: "npm:^4.2.8" + streamx: "npm:^2.12.0" + checksum: 10/9fefd9fa3d6985aea0935944288bd20215779f683ec3af3c157cf4d4d4b0c546caae8219219f47a05a1df3b23f6a605fe64bee6ee14e550f1a670db67359ff27 languageName: node linkType: hard @@ -8923,17 +8399,6 @@ __metadata: languageName: node linkType: hard -"fsevents@npm:^1.2.7": - version: 1.2.13 - resolution: "fsevents@npm:1.2.13" - dependencies: - bindings: "npm:^1.5.0" - nan: "npm:^2.12.1" - checksum: 10/ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1 - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -8944,16 +8409,6 @@ __metadata: languageName: node linkType: hard -"fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin": - version: 1.2.13 - resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin::version=1.2.13&hash=d11327" - dependencies: - bindings: "npm:^1.5.0" - nan: "npm:^2.12.1" - conditions: os=darwin - languageName: node - linkType: hard - "fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" @@ -9003,13 +8458,6 @@ __metadata: languageName: node linkType: hard -"get-caller-file@npm:^1.0.1": - version: 1.0.3 - resolution: "get-caller-file@npm:1.0.3" - checksum: 10/0b776558c1d94ac131ec0d47bf9da4e00a38e7d3a6cbde534e0e4656c13ead344e69ef7ed2c0bca16620cc2e1e26529f90e2336c8962736517b64890d583a2a0 - languageName: node - linkType: hard - "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" @@ -9076,13 +8524,6 @@ __metadata: languageName: node linkType: hard -"get-value@npm:^2.0.3, get-value@npm:^2.0.6": - version: 2.0.6 - resolution: "get-value@npm:2.0.6" - checksum: 10/5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb - languageName: node - linkType: hard - "gifwrap@npm:^0.9.2": version: 0.9.4 resolution: "gifwrap@npm:0.9.4" @@ -9093,16 +8534,6 @@ __metadata: languageName: node linkType: hard -"glob-parent@npm:^3.1.0": - version: 3.1.0 - resolution: "glob-parent@npm:3.1.0" - dependencies: - is-glob: "npm:^3.1.0" - path-dirname: "npm:^1.0.0" - checksum: 10/653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855 - languageName: node - linkType: hard - "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -9121,21 +8552,19 @@ __metadata: languageName: node linkType: hard -"glob-stream@npm:^6.1.0": - version: 6.1.0 - resolution: "glob-stream@npm:6.1.0" +"glob-stream@npm:^8.0.0": + version: 8.0.2 + resolution: "glob-stream@npm:8.0.2" dependencies: - extend: "npm:^3.0.0" - glob: "npm:^7.1.1" - glob-parent: "npm:^3.1.0" + "@gulpjs/to-absolute-glob": "npm:^4.0.0" + anymatch: "npm:^3.1.3" + fastq: "npm:^1.13.0" + glob-parent: "npm:^6.0.2" + is-glob: "npm:^4.0.3" is-negated-glob: "npm:^1.0.0" - ordered-read-streams: "npm:^1.0.0" - pumpify: "npm:^1.3.5" - readable-stream: "npm:^2.1.5" - remove-trailing-separator: "npm:^1.0.1" - to-absolute-glob: "npm:^2.0.0" - unique-stream: "npm:^2.0.2" - checksum: 10/7c9ec7be266974186b762ad686813025868067f2ea64a0428c0365b4046cb955d328b1e7498124392ec0026c5826ce2cfa4b41614584fb63edd02421e61db556 + normalize-path: "npm:^3.0.0" + streamx: "npm:^2.12.5" + checksum: 10/cda46c02b6313d4a5cd0a3e67c7a2bd477d5f708904dc761c0d6364611f188a303051ec4e0cd405597522c7f7ffbba530f147754b4bf5af9f18e970c024734d8 languageName: node linkType: hard @@ -9146,18 +8575,13 @@ __metadata: languageName: node linkType: hard -"glob-watcher@npm:^5.0.3": - version: 5.0.5 - resolution: "glob-watcher@npm:5.0.5" +"glob-watcher@npm:^6.0.0": + version: 6.0.0 + resolution: "glob-watcher@npm:6.0.0" dependencies: - anymatch: "npm:^2.0.0" - async-done: "npm:^1.2.0" - chokidar: "npm:^2.0.0" - is-negated-glob: "npm:^1.0.0" - just-debounce: "npm:^1.0.0" - normalize-path: "npm:^3.0.0" - object.defaults: "npm:^1.1.0" - checksum: 10/240bfbe2a2356eb2af826eef9f6af2f481ea05a02787e154facac4e2e6fedcc90452bdd4466ed7c0edad4a3aabed3581250bd8180a7cd83fb36827cad1231608 + async-done: "npm:^2.0.0" + chokidar: "npm:^3.5.3" + checksum: 10/404c4be88d55b9f1a2f5ee49ec92d7fc70b1522411e2d8c94713a421ef983ef6b3c532ce990893eade70285c6b7ad25d33def7367560ce3d5b27f5905d2b6223 languageName: node linkType: hard @@ -9189,7 +8613,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.6": +"glob@npm:^7.1.3, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -9289,12 +8713,12 @@ __metadata: languageName: node linkType: hard -"glogg@npm:^1.0.0": - version: 1.0.2 - resolution: "glogg@npm:1.0.2" +"glogg@npm:^2.2.0": + version: 2.2.0 + resolution: "glogg@npm:2.2.0" dependencies: - sparkles: "npm:^1.0.0" - checksum: 10/e8343d0a2b647ed146dcd1585467014853fa568d3b7f49405576775313184390c6d557a16eadfef2b04e63302769d8e0785343169173c8ad4e4c2b54cf25a8c0 + sparkles: "npm:^2.1.0" + checksum: 10/9213c7b0835a05e32e40239187af611b54eacadaf434123be2d0538e89efdf8429b5453821c2da3906863fd6824ae978a0364aeaf8f6bcf51aa78c7b241c0c5d languageName: node linkType: hard @@ -9314,7 +8738,7 @@ __metadata: 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.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": +"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.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.8": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2 @@ -9328,31 +8752,25 @@ __metadata: languageName: node linkType: hard -"gulp-cli@npm:^2.2.0": - version: 2.3.0 - resolution: "gulp-cli@npm:2.3.0" +"gulp-cli@npm:^3.0.0": + version: 3.0.0 + resolution: "gulp-cli@npm:3.0.0" dependencies: - ansi-colors: "npm:^1.0.1" - archy: "npm:^1.0.0" - array-sort: "npm:^1.0.0" - color-support: "npm:^1.1.3" - concat-stream: "npm:^1.6.0" - copy-props: "npm:^2.0.1" - fancy-log: "npm:^1.3.2" - gulplog: "npm:^1.0.0" - interpret: "npm:^1.4.0" - isobject: "npm:^3.0.1" - liftoff: "npm:^3.1.0" - matchdep: "npm:^2.0.0" - mute-stdout: "npm:^1.0.0" - pretty-hrtime: "npm:^1.0.0" - replace-homedir: "npm:^1.0.0" - semver-greatest-satisfied-range: "npm:^1.1.0" - v8flags: "npm:^3.2.0" - yargs: "npm:^7.1.0" + "@gulpjs/messages": "npm:^1.1.0" + chalk: "npm:^4.1.2" + copy-props: "npm:^4.0.0" + gulplog: "npm:^2.2.0" + interpret: "npm:^3.1.1" + liftoff: "npm:^5.0.0" + mute-stdout: "npm:^2.0.0" + replace-homedir: "npm:^2.0.0" + semver-greatest-satisfied-range: "npm:^2.0.0" + string-width: "npm:^4.2.3" + v8flags: "npm:^4.0.0" + yargs: "npm:^16.2.0" bin: gulp: bin/gulp.js - checksum: 10/d1a47535b6aba7167d42fcca341939e3b5a907976dd8a5fcc6a0c03723f9d74156d49cf4b82aa3e30d6d56cfbb54dd145874b58ad4bb859666c1ee537933d65b + checksum: 10/19c8dd8e716480800bc94c7bb0804f006b35686b1fb00ad8b41471058fb73e459444c81093585b32cad449db4d6e200dc7c8d0620e6b35549a2c06191900f3b4 languageName: node linkType: hard @@ -9405,26 +8823,26 @@ __metadata: languageName: node linkType: hard -"gulp@npm:4.0.2": - version: 4.0.2 - resolution: "gulp@npm:4.0.2" +"gulp@npm:5.0.0": + version: 5.0.0 + resolution: "gulp@npm:5.0.0" dependencies: - glob-watcher: "npm:^5.0.3" - gulp-cli: "npm:^2.2.0" - undertaker: "npm:^1.2.1" - vinyl-fs: "npm:^3.0.0" + glob-watcher: "npm:^6.0.0" + gulp-cli: "npm:^3.0.0" + undertaker: "npm:^2.0.0" + vinyl-fs: "npm:^4.0.0" bin: - gulp: ./bin/gulp.js - checksum: 10/1e8a49ea2c6b6a7b084777b1c1f5508264a1984e3fa450a9c88c714651907d542ebdec614bb5e130fc2c3d1dd7b7d1444abc9c9e8e99350b19fcdaad03da730f + gulp: bin/gulp.js + checksum: 10/d093ce9fbfb711d9a39635c9928dc2ebf502164358d6aa2e092f2d33ec76c16ecf8c959f4d1b7c924fc087af9cfb6fcfc1a8d0cb2a4604409e4fd17e26307dd4 languageName: node linkType: hard -"gulplog@npm:^1.0.0": - version: 1.0.0 - resolution: "gulplog@npm:1.0.0" +"gulplog@npm:^2.2.0": + version: 2.2.0 + resolution: "gulplog@npm:2.2.0" dependencies: - glogg: "npm:^1.0.0" - checksum: 10/e3282db891c41974b7bea670fe728ed1af17ef5379babdcea2f6e0e5efddce8a2bcccc1eed1654bf1f7446aa351421f1cc5966cf03adefe74ab63f8b9a3d4a8a + glogg: "npm:^2.2.0" + checksum: 10/dff22c7347bdb5276ceccedfb89d36e515afb049d74587f032f1f5a493fc177c0d2b82e38086babc707910491b29569002c2e75206595ff7926aeae124f91756 languageName: node linkType: hard @@ -9488,45 +8906,6 @@ __metadata: languageName: node linkType: hard -"has-value@npm:^0.3.1": - version: 0.3.1 - resolution: "has-value@npm:0.3.1" - dependencies: - get-value: "npm:^2.0.3" - has-values: "npm:^0.1.4" - isobject: "npm:^2.0.0" - checksum: 10/29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f - languageName: node - linkType: hard - -"has-value@npm:^1.0.0": - version: 1.0.0 - resolution: "has-value@npm:1.0.0" - dependencies: - get-value: "npm:^2.0.6" - has-values: "npm:^1.0.0" - isobject: "npm:^3.0.0" - checksum: 10/b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847 - languageName: node - linkType: hard - -"has-values@npm:^0.1.4": - version: 0.1.4 - resolution: "has-values@npm:0.1.4" - checksum: 10/ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc - languageName: node - linkType: hard - -"has-values@npm:^1.0.0": - version: 1.0.0 - resolution: "has-values@npm:1.0.0" - dependencies: - is-number: "npm:^3.0.0" - kind-of: "npm:^4.0.0" - checksum: 10/77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11 - languageName: node - linkType: hard - "hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2": version: 2.0.2 resolution: "hasown@npm:2.0.2" @@ -9705,7 +9084,7 @@ __metadata: fuse.js: "npm:7.0.0" glob: "npm:10.3.12" google-timezones-json: "npm:1.2.0" - gulp: "npm:4.0.2" + gulp: "npm:5.0.0" gulp-json-transform: "npm:0.5.0" gulp-merge-json: "npm:2.2.1" gulp-rename: "npm:2.0.0" @@ -9801,13 +9180,6 @@ __metadata: languageName: node linkType: hard -"hosted-git-info@npm:^2.1.4": - version: 2.8.9 - resolution: "hosted-git-info@npm:2.8.9" - checksum: 10/96da7d412303704af41c3819207a09ea2cab2de97951db4cf336bb8bce8d8e36b9a6821036ad2e55e67d3be0af8f967a7b57981203fbfb88bc05cd803407b8c3 - languageName: node - linkType: hard - "hpack.js@npm:^2.1.6": version: 2.1.6 resolution: "hpack.js@npm:2.1.6" @@ -10011,7 +9383,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2": +"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: @@ -10117,7 +9489,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 10/cd45e923bee15186c07fa4c89db0aace24824c482fb887b528304694b2aa6ff8a898da8657046a5dcf3e46cd6db6c61629551f9215f208d7c3f157cf9b290521 @@ -10192,13 +9564,6 @@ __metadata: languageName: node linkType: hard -"invert-kv@npm:^1.0.0": - version: 1.0.0 - resolution: "invert-kv@npm:1.0.0" - checksum: 10/0820af99ca21818fa4a78815a8d06cf621a831306a5db57d7558234624b4891a89bb19a95fc3a868db4e754384c0ee38b70a00b75d81a0a46ee3937184a7cf6d - languageName: node - linkType: hard - "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -10240,15 +9605,6 @@ __metadata: languageName: node linkType: hard -"is-accessor-descriptor@npm:^1.0.1": - version: 1.0.1 - resolution: "is-accessor-descriptor@npm:1.0.1" - dependencies: - hasown: "npm:^2.0.0" - checksum: 10/df0d1da1a320e57c594e6f9b52dab8a6bece6dc90e51689d05ac8e5247164aa3eb3e9c66b37027bebfc0ea5fcce6d9503dbc41dccd82f4b57add79a307735365 - languageName: node - linkType: hard - "is-array-buffer@npm:^3.0.4": version: 3.0.4 resolution: "is-array-buffer@npm:3.0.4" @@ -10259,13 +9615,6 @@ __metadata: languageName: node linkType: hard -"is-arrayish@npm:^0.2.1": - version: 0.2.1 - resolution: "is-arrayish@npm:0.2.1" - checksum: 10/73ced84fa35e59e2c57da2d01e12cd01479f381d7f122ce41dcbb713f09dbfc651315832cd2bf8accba7681a69e4d6f1e03941d94dd10040d415086360e7005e - languageName: node - linkType: hard - "is-bigint@npm:^1.0.1": version: 1.0.4 resolution: "is-bigint@npm:1.0.4" @@ -10275,15 +9624,6 @@ __metadata: languageName: node linkType: hard -"is-binary-path@npm:^1.0.0": - version: 1.0.1 - resolution: "is-binary-path@npm:1.0.1" - dependencies: - binary-extensions: "npm:^1.0.0" - checksum: 10/a803c99e9d898170c3b44a86fbdc0736d3d7fcbe737345433fb78e810b9fe30c982657782ad0e676644ba4693ddf05601a7423b5611423218663d6b533341ac9 - languageName: node - linkType: hard - "is-binary-path@npm:~2.1.0": version: 2.1.0 resolution: "is-binary-path@npm:2.1.0" @@ -10303,13 +9643,6 @@ __metadata: languageName: node linkType: hard -"is-buffer@npm:^1.1.5": - version: 1.1.6 - resolution: "is-buffer@npm:1.1.6" - checksum: 10/f63da109e74bbe8947036ed529d43e4ae0c5fcd0909921dce4917ad3ea212c6a87c29f525ba1d17c0858c18331cf1046d4fc69ef59ed26896b25c8288a627133 - languageName: node - linkType: hard - "is-builtin-module@npm:^3.0.0, is-builtin-module@npm:^3.1.0, is-builtin-module@npm:^3.2.1": version: 3.2.1 resolution: "is-builtin-module@npm:3.2.1" @@ -10335,15 +9668,6 @@ __metadata: languageName: node linkType: hard -"is-data-descriptor@npm:^1.0.1": - version: 1.0.1 - resolution: "is-data-descriptor@npm:1.0.1" - dependencies: - hasown: "npm:^2.0.0" - checksum: 10/49b36e903b31623b0c5b416e182e366810ef97a3a19ab0e6cd501eb5599112680b7d9e768b07a84fb52aa2510a92b3eb51a3e18ce8d5f7978a49f4b50e6ec6dd - languageName: node - linkType: hard - "is-data-view@npm:^1.0.1": version: 1.0.1 resolution: "is-data-view@npm:1.0.1" @@ -10362,26 +9686,6 @@ __metadata: languageName: node linkType: hard -"is-descriptor@npm:^0.1.0": - version: 0.1.7 - resolution: "is-descriptor@npm:0.1.7" - dependencies: - is-accessor-descriptor: "npm:^1.0.1" - is-data-descriptor: "npm:^1.0.1" - checksum: 10/38783182c3d83f839a9fa3e87b4d6de11fa9639833ed98993ea51aea2296b2da155121956e148695a738228871d1057c5f963d0b1c857bb8a4a38d8dd9ceeb56 - languageName: node - linkType: hard - -"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2": - version: 1.0.3 - resolution: "is-descriptor@npm:1.0.3" - dependencies: - is-accessor-descriptor: "npm:^1.0.1" - is-data-descriptor: "npm:^1.0.1" - checksum: 10/b940d04d93adaffb749b3ca7f7f6d73dd3c5582b674f372513ecb5511a8a3f3ff4a24f4c1161cb10e48fe4886f9e84c09fa71785def27905ca8df1197e563dc6 - languageName: node - linkType: hard - "is-docker@npm:^2.0.0, is-docker@npm:^2.1.1": version: 2.2.1 resolution: "is-docker@npm:2.2.1" @@ -10400,13 +9704,6 @@ __metadata: languageName: node linkType: hard -"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1": - version: 0.1.1 - resolution: "is-extendable@npm:0.1.1" - checksum: 10/3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672 - languageName: node - linkType: hard - "is-extendable@npm:^1.0.1": version: 1.0.1 resolution: "is-extendable@npm:1.0.1" @@ -10416,22 +9713,13 @@ __metadata: languageName: node linkType: hard -"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": +"is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" checksum: 10/df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85 languageName: node linkType: hard -"is-fullwidth-code-point@npm:^1.0.0": - version: 1.0.0 - resolution: "is-fullwidth-code-point@npm:1.0.0" - dependencies: - number-is-nan: "npm:^1.0.0" - checksum: 10/4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57 - languageName: node - linkType: hard - "is-fullwidth-code-point@npm:^3.0.0": version: 3.0.0 resolution: "is-fullwidth-code-point@npm:3.0.0" @@ -10471,15 +9759,6 @@ __metadata: languageName: node linkType: hard -"is-glob@npm:^3.1.0": - version: 3.1.0 - resolution: "is-glob@npm:3.1.0" - dependencies: - is-extglob: "npm:^2.1.0" - checksum: 10/9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc - languageName: node - linkType: hard - "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": version: 4.0.3 resolution: "is-glob@npm:4.0.3" @@ -10544,22 +9823,6 @@ __metadata: languageName: node linkType: hard -"is-number@npm:^3.0.0": - version: 3.0.0 - resolution: "is-number@npm:3.0.0" - dependencies: - kind-of: "npm:^3.0.2" - checksum: 10/0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9 - languageName: node - linkType: hard - -"is-number@npm:^4.0.0": - version: 4.0.0 - resolution: "is-number@npm:4.0.0" - checksum: 10/7f25967eb4fd92c4c5c282f6510c86d257de5894501b831ae6ab44a964c690ba721eef931eb2aaad2aacf35fd0cf57b9d2135b0bd25147dc5bc64f99fbca1785 - languageName: node - linkType: hard - "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -10609,7 +9872,7 @@ __metadata: languageName: node linkType: hard -"is-plain-object@npm:^2.0.1, is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": +"is-plain-object@npm:^2.0.4": version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" dependencies: @@ -10733,13 +9996,6 @@ __metadata: languageName: node linkType: hard -"is-utf8@npm:^0.2.0, is-utf8@npm:^0.2.1": - version: 0.2.1 - resolution: "is-utf8@npm:0.2.1" - checksum: 10/167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3 - languageName: node - linkType: hard - "is-valid-element-name@npm:^1.0.0": version: 1.0.0 resolution: "is-valid-element-name@npm:1.0.0" @@ -10765,7 +10021,7 @@ __metadata: languageName: node linkType: hard -"is-windows@npm:^1.0.1, is-windows@npm:^1.0.2": +"is-windows@npm:^1.0.1": version: 1.0.2 resolution: "is-windows@npm:1.0.2" checksum: 10/438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7 @@ -10790,13 +10046,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:1.0.0, isarray@npm:~1.0.0": - version: 1.0.0 - resolution: "isarray@npm:1.0.0" - checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab - languageName: node - linkType: hard - "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -10804,6 +10053,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:~1.0.0": + version: 1.0.0 + resolution: "isarray@npm:1.0.0" + checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab + languageName: node + linkType: hard + "isbinaryfile@npm:^5.0.0": version: 5.0.2 resolution: "isbinaryfile@npm:5.0.2" @@ -10825,15 +10081,6 @@ __metadata: languageName: node linkType: hard -"isobject@npm:^2.0.0": - version: 2.1.0 - resolution: "isobject@npm:2.1.0" - dependencies: - isarray: "npm:1.0.0" - checksum: 10/811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f - languageName: node - linkType: hard - "isobject@npm:^3.0.0, isobject@npm:^3.0.1": version: 3.0.1 resolution: "isobject@npm:3.0.1" @@ -11041,13 +10288,6 @@ __metadata: languageName: node linkType: hard -"just-debounce@npm:^1.0.0": - version: 1.1.0 - resolution: "just-debounce@npm:1.1.0" - checksum: 10/6f43d4d9b25ad45d8c2970f839d378b4d161f6da7e5fecfa3bab478d2567ea07d8992ca957009820704dc1accd211f816ffb15ace7e3a0a7254f1830b4914265 - languageName: node - linkType: hard - "just-extend@npm:^6.2.0": version: 6.2.0 resolution: "just-extend@npm:6.2.0" @@ -11073,31 +10313,6 @@ __metadata: languageName: node linkType: hard -"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0": - version: 3.2.2 - resolution: "kind-of@npm:3.2.2" - dependencies: - is-buffer: "npm:^1.1.5" - checksum: 10/b6e7eed10f9dea498500e73129c9bf289bc417568658648aecfc2e104aa32683b908e5d349563fc78d6752da0ea60c9ed1dda4b24dd85a0c8fc0c7376dc0acac - languageName: node - linkType: hard - -"kind-of@npm:^4.0.0": - version: 4.0.0 - resolution: "kind-of@npm:4.0.0" - dependencies: - is-buffer: "npm:^1.1.5" - checksum: 10/b35a90e0690f06bf07c8970b5290256b1740625fb3bf17ef8c9813a9e197302dbe9ad710b0d97a44556c9280becfc2132cbc3b370056f63b7e350a85f79088f1 - languageName: node - linkType: hard - -"kind-of@npm:^5.0.2": - version: 5.1.0 - resolution: "kind-of@npm:5.1.0" - checksum: 10/acf7cc73881f27629f700a80de77ff7fe4abc9430eac7ddb09117f75126e578ee8d7e44c4dacb6a9e802d5d881abf007ee6af3cfbe55f8b5cf0a7fdc49a02aa3 - languageName: node - linkType: hard - "kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" @@ -11199,13 +10414,10 @@ __metadata: languageName: node linkType: hard -"last-run@npm:^1.1.0": - version: 1.1.1 - resolution: "last-run@npm:1.1.1" - dependencies: - default-resolution: "npm:^2.0.0" - es6-weak-map: "npm:^2.0.1" - checksum: 10/2a49b4d13a8b61a42bebd93f3c6301eeb0c5af25f5004a04f9558c9793fd6ec1cb4be47de6f7ba8d6e3731b64ba62db390fa3fd8afb87e35b6e67c12103a3181 +"last-run@npm:^2.0.0": + version: 2.0.0 + resolution: "last-run@npm:2.0.0" + checksum: 10/a594c4bb4312258c625e3b40b760d5ce9ff183f90cd77a73dc509ff8d9f215ce7754755d843d8489ea97ef39cbe5975401889f29d0022a820321563dcd1ac184 languageName: node linkType: hard @@ -11219,30 +10431,10 @@ __metadata: languageName: node linkType: hard -"lazystream@npm:^1.0.0": - version: 1.0.1 - resolution: "lazystream@npm:1.0.1" - dependencies: - readable-stream: "npm:^2.0.5" - checksum: 10/35f8cf8b5799c76570b211b079d4d706a20cbf13a4936d44cc7dbdacab1de6b346ab339ed3e3805f4693155ee5bbebbda4050fa2b666d61956e89a573089e3d4 - languageName: node - linkType: hard - -"lcid@npm:^1.0.0": - version: 1.0.0 - resolution: "lcid@npm:1.0.0" - dependencies: - invert-kv: "npm:^1.0.0" - checksum: 10/e8c7a4db07663068c5c44b650938a2bc41aa992037eebb69376214320f202c1250e70b50c32f939e28345fd30c2d35b8e8cd9a19d5932c398246a864ce54843d - languageName: node - linkType: hard - -"lead@npm:^1.0.0": - version: 1.0.0 - resolution: "lead@npm:1.0.0" - dependencies: - flush-write-stream: "npm:^1.0.2" - checksum: 10/f08a9f45ac39b8d1fecf31de4d97a8fa2aa7e233e99bb61fd443414fc8055331224490698e186cb614aa3ea2f2695d71c42afc85415fa680b078d640efadab50 +"lead@npm:^4.0.0": + version: 4.0.0 + resolution: "lead@npm:4.0.0" + checksum: 10/7117297c29b94e4846822e5ae0a25780af834586c0862b89ff899e44547f4f742d67801f19838b34611d36eec44868604c55525e12d2a1fb0c9496a9792ca396 languageName: node linkType: hard @@ -11293,19 +10485,18 @@ __metadata: languageName: node linkType: hard -"liftoff@npm:^3.1.0": - version: 3.1.0 - resolution: "liftoff@npm:3.1.0" +"liftoff@npm:^5.0.0": + version: 5.0.0 + resolution: "liftoff@npm:5.0.0" dependencies: - extend: "npm:^3.0.0" - findup-sync: "npm:^3.0.0" - fined: "npm:^1.0.1" - flagged-respawn: "npm:^1.0.0" - is-plain-object: "npm:^2.0.4" - object.map: "npm:^1.0.0" - rechoir: "npm:^0.6.2" - resolve: "npm:^1.1.7" - checksum: 10/af0ea7c51c42ac9250c22c4281111381f842a5cb64d233c6e0b49822ef611c8ccb78a1f2f74d94201715796c3a57a107ac8157e49149a0d8ab51c343a80d2174 + extend: "npm:^3.0.2" + findup-sync: "npm:^5.0.0" + fined: "npm:^2.0.0" + flagged-respawn: "npm:^2.0.0" + is-plain-object: "npm:^5.0.0" + rechoir: "npm:^0.8.0" + resolve: "npm:^1.20.0" + checksum: 10/97aab6ed2a0ad069abcfc125dabddeff65b2054d2660bcda85e20e7e5a89f338340f05e651e48eece8816a7e4d1a4ef4757af097919171b903b00dacdbdfc94b languageName: node linkType: hard @@ -11427,19 +10618,6 @@ __metadata: languageName: node linkType: hard -"load-json-file@npm:^1.0.0": - version: 1.1.0 - resolution: "load-json-file@npm:1.1.0" - dependencies: - graceful-fs: "npm:^4.1.2" - parse-json: "npm:^2.2.0" - pify: "npm:^2.0.0" - pinkie-promise: "npm:^2.0.0" - strip-bom: "npm:^2.0.0" - checksum: 10/bb16e169d87df38806f5ffa7efa3287921839fdfee2c20c8525f53b53ba43d14b56b6881901c04190f7da4a4ba6e0c9784d212e83ee3a32d49bb986b5a6094cb - languageName: node - linkType: hard - "loader-runner@npm:^4.2.0": version: 4.3.0 resolution: "loader-runner@npm:4.3.0" @@ -11680,16 +10858,7 @@ __metadata: languageName: node linkType: hard -"make-iterator@npm:^1.0.0": - version: 1.0.1 - resolution: "make-iterator@npm:1.0.1" - dependencies: - kind-of: "npm:^6.0.2" - checksum: 10/d38afc388f4374b15c0622d4fa4d3e8c3154e3a6ba35b01e9a5179c127d7dd09a91fa571056aa9e041981b39f80bdbab035c05475e56ef675a18bdf550f0cb6a - languageName: node - linkType: hard - -"map-cache@npm:^0.2.0, map-cache@npm:^0.2.2": +"map-cache@npm:^0.2.0": version: 0.2.2 resolution: "map-cache@npm:0.2.2" checksum: 10/3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969 @@ -11703,15 +10872,6 @@ __metadata: languageName: node linkType: hard -"map-visit@npm:^1.0.0": - version: 1.0.0 - resolution: "map-visit@npm:1.0.0" - dependencies: - object-visit: "npm:^1.0.0" - checksum: 10/c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a - languageName: node - linkType: hard - "markdown-table@npm:^2.0.0": version: 2.0.0 resolution: "markdown-table@npm:2.0.0" @@ -11730,18 +10890,6 @@ __metadata: languageName: node linkType: hard -"matchdep@npm:^2.0.0": - version: 2.0.0 - resolution: "matchdep@npm:2.0.0" - dependencies: - findup-sync: "npm:^2.0.0" - micromatch: "npm:^3.0.4" - resolve: "npm:^1.4.0" - stack-trace: "npm:0.0.10" - checksum: 10/2fc824d96fd80ea5fbdb46779b610ee694c138a8b10a267a29b442d9253b489d01866a1557e48ef98923b7132b94c868cb937b7564d6d2900729abaec75197d9 - languageName: node - linkType: hard - "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -11819,27 +10967,6 @@ __metadata: languageName: node linkType: hard -"micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": - version: 3.1.10 - resolution: "micromatch@npm:3.1.10" - dependencies: - arr-diff: "npm:^4.0.0" - array-unique: "npm:^0.3.2" - braces: "npm:^2.3.1" - define-property: "npm:^2.0.2" - extend-shallow: "npm:^3.0.2" - extglob: "npm:^2.0.4" - fragment-cache: "npm:^0.2.1" - kind-of: "npm:^6.0.2" - nanomatch: "npm:^1.2.9" - object.pick: "npm:^1.3.0" - regex-not: "npm:^1.0.0" - snapdragon: "npm:^0.8.1" - to-regex: "npm:^3.0.2" - checksum: 10/4102bac83685dc7882ca1a28443d158b464653f84450de68c07cf77dbd531ed98c25006e9d9f6082bf3b95aabbff4cf231b26fd3bc84f7c4e7f263376101fad6 - languageName: node - linkType: hard - "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -12055,16 +11182,6 @@ __metadata: languageName: node linkType: hard -"mixin-deep@npm:^1.2.0": - version: 1.3.2 - resolution: "mixin-deep@npm:1.3.2" - dependencies: - for-in: "npm:^1.0.2" - is-extendable: "npm:^1.0.1" - checksum: 10/820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d - languageName: node - linkType: hard - "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.6": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" @@ -12158,19 +11275,10 @@ __metadata: languageName: node linkType: hard -"mute-stdout@npm:^1.0.0": - version: 1.0.1 - resolution: "mute-stdout@npm:1.0.1" - checksum: 10/7fcb575752076e13ec45bbeb93354bcf1d1e51522d60df84915996cd9b5fe7b8ceb285e9e419beb426c3e1375c820da5325d4cecf947cd6f7efd8d1db090c552 - languageName: node - linkType: hard - -"nan@npm:^2.12.1": - version: 2.19.0 - resolution: "nan@npm:2.19.0" - dependencies: - node-gyp: "npm:latest" - checksum: 10/b97f680753113bcd803cb174e40baa01e04aa4cb95ee62b48841336d9c48b278a2eeff71a4a0d7315b8f639fb1e38049925d3be1c6e266c158dc8f7d95d67eaa +"mute-stdout@npm:^2.0.0": + version: 2.0.0 + resolution: "mute-stdout@npm:2.0.0" + checksum: 10/5324d58cc6b0df0173cb671f40c8bc3a843ab3804db925fdf561b734ca509d3ad8546744e211ac933d384e7e699092f43fc5712b38d5ddf29ecf9c963358d67c languageName: node linkType: hard @@ -12190,25 +11298,6 @@ __metadata: languageName: node linkType: hard -"nanomatch@npm:^1.2.9": - version: 1.2.13 - resolution: "nanomatch@npm:1.2.13" - dependencies: - arr-diff: "npm:^4.0.0" - array-unique: "npm:^0.3.2" - define-property: "npm:^2.0.2" - extend-shallow: "npm:^3.0.2" - fragment-cache: "npm:^0.2.1" - is-windows: "npm:^1.0.2" - kind-of: "npm:^6.0.2" - object.pick: "npm:^1.3.0" - regex-not: "npm:^1.0.0" - snapdragon: "npm:^0.8.1" - to-regex: "npm:^3.0.1" - checksum: 10/5c4ec7d6264b93795248f22d19672f0b972f900772c057bc67e43ae4999165b5fea7b937359efde78707930a460ceaa6d93e0732ac1d993dab8654655a2e959b - languageName: node - linkType: hard - "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -12230,13 +11319,6 @@ __metadata: languageName: node linkType: hard -"next-tick@npm:^1.1.0": - version: 1.1.0 - resolution: "next-tick@npm:1.1.0" - checksum: 10/83b5cf36027a53ee6d8b7f9c0782f2ba87f4858d977342bfc3c20c21629290a2111f8374d13a81221179603ffc4364f38374b5655d17b6a8f8a8c77bdea4fe8b - languageName: node - linkType: hard - "nise@npm:^5.1.5": version: 5.1.9 resolution: "nise@npm:5.1.9" @@ -12343,40 +11425,19 @@ __metadata: languageName: node linkType: hard -"normalize-package-data@npm:^2.3.2": - version: 2.5.0 - resolution: "normalize-package-data@npm:2.5.0" - dependencies: - hosted-git-info: "npm:^2.1.4" - resolve: "npm:^1.10.0" - semver: "npm:2 || 3 || 4 || 5" - validate-npm-package-license: "npm:^3.0.1" - checksum: 10/644f830a8bb9b7cc9bf2f6150618727659ee27cdd0840d1c1f97e8e6cab0803a098a2c19f31c6247ad9d3a0792e61521a13a6e8cd87cc6bb676e3150612c03d4 - languageName: node - linkType: hard - -"normalize-path@npm:^2.1.1": - version: 2.1.1 - resolution: "normalize-path@npm:2.1.1" - dependencies: - remove-trailing-separator: "npm:^1.0.1" - checksum: 10/7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea - languageName: node - linkType: hard - -"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": +"normalize-path@npm:3.0.0, normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" checksum: 10/88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20 languageName: node linkType: hard -"now-and-later@npm:^2.0.0": - version: 2.0.1 - resolution: "now-and-later@npm:2.0.1" +"now-and-later@npm:^3.0.0": + version: 3.0.0 + resolution: "now-and-later@npm:3.0.0" dependencies: - once: "npm:^1.3.2" - checksum: 10/f5afe432eb7d9bad311ff886714bcd01b2def305b262bc93ad0163b786e740ed1c8baa6f3ccb0e491ac7842dd2ee523439992d7419c227d0e6640693171dc8c4 + once: "npm:^1.4.0" + checksum: 10/5300d42932bac5d4f8d19bf90ebb53c3474ba615eab912770d1b8de896baea6dc7ef3b95158aaf601acfb0cd6b573bceb5fe30cf0224cb06ea227ef3e8fc7f3d languageName: node linkType: hard @@ -12398,24 +11459,6 @@ __metadata: languageName: node linkType: hard -"number-is-nan@npm:^1.0.0": - version: 1.0.1 - resolution: "number-is-nan@npm:1.0.1" - checksum: 10/13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb - languageName: node - linkType: hard - -"object-copy@npm:^0.1.0": - version: 0.1.0 - resolution: "object-copy@npm:0.1.0" - dependencies: - copy-descriptor: "npm:^0.1.0" - define-property: "npm:^0.2.5" - kind-of: "npm:^3.0.3" - checksum: 10/a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783 - languageName: node - linkType: hard - "object-hash@npm:3.0.0": version: 3.0.0 resolution: "object-hash@npm:3.0.0" @@ -12437,16 +11480,7 @@ __metadata: languageName: node linkType: hard -"object-visit@npm:^1.0.0": - version: 1.0.1 - resolution: "object-visit@npm:1.0.1" - dependencies: - isobject: "npm:^3.0.0" - checksum: 10/77abf807de86fa65bf1ba92699b45b1e5485f2d899300d5cb92cca0863909e9528b6cbf366c237c9f5d2264dab6cfbeda2201252ed0e605ae1b3e263515c5cea - languageName: node - linkType: hard - -"object.assign@npm:^4.0.4, object.assign@npm:^4.1.0, object.assign@npm:^4.1.2, object.assign@npm:^4.1.5": +"object.assign@npm:^4.1.2, object.assign@npm:^4.1.5": version: 4.1.5 resolution: "object.assign@npm:4.1.5" dependencies: @@ -12458,7 +11492,7 @@ __metadata: languageName: node linkType: hard -"object.defaults@npm:^1.0.0, object.defaults@npm:^1.1.0": +"object.defaults@npm:^1.1.0": version: 1.1.0 resolution: "object.defaults@npm:1.1.0" dependencies: @@ -12504,17 +11538,7 @@ __metadata: languageName: node linkType: hard -"object.map@npm:^1.0.0": - version: 1.0.1 - resolution: "object.map@npm:1.0.1" - dependencies: - for-own: "npm:^1.0.0" - make-iterator: "npm:^1.0.0" - checksum: 10/c2b945a309f789441fae30e4c0772066b45ad03eb1c0f91b8ae117700c975676652b356f61635fe0b21ae021d98f10a04d2f1c6cf30aef14111154e756b162d7 - languageName: node - linkType: hard - -"object.pick@npm:^1.2.0, object.pick@npm:^1.3.0": +"object.pick@npm:^1.3.0": version: 1.3.0 resolution: "object.pick@npm:1.3.0" dependencies: @@ -12523,16 +11547,6 @@ __metadata: languageName: node linkType: hard -"object.reduce@npm:^1.0.0": - version: 1.0.1 - resolution: "object.reduce@npm:1.0.1" - dependencies: - for-own: "npm:^1.0.0" - make-iterator: "npm:^1.0.0" - checksum: 10/71480cd250d092b89ea0e12db4589b3dac2ae712e47f2f2434749f49989b197ef0cae1cfdb249721c1221f661ac730438d146288d7a55587ddef3c48ce0e33f0 - languageName: node - linkType: hard - "object.values@npm:^1.1.7": version: 1.2.0 resolution: "object.values@npm:1.2.0" @@ -12574,7 +11588,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.3.2, once@npm:^1.4.0": +"once@npm:^1.3.0, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -12645,24 +11659,6 @@ __metadata: languageName: node linkType: hard -"ordered-read-streams@npm:^1.0.0": - version: 1.0.1 - resolution: "ordered-read-streams@npm:1.0.1" - dependencies: - readable-stream: "npm:^2.0.1" - checksum: 10/7558ac1acd649164524be715d25e38a1aba0f34df9dfb8ce281f9d14589ac3506bfe66e6609fa8c9cf0d7835e11da33f3f5445336cf3eb783f81da09a1bc5fe8 - languageName: node - linkType: hard - -"os-locale@npm:^1.4.0": - version: 1.4.0 - resolution: "os-locale@npm:1.4.0" - dependencies: - lcid: "npm:^1.0.0" - checksum: 10/0161a1b6b5a8492f99f4b47fe465df9fc521c55ba5414fce6444c45e2500487b8ed5b40a47a98a2363fe83ff04ab033785300ed8df717255ec4c3b625e55b1fb - languageName: node - linkType: hard - "p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -12803,7 +11799,7 @@ __metadata: languageName: node linkType: hard -"parse-filepath@npm:^1.0.1": +"parse-filepath@npm:^1.0.2": version: 1.0.2 resolution: "parse-filepath@npm:1.0.2" dependencies: @@ -12821,15 +11817,6 @@ __metadata: languageName: node linkType: hard -"parse-json@npm:^2.2.0": - version: 2.2.0 - resolution: "parse-json@npm:2.2.0" - dependencies: - error-ex: "npm:^1.2.0" - checksum: 10/39924c0ddbf6f2544ab92acea61d91a0fb0ac959b0d19d273468cf8aa977522f8076e8fbb29cdab75c1440ebc2e172389988274890373d95fe308837074cc7e0 - languageName: node - linkType: hard - "parse-node-version@npm:^1.0.0": version: 1.0.1 resolution: "parse-node-version@npm:1.0.1" @@ -12900,29 +11887,6 @@ __metadata: languageName: node linkType: hard -"pascalcase@npm:^0.1.1": - version: 0.1.1 - resolution: "pascalcase@npm:0.1.1" - checksum: 10/f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925 - languageName: node - linkType: hard - -"path-dirname@npm:^1.0.0": - version: 1.0.2 - resolution: "path-dirname@npm:1.0.2" - checksum: 10/0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f - languageName: node - linkType: hard - -"path-exists@npm:^2.0.0": - version: 2.1.0 - resolution: "path-exists@npm:2.1.0" - dependencies: - pinkie-promise: "npm:^2.0.0" - checksum: 10/fdb734f1d00f225f7a0033ce6d73bff6a7f76ea08936abf0e5196fa6e54a645103538cd8aedcb90d6d8c3fa3705ded0c58a4da5948ae92aa8834892c1ab44a84 - languageName: node - linkType: hard - "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -13019,17 +11983,6 @@ __metadata: languageName: node linkType: hard -"path-type@npm:^1.0.0": - version: 1.1.0 - resolution: "path-type@npm:1.1.0" - dependencies: - graceful-fs: "npm:^4.1.2" - pify: "npm:^2.0.0" - pinkie-promise: "npm:^2.0.0" - checksum: 10/59a4b2c0e566baf4db3021a1ed4ec09a8b36fca960a490b54a6bcefdb9987dafe772852982b6011cd09579478a96e57960a01f75fa78a794192853c9d468fc79 - languageName: node - linkType: hard - "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -13081,29 +12034,6 @@ __metadata: languageName: node linkType: hard -"pify@npm:^2.0.0": - version: 2.3.0 - resolution: "pify@npm:2.3.0" - checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba - languageName: node - linkType: hard - -"pinkie-promise@npm:^2.0.0": - version: 2.0.1 - resolution: "pinkie-promise@npm:2.0.1" - dependencies: - pinkie: "npm:^2.0.0" - checksum: 10/b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca - languageName: node - linkType: hard - -"pinkie@npm:^2.0.0": - version: 2.0.4 - resolution: "pinkie@npm:2.0.4" - checksum: 10/11d207257a044d1047c3755374d36d84dda883a44d030fe98216bf0ea97da05a5c9d64e82495387edeb9ee4f52c455bca97cdb97629932be65e6f54b29f5aec8 - languageName: node - linkType: hard - "pinst@npm:3.0.0": version: 3.0.0 resolution: "pinst@npm:3.0.0" @@ -13188,13 +12118,6 @@ __metadata: languageName: node linkType: hard -"posix-character-classes@npm:^0.1.0": - version: 0.1.1 - resolution: "posix-character-classes@npm:0.1.1" - checksum: 10/dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442 - languageName: node - linkType: hard - "possible-typed-array-names@npm:^1.0.0": version: 1.0.0 resolution: "possible-typed-array-names@npm:1.0.0" @@ -13252,13 +12175,6 @@ __metadata: languageName: node linkType: hard -"pretty-hrtime@npm:^1.0.0": - version: 1.0.3 - resolution: "pretty-hrtime@npm:1.0.3" - checksum: 10/0a462e88a0a3fd3320288fd8307f488974326ae8e13eea8c27f590f8ee767ccb59cf35bcae1cadff241cd8b72f3e373fc76ff1be95243649899bf8c816874af9 - languageName: node - linkType: hard - "pretty-time@npm:^1.1.0": version: 1.1.0 resolution: "pretty-time@npm:1.1.0" @@ -13314,27 +12230,6 @@ __metadata: languageName: node linkType: hard -"pump@npm:^2.0.0": - version: 2.0.1 - resolution: "pump@npm:2.0.1" - dependencies: - end-of-stream: "npm:^1.1.0" - once: "npm:^1.3.1" - checksum: 10/e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931 - languageName: node - linkType: hard - -"pumpify@npm:^1.3.5": - version: 1.5.1 - resolution: "pumpify@npm:1.5.1" - dependencies: - duplexify: "npm:^3.6.0" - inherits: "npm:^2.0.3" - pump: "npm:^2.0.0" - checksum: 10/5d11a99f320dc2a052610399bac6d03db0a23bc23b23aa2a7d0adf879da3065a55134b975db66dc46bc79f54af3dd575d8119113a0a5b311a00580e1f053896b - languageName: node - linkType: hard - "punycode@npm:2.3.1, punycode@npm:^2.1.0, punycode@npm:^2.1.1": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -13439,28 +12334,7 @@ __metadata: languageName: node linkType: hard -"read-pkg-up@npm:^1.0.1": - version: 1.0.1 - resolution: "read-pkg-up@npm:1.0.1" - dependencies: - find-up: "npm:^1.0.0" - read-pkg: "npm:^1.0.0" - checksum: 10/d18399a0f46e2da32beb2f041edd0cda49d2f2cc30195a05c759ef3ed9b5e6e19ba1ad1bae2362bdec8c6a9f2c3d18f4d5e8c369e808b03d498d5781cb9122c7 - languageName: node - linkType: hard - -"read-pkg@npm:^1.0.0": - version: 1.1.0 - resolution: "read-pkg@npm:1.1.0" - dependencies: - load-json-file: "npm:^1.0.0" - normalize-package-data: "npm:^2.3.2" - path-type: "npm:^1.0.0" - checksum: 10/a0f5d5e32227ec8e6a028dd5c5134eab229768dcb7a5d9a41a284ed28ad4b9284fecc47383dc1593b5694f4de603a7ffaee84b738956b9b77e0999567485a366 - languageName: node - linkType: hard - -"readable-stream@npm:3, readable-stream@npm:^3.0.6, readable-stream@npm:^3.6.0": +"readable-stream@npm:3, readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -13471,7 +12345,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": +"readable-stream@npm:^2.0.1, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: @@ -13495,17 +12369,6 @@ __metadata: languageName: node linkType: hard -"readdirp@npm:^2.2.1": - version: 2.2.1 - resolution: "readdirp@npm:2.2.1" - dependencies: - graceful-fs: "npm:^4.1.11" - micromatch: "npm:^3.1.10" - readable-stream: "npm:^2.0.2" - checksum: 10/14af3408ac2afa4e72e72a27e2c800d80c03e80bdef7ae4bd4b7907e98dddbeaa1ba37d4788959d9ce1131fc262cc823ce41ca9f024a91d80538241eea112c3c - languageName: node - linkType: hard - "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -13515,15 +12378,6 @@ __metadata: languageName: node linkType: hard -"rechoir@npm:^0.6.2": - version: 0.6.2 - resolution: "rechoir@npm:0.6.2" - dependencies: - resolve: "npm:^1.1.6" - checksum: 10/fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b - languageName: node - linkType: hard - "rechoir@npm:^0.8.0": version: 0.8.0 resolution: "rechoir@npm:0.8.0" @@ -13564,21 +12418,11 @@ __metadata: linkType: hard "regenerator-transform@npm:^0.15.2": - version: 0.15.2 - resolution: "regenerator-transform@npm:0.15.2" - dependencies: - "@babel/runtime": "npm:^7.8.4" - checksum: 10/c4fdcb46d11bbe32605b4b9ed76b21b8d3f241a45153e9dc6f5542fed4c7744fed459f42701f650d5d5956786bf7de57547329d1c05a9df2ed9e367b9d903302 - languageName: node - linkType: hard - -"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2": - version: 1.0.2 - resolution: "regex-not@npm:1.0.2" + version: 0.15.2 + resolution: "regenerator-transform@npm:0.15.2" dependencies: - extend-shallow: "npm:^3.0.2" - safe-regex: "npm:^1.1.0" - checksum: 10/3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77 + "@babel/runtime": "npm:^7.8.4" + checksum: 10/c4fdcb46d11bbe32605b4b9ed76b21b8d3f241a45153e9dc6f5542fed4c7744fed459f42701f650d5d5956786bf7de57547329d1c05a9df2ed9e367b9d903302 languageName: node linkType: hard @@ -13626,27 +12470,6 @@ __metadata: languageName: node linkType: hard -"remove-bom-buffer@npm:^3.0.0": - version: 3.0.0 - resolution: "remove-bom-buffer@npm:3.0.0" - dependencies: - is-buffer: "npm:^1.1.5" - is-utf8: "npm:^0.2.1" - checksum: 10/e508fd92e5c7b210123485a366b00bb46fe15ef2c23ae90b05cd365bbfeede429ae70f32bce150fc6467e53c921bc0d9a5c7e33d865009c99603f9fbf7c8b7ae - languageName: node - linkType: hard - -"remove-bom-stream@npm:^1.2.0": - version: 1.2.0 - resolution: "remove-bom-stream@npm:1.2.0" - dependencies: - remove-bom-buffer: "npm:^3.0.0" - safe-buffer: "npm:^5.1.0" - through2: "npm:^2.0.3" - checksum: 10/32533fa1925a753cfeb352efe7f01c4171de992275e39f66672752669a457d6cdaaa1c9fd41a25b0e54cd6c0db4987a01a2593c01680a6d5e7b5076d27540786 - languageName: node - linkType: hard - "remove-trailing-separator@npm:^1.0.1, remove-trailing-separator@npm:^1.1.0": version: 1.1.0 resolution: "remove-trailing-separator@npm:1.1.0" @@ -13654,14 +12477,7 @@ __metadata: languageName: node linkType: hard -"repeat-element@npm:^1.1.2": - version: 1.1.4 - resolution: "repeat-element@npm:1.1.4" - checksum: 10/1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9 - languageName: node - linkType: hard - -"repeat-string@npm:^1.0.0, repeat-string@npm:^1.6.1": +"repeat-string@npm:^1.0.0": version: 1.6.1 resolution: "repeat-string@npm:1.6.1" checksum: 10/1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 @@ -13682,14 +12498,10 @@ __metadata: languageName: node linkType: hard -"replace-homedir@npm:^1.0.0": - version: 1.0.0 - resolution: "replace-homedir@npm:1.0.0" - dependencies: - homedir-polyfill: "npm:^1.0.1" - is-absolute: "npm:^1.0.0" - remove-trailing-separator: "npm:^1.1.0" - checksum: 10/a330e7c4fda2ba7978472dcaf9ee9129755ca0d704f903b4fc5f0384170f74fdaf1b3f10977ec3fc910cb992f90896c17c8e44d0de327cb9f01ee9bb7eed8d24 +"replace-homedir@npm:^2.0.0": + version: 2.0.0 + resolution: "replace-homedir@npm:2.0.0" + checksum: 10/66030e85400b7b4af41aad5595a8a75d1344f768e9a773702a9e16e48bf12e56c006799007e59ea229a74398237b0934aca51795143b071d3578c23309d7e48b languageName: node linkType: hard @@ -13707,13 +12519,6 @@ __metadata: languageName: node linkType: hard -"require-main-filename@npm:^1.0.1": - version: 1.0.1 - resolution: "require-main-filename@npm:1.0.1" - checksum: 10/49e4586207c138dabe885cffb9484f3f4583fc839851cd6705466eb343d8bb6af7dfa3d8e611fbd44d40441d4cddaadb34b4d537092b92adafa6a6f440dc1da8 - languageName: node - linkType: hard - "require-main-filename@npm:^2.0.0": version: 2.0.0 resolution: "require-main-filename@npm:2.0.0" @@ -13768,12 +12573,12 @@ __metadata: languageName: node linkType: hard -"resolve-options@npm:^1.1.0": - version: 1.1.0 - resolution: "resolve-options@npm:1.1.0" +"resolve-options@npm:^2.0.0": + version: 2.0.0 + resolution: "resolve-options@npm:2.0.0" dependencies: - value-or-function: "npm:^3.0.0" - checksum: 10/437813d9418b49e52c367b980b6b48b3ea1ea39105aac97c39f104724abb6cda224ed92ebf12499cf00993589d38c8195eb2be730d0ba8b45df9bdf7cec65b33 + value-or-function: "npm:^4.0.0" + checksum: 10/b28584cc089099af42e36292c32bd9af8bc9e28e3ca73c172c0a172d7ed5afb01c75cc2275268c327dceba77a5555b33fbd55617be138874040279fe6ff02fbf languageName: node linkType: hard @@ -13787,14 +12592,7 @@ __metadata: languageName: node linkType: hard -"resolve-url@npm:^0.2.1": - version: 0.2.1 - resolution: "resolve-url@npm:0.2.1" - checksum: 10/c8bbf6385730add6657103929ebd7e4aa623a2c2df29bba28a58fec73097c003edcce475efefa51c448a904aa344a4ebabe6ad85c8e75c72c4ce9a0c0b5652d2 - languageName: node - linkType: hard - -"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4, resolve@npm:^1.4.0": +"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -13820,7 +12618,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -13856,13 +12654,6 @@ __metadata: languageName: node linkType: hard -"ret@npm:~0.1.10": - version: 0.1.15 - resolution: "ret@npm:0.1.15" - checksum: 10/07c9e7619b4c86053fa57689bf7606b5a40fc1231fc87682424d0b3e296641cc19c218c3b8a8917305fbcca3bfc43038a5b6a63f54755c1bbca2f91857253b03 - languageName: node - linkType: hard - "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -14047,15 +12838,6 @@ __metadata: languageName: node linkType: hard -"safe-regex@npm:^1.1.0": - version: 1.1.0 - resolution: "safe-regex@npm:1.1.0" - dependencies: - ret: "npm:~0.1.10" - checksum: 10/5405b5a3effed649e6133d51d45cecbbbb02a1dd8d5b78a5e7979a69035870c817a5d2682d0ebb62188d3a840f7b24ea00ebbad2e418d5afabed151e8db96d04 - languageName: node - linkType: hard - "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -14110,16 +12892,16 @@ __metadata: languageName: node linkType: hard -"semver-greatest-satisfied-range@npm:^1.1.0": - version: 1.1.0 - resolution: "semver-greatest-satisfied-range@npm:1.1.0" +"semver-greatest-satisfied-range@npm:^2.0.0": + version: 2.0.0 + resolution: "semver-greatest-satisfied-range@npm:2.0.0" dependencies: - sver-compat: "npm:^1.5.0" - checksum: 10/0aa15bbf69dcec89d7f02edc8171d8e71354d2ed4beebd4de5305f5234088fb970b7078b0ce5585b853773cafb4c3f692e35031c5d691abab0d5bc8c9ebacc80 + sver: "npm:^1.8.3" + checksum: 10/478a52a34fa4a265d7caf1f2279bf3f427abeee36175bfa03c29d48df65040f4d934ccdf5896b7ae6012f60f7364ec30826390ecb7c913f94109002dbd53a588 languageName: node linkType: hard -"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.7.2": +"semver@npm:^5.7.2": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -14272,18 +13054,6 @@ __metadata: languageName: node linkType: hard -"set-value@npm:^2.0.0, set-value@npm:^2.0.1": - version: 2.0.1 - resolution: "set-value@npm:2.0.1" - dependencies: - extend-shallow: "npm:^2.0.1" - is-extendable: "npm:^0.1.1" - is-plain-object: "npm:^2.0.3" - split-string: "npm:^3.0.1" - checksum: 10/4f1ccac2e9ad4d1b0851761d41df4bbd3780ed69805f24a80ab237a56d9629760b7b98551cd370931620defe5da329645834e1e9a18574cecad09ce7b2b83296 - languageName: node - linkType: hard - "setimmediate@npm:^1.0.5": version: 1.0.5 resolution: "setimmediate@npm:1.0.5" @@ -14418,42 +13188,6 @@ __metadata: languageName: node linkType: hard -"snapdragon-node@npm:^2.0.1": - version: 2.1.1 - resolution: "snapdragon-node@npm:2.1.1" - dependencies: - define-property: "npm:^1.0.0" - isobject: "npm:^3.0.0" - snapdragon-util: "npm:^3.0.1" - checksum: 10/093c3584efc51103d8607d28cb7a3079f7e371b2320a60c685a84a57956cf9693f3dec8b2f77250ba48063cf42cb5261f3970e6d3bb7e68fd727299c991e0bff - languageName: node - linkType: hard - -"snapdragon-util@npm:^3.0.1": - version: 3.0.1 - resolution: "snapdragon-util@npm:3.0.1" - dependencies: - kind-of: "npm:^3.2.0" - checksum: 10/b776b15bf683c9ac0243582d7b13f2070f85c9036d73c2ba31da61d1effe22d4a39845b6f43ce7e7ec82c7e686dc47d9c3cffa1a75327bb16505b9afc34f516d - languageName: node - linkType: hard - -"snapdragon@npm:^0.8.1": - version: 0.8.2 - resolution: "snapdragon@npm:0.8.2" - dependencies: - base: "npm:^0.11.1" - debug: "npm:^2.2.0" - define-property: "npm:^0.2.5" - extend-shallow: "npm:^2.0.1" - map-cache: "npm:^0.2.2" - source-map: "npm:^0.5.6" - source-map-resolve: "npm:^0.5.0" - use: "npm:^3.1.0" - checksum: 10/cbe35b25dca5504be0ced90d907948d8efeda0b118d9a032bfc499e22b7f78515832f2706d9c9297c87906eaa51c12bfcaa8ea5a4f3e98ecf1116a73428e344a - languageName: node - linkType: hard - "sockjs@npm:^0.3.24": version: 0.3.24 resolution: "sockjs@npm:0.3.24" @@ -14514,19 +13248,6 @@ __metadata: languageName: node linkType: hard -"source-map-resolve@npm:^0.5.0": - version: 0.5.3 - resolution: "source-map-resolve@npm:0.5.3" - dependencies: - atob: "npm:^2.1.2" - decode-uri-component: "npm:^0.2.0" - resolve-url: "npm:^0.2.1" - source-map-url: "npm:^0.4.0" - urix: "npm:^0.1.0" - checksum: 10/98e281cceb86b80c8bd3453110617b9df93132d6a50c7bf5847b5d74b4b5d6e1d4d261db276035b9b7e5ba7f32c2d6a0d2c13d581e37870a0219a524402efcab - languageName: node - linkType: hard - "source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" @@ -14537,7 +13258,7 @@ __metadata: languageName: node linkType: hard -"source-map-url@npm:0.4.1, source-map-url@npm:^0.4.0": +"source-map-url@npm:0.4.1": version: 0.4.1 resolution: "source-map-url@npm:0.4.1" checksum: 10/7fec0460ca017330568e1a4d67c80c397871f27d75b034e1117eaa802076db5cda5944659144d26eafd2a95008ada19296c8e0d5ec116302c32c6daa4e430003 @@ -14551,13 +13272,6 @@ __metadata: languageName: node linkType: hard -"source-map@npm:^0.5.6": - version: 0.5.7 - resolution: "source-map@npm:0.5.7" - checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269 - languageName: node - linkType: hard - "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" @@ -14588,44 +13302,10 @@ __metadata: languageName: node linkType: hard -"sparkles@npm:^1.0.0": - version: 1.0.1 - resolution: "sparkles@npm:1.0.1" - checksum: 10/57645793425ba836b5ada5fc9954658c0178bca4b5bf7a9bea67e269106129fd95fa17d0388ce429871f0ee004633e59af670232aaa9fd61511a0ab5f8db902a - languageName: node - linkType: hard - -"spdx-correct@npm:^3.0.0": - version: 3.2.0 - resolution: "spdx-correct@npm:3.2.0" - dependencies: - spdx-expression-parse: "npm:^3.0.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10/cc2e4dbef822f6d12142116557d63f5facf3300e92a6bd24e907e4865e17b7e1abd0ee6b67f305cae6790fc2194175a24dc394bfcc01eea84e2bdad728e9ae9a - languageName: node - linkType: hard - -"spdx-exceptions@npm:^2.1.0": - version: 2.5.0 - resolution: "spdx-exceptions@npm:2.5.0" - checksum: 10/bb127d6e2532de65b912f7c99fc66097cdea7d64c10d3ec9b5e96524dbbd7d20e01cba818a6ddb2ae75e62bb0c63d5e277a7e555a85cbc8ab40044984fa4ae15 - languageName: node - linkType: hard - -"spdx-expression-parse@npm:^3.0.0": - version: 3.0.1 - resolution: "spdx-expression-parse@npm:3.0.1" - dependencies: - spdx-exceptions: "npm:^2.1.0" - spdx-license-ids: "npm:^3.0.0" - checksum: 10/a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde - languageName: node - linkType: hard - -"spdx-license-ids@npm:^3.0.0": - version: 3.0.17 - resolution: "spdx-license-ids@npm:3.0.17" - checksum: 10/8f6c6ae02ebb25b4ca658b8990d9e8a8f8d8a95e1d8b9fd84d87eed80a7dc8f8073d6a8d50b8a0295c0e8399e1f8814f5c00e2985e6bf3731540a16f7241cbf1 +"sparkles@npm:^2.1.0": + version: 2.1.0 + resolution: "sparkles@npm:2.1.0" + checksum: 10/72b76a81a50e43e617f16b52bf852c38c9c86effbd0a388ab90ad88c138322f662c997adb60a456a44538b14fbd4e3a2e851901f2f64691b523fdb91efce7365 languageName: node linkType: hard @@ -14656,15 +13336,6 @@ __metadata: languageName: node linkType: hard -"split-string@npm:^3.0.1, split-string@npm:^3.0.2": - version: 3.1.0 - resolution: "split-string@npm:3.1.0" - dependencies: - extend-shallow: "npm:^3.0.0" - checksum: 10/f31f4709d2b14fe4ff46b4fb88b2fb68a1c59b59e573c5417907c182397ddb2cb67903232bdc3a8b9dd3bb660c6f533ff11b5d624aff7b1fe0a213e3e4c75f20 - languageName: node - linkType: hard - "sprintf-js@npm:^1.1.3": version: 1.1.3 resolution: "sprintf-js@npm:1.1.3" @@ -14690,13 +13361,6 @@ __metadata: languageName: node linkType: hard -"stack-trace@npm:0.0.10": - version: 0.0.10 - resolution: "stack-trace@npm:0.0.10" - checksum: 10/7bd633f0e9ac46e81a0b0fe6538482c1d77031959cf94478228731709db4672fbbed59176f5b9a9fd89fec656b5dae03d084ef2d1b0c4c2f5683e05f2dbb1405 - languageName: node - linkType: hard - "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -14725,16 +13389,6 @@ __metadata: languageName: node linkType: hard -"static-extend@npm:^0.1.1": - version: 0.1.2 - resolution: "static-extend@npm:0.1.2" - dependencies: - define-property: "npm:^0.2.5" - object-copy: "npm:^0.1.0" - checksum: 10/8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c - languageName: node - linkType: hard - "statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -14756,7 +13410,16 @@ __metadata: languageName: node linkType: hard -"stream-exhaust@npm:^1.0.1": +"stream-composer@npm:^1.0.2": + version: 1.0.2 + resolution: "stream-composer@npm:1.0.2" + dependencies: + streamx: "npm:^2.13.2" + checksum: 10/338b8e088f2eb2c91b0e06907db436525da3620991b13499e57441548e62d3585be185505901b0380cad425889572794e5fe178dd326f5efde654b3ab26df3d3 + languageName: node + linkType: hard + +"stream-exhaust@npm:^1.0.2": version: 1.0.2 resolution: "stream-exhaust@npm:1.0.2" checksum: 10/ffac181a5c706db3a940d96f9a5be02df84cf03a4925bff10d210a2d791d65f6197d67a0a484cea128298e63737f46c08e51f9ebe64f25556b9d824b820c996d @@ -14770,13 +13433,6 @@ __metadata: languageName: node linkType: hard -"stream-shift@npm:^1.0.0": - version: 1.0.3 - resolution: "stream-shift@npm:1.0.3" - checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242 - languageName: node - linkType: hard - "stream-to-array@npm:^2.0.2": version: 2.3.0 resolution: "stream-to-array@npm:2.3.0" @@ -14786,7 +13442,7 @@ __metadata: languageName: node linkType: hard -"streamx@npm:^2.12.5": +"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0": version: 2.16.1 resolution: "streamx@npm:2.16.1" dependencies: @@ -14818,17 +13474,6 @@ __metadata: languageName: node linkType: hard -"string-width@npm:^1.0.1, string-width@npm:^1.0.2": - version: 1.0.2 - resolution: "string-width@npm:1.0.2" - dependencies: - code-point-at: "npm:^1.0.0" - is-fullwidth-code-point: "npm:^1.0.0" - strip-ansi: "npm:^3.0.0" - checksum: 10/5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e - languageName: node - linkType: hard - "string-width@npm:^5.0.1, string-width@npm:^5.1.2": version: 5.1.2 resolution: "string-width@npm:5.1.2" @@ -14940,15 +13585,6 @@ __metadata: languageName: node linkType: hard -"strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1": - version: 3.0.1 - resolution: "strip-ansi@npm:3.0.1" - dependencies: - ansi-regex: "npm:^2.0.0" - checksum: 10/9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465 - languageName: node - linkType: hard - "strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0": version: 7.1.0 resolution: "strip-ansi@npm:7.1.0" @@ -14958,15 +13594,6 @@ __metadata: languageName: node linkType: hard -"strip-bom@npm:^2.0.0": - version: 2.0.0 - resolution: "strip-bom@npm:2.0.0" - dependencies: - is-utf8: "npm:^0.2.0" - checksum: 10/08efb746bc67b10814cd03d79eb31bac633393a782e3f35efbc1b61b5165d3806d03332a97f362822cf0d4dd14ba2e12707fcff44fe1c870c48a063a0c9e4944 - languageName: node - linkType: hard - "strip-bom@npm:^3.0.0": version: 3.0.0 resolution: "strip-bom@npm:3.0.0" @@ -15060,13 +13687,15 @@ __metadata: languageName: node linkType: hard -"sver-compat@npm:^1.5.0": - version: 1.5.0 - resolution: "sver-compat@npm:1.5.0" +"sver@npm:^1.8.3": + version: 1.8.4 + resolution: "sver@npm:1.8.4" dependencies: - es6-iterator: "npm:^2.0.1" - es6-symbol: "npm:^3.1.1" - checksum: 10/e85edc83801d4ad35ac0f7b95026395d9328e22f31ceb3497807d5fec25502412330da179265f3772531e67caf1a7e933cccc64c379a8055aba65877c2f49268 + semver: "npm:^6.3.0" + dependenciesMeta: + semver: + optional: true + checksum: 10/2647b8bc0bfb96cb2efe4a6bc080472b1a2078ac2c5cfa912fd49c981b764c7c7347e3b1a83c8506ce966665b02767b2ce7c5c6efde8c74835dc7aabc9456326 languageName: node linkType: hard @@ -15220,17 +13849,7 @@ __metadata: languageName: node linkType: hard -"through2-filter@npm:^3.0.0": - version: 3.0.0 - resolution: "through2-filter@npm:3.0.0" - dependencies: - through2: "npm:~2.0.0" - xtend: "npm:~4.0.0" - checksum: 10/085e0d9edf6a30b11d453697d5bf095fde1a0c27626d905dab8c26c030dcc3185fe2cdf469732de216f4439269bbe165a848a8c73675135999ff35ac1f511093 - languageName: node - linkType: hard - -"through2@npm:^2.0.0, through2@npm:^2.0.3, through2@npm:~2.0.0": +"through2@npm:^2.0.3": version: 2.0.5 resolution: "through2@npm:2.0.5" dependencies: @@ -15291,16 +13910,6 @@ __metadata: languageName: node linkType: hard -"to-absolute-glob@npm:^2.0.0": - version: 2.0.2 - resolution: "to-absolute-glob@npm:2.0.2" - dependencies: - is-absolute: "npm:^1.0.0" - is-negated-glob: "npm:^1.0.0" - checksum: 10/0a8bef172909e43d711bfd33792643f2eec35b9109bde927dabfd231e6ad643b7a657f306c93c6e7b89f71d3de74ac94060fe9637bca8c37b036523993664323 - languageName: node - linkType: hard - "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -15308,25 +13917,6 @@ __metadata: languageName: node linkType: hard -"to-object-path@npm:^0.3.0": - version: 0.3.0 - resolution: "to-object-path@npm:0.3.0" - dependencies: - kind-of: "npm:^3.0.2" - checksum: 10/9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70 - languageName: node - linkType: hard - -"to-regex-range@npm:^2.1.0": - version: 2.1.1 - resolution: "to-regex-range@npm:2.1.1" - dependencies: - is-number: "npm:^3.0.0" - repeat-string: "npm:^1.6.1" - checksum: 10/2eed5f897188de8ec8745137f80c0f564810082d506278dd6a80db4ea313b6d363ce8d7dc0e0406beeaba0bb7f90f01b41fa3d08fb72dd02c329b2ec579cd4e8 - languageName: node - linkType: hard - "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1" @@ -15336,24 +13926,12 @@ __metadata: languageName: node linkType: hard -"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2": - version: 3.0.2 - resolution: "to-regex@npm:3.0.2" - dependencies: - define-property: "npm:^2.0.2" - extend-shallow: "npm:^3.0.2" - regex-not: "npm:^1.0.2" - safe-regex: "npm:^1.1.0" - checksum: 10/ab87c22f0719f7def00145b53e2c90d2fdcc75efa0fec1227b383aaf88ed409db2542b2b16bcbfbf95fe0727f879045803bb635b777c0306762241ca3e5562c6 - languageName: node - linkType: hard - -"to-through@npm:^2.0.0": - version: 2.0.0 - resolution: "to-through@npm:2.0.0" +"to-through@npm:^3.0.0": + version: 3.0.0 + resolution: "to-through@npm:3.0.0" dependencies: - through2: "npm:^2.0.3" - checksum: 10/5834a69d68cbe0d74115373bbe219dbe60c1950021f5ec9dd4af179ffbb307bce3d45fde9dacec05a8f4f79b86734433eb9b42946ccb81d2d4d4f8828628b7e6 + streamx: "npm:^2.12.5" + checksum: 10/404ad1a346babab53d75d3b4deb779916760fc9e605f4e64ec789366edf08e75ad592a262ca566e7864f77c03375151dcfac4744ff7fd52417cb2a2e9fc60795 languageName: node linkType: hard @@ -15608,13 +14186,6 @@ __metadata: languageName: node linkType: hard -"type@npm:^2.7.2": - version: 2.7.2 - resolution: "type@npm:2.7.2" - checksum: 10/602f1b369fba60687fa4d0af6fcfb814075bcaf9ed3a87637fb384d9ff849e2ad15bc244a431f341374562e51a76c159527ffdb1f1f24b0f1f988f35a301c41d - languageName: node - linkType: hard - "typed-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "typed-array-buffer@npm:1.0.2" @@ -15667,13 +14238,6 @@ __metadata: languageName: node linkType: hard -"typedarray@npm:^0.0.6": - version: 0.0.6 - resolution: "typedarray@npm:0.0.6" - checksum: 10/2cc1bcf7d8c1237f6a16c04efc06637b2c5f2d74e58e84665445cf87668b85a21ab18dd751fa49eee6ae024b70326635d7b79ad37b1c370ed2fec6aeeeb52714 - languageName: node - linkType: hard - "typescript@npm:5.4.5": version: 5.4.5 resolution: "typescript@npm:5.4.5" @@ -15754,28 +14318,22 @@ __metadata: languageName: node linkType: hard -"undertaker-registry@npm:^1.0.0": - version: 1.0.1 - resolution: "undertaker-registry@npm:1.0.1" - checksum: 10/adcc5af240fe4ec4dcda02ce060121a03f28a19bbc922f6a24e17c851eef4cf66de60196ad4c8b27c1c5df6d0a21cf7a63e80129e31832730fca0d062cd9eb30 +"undertaker-registry@npm:^2.0.0": + version: 2.0.0 + resolution: "undertaker-registry@npm:2.0.0" + checksum: 10/c1ebb4b72eeacf563a583f5928e7cee7a71391b0f33d5bac939fbb4e3ea1f00298850ca2449776f18e4c2eab8c57434327fc826f3ca43061cce22471bdf3604e languageName: node linkType: hard -"undertaker@npm:^1.2.1": - version: 1.3.0 - resolution: "undertaker@npm:1.3.0" +"undertaker@npm:^2.0.0": + version: 2.0.0 + resolution: "undertaker@npm:2.0.0" dependencies: - arr-flatten: "npm:^1.0.1" - arr-map: "npm:^2.0.0" - bach: "npm:^1.0.0" - collection-map: "npm:^1.0.0" - es6-weak-map: "npm:^2.0.1" - fast-levenshtein: "npm:^1.0.0" - last-run: "npm:^1.1.0" - object.defaults: "npm:^1.0.0" - object.reduce: "npm:^1.0.0" - undertaker-registry: "npm:^1.0.0" - checksum: 10/6cb5898b0b8fd4b094fbd6ed9c2e155f436d698fdc13f45444d5083825cc29bca7a364c5e27922366f0ce3fff7bb5b834f6ff3583f77cb655bbc3a60fee632ed + bach: "npm:^2.0.1" + fast-levenshtein: "npm:^3.0.0" + last-run: "npm:^2.0.0" + undertaker-registry: "npm:^2.0.0" + checksum: 10/1f182515bd95f2becd7ff4b9c7ffa6fb5d403ea0e75f290234e4c09b748242761f271606646f8f07f8fa5c0ab20b3de5ec6975a827764f32dfb965a207d1e6cf languageName: node linkType: hard @@ -15824,18 +14382,6 @@ __metadata: languageName: node linkType: hard -"union-value@npm:^1.0.0": - version: 1.0.1 - resolution: "union-value@npm:1.0.1" - dependencies: - arr-union: "npm:^3.1.0" - get-value: "npm:^2.0.6" - is-extendable: "npm:^0.1.1" - set-value: "npm:^2.0.1" - checksum: 10/a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba - languageName: node - linkType: hard - "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -15854,16 +14400,6 @@ __metadata: languageName: node linkType: hard -"unique-stream@npm:^2.0.2": - version: 2.3.1 - resolution: "unique-stream@npm:2.3.1" - dependencies: - json-stable-stringify-without-jsonify: "npm:^1.0.1" - through2-filter: "npm:^3.0.0" - checksum: 10/65e433e68e46640e9283dbb022493c8d79ed1dac47807fe751dfe3bd50586927f63ad880ce9e01c2f85911f3caca48d04731aff6f07869434d5f76ecfe478559 - languageName: node - linkType: hard - "unique-string@npm:^2.0.0": version: 2.0.0 resolution: "unique-string@npm:2.0.0" @@ -15901,17 +14437,7 @@ __metadata: languageName: node linkType: hard -"unset-value@npm:^1.0.0": - version: 1.0.0 - resolution: "unset-value@npm:1.0.0" - dependencies: - has-value: "npm:^0.3.1" - isobject: "npm:^3.0.0" - checksum: 10/0ca644870613dece963e4abb762b0da4c1cf6be4ac2f0859a463e4e9520c1ec85e512cfbfd73371ee0bb09ef536a0c4abd6f2c357715a08b43448aedc82acee6 - languageName: node - linkType: hard - -"upath@npm:^1.1.1, upath@npm:^1.2.0": +"upath@npm:^1.2.0": version: 1.2.0 resolution: "upath@npm:1.2.0" checksum: 10/ac07351d9e913eb7bc9bc0a17ed7d033a52575f0f2959e19726956c3e96f5d4d75aa6a7a777c4c9506e72372f58e06215e581f8dbff35611fc0a7b68ab4a6ddb @@ -15941,13 +14467,6 @@ __metadata: languageName: node linkType: hard -"urix@npm:^0.1.0": - version: 0.1.0 - resolution: "urix@npm:0.1.0" - checksum: 10/ebf5df5491c1d40ea88f7529ee9d8fd6501f44c47b8017d168fd1558d40f7d613c6f39869643344e58b71ba2da357a7c26f353a2a54d416492fcdca81f05b338 - languageName: node - linkType: hard - "url@npm:^0.11.0": version: 0.11.3 resolution: "url@npm:0.11.3" @@ -15958,13 +14477,6 @@ __metadata: languageName: node linkType: hard -"use@npm:^3.1.0": - version: 3.1.1 - resolution: "use@npm:3.1.1" - checksum: 10/08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33 - languageName: node - linkType: hard - "utif@npm:^2.0.1": version: 2.0.1 resolution: "utif@npm:2.0.1" @@ -15997,29 +14509,17 @@ __metadata: languageName: node linkType: hard -"v8flags@npm:^3.2.0": - version: 3.2.0 - resolution: "v8flags@npm:3.2.0" - dependencies: - homedir-polyfill: "npm:^1.0.1" - checksum: 10/4c88e2681f12153ae5e45de678ba724ebd2daf2619d4fbe5cc8075b07b2095522dbfd0cb55e510a1d27ea0ed0db4a5e6fc6d18d312f7d8fc098a3c6a79b7ffc6 - languageName: node - linkType: hard - -"validate-npm-package-license@npm:^3.0.1": - version: 3.0.4 - resolution: "validate-npm-package-license@npm:3.0.4" - dependencies: - spdx-correct: "npm:^3.0.0" - spdx-expression-parse: "npm:^3.0.0" - checksum: 10/86242519b2538bb8aeb12330edebb61b4eb37fd35ef65220ab0b03a26c0592c1c8a7300d32da3cde5abd08d18d95e8dabfad684b5116336f6de9e6f207eec224 +"v8flags@npm:^4.0.0": + version: 4.0.1 + resolution: "v8flags@npm:4.0.1" + checksum: 10/69863ede75ff79579654951c78724c084bc337d0ebe1d9bffc6924f3f2bd0b40a9eb4c568fc795201d5eb72311b77e5d75a7e1544faa12355412360dc37d76e2 languageName: node linkType: hard -"value-or-function@npm:^3.0.0": - version: 3.0.0 - resolution: "value-or-function@npm:3.0.0" - checksum: 10/2b901d05b82deb8565d4edeba02e0737be73e7fb2c640b79fa64152aae8b450f790a46c86bf7039f91938c1b69d2cc0908cd18c4695b120293bb442179061fac +"value-or-function@npm:^4.0.0": + version: 4.0.0 + resolution: "value-or-function@npm:4.0.0" + checksum: 10/16b6aed84b8f9732a7eb7a5035a1480be3689d097a73b1154fb827caf021d5f2b6f60c0dfe694bfc8c9605f06cfc093dc428efdc3d24cb2768fbe202ffd42ae1 languageName: node linkType: hard @@ -16030,47 +14530,53 @@ __metadata: languageName: node linkType: hard -"vinyl-fs@npm:^3.0.0": - version: 3.0.3 - resolution: "vinyl-fs@npm:3.0.3" +"vinyl-contents@npm:^2.0.0": + version: 2.0.0 + resolution: "vinyl-contents@npm:2.0.0" + dependencies: + bl: "npm:^5.0.0" + vinyl: "npm:^3.0.0" + checksum: 10/10d72a032e6317bf89713565d616df8726ee41601a41c48c7d778e61ab557c0a5fdee883ceecbfb33da4a5e11ea80e76e5ae63c1d13fda61edbb5ef50445c8b2 + languageName: node + linkType: hard + +"vinyl-fs@npm:^4.0.0": + version: 4.0.0 + resolution: "vinyl-fs@npm:4.0.0" dependencies: - fs-mkdirp-stream: "npm:^1.0.0" - glob-stream: "npm:^6.1.0" - graceful-fs: "npm:^4.0.0" + fs-mkdirp-stream: "npm:^2.0.1" + glob-stream: "npm:^8.0.0" + graceful-fs: "npm:^4.2.11" + iconv-lite: "npm:^0.6.3" is-valid-glob: "npm:^1.0.0" - lazystream: "npm:^1.0.0" - lead: "npm:^1.0.0" - object.assign: "npm:^4.0.4" - pumpify: "npm:^1.3.5" - readable-stream: "npm:^2.3.3" - remove-bom-buffer: "npm:^3.0.0" - remove-bom-stream: "npm:^1.2.0" - resolve-options: "npm:^1.1.0" - through2: "npm:^2.0.0" - to-through: "npm:^2.0.0" - value-or-function: "npm:^3.0.0" - vinyl: "npm:^2.0.0" - vinyl-sourcemap: "npm:^1.1.0" - checksum: 10/14fe1e7b32a70305222b5e66a837b78b71df89a84ef8ecd9a2ac348937bd9425a2eb38499a461dd745c12153acb689a81f98d461237060ba14a9e71c7ec3892f - languageName: node - linkType: hard - -"vinyl-sourcemap@npm:^1.1.0": - version: 1.1.0 - resolution: "vinyl-sourcemap@npm:1.1.0" + lead: "npm:^4.0.0" + normalize-path: "npm:3.0.0" + resolve-options: "npm:^2.0.0" + stream-composer: "npm:^1.0.2" + streamx: "npm:^2.14.0" + to-through: "npm:^3.0.0" + value-or-function: "npm:^4.0.0" + vinyl: "npm:^3.0.0" + vinyl-sourcemap: "npm:^2.0.0" + checksum: 10/22ae47c018600e6973b8a0a0c098927b09f60c4963cc5f717be04e774215774aa15ea97400803483d3dadafc5cff1a6744c3a2ab0322528234dc4e93ae1a55aa + languageName: node + linkType: hard + +"vinyl-sourcemap@npm:^2.0.0": + version: 2.0.0 + resolution: "vinyl-sourcemap@npm:2.0.0" dependencies: - append-buffer: "npm:^1.0.2" - convert-source-map: "npm:^1.5.0" - graceful-fs: "npm:^4.1.6" - normalize-path: "npm:^2.1.1" - now-and-later: "npm:^2.0.0" - remove-bom-buffer: "npm:^3.0.0" - vinyl: "npm:^2.0.0" - checksum: 10/9930a2b5c6ee839849ff269612a05568b1c158e4fb589746d8d995540b48466f3152c640e76700c27a440be0ccaa7b6e2bf0e7dc984c1968d0d1a91f6a5ec23e + convert-source-map: "npm:^2.0.0" + graceful-fs: "npm:^4.2.10" + now-and-later: "npm:^3.0.0" + streamx: "npm:^2.12.5" + vinyl: "npm:^3.0.0" + vinyl-contents: "npm:^2.0.0" + checksum: 10/f23fc251a3eb72100690e5e93685ef776d8fee20e076f29655536a31b5235426b9404eea76b6b268fa00648437acc98aad54a7e76661b97305706c487a54afdb languageName: node linkType: hard -"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0": +"vinyl@npm:^2.1.0": version: 2.2.1 resolution: "vinyl@npm:2.2.1" dependencies: @@ -16506,13 +15012,6 @@ __metadata: languageName: node linkType: hard -"which-module@npm:^1.0.0": - version: 1.0.0 - resolution: "which-module@npm:1.0.0" - checksum: 10/98434f7deb36350cb543c1f15612188541737e1f12d39b23b1c371dff5cf4aa4746210f2bdec202d5fe9da8682adaf8e3f7c44c520687d30948cfc59d5534edb - languageName: node - linkType: hard - "which-module@npm:^2.0.0": version: 2.0.1 resolution: "which-module@npm:2.0.1" @@ -16795,16 +15294,6 @@ __metadata: languageName: node linkType: hard -"wrap-ansi@npm:^2.0.0": - version: 2.1.0 - resolution: "wrap-ansi@npm:2.1.0" - dependencies: - string-width: "npm:^1.0.1" - strip-ansi: "npm:^3.0.1" - checksum: 10/cf66d33f62f2edf0aac52685da98194e47ddf4ceb81d9f98f294b46ffbbf8662caa72a905b343aeab8d6a16cade982be5fc45df99235b07f781ebf68f051ca98 - languageName: node - linkType: hard - "wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" @@ -16923,20 +15412,13 @@ __metadata: languageName: node linkType: hard -"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: 10/ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a languageName: node linkType: hard -"y18n@npm:^3.2.1": - version: 3.2.2 - resolution: "y18n@npm:3.2.2" - checksum: 10/42ee58e321252ac87f85ccc7cee01c2e3e224737531e9e543963264194255132ce406e02993904b84ea974050d53b8959dcf9da695408553c32f2a8b4b59a667 - languageName: node - linkType: hard - "y18n@npm:^4.0.0": version: 4.0.3 resolution: "y18n@npm:4.0.3" @@ -17010,16 +15492,6 @@ __metadata: languageName: node linkType: hard -"yargs-parser@npm:^5.0.1": - version: 5.0.1 - resolution: "yargs-parser@npm:5.0.1" - dependencies: - camelcase: "npm:^3.0.0" - object.assign: "npm:^4.1.0" - checksum: 10/eb1b44ea6ab0eecbf496a6b5884a9905664f5bd0581e12539fa8e9f05c3a303f450066a85bfb6471f23cc188400d3fd9b83832b671e7d4b2b2eadb247f7ea1a5 - languageName: node - linkType: hard - "yargs-unparser@npm:2.0.0": version: 2.0.0 resolution: "yargs-unparser@npm:2.0.0" @@ -17081,27 +15553,6 @@ __metadata: languageName: node linkType: hard -"yargs@npm:^7.1.0": - version: 7.1.2 - resolution: "yargs@npm:7.1.2" - dependencies: - camelcase: "npm:^3.0.0" - cliui: "npm:^3.2.0" - decamelize: "npm:^1.1.1" - get-caller-file: "npm:^1.0.1" - os-locale: "npm:^1.4.0" - read-pkg-up: "npm:^1.0.1" - require-directory: "npm:^2.1.1" - require-main-filename: "npm:^1.0.1" - set-blocking: "npm:^2.0.0" - string-width: "npm:^1.0.2" - which-module: "npm:^1.0.0" - y18n: "npm:^3.2.1" - yargs-parser: "npm:^5.0.1" - checksum: 10/5d52d70cdad810c163b49a0805f5962417e17630b69356aee6234667f75a167f4cc2a51d0cfe0a8ee002ebd0dbdfdd7c471abebe93e1d63125c9363bf6852f7f - languageName: node - linkType: hard - "ylru@npm:^1.2.0": version: 1.3.2 resolution: "ylru@npm:1.3.2" From af37d577790b8ab62582e770fef09811885be216 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Wed, 17 Apr 2024 10:48:25 -0700 Subject: [PATCH 51/98] Fix entity picker delete entity (#20542) --- src/components/entity/ha-entity-picker.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/entity/ha-entity-picker.ts b/src/components/entity/ha-entity-picker.ts index 680910d8b8f5..ccb233fffb89 100644 --- a/src/components/entity/ha-entity-picker.ts +++ b/src/components/entity/ha-entity-picker.ts @@ -409,7 +409,7 @@ export class HaEntityPicker extends LitElement { ev.stopPropagation(); const newValue = ev.detail.value; - if (newValue.startsWith(CREATE_ID)) { + if (newValue && newValue.startsWith(CREATE_ID)) { const domain = newValue.substring(CREATE_ID.length); showHelperDetailDialog(this, { domain, From 542e22fe0ed07621a8b3e984e7d1da7220597567 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 22:54:57 +0000 Subject: [PATCH 52/98] Update dependency tar to v7.0.1 (#20547) Co-authored-by: renovate[bot] <29139614+renovate[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 5c08c4142174..8e3c84490ad0 100644 --- a/package.json +++ b/package.json @@ -234,7 +234,7 @@ "sinon": "17.0.1", "source-map-url": "0.4.1", "systemjs": "6.14.3", - "tar": "7.0.0", + "tar": "7.0.1", "terser-webpack-plugin": "5.3.10", "transform-async-modules-webpack-plugin": "1.0.4", "ts-lit-plugin": "2.0.2", diff --git a/yarn.lock b/yarn.lock index 7984b04300ee..420c77fc93b7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9132,7 +9132,7 @@ __metadata: stacktrace-js: "npm:2.0.2" superstruct: "npm:1.0.4" systemjs: "npm:6.14.3" - tar: "npm:7.0.0" + tar: "npm:7.0.1" terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" transform-async-modules-webpack-plugin: "npm:1.0.4" @@ -13737,9 +13737,9 @@ __metadata: languageName: node linkType: hard -"tar@npm:7.0.0": - version: 7.0.0 - resolution: "tar@npm:7.0.0" +"tar@npm:7.0.1": + version: 7.0.1 + resolution: "tar@npm:7.0.1" dependencies: "@isaacs/fs-minipass": "npm:^4.0.0" chownr: "npm:^3.0.0" @@ -13747,7 +13747,7 @@ __metadata: minizlib: "npm:^3.0.1" mkdirp: "npm:^3.0.1" yallist: "npm:^5.0.0" - checksum: 10/f4850dc337f5b5ba0ef3121536fbf7ed723bac0f49bc1d38df24f13147ce58aa7209d06da68f52766a43237e68b76c401c5e6780bacc5558a47439d05f91772b + checksum: 10/6fd89ef8051d12975f66a2f3932a80479bdc6c9f3bcdf04b8b57784e942ed860708ccecf79bcbb30659b14ab52eef2095d2c3af377545ff9df30de28036671dc languageName: node linkType: hard From 382035a1d4e054cf687547f7ccdd5cf51272f09b Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 17 Apr 2024 18:55:59 -0400 Subject: [PATCH 53/98] Update dependency @types/color-name to v1.1.4 (#20546) Co-authored-by: renovate[bot] <29139614+renovate[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 8e3c84490ad0..d6cd76fb9741 100644 --- a/package.json +++ b/package.json @@ -171,7 +171,7 @@ "@types/babel__plugin-transform-runtime": "7.9.5", "@types/chromecast-caf-receiver": "6.0.13", "@types/chromecast-caf-sender": "1.0.9", - "@types/color-name": "1.1.3", + "@types/color-name": "1.1.4", "@types/glob": "8.1.0", "@types/html-minifier-terser": "7.0.2", "@types/js-yaml": "4.0.9", diff --git a/yarn.lock b/yarn.lock index 420c77fc93b7..ded556bb88c5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4069,10 +4069,10 @@ __metadata: languageName: node linkType: hard -"@types/color-name@npm:1.1.3": - version: 1.1.3 - resolution: "@types/color-name@npm:1.1.3" - checksum: 10/9060d16d0bce2cdf562d6da54e18c5f23e80308ccb58b725b9173a028818f27d8e01c8a5cd96952e76f11145a7388ed7d2f450fb4652f4760383834f2e698263 +"@types/color-name@npm:1.1.4": + version: 1.1.4 + resolution: "@types/color-name@npm:1.1.4" + checksum: 10/be275af06d32e6f09c8f1b8c15d35d2b8194736af980569b2fa572720339a19b3d5ccb63ce5950105d859d5c6226c98b8d8ecd613d626e757667037a90b9b47f languageName: node linkType: hard @@ -9027,7 +9027,7 @@ __metadata: "@types/babel__plugin-transform-runtime": "npm:7.9.5" "@types/chromecast-caf-receiver": "npm:6.0.13" "@types/chromecast-caf-sender": "npm:1.0.9" - "@types/color-name": "npm:1.1.3" + "@types/color-name": "npm:1.1.4" "@types/glob": "npm:8.1.0" "@types/html-minifier-terser": "npm:7.0.2" "@types/js-yaml": "npm:4.0.9" From e376efc57920feab37e322f2276beaa31e17d0c0 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 17 Apr 2024 23:33:07 -0500 Subject: [PATCH 54/98] Remove legacy state translations (#20536) * Remove legacy state translations https://github.com/home-assistant/core/pull/112023 --- src/data/translation.ts | 11 ----------- src/layouts/home-assistant.ts | 4 ---- src/state/translations-mixin.ts | 19 ------------------- 3 files changed, 34 deletions(-) diff --git a/src/data/translation.ts b/src/data/translation.ts index e4824b0e636f..82df04a11d73 100644 --- a/src/data/translation.ts +++ b/src/data/translation.ts @@ -97,14 +97,3 @@ export const getHassTranslations = async ( }); return result.resources; }; - -export const getHassTranslationsPre109 = async ( - hass: HomeAssistant, - language: string -): Promise> => { - const result = await hass.callWS<{ resources: Record }>({ - type: "frontend/get_translations", - language, - }); - return result.resources; -}; diff --git a/src/layouts/home-assistant.ts b/src/layouts/home-assistant.ts index 6bac52581f7e..5fe9df6fbd5c 100644 --- a/src/layouts/home-assistant.ts +++ b/src/layouts/home-assistant.ts @@ -169,10 +169,6 @@ export class HomeAssistantAppEl extends QuickBarMixin(HassElement) { // @ts-ignore this._loadHassTranslations(this.hass!.language, "entity"); - // Backwards compatibility for custom integrations - // @ts-ignore - this._loadHassTranslations(this.hass!.language, "state"); - document.addEventListener( "visibilitychange", () => this._checkVisibility(), diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts index db00f9c3c71b..b76c837c455f 100644 --- a/src/state/translations-mixin.ts +++ b/src/state/translations-mixin.ts @@ -1,4 +1,3 @@ -import { atLeastVersion } from "../common/config/version"; import { fireEvent } from "../common/dom/fire_event"; import { computeLocalize, LocalizeFunc } from "../common/translations/localize"; import { @@ -9,7 +8,6 @@ import { debounce } from "../common/util/debounce"; import { FirstWeekday, getHassTranslations, - getHassTranslationsPre109, NumberFormat, saveTranslationPreferences, TimeFormat, @@ -286,23 +284,6 @@ export default >(superClass: T) => configFlow?: Parameters[4], force = false ): Promise { - if ( - __BACKWARDS_COMPAT__ && - !atLeastVersion(this.hass!.connection.haVersion, 0, 109) - ) { - if (category !== "state") { - return this.hass!.localize; - } - const resources = await getHassTranslationsPre109(this.hass!, language); - - // Ignore the repsonse if user switched languages before we got response - if (this.hass!.language !== language) { - return this.hass!.localize; - } - - return this._updateResources(language, resources); - } - let alreadyLoaded: LoadedTranslationCategory; if (category in this.__loadedTranslations) { From b60ad8b1439fe4b8980b6a1298f8d222df16180c Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Thu, 18 Apr 2024 18:55:17 -0400 Subject: [PATCH 55/98] Update typescript-eslint monorepo to v7.7.0 (#20549) --- package.json | 4 +- yarn.lock | 104 +++++++++++++++++++++++++-------------------------- 2 files changed, 54 insertions(+), 54 deletions(-) diff --git a/package.json b/package.json index d6cd76fb9741..28c4743d7402 100644 --- a/package.json +++ b/package.json @@ -185,8 +185,8 @@ "@types/tar": "6.1.12", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", - "@typescript-eslint/eslint-plugin": "7.6.0", - "@typescript-eslint/parser": "7.6.0", + "@typescript-eslint/eslint-plugin": "7.7.0", + "@typescript-eslint/parser": "7.7.0", "@web/dev-server": "0.1.38", "@web/dev-server-rollup": "0.4.1", "babel-loader": "9.1.3", diff --git a/yarn.lock b/yarn.lock index ded556bb88c5..a6b1cebb92ab 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4597,15 +4597,15 @@ __metadata: languageName: node linkType: hard -"@typescript-eslint/eslint-plugin@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/eslint-plugin@npm:7.6.0" +"@typescript-eslint/eslint-plugin@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/eslint-plugin@npm:7.7.0" dependencies: "@eslint-community/regexpp": "npm:^4.10.0" - "@typescript-eslint/scope-manager": "npm:7.6.0" - "@typescript-eslint/type-utils": "npm:7.6.0" - "@typescript-eslint/utils": "npm:7.6.0" - "@typescript-eslint/visitor-keys": "npm:7.6.0" + "@typescript-eslint/scope-manager": "npm:7.7.0" + "@typescript-eslint/type-utils": "npm:7.7.0" + "@typescript-eslint/utils": "npm:7.7.0" + "@typescript-eslint/visitor-keys": "npm:7.7.0" debug: "npm:^4.3.4" graphemer: "npm:^1.4.0" ignore: "npm:^5.3.1" @@ -4618,44 +4618,44 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/6977c5fb5397ac6c9fda8786b149130321ffba45a71b813ca8a800fe711ac626bcbe05d5ace2ef6245eb8f0c4b6feb2b505a0e0e398fa37ce088731e78478b20 + checksum: 10/9e6b6fbb9920581813c01daaa2f89419c3476e42823755c0627f4491640cfaffaebeb0592231ed4f318eefadfcdd4560b77b2903d66ab4e0c8df746a7037a603 languageName: node linkType: hard -"@typescript-eslint/parser@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/parser@npm:7.6.0" +"@typescript-eslint/parser@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/parser@npm:7.7.0" dependencies: - "@typescript-eslint/scope-manager": "npm:7.6.0" - "@typescript-eslint/types": "npm:7.6.0" - "@typescript-eslint/typescript-estree": "npm:7.6.0" - "@typescript-eslint/visitor-keys": "npm:7.6.0" + "@typescript-eslint/scope-manager": "npm:7.7.0" + "@typescript-eslint/types": "npm:7.7.0" + "@typescript-eslint/typescript-estree": "npm:7.7.0" + "@typescript-eslint/visitor-keys": "npm:7.7.0" debug: "npm:^4.3.4" peerDependencies: eslint: ^8.56.0 peerDependenciesMeta: typescript: optional: true - checksum: 10/245b975280691c6c7bd3fe3e9d57943220e0400df62738274b98dffcbd3011b7191fd54c950cb4d0b6328699f3b1a45cea5e46cc5c86528e7f14e533277616c8 + checksum: 10/9f8c53ca29af09cd366e37420410319c8f69e9f4a676513ecd91f5e6d822b9935b6a8ad7ec931d604fc4a0ecd93d51063d0c93227f78f2380196c8a7fa6970d1 languageName: node linkType: hard -"@typescript-eslint/scope-manager@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/scope-manager@npm:7.6.0" +"@typescript-eslint/scope-manager@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/scope-manager@npm:7.7.0" dependencies: - "@typescript-eslint/types": "npm:7.6.0" - "@typescript-eslint/visitor-keys": "npm:7.6.0" - checksum: 10/1daa0b84f751e740df39abf7303e63dcff26883242a616712d338edb11d24a05a03156d8f5d6b2c42ef01a28c540dbfc5c83853e159f341189870320e4c4acef + "@typescript-eslint/types": "npm:7.7.0" + "@typescript-eslint/visitor-keys": "npm:7.7.0" + checksum: 10/c8890aaf99b57543774e50549c5b178c13695b21a6b30c65292268137fe5e6856cc0e050c118b47b5835dd8a48c96e042fc75891a7f6093a0b94b6b3b251afd9 languageName: node linkType: hard -"@typescript-eslint/type-utils@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/type-utils@npm:7.6.0" +"@typescript-eslint/type-utils@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/type-utils@npm:7.7.0" dependencies: - "@typescript-eslint/typescript-estree": "npm:7.6.0" - "@typescript-eslint/utils": "npm:7.6.0" + "@typescript-eslint/typescript-estree": "npm:7.7.0" + "@typescript-eslint/utils": "npm:7.7.0" debug: "npm:^4.3.4" ts-api-utils: "npm:^1.3.0" peerDependencies: @@ -4663,23 +4663,23 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/1011e1d3ff15f0167f653652865c5b850a1acb21627abff30b0cf1e15865dd490bfb7e9334fa2f4123477fc1eea1ebf4a5c3c8c5cc1972e3b195a39bd8c03aa8 + checksum: 10/a3f5358b4b7046458ea573607f3d6ea7f48e16524390b24c9360bdf8b03cc89fc6eb5da31b3e541e7f1e5f6958194ecaad5b644ca9b0d90c9a7b182f345451aa languageName: node linkType: hard -"@typescript-eslint/types@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/types@npm:7.6.0" - checksum: 10/830c1b12d8a9242285516e9b7e46bf434b52ad835da4fc5cdac19e79f02bf637c9458923d72cc0babe20d474ddcafcdd4dcd8991c2280d00084a014de3d32da0 +"@typescript-eslint/types@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/types@npm:7.7.0" + checksum: 10/d54ff9eeea168188fcbf1c8efe42892d1646ead801ea0a0f1312c80cfb74ee5dd61a145bc982919fb396683fb4578f98f7ad90e5d466d7aa1ca593e4338e1a2e languageName: node linkType: hard -"@typescript-eslint/typescript-estree@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/typescript-estree@npm:7.6.0" +"@typescript-eslint/typescript-estree@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/typescript-estree@npm:7.7.0" dependencies: - "@typescript-eslint/types": "npm:7.6.0" - "@typescript-eslint/visitor-keys": "npm:7.6.0" + "@typescript-eslint/types": "npm:7.7.0" + "@typescript-eslint/visitor-keys": "npm:7.7.0" debug: "npm:^4.3.4" globby: "npm:^11.1.0" is-glob: "npm:^4.0.3" @@ -4689,34 +4689,34 @@ __metadata: peerDependenciesMeta: typescript: optional: true - checksum: 10/a10ae981669180d7c09acdd01e1c3b3dcb544edb8fa44d0c82586c2915d3001e6e15c792ef6b0b75774d6ff705613ec213f2316a7d9477a122e68c5913545a2b + checksum: 10/40af26b3edb07af439f99728aa149bbc8668dae4a700a128abaf98d7f9bc0d5d31f8027aa1d13d6a55b22c20738d7cab84a3046a56417a2551de58671b39dbdf languageName: node linkType: hard -"@typescript-eslint/utils@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/utils@npm:7.6.0" +"@typescript-eslint/utils@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/utils@npm:7.7.0" dependencies: "@eslint-community/eslint-utils": "npm:^4.4.0" "@types/json-schema": "npm:^7.0.15" "@types/semver": "npm:^7.5.8" - "@typescript-eslint/scope-manager": "npm:7.6.0" - "@typescript-eslint/types": "npm:7.6.0" - "@typescript-eslint/typescript-estree": "npm:7.6.0" + "@typescript-eslint/scope-manager": "npm:7.7.0" + "@typescript-eslint/types": "npm:7.7.0" + "@typescript-eslint/typescript-estree": "npm:7.7.0" semver: "npm:^7.6.0" peerDependencies: eslint: ^8.56.0 - checksum: 10/45bcc1b00ec281cfc997aeff4bca3b3e169f49c656ddfcfad909b18ecdcd8b0d27776df1c452d47d9291cd1346023e0a2d7c8aa67bf3ad917f530033f6b193aa + checksum: 10/4223233ee022460a74f389302b50779537dfbb3bd414486dca356d2628a08d5b2c4c6002bae3bdffad92b368569024faf25faee9be739340d9459c23549a866f languageName: node linkType: hard -"@typescript-eslint/visitor-keys@npm:7.6.0": - version: 7.6.0 - resolution: "@typescript-eslint/visitor-keys@npm:7.6.0" +"@typescript-eslint/visitor-keys@npm:7.7.0": + version: 7.7.0 + resolution: "@typescript-eslint/visitor-keys@npm:7.7.0" dependencies: - "@typescript-eslint/types": "npm:7.6.0" + "@typescript-eslint/types": "npm:7.7.0" eslint-visitor-keys: "npm:^3.4.3" - checksum: 10/2703629f1359f08e7a20706e225f2d83bf12292c282d2effa431eae441b12d4af1fe8c692535f6ef32d5b6d0c15ad61c4c102e4dd157c8fe30eefb94222ba239 + checksum: 10/9f03591ab60b0b164f6bb222b5d5ae75f73fbe7f264be9318f770be9dc5dff8138d34701928940ffc18924058ae80754a738a1e623912a297d57a8a59cdfb41d languageName: node linkType: hard @@ -9041,8 +9041,8 @@ __metadata: "@types/tar": "npm:6.1.12" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" - "@typescript-eslint/eslint-plugin": "npm:7.6.0" - "@typescript-eslint/parser": "npm:7.6.0" + "@typescript-eslint/eslint-plugin": "npm:7.7.0" + "@typescript-eslint/parser": "npm:7.7.0" "@vaadin/combo-box": "npm:24.3.11" "@vaadin/vaadin-themable-mixin": "npm:24.3.11" "@vibrant/color": "npm:3.2.1-alpha.1" From a3b021b11db303063a87c09720b55028ebf123b1 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 00:12:18 -0400 Subject: [PATCH 56/98] Update dependency @material/web to v1.4.1 (#20551) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 28c4743d7402..8cd3f2f39a3a 100644 --- a/package.json +++ b/package.json @@ -81,7 +81,7 @@ "@material/mwc-top-app-bar": "0.27.0", "@material/mwc-top-app-bar-fixed": "0.27.0", "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0", - "@material/web": "1.4.0", + "@material/web": "1.4.1", "@mdi/js": "7.4.47", "@mdi/svg": "7.4.47", "@polymer/paper-item": "3.0.1", diff --git a/yarn.lock b/yarn.lock index a6b1cebb92ab..39d5cc695b4f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3203,13 +3203,13 @@ __metadata: languageName: node linkType: hard -"@material/web@npm:1.4.0": - version: 1.4.0 - resolution: "@material/web@npm:1.4.0" +"@material/web@npm:1.4.1": + version: 1.4.1 + resolution: "@material/web@npm:1.4.1" dependencies: lit: "npm:^2.7.4 || ^3.0.0" tslib: "npm:^2.4.0" - checksum: 10/226571fd96d77f9baa48a77dfe48d88ad26efe6993724d5370e78ed1f82cb3b3882d631fb474d0289e188b58c746e162d9ac5157fefc868d86db5f5ee0a123d8 + checksum: 10/d712a885d131ce39b4fb44fe2219ada737e1874480db956eb675dfd8569c7f50f4f005b6cd79c18c54d728873de8b7861241ced3332f8cc6f252b4a4088e2b6a languageName: node linkType: hard @@ -9007,7 +9007,7 @@ __metadata: "@material/mwc-top-app-bar": "npm:0.27.0" "@material/mwc-top-app-bar-fixed": "npm:0.27.0" "@material/top-app-bar": "npm:=14.0.0-canary.53b3cad2f.0" - "@material/web": "npm:1.4.0" + "@material/web": "npm:1.4.1" "@mdi/js": "npm:7.4.47" "@mdi/svg": "npm:7.4.47" "@octokit/auth-oauth-device": "npm:7.1.0" From 424622061a8f030686a6b1dd3c912a8411a73f8d Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 00:47:42 -0400 Subject: [PATCH 57/98] Lock file maintenance (#20553) --- yarn.lock | 435 +++++++++++++++++++++++++++--------------------------- 1 file changed, 217 insertions(+), 218 deletions(-) diff --git a/yarn.lock b/yarn.lock index 39d5cc695b4f..b28722392985 100644 --- a/yarn.lock +++ b/yarn.lock @@ -304,9 +304,9 @@ __metadata: linkType: hard "@babel/helper-string-parser@npm:^7.23.4": - version: 7.23.4 - resolution: "@babel/helper-string-parser@npm:7.23.4" - checksum: 10/c352082474a2ee1d2b812bd116a56b2e8b38065df9678a32a535f151ec6f58e54633cc778778374f10544b930703cca6ddf998803888a636afa27e2658068a9c + version: 7.24.1 + resolution: "@babel/helper-string-parser@npm:7.24.1" + checksum: 10/04c0ede77b908b43e6124753b48bc485528112a9335f0a21a226bff1ace75bb6e64fab24c85cb4b1610ef3494dacd1cb807caeb6b79a7b36c43d48c289b35949 languageName: node linkType: hard @@ -1218,16 +1218,16 @@ __metadata: linkType: hard "@babel/plugin-transform-typescript@npm:^7.24.1": - version: 7.24.1 - resolution: "@babel/plugin-transform-typescript@npm:7.24.1" + version: 7.24.4 + resolution: "@babel/plugin-transform-typescript@npm:7.24.4" dependencies: "@babel/helper-annotate-as-pure": "npm:^7.22.5" - "@babel/helper-create-class-features-plugin": "npm:^7.24.1" + "@babel/helper-create-class-features-plugin": "npm:^7.24.4" "@babel/helper-plugin-utils": "npm:^7.24.0" "@babel/plugin-syntax-typescript": "npm:^7.24.1" peerDependencies: "@babel/core": ^7.0.0-0 - checksum: 10/9b7fee53ebea0e96d990d9bd4f37602366f9a0955fe65bb5671505ec2e0f3d14709f26c61383481ecacc8a418c545ea8a50d407f9e34e3265fe53a686fe2d826 + checksum: 10/e8d66fbafd6cbfeca2ebe77c4fc67537be9e01813f835ce097fa91329b0cd7ba587a9cf4c4a1df661cdde438741cb3c63d2ab95c97354eb89d7682a4d99bea5d languageName: node linkType: hard @@ -1863,9 +1863,9 @@ __metadata: linkType: hard "@humanwhocodes/object-schema@npm:^2.0.2": - version: 2.0.2 - resolution: "@humanwhocodes/object-schema@npm:2.0.2" - checksum: 10/ef915e3e2f34652f3d383b28a9a99cfea476fa991482370889ab14aac8ecd2b38d47cc21932526c6d949da0daf4a4a6bf629d30f41b0caca25e146819cbfa70e + version: 2.0.3 + resolution: "@humanwhocodes/object-schema@npm:2.0.3" + checksum: 10/05bb99ed06c16408a45a833f03a732f59bf6184795d4efadd33238ff8699190a8c871ad1121241bb6501589a9598dc83bf25b99dcbcf41e155cdf36e35e937a3 languageName: node linkType: hard @@ -1884,11 +1884,11 @@ __metadata: linkType: hard "@isaacs/fs-minipass@npm:^4.0.0": - version: 4.0.0 - resolution: "@isaacs/fs-minipass@npm:4.0.0" + version: 4.0.1 + resolution: "@isaacs/fs-minipass@npm:4.0.1" dependencies: minipass: "npm:^7.0.4" - checksum: 10/7444d7a3c9211c27494630e2bff8545e3494a1598624a4871ee7ef3a9e592a61fed3abd85d118f966673bd0b4401c266d45441f89c00c420e9d0cfbf1042dbd5 + checksum: 10/4412e9e6713c89c1e66d80bb0bb5a2a93192f10477623a27d08f228ba0316bb880affabc5bfe7f838f58a34d26c2c190da726e576cdfc18c49a72e89adabdcf5 languageName: node linkType: hard @@ -2104,9 +2104,9 @@ __metadata: linkType: hard "@leichtgewicht/ip-codec@npm:^2.0.1": - version: 2.0.4 - resolution: "@leichtgewicht/ip-codec@npm:2.0.4" - checksum: 10/3c7ffb0afb86c731a02813aa4370da27eac037abf8a15fce211226c11b644610382c8eca7efadace9471ee1959afe72fc1d43a62227d974b9fca8eae8b8d2124 + version: 2.0.5 + resolution: "@leichtgewicht/ip-codec@npm:2.0.5" + checksum: 10/cb98c608392abe59457a14e00134e7dfa57c0c9b459871730cd4e907bb12b834cbd03e08ad8663fea9e486f260da7f1293ccd9af0376bf5524dd8536192f248c languageName: node linkType: hard @@ -3255,15 +3255,15 @@ __metadata: linkType: hard "@npmcli/agent@npm:^2.0.0": - version: 2.2.1 - resolution: "@npmcli/agent@npm:2.2.1" + version: 2.2.2 + resolution: "@npmcli/agent@npm:2.2.2" dependencies: agent-base: "npm:^7.1.0" http-proxy-agent: "npm:^7.0.0" https-proxy-agent: "npm:^7.0.1" lru-cache: "npm:^10.0.1" - socks-proxy-agent: "npm:^8.0.1" - checksum: 10/d4a48128f61e47f2f5c89315a5350e265dc619987e635bd62b52b29c7ed93536e724e721418c0ce352ceece86c13043c67aba1b70c3f5cc72fce6bb746706162 + socks-proxy-agent: "npm:^8.0.3" + checksum: 10/96fc0036b101bae5032dc2a4cd832efb815ce9b33f9ee2f29909ee49d96a0026b3565f73c507a69eb8603f5cb32e0ae45a70cab1e2655990a4e06ae99f7f572a languageName: node linkType: hard @@ -3311,12 +3311,12 @@ __metadata: linkType: hard "@octokit/endpoint@npm:^10.0.0": - version: 10.0.0 - resolution: "@octokit/endpoint@npm:10.0.0" + version: 10.1.1 + resolution: "@octokit/endpoint@npm:10.1.1" dependencies: - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.0.0" universal-user-agent: "npm:^7.0.2" - checksum: 10/a73a3499206ffa47bc4060a296488886fb457e4526ea6c314d56a70b4c21c8c8cdc3b6db770cfd61d99789d9d4ea7ba73d31b40f5e7b99eea81f87491eabe914 + checksum: 10/6b8991b278ba7e63ddf95e7396f54e5f1347237f11fb845322ec25101764336ed0994ccb197c449b4fd4bc00ec5b78780ccbc3a0b48ba0620dcc115027a3add1 languageName: node linkType: hard @@ -3342,21 +3342,21 @@ __metadata: linkType: hard "@octokit/oauth-authorization-url@npm:^7.0.0": - version: 7.0.1 - resolution: "@octokit/oauth-authorization-url@npm:7.0.1" - checksum: 10/028aa11cd976699eb8a26e26080be52f36757fa7f5213bc434f68a1fdf3886b41edc0c15a9008deade11672a11337650655cdfe3db20fcdcf27d23e7fc57bfe8 + version: 7.1.1 + resolution: "@octokit/oauth-authorization-url@npm:7.1.1" + checksum: 10/3ef5ef3fe943f9f82c6d0686120c7481078f46594c463f492e559cdd12d74043c9295f4323d7ac9f98d7a20692694cc7263657fabbcb275d3475686133d4f4a0 languageName: node linkType: hard "@octokit/oauth-methods@npm:^5.0.0": - version: 5.0.0 - resolution: "@octokit/oauth-methods@npm:5.0.0" + version: 5.1.2 + resolution: "@octokit/oauth-methods@npm:5.1.2" dependencies: "@octokit/oauth-authorization-url": "npm:^7.0.0" - "@octokit/request": "npm:^9.0.0" - "@octokit/request-error": "npm:^6.0.0" - "@octokit/types": "npm:^12.0.0" - checksum: 10/79e3cce0dac041ef1a117c9f7ef34abbf0076f58e2f86f445a4151c19479fa772fa6c0c7b01fedd63dfedcb8164c81fcccd3e8a98c96a8775af0f1663c1f0e6c + "@octokit/request": "npm:^9.1.0" + "@octokit/request-error": "npm:^6.1.0" + "@octokit/types": "npm:^13.0.0" + checksum: 10/8ed3a3d1abf3764aefdc0fa71ff4e8c8f1cf02e812a41cd8c9d7ebb15bb116f105380aef1aa14040dd37df3e33ef4bedf2ec1489525d5a1d63ff32e711c39b39 languageName: node linkType: hard @@ -3367,10 +3367,10 @@ __metadata: languageName: node linkType: hard -"@octokit/openapi-types@npm:^21.0.0": - version: 21.2.0 - resolution: "@octokit/openapi-types@npm:21.2.0" - checksum: 10/93bd5b188b7bd6e9ee40893594df4a4a65f4f8f6f46f145625fc990c1ad04c42de21ef6297678fac6e9256316ab2976f895b4e3eb504035c7a8656371e9dac7d +"@octokit/openapi-types@npm:^22.1.0": + version: 22.1.0 + resolution: "@octokit/openapi-types@npm:22.1.0" + checksum: 10/d80567182efe6cc2c36b96853e622f013a21362897c49fc35fadccfbc1c32b26e478a119385093ea95a5877c76a9327c54457ad22b1815c7a20a6912f2f7e0fb languageName: node linkType: hard @@ -3429,36 +3429,36 @@ __metadata: languageName: node linkType: hard -"@octokit/request-error@npm:^6.0.0, @octokit/request-error@npm:^6.0.1": - version: 6.0.2 - resolution: "@octokit/request-error@npm:6.0.2" +"@octokit/request-error@npm:^6.0.0, @octokit/request-error@npm:^6.0.1, @octokit/request-error@npm:^6.1.0": + version: 6.1.1 + resolution: "@octokit/request-error@npm:6.1.1" dependencies: - "@octokit/types": "npm:^12.0.0" - checksum: 10/ad2567500dccd14b42af02531812b63104e33fabd84de577005eed5104ca90b91d02456548b523c4b53b15bc12fb9e82e574f8fba993b93e7542dc80412f93eb + "@octokit/types": "npm:^13.0.0" + checksum: 10/cae7bc4078629a02edcf35977f496a4b943e730165f6d7828795073f99a1d884ac67343b02eff69e553a5057765e466d70ddd9d266787f505aa29018858ab06d languageName: node linkType: hard "@octokit/request@npm:^8.3.0, @octokit/request@npm:^8.3.1": - version: 8.3.1 - resolution: "@octokit/request@npm:8.3.1" + version: 8.4.0 + resolution: "@octokit/request@npm:8.4.0" dependencies: "@octokit/endpoint": "npm:^9.0.1" "@octokit/request-error": "npm:^5.1.0" - "@octokit/types": "npm:^13.0.0" + "@octokit/types": "npm:^13.1.0" universal-user-agent: "npm:^6.0.0" - checksum: 10/9df92d1e2c739cdfc01eef11ffa88e36a6dbd2b52f950b27fe5e47f5b795f9df2e99318adab28e16ff360197e7db49f2d34dad25d432abe77c7f4657fc8c681e + checksum: 10/176cd83c68bde87111a01d50e2d21cf12ec362c1a30b33649eb8771d37397f6d6dd0b0844aab8d59b16d74c825252e39cadd52e37a4b1669d6facd1cb2cdc995 languageName: node linkType: hard -"@octokit/request@npm:^9.0.0": - version: 9.0.1 - resolution: "@octokit/request@npm:9.0.1" +"@octokit/request@npm:^9.0.0, @octokit/request@npm:^9.1.0": + version: 9.1.1 + resolution: "@octokit/request@npm:9.1.1" dependencies: "@octokit/endpoint": "npm:^10.0.0" "@octokit/request-error": "npm:^6.0.1" - "@octokit/types": "npm:^12.0.0" + "@octokit/types": "npm:^13.1.0" universal-user-agent: "npm:^7.0.2" - checksum: 10/428e27ca11ebf02ffc4a7705f0b73cb5f7323a0a1e3a96ebce6a6da1c66c22ffdf7f0af536c67288cda4360525c47fc938c3b31258376ca3739be7c32c7b98d3 + checksum: 10/aef47d85751c387c6ef29e70b3b86c9033fc7940361092c80728f7e99cc0ba54ddd00bbecb4422e50df78744600cfb8a1a2bc6916c5b6440677aa8ebd6b9b291 languageName: node linkType: hard @@ -3474,7 +3474,7 @@ __metadata: languageName: node linkType: hard -"@octokit/types@npm:^12.0.0, @octokit/types@npm:^12.6.0": +"@octokit/types@npm:^12.6.0": version: 12.6.0 resolution: "@octokit/types@npm:12.6.0" dependencies: @@ -3484,11 +3484,11 @@ __metadata: linkType: hard "@octokit/types@npm:^13.0.0, @octokit/types@npm:^13.1.0": - version: 13.1.0 - resolution: "@octokit/types@npm:13.1.0" + version: 13.4.1 + resolution: "@octokit/types@npm:13.4.1" dependencies: - "@octokit/openapi-types": "npm:^21.0.0" - checksum: 10/3ca6bf76ee1e07ba5bf5aea911948878f82dc0ca5295902f1a3bb405ea008b927bf9dd6c2b3d6e875a7ecfbd7f5b6dc00be3e23adc89ba6fa015c1a00836f920 + "@octokit/openapi-types": "npm:^22.1.0" + checksum: 10/ea2460da2e343edc2f4c9759d0846e40158b4023c9d802ee9edd0d15a18fa596cb151e0a21e8cad48c34c001942dc7813a4b15c399eb169e6fd5bd983d2f55dc languageName: node linkType: hard @@ -4044,12 +4044,12 @@ __metadata: linkType: hard "@types/chrome@npm:*": - version: 0.0.263 - resolution: "@types/chrome@npm:0.0.263" + version: 0.0.266 + resolution: "@types/chrome@npm:0.0.266" dependencies: "@types/filesystem": "npm:*" "@types/har-format": "npm:*" - checksum: 10/ecffc799c2c8df057457fb79be0ac69d2d3327e53343d6727f1633a4782037613e7392ede6541284a9fa771d4d63352d61889882328c95e0ea9af4c65d8c98c5 + checksum: 10/3a6c0d3214da65947a9fcd4343ca86b0a4d3ebe1745038fd075a116b7d99d7ef331b84f7b595297faf31cfd4dd7c344ef366f403991635169d295807d3a75d78 languageName: node linkType: hard @@ -4132,12 +4132,12 @@ __metadata: linkType: hard "@types/eslint@npm:*": - version: 8.56.5 - resolution: "@types/eslint@npm:8.56.5" + version: 8.56.10 + resolution: "@types/eslint@npm:8.56.10" dependencies: "@types/estree": "npm:*" "@types/json-schema": "npm:*" - checksum: 10/548aab6ea34ca14452bf6e9212c76bb22cdf3b725d47e25591c20651af3f47fb62c59c4e80ed8ea3f7d1d7374d907cbba980af910e4c0f0cb29f73b9a6a9226f + checksum: 10/0cdd914b944ebba51c35827d3ef95bc3e16eb82b4c2741f6437fa57cdb00a4407c77f89c220afe9e4c9566982ec8a0fb9b97c956ac3bd4623a3b6af32eed8424 languageName: node linkType: hard @@ -4156,14 +4156,14 @@ __metadata: linkType: hard "@types/express-serve-static-core@npm:*, @types/express-serve-static-core@npm:^4.17.33": - version: 4.17.43 - resolution: "@types/express-serve-static-core@npm:4.17.43" + version: 4.19.0 + resolution: "@types/express-serve-static-core@npm:4.19.0" dependencies: "@types/node": "npm:*" "@types/qs": "npm:*" "@types/range-parser": "npm:*" "@types/send": "npm:*" - checksum: 10/9079e137470e0456bb8e77ae66df9505ee12591e94860bde574cfe52c5c60bbc5bf7dd44f5689c3cbb1baf0aa84442d9a21f53dcd921d18745727293cd5a5fd6 + checksum: 10/3e803822f90106158e2c7598d0a44e078e22fad67806eadb1e9f00261fa2be7ea65725d9d177157225d2b0ab22793a84039a433c2d97910586ae6f79e9d04c2f languageName: node linkType: hard @@ -4180,11 +4180,11 @@ __metadata: linkType: hard "@types/filesystem@npm:*": - version: 0.0.35 - resolution: "@types/filesystem@npm:0.0.35" + version: 0.0.36 + resolution: "@types/filesystem@npm:0.0.36" dependencies: "@types/filewriter": "npm:*" - checksum: 10/d8eb6c2b28601c5eacf8b48464bc48f060c2a7194e2c8e493e943f3a8543e35da9c706987665356ed67b11587cc94819fd8262037bf56945c6a38569a0e260f1 + checksum: 10/ec831040fe3aff066ffb7b7541e21a5dd59aa06e7175c61e592736e38b018b1d513551438254631e2a3fbc81ff671bf618401000f4c8ea79156934cbc7dcaeaa languageName: node linkType: hard @@ -4350,13 +4350,6 @@ __metadata: languageName: node linkType: hard -"@types/mime@npm:*": - version: 3.0.4 - resolution: "@types/mime@npm:3.0.4" - checksum: 10/a6139c8e1f705ef2b064d072f6edc01f3c099023ad7c4fce2afc6c2bf0231888202adadbdb48643e8e20da0ce409481a49922e737eca52871b3dc08017455843 - languageName: node - linkType: hard - "@types/mime@npm:^1": version: 1.3.5 resolution: "@types/mime@npm:1.3.5" @@ -4388,11 +4381,11 @@ __metadata: linkType: hard "@types/node@npm:*": - version: 20.11.29 - resolution: "@types/node@npm:20.11.29" + version: 20.12.7 + resolution: "@types/node@npm:20.12.7" dependencies: undici-types: "npm:~5.26.4" - checksum: 10/eca2c87c1e583bcd4d73dc7a49643c6b793008d8aeefb93ba22c84d70b61388d6cacf8c44af0fcd35820a92121249437689afe48f42b228e281ecc64c22b0a67 + checksum: 10/b4a28a3b593a9bdca5650880b6a9acef46911d58cf7cfa57268f048e9a7157a7c3196421b96cea576850ddb732e3b54bc982c8eb5e1e5ef0635d4424c2fce801 languageName: node linkType: hard @@ -4450,9 +4443,9 @@ __metadata: linkType: hard "@types/qs@npm:*": - version: 6.9.13 - resolution: "@types/qs@npm:6.9.13" - checksum: 10/0a8c55694fee7027dda7e1451936a5a0f8f33a8a5ea24a2e5b0cf2dc221fc21afc6939ff74ea82c5107924e87192a403e60904c339abc3cbc19bd5e90e6e1ce0 + version: 6.9.15 + resolution: "@types/qs@npm:6.9.15" + checksum: 10/97d8208c2b82013b618e7a9fc14df6bd40a73e1385ac479b6896bafc7949a46201c15f42afd06e86a05e914f146f495f606b6fb65610cc60cf2e0ff743ec38a2 languageName: node linkType: hard @@ -4522,13 +4515,13 @@ __metadata: linkType: hard "@types/serve-static@npm:*, @types/serve-static@npm:^1.15.5": - version: 1.15.5 - resolution: "@types/serve-static@npm:1.15.5" + version: 1.15.7 + resolution: "@types/serve-static@npm:1.15.7" dependencies: "@types/http-errors": "npm:*" - "@types/mime": "npm:*" "@types/node": "npm:*" - checksum: 10/49aa21c367fffe4588fc8c57ea48af0ea7cbadde7418bc53cde85d8bd57fd2a09a293970d9ea86e79f17a87f8adeb3e20da76aab38e1c4d1567931fa15c8af38 + "@types/send": "npm:*" + checksum: 10/c5a7171d5647f9fbd096ed1a26105759f3153ccf683824d99fee4c7eb9cde2953509621c56a070dd9fb1159e799e86d300cbe4e42245ebc5b0c1767e8ca94a67 languageName: node linkType: hard @@ -5396,12 +5389,12 @@ __metadata: languageName: node linkType: hard -"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0": - version: 7.1.0 - resolution: "agent-base@npm:7.1.0" +"agent-base@npm:^7.0.2, agent-base@npm:^7.1.0, agent-base@npm:^7.1.1": + version: 7.1.1 + resolution: "agent-base@npm:7.1.1" dependencies: debug: "npm:^4.3.4" - checksum: 10/f7828f991470a0cc22cb579c86a18cbae83d8a3cbed39992ab34fc7217c4d126017f1c74d0ab66be87f71455318a8ea3e757d6a37881b8d0f2a2c6aa55e5418f + checksum: 10/c478fec8f79953f118704d007a38f2a185458853f5c45579b9669372bd0e12602e88dc2ad0233077831504f7cd6fcc8251c383375bba5eaaf563b102938bda26 languageName: node linkType: hard @@ -5509,11 +5502,9 @@ __metadata: linkType: hard "ansi-escapes@npm:^6.2.0": - version: 6.2.0 - resolution: "ansi-escapes@npm:6.2.0" - dependencies: - type-fest: "npm:^3.0.0" - checksum: 10/442f91b04650b35bc4815f47c20412d69ddbba5d4bf22f72ec03be352fca2de6819c7e3f4dfd17816ee4e0c6c965fe85e6f1b3f09683996a8d12fd366afd924e + version: 6.2.1 + resolution: "ansi-escapes@npm:6.2.1" + checksum: 10/3b064937dc8a0645ed8094bc8b09483ee718f3aa3139746280e6c2ea80e28c0a3ce66973d0f33e88e60021abbf67e5f877deabfc810e75edf8a19dfa128850be languageName: node linkType: hard @@ -5686,15 +5677,16 @@ __metadata: linkType: hard "array-includes@npm:^3.1.7": - version: 3.1.7 - resolution: "array-includes@npm:3.1.7" + version: 3.1.8 + resolution: "array-includes@npm:3.1.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - get-intrinsic: "npm:^1.2.1" + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-object-atoms: "npm:^1.0.0" + get-intrinsic: "npm:^1.2.4" is-string: "npm:^1.0.7" - checksum: 10/856a8be5d118967665936ad33ff3b07adfc50b06753e596e91fb80c3da9b8c022e92e3cc6781156d6ad95db7109b9f603682c7df2d6a529ed01f7f6b39a4a360 + checksum: 10/290b206c9451f181fb2b1f79a3bf1c0b66bb259791290ffbada760c79b284eef6f5ae2aeb4bcff450ebc9690edd25732c4c73a3c2b340fcc0f4563aed83bf488 languageName: node linkType: hard @@ -5713,27 +5705,29 @@ __metadata: linkType: hard "array.prototype.find@npm:^2.2.2": - version: 2.2.2 - resolution: "array.prototype.find@npm:2.2.2" + version: 2.2.3 + resolution: "array.prototype.find@npm:2.2.3" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - es-shim-unscopables: "npm:^1.0.0" - checksum: 10/d6b88bdbbc84851061e3689617748781c85228282ee923b556b70a3ac664bdb016803dc6aaf58666b47b5cdfc52cdb2395114fdc5bac08b69be25504c276840d + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-object-atoms: "npm:^1.0.0" + es-shim-unscopables: "npm:^1.0.2" + checksum: 10/8ee81d37de9c8574a94f4773dffa40b4d200deca11b00f7176dcb328a9ddcf75fef117c97ccce1ab8345b7184c107553156908e7dcaf0d42f1a395a04bbe803e languageName: node linkType: hard "array.prototype.findlastindex@npm:^1.2.3": - version: 1.2.4 - resolution: "array.prototype.findlastindex@npm:1.2.4" + version: 1.2.5 + resolution: "array.prototype.findlastindex@npm:1.2.5" dependencies: - call-bind: "npm:^1.0.5" + call-bind: "npm:^1.0.7" define-properties: "npm:^1.2.1" - es-abstract: "npm:^1.22.3" + es-abstract: "npm:^1.23.2" es-errors: "npm:^1.3.0" + es-object-atoms: "npm:^1.0.0" es-shim-unscopables: "npm:^1.0.2" - checksum: 10/12d7de8da619065b9d4c40550d11c13f2fbbc863c4270ef01d022f49ef16fbe9022441ee9d60b1e952853c661dd4b3e05c21e4348d4631c6d93ddf802a252296 + checksum: 10/7c5c821f357cd53ab6cc305de8086430dd8d7a2485db87b13f843e868055e9582b1fd338f02338f67fc3a1603ceaf9610dd2a470b0b506f9d18934780f95b246 languageName: node linkType: hard @@ -5844,9 +5838,9 @@ __metadata: linkType: hard "axe-core@npm:^4.3.3": - version: 4.8.4 - resolution: "axe-core@npm:4.8.4" - checksum: 10/c8b3972b17afac33b9e151556fa500b9218086ca763866942de30e7f51ac50582902ad03ec16381796c95afaacfa8c33efb2d02ab4f09b6c09d6be58b95da978 + version: 4.9.0 + resolution: "axe-core@npm:4.9.0" + checksum: 10/d337c4600e522bb85ed7b242e8eea322892025bc3c951fcda4845a664f9cfb065c509bc17428315c7f8571a4b5c55552d9011d752a6aae8be006bfa54d725a42 languageName: node linkType: hard @@ -5936,9 +5930,9 @@ __metadata: linkType: hard "bare-events@npm:^2.2.0": - version: 2.2.1 - resolution: "bare-events@npm:2.2.1" - checksum: 10/a2c96a638e5a049960e42660320bcd9e3c5e83da2072e4c05080661219eae744931751be86c814590dcce5107c30cbb60dc2d15097b1b14e2f42db1cd9b80898 + version: 2.2.2 + resolution: "bare-events@npm:2.2.2" + checksum: 10/79d50a739d9f2173e881e0957f9b0ee64befde3d7b6f955b1450de06a4c131f095415beaafa9772caa23c2ddfd70c56def0a3c5841b21488b7ff2c91d9f9898a languageName: node linkType: hard @@ -6220,9 +6214,9 @@ __metadata: linkType: hard "caniuse-lite@npm:^1.0.30001587": - version: 1.0.30001599 - resolution: "caniuse-lite@npm:1.0.30001599" - checksum: 10/c9a5ad806fc0d446e4f995d551b840d8fdcbe97958b7f83ff7a255a8ef5e40ca12ca1a508c66b3ab147e19eef932d28772d205c046500dd0740ea9dfb602e2e1 + version: 1.0.30001611 + resolution: "caniuse-lite@npm:1.0.30001611" + checksum: 10/24710a9cc026e564508fad6905d93d2be14ff38af6e08dce651521e7f4e87b2d2863dd8976da5349173e0c10b47377634238890dc34aa6d44a4d0ca3b1f6e236 languageName: node linkType: hard @@ -6737,11 +6731,11 @@ __metadata: linkType: hard "core-js-compat@npm:^3.31.0, core-js-compat@npm:^3.36.1": - version: 3.36.1 - resolution: "core-js-compat@npm:3.36.1" + version: 3.37.0 + resolution: "core-js-compat@npm:3.37.0" dependencies: browserslist: "npm:^4.23.0" - checksum: 10/d86b46805de7f5ba3675ed21532ecc64b6c1f123be7286b9efa7941ec087cd8d2446cb555f03a407dbbbeb6e881d1baf92eaffb7f051b11d9103f39c8731fa62 + checksum: 10/5f33d7ba45acc9ceb45544d844090edfd14e46a64c2424df24084347405182c1156588cc3a877fc580c005a0b13b8a1af26bb6c73fe73f22eede89b5483b482d languageName: node linkType: hard @@ -7213,20 +7207,20 @@ __metadata: linkType: hard "ejs@npm:^3.1.6": - version: 3.1.9 - resolution: "ejs@npm:3.1.9" + version: 3.1.10 + resolution: "ejs@npm:3.1.10" dependencies: jake: "npm:^10.8.5" bin: ejs: bin/cli.js - checksum: 10/71f56d37540d2c2d71701f0116710c676f75314a3e997ef8b83515d5d4d2b111c5a72725377caeecb928671bacb84a0d38135f345904812e989847057d59f21a + checksum: 10/a9cb7d7cd13b7b1cd0be5c4788e44dd10d92f7285d2f65b942f33e127230c054f99a42db4d99f766d8dbc6c57e94799593ee66a14efd7c8dd70c4812bf6aa384 languageName: node linkType: hard "electron-to-chromium@npm:^1.4.668": - version: 1.4.710 - resolution: "electron-to-chromium@npm:1.4.710" - checksum: 10/9f20e58d35350141e3c8d8ea577249cacf91e91ac57be2ad631606c4fb2ee627c6054e4dff152800c438faa1dc1cd14ae244a9e270eaec11821e0de263ff5de5 + version: 1.4.743 + resolution: "electron-to-chromium@npm:1.4.743" + checksum: 10/e8c2db1f6bc55c9edf20819afaa93682309bc91078e01918aff8c9b4f7ac109fb43223f09468ea0559216e608e9a3c24a73adab4cc872ebdc3ad41f7b2d692e9 languageName: node linkType: hard @@ -7326,11 +7320,11 @@ __metadata: linkType: hard "envinfo@npm:^7.7.3": - version: 7.11.1 - resolution: "envinfo@npm:7.11.1" + version: 7.12.0 + resolution: "envinfo@npm:7.12.0" bin: envinfo: dist/cli.js - checksum: 10/5a18ead05954ac1643350170fefce2436a9cb758dc402e36fe4616553ee46469f766fcb6df72379d1741a2e5b55918949b343ff6174502c31c524a5cf75f05cd + checksum: 10/981fbc80d484e42aa2c86d637ab0db773b67c285116561e50f49b5d2cb95cfd7c381d323196c487a1fa95d461ae787857559f08cf68c01be114449527f757df8 languageName: node linkType: hard @@ -7351,8 +7345,8 @@ __metadata: linkType: hard "es-abstract@npm:^1.22.1, es-abstract@npm:^1.22.3, es-abstract@npm:^1.23.0, es-abstract@npm:^1.23.2": - version: 1.23.2 - resolution: "es-abstract@npm:1.23.2" + version: 1.23.3 + resolution: "es-abstract@npm:1.23.3" dependencies: array-buffer-byte-length: "npm:^1.0.1" arraybuffer.prototype.slice: "npm:^1.0.3" @@ -7393,14 +7387,14 @@ __metadata: safe-regex-test: "npm:^1.0.3" string.prototype.trim: "npm:^1.2.9" string.prototype.trimend: "npm:^1.0.8" - string.prototype.trimstart: "npm:^1.0.7" + string.prototype.trimstart: "npm:^1.0.8" typed-array-buffer: "npm:^1.0.2" typed-array-byte-length: "npm:^1.0.1" typed-array-byte-offset: "npm:^1.0.2" - typed-array-length: "npm:^1.0.5" + typed-array-length: "npm:^1.0.6" unbox-primitive: "npm:^1.0.2" which-typed-array: "npm:^1.1.15" - checksum: 10/f8fa0ef674b176f177f637f1af13fb895d10306e1eb1f57dc48a5aa64a643da307f96b222054ff76f3fd9029983295192c55fc54169f464ad2fcee992c5b7310 + checksum: 10/2da795a6a1ac5fc2c452799a409acc2e3692e06dc6440440b076908617188899caa562154d77263e3053bcd9389a07baa978ab10ac3b46acc399bd0c77be04cb languageName: node linkType: hard @@ -7421,9 +7415,9 @@ __metadata: linkType: hard "es-module-lexer@npm:^1.0.0, es-module-lexer@npm:^1.2.1": - version: 1.4.1 - resolution: "es-module-lexer@npm:1.4.1" - checksum: 10/cf453613468c417af6e189b03d9521804033fdd5a229a36fedec28d37ea929fccf6822d42abff1126eb01ba1d2aa2845a48d5d1772c0724f8204464d9d3855f6 + version: 1.5.0 + resolution: "es-module-lexer@npm:1.5.0" + checksum: 10/d0e198d8642cb42aa82d86f2c6830cb6786916171a3e693046c11500c0cb62e77703940e58757db8aafa8a86fa2a9cc1c493dcd22c0b03c4a72dede3ce5c7dd1 languageName: node linkType: hard @@ -9527,7 +9521,7 @@ __metadata: languageName: node linkType: hard -"internal-slot@npm:^1.0.5, internal-slot@npm:^1.0.7": +"internal-slot@npm:^1.0.7": version: 1.0.7 resolution: "internal-slot@npm:1.0.7" dependencies: @@ -9808,9 +9802,9 @@ __metadata: linkType: hard "is-network-error@npm:^1.0.0": - version: 1.0.1 - resolution: "is-network-error@npm:1.0.1" - checksum: 10/165d61500c4186c62db5a3a693d6bfa14ca40fe9b471ef4cd4f27b20ef6760880faf5386dc01ca9867531631782941fedaa94521d09959edf71f046e393c7b91 + version: 1.1.0 + resolution: "is-network-error@npm:1.1.0" + checksum: 10/b2fe6aac07f814a9de275efd05934c832c129e7ba292d27614e9e8eec9e043b7a0bbeaeca5d0916b0f462edbec2aa2eaee974ee0a12ac095040e9515c222c251 languageName: node linkType: hard @@ -10368,8 +10362,8 @@ __metadata: linkType: hard "koa@npm:^2.13.0": - version: 2.15.1 - resolution: "koa@npm:2.15.1" + version: 2.15.3 + resolution: "koa@npm:2.15.3" dependencies: accepts: "npm:^1.3.5" cache-content-type: "npm:^1.0.0" @@ -10394,7 +10388,7 @@ __metadata: statuses: "npm:^1.5.0" type-is: "npm:^1.6.16" vary: "npm:^1.1.2" - checksum: 10/494e3deaa26879744a0f145cbd12ad1020a54dea327b50e2074e336697dfba3c45cb63f76a8bcc546183347286b254b8aa49b63a32eebad6de0a046edd58db48 + checksum: 10/b2c2771a4ee5268f9d039ce025b9c3798a0baba8c3cf3895a6fc2d286363e0cd2c98c02a5b87f14100baa2bc17d854eed6ed80f9bd41afda1d056f803b206514 languageName: node linkType: hard @@ -10821,7 +10815,7 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:0.30.9, magic-string@npm:^0.30.3": +"magic-string@npm:0.30.9": version: 0.30.9 resolution: "magic-string@npm:0.30.9" dependencies: @@ -10839,6 +10833,15 @@ __metadata: languageName: node linkType: hard +"magic-string@npm:^0.30.3": + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" + dependencies: + "@jridgewell/sourcemap-codec": "npm:^1.4.15" + checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201 + languageName: node + linkType: hard + "make-fetch-happen@npm:^13.0.0": version: 13.0.0 resolution: "make-fetch-happen@npm:13.0.0" @@ -10907,11 +10910,11 @@ __metadata: linkType: hard "memfs@npm:^4.6.0": - version: 4.7.7 - resolution: "memfs@npm:4.7.7" + version: 4.8.2 + resolution: "memfs@npm:4.8.2" dependencies: tslib: "npm:^2.0.0" - checksum: 10/311633e5857c91f41021b43f00eda8d540fed2c2d9e02c780fe78de720cfb55d15ab2d5b5ce9f2576637589b82e84488f1b9ff503563e817ed65200ad24617fb + checksum: 10/9cc1d1ce0ecb7cf91b1c0a29cb661ff0bde7471e8d902bbd465da6e0c49b4b3917309042a0ce7af82fa130b130e8b55688f7ac306c03e51639eb44eea6ffd75a languageName: node linkType: hard @@ -11350,8 +11353,8 @@ __metadata: linkType: hard "node-gyp@npm:latest": - version: 10.0.1 - resolution: "node-gyp@npm:10.0.1" + version: 10.1.0 + resolution: "node-gyp@npm:10.1.0" dependencies: env-paths: "npm:^2.2.0" exponential-backoff: "npm:^3.1.1" @@ -11365,7 +11368,7 @@ __metadata: which: "npm:^4.0.0" bin: node-gyp: bin/node-gyp.js - checksum: 10/578cf0c821f258ce4b6ebce4461eca4c991a4df2dee163c0624f2fe09c7d6d37240be4942285a0048d307230248ee0b18382d6623b9a0136ce9533486deddfa8 + checksum: 10/89e105e495e66cd4568af3cf79cdeb67d670eb069e33163c7781d3366470a30367c9bd8dea59e46db16370020139e5bf78b1fbc03284cb571754dfaa59744db5 languageName: node linkType: hard @@ -11977,9 +11980,9 @@ __metadata: linkType: hard "path-to-regexp@npm:^6.2.1": - version: 6.2.1 - resolution: "path-to-regexp@npm:6.2.1" - checksum: 10/1e266be712d1a08086ee77beab12a1804842ec635dfed44f9ee1ba960a0e01cec8063fb8c92561115cdc0ce73158cdc7766e353ffa039340b4a85b370084c4d4 + version: 6.2.2 + resolution: "path-to-regexp@npm:6.2.2" + checksum: 10/f7d11c1a9e02576ce0294f4efdc523c11b73894947afdf7b23a0d0f7c6465d7a7772166e770ddf1495a8017cc0ee99e3e8a15ed7302b6b948b89a6dd4eea895e languageName: node linkType: hard @@ -12126,13 +12129,13 @@ __metadata: linkType: hard "postcss@npm:^8.4.14": - version: 8.4.36 - resolution: "postcss@npm:8.4.36" + version: 8.4.38 + resolution: "postcss@npm:8.4.38" dependencies: nanoid: "npm:^3.3.7" picocolors: "npm:^1.0.0" - source-map-js: "npm:^1.1.0" - checksum: 10/8b8bb8e6b67ed8bd3c6773b9b7e9f5fabcf3c6bce35f08dcbea099ce971e81ed5e0639dd08edcdd7078aa78523cdd195f985dde2e070013897f8a7aa4e95adf3 + source-map-js: "npm:^1.2.0" + checksum: 10/6e44a7ed835ffa9a2b096e8d3e5dfc6bcf331a25c48aeb862dd54e3aaecadf814fa22be224fd308f87d08adf2299164f88c5fd5ab1c4ef6cbd693ceb295377f4 languageName: node linkType: hard @@ -12277,11 +12280,11 @@ __metadata: linkType: hard "qs@npm:^6.11.2": - version: 6.12.0 - resolution: "qs@npm:6.12.0" + version: 6.12.1 + resolution: "qs@npm:6.12.1" dependencies: side-channel: "npm:^1.0.6" - checksum: 10/6156d3f0d74278b7e93a3a6b56e6b87b513ebd45ae65c7330c96d70270d0844fb0af9454a194124cd56b9ebf47b456dd01e28b223cde93c8ab01d1cb53a0e491 + checksum: 10/035bcad2a1ab0175bac7a74c904c15913bdac252834149ccff988c93a51de02642fe7be10e43058ba4dc4094bb28ce9b59d12b9e91d40997f445cfde3ecc1c29 languageName: node linkType: hard @@ -12426,7 +12429,7 @@ __metadata: languageName: node linkType: hard -"regexp.prototype.flags@npm:^1.5.0, regexp.prototype.flags@npm:^1.5.2": +"regexp.prototype.flags@npm:^1.5.2": version: 1.5.2 resolution: "regexp.prototype.flags@npm:1.5.2" dependencies: @@ -13042,7 +13045,7 @@ __metadata: languageName: node linkType: hard -"set-function-name@npm:^2.0.0, set-function-name@npm:^2.0.1": +"set-function-name@npm:^2.0.1, set-function-name@npm:^2.0.2": version: 2.0.2 resolution: "set-function-name@npm:2.0.2" dependencies: @@ -13199,24 +13202,24 @@ __metadata: languageName: node linkType: hard -"socks-proxy-agent@npm:^8.0.1": - version: 8.0.2 - resolution: "socks-proxy-agent@npm:8.0.2" +"socks-proxy-agent@npm:^8.0.3": + version: 8.0.3 + resolution: "socks-proxy-agent@npm:8.0.3" dependencies: - agent-base: "npm:^7.0.2" + agent-base: "npm:^7.1.1" debug: "npm:^4.3.4" socks: "npm:^2.7.1" - checksum: 10/ea727734bd5b2567597aa0eda14149b3b9674bb44df5937bbb9815280c1586994de734d965e61f1dd45661183d7b41f115fb9e432d631287c9063864cfcc2ecc + checksum: 10/c2112c66d6322e497d68e913c3780f3683237fd394bfd480b9283486a86e36095d0020db96145d88f8ccd9cc73261b98165b461f9c1bf5dc17abfe75c18029ce languageName: node linkType: hard "socks@npm:^2.7.1": - version: 2.8.1 - resolution: "socks@npm:2.8.1" + version: 2.8.3 + resolution: "socks@npm:2.8.3" dependencies: ip-address: "npm:^9.0.5" smart-buffer: "npm:^4.2.0" - checksum: 10/a3cc38e0716ab53a2db3fa00c703ca682ad54dbbc9ed4c7461624a999be6fa7cdc79fc904c411618e698d5eff55a55aa6d9329169a7db11636d0200814a2b5aa + checksum: 10/ffcb622c22481dfcd7589aae71fbfd71ca34334064d181df64bf8b7feaeee19706aba4cffd1de35cc7bbaeeaa0af96be2d7f40fcbc7bc0ab69533a7ae9ffc4fb languageName: node linkType: hard @@ -13241,10 +13244,10 @@ __metadata: languageName: node linkType: hard -"source-map-js@npm:^1.1.0": - version: 1.1.0 - resolution: "source-map-js@npm:1.1.0" - checksum: 10/6319690f50f8da9445433d7edfb8cc4ffd42b9deb69739c73bb65992c61dfdf6f5979f49d4a25e85e51ebf235fde65e061291e8ee2a68da2b87a38c62cb4aef4 +"source-map-js@npm:^1.2.0": + version: 1.2.0 + resolution: "source-map-js@npm:1.2.0" + checksum: 10/74f331cfd2d121c50790c8dd6d3c9de6be21926de80583b23b37029b0f37aefc3e019fa91f9a10a5e120c08135297e1ecf312d561459c45908cb1e0e365f49e5 languageName: node linkType: hard @@ -13497,19 +13500,22 @@ __metadata: linkType: hard "string.prototype.matchall@npm:^4.0.6": - version: 4.0.10 - resolution: "string.prototype.matchall@npm:4.0.10" + version: 4.0.11 + resolution: "string.prototype.matchall@npm:4.0.11" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - get-intrinsic: "npm:^1.2.1" + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-abstract: "npm:^1.23.2" + es-errors: "npm:^1.3.0" + es-object-atoms: "npm:^1.0.0" + get-intrinsic: "npm:^1.2.4" + gopd: "npm:^1.0.1" has-symbols: "npm:^1.0.3" - internal-slot: "npm:^1.0.5" - regexp.prototype.flags: "npm:^1.5.0" - set-function-name: "npm:^2.0.0" - side-channel: "npm:^1.0.4" - checksum: 10/0f7a1a7f91790cd45f804039a16bc6389c8f4f25903e648caa3eea080b019a5c7b0cac2ca83976646140c2332b159042140bf389f23675609d869dd52450cddc + internal-slot: "npm:^1.0.7" + regexp.prototype.flags: "npm:^1.5.2" + set-function-name: "npm:^2.0.2" + side-channel: "npm:^1.0.6" + checksum: 10/a902ff4500f909f2a08e55cc5ab1ffbbc905f603b36837674370ee3921058edd0392147e15891910db62a2f31ace2adaf065eaa3bc6e9810bdbc8ca48e05a7b5 languageName: node linkType: hard @@ -13536,14 +13542,14 @@ __metadata: languageName: node linkType: hard -"string.prototype.trimstart@npm:^1.0.7": - version: 1.0.7 - resolution: "string.prototype.trimstart@npm:1.0.7" +"string.prototype.trimstart@npm:^1.0.8": + version: 1.0.8 + resolution: "string.prototype.trimstart@npm:1.0.8" dependencies: - call-bind: "npm:^1.0.2" - define-properties: "npm:^1.2.0" - es-abstract: "npm:^1.22.1" - checksum: 10/6e594d3a61b127d243b8be1312e9f78683abe452cfe0bcafa3e0dc62ad6f030ccfb64d87ed3086fb7cb540fda62442c164d237cc5cc4d53c6e3eb659c29a0aeb + call-bind: "npm:^1.0.7" + define-properties: "npm:^1.2.1" + es-object-atoms: "npm:^1.0.0" + checksum: 10/160167dfbd68e6f7cb9f51a16074eebfce1571656fc31d40c3738ca9e30e35496f2c046fe57b6ad49f65f238a152be8c86fd9a2dd58682b5eba39dad995b3674 languageName: node linkType: hard @@ -13829,8 +13835,8 @@ __metadata: linkType: hard "terser@npm:^5.0.0, terser@npm:^5.15.1, terser@npm:^5.26.0": - version: 5.29.2 - resolution: "terser@npm:5.29.2" + version: 5.30.3 + resolution: "terser@npm:5.30.3" dependencies: "@jridgewell/source-map": "npm:^0.3.3" acorn: "npm:^8.8.2" @@ -13838,7 +13844,7 @@ __metadata: source-map-support: "npm:~0.5.20" bin: terser: bin/terser - checksum: 10/062df6a8f99ea2635d1b3ce41cfd4180dea6e1c83db9b2cf4b525170b2446d10e069d2877d8dcb59fbf6045870efa17b56462b67045ef2d2b420870f9d144690 + checksum: 10/f4ee378065a327c85472f351ac232fa47ec84d4f15df7ec58c044b41e3c063cf11aaedd90dcfe9c7f2a6ef01d4aab23deb61622301170dc77d0a8b6a6a83cf5e languageName: node linkType: hard @@ -14169,13 +14175,6 @@ __metadata: languageName: node linkType: hard -"type-fest@npm:^3.0.0": - version: 3.13.1 - resolution: "type-fest@npm:3.13.1" - checksum: 10/9a8a2359ada34c9b3affcaf3a8f73ee14c52779e89950db337ce66fb74c3399776c697c99f2532e9b16e10e61cfdba3b1c19daffb93b338b742f0acd0117ce12 - languageName: node - linkType: hard - "type-is@npm:^1.6.16, type-is@npm:~1.6.18": version: 1.6.18 resolution: "type-is@npm:1.6.18" @@ -14224,9 +14223,9 @@ __metadata: languageName: node linkType: hard -"typed-array-length@npm:^1.0.5": - version: 1.0.5 - resolution: "typed-array-length@npm:1.0.5" +"typed-array-length@npm:^1.0.6": + version: 1.0.6 + resolution: "typed-array-length@npm:1.0.6" dependencies: call-bind: "npm:^1.0.7" for-each: "npm:^0.3.3" @@ -14234,7 +14233,7 @@ __metadata: has-proto: "npm:^1.0.3" is-typed-array: "npm:^1.1.13" possible-typed-array-names: "npm:^1.0.0" - checksum: 10/f9a0da99c41880b44e2c5e5d0d01515c2a6e0f54b10c594151804f013272d837df3b67ea84d7304ecfbab2c10d99c3372168bf3a4bd295abf13ac5a72f93054a + checksum: 10/05e96cf4ff836743ebfc593d86133b8c30e83172cb5d16c56814d7bacfed57ce97e87ada9c4b2156d9aaa59f75cdef01c25bd9081c7826e0b869afbefc3e8c39 languageName: node linkType: hard @@ -14786,8 +14785,8 @@ __metadata: linkType: hard "webpack-dev-middleware@npm:^7.1.0": - version: 7.1.1 - resolution: "webpack-dev-middleware@npm:7.1.1" + version: 7.2.1 + resolution: "webpack-dev-middleware@npm:7.2.1" dependencies: colorette: "npm:^2.0.10" memfs: "npm:^4.6.0" @@ -14800,7 +14799,7 @@ __metadata: peerDependenciesMeta: webpack: optional: true - checksum: 10/c6076d4c89431ab50c16170bc34be5aaf35a7e28e9f97a621a2ed62c453e89bfacbbebfcc135c669c73a7044b386875f5c0c8e9121159e74d8745cb3c3664e20 + checksum: 10/e1fa9b40cba7b954f901b085cdded62df6f3c10d1d4e24d4850bd35ebe3dcfb18e7159e6579d6ac854e8e3611e5895aaf45ea1f3e29da2287659d36f0cb614d1 languageName: node linkType: hard @@ -15554,9 +15553,9 @@ __metadata: linkType: hard "ylru@npm:^1.2.0": - version: 1.3.2 - resolution: "ylru@npm:1.3.2" - checksum: 10/56ea73b6fd01170de8bf7f28347a832bfb87b0bf02deb8e43b1bbe11bdc14532b0fba2364d550ed20fd0ec2ec73a3e14b1b9324636718336accd325135643ae8 + version: 1.4.0 + resolution: "ylru@npm:1.4.0" + checksum: 10/5437f8eb2fb5dd515845c657dde3cecaa9f6bd4c6386d2a5212d3fafe02189c7d8ebfdfc84940a7811607cb3524eb362ce95d3180d355cd5deb610aa8c82c9bc languageName: node linkType: hard From c3dc62523b9103e8bb76fbb8373c934e36630299 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 19 Apr 2024 20:45:00 -0400 Subject: [PATCH 58/98] Update dependency core-js to v3.37.0 (#20559) --- package.json | 2 +- yarn.lock | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 8cd3f2f39a3a..3704d74b6696 100644 --- a/package.json +++ b/package.json @@ -101,7 +101,7 @@ "chart.js": "4.4.2", "color-name": "2.0.0", "comlink": "4.4.1", - "core-js": "3.36.1", + "core-js": "3.37.0", "cropperjs": "1.6.1", "date-fns": "3.6.0", "date-fns-tz": "3.0.1", diff --git a/yarn.lock b/yarn.lock index b28722392985..c1f0ba6ac3f2 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6739,10 +6739,10 @@ __metadata: languageName: node linkType: hard -"core-js@npm:3.36.1": - version: 3.36.1 - resolution: "core-js@npm:3.36.1" - checksum: 10/ce1e1bfc1034b6f2ff7c91077319e8abdd650ee606ffe6e80073e64ab9d8aad2d6a6d953461b01f331a6f796ad2fd766a3386b88aa371b45d44fa7c0b9913ce6 +"core-js@npm:3.37.0": + version: 3.37.0 + resolution: "core-js@npm:3.37.0" + checksum: 10/97feac0b54b95d928bda6a6e611cf34963a265a5fe8ab46ed35bbc9d32a14221bf6bede5d6cd4b0c0f30e8440cf1eff0c4f0c242d719c561e5dd73d3b005d63c languageName: node linkType: hard @@ -9054,7 +9054,7 @@ __metadata: chart.js: "npm:4.4.2" color-name: "npm:2.0.0" comlink: "npm:4.4.1" - core-js: "npm:3.36.1" + core-js: "npm:3.37.0" cropperjs: "npm:1.6.1" date-fns: "npm:3.6.0" date-fns-tz: "npm:3.0.1" From 3a5f4d33d2a541acb768e02cc8d584ff52e310a7 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Fri, 19 Apr 2024 23:45:05 -0700 Subject: [PATCH 59/98] Fix stopped_unknown_reason localization message (#20557) * Fix stopped_unknown_reason localization message --- src/components/trace/hat-trace-timeline.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/components/trace/hat-trace-timeline.ts b/src/components/trace/hat-trace-timeline.ts index eab5998d1d60..9a440e6ed135 100644 --- a/src/components/trace/hat-trace-timeline.ts +++ b/src/components/trace/hat-trace-timeline.ts @@ -797,6 +797,7 @@ export class HaAutomationTracer extends LitElement { description: html`${this.hass.localize( `ui.panel.config.automation.trace.messages.${message}`, { + reason: this.trace.script_execution, time: renderFinishedAt(), executiontime: renderRuntime(), } From c7444a2605c764d9a39038153203cb482f3a3308 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 09:03:01 +0200 Subject: [PATCH 60/98] Update dependency @octokit/auth-oauth-device to v7.1.1 (#20560) Co-authored-by: renovate[bot] <29139614+renovate[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 3704d74b6696..34a615adab8c 100644 --- a/package.json +++ b/package.json @@ -159,7 +159,7 @@ "@bundle-stats/plugin-webpack-filter": "4.12.2", "@koa/cors": "5.0.0", "@lokalise/node-api": "12.4.0", - "@octokit/auth-oauth-device": "7.1.0", + "@octokit/auth-oauth-device": "7.1.1", "@octokit/plugin-retry": "7.1.0", "@octokit/rest": "20.1.0", "@open-wc/dev-server-hmr": "0.1.4", diff --git a/yarn.lock b/yarn.lock index c1f0ba6ac3f2..e3e490fea72d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -3276,15 +3276,15 @@ __metadata: languageName: node linkType: hard -"@octokit/auth-oauth-device@npm:7.1.0": - version: 7.1.0 - resolution: "@octokit/auth-oauth-device@npm:7.1.0" +"@octokit/auth-oauth-device@npm:7.1.1": + version: 7.1.1 + resolution: "@octokit/auth-oauth-device@npm:7.1.1" dependencies: "@octokit/oauth-methods": "npm:^5.0.0" "@octokit/request": "npm:^9.0.0" "@octokit/types": "npm:^13.0.0" universal-user-agent: "npm:^7.0.0" - checksum: 10/117cf1ea6f2bafade404cfd0b198871e4834240810e16cd358a74065ef56c8b550ea6f84889f31be06b0235575e496a7d9ac6e163e756637fc435d08721bfa51 + checksum: 10/a7ff0c190a9318f790b20a40eb0a16fc86b962547fd40e724ad9da9f22967f6b0adca9b91956df45b039416a634ae7208da41f8cbee83fdee6be4610d0d1d059 languageName: node linkType: hard @@ -9004,7 +9004,7 @@ __metadata: "@material/web": "npm:1.4.1" "@mdi/js": "npm:7.4.47" "@mdi/svg": "npm:7.4.47" - "@octokit/auth-oauth-device": "npm:7.1.0" + "@octokit/auth-oauth-device": "npm:7.1.1" "@octokit/plugin-retry": "npm:7.1.0" "@octokit/rest": "npm:20.1.0" "@open-wc/dev-server-hmr": "npm:0.1.4" From 697bbf428e6e6bb0a3105c95874d0b055cfed567 Mon Sep 17 00:00:00 2001 From: G Johansson Date: Sat, 20 Apr 2024 09:16:36 +0200 Subject: [PATCH 61/98] Add translation to integration setup failures (#19128) --- gallery/src/pages/misc/integration-card.ts | 2 ++ src/data/config_entries.ts | 2 ++ .../ha-config-integration-page.ts | 23 +++++++++++++++---- 3 files changed, 23 insertions(+), 4 deletions(-) diff --git a/gallery/src/pages/misc/integration-card.ts b/gallery/src/pages/misc/integration-card.ts index ca1e83c0b6a0..72a99c7c28e7 100644 --- a/gallery/src/pages/misc/integration-card.ts +++ b/gallery/src/pages/misc/integration-card.ts @@ -36,6 +36,8 @@ const createConfigEntry = ( pref_disable_new_entities: false, pref_disable_polling: false, reason: null, + error_reason_translation_key: null, + error_reason_translation_placeholders: null, ...override, }); diff --git a/src/data/config_entries.ts b/src/data/config_entries.ts index ab3d7480fd1d..37af47885d83 100644 --- a/src/data/config_entries.ts +++ b/src/data/config_entries.ts @@ -23,6 +23,8 @@ export interface ConfigEntry { pref_disable_polling: boolean; disabled_by: "user" | null; reason: string | null; + error_reason_translation_key: string | null; + error_reason_translation_placeholders: Record | null; } export type ConfigEntryMutableParams = Partial< diff --git a/src/panels/config/integrations/ha-config-integration-page.ts b/src/panels/config/integrations/ha-config-integration-page.ts index 5f0b01f2a0a4..674a720c056b 100644 --- a/src/panels/config/integrations/ha-config-integration-page.ts +++ b/src/panels/config/integrations/ha-config-integration-page.ts @@ -37,6 +37,7 @@ import { } from "lit"; import { customElement, property, state } from "lit/decorators"; import { classMap } from "lit/directives/class-map"; +import { until } from "lit/directives/until"; import memoizeOne from "memoize-one"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { isDevVersion } from "../../../common/config/version"; @@ -550,10 +551,24 @@ class HaConfigIntegrationPage extends SubscribeMixin(LitElement) { `ui.panel.config.integrations.config_entry.state.${item.state}`, ]; if (item.reason) { - this.hass.loadBackendTranslation("config", item.domain); - stateTextExtra = html`${this.hass.localize( - `component.${item.domain}.config.error.${item.reason}` - ) || item.reason}`; + if (item.error_reason_translation_key) { + const lokalisePromExc = this.hass + .loadBackendTranslation("exceptions", item.domain) + .then((localize) => + localize( + `component.${item.domain}.exceptions.${item.error_reason_translation_key}.message`, + item.error_reason_translation_placeholders ?? undefined + ) + ); + stateTextExtra = html`${until(lokalisePromExc)}`; + } else { + const lokalisePromError = this.hass + .loadBackendTranslation("config", item.domain) + .then((localize) => + localize(`component.${item.domain}.config.error.${item.reason}`) + ); + stateTextExtra = html`${until(lokalisePromError, item.reason)}`; + } } else { stateTextExtra = html`
From f39758b1031202339ee0b4251763b6d09d3d2da5 Mon Sep 17 00:00:00 2001 From: Simon Lamon <32477463+silamon@users.noreply.github.com> Date: Sat, 20 Apr 2024 14:32:40 +0200 Subject: [PATCH 62/98] Only create sortable when not disabled (#20565) --- src/components/ha-sortable.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/ha-sortable.ts b/src/components/ha-sortable.ts index b3a565dd4758..e86c32dd779a 100644 --- a/src/components/ha-sortable.ts +++ b/src/components/ha-sortable.ts @@ -82,7 +82,7 @@ export class HaSortable extends LitElement { public connectedCallback() { super.connectedCallback(); this._shouldBeDestroy = false; - if (this.hasUpdated) { + if (this.hasUpdated && !this.disabled) { this._createSortable(); } } From 87012e23e72627dd6954fb4ddbf01e0588e5f22e Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sat, 20 Apr 2024 10:39:24 -0700 Subject: [PATCH 63/98] Wrap unbreakable area names in ha-card header (#20566) --- src/panels/config/areas/ha-config-areas-dashboard.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/src/panels/config/areas/ha-config-areas-dashboard.ts b/src/panels/config/areas/ha-config-areas-dashboard.ts index 1b00b463d851..b63be2f40906 100644 --- a/src/panels/config/areas/ha-config-areas-dashboard.ts +++ b/src/panels/config/areas/ha-config-areas-dashboard.ts @@ -511,6 +511,7 @@ export class HaConfigAreasDashboard extends SubscribeMixin(LitElement) { display: flex; justify-content: space-between; align-items: center; + overflow-wrap: anywhere; } .warning { color: var(--error-color); From b80d94d260066c1eff87a5ac22c405672e0dbaab Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 19:39:42 +0200 Subject: [PATCH 64/98] Update dependency magic-string to v0.30.10 (#20568) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 19 +++++-------------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/package.json b/package.json index 34a615adab8c..8b03f2a077b3 100644 --- a/package.json +++ b/package.json @@ -219,7 +219,7 @@ "lint-staged": "15.2.2", "lit-analyzer": "2.0.3", "lodash.template": "4.5.0", - "magic-string": "0.30.9", + "magic-string": "0.30.10", "map-stream": "0.0.7", "mocha": "10.4.0", "object-hash": "3.0.0", diff --git a/yarn.lock b/yarn.lock index e3e490fea72d..7a1076b2133c 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9099,7 +9099,7 @@ __metadata: lit-analyzer: "npm:2.0.3" lodash.template: "npm:4.5.0" luxon: "npm:3.4.4" - magic-string: "npm:0.30.9" + magic-string: "npm:0.30.10" map-stream: "npm:0.0.7" marked: "npm:12.0.1" memoize-one: "npm:6.0.0" @@ -10815,12 +10815,12 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:0.30.9": - version: 0.30.9 - resolution: "magic-string@npm:0.30.9" +"magic-string@npm:0.30.10, magic-string@npm:^0.30.3": + version: 0.30.10 + resolution: "magic-string@npm:0.30.10" dependencies: "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: 10/a49b7f848e36914c2794e443d4da6579abebb3e57a5e98b1603958f4672d1435dc15261f70c2793e9b6d6c891191c83b9608322b48d0d76a9be32e73e039cc8a + checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201 languageName: node linkType: hard @@ -10833,15 +10833,6 @@ __metadata: languageName: node linkType: hard -"magic-string@npm:^0.30.3": - version: 0.30.10 - resolution: "magic-string@npm:0.30.10" - dependencies: - "@jridgewell/sourcemap-codec": "npm:^1.4.15" - checksum: 10/9f8bf6363a14c98a9d9f32ef833b194702a5c98fb931b05ac511b76f0b06fd30ed92beda6ca3261d2d52d21e39e891ef1136fbd032023f6cbb02d0b7d5767201 - languageName: node - linkType: hard - "make-fetch-happen@npm:^13.0.0": version: 13.0.0 resolution: "make-fetch-happen@npm:13.0.0" From 1c045610046dd042b91e4c26e0243c503c16b0d6 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 19:39:54 +0200 Subject: [PATCH 65/98] Update dependency @codemirror/commands to v6.4.0 (#20569) Co-authored-by: renovate[bot] <29139614+renovate[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 8b03f2a077b3..05baa01e9466 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@babel/runtime": "7.24.4", "@braintree/sanitize-url": "7.0.1", "@codemirror/autocomplete": "6.16.0", - "@codemirror/commands": "6.3.3", + "@codemirror/commands": "6.4.0", "@codemirror/language": "6.10.1", "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", diff --git a/yarn.lock b/yarn.lock index 7a1076b2133c..acf713e99c5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ __metadata: languageName: node linkType: hard -"@codemirror/commands@npm:6.3.3": - version: 6.3.3 - resolution: "@codemirror/commands@npm:6.3.3" +"@codemirror/commands@npm:6.4.0": + version: 6.4.0 + resolution: "@codemirror/commands@npm:6.4.0" dependencies: "@codemirror/language": "npm:^6.0.0" "@codemirror/state": "npm:^6.4.0" "@codemirror/view": "npm:^6.0.0" "@lezer/common": "npm:^1.1.0" - checksum: 10/4b398b102d6afcbf0e0018b426287a7458867497811c9155790a3cc679b880765cd756bdb96bf35abc28fecb85c0938e618d39469ce8bc0724d4dea5d88f6ac2 + checksum: 10/8cbd985f00e3352c2a928b8d23388395803c198768f6eb3e51f6b5a8e5954c48765152e85a0d6d4bf34ae11a8d271d81de87250b9a7ef57d58987cfa37191e6c languageName: node linkType: hard @@ -8946,7 +8946,7 @@ __metadata: "@braintree/sanitize-url": "npm:7.0.1" "@bundle-stats/plugin-webpack-filter": "npm:4.12.2" "@codemirror/autocomplete": "npm:6.16.0" - "@codemirror/commands": "npm:6.3.3" + "@codemirror/commands": "npm:6.4.0" "@codemirror/language": "npm:6.10.1" "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" From 50a49eae43440b23d98a8919744c8ea31528ca14 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sat, 20 Apr 2024 14:23:57 -0400 Subject: [PATCH 66/98] Update dependency date-fns-tz to v3.1.3 (#20552) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- package.json | 2 +- yarn.lock | 12 +++++------- 2 files changed, 6 insertions(+), 8 deletions(-) diff --git a/package.json b/package.json index 05baa01e9466..e2957d7d1ab7 100644 --- a/package.json +++ b/package.json @@ -104,7 +104,7 @@ "core-js": "3.37.0", "cropperjs": "1.6.1", "date-fns": "3.6.0", - "date-fns-tz": "3.0.1", + "date-fns-tz": "3.1.3", "deep-clone-simple": "1.1.1", "deep-freeze": "0.0.1", "element-internals-polyfill": "1.3.11", diff --git a/yarn.lock b/yarn.lock index acf713e99c5e..a56867d16637 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6832,14 +6832,12 @@ __metadata: languageName: node linkType: hard -"date-fns-tz@npm:3.0.1": - version: 3.0.1 - resolution: "date-fns-tz@npm:3.0.1" - dependencies: - lodash.clonedeep: "npm:^4.5.0" +"date-fns-tz@npm:3.1.3": + version: 3.1.3 + resolution: "date-fns-tz@npm:3.1.3" peerDependencies: date-fns: ^3.0.0 - checksum: 10/d34eaf95510473cd6f22728a24a6d5ee191a6faa9d059d8ee659708936f1f4ae56dfe82b9d40ee983ca20e5d1a6950119e046d717f0a9f22e589f01975a1dea1 + checksum: 10/eb5cb3b2cd152340004efda9f7905e571cf5140b8e85267b1eaa36c2f1eaa54a0f2e3b26e19794f2aca4d3b15aa3d52a5b2dadb540fcec74b239049c7792a981 languageName: node linkType: hard @@ -9057,7 +9055,7 @@ __metadata: core-js: "npm:3.37.0" cropperjs: "npm:1.6.1" date-fns: "npm:3.6.0" - date-fns-tz: "npm:3.0.1" + date-fns-tz: "npm:3.1.3" deep-clone-simple: "npm:1.1.1" deep-freeze: "npm:0.0.1" del: "npm:7.1.0" From f2a0881821af324dbad052015a8500d2cb9bed34 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 21 Apr 2024 09:36:09 +0200 Subject: [PATCH 67/98] Update dependency @types/tar to v6.1.13 (#20572) Co-authored-by: renovate[bot] <29139614+renovate[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 e2957d7d1ab7..fd4cfb15f7c8 100644 --- a/package.json +++ b/package.json @@ -182,7 +182,7 @@ "@types/qrcode": "1.5.5", "@types/serve-handler": "6.1.4", "@types/sortablejs": "1.15.8", - "@types/tar": "6.1.12", + "@types/tar": "6.1.13", "@types/ua-parser-js": "0.7.39", "@types/webspeechapi": "0.0.29", "@typescript-eslint/eslint-plugin": "7.7.0", diff --git a/yarn.lock b/yarn.lock index a56867d16637..af2d00a20962 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4541,13 +4541,13 @@ __metadata: languageName: node linkType: hard -"@types/tar@npm:6.1.12": - version: 6.1.12 - resolution: "@types/tar@npm:6.1.12" +"@types/tar@npm:6.1.13": + version: 6.1.13 + resolution: "@types/tar@npm:6.1.13" dependencies: "@types/node": "npm:*" minipass: "npm:^4.0.0" - checksum: 10/5cd6d3a9867f5fbf6cc045752d439b2b9967c1cf5b389e9ea8afde7fdd749dd6f0a7ca879e7bfaf6f1bc242874ac7a923a319fc0caf5caed96e48cc2b6c58a1e + checksum: 10/d325223cf90399fd03f366d0eabe2383e75e550b3e40a006d5f062d006b894a475cd7c0968d258a8eb8eae5df30b6e7f4607d493a474f89134bbff65362b77ed languageName: node linkType: hard @@ -9030,7 +9030,7 @@ __metadata: "@types/qrcode": "npm:1.5.5" "@types/serve-handler": "npm:6.1.4" "@types/sortablejs": "npm:1.15.8" - "@types/tar": "npm:6.1.12" + "@types/tar": "npm:6.1.13" "@types/ua-parser-js": "npm:0.7.39" "@types/webspeechapi": "npm:0.0.29" "@typescript-eslint/eslint-plugin": "npm:7.7.0" From b966601e6a373cc65b90159b45c92ac7043b56c9 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Sun, 21 Apr 2024 00:50:14 -0700 Subject: [PATCH 68/98] Hide beta toggle when unsupervised (#20573) --- src/panels/config/core/ha-config-section-updates.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/panels/config/core/ha-config-section-updates.ts b/src/panels/config/core/ha-config-section-updates.ts index 6493cd145656..cdf7d896fa84 100644 --- a/src/panels/config/core/ha-config-section-updates.ts +++ b/src/panels/config/core/ha-config-section-updates.ts @@ -82,11 +82,11 @@ class HaConfigSectionUpdates extends LitElement { > ${this.hass.localize("ui.panel.config.updates.show_skipped")} - ${this._supervisorInfo?.channel !== "dev" + ${this._supervisorInfo && this._supervisorInfo.channel !== "dev" ? html`
  • - ${this._supervisorInfo?.channel === "stable" + ${this._supervisorInfo.channel === "stable" ? this.hass.localize("ui.panel.config.updates.join_beta") : this.hass.localize( "ui.panel.config.updates.leave_beta" From 389f0d3d23a8438926829e18b1fc5853f79c3014 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:19:52 +0200 Subject: [PATCH 69/98] Update dependency marked to v12.0.2 (#20577) Co-authored-by: renovate[bot] <29139614+renovate[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 fd4cfb15f7c8..4a78293dda6c 100644 --- a/package.json +++ b/package.json @@ -119,7 +119,7 @@ "leaflet-draw": "1.0.4", "lit": "2.8.0", "luxon": "3.4.4", - "marked": "12.0.1", + "marked": "12.0.2", "memoize-one": "6.0.0", "node-vibrant": "3.2.1-alpha.1", "proxy-polyfill": "0.3.2", diff --git a/yarn.lock b/yarn.lock index af2d00a20962..64c91a0c9569 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9099,7 +9099,7 @@ __metadata: luxon: "npm:3.4.4" magic-string: "npm:0.30.10" map-stream: "npm:0.0.7" - marked: "npm:12.0.1" + marked: "npm:12.0.2" memoize-one: "npm:6.0.0" mocha: "npm:10.4.0" node-vibrant: "npm:3.2.1-alpha.1" @@ -10873,12 +10873,12 @@ __metadata: languageName: node linkType: hard -"marked@npm:12.0.1": - version: 12.0.1 - resolution: "marked@npm:12.0.1" +"marked@npm:12.0.2": + version: 12.0.2 + resolution: "marked@npm:12.0.2" bin: marked: bin/marked.js - checksum: 10/34fd0044ebeda28b3f3f94f340e2388666408315557f125d561b59b49baec4c6e6777f54b6fb12aa5c2bf3b75a4aa9f1809679bfb6502da73053d0461c1a232d + checksum: 10/24d4fc58d37c1779197fa7f93c504d8c71d4df54eb69cbbc14a55ba2a8e2ad83d723801fc25452c21ce74b38a483c5863c53449f130253a597be9e9c1d3e7e2b languageName: node linkType: hard From 8bf27a83ec8ff0f8e7acfd532d15d873b8968029 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:21:14 +0200 Subject: [PATCH 70/98] Bump actions/checkout from 4.1.2 to 4.1.3 (#20576) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/cast_deployment.yaml | 4 ++-- .github/workflows/ci.yaml | 8 ++++---- .github/workflows/codeql-analysis.yml | 2 +- .github/workflows/demo_deployment.yaml | 4 ++-- .github/workflows/design_deployment.yaml | 2 +- .github/workflows/design_preview.yaml | 2 +- .github/workflows/nightly.yaml | 2 +- .github/workflows/release.yaml | 2 +- .github/workflows/translations.yaml | 2 +- 9 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.github/workflows/cast_deployment.yaml b/.github/workflows/cast_deployment.yaml index 3b5955dfae8a..9733c5ec5963 100644 --- a/.github/workflows/cast_deployment.yaml +++ b/.github/workflows/cast_deployment.yaml @@ -21,7 +21,7 @@ jobs: url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 with: ref: dev @@ -57,7 +57,7 @@ jobs: url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 with: ref: master diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 61290c36bcfc..491baeaf803b 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 with: @@ -58,7 +58,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 with: @@ -76,7 +76,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 with: @@ -100,7 +100,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 with: diff --git a/.github/workflows/codeql-analysis.yml b/.github/workflows/codeql-analysis.yml index ea1bf0d2d198..b6d12250e913 100644 --- a/.github/workflows/codeql-analysis.yml +++ b/.github/workflows/codeql-analysis.yml @@ -23,7 +23,7 @@ jobs: steps: - name: Checkout repository - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 with: # We must fetch at least the immediate parents so that if this is # a pull request then we can checkout the head. diff --git a/.github/workflows/demo_deployment.yaml b/.github/workflows/demo_deployment.yaml index accbe3c9df08..2bf4fb3a277f 100644 --- a/.github/workflows/demo_deployment.yaml +++ b/.github/workflows/demo_deployment.yaml @@ -22,7 +22,7 @@ jobs: url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 with: ref: dev @@ -58,7 +58,7 @@ jobs: url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 with: ref: master diff --git a/.github/workflows/design_deployment.yaml b/.github/workflows/design_deployment.yaml index 64168418dd29..9708d4f1d4cb 100644 --- a/.github/workflows/design_deployment.yaml +++ b/.github/workflows/design_deployment.yaml @@ -16,7 +16,7 @@ jobs: url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 diff --git a/.github/workflows/design_preview.yaml b/.github/workflows/design_preview.yaml index 19b73c2609db..3a4817eaa016 100644 --- a/.github/workflows/design_preview.yaml +++ b/.github/workflows/design_preview.yaml @@ -21,7 +21,7 @@ jobs: if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview') steps: - name: Check out files from GitHub - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Setup Node uses: actions/setup-node@v4.0.2 diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index d3d8e892468a..442211f12197 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -20,7 +20,7 @@ jobs: contents: write steps: - name: Checkout the repository - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Set up Python ${{ env.PYTHON_VERSION }} uses: actions/setup-python@v5 diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml index fe7faf0590c2..b58d1fb4f54d 100644 --- a/.github/workflows/release.yaml +++ b/.github/workflows/release.yaml @@ -23,7 +23,7 @@ jobs: contents: write # Required to upload release assets steps: - name: Checkout the repository - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Verify version uses: home-assistant/actions/helpers/verify-version@master diff --git a/.github/workflows/translations.yaml b/.github/workflows/translations.yaml index 04894b0770c8..403b25862133 100644 --- a/.github/workflows/translations.yaml +++ b/.github/workflows/translations.yaml @@ -13,7 +13,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout the repository - uses: actions/checkout@v4.1.2 + uses: actions/checkout@v4.1.3 - name: Upload Translations run: | From 50ce1b94c81406dd0383a11566f3f5c15d4c23aa Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:22:38 +0200 Subject: [PATCH 71/98] Bump actions/upload-artifact from 4.3.1 to 4.3.2 (#20575) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- .github/workflows/ci.yaml | 4 ++-- .github/workflows/nightly.yaml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 491baeaf803b..409775311494 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -89,7 +89,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.3.2 with: name: frontend-bundle-stats path: build/stats/*.json @@ -113,7 +113,7 @@ jobs: env: IS_TEST: "true" - name: Upload bundle stats - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.3.2 with: name: supervisor-bundle-stats path: build/stats/*.json diff --git a/.github/workflows/nightly.yaml b/.github/workflows/nightly.yaml index 442211f12197..88e0ed9660e3 100644 --- a/.github/workflows/nightly.yaml +++ b/.github/workflows/nightly.yaml @@ -57,14 +57,14 @@ jobs: run: tar -czvf translations.tar.gz translations - name: Upload build artifacts - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.3.2 with: name: wheels path: dist/home_assistant_frontend*.whl if-no-files-found: error - name: Upload translations - uses: actions/upload-artifact@v4.3.1 + uses: actions/upload-artifact@v4.3.2 with: name: translations path: translations.tar.gz From 4b593c1c96d43333700cf94f2b1f9397942db1cf Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Mon, 22 Apr 2024 03:40:20 -0400 Subject: [PATCH 72/98] Enhance webpack transform async plugin to use babel runtime (#20543) --- build-scripts/webpack.cjs | 6 +++++- package.json | 2 +- yarn.lock | 15 +++++++++------ 3 files changed, 15 insertions(+), 8 deletions(-) diff --git a/build-scripts/webpack.cjs b/build-scripts/webpack.cjs index b08d3b2eeb50..0679e3e2baec 100644 --- a/build-scripts/webpack.cjs +++ b/build-scripts/webpack.cjs @@ -10,6 +10,7 @@ const WebpackBar = require("webpackbar"); const { TransformAsyncModulesPlugin, } = require("transform-async-modules-webpack-plugin"); +const { dependencies } = require("../package.json"); const paths = require("./paths.cjs"); const bundle = require("./bundle.cjs"); @@ -156,7 +157,10 @@ const createWebpackConfig = ({ transform: (stats) => JSON.stringify(filterStats(stats)), }), !latestBuild && - new TransformAsyncModulesPlugin({ browserslistEnv: "legacy" }), + new TransformAsyncModulesPlugin({ + browserslistEnv: "legacy", + runtime: { version: dependencies["@babel/runtime"] }, + }), ].filter(Boolean), resolve: { extensions: [".ts", ".js", ".json"], diff --git a/package.json b/package.json index 4a78293dda6c..984032fc4a0c 100644 --- a/package.json +++ b/package.json @@ -236,7 +236,7 @@ "systemjs": "6.14.3", "tar": "7.0.1", "terser-webpack-plugin": "5.3.10", - "transform-async-modules-webpack-plugin": "1.0.4", + "transform-async-modules-webpack-plugin": "1.1.0", "ts-lit-plugin": "2.0.2", "typescript": "5.4.5", "webpack": "5.91.0", diff --git a/yarn.lock b/yarn.lock index 64c91a0c9569..d648ed9d6ee5 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1145,7 +1145,7 @@ __metadata: languageName: node linkType: hard -"@babel/plugin-transform-runtime@npm:7.24.3": +"@babel/plugin-transform-runtime@npm:7.24.3, @babel/plugin-transform-runtime@npm:^7.13.0": version: 7.24.3 resolution: "@babel/plugin-transform-runtime@npm:7.24.3" dependencies: @@ -9127,7 +9127,7 @@ __metadata: tar: "npm:7.0.1" terser-webpack-plugin: "npm:5.3.10" tinykeys: "npm:2.1.0" - transform-async-modules-webpack-plugin: "npm:1.0.4" + transform-async-modules-webpack-plugin: "npm:1.1.0" ts-lit-plugin: "npm:2.0.2" tsparticles-engine: "npm:2.12.0" tsparticles-preset-links: "npm:2.12.0" @@ -13965,17 +13965,20 @@ __metadata: languageName: node linkType: hard -"transform-async-modules-webpack-plugin@npm:1.0.4": - version: 1.0.4 - resolution: "transform-async-modules-webpack-plugin@npm:1.0.4" +"transform-async-modules-webpack-plugin@npm:1.1.0": + version: 1.1.0 + resolution: "transform-async-modules-webpack-plugin@npm:1.1.0" dependencies: "@babel/core": "npm:^7.13.0" + "@babel/plugin-transform-runtime": "npm:^7.13.0" "@babel/preset-env": "npm:^7.13.0" peerDependencies: "@babel/core": ^7.13.0 + "@babel/plugin-transform-runtime": ^7.13.0 "@babel/preset-env": ^7.13.0 + "@babel/runtime": ^7.13.0 webpack: ^5.0.0 - checksum: 10/dfb4c1a693897b0b35bf435130fd48fac8175fe60d681ef884bbdc0f1cd15017747f18b3d966bdcd96781ed85b284facbf007c6f358a6b495d46aa4358081909 + checksum: 10/35e729c8ed44bf7cf5b6ae6e4ea5eb82eef44038ec13fba0a53eec551095be5553e3c99c6c7dec37d6b1fd3c9e04f35e94a246f735c81fb2d247dfad21678322 languageName: node linkType: hard From b5277dee538b588ef2997024928cad1ee57a30b2 Mon Sep 17 00:00:00 2001 From: karwosts <32912880+karwosts@users.noreply.github.com> Date: Mon, 22 Apr 2024 00:41:12 -0700 Subject: [PATCH 73/98] When munging statistics to history, assume always numeric (#20544) --- src/data/history.ts | 4 +++- src/panels/history/ha-panel-history.ts | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/data/history.ts b/src/data/history.ts index e0fc8bd328cb..53b83896e8dd 100644 --- a/src/data/history.ts +++ b/src/data/history.ts @@ -422,7 +422,8 @@ export const computeHistory = ( entityIds: string[], localize: LocalizeFunc, sensorNumericalDeviceClasses: string[], - splitDeviceClasses = false + splitDeviceClasses = false, + forceNumeric = false ): HistoryResult => { const lineChartDevices: { [unit: string]: HistoryStates } = {}; const timelineDevices: TimelineEntity[] = []; @@ -468,6 +469,7 @@ export const computeHistory = ( let unit: string | undefined; const isNumeric = + forceNumeric || isNumericFromDomain(domain) || (currentState != null && isNumericFromAttributes(currentState.attributes)) || diff --git a/src/panels/history/ha-panel-history.ts b/src/panels/history/ha-panel-history.ts index 9efaf89672a9..d3530154076b 100644 --- a/src/panels/history/ha-panel-history.ts +++ b/src/panels/history/ha-panel-history.ts @@ -421,6 +421,7 @@ class HaPanelHistory extends LitElement { [], this.hass.localize, sensorNumericDeviceClasses, + true, true ); // remap states array to statistics array From 141107f1f3178df8b8bad0225057a9bef5d4be7d Mon Sep 17 00:00:00 2001 From: Matthias Alphart Date: Mon, 22 Apr 2024 09:48:50 +0200 Subject: [PATCH 74/98] Apply initial values to forms of device trigger extra fields (#20555) * Apply default values of device trigger extra fields * use computeInitialHaFormData --- .../automation/trigger/types/ha-automation-trigger-device.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts index 1b94ff6138b2..fdd239e0115c 100644 --- a/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts +++ b/src/panels/config/automation/trigger/types/ha-automation-trigger-device.ts @@ -6,6 +6,7 @@ import { fireEvent } from "../../../../../common/dom/fire_event"; import "../../../../../components/device/ha-device-picker"; import "../../../../../components/device/ha-device-trigger-picker"; import "../../../../../components/ha-form/ha-form"; +import { computeInitialHaFormData } from "../../../../../components/ha-form/compute-initial-ha-form-data"; import { fullEntitiesContext } from "../../../../../data/context"; import { deviceAutomationsEqual, @@ -44,7 +45,9 @@ export class HaDeviceTrigger extends LitElement { private _extraFieldsData = memoizeOne( (trigger: DeviceTrigger, capabilities: DeviceCapabilities) => { - const extraFieldsData: Record = {}; + const extraFieldsData = computeInitialHaFormData( + capabilities.extra_fields + ); capabilities.extra_fields.forEach((item) => { if (trigger[item.name] !== undefined) { extraFieldsData![item.name] = trigger[item.name]; From 7ecf8b755ede71b85a0e61cc4641ccd67e3554dc Mon Sep 17 00:00:00 2001 From: Nicooow <46629108+Nicooow@users.noreply.github.com> Date: Mon, 22 Apr 2024 09:51:21 +0200 Subject: [PATCH 75/98] Add css var for meta theme-color attribute (#20558) * add app-theme-color var * Fix Prettier format --- src/resources/styles-data.ts | 1 + src/state/themes-mixin.ts | 7 +++---- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resources/styles-data.ts b/src/resources/styles-data.ts index ae04a4c4c473..77bde2fcb1b8 100644 --- a/src/resources/styles-data.ts +++ b/src/resources/styles-data.ts @@ -102,6 +102,7 @@ export const derivedStyles = { "mdc-theme-error": "var(--error-color)", "app-header-text-color": "var(--text-primary-color)", "app-header-background-color": "var(--primary-color)", + "app-theme-color": "var(--primary-color)", "mdc-checkbox-unchecked-color": "rgba(var(--rgb-primary-text-color), 0.54)", "mdc-checkbox-disabled-color": "var(--disabled-text-color)", "mdc-radio-unchecked-color": "rgba(var(--rgb-primary-text-color), 0.54)", diff --git a/src/state/themes-mixin.ts b/src/state/themes-mixin.ts index 034a3eb9aca8..4dfb775d7742 100644 --- a/src/state/themes-mixin.ts +++ b/src/state/themes-mixin.ts @@ -130,9 +130,8 @@ export default >(superClass: T) => const themeMeta = document.querySelector("meta[name=theme-color]"); const computedStyles = getComputedStyle(document.documentElement); - const headerColor = computedStyles.getPropertyValue( - "--app-header-background-color" - ); + const themeMetaColor = + computedStyles.getPropertyValue("--app-theme-color"); document.documentElement.style.backgroundColor = computedStyles.getPropertyValue("--primary-background-color"); @@ -145,7 +144,7 @@ export default >(superClass: T) => ); } const themeColor = - headerColor?.trim() || + themeMetaColor?.trim() || (themeMeta.getAttribute("default-content") as string); themeMeta.setAttribute("content", themeColor); } From ac378cfe6da07652d27cea33d9a302898064669f Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 12:52:59 +0200 Subject: [PATCH 76/98] Update external barcode scanning API (#20470) --- src/external_app/external_app_entrypoint.ts | 43 ++++++++++++++++++++- src/external_app/external_messaging.ts | 12 ++++-- 2 files changed, 50 insertions(+), 5 deletions(-) diff --git a/src/external_app/external_app_entrypoint.ts b/src/external_app/external_app_entrypoint.ts index 2f070044e2f1..e4c52b3b4b5d 100644 --- a/src/external_app/external_app_entrypoint.ts +++ b/src/external_app/external_app_entrypoint.ts @@ -9,7 +9,19 @@ import { fireEvent } from "../common/dom/fire_event"; import { mainWindow } from "../common/dom/get_main_window"; import { showAutomationEditor } from "../data/automation"; import { HomeAssistantMain } from "../layouts/home-assistant-main"; -import type { EMIncomingMessageCommands } from "./external_messaging"; +import type { + EMIncomingMessageBarCodeScanAborted, + EMIncomingMessageBarCodeScanResult, + EMIncomingMessageCommands, +} from "./external_messaging"; + +const barCodeListeners = new Set< + ( + msg: + | EMIncomingMessageBarCodeScanResult + | EMIncomingMessageBarCodeScanAborted + ) => boolean +>(); export const attachExternalToApp = (hassMainEl: HomeAssistantMain) => { window.addEventListener("haptic", (ev) => @@ -24,6 +36,19 @@ export const attachExternalToApp = (hassMainEl: HomeAssistantMain) => { ); }; +export const addExternalBarCodeListener = ( + listener: ( + msg: + | EMIncomingMessageBarCodeScanResult + | EMIncomingMessageBarCodeScanAborted + ) => boolean +) => { + barCodeListeners.add(listener); + return () => { + barCodeListeners.delete(listener); + }; +}; + const handleExternalMessage = ( hassMainEl: HomeAssistantMain, msg: EMIncomingMessageCommands @@ -88,6 +113,22 @@ const handleExternalMessage = ( success: true, result: null, }); + } else if (msg.command === "bar_code/scan_result") { + barCodeListeners.forEach((listener) => listener(msg)); + bus.fireMessage({ + id: msg.id, + type: "result", + success: true, + result: null, + }); + } else if (msg.command === "bar_code/aborted") { + barCodeListeners.forEach((listener) => listener(msg)); + bus.fireMessage({ + id: msg.id, + type: "result", + success: true, + result: null, + }); } else { return false; } diff --git a/src/external_app/external_messaging.ts b/src/external_app/external_messaging.ts index a994a669b988..e533a453cb8d 100644 --- a/src/external_app/external_messaging.ts +++ b/src/external_app/external_messaging.ts @@ -37,9 +37,11 @@ interface EMOutgoingMessageConfigGet extends EMMessage { interface EMOutgoingMessageBarCodeScan extends EMMessage { type: "bar_code/scan"; - title: string; - description: string; - alternative_option_label?: string; + payload: { + title: string; + description: string; + alternative_option_label?: string; + }; } interface EMOutgoingMessageBarCodeClose extends EMMessage { @@ -48,7 +50,9 @@ interface EMOutgoingMessageBarCodeClose extends EMMessage { interface EMOutgoingMessageBarCodeNotify extends EMMessage { type: "bar_code/notify"; - message: string; + payload: { + message: string; + }; } interface EMOutgoingMessageMatterCommission extends EMMessage { From 66228f5858588d17f1de02bed146c2a1a48be90b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 16:33:32 +0200 Subject: [PATCH 77/98] Add new timestamp state domains (#20584) --- src/common/entity/compute_state_display.ts | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/common/entity/compute_state_display.ts b/src/common/entity/compute_state_display.ts index 6d5e36d5c231..0db516e56f0c 100644 --- a/src/common/entity/compute_state_display.ts +++ b/src/common/entity/compute_state_display.ts @@ -187,11 +187,14 @@ export const computeStateDisplayFromEntityAttributes = ( if ( [ "button", + "conversation", "event", "image", "input_button", + "notify", "scene", "stt", + "tag", "tts", "wake_word", ].includes(domain) || From c34c5d64f9e639f54cdde152e56724f1b1dfb3f9 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 22 Apr 2024 18:09:46 +0200 Subject: [PATCH 78/98] Update dependency @codemirror/commands to v6.5.0 (#20587) Co-authored-by: renovate[bot] <29139614+renovate[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 984032fc4a0c..ff3e0b9cbc92 100644 --- a/package.json +++ b/package.json @@ -28,7 +28,7 @@ "@babel/runtime": "7.24.4", "@braintree/sanitize-url": "7.0.1", "@codemirror/autocomplete": "6.16.0", - "@codemirror/commands": "6.4.0", + "@codemirror/commands": "6.5.0", "@codemirror/language": "6.10.1", "@codemirror/legacy-modes": "6.4.0", "@codemirror/search": "6.5.6", diff --git a/yarn.lock b/yarn.lock index d648ed9d6ee5..e0a18ec3fbbe 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1486,15 +1486,15 @@ __metadata: languageName: node linkType: hard -"@codemirror/commands@npm:6.4.0": - version: 6.4.0 - resolution: "@codemirror/commands@npm:6.4.0" +"@codemirror/commands@npm:6.5.0": + version: 6.5.0 + resolution: "@codemirror/commands@npm:6.5.0" dependencies: "@codemirror/language": "npm:^6.0.0" "@codemirror/state": "npm:^6.4.0" "@codemirror/view": "npm:^6.0.0" "@lezer/common": "npm:^1.1.0" - checksum: 10/8cbd985f00e3352c2a928b8d23388395803c198768f6eb3e51f6b5a8e5954c48765152e85a0d6d4bf34ae11a8d271d81de87250b9a7ef57d58987cfa37191e6c + checksum: 10/2fa3e42e02e50a02cbf55c48c3f3f7891453c841b6399834a2898f4f3a286074ef13646341a60a89b53bd8372ed5885740ced869b9482e115a73305f792971fe languageName: node linkType: hard @@ -8944,7 +8944,7 @@ __metadata: "@braintree/sanitize-url": "npm:7.0.1" "@bundle-stats/plugin-webpack-filter": "npm:4.12.2" "@codemirror/autocomplete": "npm:6.16.0" - "@codemirror/commands": "npm:6.4.0" + "@codemirror/commands": "npm:6.5.0" "@codemirror/language": "npm:6.10.1" "@codemirror/legacy-modes": "npm:6.4.0" "@codemirror/search": "npm:6.5.6" From a3090796d2763adbc671813e162d30447912cfa1 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 18:13:44 +0200 Subject: [PATCH 79/98] Store grouping and sorting for device table (#20583) --- src/components/data-table/ha-data-table.ts | 36 +++++++++--------- src/layouts/hass-tabs-subpage-data-table.ts | 38 +++++++++++++------ .../devices/ha-config-devices-dashboard.ts | 20 ++++++++++ 3 files changed, 65 insertions(+), 29 deletions(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 2c95735e821a..3e8b6830214a 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -35,15 +35,6 @@ import { filterData, sortData } from "./sort-filter"; import { groupBy } from "../../common/util/group-by"; import { stringCompare } from "../../common/string/compare"; -declare global { - // for fire event - interface HASSDomEvents { - "selection-changed": SelectionChangedEvent; - "row-click": RowClickedEvent; - "sorting-changed": SortingChangedEvent; - } -} - export interface RowClickedEvent { id: string; } @@ -213,17 +204,19 @@ export class HaDataTable extends LitElement { (column) => column.filterable ); - for (const columnId in this.columns) { - if (this.columns[columnId].direction) { - this.sortDirection = this.columns[columnId].direction!; - this.sortColumn = columnId; + if (!this.sortColumn) { + for (const columnId in this.columns) { + if (this.columns[columnId].direction) { + this.sortDirection = this.columns[columnId].direction!; + this.sortColumn = columnId; - fireEvent(this, "sorting-changed", { - column: columnId, - direction: this.sortDirection, - }); + fireEvent(this, "sorting-changed", { + column: columnId, + direction: this.sortDirection, + }); - break; + break; + } } } @@ -1031,4 +1024,11 @@ declare global { interface HTMLElementTagNameMap { "ha-data-table": HaDataTable; } + + // for fire event + interface HASSDomEvents { + "selection-changed": SelectionChangedEvent; + "row-click": RowClickedEvent; + "sorting-changed": SortingChangedEvent; + } } diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 9880503faf7b..7a9f11845294 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -41,14 +41,6 @@ import type { HomeAssistant, Route } from "../types"; import "./hass-tabs-subpage"; import type { PageNavigation } from "./hass-tabs-subpage"; -declare global { - // for fire event - interface HASSDomEvents { - "search-changed": { value: string }; - "clear-filter": undefined; - } -} - @customElement("hass-tabs-subpage-data-table") export class HaTabsSubpageDataTable extends LitElement { @property({ attribute: false }) public hass!: HomeAssistant; @@ -166,6 +158,11 @@ export class HaTabsSubpageDataTable extends LitElement { @property({ type: Boolean }) public showFilters = false; + @property({ attribute: false }) public initalSorting?: { + column: string; + direction: SortingDirection; + }; + @property() public initialGroupColumn?: string; @state() private _sortColumn?: string; @@ -190,9 +187,16 @@ export class HaTabsSubpageDataTable extends LitElement { this._dataTable.clearSelection(); } - protected firstUpdated() { + protected willUpdate() { + if (this.hasUpdated) { + return; + } if (this.initialGroupColumn) { - this._groupColumn = this.initialGroupColumn; + this._setGroupColumn(this.initialGroupColumn); + } + if (this.initalSorting) { + this._sortColumn = this.initalSorting.column; + this._sortDirection = this.initalSorting.direction; } } @@ -563,7 +567,12 @@ export class HaTabsSubpageDataTable extends LitElement { } private _handleGroupBy(ev) { - this._groupColumn = ev.currentTarget.value; + this._setGroupColumn(ev.currentTarget.value); + } + + private _setGroupColumn(columnId: string) { + this._groupColumn = columnId; + fireEvent(this, "grouping-changed", { value: columnId }); } private _enableSelectMode() { @@ -819,4 +828,11 @@ declare global { interface HTMLElementTagNameMap { "hass-tabs-subpage-data-table": HaTabsSubpageDataTable; } + + // for fire event + interface HASSDomEvents { + "search-changed": { value: string }; + "grouping-changed": { value: string }; + "clear-filter": undefined; + } } diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index e834e453fc1d..0e5c0eff43ff 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -26,6 +26,7 @@ import { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/entity/ha-battery-icon"; @@ -74,6 +75,7 @@ import { rejectedItems, } from "../../../common/util/promise-all-settled-results"; import { showAlertDialog } from "../../lovelace/custom-card-helpers"; +import { storage } from "../../../common/decorators/storage"; interface DeviceRowData extends DeviceRegistryEntry { device?: DeviceRowData; @@ -117,6 +119,12 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { @state() _labels!: LabelRegistryEntry[]; + @storage({ key: "devices-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "devices-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + private _ignoreLocationChange = false; public connectedCallback() { @@ -614,8 +622,12 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { Array.isArray(val) ? val.length : val ) ).length} + .initialGroupColumn=${this._activeGrouping} + .initalSorting=${this._activeSorting} @clear-filter=${this._clearFilter} @search-changed=${this._handleSearchChange} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} @row-click=${this._handleRowClicked} clickable hasFab @@ -855,6 +867,14 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ css` From 62f46baacf4bcda16e690de2cfad898ca7bbd876 Mon Sep 17 00:00:00 2001 From: Paul Bottein Date: Mon, 22 Apr 2024 18:26:50 +0200 Subject: [PATCH 80/98] Fix more info slider in iOS (#20586) --- src/components/ha-control-slider.ts | 5 ++++- src/components/ha-control-switch.ts | 5 ++++- .../more-info/components/lights/light-color-temp-picker.ts | 1 + src/state-control/cover/ha-state-control-cover-position.ts | 1 + .../cover/ha-state-control-cover-tilt-position.ts | 1 + src/state-control/cover/ha-state-control-cover-toggle.ts | 1 + src/state-control/fan/ha-state-control-fan-speed.ts | 1 + src/state-control/ha-state-control-toggle.ts | 1 + src/state-control/light/ha-state-control-light-brightness.ts | 1 + src/state-control/lock/ha-state-control-lock-toggle.ts | 1 + src/state-control/valve/ha-state-control-valve-position.ts | 1 + src/state-control/valve/ha-state-control-valve-toggle.ts | 1 + 12 files changed, 18 insertions(+), 2 deletions(-) diff --git a/src/components/ha-control-slider.ts b/src/components/ha-control-slider.ts index 23014308d0e8..290e061ae3d2 100644 --- a/src/components/ha-control-slider.ts +++ b/src/components/ha-control-slider.ts @@ -67,6 +67,9 @@ export class HaControlSlider extends LitElement { @property({ attribute: "tooltip-mode" }) public tooltipMode: TooltipMode = "interaction"; + @property({ attribute: "touch-action" }) + public touchAction?: string; + @property({ type: Number }) public value?: number; @@ -152,7 +155,7 @@ export class HaControlSlider extends LitElement { setupListeners() { if (this.slider && !this._mc) { this._mc = new Manager(this.slider, { - touchAction: this.vertical ? "pan-x" : "pan-y", + touchAction: this.touchAction ?? (this.vertical ? "pan-x" : "pan-y"), }); this._mc.add( new Pan({ diff --git a/src/components/ha-control-switch.ts b/src/components/ha-control-switch.ts index 2626b2ea2003..0e75b665490e 100644 --- a/src/components/ha-control-switch.ts +++ b/src/components/ha-control-switch.ts @@ -33,6 +33,9 @@ export class HaControlSwitch extends LitElement { // SVG icon path (if you need a non SVG icon instead, use the provided off icon slot to pass an in) @property({ type: String }) pathOff?: string; + @property({ attribute: "touch-action" }) + public touchAction?: string; + private _mc?: HammerManager; protected firstUpdated(changedProperties: PropertyValues): void { @@ -73,7 +76,7 @@ export class HaControlSwitch extends LitElement { setupListeners() { if (this.switch && !this._mc) { this._mc = new Manager(this.switch, { - touchAction: this.vertical ? "pan-x" : "pan-y", + touchAction: this.touchAction ?? (this.vertical ? "pan-x" : "pan-y"), }); this._mc.add( new Swipe({ diff --git a/src/dialogs/more-info/components/lights/light-color-temp-picker.ts b/src/dialogs/more-info/components/lights/light-color-temp-picker.ts index a1f5726cac18..7c300193e0ec 100644 --- a/src/dialogs/more-info/components/lights/light-color-temp-picker.ts +++ b/src/dialogs/more-info/components/lights/light-color-temp-picker.ts @@ -78,6 +78,7 @@ class LightColorTempPicker extends LitElement { return html` Date: Mon, 22 Apr 2024 18:27:13 +0200 Subject: [PATCH 81/98] Allow to group entities by domain (#20580) Allow group entities by domain --- src/panels/config/entities/ha-config-entities.ts | 13 +++++++++++-- src/translations/en.json | 3 ++- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index 50aa67a862a5..338ccd31e64b 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -94,6 +94,7 @@ import { hasRejectedItems, rejectedItems, } from "../../../common/util/promise-all-settled-results"; +import { domainToName } from "../../../data/integration"; export interface StateEntity extends Omit { @@ -110,6 +111,7 @@ export interface EntityRow extends StateEntity { status: string | undefined; area?: string; localized_platform: string; + domain: string; label_entries: LabelRegistryEntry[]; } @@ -261,6 +263,13 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { filterable: true, width: "20%", }, + domain: { + title: localize("ui.panel.config.entities.picker.headers.domain"), + sortable: true, + hidden: true, + filterable: true, + groupable: true, + }, area: { title: localize("ui.panel.config.entities.picker.headers.area"), sortable: true, @@ -467,9 +476,9 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { ), unavailable, restored, - localized_platform: - localize(`component.${entry.platform}.title`) || entry.platform, + localized_platform: domainToName(localize, entry.platform), area: area ? area.name : "—", + domain: domainToName(localize, computeDomain(entry.entity_id)), status: restored ? localize("ui.panel.config.entities.picker.status.restored") : unavailable diff --git a/src/translations/en.json b/src/translations/en.json index 6478c5a339f7..6bfe42807a0e 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -4052,7 +4052,8 @@ "integration": "Integration", "area": "Area", "disabled_by": "Disabled by", - "status": "Status" + "status": "Status", + "domain": "Domain" }, "selected": "{number} selected", "enable_selected": { From eb1354d2290ee2d4133b877c5819a4486b9fc8a0 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 18:27:46 +0200 Subject: [PATCH 82/98] Allow groups in data table to be collapsed (#20579) --- src/components/data-table/ha-data-table.ts | 63 ++++++++++++++++++---- src/translations/en.json | 3 +- 2 files changed, 55 insertions(+), 11 deletions(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 3e8b6830214a..d6b6f8a2839a 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -1,13 +1,13 @@ -import { mdiArrowDown, mdiArrowUp } from "@mdi/js"; +import { mdiArrowDown, mdiArrowUp, mdiChevronDown } from "@mdi/js"; import deepClone from "deep-clone-simple"; import { - css, CSSResultGroup, - html, LitElement, - nothing, PropertyValues, TemplateResult, + css, + html, + nothing, } from "lit"; import { customElement, @@ -22,7 +22,9 @@ import { styleMap } from "lit/directives/style-map"; import memoizeOne from "memoize-one"; import { restoreScroll } from "../../common/decorators/restore-scroll"; import { fireEvent } from "../../common/dom/fire_event"; +import { stringCompare } from "../../common/string/compare"; import { debounce } from "../../common/util/debounce"; +import { groupBy } from "../../common/util/group-by"; import { nextRender } from "../../common/util/render-status"; import { haStyleScrollbar } from "../../resources/styles"; import { loadVirtualizer } from "../../resources/virtualizer"; @@ -32,8 +34,6 @@ import type { HaCheckbox } from "../ha-checkbox"; import "../ha-svg-icon"; import "../search-input"; import { filterData, sortData } from "./sort-filter"; -import { groupBy } from "../../common/util/group-by"; -import { stringCompare } from "../../common/string/compare"; export interface RowClickedEvent { id: string; @@ -149,6 +149,8 @@ export class HaDataTable extends LitElement { @state() private _items: DataTableRowData[] = []; + @state() private _collapsedGroups: string[] = []; + private _checkableRowsCount?: number; private _checkedRows: string[] = []; @@ -241,13 +243,18 @@ export class HaDataTable extends LitElement { ).length; } + if (properties.has("groupColumn")) { + this._collapsedGroups = []; + } + if ( properties.has("data") || properties.has("columns") || properties.has("_filter") || properties.has("sortColumn") || properties.has("sortDirection") || - properties.has("groupColumn") + properties.has("groupColumn") || + properties.has("_collapsedGroups") ) { this._sortFilterData(); } @@ -545,13 +552,25 @@ export class HaDataTable extends LitElement { content: html`
    - ${groupName === UNDEFINED_GROUP_KEY ? "" : groupName || ""} + + + ${groupName === UNDEFINED_GROUP_KEY + ? this.hass.localize("ui.components.data-table.ungrouped") + : groupName || ""}
    `, }); } - - groupedItems.push(...rows); + if (!this._collapsedGroups.includes(groupName)) { + groupedItems.push(...rows); + } }); this._items = groupedItems; @@ -672,6 +691,17 @@ export class HaDataTable extends LitElement { this._savedScrollPos = (e.target as HTMLDivElement).scrollTop; } + private _collapseGroup = (ev: Event) => { + const groupName = (ev.currentTarget as any).group; + if (this._collapsedGroups.includes(groupName)) { + this._collapsedGroups = this._collapsedGroups.filter( + (grp) => grp !== groupName + ); + } else { + this._collapsedGroups = [...this._collapsedGroups, groupName]; + } + }; + static get styles(): CSSResultGroup { return [ haStyleScrollbar, @@ -924,8 +954,21 @@ export class HaDataTable extends LitElement { .group-header { padding-top: 12px; + padding-left: 12px; + padding-inline-start: 12px; width: 100%; font-weight: 500; + display: flex; + align-items: center; + cursor: pointer; + } + + .group-header ha-icon-button { + transition: transform 0.2s ease; + } + + .group-header ha-icon-button.collapsed { + transform: rotate(180deg); } :host { diff --git a/src/translations/en.json b/src/translations/en.json index 6bfe42807a0e..100b5536e5c4 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -783,7 +783,8 @@ "no-data": "No data", "filtering_by": "Filtering by", "hidden": "{number} hidden", - "clear": "Clear" + "clear": "Clear", + "ungrouped": "Ungrouped" }, "media-browser": { "tts": { From 1b54d51e4a0607b8077ec5a9efc14c47eac7c7d8 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 18:28:50 +0200 Subject: [PATCH 83/98] Add option for custom group order to data table (#20582) --- src/components/data-table/ha-data-table.ts | 22 +++++++++++++++++---- src/layouts/hass-tabs-subpage-data-table.ts | 3 +++ 2 files changed, 21 insertions(+), 4 deletions(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index d6b6f8a2839a..553fa07777da 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -133,6 +133,8 @@ export class HaDataTable extends LitElement { @property() public groupColumn?: string; + @property({ attribute: false }) public groupOrder?: string[]; + @property() public sortColumn?: string; @property() public sortDirection: SortingDirection = null; @@ -254,6 +256,7 @@ export class HaDataTable extends LitElement { properties.has("sortColumn") || properties.has("sortDirection") || properties.has("groupColumn") || + properties.has("groupOrder") || properties.has("_collapsedGroups") ) { this._sortFilterData(); @@ -530,13 +533,24 @@ export class HaDataTable extends LitElement { const sorted: { [key: string]: DataTableRowData[]; } = Object.keys(grouped) - .sort((a, b) => - stringCompare( + .sort((a, b) => { + const orderA = this.groupOrder?.indexOf(a) ?? -1; + const orderB = this.groupOrder?.indexOf(b) ?? -1; + if (orderA !== orderB) { + if (orderA === -1) { + return 1; + } + if (orderB === -1) { + return -1; + } + return orderA - orderB; + } + return stringCompare( ["", "-", "—"].includes(a) ? "zzz" : a, ["", "-", "—"].includes(b) ? "zzz" : b, this.hass.locale.language - ) - ) + ); + }) .reduce((obj, key) => { obj[key] = grouped[key]; return obj; diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 7a9f11845294..eee6153e4a04 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -165,6 +165,8 @@ export class HaTabsSubpageDataTable extends LitElement { @property() public initialGroupColumn?: string; + @property({ attribute: false }) public groupOrder?: string[]; + @state() private _sortColumn?: string; @state() private _sortDirection: SortingDirection = null; @@ -422,6 +424,7 @@ export class HaTabsSubpageDataTable extends LitElement { .sortColumn=${this._sortColumn} .sortDirection=${this._sortDirection} .groupColumn=${this._groupColumn} + .groupOrder=${this.groupOrder} > ${!this.narrow ? html` From a428ad0655712dedb3c0749fda2f6b454a25e2ef Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 18:35:58 +0200 Subject: [PATCH 84/98] Add bulk area assignment to device dashboard (#20581) * Add bulk area assignment to device dashboard * Update ha-config-devices-dashboard.ts --- .../config/automation/ha-automation-picker.ts | 2 + .../devices/ha-config-devices-dashboard.ts | 203 +++++++++++++++--- src/translations/en.json | 7 +- 3 files changed, 176 insertions(+), 36 deletions(-) diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 0d1d506d6a5d..4d58866e34e5 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -424,9 +424,11 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { ${this.hass.localize("ui.panel.config.labels.add_label")}
    `; + const labelsInOverflow = (this._sizeController.value && this._sizeController.value < 700) || (!this._sizeController.value && this.hass.dockedSidebar === "docked"); + const automations = this._automations( this.automations, this._entityReg, diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index 0e5c0eff43ff..5cfc42149254 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -1,6 +1,12 @@ import { consume } from "@lit-labs/context"; import "@lrnwebcomponents/simple-tooltip/simple-tooltip"; -import { mdiChevronRight, mdiMenuDown, mdiPlus } from "@mdi/js"; +import { + mdiChevronRight, + mdiDotsVertical, + mdiMenuDown, + mdiPlus, + mdiTextureBox, +} from "@mdi/js"; import { CSSResultGroup, LitElement, @@ -10,10 +16,12 @@ import { nothing, } from "lit"; +import { ResizeController } from "@lit-labs/observers/resize-controller"; import { UnsubscribeFunc } from "home-assistant-js-websocket"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { computeCssColor } from "../../../common/color/compute-color"; +import { storage } from "../../../common/decorators/storage"; import { HASSDomEvent } from "../../../common/dom/fire_event"; import { computeStateDomain } from "../../../common/entity/compute_state_domain"; import { @@ -22,6 +30,10 @@ import { } from "../../../common/integrations/protocolIntegrationPicked"; import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import { DataTableColumnContainer, RowClickedEvent, @@ -42,6 +54,7 @@ import "../../../components/ha-filter-states"; import "../../../components/ha-icon-button"; import "../../../components/ha-menu-item"; import "../../../components/ha-sub-menu"; +import { createAreaRegistryEntry } from "../../../data/area_registry"; import { ConfigEntry, sortConfigEntries } from "../../../data/config_entries"; import { fullEntitiesContext } from "../../../data/context"; import { @@ -66,16 +79,12 @@ import { SubscribeMixin } from "../../../mixins/subscribe-mixin"; import { haStyle } from "../../../resources/styles"; import { HomeAssistant, Route } from "../../../types"; import { brandsUrl } from "../../../util/brands-url"; +import { showAreaRegistryDetailDialog } from "../areas/show-dialog-area-registry-detail"; import { configSections } from "../ha-panel-config"; import "../integrations/ha-integration-overflow-menu"; import { showAddIntegrationDialog } from "../integrations/show-add-integration-dialog"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; -import { showAlertDialog } from "../../lovelace/custom-card-helpers"; -import { storage } from "../../../common/decorators/storage"; +import { showAlertDialog } from "../../../dialogs/generic/show-dialog-box"; interface DeviceRowData extends DeviceRegistryEntry { device?: DeviceRowData; @@ -125,6 +134,10 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { @storage({ key: "devices-table-grouping", state: false, subscribe: false }) private _activeGrouping?: string; + private _sizeController = new ResizeController(this, { + callback: (entries) => entries[0]?.contentRect.width, + }); + private _ignoreLocationChange = false; public connectedCallback() { @@ -557,6 +570,41 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { this._labels ); + const areasInOverflow = + (this._sizeController.value && this._sizeController.value < 700) || + (!this._sizeController.value && this.hass.dockedSidebar === "docked"); + + const areaItems = html`${Object.values(this.hass.areas).map( + (area) => + html` + ${area.icon + ? html`` + : html``} +
    ${area.name}
    +
    ` + )} + +
    + ${this.hass.localize( + "ui.panel.config.devices.picker.bulk_actions.no_area" + )} +
    +
    + + +
    + ${this.hass.localize( + "ui.panel.config.devices.picker.bulk_actions.add_area" + )} +
    +
    `; + const labelItems = html`${this._labels?.map((label) => { const color = label.color ? computeCssColor(label.color) : undefined; const selected = this._selected.every((deviceId) => @@ -696,36 +744,77 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { ${!this.narrow ? html` - - - - ${labelItems} - ` - : html` - - + + + + ${labelItems} + + + ${areasInOverflow + ? nothing + : html` + + + + ${areaItems} + `}` + : nothing} + ${this.narrow || areasInOverflow + ? html` + ${this.narrow + ? html` + + ` + : html``} + ${this.narrow + ? html` + +
    + ${this.hass.localize( + "ui.panel.config.automation.picker.bulk_actions.add_label" + )} +
    + +
    + ${labelItems} +
    ` + : nothing}
    ${this.hass.localize( - "ui.panel.config.automation.picker.bulk_actions.add_label" + "ui.panel.config.devices.picker.bulk_actions.move_area" )}
    - ${labelItems} + ${areaItems}
    -
    `} + ` + : nothing} `; } @@ -821,6 +911,46 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { this._selected = ev.detail.value; } + private async _handleBulkArea(ev) { + const area = ev.currentTarget.value; + this._bulkAddArea(area); + } + + private async _bulkAddArea(area: string) { + const promises: Promise[] = []; + this._selected.forEach((deviceId) => { + promises.push( + updateDeviceRegistryEntry(this.hass, deviceId, { + area_id: area, + }) + ); + }); + const result = await Promise.allSettled(promises); + if (hasRejectedItems(result)) { + const rejected = rejectedItems(result); + showAlertDialog(this, { + title: this.hass.localize("ui.panel.config.common.multiselect.failed", { + number: rejected.length, + }), + text: html`
    +${rejected
    +            .map((r) => r.reason.message || r.reason.code || r.reason)
    +            .join("\r\n")}
    `, + }); + } + } + + private async _bulkCreateArea() { + showAreaRegistryDetailDialog(this, { + createEntry: async (values) => { + const area = await createAreaRegistryEntry(this.hass, values); + this._bulkAddArea(area.area_id); + return area; + }, + }); + } + private async _handleBulkLabel(ev) { const label = ev.currentTarget.value; const action = ev.currentTarget.action; @@ -878,6 +1008,9 @@ ${rejected static get styles(): CSSResultGroup { return [ css` + :host { + display: block; + } hass-tabs-subpage-data-table { --data-table-row-height: 60px; } diff --git a/src/translations/en.json b/src/translations/en.json index 100b5536e5c4..c360ded24463 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -4026,7 +4026,12 @@ "confirm_delete_integration": "Are you sure you want to remove this device from {integration}?", "picker": { "search": "Search {number} devices", - "state": "State" + "state": "State", + "bulk_actions": { + "move_area": "Move to area", + "no_area": "No area", + "add_area": "Add area" + } } }, "entities": { From 45dce18e4d03c55544bc1cf293d20a2f772b0ca9 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 20:15:52 +0200 Subject: [PATCH 85/98] typo --- src/layouts/hass-tabs-subpage-data-table.ts | 8 ++++---- src/panels/config/devices/ha-config-devices-dashboard.ts | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index eee6153e4a04..2942626502fc 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -158,7 +158,7 @@ export class HaTabsSubpageDataTable extends LitElement { @property({ type: Boolean }) public showFilters = false; - @property({ attribute: false }) public initalSorting?: { + @property({ attribute: false }) public initialSorting?: { column: string; direction: SortingDirection; }; @@ -196,9 +196,9 @@ export class HaTabsSubpageDataTable extends LitElement { if (this.initialGroupColumn) { this._setGroupColumn(this.initialGroupColumn); } - if (this.initalSorting) { - this._sortColumn = this.initalSorting.column; - this._sortDirection = this.initalSorting.direction; + if (this.initialSorting) { + this._sortColumn = this.initialSorting.column; + this._sortDirection = this.initialSorting.direction; } } diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index 5cfc42149254..53d4425dcec0 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -671,7 +671,7 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { ) ).length} .initialGroupColumn=${this._activeGrouping} - .initalSorting=${this._activeSorting} + .initialSorting=${this._activeSorting} @clear-filter=${this._clearFilter} @search-changed=${this._handleSearchChange} @sorting-changed=${this._handleSortingChanged} From 8239f6dd6082a3ef24cc394f8ee17e9715b32a33 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Mon, 22 Apr 2024 20:28:21 +0200 Subject: [PATCH 86/98] Update hass-tabs-subpage-data-table.ts --- src/layouts/hass-tabs-subpage-data-table.ts | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index 2942626502fc..dfab77e67c6a 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -567,6 +567,11 @@ export class HaTabsSubpageDataTable extends LitElement { this._sortDirection = null; } this._sortColumn = this._sortDirection === null ? undefined : columnId; + + fireEvent(this, "sorting-changed", { + column: columnId, + direction: this._sortDirection, + }); } private _handleGroupBy(ev) { From 8ab61b5468a045a730d0a6f4b8d11be9f55cbd80 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 23 Apr 2024 13:50:44 +0200 Subject: [PATCH 87/98] Add title when text in datatable doesnt fit (#20590) --- src/components/data-table/ha-data-table.ts | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 553fa07777da..148e5414b515 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -450,6 +450,8 @@ export class HaDataTable extends LitElement { } return html`
    target.offsetWidth) { + target.setAttribute("title", target.innerText); + } + } + private _checkedRowsChanged() { // force scroller to update, change it's items if (this._items.length) { From 7e25366897567634b42f188d1f73b8675298a00f Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 23 Apr 2024 18:04:44 +0200 Subject: [PATCH 88/98] Update dependency @types/chromecast-caf-receiver to v6.0.14 (#20589) Co-authored-by: renovate[bot] <29139614+renovate[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 ff3e0b9cbc92..b6cb46e72f5f 100644 --- a/package.json +++ b/package.json @@ -169,7 +169,7 @@ "@rollup/plugin-node-resolve": "15.2.3", "@rollup/plugin-replace": "5.0.5", "@types/babel__plugin-transform-runtime": "7.9.5", - "@types/chromecast-caf-receiver": "6.0.13", + "@types/chromecast-caf-receiver": "6.0.14", "@types/chromecast-caf-sender": "1.0.9", "@types/color-name": "1.1.4", "@types/glob": "8.1.0", diff --git a/yarn.lock b/yarn.lock index e0a18ec3fbbe..36d8d9a49631 100644 --- a/yarn.lock +++ b/yarn.lock @@ -4053,10 +4053,10 @@ __metadata: languageName: node linkType: hard -"@types/chromecast-caf-receiver@npm:6.0.13": - version: 6.0.13 - resolution: "@types/chromecast-caf-receiver@npm:6.0.13" - checksum: 10/4e2fb8628985cd61f206de5dfe6f3bcbcb2527024f03e36c6cad844fe7672ecd1c2b14cd2b91987f3ab0f67a8b6430008e2a567cfa6b5df8cb09b204e7b72094 +"@types/chromecast-caf-receiver@npm:6.0.14": + version: 6.0.14 + resolution: "@types/chromecast-caf-receiver@npm:6.0.14" + checksum: 10/8d7388b280ef6db0d81098d68c77c1f256f0ccae480b3f4316ce3f86f68b585b38e3fbc4d2519bc55bbf41cc85fab2c968e6144ebfe671aabf6ccf0d4f26e203 languageName: node linkType: hard @@ -9017,7 +9017,7 @@ __metadata: "@rollup/plugin-replace": "npm:5.0.5" "@thomasloven/round-slider": "npm:0.6.0" "@types/babel__plugin-transform-runtime": "npm:7.9.5" - "@types/chromecast-caf-receiver": "npm:6.0.13" + "@types/chromecast-caf-receiver": "npm:6.0.14" "@types/chromecast-caf-sender": "npm:1.0.9" "@types/color-name": "npm:1.1.4" "@types/glob": "npm:8.1.0" From 81922f5a3ed0031f4fc93d388ba1bc0ed28434dd Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Tue, 23 Apr 2024 21:00:17 +0200 Subject: [PATCH 89/98] Save and restore collapsed groups (#20591) --- src/components/data-table/ha-data-table.ts | 14 +++++++++++++- src/layouts/hass-tabs-subpage-data-table.ts | 3 +++ .../config/devices/ha-config-devices-dashboard.ts | 9 +++++++++ 3 files changed, 25 insertions(+), 1 deletion(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 148e5414b515..7221587266ee 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -43,6 +43,10 @@ export interface SelectionChangedEvent { value: string[]; } +export interface CollapsedChangedEvent { + value: string[]; +} + export interface SortingChangedEvent { column: string; direction: SortingDirection; @@ -139,6 +143,8 @@ export class HaDataTable extends LitElement { @property() public sortDirection: SortingDirection = null; + @property({ attribute: false }) public initialCollapsedGroups?: string[]; + @state() private _filterable = false; @state() private _filter = ""; @@ -245,8 +251,12 @@ export class HaDataTable extends LitElement { ).length; } - if (properties.has("groupColumn")) { + if (!this.hasUpdated && this.initialCollapsedGroups) { + this._collapsedGroups = this.initialCollapsedGroups; + fireEvent(this, "collapsed-changed", { value: this._collapsedGroups }); + } else if (properties.has("groupColumn")) { this._collapsedGroups = []; + fireEvent(this, "collapsed-changed", { value: this._collapsedGroups }); } if ( @@ -723,6 +733,7 @@ export class HaDataTable extends LitElement { } else { this._collapsedGroups = [...this._collapsedGroups, groupName]; } + fireEvent(this, "collapsed-changed", { value: this._collapsedGroups }); }; static get styles(): CSSResultGroup { @@ -1096,5 +1107,6 @@ declare global { "selection-changed": SelectionChangedEvent; "row-click": RowClickedEvent; "sorting-changed": SortingChangedEvent; + "collapsed-changed": CollapsedChangedEvent; } } diff --git a/src/layouts/hass-tabs-subpage-data-table.ts b/src/layouts/hass-tabs-subpage-data-table.ts index dfab77e67c6a..491e36d2c9e3 100644 --- a/src/layouts/hass-tabs-subpage-data-table.ts +++ b/src/layouts/hass-tabs-subpage-data-table.ts @@ -55,6 +55,8 @@ export class HaTabsSubpageDataTable extends LitElement { @property({ type: Boolean, attribute: "main-page" }) public mainPage = false; + @property({ attribute: false }) public initialCollapsedGroups: string[] = []; + /** * Object with the columns. * @type {Object} @@ -425,6 +427,7 @@ export class HaTabsSubpageDataTable extends LitElement { .sortDirection=${this._sortDirection} .groupColumn=${this._groupColumn} .groupOrder=${this.groupOrder} + .initialCollapsedGroups=${this.initialCollapsedGroups} > ${!this.narrow ? html` diff --git a/src/panels/config/devices/ha-config-devices-dashboard.ts b/src/panels/config/devices/ha-config-devices-dashboard.ts index 53d4425dcec0..5d714d763b8e 100644 --- a/src/panels/config/devices/ha-config-devices-dashboard.ts +++ b/src/panels/config/devices/ha-config-devices-dashboard.ts @@ -134,6 +134,9 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { @storage({ key: "devices-table-grouping", state: false, subscribe: false }) private _activeGrouping?: string; + @storage({ key: "devices-table-collapsed", state: false, subscribe: false }) + private _activeCollapsed?: string; + private _sizeController = new ResizeController(this, { callback: (entries) => entries[0]?.contentRect.width, }); @@ -671,11 +674,13 @@ export class HaConfigDeviceDashboard extends SubscribeMixin(LitElement) { ) ).length} .initialGroupColumn=${this._activeGrouping} + .initialCollapsedGroups=${this._activeCollapsed} .initialSorting=${this._activeSorting} @clear-filter=${this._clearFilter} @search-changed=${this._handleSearchChange} @sorting-changed=${this._handleSortingChanged} @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} @row-click=${this._handleRowClicked} clickable hasFab @@ -1005,6 +1010,10 @@ ${rejected this._activeGrouping = ev.detail.value; } + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ css` From ffdd661b1f00333704071675af3e344a59e8d93b Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 24 Apr 2024 07:31:29 +0200 Subject: [PATCH 90/98] Make fallback translations work (#20596) --- src/state/translations-mixin.ts | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts index b76c837c455f..ea329c086e1d 100644 --- a/src/state/translations-mixin.ts +++ b/src/state/translations-mixin.ts @@ -70,7 +70,7 @@ export default >(superClass: T) => // eslint-disable-next-line: variable-name private __coreProgress?: string; - private __loadedFragmetTranslations: Set = new Set(); + private __loadedFragmentTranslations: Set = new Set(); private __loadedTranslations: { // track what things have been loaded @@ -260,7 +260,7 @@ export default >(superClass: T) => document.querySelector("html")!.setAttribute("lang", hass.language); this._applyDirection(hass); this._loadCoreTranslations(hass.language); - this.__loadedFragmetTranslations = new Set(); + this.__loadedFragmentTranslations = new Set(); this._loadFragmentTranslations(hass.language, hass.panelUrl); } @@ -366,12 +366,12 @@ export default >(superClass: T) => return undefined; } - if (this.__loadedFragmetTranslations.has(fragment)) { + if (this.__loadedFragmentTranslations.has(fragment)) { return this.hass!.localize; } - this.__loadedFragmetTranslations.add(fragment); + this.__loadedFragmentTranslations.add(fragment); const result = await getTranslation(fragment, language); - return this._updateResources(result.language, result.data); + return this._updateResources(language, result.data); } private async _loadCoreTranslations(language: string) { @@ -383,7 +383,7 @@ export default >(superClass: T) => this.__coreProgress = language; try { const result = await getTranslation(null, language); - await this._updateResources(result.language, result.data); + await this._updateResources(language, result.data); } finally { this.__coreProgress = undefined; } From 469dbbcccc955953812734d4b39dc52d101da79a Mon Sep 17 00:00:00 2001 From: Steve Repsher Date: Wed, 24 Apr 2024 04:25:52 -0400 Subject: [PATCH 91/98] Rollback gulp to version 4 (#20598) --- package.json | 2 +- yarn.lock | 2199 ++++++++++++++++++++++++++++++++++++++++++-------- 2 files changed, 1875 insertions(+), 326 deletions(-) diff --git a/package.json b/package.json index b6cb46e72f5f..59c321dc9799 100644 --- a/package.json +++ b/package.json @@ -207,7 +207,7 @@ "fancy-log": "2.0.0", "fs-extra": "11.2.0", "glob": "10.3.12", - "gulp": "5.0.0", + "gulp": "4.0.2", "gulp-json-transform": "0.5.0", "gulp-merge-json": "2.2.1", "gulp-rename": "2.0.0", diff --git a/yarn.lock b/yarn.lock index 36d8d9a49631..28ce42d768e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1828,22 +1828,6 @@ __metadata: languageName: node linkType: hard -"@gulpjs/messages@npm:^1.1.0": - version: 1.1.0 - resolution: "@gulpjs/messages@npm:1.1.0" - checksum: 10/fa23de4f369cee6aec990a3795db0d1b109edca503ccd6c7551986e4936b1f08bdc5b6a2f3022e5828e478b4488ed3ac5677304bc2b691b03c575c9ac4042182 - languageName: node - linkType: hard - -"@gulpjs/to-absolute-glob@npm:^4.0.0": - version: 4.0.0 - resolution: "@gulpjs/to-absolute-glob@npm:4.0.0" - dependencies: - is-negated-glob: "npm:^1.0.0" - checksum: 10/30ec7825064422b6f02c1975ab6c779ff73409411c37bec2e984262459935afd196c1dbe960075e914967a047743ccf726fce3d3ebb4417ca2e3c34538fbceb8 - languageName: node - linkType: hard - "@humanwhocodes/config-array@npm:^0.11.14": version: 0.11.14 resolution: "@humanwhocodes/config-array@npm:0.11.14" @@ -5526,6 +5510,13 @@ __metadata: languageName: node linkType: hard +"ansi-regex@npm:^2.0.0": + version: 2.1.1 + resolution: "ansi-regex@npm:2.1.1" + checksum: 10/190abd03e4ff86794f338a31795d262c1dfe8c91f7e01d04f13f646f1dcb16c5800818f886047876f1272f065570ab86b24b99089f8b68a0e11ff19aed4ca8f1 + languageName: node + linkType: hard + "ansi-regex@npm:^5.0.1": version: 5.0.1 resolution: "ansi-regex@npm:5.0.1" @@ -5586,7 +5577,17 @@ __metadata: languageName: node linkType: hard -"anymatch@npm:^3.1.3, anymatch@npm:~3.1.2": +"anymatch@npm:^2.0.0": + version: 2.0.0 + resolution: "anymatch@npm:2.0.0" + dependencies: + micromatch: "npm:^3.1.4" + normalize-path: "npm:^2.1.1" + checksum: 10/f7bb1929842b4585cdc28edbb385767d499ce7d673f96a8f11348d2b2904592ffffc594fe9229b9a1e9e4dccb9329b7692f9f45e6a11dcefbb76ecdc9ab740f6 + languageName: node + linkType: hard + +"anymatch@npm:~3.1.2": version: 3.1.3 resolution: "anymatch@npm:3.1.3" dependencies: @@ -5608,6 +5609,22 @@ __metadata: languageName: node linkType: hard +"append-buffer@npm:^1.0.2": + version: 1.0.2 + resolution: "append-buffer@npm:1.0.2" + dependencies: + buffer-equal: "npm:^1.0.0" + checksum: 10/e809940b5137c0bfa6f6d4aefcae45b5a15a28938749c0ef50eb39e4d877978fcabf08ceba10d6f214fc15f021681f308fe24865d6557126e2923c58e9c3a134 + languageName: node + linkType: hard + +"archy@npm:^1.0.0": + version: 1.0.0 + resolution: "archy@npm:1.0.0" + checksum: 10/d7928049a57988b86df3f4de75ca16a4252ccee591d085c627e649fc54c5ae5daa833f17aa656bd825bd00bc0a2756ae03d2b983050bdbda1046b6d832bf7303 + languageName: node + linkType: hard + "argparse@npm:^2.0.1": version: 2.0.1 resolution: "argparse@npm:2.0.1" @@ -5631,6 +5648,31 @@ __metadata: languageName: node linkType: hard +"arr-filter@npm:^1.1.1": + version: 1.1.2 + resolution: "arr-filter@npm:1.1.2" + dependencies: + make-iterator: "npm:^1.0.0" + checksum: 10/952254f0caff460bf62ca356abecb78013c578db9c5a9a688861a5c87debdae6c22097e17e58cd59aaa2d96ac95254757e0e0bd4125bea38e6a160754b5fa6b1 + languageName: node + linkType: hard + +"arr-flatten@npm:^1.0.1, arr-flatten@npm:^1.1.0": + version: 1.1.0 + resolution: "arr-flatten@npm:1.1.0" + checksum: 10/963fe12564fca2f72c055f3f6c206b9e031f7c433a0c66ca9858b484821f248c5b1e5d53c8e4989d80d764cd776cf6d9b160ad05f47bdc63022bfd63b5455e22 + languageName: node + linkType: hard + +"arr-map@npm:^2.0.0, arr-map@npm:^2.0.2": + version: 2.0.2 + resolution: "arr-map@npm:2.0.2" + dependencies: + make-iterator: "npm:^1.0.0" + checksum: 10/51861a8a10b3f9d417468154c0b43a1fd85bbccfeca365f3cafe9d8c81218dc9b5ea9f923f9417365deface95111b36d06d5f348d0214bc9e277dfd2802f3acc + languageName: node + linkType: hard + "arr-union@npm:^3.1.0": version: 3.1.0 resolution: "arr-union@npm:3.1.0" @@ -5662,7 +5704,7 @@ __metadata: languageName: node linkType: hard -"array-each@npm:^1.0.1": +"array-each@npm:^1.0.0, array-each@npm:^1.0.1": version: 1.0.1 resolution: "array-each@npm:1.0.1" checksum: 10/eb2393c1200003993d97dab2b280aa01e6ca339b383198e5d250cc8cd31f8012a0c22b66f275401a80e89e21bfab420e0f4c77c295637dea525fe0e152ba2300 @@ -5690,6 +5732,25 @@ __metadata: languageName: node linkType: hard +"array-initial@npm:^1.0.0": + version: 1.1.0 + resolution: "array-initial@npm:1.1.0" + dependencies: + array-slice: "npm:^1.0.0" + is-number: "npm:^4.0.0" + checksum: 10/8fc7c2cbc6238fc0c4207ff63e15d651cad667c044e1ed53838fc530b8bde49a29445de73d58e909de5e8609bf5c61f4389b35b461c3ed282f79a0265c86a824 + languageName: node + linkType: hard + +"array-last@npm:^1.1.1": + version: 1.3.0 + resolution: "array-last@npm:1.3.0" + dependencies: + is-number: "npm:^4.0.0" + checksum: 10/7631c7df9b44ea26f49e2f6eeb7a7d4d95b3798586b917e1efae4a321b6362e449e00b011e88eb0260959fbfc940fbdfce1d2a35765ea080de6d71e3fc3cf1dd + languageName: node + linkType: hard + "array-slice@npm:^1.0.0": version: 1.1.0 resolution: "array-slice@npm:1.1.0" @@ -5697,6 +5758,17 @@ __metadata: languageName: node linkType: hard +"array-sort@npm:^1.0.0": + version: 1.0.0 + resolution: "array-sort@npm:1.0.0" + dependencies: + default-compare: "npm:^1.0.0" + get-value: "npm:^2.0.6" + kind-of: "npm:^5.0.2" + checksum: 10/e2346e58320e3c91ffbf6983526f84cfa4f07f5a135300c18ab22898b42351183a1e8a46fddecb9cd48e8ed697d577ba7c175ff3df36ea6ed2834d11441ee1a4 + languageName: node + linkType: hard + "array-union@npm:^2.1.0": version: 2.1.0 resolution: "array-union@npm:2.1.0" @@ -5704,6 +5776,13 @@ __metadata: languageName: node linkType: hard +"array-unique@npm:^0.3.2": + version: 0.3.2 + resolution: "array-unique@npm:0.3.2" + checksum: 10/da344b89cfa6b0a5c221f965c21638bfb76b57b45184a01135382186924f55973cd9b171d4dad6bf606c6d9d36b0d721d091afdc9791535ead97ccbe78f8a888 + languageName: node + linkType: hard + "array.prototype.find@npm:^2.2.2": version: 2.2.3 resolution: "array.prototype.find@npm:2.2.3" @@ -5785,23 +5864,31 @@ __metadata: languageName: node linkType: hard -"async-done@npm:^2.0.0": - version: 2.0.0 - resolution: "async-done@npm:2.0.0" +"async-done@npm:^1.2.0, async-done@npm:^1.2.2": + version: 1.3.2 + resolution: "async-done@npm:1.3.2" dependencies: - end-of-stream: "npm:^1.4.4" - once: "npm:^1.4.0" - stream-exhaust: "npm:^1.0.2" - checksum: 10/70d275c7ee8808e356b14fd10036d1667e778d6b3b3d3ad861d3602cbe5071931d8ec7379c01b15bf1883d04d42d0e790ceffde3ba96858f6b7cbeaf9142a23d + end-of-stream: "npm:^1.1.0" + once: "npm:^1.3.2" + process-nextick-args: "npm:^2.0.0" + stream-exhaust: "npm:^1.0.1" + checksum: 10/fc23b7752fdd78de3e2cc302b06d51c1e35eb068e9ccf55f5d5da74da32386eb8b70a5d688c5bc46b2e28016078493804a836e00150bdd50d7e009ac27705a10 languageName: node linkType: hard -"async-settle@npm:^2.0.0": - version: 2.0.0 - resolution: "async-settle@npm:2.0.0" +"async-each@npm:^1.0.1": + version: 1.0.6 + resolution: "async-each@npm:1.0.6" + checksum: 10/d237e8c39348d5f1441edbd3893692912afbacaf83a2ccce8978ebeea804529a8838654b12208fbbc08c8b0411a1248948ee9bf9291ebe1921aabd5b613bc5db + languageName: node + linkType: hard + +"async-settle@npm:^1.0.0": + version: 1.0.0 + resolution: "async-settle@npm:1.0.0" dependencies: - async-done: "npm:^2.0.0" - checksum: 10/69398507b20e7d7628ee6756ca1547c80744eb5b33cc9b1a22e0a8a38a6b864be96b93e0940de45113afa33cb34d89151ee9c85dbffcd51e741c8146cf695d15 + async-done: "npm:^1.2.2" + checksum: 10/d2382ad4b9137b5cee7a21ba5d573af4b3458ba7e104e46acda035168d1a58f5715509ad046006a561586ae0106c11836d90bbe269c85928fdd24ee5bd71fbb4 languageName: node linkType: hard @@ -5828,6 +5915,15 @@ __metadata: languageName: node linkType: hard +"atob@npm:^2.1.2": + version: 2.1.2 + resolution: "atob@npm:2.1.2" + bin: + atob: bin/atob.js + checksum: 10/0624406cc0295533b38b60ab2e3b028aa7b8225f37e0cde6be3bc5c13a8015c889b192e874fd7660671179cef055f2e258855f372b0e495bd4096cf0b4785c25 + languageName: node + linkType: hard + "available-typed-arrays@npm:^1.0.7": version: 1.0.7 resolution: "available-typed-arrays@npm:1.0.7" @@ -5911,14 +6007,20 @@ __metadata: languageName: node linkType: hard -"bach@npm:^2.0.1": - version: 2.0.1 - resolution: "bach@npm:2.0.1" +"bach@npm:^1.0.0": + version: 1.2.0 + resolution: "bach@npm:1.2.0" dependencies: - async-done: "npm:^2.0.0" - async-settle: "npm:^2.0.0" - now-and-later: "npm:^3.0.0" - checksum: 10/e1356946290225e88151e7af5155f6d75c2daf9797de0de380cf9e40004ba54face99249cc99c965acd31cf7754d85b5249ec622fffcacb5c5ef11667f8fccd5 + arr-filter: "npm:^1.1.1" + arr-flatten: "npm:^1.0.1" + arr-map: "npm:^2.0.0" + array-each: "npm:^1.0.0" + array-initial: "npm:^1.0.0" + array-last: "npm:^1.1.1" + async-done: "npm:^1.2.2" + async-settle: "npm:^1.0.0" + now-and-later: "npm:^2.0.0" + checksum: 10/c37fac684744ca2783b14c0e26a2d9700068ef5f14ea7a5808e402a4c47cdaf7c2ef72bd5af2edd83938d667626833ecd1be59cbbd1d0a5bffd92b6fb4705434 languageName: node linkType: hard @@ -5943,6 +6045,21 @@ __metadata: languageName: node linkType: hard +"base@npm:^0.11.1": + version: 0.11.2 + resolution: "base@npm:0.11.2" + dependencies: + cache-base: "npm:^1.0.1" + class-utils: "npm:^0.3.5" + component-emitter: "npm:^1.2.1" + define-property: "npm:^1.0.0" + isobject: "npm:^3.0.1" + mixin-deep: "npm:^1.2.0" + pascalcase: "npm:^0.1.1" + checksum: 10/33b0c5d570840873cf370248e653d43e8d82ce4f03161ad3c58b7da6238583cfc65bf4bbb06b27050d6c2d8f40628777f3933f483c0a7c0274fcef4c51f70a7e + languageName: node + linkType: hard + "batch@npm:0.6.1": version: 0.6.1 resolution: "batch@npm:0.6.1" @@ -5957,6 +6074,13 @@ __metadata: languageName: node linkType: hard +"binary-extensions@npm:^1.0.0": + version: 1.13.1 + resolution: "binary-extensions@npm:1.13.1" + checksum: 10/ad7747f33c07e94ba443055de130b50c8b8b130a358bca064c580d91769ca6a69c7ac65ca008ff044ed4541d2c6ad45496e1fadbef5218a68770996b6a2194d7 + languageName: node + linkType: hard + "binary-extensions@npm:^2.0.0": version: 2.3.0 resolution: "binary-extensions@npm:2.3.0" @@ -5964,14 +6088,12 @@ __metadata: languageName: node linkType: hard -"bl@npm:^5.0.0": - version: 5.1.0 - resolution: "bl@npm:5.1.0" +"bindings@npm:^1.5.0": + version: 1.5.0 + resolution: "bindings@npm:1.5.0" dependencies: - buffer: "npm:^6.0.3" - inherits: "npm:^2.0.4" - readable-stream: "npm:^3.4.0" - checksum: 10/0340d3d70def4213cd9cbcd8592f7c5922d3668e7b231286c354613fac4a8411ad373cff26e06162da7423035bbd5caafce3e140a5f397be72fcd1e9d86f1179 + file-uri-to-path: "npm:1.0.0" + checksum: 10/593d5ae975ffba15fbbb4788fe5abd1e125afbab849ab967ab43691d27d6483751805d98cb92f7ac24a2439a8a8678cd0131c535d5d63de84e383b0ce2786133 languageName: node linkType: hard @@ -6045,6 +6167,24 @@ __metadata: languageName: node linkType: hard +"braces@npm:^2.3.1, braces@npm:^2.3.2": + version: 2.3.2 + resolution: "braces@npm:2.3.2" + dependencies: + arr-flatten: "npm:^1.1.0" + array-unique: "npm:^0.3.2" + extend-shallow: "npm:^2.0.1" + fill-range: "npm:^4.0.0" + isobject: "npm:^3.0.1" + repeat-element: "npm:^1.1.2" + snapdragon: "npm:^0.8.1" + snapdragon-node: "npm:^2.0.1" + split-string: "npm:^3.0.2" + to-regex: "npm:^3.0.1" + checksum: 10/7c0f0d962570812009b050ee2e6243fd425ea80d3136aace908d0038bde9e7a43e9326fa35538cebf7c753f0482655f08ea11be074c9a140394287980a5c66c9 + languageName: node + linkType: hard + "braces@npm:^3.0.2, braces@npm:~3.0.2": version: 3.0.2 resolution: "braces@npm:3.0.2" @@ -6082,6 +6222,13 @@ __metadata: languageName: node linkType: hard +"buffer-equal@npm:^1.0.0": + version: 1.0.1 + resolution: "buffer-equal@npm:1.0.1" + checksum: 10/0d56dbeec3d862b16f07fe1cc27751adab26219ff37b90fb0be1fe5c870ce1ce3ed45aad9d9b8c631dfc0e147315d02385ddefaf7f6cb24f067f91a2f8def324 + languageName: node + linkType: hard + "buffer-from@npm:^1.0.0": version: 1.1.2 resolution: "buffer-from@npm:1.1.2" @@ -6099,16 +6246,6 @@ __metadata: languageName: node linkType: hard -"buffer@npm:^6.0.3": - version: 6.0.3 - resolution: "buffer@npm:6.0.3" - dependencies: - base64-js: "npm:^1.3.1" - ieee754: "npm:^1.2.1" - checksum: 10/b6bc68237ebf29bdacae48ce60e5e28fc53ae886301f2ad9496618efac49427ed79096750033e7eab1897a4f26ae374ace49106a5758f38fb70c78c9fda2c3b1 - languageName: node - linkType: hard - "builtin-modules@npm:^3.1.0, builtin-modules@npm:^3.3.0": version: 3.3.0 resolution: "builtin-modules@npm:3.3.0" @@ -6159,6 +6296,23 @@ __metadata: languageName: node linkType: hard +"cache-base@npm:^1.0.1": + version: 1.0.1 + resolution: "cache-base@npm:1.0.1" + dependencies: + collection-visit: "npm:^1.0.0" + component-emitter: "npm:^1.2.1" + get-value: "npm:^2.0.6" + has-value: "npm:^1.0.0" + isobject: "npm:^3.0.1" + set-value: "npm:^2.0.0" + to-object-path: "npm:^0.3.0" + union-value: "npm:^1.0.0" + unset-value: "npm:^1.0.0" + checksum: 10/50dd11af5ce4aaa8a8bff190a870c940db80234cf087cd47dd177be8629c36ad8cd0716e62418ec1e135f2d01b28aafff62cd22d33412c3d18b2109dd9073711 + languageName: node + linkType: hard + "cache-content-type@npm:^1.0.0": version: 1.0.1 resolution: "cache-content-type@npm:1.0.1" @@ -6199,6 +6353,13 @@ __metadata: languageName: node linkType: hard +"camelcase@npm:^3.0.0": + version: 3.0.0 + resolution: "camelcase@npm:3.0.0" + checksum: 10/ae4fe1c17c8442a3a345a6b7d2393f028ab7a7601af0c352ad15d1ab97ca75112e19e29c942b2a214898e160194829b68923bce30e018d62149c6d84187f1673 + languageName: node + linkType: hard + "camelcase@npm:^5.0.0": version: 5.3.1 resolution: "camelcase@npm:5.3.1" @@ -6305,7 +6466,30 @@ __metadata: languageName: node linkType: hard -"chokidar@npm:^3.4.3, chokidar@npm:^3.5.3, chokidar@npm:^3.6.0": +"chokidar@npm:^2.0.0": + version: 2.1.8 + resolution: "chokidar@npm:2.1.8" + dependencies: + anymatch: "npm:^2.0.0" + async-each: "npm:^1.0.1" + braces: "npm:^2.3.2" + fsevents: "npm:^1.2.7" + glob-parent: "npm:^3.1.0" + inherits: "npm:^2.0.3" + is-binary-path: "npm:^1.0.0" + is-glob: "npm:^4.0.0" + normalize-path: "npm:^3.0.0" + path-is-absolute: "npm:^1.0.0" + readdirp: "npm:^2.2.1" + upath: "npm:^1.1.1" + dependenciesMeta: + fsevents: + optional: true + checksum: 10/567c319dd2a9078fddb5a64df46163d87b104857c1b50c2ef6f9b41b3ab28867c48dbc5f0c6ddaafd3c338b147ea33a6498eb9b906c71006cba1e486a0e9350d + languageName: node + linkType: hard + +"chokidar@npm:^3.4.3, chokidar@npm:^3.6.0": version: 3.6.0 resolution: "chokidar@npm:3.6.0" dependencies: @@ -6345,6 +6529,18 @@ __metadata: languageName: node linkType: hard +"class-utils@npm:^0.3.5": + version: 0.3.6 + resolution: "class-utils@npm:0.3.6" + dependencies: + arr-union: "npm:^3.1.0" + define-property: "npm:^0.2.5" + isobject: "npm:^3.0.0" + static-extend: "npm:^0.1.1" + checksum: 10/b236d9deb6594828966e45c5f48abac9a77453ee0dbdb89c635ce876f59755d7952309d554852b6f7d909198256c335a4bd51b09c1d238b36b92152eb2b9d47a + languageName: node + linkType: hard + "clean-css@npm:5.3.3": version: 5.3.3 resolution: "clean-css@npm:5.3.3" @@ -6389,6 +6585,17 @@ __metadata: languageName: node linkType: hard +"cliui@npm:^3.2.0": + version: 3.2.0 + resolution: "cliui@npm:3.2.0" + dependencies: + string-width: "npm:^1.0.1" + strip-ansi: "npm:^3.0.1" + wrap-ansi: "npm:^2.0.0" + checksum: 10/a8acc1a2e5f6307bb3200738a55b353ae5ca13d7a9a8001e40bdf2449c228104daf245e29cdfe60652ffafc3e70096fc1624cd9cf8651bb322903dbbb22a4ac3 + languageName: node + linkType: hard + "cliui@npm:^6.0.0": version: 6.0.0 resolution: "cliui@npm:6.0.0" @@ -6479,6 +6686,34 @@ __metadata: languageName: node linkType: hard +"code-point-at@npm:^1.0.0": + version: 1.1.0 + resolution: "code-point-at@npm:1.1.0" + checksum: 10/17d5666611f9b16d64fdf48176d9b7fb1c7d1c1607a189f7e600040a11a6616982876af148230336adb7d8fe728a559f743a4e29db3747e3b1a32fa7f4529681 + languageName: node + linkType: hard + +"collection-map@npm:^1.0.0": + version: 1.0.0 + resolution: "collection-map@npm:1.0.0" + dependencies: + arr-map: "npm:^2.0.2" + for-own: "npm:^1.0.0" + make-iterator: "npm:^1.0.0" + checksum: 10/770b5eb244870a699b4d16549684b54235f5e6e829d10771a09f089fc96ec0d5563ca0aa3a27511fe1bca36fdad156c9b7b2876437bcdf02c355f69046b3fd2f + languageName: node + linkType: hard + +"collection-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "collection-visit@npm:1.0.0" + dependencies: + map-visit: "npm:^1.0.0" + object-visit: "npm:^1.0.0" + checksum: 10/15d9658fe6eb23594728346adad5433b86bb7a04fd51bbab337755158722f9313a5376ef479de5b35fbc54140764d0d39de89c339f5d25b959ed221466981da9 + languageName: node + linkType: hard + "color-convert@npm:^1.9.0": version: 1.9.3 resolution: "color-convert@npm:1.9.3" @@ -6614,6 +6849,13 @@ __metadata: languageName: node linkType: hard +"component-emitter@npm:^1.2.1": + version: 1.3.1 + resolution: "component-emitter@npm:1.3.1" + checksum: 10/94550aa462c7bd5a61c1bc480e28554aa306066930152d1b1844a0dd3845d4e5db7e261ddec62ae184913b3e59b55a2ad84093b9d3596a8f17c341514d6c483d + languageName: node + linkType: hard + "compressible@npm:~2.0.16": version: 2.0.18 resolution: "compressible@npm:2.0.18" @@ -6645,6 +6887,18 @@ __metadata: languageName: node linkType: hard +"concat-stream@npm:^1.6.0": + version: 1.6.2 + resolution: "concat-stream@npm:1.6.2" + dependencies: + buffer-from: "npm:^1.0.0" + inherits: "npm:^2.0.3" + readable-stream: "npm:^2.2.2" + typedarray: "npm:^0.0.6" + checksum: 10/71db903c84fc073ca35a274074e8d26c4330713d299f8623e993c448c1f6bf8b967806dd1d1a7b0f8add6f15ab1af7435df21fe79b4fe7efd78420c89e054e28 + languageName: node + linkType: hard + "confusing-browser-globals@npm:^1.0.10": version: 1.0.11 resolution: "confusing-browser-globals@npm:1.0.11" @@ -6689,6 +6943,13 @@ __metadata: languageName: node linkType: hard +"convert-source-map@npm:^1.5.0": + version: 1.9.0 + resolution: "convert-source-map@npm:1.9.0" + checksum: 10/dc55a1f28ddd0e9485ef13565f8f756b342f9a46c4ae18b843fe3c30c675d058d6a4823eff86d472f187b176f0adf51ea7b69ea38be34be4a63cbbf91b0593c8 + languageName: node + linkType: hard + "convert-source-map@npm:^2.0.0": version: 2.0.0 resolution: "convert-source-map@npm:2.0.0" @@ -6720,13 +6981,20 @@ __metadata: languageName: node linkType: hard -"copy-props@npm:^4.0.0": - version: 4.0.0 - resolution: "copy-props@npm:4.0.0" +"copy-descriptor@npm:^0.1.0": + version: 0.1.1 + resolution: "copy-descriptor@npm:0.1.1" + checksum: 10/edf4651bce36166c7fcc60b5c1db2c5dad1d87820f468507331dd154b686ece8775f5d383127d44aeef813462520c866f83908aa2d4291708f898df776816860 + languageName: node + linkType: hard + +"copy-props@npm:^2.0.1": + version: 2.0.5 + resolution: "copy-props@npm:2.0.5" dependencies: - each-props: "npm:^3.0.0" + each-props: "npm:^1.3.2" is-plain-object: "npm:^5.0.0" - checksum: 10/86ea7f2c60e5502ba215b81f5094199a4d6f7e285a4c45800b0c292a7fda04e8c6852fbcb99745f4eaa0e33b04c34fc3cfa2cb4c15a01ccbcb39b6fc0f72e878 + checksum: 10/eba7486dc0ba0b5bbb0e98805849a60e0a0c14c362b1baece69d86c8460aabe03d4f271d34ac41d8f5f9b3302703ca75bab34227ff6fbfedc47646f47288aaa0 languageName: node linkType: hard @@ -6799,6 +7067,16 @@ __metadata: languageName: node linkType: hard +"d@npm:1, d@npm:^1.0.1, d@npm:^1.0.2": + version: 1.0.2 + resolution: "d@npm:1.0.2" + dependencies: + es5-ext: "npm:^0.10.64" + type: "npm:^2.7.2" + checksum: 10/a3f45ef964622f683f6a1cb9b8dcbd75ce490cd2f4ac9794099db3d8f0e2814d412d84cd3fe522e58feb1f273117bb480f29c5381f6225f0abca82517caaa77a + languageName: node + linkType: hard + "data-view-buffer@npm:^1.0.1": version: 1.0.1 resolution: "data-view-buffer@npm:1.0.1" @@ -6855,7 +7133,7 @@ __metadata: languageName: node linkType: hard -"debug@npm:2.6.9": +"debug@npm:2.6.9, debug@npm:^2.2.0, debug@npm:^2.3.3": version: 2.6.9 resolution: "debug@npm:2.6.9" dependencies: @@ -6885,7 +7163,7 @@ __metadata: languageName: node linkType: hard -"decamelize@npm:^1.2.0": +"decamelize@npm:^1.1.1, decamelize@npm:^1.2.0": version: 1.2.0 resolution: "decamelize@npm:1.2.0" checksum: 10/ad8c51a7e7e0720c70ec2eeb1163b66da03e7616d7b98c9ef43cce2416395e84c1e9548dd94f5f6ffecfee9f8b94251fc57121a8b021f2ff2469b2bae247b8aa @@ -6899,6 +7177,13 @@ __metadata: languageName: node linkType: hard +"decode-uri-component@npm:^0.2.0": + version: 0.2.2 + resolution: "decode-uri-component@npm:0.2.2" + checksum: 10/17a0e5fa400bf9ea84432226e252aa7b5e72793e16bf80b907c99b46a799aeacc139ec20ea57121e50c7bd875a1a4365928f884e92abf02e21a5a13790a0f33e + languageName: node + linkType: hard + "deep-clone-simple@npm:1.1.1": version: 1.1.1 resolution: "deep-clone-simple@npm:1.1.1" @@ -6958,6 +7243,15 @@ __metadata: languageName: node linkType: hard +"default-compare@npm:^1.0.0": + version: 1.0.0 + resolution: "default-compare@npm:1.0.0" + dependencies: + kind-of: "npm:^5.0.2" + checksum: 10/e638d86e65655af04471b0865b4ae1c8886c342cb6ca035748701413ef6ff2cc0a53f273b103f55565fb50e338ff32da10998ae232c3d06fd0251fb6e852a455 + languageName: node + linkType: hard + "default-gateway@npm:^6.0.3": version: 6.0.3 resolution: "default-gateway@npm:6.0.3" @@ -6967,6 +7261,13 @@ __metadata: languageName: node linkType: hard +"default-resolution@npm:^2.0.0": + version: 2.0.0 + resolution: "default-resolution@npm:2.0.0" + checksum: 10/68a9925e2826b52b5c2b0206372a99ab438fdb16606561bc36cf02bc42c10870862dd3e69f2d79d9ac3959be7140649e9a92fd4e476808dac8c959f35328f0aa + languageName: node + linkType: hard + "defaults@npm:^1.0.4": version: 1.0.4 resolution: "defaults@npm:1.0.4" @@ -7012,6 +7313,34 @@ __metadata: languageName: node linkType: hard +"define-property@npm:^0.2.5": + version: 0.2.5 + resolution: "define-property@npm:0.2.5" + dependencies: + is-descriptor: "npm:^0.1.0" + checksum: 10/85af107072b04973b13f9e4128ab74ddfda48ec7ad2e54b193c0ffb57067c4ce5b7786a7b4ae1f24bd03e87c5d18766b094571810b314d7540f86d4354dbd394 + languageName: node + linkType: hard + +"define-property@npm:^1.0.0": + version: 1.0.0 + resolution: "define-property@npm:1.0.0" + dependencies: + is-descriptor: "npm:^1.0.0" + checksum: 10/5fbed11dace44dd22914035ba9ae83ad06008532ca814d7936a53a09e897838acdad5b108dd0688cc8d2a7cf0681acbe00ee4136cf36743f680d10517379350a + languageName: node + linkType: hard + +"define-property@npm:^2.0.2": + version: 2.0.2 + resolution: "define-property@npm:2.0.2" + dependencies: + is-descriptor: "npm:^1.0.2" + isobject: "npm:^3.0.1" + checksum: 10/3217ed53fc9eed06ba8da6f4d33e28c68a82e2f2a8ab4d562c4920d8169a166fe7271453675e6c69301466f36a65d7f47edf0cf7f474b9aa52a5ead9c1b13c99 + languageName: node + linkType: hard + "del@npm:7.1.0": version: 7.1.0 resolution: "del@npm:7.1.0" @@ -7180,13 +7509,25 @@ __metadata: languageName: node linkType: hard -"each-props@npm:^3.0.0": - version: 3.0.0 - resolution: "each-props@npm:3.0.0" +"duplexify@npm:^3.6.0": + version: 3.7.1 + resolution: "duplexify@npm:3.7.1" dependencies: - is-plain-object: "npm:^5.0.0" + end-of-stream: "npm:^1.0.0" + inherits: "npm:^2.0.1" + readable-stream: "npm:^2.0.0" + stream-shift: "npm:^1.0.0" + checksum: 10/7799984d178fb57e11c43f5f172a10f795322ec85ff664c2a98d2c2de6deeb9d7a30b810f83923dcd7ebe0f1786724b8aee2b62ca4577522141f93d6d48fb31c + languageName: node + linkType: hard + +"each-props@npm:^1.3.2": + version: 1.3.2 + resolution: "each-props@npm:1.3.2" + dependencies: + is-plain-object: "npm:^2.0.1" object.defaults: "npm:^1.1.0" - checksum: 10/69d493f84692161898956a1251ceadc52fef35b6c4734af55a2de9d344fbf1b4e5643e160095c4a3a8808d893f5ebc5a2178d51039c8716864c6aa0ddf007029 + checksum: 10/81ac0ede3d9264b0e43c371a410fca850ad3931e21cc83b817b9715901fb60d4b86e1602eae3d24ca91558508aa16e9e5dfbf2bbe41e159eb0450c829111f721 languageName: node linkType: hard @@ -7273,7 +7614,7 @@ __metadata: languageName: node linkType: hard -"end-of-stream@npm:^1.4.4": +"end-of-stream@npm:^1.0.0, end-of-stream@npm:^1.1.0": version: 1.4.4 resolution: "end-of-stream@npm:1.4.4" dependencies: @@ -7333,6 +7674,15 @@ __metadata: languageName: node linkType: hard +"error-ex@npm:^1.2.0": + version: 1.3.2 + resolution: "error-ex@npm:1.3.2" + dependencies: + is-arrayish: "npm:^0.2.1" + checksum: 10/d547740aa29c34e753fb6fed2c5de81802438529c12b3673bd37b6bb1fe49b9b7abdc3c11e6062fe625d8a296b3cf769a80f878865e25e685f787763eede3ffb + languageName: node + linkType: hard + "error-stack-parser@npm:^2.0.6": version: 2.1.4 resolution: "error-stack-parser@npm:2.1.4" @@ -7459,6 +7809,51 @@ __metadata: languageName: node linkType: hard +"es5-ext@npm:^0.10.35, es5-ext@npm:^0.10.46, es5-ext@npm:^0.10.62, es5-ext@npm:^0.10.64, es5-ext@npm:~0.10.14": + version: 0.10.64 + resolution: "es5-ext@npm:0.10.64" + dependencies: + es6-iterator: "npm:^2.0.3" + es6-symbol: "npm:^3.1.3" + esniff: "npm:^2.0.1" + next-tick: "npm:^1.1.0" + checksum: 10/0c5d8657708b1695ddc4b06f4e0b9fbdda4d2fe46d037b6bedb49a7d1931e542ec9eecf4824d59e1d357e93229deab014bb4b86485db2d41b1d68e54439689ce + languageName: node + linkType: hard + +"es6-iterator@npm:^2.0.1, es6-iterator@npm:^2.0.3": + version: 2.0.3 + resolution: "es6-iterator@npm:2.0.3" + dependencies: + d: "npm:1" + es5-ext: "npm:^0.10.35" + es6-symbol: "npm:^3.1.1" + checksum: 10/dbadecf3d0e467692815c2b438dfa99e5a97cbbecf4a58720adcb467a04220e0e36282399ba297911fd472c50ae4158fffba7ed0b7d4273fe322b69d03f9e3a5 + languageName: node + linkType: hard + +"es6-symbol@npm:^3.1.1, es6-symbol@npm:^3.1.3": + version: 3.1.4 + resolution: "es6-symbol@npm:3.1.4" + dependencies: + d: "npm:^1.0.2" + ext: "npm:^1.7.0" + checksum: 10/3743119fe61f89e2f049a6ce52bd82fab5f65d13e2faa72453b73f95c15292c3cb9bdf3747940d504517e675e45fd375554c6b5d35d2bcbefd35f5489ecba546 + languageName: node + linkType: hard + +"es6-weak-map@npm:^2.0.1": + version: 2.0.3 + resolution: "es6-weak-map@npm:2.0.3" + dependencies: + d: "npm:1" + es5-ext: "npm:^0.10.46" + es6-iterator: "npm:^2.0.3" + es6-symbol: "npm:^3.1.1" + checksum: 10/5958a321cf8dfadc82b79eeaa57dc855893a4afd062b4ef5c9ded0010d3932099311272965c3d3fdd3c85df1d7236013a570e704fa6c1f159bbf979c203dd3a3 + languageName: node + linkType: hard + "escalade@npm:^3.1.1": version: 3.1.2 resolution: "escalade@npm:3.1.2" @@ -7766,6 +8161,18 @@ __metadata: languageName: node linkType: hard +"esniff@npm:^2.0.1": + version: 2.0.1 + resolution: "esniff@npm:2.0.1" + dependencies: + d: "npm:^1.0.1" + es5-ext: "npm:^0.10.62" + event-emitter: "npm:^0.3.5" + type: "npm:^2.7.2" + checksum: 10/f6a2abd2f8c5fe57c5fcf53e5407c278023313d0f6c3a92688e7122ab9ac233029fd424508a196ae5bc561aa1f67d23f4e2435b1a0d378030f476596129056ac + languageName: node + linkType: hard + "espree@npm:^9.6.0, espree@npm:^9.6.1": version: 9.6.1 resolution: "espree@npm:9.6.1" @@ -7844,6 +8251,16 @@ __metadata: languageName: node linkType: hard +"event-emitter@npm:^0.3.5": + version: 0.3.5 + resolution: "event-emitter@npm:0.3.5" + dependencies: + d: "npm:1" + es5-ext: "npm:~0.10.14" + checksum: 10/a7f5ea80029193f4869782d34ef7eb43baa49cd397013add1953491b24588468efbe7e3cc9eb87d53f33397e7aab690fd74c079ec440bf8b12856f6bdb6e9396 + languageName: node + linkType: hard + "eventemitter3@npm:^4.0.0": version: 4.0.7 resolution: "eventemitter3@npm:4.0.7" @@ -7906,6 +8323,21 @@ __metadata: languageName: node linkType: hard +"expand-brackets@npm:^2.1.4": + version: 2.1.4 + resolution: "expand-brackets@npm:2.1.4" + dependencies: + debug: "npm:^2.3.3" + define-property: "npm:^0.2.5" + extend-shallow: "npm:^2.0.1" + posix-character-classes: "npm:^0.1.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10/aa4acc62084638c761ecdbe178bd3136f01121939f96bbfc3be27c46c66625075f77fe0a446b627c9071b1aaf6d93ccf5bde5ff34b7ef883e4f46067a8e63e41 + languageName: node + linkType: hard + "expand-tilde@npm:^2.0.0, expand-tilde@npm:^2.0.2": version: 2.0.2 resolution: "expand-tilde@npm:2.0.2" @@ -7961,23 +8393,57 @@ __metadata: languageName: node linkType: hard -"extend-shallow@npm:^3.0.2": - version: 3.0.2 - resolution: "extend-shallow@npm:3.0.2" +"ext@npm:^1.7.0": + version: 1.7.0 + resolution: "ext@npm:1.7.0" dependencies: - assign-symbols: "npm:^1.0.0" + type: "npm:^2.7.2" + checksum: 10/666a135980b002df0e75c8ac6c389140cdc59ac953db62770479ee2856d58ce69d2f845e5f2586716350b725400f6945e51e9159573158c39f369984c72dcd84 + languageName: node + linkType: hard + +"extend-shallow@npm:^2.0.1": + version: 2.0.1 + resolution: "extend-shallow@npm:2.0.1" + dependencies: + is-extendable: "npm:^0.1.0" + checksum: 10/8fb58d9d7a511f4baf78d383e637bd7d2e80843bd9cd0853649108ea835208fb614da502a553acc30208e1325240bb7cc4a68473021612496bb89725483656d8 + languageName: node + linkType: hard + +"extend-shallow@npm:^3.0.0, extend-shallow@npm:^3.0.2": + version: 3.0.2 + resolution: "extend-shallow@npm:3.0.2" + dependencies: + assign-symbols: "npm:^1.0.0" is-extendable: "npm:^1.0.1" checksum: 10/a920b0cd5838a9995ace31dfd11ab5e79bf6e295aa566910ce53dff19f4b1c0fda2ef21f26b28586c7a2450ca2b42d97bd8c0f5cec9351a819222bf861e02461 languageName: node linkType: hard -"extend@npm:^3.0.2": +"extend@npm:^3.0.0": version: 3.0.2 resolution: "extend@npm:3.0.2" checksum: 10/59e89e2dc798ec0f54b36d82f32a27d5f6472c53974f61ca098db5d4648430b725387b53449a34df38fd0392045434426b012f302b3cc049a6500ccf82877e4e languageName: node linkType: hard +"extglob@npm:^2.0.4": + version: 2.0.4 + resolution: "extglob@npm:2.0.4" + dependencies: + array-unique: "npm:^0.3.2" + define-property: "npm:^1.0.0" + expand-brackets: "npm:^2.1.4" + extend-shallow: "npm:^2.0.1" + fragment-cache: "npm:^0.2.1" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10/6869edd48d40c322e1cda9bf494ed2407c69a19063fd2897184cb62d6d35c14fa7402b01d9dedd65d77ed1ccc74a291235a702c68b4f28a7314da0cdee97c85b + languageName: node + linkType: hard + "fancy-log@npm:2.0.0, fancy-log@npm:^2.0.0": version: 2.0.0 resolution: "fancy-log@npm:2.0.0" @@ -8033,6 +8499,13 @@ __metadata: languageName: node linkType: hard +"fast-levenshtein@npm:^1.0.0": + version: 1.1.4 + resolution: "fast-levenshtein@npm:1.1.4" + checksum: 10/3b8cd791635d4105a423ea4e023aa1a0b896fef648104107851a3372aa0e62edd0f2b1e30bd6fd50d4d69c1023c3e5ed3dadb81030f01c6fc58a3d184e1cbbfb + languageName: node + linkType: hard + "fast-levenshtein@npm:^2.0.6": version: 2.0.6 resolution: "fast-levenshtein@npm:2.0.6" @@ -8040,15 +8513,6 @@ __metadata: languageName: node linkType: hard -"fast-levenshtein@npm:^3.0.0": - version: 3.0.0 - resolution: "fast-levenshtein@npm:3.0.0" - dependencies: - fastest-levenshtein: "npm:^1.0.7" - checksum: 10/df98841b262eb345335043ae42f0219f1acf1a88f2e0959ca94c4a46df44e40455d9ee11a3f1c730dee2b1b87dc8b20d4184e71712b30b229df5b40c944ea649 - languageName: node - linkType: hard - "fast-url-parser@npm:1.1.3": version: 1.1.3 resolution: "fast-url-parser@npm:1.1.3" @@ -8058,14 +8522,14 @@ __metadata: languageName: node linkType: hard -"fastest-levenshtein@npm:^1.0.12, fastest-levenshtein@npm:^1.0.7": +"fastest-levenshtein@npm:^1.0.12": version: 1.0.16 resolution: "fastest-levenshtein@npm:1.0.16" checksum: 10/ee85d33b5cef592033f70e1c13ae8624055950b4eb832435099cd56aa313d7f251b873bedbc06a517adfaff7b31756d139535991e2406967438e03a1bf1b008e languageName: node linkType: hard -"fastq@npm:^1.13.0, fastq@npm:^1.6.0": +"fastq@npm:^1.6.0": version: 1.17.1 resolution: "fastq@npm:1.17.1" dependencies: @@ -8112,6 +8576,13 @@ __metadata: languageName: node linkType: hard +"file-uri-to-path@npm:1.0.0": + version: 1.0.0 + resolution: "file-uri-to-path@npm:1.0.0" + checksum: 10/b648580bdd893a008c92c7ecc96c3ee57a5e7b6c4c18a9a09b44fb5d36d79146f8e442578bc0e173dc027adf3987e254ba1dfd6e3ec998b7c282873010502144 + languageName: node + linkType: hard + "filelist@npm:^1.0.4": version: 1.0.4 resolution: "filelist@npm:1.0.4" @@ -8121,6 +8592,18 @@ __metadata: languageName: node linkType: hard +"fill-range@npm:^4.0.0": + version: 4.0.0 + resolution: "fill-range@npm:4.0.0" + dependencies: + extend-shallow: "npm:^2.0.1" + is-number: "npm:^3.0.0" + repeat-string: "npm:^1.6.1" + to-regex-range: "npm:^2.1.0" + checksum: 10/68be23b3c40d5a3fd2847ce18e3a5eac25d9f4c05627291e048ba1346ed0e429668b58a3429e61c0db9fa5954c4402fe99322a65d8a0eb06ebed8d3a18fbb09a + languageName: node + linkType: hard + "fill-range@npm:^7.0.1": version: 7.0.1 resolution: "fill-range@npm:7.0.1" @@ -8181,6 +8664,16 @@ __metadata: languageName: node linkType: hard +"find-up@npm:^1.0.0": + version: 1.1.2 + resolution: "find-up@npm:1.1.2" + dependencies: + path-exists: "npm:^2.0.0" + pinkie-promise: "npm:^2.0.0" + checksum: 10/a2cb9f4c9f06ee3a1e92ed71d5aed41ac8ae30aefa568132f6c556fac7678a5035126153b59eaec68da78ac409eef02503b2b059706bdbf232668d7245e3240a + languageName: node + linkType: hard + "find-up@npm:^4.0.0, find-up@npm:^4.1.0": version: 4.1.0 resolution: "find-up@npm:4.1.0" @@ -8201,35 +8694,47 @@ __metadata: languageName: node linkType: hard -"findup-sync@npm:^5.0.0": - version: 5.0.0 - resolution: "findup-sync@npm:5.0.0" +"findup-sync@npm:^2.0.0": + version: 2.0.0 + resolution: "findup-sync@npm:2.0.0" dependencies: detect-file: "npm:^1.0.0" - is-glob: "npm:^4.0.3" - micromatch: "npm:^4.0.4" + is-glob: "npm:^3.1.0" + micromatch: "npm:^3.0.4" resolve-dir: "npm:^1.0.1" - checksum: 10/576716c77a0e8330b17ae9cba27d1fda8907c8cda7bf33a47f1999e16e089bfc6df4dd62933e0760f430736183c054348c34aa45dd882d49c8c098f55b89ee1d + checksum: 10/af2849f4006208c7c0940ab87a5f816187becf30c430a735377f6163cff8e95f405db504f5435728663099878f2e8002da1bf1976132458c23f5d73f540b1fcc languageName: node linkType: hard -"fined@npm:^2.0.0": - version: 2.0.0 - resolution: "fined@npm:2.0.0" +"findup-sync@npm:^3.0.0": + version: 3.0.0 + resolution: "findup-sync@npm:3.0.0" + dependencies: + detect-file: "npm:^1.0.0" + is-glob: "npm:^4.0.0" + micromatch: "npm:^3.0.4" + resolve-dir: "npm:^1.0.1" + checksum: 10/cafd706255f3c0e3491e4ee2eb9e585e6e76999bdc50e1ecde6d4ef7316d8dbcae77eb49d27b1f61ff011971933de43e90cb7cb535620b2616eb2ff89baf9347 + languageName: node + linkType: hard + +"fined@npm:^1.0.1": + version: 1.2.0 + resolution: "fined@npm:1.2.0" dependencies: expand-tilde: "npm:^2.0.2" - is-plain-object: "npm:^5.0.0" + is-plain-object: "npm:^2.0.3" object.defaults: "npm:^1.1.0" - object.pick: "npm:^1.3.0" - parse-filepath: "npm:^1.0.2" - checksum: 10/3c5125a5b4eabb9a9569a9bc55a629d4f463ea8926cca9ee0b54d0e0351715aaed7f245a5372defbb59a0aaccdfefae9dc1a9ac0c7b1167ba8537284db956852 + object.pick: "npm:^1.2.0" + parse-filepath: "npm:^1.0.1" + checksum: 10/9c76fb17e9f7e3f21e65b563cf49aed944c6b257a46b04306cef8883d60e295e904f57514443e60c64874914d13557b2f464071181d8d80a37cd9d8565075b7f languageName: node linkType: hard -"flagged-respawn@npm:^2.0.0": - version: 2.0.0 - resolution: "flagged-respawn@npm:2.0.0" - checksum: 10/1b48b1aca4614833bc1c1aa5a7af09232bc284168334b85492e580b51f9bc5ee1a59e4d830934ca91f6dc483300043ac8fe17f88f97f289153f6fcbd8dc9171b +"flagged-respawn@npm:^1.0.0": + version: 1.0.1 + resolution: "flagged-respawn@npm:1.0.1" + checksum: 10/0b9bd79fd98426283e7ba9cccdf5bb29961fe7ec913f0c616984902d8d6a4570c312b439ff2fa6879c26a64cc585e49c9519ffe73a2bc3acc0483728b396e63f languageName: node linkType: hard @@ -8260,6 +8765,16 @@ __metadata: languageName: node linkType: hard +"flush-write-stream@npm:^1.0.2": + version: 1.1.1 + resolution: "flush-write-stream@npm:1.1.1" + dependencies: + inherits: "npm:^2.0.3" + readable-stream: "npm:^2.3.6" + checksum: 10/649dae597c1ab6292eae1ce103cfe5a2d46317b21c9a14a1900d285227869a6181b32aca51b78660191884059732849db41694807e28bf07f61233fd2d5309f5 + languageName: node + linkType: hard + "follow-redirects@npm:^1.0.0": version: 1.15.6 resolution: "follow-redirects@npm:1.15.6" @@ -8279,7 +8794,7 @@ __metadata: languageName: node linkType: hard -"for-in@npm:^1.0.1": +"for-in@npm:^1.0.1, for-in@npm:^1.0.2": version: 1.0.2 resolution: "for-in@npm:1.0.2" checksum: 10/09f4ae93ce785d253ac963d94c7f3432d89398bf25ac7a24ed034ca393bf74380bdeccc40e0f2d721a895e54211b07c8fad7132e8157827f6f7f059b70b4043d @@ -8312,6 +8827,15 @@ __metadata: languageName: node linkType: hard +"fragment-cache@npm:^0.2.1": + version: 0.2.1 + resolution: "fragment-cache@npm:0.2.1" + dependencies: + map-cache: "npm:^0.2.2" + checksum: 10/1cbbd0b0116b67d5790175de0038a11df23c1cd2e8dcdbade58ebba5594c2d641dade6b4f126d82a7b4a6ffc2ea12e3d387dbb64ea2ae97cf02847d436f60fdc + languageName: node + linkType: hard + "fresh@npm:0.5.2, fresh@npm:~0.5.2": version: 0.5.2 resolution: "fresh@npm:0.5.2" @@ -8360,13 +8884,13 @@ __metadata: languageName: node linkType: hard -"fs-mkdirp-stream@npm:^2.0.1": - version: 2.0.1 - resolution: "fs-mkdirp-stream@npm:2.0.1" +"fs-mkdirp-stream@npm:^1.0.0": + version: 1.0.0 + resolution: "fs-mkdirp-stream@npm:1.0.0" dependencies: - graceful-fs: "npm:^4.2.8" - streamx: "npm:^2.12.0" - checksum: 10/9fefd9fa3d6985aea0935944288bd20215779f683ec3af3c157cf4d4d4b0c546caae8219219f47a05a1df3b23f6a605fe64bee6ee14e550f1a670db67359ff27 + graceful-fs: "npm:^4.1.11" + through2: "npm:^2.0.3" + checksum: 10/af3c817bffa69413125fbefbb4b18b0c7d80a38f2620d4b07423d312863514f12075b5b132b78fadf7d1f8f71f322be53584b48824af6fb2ce6ac3f86132463a languageName: node linkType: hard @@ -8391,6 +8915,17 @@ __metadata: languageName: node linkType: hard +"fsevents@npm:^1.2.7": + version: 1.2.13 + resolution: "fsevents@npm:1.2.13" + dependencies: + bindings: "npm:^1.5.0" + nan: "npm:^2.12.1" + checksum: 10/ae855aa737aaa2f9167e9f70417cf6e45a5cd11918e1fee9923709a0149be52416d765433b4aeff56c789b1152e718cd1b13ddec6043b78cdda68260d86383c1 + conditions: os=darwin + languageName: node + linkType: hard + "fsevents@npm:~2.3.2": version: 2.3.3 resolution: "fsevents@npm:2.3.3" @@ -8401,6 +8936,16 @@ __metadata: languageName: node linkType: hard +"fsevents@patch:fsevents@npm%3A^1.2.7#optional!builtin": + version: 1.2.13 + resolution: "fsevents@patch:fsevents@npm%3A1.2.13#optional!builtin::version=1.2.13&hash=d11327" + dependencies: + bindings: "npm:^1.5.0" + nan: "npm:^2.12.1" + conditions: os=darwin + languageName: node + linkType: hard + "fsevents@patch:fsevents@npm%3A~2.3.2#optional!builtin": version: 2.3.3 resolution: "fsevents@patch:fsevents@npm%3A2.3.3#optional!builtin::version=2.3.3&hash=df0bf1" @@ -8450,6 +8995,13 @@ __metadata: languageName: node linkType: hard +"get-caller-file@npm:^1.0.1": + version: 1.0.3 + resolution: "get-caller-file@npm:1.0.3" + checksum: 10/0b776558c1d94ac131ec0d47bf9da4e00a38e7d3a6cbde534e0e4656c13ead344e69ef7ed2c0bca16620cc2e1e26529f90e2336c8962736517b64890d583a2a0 + languageName: node + linkType: hard + "get-caller-file@npm:^2.0.1, get-caller-file@npm:^2.0.5": version: 2.0.5 resolution: "get-caller-file@npm:2.0.5" @@ -8516,6 +9068,13 @@ __metadata: languageName: node linkType: hard +"get-value@npm:^2.0.3, get-value@npm:^2.0.6": + version: 2.0.6 + resolution: "get-value@npm:2.0.6" + checksum: 10/5c3b99cb5398ea8016bf46ff17afc5d1d286874d2ad38ca5edb6e87d75c0965b0094cb9a9dddef2c59c23d250702323539a7fbdd870620db38c7e7d7ec87c1eb + languageName: node + linkType: hard + "gifwrap@npm:^0.9.2": version: 0.9.4 resolution: "gifwrap@npm:0.9.4" @@ -8526,6 +9085,16 @@ __metadata: languageName: node linkType: hard +"glob-parent@npm:^3.1.0": + version: 3.1.0 + resolution: "glob-parent@npm:3.1.0" + dependencies: + is-glob: "npm:^3.1.0" + path-dirname: "npm:^1.0.0" + checksum: 10/653d559237e89a11b9934bef3f392ec42335602034c928590544d383ff5ef449f7b12f3cfa539708e74bc0a6c28ab1fe51d663cc07463cdf899ba92afd85a855 + languageName: node + linkType: hard + "glob-parent@npm:^5.1.2, glob-parent@npm:~5.1.2": version: 5.1.2 resolution: "glob-parent@npm:5.1.2" @@ -8544,19 +9113,21 @@ __metadata: languageName: node linkType: hard -"glob-stream@npm:^8.0.0": - version: 8.0.2 - resolution: "glob-stream@npm:8.0.2" +"glob-stream@npm:^6.1.0": + version: 6.1.0 + resolution: "glob-stream@npm:6.1.0" dependencies: - "@gulpjs/to-absolute-glob": "npm:^4.0.0" - anymatch: "npm:^3.1.3" - fastq: "npm:^1.13.0" - glob-parent: "npm:^6.0.2" - is-glob: "npm:^4.0.3" + extend: "npm:^3.0.0" + glob: "npm:^7.1.1" + glob-parent: "npm:^3.1.0" is-negated-glob: "npm:^1.0.0" - normalize-path: "npm:^3.0.0" - streamx: "npm:^2.12.5" - checksum: 10/cda46c02b6313d4a5cd0a3e67c7a2bd477d5f708904dc761c0d6364611f188a303051ec4e0cd405597522c7f7ffbba530f147754b4bf5af9f18e970c024734d8 + ordered-read-streams: "npm:^1.0.0" + pumpify: "npm:^1.3.5" + readable-stream: "npm:^2.1.5" + remove-trailing-separator: "npm:^1.0.1" + to-absolute-glob: "npm:^2.0.0" + unique-stream: "npm:^2.0.2" + checksum: 10/7c9ec7be266974186b762ad686813025868067f2ea64a0428c0365b4046cb955d328b1e7498124392ec0026c5826ce2cfa4b41614584fb63edd02421e61db556 languageName: node linkType: hard @@ -8567,13 +9138,18 @@ __metadata: languageName: node linkType: hard -"glob-watcher@npm:^6.0.0": - version: 6.0.0 - resolution: "glob-watcher@npm:6.0.0" +"glob-watcher@npm:^5.0.3": + version: 5.0.5 + resolution: "glob-watcher@npm:5.0.5" dependencies: - async-done: "npm:^2.0.0" - chokidar: "npm:^3.5.3" - checksum: 10/404c4be88d55b9f1a2f5ee49ec92d7fc70b1522411e2d8c94713a421ef983ef6b3c532ce990893eade70285c6b7ad25d33def7367560ce3d5b27f5905d2b6223 + anymatch: "npm:^2.0.0" + async-done: "npm:^1.2.0" + chokidar: "npm:^2.0.0" + is-negated-glob: "npm:^1.0.0" + just-debounce: "npm:^1.0.0" + normalize-path: "npm:^3.0.0" + object.defaults: "npm:^1.1.0" + checksum: 10/240bfbe2a2356eb2af826eef9f6af2f481ea05a02787e154facac4e2e6fedcc90452bdd4466ed7c0edad4a3aabed3581250bd8180a7cd83fb36827cad1231608 languageName: node linkType: hard @@ -8605,7 +9181,7 @@ __metadata: languageName: node linkType: hard -"glob@npm:^7.1.3, glob@npm:^7.1.6": +"glob@npm:^7.1.1, glob@npm:^7.1.3, glob@npm:^7.1.6": version: 7.2.3 resolution: "glob@npm:7.2.3" dependencies: @@ -8705,12 +9281,12 @@ __metadata: languageName: node linkType: hard -"glogg@npm:^2.2.0": - version: 2.2.0 - resolution: "glogg@npm:2.2.0" +"glogg@npm:^1.0.0": + version: 1.0.2 + resolution: "glogg@npm:1.0.2" dependencies: - sparkles: "npm:^2.1.0" - checksum: 10/9213c7b0835a05e32e40239187af611b54eacadaf434123be2d0538e89efdf8429b5453821c2da3906863fd6824ae978a0364aeaf8f6bcf51aa78c7b241c0c5d + sparkles: "npm:^1.0.0" + checksum: 10/e8343d0a2b647ed146dcd1585467014853fa568d3b7f49405576775313184390c6d557a16eadfef2b04e63302769d8e0785343169173c8ad4e4c2b54cf25a8c0 languageName: node linkType: hard @@ -8730,7 +9306,7 @@ __metadata: languageName: node linkType: hard -"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.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6, graceful-fs@npm:^4.2.8": +"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.11, graceful-fs@npm:^4.2.4, graceful-fs@npm:^4.2.6": version: 4.2.11 resolution: "graceful-fs@npm:4.2.11" checksum: 10/bf152d0ed1dc159239db1ba1f74fdbc40cb02f626770dcd5815c427ce0688c2635a06ed69af364396da4636d0408fcf7d4afdf7881724c3307e46aff30ca49e2 @@ -8744,25 +9320,31 @@ __metadata: languageName: node linkType: hard -"gulp-cli@npm:^3.0.0": - version: 3.0.0 - resolution: "gulp-cli@npm:3.0.0" +"gulp-cli@npm:^2.2.0": + version: 2.3.0 + resolution: "gulp-cli@npm:2.3.0" dependencies: - "@gulpjs/messages": "npm:^1.1.0" - chalk: "npm:^4.1.2" - copy-props: "npm:^4.0.0" - gulplog: "npm:^2.2.0" - interpret: "npm:^3.1.1" - liftoff: "npm:^5.0.0" - mute-stdout: "npm:^2.0.0" - replace-homedir: "npm:^2.0.0" - semver-greatest-satisfied-range: "npm:^2.0.0" - string-width: "npm:^4.2.3" - v8flags: "npm:^4.0.0" - yargs: "npm:^16.2.0" + ansi-colors: "npm:^1.0.1" + archy: "npm:^1.0.0" + array-sort: "npm:^1.0.0" + color-support: "npm:^1.1.3" + concat-stream: "npm:^1.6.0" + copy-props: "npm:^2.0.1" + fancy-log: "npm:^1.3.2" + gulplog: "npm:^1.0.0" + interpret: "npm:^1.4.0" + isobject: "npm:^3.0.1" + liftoff: "npm:^3.1.0" + matchdep: "npm:^2.0.0" + mute-stdout: "npm:^1.0.0" + pretty-hrtime: "npm:^1.0.0" + replace-homedir: "npm:^1.0.0" + semver-greatest-satisfied-range: "npm:^1.1.0" + v8flags: "npm:^3.2.0" + yargs: "npm:^7.1.0" bin: gulp: bin/gulp.js - checksum: 10/19c8dd8e716480800bc94c7bb0804f006b35686b1fb00ad8b41471058fb73e459444c81093585b32cad449db4d6e200dc7c8d0620e6b35549a2c06191900f3b4 + checksum: 10/d1a47535b6aba7167d42fcca341939e3b5a907976dd8a5fcc6a0c03723f9d74156d49cf4b82aa3e30d6d56cfbb54dd145874b58ad4bb859666c1ee537933d65b languageName: node linkType: hard @@ -8815,26 +9397,26 @@ __metadata: languageName: node linkType: hard -"gulp@npm:5.0.0": - version: 5.0.0 - resolution: "gulp@npm:5.0.0" +"gulp@npm:4.0.2": + version: 4.0.2 + resolution: "gulp@npm:4.0.2" dependencies: - glob-watcher: "npm:^6.0.0" - gulp-cli: "npm:^3.0.0" - undertaker: "npm:^2.0.0" - vinyl-fs: "npm:^4.0.0" + glob-watcher: "npm:^5.0.3" + gulp-cli: "npm:^2.2.0" + undertaker: "npm:^1.2.1" + vinyl-fs: "npm:^3.0.0" bin: - gulp: bin/gulp.js - checksum: 10/d093ce9fbfb711d9a39635c9928dc2ebf502164358d6aa2e092f2d33ec76c16ecf8c959f4d1b7c924fc087af9cfb6fcfc1a8d0cb2a4604409e4fd17e26307dd4 + gulp: ./bin/gulp.js + checksum: 10/1e8a49ea2c6b6a7b084777b1c1f5508264a1984e3fa450a9c88c714651907d542ebdec614bb5e130fc2c3d1dd7b7d1444abc9c9e8e99350b19fcdaad03da730f languageName: node linkType: hard -"gulplog@npm:^2.2.0": - version: 2.2.0 - resolution: "gulplog@npm:2.2.0" +"gulplog@npm:^1.0.0": + version: 1.0.0 + resolution: "gulplog@npm:1.0.0" dependencies: - glogg: "npm:^2.2.0" - checksum: 10/dff22c7347bdb5276ceccedfb89d36e515afb049d74587f032f1f5a493fc177c0d2b82e38086babc707910491b29569002c2e75206595ff7926aeae124f91756 + glogg: "npm:^1.0.0" + checksum: 10/e3282db891c41974b7bea670fe728ed1af17ef5379babdcea2f6e0e5efddce8a2bcccc1eed1654bf1f7446aa351421f1cc5966cf03adefe74ab63f8b9a3d4a8a languageName: node linkType: hard @@ -8898,6 +9480,45 @@ __metadata: languageName: node linkType: hard +"has-value@npm:^0.3.1": + version: 0.3.1 + resolution: "has-value@npm:0.3.1" + dependencies: + get-value: "npm:^2.0.3" + has-values: "npm:^0.1.4" + isobject: "npm:^2.0.0" + checksum: 10/29e2a1e6571dad83451b769c7ce032fce6009f65bccace07c2962d3ad4d5530b6743d8f3229e4ecf3ea8e905d23a752c5f7089100c1f3162039fa6dc3976558f + languageName: node + linkType: hard + +"has-value@npm:^1.0.0": + version: 1.0.0 + resolution: "has-value@npm:1.0.0" + dependencies: + get-value: "npm:^2.0.6" + has-values: "npm:^1.0.0" + isobject: "npm:^3.0.0" + checksum: 10/b9421d354e44f03d3272ac39fd49f804f19bc1e4fa3ceef7745df43d6b402053f828445c03226b21d7d934a21ac9cf4bc569396dc312f496ddff873197bbd847 + languageName: node + linkType: hard + +"has-values@npm:^0.1.4": + version: 0.1.4 + resolution: "has-values@npm:0.1.4" + checksum: 10/ab1c4bcaf811ccd1856c11cfe90e62fca9e2b026ebe474233a3d282d8d67e3b59ed85b622c7673bac3db198cb98bd1da2b39300a2f98e453729b115350af49bc + languageName: node + linkType: hard + +"has-values@npm:^1.0.0": + version: 1.0.0 + resolution: "has-values@npm:1.0.0" + dependencies: + is-number: "npm:^3.0.0" + kind-of: "npm:^4.0.0" + checksum: 10/77e6693f732b5e4cf6c38dfe85fdcefad0fab011af74995c3e83863fabf5e3a836f406d83565816baa0bc0a523c9410db8b990fe977074d61aeb6d8f4fcffa11 + languageName: node + linkType: hard + "hasown@npm:^2.0.0, hasown@npm:^2.0.1, hasown@npm:^2.0.2": version: 2.0.2 resolution: "hasown@npm:2.0.2" @@ -9076,7 +9697,7 @@ __metadata: fuse.js: "npm:7.0.0" glob: "npm:10.3.12" google-timezones-json: "npm:1.2.0" - gulp: "npm:5.0.0" + gulp: "npm:4.0.2" gulp-json-transform: "npm:0.5.0" gulp-merge-json: "npm:2.2.1" gulp-rename: "npm:2.0.0" @@ -9172,6 +9793,13 @@ __metadata: languageName: node linkType: hard +"hosted-git-info@npm:^2.1.4": + version: 2.8.9 + resolution: "hosted-git-info@npm:2.8.9" + checksum: 10/96da7d412303704af41c3819207a09ea2cab2de97951db4cf336bb8bce8d8e36b9a6821036ad2e55e67d3be0af8f967a7b57981203fbfb88bc05cd803407b8c3 + languageName: node + linkType: hard + "hpack.js@npm:^2.1.6": version: 2.1.6 resolution: "hpack.js@npm:2.1.6" @@ -9375,7 +10003,7 @@ __metadata: languageName: node linkType: hard -"iconv-lite@npm:^0.6.2, iconv-lite@npm:^0.6.3": +"iconv-lite@npm:^0.6.2": version: 0.6.3 resolution: "iconv-lite@npm:0.6.3" dependencies: @@ -9481,7 +10109,7 @@ __metadata: languageName: node linkType: hard -"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:^2.0.4, inherits@npm:~2.0.3": +"inherits@npm:2, inherits@npm:2.0.4, inherits@npm:^2.0.1, inherits@npm:^2.0.3, inherits@npm:~2.0.3": version: 2.0.4 resolution: "inherits@npm:2.0.4" checksum: 10/cd45e923bee15186c07fa4c89db0aace24824c482fb887b528304694b2aa6ff8a898da8657046a5dcf3e46cd6db6c61629551f9215f208d7c3f157cf9b290521 @@ -9556,6 +10184,13 @@ __metadata: languageName: node linkType: hard +"invert-kv@npm:^1.0.0": + version: 1.0.0 + resolution: "invert-kv@npm:1.0.0" + checksum: 10/0820af99ca21818fa4a78815a8d06cf621a831306a5db57d7558234624b4891a89bb19a95fc3a868db4e754384c0ee38b70a00b75d81a0a46ee3937184a7cf6d + languageName: node + linkType: hard + "ip-address@npm:^9.0.5": version: 9.0.5 resolution: "ip-address@npm:9.0.5" @@ -9597,6 +10232,15 @@ __metadata: languageName: node linkType: hard +"is-accessor-descriptor@npm:^1.0.1": + version: 1.0.1 + resolution: "is-accessor-descriptor@npm:1.0.1" + dependencies: + hasown: "npm:^2.0.0" + checksum: 10/df0d1da1a320e57c594e6f9b52dab8a6bece6dc90e51689d05ac8e5247164aa3eb3e9c66b37027bebfc0ea5fcce6d9503dbc41dccd82f4b57add79a307735365 + languageName: node + linkType: hard + "is-array-buffer@npm:^3.0.4": version: 3.0.4 resolution: "is-array-buffer@npm:3.0.4" @@ -9607,6 +10251,13 @@ __metadata: languageName: node linkType: hard +"is-arrayish@npm:^0.2.1": + version: 0.2.1 + resolution: "is-arrayish@npm:0.2.1" + checksum: 10/73ced84fa35e59e2c57da2d01e12cd01479f381d7f122ce41dcbb713f09dbfc651315832cd2bf8accba7681a69e4d6f1e03941d94dd10040d415086360e7005e + languageName: node + linkType: hard + "is-bigint@npm:^1.0.1": version: 1.0.4 resolution: "is-bigint@npm:1.0.4" @@ -9616,6 +10267,15 @@ __metadata: languageName: node linkType: hard +"is-binary-path@npm:^1.0.0": + version: 1.0.1 + resolution: "is-binary-path@npm:1.0.1" + dependencies: + binary-extensions: "npm:^1.0.0" + checksum: 10/a803c99e9d898170c3b44a86fbdc0736d3d7fcbe737345433fb78e810b9fe30c982657782ad0e676644ba4693ddf05601a7423b5611423218663d6b533341ac9 + languageName: node + linkType: hard + "is-binary-path@npm:~2.1.0": version: 2.1.0 resolution: "is-binary-path@npm:2.1.0" @@ -9635,6 +10295,13 @@ __metadata: languageName: node linkType: hard +"is-buffer@npm:^1.1.5": + version: 1.1.6 + resolution: "is-buffer@npm:1.1.6" + checksum: 10/f63da109e74bbe8947036ed529d43e4ae0c5fcd0909921dce4917ad3ea212c6a87c29f525ba1d17c0858c18331cf1046d4fc69ef59ed26896b25c8288a627133 + languageName: node + linkType: hard + "is-builtin-module@npm:^3.0.0, is-builtin-module@npm:^3.1.0, is-builtin-module@npm:^3.2.1": version: 3.2.1 resolution: "is-builtin-module@npm:3.2.1" @@ -9660,6 +10327,15 @@ __metadata: languageName: node linkType: hard +"is-data-descriptor@npm:^1.0.1": + version: 1.0.1 + resolution: "is-data-descriptor@npm:1.0.1" + dependencies: + hasown: "npm:^2.0.0" + checksum: 10/49b36e903b31623b0c5b416e182e366810ef97a3a19ab0e6cd501eb5599112680b7d9e768b07a84fb52aa2510a92b3eb51a3e18ce8d5f7978a49f4b50e6ec6dd + languageName: node + linkType: hard + "is-data-view@npm:^1.0.1": version: 1.0.1 resolution: "is-data-view@npm:1.0.1" @@ -9678,6 +10354,26 @@ __metadata: languageName: node linkType: hard +"is-descriptor@npm:^0.1.0": + version: 0.1.7 + resolution: "is-descriptor@npm:0.1.7" + dependencies: + is-accessor-descriptor: "npm:^1.0.1" + is-data-descriptor: "npm:^1.0.1" + checksum: 10/38783182c3d83f839a9fa3e87b4d6de11fa9639833ed98993ea51aea2296b2da155121956e148695a738228871d1057c5f963d0b1c857bb8a4a38d8dd9ceeb56 + languageName: node + linkType: hard + +"is-descriptor@npm:^1.0.0, is-descriptor@npm:^1.0.2": + version: 1.0.3 + resolution: "is-descriptor@npm:1.0.3" + dependencies: + is-accessor-descriptor: "npm:^1.0.1" + is-data-descriptor: "npm:^1.0.1" + checksum: 10/b940d04d93adaffb749b3ca7f7f6d73dd3c5582b674f372513ecb5511a8a3f3ff4a24f4c1161cb10e48fe4886f9e84c09fa71785def27905ca8df1197e563dc6 + languageName: node + linkType: hard + "is-docker@npm:^2.0.0, is-docker@npm:^2.1.1": version: 2.2.1 resolution: "is-docker@npm:2.2.1" @@ -9696,6 +10392,13 @@ __metadata: languageName: node linkType: hard +"is-extendable@npm:^0.1.0, is-extendable@npm:^0.1.1": + version: 0.1.1 + resolution: "is-extendable@npm:0.1.1" + checksum: 10/3875571d20a7563772ecc7a5f36cb03167e9be31ad259041b4a8f73f33f885441f778cee1f1fe0085eb4bc71679b9d8c923690003a36a6a5fdf8023e6e3f0672 + languageName: node + linkType: hard + "is-extendable@npm:^1.0.1": version: 1.0.1 resolution: "is-extendable@npm:1.0.1" @@ -9705,13 +10408,22 @@ __metadata: languageName: node linkType: hard -"is-extglob@npm:^2.1.1": +"is-extglob@npm:^2.1.0, is-extglob@npm:^2.1.1": version: 2.1.1 resolution: "is-extglob@npm:2.1.1" checksum: 10/df033653d06d0eb567461e58a7a8c9f940bd8c22274b94bf7671ab36df5719791aae15eef6d83bbb5e23283967f2f984b8914559d4449efda578c775c4be6f85 languageName: node linkType: hard +"is-fullwidth-code-point@npm:^1.0.0": + version: 1.0.0 + resolution: "is-fullwidth-code-point@npm:1.0.0" + dependencies: + number-is-nan: "npm:^1.0.0" + checksum: 10/4d46a7465a66a8aebcc5340d3b63a56602133874af576a9ca42c6f0f4bd787a743605771c5f246db77da96605fefeffb65fc1dbe862dcc7328f4b4d03edf5a57 + languageName: node + linkType: hard + "is-fullwidth-code-point@npm:^3.0.0": version: 3.0.0 resolution: "is-fullwidth-code-point@npm:3.0.0" @@ -9751,6 +10463,15 @@ __metadata: languageName: node linkType: hard +"is-glob@npm:^3.1.0": + version: 3.1.0 + resolution: "is-glob@npm:3.1.0" + dependencies: + is-extglob: "npm:^2.1.0" + checksum: 10/9d483bca84f16f01230f7c7c8c63735248fe1064346f292e0f6f8c76475fd20c6f50fc19941af5bec35f85d6bf26f4b7768f39a48a5f5fdc72b408dc74e07afc + languageName: node + linkType: hard + "is-glob@npm:^4.0.0, is-glob@npm:^4.0.1, is-glob@npm:^4.0.3, is-glob@npm:~4.0.1": version: 4.0.3 resolution: "is-glob@npm:4.0.3" @@ -9815,6 +10536,22 @@ __metadata: languageName: node linkType: hard +"is-number@npm:^3.0.0": + version: 3.0.0 + resolution: "is-number@npm:3.0.0" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10/0c62bf8e9d72c4dd203a74d8cfc751c746e75513380fef420cda8237e619a988ee43e678ddb23c87ac24d91ac0fe9f22e4ffb1301a50310c697e9d73ca3994e9 + languageName: node + linkType: hard + +"is-number@npm:^4.0.0": + version: 4.0.0 + resolution: "is-number@npm:4.0.0" + checksum: 10/7f25967eb4fd92c4c5c282f6510c86d257de5894501b831ae6ab44a964c690ba721eef931eb2aaad2aacf35fd0cf57b9d2135b0bd25147dc5bc64f99fbca1785 + languageName: node + linkType: hard + "is-number@npm:^7.0.0": version: 7.0.0 resolution: "is-number@npm:7.0.0" @@ -9864,7 +10601,7 @@ __metadata: languageName: node linkType: hard -"is-plain-object@npm:^2.0.4": +"is-plain-object@npm:^2.0.1, is-plain-object@npm:^2.0.3, is-plain-object@npm:^2.0.4": version: 2.0.4 resolution: "is-plain-object@npm:2.0.4" dependencies: @@ -9988,6 +10725,13 @@ __metadata: languageName: node linkType: hard +"is-utf8@npm:^0.2.0, is-utf8@npm:^0.2.1": + version: 0.2.1 + resolution: "is-utf8@npm:0.2.1" + checksum: 10/167ccd2be869fc228cc62c1a28df4b78c6b5485d15a29027d3b5dceb09b383e86a3522008b56dcac14b592b22f0a224388718c2505027a994fd8471465de54b3 + languageName: node + linkType: hard + "is-valid-element-name@npm:^1.0.0": version: 1.0.0 resolution: "is-valid-element-name@npm:1.0.0" @@ -10013,7 +10757,7 @@ __metadata: languageName: node linkType: hard -"is-windows@npm:^1.0.1": +"is-windows@npm:^1.0.1, is-windows@npm:^1.0.2": version: 1.0.2 resolution: "is-windows@npm:1.0.2" checksum: 10/438b7e52656fe3b9b293b180defb4e448088e7023a523ec21a91a80b9ff8cdb3377ddb5b6e60f7c7de4fa8b63ab56e121b6705fe081b3cf1b828b0a380009ad7 @@ -10038,6 +10782,13 @@ __metadata: languageName: node linkType: hard +"isarray@npm:1.0.0, isarray@npm:~1.0.0": + version: 1.0.0 + resolution: "isarray@npm:1.0.0" + checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab + languageName: node + linkType: hard + "isarray@npm:^2.0.5": version: 2.0.5 resolution: "isarray@npm:2.0.5" @@ -10045,13 +10796,6 @@ __metadata: languageName: node linkType: hard -"isarray@npm:~1.0.0": - version: 1.0.0 - resolution: "isarray@npm:1.0.0" - checksum: 10/f032df8e02dce8ec565cf2eb605ea939bdccea528dbcf565cdf92bfa2da9110461159d86a537388ef1acef8815a330642d7885b29010e8f7eac967c9993b65ab - languageName: node - linkType: hard - "isbinaryfile@npm:^5.0.0": version: 5.0.2 resolution: "isbinaryfile@npm:5.0.2" @@ -10073,6 +10817,15 @@ __metadata: languageName: node linkType: hard +"isobject@npm:^2.0.0": + version: 2.1.0 + resolution: "isobject@npm:2.1.0" + dependencies: + isarray: "npm:1.0.0" + checksum: 10/811c6f5a866877d31f0606a88af4a45f282544de886bf29f6a34c46616a1ae2ed17076cc6bf34c0128f33eecf7e1fcaa2c82cf3770560d3e26810894e96ae79f + languageName: node + linkType: hard + "isobject@npm:^3.0.0, isobject@npm:^3.0.1": version: 3.0.1 resolution: "isobject@npm:3.0.1" @@ -10280,6 +11033,13 @@ __metadata: languageName: node linkType: hard +"just-debounce@npm:^1.0.0": + version: 1.1.0 + resolution: "just-debounce@npm:1.1.0" + checksum: 10/6f43d4d9b25ad45d8c2970f839d378b4d161f6da7e5fecfa3bab478d2567ea07d8992ca957009820704dc1accd211f816ffb15ace7e3a0a7254f1830b4914265 + languageName: node + linkType: hard + "just-extend@npm:^6.2.0": version: 6.2.0 resolution: "just-extend@npm:6.2.0" @@ -10305,6 +11065,31 @@ __metadata: languageName: node linkType: hard +"kind-of@npm:^3.0.2, kind-of@npm:^3.0.3, kind-of@npm:^3.2.0": + version: 3.2.2 + resolution: "kind-of@npm:3.2.2" + dependencies: + is-buffer: "npm:^1.1.5" + checksum: 10/b6e7eed10f9dea498500e73129c9bf289bc417568658648aecfc2e104aa32683b908e5d349563fc78d6752da0ea60c9ed1dda4b24dd85a0c8fc0c7376dc0acac + languageName: node + linkType: hard + +"kind-of@npm:^4.0.0": + version: 4.0.0 + resolution: "kind-of@npm:4.0.0" + dependencies: + is-buffer: "npm:^1.1.5" + checksum: 10/b35a90e0690f06bf07c8970b5290256b1740625fb3bf17ef8c9813a9e197302dbe9ad710b0d97a44556c9280becfc2132cbc3b370056f63b7e350a85f79088f1 + languageName: node + linkType: hard + +"kind-of@npm:^5.0.2": + version: 5.1.0 + resolution: "kind-of@npm:5.1.0" + checksum: 10/acf7cc73881f27629f700a80de77ff7fe4abc9430eac7ddb09117f75126e578ee8d7e44c4dacb6a9e802d5d881abf007ee6af3cfbe55f8b5cf0a7fdc49a02aa3 + languageName: node + linkType: hard + "kind-of@npm:^6.0.2": version: 6.0.3 resolution: "kind-of@npm:6.0.3" @@ -10406,10 +11191,13 @@ __metadata: languageName: node linkType: hard -"last-run@npm:^2.0.0": - version: 2.0.0 - resolution: "last-run@npm:2.0.0" - checksum: 10/a594c4bb4312258c625e3b40b760d5ce9ff183f90cd77a73dc509ff8d9f215ce7754755d843d8489ea97ef39cbe5975401889f29d0022a820321563dcd1ac184 +"last-run@npm:^1.1.0": + version: 1.1.1 + resolution: "last-run@npm:1.1.1" + dependencies: + default-resolution: "npm:^2.0.0" + es6-weak-map: "npm:^2.0.1" + checksum: 10/2a49b4d13a8b61a42bebd93f3c6301eeb0c5af25f5004a04f9558c9793fd6ec1cb4be47de6f7ba8d6e3731b64ba62db390fa3fd8afb87e35b6e67c12103a3181 languageName: node linkType: hard @@ -10423,10 +11211,30 @@ __metadata: languageName: node linkType: hard -"lead@npm:^4.0.0": - version: 4.0.0 - resolution: "lead@npm:4.0.0" - checksum: 10/7117297c29b94e4846822e5ae0a25780af834586c0862b89ff899e44547f4f742d67801f19838b34611d36eec44868604c55525e12d2a1fb0c9496a9792ca396 +"lazystream@npm:^1.0.0": + version: 1.0.1 + resolution: "lazystream@npm:1.0.1" + dependencies: + readable-stream: "npm:^2.0.5" + checksum: 10/35f8cf8b5799c76570b211b079d4d706a20cbf13a4936d44cc7dbdacab1de6b346ab339ed3e3805f4693155ee5bbebbda4050fa2b666d61956e89a573089e3d4 + languageName: node + linkType: hard + +"lcid@npm:^1.0.0": + version: 1.0.0 + resolution: "lcid@npm:1.0.0" + dependencies: + invert-kv: "npm:^1.0.0" + checksum: 10/e8c7a4db07663068c5c44b650938a2bc41aa992037eebb69376214320f202c1250e70b50c32f939e28345fd30c2d35b8e8cd9a19d5932c398246a864ce54843d + languageName: node + linkType: hard + +"lead@npm:^1.0.0": + version: 1.0.0 + resolution: "lead@npm:1.0.0" + dependencies: + flush-write-stream: "npm:^1.0.2" + checksum: 10/f08a9f45ac39b8d1fecf31de4d97a8fa2aa7e233e99bb61fd443414fc8055331224490698e186cb614aa3ea2f2695d71c42afc85415fa680b078d640efadab50 languageName: node linkType: hard @@ -10477,18 +11285,19 @@ __metadata: languageName: node linkType: hard -"liftoff@npm:^5.0.0": - version: 5.0.0 - resolution: "liftoff@npm:5.0.0" +"liftoff@npm:^3.1.0": + version: 3.1.0 + resolution: "liftoff@npm:3.1.0" dependencies: - extend: "npm:^3.0.2" - findup-sync: "npm:^5.0.0" - fined: "npm:^2.0.0" - flagged-respawn: "npm:^2.0.0" - is-plain-object: "npm:^5.0.0" - rechoir: "npm:^0.8.0" - resolve: "npm:^1.20.0" - checksum: 10/97aab6ed2a0ad069abcfc125dabddeff65b2054d2660bcda85e20e7e5a89f338340f05e651e48eece8816a7e4d1a4ef4757af097919171b903b00dacdbdfc94b + extend: "npm:^3.0.0" + findup-sync: "npm:^3.0.0" + fined: "npm:^1.0.1" + flagged-respawn: "npm:^1.0.0" + is-plain-object: "npm:^2.0.4" + object.map: "npm:^1.0.0" + rechoir: "npm:^0.6.2" + resolve: "npm:^1.1.7" + checksum: 10/af0ea7c51c42ac9250c22c4281111381f842a5cb64d233c6e0b49822ef611c8ccb78a1f2f74d94201715796c3a57a107ac8157e49149a0d8ab51c343a80d2174 languageName: node linkType: hard @@ -10610,6 +11419,19 @@ __metadata: languageName: node linkType: hard +"load-json-file@npm:^1.0.0": + version: 1.1.0 + resolution: "load-json-file@npm:1.1.0" + dependencies: + graceful-fs: "npm:^4.1.2" + parse-json: "npm:^2.2.0" + pify: "npm:^2.0.0" + pinkie-promise: "npm:^2.0.0" + strip-bom: "npm:^2.0.0" + checksum: 10/bb16e169d87df38806f5ffa7efa3287921839fdfee2c20c8525f53b53ba43d14b56b6881901c04190f7da4a4ba6e0c9784d212e83ee3a32d49bb986b5a6094cb + languageName: node + linkType: hard + "loader-runner@npm:^4.2.0": version: 4.3.0 resolution: "loader-runner@npm:4.3.0" @@ -10850,7 +11672,16 @@ __metadata: languageName: node linkType: hard -"map-cache@npm:^0.2.0": +"make-iterator@npm:^1.0.0": + version: 1.0.1 + resolution: "make-iterator@npm:1.0.1" + dependencies: + kind-of: "npm:^6.0.2" + checksum: 10/d38afc388f4374b15c0622d4fa4d3e8c3154e3a6ba35b01e9a5179c127d7dd09a91fa571056aa9e041981b39f80bdbab035c05475e56ef675a18bdf550f0cb6a + languageName: node + linkType: hard + +"map-cache@npm:^0.2.0, map-cache@npm:^0.2.2": version: 0.2.2 resolution: "map-cache@npm:0.2.2" checksum: 10/3067cea54285c43848bb4539f978a15dedc63c03022abeec6ef05c8cb6829f920f13b94bcaf04142fc6a088318e564c4785704072910d120d55dbc2e0c421969 @@ -10864,6 +11695,15 @@ __metadata: languageName: node linkType: hard +"map-visit@npm:^1.0.0": + version: 1.0.0 + resolution: "map-visit@npm:1.0.0" + dependencies: + object-visit: "npm:^1.0.0" + checksum: 10/c27045a5021c344fc19b9132eb30313e441863b2951029f8f8b66f79d3d8c1e7e5091578075a996f74e417479506fe9ede28c44ca7bc351a61c9d8073daec36a + languageName: node + linkType: hard + "markdown-table@npm:^2.0.0": version: 2.0.0 resolution: "markdown-table@npm:2.0.0" @@ -10882,6 +11722,18 @@ __metadata: languageName: node linkType: hard +"matchdep@npm:^2.0.0": + version: 2.0.0 + resolution: "matchdep@npm:2.0.0" + dependencies: + findup-sync: "npm:^2.0.0" + micromatch: "npm:^3.0.4" + resolve: "npm:^1.4.0" + stack-trace: "npm:0.0.10" + checksum: 10/2fc824d96fd80ea5fbdb46779b610ee694c138a8b10a267a29b442d9253b489d01866a1557e48ef98923b7132b94c868cb937b7564d6d2900729abaec75197d9 + languageName: node + linkType: hard + "media-typer@npm:0.3.0": version: 0.3.0 resolution: "media-typer@npm:0.3.0" @@ -10959,6 +11811,27 @@ __metadata: languageName: node linkType: hard +"micromatch@npm:^3.0.4, micromatch@npm:^3.1.10, micromatch@npm:^3.1.4": + version: 3.1.10 + resolution: "micromatch@npm:3.1.10" + dependencies: + arr-diff: "npm:^4.0.0" + array-unique: "npm:^0.3.2" + braces: "npm:^2.3.1" + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + extglob: "npm:^2.0.4" + fragment-cache: "npm:^0.2.1" + kind-of: "npm:^6.0.2" + nanomatch: "npm:^1.2.9" + object.pick: "npm:^1.3.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.2" + checksum: 10/4102bac83685dc7882ca1a28443d158b464653f84450de68c07cf77dbd531ed98c25006e9d9f6082bf3b95aabbff4cf231b26fd3bc84f7c4e7f263376101fad6 + languageName: node + linkType: hard + "mime-db@npm:1.52.0, mime-db@npm:>= 1.43.0 < 2": version: 1.52.0 resolution: "mime-db@npm:1.52.0" @@ -11174,6 +12047,16 @@ __metadata: languageName: node linkType: hard +"mixin-deep@npm:^1.2.0": + version: 1.3.2 + resolution: "mixin-deep@npm:1.3.2" + dependencies: + for-in: "npm:^1.0.2" + is-extendable: "npm:^1.0.1" + checksum: 10/820d5a51fcb7479f2926b97f2c3bb223546bc915e6b3a3eb5d906dda871bba569863595424a76682f2b15718252954644f3891437cb7e3f220949bed54b1750d + languageName: node + linkType: hard + "mkdirp@npm:^0.5.1, mkdirp@npm:^0.5.6": version: 0.5.6 resolution: "mkdirp@npm:0.5.6" @@ -11267,10 +12150,19 @@ __metadata: languageName: node linkType: hard -"mute-stdout@npm:^2.0.0": - version: 2.0.0 - resolution: "mute-stdout@npm:2.0.0" - checksum: 10/5324d58cc6b0df0173cb671f40c8bc3a843ab3804db925fdf561b734ca509d3ad8546744e211ac933d384e7e699092f43fc5712b38d5ddf29ecf9c963358d67c +"mute-stdout@npm:^1.0.0": + version: 1.0.1 + resolution: "mute-stdout@npm:1.0.1" + checksum: 10/7fcb575752076e13ec45bbeb93354bcf1d1e51522d60df84915996cd9b5fe7b8ceb285e9e419beb426c3e1375c820da5325d4cecf947cd6f7efd8d1db090c552 + languageName: node + linkType: hard + +"nan@npm:^2.12.1": + version: 2.19.0 + resolution: "nan@npm:2.19.0" + dependencies: + node-gyp: "npm:latest" + checksum: 10/b97f680753113bcd803cb174e40baa01e04aa4cb95ee62b48841336d9c48b278a2eeff71a4a0d7315b8f639fb1e38049925d3be1c6e266c158dc8f7d95d67eaa languageName: node linkType: hard @@ -11290,6 +12182,25 @@ __metadata: languageName: node linkType: hard +"nanomatch@npm:^1.2.9": + version: 1.2.13 + resolution: "nanomatch@npm:1.2.13" + dependencies: + arr-diff: "npm:^4.0.0" + array-unique: "npm:^0.3.2" + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + fragment-cache: "npm:^0.2.1" + is-windows: "npm:^1.0.2" + kind-of: "npm:^6.0.2" + object.pick: "npm:^1.3.0" + regex-not: "npm:^1.0.0" + snapdragon: "npm:^0.8.1" + to-regex: "npm:^3.0.1" + checksum: 10/5c4ec7d6264b93795248f22d19672f0b972f900772c057bc67e43ae4999165b5fea7b937359efde78707930a460ceaa6d93e0732ac1d993dab8654655a2e959b + languageName: node + linkType: hard + "natural-compare@npm:^1.4.0": version: 1.4.0 resolution: "natural-compare@npm:1.4.0" @@ -11311,6 +12222,13 @@ __metadata: languageName: node linkType: hard +"next-tick@npm:^1.1.0": + version: 1.1.0 + resolution: "next-tick@npm:1.1.0" + checksum: 10/83b5cf36027a53ee6d8b7f9c0782f2ba87f4858d977342bfc3c20c21629290a2111f8374d13a81221179603ffc4364f38374b5655d17b6a8f8a8c77bdea4fe8b + languageName: node + linkType: hard + "nise@npm:^5.1.5": version: 5.1.9 resolution: "nise@npm:5.1.9" @@ -11417,19 +12335,40 @@ __metadata: languageName: node linkType: hard -"normalize-path@npm:3.0.0, normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": +"normalize-package-data@npm:^2.3.2": + version: 2.5.0 + resolution: "normalize-package-data@npm:2.5.0" + dependencies: + hosted-git-info: "npm:^2.1.4" + resolve: "npm:^1.10.0" + semver: "npm:2 || 3 || 4 || 5" + validate-npm-package-license: "npm:^3.0.1" + checksum: 10/644f830a8bb9b7cc9bf2f6150618727659ee27cdd0840d1c1f97e8e6cab0803a098a2c19f31c6247ad9d3a0792e61521a13a6e8cd87cc6bb676e3150612c03d4 + languageName: node + linkType: hard + +"normalize-path@npm:^2.1.1": + version: 2.1.1 + resolution: "normalize-path@npm:2.1.1" + dependencies: + remove-trailing-separator: "npm:^1.0.1" + checksum: 10/7e9cbdcf7f5b8da7aa191fbfe33daf290cdcd8c038f422faf1b8a83c972bf7a6d94c5be34c4326cb00fb63bc0fd97d9fbcfaf2e5d6142332c2cd36d2e1b86cea + languageName: node + linkType: hard + +"normalize-path@npm:^3.0.0, normalize-path@npm:~3.0.0": version: 3.0.0 resolution: "normalize-path@npm:3.0.0" checksum: 10/88eeb4da891e10b1318c4b2476b6e2ecbeb5ff97d946815ffea7794c31a89017c70d7f34b3c2ebf23ef4e9fc9fb99f7dffe36da22011b5b5c6ffa34f4873ec20 languageName: node linkType: hard -"now-and-later@npm:^3.0.0": - version: 3.0.0 - resolution: "now-and-later@npm:3.0.0" +"now-and-later@npm:^2.0.0": + version: 2.0.1 + resolution: "now-and-later@npm:2.0.1" dependencies: - once: "npm:^1.4.0" - checksum: 10/5300d42932bac5d4f8d19bf90ebb53c3474ba615eab912770d1b8de896baea6dc7ef3b95158aaf601acfb0cd6b573bceb5fe30cf0224cb06ea227ef3e8fc7f3d + once: "npm:^1.3.2" + checksum: 10/f5afe432eb7d9bad311ff886714bcd01b2def305b262bc93ad0163b786e740ed1c8baa6f3ccb0e491ac7842dd2ee523439992d7419c227d0e6640693171dc8c4 languageName: node linkType: hard @@ -11451,6 +12390,24 @@ __metadata: languageName: node linkType: hard +"number-is-nan@npm:^1.0.0": + version: 1.0.1 + resolution: "number-is-nan@npm:1.0.1" + checksum: 10/13656bc9aa771b96cef209ffca31c31a03b507ca6862ba7c3f638a283560620d723d52e626d57892c7fff475f4c36ac07f0600f14544692ff595abff214b9ffb + languageName: node + linkType: hard + +"object-copy@npm:^0.1.0": + version: 0.1.0 + resolution: "object-copy@npm:0.1.0" + dependencies: + copy-descriptor: "npm:^0.1.0" + define-property: "npm:^0.2.5" + kind-of: "npm:^3.0.3" + checksum: 10/a9e35f07e3a2c882a7e979090360d1a20ab51d1fa19dfdac3aa8873b328a7c4c7683946ee97c824ae40079d848d6740a3788fa14f2185155dab7ed970a72c783 + languageName: node + linkType: hard + "object-hash@npm:3.0.0": version: 3.0.0 resolution: "object-hash@npm:3.0.0" @@ -11472,7 +12429,16 @@ __metadata: languageName: node linkType: hard -"object.assign@npm:^4.1.2, object.assign@npm:^4.1.5": +"object-visit@npm:^1.0.0": + version: 1.0.1 + resolution: "object-visit@npm:1.0.1" + dependencies: + isobject: "npm:^3.0.0" + checksum: 10/77abf807de86fa65bf1ba92699b45b1e5485f2d899300d5cb92cca0863909e9528b6cbf366c237c9f5d2264dab6cfbeda2201252ed0e605ae1b3e263515c5cea + languageName: node + linkType: hard + +"object.assign@npm:^4.0.4, object.assign@npm:^4.1.0, object.assign@npm:^4.1.2, object.assign@npm:^4.1.5": version: 4.1.5 resolution: "object.assign@npm:4.1.5" dependencies: @@ -11484,7 +12450,7 @@ __metadata: languageName: node linkType: hard -"object.defaults@npm:^1.1.0": +"object.defaults@npm:^1.0.0, object.defaults@npm:^1.1.0": version: 1.1.0 resolution: "object.defaults@npm:1.1.0" dependencies: @@ -11530,7 +12496,17 @@ __metadata: languageName: node linkType: hard -"object.pick@npm:^1.3.0": +"object.map@npm:^1.0.0": + version: 1.0.1 + resolution: "object.map@npm:1.0.1" + dependencies: + for-own: "npm:^1.0.0" + make-iterator: "npm:^1.0.0" + checksum: 10/c2b945a309f789441fae30e4c0772066b45ad03eb1c0f91b8ae117700c975676652b356f61635fe0b21ae021d98f10a04d2f1c6cf30aef14111154e756b162d7 + languageName: node + linkType: hard + +"object.pick@npm:^1.2.0, object.pick@npm:^1.3.0": version: 1.3.0 resolution: "object.pick@npm:1.3.0" dependencies: @@ -11539,6 +12515,16 @@ __metadata: languageName: node linkType: hard +"object.reduce@npm:^1.0.0": + version: 1.0.1 + resolution: "object.reduce@npm:1.0.1" + dependencies: + for-own: "npm:^1.0.0" + make-iterator: "npm:^1.0.0" + checksum: 10/71480cd250d092b89ea0e12db4589b3dac2ae712e47f2f2434749f49989b197ef0cae1cfdb249721c1221f661ac730438d146288d7a55587ddef3c48ce0e33f0 + languageName: node + linkType: hard + "object.values@npm:^1.1.7": version: 1.2.0 resolution: "object.values@npm:1.2.0" @@ -11580,7 +12566,7 @@ __metadata: languageName: node linkType: hard -"once@npm:^1.3.0, once@npm:^1.4.0": +"once@npm:^1.3.0, once@npm:^1.3.1, once@npm:^1.3.2, once@npm:^1.4.0": version: 1.4.0 resolution: "once@npm:1.4.0" dependencies: @@ -11651,6 +12637,24 @@ __metadata: languageName: node linkType: hard +"ordered-read-streams@npm:^1.0.0": + version: 1.0.1 + resolution: "ordered-read-streams@npm:1.0.1" + dependencies: + readable-stream: "npm:^2.0.1" + checksum: 10/7558ac1acd649164524be715d25e38a1aba0f34df9dfb8ce281f9d14589ac3506bfe66e6609fa8c9cf0d7835e11da33f3f5445336cf3eb783f81da09a1bc5fe8 + languageName: node + linkType: hard + +"os-locale@npm:^1.4.0": + version: 1.4.0 + resolution: "os-locale@npm:1.4.0" + dependencies: + lcid: "npm:^1.0.0" + checksum: 10/0161a1b6b5a8492f99f4b47fe465df9fc521c55ba5414fce6444c45e2500487b8ed5b40a47a98a2363fe83ff04ab033785300ed8df717255ec4c3b625e55b1fb + languageName: node + linkType: hard + "p-limit@npm:^2.2.0": version: 2.3.0 resolution: "p-limit@npm:2.3.0" @@ -11791,7 +12795,7 @@ __metadata: languageName: node linkType: hard -"parse-filepath@npm:^1.0.2": +"parse-filepath@npm:^1.0.1": version: 1.0.2 resolution: "parse-filepath@npm:1.0.2" dependencies: @@ -11809,6 +12813,15 @@ __metadata: languageName: node linkType: hard +"parse-json@npm:^2.2.0": + version: 2.2.0 + resolution: "parse-json@npm:2.2.0" + dependencies: + error-ex: "npm:^1.2.0" + checksum: 10/39924c0ddbf6f2544ab92acea61d91a0fb0ac959b0d19d273468cf8aa977522f8076e8fbb29cdab75c1440ebc2e172389988274890373d95fe308837074cc7e0 + languageName: node + linkType: hard + "parse-node-version@npm:^1.0.0": version: 1.0.1 resolution: "parse-node-version@npm:1.0.1" @@ -11879,6 +12892,29 @@ __metadata: languageName: node linkType: hard +"pascalcase@npm:^0.1.1": + version: 0.1.1 + resolution: "pascalcase@npm:0.1.1" + checksum: 10/f83681c3c8ff75fa473a2bb2b113289952f802ff895d435edd717e7cb898b0408cbdb247117a938edcbc5d141020909846cc2b92c47213d764e2a94d2ad2b925 + languageName: node + linkType: hard + +"path-dirname@npm:^1.0.0": + version: 1.0.2 + resolution: "path-dirname@npm:1.0.2" + checksum: 10/0d2f6604ae05a252a0025318685f290e2764ecf9c5436f203cdacfc8c0b17c24cdedaa449d766beb94ab88cc7fc70a09ec21e7933f31abc2b719180883e5e33f + languageName: node + linkType: hard + +"path-exists@npm:^2.0.0": + version: 2.1.0 + resolution: "path-exists@npm:2.1.0" + dependencies: + pinkie-promise: "npm:^2.0.0" + checksum: 10/fdb734f1d00f225f7a0033ce6d73bff6a7f76ea08936abf0e5196fa6e54a645103538cd8aedcb90d6d8c3fa3705ded0c58a4da5948ae92aa8834892c1ab44a84 + languageName: node + linkType: hard + "path-exists@npm:^4.0.0": version: 4.0.0 resolution: "path-exists@npm:4.0.0" @@ -11975,6 +13011,17 @@ __metadata: languageName: node linkType: hard +"path-type@npm:^1.0.0": + version: 1.1.0 + resolution: "path-type@npm:1.1.0" + dependencies: + graceful-fs: "npm:^4.1.2" + pify: "npm:^2.0.0" + pinkie-promise: "npm:^2.0.0" + checksum: 10/59a4b2c0e566baf4db3021a1ed4ec09a8b36fca960a490b54a6bcefdb9987dafe772852982b6011cd09579478a96e57960a01f75fa78a794192853c9d468fc79 + languageName: node + linkType: hard + "path-type@npm:^4.0.0": version: 4.0.0 resolution: "path-type@npm:4.0.0" @@ -12026,6 +13073,29 @@ __metadata: languageName: node linkType: hard +"pify@npm:^2.0.0": + version: 2.3.0 + resolution: "pify@npm:2.3.0" + checksum: 10/9503aaeaf4577acc58642ad1d25c45c6d90288596238fb68f82811c08104c800e5a7870398e9f015d82b44ecbcbef3dc3d4251a1cbb582f6e5959fe09884b2ba + languageName: node + linkType: hard + +"pinkie-promise@npm:^2.0.0": + version: 2.0.1 + resolution: "pinkie-promise@npm:2.0.1" + dependencies: + pinkie: "npm:^2.0.0" + checksum: 10/b53a4a2e73bf56b6f421eef711e7bdcb693d6abb474d57c5c413b809f654ba5ee750c6a96dd7225052d4b96c4d053cdcb34b708a86fceed4663303abee52fcca + languageName: node + linkType: hard + +"pinkie@npm:^2.0.0": + version: 2.0.4 + resolution: "pinkie@npm:2.0.4" + checksum: 10/11d207257a044d1047c3755374d36d84dda883a44d030fe98216bf0ea97da05a5c9d64e82495387edeb9ee4f52c455bca97cdb97629932be65e6f54b29f5aec8 + languageName: node + linkType: hard + "pinst@npm:3.0.0": version: 3.0.0 resolution: "pinst@npm:3.0.0" @@ -12110,6 +13180,13 @@ __metadata: languageName: node linkType: hard +"posix-character-classes@npm:^0.1.0": + version: 0.1.1 + resolution: "posix-character-classes@npm:0.1.1" + checksum: 10/dedb99913c60625a16050cfed2fb5c017648fc075be41ac18474e1c6c3549ef4ada201c8bd9bd006d36827e289c571b6092e1ef6e756cdbab2fd7046b25c6442 + languageName: node + linkType: hard + "possible-typed-array-names@npm:^1.0.0": version: 1.0.0 resolution: "possible-typed-array-names@npm:1.0.0" @@ -12167,6 +13244,13 @@ __metadata: languageName: node linkType: hard +"pretty-hrtime@npm:^1.0.0": + version: 1.0.3 + resolution: "pretty-hrtime@npm:1.0.3" + checksum: 10/0a462e88a0a3fd3320288fd8307f488974326ae8e13eea8c27f590f8ee767ccb59cf35bcae1cadff241cd8b72f3e373fc76ff1be95243649899bf8c816874af9 + languageName: node + linkType: hard + "pretty-time@npm:^1.1.0": version: 1.1.0 resolution: "pretty-time@npm:1.1.0" @@ -12222,6 +13306,27 @@ __metadata: languageName: node linkType: hard +"pump@npm:^2.0.0": + version: 2.0.1 + resolution: "pump@npm:2.0.1" + dependencies: + end-of-stream: "npm:^1.1.0" + once: "npm:^1.3.1" + checksum: 10/e9f26a17be00810bff37ad0171edb35f58b242487b0444f92fb7d78bc7d61442fa9b9c5bd93a43fd8fd8ddd3cc75f1221f5e04c790f42907e5baab7cf5e2b931 + languageName: node + linkType: hard + +"pumpify@npm:^1.3.5": + version: 1.5.1 + resolution: "pumpify@npm:1.5.1" + dependencies: + duplexify: "npm:^3.6.0" + inherits: "npm:^2.0.3" + pump: "npm:^2.0.0" + checksum: 10/5d11a99f320dc2a052610399bac6d03db0a23bc23b23aa2a7d0adf879da3065a55134b975db66dc46bc79f54af3dd575d8119113a0a5b311a00580e1f053896b + languageName: node + linkType: hard + "punycode@npm:2.3.1, punycode@npm:^2.1.0, punycode@npm:^2.1.1": version: 2.3.1 resolution: "punycode@npm:2.3.1" @@ -12326,7 +13431,28 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:3, readable-stream@npm:^3.0.6, readable-stream@npm:^3.4.0, readable-stream@npm:^3.6.0": +"read-pkg-up@npm:^1.0.1": + version: 1.0.1 + resolution: "read-pkg-up@npm:1.0.1" + dependencies: + find-up: "npm:^1.0.0" + read-pkg: "npm:^1.0.0" + checksum: 10/d18399a0f46e2da32beb2f041edd0cda49d2f2cc30195a05c759ef3ed9b5e6e19ba1ad1bae2362bdec8c6a9f2c3d18f4d5e8c369e808b03d498d5781cb9122c7 + languageName: node + linkType: hard + +"read-pkg@npm:^1.0.0": + version: 1.1.0 + resolution: "read-pkg@npm:1.1.0" + dependencies: + load-json-file: "npm:^1.0.0" + normalize-package-data: "npm:^2.3.2" + path-type: "npm:^1.0.0" + checksum: 10/a0f5d5e32227ec8e6a028dd5c5134eab229768dcb7a5d9a41a284ed28ad4b9284fecc47383dc1593b5694f4de603a7ffaee84b738956b9b77e0999567485a366 + languageName: node + linkType: hard + +"readable-stream@npm:3, readable-stream@npm:^3.0.6, readable-stream@npm:^3.6.0": version: 3.6.2 resolution: "readable-stream@npm:3.6.2" dependencies: @@ -12337,7 +13463,7 @@ __metadata: languageName: node linkType: hard -"readable-stream@npm:^2.0.1, readable-stream@npm:^2.3.5, readable-stream@npm:~2.3.6": +"readable-stream@npm:^2.0.0, readable-stream@npm:^2.0.1, readable-stream@npm:^2.0.2, readable-stream@npm:^2.0.5, readable-stream@npm:^2.1.5, readable-stream@npm:^2.2.2, readable-stream@npm:^2.3.3, readable-stream@npm:^2.3.5, readable-stream@npm:^2.3.6, readable-stream@npm:~2.3.6": version: 2.3.8 resolution: "readable-stream@npm:2.3.8" dependencies: @@ -12361,6 +13487,17 @@ __metadata: languageName: node linkType: hard +"readdirp@npm:^2.2.1": + version: 2.2.1 + resolution: "readdirp@npm:2.2.1" + dependencies: + graceful-fs: "npm:^4.1.11" + micromatch: "npm:^3.1.10" + readable-stream: "npm:^2.0.2" + checksum: 10/14af3408ac2afa4e72e72a27e2c800d80c03e80bdef7ae4bd4b7907e98dddbeaa1ba37d4788959d9ce1131fc262cc823ce41ca9f024a91d80538241eea112c3c + languageName: node + linkType: hard + "readdirp@npm:~3.6.0": version: 3.6.0 resolution: "readdirp@npm:3.6.0" @@ -12370,6 +13507,15 @@ __metadata: languageName: node linkType: hard +"rechoir@npm:^0.6.2": + version: 0.6.2 + resolution: "rechoir@npm:0.6.2" + dependencies: + resolve: "npm:^1.1.6" + checksum: 10/fe76bf9c21875ac16e235defedd7cbd34f333c02a92546142b7911a0f7c7059d2e16f441fe6fb9ae203f459c05a31b2bcf26202896d89e390eda7514d5d2702b + languageName: node + linkType: hard + "rechoir@npm:^0.8.0": version: 0.8.0 resolution: "rechoir@npm:0.8.0" @@ -12413,8 +13559,18 @@ __metadata: version: 0.15.2 resolution: "regenerator-transform@npm:0.15.2" dependencies: - "@babel/runtime": "npm:^7.8.4" - checksum: 10/c4fdcb46d11bbe32605b4b9ed76b21b8d3f241a45153e9dc6f5542fed4c7744fed459f42701f650d5d5956786bf7de57547329d1c05a9df2ed9e367b9d903302 + "@babel/runtime": "npm:^7.8.4" + checksum: 10/c4fdcb46d11bbe32605b4b9ed76b21b8d3f241a45153e9dc6f5542fed4c7744fed459f42701f650d5d5956786bf7de57547329d1c05a9df2ed9e367b9d903302 + languageName: node + linkType: hard + +"regex-not@npm:^1.0.0, regex-not@npm:^1.0.2": + version: 1.0.2 + resolution: "regex-not@npm:1.0.2" + dependencies: + extend-shallow: "npm:^3.0.2" + safe-regex: "npm:^1.1.0" + checksum: 10/3081403de79559387a35ef9d033740e41818a559512668cef3d12da4e8a29ef34ee13c8ed1256b07e27ae392790172e8a15c8a06b72962fd4550476cde3d8f77 languageName: node linkType: hard @@ -12462,6 +13618,27 @@ __metadata: languageName: node linkType: hard +"remove-bom-buffer@npm:^3.0.0": + version: 3.0.0 + resolution: "remove-bom-buffer@npm:3.0.0" + dependencies: + is-buffer: "npm:^1.1.5" + is-utf8: "npm:^0.2.1" + checksum: 10/e508fd92e5c7b210123485a366b00bb46fe15ef2c23ae90b05cd365bbfeede429ae70f32bce150fc6467e53c921bc0d9a5c7e33d865009c99603f9fbf7c8b7ae + languageName: node + linkType: hard + +"remove-bom-stream@npm:^1.2.0": + version: 1.2.0 + resolution: "remove-bom-stream@npm:1.2.0" + dependencies: + remove-bom-buffer: "npm:^3.0.0" + safe-buffer: "npm:^5.1.0" + through2: "npm:^2.0.3" + checksum: 10/32533fa1925a753cfeb352efe7f01c4171de992275e39f66672752669a457d6cdaaa1c9fd41a25b0e54cd6c0db4987a01a2593c01680a6d5e7b5076d27540786 + languageName: node + linkType: hard + "remove-trailing-separator@npm:^1.0.1, remove-trailing-separator@npm:^1.1.0": version: 1.1.0 resolution: "remove-trailing-separator@npm:1.1.0" @@ -12469,7 +13646,14 @@ __metadata: languageName: node linkType: hard -"repeat-string@npm:^1.0.0": +"repeat-element@npm:^1.1.2": + version: 1.1.4 + resolution: "repeat-element@npm:1.1.4" + checksum: 10/1edd0301b7edad71808baad226f0890ba709443f03a698224c9ee4f2494c317892dc5211b2ba8cbea7194a9ddbcac01e283bd66de0467ab24ee1fc1a3711d8a9 + languageName: node + linkType: hard + +"repeat-string@npm:^1.0.0, repeat-string@npm:^1.6.1": version: 1.6.1 resolution: "repeat-string@npm:1.6.1" checksum: 10/1b809fc6db97decdc68f5b12c4d1a671c8e3f65ec4a40c238bc5200e44e85bcc52a54f78268ab9c29fcf5fe4f1343e805420056d1f30fa9a9ee4c2d93e3cc6c0 @@ -12490,10 +13674,14 @@ __metadata: languageName: node linkType: hard -"replace-homedir@npm:^2.0.0": - version: 2.0.0 - resolution: "replace-homedir@npm:2.0.0" - checksum: 10/66030e85400b7b4af41aad5595a8a75d1344f768e9a773702a9e16e48bf12e56c006799007e59ea229a74398237b0934aca51795143b071d3578c23309d7e48b +"replace-homedir@npm:^1.0.0": + version: 1.0.0 + resolution: "replace-homedir@npm:1.0.0" + dependencies: + homedir-polyfill: "npm:^1.0.1" + is-absolute: "npm:^1.0.0" + remove-trailing-separator: "npm:^1.1.0" + checksum: 10/a330e7c4fda2ba7978472dcaf9ee9129755ca0d704f903b4fc5f0384170f74fdaf1b3f10977ec3fc910cb992f90896c17c8e44d0de327cb9f01ee9bb7eed8d24 languageName: node linkType: hard @@ -12511,6 +13699,13 @@ __metadata: languageName: node linkType: hard +"require-main-filename@npm:^1.0.1": + version: 1.0.1 + resolution: "require-main-filename@npm:1.0.1" + checksum: 10/49e4586207c138dabe885cffb9484f3f4583fc839851cd6705466eb343d8bb6af7dfa3d8e611fbd44d40441d4cddaadb34b4d537092b92adafa6a6f440dc1da8 + languageName: node + linkType: hard + "require-main-filename@npm:^2.0.0": version: 2.0.0 resolution: "require-main-filename@npm:2.0.0" @@ -12565,12 +13760,12 @@ __metadata: languageName: node linkType: hard -"resolve-options@npm:^2.0.0": - version: 2.0.0 - resolution: "resolve-options@npm:2.0.0" +"resolve-options@npm:^1.1.0": + version: 1.1.0 + resolution: "resolve-options@npm:1.1.0" dependencies: - value-or-function: "npm:^4.0.0" - checksum: 10/b28584cc089099af42e36292c32bd9af8bc9e28e3ca73c172c0a172d7ed5afb01c75cc2275268c327dceba77a5555b33fbd55617be138874040279fe6ff02fbf + value-or-function: "npm:^3.0.0" + checksum: 10/437813d9418b49e52c367b980b6b48b3ea1ea39105aac97c39f104724abb6cda224ed92ebf12499cf00993589d38c8195eb2be730d0ba8b45df9bdf7cec65b33 languageName: node linkType: hard @@ -12584,7 +13779,14 @@ __metadata: languageName: node linkType: hard -"resolve@npm:^1.1.6, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4": +"resolve-url@npm:^0.2.1": + version: 0.2.1 + resolution: "resolve-url@npm:0.2.1" + checksum: 10/c8bbf6385730add6657103929ebd7e4aa623a2c2df29bba28a58fec73097c003edcce475efefa51c448a904aa344a4ebabe6ad85c8e75c72c4ce9a0c0b5652d2 + languageName: node + linkType: hard + +"resolve@npm:^1.1.6, resolve@npm:^1.1.7, resolve@npm:^1.10.0, resolve@npm:^1.14.2, resolve@npm:^1.19.0, resolve@npm:^1.20.0, resolve@npm:^1.22.1, resolve@npm:^1.22.4, resolve@npm:^1.4.0": version: 1.22.8 resolution: "resolve@npm:1.22.8" dependencies: @@ -12610,7 +13812,7 @@ __metadata: languageName: node linkType: hard -"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin": +"resolve@patch:resolve@npm%3A^1.1.6#optional!builtin, resolve@patch:resolve@npm%3A^1.1.7#optional!builtin, resolve@patch:resolve@npm%3A^1.10.0#optional!builtin, resolve@patch:resolve@npm%3A^1.14.2#optional!builtin, resolve@patch:resolve@npm%3A^1.19.0#optional!builtin, resolve@patch:resolve@npm%3A^1.20.0#optional!builtin, resolve@patch:resolve@npm%3A^1.22.1#optional!builtin, resolve@patch:resolve@npm%3A^1.22.4#optional!builtin, resolve@patch:resolve@npm%3A^1.4.0#optional!builtin": version: 1.22.8 resolution: "resolve@patch:resolve@npm%3A1.22.8#optional!builtin::version=1.22.8&hash=c3c19d" dependencies: @@ -12646,6 +13848,13 @@ __metadata: languageName: node linkType: hard +"ret@npm:~0.1.10": + version: 0.1.15 + resolution: "ret@npm:0.1.15" + checksum: 10/07c9e7619b4c86053fa57689bf7606b5a40fc1231fc87682424d0b3e296641cc19c218c3b8a8917305fbcca3bfc43038a5b6a63f54755c1bbca2f91857253b03 + languageName: node + linkType: hard + "retry@npm:^0.12.0": version: 0.12.0 resolution: "retry@npm:0.12.0" @@ -12830,6 +14039,15 @@ __metadata: languageName: node linkType: hard +"safe-regex@npm:^1.1.0": + version: 1.1.0 + resolution: "safe-regex@npm:1.1.0" + dependencies: + ret: "npm:~0.1.10" + checksum: 10/5405b5a3effed649e6133d51d45cecbbbb02a1dd8d5b78a5e7979a69035870c817a5d2682d0ebb62188d3a840f7b24ea00ebbad2e418d5afabed151e8db96d04 + languageName: node + linkType: hard + "safer-buffer@npm:>= 2.1.2 < 3, safer-buffer@npm:>= 2.1.2 < 3.0.0": version: 2.1.2 resolution: "safer-buffer@npm:2.1.2" @@ -12884,16 +14102,16 @@ __metadata: languageName: node linkType: hard -"semver-greatest-satisfied-range@npm:^2.0.0": - version: 2.0.0 - resolution: "semver-greatest-satisfied-range@npm:2.0.0" +"semver-greatest-satisfied-range@npm:^1.1.0": + version: 1.1.0 + resolution: "semver-greatest-satisfied-range@npm:1.1.0" dependencies: - sver: "npm:^1.8.3" - checksum: 10/478a52a34fa4a265d7caf1f2279bf3f427abeee36175bfa03c29d48df65040f4d934ccdf5896b7ae6012f60f7364ec30826390ecb7c913f94109002dbd53a588 + sver-compat: "npm:^1.5.0" + checksum: 10/0aa15bbf69dcec89d7f02edc8171d8e71354d2ed4beebd4de5305f5234088fb970b7078b0ce5585b853773cafb4c3f692e35031c5d691abab0d5bc8c9ebacc80 languageName: node linkType: hard -"semver@npm:^5.7.2": +"semver@npm:2 || 3 || 4 || 5, semver@npm:^5.7.2": version: 5.7.2 resolution: "semver@npm:5.7.2" bin: @@ -13046,6 +14264,18 @@ __metadata: languageName: node linkType: hard +"set-value@npm:^2.0.0, set-value@npm:^2.0.1": + version: 2.0.1 + resolution: "set-value@npm:2.0.1" + dependencies: + extend-shallow: "npm:^2.0.1" + is-extendable: "npm:^0.1.1" + is-plain-object: "npm:^2.0.3" + split-string: "npm:^3.0.1" + checksum: 10/4f1ccac2e9ad4d1b0851761d41df4bbd3780ed69805f24a80ab237a56d9629760b7b98551cd370931620defe5da329645834e1e9a18574cecad09ce7b2b83296 + languageName: node + linkType: hard + "setimmediate@npm:^1.0.5": version: 1.0.5 resolution: "setimmediate@npm:1.0.5" @@ -13180,6 +14410,42 @@ __metadata: languageName: node linkType: hard +"snapdragon-node@npm:^2.0.1": + version: 2.1.1 + resolution: "snapdragon-node@npm:2.1.1" + dependencies: + define-property: "npm:^1.0.0" + isobject: "npm:^3.0.0" + snapdragon-util: "npm:^3.0.1" + checksum: 10/093c3584efc51103d8607d28cb7a3079f7e371b2320a60c685a84a57956cf9693f3dec8b2f77250ba48063cf42cb5261f3970e6d3bb7e68fd727299c991e0bff + languageName: node + linkType: hard + +"snapdragon-util@npm:^3.0.1": + version: 3.0.1 + resolution: "snapdragon-util@npm:3.0.1" + dependencies: + kind-of: "npm:^3.2.0" + checksum: 10/b776b15bf683c9ac0243582d7b13f2070f85c9036d73c2ba31da61d1effe22d4a39845b6f43ce7e7ec82c7e686dc47d9c3cffa1a75327bb16505b9afc34f516d + languageName: node + linkType: hard + +"snapdragon@npm:^0.8.1": + version: 0.8.2 + resolution: "snapdragon@npm:0.8.2" + dependencies: + base: "npm:^0.11.1" + debug: "npm:^2.2.0" + define-property: "npm:^0.2.5" + extend-shallow: "npm:^2.0.1" + map-cache: "npm:^0.2.2" + source-map: "npm:^0.5.6" + source-map-resolve: "npm:^0.5.0" + use: "npm:^3.1.0" + checksum: 10/cbe35b25dca5504be0ced90d907948d8efeda0b118d9a032bfc499e22b7f78515832f2706d9c9297c87906eaa51c12bfcaa8ea5a4f3e98ecf1116a73428e344a + languageName: node + linkType: hard + "sockjs@npm:^0.3.24": version: 0.3.24 resolution: "sockjs@npm:0.3.24" @@ -13240,6 +14506,19 @@ __metadata: languageName: node linkType: hard +"source-map-resolve@npm:^0.5.0": + version: 0.5.3 + resolution: "source-map-resolve@npm:0.5.3" + dependencies: + atob: "npm:^2.1.2" + decode-uri-component: "npm:^0.2.0" + resolve-url: "npm:^0.2.1" + source-map-url: "npm:^0.4.0" + urix: "npm:^0.1.0" + checksum: 10/98e281cceb86b80c8bd3453110617b9df93132d6a50c7bf5847b5d74b4b5d6e1d4d261db276035b9b7e5ba7f32c2d6a0d2c13d581e37870a0219a524402efcab + languageName: node + linkType: hard + "source-map-support@npm:~0.5.12, source-map-support@npm:~0.5.20": version: 0.5.21 resolution: "source-map-support@npm:0.5.21" @@ -13250,7 +14529,7 @@ __metadata: languageName: node linkType: hard -"source-map-url@npm:0.4.1": +"source-map-url@npm:0.4.1, source-map-url@npm:^0.4.0": version: 0.4.1 resolution: "source-map-url@npm:0.4.1" checksum: 10/7fec0460ca017330568e1a4d67c80c397871f27d75b034e1117eaa802076db5cda5944659144d26eafd2a95008ada19296c8e0d5ec116302c32c6daa4e430003 @@ -13264,6 +14543,13 @@ __metadata: languageName: node linkType: hard +"source-map@npm:^0.5.6": + version: 0.5.7 + resolution: "source-map@npm:0.5.7" + checksum: 10/9b4ac749ec5b5831cad1f8cc4c19c4298ebc7474b24a0acf293e2f040f03f8eeccb3d01f12aa0f90cf46d555c887e03912b83a042c627f419bda5152d89c5269 + languageName: node + linkType: hard + "source-map@npm:^0.6.0, source-map@npm:^0.6.1, source-map@npm:~0.6.0, source-map@npm:~0.6.1": version: 0.6.1 resolution: "source-map@npm:0.6.1" @@ -13294,10 +14580,44 @@ __metadata: languageName: node linkType: hard -"sparkles@npm:^2.1.0": - version: 2.1.0 - resolution: "sparkles@npm:2.1.0" - checksum: 10/72b76a81a50e43e617f16b52bf852c38c9c86effbd0a388ab90ad88c138322f662c997adb60a456a44538b14fbd4e3a2e851901f2f64691b523fdb91efce7365 +"sparkles@npm:^1.0.0": + version: 1.0.1 + resolution: "sparkles@npm:1.0.1" + checksum: 10/57645793425ba836b5ada5fc9954658c0178bca4b5bf7a9bea67e269106129fd95fa17d0388ce429871f0ee004633e59af670232aaa9fd61511a0ab5f8db902a + languageName: node + linkType: hard + +"spdx-correct@npm:^3.0.0": + version: 3.2.0 + resolution: "spdx-correct@npm:3.2.0" + dependencies: + spdx-expression-parse: "npm:^3.0.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10/cc2e4dbef822f6d12142116557d63f5facf3300e92a6bd24e907e4865e17b7e1abd0ee6b67f305cae6790fc2194175a24dc394bfcc01eea84e2bdad728e9ae9a + languageName: node + linkType: hard + +"spdx-exceptions@npm:^2.1.0": + version: 2.5.0 + resolution: "spdx-exceptions@npm:2.5.0" + checksum: 10/bb127d6e2532de65b912f7c99fc66097cdea7d64c10d3ec9b5e96524dbbd7d20e01cba818a6ddb2ae75e62bb0c63d5e277a7e555a85cbc8ab40044984fa4ae15 + languageName: node + linkType: hard + +"spdx-expression-parse@npm:^3.0.0": + version: 3.0.1 + resolution: "spdx-expression-parse@npm:3.0.1" + dependencies: + spdx-exceptions: "npm:^2.1.0" + spdx-license-ids: "npm:^3.0.0" + checksum: 10/a1c6e104a2cbada7a593eaa9f430bd5e148ef5290d4c0409899855ce8b1c39652bcc88a725259491a82601159d6dc790bedefc9016c7472f7de8de7361f8ccde + languageName: node + linkType: hard + +"spdx-license-ids@npm:^3.0.0": + version: 3.0.17 + resolution: "spdx-license-ids@npm:3.0.17" + checksum: 10/8f6c6ae02ebb25b4ca658b8990d9e8a8f8d8a95e1d8b9fd84d87eed80a7dc8f8073d6a8d50b8a0295c0e8399e1f8814f5c00e2985e6bf3731540a16f7241cbf1 languageName: node linkType: hard @@ -13328,6 +14648,15 @@ __metadata: languageName: node linkType: hard +"split-string@npm:^3.0.1, split-string@npm:^3.0.2": + version: 3.1.0 + resolution: "split-string@npm:3.1.0" + dependencies: + extend-shallow: "npm:^3.0.0" + checksum: 10/f31f4709d2b14fe4ff46b4fb88b2fb68a1c59b59e573c5417907c182397ddb2cb67903232bdc3a8b9dd3bb660c6f533ff11b5d624aff7b1fe0a213e3e4c75f20 + languageName: node + linkType: hard + "sprintf-js@npm:^1.1.3": version: 1.1.3 resolution: "sprintf-js@npm:1.1.3" @@ -13353,6 +14682,13 @@ __metadata: languageName: node linkType: hard +"stack-trace@npm:0.0.10": + version: 0.0.10 + resolution: "stack-trace@npm:0.0.10" + checksum: 10/7bd633f0e9ac46e81a0b0fe6538482c1d77031959cf94478228731709db4672fbbed59176f5b9a9fd89fec656b5dae03d084ef2d1b0c4c2f5683e05f2dbb1405 + languageName: node + linkType: hard + "stackframe@npm:^1.3.4": version: 1.3.4 resolution: "stackframe@npm:1.3.4" @@ -13381,6 +14717,16 @@ __metadata: languageName: node linkType: hard +"static-extend@npm:^0.1.1": + version: 0.1.2 + resolution: "static-extend@npm:0.1.2" + dependencies: + define-property: "npm:^0.2.5" + object-copy: "npm:^0.1.0" + checksum: 10/8657485b831f79e388a437260baf22784540417a9b29e11572c87735df24c22b84eda42107403a64b30861b2faf13df9f7fc5525d51f9d1d2303aba5cbf4e12c + languageName: node + linkType: hard + "statuses@npm:2.0.1": version: 2.0.1 resolution: "statuses@npm:2.0.1" @@ -13402,16 +14748,7 @@ __metadata: languageName: node linkType: hard -"stream-composer@npm:^1.0.2": - version: 1.0.2 - resolution: "stream-composer@npm:1.0.2" - dependencies: - streamx: "npm:^2.13.2" - checksum: 10/338b8e088f2eb2c91b0e06907db436525da3620991b13499e57441548e62d3585be185505901b0380cad425889572794e5fe178dd326f5efde654b3ab26df3d3 - languageName: node - linkType: hard - -"stream-exhaust@npm:^1.0.2": +"stream-exhaust@npm:^1.0.1": version: 1.0.2 resolution: "stream-exhaust@npm:1.0.2" checksum: 10/ffac181a5c706db3a940d96f9a5be02df84cf03a4925bff10d210a2d791d65f6197d67a0a484cea128298e63737f46c08e51f9ebe64f25556b9d824b820c996d @@ -13425,6 +14762,13 @@ __metadata: languageName: node linkType: hard +"stream-shift@npm:^1.0.0": + version: 1.0.3 + resolution: "stream-shift@npm:1.0.3" + checksum: 10/a24c0a3f66a8f9024bd1d579a533a53be283b4475d4e6b4b3211b964031447bdf6532dd1f3c2b0ad66752554391b7c62bd7ca4559193381f766534e723d50242 + languageName: node + linkType: hard + "stream-to-array@npm:^2.0.2": version: 2.3.0 resolution: "stream-to-array@npm:2.3.0" @@ -13434,7 +14778,7 @@ __metadata: languageName: node linkType: hard -"streamx@npm:^2.12.0, streamx@npm:^2.12.5, streamx@npm:^2.13.2, streamx@npm:^2.14.0": +"streamx@npm:^2.12.5": version: 2.16.1 resolution: "streamx@npm:2.16.1" dependencies: @@ -13466,6 +14810,17 @@ __metadata: languageName: node linkType: hard +"string-width@npm:^1.0.1, string-width@npm:^1.0.2": + version: 1.0.2 + resolution: "string-width@npm:1.0.2" + dependencies: + code-point-at: "npm:^1.0.0" + is-fullwidth-code-point: "npm:^1.0.0" + strip-ansi: "npm:^3.0.0" + checksum: 10/5c79439e95bc3bd7233a332c5f5926ab2ee90b23816ed4faa380ce3b2576d7800b0a5bb15ae88ed28737acc7ea06a518c2eef39142dd727adad0e45c776cd37e + languageName: node + linkType: hard + "string-width@npm:^5.0.1, string-width@npm:^5.1.2": version: 5.1.2 resolution: "string-width@npm:5.1.2" @@ -13580,6 +14935,15 @@ __metadata: languageName: node linkType: hard +"strip-ansi@npm:^3.0.0, strip-ansi@npm:^3.0.1": + version: 3.0.1 + resolution: "strip-ansi@npm:3.0.1" + dependencies: + ansi-regex: "npm:^2.0.0" + checksum: 10/9b974de611ce5075c70629c00fa98c46144043db92ae17748fb780f706f7a789e9989fd10597b7c2053ae8d1513fd707816a91f1879b2f71e6ac0b6a863db465 + languageName: node + linkType: hard + "strip-ansi@npm:^7.0.1, strip-ansi@npm:^7.1.0": version: 7.1.0 resolution: "strip-ansi@npm:7.1.0" @@ -13589,6 +14953,15 @@ __metadata: languageName: node linkType: hard +"strip-bom@npm:^2.0.0": + version: 2.0.0 + resolution: "strip-bom@npm:2.0.0" + dependencies: + is-utf8: "npm:^0.2.0" + checksum: 10/08efb746bc67b10814cd03d79eb31bac633393a782e3f35efbc1b61b5165d3806d03332a97f362822cf0d4dd14ba2e12707fcff44fe1c870c48a063a0c9e4944 + languageName: node + linkType: hard + "strip-bom@npm:^3.0.0": version: 3.0.0 resolution: "strip-bom@npm:3.0.0" @@ -13682,15 +15055,13 @@ __metadata: languageName: node linkType: hard -"sver@npm:^1.8.3": - version: 1.8.4 - resolution: "sver@npm:1.8.4" +"sver-compat@npm:^1.5.0": + version: 1.5.0 + resolution: "sver-compat@npm:1.5.0" dependencies: - semver: "npm:^6.3.0" - dependenciesMeta: - semver: - optional: true - checksum: 10/2647b8bc0bfb96cb2efe4a6bc080472b1a2078ac2c5cfa912fd49c981b764c7c7347e3b1a83c8506ce966665b02767b2ce7c5c6efde8c74835dc7aabc9456326 + es6-iterator: "npm:^2.0.1" + es6-symbol: "npm:^3.1.1" + checksum: 10/e85edc83801d4ad35ac0f7b95026395d9328e22f31ceb3497807d5fec25502412330da179265f3772531e67caf1a7e933cccc64c379a8055aba65877c2f49268 languageName: node linkType: hard @@ -13844,7 +15215,17 @@ __metadata: languageName: node linkType: hard -"through2@npm:^2.0.3": +"through2-filter@npm:^3.0.0": + version: 3.0.0 + resolution: "through2-filter@npm:3.0.0" + dependencies: + through2: "npm:~2.0.0" + xtend: "npm:~4.0.0" + checksum: 10/085e0d9edf6a30b11d453697d5bf095fde1a0c27626d905dab8c26c030dcc3185fe2cdf469732de216f4439269bbe165a848a8c73675135999ff35ac1f511093 + languageName: node + linkType: hard + +"through2@npm:^2.0.0, through2@npm:^2.0.3, through2@npm:~2.0.0": version: 2.0.5 resolution: "through2@npm:2.0.5" dependencies: @@ -13905,6 +15286,16 @@ __metadata: languageName: node linkType: hard +"to-absolute-glob@npm:^2.0.0": + version: 2.0.2 + resolution: "to-absolute-glob@npm:2.0.2" + dependencies: + is-absolute: "npm:^1.0.0" + is-negated-glob: "npm:^1.0.0" + checksum: 10/0a8bef172909e43d711bfd33792643f2eec35b9109bde927dabfd231e6ad643b7a657f306c93c6e7b89f71d3de74ac94060fe9637bca8c37b036523993664323 + languageName: node + linkType: hard + "to-fast-properties@npm:^2.0.0": version: 2.0.0 resolution: "to-fast-properties@npm:2.0.0" @@ -13912,6 +15303,25 @@ __metadata: languageName: node linkType: hard +"to-object-path@npm:^0.3.0": + version: 0.3.0 + resolution: "to-object-path@npm:0.3.0" + dependencies: + kind-of: "npm:^3.0.2" + checksum: 10/9425effee5b43e61d720940fa2b889623f77473d459c2ce3d4a580a4405df4403eec7be6b857455908070566352f9e2417304641ed158dda6f6a365fe3e66d70 + languageName: node + linkType: hard + +"to-regex-range@npm:^2.1.0": + version: 2.1.1 + resolution: "to-regex-range@npm:2.1.1" + dependencies: + is-number: "npm:^3.0.0" + repeat-string: "npm:^1.6.1" + checksum: 10/2eed5f897188de8ec8745137f80c0f564810082d506278dd6a80db4ea313b6d363ce8d7dc0e0406beeaba0bb7f90f01b41fa3d08fb72dd02c329b2ec579cd4e8 + languageName: node + linkType: hard + "to-regex-range@npm:^5.0.1": version: 5.0.1 resolution: "to-regex-range@npm:5.0.1" @@ -13921,12 +15331,24 @@ __metadata: languageName: node linkType: hard -"to-through@npm:^3.0.0": - version: 3.0.0 - resolution: "to-through@npm:3.0.0" +"to-regex@npm:^3.0.1, to-regex@npm:^3.0.2": + version: 3.0.2 + resolution: "to-regex@npm:3.0.2" dependencies: - streamx: "npm:^2.12.5" - checksum: 10/404ad1a346babab53d75d3b4deb779916760fc9e605f4e64ec789366edf08e75ad592a262ca566e7864f77c03375151dcfac4744ff7fd52417cb2a2e9fc60795 + define-property: "npm:^2.0.2" + extend-shallow: "npm:^3.0.2" + regex-not: "npm:^1.0.2" + safe-regex: "npm:^1.1.0" + checksum: 10/ab87c22f0719f7def00145b53e2c90d2fdcc75efa0fec1227b383aaf88ed409db2542b2b16bcbfbf95fe0727f879045803bb635b777c0306762241ca3e5562c6 + languageName: node + linkType: hard + +"to-through@npm:^2.0.0": + version: 2.0.0 + resolution: "to-through@npm:2.0.0" + dependencies: + through2: "npm:^2.0.3" + checksum: 10/5834a69d68cbe0d74115373bbe219dbe60c1950021f5ec9dd4af179ffbb307bce3d45fde9dacec05a8f4f79b86734433eb9b42946ccb81d2d4d4f8828628b7e6 languageName: node linkType: hard @@ -14177,6 +15599,13 @@ __metadata: languageName: node linkType: hard +"type@npm:^2.7.2": + version: 2.7.2 + resolution: "type@npm:2.7.2" + checksum: 10/602f1b369fba60687fa4d0af6fcfb814075bcaf9ed3a87637fb384d9ff849e2ad15bc244a431f341374562e51a76c159527ffdb1f1f24b0f1f988f35a301c41d + languageName: node + linkType: hard + "typed-array-buffer@npm:^1.0.2": version: 1.0.2 resolution: "typed-array-buffer@npm:1.0.2" @@ -14229,6 +15658,13 @@ __metadata: languageName: node linkType: hard +"typedarray@npm:^0.0.6": + version: 0.0.6 + resolution: "typedarray@npm:0.0.6" + checksum: 10/2cc1bcf7d8c1237f6a16c04efc06637b2c5f2d74e58e84665445cf87668b85a21ab18dd751fa49eee6ae024b70326635d7b79ad37b1c370ed2fec6aeeeb52714 + languageName: node + linkType: hard + "typescript@npm:5.4.5": version: 5.4.5 resolution: "typescript@npm:5.4.5" @@ -14309,22 +15745,28 @@ __metadata: languageName: node linkType: hard -"undertaker-registry@npm:^2.0.0": - version: 2.0.0 - resolution: "undertaker-registry@npm:2.0.0" - checksum: 10/c1ebb4b72eeacf563a583f5928e7cee7a71391b0f33d5bac939fbb4e3ea1f00298850ca2449776f18e4c2eab8c57434327fc826f3ca43061cce22471bdf3604e +"undertaker-registry@npm:^1.0.0": + version: 1.0.1 + resolution: "undertaker-registry@npm:1.0.1" + checksum: 10/adcc5af240fe4ec4dcda02ce060121a03f28a19bbc922f6a24e17c851eef4cf66de60196ad4c8b27c1c5df6d0a21cf7a63e80129e31832730fca0d062cd9eb30 languageName: node linkType: hard -"undertaker@npm:^2.0.0": - version: 2.0.0 - resolution: "undertaker@npm:2.0.0" +"undertaker@npm:^1.2.1": + version: 1.3.0 + resolution: "undertaker@npm:1.3.0" dependencies: - bach: "npm:^2.0.1" - fast-levenshtein: "npm:^3.0.0" - last-run: "npm:^2.0.0" - undertaker-registry: "npm:^2.0.0" - checksum: 10/1f182515bd95f2becd7ff4b9c7ffa6fb5d403ea0e75f290234e4c09b748242761f271606646f8f07f8fa5c0ab20b3de5ec6975a827764f32dfb965a207d1e6cf + arr-flatten: "npm:^1.0.1" + arr-map: "npm:^2.0.0" + bach: "npm:^1.0.0" + collection-map: "npm:^1.0.0" + es6-weak-map: "npm:^2.0.1" + fast-levenshtein: "npm:^1.0.0" + last-run: "npm:^1.1.0" + object.defaults: "npm:^1.0.0" + object.reduce: "npm:^1.0.0" + undertaker-registry: "npm:^1.0.0" + checksum: 10/6cb5898b0b8fd4b094fbd6ed9c2e155f436d698fdc13f45444d5083825cc29bca7a364c5e27922366f0ce3fff7bb5b834f6ff3583f77cb655bbc3a60fee632ed languageName: node linkType: hard @@ -14373,6 +15815,18 @@ __metadata: languageName: node linkType: hard +"union-value@npm:^1.0.0": + version: 1.0.1 + resolution: "union-value@npm:1.0.1" + dependencies: + arr-union: "npm:^3.1.0" + get-value: "npm:^2.0.6" + is-extendable: "npm:^0.1.1" + set-value: "npm:^2.0.1" + checksum: 10/a3464097d3f27f6aa90cf103ed9387541bccfc006517559381a10e0dffa62f465a9d9a09c9b9c3d26d0f4cbe61d4d010e2fbd710fd4bf1267a768ba8a774b0ba + languageName: node + linkType: hard + "unique-filename@npm:^3.0.0": version: 3.0.0 resolution: "unique-filename@npm:3.0.0" @@ -14391,6 +15845,16 @@ __metadata: languageName: node linkType: hard +"unique-stream@npm:^2.0.2": + version: 2.3.1 + resolution: "unique-stream@npm:2.3.1" + dependencies: + json-stable-stringify-without-jsonify: "npm:^1.0.1" + through2-filter: "npm:^3.0.0" + checksum: 10/65e433e68e46640e9283dbb022493c8d79ed1dac47807fe751dfe3bd50586927f63ad880ce9e01c2f85911f3caca48d04731aff6f07869434d5f76ecfe478559 + languageName: node + linkType: hard + "unique-string@npm:^2.0.0": version: 2.0.0 resolution: "unique-string@npm:2.0.0" @@ -14428,7 +15892,17 @@ __metadata: languageName: node linkType: hard -"upath@npm:^1.2.0": +"unset-value@npm:^1.0.0": + version: 1.0.0 + resolution: "unset-value@npm:1.0.0" + dependencies: + has-value: "npm:^0.3.1" + isobject: "npm:^3.0.0" + checksum: 10/0ca644870613dece963e4abb762b0da4c1cf6be4ac2f0859a463e4e9520c1ec85e512cfbfd73371ee0bb09ef536a0c4abd6f2c357715a08b43448aedc82acee6 + languageName: node + linkType: hard + +"upath@npm:^1.1.1, upath@npm:^1.2.0": version: 1.2.0 resolution: "upath@npm:1.2.0" checksum: 10/ac07351d9e913eb7bc9bc0a17ed7d033a52575f0f2959e19726956c3e96f5d4d75aa6a7a777c4c9506e72372f58e06215e581f8dbff35611fc0a7b68ab4a6ddb @@ -14458,6 +15932,13 @@ __metadata: languageName: node linkType: hard +"urix@npm:^0.1.0": + version: 0.1.0 + resolution: "urix@npm:0.1.0" + checksum: 10/ebf5df5491c1d40ea88f7529ee9d8fd6501f44c47b8017d168fd1558d40f7d613c6f39869643344e58b71ba2da357a7c26f353a2a54d416492fcdca81f05b338 + languageName: node + linkType: hard + "url@npm:^0.11.0": version: 0.11.3 resolution: "url@npm:0.11.3" @@ -14468,6 +15949,13 @@ __metadata: languageName: node linkType: hard +"use@npm:^3.1.0": + version: 3.1.1 + resolution: "use@npm:3.1.1" + checksum: 10/08a130289f5238fcbf8f59a18951286a6e660d17acccc9d58d9b69dfa0ee19aa038e8f95721b00b432c36d1629a9e32a464bf2e7e0ae6a244c42ddb30bdd8b33 + languageName: node + linkType: hard + "utif@npm:^2.0.1": version: 2.0.1 resolution: "utif@npm:2.0.1" @@ -14500,17 +15988,29 @@ __metadata: languageName: node linkType: hard -"v8flags@npm:^4.0.0": - version: 4.0.1 - resolution: "v8flags@npm:4.0.1" - checksum: 10/69863ede75ff79579654951c78724c084bc337d0ebe1d9bffc6924f3f2bd0b40a9eb4c568fc795201d5eb72311b77e5d75a7e1544faa12355412360dc37d76e2 +"v8flags@npm:^3.2.0": + version: 3.2.0 + resolution: "v8flags@npm:3.2.0" + dependencies: + homedir-polyfill: "npm:^1.0.1" + checksum: 10/4c88e2681f12153ae5e45de678ba724ebd2daf2619d4fbe5cc8075b07b2095522dbfd0cb55e510a1d27ea0ed0db4a5e6fc6d18d312f7d8fc098a3c6a79b7ffc6 languageName: node linkType: hard -"value-or-function@npm:^4.0.0": - version: 4.0.0 - resolution: "value-or-function@npm:4.0.0" - checksum: 10/16b6aed84b8f9732a7eb7a5035a1480be3689d097a73b1154fb827caf021d5f2b6f60c0dfe694bfc8c9605f06cfc093dc428efdc3d24cb2768fbe202ffd42ae1 +"validate-npm-package-license@npm:^3.0.1": + version: 3.0.4 + resolution: "validate-npm-package-license@npm:3.0.4" + dependencies: + spdx-correct: "npm:^3.0.0" + spdx-expression-parse: "npm:^3.0.0" + checksum: 10/86242519b2538bb8aeb12330edebb61b4eb37fd35ef65220ab0b03a26c0592c1c8a7300d32da3cde5abd08d18d95e8dabfad684b5116336f6de9e6f207eec224 + languageName: node + linkType: hard + +"value-or-function@npm:^3.0.0": + version: 3.0.0 + resolution: "value-or-function@npm:3.0.0" + checksum: 10/2b901d05b82deb8565d4edeba02e0737be73e7fb2c640b79fa64152aae8b450f790a46c86bf7039f91938c1b69d2cc0908cd18c4695b120293bb442179061fac languageName: node linkType: hard @@ -14521,53 +16021,47 @@ __metadata: languageName: node linkType: hard -"vinyl-contents@npm:^2.0.0": - version: 2.0.0 - resolution: "vinyl-contents@npm:2.0.0" - dependencies: - bl: "npm:^5.0.0" - vinyl: "npm:^3.0.0" - checksum: 10/10d72a032e6317bf89713565d616df8726ee41601a41c48c7d778e61ab557c0a5fdee883ceecbfb33da4a5e11ea80e76e5ae63c1d13fda61edbb5ef50445c8b2 - languageName: node - linkType: hard - -"vinyl-fs@npm:^4.0.0": - version: 4.0.0 - resolution: "vinyl-fs@npm:4.0.0" +"vinyl-fs@npm:^3.0.0": + version: 3.0.3 + resolution: "vinyl-fs@npm:3.0.3" dependencies: - fs-mkdirp-stream: "npm:^2.0.1" - glob-stream: "npm:^8.0.0" - graceful-fs: "npm:^4.2.11" - iconv-lite: "npm:^0.6.3" + fs-mkdirp-stream: "npm:^1.0.0" + glob-stream: "npm:^6.1.0" + graceful-fs: "npm:^4.0.0" is-valid-glob: "npm:^1.0.0" - lead: "npm:^4.0.0" - normalize-path: "npm:3.0.0" - resolve-options: "npm:^2.0.0" - stream-composer: "npm:^1.0.2" - streamx: "npm:^2.14.0" - to-through: "npm:^3.0.0" - value-or-function: "npm:^4.0.0" - vinyl: "npm:^3.0.0" - vinyl-sourcemap: "npm:^2.0.0" - checksum: 10/22ae47c018600e6973b8a0a0c098927b09f60c4963cc5f717be04e774215774aa15ea97400803483d3dadafc5cff1a6744c3a2ab0322528234dc4e93ae1a55aa - languageName: node - linkType: hard - -"vinyl-sourcemap@npm:^2.0.0": - version: 2.0.0 - resolution: "vinyl-sourcemap@npm:2.0.0" + lazystream: "npm:^1.0.0" + lead: "npm:^1.0.0" + object.assign: "npm:^4.0.4" + pumpify: "npm:^1.3.5" + readable-stream: "npm:^2.3.3" + remove-bom-buffer: "npm:^3.0.0" + remove-bom-stream: "npm:^1.2.0" + resolve-options: "npm:^1.1.0" + through2: "npm:^2.0.0" + to-through: "npm:^2.0.0" + value-or-function: "npm:^3.0.0" + vinyl: "npm:^2.0.0" + vinyl-sourcemap: "npm:^1.1.0" + checksum: 10/14fe1e7b32a70305222b5e66a837b78b71df89a84ef8ecd9a2ac348937bd9425a2eb38499a461dd745c12153acb689a81f98d461237060ba14a9e71c7ec3892f + languageName: node + linkType: hard + +"vinyl-sourcemap@npm:^1.1.0": + version: 1.1.0 + resolution: "vinyl-sourcemap@npm:1.1.0" dependencies: - convert-source-map: "npm:^2.0.0" - graceful-fs: "npm:^4.2.10" - now-and-later: "npm:^3.0.0" - streamx: "npm:^2.12.5" - vinyl: "npm:^3.0.0" - vinyl-contents: "npm:^2.0.0" - checksum: 10/f23fc251a3eb72100690e5e93685ef776d8fee20e076f29655536a31b5235426b9404eea76b6b268fa00648437acc98aad54a7e76661b97305706c487a54afdb + append-buffer: "npm:^1.0.2" + convert-source-map: "npm:^1.5.0" + graceful-fs: "npm:^4.1.6" + normalize-path: "npm:^2.1.1" + now-and-later: "npm:^2.0.0" + remove-bom-buffer: "npm:^3.0.0" + vinyl: "npm:^2.0.0" + checksum: 10/9930a2b5c6ee839849ff269612a05568b1c158e4fb589746d8d995540b48466f3152c640e76700c27a440be0ccaa7b6e2bf0e7dc984c1968d0d1a91f6a5ec23e languageName: node linkType: hard -"vinyl@npm:^2.1.0": +"vinyl@npm:^2.0.0, vinyl@npm:^2.1.0": version: 2.2.1 resolution: "vinyl@npm:2.2.1" dependencies: @@ -15003,6 +16497,13 @@ __metadata: languageName: node linkType: hard +"which-module@npm:^1.0.0": + version: 1.0.0 + resolution: "which-module@npm:1.0.0" + checksum: 10/98434f7deb36350cb543c1f15612188541737e1f12d39b23b1c371dff5cf4aa4746210f2bdec202d5fe9da8682adaf8e3f7c44c520687d30948cfc59d5534edb + languageName: node + linkType: hard + "which-module@npm:^2.0.0": version: 2.0.1 resolution: "which-module@npm:2.0.1" @@ -15285,6 +16786,16 @@ __metadata: languageName: node linkType: hard +"wrap-ansi@npm:^2.0.0": + version: 2.1.0 + resolution: "wrap-ansi@npm:2.1.0" + dependencies: + string-width: "npm:^1.0.1" + strip-ansi: "npm:^3.0.1" + checksum: 10/cf66d33f62f2edf0aac52685da98194e47ddf4ceb81d9f98f294b46ffbbf8662caa72a905b343aeab8d6a16cade982be5fc45df99235b07f781ebf68f051ca98 + languageName: node + linkType: hard + "wrap-ansi@npm:^6.2.0": version: 6.2.0 resolution: "wrap-ansi@npm:6.2.0" @@ -15403,13 +16914,20 @@ __metadata: languageName: node linkType: hard -"xtend@npm:^4.0.0, xtend@npm:~4.0.1": +"xtend@npm:^4.0.0, xtend@npm:~4.0.0, xtend@npm:~4.0.1": version: 4.0.2 resolution: "xtend@npm:4.0.2" checksum: 10/ac5dfa738b21f6e7f0dd6e65e1b3155036d68104e67e5d5d1bde74892e327d7e5636a076f625599dc394330a731861e87343ff184b0047fef1360a7ec0a5a36a languageName: node linkType: hard +"y18n@npm:^3.2.1": + version: 3.2.2 + resolution: "y18n@npm:3.2.2" + checksum: 10/42ee58e321252ac87f85ccc7cee01c2e3e224737531e9e543963264194255132ce406e02993904b84ea974050d53b8959dcf9da695408553c32f2a8b4b59a667 + languageName: node + linkType: hard + "y18n@npm:^4.0.0": version: 4.0.3 resolution: "y18n@npm:4.0.3" @@ -15483,6 +17001,16 @@ __metadata: languageName: node linkType: hard +"yargs-parser@npm:^5.0.1": + version: 5.0.1 + resolution: "yargs-parser@npm:5.0.1" + dependencies: + camelcase: "npm:^3.0.0" + object.assign: "npm:^4.1.0" + checksum: 10/eb1b44ea6ab0eecbf496a6b5884a9905664f5bd0581e12539fa8e9f05c3a303f450066a85bfb6471f23cc188400d3fd9b83832b671e7d4b2b2eadb247f7ea1a5 + languageName: node + linkType: hard + "yargs-unparser@npm:2.0.0": version: 2.0.0 resolution: "yargs-unparser@npm:2.0.0" @@ -15544,6 +17072,27 @@ __metadata: languageName: node linkType: hard +"yargs@npm:^7.1.0": + version: 7.1.2 + resolution: "yargs@npm:7.1.2" + dependencies: + camelcase: "npm:^3.0.0" + cliui: "npm:^3.2.0" + decamelize: "npm:^1.1.1" + get-caller-file: "npm:^1.0.1" + os-locale: "npm:^1.4.0" + read-pkg-up: "npm:^1.0.1" + require-directory: "npm:^2.1.1" + require-main-filename: "npm:^1.0.1" + set-blocking: "npm:^2.0.0" + string-width: "npm:^1.0.2" + which-module: "npm:^1.0.0" + y18n: "npm:^3.2.1" + yargs-parser: "npm:^5.0.1" + checksum: 10/5d52d70cdad810c163b49a0805f5962417e17630b69356aee6234667f75a167f4cc2a51d0cfe0a8ee002ebd0dbdfdd7c471abebe93e1d63125c9363bf6852f7f + languageName: node + linkType: hard + "ylru@npm:^1.2.0": version: 1.4.0 resolution: "ylru@npm:1.4.0" From 0725c7b1605359ff0f49967c2c4c5b839dc385c7 Mon Sep 17 00:00:00 2001 From: "J. Nick Koston" Date: Wed, 24 Apr 2024 10:26:24 +0200 Subject: [PATCH 92/98] Restore getHassTranslationsPre109 (#20597) * Revert "Remove legacy state translations (#20536)" This reverts commit e376efc57920feab37e322f2276beaa31e17d0c0. * keep --- src/data/translation.ts | 11 +++++++++++ src/state/translations-mixin.ts | 19 +++++++++++++++++++ 2 files changed, 30 insertions(+) diff --git a/src/data/translation.ts b/src/data/translation.ts index 82df04a11d73..e4824b0e636f 100644 --- a/src/data/translation.ts +++ b/src/data/translation.ts @@ -97,3 +97,14 @@ export const getHassTranslations = async ( }); return result.resources; }; + +export const getHassTranslationsPre109 = async ( + hass: HomeAssistant, + language: string +): Promise> => { + const result = await hass.callWS<{ resources: Record }>({ + type: "frontend/get_translations", + language, + }); + return result.resources; +}; diff --git a/src/state/translations-mixin.ts b/src/state/translations-mixin.ts index ea329c086e1d..be3158da0873 100644 --- a/src/state/translations-mixin.ts +++ b/src/state/translations-mixin.ts @@ -1,3 +1,4 @@ +import { atLeastVersion } from "../common/config/version"; import { fireEvent } from "../common/dom/fire_event"; import { computeLocalize, LocalizeFunc } from "../common/translations/localize"; import { @@ -8,6 +9,7 @@ import { debounce } from "../common/util/debounce"; import { FirstWeekday, getHassTranslations, + getHassTranslationsPre109, NumberFormat, saveTranslationPreferences, TimeFormat, @@ -284,6 +286,23 @@ export default >(superClass: T) => configFlow?: Parameters[4], force = false ): Promise { + if ( + __BACKWARDS_COMPAT__ && + !atLeastVersion(this.hass!.connection.haVersion, 0, 109) + ) { + if (category !== "state") { + return this.hass!.localize; + } + const resources = await getHassTranslationsPre109(this.hass!, language); + + // Ignore the repsonse if user switched languages before we got response + if (this.hass!.language !== language) { + return this.hass!.localize; + } + + return this._updateResources(language, resources); + } + let alreadyLoaded: LoadedTranslationCategory; if (category in this.__loadedTranslations) { From 5fc950f09f146d4466b111f522e940c8ae32d8c3 Mon Sep 17 00:00:00 2001 From: Matthias Alphart Date: Wed, 24 Apr 2024 10:28:17 +0200 Subject: [PATCH 93/98] Fix `ha-filter-states` clear filter behaviour (#20599) Fix ha-filter-states clear filter behaviour --- src/components/ha-filter-devices.ts | 2 +- src/components/ha-filter-entities.ts | 2 +- src/components/ha-filter-states.ts | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/components/ha-filter-devices.ts b/src/components/ha-filter-devices.ts index 97f17f9c83b0..a88b957ed775 100644 --- a/src/components/ha-filter-devices.ts +++ b/src/components/ha-filter-devices.ts @@ -94,7 +94,7 @@ export class HaFilterDevices extends LitElement { ? nothing : html` ${computeDeviceName(device, this.hass)} `; diff --git a/src/components/ha-filter-entities.ts b/src/components/ha-filter-entities.ts index 585d35a527ad..ee92c9d0c369 100644 --- a/src/components/ha-filter-entities.ts +++ b/src/components/ha-filter-entities.ts @@ -108,7 +108,7 @@ export class HaFilterEntities extends LitElement { ? nothing : html` html` ${item.icon ? html` Date: Wed, 24 Apr 2024 10:30:34 +0200 Subject: [PATCH 94/98] Add lock features for tile card (#20539) * Added lock features for tile card * Change success label --- gallery/src/pages/lovelace/tile-card.ts | 24 +++ src/data/lock.ts | 31 +++- .../more-info/controls/more-info-lock.ts | 11 +- .../hui-lock-commands-card-feature.ts | 127 ++++++++++++++ .../hui-lock-open-door-card-feature.ts | 158 ++++++++++++++++++ src/panels/lovelace/card-features/types.ts | 10 ++ .../create-card-feature-element.ts | 4 + .../hui-card-features-editor.ts | 8 +- src/translations/en.json | 6 + 9 files changed, 369 insertions(+), 10 deletions(-) create mode 100644 src/panels/lovelace/card-features/hui-lock-commands-card-feature.ts create mode 100644 src/panels/lovelace/card-features/hui-lock-open-door-card-feature.ts diff --git a/gallery/src/pages/lovelace/tile-card.ts b/gallery/src/pages/lovelace/tile-card.ts index 62ab5abd23ed..58c5ad77bd2f 100644 --- a/gallery/src/pages/lovelace/tile-card.ts +++ b/gallery/src/pages/lovelace/tile-card.ts @@ -2,6 +2,7 @@ import { html, LitElement, PropertyValues, TemplateResult } from "lit"; import { customElement, query } from "lit/decorators"; import { CoverEntityFeature } from "../../../../src/data/cover"; import { LightColorMode } from "../../../../src/data/light"; +import { LockEntityFeature } from "../../../../src/data/lock"; import { VacuumEntityFeature } from "../../../../src/data/vacuum"; import { getEntity } from "../../../../src/fake_data/entity"; import { provideHass } from "../../../../src/fake_data/provide_hass"; @@ -20,6 +21,11 @@ const ENTITIES = [ getEntity("light", "unavailable", "unavailable", { friendly_name: "Unavailable entity", }), + getEntity("lock", "front_door", "locked", { + friendly_name: "Front Door Lock", + device_class: "lock", + supported_features: LockEntityFeature.OPEN, + }), getEntity("climate", "thermostat", "heat", { current_temperature: 73, min_temp: 45, @@ -138,6 +144,24 @@ const CONFIGS = [ - type: "color-temp" `, }, + { + heading: "Lock commands feature", + config: ` +- type: tile + entity: lock.front_door + features: + - type: "lock-commands" + `, + }, + { + heading: "Lock open door feature", + config: ` +- type: tile + entity: lock.front_door + features: + - type: "lock-open-door" + `, + }, { heading: "Vacuum commands feature", config: ` diff --git a/src/data/lock.ts b/src/data/lock.ts index 7d155369f4fa..26d42178023f 100644 --- a/src/data/lock.ts +++ b/src/data/lock.ts @@ -5,9 +5,7 @@ import { import { getExtendedEntityRegistryEntry } from "./entity_registry"; import { showEnterCodeDialog } from "../dialogs/enter-code/show-enter-code-dialog"; import { HomeAssistant } from "../types"; - -export const FORMAT_TEXT = "text"; -export const FORMAT_NUMBER = "number"; +import { UNAVAILABLE } from "./entity"; export const enum LockEntityFeature { OPEN = 1, @@ -24,6 +22,33 @@ export interface LockEntity extends HassEntityBase { type ProtectedLockService = "lock" | "unlock" | "open"; +export function isLocked(stateObj: LockEntity) { + return stateObj.state === "locked"; +} + +export function isUnlocking(stateObj: LockEntity) { + return stateObj.state === "unlocking"; +} + +export function isLocking(stateObj: LockEntity) { + return stateObj.state === "locking"; +} + +export function isJammed(stateObj: LockEntity) { + return stateObj.state === "jammed"; +} + +export function isAvailable(stateObj: LockEntity) { + if (stateObj.state === UNAVAILABLE) { + return false; + } + const assumedState = stateObj.attributes.assumed_state === true; + return ( + assumedState || + (!isLocking(stateObj) && !isUnlocking(stateObj) && !isJammed(stateObj)) + ); +} + export const callProtectedLockService = async ( element: HTMLElement, hass: HomeAssistant, diff --git a/src/dialogs/more-info/controls/more-info-lock.ts b/src/dialogs/more-info/controls/more-info-lock.ts index ac0f45e43ad9..2236a523518b 100644 --- a/src/dialogs/more-info/controls/more-info-lock.ts +++ b/src/dialogs/more-info/controls/more-info-lock.ts @@ -9,11 +9,12 @@ import "../../../components/ha-control-button"; import "../../../components/ha-control-button-group"; import "../../../components/ha-outlined-icon-button"; import "../../../components/ha-state-icon"; -import { UNAVAILABLE } from "../../../data/entity"; import { LockEntity, LockEntityFeature, callProtectedLockService, + isAvailable, + isJammed, } from "../../../data/lock"; import "../../../state-control/lock/ha-state-control-lock-toggle"; import type { HomeAssistant } from "../../../types"; @@ -85,15 +86,13 @@ class MoreInfoLock extends LitElement { "--state-color": color, }; - const isJammed = this.stateObj.state === "jammed"; - return html`
    - ${this.stateObj.state === "jammed" + ${isJammed(this.stateObj) ? html`
    @@ -125,7 +124,7 @@ class MoreInfoLock extends LitElement { ` : html` @@ -139,7 +138,7 @@ class MoreInfoLock extends LitElement { : nothing}
    - ${isJammed + ${isJammed(this.stateObj) ? html` diff --git a/src/panels/lovelace/card-features/hui-lock-commands-card-feature.ts b/src/panels/lovelace/card-features/hui-lock-commands-card-feature.ts new file mode 100644 index 000000000000..b0763a207422 --- /dev/null +++ b/src/panels/lovelace/card-features/hui-lock-commands-card-feature.ts @@ -0,0 +1,127 @@ +import { mdiLock, mdiLockOpen } from "@mdi/js"; +import { HassEntity } from "home-assistant-js-websocket"; +import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import { classMap } from "lit/directives/class-map"; +import { computeDomain } from "../../../common/entity/compute_domain"; + +import "../../../components/ha-control-button"; +import "../../../components/ha-control-button-group"; +import { + callProtectedLockService, + isAvailable, + isLocking, + isUnlocking, + isLocked, +} from "../../../data/lock"; +import { HomeAssistant } from "../../../types"; +import { LovelaceCardFeature } from "../types"; +import { LockCommandsCardFeatureConfig } from "./types"; +import { forwardHaptic } from "../../../data/haptics"; + +export const supportsLockCommandsCardFeature = (stateObj: HassEntity) => { + const domain = computeDomain(stateObj.entity_id); + return domain === "lock"; +}; + +@customElement("hui-lock-commands-card-feature") +class HuiLockCommandsCardFeature + extends LitElement + implements LovelaceCardFeature +{ + @property({ attribute: false }) public hass?: HomeAssistant; + + @property({ attribute: false }) public stateObj?: HassEntity; + + @state() private _config?: LockCommandsCardFeatureConfig; + + static getStubConfig(): LockCommandsCardFeatureConfig { + return { + type: "lock-commands", + }; + } + + public setConfig(config: LockCommandsCardFeatureConfig): void { + if (!config) { + throw new Error("Invalid configuration"); + } + this._config = config; + } + + private _onTap(ev): void { + ev.stopPropagation(); + const service = ev.target.dataset.service; + if (!this.hass || !this.stateObj || !service) { + return; + } + forwardHaptic("light"); + callProtectedLockService(this, this.hass, this.stateObj, service); + } + + protected render() { + if ( + !this._config || + !this.hass || + !this.stateObj || + !supportsLockCommandsCardFeature(this.stateObj) + ) { + return nothing; + } + + return html` + + + + + + + + + `; + } + + static get styles(): CSSResultGroup { + return css` + @keyframes pulse { + 0% { + opacity: 1; + } + 50% { + opacity: 0; + } + 100% { + opacity: 1; + } + } + .pulse { + animation: pulse 1s infinite; + } + ha-control-button-group { + margin: 0 12px 12px 12px; + --control-button-group-spacing: 12px; + } + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-lock-commands-card-feature": HuiLockCommandsCardFeature; + } +} diff --git a/src/panels/lovelace/card-features/hui-lock-open-door-card-feature.ts b/src/panels/lovelace/card-features/hui-lock-open-door-card-feature.ts new file mode 100644 index 000000000000..4b13e4432338 --- /dev/null +++ b/src/panels/lovelace/card-features/hui-lock-open-door-card-feature.ts @@ -0,0 +1,158 @@ +import { mdiCheck } from "@mdi/js"; +import { HassEntity } from "home-assistant-js-websocket"; +import { css, CSSResultGroup, html, LitElement, nothing } from "lit"; +import { customElement, property, state } from "lit/decorators"; +import { computeDomain } from "../../../common/entity/compute_domain"; + +import { supportsFeature } from "../../../common/entity/supports-feature"; +import "../../../components/ha-control-button"; +import "../../../components/ha-control-button-group"; +import { + LockEntityFeature, + callProtectedLockService, + isAvailable, +} from "../../../data/lock"; +import { HomeAssistant } from "../../../types"; +import { LovelaceCardFeature } from "../types"; +import { LockOpenDoorCardFeatureConfig } from "./types"; + +export const supportsLockOpenDoorCardFeature = (stateObj: HassEntity) => { + const domain = computeDomain(stateObj.entity_id); + return domain === "lock" && supportsFeature(stateObj, LockEntityFeature.OPEN); +}; + +const CONFIRM_TIMEOUT_SECOND = 5; +const OPENED_TIMEOUT_SECOND = 3; + +type ButtonState = "normal" | "confirm" | "success"; + +@customElement("hui-lock-open-door-card-feature") +class HuiLockOpenDoorCardFeature + extends LitElement + implements LovelaceCardFeature +{ + @property({ attribute: false }) public hass?: HomeAssistant; + + @property({ attribute: false }) public stateObj?: HassEntity; + + @state() public _buttonState: ButtonState = "normal"; + + @state() private _config?: LockOpenDoorCardFeatureConfig; + + private _buttonTimeout?: number; + + static getStubConfig(): LockOpenDoorCardFeatureConfig { + return { + type: "lock-open-door", + }; + } + + public setConfig(config: LockOpenDoorCardFeatureConfig): void { + if (!config) { + throw new Error("Invalid configuration"); + } + this._config = config; + } + + private _setButtonState(buttonState: ButtonState, timeoutSecond?: number) { + clearTimeout(this._buttonTimeout); + this._buttonState = buttonState; + if (timeoutSecond) { + this._buttonTimeout = window.setTimeout(() => { + this._buttonState = "normal"; + }, timeoutSecond * 1000); + } + } + + private async _open() { + if (this._buttonState !== "confirm") { + this._setButtonState("confirm", CONFIRM_TIMEOUT_SECOND); + return; + } + if (!this.hass || !this.stateObj) { + return; + } + callProtectedLockService(this, this.hass, this.stateObj!, "open"); + + this._setButtonState("success", OPENED_TIMEOUT_SECOND); + } + + protected render() { + if ( + !this._config || + !this.hass || + !this.stateObj || + !supportsLockOpenDoorCardFeature(this.stateObj) + ) { + return nothing; + } + + return html` + ${this._buttonState === "success" + ? html` +
    +

    + + ${this.hass.localize("ui.card.lock.open_door_success")} +

    +
    + ` + : html` + + + ${this._buttonState === "confirm" + ? this.hass.localize("ui.card.lock.open_door_confirm") + : this.hass.localize("ui.card.lock.open_door")} + + + `} + `; + } + + static get styles(): CSSResultGroup { + return css` + .buttons { + display: flex; + align-items: center; + justify-content: center; + margin-top: 0; + } + ha-control-button { + font-size: 14px; + } + ha-control-button-group { + margin: 0 12px 12px 12px; + --control-button-group-spacing: 12px; + } + .open-button { + width: 130px; + } + .open-button.confirm { + --control-button-background-color: var(--warning-color); + } + .open-success { + font-size: 14px; + line-height: 14px; + display: flex; + align-items: center; + flex-direction: row; + gap: 8px; + font-weight: 500; + color: var(--success-color); + } + ha-control-button-group + ha-attributes:not([empty]) { + margin-top: 16px; + } + `; + } +} + +declare global { + interface HTMLElementTagNameMap { + "hui-lock-open-door-card-feature": HuiLockOpenDoorCardFeature; + } +} diff --git a/src/panels/lovelace/card-features/types.ts b/src/panels/lovelace/card-features/types.ts index 7b3771a2d86f..82fa311876a5 100644 --- a/src/panels/lovelace/card-features/types.ts +++ b/src/panels/lovelace/card-features/types.ts @@ -26,6 +26,14 @@ export interface LightColorTempCardFeatureConfig { type: "light-color-temp"; } +export interface LockCommandsCardFeatureConfig { + type: "lock-commands"; +} + +export interface LockOpenDoorCardFeatureConfig { + type: "lock-open-door"; +} + export interface FanPresetModesCardFeatureConfig { type: "fan-preset-modes"; style?: "dropdown" | "icons"; @@ -143,6 +151,8 @@ export type LovelaceCardFeatureConfig = | LawnMowerCommandsCardFeatureConfig | LightBrightnessCardFeatureConfig | LightColorTempCardFeatureConfig + | LockCommandsCardFeatureConfig + | LockOpenDoorCardFeatureConfig | NumericInputCardFeatureConfig | SelectOptionsCardFeatureConfig | TargetHumidityCardFeatureConfig diff --git a/src/panels/lovelace/create-element/create-card-feature-element.ts b/src/panels/lovelace/create-element/create-card-feature-element.ts index 4054f4610ecc..2710c69ebf9a 100644 --- a/src/panels/lovelace/create-element/create-card-feature-element.ts +++ b/src/panels/lovelace/create-element/create-card-feature-element.ts @@ -14,6 +14,8 @@ import "../card-features/hui-humidifier-toggle-card-feature"; import "../card-features/hui-lawn-mower-commands-card-feature"; import "../card-features/hui-light-brightness-card-feature"; import "../card-features/hui-light-color-temp-card-feature"; +import "../card-features/hui-lock-commands-card-feature"; +import "../card-features/hui-lock-open-door-card-feature"; import "../card-features/hui-numeric-input-card-feature"; import "../card-features/hui-select-options-card-feature"; import "../card-features/hui-target-temperature-card-feature"; @@ -45,6 +47,8 @@ const TYPES: Set = new Set([ "lawn-mower-commands", "light-brightness", "light-color-temp", + "lock-commands", + "lock-open-door", "numeric-input", "select-options", "target-humidity", diff --git a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts index 444144925fa9..c4b938230a4c 100644 --- a/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-card-features-editor.ts @@ -35,6 +35,8 @@ import { supportsHumidifierToggleCardFeature } from "../../card-features/hui-hum import { supportsLawnMowerCommandCardFeature } from "../../card-features/hui-lawn-mower-commands-card-feature"; import { supportsLightBrightnessCardFeature } from "../../card-features/hui-light-brightness-card-feature"; import { supportsLightColorTempCardFeature } from "../../card-features/hui-light-color-temp-card-feature"; +import { supportsLockCommandsCardFeature } from "../../card-features/hui-lock-commands-card-feature"; +import { supportsLockOpenDoorCardFeature } from "../../card-features/hui-lock-open-door-card-feature"; import { supportsNumericInputCardFeature } from "../../card-features/hui-numeric-input-card-feature"; import { supportsSelectOptionsCardFeature } from "../../card-features/hui-select-options-card-feature"; import { supportsTargetHumidityCardFeature } from "../../card-features/hui-target-humidity-card-feature"; @@ -56,8 +58,8 @@ const UI_FEATURE_TYPES = [ "climate-preset-modes", "cover-open-close", "cover-position", - "cover-tilt-position", "cover-tilt", + "cover-tilt-position", "fan-preset-modes", "fan-speed", "humidifier-modes", @@ -65,6 +67,8 @@ const UI_FEATURE_TYPES = [ "lawn-mower-commands", "light-brightness", "light-color-temp", + "lock-commands", + "lock-open-door", "numeric-input", "select-options", "target-humidity", @@ -111,6 +115,8 @@ const SUPPORTS_FEATURE_TYPES: Record< "lawn-mower-commands": supportsLawnMowerCommandCardFeature, "light-brightness": supportsLightBrightnessCardFeature, "light-color-temp": supportsLightColorTempCardFeature, + "lock-commands": supportsLockCommandsCardFeature, + "lock-open-door": supportsLockOpenDoorCardFeature, "numeric-input": supportsNumericInputCardFeature, "select-options": supportsSelectOptionsCardFeature, "target-humidity": supportsTargetHumidityCardFeature, diff --git a/src/translations/en.json b/src/translations/en.json index c360ded24463..18b28941f5ee 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -5948,6 +5948,12 @@ "light-color-temp": { "label": "Light color temperature" }, + "lock-commands": { + "label": "Lock commands" + }, + "lock-open-door": { + "label": "Lock open door" + }, "vacuum-commands": { "label": "Vacuum commands", "commands": "Commands", From 62de16bb8e57407fdb2921cac19a7d08954405c5 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 24 Apr 2024 11:06:00 +0200 Subject: [PATCH 95/98] Implement storing sorting and grouping for all tables (#20594) --- src/components/data-table/ha-data-table.ts | 18 +++--- .../config/automation/ha-automation-picker.ts | 42 +++++++++++-- .../config/blueprint/ha-blueprint-overview.ts | 60 +++++++++++++++---- .../config/entities/ha-config-entities.ts | 53 ++++++++++++---- .../config/helpers/ha-config-helpers.ts | 34 ++++++++++- src/panels/config/labels/ha-config-labels.ts | 19 +++++- .../ha-config-lovelace-dashboards.ts | 15 +++++ .../resources/ha-config-lovelace-resources.ts | 17 +++++- src/panels/config/scene/ha-scene-dashboard.ts | 42 +++++++++++-- src/panels/config/script/ha-script-picker.ts | 42 +++++++++++-- src/panels/config/users/ha-config-users.ts | 48 +++++++++++++-- .../ha-config-voice-assistants-expose.ts | 15 +++++ 12 files changed, 352 insertions(+), 53 deletions(-) diff --git a/src/components/data-table/ha-data-table.ts b/src/components/data-table/ha-data-table.ts index 7221587266ee..e019a5d400af 100644 --- a/src/components/data-table/ha-data-table.ts +++ b/src/components/data-table/ha-data-table.ts @@ -529,11 +529,7 @@ export class HaDataTable extends LitElement { } if (this.appendRow || this.hasFab || this.groupColumn) { - const items = [...data]; - - if (this.appendRow) { - items.push({ append: true, content: this.appendRow }); - } + let items = [...data]; if (this.groupColumn) { const grouped = groupBy(items, (item) => item[this.groupColumn!]); @@ -599,14 +595,18 @@ export class HaDataTable extends LitElement { } }); - this._items = groupedItems; - } else { - this._items = items; + items = groupedItems; + } + + if (this.appendRow) { + items.push({ append: true, content: this.appendRow }); } if (this.hasFab) { - this._items = [...this._items, { empty: true }]; + items.push({ empty: true }); } + + this._items = items; } else { this._items = data; } diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index 4d58866e34e5..d11b038beb0b 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -37,15 +37,21 @@ import { computeCssColor } from "../../../common/color/compute-color"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { formatShortDateTime } from "../../../common/datetime/format_date_time"; import { relativeTime } from "../../../common/datetime/relative_time"; +import { storage } from "../../../common/decorators/storage"; import { HASSDomEvent, fireEvent } from "../../../common/dom/fire_event"; import { computeStateName } from "../../../common/entity/compute_state_name"; import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import "../../../components/chips/ha-assist-chip"; import type { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/entity/ha-entity-toggle"; @@ -105,10 +111,6 @@ import { showCategoryRegistryDetailDialog } from "../category/show-dialog-catego import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; import { showNewAutomationDialog } from "./show-dialog-new-automation"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type AutomationItem = AutomationEntity & { name: string; @@ -156,6 +158,19 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { @state() private _overflowAutomation?: AutomationItem; + @storage({ key: "automation-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "automation-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "automation-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + @query("#overflow-menu") private _overflowMenu!: HaMenu; private _sizeController = new ResizeController(this, { @@ -470,7 +485,12 @@ class HaAutomationPicker extends SubscribeMixin(LitElement) { this.hass.localize, this.hass.locale )} - initialGroupColumn="category" + .initialGroupColumn=${this._activeGrouping || "category"} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} .data=${automations} .empty=${!this.automations.length} @row-click=${this._handleRowClicked} @@ -1238,6 +1258,18 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/blueprint/ha-blueprint-overview.ts b/src/panels/config/blueprint/ha-blueprint-overview.ts index 1133bf8fa460..45f02be911ee 100644 --- a/src/panels/config/blueprint/ha-blueprint-overview.ts +++ b/src/panels/config/blueprint/ha-blueprint-overview.ts @@ -24,6 +24,7 @@ import { extractSearchParam } from "../../../common/url/search-params"; import { DataTableColumnContainer, RowClickedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/entity/ha-entity-toggle"; import "../../../components/ha-button"; @@ -54,6 +55,7 @@ import { documentationUrl } from "../../../util/documentation-url"; import { showToast } from "../../../util/toast"; import { configSections } from "../ha-panel-config"; import { showAddBlueprintDialog } from "./show-dialog-import-blueprint"; +import { storage } from "../../../common/decorators/storage"; type BlueprintMetaDataPath = BlueprintMetaData & { path: string; @@ -92,8 +94,24 @@ class HaBlueprintOverview extends LitElement { Blueprints >; + @storage({ key: "blueprint-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "blueprint-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "blueprint-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + private _processedBlueprints = memoizeOne( - (blueprints: Record): BlueprintMetaDataPath[] => { + ( + blueprints: Record, + localize: LocalizeFunc + ): BlueprintMetaDataPath[] => { const result: any[] = []; Object.entries(blueprints).forEach(([type, typeBlueprints]) => Object.entries(typeBlueprints).forEach(([path, blueprint]) => { @@ -101,6 +119,9 @@ class HaBlueprintOverview extends LitElement { result.push({ name: blueprint.error, type, + translated_type: localize( + `ui.panel.config.blueprint.overview.types.${type as "automation" | "script"}` + ), error: true, path, fullpath: `${type}/${path}`, @@ -109,6 +130,9 @@ class HaBlueprintOverview extends LitElement { result.push({ ...blueprint.metadata, type, + translated_type: localize( + `ui.panel.config.blueprint.overview.types.${type as "automation" | "script"}` + ), error: false, path, fullpath: `${type}/${path}`, @@ -140,14 +164,11 @@ class HaBlueprintOverview extends LitElement { ` : undefined, }, - type: { + translated_type: { title: localize("ui.panel.config.blueprint.overview.headers.type"), - template: (blueprint) => - html`${this.hass.localize( - `ui.panel.config.blueprint.overview.types.${blueprint.type}` - )}`, sortable: true, filterable: true, + groupable: true, hidden: narrow, direction: "asc", width: "10%", @@ -256,7 +277,7 @@ class HaBlueprintOverview extends LitElement { this.hass.language, this.hass.localize )} - .data=${this._processedBlueprints(this.blueprints)} + .data=${this._processedBlueprints(this.blueprints, this.hass.localize)} id="fullpath" .noDataText=${this.hass.localize( "ui.panel.config.blueprint.overview.no_blueprints" @@ -281,6 +302,12 @@ class HaBlueprintOverview extends LitElement { >
    `} + .initialGroupColumn=${this._activeGrouping} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} > ) { - const blueprint = this._processedBlueprints(this.blueprints).find( - (b) => b.fullpath === ev.detail.id - )!; + const blueprint = this._processedBlueprints( + this.blueprints, + this.hass.localize + ).find((b) => b.fullpath === ev.detail.id)!; if (blueprint.error) { showAlertDialog(this, { title: this.hass.localize("ui.panel.config.blueprint.overview.error", { @@ -502,6 +530,18 @@ class HaBlueprintOverview extends LitElement { fireEvent(this, "reload-blueprints"); }; + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return haStyle; } diff --git a/src/panels/config/entities/ha-config-entities.ts b/src/panels/config/entities/ha-config-entities.ts index 338ccd31e64b..1e8d9a6db479 100644 --- a/src/panels/config/entities/ha-config-entities.ts +++ b/src/panels/config/entities/ha-config-entities.ts @@ -29,6 +29,7 @@ import { ifDefined } from "lit/directives/if-defined"; import { styleMap } from "lit/directives/style-map"; import memoize from "memoize-one"; import { computeCssColor } from "../../../common/color/compute-color"; +import { storage } from "../../../common/decorators/storage"; import type { HASSDomEvent } from "../../../common/dom/fire_event"; import { computeDomain } from "../../../common/entity/compute_domain"; import { computeStateName } from "../../../common/entity/compute_state_name"; @@ -37,10 +38,15 @@ import { protocolIntegrationPicked, } from "../../../common/integrations/protocolIntegrationPicked"; import { LocalizeFunc } from "../../../common/translations/localize"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import type { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/ha-alert"; @@ -66,6 +72,11 @@ import { removeEntityRegistryEntry, updateEntityRegistryEntry, } from "../../../data/entity_registry"; +import { + EntitySources, + fetchEntitySourcesWithCache, +} from "../../../data/entity_sources"; +import { domainToName } from "../../../data/integration"; import { LabelRegistryEntry, createLabelRegistryEntry, @@ -86,15 +97,6 @@ import { configSections } from "../ha-panel-config"; import "../integrations/ha-integration-overflow-menu"; import { showAddIntegrationDialog } from "../integrations/show-add-integration-dialog"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - EntitySources, - fetchEntitySourcesWithCache, -} from "../../../data/entity_sources"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; -import { domainToName } from "../../../data/integration"; export interface StateEntity extends Omit { @@ -151,6 +153,19 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { @state() private _entitySources?: EntitySources; + @storage({ key: "entities-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "entities-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "entities-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + @query("hass-tabs-subpage-data-table", true) private _dataTable!: HaTabsSubpageDataTable; @@ -265,7 +280,7 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { }, domain: { title: localize("ui.panel.config.entities.picker.headers.domain"), - sortable: true, + sortable: false, hidden: true, filterable: true, groupable: true, @@ -603,6 +618,12 @@ export class HaConfigEntities extends SubscribeMixin(LitElement) { .filter=${this._filter} selectable .selected=${this._selected.length} + .initialGroupColumn=${this._activeGrouping} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} @selection-changed=${this._handleSelectionChanged} clickable @clear-filter=${this._clearFilter} @@ -1205,6 +1226,18 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/helpers/ha-config-helpers.ts b/src/panels/config/helpers/ha-config-helpers.ts index 14149c7d1914..6be09330eec9 100644 --- a/src/panels/config/helpers/ha-config-helpers.ts +++ b/src/panels/config/helpers/ha-config-helpers.ts @@ -24,6 +24,7 @@ import { import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { computeCssColor } from "../../../common/color/compute-color"; +import { storage } from "../../../common/decorators/storage"; import { HASSDomEvent } from "../../../common/dom/fire_event"; import { computeStateDomain } from "../../../common/entity/compute_state_domain"; import { navigate } from "../../../common/navigate"; @@ -40,6 +41,7 @@ import { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/ha-fab"; @@ -139,6 +141,19 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { @property({ attribute: false }) public route!: Route; + @storage({ key: "helpers-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "helpers-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "helpers-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + @state() private _stateItems: HassEntity[] = []; @state() private _entityEntries?: Record; @@ -525,7 +540,12 @@ export class HaConfigHelpers extends SubscribeMixin(LitElement) { ).length} .columns=${this._columns(this.narrow, this.hass.localize)} .data=${helpers} - initialGroupColumn="category" + .initialGroupColumn=${this._activeGrouping || "category"} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} .activeFilters=${this._activeFilters} @clear-filter=${this._clearFilter} @row-click=${this._openEditDialog} @@ -1020,6 +1040,18 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/labels/ha-config-labels.ts b/src/panels/config/labels/ha-config-labels.ts index 5e05b468aee4..43f346ce6a71 100644 --- a/src/panels/config/labels/ha-config-labels.ts +++ b/src/panels/config/labels/ha-config-labels.ts @@ -10,15 +10,17 @@ import { LitElement, PropertyValues, html, nothing } from "lit"; import { customElement, property, state } from "lit/decorators"; import memoizeOne from "memoize-one"; import { computeCssColor } from "../../../common/color/compute-color"; +import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; import { DataTableColumnContainer, RowClickedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/ha-fab"; import "../../../components/ha-icon-button"; -import "../../../components/ha-relative-time"; import "../../../components/ha-icon-overflow-menu"; +import "../../../components/ha-relative-time"; import { LabelRegistryEntry, LabelRegistryEntryMutableParams, @@ -35,7 +37,7 @@ import "../../../layouts/hass-tabs-subpage-data-table"; import { HomeAssistant, Route } from "../../../types"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "./show-dialog-label-detail"; -import { navigate } from "../../../common/navigate"; +import { storage } from "../../../common/decorators/storage"; @customElement("ha-config-labels") export class HaConfigLabels extends LitElement { @@ -49,6 +51,13 @@ export class HaConfigLabels extends LitElement { @state() private _labels: LabelRegistryEntry[] = []; + @storage({ + key: "labels-table-sort", + state: false, + subscribe: false, + }) + private _activeSorting?: SortingChangedEvent; + private _columns = memoizeOne((localize: LocalizeFunc) => { const columns: DataTableColumnContainer = { icon: { @@ -149,6 +158,8 @@ export class HaConfigLabels extends LitElement { .data=${this._data(this._labels)} .noDataText=${this.hass.localize("ui.panel.config.labels.no_labels")} hasFab + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} @row-click=${this._editLabel} clickable id="label_id" @@ -268,6 +279,10 @@ export class HaConfigLabels extends LitElement { `/config/automation/dashboard?historyBack=1&label=${label.label_id}` ); } + + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } } declare global { diff --git a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts index c393cd0cedb9..a089218c8c22 100644 --- a/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts +++ b/src/panels/config/lovelace/dashboards/ha-config-lovelace-dashboards.ts @@ -16,6 +16,7 @@ import { stringCompare } from "../../../../common/string/compare"; import { DataTableColumnContainer, RowClickedEvent, + SortingChangedEvent, } from "../../../../components/data-table/ha-data-table"; import "../../../../components/ha-clickable-list-item"; import "../../../../components/ha-fab"; @@ -46,6 +47,7 @@ import { showNewDashboardDialog } from "../../dashboard/show-dialog-new-dashboar import { lovelaceTabs } from "../ha-config-lovelace"; import { showDashboardConfigureStrategyDialog } from "./show-dialog-lovelace-dashboard-configure-strategy"; import { showDashboardDetailDialog } from "./show-dialog-lovelace-dashboard-detail"; +import { storage } from "../../../../common/decorators/storage"; type DataTableItem = Pick< LovelaceDashboard, @@ -68,6 +70,13 @@ export class HaConfigLovelaceDashboards extends LitElement { @state() private _dashboards: LovelaceDashboard[] = []; + @storage({ + key: "lovelace-dashboards-table-sort", + state: false, + subscribe: false, + }) + private _activeSorting?: SortingChangedEvent; + public willUpdate() { if (!this.hasUpdated) { this.hass.loadFragmentTranslation("lovelace"); @@ -293,6 +302,8 @@ export class HaConfigLovelaceDashboards extends LitElement { this.hass.localize )} .data=${this._getItems(this._dashboards)} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} @row-click=${this._editDashboard} id="url_path" hasFab @@ -440,6 +451,10 @@ export class HaConfigLovelaceDashboards extends LitElement { }, }); } + + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } } declare global { diff --git a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts index 273713b950a3..3131af913ee5 100644 --- a/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts +++ b/src/panels/config/lovelace/resources/ha-config-lovelace-resources.ts @@ -10,9 +10,11 @@ import { import { customElement, property, state } from "lit/decorators"; import memoize from "memoize-one"; import { stringCompare } from "../../../../common/string/compare"; +import { LocalizeFunc } from "../../../../common/translations/localize"; import { DataTableColumnContainer, RowClickedEvent, + SortingChangedEvent, } from "../../../../components/data-table/ha-data-table"; import "../../../../components/ha-card"; import "../../../../components/ha-fab"; @@ -33,10 +35,10 @@ import "../../../../layouts/hass-subpage"; import "../../../../layouts/hass-tabs-subpage-data-table"; import { haStyle } from "../../../../resources/styles"; import { HomeAssistant, Route } from "../../../../types"; -import { LocalizeFunc } from "../../../../common/translations/localize"; import { loadLovelaceResources } from "../../../lovelace/common/load-resources"; import { lovelaceResourcesTabs } from "../ha-config-lovelace"; import { showResourceDetailDialog } from "./show-dialog-lovelace-resource-detail"; +import { storage } from "../../../../common/decorators/storage"; @customElement("ha-config-lovelace-resources") export class HaConfigLovelaceRescources extends LitElement { @@ -50,6 +52,13 @@ export class HaConfigLovelaceRescources extends LitElement { @state() private _resources: LovelaceResource[] = []; + @storage({ + key: "lovelace-resources-table-sort", + state: false, + subscribe: false, + }) + private _activeSorting?: SortingChangedEvent; + private _columns = memoize( ( _language, @@ -127,6 +136,8 @@ export class HaConfigLovelaceRescources extends LitElement { .noDataText=${this.hass.localize( "ui.panel.config.lovelace.resources.picker.no_resources" )} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} @row-click=${this._editResource} hasFab clickable @@ -237,6 +248,10 @@ export class HaConfigLovelaceRescources extends LitElement { }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index 9a0402f6a99b..c77bb1fb503c 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -32,14 +32,20 @@ import memoizeOne from "memoize-one"; import { computeCssColor } from "../../../common/color/compute-color"; import { formatShortDateTime } from "../../../common/datetime/format_date_time"; import { relativeTime } from "../../../common/datetime/relative_time"; +import { storage } from "../../../common/decorators/storage"; import { HASSDomEvent, fireEvent } from "../../../common/dom/fire_event"; import { computeStateName } from "../../../common/entity/compute_state_name"; import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/ha-button"; @@ -95,10 +101,6 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type SceneItem = SceneEntity & { name: string; @@ -144,6 +146,19 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @storage({ key: "scene-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "scene-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "scene-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + private _sizeController = new ResizeController(this, { callback: (entries) => entries[0]?.contentRect.width, }); @@ -463,7 +478,12 @@ class HaSceneDashboard extends SubscribeMixin(LitElement) { ).length} .columns=${this._columns(this.narrow, this.hass.localize)} id="entity_id" - initialGroupColumn="category" + .initialGroupColumn=${this._activeGrouping || "category"} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} .data=${scenes} .empty=${!this.scenes.length} .activeFilters=${this._activeFilters} @@ -975,6 +995,18 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index 8282abf6b7c9..2d8f5e70c114 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -33,14 +33,20 @@ import { computeCssColor } from "../../../common/color/compute-color"; import { isComponentLoaded } from "../../../common/config/is_component_loaded"; import { formatShortDateTime } from "../../../common/datetime/format_date_time"; import { relativeTime } from "../../../common/datetime/relative_time"; +import { storage } from "../../../common/decorators/storage"; import { HASSDomEvent, fireEvent } from "../../../common/dom/fire_event"; import { computeStateName } from "../../../common/entity/compute_state_name"; import { navigate } from "../../../common/navigate"; import { LocalizeFunc } from "../../../common/translations/localize"; +import { + hasRejectedItems, + rejectedItems, +} from "../../../common/util/promise-all-settled-results"; import { DataTableColumnContainer, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-labels"; import "../../../components/ha-fab"; @@ -97,10 +103,6 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type ScriptItem = ScriptEntity & { name: string; @@ -148,6 +150,19 @@ class HaScriptPicker extends SubscribeMixin(LitElement) { @consume({ context: fullEntitiesContext, subscribe: true }) _entityReg!: EntityRegistryEntry[]; + @storage({ key: "script-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "script-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "script-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + private _sizeController = new ResizeController(this, { callback: (entries) => entries[0]?.contentRect.width, }); @@ -462,7 +477,12 @@ class HaScriptPicker extends SubscribeMixin(LitElement) { { number: scripts.length } )} hasFilters - initialGroupColumn="category" + .initialGroupColumn=${this._activeGrouping || "category"} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} selectable .selected=${this._selected.length} @selection-changed=${this._handleSelectionChanged} @@ -1091,6 +1111,18 @@ ${rejected }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } + static get styles(): CSSResultGroup { return [ haStyle, diff --git a/src/panels/config/users/ha-config-users.ts b/src/panels/config/users/ha-config-users.ts index 2512e0d3d1eb..a99d3ccf030f 100644 --- a/src/panels/config/users/ha-config-users.ts +++ b/src/panels/config/users/ha-config-users.ts @@ -7,6 +7,7 @@ import { LocalizeFunc } from "../../../common/translations/localize"; import { DataTableColumnContainer, RowClickedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/data-table/ha-data-table-icon"; import "../../../components/ha-fab"; @@ -25,6 +26,7 @@ import { HomeAssistant, Route } from "../../../types"; import { configSections } from "../ha-panel-config"; import { showAddUserDialog } from "./show-dialog-add-user"; import { showUserDetailDialog } from "./show-dialog-user-detail"; +import { storage } from "../../../common/decorators/storage"; @customElement("ha-config-users") export class HaConfigUsers extends LitElement { @@ -38,6 +40,19 @@ export class HaConfigUsers extends LitElement { @state() private _users: User[] = []; + @storage({ key: "users-table-sort", state: false, subscribe: false }) + private _activeSorting?: SortingChangedEvent; + + @storage({ key: "users-table-grouping", state: false, subscribe: false }) + private _activeGrouping?: string; + + @storage({ + key: "users-table-collapsed", + state: false, + subscribe: false, + }) + private _activeCollapsed?: string; + private _columns = memoizeOne( (narrow: boolean, localize: LocalizeFunc): DataTableColumnContainer => { const columns: DataTableColumnContainer = { @@ -70,16 +85,14 @@ export class HaConfigUsers extends LitElement { hidden: narrow, template: (user) => html`${user.username || "—"}`, }, - group_ids: { + group: { title: localize("ui.panel.config.users.picker.headers.group"), sortable: true, filterable: true, + groupable: true, width: "20%", direction: "asc", hidden: narrow, - template: (user) => html` - ${localize(`groups.${user.group_ids[0]}`)} - `, }, is_active: { title: this.hass.localize( @@ -164,7 +177,13 @@ export class HaConfigUsers extends LitElement { backPath="/config" .tabs=${configSections.persons} .columns=${this._columns(this.narrow, this.hass.localize)} - .data=${this._users} + .data=${this._userData(this._users, this.hass.localize)} + .initialGroupColumn=${this._activeGrouping} + .initialCollapsedGroups=${this._activeCollapsed} + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} + @grouping-changed=${this._handleGroupingChanged} + @collapsed-changed=${this._handleCollapseChanged} @row-click=${this._editUser} hasFab clickable @@ -181,6 +200,13 @@ export class HaConfigUsers extends LitElement { `; } + private _userData = memoizeOne((users: User[], localize: LocalizeFunc) => + users.map((user) => ({ + ...user, + group: localize(`groups.${user.group_ids[0]}`), + })) + ); + private async _fetchUsers() { this._users = await fetchUsers(this.hass); @@ -245,6 +271,18 @@ export class HaConfigUsers extends LitElement { }, }); } + + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + + private _handleGroupingChanged(ev: CustomEvent) { + this._activeGrouping = ev.detail.value; + } + + private _handleCollapseChanged(ev: CustomEvent) { + this._activeCollapsed = ev.detail.value; + } } declare global { diff --git a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts index c64ea12cef29..68caa31338cf 100644 --- a/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts +++ b/src/panels/config/voice-assistants/ha-config-voice-assistants-expose.ts @@ -23,6 +23,7 @@ import { DataTableRowData, RowClickedEvent, SelectionChangedEvent, + SortingChangedEvent, } from "../../../components/data-table/ha-data-table"; import "../../../components/ha-fab"; import { AlexaEntity, fetchCloudAlexaEntities } from "../../../data/alexa"; @@ -52,6 +53,7 @@ import "./expose/expose-assistant-icon"; import { voiceAssistantTabs } from "./ha-config-voice-assistants"; import { showExposeEntityDialog } from "./show-dialog-expose-entity"; import { showVoiceSettingsDialog } from "./show-dialog-voice-settings"; +import { storage } from "../../../common/decorators/storage"; @customElement("ha-config-voice-assistants-expose") export class VoiceAssistantsExpose extends LitElement { @@ -87,6 +89,13 @@ export class VoiceAssistantsExpose extends LitElement { string[] | undefined >; + @storage({ + key: "voice-expose-table-sort", + state: false, + subscribe: false, + }) + private _activeSorting?: SortingChangedEvent; + @query("hass-tabs-subpage-data-table", true) private _dataTable!: HaTabsSubpageDataTable; @@ -505,6 +514,8 @@ export class VoiceAssistantsExpose extends LitElement { selectable .selected=${this._selectedEntities.length} clickable + .initialSorting=${this._activeSorting} + @sorting-changed=${this._handleSortingChanged} @selection-changed=${this._handleSelectionChanged} @clear-filter=${this._clearFilter} @search-changed=${this._handleSearchChange} @@ -696,6 +707,10 @@ export class VoiceAssistantsExpose extends LitElement { navigate(window.location.pathname, { replace: true }); } + private _handleSortingChanged(ev: CustomEvent) { + this._activeSorting = ev.detail; + } + static get styles(): CSSResultGroup { return [ haStyle, From 67c60a4aa81306472e0481a0e322fc90bc8b1864 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 24 Apr 2024 11:06:15 +0200 Subject: [PATCH 96/98] Add strict connection cloud settings (#20585) * Add strict connection cloud settings * Change static page to guard page * saving files helps... * Add create link button * use correct service --- package.json | 2 +- src/data/cloud.ts | 4 + .../config/cloud/account/cloud-remote-pref.ts | 104 +++++++++++++++++- src/state/connection-mixin.ts | 6 +- src/translations/en.json | 13 +++ src/types.ts | 4 +- yarn.lock | 10 +- 7 files changed, 133 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index 59c321dc9799..583d05fc240b 100644 --- a/package.json +++ b/package.json @@ -111,7 +111,7 @@ "fuse.js": "7.0.0", "google-timezones-json": "1.2.0", "hls.js": "patch:hls.js@npm%3A1.5.7#~/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch", - "home-assistant-js-websocket": "9.2.1", + "home-assistant-js-websocket": "9.3.0", "idb-keyval": "6.2.1", "intl-messageformat": "10.5.11", "js-yaml": "4.1.0", diff --git a/src/data/cloud.ts b/src/data/cloud.ts index 5db22590c4fa..e3d62b513bb6 100644 --- a/src/data/cloud.ts +++ b/src/data/cloud.ts @@ -1,6 +1,8 @@ import { EntityFilter } from "../common/entity/entity_filter"; import { HomeAssistant } from "../types"; +type StrictConnectionMode = "disabled" | "guard_page" | "drop_connection"; + interface CloudStatusNotLoggedIn { logged_in: false; cloud: "disconnected" | "connecting" | "connected"; @@ -19,6 +21,7 @@ export interface CloudPreferences { alexa_enabled: boolean; remote_enabled: boolean; remote_allow_remote_enable: boolean; + strict_connection: StrictConnectionMode; google_secure_devices_pin: string | undefined; cloudhooks: { [webhookId: string]: CloudWebhook }; alexa_report_state: boolean; @@ -141,6 +144,7 @@ export const updateCloudPref = ( google_secure_devices_pin?: CloudPreferences["google_secure_devices_pin"]; tts_default_voice?: CloudPreferences["tts_default_voice"]; remote_allow_remote_enable?: CloudPreferences["remote_allow_remote_enable"]; + strict_connection?: CloudPreferences["strict_connection"]; } ) => hass.callWS({ diff --git a/src/panels/config/cloud/account/cloud-remote-pref.ts b/src/panels/config/cloud/account/cloud-remote-pref.ts index cd9d509f81ac..508ac04f22af 100644 --- a/src/panels/config/cloud/account/cloud-remote-pref.ts +++ b/src/panels/config/cloud/account/cloud-remote-pref.ts @@ -21,6 +21,7 @@ import { import type { HomeAssistant } from "../../../../types"; import { showToast } from "../../../../util/toast"; import { showCloudCertificateDialog } from "../dialog-cloud-certificate/show-dialog-cloud-certificate"; +import { showAlertDialog } from "../../../lovelace/custom-card-helpers"; @customElement("cloud-remote-pref") export class CloudRemotePref extends LitElement { @@ -33,7 +34,7 @@ export class CloudRemotePref extends LitElement { return nothing; } - const { remote_enabled, remote_allow_remote_enable } = + const { remote_enabled, remote_allow_remote_enable, strict_connection } = this.cloudStatus.prefs; const { @@ -153,6 +154,61 @@ export class CloudRemotePref extends LitElement { @change=${this._toggleAllowRemoteEnabledChanged} > + + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection" + )} + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_secondary" + )} + + + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_modes.disabled" + )} + + + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_modes.guard_page" + )} + + + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_modes.drop_connection" + )} + + + + ${strict_connection !== "disabled" + ? html` + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_link" + )} + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_link_secondary" + )} + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_create_link" + )} + ` + : nothing} ${this.hass.localize( @@ -223,6 +279,18 @@ export class CloudRemotePref extends LitElement { } } + private async _setStrictConnectionMode(ev) { + const mode = ev.target.value; + try { + await updateCloudPref(this.hass, { + strict_connection: mode, + }); + fireEvent(this, "ha-refresh-cloud-status"); + } catch (err: any) { + alert(err.message); + } + } + private async _copyURL(ev): Promise { const url = ev.currentTarget.url; await copyToClipboard(url); @@ -231,6 +299,40 @@ export class CloudRemotePref extends LitElement { }); } + private async _createLoginUrl() { + try { + const result = await this.hass.callService( + "cloud", + "create_temporary_strict_connection_url", + undefined, + undefined, + false, + true + ); + showAlertDialog(this, { + title: this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_link" + ), + text: html`${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_link_created_message" + )} +
    ${result.response.url}
    + + + ${this.hass.localize( + "ui.panel.config.cloud.account.remote.strict_connection_copy_link" + )} + `, + }); + } catch (err: any) { + showAlertDialog(this, { text: err.message }); + } + } + static get styles(): CSSResultGroup { return css` .preparing { diff --git a/src/state/connection-mixin.ts b/src/state/connection-mixin.ts index b00cc43b28c7..e37652950131 100644 --- a/src/state/connection-mixin.ts +++ b/src/state/connection-mixin.ts @@ -83,7 +83,8 @@ export const connectionMixin = >( service, serviceData, target, - notifyOnError = true + notifyOnError = true, + returnResponse = false ) => { if (__DEV__ || this.hass?.debugConnection) { // eslint-disable-next-line no-console @@ -101,7 +102,8 @@ export const connectionMixin = >( domain, service, serviceData ?? {}, - target + target, + returnResponse )) as ServiceCallResponse; } catch (err: any) { if ( diff --git a/src/translations/en.json b/src/translations/en.json index 18b28941f5ee..65b153f5221d 100644 --- a/src/translations/en.json +++ b/src/translations/en.json @@ -3837,6 +3837,19 @@ "advanced_options": "Advanced options", "external_activation": "Allow external activation of remote control", "external_activation_secondary": "Allows you to turn on remote control from your Nabu Casa account page, even if you're outside your local network", + "strict_connection": "Restrict access to logged in users", + "strict_connection_secondary": "When a user is not logged in to your Home Assistant instance, they will not be able to access your instance remotely", + "strict_connection_mode": "Mode", + "strict_connection_modes": { + "disabled": "Disabled", + "guard_page": "Guard page", + "drop_connection": "Drop connection" + }, + "strict_connection_link": "Create login link", + "strict_connection_link_secondary": "You can create a link that will give temporary access to the login page.", + "strict_connection_create_link": "Create link", + "strict_connection_link_created_message": "Give this link to the person you want to give remote access to the login page of your Home Assistant instance.", + "strict_connection_copy_link": "Copy link", "certificate_info": "Certificate info", "certificate_expire": "Will be renewed at {date}", "more_info": "More info" diff --git a/src/types.ts b/src/types.ts index cb0e1931f910..c6b32be85d06 100644 --- a/src/types.ts +++ b/src/types.ts @@ -190,6 +190,7 @@ export interface Context { export interface ServiceCallResponse { context: Context; + response?: any; } export interface ServiceCallRequest { @@ -241,7 +242,8 @@ export interface HomeAssistant { service: ServiceCallRequest["service"], serviceData?: ServiceCallRequest["serviceData"], target?: ServiceCallRequest["target"], - notifyOnError?: boolean + notifyOnError?: boolean, + returnResponse?: boolean ): Promise; callApi( method: "GET" | "POST" | "PUT" | "DELETE", diff --git a/yarn.lock b/yarn.lock index 28ce42d768e7..b546d2a82f0d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9703,7 +9703,7 @@ __metadata: gulp-rename: "npm:2.0.0" gulp-zopfli-green: "npm:6.0.1" hls.js: "patch:hls.js@npm%3A1.5.7#~/.yarn/patches/hls.js-npm-1.5.7-f5bbd3d060.patch" - home-assistant-js-websocket: "npm:9.2.1" + home-assistant-js-websocket: "npm:9.3.0" html-minifier-terser: "npm:7.2.0" husky: "npm:9.0.11" idb-keyval: "npm:6.2.1" @@ -9777,10 +9777,10 @@ __metadata: languageName: unknown linkType: soft -"home-assistant-js-websocket@npm:9.2.1": - version: 9.2.1 - resolution: "home-assistant-js-websocket@npm:9.2.1" - checksum: 10/0508aacb4285c805953e620968ef7ca7fc9c3cdac18fa723dd9af128dff74ef2ec65fad4079353b80363cd1daec6d2798b46d2d40a7e4ff5c0807ac71080bf58 +"home-assistant-js-websocket@npm:9.3.0": + version: 9.3.0 + resolution: "home-assistant-js-websocket@npm:9.3.0" + checksum: 10/0afbe9f327c3f917187422db1b800383530846724ed8985bb076f6312a10580baeff706d45fba3d840348b76e261eab3f3f7c0b4597340d7575b9b09fc41b0c7 languageName: node linkType: hard From af3a331f57c879f170679e66c9223c959da0003d Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 24 Apr 2024 11:09:48 +0200 Subject: [PATCH 97/98] Bumped version to 20240424.0 --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 1ac865e1d982..b25adda887fd 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta" [project] name = "home-assistant-frontend" -version = "20240404.1" +version = "20240424.0" license = {text = "Apache-2.0"} description = "The Home Assistant frontend" readme = "README.md" From 4b0d19b615e45a96977e4e2092be3bdaab53b8e3 Mon Sep 17 00:00:00 2001 From: Bram Kragten Date: Wed, 24 Apr 2024 11:14:55 +0200 Subject: [PATCH 98/98] Fix duplicate imports from merge --- src/panels/config/automation/ha-automation-picker.ts | 4 ---- src/panels/config/scene/ha-scene-dashboard.ts | 4 ---- src/panels/config/script/ha-script-picker.ts | 4 ---- 3 files changed, 12 deletions(-) diff --git a/src/panels/config/automation/ha-automation-picker.ts b/src/panels/config/automation/ha-automation-picker.ts index bd3350ff88f7..d11b038beb0b 100644 --- a/src/panels/config/automation/ha-automation-picker.ts +++ b/src/panels/config/automation/ha-automation-picker.ts @@ -111,10 +111,6 @@ import { showCategoryRegistryDetailDialog } from "../category/show-dialog-catego import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; import { showNewAutomationDialog } from "./show-dialog-new-automation"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type AutomationItem = AutomationEntity & { name: string; diff --git a/src/panels/config/scene/ha-scene-dashboard.ts b/src/panels/config/scene/ha-scene-dashboard.ts index f5f4793fd22e..c77bb1fb503c 100644 --- a/src/panels/config/scene/ha-scene-dashboard.ts +++ b/src/panels/config/scene/ha-scene-dashboard.ts @@ -101,10 +101,6 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type SceneItem = SceneEntity & { name: string; diff --git a/src/panels/config/script/ha-script-picker.ts b/src/panels/config/script/ha-script-picker.ts index 1daa94c9b4f3..2d8f5e70c114 100644 --- a/src/panels/config/script/ha-script-picker.ts +++ b/src/panels/config/script/ha-script-picker.ts @@ -103,10 +103,6 @@ import { showAssignCategoryDialog } from "../category/show-dialog-assign-categor import { showCategoryRegistryDetailDialog } from "../category/show-dialog-category-registry-detail"; import { configSections } from "../ha-panel-config"; import { showLabelDetailDialog } from "../labels/show-dialog-label-detail"; -import { - hasRejectedItems, - rejectedItems, -} from "../../../common/util/promise-all-settled-results"; type ScriptItem = ScriptEntity & { name: string;