From b0d32b567493e39c7d67fde26ec3197791bda93c Mon Sep 17 00:00:00 2001 From: Paulus Schoutsen Date: Sat, 12 Jan 2019 23:32:53 -0800 Subject: [PATCH] upgrade lit (#2458) * upgrade lit * Lint --- gallery/src/demos/demo-util-long-press.ts | 5 +- package.json | 9 +-- src/auth/ha-authorize.ts | 4 +- src/components/buttons/ha-call-api-button.js | 2 +- src/components/entity/ha-state-label-badge.ts | 8 +-- src/components/ha-label-badge.ts | 9 +-- src/layouts/app/dialog-manager-mixin.ts | 2 +- src/layouts/app/home-assistant.js | 2 +- src/mixins/lit-localize-lite-mixin.ts | 2 +- src/mixins/lit-localize-mixin.ts | 2 +- src/panels/config/cloud/cloud-alexa-pref.ts | 10 ++- .../config/cloud/cloud-exposed-entities.ts | 6 +- src/panels/config/cloud/cloud-google-pref.ts | 10 ++- .../cloud/cloud-webhook-manage-dialog.ts | 2 +- src/panels/config/cloud/cloud-webhooks.ts | 2 +- src/panels/config/zha/ha-config-zha.ts | 10 ++- .../config/zha/zha-cluster-attributes.ts | 6 +- src/panels/config/zha/zha-cluster-commands.ts | 6 +- src/panels/config/zha/zha-clusters.ts | 6 +- src/panels/config/zha/zha-entities.ts | 6 +- src/panels/config/zha/zha-network.ts | 10 ++- src/panels/config/zha/zha-node.ts | 10 ++- .../lovelace/cards/hui-alarm-panel-card.ts | 8 +-- .../lovelace/cards/hui-entities-card.ts | 6 +- .../lovelace/cards/hui-entity-button-card.ts | 8 +-- src/panels/lovelace/cards/hui-error-card.ts | 5 +- src/panels/lovelace/cards/hui-gauge-card.ts | 8 +-- src/panels/lovelace/cards/hui-glance-card.ts | 8 +-- .../cards/hui-horizontal-stack-card.ts | 3 +- src/panels/lovelace/cards/hui-iframe-card.ts | 12 ++-- src/panels/lovelace/cards/hui-light-card.ts | 8 +-- .../lovelace/cards/hui-markdown-card.ts | 12 ++-- src/panels/lovelace/cards/hui-picture-card.ts | 12 ++-- .../cards/hui-picture-elements-card.ts | 5 +- .../lovelace/cards/hui-picture-entity-card.ts | 12 ++-- .../lovelace/cards/hui-picture-glance-card.ts | 12 ++-- src/panels/lovelace/cards/hui-sensor-card.ts | 6 +- .../lovelace/cards/hui-shopping-list-card.ts | 5 +- src/panels/lovelace/cards/hui-stack-card.ts | 5 +- .../lovelace/cards/hui-thermostat-card.ts | 8 +-- .../lovelace/cards/hui-vertical-stack-card.ts | 3 +- src/panels/lovelace/common/has-changed.ts | 2 +- .../lovelace/components/hui-action-editor.ts | 10 ++- .../lovelace/components/hui-card-options.ts | 2 +- .../components/hui-entities-toggle.ts | 6 +- .../lovelace/components/hui-entity-editor.ts | 10 ++- .../components/hui-theme-select-editor.ts | 10 ++- .../components/hui-timestamp-display.ts | 6 +- .../editor/card-editor/hui-card-picker.ts | 5 +- .../card-editor/hui-dialog-edit-card.ts | 10 ++- .../card-editor/hui-dialog-move-card-view.ts | 10 ++- .../card-editor/hui-dialog-pick-card.ts | 10 ++- .../editor/card-editor/hui-edit-card.ts | 8 +-- .../editor/card-editor/hui-yaml-editor.ts | 10 ++- .../config-elements/config-elements-style.ts | 2 +- .../hui-alarm-panel-card-editor.ts | 10 ++- .../hui-entities-card-editor.ts | 10 ++- .../hui-entity-button-card-editor.ts | 10 ++- .../config-elements/hui-gauge-card-editor.ts | 10 ++- .../config-elements/hui-glance-card-editor.ts | 10 ++- .../config-elements/hui-iframe-card-editor.ts | 10 ++- .../config-elements/hui-light-card-editor.ts | 10 ++- .../config-elements/hui-map-card-editor.ts | 10 ++- .../hui-markdown-card-editor.ts | 10 ++- .../hui-media-control-card-editor.ts | 10 ++- .../hui-picture-card-editor.ts | 10 ++- .../hui-plant-status-card-editor.ts | 10 ++- .../config-elements/hui-sensor-card-editor.ts | 10 ++- .../hui-shopping-list-editor.ts | 10 ++- .../hui-thermostat-card-editor.ts | 10 ++- .../hui-weather-forecast-card-editor.ts | 10 ++- .../lovelace/editor/hui-dialog-save-config.ts | 10 ++- .../hui-dialog-edit-lovelace.ts | 10 ++- .../lovelace-editor/hui-lovelace-editor.ts | 10 ++- .../view-editor/hui-dialog-edit-view.ts | 10 ++- .../editor/view-editor/hui-edit-view.ts | 10 ++- .../editor/view-editor/hui-view-editor.ts | 10 ++- .../lovelace/elements/hui-icon-element.ts | 5 +- .../lovelace/elements/hui-image-element.ts | 5 +- .../elements/hui-service-button-element.ts | 5 +- .../elements/hui-state-badge-element.ts | 5 +- .../elements/hui-state-icon-element.ts | 5 +- .../elements/hui-state-label-element.ts | 5 +- .../entity-rows/hui-climate-entity-row.ts | 5 +- .../entity-rows/hui-cover-entity-row.ts | 10 ++- .../entity-rows/hui-error-entity-row.ts | 5 +- .../entity-rows/hui-group-entity-row.ts | 10 ++- .../hui-input-select-entity-row.ts | 10 ++- .../entity-rows/hui-input-text-entity-row.ts | 10 ++- .../entity-rows/hui-lock-entity-row.ts | 10 ++- .../hui-media-player-entity-row.ts | 5 +- .../entity-rows/hui-scene-entity-row.ts | 10 ++- .../entity-rows/hui-script-entity-row.ts | 10 ++- .../entity-rows/hui-sensor-entity-row.ts | 10 ++- .../entity-rows/hui-text-entity-row.ts | 10 ++- .../entity-rows/hui-toggle-entity-row.ts | 10 ++- src/panels/lovelace/ha-panel-lovelace.ts | 5 +- src/panels/lovelace/hui-editor.ts | 7 +- src/panels/lovelace/hui-root.ts | 8 +-- src/panels/lovelace/hui-unused-entities.ts | 10 ++- src/panels/lovelace/hui-view.ts | 6 +- .../special-rows/hui-call-service-row.ts | 5 +- .../lovelace/special-rows/hui-divider-row.ts | 5 +- .../lovelace/special-rows/hui-section-row.ts | 5 +- .../lovelace/special-rows/hui-weblink-row.ts | 6 +- src/resources/jquery.roundslider.js | 2 +- src/resources/jquery.roundslider.ondemand.ts | 2 +- yarn.lock | 64 ++++--------------- 108 files changed, 499 insertions(+), 367 deletions(-) diff --git a/gallery/src/demos/demo-util-long-press.ts b/gallery/src/demos/demo-util-long-press.ts index 9e790fed50..96247b202b 100644 --- a/gallery/src/demos/demo-util-long-press.ts +++ b/gallery/src/demos/demo-util-long-press.ts @@ -1,12 +1,11 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "@polymer/paper-button/paper-button"; import "../../../src/components/ha-card"; import { longPress } from "../../../src/panels/lovelace/common/directives/long-press-directive"; export class DemoUtilLongPress extends LitElement { - public render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} ${ diff --git a/package.json b/package.json index 732dcc03b3..0d99d08d7d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,6 @@ "author": "Paulus Schoutsen (http://paulusschoutsen.nl)", "license": "Apache-2.0", "dependencies": { - "@material/mwc-ripple": "^0.3.1", "@mdi/svg": "^3.0.39", "@polymer/app-layout": "^3.0.1", "@polymer/app-localize-behavior": "^3.0.1", @@ -35,7 +34,6 @@ "@polymer/iron-media-query": "^3.0.1", "@polymer/iron-pages": "^3.0.1", "@polymer/iron-resizable-behavior": "^3.0.1", - "@polymer/lit-element": "0.6.2", "@polymer/neon-animation": "^3.0.1", "@polymer/paper-button": "^3.0.1", "@polymer/paper-card": "^3.0.1", @@ -78,7 +76,8 @@ "jquery": "^3.3.1", "js-yaml": "^3.12.0", "leaflet": "^1.3.4", - "lit-html": "0.12.0", + "lit-element": "2.0.0-rc.2", + "lit-html": "1.0.0-rc.2", "marked": "^0.5.0", "mdn-polyfills": "^5.12.0", "moment": "^2.22.2", @@ -158,9 +157,7 @@ "@webcomponents/shadycss": "^1.6.0", "@vaadin/vaadin-overlay": "3.2.2", "@vaadin/vaadin-lumo-styles": "1.3.0", - "fecha": "https://github.com/taylorhakes/fecha/archive/5e8fe08d982647fdb19fb403459838b02647813c.tar.gz", - "lit-html": "0.12.0", - "@polymer/lit-element": "0.6.2" + "fecha": "https://github.com/taylorhakes/fecha/archive/5e8fe08d982647fdb19fb403459838b02647813c.tar.gz" }, "main": "src/home-assistant.js", "husky": { diff --git a/src/auth/ha-authorize.ts b/src/auth/ha-authorize.ts index e93a992959..5a85beac68 100644 --- a/src/auth/ha-authorize.ts +++ b/src/auth/ha-authorize.ts @@ -1,5 +1,5 @@ import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin"; -import { LitElement, html, PropertyDeclarations } from "@polymer/lit-element"; +import { LitElement, html, PropertyDeclarations } from "lit-element"; import "./ha-auth-flow"; import { AuthProvider } from "../data/auth"; @@ -50,7 +50,7 @@ class HaAuthorize extends litLocalizeLiteMixin(LitElement) { }; } - public render() { + protected render() { if (!this._authProviders) { return html`

[[localize('ui.panel.page-authorize.initializing')]]

diff --git a/src/components/buttons/ha-call-api-button.js b/src/components/buttons/ha-call-api-button.js index 792d7d719c..59c7c8e748 100644 --- a/src/components/buttons/ha-call-api-button.js +++ b/src/components/buttons/ha-call-api-button.js @@ -1,4 +1,4 @@ -import { LitElement, html } from "@polymer/lit-element"; +import { LitElement, html } from "lit-element"; import "./ha-progress-button"; import { fireEvent } from "../../common/dom/fire_event"; diff --git a/src/components/entity/ha-state-label-badge.ts b/src/components/entity/ha-state-label-badge.ts index db59a82ea6..09a16a8681 100644 --- a/src/components/entity/ha-state-label-badge.ts +++ b/src/components/entity/ha-state-label-badge.ts @@ -3,10 +3,10 @@ import { html, PropertyValues, PropertyDeclarations, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import { HassEntity } from "home-assistant-js-websocket"; -import { classMap } from "lit-html/directives/classMap"; +import { classMap } from "lit-html/directives/class-map"; import computeStateDomain from "../../common/entity/compute_state_domain"; import computeStateName from "../../common/entity/compute_state_name"; @@ -41,7 +41,7 @@ export class HaStateLabelBadge extends hassLocalizeLitMixin(LitElement) { this.clearInterval(); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { const state = this.state; if (!state) { diff --git a/src/components/ha-label-badge.ts b/src/components/ha-label-badge.ts index f29778a0f0..5340ec4219 100644 --- a/src/components/ha-label-badge.ts +++ b/src/components/ha-label-badge.ts @@ -1,10 +1,11 @@ import { + html, LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult, html } from "lit-html"; -import { classMap } from "lit-html/directives/classMap"; + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import "./ha-icon"; class HaLabelBadge extends LitElement { @@ -24,7 +25,7 @@ class HaLabelBadge extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()}
diff --git a/src/layouts/app/dialog-manager-mixin.ts b/src/layouts/app/dialog-manager-mixin.ts index 90295c3866..3bd480f3a1 100644 --- a/src/layouts/app/dialog-manager-mixin.ts +++ b/src/layouts/app/dialog-manager-mixin.ts @@ -1,5 +1,5 @@ import { PolymerElement } from "@polymer/polymer"; -import { Constructor } from "@polymer/lit-element"; +import { Constructor } from "lit-element"; import { HASSDomEvent, ValidHassDomEvent } from "../../common/dom/fire_event"; interface RegisterDialogParams { diff --git a/src/layouts/app/home-assistant.js b/src/layouts/app/home-assistant.js index 2cd729b534..0f8ec6b0f3 100644 --- a/src/layouts/app/home-assistant.js +++ b/src/layouts/app/home-assistant.js @@ -4,7 +4,7 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes"; import { html } from "@polymer/polymer/lib/utils/html-tag"; import { PolymerElement } from "@polymer/polymer/polymer-element"; import { afterNextRender } from "@polymer/polymer/lib/utils/render-status"; -import { html as litHtml, LitElement } from "@polymer/lit-element"; +import { html as litHtml, LitElement } from "lit-element"; import "../home-assistant-main"; import "../ha-init-page"; diff --git a/src/mixins/lit-localize-lite-mixin.ts b/src/mixins/lit-localize-lite-mixin.ts index 4c6f4a25e5..393cdb875c 100644 --- a/src/mixins/lit-localize-lite-mixin.ts +++ b/src/mixins/lit-localize-lite-mixin.ts @@ -3,7 +3,7 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; +} from "lit-element"; import { HomeAssistant } from "../types"; import { getActiveTranslation } from "../util/hass-translation"; import { LocalizeFunc, LocalizeMixin } from "./localize-base-mixin"; diff --git a/src/mixins/lit-localize-mixin.ts b/src/mixins/lit-localize-mixin.ts index e16a739f46..742a60b76d 100644 --- a/src/mixins/lit-localize-mixin.ts +++ b/src/mixins/lit-localize-mixin.ts @@ -3,7 +3,7 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; +} from "lit-element"; import { HomeAssistant } from "../types"; import { localizeBaseMixin, diff --git a/src/panels/config/cloud/cloud-alexa-pref.ts b/src/panels/config/cloud/cloud-alexa-pref.ts index 149084acc8..91b48d9927 100644 --- a/src/panels/config/cloud/cloud-alexa-pref.ts +++ b/src/panels/config/cloud/cloud-alexa-pref.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-toggle-button/paper-toggle-button"; @@ -23,7 +27,7 @@ export class CloudAlexaPref extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.cloudStatus) { return html``; } diff --git a/src/panels/config/cloud/cloud-exposed-entities.ts b/src/panels/config/cloud/cloud-exposed-entities.ts index fd47f759b0..7e6c79bd10 100644 --- a/src/panels/config/cloud/cloud-exposed-entities.ts +++ b/src/panels/config/cloud/cloud-exposed-entities.ts @@ -3,8 +3,8 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import { repeat } from "lit-html/directives/repeat"; import "@polymer/paper-tooltip/paper-tooltip"; import { HassEntityBase } from "home-assistant-js-websocket"; @@ -34,7 +34,7 @@ export class CloudExposedEntities extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._filterFunc) { return html``; } diff --git a/src/panels/config/cloud/cloud-google-pref.ts b/src/panels/config/cloud/cloud-google-pref.ts index 015c5155c2..f724b1903d 100644 --- a/src/panels/config/cloud/cloud-google-pref.ts +++ b/src/panels/config/cloud/cloud-google-pref.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-toggle-button/paper-toggle-button"; @@ -24,7 +28,7 @@ export class CloudGooglePref extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.cloudStatus) { return html``; } diff --git a/src/panels/config/cloud/cloud-webhook-manage-dialog.ts b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts index 610f916f24..2614db408b 100644 --- a/src/panels/config/cloud/cloud-webhook-manage-dialog.ts +++ b/src/panels/config/cloud/cloud-webhook-manage-dialog.ts @@ -1,4 +1,4 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { html, LitElement, PropertyDeclarations } from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-input/paper-input"; diff --git a/src/panels/config/cloud/cloud-webhooks.ts b/src/panels/config/cloud/cloud-webhooks.ts index e89b6123a9..5d866a91f8 100644 --- a/src/panels/config/cloud/cloud-webhooks.ts +++ b/src/panels/config/cloud/cloud-webhooks.ts @@ -3,7 +3,7 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; +} from "lit-element"; import "@polymer/paper-toggle-button/paper-toggle-button"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-item/paper-item-body"; diff --git a/src/panels/config/zha/ha-config-zha.ts b/src/panels/config/zha/ha-config-zha.ts index a307e14850..a8b70fe340 100755 --- a/src/panels/config/zha/ha-config-zha.ts +++ b/src/panels/config/zha/ha-config-zha.ts @@ -1,10 +1,14 @@ import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-toolbar/app-toolbar"; import "@polymer/iron-flex-layout/iron-flex-layout-classes"; -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-icon-button/paper-icon-button"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; import { HASSDomEvent } from "../../../common/dom/fire_event"; import { Cluster } from "../../../data/zha"; import "../../../layouts/ha-app-layout"; @@ -39,7 +43,7 @@ export class HaConfigZha extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/config/zha/zha-cluster-attributes.ts b/src/panels/config/zha/zha-cluster-attributes.ts index 3a18e025fb..146801bd42 100644 --- a/src/panels/config/zha/zha-cluster-attributes.ts +++ b/src/panels/config/zha/zha-cluster-attributes.ts @@ -4,12 +4,12 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-icon-button/paper-icon-button"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/ha-service-description"; import { @@ -78,7 +78,7 @@ export class ZHAClusterAttributes extends LitElement { super.update(changedProperties); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/config/zha/zha-cluster-commands.ts b/src/panels/config/zha/zha-cluster-commands.ts index e91d4d1162..30e506e1c8 100644 --- a/src/panels/config/zha/zha-cluster-commands.ts +++ b/src/panels/config/zha/zha-cluster-commands.ts @@ -4,10 +4,10 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; + TemplateResult, +} from "lit-element"; import "@polymer/paper-card/paper-card"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/ha-service-description"; import { @@ -70,7 +70,7 @@ export class ZHAClusterCommands extends LitElement { super.update(changedProperties); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/config/zha/zha-clusters.ts b/src/panels/config/zha/zha-clusters.ts index 6f1b7bd65f..bf00ffdddd 100644 --- a/src/panels/config/zha/zha-clusters.ts +++ b/src/panels/config/zha/zha-clusters.ts @@ -4,9 +4,9 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; + TemplateResult, +} from "lit-element"; import "@polymer/paper-card/paper-card"; -import { TemplateResult } from "lit-html"; import { fireEvent } from "../../../common/dom/fire_event"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/ha-service-description"; @@ -73,7 +73,7 @@ export class ZHAClusters extends LitElement { super.update(changedProperties); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this._renderStyle()}
diff --git a/src/panels/config/zha/zha-entities.ts b/src/panels/config/zha/zha-entities.ts index 4e340d3546..561adf50ad 100644 --- a/src/panels/config/zha/zha-entities.ts +++ b/src/panels/config/zha/zha-entities.ts @@ -4,12 +4,12 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; import { fireEvent } from "../../../common/dom/fire_event"; import { fetchEntitiesForZhaNode } from "../../../data/zha"; import "../../../resources/ha-style"; @@ -62,7 +62,7 @@ export class ZHAEntities extends LitElement { super.update(changedProperties); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this._renderStyle()}
diff --git a/src/panels/config/zha/zha-network.ts b/src/panels/config/zha/zha-network.ts index c83b5feb6f..1bd65f6859 100644 --- a/src/panels/config/zha/zha-network.ts +++ b/src/panels/config/zha/zha-network.ts @@ -1,9 +1,13 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes"; -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-icon-button/paper-icon-button"; -import { TemplateResult } from "lit-html"; import "../../../components/buttons/ha-call-service-button"; import "../../../components/ha-service-description"; import "../../../resources/ha-style"; @@ -30,7 +34,7 @@ export class ZHANetwork extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/config/zha/zha-node.ts b/src/panels/config/zha/zha-node.ts index 681bbe3f9b..a3e26570a3 100644 --- a/src/panels/config/zha/zha-node.ts +++ b/src/panels/config/zha/zha-node.ts @@ -1,12 +1,16 @@ import "@polymer/iron-flex-layout/iron-flex-layout-classes"; -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-card/paper-card"; import "@polymer/paper-icon-button/paper-icon-button"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event"; import computeStateName from "../../../common/entity/compute_state_name"; import sortByName from "../../../common/entity/states_sort_by_name"; @@ -64,7 +68,7 @@ export class ZHANode extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { this._nodes = this._computeNodes(this.hass); return html` ${this.renderStyle()} diff --git a/src/panels/lovelace/cards/hui-alarm-panel-card.ts b/src/panels/lovelace/cards/hui-alarm-panel-card.ts index 2f560f22a8..51153caa27 100644 --- a/src/panels/lovelace/cards/hui-alarm-panel-card.ts +++ b/src/panels/lovelace/cards/hui-alarm-panel-card.ts @@ -3,9 +3,9 @@ import { LitElement, PropertyValues, PropertyDeclarations, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; -import { classMap } from "lit-html/directives/classMap"; + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import { LovelaceCard } from "../types"; import { HomeAssistant } from "../../../types"; @@ -97,7 +97,7 @@ class HuiAlarmPanelCard extends hassLocalizeLitMixin(LitElement) return true; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-entities-card.ts b/src/panels/lovelace/cards/hui-entities-card.ts index 13e36603f6..0b7c487bd6 100644 --- a/src/panels/lovelace/cards/hui-entities-card.ts +++ b/src/panels/lovelace/cards/hui-entities-card.ts @@ -3,8 +3,8 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import "../../../components/ha-card"; import "../components/hui-entities-toggle"; @@ -95,7 +95,7 @@ class HuiEntitiesCard extends hassLocalizeLitMixin(LitElement) } } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this._hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-entity-button-card.ts b/src/panels/lovelace/cards/hui-entity-button-card.ts index 31c826c77c..992899a830 100644 --- a/src/panels/lovelace/cards/hui-entity-button-card.ts +++ b/src/panels/lovelace/cards/hui-entity-button-card.ts @@ -3,10 +3,10 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; + TemplateResult, +} from "lit-element"; import { HassEntity } from "home-assistant-js-websocket"; -import { TemplateResult } from "lit-html"; -import { styleMap } from "lit-html/directives/styleMap"; +import { styleMap } from "lit-html/directives/style-map"; import "../../../components/ha-card"; @@ -82,7 +82,7 @@ class HuiEntityButtonCard extends hassLocalizeLitMixin(LitElement) return true; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-error-card.ts b/src/panels/lovelace/cards/hui-error-card.ts index 59981fc7fb..95d535061b 100644 --- a/src/panels/lovelace/cards/hui-error-card.ts +++ b/src/panels/lovelace/cards/hui-error-card.ts @@ -1,8 +1,7 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import { LovelaceCard } from "../types"; import { LovelaceCardConfig } from "../../../data/lovelace"; -import { TemplateResult } from "lit-html"; import { HomeAssistant } from "../../../types"; interface Config extends LovelaceCardConfig { @@ -40,7 +39,7 @@ export class HuiErrorCard extends LitElement implements LovelaceCard { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-gauge-card.ts b/src/panels/lovelace/cards/hui-gauge-card.ts index 08cd54111f..7432154e8e 100644 --- a/src/panels/lovelace/cards/hui-gauge-card.ts +++ b/src/panels/lovelace/cards/hui-gauge-card.ts @@ -3,9 +3,9 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; -import { styleMap } from "lit-html/directives/styleMap"; + TemplateResult, +} from "lit-element"; +import { styleMap } from "lit-html/directives/style-map"; import "../../../components/ha-card"; import { LovelaceCardConfig } from "../../../data/lovelace"; @@ -84,7 +84,7 @@ class HuiGaugeCard extends LitElement implements LovelaceCard { this._setBaseUnit(); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-glance-card.ts b/src/panels/lovelace/cards/hui-glance-card.ts index 7d07f62b49..76f3f767f7 100644 --- a/src/panels/lovelace/cards/hui-glance-card.ts +++ b/src/panels/lovelace/cards/hui-glance-card.ts @@ -3,9 +3,9 @@ import { LitElement, PropertyValues, PropertyDeclarations, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; -import { classMap } from "lit-html/directives/classMap"; + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { HomeAssistant } from "../../../types"; @@ -114,7 +114,7 @@ export class HuiGlanceCard extends hassLocalizeLitMixin(LitElement) return true; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts index 39d5acf1ec..e1427fbe1d 100644 --- a/src/panels/lovelace/cards/hui-horizontal-stack-card.ts +++ b/src/panels/lovelace/cards/hui-horizontal-stack-card.ts @@ -1,5 +1,4 @@ -import { html } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, TemplateResult } from "lit-element"; import { computeCardSize } from "../common/compute-card-size"; import { HuiStackCard } from "./hui-stack-card"; diff --git a/src/panels/lovelace/cards/hui-iframe-card.ts b/src/panels/lovelace/cards/hui-iframe-card.ts index 0b43162179..6d122fe8d5 100644 --- a/src/panels/lovelace/cards/hui-iframe-card.ts +++ b/src/panels/lovelace/cards/hui-iframe-card.ts @@ -1,11 +1,15 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../../../components/ha-card"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { LovelaceCardConfig } from "../../../data/lovelace"; -import { TemplateResult } from "lit-html"; -import { styleMap } from "lit-html/directives/styleMap"; +import { styleMap } from "lit-html/directives/style-map"; export interface Config extends LovelaceCardConfig { aspect_ratio?: string; @@ -42,7 +46,7 @@ export class HuiIframeCard extends LitElement implements LovelaceCard { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-light-card.ts b/src/panels/lovelace/cards/hui-light-card.ts index 22e58e4ca8..90df1b1534 100644 --- a/src/panels/lovelace/cards/hui-light-card.ts +++ b/src/panels/lovelace/cards/hui-light-card.ts @@ -3,11 +3,11 @@ import { LitElement, PropertyValues, PropertyDeclarations, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import { fireEvent } from "../../../common/dom/fire_event"; -import { styleMap } from "lit-html/directives/styleMap"; +import { styleMap } from "lit-html/directives/style-map"; import { HomeAssistant, LightEntity } from "../../../types"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { LovelaceCard, LovelaceCardEditor } from "../types"; @@ -82,7 +82,7 @@ export class HuiLightCard extends hassLocalizeLitMixin(LitElement) this._config = { theme: "default", ...config }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-markdown-card.ts b/src/panels/lovelace/cards/hui-markdown-card.ts index e61be9c63c..8e714a0131 100644 --- a/src/panels/lovelace/cards/hui-markdown-card.ts +++ b/src/panels/lovelace/cards/hui-markdown-card.ts @@ -1,12 +1,16 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { classMap } from "lit-html/directives/classMap"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import "../../../components/ha-card"; import "../../../components/ha-markdown"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { LovelaceCardConfig } from "../../../data/lovelace"; -import { TemplateResult } from "lit-html"; export interface Config extends LovelaceCardConfig { content: string; @@ -42,7 +46,7 @@ export class HuiMarkdownCard extends LitElement implements LovelaceCard { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-picture-card.ts b/src/panels/lovelace/cards/hui-picture-card.ts index b0799b6eb9..24435ad518 100644 --- a/src/panels/lovelace/cards/hui-picture-card.ts +++ b/src/panels/lovelace/cards/hui-picture-card.ts @@ -1,12 +1,16 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../../../components/ha-card"; import { LovelaceCard, LovelaceCardEditor } from "../types"; import { LovelaceCardConfig, ActionConfig } from "../../../data/lovelace"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; -import { classMap } from "lit-html/directives/classMap"; +import { classMap } from "lit-html/directives/class-map"; import { handleClick } from "../common/handle-click"; import { longPress } from "../common/directives/long-press-directive"; @@ -49,7 +53,7 @@ export class HuiPictureCard extends LitElement implements LovelaceCard { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-picture-elements-card.ts b/src/panels/lovelace/cards/hui-picture-elements-card.ts index 83114f772e..0562630f86 100644 --- a/src/panels/lovelace/cards/hui-picture-elements-card.ts +++ b/src/panels/lovelace/cards/hui-picture-elements-card.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import { createHuiElement } from "../common/create-hui-element"; @@ -55,7 +54,7 @@ class HuiPictureElementsCard extends LitElement implements LovelaceCard { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-picture-entity-card.ts b/src/panels/lovelace/cards/hui-picture-entity-card.ts index 9fa9a2c896..718e694fe9 100644 --- a/src/panels/lovelace/cards/hui-picture-entity-card.ts +++ b/src/panels/lovelace/cards/hui-picture-entity-card.ts @@ -1,6 +1,10 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html/lib/shady-render"; -import { classMap } from "lit-html/directives/classMap"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import "../../../components/ha-card"; import "../components/hui-image"; @@ -65,7 +69,7 @@ class HuiPictureEntityCard extends hassLocalizeLitMixin(LitElement) this._config = { show_name: true, show_state: true, ...config }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-picture-glance-card.ts b/src/panels/lovelace/cards/hui-picture-glance-card.ts index 1a98be568a..f83848a5e8 100644 --- a/src/panels/lovelace/cards/hui-picture-glance-card.ts +++ b/src/panels/lovelace/cards/hui-picture-glance-card.ts @@ -1,6 +1,10 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { classMap } from "lit-html/directives/classMap"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { DOMAINS_TOGGLE } from "../../../common/const"; @@ -83,7 +87,7 @@ class HuiPictureGlanceCard extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-sensor-card.ts b/src/panels/lovelace/cards/hui-sensor-card.ts index 2a8394bea4..aeec27c82e 100755 --- a/src/panels/lovelace/cards/hui-sensor-card.ts +++ b/src/panels/lovelace/cards/hui-sensor-card.ts @@ -4,8 +4,8 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import "@polymer/paper-spinner/paper-spinner"; import { LovelaceCard, LovelaceCardEditor } from "../types"; @@ -192,7 +192,7 @@ class HuiSensorCard extends LitElement implements LovelaceCard { return 3; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-shopping-list-card.ts b/src/panels/lovelace/cards/hui-shopping-list-card.ts index c0cff3b086..13099310ba 100644 --- a/src/panels/lovelace/cards/hui-shopping-list-card.ts +++ b/src/panels/lovelace/cards/hui-shopping-list-card.ts @@ -1,6 +1,5 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import { repeat } from "lit-html/directives/repeat"; -import { TemplateResult } from "lit-html"; import { PaperInputElement } from "@polymer/paper-input/paper-input"; import "@polymer/paper-checkbox/paper-checkbox"; @@ -79,7 +78,7 @@ class HuiShoppingListCard extends hassLocalizeLitMixin(LitElement) } } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/cards/hui-stack-card.ts b/src/panels/lovelace/cards/hui-stack-card.ts index d5f13689c7..0c6e35e257 100644 --- a/src/panels/lovelace/cards/hui-stack-card.ts +++ b/src/panels/lovelace/cards/hui-stack-card.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import { createCardElement } from "../common/create-card-element"; @@ -50,7 +49,7 @@ export abstract class HuiStackCard extends LitElement implements LovelaceCard { }); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-thermostat-card.ts b/src/panels/lovelace/cards/hui-thermostat-card.ts index ebbc32c96e..889c205a8d 100644 --- a/src/panels/lovelace/cards/hui-thermostat-card.ts +++ b/src/panels/lovelace/cards/hui-thermostat-card.ts @@ -3,9 +3,9 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { classMap } from "lit-html/directives/classMap"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import "../../../components/ha-card"; import "../../../components/ha-icon"; @@ -110,7 +110,7 @@ export class HuiThermostatCard extends hassLocalizeLitMixin(LitElement) } } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this._config) { return html``; } diff --git a/src/panels/lovelace/cards/hui-vertical-stack-card.ts b/src/panels/lovelace/cards/hui-vertical-stack-card.ts index b868e1226e..a36c37ea6b 100644 --- a/src/panels/lovelace/cards/hui-vertical-stack-card.ts +++ b/src/panels/lovelace/cards/hui-vertical-stack-card.ts @@ -1,8 +1,7 @@ -import { html } from "@polymer/lit-element"; +import { html, TemplateResult } from "lit-element"; import { computeCardSize } from "../common/compute-card-size"; import { HuiStackCard } from "./hui-stack-card"; -import { TemplateResult } from "lit-html"; class HuiVerticalStackCard extends HuiStackCard { public getCardSize() { diff --git a/src/panels/lovelace/common/has-changed.ts b/src/panels/lovelace/common/has-changed.ts index d246bebc49..19aed21579 100644 --- a/src/panels/lovelace/common/has-changed.ts +++ b/src/panels/lovelace/common/has-changed.ts @@ -1,5 +1,5 @@ import { HomeAssistant } from "../../../types"; -import { PropertyValues } from "@polymer/lit-element"; +import { PropertyValues } from "lit-element"; // Check if config or Entity changed export function hasConfigOrEntityChanged( diff --git a/src/panels/lovelace/components/hui-action-editor.ts b/src/panels/lovelace/components/hui-action-editor.ts index 7058a2ab73..3ca20e2566 100644 --- a/src/panels/lovelace/components/hui-action-editor.ts +++ b/src/panels/lovelace/components/hui-action-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-textarea"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; @@ -51,7 +55,7 @@ export class HuiActionEditor extends LitElement { return config.service || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this.actions) { return html``; } diff --git a/src/panels/lovelace/components/hui-card-options.ts b/src/panels/lovelace/components/hui-card-options.ts index 4cff932dc7..8b7b7b87f1 100644 --- a/src/panels/lovelace/components/hui-card-options.ts +++ b/src/panels/lovelace/components/hui-card-options.ts @@ -1,4 +1,4 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { html, LitElement, PropertyDeclarations } from "lit-element"; import "@polymer/paper-button/paper-button"; import "@polymer/paper-menu-button/paper-menu-button"; import "@polymer/paper-icon-button/paper-icon-button"; diff --git a/src/panels/lovelace/components/hui-entities-toggle.ts b/src/panels/lovelace/components/hui-entities-toggle.ts index d441f7369f..de4814296d 100644 --- a/src/panels/lovelace/components/hui-entities-toggle.ts +++ b/src/panels/lovelace/components/hui-entities-toggle.ts @@ -3,8 +3,8 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import { PaperToggleButtonElement } from "@polymer/paper-toggle-button/paper-toggle-button"; import { DOMAINS_TOGGLE } from "../../../common/const"; @@ -35,7 +35,7 @@ class HuiEntitiesToggle extends LitElement { } } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._toggleEntities) { return html``; } diff --git a/src/panels/lovelace/components/hui-entity-editor.ts b/src/panels/lovelace/components/hui-entity-editor.ts index 93c159becd..e94c7c5496 100644 --- a/src/panels/lovelace/components/hui-entity-editor.ts +++ b/src/panels/lovelace/components/hui-entity-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { HomeAssistant } from "../../../types"; import { fireEvent } from "../../../common/dom/fire_event"; @@ -19,7 +23,7 @@ export class HuiEntityEditor extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.entities) { return html``; } diff --git a/src/panels/lovelace/components/hui-theme-select-editor.ts b/src/panels/lovelace/components/hui-theme-select-editor.ts index 68c452c3d2..497e1a0013 100644 --- a/src/panels/lovelace/components/hui-theme-select-editor.ts +++ b/src/panels/lovelace/components/hui-theme-select-editor.ts @@ -1,6 +1,10 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-button/paper-button"; -import { TemplateResult } from "lit-html"; import { HomeAssistant } from "../../../types"; import { fireEvent, HASSDomEvent } from "../../../common/dom/fire_event"; @@ -28,7 +32,7 @@ export class HuiThemeSelectionEditor extends hassLocalizeLitMixin(LitElement) { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { const themes = ["Backend-selected", "default"].concat( Object.keys(this.hass!.themes.themes).sort() ); diff --git a/src/panels/lovelace/components/hui-timestamp-display.ts b/src/panels/lovelace/components/hui-timestamp-display.ts index 3a346ff0ce..c908f0b204 100644 --- a/src/panels/lovelace/components/hui-timestamp-display.ts +++ b/src/panels/lovelace/components/hui-timestamp-display.ts @@ -3,8 +3,8 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; + TemplateResult, +} from "lit-element"; import { HomeAssistant } from "../../../types"; import format_date from "../../../common/datetime/format_date"; @@ -49,7 +49,7 @@ class HuiTimestampDisplay extends hassLocalizeLitMixin(LitElement) { this._clearInterval(); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.ts || !this.hass) { return html``; } 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 c9f06aaac6..3ee078070f 100644 --- a/src/panels/lovelace/editor/card-editor/hui-card-picker.ts +++ b/src/panels/lovelace/editor/card-editor/hui-card-picker.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "@polymer/paper-button/paper-button"; import { HomeAssistant } from "../../../../types"; @@ -39,7 +38,7 @@ export class HuiCardPicker extends hassLocalizeLitMixin(LitElement) { public hass?: HomeAssistant; public cardPicked?: (cardConf: LovelaceCardConfig) => void; - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()}

${this.localize("ui.panel.lovelace.editor.edit_card.pick_card")}

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 f47930a851..0170f16984 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 @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { HomeAssistant } from "../../../../types"; import { HASSDomEvent } from "../../../../common/dom/fire_event"; @@ -48,7 +52,7 @@ export class HuiDialogEditCard extends LitElement { : undefined; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._params) { return html``; } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts index 7f88c436cf..d794f7c92f 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-move-card-view.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-dialog/paper-dialog"; import "@polymer/paper-item/paper-item"; // tslint:disable-next-line:no-duplicate-imports @@ -23,7 +27,7 @@ export class HuiDialogMoveCardView extends hassLocalizeLitMixin(LitElement) { await this.updateComplete; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._params) { return html``; } diff --git a/src/panels/lovelace/editor/card-editor/hui-dialog-pick-card.ts b/src/panels/lovelace/editor/card-editor/hui-dialog-pick-card.ts index 5c55787dfa..292b4c9026 100644 --- a/src/panels/lovelace/editor/card-editor/hui-dialog-pick-card.ts +++ b/src/panels/lovelace/editor/card-editor/hui-dialog-pick-card.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-dialog/paper-dialog"; import "@polymer/paper-dialog-scrollable/paper-dialog-scrollable"; @@ -17,7 +21,7 @@ export class HuiDialogPickCard extends hassLocalizeLitMixin(LitElement) { return {}; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` diff --git a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts index f364c3cb7b..dd196cee7e 100644 --- a/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-alarm-panel-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; @@ -49,7 +53,7 @@ export class HuiAlarmPanelCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.states || []; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts index c13b303a1a..5622e51b96 100644 --- a/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-entities-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; @@ -62,7 +66,7 @@ export class HuiEntitiesCardEditor extends hassLocalizeLitMixin(LitElement) this._configEntities = processEditorEntities(config.entities); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts index d5a7669008..9c13aebf7f 100644 --- a/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-entity-button-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -68,7 +72,7 @@ export class HuiEntityButtonCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.theme || "default"; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts index 1b7d734940..3c0724f84a 100644 --- a/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-gauge-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import "@polymer/paper-toggle-button/paper-toggle-button"; @@ -70,7 +74,7 @@ export class HuiGaugeCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.severity || undefined; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts index da8b1ff2cd..509d5a145a 100644 --- a/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-glance-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; @@ -68,7 +72,7 @@ export class HuiGlanceCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.columns || NaN; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts index 673156032d..3442e2c5c2 100644 --- a/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-iframe-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -44,7 +48,7 @@ export class HuiIframeCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.aspect_ratio || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts index ba65142b1b..2890eba236 100644 --- a/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-light-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -47,7 +51,7 @@ export class HuiLightCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.entity || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts index ed6531a0e0..d775ecdda7 100644 --- a/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-map-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -64,7 +68,7 @@ export class HuiMapCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.entities || []; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts index c4b002eff1..51be28d856 100644 --- a/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-markdown-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import "@polymer/paper-input/paper-textarea"; @@ -40,7 +44,7 @@ export class HuiMarkdownCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.content || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts index b6ac24fe3f..7d0b136207 100644 --- a/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-media-control-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { struct } from "../../common/structs/struct"; import { EntitiesEditorEvent, EditorTarget } from "../types"; @@ -34,7 +38,7 @@ export class HuiMediaControlCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.entity || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts index 52bba01b3c..6d852fd534 100644 --- a/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-picture-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -51,7 +55,7 @@ export class HuiPictureCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.hold_action || { action: "none" }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts index d321f52b76..97cb2a8078 100644 --- a/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-plant-status-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -42,7 +46,7 @@ export class HuiPlantStatusCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.name || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts index dcf108c3ed..07b7d8d3f3 100644 --- a/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-sensor-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; @@ -75,7 +79,7 @@ export class HuiSensorCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.hours_to_show || "24"; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts index 6bd987db6a..504a82359e 100644 --- a/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-shopping-list-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -33,7 +37,7 @@ export class HuiShoppingListEditor extends hassLocalizeLitMixin(LitElement) return this._config!.title || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts index e1db48583e..86a3bcf22f 100644 --- a/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-thermostat-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { struct } from "../../common/structs/struct"; @@ -47,7 +51,7 @@ export class HuiThermostatCardEditor extends hassLocalizeLitMixin(LitElement) return this._config!.theme || "default"; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts index 8854c411a8..4be9757604 100644 --- a/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts +++ b/src/panels/lovelace/editor/config-elements/hui-weather-forecast-card-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { struct } from "../../common/structs/struct"; import { EntitiesEditorEvent, EditorTarget } from "../types"; @@ -41,7 +45,7 @@ export class HuiWeatherForecastCardEditor return this._config!.name || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/editor/hui-dialog-save-config.ts b/src/panels/lovelace/editor/hui-dialog-save-config.ts index 295d9ae87c..4e2a411ac1 100644 --- a/src/panels/lovelace/editor/hui-dialog-save-config.ts +++ b/src/panels/lovelace/editor/hui-dialog-save-config.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-spinner/paper-spinner"; import "@polymer/paper-dialog/paper-dialog"; @@ -41,7 +45,7 @@ export class HuiSaveConfig extends hassLocalizeLitMixin(LitElement) { return this.shadowRoot!.querySelector("paper-dialog")!; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/lovelace/editor/lovelace-editor/hui-dialog-edit-lovelace.ts b/src/panels/lovelace/editor/lovelace-editor/hui-dialog-edit-lovelace.ts index 2cb86b013b..3f15f505a6 100644 --- a/src/panels/lovelace/editor/lovelace-editor/hui-dialog-edit-lovelace.ts +++ b/src/panels/lovelace/editor/lovelace-editor/hui-dialog-edit-lovelace.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-spinner/paper-spinner"; import "@polymer/paper-dialog/paper-dialog"; // This is not a duplicate import, one is for types, one is for element. @@ -47,7 +51,7 @@ export class HuiDialogEditLovelace extends hassLocalizeLitMixin(LitElement) { return this.shadowRoot!.querySelector("paper-dialog")!; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts b/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts index 68761be409..b6fa8e5b04 100644 --- a/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts +++ b/src/panels/lovelace/editor/lovelace-editor/hui-lovelace-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { EditorTarget } from "../types"; @@ -33,7 +37,7 @@ export class HuiLovelaceEditor extends hassLocalizeLitMixin(LitElement) { return this.config.title || ""; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${configElementStyle}
diff --git a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts index 087ed20ce2..163127b073 100644 --- a/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-dialog-edit-view.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { HomeAssistant } from "../../../../types"; import { HASSDomEvent } from "../../../../common/dom/fire_event"; @@ -34,7 +38,7 @@ export class HuiDialogEditView extends LitElement { (this.shadowRoot!.children[0] as any).showDialog(); } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._params) { return html``; } diff --git a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts index 8b27068812..537a1ed379 100644 --- a/src/panels/lovelace/editor/view-editor/hui-edit-view.ts +++ b/src/panels/lovelace/editor/view-editor/hui-edit-view.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-spinner/paper-spinner"; import "@polymer/paper-tabs/paper-tab"; @@ -83,7 +87,7 @@ export class HuiEditView extends hassLocalizeLitMixin(LitElement) { return this.shadowRoot!.querySelector("paper-dialog")!; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { let content; switch (this._curTab) { case "tab-settings": diff --git a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts index e85cbff0d1..80a6664353 100644 --- a/src/panels/lovelace/editor/view-editor/hui-view-editor.ts +++ b/src/panels/lovelace/editor/view-editor/hui-view-editor.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "@polymer/paper-input/paper-input"; import { EditorTarget } from "../types"; @@ -59,7 +63,7 @@ export class HuiViewEditor extends hassLocalizeLitMixin(LitElement) { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass) { return html``; } diff --git a/src/panels/lovelace/elements/hui-icon-element.ts b/src/panels/lovelace/elements/hui-icon-element.ts index ee398c3c84..3f626446d7 100644 --- a/src/panels/lovelace/elements/hui-icon-element.ts +++ b/src/panels/lovelace/elements/hui-icon-element.ts @@ -1,4 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/ha-icon"; @@ -8,7 +8,6 @@ import { longPress } from "../common/directives/long-press-directive"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { LovelaceElement, LovelaceElementConfig } from "./types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; interface Config extends LovelaceElementConfig { icon: string; @@ -31,7 +30,7 @@ export class HuiIconElement extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/elements/hui-image-element.ts b/src/panels/lovelace/elements/hui-image-element.ts index af47ba04ef..3271b91a8a 100644 --- a/src/panels/lovelace/elements/hui-image-element.ts +++ b/src/panels/lovelace/elements/hui-image-element.ts @@ -1,4 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../components/hui-image"; @@ -8,7 +8,6 @@ import { longPress } from "../common/directives/long-press-directive"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { LovelaceElement, LovelaceElementConfig } from "./types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; interface Config extends LovelaceElementConfig { image?: string; @@ -40,7 +39,7 @@ export class HuiImageElement extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/elements/hui-service-button-element.ts b/src/panels/lovelace/elements/hui-service-button-element.ts index eb4013f3cf..13fb73d3d0 100644 --- a/src/panels/lovelace/elements/hui-service-button-element.ts +++ b/src/panels/lovelace/elements/hui-service-button-element.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/buttons/ha-call-service-button"; @@ -37,7 +36,7 @@ export class HuiServiceButtonElement extends LitElement this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/elements/hui-state-badge-element.ts b/src/panels/lovelace/elements/hui-state-badge-element.ts index 818f7986bb..c7cc4294da 100644 --- a/src/panels/lovelace/elements/hui-state-badge-element.ts +++ b/src/panels/lovelace/elements/hui-state-badge-element.ts @@ -1,11 +1,10 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/entity/ha-state-label-badge"; import computeStateName from "../../../common/entity/compute_state_name"; import { LovelaceElement, LovelaceElementConfig } from "./types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; export class HuiStateBadgeElement extends LitElement implements LovelaceElement { @@ -24,7 +23,7 @@ export class HuiStateBadgeElement extends LitElement this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if ( !this._config || !this.hass || diff --git a/src/panels/lovelace/elements/hui-state-icon-element.ts b/src/panels/lovelace/elements/hui-state-icon-element.ts index c767252568..a065c15b10 100644 --- a/src/panels/lovelace/elements/hui-state-icon-element.ts +++ b/src/panels/lovelace/elements/hui-state-icon-element.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/entity/state-badge"; @@ -27,7 +26,7 @@ export class HuiStateIconElement extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if ( !this._config || !this.hass || diff --git a/src/panels/lovelace/elements/hui-state-label-element.ts b/src/panels/lovelace/elements/hui-state-label-element.ts index 6a6f8233f4..552505754b 100644 --- a/src/panels/lovelace/elements/hui-state-label-element.ts +++ b/src/panels/lovelace/elements/hui-state-label-element.ts @@ -1,4 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/entity/ha-state-label-badge"; @@ -9,7 +9,6 @@ import { longPress } from "../common/directives/long-press-directive"; import { hassLocalizeLitMixin } from "../../../mixins/lit-localize-mixin"; import { LovelaceElement, LovelaceElementConfig } from "./types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; interface Config extends LovelaceElementConfig { prefix?: string; @@ -33,7 +32,7 @@ class HuiStateLabelElement extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-climate-entity-row.ts b/src/panels/lovelace/entity-rows/hui-climate-entity-row.ts index 3186c9c62b..d452445d78 100644 --- a/src/panels/lovelace/entity-rows/hui-climate-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-climate-entity-row.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "../../../components/ha-climate-state"; import "../components/hui-generic-entity-row"; @@ -26,7 +25,7 @@ class HuiClimateEntityRow extends LitElement implements EntityRow { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this._config) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-cover-entity-row.ts b/src/panels/lovelace/entity-rows/hui-cover-entity-row.ts index 9410960e5a..8572943852 100644 --- a/src/panels/lovelace/entity-rows/hui-cover-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-cover-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../../../components/ha-cover-controls"; @@ -28,7 +32,7 @@ class HuiCoverEntityRow extends LitElement implements EntityRow { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-error-entity-row.ts b/src/panels/lovelace/entity-rows/hui-error-entity-row.ts index 252ed1dfd6..fc0265eddb 100644 --- a/src/panels/lovelace/entity-rows/hui-error-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-error-entity-row.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; class HuiErrorEntityRow extends LitElement { public entity?: string; @@ -12,7 +11,7 @@ class HuiErrorEntityRow extends LitElement { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()} ${this.error || "Entity not available"}: ${this.entity || ""} diff --git a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts index 250970653f..f5a56e1c5e 100644 --- a/src/panels/lovelace/entity-rows/hui-group-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-group-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; @@ -30,7 +34,7 @@ class HuiGroupEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts index eca12feb00..40d4bf8e72 100644 --- a/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-input-select-entity-row.ts @@ -1,6 +1,10 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { repeat } from "lit-html/directives/repeat"; -import { TemplateResult } from "lit-html"; import "@polymer/paper-dropdown-menu/paper-dropdown-menu"; import "@polymer/paper-item/paper-item"; import "@polymer/paper-listbox/paper-listbox"; @@ -32,7 +36,7 @@ class HuiInputSelectEntityRow extends LitElement implements EntityRow { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this._config) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts b/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts index e6c4b4b336..9aae5b482d 100644 --- a/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-input-text-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import { PaperInputElement } from "@polymer/paper-input/paper-input"; import "../components/hui-generic-entity-row"; @@ -27,7 +31,7 @@ class HuiInputTextEntityRow extends LitElement implements EntityRow { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts b/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts index a63ae52753..00ce64a501 100644 --- a/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-lock-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "./hui-error-entity-row"; @@ -27,7 +31,7 @@ class HuiLockEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts index 0181c068ae..3d25f31d4d 100644 --- a/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-media-player-entity-row.ts @@ -1,5 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { html, LitElement, TemplateResult } from "lit-element"; import "@polymer/paper-icon-button/paper-icon-button"; import "../components/hui-generic-entity-row"; @@ -36,7 +35,7 @@ class HuiMediaPlayerEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this.hass || !this._config) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts index 029b4eb91d..7fd6a52052 100644 --- a/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-scene-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; @@ -28,7 +32,7 @@ class HuiSceneEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-script-entity-row.ts b/src/panels/lovelace/entity-rows/hui-script-entity-row.ts index d39145d2c9..8ea849ec76 100644 --- a/src/panels/lovelace/entity-rows/hui-script-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-script-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; @@ -28,7 +32,7 @@ class HuiScriptEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts index de2f7f2fbb..609348a1b2 100644 --- a/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-sensor-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../components/hui-timestamp-display"; @@ -34,7 +38,7 @@ class HuiSensorEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-text-entity-row.ts b/src/panels/lovelace/entity-rows/hui-text-entity-row.ts index 67058a9ac3..6a39d56152 100644 --- a/src/panels/lovelace/entity-rows/hui-text-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-text-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "./hui-error-entity-row"; @@ -28,7 +32,7 @@ class HuiTextEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts b/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts index 9daa8837b2..414efabae4 100644 --- a/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts +++ b/src/panels/lovelace/entity-rows/hui-toggle-entity-row.ts @@ -1,5 +1,9 @@ -import { html, LitElement, PropertyDeclarations } from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; +import { + html, + LitElement, + PropertyDeclarations, + TemplateResult, +} from "lit-element"; import "../components/hui-generic-entity-row"; import "../../../components/entity/ha-entity-toggle"; @@ -29,7 +33,7 @@ class HuiToggleEntityRow extends hassLocalizeLitMixin(LitElement) this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config || !this.hass) { return html``; } diff --git a/src/panels/lovelace/ha-panel-lovelace.ts b/src/panels/lovelace/ha-panel-lovelace.ts index 559e1e5311..eb3821979b 100644 --- a/src/panels/lovelace/ha-panel-lovelace.ts +++ b/src/panels/lovelace/ha-panel-lovelace.ts @@ -6,9 +6,8 @@ import "../../layouts/hass-error-screen"; import "./hui-root"; import { HomeAssistant, PanelInfo } from "../../types"; import { Lovelace } from "./types"; -import { LitElement, html, PropertyValues } from "@polymer/lit-element"; +import { LitElement, html, PropertyValues, TemplateResult } from "lit-element"; import { hassLocalizeLitMixin } from "../../mixins/lit-localize-mixin"; -import { TemplateResult } from "lit-html"; import { showSaveDialog } from "./editor/show-save-config-dialog"; import { generateLovelaceConfig } from "./common/generate-lovelace-config"; @@ -49,7 +48,7 @@ class LovelacePanel extends hassLocalizeLitMixin(LitElement) { this._closeEditor = this._closeEditor.bind(this); } - public render(): TemplateResult { + public render(): TemplateResult | void { const state = this._state!; if (state === "loaded") { diff --git a/src/panels/lovelace/hui-editor.ts b/src/panels/lovelace/hui-editor.ts index fe7260ba4a..9395a8413f 100644 --- a/src/panels/lovelace/hui-editor.ts +++ b/src/panels/lovelace/hui-editor.ts @@ -1,6 +1,5 @@ -import { LitElement, html } from "@polymer/lit-element"; -import { classMap } from "lit-html/directives/classMap"; -import { TemplateResult } from "lit-html"; +import { LitElement, html, TemplateResult } from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import yaml from "js-yaml"; import "@polymer/app-layout/app-header-layout/app-header-layout"; @@ -43,7 +42,7 @@ class LovelaceFullConfigEditor extends hassLocalizeLitMixin(LitElement) { }; } - public render(): TemplateResult { + public render(): TemplateResult | void { return html` ${this.renderStyle()} diff --git a/src/panels/lovelace/hui-root.ts b/src/panels/lovelace/hui-root.ts index b261529b38..313a628fa6 100644 --- a/src/panels/lovelace/hui-root.ts +++ b/src/panels/lovelace/hui-root.ts @@ -3,9 +3,9 @@ import { LitElement, PropertyDeclarations, PropertyValues, -} from "@polymer/lit-element"; -import { TemplateResult } from "lit-html"; -import { classMap } from "lit-html/directives/classMap"; + TemplateResult, +} from "lit-element"; +import { classMap } from "lit-html/directives/class-map"; import "@polymer/app-layout/app-header-layout/app-header-layout"; import "@polymer/app-layout/app-header/app-header"; import "@polymer/app-layout/app-scroll-effects/effects/waterfall"; @@ -119,7 +119,7 @@ class HUIRoot extends hassLocalizeLitMixin(LitElement) { } } - protected render(): TemplateResult { + protected render(): TemplateResult | void { return html` ${this.renderStyle()}
diff --git a/src/panels/lovelace/special-rows/hui-call-service-row.ts b/src/panels/lovelace/special-rows/hui-call-service-row.ts index 33a882c4d3..608016e217 100644 --- a/src/panels/lovelace/special-rows/hui-call-service-row.ts +++ b/src/panels/lovelace/special-rows/hui-call-service-row.ts @@ -1,4 +1,4 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import "@polymer/paper-button/paper-button"; import "../../../components/ha-icon"; @@ -6,7 +6,6 @@ import "../../../components/ha-icon"; import { callService } from "../common/call-service"; import { EntityRow, CallServiceConfig } from "../entity-rows/types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; class HuiCallServiceRow extends LitElement implements EntityRow { public hass?: HomeAssistant; @@ -27,7 +26,7 @@ class HuiCallServiceRow extends LitElement implements EntityRow { this._config = { icon: "hass:remote", action_name: "Run", ...config }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/special-rows/hui-divider-row.ts b/src/panels/lovelace/special-rows/hui-divider-row.ts index f1feced482..38cead769e 100644 --- a/src/panels/lovelace/special-rows/hui-divider-row.ts +++ b/src/panels/lovelace/special-rows/hui-divider-row.ts @@ -1,7 +1,6 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import { EntityRow, DividerConfig } from "../entity-rows/types"; import { HomeAssistant } from "../../../types"; -import { TemplateResult } from "lit-html"; class HuiDividerRow extends LitElement implements EntityRow { public hass?: HomeAssistant; @@ -27,7 +26,7 @@ class HuiDividerRow extends LitElement implements EntityRow { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/special-rows/hui-section-row.ts b/src/panels/lovelace/special-rows/hui-section-row.ts index cce632f42b..9d2db0c6c4 100644 --- a/src/panels/lovelace/special-rows/hui-section-row.ts +++ b/src/panels/lovelace/special-rows/hui-section-row.ts @@ -1,9 +1,8 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import { EntityRow, SectionConfig } from "../entity-rows/types"; import { HomeAssistant } from "../../../types"; import "../../../components/ha-icon"; -import { TemplateResult } from "lit-html"; class HuiSectionRow extends LitElement implements EntityRow { public hass?: HomeAssistant; @@ -23,7 +22,7 @@ class HuiSectionRow extends LitElement implements EntityRow { this._config = config; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/panels/lovelace/special-rows/hui-weblink-row.ts b/src/panels/lovelace/special-rows/hui-weblink-row.ts index c54beba2fb..d06e8470c9 100644 --- a/src/panels/lovelace/special-rows/hui-weblink-row.ts +++ b/src/panels/lovelace/special-rows/hui-weblink-row.ts @@ -1,11 +1,9 @@ -import { html, LitElement } from "@polymer/lit-element"; +import { html, LitElement, TemplateResult } from "lit-element"; import { EntityRow, WeblinkConfig } from "../entity-rows/types"; import { HomeAssistant } from "../../../types"; import "../../../components/ha-icon"; -import { TemplateResult } from "lit-html"; - class HuiWeblinkRow extends LitElement implements EntityRow { public hass?: HomeAssistant; private _config?: WeblinkConfig; @@ -28,7 +26,7 @@ class HuiWeblinkRow extends LitElement implements EntityRow { }; } - protected render(): TemplateResult { + protected render(): TemplateResult | void { if (!this._config) { return html``; } diff --git a/src/resources/jquery.roundslider.js b/src/resources/jquery.roundslider.js index 2876976369..920cff0fb9 100644 --- a/src/resources/jquery.roundslider.js +++ b/src/resources/jquery.roundslider.js @@ -1,4 +1,4 @@ -import { html } from "@polymer/lit-element"; +import { html } from "lit-element"; // jQuery import should come before plugin import import { jQuery as jQuery_ } from "./jquery"; import "round-slider"; diff --git a/src/resources/jquery.roundslider.ondemand.ts b/src/resources/jquery.roundslider.ondemand.ts index 9543de3e28..3c92056f97 100644 --- a/src/resources/jquery.roundslider.ondemand.ts +++ b/src/resources/jquery.roundslider.ondemand.ts @@ -1,4 +1,4 @@ -import { TemplateResult } from "lit-html"; +import { TemplateResult } from "lit-element"; type LoadedRoundSlider = Promise<{ roundSliderStyle: TemplateResult; diff --git a/yarn.lock b/yarn.lock index d8f8a49567..a4ca8e389e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -704,48 +704,6 @@ log-update "^2.3.0" strip-ansi "^3.0.1" -"@material/animation@^0.40.1": - version "0.40.1" - resolved "https://registry.yarnpkg.com/@material/animation/-/animation-0.40.1.tgz#c5ff31e7d7e17324a0045e889d3530b150b9fcec" - integrity sha512-HtxFUw04EHg4S6pXfTA3Z0wKxnNDNcDhe1Np2Y2geo+lAk2Hb7m8yCL/GaL9o2I/eRYsgUXC0U7+Mk74GCz3zw== - -"@material/base@^0.40.1": - version "0.40.1" - resolved "https://registry.yarnpkg.com/@material/base/-/base-0.40.1.tgz#a0d8e19cee98dae0f96dbf0887a14b3f7acd2aac" - integrity sha512-vrbOK8hONVCYgURQ9h7nkXvMdYnZVVNmAfFFijF8fbWQdwnoPcNTdqV6RoQlhBEqHYHQqLNfdUDlznAPKLclGQ== - -"@material/mwc-base@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@material/mwc-base/-/mwc-base-0.3.1.tgz#5e1440aa09e0a83633be36eb8102ff88d3fddae8" - integrity sha512-7AdcBu6rxARcUteEBNSJKCen3hP47T/NRsfw+RMn6IedHlEGp2GKwF6YqYDCVSsQbm0IjsJ4ft4+nVXlFVYO2g== - dependencies: - "@polymer/lit-element" "^0.6.2" - lit-html "^0.12.0" - -"@material/mwc-ripple@^0.3.1": - version "0.3.1" - resolved "https://registry.yarnpkg.com/@material/mwc-ripple/-/mwc-ripple-0.3.1.tgz#da812516d0bd0b15b0c4793b783fbdb9e04cd7a0" - integrity sha512-pOdBkP6NJyGz9UftvKjrx8sXvz+yIXMC8q6Qx/LgGw67tgU4qM/1Hy22iePiw1UFNhlqD8ZwtdPLXKVaisGauQ== - dependencies: - "@material/mwc-base" "^0.3.1" - "@material/ripple" "^0.40.0" - "@polymer/lit-element" "^0.6.2" - lit-html "^0.12.0" - -"@material/ripple@^0.40.0": - version "0.40.1" - resolved "https://registry.yarnpkg.com/@material/ripple/-/ripple-0.40.1.tgz#57cbc689303b48282229cb9b62556af7442e852a" - integrity sha512-sndeTS4VHa0v1UGj7MNcxMCuO9LJ1DjoL1EjE6BH3Lm3M1MnXJHdsBo2CgPbU/FI84tt6+eyHGOYPdPrEDJhCA== - dependencies: - "@material/animation" "^0.40.1" - "@material/base" "^0.40.1" - "@material/theme" "^0.40.1" - -"@material/theme@^0.40.1": - version "0.40.1" - resolved "https://registry.yarnpkg.com/@material/theme/-/theme-0.40.1.tgz#3cc3f1bf87ee9581df03e347a1979e53ae617221" - integrity sha512-cH1CsGIDisEQ2oroZhLTypV0Ir00x3WIwFXnPo7qv3832tuIDkZY623U3rUax6KNPz4Hh1j0tNpTwgrNZwvwWA== - "@mdi/svg@^3.0.39": version "3.0.39" resolved "https://registry.yarnpkg.com/@mdi/svg/-/svg-3.0.39.tgz#6a2d50e5650f758a3a8f6ab294cd272c9408fcda" @@ -1029,13 +987,6 @@ "@polymer/iron-meta" "^3.0.0-pre.26" "@polymer/polymer" "^3.0.0" -"@polymer/lit-element@0.6.2", "@polymer/lit-element@^0.6.2": - version "0.6.2" - resolved "https://registry.yarnpkg.com/@polymer/lit-element/-/lit-element-0.6.2.tgz#589f2fa19e84d23c1debb2c329cbab758ae30581" - integrity sha512-4NWvK6SyAyyeW1mQ24ZVR+rtqZNHZ2JWnVTsPF/1iXnmmPwnpLs8mz0HRqz5adyoyt96ed/y2dsDwGBktJYyew== - dependencies: - lit-html "^0.12.0" - "@polymer/neon-animation@^3.0.0-pre.26", "@polymer/neon-animation@^3.0.1": version "3.0.1" resolved "https://registry.yarnpkg.com/@polymer/neon-animation/-/neon-animation-3.0.1.tgz#6658e4b524abc057477772a7473292493d366c24" @@ -8685,10 +8636,17 @@ listr@^0.14.2: p-map "^2.0.0" rxjs "^6.3.3" -lit-html@0.12.0, lit-html@^0.12.0: - version "0.12.0" - resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-0.12.0.tgz#d994420fda74744f9d4a79401b086de929643e6a" - integrity sha512-NyFgq8yTlGEjUFQOmNnK/kj+ZdDVJzTwsLunNSewGiOns7SjuJi6ymCCqzZZ81uW2VwEmliMbOlFZc9QmOJPLA== +lit-element@2.0.0-rc.2: + version "2.0.0-rc.2" + resolved "https://registry.yarnpkg.com/lit-element/-/lit-element-2.0.0-rc.2.tgz#5975c3b282ce47937de861b48456036df71f422b" + integrity sha512-yP6mX23n8WUYXpS2RJUL87DSZYQY327YrnqFiSyPe9aSzjgJ5Jy3In3itzjeiFOT8Od4VKLM7u6bLG9tGFO1pw== + dependencies: + lit-html "^1.0.0-rc.2" + +lit-html@1.0.0-rc.2, lit-html@^1.0.0-rc.2: + version "1.0.0-rc.2" + resolved "https://registry.yarnpkg.com/lit-html/-/lit-html-1.0.0-rc.2.tgz#b9c904520fe005d349aa737a86d83645d97d5a89" + integrity sha512-4bq34lhVmwWly1zBXicOBJLOwaWfjOVbchEEmFnZLuztxjh5wRd2WqV0URX8Q47MQ7PaIjn/eXyTRKsYhSAeRw== load-json-file@^1.0.0: version "1.1.0"