From 6f8c366bad70b50465e0dabf87a15e5a50e75efe Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Mon, 15 Jan 2024 16:49:22 -0500 Subject: [PATCH] Update dependency prettier to v3.2.0 (#19411) * Update dependency prettier to v3.2.0 * Reformat --------- Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> Co-authored-by: Steve Repsher --- .../registries/dialog-hassio-registries.ts | 9 ++- .../dialog-hassio-repositories.ts | 9 ++- package.json | 2 +- src/components/user/ha-users-picker.ts | 66 +++++++++---------- .../core/ha-config-system-navigation.ts | 5 +- .../entity-registry-settings-editor.ts | 8 ++- .../config/helpers/forms/ha-counter-form.ts | 9 ++- .../helpers/forms/ha-input_boolean-form.ts | 9 ++- .../helpers/forms/ha-input_button-form.ts | 9 ++- .../helpers/forms/ha-input_datetime-form.ts | 9 ++- .../helpers/forms/ha-input_number-form.ts | 9 ++- .../helpers/forms/ha-input_select-form.ts | 9 ++- .../helpers/forms/ha-input_text-form.ts | 9 ++- .../config/helpers/forms/ha-schedule-form.ts | 9 ++- .../config/helpers/forms/ha-timer-form.ts | 9 ++- .../config/script/manual-script-editor.ts | 4 +- .../service/developer-tools-service.ts | 8 +-- .../card-editor/hui-dialog-edit-card.ts | 5 +- ...-climate-hvac-modes-card-feature-editor.ts | 4 +- .../hui-statistics-graph-card-editor.ts | 9 ++- ...ter-operation-modes-card-feature-editor.ts | 4 +- src/resources/css-variables.ts | 7 +- yarn.lock | 10 +-- 23 files changed, 110 insertions(+), 121 deletions(-) diff --git a/hassio/src/dialogs/registries/dialog-hassio-registries.ts b/hassio/src/dialogs/registries/dialog-hassio-registries.ts index d623ebf3b8..e26753e5dc 100644 --- a/hassio/src/dialogs/registries/dialog-hassio-registries.ts +++ b/hassio/src/dialogs/registries/dialog-hassio-registries.ts @@ -157,11 +157,10 @@ class HassioRegistriesDialog extends LitElement { } public focus(): void { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts index 5443d7ed44..1399e552df 100644 --- a/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts +++ b/hassio/src/dialogs/repositories/dialog-hassio-repositories.ts @@ -209,11 +209,10 @@ class HassioRepositoriesDialog extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/package.json b/package.json index 02ece2fcfe..92eafcd8ca 100644 --- a/package.json +++ b/package.json @@ -224,7 +224,7 @@ "object-hash": "3.0.0", "open": "10.0.3", "pinst": "3.0.0", - "prettier": "3.1.1", + "prettier": "3.2.0", "rollup": "2.79.1", "rollup-plugin-string": "3.0.0", "rollup-plugin-terser": "7.0.2", diff --git a/src/components/user/ha-users-picker.ts b/src/components/user/ha-users-picker.ts index aeda071a88..a78de5ed4c 100644 --- a/src/components/user/ha-users-picker.ts +++ b/src/components/user/ha-users-picker.ts @@ -40,40 +40,38 @@ class HaUsersPickerLight extends LitElement { const notSelectedUsers = this._notSelectedUsers(this.users, this.value); return html` - ${guard( - [notSelectedUsers], - () => - this.value?.map( - (user_id, idx) => html` -
- - - > -
- ` - ) + ${guard([notSelectedUsers], () => + this.value?.map( + (user_id, idx) => html` +
+ + + > +
+ ` + ) )} hw.board !== null) - ?.name; + this._boardName = hardwareInfo?.hardware.find( + (hw) => hw.board !== null + )?.name; } else if (isHassioLoaded) { const osData: HassioHassOSInfo = await fetchHassioHassOsInfo(this.hass); if (osData.board) { diff --git a/src/panels/config/entities/entity-registry-settings-editor.ts b/src/panels/config/entities/entity-registry-settings-editor.ts index 9e7213e414..783528c53a 100644 --- a/src/panels/config/entities/entity-registry-settings-editor.ts +++ b/src/panels/config/entities/entity-registry-settings-editor.ts @@ -917,9 +917,11 @@ export class EntityRegistrySettingsEditor extends LitElement { "ui.dialogs.entity_registry.editor.use_device_area" )} ${this.hass.devices[this.entry.device_id].area_id - ? `(${this.hass.areas[ - this.hass.devices[this.entry.device_id].area_id! - ]?.name})` + ? `(${ + this.hass.areas[ + this.hass.devices[this.entry.device_id].area_id! + ]?.name + })` : ""} - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_boolean-form.ts b/src/panels/config/helpers/forms/ha-input_boolean-form.ts index 8a2c1eeacd..6558302350 100644 --- a/src/panels/config/helpers/forms/ha-input_boolean-form.ts +++ b/src/panels/config/helpers/forms/ha-input_boolean-form.ts @@ -31,11 +31,10 @@ class HaInputBooleanForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_button-form.ts b/src/panels/config/helpers/forms/ha-input_button-form.ts index 9409311757..e02fbf35e2 100644 --- a/src/panels/config/helpers/forms/ha-input_button-form.ts +++ b/src/panels/config/helpers/forms/ha-input_button-form.ts @@ -31,11 +31,10 @@ class HaInputButtonForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_datetime-form.ts b/src/panels/config/helpers/forms/ha-input_datetime-form.ts index dfb3dd6503..6210bfcfe7 100644 --- a/src/panels/config/helpers/forms/ha-input_datetime-form.ts +++ b/src/panels/config/helpers/forms/ha-input_datetime-form.ts @@ -45,11 +45,10 @@ class HaInputDateTimeForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_number-form.ts b/src/panels/config/helpers/forms/ha-input_number-form.ts index b047708d24..461c2b96df 100644 --- a/src/panels/config/helpers/forms/ha-input_number-form.ts +++ b/src/panels/config/helpers/forms/ha-input_number-form.ts @@ -60,11 +60,10 @@ class HaInputNumberForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_select-form.ts b/src/panels/config/helpers/forms/ha-input_select-form.ts index 4f5ed4c271..ef84db325e 100644 --- a/src/panels/config/helpers/forms/ha-input_select-form.ts +++ b/src/panels/config/helpers/forms/ha-input_select-form.ts @@ -58,11 +58,10 @@ class HaInputSelectForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-input_text-form.ts b/src/panels/config/helpers/forms/ha-input_text-form.ts index 852b62d628..aa46c28f89 100644 --- a/src/panels/config/helpers/forms/ha-input_text-form.ts +++ b/src/panels/config/helpers/forms/ha-input_text-form.ts @@ -50,11 +50,10 @@ class HaInputTextForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-schedule-form.ts b/src/panels/config/helpers/forms/ha-schedule-form.ts index a4dd69bf45..43fded379b 100644 --- a/src/panels/config/helpers/forms/ha-schedule-form.ts +++ b/src/panels/config/helpers/forms/ha-schedule-form.ts @@ -108,11 +108,10 @@ class HaScheduleForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/helpers/forms/ha-timer-form.ts b/src/panels/config/helpers/forms/ha-timer-form.ts index 34ff52ad87..069096a98b 100644 --- a/src/panels/config/helpers/forms/ha-timer-form.ts +++ b/src/panels/config/helpers/forms/ha-timer-form.ts @@ -39,11 +39,10 @@ class HaTimerForm extends LitElement { } public focus() { - this.updateComplete.then( - () => - ( - this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement - )?.focus() + this.updateComplete.then(() => + ( + this.shadowRoot?.querySelector("[dialogInitialFocus]") as HTMLElement + )?.focus() ); } diff --git a/src/panels/config/script/manual-script-editor.ts b/src/panels/config/script/manual-script-editor.ts index a648ec8bbc..78f7c1c5cd 100644 --- a/src/panels/config/script/manual-script-editor.ts +++ b/src/panels/config/script/manual-script-editor.ts @@ -50,8 +50,8 @@ export class HaManualScriptEditor extends LitElement { protected updated(changedProps) { if (this._openFields && changedProps.has("config")) { this._openFields = false; - this._scriptFields?.updateComplete.then( - () => this._scriptFields?.focusLastField() + this._scriptFields?.updateComplete.then(() => + this._scriptFields?.focusLastField() ); } } diff --git a/src/panels/developer-tools/service/developer-tools-service.ts b/src/panels/developer-tools/service/developer-tools-service.ts index 394ed6d9fa..94e88b79bd 100644 --- a/src/panels/developer-tools/service/developer-tools-service.ts +++ b/src/panels/developer-tools/service/developer-tools-service.ts @@ -73,8 +73,8 @@ class HaPanelDevService extends LitElement { data: {}, }; if (this._yamlMode) { - this.updateComplete.then( - () => this._yamlEditor?.setValue(this._serviceData) + this.updateComplete.then(() => + this._yamlEditor?.setValue(this._serviceData) ); } } else if (!this._serviceData?.service) { @@ -86,8 +86,8 @@ class HaPanelDevService extends LitElement { data: {}, }; if (this._yamlMode) { - this.updateComplete.then( - () => this._yamlEditor?.setValue(this._serviceData) + this.updateComplete.then(() => + this._yamlEditor?.setValue(this._serviceData) ); } } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts index 2ab16a7853..dace73f087 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-edit-card.ts @@ -152,8 +152,9 @@ export class HuiDialogEditCard if (this._cardConfig && this._cardConfig.type) { let cardName: string | undefined; if (isCustomType(this._cardConfig.type)) { - cardName = getCustomCardEntry(stripCustomPrefix(this._cardConfig.type)) - ?.name; + cardName = getCustomCardEntry( + stripCustomPrefix(this._cardConfig.type) + )?.name; // Trim names that end in " Card" so as not to redundantly duplicate it if (cardName?.toLowerCase().endsWith(" card")) { cardName = cardName.substring(0, cardName.length - 5); diff --git a/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts b/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts index 7f01de6102..228a43740d 100644 --- a/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-climate-hvac-modes-card-feature-editor.ts @@ -58,8 +58,8 @@ export class HuiClimateHvacModesCardFeatureEditor select: { multiple: true, mode: "list", - options: HVAC_MODES.filter( - (mode) => stateObj?.attributes.hvac_modes?.includes(mode) + options: HVAC_MODES.filter((mode) => + stateObj?.attributes.hvac_modes?.includes(mode) ).map((mode) => ({ value: mode, label: stateObj ? formatEntityState(stateObj, mode) : mode, diff --git a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts index 71f77a86bf..fb236112f1 100644 --- a/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-statistics-graph-card-editor.ts @@ -252,11 +252,10 @@ export class HuiStatisticsGraphCardEditor ); const configured_stat_types = this._config!.stat_types ? ensureArray(this._config.stat_types) - : stat_types.filter( - (stat_type) => - this._metaDatas?.some((metaData) => - statisticsMetaHasType(metaData, stat_type) - ) + : stat_types.filter((stat_type) => + this._metaDatas?.some((metaData) => + statisticsMetaHasType(metaData, stat_type) + ) ); const data = { chart_type: "line", diff --git a/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts b/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts index a1f95b8a52..6e1a5f43ab 100644 --- a/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-water-heater-operation-modes-card-feature-editor.ts @@ -38,8 +38,8 @@ export class HuiWaterHeaterOperationModesCardFeatureEditor select: { multiple: true, mode: "list", - options: OPERATION_MODES.filter( - (mode) => stateObj?.attributes.operation_list?.includes(mode) + options: OPERATION_MODES.filter((mode) => + stateObj?.attributes.operation_list?.includes(mode) ).map((mode) => ({ value: mode, label: stateObj ? formatEntityState(stateObj, mode) : mode, diff --git a/src/resources/css-variables.ts b/src/resources/css-variables.ts index fe74704f9a..b9760de4e3 100644 --- a/src/resources/css-variables.ts +++ b/src/resources/css-variables.ts @@ -4,10 +4,9 @@ export function computeCssVariable( if (Array.isArray(props)) { return props .reverse() - .reduce( - (str, variable) => `var(${variable}${str ? `, ${str}` : ""})`, - undefined - ); + .reduce< + string | undefined + >((str, variable) => `var(${variable}${str ? `, ${str}` : ""})`, undefined); } return `var(${props})`; } diff --git a/yarn.lock b/yarn.lock index 7c879ce1ba..c2b67f0850 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9644,7 +9644,7 @@ __metadata: object-hash: "npm:3.0.0" open: "npm:10.0.3" pinst: "npm:3.0.0" - prettier: "npm:3.1.1" + prettier: "npm:3.2.0" proxy-polyfill: "npm:0.3.2" punycode: "npm:2.3.1" qr-scanner: "npm:1.4.2" @@ -13100,12 +13100,12 @@ __metadata: languageName: node linkType: hard -"prettier@npm:3.1.1": - version: 3.1.1 - resolution: "prettier@npm:3.1.1" +"prettier@npm:3.2.0": + version: 3.2.0 + resolution: "prettier@npm:3.2.0" bin: prettier: bin/prettier.cjs - checksum: 26a249f321b97d26c04483f1bf2eeb22e082a76f4222a2c922bebdc60111691aad4ec3979610e83942e0b956058ec361d9e9c81c185172264eb6db9aa678082b + checksum: eb2eb63038ca9aaf86bda7dc49b879a278bc8344d28236fef08a8f185e8ce721a40155acc4a494e8f91ecbcdd9a132fd326516f791c61cbfa9037c1f74d6d029 languageName: node linkType: hard