Enable compression for development

2026-05-24 01:57:13 +00:00 · 2023-02-27 16:10:45 -06:00
403 changed files with 4000 additions and 4161 deletions
@@ -119,6 +119,7 @@
    "lit/no-template-map": "off",
    "lit/no-native-attributes": "warn",
    "lit/no-this-assign-in-render": "warn",
+    "lit/prefer-nothing": "warn",
    "lit-a11y/click-events-have-key-events": ["off"],
    "lit-a11y/no-autofocus": "off",
    "lit-a11y/alt-text": "warn",
@@ -6,3 +6,16 @@ updates:
      interval: weekly
      time: "06:00"
    open-pull-requests-limit: 10
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "03:00"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    ignore:
+      # Ignore rollup and plugins until everything else is updated
+      - dependency-name: "*rollup*"
+      - dependency-name: "@rollup/*"
+      - dependency-name: "serve"
@@ -1,5 +1,3 @@
-defaultSemverRangePrefix: ""
-
 nodeLinker: node-modules

 plugins:
@@ -8,4 +6,4 @@ plugins:
  - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
    spec: "@yarnpkg/plugin-interactive-tools"

-yarnPath: .yarn/releases/yarn-3.4.1.cjs
+yarnPath: .yarn/releases/yarn-3.3.1.cjs
@@ -53,25 +53,13 @@ module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
  ...defineOverlay,
 });

-const htmlMinifierOptions = {
-  caseSensitive: true,
-  collapseWhitespace: true,
-  conservativeCollapse: true,
-  decodeEntities: true,
-  removeComments: true,
-  removeRedundantAttributes: true,
-  minifyCSS: {
-    level: 0,
-  },
-};
-
 module.exports.terserOptions = (latestBuild) => ({
  safari10: !latestBuild,
  ecma: latestBuild ? undefined : 5,
  output: { comments: false },
 });

