Cleanup some subscriptions

.devcontainer/Dockerfile

@@ -0,0 +1,13 @@
+# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.9
+
+ENV \
+  DEBIAN_FRONTEND=noninteractive \
+  DEVCONTAINER=true \
+  PATH=$PATH:./node_modules/.bin
+
+# Install nvm
+COPY .nvmrc /tmp/.nvmrc
+RUN \
+  su vscode -c \
+    "source /usr/local/share/nvm/nvm.sh && nvm install $(cat /tmp/.nvmrc) 2>&1"

.devcontainer/devcontainer.json

@@ -1,20 +1,13 @@
 {
   "name": "Home Assistant Frontend",
-  "image": "mcr.microsoft.com/devcontainers/python:0-3.10",
+  "build": {
+    "dockerfile": "Dockerfile",
+    "context": ".."
+  },
   "appPort": "8124:8123",
   "postCreateCommand": "script/bootstrap",
   "containerEnv": {
-    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}",
-    "DEVCONTAINER": "true"
-  },
-  "remoteUser": "vscode",
-  "remoteEnv": {
-    "PATH": "${containerEnv:PATH}:${containerWorkspaceFolder}/node_modules/.bin:/home/vscode/.local/bin"
-  },
-  "features": {
-    "ghcr.io/devcontainers/features/node:1": {
-      "version": "16"
-    }
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
   "customizations": {
     "vscode": {

.github/dependabot.yml

@@ -12,7 +12,3 @@ updates:
       interval: "daily"
       time: "06:00"
     open-pull-requests-limit: 5
-    ignore:
-      # Ignore rollup and plugins until everything else is updated
-      - dependency-name: "*rollup*"
-      - dependency-name: "@rollup/*"

.github/workflows/cast_deployment.yaml

@@ -22,12 +22,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
         with:
           ref: dev
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -60,12 +60,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
         with:
           ref: master
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/ci.yaml

@@ -20,9 +20,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -44,9 +44,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -63,9 +63,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -82,9 +82,9 @@ jobs:
     needs: [lint, test]
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.3.0
+      uses: actions/checkout@v3.2.0
       with:
         # We must fetch at least the immediate parents so that if this is
         # a pull request then we can checkout the head.

.github/workflows/demo_deployment.yaml

@@ -23,12 +23,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
         with:
           ref: dev
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn
@@ -61,12 +61,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
         with:
           ref: master
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/design_deployment.yaml

@@ -17,10 +17,10 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/design_preview.yaml

@@ -22,10 +22,10 @@ jobs:
     if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/nightly.yaml

@@ -21,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v4
@@ -29,7 +29,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/release.yaml

@@ -24,7 +24,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -35,7 +35,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Set up Node ${{ env.NODE_VERSION }}
-        uses: actions/setup-node@v3.6.0
+        uses: actions/setup-node@v3.5.1
         with:
           node-version: ${{ env.NODE_VERSION }}
           cache: yarn

.github/workflows/translations.yaml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.3.0
+        uses: actions/checkout@v3.2.0
 
       - name: Upload Translations
         run: |

.gitignore

@@ -8,7 +8,7 @@ dist/
 /translations/
 
 # yarn
-.yarn/*
+.yarn/**
 !.yarn/patches
 !.yarn/releases
 !.yarn/plugins
@@ -31,7 +31,7 @@ pip-selfcheck.json
 .venv
 
 # vscode
-.vscode/*
+.vscode/**
 !.vscode/extensions.json
 !.vscode/launch.json
 !.vscode/tasks.json

.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch

@@ -0,0 +1,29 @@
+diff --git a/polyfillLoaders/EventTarget.js b/polyfillLoaders/EventTarget.js
+index 4e18ade7ba485849f17f28c94c42f0e0e01ac387..8f34f4f646c7f7becc208fb5a546c96034fc74dc 100644
+--- a/polyfillLoaders/EventTarget.js
++++ b/polyfillLoaders/EventTarget.js
+@@ -6,16 +6,15 @@
+ let _ET;
+ let ET;
+ export default async function EventTarget() {
+-    return ET || init();
++  return ET || init();
+ }
+ async function init() {
+-    _ET = window.EventTarget;
+-    try {
+-        new _ET();
+-    }
+-    catch (_a) {
+-        _ET = (await import('event-target-shim')).EventTarget;
+-    }
+-    return (ET = _ET);
++  _ET = window.EventTarget;
++  try {
++    new _ET();
++  } catch (_a) {
++    _ET = (await import("event-target-shim")).default.EventTarget;
++  }
++  return (ET = _ET);
+ }
+ //# sourceMappingURL=EventTarget.js.map

.yarn/patches/@material/mwc-icon-button/remove-icon.patch

@@ -0,0 +1,12 @@
+diff --git a/mwc-icon-button-base.js b/mwc-icon-button-base.js
+index 45cdaab93ccc0a6daaaaabc01266dcdc32e46bfd..b3ea5b541597308d85f86ce6c23fd00785fda835 100644
+--- a/mwc-icon-button-base.js
++++ b/mwc-icon-button-base.js
+@@ -63,7 +63,6 @@ export class IconButtonBase extends LitElement {
+         @touchend="${this.handleRippleDeactivate}"
+         @touchcancel="${this.handleRippleDeactivate}"
+     >${this.renderRipple()}
+-    <i class="material-icons">${this.icon}</i>
+     <span
+       ><slot></slot
+     ></span>

.yarnrc.yml

@@ -6,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.3.1.cjs
+yarnPath: .yarn/releases/yarn-3.2.3.cjs

build-scripts/gulp/clean.js

@@ -1,40 +1,36 @@
-const del = import("del");
+const del = require("del");
 const gulp = require("gulp");
 const paths = require("../paths");
 require("./translations");
 
 gulp.task(
   "clean",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.app_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.app_output_root, paths.build_dir])
   )
 );
 
 gulp.task(
   "clean-demo",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.demo_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.demo_output_root, paths.build_dir])
   )
 );
 
 gulp.task(
   "clean-cast",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([paths.cast_output_root, paths.build_dir])
+  gulp.parallel("clean-translations", () =>
+    del([paths.cast_output_root, paths.build_dir])
   )
 );
 
-gulp.task("clean-hassio", async () =>
-  (await del).deleteSync([paths.hassio_output_root, paths.build_dir])
+gulp.task("clean-hassio", () =>
+  del([paths.hassio_output_root, paths.build_dir])
 );
 
 gulp.task(
   "clean-gallery",
-  gulp.parallel("clean-translations", async () =>
-    (await del).deleteSync([
-      paths.gallery_output_root,
-      paths.gallery_build,
-      paths.build_dir,
-    ])
+  gulp.parallel("clean-translations", () =>
+    del([paths.gallery_output_root, paths.gallery_build, paths.build_dir])
   )
 );

build-scripts/gulp/fetch-nightly_translations.js

@@ -1,9 +1,9 @@
 // Task to download the latest Lokalise translations from the nightly workflow artifacts
 
-const del = import("del");
 const fs = require("fs/promises");
 const path = require("path");
 const process = require("process");
+const del = require("del");
 const gulp = require("gulp");
 const jszip = require("jszip");
 const tar = require("tar");
@@ -17,8 +17,8 @@ const WORKFLOW_NAME = "nightly.yaml";
 const ARTIFACT_NAME = "translations";
 const CLIENT_ID = "Iv1.3914e28cb27834d1";
 const EXTRACT_DIR = "translations";
-const TOKEN_FILE = path.posix.join(EXTRACT_DIR, "token.json");
-const ARTIFACT_FILE = path.posix.join(EXTRACT_DIR, "artifact.json");
+const TOKEN_FILE = path.join(EXTRACT_DIR, "token.json");
+const ARTIFACT_FILE = path.join(EXTRACT_DIR, "artifact.json");
 
 let allowTokenSetup = false;
 gulp.task("allow-setup-fetch-nightly-translations", (done) => {
@@ -137,11 +137,7 @@ gulp.task("fetch-nightly-translations", async function () {
 
   // Remove the current translations
   const deleteCurrent = Promise.all(writings).then(
-    (await del).deleteAsync([
-      `${EXTRACT_DIR}/*`,
-      `!${ARTIFACT_FILE}`,
-      `!${TOKEN_FILE}`,
-    ])
+    del([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`])
   );
 
   // Get the download URL and follow the redirect to download (stored as ArrayBuffer)

build-scripts/gulp/locale-data.js

@@ -1,4 +1,4 @@
-const del = import("del");
+const del = require("del");
 const path = require("path");
 const gulp = require("gulp");
 const fs = require("fs");
@@ -6,7 +6,7 @@ const paths = require("../paths");
 
 const outDir = "build/locale-data";
 
-gulp.task("clean-locale-data", async () => (await del).deleteSync([outDir]));
+gulp.task("clean-locale-data", () => del([outDir]));
 
 gulp.task("ensure-locale-data-build-dir", (done) => {
   if (!fs.existsSync(outDir)) {

build-scripts/gulp/translations.js

@@ -1,5 +1,5 @@
-const del = import("del");
 const crypto = require("crypto");
+const del = require("del");
 const path = require("path");
 const source = require("vinyl-source-stream");
 const vinylBuffer = require("vinyl-buffer");
@@ -13,7 +13,7 @@ const { mapFiles } = require("../util");
 const env = require("../env");
 const paths = require("../paths");
 
-require("./fetch-nightly-translations");
+require("./fetch-nightly_translations");
 
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
@@ -120,7 +120,7 @@ function lokaliseTransform(data, original, file) {
   return output;
 }
 
-gulp.task("clean-translations", async () => (await del).deleteSync([workDir]));
+gulp.task("clean-translations", () => del([workDir]));
 
 gulp.task("ensure-translations-build-dir", (done) => {
   if (!fs.existsSync(workDir)) {

cast/src/launcher/layout/hc-layout.ts

@@ -22,11 +22,7 @@ class HcLayout extends LitElement {
     return html`
       <ha-card>
         <div class="layout">
-          <img
-            class="hero"
-            alt="A Google Nest Hub with a Home Assistant dashboard on its screen"
-            src="/images/google-nest-hub.png"
-          />
+          <img class="hero" src="/images/google-nest-hub.png" />
           <h1 class="card-header">
             Home Assistant Cast${this.subtitle ? ` – ${this.subtitle}` : ""}
             ${this.auth

cast/src/receiver/layout/hc-launch-screen.ts

@@ -12,7 +12,6 @@ class HcLaunchScreen extends LitElement {
     return html`
       <div class="container">
         <img
-          alt="Home Assistant logo on left, Nabu Casa logo on right, and red heart in center"
           src="https://www.home-assistant.io/images/blog/2018-09-thinking-big/social.png"
         />
         <div class="status">

gallery/src/pages/components/ha-bar-switch.ts

@@ -115,8 +115,8 @@ export class DemoHaBarSwitch extends LitElement {
         font-weight: 600;
       }
       .custom {
-        --switch-bar-on-color: var(--green-color);
-        --switch-bar-off-color: var(--red-color);
+        --switch-bar-on-color: rgb(var(--rgb-green-color));
+        --switch-bar-off-color: rgb(var(--rgb-red-color));
         --switch-bar-thickness: 100px;
         --switch-bar-border-radius: 24px;
         --switch-bar-padding: 6px;

gallery/src/pages/components/ha-form.ts

@@ -99,19 +99,16 @@ const AREAS = [
     area_id: "backyard",
     name: "Backyard",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "bedroom",
     name: "Bedroom",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "livingroom",
     name: "Livingroom",
     picture: null,
-    aliases: [],
   },
 ];
 

gallery/src/pages/components/ha-selector.ts

@@ -95,19 +95,16 @@ const AREAS = [
     area_id: "backyard",
     name: "Backyard",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "bedroom",
     name: "Bedroom",
     picture: null,
-    aliases: [],
   },
   {
     area_id: "livingroom",
     name: "Livingroom",
     picture: null,
-    aliases: [],
   },
 ];
 

gallery/src/pages/misc/entity-state.ts

@@ -104,17 +104,16 @@ const ENTITIES: HassEntity[] = [
   createEntity("alarm_control_panel.disarming", "disarming"),
   createEntity("alarm_control_panel.triggered", "triggered"),
   // Alert
-  createEntity("alert.idle", "idle"),
   createEntity("alert.off", "off"),
   createEntity("alert.on", "on"),
+  createEntity("alert.idle", "idle"),
   // Automation
   createEntity("automation.off", "off"),
   createEntity("automation.on", "on"),
   // Binary Sensor
-  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) => [
-    createEntity(`binary_sensor.${dc}`, "off", dc),
-    createEntity(`binary_sensor.${dc}`, "on", dc),
-  ]).reduce((arr, item) => [...arr, ...item], []),
+  ...BINARY_SENSOR_DEVICE_CLASSES.map((dc) =>
+    createEntity(`binary_sensor.${dc}`, "on", dc)
+  ),
   // Button
   createEntity("button.restart", "unknown", "restart"),
   createEntity("button.update", "unknown", "update"),
@@ -143,9 +142,6 @@ const ENTITIES: HassEntity[] = [
   createEntity("climate.auto_dry", "auto", undefined, {
     hvac_action: "drying",
   }),
-  createEntity("climate.auto_fan", "auto", undefined, {
-    hvac_action: "fan",
-  }),
   // Cover
   createEntity("cover.closing", "closing"),
   createEntity("cover.closed", "closed"),
@@ -184,8 +180,8 @@ const ENTITIES: HassEntity[] = [
   createEntity("light.off", "off"),
   createEntity("light.on", "on"),
   // Locks
-  createEntity("lock.locked", "locked"),
   createEntity("lock.unlocked", "unlocked"),
+  createEntity("lock.locked", "locked"),
   createEntity("lock.locking", "locking"),
   createEntity("lock.unlocking", "unlocking"),
   createEntity("lock.jammed", "jammed"),
@@ -209,24 +205,17 @@ const ENTITIES: HassEntity[] = [
   createEntity("media_player.speaker_playing", "playing", "speaker"),
   createEntity("media_player.speaker_paused", "paused", "speaker"),
   createEntity("media_player.speaker_standby", "standby", "speaker"),
-  // Plant
-  createEntity("plant.ok", "ok"),
-  createEntity("plant.problem", "problem"),
   // Remote
   createEntity("remote.off", "off"),
   createEntity("remote.on", "on"),
-  // Schedule
-  createEntity("schedule.off", "off"),
-  createEntity("schedule.on", "on"),
   // Script
   createEntity("script.off", "off"),
   createEntity("script.on", "on"),
   // Sensor
   ...SENSOR_DEVICE_CLASSES.map((dc) => createEntity(`sensor.${dc}`, "10", dc)),
   // Battery sensor
-  ...[0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100, "unknown", "not_valid"].map(
-    (value) =>
-      createEntity(`sensor.battery_${value}`, value.toString(), "battery")
+  ...[0, 10, 20, 30, 40, 50, 60, 70, 80, 90, 100].map((value) =>
+    createEntity(`sensor.battery_${value}`, value.toString(), "battery")
   ),
   // Siren
   createEntity("siren.off", "off"),

hassio/src/components/supervisor-formfield-label.ts

@@ -15,7 +15,7 @@ class SupervisorFormfieldLabel extends LitElement {
   protected render(): TemplateResult {
     return html`
       ${this.imageUrl
-        ? html`<img loading="lazy" alt="" src=${this.imageUrl} class="icon" />`
+        ? html`<img loading="lazy" .src=${this.imageUrl} class="icon" />`
         : this.iconPath
         ? html`<ha-svg-icon .path=${this.iconPath} class="icon"></ha-svg-icon>`
         : ""}

hassio/src/ingress-view/hassio-ingress-view.ts

@@ -60,8 +60,8 @@ class HassioIngressView extends LitElement {
     }
 
     const iframe = html`<iframe
-      title=${this._addon.name}
-      src=${this._addon.ingress_url!}
+      .title=${this._addon.name}
+      .src=${this._addon.ingress_url!}
     >
     </iframe>`;
 

package.json

@@ -25,16 +25,21 @@
   "license": "Apache-2.0",
   "dependencies": {
     "@braintree/sanitize-url": "^6.0.0",
-    "@codemirror/autocomplete": "^6.4.0",
-    "@codemirror/commands": "^6.1.3",
-    "@codemirror/language": "^6.4.0",
-    "@codemirror/legacy-modes": "^6.3.1",
-    "@codemirror/search": "^6.2.3",
-    "@codemirror/state": "^6.2.0",
-    "@codemirror/view": "^6.7.1",
+    "@codemirror/autocomplete": "^0.19.12",
+    "@codemirror/commands": "^0.19.8",
+    "@codemirror/gutter": "^0.19.9",
+    "@codemirror/highlight": "^0.19.7",
+    "@codemirror/history": "^0.19.2",
+    "@codemirror/legacy-modes": "^0.19.0",
+    "@codemirror/rectangular-selection": "^0.19.1",
+    "@codemirror/search": "^0.19.6",
+    "@codemirror/state": "^0.19.6",
+    "@codemirror/stream-parser": "^0.19.5",
+    "@codemirror/text": "^0.19.6",
+    "@codemirror/view": "^0.19.40",
     "@formatjs/intl-datetimeformat": "^4.2.5",
-    "@formatjs/intl-getcanonicallocales": "^2.0.5",
-    "@formatjs/intl-locale": "^3.0.11",
+    "@formatjs/intl-getcanonicallocales": "^1.8.0",
+    "@formatjs/intl-locale": "^2.4.40",
     "@formatjs/intl-numberformat": "^7.2.5",
     "@formatjs/intl-pluralrules": "^4.1.5",
     "@formatjs/intl-relativetimeformat": "^9.3.2",
@@ -44,35 +49,34 @@
     "@fullcalendar/interaction": "5.9.0",
     "@fullcalendar/list": "5.9.0",
     "@fullcalendar/timegrid": "5.9.0",
-    "@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/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@mdi/js": "7.1.96",
-    "@mdi/svg": "7.1.96",
+    "@lit-labs/motion": "^1.0.2",
+    "@lit-labs/virtualizer": "patch:@lit-labs/virtualizer@0.7.0-pre.2#./.yarn/patches/@lit-labs/virtualizer/event-target-shim.patch",
+    "@material/chips": "14.0.0-canary.261f2db59.0",
+    "@material/data-table": "14.0.0-canary.261f2db59.0",
+    "@material/mwc-button": "0.25.3",
+    "@material/mwc-checkbox": "0.25.3",
+    "@material/mwc-circular-progress": "0.25.3",
+    "@material/mwc-dialog": "0.25.3",
+    "@material/mwc-drawer": "^0.25.3",
+    "@material/mwc-fab": "0.25.3",
+    "@material/mwc-formfield": "0.25.3",
+    "@material/mwc-icon-button": "patch:@material/mwc-icon-button@0.25.3#./.yarn/patches/@material/mwc-icon-button/remove-icon.patch",
+    "@material/mwc-linear-progress": "0.25.3",
+    "@material/mwc-list": "^0.25.3",
+    "@material/mwc-menu": "0.25.3",
+    "@material/mwc-radio": "0.25.3",
+    "@material/mwc-ripple": "0.25.3",
+    "@material/mwc-select": "0.25.3",
+    "@material/mwc-slider": "0.25.3",
+    "@material/mwc-switch": "0.25.3",
+    "@material/mwc-tab": "0.25.3",
+    "@material/mwc-tab-bar": "0.25.3",
+    "@material/mwc-textarea": "^0.25.3",
+    "@material/mwc-textfield": "0.25.3",
+    "@material/mwc-top-app-bar-fixed": "^0.25.3",
+    "@material/top-app-bar": "14.0.0-canary.261f2db59.0",
+    "@mdi/js": "7.0.96",
+    "@mdi/svg": "7.0.96",
     "@polymer/app-layout": "^3.1.0",
     "@polymer/iron-flex-layout": "^3.0.1",
     "@polymer/iron-icon": "^3.0.1",
@@ -87,48 +91,48 @@
     "@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.5",
-    "@vaadin/vaadin-themable-mixin": "^23.3.5",
+    "@thomasloven/round-slider": "0.5.4",
+    "@vaadin/combo-box": "^23.2.9",
+    "@vaadin/vaadin-themable-mixin": "^23.2.9",
     "@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",
+    "@vue/web-component-wrapper": "^1.2.0",
     "@webcomponents/scoped-custom-element-registry": "^0.0.5",
     "@webcomponents/webcomponentsjs": "^2.2.10",
     "app-datepicker": "^5.1.0",
     "chart.js": "^3.3.2",
     "comlink": "^4.3.1",
     "core-js": "^3.15.2",
-    "cropperjs": "^1.5.13",
-    "date-fns": "^2.29.3",
+    "cropperjs": "^1.5.12",
+    "date-fns": "^2.23.0",
     "date-fns-tz": "^1.3.7",
     "deep-clone-simple": "^1.1.1",
     "deep-freeze": "^0.0.1",
-    "fuse.js": "^6.6.2",
+    "fuse.js": "^6.0.0",
     "google-timezones-json": "^1.0.2",
     "hammerjs": "^2.0.8",
-    "hls.js": "^1.3.1",
+    "hls.js": "^1.2.5",
     "home-assistant-js-websocket": "^8.0.1",
     "idb-keyval": "^5.1.3",
-    "intl-messageformat": "^10.2.5",
+    "intl-messageformat": "^9.9.1",
     "js-yaml": "^4.1.0",
     "leaflet": "^1.7.1",
     "leaflet-draw": "^1.0.4",
-    "lit": "^2.6.1",
+    "lit": "^2.1.2",
     "marked": "^4.0.12",
-    "memoize-one": "^6.0.0",
+    "memoize-one": "^5.2.1",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "^0.3.2",
-    "punycode": "^2.3.0",
+    "punycode": "^2.1.1",
     "qr-scanner": "^1.3.0",
-    "qrcode": "^1.5.1",
-    "regenerator-runtime": "^0.13.11",
+    "qrcode": "^1.4.4",
+    "regenerator-runtime": "^0.13.8",
     "resize-observer-polyfill": "^1.5.1",
     "roboto-fontface": "^0.10.0",
     "rrule": "^2.7.1",
     "sortablejs": "^1.14.0",
-    "superstruct": "^1.0.3",
+    "superstruct": "^0.15.2",
     "tinykeys": "^1.1.3",
     "tsparticles": "^1.34.0",
     "unfetch": "^4.1.0",
@@ -137,19 +141,19 @@
     "vue": "^2.6.12",
     "vue2-daterange-picker": "^0.5.1",
     "weekstart": "^1.1.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"
+    "workbox-cacheable-response": "^6.4.2",
+    "workbox-core": "^6.4.2",
+    "workbox-expiration": "^6.4.2",
+    "workbox-precaching": "^6.4.2",
+    "workbox-routing": "^6.4.2",
+    "workbox-strategies": "^6.4.2",
+    "xss": "^1.0.9"
   },
   "devDependencies": {
     "@babel/core": "^7.20.2",
     "@babel/plugin-external-helpers": "^7.18.6",
     "@babel/plugin-proposal-class-properties": "^7.18.6",
-    "@babel/plugin-proposal-decorators": "^7.20.7",
+    "@babel/plugin-proposal-decorators": "^7.20.2",
     "@babel/plugin-proposal-nullish-coalescing-operator": "^7.18.6",
     "@babel/plugin-proposal-object-rest-spread": "^7.20.2",
     "@babel/plugin-proposal-optional-chaining": "^7.18.9",
@@ -160,7 +164,7 @@
     "@babel/preset-typescript": "^7.18.6",
     "@koa/cors": "^3.1.0",
     "@octokit/auth-oauth-device": "^4.0.2",
-    "@octokit/rest": "^19.0.7",
+    "@octokit/rest": "^19.0.4",
     "@open-wc/dev-server-hmr": "^0.0.2",
     "@rollup/plugin-babel": "^5.2.1",
     "@rollup/plugin-commonjs": "^11.1.0",
@@ -169,89 +173,93 @@
     "@rollup/plugin-replace": "^2.3.2",
     "@types/chromecast-caf-receiver": "5.0.12",
     "@types/chromecast-caf-sender": "^1.0.3",
-    "@types/glob": "^8",
+    "@types/glob": "^7",
     "@types/hammerjs": "^2.0.41",
     "@types/js-yaml": "^4",
     "@types/leaflet": "^1",
     "@types/leaflet-draw": "^1",
     "@types/marked": "^4",
     "@types/mocha": "^8",
-    "@types/qrcode": "^1.5.0",
+    "@types/qrcode": "^1.4.2",
     "@types/sortablejs": "^1",
     "@types/tar": "^6",
     "@types/webspeechapi": "^0.0.29",
     "@typescript-eslint/eslint-plugin": "^5.46.1",
-    "@typescript-eslint/parser": "^5.49.0",
+    "@typescript-eslint/parser": "^5.44.0",
     "@web/dev-server": "^0.0.24",
     "@web/dev-server-rollup": "^0.2.11",
     "babel-loader": "^9.1.0",
     "chai": "^4.3.4",
-    "del": "^7.0.0",
+    "del": "^4.0.0",
     "eslint": "^7.32.0",
     "eslint-config-airbnb-base": "^14.2.1",
     "eslint-config-airbnb-typescript": "^14.0.0",
-    "eslint-config-prettier": "^8.6.0",
+    "eslint-config-prettier": "^8.5.0",
     "eslint-import-resolver-webpack": "^0.13.1",
     "eslint-plugin-disable": "^2.0.1",
     "eslint-plugin-import": "^2.24.2",
     "eslint-plugin-lit": "^1.6.1",
     "eslint-plugin-unused-imports": "^1.1.5",
-    "eslint-plugin-wc": "^1.4.0",
+    "eslint-plugin-wc": "^1.3.2",
     "fancy-log": "^2.0.0",
-    "fs-extra": "^11.1.0",
-    "glob": "^8.1.0",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.2.0",
     "gulp": "^4.0.2",
     "gulp-flatmap": "^1.0.2",
     "gulp-json-transform": "^0.4.6",
-    "gulp-merge-json": "^2.1.2",
+    "gulp-merge-json": "^1.3.1",
     "gulp-rename": "^2.0.0",
     "gulp-zopfli-green": "^3.0.1",
     "html-minifier": "^4.0.0",
-    "husky": "^8.0.3",
+    "husky": "^8.0.1",
     "instant-mocha": "^1.3.1",
     "jszip": "^3.10.1",
-    "lint-staged": "^13.1.0",
+    "lint-staged": "^13.0.3",
     "lit-analyzer": "^1.2.1",
     "lodash.template": "^4.5.0",
     "magic-string": "^0.25.7",
     "map-stream": "^0.0.7",
     "merge-stream": "^1.0.1",
     "mocha": "^8.4.0",
-    "object-hash": "^3.0.0",
-    "open": "^8.4.0",
+    "object-hash": "^2.0.3",
+    "open": "^7.0.4",
     "pinst": "^3.0.0",
-    "prettier": "^2.8.3",
+    "prettier": "^2.8.1",
     "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",
+    "rollup-plugin-visualizer": "^4.0.4",
     "serve": "^11.3.2",
-    "sinon": "^15.0.1",
+    "sinon": "^11.0.0",
     "source-map-url": "^0.4.0",
     "systemjs": "^6.3.2",
     "tar": "^6.1.11",
     "terser-webpack-plugin": "^5.2.4",
     "ts-lit-plugin": "^1.2.1",
-    "typescript": "^4.9.4",
+    "typescript": "^4.9.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
     "webpack": "^5.55.1",
-    "webpack-cli": "^5.0.1",
-    "webpack-dev-server": "^4.11.1",
+    "webpack-cli": "^4.8.0",
+    "webpack-dev-server": "^4.3.0",
     "webpack-manifest-plugin": "^4.0.2",
-    "webpackbar": "^5.0.2",
-    "workbox-build": "^6.5.4"
+    "webpackbar": "^5.0.0-3",
+    "workbox-build": "^6.4.2"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
     "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
-    "@webcomponents/webcomponentsjs": "^2.2.10"
+    "@webcomponents/webcomponentsjs": "^2.2.10",
+    "lit": "^2.1.2",
+    "lit-html": "2.1.2",
+    "lit-element": "3.1.2",
+    "@lit/reactive-element": "1.2.1"
   },
   "main": "src/home-assistant.js",
   "prettier": {
     "trailingComma": "es5",
     "arrowParens": "always"
   },
-  "packageManager": "yarn@3.3.1"
+  "packageManager": "yarn@3.2.3"
 }

pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name         = "home-assistant-frontend"
-version      = "20230128.0"
+version      = "20230102.0"
 license      = {text = "Apache-2.0"}
 description  = "The Home Assistant frontend"
 readme       = "README.md"

src/common/color/compute-color.ts

@@ -19,9 +19,7 @@ export const THEME_COLORS = new Set([
   "orange",
   "deep-orange",
   "brown",
-  "light-grey",
   "grey",
-  "dark-grey",
   "blue-grey",
   "black",
   "white",
@@ -29,7 +27,7 @@ export const THEME_COLORS = new Set([
 
 export function computeCssColor(color: string): string {
   if (THEME_COLORS.has(color)) {
-    return `var(--${color}-color)`;
+    return `rgb(var(--rgb-${color}-color))`;
   }
   return color;
 }

src/common/const.ts

@@ -201,7 +201,6 @@ export const DOMAINS_WITH_CARD = [
 export const SENSOR_ENTITIES = [
   "sensor",
   "binary_sensor",
-  "calendar",
   "camera",
   "device_tracker",
   "weather",

src/common/datetime/relative_time.ts

@@ -18,7 +18,7 @@ export const relativeTime = (
   to?: Date,
   includeTense = true
 ): string => {
-  const diff = selectUnit(from, to, locale);
+  const diff = selectUnit(from, to);
   if (includeTense) {
     return formatRelTimeMem(locale).format(diff.value, diff.unit);
   }

src/common/dom/scroll-to-target.ts

@@ -39,5 +39,5 @@ export default function scrollToTarget(element, target) {
       );
       requestAnimationFrame(updateFrame.bind(element));
     }
-  }).call(element);
+  }.call(element));
 }

src/common/entity/color/alarm_control_panel_color.ts

@@ -0,0 +1,21 @@
+export const alarmControlPanelColor = (state?: string): string | undefined => {
+  switch (state) {
+    case "armed_away":
+    case "armed_vacation":
+    case "armed_home":
+    case "armed_night":
+    case "armed_custom_bypass":
+      return "alarm-armed";
+    case "pending":
+      return "alarm-pending";
+    case "arming":
+    case "disarming":
+      return "alarm-arming";
+    case "triggered":
+      return "alarm-triggered";
+    case "disarmed":
+      return "alarm-disarmed";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/alert_color.ts

@@ -0,0 +1,10 @@
+export const alertColor = (state?: string): string | undefined => {
+  switch (state) {
+    case "on":
+      return "alert";
+    case "off":
+      return "alert-off";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/battery_color.ts

@@ -1,15 +1,13 @@
-export const batteryStateColorProperty = (
-  state: string
-): string | undefined => {
+export const batteryStateColor = (state: string) => {
   const value = Number(state);
   if (isNaN(value)) {
     return undefined;
   }
   if (value >= 70) {
-    return "--state-sensor-battery-high-color";
+    return "sensor-battery-high";
   }
   if (value >= 30) {
-    return "--state-sensor-battery-medium-color";
+    return "sensor-battery-medium";
   }
-  return "--state-sensor-battery-low-color";
+  return "sensor-battery-low";
 };

src/common/entity/color/binary_sensor_color.ts

@@ -0,0 +1,29 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { stateActive } from "../state_active";
+
+const ALERTING_DEVICE_CLASSES = new Set([
+  "battery",
+  "carbon_monoxide",
+  "gas",
+  "heat",
+  "lock",
+  "moisture",
+  "problem",
+  "safety",
+  "smoke",
+  "tamper",
+]);
+
+export const binarySensorColor = (
+  stateObj: HassEntity,
+  state: string
+): string | undefined => {
+  const deviceClass = stateObj?.attributes.device_class;
+
+  if (!stateActive(stateObj, state)) {
+    return undefined;
+  }
+  return deviceClass && ALERTING_DEVICE_CLASSES.has(deviceClass)
+    ? "binary-sensor-alerting"
+    : "binary-sensor";
+};

src/common/entity/color/climate_color.ts

@@ -0,0 +1,29 @@
+import { HvacAction } from "../../../data/climate";
+
+export const CLIMATE_HVAC_ACTION_COLORS: Record<HvacAction, string> = {
+  cooling: "var(--rgb-state-climate-cool-color)",
+  drying: "var(--rgb-state-climate-dry-color)",
+  fan: "var(--rgb-state-climate-fan-only-color)",
+  heating: "var(--rgb-state-climate-heat-color)",
+  idle: "var(--rgb-state-climate-idle-color)",
+  off: "var(--rgb-state-climate-off-color)",
+};
+
+export const climateColor = (state: string): string | undefined => {
+  switch (state) {
+    case "auto":
+      return "climate-auto";
+    case "cool":
+      return "climate-cool";
+    case "dry":
+      return "climate-dry";
+    case "fan_only":
+      return "climate-fan-only";
+    case "heat":
+      return "climate-heat";
+    case "heat_cool":
+      return "climate-heat-cool";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/lock_color.ts

@@ -0,0 +1,15 @@
+export const lockColor = (state?: string): string | undefined => {
+  switch (state) {
+    case "unlocked":
+      return "lock-unlocked";
+    case "locked":
+      return "lock-locked";
+    case "jammed":
+      return "lock-jammed";
+    case "locking":
+    case "unlocking":
+      return "lock-pending";
+    default:
+      return undefined;
+  }
+};

src/common/entity/color/person_color.ts

@@ -0,0 +1,10 @@
+export const personColor = (state: string): string | undefined => {
+  switch (state) {
+    case "home":
+      return "person-home";
+    case "not_home":
+      return "person-not-home";
+    default:
+      return "person-zone";
+  }
+};

src/common/entity/color/sensor_color.ts

@@ -0,0 +1,15 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { batteryStateColor } from "./battery_color";
+
+export const sensorColor = (
+  stateObj: HassEntity,
+  state: string
+): string | undefined => {
+  const deviceClass = stateObj?.attributes.device_class;
+
+  if (deviceClass === "battery") {
+    return batteryStateColor(state);
+  }
+
+  return undefined;
+};

src/common/entity/color/update_color.ts

@@ -0,0 +1,15 @@
+import { HassEntity } from "home-assistant-js-websocket";
+import { UpdateEntity, updateIsInstalling } from "../../../data/update";
+import { stateActive } from "../state_active";
+
+export const updateColor = (
+  stateObj: HassEntity,
+  state: string
+): string | undefined => {
+  if (!stateActive(stateObj, state)) {
+    return undefined;
+  }
+  return updateIsInstalling(stateObj as UpdateEntity)
+    ? "update-installing"
+    : "update";
+};

src/common/entity/domain_icon.ts

@@ -3,8 +3,6 @@ import {
   mdiAccountArrowRight,
   mdiAirHumidifier,
   mdiAirHumidifierOff,
-  mdiAudioVideo,
-  mdiAudioVideoOff,
   mdiBluetooth,
   mdiBluetoothConnect,
   mdiCalendar,
@@ -27,6 +25,8 @@ import {
   mdiPackageUp,
   mdiPowerPlug,
   mdiPowerPlugOff,
+  mdiAudioVideo,
+  mdiAudioVideoOff,
   mdiRestart,
   mdiSpeaker,
   mdiSpeakerOff,
@@ -53,7 +53,6 @@ import { DEFAULT_DOMAIN_ICON, FIXED_DOMAIN_ICONS } from "../const";
 import { alarmPanelIcon } from "./alarm_panel_icon";
 import { binarySensorIcon } from "./binary_sensor_icon";
 import { coverIcon } from "./cover_icon";
-import { numberIcon } from "./number_icon";
 import { sensorIcon } from "./sensor_icon";
 
 export const domainIcon = (
@@ -109,7 +108,7 @@ export const domainIconWithoutDefault = (
       return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;
 
     case "humidifier":
-      return compareState === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;
+      return state && state === "off" ? mdiAirHumidifierOff : mdiAirHumidifier;
 
     case "input_boolean":
       return compareState === "on"
@@ -181,15 +180,6 @@ export const domainIconWithoutDefault = (
           }
       }
 
-    case "number": {
-      const icon = numberIcon(stateObj);
-      if (icon) {
-        return icon;
-      }
-
-      break;
-    }
-
     case "person":
       return compareState === "not_home" ? mdiAccountArrowRight : mdiAccount;
 

src/common/entity/number_icon.ts

@@ -1,13 +0,0 @@
-/** Return an icon representing a number state. */
-import { HassEntity } from "home-assistant-js-websocket";
-import { FIXED_DEVICE_CLASS_ICONS } from "../const";
-
-export const numberIcon = (stateObj?: HassEntity): string | undefined => {
-  const dclass = stateObj?.attributes.device_class;
-
-  if (dclass && dclass in FIXED_DEVICE_CLASS_ICONS) {
-    return FIXED_DEVICE_CLASS_ICONS[dclass];
-  }
-
-  return undefined;
-};

src/common/entity/state_color.ts

@@ -1,102 +1,94 @@
 /** Return an color representing a state. */
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE } from "../../data/entity";
-import { computeCssVariable } from "../../resources/css-variables";
-import { slugify } from "../string/slugify";
-import { batteryStateColorProperty } from "./color/battery_color";
+import { alarmControlPanelColor } from "./color/alarm_control_panel_color";
+import { alertColor } from "./color/alert_color";
+import { binarySensorColor } from "./color/binary_sensor_color";
+import { climateColor } from "./color/climate_color";
+import { lockColor } from "./color/lock_color";
+import { personColor } from "./color/person_color";
+import { sensorColor } from "./color/sensor_color";
+import { updateColor } from "./color/update_color";
 import { computeDomain } from "./compute_domain";
 import { stateActive } from "./state_active";
 
-const STATE_COLORED_DOMAIN = new Set([
-  "alarm_control_panel",
-  "alert",
+const STATIC_ACTIVE_COLORED_DOMAIN = new Set([
   "automation",
-  "binary_sensor",
   "calendar",
   "camera",
-  "climate",
   "cover",
-  "device_tracker",
   "fan",
   "group",
   "humidifier",
   "input_boolean",
   "light",
-  "lock",
   "media_player",
-  "person",
-  "plant",
   "remote",
-  "schedule",
   "script",
   "siren",
-  "sun",
   "switch",
   "timer",
-  "update",
   "vacuum",
 ]);
 
 export const stateColorCss = (stateObj: HassEntity, state?: string) => {
   const compareState = state !== undefined ? state : stateObj?.state;
   if (compareState === UNAVAILABLE) {
-    return `var(--state-unavailable-color)`;
+    return `var(--rgb-state-unavailable-color)`;
   }
 
-  const properties = stateColorProperties(stateObj, state);
-  if (properties) {
-    return computeCssVariable(properties);
+  const domainColor = stateColor(stateObj, state);
+
+  if (domainColor) {
+    return `var(--rgb-state-${domainColor}-color)`;
+  }
+
+  if (!stateActive(stateObj, state)) {
+    return `var(--rgb-state-inactive-color)`;
   }
 
   return undefined;
 };
 
-export const domainStateColorProperties = (
-  stateObj: HassEntity,
-  state?: string
-): string[] => {
-  const compareState = state !== undefined ? state : stateObj.state;
-  const domain = computeDomain(stateObj.entity_id);
-  const active = stateActive(stateObj, state);
-
-  const properties: string[] = [];
-
-  const stateKey = slugify(compareState, "_");
-  const activeKey = active ? "active" : "inactive";
-
-  const dc = stateObj.attributes.device_class;
-
-  if (dc) {
-    properties.push(`--state-${domain}-${dc}-${stateKey}-color`);
-  }
-
-  properties.push(
-    `--state-${domain}-${stateKey}-color`,
-    `--state-${domain}-${activeKey}-color`,
-    `--state-${activeKey}-color`
-  );
-
-  return properties;
-};
-
-export const stateColorProperties = (
-  stateObj: HassEntity,
-  state?: string
-): string[] | undefined => {
+export const stateColor = (stateObj: HassEntity, state?: string) => {
   const compareState = state !== undefined ? state : stateObj?.state;
   const domain = computeDomain(stateObj.entity_id);
-  const dc = stateObj.attributes.device_class;
 
-  // Special rules for battery coloring
-  if (domain === "sensor" && dc === "battery") {
-    const property = batteryStateColorProperty(compareState);
-    if (property) {
-      return [property];
-    }
+  if (
+    STATIC_ACTIVE_COLORED_DOMAIN.has(domain) &&
+    stateActive(stateObj, state)
+  ) {
+    return domain.replace("_", "-");
   }
 
-  if (STATE_COLORED_DOMAIN.has(domain)) {
-    return domainStateColorProperties(stateObj, state);
+  switch (domain) {
+    case "alarm_control_panel":
+      return alarmControlPanelColor(compareState);
+
+    case "alert":
+      return alertColor(compareState);
+
+    case "binary_sensor":
+      return binarySensorColor(stateObj, compareState);
+
+    case "climate":
+      return climateColor(compareState);
+
+    case "lock":
+      return lockColor(compareState);
+
+    case "person":
+    case "device_tracker":
+      return personColor(compareState);
+
+    case "sensor":
+      return sensorColor(stateObj, compareState);
+
+    case "sun":
+      return compareState === "above_horizon" ? "sun-day" : "sun-night";
+
+    case "update":
+      return updateColor(stateObj, compareState);
   }
 
   return undefined;

src/common/style/icon_color_css.ts

@@ -22,6 +22,6 @@ export const iconColorCSS = css`
 
   /* Color the icon if unavailable */
   ha-state-icon[data-state="unavailable"] {
-    color: var(--state-unavailable-color);
+    color: rgb(var(--rgb-state-unavailable-color));
   }
 `;

src/common/translations/localize.ts

@@ -29,9 +29,11 @@ export type LocalizeKeys =
   | `ui.panel.config.devices.${string}`
   | `ui.panel.config.energy.${string}`
   | `ui.panel.config.info.${string}`
+  | `ui.panel.config.logs.${string}`
   | `ui.panel.config.lovelace.${string}`
   | `ui.panel.config.network.${string}`
   | `ui.panel.config.scene.${string}`
+  | `ui.panel.config.url.${string}`
   | `ui.panel.config.zha.${string}`
   | `ui.panel.config.zwave_js.${string}`
   | `ui.panel.lovelace.card.${string}`

src/common/util/select-unit.ts

@@ -1,7 +1,3 @@
-import { differenceInDays, differenceInWeeks, startOfWeek } from "date-fns/esm";
-import { FrontendLocaleData } from "../../data/translation";
-import { firstWeekdayIndex } from "../datetime/first_weekday";
-
 export type Unit =
   | "second"
   | "minute"
@@ -15,12 +11,13 @@ export type Unit =
 const MS_PER_SECOND = 1e3;
 const SECS_PER_MIN = 60;
 const SECS_PER_HOUR = SECS_PER_MIN * 60;
+const SECS_PER_DAY = SECS_PER_HOUR * 24;
+const SECS_PER_WEEK = SECS_PER_DAY * 7;
 
 // Adapted from https://github.com/formatjs/formatjs/blob/186cef62f980ec66252ee232f438a42d0b51b9f9/packages/intl-utils/src/diff.ts
 export function selectUnit(
   from: Date | number,
   to: Date | number = Date.now(),
-  locale: FrontendLocaleData,
   thresholds: Partial<Thresholds> = {}
 ): { value: number; unit: Unit } {
   const resolvedThresholds: Thresholds = {
@@ -52,56 +49,29 @@ export function selectUnit(
     };
   }
 
-  const fromDate = new Date(from);
-  const toDate = new Date(to);
-
-  // Set time component to zero, which allows us to compare only the days
-  fromDate.setHours(0, 0, 0, 0);
-  toDate.setHours(0, 0, 0, 0);
-
-  const days = differenceInDays(fromDate, toDate);
-  if (days === 0) {
-    return {
-      value: Math.round(hours),
-      unit: "hour",
-    };
-  }
+  const days = secs / SECS_PER_DAY;
   if (Math.abs(days) < resolvedThresholds.day) {
     return {
-      value: days,
+      value: Math.round(days),
       unit: "day",
     };
   }
 
-  const firstWeekday = firstWeekdayIndex(locale);
-  const fromWeek = startOfWeek(fromDate, { weekStartsOn: firstWeekday });
-  const toWeek = startOfWeek(toDate, { weekStartsOn: firstWeekday });
-
-  const weeks = differenceInWeeks(fromWeek, toWeek);
-  if (weeks === 0) {
-    return {
-      value: days,
-      unit: "day",
-    };
-  }
+  const weeks = secs / SECS_PER_WEEK;
   if (Math.abs(weeks) < resolvedThresholds.week) {
     return {
-      value: weeks,
+      value: Math.round(weeks),
       unit: "week",
     };
   }
 
+  const fromDate = new Date(from);
+  const toDate = new Date(to);
   const years = fromDate.getFullYear() - toDate.getFullYear();
   const months = years * 12 + fromDate.getMonth() - toDate.getMonth();
-  if (months === 0) {
+  if (Math.round(Math.abs(months)) < resolvedThresholds.month) {
     return {
-      value: weeks,
-      unit: "week",
-    };
-  }
-  if (Math.abs(months) < resolvedThresholds.month || years === 0) {
-    return {
-      value: months,
+      value: Math.round(months),
       unit: "month",
     };
   }

src/components/chart/ha-chart-base.ts

@@ -10,8 +10,6 @@ import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import { styleMap } from "lit/directives/style-map";
 import { clamp } from "../../common/number/clamp";
-import { computeRTL } from "../../common/util/compute_rtl";
-import { HomeAssistant } from "../../types";
 
 export const MIN_TIME_BETWEEN_UPDATES = 60 * 5 * 1000;
 
@@ -24,8 +22,6 @@ interface Tooltip extends TooltipModel<any> {
 export default class HaChartBase extends LitElement {
   public chart?: Chart;
 
-  @property({ attribute: false }) public hass!: HomeAssistant;
-
   @property({ attribute: "chart-type", reflect: true })
   public chartType: ChartType = "line";
 
@@ -37,8 +33,6 @@ export default class HaChartBase extends LitElement {
 
   @property({ type: Number }) public height?: number;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
   @state() private _chartHeight?: number;
 
   @state() private _tooltip?: Tooltip;
@@ -134,8 +128,6 @@ export default class HaChartBase extends LitElement {
         style=${styleMap({
           height: `${this.height ?? this._chartHeight}px`,
           overflow: this._chartHeight ? "initial" : "hidden",
-          "padding-left": `${computeRTL(this.hass) ? 0 : this.paddingYAxis}px`,
-          "padding-right": `${computeRTL(this.hass) ? this.paddingYAxis : 0}px`,
         })}
       >
         <canvas></canvas>

src/components/chart/state-history-chart-line.ts

@@ -2,8 +2,6 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { html, LitElement, PropertyValues } from "lit";
 import { property, state } from "lit/decorators";
 import { getGraphColorByIndex } from "../../common/color/colors";
-import { fireEvent } from "../../common/dom/fire_event";
-import { computeRTL } from "../../common/util/compute_rtl";
 import {
   formatNumber,
   numberFormatToLocale,
@@ -32,25 +30,17 @@ class StateHistoryChartLine extends LitElement {
 
   @property({ attribute: false }) public endTime!: Date;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
-  @property({ type: Number }) public chartIndex?;
-
   @state() private _chartData?: ChartData<"line">;
 
   @state() private _chartOptions?: ChartOptions;
 
-  @state() private _yWidth = 0;
-
   private _chartTime: Date = new Date();
 
   protected render() {
     return html`
       <ha-chart-base
-        .hass=${this.hass}
         .data=${this._chartData}
         .options=${this._chartOptions}
-        .paddingYAxis=${this.paddingYAxis - this._yWidth}
         chart-type="line"
       ></ha-chart-base>
     `;
@@ -94,16 +84,6 @@ class StateHistoryChartLine extends LitElement {
               display: true,
               text: this.unit,
             },
-            afterUpdate: (y) => {
-              if (this._yWidth !== Math.floor(y.width)) {
-                this._yWidth = Math.floor(y.width);
-                fireEvent(this, "y-width-changed", {
-                  value: this._yWidth,
-                  chartIndex: this.chartIndex,
-                });
-              }
-            },
-            position: computeRTL(this.hass) ? "right" : "left",
           },
         },
         plugins: {

src/components/chart/state-history-chart-timeline.ts

@@ -2,7 +2,6 @@ import type { ChartData, ChartDataset, ChartOptions } from "chart.js";
 import { css, CSSResultGroup, html, LitElement, PropertyValues } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { formatDateTimeWithSeconds } from "../../common/datetime/format_date_time";
-import { fireEvent } from "../../common/dom/fire_event";
 import { numberFormatToLocale } from "../../common/number/format_number";
 import { computeRTL } from "../../common/util/compute_rtl";
 import { TimelineEntity } from "../../data/history";
@@ -33,26 +32,18 @@ export class StateHistoryChartTimeline extends LitElement {
 
   @property({ attribute: false }) public endTime!: Date;
 
-  @property({ type: Number }) public paddingYAxis = 0;
-
-  @property({ type: Number }) public chartIndex?;
-
   @state() private _chartData?: ChartData<"timeline">;
 
   @state() private _chartOptions?: ChartOptions<"timeline">;
 
-  @state() private _yWidth = 0;
-
   private _chartTime: Date = new Date();
 
   protected render() {
     return html`
       <ha-chart-base
-        .hass=${this.hass}
         .data=${this._chartData}
         .options=${this._chartOptions}
         .height=${this.data.length * 30 + 30}
-        .paddingYAxis=${this.paddingYAxis - this._yWidth}
         chart-type="timeline"
       ></ha-chart-base>
     `;
@@ -140,15 +131,6 @@ export class StateHistoryChartTimeline extends LitElement {
               scaleInstance.width = narrow ? 105 : 185;
             }
           },
-          afterUpdate: (y) => {
-            if (this._yWidth !== Math.floor(y.width)) {
-              this._yWidth = Math.floor(y.width);
-              fireEvent(this, "y-width-changed", {
-                value: this._yWidth,
-                chartIndex: this.chartIndex,
-              });
-            }
-          },
           position: computeRTL(this.hass) ? "right" : "left",
         },
       },

src/components/chart/state-history-charts.ts

@@ -31,12 +31,6 @@ const chunkData = (inputArray: any[], chunks: number) =>
     return results;
   }, []);
 
-declare global {
-  interface HASSDomEvents {
-    "y-width-changed": { value: number; chartIndex: number };
-  }
-}
-
 @customElement("state-history-charts")
 class StateHistoryCharts extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
@@ -62,12 +56,6 @@ class StateHistoryCharts extends LitElement {
 
   @state() private _computedEndTime!: Date;
 
-  @state() private _maxYWidth = 0;
-
-  @state() private _childYWidths: number[] = [];
-
-  @state() private _chartCount = 0;
-
   // @ts-ignore
   @restoreScroll(".container") private _savedScrollPos?: number;
 
@@ -111,8 +99,6 @@ class StateHistoryCharts extends LitElement {
         ).concat(this.historyData.line)
       : this.historyData.line;
 
-    this._chartCount = combinedItems.length;
-
     return this.virtualize
       ? html`<div class="container ha-scrollbar" @scroll=${this._saveScrollPos}>
           <lit-virtualizer
@@ -144,10 +130,7 @@ class StateHistoryCharts extends LitElement {
           .identifier=${item.identifier}
           .showNames=${this.showNames}
           .endTime=${this._computedEndTime}
-          .paddingYAxis=${this._maxYWidth}
           .names=${this.names}
-          .chartIndex=${index}
-          @y-width-changed=${this._yWidthChanged}
         ></state-history-chart-line>
       </div> `;
     }
@@ -161,9 +144,6 @@ class StateHistoryCharts extends LitElement {
         .names=${this.names}
         .narrow=${this.narrow}
         .chunked=${this.virtualize}
-        .paddingYAxis=${this._maxYWidth}
-        .chartIndex=${index}
-        @y-width-changed=${this._yWidthChanged}
       ></state-history-chart-timeline>
     </div> `;
   };
@@ -172,21 +152,6 @@ class StateHistoryCharts extends LitElement {
     return !(changedProps.size === 1 && changedProps.has("hass"));
   }
 
-  protected updated(changedProps: PropertyValues) {
-    if (changedProps.has("_chartCount")) {
-      if (this._chartCount < this._childYWidths.length) {
-        this._childYWidths.length = this._chartCount;
-        this._maxYWidth =
-          this._childYWidths.length === 0 ? 0 : Math.max(...this._childYWidths);
-      }
-    }
-  }
-
-  private _yWidthChanged(e: CustomEvent<HASSDomEvents["y-width-changed"]>) {
-    this._childYWidths[e.detail.chartIndex] = e.detail.value;
-    this._maxYWidth = Math.max(...this._childYWidths);
-  }
-
   private _isHistoryEmpty(): boolean {
     const historyDataEmpty =
       !this.historyData ||

src/components/chart/statistics-chart.ts

@@ -133,7 +133,6 @@ class StatisticsChart extends LitElement {
 
     return html`
       <ha-chart-base
-        .hass=${this.hass}
         .data=${this._chartData}
         .options=${this._chartOptions}
         .chartType=${this.chartType}

src/components/chart/timeline-chart/timeline-color.ts

@@ -1,11 +1,11 @@
 import { HassEntity } from "home-assistant-js-websocket";
 import { getGraphColorByIndex } from "../../../common/color/colors";
-import { hex2rgb, lab2hex, rgb2lab } from "../../../common/color/convert-color";
+import { lab2hex, rgb2hex, rgb2lab } from "../../../common/color/convert-color";
 import { labBrighten } from "../../../common/color/lab";
 import { computeDomain } from "../../../common/entity/compute_domain";
-import { stateColorProperties } from "../../../common/entity/state_color";
-import { UNAVAILABLE, UNKNOWN } from "../../../data/entity";
-import { computeCssValue } from "../../../resources/css-variables";
+import { stateActive } from "../../../common/entity/state_active";
+import { stateColor } from "../../../common/entity/state_color";
+import { UNAVAILABLE } from "../../../data/entity";
 
 const DOMAIN_STATE_SHADES: Record<string, Record<string, number>> = {
   media_player: {
@@ -17,35 +17,61 @@ const DOMAIN_STATE_SHADES: Record<string, Record<string, number>> = {
   },
 };
 
+const cssColorMap: Map<string, [number, number, number]> = new Map();
+
+function cssToRgb(
+  cssVariable: string,
+  computedStyles: CSSStyleDeclaration
+): [number, number, number] | undefined {
+  if (!cssVariable.startsWith("--rgb")) {
+    return undefined;
+  }
+
+  if (cssColorMap.has(cssVariable)) {
+    return cssColorMap.get(cssVariable)!;
+  }
+
+  const value = computedStyles.getPropertyValue(cssVariable);
+
+  if (!value) return undefined;
+
+  const rgb = value.split(",").map((v) => Number(v)) as [
+    number,
+    number,
+    number
+  ];
+  cssColorMap.set(cssVariable, rgb);
+
+  return rgb;
+}
+
 function computeTimelineStateColor(
   state: string,
   computedStyles: CSSStyleDeclaration,
   stateObj?: HassEntity
 ): string | undefined {
   if (!stateObj || state === UNAVAILABLE) {
-    return computeCssValue("--history-unavailable-color", computedStyles);
+    return "transparent";
   }
 
-  if (state === UNKNOWN) {
-    return computeCssValue("--history-unknown-color", computedStyles);
+  const color = stateColor(stateObj, state);
+
+  if (!color && !stateActive(stateObj, state)) {
+    const rgb = cssToRgb("--rgb-state-inactive-color", computedStyles);
+    if (!rgb) return undefined;
+    return rgb2hex(rgb);
   }
 
-  const properties = stateColorProperties(stateObj, state);
-
-  if (!properties) {
-    return undefined;
-  }
-
-  const rgb = computeCssValue(properties, computedStyles);
+  const rgb = cssToRgb(`--rgb-state-${color}-color`, computedStyles);
 
   if (!rgb) return undefined;
 
   const domain = computeDomain(stateObj.entity_id);
   const shade = DOMAIN_STATE_SHADES[domain]?.[state] as number | number;
   if (!shade) {
-    return rgb;
+    return rgb2hex(rgb);
   }
-  return lab2hex(labBrighten(rgb2lab(hex2rgb(rgb)), shade));
+  return lab2hex(labBrighten(rgb2lab(rgb), shade));
 }
 
 let colorIndex = 0;

src/components/currency-datalist.ts

@@ -157,7 +157,7 @@ export const CURRENCIES = [
   "XPF",
   "YER",
   "ZAR",
-  "ZMW",
+  "ZMK",
   "ZWL",
 ];
 

src/components/data-table/ha-data-table.ts

@@ -200,6 +200,7 @@ export class HaDataTable extends LitElement {
       Object.values(clonedColumns).forEach(
         (column: ClonedDataTableColumnData) => {
           delete column.title;
+          delete column.type;
           delete column.template;
         }
       );

src/components/data-table/sort_filter_worker.ts

@@ -55,16 +55,11 @@ const sortData = (
       ? b[column.valueColumn || sortColumn][column.filterKey]
       : b[column.valueColumn || sortColumn];
 
-    if (column.type === "numeric") {
-      valA = isNaN(valA) ? undefined : Number(valA);
-      valB = isNaN(valB) ? undefined : Number(valB);
-    } else {
-      if (typeof valA === "string") {
-        valA = valA.toUpperCase();
-      }
-      if (typeof valB === "string") {
-        valB = valB.toUpperCase();
-      }
+    if (typeof valA === "string") {
+      valA = valA.toUpperCase();
+    }
+    if (typeof valB === "string") {
+      valB = valB.toUpperCase();
     }
 
     // Ensure "undefined" is always sorted to the bottom

src/components/date-range-picker.ts

@@ -5,6 +5,7 @@ import DateRangePicker from "vue2-daterange-picker";
 // @ts-ignore
 import dateRangePickerStyles from "vue2-daterange-picker/dist/vue2-daterange-picker.css";
 import { fireEvent } from "../common/dom/fire_event";
+import { Constructor } from "../types";
 
 const Component = Vue.extend({
   props: {
@@ -46,26 +47,35 @@ const Component = Vue.extend({
     },
   },
   render(createElement) {
-    // @ts-expect-error
+    // @ts-ignore
     return createElement(DateRangePicker, {
       props: {
+        // @ts-ignore
         "time-picker": this.timePicker,
+        // @ts-ignore
         "auto-apply": this.autoApply,
         opens: "right",
         "show-dropdowns": false,
+        // @ts-ignore
         "time-picker24-hour": this.twentyfourHours,
+        // @ts-ignore
         disabled: this.disabled,
+        // @ts-ignore
         ranges: this.ranges ? {} : false,
         "locale-data": {
+          // @ts-ignore
           firstDay: this.firstDay,
         },
       },
       model: {
         value: {
+          // @ts-ignore
           startDate: this.startDate,
+          // @ts-ignore
           endDate: this.endDate,
         },
         callback: (value) => {
+          // @ts-ignore
           fireEvent(this.$el as HTMLElement, "change", value);
         },
         expression: "dateRange",
@@ -96,11 +106,7 @@ const Component = Vue.extend({
   },
 });
 
-// Assertion corrects HTMLElement type from package
-const WrappedElement = wrap(
-  Vue,
-  Component
-) as unknown as CustomElementConstructor;
+const WrappedElement: Constructor<HTMLElement> = wrap(Vue, Component);
 
 @customElement("date-range-picker")
 class DateRangePickerElement extends WrappedElement {

src/components/device/ha-area-devices-picker.ts

@@ -1,26 +1,15 @@
 import "@material/mwc-button/mwc-button";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
-import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
+import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { stringCompare } from "../../common/string/compare";
-import {
-  AreaRegistryEntry,
-  subscribeAreaRegistry,
-} from "../../data/area_registry";
 import {
   DeviceEntityLookup,
   DeviceRegistryEntry,
-  subscribeDeviceRegistry,
 } from "../../data/device_registry";
-import {
-  EntityRegistryEntry,
-  subscribeEntityRegistry,
-} from "../../data/entity_registry";
-import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-icon-button";
@@ -45,7 +34,7 @@ const rowRenderer: ComboBoxLitRenderer<AreaDevices> = (
 </mwc-list-item>`;
 
 @customElement("ha-area-devices-picker")
-export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
+export class HaAreaDevicesPicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public label?: string;
@@ -82,25 +71,22 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
 
   @state() private _areaPicker = true;
 
-  @state() private _devices?: DeviceRegistryEntry[];
-
-  @state() private _areas?: AreaRegistryEntry[];
-
-  @state() private _entities?: EntityRegistryEntry[];
-
   private _selectedDevices: string[] = [];
 
   private _filteredDevices: DeviceRegistryEntry[] = [];
 
   private _getAreasWithDevices = memoizeOne(
     (
-      devices: DeviceRegistryEntry[],
-      areas: AreaRegistryEntry[],
-      entities: EntityRegistryEntry[],
+      deviceReg: HomeAssistant["devices"],
+      areas: HomeAssistant["areas"],
+      entityReg: HomeAssistant["entities"],
       includeDomains: this["includeDomains"],
       excludeDomains: this["excludeDomains"],
       includeDeviceClasses: this["includeDeviceClasses"]
     ): AreaDevices[] => {
+      const devices = Object.values(deviceReg);
+      const entities = Object.values(entityReg);
+
       if (!devices.length) {
         return [];
       }
@@ -164,11 +150,6 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
 
       this._filteredDevices = inputDevices;
 
-      const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
-      for (const area of areas) {
-        areaLookup[area.area_id] = area;
-      }
-
       const devicesByArea: DevicesByArea = {};
 
       for (const device of inputDevices) {
@@ -177,7 +158,7 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
           if (!(areaId in devicesByArea)) {
             devicesByArea[areaId] = {
               id: areaId,
-              name: areaLookup[areaId].name,
+              name: areas[areaId].name,
               devices: [],
             };
           }
@@ -199,20 +180,6 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
     }
   );
 
-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
-        this._devices = devices;
-      }),
-      subscribeAreaRegistry(this.hass.connection!, (areas) => {
-        this._areas = areas;
-      }),
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        this._entities = entities;
-      }),
-    ];
-  }
-
   protected updated(changedProps: PropertyValues) {
     super.updated(changedProps);
     if (changedProps.has("area") && this.area) {
@@ -231,13 +198,10 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
   }
 
   protected render(): TemplateResult {
-    if (!this._devices || !this._areas || !this._entities) {
-      return html``;
-    }
     const areas = this._getAreasWithDevices(
-      this._devices,
-      this._areas,
-      this._entities,
+      this.hass.devices,
+      this.hass.areas,
+      this.hass.entities,
       this.includeDomains,
       this.excludeDomains,
       this.includeDeviceClasses

src/components/device/ha-device-picker.ts

@@ -1,5 +1,4 @@
 import "@material/mwc-list/mwc-list-item";
-import { UnsubscribeFunc } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { ComboBoxLitRenderer } from "@vaadin/combo-box/lit";
 import { customElement, property, query, state } from "lit/decorators";
@@ -7,21 +6,15 @@ import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { stringCompare } from "../../common/string/compare";
-import {
-  AreaRegistryEntry,
-  subscribeAreaRegistry,
-} from "../../data/area_registry";
+
+
 import {
   computeDeviceName,
   DeviceEntityLookup,
   DeviceRegistryEntry,
-  subscribeDeviceRegistry,
 } from "../../data/device_registry";
-import {
-  EntityRegistryEntry,
-  subscribeEntityRegistry,
-} from "../../data/entity_registry";
-import { SubscribeMixin } from "../../mixins/subscribe-mixin";
+
+
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
 import "../ha-combo-box";
@@ -45,7 +38,7 @@ const rowRenderer: ComboBoxLitRenderer<Device> = (item) => html`<mwc-list-item
 </mwc-list-item>`;
 
 @customElement("ha-device-picker")
-export class HaDevicePicker extends SubscribeMixin(LitElement) {
+export class HaDevicePicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public label?: string;
@@ -54,12 +47,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   @property() public helper?: string;
 
-  @property() public devices?: DeviceRegistryEntry[];
-
-  @property() public areas?: AreaRegistryEntry[];
-
-  @property() public entities?: EntityRegistryEntry[];
-
   /**
    * Show only devices with entities from specific domains.
    * @type {Array}
@@ -106,15 +93,18 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   private _getDevices = memoizeOne(
     (
-      devices: DeviceRegistryEntry[],
-      areas: AreaRegistryEntry[],
-      entities: EntityRegistryEntry[],
+      deviceReg: HomeAssistant["devices"],
+      areas: HomeAssistant["areas"],
+      entityReg: HomeAssistant["entities"],
       includeDomains: this["includeDomains"],
       excludeDomains: this["excludeDomains"],
       includeDeviceClasses: this["includeDeviceClasses"],
       deviceFilter: this["deviceFilter"],
       excludeDevices: this["excludeDevices"]
     ): Device[] => {
+      const devices = Object.values(deviceReg);
+      const entities = Object.values(entityReg);
+
       if (!devices.length) {
         return [
           {
@@ -138,12 +128,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
           deviceEntityLookup[entity.device_id].push(entity);
         }
       }
-
-      const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
-      for (const area of areas) {
-        areaLookup[area.area_id] = area;
-      }
-
       let inputDevices = devices.filter(
         (device) => device.id === this.value || !device.disabled_by
       );
@@ -214,8 +198,8 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
           deviceEntityLookup[device.id]
         ),
         area:
-          device.area_id && areaLookup[device.area_id]
-            ? areaLookup[device.area_id].name
+          device.area_id && device.area_id in areas
+            ? areas[device.area_id].name
             : this.hass.localize("ui.components.device-picker.no_area"),
       }));
       if (!outputDevices.length) {
@@ -246,30 +230,16 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
     await this.comboBox?.focus();
   }
 
-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
-        this.devices = devices;
-      }),
-      subscribeAreaRegistry(this.hass.connection!, (areas) => {
-        this.areas = areas;
-      }),
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        this.entities = entities;
-      }),
-    ];
-  }
-
   protected updated(changedProps: PropertyValues) {
     if (
-      (!this._init && this.devices && this.areas && this.entities) ||
+      !this._init ||
       (this._init && changedProps.has("_opened") && this._opened)
     ) {
       this._init = true;
       (this.comboBox as any).items = this._getDevices(
-        this.devices!,
-        this.areas!,
-        this.entities!,
+        this.hass.devices,
+        this.hass.areas,
+        this.hass.entities,
         this.includeDomains,
         this.excludeDomains,
         this.includeDeviceClasses,

src/components/entity/ha-entities-picker.ts

@@ -1,7 +1,6 @@
 import type { HassEntity } from "home-assistant-js-websocket";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
-import memoizeOne from "memoize-one";
 import { fireEvent } from "../../common/dom/fire_event";
 import { isValidEntityId } from "../../common/entity/valid_entity_id";
 import type { PolymerChangedEvent } from "../../polymer-types";
@@ -96,10 +95,7 @@ class HaEntitiesPickerLight extends LitElement {
               .excludeEntities=${this.excludeEntities}
               .includeDeviceClasses=${this.includeDeviceClasses}
               .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-              .entityFilter=${this._getEntityFilter(
-                this.value,
-                this.entityFilter
-              )}
+              .entityFilter=${this._entityFilter}
               .value=${entityId}
               .label=${this.pickedEntityLabel}
               .disabled=${this.disabled}
@@ -118,7 +114,7 @@ class HaEntitiesPickerLight extends LitElement {
           .excludeEntities=${this.excludeEntities}
           .includeDeviceClasses=${this.includeDeviceClasses}
           .includeUnitOfMeasurement=${this.includeUnitOfMeasurement}
-          .entityFilter=${this._getEntityFilter(this.value, this.entityFilter)}
+          .entityFilter=${this._entityFilter}
           .label=${this.pickEntityLabel}
           .helper=${this.helper}
           .disabled=${this.disabled}
@@ -129,15 +125,11 @@ class HaEntitiesPickerLight extends LitElement {
     `;
   }
 
-  private _getEntityFilter = memoizeOne(
-    (
-        value: string[] | undefined,
-        entityFilter: HaEntityPickerEntityFilterFunc | undefined
-      ): HaEntityPickerEntityFilterFunc =>
-      (stateObj: HassEntity) =>
-        (!value || !value.includes(stateObj.entity_id)) &&
-        (!entityFilter || entityFilter(stateObj))
-  );
+  private _entityFilter: HaEntityPickerEntityFilterFunc = (
+    stateObj: HassEntity
+  ) =>
+    (!this.value || !this.value.includes(stateObj.entity_id)) &&
+    (!this.entityFilter || this.entityFilter(stateObj));
 
   private get _currentEntities() {
     return this.value || [];

src/components/entity/ha-state-label-badge.ts

@@ -22,7 +22,6 @@ import {
   isNumericState,
 } from "../../common/number/format_number";
 import { isUnavailableState, UNAVAILABLE, UNKNOWN } from "../../data/entity";
-import { EntityRegistryEntry } from "../../data/entity_registry";
 import { timerTimeRemaining } from "../../data/timer";
 import { HomeAssistant } from "../../types";
 import "../ha-label-badge";
@@ -35,9 +34,9 @@ const TRUNCATED_DOMAINS = [
   "person",
 ] as const satisfies ReadonlyArray<keyof typeof FIXED_DOMAIN_STATES>;
 
-type TruncatedDomain = (typeof TRUNCATED_DOMAINS)[number];
+type TruncatedDomain = typeof TRUNCATED_DOMAINS[number];
 type TruncatedKey = {
-  [T in TruncatedDomain]: `${T}.${(typeof FIXED_DOMAIN_STATES)[T][number]}`;
+  [T in TruncatedDomain]: `${T}.${typeof FIXED_DOMAIN_STATES[T][number]}`;
 }[TruncatedDomain];
 
 const getTruncatedKey = (domainKey: string, stateKey: string) => {
@@ -104,10 +103,8 @@ export class HaStateLabelBadge extends LitElement {
     // 4. Icon determined via entity state
     // 5. Value string as fallback
     const domain = computeStateDomain(entityState);
-    const entry = this.hass?.entities[entityState.entity_id];
 
-    const showIcon =
-      this.icon || this._computeShowIcon(domain, entityState, entry);
+    const showIcon = this.icon || this._computeShowIcon(domain, entityState);
     const image = this.icon
       ? ""
       : this.image
@@ -115,9 +112,7 @@ export class HaStateLabelBadge extends LitElement {
       : entityState.attributes.entity_picture_local ||
         entityState.attributes.entity_picture;
     const value =
-      !image && !showIcon
-        ? this._computeValue(domain, entityState, entry)
-        : undefined;
+      !image && !showIcon ? this._computeValue(domain, entityState) : undefined;
 
     return html`
       <ha-label-badge
@@ -157,11 +152,7 @@ export class HaStateLabelBadge extends LitElement {
     }
   }
 
-  private _computeValue(
-    domain: string,
-    entityState: HassEntity,
-    entry?: EntityRegistryEntry
-  ) {
+  private _computeValue(domain: string, entityState: HassEntity) {
     switch (domain) {
       case "alarm_control_panel":
       case "binary_sensor":
@@ -174,7 +165,7 @@ export class HaStateLabelBadge extends LitElement {
         return null;
       // @ts-expect-error we don't break and go to default
       case "sensor":
-        if (entry?.platform === "moon") {
+        if (entityState.attributes.device_class === "moon__phase") {
           return null;
         }
       // eslint-disable-next-line: disable=no-fallthrough
@@ -197,11 +188,7 @@ export class HaStateLabelBadge extends LitElement {
     }
   }
 
-  private _computeShowIcon(
-    domain: string,
-    entityState: HassEntity,
-    entry?: EntityRegistryEntry
-  ): boolean {
+  private _computeShowIcon(domain: string, entityState: HassEntity): boolean {
     if (entityState.state === UNAVAILABLE) {
       return false;
     }
@@ -217,7 +204,7 @@ export class HaStateLabelBadge extends LitElement {
       case "timer":
         return true;
       case "sensor":
-        return entry?.platform === "moon";
+        return entityState.attributes.device_class === "moon__phase";
       default:
         return false;
     }
@@ -236,10 +223,6 @@ export class HaStateLabelBadge extends LitElement {
     if (domainStateKey) {
       return this.hass!.localize(`state_badge.${domainStateKey}`);
     }
-    // Person and device tracker state can be zone name
-    if (domain === "person" || domain === "device_tracker") {
-      return entityState.state;
-    }
     if (domain === "timer") {
       return secondsToDuration(_timerTimeRemaining);
     }

src/components/entity/state-badge.ts

@@ -11,12 +11,13 @@ import {
 import { property, state } from "lit/decorators";
 import { ifDefined } from "lit/directives/if-defined";
 import { styleMap } from "lit/directives/style-map";
+import { CLIMATE_HVAC_ACTION_COLORS } from "../../common/entity/color/climate_color";
 import { computeDomain } from "../../common/entity/compute_domain";
 import { computeStateDomain } from "../../common/entity/compute_state_domain";
+import { stateActive } from "../../common/entity/state_active";
 import { stateColorCss } from "../../common/entity/state_color";
 import { iconColorCSS } from "../../common/style/icon_color_css";
 import { cameraUrlWithWidthHeight } from "../../data/camera";
-import { HVAC_ACTION_TO_MODE } from "../../data/climate";
 import type { HomeAssistant } from "../../types";
 import "../ha-state-icon";
 
@@ -111,10 +112,10 @@ export class StateBadge extends LitElement {
       } else if (this.color) {
         // Externally provided overriding color wins over state color
         iconStyle.color = this.color;
-      } else if (this._stateColor) {
+      } else if (this._stateColor && stateActive(stateObj)) {
         const color = stateColorCss(stateObj);
         if (color) {
-          iconStyle.color = color;
+          iconStyle.color = `rgb(${color})`;
         }
         if (stateObj.attributes.rgb_color) {
           iconStyle.color = `rgb(${stateObj.attributes.rgb_color.join(",")})`;
@@ -133,11 +134,8 @@ export class StateBadge extends LitElement {
         }
         if (stateObj.attributes.hvac_action) {
           const hvacAction = stateObj.attributes.hvac_action;
-          if (["heating", "cooling", "drying", "fan"].includes(hvacAction)) {
-            iconStyle.color = stateColorCss(
-              stateObj,
-              HVAC_ACTION_TO_MODE[hvacAction]
-            )!;
+          if (["heating", "cooling", "drying"].includes(hvacAction)) {
+            iconStyle.color = `rgb(${CLIMATE_HVAC_ACTION_COLORS[hvacAction]})`;
           } else {
             delete iconStyle.color;
           }
@@ -172,7 +170,6 @@ export class StateBadge extends LitElement {
           line-height: 40px;
           vertical-align: middle;
           box-sizing: border-box;
-          --state-inactive-color: initial;
         }
         :host(:focus) {
           outline: none;

src/components/ha-area-picker.ts

@@ -126,7 +126,6 @@ export class HaAreaPicker extends LitElement {
             area_id: "no_areas",
             name: this.hass.localize("ui.components.area-picker.no_areas"),
             picture: null,
-            aliases: [],
           },
         ];
       }
@@ -257,7 +256,6 @@ export class HaAreaPicker extends LitElement {
             area_id: "no_areas",
             name: this.hass.localize("ui.components.area-picker.no_match"),
             picture: null,
-            aliases: [],
           },
         ];
       }
@@ -270,7 +268,6 @@ export class HaAreaPicker extends LitElement {
               area_id: "add_new",
               name: this.hass.localize("ui.components.area-picker.add_new"),
               picture: null,
-              aliases: [],
             },
           ];
     }

src/components/ha-areas-picker.ts

@@ -2,13 +2,12 @@ import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
 import type { EntityRegistryEntry } from "../data/entity_registry";
-import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import type { HomeAssistant } from "../types";
 import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
 import "./ha-area-picker";
 
 @customElement("ha-areas-picker")
-export class HaAreasPicker extends SubscribeMixin(LitElement) {
+export class HaAreasPicker extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public label?: string;

src/components/ha-bar-slider.ts

@@ -271,18 +271,13 @@ export class HaBarSlider extends LitElement {
     return css`
       :host {
         display: block;
-        --slider-bar-color: var(--primary-color);
-        --slider-bar-background: var(--disabled-color);
+        --slider-bar-color: rgb(var(--rgb-primary-color));
+        --slider-bar-background: rgb(var(--rgb-disabled-color));
         --slider-bar-background-opacity: 0.2;
         --slider-bar-thickness: 40px;
         --slider-bar-border-radius: 10px;
         height: var(--slider-bar-thickness);
         width: 100%;
-        border-radius: var(--slider-bar-border-radius);
-        outline: none;
-      }
-      :host(:focus-visible) {
-        box-shadow: 0 0 0 2px var(--slider-bar-color);
       }
       :host([vertical]) {
         width: var(--slider-bar-thickness);
@@ -401,7 +396,7 @@ export class HaBarSlider extends LitElement {
       .slider .slider-track-cursor:after {
         display: block;
         content: "";
-        background-color: var(--secondary-text-color);
+        background-color: rgb(var(--rgb-secondary-text-color));
         position: absolute;
         top: 0;
         left: 0;

src/components/ha-bar-switch.ts

@@ -92,8 +92,8 @@ export class HaBarSwitch extends LitElement {
     return css`
       :host {
         display: block;
-        --switch-bar-on-color: var(--primary-color);
-        --switch-bar-off-color: var(--disabled-color);
+        --switch-bar-on-color: rgb(var(--rgb-primary-color));
+        --switch-bar-off-color: rgb(var(--rgb-disabled-color));
         --switch-bar-background-opacity: 0.2;
         --switch-bar-thickness: 40px;
         --switch-bar-border-radius: 12px;
@@ -104,14 +104,6 @@ export class HaBarSwitch extends LitElement {
         box-sizing: border-box;
         user-select: none;
         cursor: pointer;
-        border-radius: var(--switch-bar-border-radius);
-        outline: none;
-      }
-      :host(:focus-visible) {
-        box-shadow: 0 0 0 2px var(--switch-bar-off-color);
-      }
-      :host([checked]:focus-visible) {
-        box-shadow: 0 0 0 2px var(--switch-bar-on-color);
       }
       .switch {
         box-sizing: border-box;

src/components/ha-climate-state.ts

@@ -3,7 +3,6 @@ import { customElement, property } from "lit/decorators";
 import { computeAttributeValueDisplay } from "../common/entity/compute_attribute_display";
 import { computeStateDisplay } from "../common/entity/compute_state_display";
 import { formatNumber } from "../common/number/format_number";
-import { blankBeforePercent } from "../common/translations/blank_before_percent";
 import { ClimateEntity, CLIMATE_PRESET_NONE } from "../data/climate";
 import { isUnavailableState } from "../data/entity";
 import type { HomeAssistant } from "../types";
@@ -48,19 +47,6 @@ class HaClimateState extends LitElement {
     if (!this.hass || !this.stateObj) {
       return undefined;
     }
-    if (
-      this.stateObj.attributes.current_temperature != null &&
-      this.stateObj.attributes.current_humidity != null
-    ) {
-      return `${formatNumber(
-        this.stateObj.attributes.current_temperature,
-        this.hass.locale
-      )} ${this.hass.config.unit_system.temperature}/
-      ${formatNumber(
-        this.stateObj.attributes.current_humidity,
-        this.hass.locale
-      )}${blankBeforePercent(this.hass.locale)}%`;
-    }
 
     if (this.stateObj.attributes.current_temperature != null) {
       return `${formatNumber(
@@ -73,7 +59,7 @@ class HaClimateState extends LitElement {
       return `${formatNumber(
         this.stateObj.attributes.current_humidity,
         this.hass.locale
-      )}${blankBeforePercent(this.hass.locale)}%`;
+      )} %`;
     }
 
     return undefined;

src/components/ha-code-editor.ts

@@ -4,7 +4,6 @@ import type {
   CompletionResult,
   CompletionSource,
 } from "@codemirror/autocomplete";
-import type { Extension } from "@codemirror/state";
 import type { EditorView, KeyBinding, ViewUpdate } from "@codemirror/view";
 import { HassEntities } from "home-assistant-js-websocket";
 import { css, CSSResultGroup, PropertyValues, ReactiveElement } from "lit";
@@ -73,9 +72,9 @@ export class HaCodeEditor extends ReactiveElement {
     if (!this.codemirror || !this._loadedCodeMirror) {
       return false;
     }
-    const className = this._loadedCodeMirror.highlightingFor(
+    const className = this._loadedCodeMirror.HighlightStyle.get(
       this.codemirror.state,
-      [this._loadedCodeMirror.tags.comment]
+      this._loadedCodeMirror.tags.comment
     );
     return !!this.shadowRoot!.querySelector(`span.${className}`);
   }
@@ -137,7 +136,7 @@ export class HaCodeEditor extends ReactiveElement {
 
   private async _load(): Promise<void> {
     this._loadedCodeMirror = await loadCodeMirror();
-    const extensions: Extension[] = [
+    const extensions = [
       this._loadedCodeMirror.lineNumbers(),
       this._loadedCodeMirror.EditorState.allowMultipleSelections.of(true),
       this._loadedCodeMirror.history(),
@@ -153,8 +152,10 @@ export class HaCodeEditor extends ReactiveElement {
         saveKeyBinding,
       ] as KeyBinding[]),
       this._loadedCodeMirror.langCompartment.of(this._mode),
-      this._loadedCodeMirror.haTheme,
-      this._loadedCodeMirror.haSyntaxHighlighting,
+      this._loadedCodeMirror.theme,
+      this._loadedCodeMirror.Prec.fallback(
+        this._loadedCodeMirror.highlightStyle
+      ),
       this._loadedCodeMirror.readonlyCompartment.of(
         this._loadedCodeMirror.EditorView.editable.of(!this.readOnly)
       ),
@@ -226,7 +227,7 @@ export class HaCodeEditor extends ReactiveElement {
     return {
       from: Number(entityWord.from),
       options: states,
-      validFor: /^[a-z_]{3,}\.\w*$/,
+      span: /^[a-z_]{3,}\.\w*$/,
     };
   }
 
@@ -267,7 +268,7 @@ export class HaCodeEditor extends ReactiveElement {
     return {
       from: Number(match.from),
       options: iconItems,
-      validFor: /^mdi:\S*$/,
+      span: /^mdi:\S*$/,
     };
   }
 

src/components/ha-form/ha-form.ts

@@ -43,8 +43,6 @@ export class HaForm extends LitElement implements HaFormElement {
 
   @property() public computeHelper?: (schema: any) => string | undefined;
 
-  @property() public localizeValue?: (key: string) => string;
-
   public focus() {
     const root = this.shadowRoot?.querySelector(".root");
     if (!root) {
@@ -88,9 +86,7 @@ export class HaForm extends LitElement implements HaFormElement {
                   .value=${getValue(this.data, item)}
                   .label=${this._computeLabel(item, this.data)}
                   .disabled=${item.disabled || this.disabled || false}
-                  .placeholder=${item.required ? "" : item.default}
                   .helper=${this._computeHelper(item)}
-                  .localizeValue=${this.localizeValue}
                   .required=${item.required || false}
                   .context=${this._generateContext(item)}
                 ></ha-selector>`

src/components/ha-related-items.ts

@@ -1,4 +1,4 @@
-import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
+import { HassEntity } from "home-assistant-js-websocket";
 import {
   css,
   CSSResultGroup,
@@ -9,23 +9,16 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import {
-  AreaRegistryEntry,
-  subscribeAreaRegistry,
-} from "../data/area_registry";
+import { AreaRegistryEntry } from "../data/area_registry";
 import { ConfigEntry, getConfigEntries } from "../data/config_entries";
-import {
-  DeviceRegistryEntry,
-  subscribeDeviceRegistry,
-} from "../data/device_registry";
+import { DeviceRegistryEntry } from "../data/device_registry";
 import { SceneEntity } from "../data/scene";
 import { findRelated, ItemType, RelatedResult } from "../data/search";
-import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { HomeAssistant } from "../types";
 import "./ha-switch";
 
 @customElement("ha-related-items")
-export class HaRelatedItems extends SubscribeMixin(LitElement) {
+export class HaRelatedItems extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
   @property() public itemType!: ItemType;
@@ -34,23 +27,8 @@ export class HaRelatedItems extends SubscribeMixin(LitElement) {
 
   @state() private _entries?: ConfigEntry[];
 
-  @state() private _devices?: DeviceRegistryEntry[];
-
-  @state() private _areas?: AreaRegistryEntry[];
-
   @state() private _related?: RelatedResult;
 
-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
-        this._devices = devices;
-      }),
-      subscribeAreaRegistry(this.hass.connection!, (areas) => {
-        this._areas = areas;
-      }),
-    ];
-  }
-
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
     getConfigEntries(this.hass).then((configEntries) => {
@@ -104,11 +82,10 @@ export class HaRelatedItems extends SubscribeMixin(LitElement) {
             `;
           })
         : ""}
-      ${this._related.device && this._devices
+      ${this._related.device
         ? this._related.device.map((relatedDeviceId) => {
-            const device: DeviceRegistryEntry | undefined = this._devices!.find(
-              (dev) => dev.id === relatedDeviceId
-            );
+            const device: DeviceRegistryEntry | undefined =
+              this.hass.devices[relatedDeviceId];
             if (!device) {
               return "";
             }
@@ -125,11 +102,10 @@ export class HaRelatedItems extends SubscribeMixin(LitElement) {
             `;
           })
         : ""}
-      ${this._related.area && this._areas
+      ${this._related.area
         ? this._related.area.map((relatedAreaId) => {
-            const area: AreaRegistryEntry | undefined = this._areas!.find(
-              (ar) => ar.area_id === relatedAreaId
-            );
+            const area: AreaRegistryEntry | undefined =
+              this.hass.areas[relatedAreaId];
             if (!area) {
               return "";
             }

src/components/ha-selector/ha-selector-area.ts

@@ -1,13 +1,10 @@
-import { HassEntity, UnsubscribeFunc } from "home-assistant-js-websocket";
+import { HassEntity } from "home-assistant-js-websocket";
 import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import type { DeviceRegistryEntry } from "../../data/device_registry";
 import { getDeviceIntegrationLookup } from "../../data/device_registry";
-import {
-  EntityRegistryEntry,
-  subscribeEntityRegistry,
-} from "../../data/entity_registry";
+import { EntityRegistryEntry } from "../../data/entity_registry";
 import {
   EntitySources,
   fetchEntitySourcesWithCache,
@@ -17,13 +14,12 @@ import {
   filterSelectorDevices,
   filterSelectorEntities,
 } from "../../data/selector";
-import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { HomeAssistant } from "../../types";
 import "../ha-area-picker";
 import "../ha-areas-picker";
 
 @customElement("ha-selector-area")
-export class HaAreaSelector extends SubscribeMixin(LitElement) {
+export class HaAreaSelector extends LitElement {
   @property() public hass!: HomeAssistant;
 
   @property() public selector!: AreaSelector;
@@ -44,12 +40,16 @@ export class HaAreaSelector extends SubscribeMixin(LitElement) {
 
   private _deviceIntegrationLookup = memoizeOne(getDeviceIntegrationLookup);
 
-  public hassSubscribe(): UnsubscribeFunc[] {
-    return [
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
-        this._entities = entities.filter((entity) => entity.device_id !== null);
-      }),
-    ];
+  protected willUpdate(changedProperties: PropertyValues): void {
+    if (
+      changedProperties.has("hass") &&
+      (changedProperties.get("hass") as HomeAssistant | undefined)?.entities !==
+        this.hass.entities
+    ) {
+      this._entities = Object.values(this.hass.entities).filter(
+        (entity) => entity.device_id !== null
+      );
+    }
   }
 
   protected updated(changedProperties: PropertyValues): void {

src/components/ha-selector/ha-selector-number.ts

@@ -39,7 +39,7 @@ export class HaNumberSelector extends LitElement {
               <ha-slider
                 .min=${this.selector.number?.min}
                 .max=${this.selector.number?.max}
-                .value=${this.value ?? ""}
+                .value=${this._value}
                 .step=${this.selector.number?.step ?? 1}
                 .disabled=${this.disabled}
                 .required=${this.required}
@@ -81,11 +81,17 @@ export class HaNumberSelector extends LitElement {
     `;
   }
 
+  private get _value() {
+    return this.value ?? (this.selector.number?.min || 0);
+  }
+
   private _handleInputChange(ev) {
     ev.stopPropagation();
     const value =
       ev.target.value === "" || isNaN(ev.target.value)
-        ? undefined
+        ? this.required
+          ? this.selector.number?.min || 0
+          : undefined
         : Number(ev.target.value);
     if (this.value === value) {
       return;

src/components/ha-selector/ha-selector-object.ts

@@ -1,10 +1,9 @@
-import { html, LitElement, PropertyValues } from "lit";
-import { customElement, property, query } from "lit/decorators";
+import { html, LitElement } from "lit";
+import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../common/dom/fire_event";
 import { HomeAssistant } from "../../types";
 import "../ha-yaml-editor";
 import "../ha-input-helper-text";
-import type { HaYamlEditor } from "../ha-yaml-editor";
 
 @customElement("ha-selector-object")
 export class HaObjectSelector extends LitElement {
@@ -22,10 +21,6 @@ export class HaObjectSelector extends LitElement {
 
   @property({ type: Boolean }) public required = true;
 
-  @query("ha-yaml-editor", true) private _yamlEditor!: HaYamlEditor;
-
-  private _valueChangedFromChild = false;
-
   protected render() {
     return html`<ha-yaml-editor
         .hass=${this.hass}
@@ -41,16 +36,7 @@ export class HaObjectSelector extends LitElement {
         : ""} `;
   }
 
-  protected updated(changedProps: PropertyValues) {
-    super.updated(changedProps);
-    if (changedProps.has("value") && !this._valueChangedFromChild) {
-      this._yamlEditor.setValue(this.value);
-    }
-    this._valueChangedFromChild = false;
-  }
-
   private _handleChange(ev) {
-    this._valueChangedFromChild = true;
     const value = ev.target.value;
     if (!ev.target.isValid) {
       return;

src/components/ha-selector/ha-selector-select.ts

@@ -28,8 +28,6 @@ export class HaSelectSelector extends LitElement {
 
   @property() public helper?: string;
 
-  @property() public localizeValue?: (key: string) => string;
-
   @property({ type: Boolean }) public disabled = false;
 
   @property({ type: Boolean }) public required = true;
@@ -41,21 +39,9 @@ export class HaSelectSelector extends LitElement {
   protected render() {
     const options =
       this.selector.select?.options.map((option) =>
-        typeof option === "object"
-          ? (option as SelectOption)
-          : ({ value: option, label: option } as SelectOption)
+        typeof option === "object" ? option : { value: option, label: option }
       ) || [];
 
-    const translationKey = this.selector.select?.translation_key;
-
-    if (this.localizeValue && translationKey) {
-      options.forEach((option) => {
-        option.label =
-          this.localizeValue!(`${translationKey}.options.${option.value}`) ||
-          option.label;
-      });
-    }
-
     if (!this.selector.select?.custom_value && this._mode === "list") {
       if (!this.selector.select?.multiple) {
         return html`
@@ -178,11 +164,10 @@ export class HaSelectSelector extends LitElement {
       <ha-select
         fixedMenuPosition
         naturalMenuWidth
-        .label=${this.label ?? ""}
-        .value=${this.value ?? ""}
-        .helper=${this.helper ?? ""}
+        .label=${this.label}
+        .value=${this.value}
+        .helper=${this.helper}
         .disabled=${this.disabled}
-        .required=${this.required}
         @closed=${stopPropagation}
         @selected=${this._valueChanged}
       >

src/components/ha-selector/ha-selector-target.ts

@@ -9,7 +9,6 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
-import { ensureArray } from "../../common/array/ensure-array";
 import {
   DeviceRegistryEntry,
   getDeviceIntegrationLookup,
@@ -79,7 +78,7 @@ export class HaTargetSelector extends LitElement {
         ? [this.selector.target?.entity.device_class]
         : undefined}
       .includeDomains=${this.selector.target?.entity?.domain
-        ? ensureArray(this.selector.target.entity.domain as string | string[])
+        ? [this.selector.target?.entity.domain]
         : undefined}
       .disabled=${this.disabled}
     ></ha-target-picker>`;

src/components/ha-selector/ha-selector.ts

@@ -51,8 +51,6 @@ export class HaSelector extends LitElement {
 
   @property() public helper?: string;
 
-  @property() public localizeValue?: (key: string) => string;
-
   @property() public placeholder?: any;
 
   @property({ type: Boolean }) public disabled = false;
@@ -88,7 +86,6 @@ export class HaSelector extends LitElement {
         required: this.required,
         helper: this.helper,
         context: this.context,
-        localizeValue: this.localizeValue,
         id: "selector",
       })}
     `;

src/components/ha-service-control.ts

@@ -151,14 +151,6 @@ export class HaServiceControl extends LitElement {
             updatedDefaultValue = true;
             this._value!.data![field.key] = false;
           }
-          if (
-            field.selector &&
-            field.default !== undefined &&
-            this._value!.data![field.key] === undefined
-          ) {
-            updatedDefaultValue = true;
-            this._value!.data![field.key] = field.default;
-          }
         });
       }
       if (updatedDefaultValue) {

src/components/ha-time-input.ts

@@ -58,32 +58,20 @@ export class HaTimeInput extends LitElement {
     const eventValue = ev.detail.value;
 
     const useAMPM = useAmPm(this.locale);
-    let value;
-
-    if (
-      !isNaN(eventValue.hours) ||
-      !isNaN(eventValue.minutes) ||
-      !isNaN(eventValue.seconds)
-    ) {
-      let hours = eventValue.hours || 0;
-      if (eventValue && useAMPM) {
-        if (eventValue.amPm === "PM" && hours < 12) {
-          hours += 12;
-        }
-        if (eventValue.amPm === "AM" && hours === 12) {
-          hours = 0;
-        }
+    let hours = eventValue.hours || 0;
+    if (eventValue && useAMPM) {
+      if (eventValue.amPm === "PM" && hours < 12) {
+        hours += 12;
+      }
+      if (eventValue.amPm === "AM" && hours === 12) {
+        hours = 0;
       }
-      value = `${hours.toString().padStart(2, "0")}:${
-        eventValue.minutes
-          ? eventValue.minutes.toString().padStart(2, "0")
-          : "00"
-      }:${
-        eventValue.seconds
-          ? eventValue.seconds.toString().padStart(2, "0")
-          : "00"
-      }`;
     }
+    const value = `${hours.toString().padStart(2, "0")}:${
+      eventValue.minutes ? eventValue.minutes.toString().padStart(2, "0") : "00"
+    }:${
+      eventValue.seconds ? eventValue.seconds.toString().padStart(2, "0") : "00"
+    }`;
 
     if (value === this.value) {
       return;

src/components/tile/ha-tile-badge.ts

@@ -21,8 +21,8 @@ export class HaTileBadge extends LitElement {
   static get styles(): CSSResultGroup {
     return css`
       :host {
-        --tile-badge-background-color: var(--primary-color);
-        --tile-badge-icon-color: var(--white-color);
+        --tile-badge-background-color: rgb(var(--rgb-primary-color));
+        --tile-badge-icon-color: rgb(var(--rgb-white-color));
         --mdc-icon-size: 12px;
       }
       .badge {

src/components/tile/ha-tile-button.ts

@@ -82,8 +82,9 @@ export class HaTileButton extends LitElement {
     return css`
       :host {
         --tile-button-icon-color: var(--primary-text-color);
-        --tile-button-background-color: var(--disabled-color);
+        --tile-button-background-color: rgb(var(--rgb-disabled-color));
         --tile-button-background-opacity: 0.2;
+        --mdc-ripple-color: var(--tile-button-background-color);
         width: 40px;
         height: 40px;
         -webkit-tap-highlight-color: transparent;
@@ -106,7 +107,6 @@ export class HaTileButton extends LitElement {
         outline: none;
         overflow: hidden;
         background: none;
-        --mdc-ripple-color: var(--tile-button-background-color);
       }
       .button::before {
         content: "";
@@ -128,7 +128,7 @@ export class HaTileButton extends LitElement {
       }
       .button:disabled {
         cursor: not-allowed;
-        --tile-button-background-color: var(--disabled-color);
+        --tile-button-background-color: rgb(var(--rgb-disabled-color));
         --tile-button-icon-color: var(--disabled-text-color);
         --tile-button-background-opacity: 0.2;
       }

src/components/tile/ha-tile-icon.ts

@@ -22,7 +22,7 @@ export class HaTileIcon extends LitElement {
   static get styles(): CSSResultGroup {
     return css`
       :host {
-        --tile-icon-color: var(--disabled-color);
+        --tile-icon-color: rgb(var(--rgb-disabled-color));
         --mdc-icon-size: 24px;
       }
       .shape::before {

src/components/tile/ha-tile-slider.ts

@@ -47,10 +47,13 @@ export class HaTileSlider extends LitElement {
   static get styles(): CSSResultGroup {
     return css`
       ha-bar-slider {
-        --slider-bar-color: var(--tile-slider-color, var(--primary-color));
+        --slider-bar-color: var(
+          --tile-slider-color,
+          rgb(var(--rgb-primary-color))
+        );
         --slider-bar-background: var(
           --tile-slider-background,
-          var(--disabled-color)
+          rgb(var(--rgb-disabled-color))
         );
         --slider-bar-background-opacity: var(
           --tile-slider-background-opacity,

src/data/area_registry.ts

@@ -10,7 +10,6 @@ export interface AreaRegistryEntry {
   area_id: string;
   name: string;
   picture: string | null;
-  aliases: string[];
 }
 
 export interface AreaEntityLookup {
@@ -24,7 +23,6 @@ export interface AreaDeviceLookup {
 export interface AreaRegistryEntryMutableParams {
   name: string;
   picture?: string | null;
-  aliases?: string[];
 }
 
 export const createAreaRegistryEntry = (

src/data/automation.ts

@@ -8,7 +8,7 @@ import { BlueprintInput } from "./blueprint";
 import { DeviceCondition, DeviceTrigger } from "./device_automation";
 import { Action, MODES } from "./script";
 
-export const AUTOMATION_DEFAULT_MODE: (typeof MODES)[number] = "single";
+export const AUTOMATION_DEFAULT_MODE: typeof MODES[number] = "single";
 export const AUTOMATION_DEFAULT_MAX = 10;
 
 export interface AutomationEntity extends HassEntityBase {
@@ -29,7 +29,7 @@ export interface ManualAutomationConfig {
   trigger: Trigger | Trigger[];
   condition?: Condition | Condition[];
   action: Action | Action[];
-  mode?: (typeof MODES)[number];
+  mode?: typeof MODES[number];
   max?: number;
   max_exceeded?:
     | "silent"

src/data/cached-history.ts

@@ -0,0 +1,200 @@
+import { LocalizeFunc } from "../common/translations/localize";
+import { HomeAssistant } from "../types";
+import {
+  computeHistory,
+  HistoryStates,
+  HistoryResult,
+  LineChartUnit,
+  TimelineEntity,
+  entityIdHistoryNeedsAttributes,
+  fetchRecentWS,
+} from "./history";
+
+export interface CacheConfig {
+  cacheKey: string;
+  hoursToShow: number;
+}
+
+interface CachedResults {
+  prom: Promise<HistoryResult>;
+  startTime: Date;
+  endTime: Date;
+  language: string;
+  data: HistoryResult;
+}
+
+const stateHistoryCache: { [cacheKey: string]: CachedResults } = {};
+
+// Cache type 2 functionality
+function getEmptyCache(
+  language: string,
+  startTime: Date,
+  endTime: Date
+): CachedResults {
+  return {
+    prom: Promise.resolve({ line: [], timeline: [] }),
+    language,
+    startTime,
+    endTime,
+    data: { line: [], timeline: [] },
+  };
+}
+
+export const getRecentWithCache = (
+  hass: HomeAssistant,
+  entityIds: string[],
+  cacheConfig: CacheConfig,
+  localize: LocalizeFunc,
+  language: string
+) => {
+  const cacheKey = cacheConfig.cacheKey;
+  const fullCacheKey = cacheKey + `_${cacheConfig.hoursToShow}`;
+  const endTime = new Date();
+  const startTime = new Date(endTime);
+  startTime.setHours(startTime.getHours() - cacheConfig.hoursToShow);
+  let toFetchStartTime = startTime;
+  let appendingToCache = false;
+
+  let cache = stateHistoryCache[fullCacheKey];
+  if (
+    cache &&
+    toFetchStartTime >= cache.startTime &&
+    toFetchStartTime <= cache.endTime &&
+    cache.language === language
+  ) {
+    toFetchStartTime = cache.endTime;
+    appendingToCache = true;
+    // This pretty much never happens as endTime is usually set to now
+    if (endTime <= cache.endTime) {
+      return cache.prom;
+    }
+  } else {
+    cache = stateHistoryCache[fullCacheKey] = getEmptyCache(
+      language,
+      startTime,
+      endTime
+    );
+  }
+
+  const curCacheProm = cache.prom;
+  const noAttributes = !entityIds.some((entityId) =>
+    entityIdHistoryNeedsAttributes(hass, entityId)
+  );
+
+  const genProm = async () => {
+    let fetchedHistory: HistoryStates;
+
+    try {
+      const results = await Promise.all([
+        curCacheProm,
+        fetchRecentWS(
+          hass,
+          entityIds,
+          toFetchStartTime,
+          endTime,
+          appendingToCache,
+          undefined,
+          true,
+          noAttributes
+        ),
+      ]);
+      fetchedHistory = results[1];
+    } catch (err: any) {
+      delete stateHistoryCache[fullCacheKey];
+      throw err;
+    }
+    const stateHistory = computeHistory(hass, fetchedHistory, localize);
+    if (appendingToCache) {
+      if (stateHistory.line.length) {
+        mergeLine(stateHistory.line, cache.data.line);
+      }
+      if (stateHistory.timeline.length) {
+        mergeTimeline(stateHistory.timeline, cache.data.timeline);
+        // Replace the timeline array to force an update
+        cache.data.timeline = [...cache.data.timeline];
+      }
+      pruneStartTime(startTime, cache.data);
+    } else {
+      cache.data = stateHistory;
+    }
+    return cache.data;
+  };
+
+  cache.prom = genProm();
+  cache.startTime = startTime;
+  cache.endTime = endTime;
+  return cache.prom;
+};
+
+const mergeLine = (
+  historyLines: LineChartUnit[],
+  cacheLines: LineChartUnit[]
+) => {
+  historyLines.forEach((line) => {
+    const unit = line.unit;
+    const oldLine = cacheLines.find((cacheLine) => cacheLine.unit === unit);
+    if (oldLine) {
+      line.data.forEach((entity) => {
+        const oldEntity = oldLine.data.find(
+          (cacheEntity) => entity.entity_id === cacheEntity.entity_id
+        );
+        if (oldEntity) {
+          oldEntity.states = oldEntity.states.concat(entity.states);
+        } else {
+          oldLine.data.push(entity);
+        }
+      });
+      // Replace the cached line data to force an update
+      oldLine.data = [...oldLine.data];
+    } else {
+      cacheLines.push(line);
+    }
+  });
+};
+
+const mergeTimeline = (
+  historyTimelines: TimelineEntity[],
+  cacheTimelines: TimelineEntity[]
+) => {
+  historyTimelines.forEach((timeline) => {
+    const oldTimeline = cacheTimelines.find(
+      (cacheTimeline) => cacheTimeline.entity_id === timeline.entity_id
+    );
+    if (oldTimeline) {
+      oldTimeline.data = oldTimeline.data.concat(timeline.data);
+    } else {
+      cacheTimelines.push(timeline);
+    }
+  });
+};
+
+const pruneArray = (originalStartTime: Date, arr) => {
+  if (arr.length === 0) {
+    return arr;
+  }
+  const changedAfterStartTime = arr.findIndex(
+    (state) => new Date(state.last_changed) > originalStartTime
+  );
+  if (changedAfterStartTime === 0) {
+    // If all changes happened after originalStartTime then we are done.
+    return arr;
+  }
+
+  // If all changes happened at or before originalStartTime. Use last index.
+  const updateIndex =
+    changedAfterStartTime === -1 ? arr.length - 1 : changedAfterStartTime - 1;
+  arr[updateIndex].last_changed = originalStartTime;
+  return arr.slice(updateIndex);
+};
+
+const pruneStartTime = (originalStartTime: Date, cacheData: HistoryResult) => {
+  cacheData.line.forEach((line) => {
+    line.data.forEach((entity) => {
+      entity.states = pruneArray(originalStartTime, entity.states);
+    });
+  });
+
+  cacheData.timeline.forEach((timeline) => {
+    timeline.data = pruneArray(originalStartTime, timeline.data);
+  });
+};

src/data/climate.ts

@@ -72,12 +72,3 @@ const hvacModeOrdering: { [key in HvacMode]: number } = {
 
 export const compareClimateHvacModes = (mode1: HvacMode, mode2: HvacMode) =>
   hvacModeOrdering[mode1] - hvacModeOrdering[mode2];
-
-export const HVAC_ACTION_TO_MODE: Record<HvacAction, HvacMode> = {
-  cooling: "cool",
-  drying: "dry",
-  fan: "fan_only",
-  heating: "heat",
-  idle: "off",
-  off: "off",
-};

src/data/conversation.ts

@@ -54,6 +54,7 @@ interface ConversationResult {
 
 export interface AgentInfo {
   attribution?: { name: string; url: string };
+  onboarding?: { text: string; url: string };
 }
 
 export const processConversationInput = (
@@ -75,11 +76,11 @@ export const getAgentInfo = (hass: HomeAssistant): Promise<AgentInfo> =>
     type: "conversation/agent/info",
   });
 
-export const prepareConversation = (
+export const setConversationOnboarding = (
   hass: HomeAssistant,
-  language?: string
-): Promise<void> =>
+  value: boolean
+): Promise<boolean> =>
   hass.callWS({
-    type: "conversation/prepare",
-    language,
+    type: "conversation/onboarding/set",
+    shown: value,
   });

src/data/energy.ts

@@ -186,8 +186,8 @@ export interface EnergyInfo {
 
 export interface EnergyValidationIssue {
   type: string;
-  affected_entities: [string, unknown][];
-  translation_placeholders: Record<string, string>;
+  identifier: string;
+  value?: unknown;
 }
 
 export interface EnergyPreferencesValidation {
@@ -200,12 +200,10 @@ export const getEnergyInfo = (hass: HomeAssistant) =>
     type: "energy/info",
   });
 
-export const getEnergyPreferenceValidation = async (hass: HomeAssistant) => {
-  await hass.loadBackendTranslation("issues", "energy");
-  return hass.callWS<EnergyPreferencesValidation>({
+export const getEnergyPreferenceValidation = (hass: HomeAssistant) =>
+  hass.callWS<EnergyPreferencesValidation>({
     type: "energy/validate",
   });
-};
 
 export const getEnergyPreferences = (hass: HomeAssistant) =>
   hass.callWS<EnergyPreferences>({
@@ -671,7 +669,7 @@ export const getEnergySolarForecasts = (hass: HomeAssistant) =>
   });
 
 const energyGasUnitClass = ["volume", "energy"] as const;
-export type EnergyGasUnitClass = (typeof energyGasUnitClass)[number];
+export type EnergyGasUnitClass = typeof energyGasUnitClass[number];
 
 export const getEnergyGasUnitClass = (
   prefs: EnergyPreferences,

src/data/entity_registry.ts

@@ -30,7 +30,6 @@ export interface ExtEntityRegistryEntry extends EntityRegistryEntry {
   device_class?: string;
   original_device_class?: string;
   aliases: string[];
-  options: EntityRegistryOptions | null;
 }
 
 export interface UpdateEntityRegistryEntryResult {
@@ -40,7 +39,6 @@ export interface UpdateEntityRegistryEntryResult {
 }
 
 export interface SensorEntityOptions {
-  precision?: number | null;
   unit_of_measurement?: string | null;
 }
 
@@ -56,12 +54,6 @@ export interface WeatherEntityOptions {
   wind_speed_unit?: string | null;
 }
 
-export interface EntityRegistryOptions {
-  number?: NumberEntityOptions;
-  sensor?: SensorEntityOptions;
-  weather?: WeatherEntityOptions;
-}
-
 export interface EntityRegistryEntryUpdateParams {
   name?: string | null;
   icon?: string | null;
@@ -119,15 +111,6 @@ export const getExtendedEntityRegistryEntry = (
     entity_id: entityId,
   });
 
-export const getExtendedEntityRegistryEntries = (
-  hass: HomeAssistant,
-  entityIds: string[]
-): Promise<Record<string, ExtEntityRegistryEntry>> =>
-  hass.callWS({
-    type: "config/entity_registry/get_entries",
-    entity_ids: entityIds,
-  });
-
 export const updateEntityRegistryEntry = (
   hass: HomeAssistant,
   entityId: string,

src/data/history.ts

@@ -17,8 +17,6 @@ const NEED_ATTRIBUTE_DOMAINS = [
   "input_datetime",
   "thermostat",
   "water_heater",
-  "person",
-  "device_tracker",
 ];
 const LINE_ATTRIBUTES_TO_KEEP = [
   "temperature",
@@ -70,7 +68,7 @@ export interface HistoryStates {
   [entityId: string]: EntityHistoryState[];
 }
 
-export interface EntityHistoryState {
+interface EntityHistoryState {
   /** state */
   s: string;
   /** attributes */
@@ -81,12 +79,6 @@ export interface EntityHistoryState {
   lu: number;
 }
 
-export interface HistoryStreamMessage {
-  states: HistoryStates;
-  start_time?: number; // Start time of this historical chunk
-  end_time?: number; // End time of this historical chunk
-}
-
 export const entityIdHistoryNeedsAttributes = (
   hass: HomeAssistant,
   entityId: string
@@ -94,6 +86,73 @@ export const entityIdHistoryNeedsAttributes = (
   !hass.states[entityId] ||
   NEED_ATTRIBUTE_DOMAINS.includes(computeDomain(entityId));
 
+export const fetchRecent = (
+  hass: HomeAssistant,
+  entityId: string,
+  startTime: Date,
+  endTime: Date,
+  skipInitialState = false,
+  significantChangesOnly?: boolean,
+  minimalResponse = true,
+  noAttributes?: boolean
+): Promise<HassEntity[][]> => {
+  let url = "history/period";
+  if (startTime) {
+    url += "/" + startTime.toISOString();
+  }
+  url += "?filter_entity_id=" + entityId;
+  if (endTime) {
+    url += "&end_time=" + endTime.toISOString();
+  }
+  if (skipInitialState) {
+    url += "&skip_initial_state";
+  }
+  if (significantChangesOnly !== undefined) {
+    url += `&significant_changes_only=${Number(significantChangesOnly)}`;
+  }
+  if (minimalResponse) {
+    url += "&minimal_response";
+  }
+  if (noAttributes) {
+    url += "&no_attributes";
+  }
+  return hass.callApi("GET", url);
+};
+
+export const fetchRecentWS = (
+  hass: HomeAssistant,
+  entityIds: string[],
+  startTime: Date,
+  endTime: Date,
+  skipInitialState = false,
+  significantChangesOnly?: boolean,
+  minimalResponse = true,
+  noAttributes?: boolean
+) =>
+  hass.callWS<HistoryStates>({
+    type: "history/history_during_period",
+    start_time: startTime.toISOString(),
+    end_time: endTime.toISOString(),
+    significant_changes_only: significantChangesOnly || false,
+    include_start_time_state: !skipInitialState,
+    minimal_response: minimalResponse,
+    no_attributes: noAttributes || false,
+    entity_ids: entityIds,
+  });
+
+export const fetchDate = (
+  hass: HomeAssistant,
+  startTime: Date,
+  endTime: Date,
+  entityIds: string[]
+): Promise<HassEntity[][]> =>
+  hass.callApi(
+    "GET",
+    `history/period/${startTime.toISOString()}?end_time=${endTime.toISOString()}&minimal_response${
+      entityIds ? `&filter_entity_id=${entityIds.join(",")}` : ``
+    }`
+  );
+
 export const fetchDateWS = (
   hass: HomeAssistant,
   startTime: Date,
@@ -115,142 +174,6 @@ export const fetchDateWS = (
   return hass.callWS<HistoryStates>(params);
 };
 
-export const subscribeHistory = (
-  hass: HomeAssistant,
-  callbackFunction: (message: HistoryStreamMessage) => void,
-  startTime: Date,
-  endTime: Date,
-  entityIds: string[]
-): Promise<() => Promise<void>> => {
-  const params = {
-    type: "history/stream",
-    entity_ids: entityIds,
-    start_time: startTime.toISOString(),
-    end_time: endTime.toISOString(),
-    minimal_response: true,
-    no_attributes: !entityIds.some((entityId) =>
-      entityIdHistoryNeedsAttributes(hass, entityId)
-    ),
-  };
-  return hass.connection.subscribeMessage<HistoryStreamMessage>(
-    (message) => callbackFunction(message),
-    params
-  );
-};
-
-class HistoryStream {
-  hass: HomeAssistant;
-
-  hoursToShow: number;
-
-  combinedHistory: HistoryStates;
-
-  constructor(hass: HomeAssistant, hoursToShow: number) {
-    this.hass = hass;
-    this.hoursToShow = hoursToShow;
-    this.combinedHistory = {};
-  }
-
-  processMessage(streamMessage: HistoryStreamMessage): HistoryStates {
-    if (!this.combinedHistory || !Object.keys(this.combinedHistory).length) {
-      this.combinedHistory = streamMessage.states;
-      return this.combinedHistory;
-    }
-    if (!Object.keys(streamMessage.states).length) {
-      // Empty messages are still sent to
-      // indicate no more historical events
-      return this.combinedHistory;
-    }
-    const purgeBeforePythonTime =
-      (new Date().getTime() - 60 * 60 * this.hoursToShow * 1000) / 1000;
-    const newHistory: HistoryStates = {};
-    for (const entityId of Object.keys(this.combinedHistory)) {
-      newHistory[entityId] = [];
-    }
-    for (const entityId of Object.keys(streamMessage.states)) {
-      newHistory[entityId] = [];
-    }
-    for (const entityId of Object.keys(newHistory)) {
-      if (
-        entityId in this.combinedHistory &&
-        entityId in streamMessage.states
-      ) {
-        const entityCombinedHistory = this.combinedHistory[entityId];
-        const lastEntityCombinedHistory =
-          entityCombinedHistory[entityCombinedHistory.length - 1];
-        newHistory[entityId] = entityCombinedHistory.concat(
-          streamMessage.states[entityId]
-        );
-        if (
-          streamMessage.states[entityId][0].lu < lastEntityCombinedHistory.lu
-        ) {
-          // If the history is out of order we have to sort it.
-          newHistory[entityId] = newHistory[entityId].sort(
-            (a, b) => a.lu - b.lu
-          );
-        }
-      } else if (entityId in this.combinedHistory) {
-        newHistory[entityId] = this.combinedHistory[entityId];
-      } else {
-        newHistory[entityId] = streamMessage.states[entityId];
-      }
-      // Remove old history
-      if (entityId in this.combinedHistory) {
-        const expiredStates = newHistory[entityId].filter(
-          (state) => state.lu < purgeBeforePythonTime
-        );
-        if (!expiredStates.length) {
-          continue;
-        }
-        newHistory[entityId] = newHistory[entityId].filter(
-          (state) => state.lu >= purgeBeforePythonTime
-        );
-        if (
-          newHistory[entityId].length &&
-          newHistory[entityId][0].lu === purgeBeforePythonTime
-        ) {
-          continue;
-        }
-        // Update the first entry to the start time state
-        // as we need to preserve the start time state and
-        // only expire the rest of the history as it ages.
-        const lastExpiredState = expiredStates[expiredStates.length - 1];
-        lastExpiredState.lu = purgeBeforePythonTime;
-        newHistory[entityId].unshift(lastExpiredState);
-      }
-    }
-    this.combinedHistory = newHistory;
-    return this.combinedHistory;
-  }
-}
-
-export const subscribeHistoryStatesTimeWindow = (
-  hass: HomeAssistant,
-  callbackFunction: (data: HistoryStates) => void,
-  hoursToShow: number,
-  entityIds: string[],
-  minimalResponse = true,
-  significantChangesOnly = true
-): Promise<() => Promise<void>> => {
-  const params = {
-    type: "history/stream",
-    entity_ids: entityIds,
-    start_time: new Date(
-      new Date().getTime() - 60 * 60 * hoursToShow * 1000
-    ).toISOString(),
-    minimal_response: minimalResponse,
-    significant_changes_only: significantChangesOnly,
-    no_attributes: !entityIds.some((entityId) =>
-      entityIdHistoryNeedsAttributes(hass, entityId)
-    ),
-  };
-  const stream = new HistoryStream(hass, hoursToShow);
-  return hass.connection.subscribeMessage<HistoryStreamMessage>(
-    (message) => callbackFunction(stream.processMessage(message)),
-    params
-  );
-};
-
 const equalState = (obj1: LineChartState, obj2: LineChartState) =>
   obj1.state === obj2.state &&
   // Only compare attributes if both states have an attributes object.

src/data/humidifier.ts

@@ -7,8 +7,8 @@ import { TranslationDict } from "../types";
 import { UNAVAILABLE_STATES } from "./entity";
 
 type HumidifierState =
-  | (typeof FIXED_DOMAIN_STATES.humidifier)[number]
-  | (typeof UNAVAILABLE_STATES)[number];
+  | typeof FIXED_DOMAIN_STATES.humidifier[number]
+  | typeof UNAVAILABLE_STATES[number];
 type HumidifierMode =
   keyof TranslationDict["state_attributes"]["humidifier"]["mode"];
 

src/data/number.ts

@@ -1,12 +0,0 @@
-import { HomeAssistant } from "../types";
-
-export type NumberDeviceClassUnits = { units: string[] };
-
-export const getNumberDeviceClassConvertibleUnits = (
-  hass: HomeAssistant,
-  deviceClass: string
-): Promise<NumberDeviceClassUnits> =>
-  hass.callWS({
-    type: "number/device_class_convertible_units",
-    device_class: deviceClass,
-  });

src/data/otbr.ts

@@ -1,11 +0,0 @@
-import { HomeAssistant } from "../types";
-
-export interface OTBRInfo {
-  url: string;
-  active_dataset_tlvs: string;
-}
-
-export const getOTBRInfo = (hass: HomeAssistant): Promise<OTBRInfo> =>
-  hass.callWS({
-    type: "otbr/info",
-  });

src/data/recorder.ts

@@ -98,7 +98,7 @@ const statisticTypes = [
   "state",
   "sum",
 ] as const;
-export type StatisticsTypes = (typeof statisticTypes)[number][];
+export type StatisticsTypes = typeof statisticTypes[number][];
 
 export interface StatisticsValidationResults {
   [statisticId: string]: StatisticsValidationResult[];