Update easing animation function

removed a harmful user-select

.devcontainer/Dockerfile

@@ -1,5 +1,4 @@
-# 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/devcontainers/python:1-3.13
-FROM mcr.microsoft.com/devcontainers/python:3.12
 
 ENV \
   DEBIAN_FRONTEND=noninteractive \

.devcontainer/devcontainer.json

@@ -11,6 +11,9 @@
     "DEV_CONTAINER": "1",
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
+  "remoteEnv": {
+    "NODE_OPTIONS": "--max_old_space_size=8192"
+  },
   "customizations": {
     "vscode": {
       "extensions": [

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -7,7 +7,7 @@ body:
       value: |
         Make sure you are running the [latest version of Home Assistant][releases] before reporting an issue.
 
-        If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
+        If you have a feature or enhancement request for the frontend, please [start a discussion][fr] instead of creating an issue.
 
         **Please do not report issues for custom cards.**
 
@@ -74,7 +74,7 @@ body:
         If known, otherwise leave blank.
   - type: input
     attributes:
-      label: In which browser are you experiencing the issue with?
+      label: In which browser are you experiencing the issue?
       placeholder: Google Chrome 88.0.4324.150
       description: >
         Provide the full name and don't forget to add the version!

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: Request a feature for the UI / Dashboards
     url: https://github.com/home-assistant/frontend/discussions/category_choices
-    about: Request an new feature for the Home Assistant frontend.
+    about: Request a new feature for the Home Assistant frontend.
   - name: Report a bug that is NOT related to the UI / Dashboards
     url: https://github.com/home-assistant/core/issues
     about: This is the issue tracker for our frontend. Please report other issues in the backend ("core") repository.

.github/workflows/cast_deployment.yaml

@@ -26,7 +26,7 @@ jobs:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -62,7 +62,7 @@ jobs:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/ci.yaml

@@ -26,20 +26,14 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        id: setup-node
+        uses: actions/setup-node@v4.2.0
-        uses: actions/setup-node@v4.1.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-      - uses: actions/cache@v4.2.0
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: "node_modules"
-          key: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}
       - name: Install dependencies
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
+      - name: Check for duplicate dependencies
+        run: yarn dedupe --check
       - name: Build resources
         run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
       - name: Setup lint cache
@@ -66,19 +60,11 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        id: setup-node
+        uses: actions/setup-node@v4.2.0
-        uses: actions/setup-node@v4.1.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-      - uses: actions/cache@v4.2.0
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: "node_modules"
-          key: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}
       - name: Install dependencies
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
       - name: Build resources
         run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data
@@ -92,26 +78,18 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        id: setup-node
+        uses: actions/setup-node@v4.2.0
-        uses: actions/setup-node@v4.1.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-      - uses: actions/cache@v4.2.0
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: "node_modules"
-          key: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}
       - name: Install dependencies
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
       - name: Build Application
         run: ./node_modules/.bin/gulp build-app
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: frontend-bundle-stats
           path: build/stats/*.json
@@ -124,26 +102,18 @@ jobs:
       - name: Check out files from GitHub
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        id: setup-node
+        uses: actions/setup-node@v4.2.0
-        uses: actions/setup-node@v4.1.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
-      - uses: actions/cache@v4.2.0
-        id: yarn-cache # use this to check for `cache-hit` (`steps.yarn-cache.outputs.cache-hit != 'true'`)
-        with:
-          path: "node_modules"
-          key: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}-${{ hashFiles('yarn.lock') }}
-          restore-keys: ${{ runner.os }}-yarn-${{ hashFiles('.yarnrc.yml') }}-${{ steps.setup-node.outputs.node-version }}
       - name: Install dependencies
-        if: steps.yarn-cache.outputs.cache-hit != 'true'
         run: yarn install --immutable
       - name: Build Application
         run: ./node_modules/.bin/gulp build-hassio
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: supervisor-bundle-stats
           path: build/stats/*.json

.github/workflows/demo_deployment.yaml

@@ -27,7 +27,7 @@ jobs:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -63,7 +63,7 @@ jobs:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_deployment.yaml

@@ -19,7 +19,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_preview.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/nightly.yaml

@@ -6,7 +6,7 @@ on:
     - cron: "0 1 * * *"
 
 env:
-  PYTHON_VERSION: "3.12"
+  PYTHON_VERSION: "3.13"
   NODE_OPTIONS: --max_old_space_size=6144
 
 permissions:
@@ -28,7 +28,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -57,14 +57,14 @@ jobs:
         run: tar -czvf translations.tar.gz translations
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: wheels
           path: dist/home_assistant_frontend*.whl
           if-no-files-found: error
 
       - name: Upload translations
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.6.0
         with:
           name: translations
           path: translations.tar.gz

.github/workflows/release-drafter.yaml

@@ -18,6 +18,6 @@ jobs:
       pull-requests: read
     runs-on: ubuntu-latest
     steps:
-      - uses: release-drafter/release-drafter@v6.0.0
+      - uses: release-drafter/release-drafter@v6.1.0
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/release.yaml

@@ -6,7 +6,7 @@ on:
       - published
 
 env:
-  PYTHON_VERSION: "3.12"
+  PYTHON_VERSION: "3.13"
   NODE_OPTIONS: --max_old_space_size=6144
 
 # Set default workflow permissions
@@ -25,16 +25,16 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
 
-      - name: Verify version
-        uses: home-assistant/actions/helpers/verify-version@master
-
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v5
         with:
           python-version: ${{ env.PYTHON_VERSION }}
 
+      - name: Verify version
+        uses: home-assistant/actions/helpers/verify-version@master
+
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -55,7 +55,7 @@ jobs:
           script/release
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.1
         with:
           files: |
             dist/*.whl
@@ -76,7 +76,7 @@ jobs:
       - name: Build wheels
         uses: home-assistant/wheels@2024.11.0
         with:
-          abi: cp312
+          abi: cp313
           tag: musllinux_1_2
           arch: amd64
           wheels-key: ${{ secrets.WHEELS_KEY }}
@@ -92,7 +92,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -107,7 +107,7 @@ jobs:
       - name: Tar folder
         run: tar -czf landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz -C landing-page/dist .
       - name: Upload release asset
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.1
         with:
           files: landing-page/home_assistant_frontend_landingpage-${{ github.event.release.tag_name }}.tar.gz
 
@@ -121,7 +121,7 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v4.2.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.2.0
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -136,6 +136,6 @@ jobs:
       - name: Tar folder
         run: tar -czf hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz -C hassio/build .
       - name: Upload release asset
-        uses: softprops/action-gh-release@v2.1.0
+        uses: softprops/action-gh-release@v2.2.1
         with:
           files: hassio/home_assistant_frontend_supervisor-${{ github.event.release.tag_name }}.tar.gz

.github/workflows/stale.yml

@@ -10,7 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: 90 days stale policy
-        uses: actions/stale@v9.0.0
+        uses: actions/stale@v9.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 90

.yarnrc.yml

@@ -6,4 +6,4 @@ enableGlobalCache: false
 
 nodeLinker: node-modules
 
-yarnPath: .yarn/releases/yarn-4.5.3.cjs
+yarnPath: .yarn/releases/yarn-4.6.0.cjs

build-scripts/babel-plugins/custom-polyfill-plugin.js

@@ -5,7 +5,7 @@ import paths from "../paths.cjs";
 const POLYFILL_DIR = join(paths.polymer_dir, "src/resources/polyfills");
 
 // List of polyfill keys with supported browser targets for the functionality
-const PolyfillSupport = {
+const polyfillSupport = {
   // Note states and shadowRoot properties should be supported.
   "element-internals": {
     android: 90,
@@ -18,17 +18,6 @@ const PolyfillSupport = {
     safari: 17.4,
     samsung: 15.0,
   },
-  "element-append": {
-    android: 54,
-    chrome: 54,
-    edge: 17,
-    firefox: 49,
-    ios: 10.0,
-    opera: 41,
-    opera_mobile: 41,
-    safari: 10.0,
-    samsung: 6.0,
-  },
   "element-getattributenames": {
     android: 61,
     chrome: 61,
@@ -51,27 +40,18 @@ const PolyfillSupport = {
     safari: 12.0,
     samsung: 10.0,
   },
-  fetch: {
+  // FormatJS polyfill detects fix for https://bugs.chromium.org/p/v8/issues/detail?id=10682,
-    android: 42,
+  // so adjusted to several months after that was marked fixed
-    chrome: 42,
-    edge: 14,
-    firefox: 39,
-    ios: 10.3,
-    opera: 29,
-    opera_mobile: 29,
-    safari: 10.1,
-    samsung: 4.0,
-  },
   "intl-getcanonicallocales": {
-    android: 54,
+    android: 90,
-    chrome: 54,
+    chrome: 90,
-    edge: 16,
+    edge: 90,
     firefox: 48,
     ios: 10.3,
-    opera: 41,
+    opera: 76,
-    opera_mobile: 41,
+    opera_mobile: 64,
     safari: 10.1,
-    samsung: 6.0,
+    samsung: 15.0,
   },
   "intl-locale": {
     android: 74,
@@ -87,17 +67,6 @@ const PolyfillSupport = {
   "intl-other": {
     // Not specified (i.e. always try polyfill) since compatibility depends on supported locales
   },
-  proxy: {
-    android: 49,
-    chrome: 49,
-    edge: 12,
-    firefox: 18,
-    ios: 10.0,
-    opera: 36,
-    opera_mobile: 36,
-    safari: 10.0,
-    samsung: 5.0,
-  },
   "resize-observer": {
     android: 64,
     chrome: 64,
@@ -115,8 +84,6 @@ const PolyfillSupport = {
 // corresponding polyfill key and actual module to import
 const polyfillMap = {
   global: {
-    fetch: { key: "fetch", module: "unfetch/polyfill" },
-    Proxy: { key: "proxy", module: "proxy-polyfill" },
     ResizeObserver: {
       key: "resize-observer",
       module: join(POLYFILL_DIR, "resize-observer.ts"),
@@ -128,7 +95,7 @@ const polyfillMap = {
       module: "element-internals-polyfill",
     },
     ...Object.fromEntries(
-      ["append", "getAttributeNames", "toggleAttribute"].map((prop) => {
+      ["getAttributeNames", "toggleAttribute"].map((prop) => {
         const key = `element-${prop.toLowerCase()}`;
         return [prop, { key, module: join(POLYFILL_DIR, `${key}.ts`) }];
       })
@@ -168,7 +135,7 @@ export default defineProvider(
     const resolvePolyfill = createMetaResolver(polyfillMap);
     return {
       name: "custom-polyfill",
-      polyfills: PolyfillSupport,
+      polyfills: polyfillSupport,
       usageGlobal(meta, utils) {
         const polyfill = resolvePolyfill(meta);
         if (polyfill && shouldInjectPolyfill(polyfill.desc.key)) {

build-scripts/eslint.config.mjs

@@ -9,7 +9,7 @@ export default [
       "import/extensions": "off",
       "import/no-dynamic-require": "off",
       "global-require": "off",
-      "@typescript-eslint/no-var-requires": "off",
+      "@typescript-eslint/no-require-imports": "off",
       "prefer-arrow-callback": "off",
     },
   },

build-scripts/gulp/compress.js

@@ -3,6 +3,7 @@
 import { constants } from "node:zlib";
 import gulp from "gulp";
 import brotli from "gulp-brotli";
+import zopfli from "gulp-zopfli-green";
 import paths from "../paths.cjs";
 
 const filesGlob = "*.{js,json,css,svg,xml}";
@@ -12,17 +13,18 @@ const brotliOptions = {
     [constants.BROTLI_PARAM_QUALITY]: constants.BROTLI_MAX_QUALITY,
   },
 };
+const zopfliOptions = { threshold: 150 };
 
-const compressModern = (rootDir, modernDir) =>
+const compressModern = (rootDir, modernDir, compress) =>
   gulp
     .src([`${modernDir}/**/${filesGlob}`, `${rootDir}/sw-modern.js`], {
       base: rootDir,
       allowEmpty: true,
     })
-    .pipe(brotli(brotliOptions))
+    .pipe(compress === "zopfli" ? zopfli(zopfliOptions) : brotli(brotliOptions))
     .pipe(gulp.dest(rootDir));
 
-const compressOther = (rootDir, modernDir) =>
+const compressOther = (rootDir, modernDir, compress) =>
   gulp
     .src(
       [
@@ -33,21 +35,52 @@ const compressOther = (rootDir, modernDir) =>
       ],
       { base: rootDir, allowEmpty: true }
     )
-    .pipe(brotli(brotliOptions))
+    .pipe(compress === "zopfli" ? zopfli(zopfliOptions) : brotli(brotliOptions))
     .pipe(gulp.dest(rootDir));
 
-const compressAppModern = () =>
+const compressAppModernBrotli = () =>
-  compressModern(paths.app_output_root, paths.app_output_latest);
+  compressModern(paths.app_output_root, paths.app_output_latest, "brotli");
-const compressHassioModern = () =>
+const compressAppModernZopfli = () =>
-  compressModern(paths.hassio_output_root, paths.hassio_output_latest);
+  compressModern(paths.app_output_root, paths.app_output_latest, "zopfli");
 
-const compressAppOther = () =>
+const compressHassioModernBrotli = () =>
-  compressOther(paths.app_output_root, paths.app_output_latest);
+  compressModern(
-const compressHassioOther = () =>
+    paths.hassio_output_root,
-  compressOther(paths.hassio_output_root, paths.hassio_output_latest);
+    paths.hassio_output_latest,
+    "brotli"
+  );
+const compressHassioModernZopfli = () =>
+  compressModern(
+    paths.hassio_output_root,
+    paths.hassio_output_latest,
+    "zopfli"
+  );
 
-gulp.task("compress-app", gulp.parallel(compressAppModern, compressAppOther));
+const compressAppOtherBrotli = () =>
+  compressOther(paths.app_output_root, paths.app_output_latest, "brotli");
+const compressAppOtherZopfli = () =>
+  compressOther(paths.app_output_root, paths.app_output_latest, "zopfli");
+
+const compressHassioOtherBrotli = () =>
+  compressOther(paths.hassio_output_root, paths.hassio_output_latest, "brotli");
+const compressHassioOtherZopfli = () =>
+  compressOther(paths.hassio_output_root, paths.hassio_output_latest, "zopfli");
+
+gulp.task(
+  "compress-app",
+  gulp.parallel(
+    compressAppModernBrotli,
+    compressAppOtherBrotli,
+    compressAppModernZopfli,
+    compressAppOtherZopfli
+  )
+);
 gulp.task(
   "compress-hassio",
-  gulp.parallel(compressHassioModern, compressHassioOther)
+  gulp.parallel(
+    compressHassioModernBrotli,
+    compressHassioOtherBrotli,
+    compressHassioModernZopfli,
+    compressHassioOtherZopfli
+  )
 );

build-scripts/gulp/gather-static.js

@@ -67,12 +67,6 @@ function copyPolyfills(staticDir) {
   );
 }
 
-function copyLoaderJS(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-  copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js"));
-  copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js"));
-}
-
 function copyFonts(staticDir) {
   const staticPath = genStaticPath(staticDir);
   // Local fonts
@@ -140,8 +134,6 @@ gulp.task("copy-static-app", async () => {
   const staticDir = paths.app_output_static;
   // Basic static files
   fs.copySync(polyPath("public"), paths.app_output_root);
-
-  copyLoaderJS(staticDir);
   copyPolyfills(staticDir);
   copyFonts(staticDir);
   copyTranslations(staticDir);
@@ -164,8 +156,6 @@ gulp.task("copy-static-demo", async () => {
   );
   // Copy demo static files
   fs.copySync(path.resolve(paths.demo_dir, "public"), paths.demo_output_root);
-
-  copyLoaderJS(paths.demo_output_static);
   copyPolyfills(paths.demo_output_static);
   copyMapPanel(paths.demo_output_static);
   copyFonts(paths.demo_output_static);
@@ -179,8 +169,6 @@ gulp.task("copy-static-cast", async () => {
   fs.copySync(polyPath("public/static"), paths.cast_output_static);
   // Copy cast static files
   fs.copySync(path.resolve(paths.cast_dir, "public"), paths.cast_output_root);
-
-  copyLoaderJS(paths.cast_output_static);
   copyPolyfills(paths.cast_output_static);
   copyMapPanel(paths.cast_output_static);
   copyFonts(paths.cast_output_static);

build-scripts/gulp/index.mjs

@@ -0,0 +1,17 @@
+import "./app.js";
+import "./cast.js";
+import "./clean.js";
+import "./compress.js";
+import "./demo.js";
+import "./download-translations.js";
+import "./entry-html.js";
+import "./fetch-nightly-translations.js";
+import "./gallery.js";
+import "./gather-static.js";
+import "./gen-icons-json.js";
+import "./hassio.js";
+import "./landing-page.js";
+import "./locale-data.js";
+import "./rspack.js";
+import "./service-worker.js";
+import "./translations.js";

cast/README.md

@@ -25,7 +25,7 @@ Home Assistant Cast is made up of two separate applications:
 
 ### Setting dev variables
 
-Open `src/cast/dev_const.ts` and change `CAST_DEV_APP_ID` to the ID of the app you just created. And set the `CAST_DEV_HASS_URL` to the url of you development machine.
+Open `src/cast/dev_const.ts` and change `CAST_DEV_APP_ID` to the ID of the app you just created. And set the `CAST_DEV_HASS_URL` to the url of your development machine.
 
 ### Changing configuration
 

cast/src/html/receiver.html.template

@@ -7,7 +7,6 @@
   <%= renderTemplate("../../../src/html/_style_base.html.template") %>
   <style>
     body {
-      background-color: white;
       font-size: initial;
     }
   </style>

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

@@ -3,7 +3,7 @@ import "@material/mwc-list/mwc-list";
 import type { ActionDetail } from "@material/mwc-list/mwc-list";
 import { mdiCast, mdiCastConnected, mdiViewDashboard } from "@mdi/js";
 import type { Auth, Connection } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import type { CastManager } from "../../../../src/cast/cast_manager";
@@ -203,74 +203,72 @@ class HcCast extends LitElement {
       }
       this.connection.close();
       location.reload();
-    } catch (err: any) {
+    } catch (_err: any) {
       alert("Unable to log out!");
     }
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    .center-item {
-      .center-item {
+      display: flex;
-        display: flex;
+      justify-content: space-around;
-        justify-content: space-around;
+    }
-      }
 
-      .action-item {
+    .action-item {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        justify-content: space-between;
+      justify-content: space-between;
-      }
+    }
 
-      .question {
+    .question {
-        position: relative;
+      position: relative;
-        padding: 8px 16px;
+      padding: 8px 16px;
-      }
+    }
 
-      .question:before {
+    .question:before {
-        border-radius: 4px;
+      border-radius: 4px;
-        position: absolute;
+      position: absolute;
-        top: 0;
+      top: 0;
-        right: 0;
+      right: 0;
-        bottom: 0;
+      bottom: 0;
-        left: 0;
+      left: 0;
-        pointer-events: none;
+      pointer-events: none;
-        content: "";
+      content: "";
-        background-color: var(--primary-color);
+      background-color: var(--primary-color);
-        opacity: 0.12;
+      opacity: 0.12;
-        will-change: opacity;
+      will-change: opacity;
-      }
+    }
 
-      .connection,
+    .connection,
-      .connection a {
+    .connection a {
-        color: var(--secondary-text-color);
+      color: var(--secondary-text-color);
-      }
+    }
 
-      mwc-button ha-svg-icon {
+    mwc-button ha-svg-icon {
-        margin-right: 8px;
+      margin-right: 8px;
-        margin-inline-end: 8px;
+      margin-inline-end: 8px;
-        margin-inline-start: initial;
+      margin-inline-start: initial;
-        height: 18px;
+      height: 18px;
-      }
+    }
 
-      ha-list-item ha-icon,
+    ha-list-item ha-icon,
-      ha-list-item ha-svg-icon {
+    ha-list-item ha-svg-icon {
-        padding: 12px;
+      padding: 12px;
-        color: var(--secondary-text-color);
+      color: var(--secondary-text-color);
-      }
+    }
 
-      :host([hide-icons]) ha-icon {
+    :host([hide-icons]) ha-icon {
-        display: none;
+      display: none;
-      }
+    }
 
-      .spacer {
+    .spacer {
-        flex: 1;
+      flex: 1;
-      }
+    }
 
-      .card-content a {
+    .card-content a {
-        color: var(--primary-color);
+      color: var(--primary-color);
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

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

@@ -13,7 +13,7 @@ import {
   ERR_INVALID_HTTPS_TO_HTTP,
   getAuth,
 } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
 import type { CastManager } from "../../../../src/cast/cast_manager";
@@ -215,7 +215,7 @@ export class HcConnect extends LitElement {
     let url: URL;
     try {
       url = new URL(value);
-    } catch (err: any) {
+    } catch (_err: any) {
       this.error = "Invalid URL";
       return;
     }
@@ -252,7 +252,7 @@ export class HcConnect extends LitElement {
       this.loading = false;
       return;
     } finally {
-      // Clear url if we have a auth callback in url.
+      // Clear url if we have an auth callback in url.
       if (location.search.includes("auth_callback=1")) {
         history.replaceState(null, "", location.pathname);
       }
@@ -288,41 +288,39 @@ export class HcConnect extends LitElement {
     try {
       saveTokens(null);
       location.reload();
-    } catch (err: any) {
+    } catch (_err: any) {
       alert("Unable to log out!");
     }
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    .card-content a {
-      .card-content a {
+      color: var(--primary-color);
-        color: var(--primary-color);
+    }
-      }
+    .card-actions a {
-      .card-actions a {
+      text-decoration: none;
-        text-decoration: none;
+    }
-      }
+    .error {
-      .error {
+      color: red;
-        color: red;
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
 
-      .error a {
+    .error a {
-        color: darkred;
+      color: darkred;
-      }
+    }
 
-      mwc-button ha-svg-icon {
+    mwc-button ha-svg-icon {
-        margin-left: 8px;
+      margin-left: 8px;
-      }
+    }
 
-      .spacer {
+    .spacer {
-        flex: 1;
+      flex: 1;
-      }
+    }
 
-      ha-textfield {
+    ha-textfield {
-        width: 100%;
+      width: 100%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

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

@@ -1,6 +1,6 @@
 import type { Auth, Connection, HassUser } from "home-assistant-js-websocket";
 import { getUser } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
@@ -63,96 +63,94 @@ class HcLayout extends LitElement {
     }
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
+      display: flex;
+      min-height: 100%;
+      align-items: center;
+      justify-content: center;
+      flex-direction: column;
+    }
+
+    ha-card {
+      display: flex;
+      width: 100%;
+      max-width: 500px;
+    }
+
+    .layout {
+      display: flex;
+      flex-direction: column;
+    }
+
+    .card-header {
+      color: var(--ha-card-header-color, var(--primary-text-color));
+      font-family: var(--ha-card-header-font-family, inherit);
+      font-size: var(--ha-card-header-font-size, 24px);
+      letter-spacing: -0.012em;
+      line-height: 32px;
+      padding: 24px 16px 16px;
+      display: block;
+      margin: 0;
+    }
+
+    .hero {
+      border-radius: 4px 4px 0 0;
+    }
+    .subtitle {
+      font-size: 14px;
+      color: var(--secondary-text-color);
+      line-height: initial;
+    }
+    .subtitle a {
+      color: var(--secondary-text-color);
+    }
+
+    :host ::slotted(.card-content:not(:first-child)),
+    slot:not(:first-child)::slotted(.card-content) {
+      padding-top: 0px;
+      margin-top: -8px;
+    }
+
+    :host ::slotted(.section-header) {
+      font-weight: 500;
+      padding: 4px 16px;
+      text-transform: uppercase;
+    }
+
+    :host ::slotted(.card-content) {
+      padding: 16px;
+      flex: 1;
+    }
+
+    :host ::slotted(.card-actions) {
+      border-top: 1px solid #e8e8e8;
+      padding: 5px 16px;
+      display: flex;
+    }
+
+    img {
+      width: 100%;
+    }
+
+    .footer {
+      text-align: center;
+      font-size: 12px;
+      padding: 8px 0 24px;
+      color: var(--secondary-text-color);
+    }
+    .footer a {
+      color: var(--secondary-text-color);
+    }
+
+    @media all and (max-width: 500px) {
       :host {
-        display: flex;
+        justify-content: flex-start;
-        min-height: 100%;
+        min-height: 90%;
-        align-items: center;
+        margin-bottom: 30px;
-        justify-content: center;
-        flex-direction: column;
       }
-
+    }
-      ha-card {
+  `;
-        display: flex;
-        width: 100%;
-        max-width: 500px;
-      }
-
-      .layout {
-        display: flex;
-        flex-direction: column;
-      }
-
-      .card-header {
-        color: var(--ha-card-header-color, var(--primary-text-color));
-        font-family: var(--ha-card-header-font-family, inherit);
-        font-size: var(--ha-card-header-font-size, 24px);
-        letter-spacing: -0.012em;
-        line-height: 32px;
-        padding: 24px 16px 16px;
-        display: block;
-        margin: 0;
-      }
-
-      .hero {
-        border-radius: 4px 4px 0 0;
-      }
-      .subtitle {
-        font-size: 14px;
-        color: var(--secondary-text-color);
-        line-height: initial;
-      }
-      .subtitle a {
-        color: var(--secondary-text-color);
-      }
-
-      :host ::slotted(.card-content:not(:first-child)),
-      slot:not(:first-child)::slotted(.card-content) {
-        padding-top: 0px;
-        margin-top: -8px;
-      }
-
-      :host ::slotted(.section-header) {
-        font-weight: 500;
-        padding: 4px 16px;
-        text-transform: uppercase;
-      }
-
-      :host ::slotted(.card-content) {
-        padding: 16px;
-        flex: 1;
-      }
-
-      :host ::slotted(.card-actions) {
-        border-top: 1px solid #e8e8e8;
-        padding: 5px 16px;
-        display: flex;
-      }
-
-      img {
-        width: 100%;
-      }
-
-      .footer {
-        text-align: center;
-        font-size: 12px;
-        padding: 8px 0 24px;
-        color: var(--secondary-text-color);
-      }
-      .footer a {
-        color: var(--secondary-text-color);
-      }
-
-      @media all and (max-width: 500px) {
-        :host {
-          justify-content: flex-start;
-          min-height: 90%;
-          margin-bottom: 30px;
-        }
-      }
-    `;
-  }
 }
 
 declare global {

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

@@ -1,4 +1,4 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { HomeAssistant } from "../../../../src/types";
@@ -24,31 +24,29 @@ class HcLaunchScreen extends LitElement {
     `;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      display: block;