-module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
+module.exports.babelOptions = ({ latestBuild }) => ({
  babelrc: false,
  compact: false,
  presets: [
@@ -79,7 +67,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
      "@babel/preset-env",
      {
        useBuiltIns: "entry",
-        corejs: { version: "3.29", proposals: true },
+        corejs: { version: "3.28", proposals: true },
        bugfixes: true,
      },
    ],
@@ -105,30 +93,12 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild }) => ({
    "@babel/plugin-syntax-import-meta",
    "@babel/plugin-syntax-dynamic-import",
    "@babel/plugin-syntax-top-level-await",
-    // Support  various proposals
    "@babel/plugin-proposal-optional-chaining",
    "@babel/plugin-proposal-nullish-coalescing-operator",
    ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
    ["@babel/plugin-proposal-private-methods", { loose: true }],
    ["@babel/plugin-proposal-private-property-in-object", { loose: true }],
    ["@babel/plugin-proposal-class-properties", { loose: true }],
-    // Minify template literals for production
-    isProdBuild && [
-      "template-html-minifier",
-      {
-        modules: {
-          lit: [
-            "html",
-            { name: "svg", encapsulation: "svg" },
-            { name: "css", encapsulation: "style" },
-          ],
-          "@polymer/polymer/lib/utils/html-tag": ["html"],
-        },
-        strictCSS: true,
-        htmlMinifier: htmlMinifierOptions,
-        failOnError: true, // we can turn this off in case of false positives
-      },
-    ],
  ].filter(Boolean),
  exclude: [
    // \\ for Windows, / for Mac OS and Linux
@@ -1 +1,30 @@
-[]
+[
+  {
+    "path": "M20,20H7A2,2 0 0,1 5,18V8.94L2.23,5.64C2.09,5.47 2,5.24 2,5A1,1 0 0,1 3,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M8.5,7A0.5,0.5 0 0,0 8,7.5V8.5A0.5,0.5 0 0,0 8.5,9H18.5A0.5,0.5 0 0,0 19,8.5V7.5A0.5,0.5 0 0,0 18.5,7H8.5M8.5,11A0.5,0.5 0 0,0 8,11.5V12.5A0.5,0.5 0 0,0 8.5,13H18.5A0.5,0.5 0 0,0 19,12.5V11.5A0.5,0.5 0 0,0 18.5,11H8.5M8.5,15A0.5,0.5 0 0,0 8,15.5V16.5A0.5,0.5 0 0,0 8.5,17H13.5A0.5,0.5 0 0,0 14,16.5V15.5A0.5,0.5 0 0,0 13.5,15H8.5Z",
+    "name": "android-messages"
+  },
+  {
+    "path": "M4,6H2V20A2,2 0 0,0 4,22H18V20H4V6M20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2M20,12L17.5,10.5L15,12V4H20V12Z",
+    "name": "book-variant-multiple"
+  },
+  {
+    "path": "M21,14H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10L8,21V22H16V21L14,18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z",
+    "name": "desktop-mac"
+  },
+  {
+    "path": "M21,14V4H3V14H21M21,2A2,2 0 0,1 23,4V16A2,2 0 0,1 21,18H14L16,21V22H8V21L10,18H3C1.89,18 1,17.1 1,16V4C1,2.89 1.89,2 3,2H21M4,5H15V10H4V5M16,5H20V7H16V5M20,8V13H16V8H20M4,11H9V13H4V11M10,11H15V13H10V11Z",
+    "name": "desktop-mac-dashboard"
+  },
+  {
+    "path": "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z",
+    "name": "discord"
+  },
+  {
+    "path": "M8.06,7.78C7.5,7.78 7.17,7.73 7.08,7.64L6.66,13.73C7.19,14.05 7.88,14.3 8.72,14.5C9.56,14.71 10.78,14.77 12.38,14.67C13.97,14.58 15.63,14.23 17.34,13.64L16.55,4.22C15.67,5.09 14.38,5.91 12.66,6.66C11.13,7.31 9.81,7.69 8.72,7.78H8.06M7.97,5.34C7.28,5.94 7,6.34 7.13,6.56C7.22,6.78 7.7,6.84 8.58,6.75C9.67,6.66 10.91,6.31 12.28,5.72C13.22,5.31 14.03,4.88 14.72,4.41C15.41,3.94 15.88,3.55 16.13,3.23C16.38,2.92 16.47,2.7 16.41,2.58C16.34,2.42 16.03,2.34 15.47,2.34C14.34,2.34 12.94,2.7 11.25,3.42C9.81,4.05 8.72,4.69 7.97,5.34M17.34,2.2C17.41,2.33 17.44,2.47 17.44,2.63L18.61,17C18.61,18.73 18,20.09 16.83,21.07C15.64,22.05 14.03,22.55 12,22.55C10,22.55 8.4,22.04 7.2,21C6,20 5.39,18.64 5.39,16.92L6.09,6.47C6.09,6.22 6.2,5.94 6.42,5.63C6.64,5.31 6.84,5.06 7.03,4.88L7.36,4.59C8.33,3.78 9.5,3.08 10.88,2.5C11.81,2.08 12.73,1.77 13.62,1.57C14.5,1.37 15.3,1.3 16,1.38C16.71,1.46 17.16,1.73 17.34,2.2Z",
+    "name": "google-home"
+  },
+  {
+    "path": "M19.25,19H4.75V3H19.25M14,22H10V21H14M18,0H6A3,3 0 0,0 3,3V21A3,3 0 0,0 6,24H18A3,3 0 0,0 21,21V3A3,3 0 0,0 18,0Z",
+    "name": "tablet-android"
+  }
+]
@@ -43,14 +43,7 @@ const createRollupConfig = ({
    preserveEntrySignatures: false,
    plugins: [
      ignore({
-        files: bundle
-          .emptyPackages({ latestBuild })
-          // TEMP HACK: Makes Rollup build work again
-          .concat(
-            require.resolve(
-              "@webcomponents/scoped-custom-element-registry/scoped-custom-element-registry.min"
-            )
-          ),
+        files: bundle.emptyPackages({ latestBuild }),
      }),
      resolve({
        extensions,
@@ -61,7 +54,7 @@ const createRollupConfig = ({
      commonjs(),
      json(),
      babel({
-        ...bundle.babelOptions({ latestBuild, isProdBuild }),
+        ...bundle.babelOptions({ latestBuild }),
        extensions,
        babelHelpers: isWDS ? "inline" : "bundled",
      }),
@@ -2,6 +2,7 @@ const webpack = require("webpack");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
+const CompressionWebpackPlugin = require("compression-webpack-plugin");
 const log = require("fancy-log");
 const WebpackBar = require("webpackbar");
 const paths = require("./paths.js");
@@ -51,7 +52,7 @@ const createWebpackConfig = ({
          use: {
            loader: "babel-loader",
            options: {
-              ...bundle.babelOptions({ latestBuild, isProdBuild }),
+              ...bundle.babelOptions({ latestBuild }),
              cacheDirectory: !isProdBuild,
              cacheCompression: false,
            },
@@ -75,6 +76,7 @@ const createWebpackConfig = ({
      chunkIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
    },
    plugins: [
+      new CompressionWebpackPlugin(),
      !isStatsBuild && new WebpackBar({ fancy: !isProdBuild }),
      new WebpackManifestPlugin({
        // Only include the JS of entrypoints
@@ -1,4 +1,4 @@
-import { html, nothing } from "lit";
+import { html, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { mockHistory } from "../../../../demo/src/stubs/history";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
@@ -18,9 +18,9 @@ class HcDemo extends HassElement {

  @state() private _lovelaceConfig?: LovelaceConfig;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._lovelaceConfig) {
-      return nothing;
+      return html``;
    }
    return html`
      <hc-lovelace
@@ -1,5 +1,5 @@
 import { mdiTelevision } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
 import { CastManager } from "../../../src/cast/cast_manager";
 import { castSendShowDemo } from "../../../src/cast/receiver_messages";
@@ -20,12 +20,12 @@ class CastDemoRow extends LitElement implements LovelaceRow {
    // No config possible.
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (
      !this._castManager ||
      this._castManager.castState === "NO_DEVICES_AVAILABLE"
    ) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-svg-icon .path=${mdiTelevision}></ha-svg-icon>
@@ -1,5 +1,5 @@
 import "@material/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { until } from "lit/directives/until";
 import "../../../src/components/ha-card";
@@ -30,9 +30,9 @@ export class HADemoCard extends LitElement implements LovelaceCard {

  public setConfig(_config: LovelaceCardConfig) {}

-  protected render() {
+  protected render(): TemplateResult {
    if (this._hidden) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-card>
@@ -1,4 +1,4 @@
-import { css, html, nothing } from "lit";
+import { html, css } from "lit";
 import { customElement, property } from "lit/decorators";
 import { until } from "lit/directives/until";
 import { HaMarkdown } from "../../../src/components/ha-markdown";
@@ -10,7 +10,7 @@ class PageDescription extends HaMarkdown {

  render() {
    if (!PAGES[this.page].description) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -127,9 +127,9 @@ export class DemoAutomationDescribeAction extends LitElement {

  @state() _action = initialAction;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-card header="Actions">
@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -53,9 +53,9 @@ export class DemoAutomationDescribeCondition extends LitElement {

  @state() _condition = initialCondition;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -64,9 +64,9 @@ export class DemoAutomationDescribeTrigger extends LitElement {

  @state() _trigger = initialTrigger;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,6 +1,5 @@
 /* eslint-disable lit/no-template-arrow */
-
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/trace/hat-script-graph";
@@ -30,9 +29,9 @@ const traces: DemoTrace[] = [
 export class DemoAutomationTraceTimeline extends LitElement {
  @property({ attribute: false }) hass?: HomeAssistant;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }
    return html`
      ${traces.map(
@@ -1,15 +1,14 @@
 /* eslint-disable lit/no-template-arrow */
-
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { html, css, LitElement, TemplateResult } from "lit";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/trace/hat-script-graph";
 import "../../../../src/components/trace/hat-trace-timeline";
+import { customElement, property, state } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
+import { DemoTrace } from "../../data/traces/types";
 import { basicTrace } from "../../data/traces/basic_trace";
 import { motionLightTrace } from "../../data/traces/motion-light-trace";
-import { DemoTrace } from "../../data/traces/types";

 const traces: DemoTrace[] = [basicTrace, motionLightTrace];

@@ -19,9 +18,9 @@ export class DemoAutomationTrace extends LitElement {

  @state() private _selected = {};

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }
    return html`
      ${traces.map(
@@ -2,7 +2,7 @@ import {
  HassEntity,
  HassEntityAttributeBase,
 } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { computeDomain } from "../../../../src/common/entity/compute_domain";
@@ -387,9 +387,9 @@ export class DemoEntityState extends LitElement {
    hass.updateTranslations("config", "en");
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,22 +1,22 @@
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import "../../../../src/components/ha-formfield";
 import "../../../../src/components/ha-switch";

-import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
+import { customElement, property, state } from "lit/decorators";
 import { IntegrationManifest } from "../../../../src/data/integration";

-import { DeviceRegistryEntry } from "../../../../src/data/device_registry";
-import { EntityRegistryEntry } from "../../../../src/data/entity_registry";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
+import { HomeAssistant } from "../../../../src/types";
+import "../../../../src/panels/config/integrations/ha-integration-card";
+import "../../../../src/panels/config/integrations/ha-ignored-config-entry-card";
 import "../../../../src/panels/config/integrations/ha-config-flow-card";
 import type {
  ConfigEntryExtended,
  DataEntryFlowProgressExtended,
 } from "../../../../src/panels/config/integrations/ha-config-integrations";
-import "../../../../src/panels/config/integrations/ha-ignored-config-entry-card";
-import "../../../../src/panels/config/integrations/ha-integration-card";
-import { HomeAssistant } from "../../../../src/types";
+import { DeviceRegistryEntry } from "../../../../src/data/device_registry";
+import { EntityRegistryEntry } from "../../../../src/data/entity_registry";

 const createConfigEntry = (
  title: string,
@@ -231,9 +231,9 @@ export class DemoIntegrationCard extends LitElement {

  @state() isCloud = false;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }
    return html`
      <div class="container">
@@ -6,7 +6,6 @@ import {
  CSSResultGroup,
  html,
  LitElement,
-  nothing,
  PropertyValues,
  TemplateResult,
 } from "lit";
@@ -74,8 +73,8 @@ export class HassioAddonStore extends LitElement {
    }
  }

-  protected render() {
-    let repos: (TemplateResult | typeof nothing)[] = [];
+  protected render(): TemplateResult {
+    let repos: TemplateResult[] = [];

    if (this.supervisor.store.repositories) {
      repos = this.addonRepositories(
@@ -174,7 +173,7 @@ export class HassioAddonStore extends LitElement {
                .supervisor=${this.supervisor}
              ></hassio-addon-repository>
            `
-          : nothing;
+          : html``;
      })
  );

@@ -4,7 +4,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -47,9 +47,9 @@ class HassioAddonNetwork extends LitElement {
    this._setNetworkConfig();
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._config) {
-      return nothing;
+      return html``;
    }

    const hasHiddenOptions = Object.keys(this._config).find(
@@ -8,7 +8,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -160,9 +160,9 @@ export class HassioBackups extends LitElement {
    }))
  );

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.supervisor) {
-      return nothing;
+      return html``;
    }
    return html`
      <hass-tabs-subpage-data-table
@@ -1,13 +1,6 @@
 import { mdiFolder, mdiHomeAssistant, mdiPuzzle } from "@mdi/js";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  TemplateResult,
-  nothing,
-} from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { formatDate } from "../../../src/common/datetime/format_date";
@@ -18,9 +11,9 @@ import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-radio";
 import type { HaRadio } from "../../../src/components/ha-radio";
 import {
-  HassioBackupDetail,
  HassioFullBackupCreateParams,
  HassioPartialBackupCreateParams,
+  HassioBackupDetail,
 } from "../../../src/data/hassio/backup";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { PolymerChangedEvent } from "../../../src/polymer-types";
@@ -122,9 +115,9 @@ export class SupervisorBackupContent extends LitElement {
    this.supervisor?.localize(`backup.${key}`) ||
    this.localize!(`ui.panel.page-onboarding.restore.${key}`);

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.onboarding && !this.supervisor) {
-      return nothing;
+      return html``;
    }
    const foldersSection =
      this.backupType === "partial" ? this._getSection("folders") : undefined;
@@ -1,6 +1,6 @@
 import "@material/mwc-button";
 import { mdiHomeAssistant } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import "../../../src/components/buttons/ha-progress-button";
@@ -33,14 +33,14 @@ export class HassioUpdate extends LitElement {
      ).length
  );

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.supervisor) {
-      return nothing;
+      return html``;
    }

    const updatesAvailable = this._pendingUpdates(this.supervisor);
    if (!updatesAvailable) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -80,9 +80,9 @@ export class HassioUpdate extends LitElement {
    name: string,
    key: string,
    object: HassioHomeAssistantInfo | HassioSupervisorInfo | HassioHassOSInfo
-  ) {
+  ): TemplateResult {
    if (!object.update_available) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-card outlined>
@@ -1,5 +1,5 @@
 import { mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/ha-header-bar";
@@ -36,9 +36,9 @@ export class DialogHassioBackupUpload
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._dialogParams) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,11 +1,9 @@
 import { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiClose, mdiDotsVertical } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { atLeastVersion } from "../../../../src/common/config/version";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
 import { slugify } from "../../../../src/common/string/slugify";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
@@ -13,12 +11,11 @@ import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-icon-button";
 import { getSignedPath } from "../../../../src/data/auth";
+import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
  fetchHassioBackupInfo,
  HassioBackupDetail,
-  removeBackup,
 } from "../../../../src/data/hassio/backup";
-import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
  showAlertDialog,
  showConfirmationDialog,
@@ -30,6 +27,8 @@ import { fileDownload } from "../../../../src/util/file_download";
 import "../../components/supervisor-backup-content";
 import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
 import { HassioBackupDialogParams } from "./show-dialog-hassio-backup";
+import { atLeastVersion } from "../../../../src/common/config/version";
+import { stopPropagation } from "../../../../src/common/dom/stop_propagation";

@customElement("dialog-hassio-backup")
 class HassioBackupDialog
@@ -63,9 +62,9 @@ class HassioBackupDialog
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._dialogParams || !this._backup) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-dialog
@@ -287,15 +286,24 @@ class HassioBackupDialog
      return;
    }

-    try {
-      await removeBackup(this.hass!, this._backup!.slug);
-      if (this._dialogParams!.onDelete) {
-        this._dialogParams!.onDelete();
+    this.hass!.callApi(
+      atLeastVersion(this.hass!.config.version, 2021, 9) ? "DELETE" : "POST",
+      `hassio/${
+        atLeastVersion(this.hass!.config.version, 2021, 9)
+          ? `backups/${this._backup!.slug}`
+          : `snapshots/${this._backup!.slug}/remove`
+      }`
+    ).then(
+      () => {
+        if (this._dialogParams!.onDelete) {
+          this._dialogParams!.onDelete();
+        }
+        this.closeDialog();
+      },
+      (error) => {
+        this._error = error.body.message;
      }
-      this.closeDialog();
-    } catch (err: any) {
-      this._error = err.body.message;
-    }
+    );
  }

  private async _downloadClicked() {
@@ -1,15 +1,15 @@
 import "@material/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
+import "../../../../src/components/buttons/ha-progress-button";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
+import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
  createHassioFullBackup,
  createHassioPartialBackup,
 } from "../../../../src/data/hassio/backup";
-import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import { showAlertDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
@@ -42,9 +42,9 @@ class HassioCreateBackupDialog extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._dialogParams) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-dialog
@@ -1,5 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -55,9 +55,9 @@ class HassioDatadiskDialog extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.dialogParams) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-dialog
@@ -1,13 +1,13 @@
 import { mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/search-input";
 import { stringCompare } from "../../../../src/common/string/compare";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-expansion-panel";
 import "../../../../src/components/ha-icon-button";
-import "../../../../src/components/search-input";
 import { HassioHardwareInfo } from "../../../../src/data/hassio/hardware";
 import { dump } from "../../../../src/resources/js-yaml-dump";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
@@ -53,9 +53,9 @@ class HassioHardwareDialog extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._dialogParams) {
-      return nothing;
+      return html``;
    }

    const devices = _filterDevices(
@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-markdown";
@@ -27,9 +27,9 @@ class HassioMarkdownDialog extends LitElement {
    this._opened = false;
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._opened) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-dialog
@@ -5,7 +5,7 @@ import "@material/mwc-tab";
 import "@material/mwc-tab-bar";
 import { mdiClose } from "@mdi/js";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { cache } from "lit/directives/cache";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -83,9 +83,9 @@ export class DialogHassioNetwork
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params || !this._interface) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,11 +1,11 @@
+import "@polymer/paper-tooltip/paper-tooltip";
 import "@material/mwc-button/mwc-button";
 import { mdiDelete, mdiDeleteOff } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
-import "@polymer/paper-tooltip/paper-tooltip";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -19,14 +19,14 @@ import {
  HassioAddonRepository,
 } from "../../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
+import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
+import type { HomeAssistant } from "../../../../src/types";
+import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
 import {
  addStoreRepository,
  fetchStoreRepositories,
  removeStoreRepository,
 } from "../../../../src/data/supervisor/store";
-import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
-import type { HomeAssistant } from "../../../../src/types";
-import { HassioRepositoryDialogParams } from "./show-dialog-repositories";

@customElement("dialog-hassio-repositories")
 class HassioRepositoriesDialog extends LitElement {
@@ -82,9 +82,9 @@ class HassioRepositoriesDialog extends LitElement {
        .map((repo) => repo.slug)
  );

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._dialogParams?.supervisor || this._repositories === undefined) {
-      return nothing;
+      return html``;
    }
    const repositories = this._filteredRepositories(this._repositories);
    const usedRepositories = this._filteredUsedRepositories(
@@ -1,5 +1,5 @@
 import { sanitizeUrl } from "@braintree/sanitize-url";
-import { html, LitElement, TemplateResult, nothing } from "lit";
+import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { navigate } from "../../src/common/navigate";
 import {
@@ -101,13 +101,13 @@ class HassioMyRedirect extends LitElement {
    navigate(url, { replace: true });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._error) {
      return html`<hass-error-screen
        .error=${this._error}
      ></hass-error-screen>`;
    }
-    return nothing;
+    return html``;
  }

  private _createRedirectUrl(redirect: Redirect): string {
@@ -5,7 +5,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -116,12 +116,12 @@ class UpdateAvailableCard extends LitElement {
      storeAddons.find((addon) => addon.slug === slug)
  );

-  protected render() {
+  protected render(): TemplateResult {
    if (
      !this._updateType ||
      (this._updateType === "addon" && !this._addonInfo)
    ) {
-      return nothing;
+      return html``;
    }

    const changelog = changelogUrl(this._updateType, this._version_latest);
@@ -24,229 +24,228 @@
  "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
  "license": "Apache-2.0",
  "dependencies": {
-    "@braintree/sanitize-url": "6.0.2",
-    "@codemirror/autocomplete": "6.4.2",
-    "@codemirror/commands": "6.2.1",
-    "@codemirror/language": "6.6.0",
-    "@codemirror/legacy-modes": "6.3.1",
-    "@codemirror/search": "6.2.3",
-    "@codemirror/state": "6.2.0",
-    "@codemirror/view": "6.9.1",
-    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "6.5.1",
-    "@formatjs/intl-getcanonicallocales": "2.1.0",
-    "@formatjs/intl-locale": "3.1.1",
-    "@formatjs/intl-numberformat": "8.3.5",
-    "@formatjs/intl-pluralrules": "5.1.10",
-    "@formatjs/intl-relativetimeformat": "11.1.10",
-    "@fullcalendar/core": "6.1.4",
-    "@fullcalendar/daygrid": "6.1.4",
-    "@fullcalendar/interaction": "6.1.4",
-    "@fullcalendar/list": "6.1.4",
-    "@fullcalendar/timegrid": "6.1.4",
-    "@lezer/highlight": "1.1.3",
-    "@lit-labs/motion": "1.0.3",
-    "@lit-labs/virtualizer": "1.0.1",
+    "@braintree/sanitize-url": "^6.0.2",
+    "@codemirror/autocomplete": "^6.4.2",
+    "@codemirror/commands": "^6.2.1",
+    "@codemirror/language": "^6.6.0",
+    "@codemirror/legacy-modes": "^6.3.1",
+    "@codemirror/search": "^6.2.3",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.9.1",
+    "@egjs/hammerjs": "^2.0.17",
+    "@formatjs/intl-datetimeformat": "^6.5.1",
+    "@formatjs/intl-getcanonicallocales": "^2.1.0",
+    "@formatjs/intl-locale": "^3.1.1",
+    "@formatjs/intl-numberformat": "^8.3.5",
+    "@formatjs/intl-pluralrules": "^5.1.10",
+    "@formatjs/intl-relativetimeformat": "^11.1.10",
+    "@fullcalendar/core": "^6.1.4",
+    "@fullcalendar/daygrid": "^6.1.4",
+    "@fullcalendar/interaction": "^6.1.4",
+    "@fullcalendar/list": "^6.1.4",
+    "@fullcalendar/timegrid": "^6.1.4",
+    "@lezer/highlight": "^1.1.3",
+    "@lit-labs/motion": "^1.0.3",
+    "@lit-labs/virtualizer": "^1.0.1",
    "@material/chips": "=14.0.0-canary.53b3cad2f.0",
    "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
-    "@material/mwc-button": "0.27.0",
-    "@material/mwc-checkbox": "0.27.0",
-    "@material/mwc-circular-progress": "0.27.0",
-    "@material/mwc-dialog": "0.27.0",
-    "@material/mwc-drawer": "0.27.0",
-    "@material/mwc-fab": "0.27.0",
-    "@material/mwc-formfield": "0.27.0",
-    "@material/mwc-icon-button": "0.27.0",
-    "@material/mwc-linear-progress": "0.27.0",
-    "@material/mwc-list": "0.27.0",
-    "@material/mwc-menu": "0.27.0",
-    "@material/mwc-radio": "0.27.0",
-    "@material/mwc-ripple": "0.27.0",
-    "@material/mwc-select": "0.27.0",
-    "@material/mwc-slider": "0.27.0",
-    "@material/mwc-switch": "0.27.0",
-    "@material/mwc-tab": "0.27.0",
-    "@material/mwc-tab-bar": "0.27.0",
-    "@material/mwc-textarea": "0.27.0",
-    "@material/mwc-textfield": "0.27.0",
-    "@material/mwc-top-app-bar-fixed": "0.27.0",
+    "@material/mwc-button": "^0.27.0",
+    "@material/mwc-checkbox": "^0.27.0",
+    "@material/mwc-circular-progress": "^0.27.0",
+    "@material/mwc-dialog": "^0.27.0",
+    "@material/mwc-drawer": "^0.27.0",
+    "@material/mwc-fab": "^0.27.0",
+    "@material/mwc-formfield": "^0.27.0",
+    "@material/mwc-icon-button": "^0.27.0",
+    "@material/mwc-linear-progress": "^0.27.0",
+    "@material/mwc-list": "^0.27.0",
+    "@material/mwc-menu": "^0.27.0",
+    "@material/mwc-radio": "^0.27.0",
+    "@material/mwc-ripple": "^0.27.0",
+    "@material/mwc-select": "^0.27.0",
+    "@material/mwc-slider": "^0.27.0",
+    "@material/mwc-switch": "^0.27.0",
+    "@material/mwc-tab": "^0.27.0",
+    "@material/mwc-tab-bar": "^0.27.0",
+    "@material/mwc-textarea": "^0.27.0",
+    "@material/mwc-textfield": "^0.27.0",
+    "@material/mwc-top-app-bar-fixed": "^0.27.0",
    "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
    "@material/web": "=1.0.0-pre.3",
    "@mdi/js": "7.1.96",
    "@mdi/svg": "7.1.96",
-    "@polymer/app-layout": "3.1.0",
-    "@polymer/iron-flex-layout": "3.0.1",
-    "@polymer/iron-icon": "3.0.1",
-    "@polymer/iron-input": "3.0.1",
-    "@polymer/iron-resizable-behavior": "3.0.1",
-    "@polymer/paper-input": "3.2.1",
-    "@polymer/paper-item": "3.0.1",
-    "@polymer/paper-listbox": "3.0.1",
-    "@polymer/paper-slider": "3.0.1",
-    "@polymer/paper-styles": "3.0.1",
-    "@polymer/paper-tabs": "3.1.0",
-    "@polymer/paper-toast": "3.0.1",
-    "@polymer/paper-tooltip": "3.0.1",
+    "@polymer/app-layout": "^3.1.0",
+    "@polymer/iron-flex-layout": "^3.0.1",
+    "@polymer/iron-icon": "^3.0.1",
+    "@polymer/iron-input": "^3.0.1",
+    "@polymer/iron-resizable-behavior": "^3.0.1",
+    "@polymer/paper-input": "^3.2.1",
+    "@polymer/paper-item": "^3.0.1",
+    "@polymer/paper-listbox": "^3.0.1",
+    "@polymer/paper-slider": "^3.0.1",
+    "@polymer/paper-styles": "^3.0.1",
+    "@polymer/paper-tabs": "^3.1.0",
+    "@polymer/paper-toast": "^3.0.1",
+    "@polymer/paper-tooltip": "^3.0.1",
    "@polymer/polymer": "3.4.1",
    "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "23.3.8",
-    "@vaadin/vaadin-themable-mixin": "23.3.8",
-    "@vibrant/color": "3.2.1-alpha.1",
-    "@vibrant/core": "3.2.1-alpha.1",
-    "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
-    "@vue/web-component-wrapper": "1.3.0",
-    "@webcomponents/scoped-custom-element-registry": "0.0.8",
-    "@webcomponents/webcomponentsjs": "2.7.0",
-    "app-datepicker": "5.1.1",
-    "chart.js": "3.3.2",
-    "comlink": "4.4.1",
-    "core-js": "3.29.0",
-    "cropperjs": "1.5.13",
-    "date-fns": "2.29.3",
-    "date-fns-tz": "2.0.0",
-    "deep-clone-simple": "1.1.1",
-    "deep-freeze": "0.0.1",
-    "fuse.js": "6.6.2",
-    "google-timezones-json": "1.0.2",
-    "hls.js": "1.3.4",
-    "home-assistant-js-websocket": "8.0.1",
-    "idb-keyval": "6.2.0",
-    "intl-messageformat": "10.3.1",
-    "js-yaml": "4.1.0",
-    "leaflet": "1.9.3",
-    "leaflet-draw": "1.0.4",
-    "lit": "2.6.1",
-    "marked": "4.2.12",
-    "memoize-one": "6.0.0",
+    "@vaadin/combo-box": "^23.3.7",
+    "@vaadin/vaadin-themable-mixin": "^23.3.7",
+    "@vibrant/color": "^3.2.1-alpha.1",
+    "@vibrant/core": "^3.2.1-alpha.1",
+    "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
+    "@vue/web-component-wrapper": "^1.3.0",
+    "@webcomponents/scoped-custom-element-registry": "^0.0.8",
+    "@webcomponents/webcomponentsjs": "^2.7.0",
+    "app-datepicker": "^5.1.0",
+    "chart.js": "^3.3.2",
+    "comlink": "^4.4.1",
+    "compression-webpack-plugin": "^10.0.0",
+    "core-js": "^3.28.0",
+    "cropperjs": "^1.5.13",
+    "date-fns": "^2.29.3",
+    "date-fns-tz": "^2.0.0",
+    "deep-clone-simple": "^1.1.1",
+    "deep-freeze": "^0.0.1",
+    "fuse.js": "^6.6.2",
+    "google-timezones-json": "^1.0.2",
+    "hls.js": "^1.3.3",
+    "home-assistant-js-websocket": "^8.0.1",
+    "idb-keyval": "^6.2.0",
+    "intl-messageformat": "^10.3.1",
+    "js-yaml": "^4.1.0",
+    "leaflet": "^1.9.3",
+    "leaflet-draw": "^1.0.4",
+    "lit": "^2.6.1",
+    "marked": "^4.2.12",
+    "memoize-one": "^6.0.0",
    "node-vibrant": "3.2.1-alpha.1",
-    "proxy-polyfill": "0.3.2",
-    "punycode": "2.3.0",
-    "qr-scanner": "1.4.2",
-    "qrcode": "1.5.1",
-    "regenerator-runtime": "0.13.11",
-    "resize-observer-polyfill": "1.5.1",
-    "roboto-fontface": "0.10.0",
-    "rrule": "2.7.2",
-    "sortablejs": "1.15.0",
-    "superstruct": "1.0.3",
-    "tinykeys": "1.4.0",
-    "tsparticles-engine": "2.9.3",
-    "tsparticles-preset-links": "2.9.3",
-    "unfetch": "5.0.0",
-    "vis-data": "7.1.4",
-    "vis-network": "9.1.4",
-    "vue": "2.7.14",
-    "vue2-daterange-picker": "0.6.8",
-    "weekstart": "2.0.0",
-    "workbox-cacheable-response": "6.5.4",
-    "workbox-core": "6.5.4",
-    "workbox-expiration": "6.5.4",
-    "workbox-precaching": "6.5.4",
-    "workbox-routing": "6.5.4",
-    "workbox-strategies": "6.5.4",
-    "xss": "1.0.14"
+    "proxy-polyfill": "^0.3.2",
+    "punycode": "^2.3.0",
+    "qr-scanner": "^1.4.2",
+    "qrcode": "^1.5.1",
+    "regenerator-runtime": "^0.13.11",
+    "resize-observer-polyfill": "^1.5.1",
+    "roboto-fontface": "^0.10.0",
+    "rrule": "^2.7.2",
+    "sortablejs": "^1.15.0",
+    "superstruct": "^1.0.3",
+    "tinykeys": "^1.4.0",
+    "tsparticles-engine": "^2.9.3",
+    "tsparticles-preset-links": "^2.9.3",
+    "unfetch": "^5.0.0",
+    "vis-data": "^7.1.4",
+    "vis-network": "^9.1.4",
+    "vue": "^2.7.14",
+    "vue2-daterange-picker": "^0.6.8",
+    "weekstart": "^2.0.0",
+    "workbox-cacheable-response": "^6.5.4",
+    "workbox-core": "^6.5.4",
+    "workbox-expiration": "^6.5.4",
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "xss": "^1.0.14"
  },
  "devDependencies": {
-    "@babel/core": "7.21.0",
-    "@babel/plugin-external-helpers": "7.18.6",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.21.0",
-    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
-    "@babel/plugin-proposal-object-rest-spread": "7.20.7",
-    "@babel/plugin-proposal-optional-chaining": "7.21.0",
-    "@babel/plugin-syntax-dynamic-import": "7.8.3",
-    "@babel/plugin-syntax-import-meta": "7.10.4",
-    "@babel/plugin-syntax-top-level-await": "7.14.5",
-    "@babel/preset-env": "7.20.2",
-    "@babel/preset-typescript": "7.21.0",
-    "@koa/cors": "4.0.0",
-    "@octokit/auth-oauth-device": "4.0.4",
-    "@octokit/rest": "19.0.7",
-    "@open-wc/dev-server-hmr": "0.1.3",
-    "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-commonjs": "24.0.1",
-    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup/plugin-replace": "5.0.2",
+    "@babel/core": "^7.21.0",
+    "@babel/plugin-external-helpers": "^7.18.6",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "^7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "^7.21.0",
+    "@babel/plugin-syntax-dynamic-import": "^7.8.3",
+    "@babel/plugin-syntax-import-meta": "^7.10.4",
+    "@babel/plugin-syntax-top-level-await": "^7.14.5",
+    "@babel/preset-env": "^7.20.2",
+    "@babel/preset-typescript": "^7.21.0",
+    "@koa/cors": "^4.0.0",
+    "@octokit/auth-oauth-device": "^4.0.4",
+    "@octokit/rest": "^19.0.7",
+    "@open-wc/dev-server-hmr": "^0.1.3",
+    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-commonjs": "^11.1.0",
+    "@rollup/plugin-json": "^4.0.3",
+    "@rollup/plugin-node-resolve": "^7.1.3",
+    "@rollup/plugin-replace": "^2.3.2",
    "@types/chromecast-caf-receiver": "5.0.12",
-    "@types/chromecast-caf-sender": "1.0.5",
-    "@types/esprima": "4.0.3",
-    "@types/glob": "8.1.0",
-    "@types/js-yaml": "4.0.5",
-    "@types/leaflet": "1.9.1",
-    "@types/leaflet-draw": "1.0.6",
-    "@types/marked": "4.0.8",
-    "@types/mocha": "10.0.1",
-    "@types/qrcode": "1.5.0",
-    "@types/serve-handler": "6.1.1",
-    "@types/sortablejs": "1.15.0",
-    "@types/tar": "6.1.4",
-    "@types/webspeechapi": "0.0.29",
-    "@typescript-eslint/eslint-plugin": "5.54.0",
-    "@typescript-eslint/parser": "5.54.0",
-    "@web/dev-server": "0.1.35",
-    "@web/dev-server-rollup": "0.3.21",
-    "babel-loader": "9.1.2",
-    "babel-plugin-template-html-minifier": "4.1.0",
-    "chai": "4.3.7",
-    "del": "7.0.0",
-    "eslint": "8.35.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.7.0",
-    "eslint-import-resolver-webpack": "0.13.2",
-    "eslint-plugin-disable": "2.0.3",
-    "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-lit": "1.8.2",
-    "eslint-plugin-lit-a11y": "2.3.0",
-    "eslint-plugin-unused-imports": "2.0.0",
-    "eslint-plugin-wc": "1.4.0",
-    "esprima": "4.0.1",
-    "fancy-log": "2.0.0",
-    "fs-extra": "11.1.0",
-    "glob": "8.1.0",
-    "gulp": "4.0.2",
-    "gulp-flatmap": "1.0.2",
-    "gulp-json-transform": "0.4.8",
-    "gulp-merge-json": "2.1.2",
-    "gulp-rename": "2.0.0",
-    "gulp-zopfli-green": "6.0.1",
-    "html-minifier": "4.0.0",
-    "husky": "8.0.3",
-    "instant-mocha": "1.5.0",
-    "jszip": "3.10.1",
-    "lint-staged": "13.1.2",
-    "lit-analyzer": "1.2.1",
-    "lodash.template": "4.5.0",
-    "magic-string": "0.30.0",
-    "map-stream": "0.0.7",
-    "merge-stream": "2.0.0",
-    "mocha": "10.2.0",
-    "object-hash": "3.0.0",
-    "open": "8.4.2",
-    "pinst": "3.0.0",
-    "prettier": "2.8.4",
-    "require-dir": "1.2.0",
-    "rollup": "2.79.1",
-    "rollup-plugin-string": "3.0.0",
-    "rollup-plugin-terser": "5.3.1",
-    "rollup-plugin-visualizer": "5.9.0",
-    "serve-handler": "6.1.5",
-    "sinon": "15.0.1",
-    "source-map-url": "0.4.1",
-    "systemjs": "6.14.0",
-    "tar": "6.1.13",
-    "terser-webpack-plugin": "5.3.6",
-    "ts-lit-plugin": "1.2.1",
-    "typescript": "4.9.5",
-    "vinyl-buffer": "1.0.1",
-    "vinyl-source-stream": "2.0.0",
+    "@types/chromecast-caf-sender": "^1.0.5",
+    "@types/esprima": "^4",
+    "@types/glob": "^8",
+    "@types/js-yaml": "^4",
+    "@types/leaflet": "^1",
+    "@types/leaflet-draw": "^1",
+    "@types/marked": "^4",
+    "@types/mocha": "^10",
+    "@types/qrcode": "^1.5.0",
+    "@types/sortablejs": "^1",
+    "@types/tar": "^6",
+    "@types/webspeechapi": "^0.0.29",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "@web/dev-server": "^0.1.35",
+    "@web/dev-server-rollup": "^0.2.11",
+    "babel-loader": "^9.1.2",
+    "chai": "^4.3.7",
+    "del": "^7.0.0",
+    "eslint": "^8.35.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-prettier": "^8.6.0",
+    "eslint-import-resolver-webpack": "^0.13.2",
+    "eslint-plugin-disable": "^2.0.3",
+    "eslint-plugin-import": "^2.27.5",
+    "eslint-plugin-lit": "^1.8.2",
+    "eslint-plugin-lit-a11y": "^2.3.0",
+    "eslint-plugin-unused-imports": "^2.0.0",
+    "eslint-plugin-wc": "^1.4.0",
+    "esprima": "^4.0.1",
+    "fancy-log": "^2.0.0",
+    "fs-extra": "^11.1.0",
+    "glob": "^8.1.0",
+    "gulp": "^4.0.2",
+    "gulp-flatmap": "^1.0.2",
+    "gulp-json-transform": "^0.4.8",
+    "gulp-merge-json": "^2.1.2",
+    "gulp-rename": "^2.0.0",
+    "gulp-zopfli-green": "^6.0.1",
+    "html-minifier": "^4.0.0",
+    "husky": "^8.0.3",
+    "instant-mocha": "^1.5.0",
+    "jszip": "^3.10.1",
+    "lint-staged": "^13.1.2",
+    "lit-analyzer": "^1.2.1",
+    "lodash.template": "^4.5.0",
+    "magic-string": "^0.30.0",
+    "map-stream": "^0.0.7",
+    "merge-stream": "^2.0.0",
+    "mocha": "^10.2.0",
+    "object-hash": "^3.0.0",
+    "open": "^8.4.1",
+    "pinst": "^3.0.0",
+    "prettier": "^2.8.4",
+    "require-dir": "^1.2.0",
+    "rollup": "^2.8.2",
+    "rollup-plugin-string": "^3.0.0",
+    "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-visualizer": "^5.9.0",
+    "serve": "^11.3.2",
+    "sinon": "^15.0.1",
+    "source-map-url": "^0.4.1",
+    "systemjs": "^6.14.0",
+    "tar": "^6.1.13",
+    "terser-webpack-plugin": "^5.3.6",
+    "ts-lit-plugin": "^1.2.1",
+    "typescript": "^4.9.5",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
    "webpack": "=5.72.1",
-    "webpack-cli": "5.0.1",
-    "webpack-dev-server": "4.11.1",
-    "webpack-manifest-plugin": "5.0.0",
-    "webpackbar": "5.0.2",
-    "workbox-build": "6.5.4"
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
+    "webpack-manifest-plugin": "^5.0.0",
+    "webpackbar": "^5.0.2",
+    "workbox-build": "^6.5.4"
  },
  "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
  "resolutions": {
@@ -257,5 +256,5 @@
    "trailingComma": "es5",
    "arrowParens": "always"
  },
-  "packageManager": "yarn@3.4.1"
+  "packageManager": "yarn@3.3.1"
 }
@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"

 [project]
 name         = "home-assistant-frontend"
-version      = "20230309.0"
+version      = "20230224.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"
@@ -1,32 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":ignoreModulesAndTests",
-    ":label(dependencies)",
-    ":pinVersions",
-    ":prConcurrentLimit10",
-    ":semanticCommitsDisabled",
-    "group:monorepos",
-    "group:recommended",
-    "npm:unpublishSafe"
-  ],
-  "enabledManagers": ["npm"],
-  "postUpdateOptions": ["yarnDedupeHighest"],
-  "lockFileMaintenance": {
-    "description": ["Run after patch releases but before next beta"],
-    "enabled": true,
-    "schedule": ["on the 19th day of the month"]
-  },
-  "packageRules": [
-    {
-      "description": ["MDC packages are pinned to the same version as MWC"],
-      "extends": ["monorepo:material-components-web"],
-      "enabled": false
-    },
-    {
-      "description": ["Vue is only used by date range which is only v2"],
-      "matchPackageNames": ["vue"],
-      "allowedVersions": "< 3"
-    }
-  ]
-}
@@ -5,8 +5,8 @@ import {
  CSSResultGroup,
  html,
  LitElement,
-  nothing,
  PropertyValues,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../components/ha-alert";
@@ -134,11 +134,11 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
    }, 500);
  }

-  private _renderForm() {
+  private _renderForm(): TemplateResult {
    switch (this._state) {
      case "step":
        if (this._step == null) {
-          return nothing;
+          return html``;
        }
        return html`
          ${this._renderStep(this._step)}
@@ -176,11 +176,11 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
          </ha-alert>
        `;
      default:
-        return nothing;
+        return html``;
    }
  }

-  private _renderStep(step: DataEntryFlowStep) {
+  private _renderStep(step: DataEntryFlowStep): TemplateResult {
    switch (step.type) {
      case "abort":
        return html`
@@ -202,7 +202,7 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
                  .content=${this._computeStepDescription(step)}
                ></ha-markdown>
              `
-            : nothing}
+            : html``}
          <ha-form
            .data=${this._stepData}
            .schema=${autocompleteLoginFields(step.data_schema)}
@@ -228,7 +228,7 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
            : ""}
        `;
      default:
-        return nothing;
+        return html``;
    }
  }

@@ -1,6 +1,7 @@
 /** Constants to be used in the frontend. */

 import {
+  mdiAccount,
  mdiAirFilter,
  mdiAlert,
  mdiAngleAcute,
@@ -47,6 +48,7 @@ import {
  mdiProgressClock,
  mdiRayVertex,
  mdiRemote,
+  mdiRobot,
  mdiRobotVacuum,
  mdiScriptText,
  mdiSineWave,
@@ -57,12 +59,15 @@ import {
  mdiThermostat,
  mdiTimerOutline,
  mdiTransmissionTower,
+  mdiVideo,
  mdiWater,
  mdiWaterPercent,
+  mdiWeatherCloudy,
  mdiWeatherPouring,
  mdiWeatherRainy,
  mdiWeatherWindy,
  mdiWeight,
+  mdiWhiteBalanceSunny,
  mdiWifi,
 } from "@mdi/js";

@@ -77,7 +82,9 @@ export const DEFAULT_DOMAIN_ICON = mdiBookmark;
 export const FIXED_DOMAIN_ICONS = {
  alert: mdiAlert,
  air_quality: mdiAirFilter,
+  automation: mdiRobot,
  calendar: mdiCalendar,
+  camera: mdiVideo,
  climate: mdiThermostat,
  configurator: mdiCog,
  conversation: mdiMicrophoneMessage,
@@ -98,6 +105,7 @@ export const FIXED_DOMAIN_ICONS = {
  notify: mdiCommentAlert,
  number: mdiRayVertex,
  persistent_notification: mdiBell,
+  person: mdiAccount,
  plant: mdiFlower,
  proximity: mdiAppleSafari,
  remote: mdiRemote,
@@ -108,10 +116,13 @@ export const FIXED_DOMAIN_ICONS = {
  sensor: mdiEye,
  siren: mdiBullhorn,
  simple_alarm: mdiBell,
+  sun: mdiWhiteBalanceSunny,
  text: mdiFormTextbox,
  timer: mdiTimerOutline,
  updater: mdiCloudUpload,
  vacuum: mdiRobotVacuum,
+  water_heater: mdiThermometer,
+  weather: mdiWeatherCloudy,
  zone: mdiMapMarkerRadius,
 };

@@ -71,11 +71,6 @@ export const computeStateDisplayFromEntityAttributes = (
          style: "currency",
          currency: attributes.unit_of_measurement,
          minimumFractionDigits: 2,
-          // Override monetary options with number format
-          ...getNumberFormatOptions(
-            { state, attributes } as HassEntity,
-            entity
-          ),
        });
      } catch (_err) {
        // fallback to default
@@ -30,8 +30,6 @@ import {
  mdiPowerPlug,
  mdiPowerPlugOff,
  mdiRestart,
-  mdiRobot,
-  mdiRobotOff,
  mdiSpeaker,
  mdiSpeakerOff,
  mdiSpeakerPause,
@@ -43,12 +41,7 @@ import {
  mdiTelevisionPlay,
  mdiToggleSwitchVariant,
  mdiToggleSwitchVariantOff,
-  mdiVideo,
-  mdiVideoOff,
-  mdiWaterBoiler,
-  mdiWaterBoilerOff,
  mdiWeatherNight,
-  mdiWhiteBalanceSunny,
 } from "@mdi/js";
 import { HassEntity } from "home-assistant-js-websocket";
 import { UpdateEntity, updateIsInstalling } from "../../data/update";
@@ -90,9 +83,6 @@ export const domainIconWithoutDefault = (
    case "alarm_control_panel":
      return alarmPanelIcon(compareState);

-    case "automation":
-      return compareState === "off" ? mdiRobotOff : mdiRobot;
-
    case "binary_sensor":
      return binarySensorIcon(compareState, stateObj);

@@ -106,9 +96,6 @@ export const domainIconWithoutDefault = (
          return mdiGestureTapButton;
      }

-    case "camera":
-      return compareState === "off" ? mdiVideoOff : mdiVideo;
-
    case "cover":
      return coverIcon(compareState, stateObj);

@@ -234,7 +221,7 @@ export const domainIconWithoutDefault = (

    case "sun":
      return stateObj?.state === "above_horizon"
-        ? mdiWhiteBalanceSunny
+        ? FIXED_DOMAIN_ICONS[domain]
        : mdiWeatherNight;

    case "switch_as_x":
@@ -250,9 +237,6 @@ export const domainIconWithoutDefault = (
          : mdiPackageUp
        : mdiPackage;

-    case "water_heater":
-      return compareState === "off" ? mdiWaterBoilerOff : mdiWaterBoiler;
-
    case "weather":
      return weatherIcon(stateObj?.state);
  }
@@ -77,23 +77,6 @@ export const formatNumber = (
      ).format(Number(num));
    }
  }
-
-  if (
-    !Number.isNaN(Number(num)) &&
-    num !== "" &&
-    localeOptions?.number_format === NumberFormat.none &&
-    Intl
-  ) {
-    // If NumberFormat is none, use en-US format without grouping.
-    return new Intl.NumberFormat(
-      "en-US",
-      getDefaultFormatOptions(num, {
-        ...options,
-        useGrouping: false,
-      })
-    ).format(Number(num));
-  }
-
  if (typeof num === "string") {
    return num;
  }
@@ -143,10 +143,7 @@ export class StateHistoryChartTimeline extends LitElement {
            }
          },
          afterUpdate: (y) => {
-            if (
-              this._yWidth !== Math.floor(y.width) &&
-              y.ticks.length === this.data.length
-            ) {
+            if (this._yWidth !== Math.floor(y.width)) {
              this._yWidth = Math.floor(y.width);
              fireEvent(this, "y-width-changed", {
                value: this._yWidth,
@@ -4,12 +4,11 @@ import {
  CSSResultGroup,
  html,
  LitElement,
-  nothing,
  PropertyValues,
+  TemplateResult,
 } from "lit";
-import { customElement, eventOptions, property, state } from "lit/decorators";
+import { customElement, property, state, eventOptions } from "lit/decorators";
 import { isComponentLoaded } from "../../common/config/is_component_loaded";
-import { restoreScroll } from "../../common/decorators/restore-scroll";
 import {
  HistoryResult,
  LineChartUnit,
@@ -18,6 +17,7 @@ import {
 import type { HomeAssistant } from "../../types";
 import "./state-history-chart-line";
 import "./state-history-chart-timeline";
+import { restoreScroll } from "../../common/decorators/restore-scroll";

 const CANVAS_TIMELINE_ROWS_CHUNK = 10; // Split up the canvases to avoid hitting the render limit

@@ -71,7 +71,7 @@ export class StateHistoryCharts extends LitElement {
  // @ts-ignore
  @restoreScroll(".container") private _savedScrollPos?: number;

-  protected render() {
+  protected render(): TemplateResult {
    if (!isComponentLoaded(this.hass, "history")) {
      return html`<div class="info">
        ${this.hass.localize("ui.components.history_charts.history_disabled")}
@@ -130,9 +130,9 @@ export class StateHistoryCharts extends LitElement {
  private _renderHistoryItem = (
    item: TimelineEntity[] | LineChartUnit,
    index: number
-  ) => {
+  ): TemplateResult => {
    if (!item || index === undefined) {
-      return nothing;
+      return html``;
    }
    if (!Array.isArray(item)) {
      return html`<div class="entry-container">
@@ -6,7 +6,6 @@ import {
  CSSResultGroup,
  html,
  LitElement,
-  nothing,
  PropertyValues,
  TemplateResult,
 } from "lit";
@@ -74,7 +73,7 @@ export interface DataTableColumnData<T = any> extends DataTableSortColumnData {
  title: TemplateResult | string;
  label?: TemplateResult | string;
  type?: "numeric" | "icon" | "icon-button" | "overflow-menu";
-  template?: (data: any, row: T) => TemplateResult | string | typeof nothing;
+  template?: (data: any, row: T) => TemplateResult | string;
  width?: string;
  maxWidth?: string;
  grows?: boolean;
@@ -353,10 +352,13 @@ export class HaDataTable extends LitElement {
    `;
  }

-  private _renderRow = (row: DataTableRowData, index: number) => {
+  private _renderRow = (
+    row: DataTableRowData,
+    index: number
+  ): TemplateResult => {
    // not sure how this happens...
    if (!row) {
-      return nothing;
+      return html``;
    }
    if (row.append) {
      return html` <div class="mdc-data-table__row">${row.content}</div> `;
@@ -67,11 +67,11 @@ const sortData = (
      }
    }

-    // Ensure "undefined" and "null" are always sorted to the bottom
-    if (valA == null && valB != null) {
+    // Ensure "undefined" is always sorted to the bottom
+    if (valA === undefined && valB !== undefined) {
      return 1;
    }
-    if (valB == null && valA != null) {
+    if (valB === undefined && valA !== undefined) {
      return -1;
    }

@@ -1,7 +1,7 @@
 import "@material/mwc-button/mwc-button";
-import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, nothing } from "lit";
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
+import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -230,9 +230,9 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._devices || !this._areas || !this._entities) {
-      return nothing;
+      return html``;
    }
    const areas = this._getAreasWithDevices(
      this._devices,
@@ -1,5 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import {
@@ -85,9 +85,9 @@ export abstract class HaDeviceAutomationPicker<
    return `${this._automations[idx].device_id}_${idx}`;
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._renderEmpty) {
-      return nothing;
+      return html``;
    }
    const value = this._value;
    return html`
@@ -1,4 +1,4 @@
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { PolymerChangedEvent } from "../../polymer-types";
@@ -49,9 +49,9 @@ class HaDevicesPicker extends LitElement {

  @property() public entityFilter?: HaDevicePickerEntityFilterFunc;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    const currentDevices = this._currentDevices;
@@ -1,5 +1,5 @@
 import type { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -76,9 +76,9 @@ class HaEntitiesPickerLight extends LitElement {

  @property() public entityFilter?: HaEntityPickerEntityFilterFunc;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    const currentEntities = this._currentEntities;
@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, nothing } from "lit";
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { formatAttributeName } from "../../data/entity_attributes";
 import { PolymerChangedEvent } from "../../polymer-types";
@@ -60,9 +60,9 @@ class HaEntityAttributePicker extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,14 +1,14 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, nothing } from "lit";
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
 import { computeStateDisplay } from "../../common/entity/compute_state_display";
-import { getStates } from "../../common/entity/get_states";
-import { formatAttributeValue } from "../../data/entity_attributes";
 import { PolymerChangedEvent } from "../../polymer-types";
+import { getStates } from "../../common/entity/get_states";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
 import type { HaComboBox } from "../ha-combo-box";
+import { formatAttributeValue } from "../../data/entity_attributes";
+import { fireEvent } from "../../common/dom/fire_event";

 export type HaEntityPickerEntityFilterFunc = (entityId: HassEntity) => boolean;

@@ -64,9 +64,9 @@ class HaEntityStatePicker extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -30,9 +30,6 @@ export class HaStatisticPicker extends LitElement {
  @property({ attribute: "statistic-types" })
  public statisticTypes?: "mean" | "sum";

-  @property({ type: Boolean, attribute: "allow-custom-entity" })
-  public allowCustomEntity;
-
  @property({ type: Array }) public statisticIds?: StatisticsMetaData[];

  @property({ type: Boolean }) public disabled?: boolean;
@@ -248,7 +245,6 @@ export class HaStatisticPicker extends LitElement {
        .value=${this._value}
        .renderer=${this._rowRenderer}
        .disabled=${this.disabled}
-        .allowCustomValue=${this.allowCustomEntity}
        item-value-path="id"
        item-id-path="id"
        item-label-path="name"
@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import type { PolymerChangedEvent } from "../../polymer-types";
@@ -22,9 +22,6 @@ class HaStatisticsPicker extends LitElement {
  @property({ attribute: "pick-statistic-label" })
  public pickStatisticLabel?: string;

-  @property({ type: Boolean, attribute: "allow-custom-entity" })
-  public allowCustomEntity;
-
  /**
   * Show only statistics natively stored with these units of measurements.
   * @attr include-statistics-unit-of-measurement
@@ -59,9 +56,9 @@ class HaStatisticsPicker extends LitElement {
  })
  public ignoreRestrictionsOnFirstStatistic = false;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    const ignoreRestriction =
@@ -74,9 +71,6 @@ class HaStatisticsPicker extends LitElement {
    const includeUnitClassCurrent = ignoreRestriction
      ? undefined
      : this.includeUnitClass;
-    const includeDeviceClassCurrent = ignoreRestriction
-      ? undefined
-      : this.includeDeviceClass;
    const includeStatisticTypesCurrent = ignoreRestriction
      ? undefined
      : this.statisticTypes;
@@ -90,12 +84,10 @@ class HaStatisticsPicker extends LitElement {
              .hass=${this.hass}
              .includeStatisticsUnitOfMeasurement=${includeStatisticsUnitCurrent}
              .includeUnitClass=${includeUnitClassCurrent}
-              .includeDeviceClass=${includeDeviceClassCurrent}
              .value=${statisticId}
              .statisticTypes=${includeStatisticTypesCurrent}
              .statisticIds=${this.statisticIds}
              .label=${this.pickedStatisticLabel}
-              .allowCustomEntity=${this.allowCustomEntity}
              @value-changed=${this._statisticChanged}
            ></ha-statistic-picker>
          </div>
@@ -111,7 +103,6 @@ class HaStatisticsPicker extends LitElement {
          .statisticTypes=${this.statisticTypes}
          .statisticIds=${this.statisticIds}
          .label=${this.pickStatisticLabel}
-          .allowCustomEntity=${this.allowCustomEntity}
          @value-changed=${this._addStatistic}
        ></ha-statistic-picker>
      </div>
@@ -6,7 +6,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
@@ -45,7 +45,7 @@ export class StateBadge extends LitElement {
    return this.stateColor || (domain === "light" && this.stateColor !== false);
  }

-  protected render() {
+  protected render(): TemplateResult {
    const stateObj = this.stateObj;

    // We either need a `stateObj` or one override
@@ -56,7 +56,7 @@ export class StateBadge extends LitElement {
    }

    if (!this._showIcon) {
-      return nothing;
+      return html``;
    }

    const domain = stateObj ? computeStateDomain(stateObj) : undefined;
@@ -1,6 +1,6 @@
 import "@polymer/paper-tooltip/paper-tooltip";
 import type { HassEntity } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { computeStateName } from "../../common/entity/compute_state_name";
 import { computeRTL } from "../../common/util/compute_rtl";
@@ -21,9 +21,9 @@ class StateInfo extends LitElement {

  @property() public color?: string;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass || !this.stateObj) {
-      return nothing;
+      return html``;
    }

    const name = computeStateName(this.stateObj);
@@ -1,5 +1,5 @@
+import { html, LitElement, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
 import { fireEvent } from "../common/dom/fire_event";
@@ -54,9 +54,9 @@ class HaAddonPicker extends LitElement {
    this._getAddons();
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._addons) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-combo-box
@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
@@ -60,9 +60,9 @@ export class HaAreasPicker extends SubscribeMixin(LitElement) {

  @property({ type: Boolean }) public required?: boolean;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    const currentAreas = this._currentAreas;
@@ -1,12 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  TemplateResult,
-  nothing,
-} from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import {
  formatAttributeName,
@@ -28,9 +21,9 @@ class HaAttributes extends LitElement {

  @state() private _expanded = false;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.stateObj) {
-      return nothing;
+      return html``;
    }

    const attributes = this.computeDisplayAttributes(
@@ -39,7 +32,7 @@ class HaAttributes extends LitElement {
      )
    );
    if (attributes.length === 0) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../common/dom/fire_event";
@@ -51,9 +51,9 @@ class HaBluePrintPicker extends LitElement {
    );
  });

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-select
@@ -4,7 +4,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { isComponentLoaded } from "../common/config/is_component_loaded";
@@ -76,9 +76,9 @@ export class HaCameraStream extends LitElement {
    this._connected = false;
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.stateObj) {
-      return nothing;
+      return html``;
    }
    if (__DEMO__ || this._shouldRenderMJPEG) {
      return html`<img
@@ -102,7 +102,7 @@ export class HaCameraStream extends LitElement {
            .url=${this._url}
            .posterUrl=${this._posterUrl}
          ></ha-hls-player>`
-        : nothing;
+        : html``;
    }
    if (this.stateObj.attributes.frontend_stream_type === STREAM_TYPE_WEB_RTC) {
      return html`<ha-web-rtc-player
@@ -115,7 +115,7 @@ export class HaCameraStream extends LitElement {
        .posterUrl=${this._posterUrl}
      ></ha-web-rtc-player>`;
    }
-    return nothing;
+    return html``;
  }

  private get _shouldRenderMJPEG() {
@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";

@customElement("ha-card")
@@ -70,11 +70,11 @@ export class HaCard extends LitElement {
    `;
  }

-  protected render() {
+  protected render(): TemplateResult {
    return html`
      ${this.header
        ? html`<h1 class="card-header">${this.header}</h1>`
-        : nothing}
+        : html``}
      <slot></slot>
    `;
  }
@@ -1,16 +1,16 @@
 import "@material/mwc-list/mwc-list-item";
+import { html, LitElement, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
-import { html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { caseInsensitiveStringCompare } from "../common/string/compare";
-import { ConfigEntry, getConfigEntries } from "../data/config_entries";
-import { domainToName } from "../data/integration";
 import { PolymerChangedEvent } from "../polymer-types";
 import { HomeAssistant } from "../types";
+import type { HaComboBox } from "./ha-combo-box";
+import { ConfigEntry, getConfigEntries } from "../data/config_entries";
+import { domainToName } from "../data/integration";
+import { caseInsensitiveStringCompare } from "../common/string/compare";
 import { brandsUrl } from "../util/brands-url";
 import "./ha-combo-box";
-import type { HaComboBox } from "./ha-combo-box";

 export interface ConfigEntryExtended extends ConfigEntry {
  localized_domain_name?: string;
@@ -72,9 +72,9 @@ class HaConfigEntryPicker extends LitElement {
    />
  </mwc-list-item>`;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._configEntries) {
-      return nothing;
+      return html``;
    }
    return html`
      <ha-combo-box
@@ -1,5 +1,5 @@
 import { mdiStop } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { computeCloseIcon, computeOpenIcon } from "../common/entity/cover_icon";
@@ -20,9 +20,9 @@ class HaCoverControls extends LitElement {

  @property({ attribute: false }) public stateObj!: CoverEntity;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.stateObj) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import { mdiArrowBottomLeft, mdiArrowTopRight, mdiStop } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { supportsFeature } from "../common/entity/supports-feature";
@@ -19,9 +19,9 @@ class HaCoverTiltControls extends LitElement {

  @property({ attribute: false }) stateObj!: CoverEntity;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.stateObj) {
-      return nothing;
+      return html``;
    }

    return html` <ha-icon-button
@@ -1,6 +1,6 @@
 import "@material/mwc-button/mwc-button";
 import "app-datepicker";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import { nextRender } from "../common/util/render-status";
@@ -38,7 +38,7 @@ export class HaDialogDatePicker extends LitElement {

  render() {
    if (!this._params) {
-      return nothing;
+      return html``;
    }
    return html`<ha-dialog open @closed=${this.closeDialog}>
      <app-datepicker
@@ -5,7 +5,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
@@ -29,7 +29,102 @@ interface DeprecatedIcon {
  };
 }

-const mdiDeprecatedIcons: DeprecatedIcon = {};
+const mdiDeprecatedIcons: DeprecatedIcon = {
+  "android-messages": {
+    newName: "message-text",
+    removeIn: "2022.10",
+  },
+  "book-variant-multiple": {
+    newName: "bookmark-box-multiple",
+    removeIn: "2022.10",
+  },
+  "desktop-mac": {
+    newName: "monitor",
+    removeIn: "2022.10",
+  },
+  "desktop-mac-dashboard": {
+    newName: "monitor-dashboard",
+    removeIn: "2022.10",
+  },
+  discord: {
+    removeIn: "2022.10",
+  },
+  "diving-scuba": {
+    newName: "diving-scuba-mask",
+    removeIn: "2022.10",
+  },
+  "email-send": {
+    newName: "email-arrow-right",
+    removeIn: "2022.10",
+  },
+  "email-send-outline": {
+    newName: "email-arrow-right-outline",
+    removeIn: "2022.10",
+  },
+  "email-receive": {
+    newName: "email-arrow-left",
+    removeIn: "2022.10",
+  },
+  "email-receive-outline": {
+    newName: "email-arrow-left-outline",
+    removeIn: "2022.10",
+  },
+  "format-textdirection-r-to-l": {
+    newName: "format-pilcrow-arrow-left",
+    removeIn: "2022.10",
+  },
+  "format-textdirection-l-to-r": {
+    newName: "format-pilcrow-arrow-right",
+    removeIn: "2022.10",
+  },
+  "google-controller": {
+    newName: "controller",
+    removeIn: "2022.10",
+  },
+  "google-controller-off": {
+    newName: "controller-off",
+    removeIn: "2022.10",
+  },
+  "google-home": {
+    removeIn: "2022.10",
+  },
+  lecturn: {
+    newName: "lectern",
+    removeIn: "2022.10",
+  },
+  receipt: {
+    newName: "receipt-text",
+    removeIn: "2022.10",
+  },
+  "receipt-outline": {
+    newName: "receipt-text-outline",
+    removeIn: "2022.10",
+  },
+  "tablet-android": {
+    newName: "tablet",
+    removeIn: "2022.10",
+  },
+  "text-to-speech": {
+    newName: "microphone-message",
+    removeIn: "2022.10",
+  },
+  "text-to-speech-off": {
+    newName: "microphone-message-off",
+    removeIn: "2022.10",
+  },
+  "timeline-help": {
+    newName: "timeline-question",
+    removeIn: "2022.10",
+  },
+  "timeline-help-outline": {
+    newName: "timeline-question-outline",
+    removeIn: "2022.10",
+  },
+  "vector-point": {
+    newName: "vector-point-select",
+    removeIn: "2022.10",
+  },
+};

 const chunks: Chunks = {};

@@ -61,9 +156,9 @@ export class HaIcon extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.icon) {
-      return nothing;
+      return html``;
    }
    if (this._legacy) {
      return html`<iron-icon .icon=${this.icon}></iron-icon>`;
@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "./ha-markdown-element";

@@ -15,9 +15,9 @@ export class HaMarkdown extends LitElement {

  @property({ type: Boolean }) public breaks = false;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.content) {
-      return nothing;
+      return html``;
    }

    return html`<ha-markdown-element
@@ -54,9 +54,9 @@ export class HaNetwork extends LitElement {

  @state() private _expanded?: boolean;

-  protected render() {
+  protected render(): TemplateResult {
    if (this.networkConfig === undefined) {
-      return nothing;
+      return html``;
    }
    const configured_adapters = this.networkConfig.configured_adapters || [];
    return html`
@@ -5,7 +5,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
@@ -70,9 +70,9 @@ export class HaRelatedItems extends SubscribeMixin(LitElement) {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._related) {
-      return nothing;
+      return html``;
    }
    if (Object.keys(this._related).length === 0) {
      return html`
@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, nothing } from "lit";
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
@@ -61,9 +61,9 @@ export class HaAreaSelector extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._hasIntegration(this.selector) && !this._entitySources) {
-      return nothing;
+      return html``;
    }

    if (!this.selector.area?.multiple) {
@@ -59,8 +59,7 @@ export class HaSelectorAttribute extends LitElement {

    if (
      !this.context ||
-      !oldContext ||
-      oldContext.filter_entity === this.context.filter_entity
+      oldContext?.filter_entity === this.context.filter_entity
    ) {
      return;
    }
@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, nothing } from "lit";
+import { html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { ensureArray } from "../../common/array/ensure-array";
@@ -66,7 +66,7 @@ export class HaDeviceSelector extends LitElement {

  protected render() {
    if (this._hasIntegration(this.selector) && !this._entitySources) {
-      return nothing;
+      return html``;
    }

    if (!this.selector.device?.multiple) {
@@ -1,5 +1,5 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, nothing } from "lit";
+import { html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { ensureArray } from "../../common/array/ensure-array";
 import {
@@ -39,7 +39,7 @@ export class HaEntitySelector extends LitElement {

  protected render() {
    if (this._hasIntegration(this.selector) && !this._entitySources) {
-      return nothing;
+      return html``;
    }

    if (!this.selector.entity?.multiple) {
@@ -5,7 +5,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -70,9 +70,9 @@ export class HaTargetSelector extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._hasIntegration(this.selector) && !this._entitySources) {
-      return nothing;
+      return html``;
    }

    return html`<ha-target-picker
@@ -136,7 +136,6 @@ export class HaServiceControl extends LitElement {
    if (oldValue?.service !== this.value?.service) {
      let updatedDefaultValue = false;
      if (this._value && serviceData) {
-        const loadDefaults = this.value && !("data" in this.value);
        // Set mandatory bools without a default value to false
        if (!this._value.data) {
          this._value.data = {};
@@ -153,7 +152,6 @@ export class HaServiceControl extends LitElement {
            this._value!.data![field.key] = false;
          }
          if (
-            loadDefaults &&
            field.selector &&
            field.default !== undefined &&
            this._value!.data![field.key] === undefined
@@ -343,10 +341,10 @@ export class HaServiceControl extends LitElement {
                    .selector=${dataField.selector}
                    .key=${dataField.key}
                    @value-changed=${this._serviceDataChanged}
-                    .value=${this._value?.data
+                    .value=${this._value?.data &&
+                    this._value.data[dataField.key] !== undefined
                      ? this._value.data[dataField.key]
-                      : undefined}
-                    .placeholder=${dataField.default}
+                      : dataField.default}
                  ></ha-selector>
                </ha-settings-row>`
              : "";
@@ -364,7 +362,7 @@ export class HaServiceControl extends LitElement {
        this._value?.service,
        this.hass.services
      )?.fields.find((field) => field.key === key)?.default;
-      if (defaultValue != null) {
+      if (defaultValue) {
        data = {
          ...this._value?.data,
          [key]: defaultValue,
@@ -29,7 +29,6 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
 } from "lit";
 import { customElement, eventOptions, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -242,7 +241,7 @@ class HaSidebar extends SubscribeMixin(LitElement) {

  protected render() {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    // prettier-ignore
@@ -12,7 +12,7 @@ import {
 import "@polymer/paper-tooltip/paper-tooltip";
 import { ComboBoxLightOpenedChangedEvent } from "@vaadin/combo-box/vaadin-combo-box-light";
 import { HassEntity, HassServiceTarget } from "home-assistant-js-websocket";
-import { css, CSSResultGroup, html, LitElement, unsafeCSS, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, unsafeCSS } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ensureArray } from "../common/array/ensure-array";
@@ -278,7 +278,7 @@ export class HaTargetPicker extends LitElement {

  private _renderPicker() {
    if (!this._addMode) {
-      return nothing;
+      return html``;
    }
    return html`<mwc-menu-surface
      open
@@ -1,6 +1,6 @@
 import { mdiLightbulbOutline } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property } from "lit/decorators";
+import { css, html, LitElement, TemplateResult } from "lit";
+import { property, customElement } from "lit/decorators";
 import { HomeAssistant } from "../types";

 import "./ha-svg-icon";
@@ -9,9 +9,9 @@ import "./ha-svg-icon";
 class HaTip extends LitElement {
  @property({ attribute: false }) public hass!: HomeAssistant;

-  public render() {
+  public render(): TemplateResult {
    if (!this.hass) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import { DEFAULT_SCHEMA, dump, load, Schema } from "js-yaml";
-import { html, LitElement, nothing } from "lit";
+import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { HomeAssistant } from "../types";
@@ -56,9 +56,9 @@ export class HaYamlEditor extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._yaml === undefined) {
-      return nothing;
+      return html``;
    }
    return html`
      ${this.label
@@ -2,7 +2,7 @@ import { animate } from "@lit-labs/motion";
 import "@material/mwc-list/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiClose, mdiDelete } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { repeat } from "lit/directives/repeat";
 import { fireEvent } from "../../common/dom/fire_event";
@@ -18,11 +18,11 @@ import {
 import { showConfirmationDialog } from "../../dialogs/generic/show-dialog-box";
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
-import "../ha-check-list-item";
 import "../ha-circular-progress";
 import "../ha-dialog";
 import "../ha-header-bar";
 import "../ha-svg-icon";
+import "../ha-check-list-item";
 import "./ha-media-player-browse";
 import "./ha-media-upload-button";
 import type { MediaManageDialogParams } from "./show-media-manage-dialog";
@@ -60,9 +60,9 @@ class DialogMediaManage extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    const children =
@@ -1,5 +1,6 @@
+import "../ha-header-bar";
 import { mdiArrowLeft, mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
@@ -11,9 +12,8 @@ import type {
 import { haStyleDialog } from "../../resources/styles";
 import type { HomeAssistant } from "../../types";
 import "../ha-dialog";
-import "../ha-header-bar";
-import "./ha-media-manage-button";
 import "./ha-media-player-browse";
+import "./ha-media-manage-button";
 import type {
  HaMediaPlayerBrowse,
  MediaPlayerItemId,
@@ -49,9 +49,9 @@ class DialogMediaPlayerBrowse extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params || !this._navigateIds) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,13 +1,13 @@
-import "@material/mwc-button";
 import { mdiFolderEdit } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
+import "@material/mwc-button";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import { fireEvent } from "../../common/dom/fire_event";
 import { MediaPlayerItem } from "../../data/media-player";
+import "../ha-svg-icon";
 import { isLocalMediaSourceContentId } from "../../data/media_source";
 import type { HomeAssistant } from "../../types";
-import "../ha-svg-icon";
 import { showMediaManageDialog } from "./show-media-manage-dialog";
+import { fireEvent } from "../../common/dom/fire_event";

 declare global {
  interface HASSDomEvents {
@@ -23,12 +23,12 @@ class MediaManageButton extends LitElement {

  @state() _uploading = 0;

-  protected render() {
+  protected render(): TemplateResult {
    if (
      !this.currentItem ||
      !isLocalMediaSourceContentId(this.currentItem.media_content_id || "")
    ) {
-      return nothing;
+      return html``;
    }
    return html`
      <mwc-button
@@ -13,7 +13,6 @@ import {
  LitElement,
  PropertyValues,
  TemplateResult,
-  nothing,
 } from "lit";
 import {
  customElement,
@@ -312,7 +311,7 @@ export class HaMediaPlayerBrowse extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this._error) {
      return html`
        <div class="container">
@@ -389,7 +388,7 @@ export class HaMediaPlayerBrowse extends LitElement {
                                    : ""}
                                </div>
                              `
-                            : nothing}
+                            : html``}
                          <div class="header-info">
                            <div class="breadcrumb">
                              <h1 class="title">${currentItem.title}</h1>
@@ -1,17 +1,17 @@
-import "@material/mwc-button";
 import { mdiUpload } from "@mdi/js";
-import { css, html, LitElement, nothing } from "lit";
+import "@material/mwc-button";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { MediaPlayerItem } from "../../data/media-player";
+import "../ha-circular-progress";
+import "../ha-svg-icon";
 import {
  isLocalMediaSourceContentId,
  uploadLocalMedia,
 } from "../../data/media_source";
-import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../types";
-import "../ha-circular-progress";
-import "../ha-svg-icon";
+import { showAlertDialog } from "../../dialogs/generic/show-dialog-box";

 declare global {
  interface HASSDomEvents {
@@ -28,12 +28,12 @@ class MediaUploadButton extends LitElement {

  @state() _uploading = 0;

-  protected render() {
+  protected render(): TemplateResult {
    if (
      !this.currentItem ||
      !isLocalMediaSourceContentId(this.currentItem.media_content_id || "")
    ) {
-      return nothing;
+      return html``;
    }
    return html`
      <mwc-button
@@ -14,7 +14,6 @@ import {
  LitElement,
  PropertyValues,
  TemplateResult,
-  nothing,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
@@ -596,9 +595,9 @@ export class HaAutomationTracer extends LitElement {
    ];
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.trace) {
-      return nothing;
+      return html``;
    }

    const entries: TemplateResult[] = [];
@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
@@ -9,9 +9,9 @@ import { computeUserInitials } from "../../data/user";
 class PersonBadge extends LitElement {
  @property({ attribute: false }) public person?: Person;

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.person) {
-      return nothing;
+      return html``;
    }

    const picture = this.person.picture;
@@ -4,7 +4,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -47,9 +47,9 @@ class UserBadge extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass || !this.user) {
-      return nothing;
+      return html``;
    }
    const picture = this._personPicture;

@@ -1,5 +1,5 @@
 import { mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { guard } from "lit/directives/guard";
 import memoizeOne from "memoize-one";
@@ -34,9 +34,9 @@ class HaUsersPickerLight extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this.hass || !this.users) {
-      return nothing;
+      return html``;
    }

    const notSelectedUsers = this._notSelectedUsers(this.users, this.value);
@@ -11,8 +11,10 @@ import {
 } from "date-fns/esm";
 import { Collection, getCollection } from "home-assistant-js-websocket";
 import { groupBy } from "../common/util/group-by";
+import { subscribeOne } from "../common/util/subscribe-one";
 import { HomeAssistant } from "../types";
 import { ConfigEntry, getConfigEntries } from "./config_entries";
+import { subscribeEntityRegistry } from "./entity_registry";
 import {
  fetchStatistics,
  getStatisticMetadata,
@@ -339,8 +341,9 @@ const getEnergyData = async (
  end?: Date,
  compare?: boolean
 ): Promise<EnergyData> => {
-  const [configEntries, info] = await Promise.all([
+  const [configEntries, entityRegistryEntries, info] = await Promise.all([
    getConfigEntries(hass, { domain: "co2signal" }),
+    subscribeOne(hass.connection, subscribeEntityRegistry),
    getEnergyInfo(hass),
  ]);

@@ -349,14 +352,15 @@ const getEnergyData = async (
    : undefined;

  let co2SignalEntity: string | undefined;
+
  if (co2SignalConfigEntry) {
-    for (const entity of Object.values(hass.entities)) {
-      if (entity.platform !== "co2signal") {
+    for (const entry of entityRegistryEntries) {
+      if (entry.config_entry_id !== co2SignalConfigEntry.entry_id) {
        continue;
      }

      // The integration offers 2 entities. We want the % one.
-      const co2State = hass.states[entity.entity_id];
+      const co2State = hass.states[entry.entity_id];
      if (!co2State || co2State.attributes.unit_of_measurement !== "%") {
        continue;
      }
@@ -401,35 +405,34 @@ const getEnergyData = async (
    volume: lengthUnit === "km" ? "L" : "gal",
  };

-  const _energyStats: Statistics | Promise<Statistics> = energyStatIds.length
-    ? fetchStatistics(
-        hass!,
-        startMinHour,
-        end,
-        energyStatIds,
-        period,
-        energyUnits,
-        ["sum"]
-      )
-    : {};
-  const _waterStats: Statistics | Promise<Statistics> = waterStatIds.length
-    ? fetchStatistics(
-        hass!,
-        startMinHour,
-        end,
-        waterStatIds,
-        period,
-        waterUnits,
-        ["sum"]
-      )
-    : {};
+  const stats = {
+    ...(energyStatIds.length
+      ? await fetchStatistics(
+          hass!,
+          startMinHour,
+          end,
+          energyStatIds,
+          period,
+          energyUnits,
+          ["sum"]
+        )
+      : {}),
+    ...(waterStatIds.length
+      ? await fetchStatistics(
+          hass!,
+          startMinHour,
+          end,
+          waterStatIds,
+          period,
+          waterUnits,
+          ["sum"]
+        )
+      : {}),
+  };

  let statsCompare;
  let startCompare;
  let endCompare;
-  let _energyStatsCompare: Statistics | Promise<Statistics> = {};
-  let _waterStatsCompare: Statistics | Promise<Statistics> = {};
-
  if (compare) {
    if (dayDifference > 27 && dayDifference < 32) {
      // When comparing a month, we want to start at the begining of the month
@@ -440,36 +443,38 @@ const getEnergyData = async (

    const compareStartMinHour = addHours(startCompare, -1);
    endCompare = addMilliseconds(start, -1);
-    if (energyStatIds.length) {
-      _energyStatsCompare = fetchStatistics(
-        hass!,
-        compareStartMinHour,
-        endCompare,
-        energyStatIds,
-        period,
-        energyUnits,
-        ["sum"]
-      );
-    }
-    if (waterStatIds.length) {
-      _waterStatsCompare = fetchStatistics(
-        hass!,
-        compareStartMinHour,
-        endCompare,
-        waterStatIds,
-        period,
-        waterUnits,
-        ["sum"]
-      );
-    }
+
+    statsCompare = {
+      ...(energyStatIds.length
+        ? await fetchStatistics(
+            hass!,
+            compareStartMinHour,
+            endCompare,
+            energyStatIds,
+            period,
+            energyUnits,
+            ["sum"]
+          )
+        : {}),
+      ...(waterStatIds.length
+        ? await fetchStatistics(
+            hass!,
+            compareStartMinHour,
+            endCompare,
+            waterStatIds,
+            period,
+            waterUnits,
+            ["sum"]
+          )
+        : {}),
+    };
  }

-  let _fossilEnergyConsumption: undefined | Promise<FossilEnergyConsumption>;
-  let _fossilEnergyConsumptionCompare:
-    | undefined
-    | Promise<FossilEnergyConsumption>;
+  let fossilEnergyConsumption: FossilEnergyConsumption | undefined;
+  let fossilEnergyConsumptionCompare: FossilEnergyConsumption | undefined;
+
  if (co2SignalEntity !== undefined) {
-    _fossilEnergyConsumption = getFossilEnergyConsumption(
+    fossilEnergyConsumption = await getFossilEnergyConsumption(
      hass!,
      start,
      consumptionStatIDs,
@@ -478,7 +483,7 @@ const getEnergyData = async (
      dayDifference > 35 ? "month" : dayDifference > 2 ? "day" : "hour"
    );
    if (compare) {
-      _fossilEnergyConsumptionCompare = getFossilEnergyConsumption(
+      fossilEnergyConsumptionCompare = await getFossilEnergyConsumption(
        hass!,
        startCompare,
        consumptionStatIDs,
@@ -489,39 +494,6 @@ const getEnergyData = async (
    }
  }

-  const statsMetadata: Record<string, StatisticsMetaData> = {};
-  const _getStatisticMetadata:
-    | Promise<StatisticsMetaData[]>
-    | StatisticsMetaData[] = allStatIDs.length
-    ? getStatisticMetadata(hass, allStatIDs)
-    : [];
-  const [
-    energyStats,
-    waterStats,
-    energyStatsCompare,
-    waterStatsCompare,
-    statsMetadataArray,
-    fossilEnergyConsumption,
-    fossilEnergyConsumptionCompare,
-  ] = await Promise.all([
-    _energyStats,
-    _waterStats,
-    _energyStatsCompare,
-    _waterStatsCompare,
-    _getStatisticMetadata,
-    _fossilEnergyConsumption,
-    _fossilEnergyConsumptionCompare,
-  ]);
-  const stats = { ...energyStats, ...waterStats };
-  if (compare) {
-    statsCompare = { ...energyStatsCompare, ...waterStatsCompare };
-  }
-  if (allStatIDs.length) {
-    statsMetadataArray.forEach((x) => {
-      statsMetadata[x.statistic_id] = x;
-    });
-  }
-
  Object.values(stats).forEach((stat) => {
    // if the start of the first value is after the requested period, we have the first data point, and should add a zero point
    if (stat.length && new Date(stat[0].start) > startMinHour) {
@@ -535,6 +507,12 @@ const getEnergyData = async (
    }
  });

+  const statsMetadataArray = await getStatisticMetadata(hass, allStatIDs);
+  const statsMetadata: Record<string, StatisticsMetaData> = {};
+  statsMetadataArray.forEach((x) => {
+    statsMetadata[x.statistic_id] = x;
+  });
+
  const data: EnergyData = {
    start,
    end,
@@ -523,18 +523,3 @@ export const isForecastHourly = (

  return undefined;
 };
-
-export type WeatherUnits = {
-  precipitation_unit: string[];
-  pressure_unit: string[];
-  temperature_unit: string[];
-  visibility_unit: string[];
-  wind_speed_unit: string[];
-};
-
-export const getWeatherConvertibleUnits = (
-  hass: HomeAssistant
-): Promise<{ units: WeatherUnits }> =>
-  hass.callWS({
-    type: "weather/convertible_units",
-  });
@@ -1,6 +1,6 @@
 import "@material/mwc-button/mwc-button";
 import { mdiDeleteOutline, mdiPlus } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import "../../components/ha-alert";
@@ -40,9 +40,9 @@ class DialogAliases extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -1,5 +1,5 @@
 import "@material/mwc-button/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeRTLDirection } from "../../common/util/compute_rtl";
@@ -45,9 +45,9 @@ class DialogConfigEntrySystemOptions extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -7,7 +7,7 @@ import {
  html,
  LitElement,
  PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent, HASSDomEvent } from "../../common/dom/fire_event";
@@ -202,9 +202,9 @@ class DataEntryFlowDialog extends LitElement {
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    return html`
@@ -55,8 +55,7 @@ export const showConfigFlowDialog = (
    renderShowFormStepHeader(hass, step) {
      return (
        hass.localize(
-          `component.${step.handler}.config.step.${step.step_id}.title`,
-          step.description_placeholders
+          `component.${step.handler}.config.step.${step.step_id}.title`
        ) || hass.localize(`component.${step.handler}.title`)
      );
    },
@@ -67,8 +67,7 @@ export const showOptionsFlowDialog = (
      renderShowFormStepHeader(hass, step) {
        return (
          hass.localize(
-            `component.${configEntry.domain}.options.step.${step.step_id}.title`,
-            step.description_placeholders
+            `component.${configEntry.domain}.options.step.${step.step_id}.title`
          ) || hass.localize(`ui.dialogs.options_flow.form.header`)
        );
      },
@@ -1,13 +1,19 @@
 import "@material/mwc-button";
-import { CSSResultGroup, html, LitElement, PropertyValues, nothing } from "lit";
+import {
+  CSSResultGroup,
+  html,
+  LitElement,
+  TemplateResult,
+  PropertyValues,
+} from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { DataEntryFlowStepAbort } from "../../data/data_entry_flow";
-import { showAddApplicationCredentialDialog } from "../../panels/config/application_credentials/show-dialog-add-application-credential";
 import { HomeAssistant } from "../../types";
-import { showConfigFlowDialog } from "./show-dialog-config-flow";
-import { DataEntryFlowDialogParams } from "./show-dialog-data-entry-flow";
+import { showAddApplicationCredentialDialog } from "../../panels/config/application_credentials/show-dialog-add-application-credential";
 import { configFlowContentStyles } from "./styles";
+import { DataEntryFlowDialogParams } from "./show-dialog-data-entry-flow";
+import { showConfigFlowDialog } from "./show-dialog-config-flow";

@customElement("step-flow-abort")
 class StepFlowAbort extends LitElement {
@@ -26,9 +32,9 @@ class StepFlowAbort extends LitElement {
    }
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (this.step.reason === "missing_credentials") {
-      return nothing;
+      return html``;
    }
    return html`
      <h2>${this.hass.localize(`component.${this.domain}.title`)}</h2>
@@ -1,5 +1,5 @@
 import "@material/mwc-button/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { createCloseHeading } from "../../components/ha-dialog";
@@ -29,9 +29,9 @@ class DomainTogglerDialog
    fireEvent(this, "dialog-closed", { dialog: this.localName });
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    const domains = this._params.domains
@@ -1,6 +1,6 @@
 import "@material/mwc-button/mwc-button";
 import { mdiAlertOutline } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { ifDefined } from "lit/directives/if-defined";
@@ -35,9 +35,9 @@ class DialogBox extends LitElement {
    return true;
  }

-  protected render() {
+  protected render(): TemplateResult {
    if (!this._params) {
-      return nothing;
+      return html``;
    }

    const confirmPrompt = this._params.confirmation || this._params.prompt;
--- a/Show More
+++ b/Show More