-        display: block;
+      height: 100vh;
-        height: 100vh;
+      background-color: #f2f4f9;
-        background-color: #f2f4f9;
+      font-size: 24px;
-        font-size: 24px;
+    }
-      }
+    .container {
-      .container {
+      display: flex;
-        display: flex;
+      flex-direction: column;
-        flex-direction: column;
+      text-align: center;
-        text-align: center;
+      align-items: center;
-        align-items: center;
+      height: 100%;
-        height: 100%;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
+    img {
-      img {
+      max-width: 80%;
-        max-width: 80%;
+      object-fit: cover;
-        object-fit: cover;
+    }
-      }
+    .status {
-      .status {
+      color: #1d2126;
-        color: #1d2126;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

cast/src/receiver/layout/hc-lovelace.ts

@@ -1,10 +1,4 @@
-import {
+import { css, html, LitElement, type TemplateResult } from "lit";
-  css,
-  type CSSResultGroup,
-  html,
-  LitElement,
-  type TemplateResult,
-} from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import type { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
@@ -14,6 +8,7 @@ import "../../../../src/panels/lovelace/views/hui-view";
 import "../../../../src/panels/lovelace/views/hui-view-container";
 import type { HomeAssistant } from "../../../../src/types";
 import "./hc-launch-screen";
+import "../../../../src/panels/lovelace/views/hui-view-background";
 
 (window as any).loadCardHelpers = () =>
   import("../../../../src/panels/lovelace/custom-card-helpers");
@@ -57,11 +52,9 @@ class HcLovelace extends LitElement {
     const background = viewConfig.background || this.lovelaceConfig.background;
 
     return html`
-      <hui-view-container
+      <hui-view-container .hass=${this.hass} .theme=${viewConfig.theme}>
-        .hass=${this.hass}
+        <hui-view-background .hass=${this.hass} .background=${background}>
-        .background=${background}
+        </hui-view-background>
-        .theme=${viewConfig.theme}
-      >
         <hui-view
           .hass=${this.hass}
           .lovelace=${lovelace}
@@ -118,20 +111,18 @@ class HcLovelace extends LitElement {
     return undefined;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    hui-view-container {
-      hui-view-container {
+      display: flex;
-        display: flex;
+      position: relative;
-        position: relative;
+      min-height: 100vh;
-        min-height: 100vh;
+      box-sizing: border-box;
-        box-sizing: border-box;
+    }
-      }
+    hui-view-container > * {
-      hui-view {
+      flex: 1 1 100%;
-        flex: 1 1 100%;
+      max-width: 100%;
-        max-width: 100%;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 export interface CastViewChanged {

demo/src/configs/demo-configs.ts

@@ -3,7 +3,7 @@ import type { Lovelace } from "../../../src/panels/lovelace/types";
 import { energyEntities } from "../stubs/entities";
 import type { DemoConfig } from "./types";
 
-export const demoConfigs: Array<() => Promise<DemoConfig>> = [
+export const demoConfigs: (() => Promise<DemoConfig>)[] = [
   () => import("./sections").then((mod) => mod.demoSections),
   () => import("./arsaboo").then((mod) => mod.demoArsaboo),
   () => import("./teachingbirds").then((mod) => mod.demoTeachingbirds),

demo/src/custom-cards/cast-demo-row.ts

@@ -1,5 +1,4 @@
 import { mdiTelevision } from "@mdi/js";
-import type { CSSResultGroup } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
 import type { CastManager } from "../../../src/cast/cast_manager";
@@ -67,37 +66,35 @@ class CastDemoRow extends LitElement implements LovelaceRow {
     this.style.display = this._castManager ? "" : "none";
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+    }
-      }
+    ha-svg-icon {
-      ha-svg-icon {
+      padding: 8px;
-        padding: 8px;
+      color: var(--paper-item-icon-color);
-        color: var(--paper-item-icon-color);
+    }
-      }
+    .flex {
-      .flex {
+      flex: 1;
-        flex: 1;
+      overflow: hidden;
-        overflow: hidden;
+      margin-left: 16px;
-        margin-left: 16px;
+      display: flex;
-        display: flex;
+      justify-content: space-between;
-        justify-content: space-between;
+      align-items: center;
-        align-items: center;
+    }
-      }
+    .name {
-      .name {
+      white-space: nowrap;
-        white-space: nowrap;
+      overflow: hidden;
-        overflow: hidden;
+      text-overflow: ellipsis;
-        text-overflow: ellipsis;
+    }
-      }
+    google-cast-launcher {
-      google-cast-launcher {
+      cursor: pointer;
-        cursor: pointer;
+      display: inline-block;
-        display: inline-block;
+      height: 24px;
-        height: 24px;
+      width: 24px;
-        width: 24px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

demo/src/custom-cards/ha-demo-card.ts

@@ -32,6 +32,7 @@ export class HADemoCard extends LitElement implements LovelaceCard {
     return this._hidden ? 0 : 2;
   }
 
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   public setConfig(_config: LovelaceCardConfig) {}
 
   protected render() {

demo/src/ha-demo.ts

@@ -65,6 +65,7 @@ export class HaDemo extends HomeAssistantAppEl {
     mockEntityRegistry(hass, [
       {
         config_entry_id: "co2signal",
+        config_subentry_id: null,
         device_id: "co2signal",
         area_id: null,
         disabled_by: null,
@@ -85,6 +86,7 @@ export class HaDemo extends HomeAssistantAppEl {
       },
       {
         config_entry_id: "co2signal",
+        config_subentry_id: null,
         device_id: "co2signal",
         area_id: null,
         disabled_by: null,

demo/src/stubs/config_entries.ts

@@ -11,6 +11,7 @@ export const mockConfigEntries = (hass: MockHomeAssistant) => {
     supports_remove_device: false,
     supports_unload: true,
     supports_reconfigure: true,
+    supported_subentry_types: {},
     pref_disable_new_entities: false,
     pref_disable_polling: false,
     disabled_by: null,

demo/src/stubs/history.ts

@@ -131,6 +131,7 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
         });
       }, 1);
 
+      // eslint-disable-next-line @typescript-eslint/no-empty-function
       return () => {};
     }
   );

demo/src/stubs/lovelace.ts

@@ -43,7 +43,7 @@ customElements.whenDefined("hui-root").then(() => {
       const index = (ev as CustomEvent).detail.index;
       try {
         await setDemoConfig(this.hass, this.lovelace!, index);
-      } catch (err: any) {
+      } catch (_err: any) {
         setDemoConfig(this.hass, this.lovelace!, selectedDemoConfigIndex);
         alert("Failed to switch config :-(");
       }

demo/src/stubs/persistent_notification.ts

@@ -15,6 +15,7 @@ export const mockPersistentNotification = (hass: MockHomeAssistant) => {
         },
       },
     } as PersistentNotificationMessage);
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
     return () => {};
   });
 };

demo/src/stubs/recorder.ts

@@ -15,7 +15,7 @@ import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 const generateMeanStatistics = (
   start: Date,
   end: Date,
-  // eslint-disable-next-line @typescript-eslint/default-param-last
+  // eslint-disable-next-line default-param-last
   period: "5minute" | "hour" | "day" | "month" = "hour",
   initValue: number,
   maxDiff: number
@@ -52,7 +52,7 @@ const generateMeanStatistics = (
 const generateSumStatistics = (
   start: Date,
   end: Date,
-  // eslint-disable-next-line @typescript-eslint/default-param-last
+  // eslint-disable-next-line default-param-last
   period: "5minute" | "hour" | "day" | "month" = "hour",
   initValue: number,
   maxDiff: number
@@ -89,7 +89,7 @@ const generateSumStatistics = (
 const generateCurvedStatistics = (
   start: Date,
   end: Date,
-  // eslint-disable-next-line @typescript-eslint/default-param-last
+  // eslint-disable-next-line default-param-last
   _period: "5minute" | "hour" | "day" | "month" = "hour",
   initValue: number,
   maxDiff: number,

demo/src/stubs/template.ts

@@ -11,6 +11,7 @@ export const mockTemplate = (hass: MockHomeAssistant) => {
       result: msg.template,
       listeners: { all: false, domains: [], entities: [], time: false },
     });
+    // eslint-disable-next-line @typescript-eslint/no-empty-function
     return () => {};
   });
 };

demo/src/stubs/todo.ts

@@ -22,5 +22,6 @@ export const mockTodo = (hass: MockHomeAssistant) => {
       },
     ] as TodoItem[],
   }));
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
   hass.mockWS("todo/item/subscribe", (_msg, _hass) => () => {});
 };

eslint.config.mjs

@@ -18,8 +18,9 @@ const compat = new FlatCompat({
 export default [
   ...compat.extends(
     "airbnb-base",
-    "airbnb-typescript/base",
     "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/strict",
+    "plugin:@typescript-eslint/stylistic",
     "plugin:wc/recommended",
     "plugin:lit/all",
     "plugin:lit-a11y/recommended",
@@ -50,8 +51,6 @@ export default [
         ecmaFeatures: {
           modules: true,
         },
-
-        project: "./tsconfig.json",
       },
     },
 
@@ -148,15 +147,15 @@ export default [
         },
       ],
 
-      "@typescript-eslint/no-unused-vars": "off",
+      "@typescript-eslint/no-unused-vars": [
-
-      "unused-imports/no-unused-vars": [
         "error",
         {
-          vars: "all",
+          args: "all",
-          varsIgnorePattern: "^_",
-          args: "after-used",
           argsIgnorePattern: "^_",
+          caughtErrors: "all",
+          caughtErrorsIgnorePattern: "^_",
+          destructuredArrayIgnorePattern: "^_",
+          varsIgnorePattern: "^_",
           ignoreRestSiblings: true,
         },
       ],
@@ -174,6 +173,16 @@ export default [
       "lit-a11y/role-has-required-aria-attrs": "error",
       "@typescript-eslint/consistent-type-imports": "error",
       "@typescript-eslint/no-import-type-side-effects": "error",
+      camelcase: "off",
+      "@typescript-eslint/no-dynamic-delete": "off",
+      "@typescript-eslint/no-empty-object-type": [
+        "error",
+        {
+          allowInterfaces: "always",
+          allowObjectTypes: "always",
+        },
+      ],
+      "no-use-before-define": "off",
     },
   },
 ];

gallery/src/pages/Text/remove-delete-add-create.markdown

@@ -42,7 +42,7 @@ In most cases, Create can be paired with Delete, and Add can be paired with Remo
 
 ## Add
 
-An already-exisiting item.
+An already-existing item.
 
 For example:
 

gallery/src/pages/automation/describe-action.ts

@@ -177,26 +177,24 @@ export class DemoAutomationDescribeAction extends LitElement {
     this._action = ev.detail.isValid ? ev.detail.value : undefined;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .action {
-      .action {
+      padding: 16px;
-        padding: 16px;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    span {
-      span {
+      margin-right: 16px;
-        margin-right: 16px;
+    }
-      }
+    ha-yaml-editor {
-      ha-yaml-editor {
+      width: 50%;
-        width: 50%;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/automation/describe-condition.ts

@@ -98,26 +98,24 @@ export class DemoAutomationDescribeCondition extends LitElement {
     this._condition = ev.detail.isValid ? ev.detail.value : undefined;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .condition {
-      .condition {
+      padding: 16px;
-        padding: 16px;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    span {
-      span {
+      margin-right: 16px;
-        margin-right: 16px;
+    }
-      }
+    ha-yaml-editor {
-      ha-yaml-editor {
+      width: 50%;
-        width: 50%;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/automation/describe-trigger.ts

@@ -121,26 +121,24 @@ export class DemoAutomationDescribeTrigger extends LitElement {
     this._trigger = ev.detail.isValid ? ev.detail.value : undefined;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .trigger {
-      .trigger {
+      padding: 16px;
-        padding: 16px;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    span {
-      span {
+      margin-right: 16px;
-        margin-right: 16px;
+    }
-      }
+    ha-yaml-editor {
-      ha-yaml-editor {
+      width: 50%;
-        width: 50%;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/automation/trace-timeline.ts

@@ -58,22 +58,20 @@ export class DemoAutomationTraceTimeline extends LitElement {
     hass.updateTranslations("config", "en");
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px;
-        margin: 24px;
+    }
-      }
+    .card-content {
-      .card-content {
+      display: flex;
-        display: flex;
+    }
-      }
+    button {
-      button {
+      position: absolute;
-        position: absolute;
+      top: 0;
-        top: 0;
+      right: 0;
-        right: 0;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/automation/trace.ts

@@ -68,28 +68,26 @@ export class DemoAutomationTrace extends LitElement {
     this._selected = { ...this._selected, [sampleIdx]: ev.detail.path };
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px;
-        margin: 24px;
+    }
-      }
+    .card-content {
-      .card-content {
+      display: flex;
-        display: flex;
+    }
-      }
+    .card-content > * {
-      .card-content > * {
+      margin-right: 16px;
-        margin-right: 16px;
+    }
-      }
+    .card-content > *:last-child {
-      .card-content > *:last-child {
+      margin-right: 0;
-        margin-right: 0;
+    }
-      }
+    button {
-      button {
+      position: absolute;
-        position: absolute;
+      top: 0;
-        top: 0;
+      right: 0;
-        right: 0;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-alert.markdown

@@ -19,7 +19,7 @@ The alert offers four severity levels that set a distinctive icon and color.
 </ha-alert>
 
 <ha-alert alert-type="warning">
-  This is an warning alert — check it out!
+  This is a warning alert — check it out!
 </ha-alert>
 
 <ha-alert alert-type="info">
@@ -27,7 +27,7 @@ The alert offers four severity levels that set a distinctive icon and color.
 </ha-alert>
 
 <ha-alert alert-type="success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 
 **Note:** This component is by <a href="https://mui.com/components/alert/" rel="noopener noreferrer" target="_blank">MUI</a> and is not documented in the <a href="https://material.io" rel="noopener noreferrer" target="_blank">Material Design guidelines</a>.
@@ -95,7 +95,7 @@ Actions must have a tab index of 0 so that they can be reached by keyboard-only
 </ha-alert>
 
 <ha-alert alert-type="warning">
-  This is an warning alert — check it out!
+  This is a warning alert — check it out!
 </ha-alert>
 
 <ha-alert alert-type="info">
@@ -103,7 +103,7 @@ Actions must have a tab index of 0 so that they can be reached by keyboard-only
 </ha-alert>
 
 <ha-alert alert-type="success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 
 ```html
@@ -122,37 +122,37 @@ Actions must have a tab index of 0 so that they can be reached by keyboard-only
 The `title ` option should not be used without a description.
 
 <ha-alert alert-type="success" title="Success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 
 ```html
 <ha-alert alert-type="success" title="Success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 ```
 
 **Dismissable**
 
 <ha-alert alert-type="success" dismissable>
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 
 ```html
 <ha-alert alert-type="success" dismissable>
-  This is an success alert — check it out!
+  This is a success alert — check it out!
 </ha-alert>
 ```
 
 **Slotted action**
 
 <ha-alert alert-type="success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
   <mwc-button slot="action" label="Undo"></mwc-button>
 </ha-alert>
 
 ```html
 <ha-alert alert-type="success">
-  This is an success alert — check it out!
+  This is a success alert — check it out!
   <mwc-button slot="action" label="Undo"></mwc-button>
 </ha-alert>
 ```

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

@@ -177,46 +177,44 @@ export class DemoHaAlert extends LitElement {
     );
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    .dark,
-      .dark,
+    .light {
-      .light {
+      display: block;
-        display: block;
+      background-color: var(--primary-background-color);
-        background-color: var(--primary-background-color);
+      padding: 0 50px;
-        padding: 0 50px;
+    }
-      }
+    ha-card {
-      ha-card {
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    ha-alert {
-      ha-alert {
+      display: block;
-        display: block;
+      margin: 24px 0;
-        margin: 24px 0;
+    }
-      }
+    .condition {
-      .condition {
+      padding: 16px;
-        padding: 16px;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    .image {
-      .image {
+      display: inline-flex;
-        display: inline-flex;
+      height: 100%;
-        height: 100%;
+      align-items: center;
-        align-items: center;
+    }
-      }
+    img {
-      img {
+      max-height: 24px;
-        max-height: 24px;
+      width: 24px;
-        width: 24px;
+    }
-      }
+    mwc-button {
-      mwc-button {
+      --mdc-theme-primary: var(--primary-text-color);
-        --mdc-theme-primary: var(--primary-text-color);
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -63,20 +63,18 @@ export class DemoHaBar extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .warning {
-      .warning {
+      --ha-bar-primary-color: var(--warning-color);
-        --ha-bar-primary-color: var(--warning-color);
+    }
-      }
+    .error {
-      .error {
+      --ha-bar-primary-color: var(--error-color);
-        --ha-bar-primary-color: var(--error-color);
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -103,19 +103,17 @@ export class DemoHaChips extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .card-content {
-      .card-content {
+      display: flex;
-        display: flex;
+      flex-direction: column;
-        flex-direction: column;
+      align-items: flex-start;
-        align-items: flex-start;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-circular-progress.ts

@@ -48,14 +48,12 @@ export class DemoHaCircularProgress extends LitElement {
       ></ha-card>`;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-button.ts

@@ -14,12 +14,12 @@ import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-svg-icon";
 import "../../../../src/components/ha-control-button-group";
 
-type Button = {
+interface Button {
   label: string;
   icon?: string;
   class?: string;
   disabled?: boolean;
-};
+}
 
 const buttons: Button[] = [
   {
@@ -35,10 +35,10 @@ const buttons: Button[] = [
   },
 ];
 
-type ButtonGroup = {
+interface ButtonGroup {
   vertical?: boolean;
   class?: string;
-};
+}
 
 const buttonGroups: ButtonGroup[] = [
   {},
@@ -137,53 +137,51 @@ export class DemoHaBarButton extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      --control-button-icon-color: var(--primary-color);
-        --control-button-icon-color: var(--primary-color);
+      --control-button-background-color: var(--primary-color);
-        --control-button-background-color: var(--primary-color);
+      --control-button-background-opacity: 0.2;
-        --control-button-background-opacity: 0.2;
+      --control-button-border-radius: 18px;
-        --control-button-border-radius: 18px;
+      height: 100px;
-        height: 100px;
+      width: 100px;
-        width: 100px;
+    }
-      }
+    .custom-group {
-      .custom-group {
+      --control-button-group-thickness: 100px;
-        --control-button-group-thickness: 100px;
+      --control-button-group-border-radius: 36px;
-        --control-button-group-border-radius: 36px;
+      --control-button-group-spacing: 20px;
-        --control-button-group-spacing: 20px;
+    }
-      }
+    .custom-group ha-control-button {
-      .custom-group ha-control-button {
+      --control-button-border-radius: 18px;
-        --control-button-border-radius: 18px;
+      --mdc-icon-size: 32px;
-        --mdc-icon-size: 32px;
+    }
-      }
+    .vertical-buttons {
-      .vertical-buttons {
+      height: 300px;
-        height: 300px;
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    p.title {
-      p.title {
+      margin-bottom: 12px;
-        margin-bottom: 12px;
+    }
-      }
+    .vertical-switches > *:not(:last-child) {
-      .vertical-switches > *:not(:last-child) {
+      margin-right: 4px;
-        margin-right: 4px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-circular-slider.ts

@@ -133,39 +133,37 @@ export class DemoHaCircularSlider extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    p.title {
-      p.title {
+      margin-bottom: 12px;
-        margin-bottom: 12px;
+    }
-      }
+    ha-control-circular-slider {
-      ha-control-circular-slider {
+      --control-circular-slider-color: #ff9800;
-        --control-circular-slider-color: #ff9800;
+    }
-      }
+    ha-control-circular-slider[inverted] {
-      ha-control-circular-slider[inverted] {
+      --control-circular-slider-color: #2196f3;
-        --control-circular-slider-color: #2196f3;
+    }
-      }
+    ha-control-circular-slider[dual] {
-      ha-control-circular-slider[dual] {
+      --control-circular-slider-high-color: #2196f3;
-        --control-circular-slider-high-color: #2196f3;
+      --control-circular-slider-low-color: #ff9800;
-        --control-circular-slider-low-color: #ff9800;
+    }
-      }
+    .field {
-      .field {
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      align-items: center;
-        align-items: center;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-number-buttons.ts

@@ -73,32 +73,30 @@ export class DemoHarControlNumberButtons extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      color: #2196f3;
-        color: #2196f3;
+      --control-number-buttons-color: #2196f3;
-        --control-number-buttons-color: #2196f3;
+      --control-number-buttons-background-color: #2196f3;
-        --control-number-buttons-background-color: #2196f3;
+      --control-number-buttons-background-opacity: 0.1;
-        --control-number-buttons-background-opacity: 0.1;
+      --control-number-buttons-thickness: 100px;
-        --control-number-buttons-thickness: 100px;
+      --control-number-buttons-border-radius: 36px;
-        --control-number-buttons-border-radius: 36px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-select-menu.ts

@@ -8,19 +8,19 @@ import "../../../../src/components/ha-control-select-menu";
 import "../../../../src/components/ha-list-item";
 import "../../../../src/components/ha-svg-icon";
 
-type SelectMenuOptions = {
+interface SelectMenuOptions {
   label: string;
   value: string;
   icon?: string;
-};
+}
 
-type SelectMenu = {
+interface SelectMenu {
   label: string;
   icon: string;
   class?: string;
   disabled?: boolean;
   options: SelectMenuOptions[];
-};
+}
 
 const selects: SelectMenu[] = [
   {
@@ -112,32 +112,30 @@ export class DemoHaControlSelectMenu extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      --control-button-icon-color: var(--primary-color);
-        --control-button-icon-color: var(--primary-color);
+      --control-button-background-color: var(--primary-color);
-        --control-button-background-color: var(--primary-color);
+      --control-button-background-opacity: 0.2;
-        --control-button-background-opacity: 0.2;
+      --control-button-border-radius: 18px;
-        --control-button-border-radius: 18px;
+      height: 100px;
-        height: 100px;
+      width: 100px;
-        width: 100px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-select.ts

@@ -168,42 +168,40 @@ export class DemoHaControlSelect extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      --mdc-icon-size: 24px;
-        --mdc-icon-size: 24px;
+      --control-select-color: var(--state-fan-active-color);
-        --control-select-color: var(--state-fan-active-color);
+      --control-select-thickness: 130px;
-        --control-select-thickness: 130px;
+      --control-select-border-radius: 36px;
-        --control-select-border-radius: 36px;
+    }
-      }
+    .vertical-selects {
-      .vertical-selects {
+      height: 300px;
-        height: 300px;
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    p.title {
-      p.title {
+      margin-bottom: 12px;
-        margin-bottom: 12px;
+    }
-      }
+    .vertical-selects > *:not(:last-child) {
-      .vertical-selects > *:not(:last-child) {
+      margin-right: 4px;
-        margin-right: 4px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-control-slider.ts

@@ -131,43 +131,41 @@ export class DemoHaBarSlider extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      --control-slider-color: #ffcf4c;
-        --control-slider-color: #ffcf4c;
+      --control-slider-background: #ffcf4c;
-        --control-slider-background: #ffcf4c;
+      --control-slider-background-opacity: 0.2;
-        --control-slider-background-opacity: 0.2;
+      --control-slider-thickness: 130px;
-        --control-slider-thickness: 130px;
+      --control-slider-border-radius: 36px;
-        --control-slider-border-radius: 36px;
+    }
-      }
+    .vertical-sliders {
-      .vertical-sliders {
+      height: 300px;
-        height: 300px;
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    p.title {
-      p.title {
+      margin-bottom: 12px;
-        margin-bottom: 12px;
+    }
-      }
+    .vertical-sliders > *:not(:last-child) {
-      .vertical-sliders > *:not(:last-child) {
+      margin-right: 4px;
-        margin-right: 4px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -99,44 +99,42 @@ export class DemoHaControlSwitch extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-top: 0;
-        margin-top: 0;
+      margin-bottom: 8px;
-        margin-bottom: 8px;
+    }
-      }
+    p {
-      p {
+      margin: 0;
-        margin: 0;
+    }
-      }
+    label {
-      label {
+      font-weight: 600;
-        font-weight: 600;
+    }
-      }
+    .custom {
-      .custom {
+      --control-switch-on-color: var(--green-color);
-        --control-switch-on-color: var(--green-color);
+      --control-switch-off-color: var(--red-color);
-        --control-switch-off-color: var(--red-color);
+      --control-switch-thickness: 130px;
-        --control-switch-thickness: 130px;
+      --control-switch-border-radius: 36px;
-        --control-switch-border-radius: 36px;
+      --control-switch-padding: 6px;
-        --control-switch-padding: 6px;
+      --mdc-icon-size: 24px;
-        --mdc-icon-size: 24px;
+    }
-      }
+    .vertical-switches {
-      .vertical-switches {
+      height: 300px;
-        height: 300px;
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    p.title {
-      p.title {
+      margin-bottom: 12px;
-        margin-bottom: 12px;
+    }
-      }
+    .vertical-switches > *:not(:last-child) {
-      .vertical-switches > *:not(:last-child) {
+      margin-right: 4px;
-        margin-right: 4px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-expansion-panel.ts

@@ -143,13 +143,11 @@ export class DemoHaExpansionPanel extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-expansion-panel {
-      ha-expansion-panel {
+      margin: -16px;
-        margin: -16px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -20,7 +20,7 @@ export class DemoHaFaded extends LitElement {
           <ha-faded><span>${LONG_TEXT}</span></ha-faded>
           <h3>No text</h3>
           <ha-faded><span></span></ha-faded>
-          <h3>Smal text</h3>
+          <h3>Small text</h3>
           <ha-faded><span>${SMALL_TEXT}</span></ha-faded>
           <h3>Long text in markdown</h3>
           <ha-faded>
@@ -61,14 +61,12 @@ export class DemoHaFaded extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -48,6 +48,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "bedroom",
     configuration_url: null,
     config_entries: ["config_entry_1"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -71,6 +72,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "backyard",
     configuration_url: null,
     config_entries: ["config_entry_2"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -94,6 +96,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: null,
     configuration_url: null,
     config_entries: ["config_entry_3"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -124,6 +127,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },
@@ -135,6 +140,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },
@@ -146,6 +153,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },

gallery/src/pages/components/ha-hs-color-picker.ts

@@ -76,7 +76,7 @@ export class DemoHaHsColorPicker extends LitElement {
             @change=${this._saturationChanged}
           >
           </ha-slider>
-          <p>Color Brighness : ${this.brightness}</p>
+          <p>Color Brightness : ${this.brightness}</p>
           <ha-slider
             labeled
             step="1"
@@ -91,27 +91,25 @@ export class DemoHaHsColorPicker extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    .card-content {
-      .card-content {
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      flex-direction: column;
-        flex-direction: column;
+    }
-      }
+    ha-hs-color-picker {
-      ha-hs-color-picker {
+      width: 400px;
-        width: 400px;
+    }
-      }
+    .value {
-      .value {
+      font-size: 22px;
-        font-size: 22px;
+      font-weight: bold;
-        font-weight: bold;
+      margin: 0 0 12px 0;
-        margin: 0 0 12px 0;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/components/ha-label-badge.ts

@@ -95,25 +95,23 @@ export class DemoHaLabelBadge extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+    pre {
-      pre {
+      margin-left: 16px;
-        margin-left: 16px;
+      background-color: var(--markdown-code-background-color);
-        background-color: var(--markdown-code-background-color);
+      padding: 8px;
-        padding: 8px;
+    }
-      }
+    .badge {
-      .badge {
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      margin-bottom: 16px;
-        margin-bottom: 16px;
+      align-items: center;
-        align-items: center;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -47,6 +47,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "bedroom",
     configuration_url: null,
     config_entries: ["config_entry_1"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -70,6 +71,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: "backyard",
     configuration_url: null,
     config_entries: ["config_entry_2"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -93,6 +95,7 @@ const DEVICES: DeviceRegistryEntry[] = [
     area_id: null,
     configuration_url: null,
     config_entries: ["config_entry_3"],
+    config_entries_subentries: {},
     connections: [],
     disabled_by: null,
     entry_type: null,
@@ -123,6 +126,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },
@@ -134,6 +139,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },
@@ -145,6 +152,8 @@ const AREAS: AreaRegistryEntry[] = [
     picture: null,
     aliases: [],
     labels: [],
+    temperature_entity_id: null,
+    humidity_entity_id: null,
     created_at: 0,
     modified_at: 0,
   },

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

@@ -48,27 +48,25 @@ export class DemoHaTip extends LitElement {
     );
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      display: flex;
-        display: flex;
+      flex-direction: row;
-        flex-direction: row;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    .dark,
-      .dark,
+    .light {
-      .light {
+      display: block;
-        display: block;
+      background-color: var(--primary-background-color);
-        background-color: var(--primary-background-color);
+      padding: 0 50px;
-        padding: 0 50px;
+    }
-      }
+    ha-tip {
-      ha-tip {
+      margin-bottom: 14px;
-        margin-bottom: 14px;
+    }
-      }
+    ha-card {
-      ha-card {
+      margin: 24px auto;
-        margin: 24px auto;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date-time-numeric.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeDateTimeNumeric extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 900px;
-        max-width: 900px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date-time-seconds.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeDateTimeSeconds extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 900px;
-        max-width: 900px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date-time-short-year.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeDateTimeShortYear extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 900px;
-        max-width: 900px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date-time-short.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeDateTimeShort extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 900px;
-        max-width: 900px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date-time.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeDateTime extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 900px;
-        max-width: 900px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/date.ts

@@ -90,28 +90,26 @@ export class DemoDateTimeDate extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/time-seconds.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeTimeSeconds extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/time-weekday.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeTimeWeekday extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gallery/src/pages/date-time/time.ts

@@ -100,32 +100,30 @@ export class DemoDateTimeTime extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-control-select {
-      ha-control-select {
+      max-width: 800px;
-        max-width: 800px;
+      margin: 12px auto;
-        margin: 12px auto;
+    }
-      }
+    .header {
-      .header {
+      font-weight: bold;
-        font-weight: bold;
+    }
-      }
+    .center {
-      .center {
+      text-align: center;
-        text-align: center;
+    }
-      }
+    .container {
-      .container {
+      max-width: 600px;
-        max-width: 600px;
+      margin: 12px auto;
-        margin: 12px auto;
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+      justify-content: space-evenly;
-        justify-content: space-evenly;
+    }
-      }
 
-      .container > div {
+    .container > div {
-        flex-grow: 1;
+      flex-grow: 1;
-        width: 20%;
+      width: 20%;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

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

@@ -321,13 +321,13 @@ function createEntity(
   };
 }
 
-type EntityRowData = {
+interface EntityRowData {
   stateObj: HassEntity;
   entity_id: string;
   state: string;
   device_class?: string;
   domain: string;
-};
+}
 
 function createRowData(stateObj: HassEntity): EntityRowData {
   return {
@@ -429,17 +429,15 @@ export class DemoEntityState extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    .color {
-      .color {
+      display: block;
-        display: block;
+      height: 20px;
-        height: 20px;
+      width: 20px;
-        width: 20px;
+      border-radius: 10px;
-        border-radius: 10px;
+      background-color: rgb(--color);
-        background-color: rgb(--color);
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/misc/ha-markdown.ts

@@ -76,14 +76,12 @@ export class DemoMiscMarkdown extends LitElement {
     `;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    ha-card {
-      ha-card {
+      margin: 12px;
-        margin: 12px;
+      padding: 12px;
-        padding: 12px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

gallery/src/pages/misc/integration-card.ts

@@ -32,6 +32,8 @@ const createConfigEntry = (
   supports_remove_device: false,
   supports_unload: true,
   supports_reconfigure: true,
+  supported_subentry_types: {},
+  num_subentries: 0,
   disabled_by: null,
   pref_disable_new_entities: false,
   pref_disable_polling: false,
@@ -135,12 +137,12 @@ const configFlows: DataEntryFlowProgressExtended[] = [
   },
 ];
 
-const configEntries: Array<{
+const configEntries: {
   items: ConfigEntryExtended[];
   is_custom?: boolean;
   disabled?: boolean;
   highlight?: string;
-}> = [
+}[] = [
   { items: [loadedEntry] },
   { items: [configPanelEntry] },
   { items: [optionsFlowEntry] },
@@ -188,6 +190,7 @@ const createEntityRegistryEntries = (
 ): EntityRegistryEntry[] => [
   {
     config_entry_id: item.entry_id,
+    config_subentry_id: null,
     device_id: "mock-device-id",
     area_id: null,
     disabled_by: null,
@@ -214,6 +217,7 @@ const createDeviceRegistryEntries = (
   {
     entry_type: null,
     config_entries: [item.entry_id],
+    config_entries_subentries: {},
     connections: [],
     manufacturer: "ESPHome",
     model: "Mock Device",
@@ -349,26 +353,24 @@ export class DemoIntegrationCard extends LitElement {
     this.isCloud = !this.isCloud;
   }
 
-  static get styles() {
+  static styles = css`
-    return css`
+    .container {
-      .container {
+      display: grid;
-        display: grid;
+      grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
-        grid-template-columns: repeat(auto-fill, minmax(300px, 1fr));
+      grid-gap: 8px 8px;
-        grid-gap: 8px 8px;
+      padding: 8px 16px 16px;
-        padding: 8px 16px 16px;
+      margin-bottom: 16px;
-        margin-bottom: 16px;
+    }
-      }
 
-      .container > * {
+    .container > * {
-        max-width: 500px;
+      max-width: 500px;
-      }
+    }
 
-      ha-formfield {
+    ha-formfield {
-        margin: 8px 0;
+      margin: 8px 0;
-        display: block;
+      display: block;
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

gulpfile.js

@@ -1,16 +1,4 @@
-import { globIterate } from "glob";
 import { availableParallelism } from "node:os";
+import "./build-scripts/gulp/index.mjs";
 
 process.env.UV_THREADPOOL_SIZE = availableParallelism();
-
-const gulpImports = [];
-
-for await (const gulpModule of globIterate("build-scripts/gulp/*.?(c|m)js", {
-  dotRelative: true,
-})) {
-  gulpImports.push(import(gulpModule));
-}
-
-// Since all tasks are currently registered with gulp.task(), this is enough
-// If any are converted to named exports, need to loop and aggregate exports here
-await Promise.all(gulpImports);

hassio/src/addon-store/hassio-addon-store.ts

@@ -1,7 +1,7 @@
 import type { ActionDetail } from "@material/mwc-list/mwc-list-foundation";
 import "@material/mwc-list/mwc-list-item";
 import { mdiDotsVertical } from "@mdi/js";
-import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
+import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -211,35 +211,33 @@ export class HassioAddonStore extends LitElement {
     this._filter = e.detail.value;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    hassio-addon-repository {
-      hassio-addon-repository {
+      margin-top: 24px;
-        margin-top: 24px;
+    }
-      }
+    .search {
-      .search {
+      position: sticky;
-        position: sticky;
+      top: 0;
-        top: 0;
+      z-index: 2;
-        z-index: 2;
+    }
-      }
+    search-input {
-      search-input {
+      display: block;
-        display: block;
+      --mdc-text-field-fill-color: var(--sidebar-background-color);
-        --mdc-text-field-fill-color: var(--sidebar-background-color);
+      --mdc-text-field-idle-line-color: var(--divider-color);
-        --mdc-text-field-idle-line-color: var(--divider-color);
+    }
-      }
+    .advanced {
-      .advanced {
+      padding: 12px;
-        padding: 12px;
+      display: flex;
-        display: flex;
+      flex-wrap: wrap;
-        flex-wrap: wrap;
+      color: var(--primary-text-color);
-        color: var(--primary-text-color);
+    }
-      }
+    .advanced a {
-      .advanced a {
+      margin-left: 0.5em;
-        margin-left: 0.5em;
+      margin-inline-start: 0.5em;
-        margin-inline-start: 0.5em;
+      margin-inline-end: initial;
-        margin-inline-end: initial;
+      color: var(--primary-color);
-        color: var(--primary-color);
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

hassio/src/addon-view/config/hassio-addon-config.ts

@@ -299,7 +299,7 @@ class HassioAddonConfig extends LitElement {
     if (this.addon.schema && this._canShowSchema && !this._yamlMode) {
       this._valid = true;
       this._configHasChanged = true;
-      this._options! = ev.detail.value;
+      this._options = ev.detail.value;
     } else {
       this._configHasChanged = true;
       this._valid = ev.detail.isValid;

hassio/src/addon-view/config/hassio-addon-network.ts

@@ -151,7 +151,7 @@ class HassioAddonNetwork extends LitElement {
 
   private async _configChanged(ev: CustomEvent): Promise<void> {
     this._configHasChanged = true;
-    this._config! = ev.detail.value;
+    this._config = ev.detail.value;
   }
 
   private async _resetTapped(ev: CustomEvent): Promise<void> {

hassio/src/components/hassio-card-content.ts

@@ -1,5 +1,5 @@
 import { mdiHelpCircle } from "@mdi/js";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../src/components/ha-svg-icon";
@@ -64,86 +64,84 @@ class HassioCardContent extends LitElement {
     `;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      direction: ltr;
-        direction: ltr;
+    }
-      }
 
-      ha-svg-icon {
+    ha-svg-icon {
-        margin-right: 24px;
+      margin-right: 24px;
-        margin-left: 8px;
+      margin-left: 8px;
-        margin-top: 12px;
+      margin-top: 12px;
-        float: left;
+      float: left;
-        color: var(--secondary-text-color);
+      color: var(--secondary-text-color);
-      }
+    }
-      ha-svg-icon.update {
+    ha-svg-icon.update {
-        color: var(--warning-color);
+      color: var(--warning-color);
-      }
+    }
-      ha-svg-icon.running,
+    ha-svg-icon.running,
-      ha-svg-icon.installed {
+    ha-svg-icon.installed {
-        color: var(--success-color);
+      color: var(--success-color);
-      }
+    }
-      ha-svg-icon.hassupdate,
+    ha-svg-icon.hassupdate,
-      ha-svg-icon.backup {
+    ha-svg-icon.backup {
-        color: var(--paper-item-icon-color);
+      color: var(--paper-item-icon-color);
-      }
+    }
-      ha-svg-icon.not_available {
+    ha-svg-icon.not_available {
-        color: var(--error-color);
+      color: var(--error-color);
-      }
+    }
-      .title {
+    .title {
-        color: var(--primary-text-color);
+      color: var(--primary-text-color);
-        white-space: nowrap;
+      white-space: nowrap;
-        text-overflow: ellipsis;
+      text-overflow: ellipsis;
-        overflow: hidden;
+      overflow: hidden;
-      }
+    }
-      .addition {
+    .addition {
-        color: var(--secondary-text-color);
+      color: var(--secondary-text-color);
-        overflow: hidden;
+      overflow: hidden;
-        position: relative;
+      position: relative;
-        height: 2.4em;
+      height: 2.4em;
-        line-height: 1.2em;
+      line-height: 1.2em;
-      }
+    }
-      .icon_image img {
+    .icon_image img {
-        max-height: 40px;
+      max-height: 40px;
-        max-width: 40px;
+      max-width: 40px;
-        margin-top: 4px;
+      margin-top: 4px;
-        margin-right: 16px;
+      margin-right: 16px;
-        float: left;
+      float: left;
-      }
+    }
-      .icon_image.stopped,
+    .icon_image.stopped,
-      .icon_image.not_available {
+    .icon_image.not_available {
-        filter: grayscale(1);
+      filter: grayscale(1);
-      }
+    }
-      .dot {
+    .dot {
-        position: absolute;
+      position: absolute;
-        background-color: var(--warning-color);
+      background-color: var(--warning-color);
-        width: 12px;
+      width: 12px;
-        height: 12px;
+      height: 12px;
-        top: 8px;
+      top: 8px;
-        right: 8px;
+      right: 8px;
-        border-radius: 50%;
+      border-radius: 50%;
-      }
+    }
-      .topbar {
+    .topbar {
-        position: absolute;
+      position: absolute;
-        width: 100%;
+      width: 100%;
-        height: 2px;
+      height: 2px;
-        top: 0;
+      top: 0;
-        left: 0;
+      left: 0;
-        border-top-left-radius: 2px;
+      border-top-left-radius: 2px;
-        border-top-right-radius: 2px;
+      border-top-right-radius: 2px;
-      }
+    }
-      .topbar.installed {
+    .topbar.installed {
-        background-color: var(--primary-color);
+      background-color: var(--primary-color);
-      }
+    }
-      .topbar.update {
+    .topbar.update {
-        background-color: var(--accent-color);
+      background-color: var(--accent-color);
-      }
+    }
-      .topbar.unavailable {
+    .topbar.unavailable {
-        background-color: var(--error-color);
+      background-color: var(--error-color);
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

hassio/src/components/hassio-filter-addons.ts

@@ -1,8 +1,6 @@
 import type { IFuseOptions } from "fuse.js";
 import Fuse from "fuse.js";
-import { stripDiacritics } from "../../../src/common/string/strip-diacritics";
 import type { StoreAddon } from "../../../src/data/supervisor/store";
-import { getStripDiacriticsFn } from "../../../src/util/fuse";
 
 export function filterAndSort(addons: StoreAddon[], filter: string) {
   const options: IFuseOptions<StoreAddon> = {
@@ -10,8 +8,8 @@ export function filterAndSort(addons: StoreAddon[], filter: string) {
     isCaseSensitive: false,
     minMatchCharLength: Math.min(filter.length, 2),
     threshold: 0.2,
-    getFn: getStripDiacriticsFn,
+    ignoreDiacritics: true,
   };
   const fuse = new Fuse(addons, options);
-  return fuse.search(stripDiacritics(filter)).map((result) => result.item);
+  return fuse.search(filter).map((result) => result.item);
 }

hassio/src/components/hassio-upload-backup.ts

@@ -1,7 +1,7 @@
 import { mdiFolderUpload } from "@mdi/js";
 import type { TemplateResult } from "lit";
 import { html, LitElement } from "lit";
-import { customElement, state } from "lit/decorators";
+import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/ha-circular-progress";
 import "../../../src/components/ha-file-upload";
@@ -10,10 +10,12 @@ import { uploadBackup } from "../../../src/data/hassio/backup";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
 import { showAlertDialog } from "../../../src/dialogs/generic/show-dialog-box";
 import type { HomeAssistant } from "../../../src/types";
+import type { LocalizeFunc } from "../../../src/common/translations/localize";
 
 declare global {
   interface HASSDomEvents {
-    "backup-uploaded": { backup: HassioBackup };
+    "hassio-backup-uploaded": { backup: HassioBackup };
+    "backup-cleared": undefined;
   }
 }
 
@@ -21,6 +23,8 @@ declare global {
 export class HassioUploadBackup extends LitElement {
   public hass?: HomeAssistant;
 
+  @property({ attribute: false }) public localize?: LocalizeFunc;
+
   @state() public value: string | null = null;
 
   @state() private _uploading = false;
@@ -32,13 +36,26 @@ export class HassioUploadBackup extends LitElement {
         .uploading=${this._uploading}
         .icon=${mdiFolderUpload}
         accept="application/x-tar"
-        label="Upload backup"
+        .label=${this.localize?.(
-        supports="Supports .TAR files"
+          "ui.panel.page-onboarding.restore.upload_backup"
+        ) || "Upload backup"}
+        .supports=${this.localize?.(
+          "ui.panel.page-onboarding.restore.upload_supports"
+        ) || "Supports .TAR files"}
+        .secondary=${this.localize?.(
+          "ui.panel.page-onboarding.restore.upload_drop"
+        ) || "Or drop your file here"}
         @file-picked=${this._uploadFile}
+        @files-cleared=${this._clear}
       ></ha-file-upload>
     `;
   }
 
+  private _clear() {
+    this.value = null;
+    fireEvent(this, "backup-cleared");
+  }
+
   private async _uploadFile(ev) {
     const file = ev.detail.files[0];
 
@@ -53,7 +70,7 @@ export class HassioUploadBackup extends LitElement {
     this._uploading = true;
     try {
       const backup = await uploadBackup(this.hass, file);
-      fireEvent(this, "backup-uploaded", { backup: backup.data });
+      fireEvent(this, "hassio-backup-uploaded", { backup: backup.data });
     } catch (err: any) {
       showAlertDialog(this, {
         title: "Upload failed",

hassio/src/components/supervisor-backup-content.ts

@@ -1,11 +1,10 @@
 import { mdiFolder, mdiPuzzle } from "@mdi/js";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { LitElement, css, html, nothing } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { formatDate } from "../../../src/common/datetime/format_date";
 import { formatDateTime } from "../../../src/common/datetime/format_date_time";
-import type { LocalizeFunc } from "../../../src/common/translations/localize";
 import "../../../src/components/ha-checkbox";
 import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-textfield";
@@ -19,13 +18,10 @@ import type {
 } from "../../../src/data/hassio/backup";
 import type { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { mdiHomeAssistant } from "../../../src/resources/home-assistant-logo-svg";
-import type { HomeAssistant, TranslationDict } from "../../../src/types";
+import type { HomeAssistant } from "../../../src/types";
 import "./supervisor-formfield-label";
 import type { HaTextField } from "../../../src/components/ha-textfield";
 
-type BackupOrRestoreKey = keyof TranslationDict["supervisor"]["backup"] &
-  keyof TranslationDict["ui"]["panel"]["page-onboarding"]["restore"];
-
 interface CheckboxItem {
   slug: string;
   checked: boolean;
@@ -65,9 +61,7 @@ const _computeAddons = (addons): AddonCheckboxItem[] =>
 
 @customElement("supervisor-backup-content")
 export class SupervisorBackupContent extends LitElement {
-  @property({ attribute: false }) public hass!: HomeAssistant;
+  @property({ attribute: false }) public hass?: HomeAssistant;
-
-  @property({ attribute: false }) public localize?: LocalizeFunc;
 
   @property({ attribute: false }) public supervisor?: Supervisor;
 
@@ -115,10 +109,6 @@ export class SupervisorBackupContent extends LitElement {
     this._focusTarget?.focus();
   }
 
-  private _localize = (key: BackupOrRestoreKey) =>
-    this.supervisor?.localize(`backup.${key}`) ||
-    this.localize!(`ui.panel.page-onboarding.restore.${key}`);
-
   protected render() {
     if (!this.onboarding && !this.supervisor) {
       return nothing;
@@ -132,8 +122,8 @@ export class SupervisorBackupContent extends LitElement {
       ${this.backup
         ? html`<div class="details">
             ${this.backup.type === "full"
-              ? this._localize("full_backup")
+              ? this.supervisor?.localize("backup.full_backup")
-              : this._localize("partial_backup")}
+              : this.supervisor?.localize("backup.partial_backup")}
             (${Math.ceil(this.backup.size * 10) / 10 + " MB"})<br />
             ${this.hass
               ? formatDateTime(
@@ -145,7 +135,7 @@ export class SupervisorBackupContent extends LitElement {
           </div>`
         : html`<ha-textfield
             name="backupName"
-            .label=${this._localize("name")}
+            .label=${this.supervisor?.localize("backup.name")}
             .value=${this.backupName}
             @change=${this._handleTextValueChanged}
           >
@@ -153,11 +143,13 @@ export class SupervisorBackupContent extends LitElement {
       ${!this.backup || this.backup.type === "full"
         ? html`<div class="sub-header">
               ${!this.backup
-                ? this._localize("type")
+                ? this.supervisor?.localize("backup.type")
-                : this._localize("select_type")}
+                : this.supervisor?.localize("backup.select_type")}
             </div>
             <div class="backup-types">
-              <ha-formfield .label=${this._localize("full_backup")}>
+              <ha-formfield
+                .label=${this.supervisor?.localize("backup.full_backup")}
+              >
                 <ha-radio
                   @change=${this._handleRadioValueChanged}
                   value="full"
@@ -166,7 +158,9 @@ export class SupervisorBackupContent extends LitElement {
                 >
                 </ha-radio>
               </ha-formfield>
-              <ha-formfield .label=${this._localize("partial_backup")}>
+              <ha-formfield
+                .label=${this.supervisor?.localize("backup.partial_backup")}
+              >
                 <ha-radio
                   @change=${this._handleRadioValueChanged}
                   value="partial"
@@ -186,12 +180,13 @@ export class SupervisorBackupContent extends LitElement {
                     .iconPath=${mdiHomeAssistant}
                     .version=${this.backup
                       ? this.backup.homeassistant
-                      : this.hass.config.version}
+                      : this.hass?.config.version}
                   >
                   </supervisor-formfield-label>`}
                 >
                   <ha-checkbox
-                    .checked=${this.homeAssistant}
+                    .checked=${this.onboarding || this.homeAssistant}
+                    .disabled=${this.onboarding}
                     @change=${this._toggleHomeAssistant}
                   >
                   </ha-checkbox>
@@ -201,7 +196,7 @@ export class SupervisorBackupContent extends LitElement {
               ? html`
                   <ha-formfield
                     .label=${html`<supervisor-formfield-label
-                      .label=${this._localize("folders")}
+                      .label=${this.supervisor?.localize("backup.folders")}
                       .iconPath=${mdiFolder}
                     >
                     </supervisor-formfield-label>`}
@@ -221,7 +216,7 @@ export class SupervisorBackupContent extends LitElement {
               ? html`
                   <ha-formfield
                     .label=${html`<supervisor-formfield-label
-                      .label=${this._localize("addons")}
+                      .label=${this.supervisor?.localize("backup.addons")}
                       .iconPath=${mdiPuzzle}
                     >
                     </supervisor-formfield-label>`}
@@ -246,7 +241,7 @@ export class SupervisorBackupContent extends LitElement {
       ${!this.backup
         ? html`<ha-formfield
             class="password"
-            .label=${this._localize("password_protection")}
+            .label=${this.supervisor?.localize("backup.password_protection")}
           >
             <ha-checkbox
               .checked=${this.backupHasPassword}
@@ -258,7 +253,7 @@ export class SupervisorBackupContent extends LitElement {
       ${this.backupHasPassword
         ? html`
             <ha-password-field
-              .label=${this._localize("password")}
+              .label=${this.supervisor?.localize("backup.password")}
               name="backupPassword"
               .value=${this.backupPassword}
               @change=${this._handleTextValueChanged}
@@ -266,7 +261,7 @@ export class SupervisorBackupContent extends LitElement {
             </ha-password-field>
             ${!this.backup
               ? html`<ha-password-field
-                  .label=${this._localize("confirm_password")}
+                  .label=${this.supervisor?.localize("backup.confirm_password")}
                   name="confirmBackupPassword"
                   .value=${this.confirmBackupPassword}
                   @change=${this._handleTextValueChanged}
@@ -282,59 +277,57 @@ export class SupervisorBackupContent extends LitElement {
     this.homeAssistant = !this.homeAssistant;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    .partial-picker ha-formfield {
-      .partial-picker ha-formfield {
+      display: block;
-        display: block;
+    }
-      }
+    .partial-picker ha-checkbox {
-      .partial-picker ha-checkbox {
+      --mdc-checkbox-touch-target-size: 32px;
-        --mdc-checkbox-touch-target-size: 32px;
+    }
-      }
+    .partial-picker {
-      .partial-picker {
+      display: block;
-        display: block;
+      margin: 0px -6px;
-        margin: 0px -6px;
+    }
-      }
+    supervisor-formfield-label {
-      supervisor-formfield-label {
+      display: inline-flex;
-        display: inline-flex;
+      align-items: center;
-        align-items: center;
+    }
-      }
+    hr {
-      hr {
+      border-color: var(--divider-color);
-        border-color: var(--divider-color);
+      border-bottom: none;
-        border-bottom: none;
+      margin: 16px 0;
-        margin: 16px 0;
+    }
-      }
+    .details {
-      .details {
+      color: var(--secondary-text-color);
-        color: var(--secondary-text-color);
+    }
-      }
+    .section-content {
-      .section-content {
+      display: flex;
-        display: flex;
+      flex-direction: column;
-        flex-direction: column;
+      margin-left: 30px;
-        margin-left: 30px;
+      margin-inline-start: 30px;
-        margin-inline-start: 30px;
+      margin-inline-end: initial;
-        margin-inline-end: initial;
+    }
-      }
+    ha-formfield.password {
-      ha-formfield.password {
+      display: block;
-        display: block;
+      margin: 0 -14px -16px;
-        margin: 0 -14px -16px;
+    }
-      }
+    .backup-types {
-      .backup-types {
+      display: flex;
-        display: flex;
+      margin-left: -13px;
-        margin-left: -13px;
+      margin-inline-start: -13px;
-        margin-inline-start: -13px;
+      margin-inline-end: initial;
-        margin-inline-end: initial;
+    }
-      }
+    .sub-header {
-      .sub-header {
+      margin-top: 8px;
-        margin-top: 8px;
+    }
-      }
+  `;
-    `;
-  }
 
   public backupDetails():
     | HassioPartialBackupCreateParams
     | HassioFullBackupCreateParams {
     const data: any = {};
 
-    if (!this.backup) {
+    if (!this.backup && this.hass) {
       data.name =
         this.backupName ||
         formatDate(new Date(), this.hass.locale, this.hass.config);
@@ -364,7 +357,9 @@ export class SupervisorBackupContent extends LitElement {
     if (folders?.length) {
       data.folders = folders;
     }
-    data.homeassistant = this.homeAssistant;
+
+    // onboarding needs at least homeassistant to restore
+    data.homeassistant = this.onboarding || this.homeAssistant;
 
     return data;
   }
@@ -386,6 +381,7 @@ export class SupervisorBackupContent extends LitElement {
             .iconPath=${section === "addons" ? mdiPuzzle : mdiFolder}
             .imageUrl=${section === "addons" &&
             !this.onboarding &&
+            this.hass &&
             atLeastVersion(this.hass.config.version, 0, 105) &&
             addons?.get(item.slug)?.icon
               ? `/api/hassio/addons/${item.slug}/icon`

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

@@ -1,4 +1,4 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../src/components/ha-svg-icon";
@@ -30,29 +30,27 @@ class SupervisorFormfieldLabel extends LitElement {
     `;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      display: flex;
-        display: flex;
+      align-items: center;
-        align-items: center;
+    }
-      }
+    .label {
-      .label {
+      margin-right: 4px;
-        margin-right: 4px;
+      margin-inline-end: 4px;
-        margin-inline-end: 4px;
+      margin-inline-start: initial;
-        margin-inline-start: initial;
+    }
-      }
+    .version {
-      .version {
+      color: var(--secondary-text-color);
-        color: var(--secondary-text-color);
+    }
-      }
+    .icon {
-      .icon {
+      max-height: 22px;
-        max-height: 22px;
+      max-width: 22px;
-        max-width: 22px;
+      margin-right: 8px;
-        margin-right: 8px;
+      margin-inline-end: 8px;
-        margin-inline-end: 8px;
+      margin-inline-start: initial;
-        margin-inline-start: initial;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

hassio/src/components/supervisor-metric.ts

@@ -1,4 +1,4 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -31,46 +31,41 @@ class SupervisorMetric extends LitElement {
     </ha-settings-row>`;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    ha-settings-row {
-      ha-settings-row {
+      padding: 0;
-        padding: 0;
+      height: 54px;
-        height: 54px;
+      width: 100%;
-        width: 100%;
+    }
-      }
+    ha-settings-row > div[slot="description"] {
-      ha-settings-row > div[slot="description"] {
+      white-space: normal;
-        white-space: normal;
+      color: var(--secondary-text-color);
-        color: var(--secondary-text-color);
+      display: flex;
-        display: flex;
+      justify-content: space-between;
-        justify-content: space-between;
+    }
-      }
+    ha-bar {
-      ha-bar {
+      --ha-bar-primary-color: var(--hassio-bar-ok-color, var(--success-color));
-        --ha-bar-primary-color: var(
+    }
-          --hassio-bar-ok-color,
+    .target-warning {
-          var(--success-color)
+      --ha-bar-primary-color: var(
-        );
+        --hassio-bar-warning-color,
-      }
+        var(--warning-color)
-      .target-warning {
+      );
-        --ha-bar-primary-color: var(
+    }
-          --hassio-bar-warning-color,
+    .target-critical {
-          var(--warning-color)
+      --ha-bar-primary-color: var(
-        );
+        --hassio-bar-critical-color,
-      }
+        var(--error-color)
-      .target-critical {
+      );
-        --ha-bar-primary-color: var(
+    }
-          --hassio-bar-critical-color,
+    .value {
-          var(--error-color)
+      width: 48px;
-        );
+      padding-right: 4px;
-      }
+      padding-inline-start: initial;
-      .value {
+      padding-inline-end: 4px;
-        width: 48px;
+      flex-shrink: 0;
-        padding-right: 4px;
+    }
-        padding-inline-start: initial;
+  `;
-        padding-inline-end: 4px;
-        flex-shrink: 0;
-      }
-    `;
-  }
 }
 
 declare global {

hassio/src/dialogs/backup/dialog-hassio-backup-upload.ts

@@ -28,7 +28,7 @@ export class DialogHassioBackupUpload
     await this.updateComplete;
   }
 
-  public closeDialog(): void {
+  public closeDialog() {
     if (this._dialogParams && !this._dialogParams.onboarding) {
       if (this._dialogParams.reloadBackup) {
         this._dialogParams.reloadBackup();
@@ -36,6 +36,7 @@ export class DialogHassioBackupUpload
     }
     this._dialogParams = undefined;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
+    return true;
   }
 
   protected render() {
@@ -71,7 +72,7 @@ export class DialogHassioBackupUpload
           </ha-header-bar>
         </div>
         <hassio-upload-backup
-          @backup-uploaded=${this._backupUploaded}
+          @hassio-backup-uploaded=${this._backupUploaded}
           .hass=${this.hass}
         ></hassio-upload-backup>
       </ha-dialog>

hassio/src/dialogs/backup/dialog-hassio-backup.ts

@@ -8,9 +8,11 @@ import { atLeastVersion } from "../../../../src/common/config/version";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
 import { slugify } from "../../../../src/common/string/slugify";
-import "../../../../src/components/ha-dialog";
+import "../../../../src/components/ha-md-dialog";
+import "../../../../src/components/ha-dialog-header";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
+import "../../../../src/components/ha-button";
 import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-icon-button";
@@ -19,6 +21,7 @@ import type { HassioBackupDetail } from "../../../../src/data/hassio/backup";
 import {
   fetchHassioBackupInfo,
   removeBackup,
+  restoreBackup,
 } from "../../../../src/data/hassio/backup";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
@@ -32,14 +35,14 @@ import { fileDownload } from "../../../../src/util/file_download";
 import "../../components/supervisor-backup-content";
 import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
 import type { HassioBackupDialogParams } from "./show-dialog-hassio-backup";
-import type { BackupOrRestoreKey } from "../../util/translations";
+import type { HaMdDialog } from "../../../../src/components/ha-md-dialog";
 
 @customElement("dialog-hassio-backup")
 class HassioBackupDialog
   extends LitElement
   implements HassDialog<HassioBackupDialogParams>
 {
-  @property({ attribute: false }) public hass?: HomeAssistant;
+  @property({ attribute: false }) public hass!: HomeAssistant;
 
   @state() private _error?: string;
 
@@ -52,13 +55,24 @@ class HassioBackupDialog
   @query("supervisor-backup-content")
   private _backupContent!: SupervisorBackupContent;
 
+  @query("ha-md-dialog") private _dialog?: HaMdDialog;
+
   public async showDialog(dialogParams: HassioBackupDialogParams) {
-    this._backup = await fetchHassioBackupInfo(this.hass, dialogParams.slug);
     this._dialogParams = dialogParams;
+    this._backup = await fetchHassioBackupInfo(this.hass, dialogParams.slug);
+    if (!this._backup) {
+      this._error = this._dialogParams.supervisor?.localize(
+        "backup.no_backup_found"
+      );
+    } else if (this._dialogParams.onboarding && !this._backup.homeassistant) {
+      this._error = this._dialogParams.supervisor?.localize(
+        "backup.restore_no_home_assistant"
+      );
+    }
     this._restoringBackup = false;
   }
 
-  public closeDialog() {
+  private _dialogClosed(): void {
     this._backup = undefined;
     this._dialogParams = undefined;
     this._restoringBackup = false;
@@ -66,11 +80,9 @@ class HassioBackupDialog
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  private _localize(key: BackupOrRestoreKey) {
+  public closeDialog() {
-    return (
+    this._dialog?.close();
-      this._dialogParams!.supervisor?.localize(`backup.${key}`) ||
+    return true;
-      this._dialogParams!.localize!(`ui.panel.page-onboarding.restore.${key}`)
-    );
   }
 
   protected render() {
@@ -78,100 +90,79 @@ class HassioBackupDialog
       return nothing;
     }
     return html`
-      <ha-dialog
+      <ha-md-dialog
         open
-        scrimClickAction
+        .disableCancelAction=${!this._error}
-        @closed=${this.closeDialog}
+        @closed=${this._dialogClosed}
-        .heading=${this._backup.name}
       >
-        <div slot="heading">
+        <ha-dialog-header slot="headline">
-          <ha-header-bar>
+          <ha-icon-button
-            <span slot="title">${this._backup.name}</span>
+            slot="navigationIcon"
-            <ha-icon-button
+            .label=${this._dialogParams.supervisor?.localize("backup.close")}
-              .label=${this._localize("close")}
+            .path=${mdiClose}
-              .path=${mdiClose}
+            @click=${this.closeDialog}
-              slot="actionItems"
+            .disabled=${this._restoringBackup}
-              dialogAction="cancel"
+          ></ha-icon-button>
-            ></ha-icon-button>
+          <span slot="title" .title=${this._backup.name}
-          </ha-header-bar>
+            >${this._backup.name}</span
+          >
+          ${!this._dialogParams.onboarding && this._dialogParams.supervisor
+            ? html`<ha-button-menu
+                slot="actionItems"
+                fixed
+                @action=${this._handleMenuAction}
+                @closed=${stopPropagation}
+              >
+                <ha-icon-button
+                  .label=${this._dialogParams.supervisor.localize(
+                    "backup.more_actions"
+                  )}
+                  .path=${mdiDotsVertical}
+                  slot="trigger"
+                ></ha-icon-button>
+                <mwc-list-item
+                  >${this._dialogParams.supervisor.localize(
+                    "backup.download_backup"
+                  )}</mwc-list-item
+                >
+                <mwc-list-item class="error"
+                  >${this._dialogParams.supervisor.localize(
+                    "backup.delete_backup_title"
+                  )}</mwc-list-item
+                >
+              </ha-button-menu>`
+            : nothing}
+        </ha-dialog-header>
+        <div slot="content">
+          ${this._error
+            ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
+            : this._restoringBackup
+              ? html`<div class="loading">
+                  <ha-circular-progress indeterminate></ha-circular-progress>
+                </div>`
+              : html`
+                  <supervisor-backup-content
+                    .hass=${this.hass}
+                    .supervisor=${this._dialogParams.supervisor}
+                    .backup=${this._backup}
+                    .onboarding=${this._dialogParams.onboarding || false}
+                    dialogInitialFocus
+                  >
+                  </supervisor-backup-content>
+                `}
         </div>
-        ${this._restoringBackup
+        <div slot="actions">
-          ? html`<ha-circular-progress indeterminate></ha-circular-progress>`
+          <ha-button
-          : html`
+            .disabled=${this._restoringBackup || !!this._error}
-              <supervisor-backup-content
+            @click=${this._restoreClicked}
-                .hass=${this.hass}
+          >
-                .supervisor=${this._dialogParams.supervisor}
+            ${this._dialogParams.supervisor?.localize("backup.restore")}
-                .backup=${this._backup}
+          </ha-button>
-                .onboarding=${this._dialogParams.onboarding || false}
+        </div>
-                .localize=${this._dialogParams.localize}
+      </ha-md-dialog>
-                dialogInitialFocus
-              >
-              </supervisor-backup-content>
-            `}
-        ${this._error
-          ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
-          : nothing}
-
-        <mwc-button
-          .disabled=${this._restoringBackup}
-          slot="secondaryAction"
-          @click=${this._restoreClicked}
-        >
-          ${this._localize("restore")}
-        </mwc-button>
-
-        ${!this._dialogParams.onboarding && this._dialogParams.supervisor
-          ? html`<ha-button-menu
-              fixed
-              slot="primaryAction"
-              @action=${this._handleMenuAction}
-              @closed=${stopPropagation}
-            >
-              <ha-icon-button
-                .label=${this._dialogParams.supervisor.localize(
-                  "backup.more_actions"
-                )}
-                .path=${mdiDotsVertical}
-                slot="trigger"
-              ></ha-icon-button>
-              <mwc-list-item
-                >${this._dialogParams.supervisor.localize(
-                  "backup.download_backup"
-                )}</mwc-list-item
-              >
-              <mwc-list-item class="error"
-                >${this._dialogParams.supervisor.localize(
-                  "backup.delete_backup_title"
-                )}</mwc-list-item
-              >
-            </ha-button-menu>`
-          : nothing}
-      </ha-dialog>
     `;
   }
 
-  static get styles(): CSSResultGroup {
-    return [
-      haStyle,
-      haStyleDialog,
-      css`
-        ha-circular-progress {
-          display: block;
-          text-align: center;
-        }
-        ha-header-bar {
-          --mdc-theme-on-primary: var(--primary-text-color);
-          --mdc-theme-primary: var(--mdc-theme-surface);
-          flex-shrink: 0;
-          display: block;
-        }
-        ha-icon-button {
-          color: var(--secondary-text-color);
-        }
-      `,
-    ];
-  }
-
   private _handleMenuAction(ev: CustomEvent<ActionDetail>) {
     switch (ev.detail.index) {
       case 0:
@@ -186,16 +177,7 @@ class HassioBackupDialog
   private async _restoreClicked() {
     const backupDetails = this._backupContent.backupDetails();
     this._restoringBackup = true;
-    this._dialogParams?.onRestoring?.();
-    if (this._backupContent.backupType === "full") {
-      await this._fullRestoreClicked(backupDetails);
-    } else {
-      await this._partialRestoreClicked(backupDetails);
-    }
-    this._restoringBackup = false;
-  }
 
-  private async _partialRestoreClicked(backupDetails) {
     const supervisor = this._dialogParams?.supervisor;
     if (supervisor !== undefined && supervisor.info.state !== "running") {
       await showAlertDialog(this, {
@@ -204,91 +186,50 @@ class HassioBackupDialog
           state: supervisor.info.state,
         }),
       });
+      this._restoringBackup = false;
       return;
     }
     if (
       !(await showConfirmationDialog(this, {
-        title: this._localize("confirm_restore_partial_backup_title"),
+        title: supervisor?.localize(
-        text: this._localize("confirm_restore_partial_backup_text"),
+          `backup.${
-        confirmText: this._localize("restore"),
+            this._backup!.type === "full"
-        dismissText: this._localize("cancel"),
+              ? "confirm_restore_full_backup_title"
+              : "confirm_restore_partial_backup_title"
+          }`
+        ),
+        text: supervisor?.localize(
+          `backup.${
+            this._backup!.type === "full"
+              ? "confirm_restore_full_backup_text"
+              : "confirm_restore_partial_backup_text"
+          }`
+        ),
+        confirmText: supervisor?.localize("backup.restore"),
+        dismissText: supervisor?.localize("backup.cancel"),
       }))
     ) {
+      this._restoringBackup = false;
       return;
     }
 
-    if (!this._dialogParams?.onboarding) {
+    try {
-      try {
+      await restoreBackup(
-        await this.hass!.callApi(
+        this.hass,
-          "POST",
+        this._backup!.type,
-
+        this._backup!.slug,
-          `hassio/${
+        { ...backupDetails, background: this._dialogParams?.onboarding },
-            atLeastVersion(this.hass!.config.version, 2021, 9)
+        !!this.hass && atLeastVersion(this.hass.config.version, 2021, 9)
-              ? "backups"
-              : "snapshots"
-          }/${this._backup!.slug}/restore/partial`,
-          backupDetails
-        );
-        this.closeDialog();
-      } catch (error: any) {
-        this._error = error.body.message;
-      }
-    } else {
-      this._dialogParams?.onRestoring?.();
-      await fetch(`/api/hassio/backups/${this._backup!.slug}/restore/partial`, {
-        method: "POST",
-        body: JSON.stringify(backupDetails),
-      });
-      this.closeDialog();
-    }
-  }
-
-  private async _fullRestoreClicked(backupDetails) {
-    const supervisor = this._dialogParams?.supervisor;
-    if (supervisor !== undefined && supervisor.info.state !== "running") {
-      await showAlertDialog(this, {
-        title: supervisor.localize("backup.could_not_restore"),
-        text: supervisor.localize("backup.restore_blocked_not_running", {
-          state: supervisor.info.state,
-        }),
-      });
-      return;
-    }
-    if (
-      !(await showConfirmationDialog(this, {
-        title: this._localize("confirm_restore_full_backup_title"),
-        text: this._localize("confirm_restore_full_backup_text"),
-        confirmText: this._localize("restore"),
-        dismissText: this._localize("cancel"),
-      }))
-    ) {
-      return;
-    }
-
-    if (!this._dialogParams?.onboarding) {
-      this.hass!.callApi(
-        "POST",
-        `hassio/${
-          atLeastVersion(this.hass!.config.version, 2021, 9)
-            ? "backups"
-            : "snapshots"
-        }/${this._backup!.slug}/restore/full`,
-        backupDetails
-      ).then(
-        () => {
-          this.closeDialog();
-        },
-        (error) => {
-          this._error = error.body.message;
-        }
       );
-    } else {
+
       this._dialogParams?.onRestoring?.();
-      fetch(`/api/hassio/backups/${this._backup!.slug}/restore/full`, {
-        method: "POST",
-        body: JSON.stringify(backupDetails),
-      });
       this.closeDialog();
+    } catch (error: any) {
+      this._error =
+        error?.body?.message ||
+        supervisor?.localize("backup.restore_start_failed");
+    } finally {
+      this._restoringBackup = false;
     }
   }
 
@@ -345,7 +286,7 @@ class HassioBackupDialog
         title: supervisor.localize("backup.remote_download_title"),
         text: supervisor.localize("backup.remote_download_text"),
         confirmText: supervisor.localize("backup.download"),
-        dismissText: this._localize("cancel"),
+        dismissText: supervisor?.localize("backup.cancel"),
       });
       if (!confirm) {
         return;
@@ -361,7 +302,36 @@ class HassioBackupDialog
   private get _computeName() {
     return this._backup
       ? this._backup.name || this._backup.slug
-      : "Unnamed backup";
+      : this._dialogParams!.supervisor?.localize("backup.unnamed_backup") || "";
+  }
+
+  static get styles(): CSSResultGroup {
+    return [
+      haStyle,
+      haStyleDialog,
+      css`
+        ha-circular-progress {
+          display: block;
+          text-align: center;
+        }
+        ha-header-bar {
+          --mdc-theme-on-primary: var(--primary-text-color);
+          --mdc-theme-primary: var(--mdc-theme-surface);
+          flex-shrink: 0;
+          display: block;
+        }
+        ha-icon-button {
+          color: var(--secondary-text-color);
+        }
+        .loading {
+          width: 100%;
+          display: flex;
+          height: 100%;
+          justify-content: center;
+          align-items: center;
+        }
+      `,
+    ];
   }
 }
 

hassio/src/dialogs/backup/show-dialog-hassio-backup.ts

@@ -1,5 +1,4 @@
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import type { LocalizeFunc } from "../../../../src/common/translations/localize";
 import type { Supervisor } from "../../../../src/data/supervisor/supervisor";
 
 export interface HassioBackupDialogParams {
@@ -8,7 +7,6 @@ export interface HassioBackupDialogParams {
   onRestoring?: () => void;
   onboarding?: boolean;
   supervisor?: Supervisor;
-  localize?: LocalizeFunc;
 }
 
 export const showHassioBackupDialog = (

hassio/src/dialogs/network/dialog-hassio-network.ts

@@ -82,10 +82,11 @@ export class DialogHassioNetwork
     await this.updateComplete;
   }
 
-  public closeDialog(): void {
+  public closeDialog() {
     this._params = undefined;
     this._processing = false;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
+    return true;
   }
 
   protected render() {

hassio/src/hassio-my-redirect.ts

@@ -92,7 +92,7 @@ class HassioMyRedirect extends LitElement {
     let url: string;
     try {
       url = this._createRedirectUrl(redirect);
-    } catch (err: any) {
+    } catch (_err: any) {
       this._error = this.supervisor.localize("my.error");
       return;
     }

hassio/src/hassio-panel.ts

@@ -1,4 +1,4 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { Supervisor } from "../../src/data/supervisor/supervisor";
@@ -39,15 +39,13 @@ class HassioPanel extends LitElement {
     `;
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    :host {
-      :host {
+      --app-header-background-color: var(--sidebar-background-color);
-        --app-header-background-color: var(--sidebar-background-color);
+      --app-header-text-color: var(--sidebar-text-color);
-        --app-header-text-color: var(--sidebar-text-color);
+      --app-header-border-bottom: 1px solid var(--divider-color);
-        --app-header-border-bottom: 1px solid var(--divider-color);
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {

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

@@ -1,5 +1,5 @@
 import { mdiMenu } from "@mdi/js";
-import type { CSSResultGroup, PropertyValues, TemplateResult } from "lit";
+import type { PropertyValues, TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../src/common/dom/fire_event";
@@ -158,7 +158,7 @@ class HassioIngressView extends LitElement {
 
     try {
       addon = await fetchHassioAddonInfo(this.hass, addonSlug);
-    } catch (err: any) {
+    } catch (_err: any) {
       await this.updateComplete;
       await showAlertDialog(this, {
         text:
@@ -219,7 +219,7 @@ class HassioIngressView extends LitElement {
           });
           this._fetchData(addonSlug);
           return;
-        } catch (e) {
+        } catch (_err) {
           await showAlertDialog(this, {
             text:
               this.supervisor.localize("ingress.error_starting_addon") ||
@@ -264,7 +264,7 @@ class HassioIngressView extends LitElement {
 
     try {
       session = await createSessionPromise;
-    } catch (err: any) {
+    } catch (_err: any) {
       if (this._sessionKeepAlive) {
         clearInterval(this._sessionKeepAlive);
       }
@@ -285,7 +285,7 @@ class HassioIngressView extends LitElement {
     this._sessionKeepAlive = window.setInterval(async () => {
       try {
         await validateHassioSession(this.hass, session);
-      } catch (err: any) {
+      } catch (_err: any) {
         session = await createHassioSession(this.hass);
       }
     }, 60000);
@@ -325,51 +325,49 @@ class HassioIngressView extends LitElement {
     fireEvent(this, "hass-toggle-menu");
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    iframe {
-      iframe {
+      display: block;
-        display: block;
+      width: 100%;
-        width: 100%;
+      height: 100%;
-        height: 100%;
+      border: 0;
-        border: 0;
+    }
-      }
 
-      .header + iframe {
+    .header + iframe {
-        height: calc(100% - 40px);
+      height: calc(100% - 40px);
-      }
+    }
 
-      .header {
+    .header {
-        display: flex;
+      display: flex;
-        align-items: center;
+      align-items: center;
-        font-size: 16px;
+      font-size: 16px;
-        height: 40px;
+      height: 40px;
-        padding: 0 16px;
+      padding: 0 16px;
-        pointer-events: none;
+      pointer-events: none;
-        background-color: var(--app-header-background-color);
+      background-color: var(--app-header-background-color);
-        font-weight: 400;
+      font-weight: 400;
-        color: var(--app-header-text-color, white);
+      color: var(--app-header-text-color, white);
-        border-bottom: var(--app-header-border-bottom, none);
+      border-bottom: var(--app-header-border-bottom, none);
-        box-sizing: border-box;
+      box-sizing: border-box;
-        --mdc-icon-size: 20px;
+      --mdc-icon-size: 20px;
-      }
+    }
 
-      .main-title {
+    .main-title {
-        margin: var(--margin-title);
+      margin: var(--margin-title);
-        line-height: 20px;
+      line-height: 20px;
-        flex-grow: 1;
+      flex-grow: 1;
-      }
+    }
 
-      ha-icon-button {
+    ha-icon-button {
-        pointer-events: auto;
+      pointer-events: auto;
-      }
+    }
 
-      hass-subpage {
+    hass-subpage {
-        --app-header-background-color: var(--sidebar-background-color);
+      --app-header-background-color: var(--sidebar-background-color);
-        --app-header-text-color: var(--sidebar-text-color);
+      --app-header-text-color: var(--sidebar-text-color);
-        --app-header-border-bottom: 1px solid var(--divider-color);
+      --app-header-border-bottom: 1px solid var(--divider-color);
-      }
+    }
-    `;
+  `;
-  }
 }
 
 declare global {

hassio/src/system/hassio-core-info.ts

@@ -33,7 +33,7 @@ class HassioCoreInfo extends LitElement {
 
   @state() private _metrics?: HassioStats;
 
-  protected render(): TemplateResult | void {
+  protected render(): TemplateResult | undefined {
     const metrics = [
       {
         description: this.supervisor.localize("system.core.cpu_usage"),

hassio/src/system/hassio-host-info.ts

@@ -49,7 +49,7 @@ class HassioHostInfo extends LitElement {
 
   @property({ attribute: false }) public supervisor!: Supervisor;
 
-  protected render(): TemplateResult | void {
+  protected render(): TemplateResult | undefined {
     const primaryIpAddress = this.supervisor.host.features.includes("network")
       ? this._primaryIpAddress(this.supervisor.network!)
       : "";

hassio/src/system/hassio-supervisor-info.ts

@@ -44,7 +44,7 @@ class HassioSupervisorInfo extends LitElement {
 
   @state() private _metrics?: HassioStats;
 
-  protected render(): TemplateResult | void {
+  protected render(): TemplateResult | undefined {
     const metrics = [
       {
         description: this.supervisor.localize("system.supervisor.cpu_usage"),

hassio/src/system/hassio-supervisor-log.ts

@@ -65,7 +65,7 @@ class HassioSupervisorLog extends LitElement {
     await this._loadData();
   }
 
-  protected render(): TemplateResult | void {
+  protected render(): TemplateResult | undefined {
     return html`
       <ha-card outlined>
         ${this._error

hassio/src/system/hassio-system.ts

@@ -23,7 +23,7 @@ class HassioSystem extends LitElement {
 
   @property({ attribute: false }) public route!: Route;
 
-  protected render(): TemplateResult | void {
+  protected render(): TemplateResult | undefined {
     return html`
       <hass-tabs-subpage
         .hass=${this.hass}

hassio/src/update-available/update-available-card.ts

@@ -9,6 +9,7 @@ import {
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
+import { atLeastVersion } from "../../../src/common/config/version";
 import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-alert";
@@ -18,7 +19,8 @@ import "../../../src/components/ha-checkbox";
 import "../../../src/components/ha-faded";
 import "../../../src/components/ha-icon-button";
 import "../../../src/components/ha-markdown";
-import "../../../src/components/ha-settings-row";
+import "../../../src/components/ha-md-list";
+import "../../../src/components/ha-md-list-item";
 import "../../../src/components/ha-svg-icon";
 import "../../../src/components/ha-switch";
 import type { HaSwitch } from "../../../src/components/ha-switch";
@@ -124,6 +126,8 @@ class UpdateAvailableCard extends LitElement {
 
     const changelog = changelogUrl(this._updateType, this._version_latest);
 
+    const createBackupTexts = this._computeCreateBackupTexts();
+
     return html`
       <ha-card
         outlined
@@ -163,17 +167,28 @@ class UpdateAvailableCard extends LitElement {
                       )}
                     </p>
                   </div>
-                  ${["core", "addon"].includes(this._updateType)
+                  ${createBackupTexts
                     ? html`
                         <hr />
-                        <ha-settings-row>
+                        <ha-md-list>
-                          <span slot="heading">
+                          <ha-md-list-item>
-                            ${this.supervisor.localize(
+                            <span slot="headline">
-                              "update_available.create_backup"
+                              ${createBackupTexts.title}
-                            )}
+                            </span>
-                          </span>
+
-                          <ha-switch id="create_backup" checked></ha-switch>
+                            ${createBackupTexts.description
-                        </ha-settings-row>
+                              ? html`
+                                  <span slot="supporting-text">
+                                    ${createBackupTexts.description}
+                                  </span>
+                                `
+                              : nothing}
+                            <ha-switch
+                              slot="end"
+                              id="create-backup"
+                            ></ha-switch>
+                          </ha-md-list-item>
+                        </ha-md-list>
                       `
                     : nothing}
                 `
@@ -243,6 +258,35 @@ class UpdateAvailableCard extends LitElement {
     }
   }
 
+  private _computeCreateBackupTexts():
+    | { title: string; description?: string }
+    | undefined {
+    // Addon backup
+    if (
+      this._updateType === "addon" &&
+      atLeastVersion(this.hass.config.version, 2025, 2, 0)
+    ) {
+      const version = this._version;
+      return {
+        title: this.supervisor.localize("update_available.create_backup.addon"),
+        description: this.supervisor.localize(
+          "update_available.create_backup.addon_description",
+          { version: version }
+        ),
+      };
+    }
+
+    // Old behavior
+    if (this._updateType && ["core", "addon"].includes(this._updateType)) {
+      return {
+        title: this.supervisor.localize(
+          "update_available.create_backup.generic"
+        ),
+      };
+    }
+    return undefined;
+  }
+
   get _shouldCreateBackup(): boolean {
     if (this._updateType && !["core", "addon"].includes(this._updateType)) {
       return false;
@@ -374,7 +418,6 @@ class UpdateAvailableCard extends LitElement {
       this._error = this.supervisor.localize("backup.backup_already_running");
       return;
     }
-
     this._error = undefined;
     this._updating = true;
 
@@ -436,16 +479,22 @@ class UpdateAvailableCard extends LitElement {
           padding-bottom: 8px;
         }
 
-        ha-settings-row {
-          padding: 0;
-          margin-bottom: -16px;
-        }
-
         hr {
           border-color: var(--divider-color);
           border-bottom: none;
           margin: 16px 0 0 0;
         }
+
+        ha-md-list {
+          padding: 0;
+          margin-bottom: -16px;
+        }
+
+        ha-md-list-item {
+          --md-list-item-leading-space: 0;
+          --md-list-item-trailing-space: 0;
+          --md-item-overflow: visible;
+        }
       `,
     ];
   }

hassio/src/update-available/update-available-dashboard.ts

@@ -1,4 +1,4 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import type { TemplateResult } from "lit";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import type { Supervisor } from "../../../src/data/supervisor/supervisor";
@@ -38,20 +38,18 @@ class UpdateAvailableDashboard extends LitElement {
     history.back();
   }
 
-  static get styles(): CSSResultGroup {
+  static styles = css`
-    return css`
+    hass-subpage {
-      hass-subpage {
+      --app-header-background-color: var(--primary-background-color);
-        --app-header-background-color: var(--primary-background-color);
+      --app-header-text-color: var(--sidebar-text-color);
-        --app-header-text-color: var(--sidebar-text-color);
+    }
-      }
+    update-available-card {
-      update-available-card {
+      margin: auto;
-        margin: auto;
+      margin-top: 16px;
-        margin-top: 16px;
+      margin-bottom: 24px;
-        margin-bottom: 24px;
+      max-width: 600px;
-        max-width: 600px;
+    }
-      }
+  `;
-    `;
-  }
 }
 
 declare global {