Add WIP Vite config

.devcontainer/Dockerfile

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

.devcontainer/devcontainer.json

@@ -1,31 +0,0 @@
-{
-  "name": "Home Assistant Frontend",
-  "build": {
-    "dockerfile": "Dockerfile",
-    "context": ".."
-  },
-  "appPort": 8123,
-  "context": "..",
-  "postCreateCommand": "script/bootstrap",
-  "extensions": [
-    "github.vscode-pull-request-github",
-    "dbaeumer.vscode-eslint",
-    "ms-vscode.vscode-typescript-tslint-plugin",
-    "esbenp.prettier-vscode",
-    "bierner.lit-html",
-    "runem.lit-plugin",
-    "ms-python.vscode-pylance"
-  ],
-  "settings": {
-    "terminal.integrated.shell.linux": "/bin/bash",
-    "files.eol": "\n",
-    "editor.tabSize": 2,
-    "editor.formatOnPaste": false,
-    "editor.formatOnSave": true,
-    "editor.formatOnType": true,
-    "[typescript]": {
-      "editor.defaultFormatter": "esbenp.prettier-vscode"
-    },
-    "files.trimTrailingWhitespace": true
-  }
-}

.gitignore

@@ -35,6 +35,3 @@ yarn-error.log
 
 #asdf
 .tool-versions
-
-# Home Assistant config
-/config

.hound.yml

@@ -0,0 +1,6 @@
+jshint:
+  enabled: false
+
+eslint:
+  enabled: true
+  config_file: .eslintrc-hound.json

.vscode/tasks.json

@@ -37,37 +37,6 @@
         "instanceLimit": 1
       }
     },
-    {
-      "label": "Develop Supervisor panel",
-      "type": "gulp",
-      "task": "develop-hassio",
-      "problemMatcher": {
-        "owner": "ha-build",
-        "source": "ha-build",
-        "fileLocation": "absolute",
-        "severity": "error",
-        "pattern": [
-          {
-            "regexp": "(SyntaxError): (.+): (.+) \\((\\d+):(\\d+)\\)",
-            "severity": 1,
-            "file": 2,
-            "message": 3,
-            "line": 4,
-            "column": 5
-          }
-        ],
-        "background": {
-          "activeOnStart": true,
-          "beginsPattern": "Changes detected. Starting compilation",
-          "endsPattern": "Build done @"
-        }
-      },
-      "isBackground": true,
-      "group": "build",
-      "runOptions": {
-        "instanceLimit": 1
-      }
-    },
     {
       "label": "Develop Gallery",
       "type": "gulp",
@@ -164,45 +133,5 @@
         "instanceLimit": 1
       }
     },
-    {
-      "label": "Run HA Core in devcontainer",
-      "type": "shell",
-      "command": "script/core",
-      "isBackground": true,
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": [],
-      "runOptions": {
-        "instanceLimit": 1
-      }
-    },
-    {
-      "label": "Run HA Core for Supervisor in devcontainer",
-      "type": "shell",
-      "command": "HASSIO=${input:supervisorHost} HASSIO_TOKEN=${input:supervisorToken} script/core",
-      "isBackground": true,
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      },
-      "problemMatcher": [],
-      "runOptions": {
-        "instanceLimit": 1
-      }
-    }
-  ],
-  "inputs": [
-    {
-      "id": "supervisorHost",
-      "type": "promptString",
-      "description": "The IP of the Supervisor host running the Remote API proxy add-on"
-    },
-    {
-      "id": "supervisorToken",
-      "type": "promptString",
-      "description": "The token for the Remote API proxy add-on"
-    }
   ]
 }

VITE_NOTES.md

@@ -0,0 +1,27 @@
+# Vite
+
+Vite is a new type of compiler that compiles each file as they come in.
+
+## Running Vite
+
+- Checkout this branch
+- `yarn`
+- Run `script/develop` until it finishes first webpack build. Then turn it off. We use this right now to prepare the static files + auth/onboarding pages.
+- Update `hass_frontend/index.html`, find where we import the scripts and replace with:
+  ```html
+  <script>
+    // Define in vite config doesn't work.
+    window.__DEV__ = true;
+    window.__DEMO__ = false;
+    window.__BACKWARDS_COMPAT__ = false;
+    window.__BUILD__ = "latest";
+    window.__VERSION__ = "dev";
+    // Temporary to stop an error
+    document.adoptedStyleSheets = [];
+    // Load scripts from Vite dev server
+    import("http://localhost:3000/src/entrypoints/core.ts");
+    import("http://localhost:3000/src/entrypoints/app.ts");
+  ```
+  If Vite transforms would work correctly, we would just have to drop the "use-credentials" part in dev and update the import URLs to import from Vite dev server.
+- Start vite `vite serve -c build-scripts/vite/vite.config.ts`
+- Open Home Assistant as usual.

build-scripts/README.md

@@ -1,39 +0,0 @@
-# Bundling Home Assistant Frontend
-
-The Home Assistant build pipeline contains various steps to prepare a build.
-
-- Generating icon files to be included
-- Generating translation files to be included
-- Converting TypeScript, CSS and JSON files to JavaScript
-- Bundling
-- Minifying the files
-- Generating the HTML entrypoint files
-- Generating the service worker
-- Compressing the files
-
-## Converting files
-
-Currently in Home Assistant we use a bundler to convert TypeScript, CSS and JSON files to JavaScript files that the browser understands.
-
-We currently rely on Webpack but also have experimental Rollup support. Both of these programs bundle the converted files in both production and development.
-
-For development, bundling is optional. We just want to get the right files in the browser.
-
-Responsibilities of the converter during development:
-
-- Convert TypeScript to JavaScript
-- Convert CSS to JavaScript that sets the content as the default export
-- Convert JSON to JavaScript that sets the content as the default export
-- Make sure import, dynamic import and web worker references work
-  - Add extensions where missing
-  - Resolve absolute package imports
-- Filter out specific imports/packages
-- Replace constants with values
-
-In production, the following responsibilities are added:
-
-- Minify HTML
-- Bundle multiple imports so that the browser can fetch less files
-- Generate a second version that is ES5 compatible
-
-Configuration for all these steps are specified in [bundle.js](bundle.js).

build-scripts/bundle.js

@@ -44,7 +44,7 @@ module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
 });
 
 module.exports.terserOptions = (latestBuild) => ({
-  safari10: !latestBuild,
+  safari10: true,
   ecma: latestBuild ? undefined : 5,
   output: { comments: false },
 });
@@ -117,7 +117,7 @@ BundleConfig {
 */
 
 module.exports.config = {
-  app({ isProdBuild, latestBuild, isStatsBuild, isWDS }) {
+  app({ isProdBuild, latestBuild, isStatsBuild }) {
     return {
       entry: {
         service_worker: "./src/entrypoints/service_worker.ts",
@@ -132,7 +132,6 @@ module.exports.config = {
       isProdBuild,
       latestBuild,
       isStatsBuild,
-      isWDS,
     };
   },
 

build-scripts/env.js

@@ -6,9 +6,6 @@ module.exports = {
   useRollup() {
     return process.env.ROLLUP === "1";
   },
-  useWDS() {
-    return process.env.WDS === "1";
-  },
   isProdBuild() {
     return (
       process.env.NODE_ENV === "production" || module.exports.isStatsBuild()

build-scripts/gulp/app.js

@@ -12,7 +12,6 @@ require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
 require("./rollup.js");
-require("./wds.js");
 
 gulp.task(
   "develop-app",
@@ -29,11 +28,7 @@ gulp.task(
       "build-translations"
     ),
     "copy-static-app",
-    env.useWDS()
+    env.useRollup() ? "rollup-watch-app" : "webpack-watch-app"
-      ? "wds-watch-app"
-      : env.useRollup()
-      ? "rollup-watch-app"
-      : "webpack-watch-app"
   )
 );
 

build-scripts/gulp/entry-html.js

@@ -19,7 +19,6 @@ const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
   return compiled({
     ...data,
     useRollup: env.useRollup(),
-    useWDS: env.useWDS(),
     renderTemplate,
   });
 };
@@ -91,23 +90,10 @@ gulp.task("gen-pages-prod", (done) => {
 });
 
 gulp.task("gen-index-app-dev", (done) => {
-  let latestAppJS, latestCoreJS, latestCustomPanelJS;
-
-  if (env.useWDS()) {
-    latestAppJS = "http://localhost:8000/src/entrypoints/app.ts";
-    latestCoreJS = "http://localhost:8000/src/entrypoints/core.ts";
-    latestCustomPanelJS =
-      "http://localhost:8000/src/entrypoints/custom-panel.ts";
-  } else {
-    latestAppJS = "/frontend_latest/app.js";
-    latestCoreJS = "/frontend_latest/core.js";
-    latestCustomPanelJS = "/frontend_latest/custom-panel.js";
-  }
-
   const content = renderTemplate("index", {
-    latestAppJS,
+    latestAppJS: "/frontend_latest/app.js",
-    latestCoreJS,
+    latestCoreJS: "/frontend_latest/core.js",
-    latestCustomPanelJS,
+    latestCustomPanelJS: "/frontend_latest/custom-panel.js",
 
     es5AppJS: "/frontend_es5/app.js",
     es5CoreJS: "/frontend_es5/core.js",

build-scripts/gulp/translations.js

@@ -33,10 +33,21 @@ String.prototype.rsplit = function (sep, maxsplit) {
     : split;
 };
 
-// Panel translations which should be split from the core translations.
+// Panel translations which should be split from the core translations. These
-const TRANSLATION_FRAGMENTS = Object.keys(
+// should mirror the fragment definitions in polymer.json, so that we load
-  require("../../src/translations/en.json").ui.panel
+// additional resources at equivalent points.
-);
+const TRANSLATION_FRAGMENTS = [
+  "config",
+  "history",
+  "logbook",
+  "mailbox",
+  "profile",
+  "shopping-list",
+  "page-authorize",
+  "page-demo",
+  "page-onboarding",
+  "developer-tools",
+];
 
 function recursiveFlatten(prefix, data) {
   let output = {};

build-scripts/gulp/wds.js

@@ -1,11 +0,0 @@
-// Tasks to run Rollup
-const gulp = require("gulp");
-const { startDevServer } = require("@web/dev-server");
-
-gulp.task("wds-watch-app", () => {
-  startDevServer({
-    config: {
-      watch: true,
-    },
-  });
-});

build-scripts/gulp/webpack.js

@@ -47,7 +47,7 @@ const runDevServer = ({
     );
   });
 
-const doneHandler = (done) => (err, stats) => {
+const handler = (done) => (err, stats) => {
   if (err) {
     log.error(err.stack || err);
     if (err.details) {
@@ -67,20 +67,11 @@ const doneHandler = (done) => (err, stats) => {
   }
 };
 
-const prodBuild = (conf) =>
-  new Promise((resolve) => {
-    webpack(
-      conf,
-      // Resolve promise when done. Because we pass a callback, webpack closes itself
-      doneHandler(resolve)
-    );
-  });
-
 gulp.task("webpack-watch-app", () => {
-  // This command will run forever because we don't close compiler
+  // we are not calling done, so this command will run forever
   webpack(createAppConfig({ isProdBuild: false, latestBuild: true })).watch(
     { ignored: /build-translations/ },
-    doneHandler()
+    handler()
   );
   gulp.watch(
     path.join(paths.translations_src, "en.json"),
@@ -88,12 +79,15 @@ gulp.task("webpack-watch-app", () => {
   );
 });
 
-gulp.task("webpack-prod-app", () =>
+gulp.task(
-  prodBuild(
+  "webpack-prod-app",
-    bothBuilds(createAppConfig, {
+  () =>
-      isProdBuild: true,
+    new Promise((resolve) =>
-    })
+      webpack(
-  )
+        bothBuilds(createAppConfig, { isProdBuild: true }),
+        handler(resolve)
+      )
+    )
 );
 
 gulp.task("webpack-dev-server-demo", () => {
@@ -104,12 +98,17 @@ gulp.task("webpack-dev-server-demo", () => {
   });
 });
 
-gulp.task("webpack-prod-demo", () =>
+gulp.task(
-  prodBuild(
+  "webpack-prod-demo",
-    bothBuilds(createDemoConfig, {
+  () =>
-      isProdBuild: true,
+    new Promise((resolve) =>
-    })
+      webpack(
-  )
+        bothBuilds(createDemoConfig, {
+          isProdBuild: true,
+        }),
+        handler(resolve)
+      )
+    )
 );
 
 gulp.task("webpack-dev-server-cast", () => {
@@ -122,30 +121,41 @@ gulp.task("webpack-dev-server-cast", () => {
   });
 });
 
-gulp.task("webpack-prod-cast", () =>
+gulp.task(
-  prodBuild(
+  "webpack-prod-cast",
-    bothBuilds(createCastConfig, {
+  () =>
-      isProdBuild: true,
+    new Promise((resolve) =>
-    })
+      webpack(
-  )
+        bothBuilds(createCastConfig, {
+          isProdBuild: true,
+        }),
+
+        handler(resolve)
+      )
+    )
 );
 
 gulp.task("webpack-watch-hassio", () => {
-  // This command will run forever because we don't close compiler
+  // we are not calling done, so this command will run forever
   webpack(
     createHassioConfig({
       isProdBuild: false,
       latestBuild: true,
     })
-  ).watch({}, doneHandler());
+  ).watch({}, handler());
 });
 
-gulp.task("webpack-prod-hassio", () =>
+gulp.task(
-  prodBuild(
+  "webpack-prod-hassio",
-    bothBuilds(createHassioConfig, {
+  () =>
-      isProdBuild: true,
+    new Promise((resolve) =>
-    })
+      webpack(
-  )
+        bothBuilds(createHassioConfig, {
+          isProdBuild: true,
+        }),
+        handler(resolve)
+      )
+    )
 );
 
 gulp.task("webpack-dev-server-gallery", () => {
@@ -157,11 +167,17 @@ gulp.task("webpack-dev-server-gallery", () => {
   });
 });
 
-gulp.task("webpack-prod-gallery", () =>
+gulp.task(
-  prodBuild(
+  "webpack-prod-gallery",
-    createGalleryConfig({
+  () =>
-      isProdBuild: true,
+    new Promise((resolve) =>
-      latestBuild: true,
+      webpack(
-    })
+        createGalleryConfig({
-  )
+          isProdBuild: true,
+          latestBuild: true,
+        }),
+
+        handler(resolve)
+      )
+    )
 );

build-scripts/rollup-plugins/ignore-plugin.js

@@ -1,3 +1,5 @@
+const path = require("path");
+
 module.exports = function (userOptions = {}) {
   // Files need to be absolute paths.
   // This only works if the file has no exports

build-scripts/rollup.js

@@ -3,7 +3,7 @@ const path = require("path");
 const commonjs = require("@rollup/plugin-commonjs");
 const resolve = require("@rollup/plugin-node-resolve");
 const json = require("@rollup/plugin-json");
-const babel = require("@rollup/plugin-babel").babel;
+const babel = require("rollup-plugin-babel");
 const replace = require("@rollup/plugin-replace");
 const visualizer = require("rollup-plugin-visualizer");
 const { string } = require("rollup-plugin-string");
@@ -31,7 +31,6 @@ const createRollupConfig = ({
   isStatsBuild,
   publicPath,
   dontHash,
-  isWDS,
 }) => {
   return {
     /**
@@ -62,7 +61,6 @@ const createRollupConfig = ({
           ...bundle.babelOptions({ latestBuild }),
           extensions,
           exclude: bundle.babelExclude(),
-          babelHelpers: isWDS ? "inline" : "bundled",
         }),
         string({
           // Import certain extensions as strings
@@ -71,21 +69,19 @@ const createRollupConfig = ({
         replace(
           bundle.definedVars({ isProdBuild, latestBuild, defineOverlay })
         ),
-        !isWDS &&
+        manifest({
-          manifest({
+          publicPath,
-            publicPath,
+        }),
-          }),
+        worker(),
-        !isWDS && worker(),
+        dontHashPlugin({ dontHash }),
-        !isWDS && dontHashPlugin({ dontHash }),
+        isProdBuild && terser(bundle.terserOptions(latestBuild)),
-        !isWDS && isProdBuild && terser(bundle.terserOptions(latestBuild)),
+        isStatsBuild &&
-        !isWDS &&
-          isStatsBuild &&
           visualizer({
             // https://github.com/btd/rollup-plugin-visualizer#options
             open: true,
             sourcemap: true,
           }),
-      ].filter(Boolean),
+      ],
     },
     /**
      * @type { import("rollup").OutputOptions }
@@ -112,13 +108,12 @@ const createRollupConfig = ({
   };
 };
 
-const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild, isWDS }) => {
+const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
   return createRollupConfig(
     bundle.config.app({
       isProdBuild,
       latestBuild,
       isStatsBuild,
-      isWDS,
     })
   );
 };

build-scripts/vite/vite.config.ts

@@ -0,0 +1,61 @@
+import * as path from "path";
+import * as vite from "vite";
+
+// https://github.com/vitejs/vite/blob/master/src/node/config.ts
+
+const ignore = new Set(["/src/resources/compatibility.ts"]);
+
+const conf: vite.ServerConfig = {
+  root: path.resolve(__dirname, "../.."),
+  optimizeDeps: {
+    // We don't automatically optimize dependencies because
+    // that causes duplicate imports of custom elements
+    auto: false,
+  },
+  resolvers: [
+    // This resolver is meant to filter out files that we don't
+    // need in latest build, like compatibility.
+    // But resolving it to an empty file doesn't yield expected
+    // results.
+    // {
+    //   requestToFile(publicPath: string, root: string) {
+    //     console.log("requestToFile", {
+    //       publicPath,
+    //       root,
+    //       match: ignore.has(publicPath),
+    //       resolved:
+    //         ignore.has(publicPath) &&
+    //         path.resolve(conf.root!, "src/util/empty.js"),
+    //     });
+    //     if (ignore.has(publicPath)) {
+    //       return path.resolve(conf.root!, "src/util/empty.js");
+    //     }
+    //     return undefined;
+    //   },
+    //   fileToRequest(filePath: string, root: string) {
+    //     if (!filePath.endsWith("/src/util/empty.js")) {
+    //       return undefined;
+    //     }
+    //     console.log("fileToRequest", {
+    //       filePath,
+    //       root,
+    //       match: filePath.endsWith("/src/util/empty.js"),
+    //     });
+    //     return "/src/util/empty.js";
+    //   },
+    // },
+  ],
+  // These don't seem to be picked up. Workaround is to manually
+  // add them to hass_frontend/index.html for now.
+  define: {
+    __DEV__: true,
+    __BUILD__: "latest",
+    __VERSION__: "dev",
+    __DEMO__: false,
+    __BACKWARDS_COMPAT__: false,
+    __STATIC_PATH__: "/static/",
+  },
+  cors: true,
+};
+console.log(conf);
+export default conf;

demo/src/configs/demo-configs.ts

@@ -3,10 +3,22 @@ import { Lovelace } from "../../../src/panels/lovelace/types";
 import { DemoConfig } from "./types";
 
 export const demoConfigs: Array<() => Promise<DemoConfig>> = [
-  () => import("./arsaboo").then((mod) => mod.demoArsaboo),
+  () =>
-  () => import("./teachingbirds").then((mod) => mod.demoTeachingbirds),
+    import(/* webpackChunkName: "arsaboo" */ "./arsaboo").then(
-  () => import("./kernehed").then((mod) => mod.demoKernehed),
+      (mod) => mod.demoArsaboo
-  () => import("./jimpower").then((mod) => mod.demoJimpower),
+    ),
+  () =>
+    import(/* webpackChunkName: "teachingbirds" */ "./teachingbirds").then(
+      (mod) => mod.demoTeachingbirds
+    ),
+  () =>
+    import(/* webpackChunkName: "kernehed" */ "./kernehed").then(
+      (mod) => mod.demoKernehed
+    ),
+  () =>
+    import(/* webpackChunkName: "jimpower" */ "./jimpower").then(
+      (mod) => mod.demoJimpower
+    ),
 ];
 
 // eslint-disable-next-line import/no-mutable-exports

demo/src/configs/types.ts

@@ -9,5 +9,5 @@ export interface DemoConfig {
   authorUrl: string;
   lovelace: (localize: LocalizeFunc) => LovelaceConfig;
   entities: (localize: LocalizeFunc) => Entity[];
-  theme: () => Record<string, string> | null;
+  theme: () => { [key: string]: string } | null;
 }

demo/src/entrypoint.ts

@@ -7,5 +7,7 @@ import "./ha-demo";
 
 /* polyfill for paper-dropdown */
 setTimeout(() => {
-  import("web-animations-js/web-animations-next-lite.min");
+  import(
+    /* webpackChunkName: "polyfill-web-animations-next" */ "web-animations-js/web-animations-next-lite.min"
+  );
 }, 1000);

gallery/src/components/demo-card.js

@@ -21,16 +21,15 @@ class DemoCard extends PolymerElement {
         }
         pre {
           width: 400px;
-          margin: 0 16px;
+          margin: 16px;
           overflow: auto;
-          color: var(--primary-text-color);
         }
         @media only screen and (max-width: 800px) {
           .root {
             flex-direction: column;
           }
           pre {
-            margin: 16px 0;
+            margin-left: 0;
           }
         }
       </style>

gallery/src/components/demo-more-info.js

@@ -26,9 +26,8 @@ class DemoMoreInfo extends PolymerElement {
 
         pre {
           width: 400px;
-          margin: 0 16px;
+          margin: 16px;
           overflow: auto;
-          color: var(--primary-text-color);
         }
 
         @media only screen and (max-width: 800px) {
@@ -36,7 +35,7 @@ class DemoMoreInfo extends PolymerElement {
             flex-direction: column;
           }
           pre {
-            margin: 16px 0;
+            margin-left: 0;
           }
         }
       </style>

gallery/src/data/media_players.ts

@@ -7,8 +7,8 @@ export const createMediaPlayerEntities = () => [
     media_title: "I Wanna Be A Hippy (Flamman & Abraxas Radio Mix)",
     media_artist: "Technohead",
     // Pause + Seek + Volume Set + Volume Mute + Previous Track + Next Track + Play Media +
-    // Select Source + Stop + Clear + Play + Shuffle Set
+    // Select Source + Stop + Clear + Play + Shuffle Set + Browse Media
-    supported_features: 64063,
+    supported_features: 195135,
     entity_picture: "/images/album_cover_2.jpg",
     media_duration: 300,
     media_position: 50,
@@ -24,8 +24,8 @@ export const createMediaPlayerEntities = () => [
     media_title: "I Wanna Be A Hippy (Flamman & Abraxas Radio Mix)",
     media_artist: "Technohead",
     // Pause + Seek + Volume Set + Volume Mute + Previous Track + Next Track + Play Media +
-    // Select Source + Stop + Clear + Play + Shuffle Set + Browse Media
+    // Select Source + Stop + Clear + Play + Shuffle Set
-    supported_features: 195135,
+    supported_features: 64063,
     entity_picture: "/images/album_cover.jpg",
     media_duration: 300,
     media_position: 0,

gallery/src/demos/demo-hui-alarm-panel-card.ts

@@ -73,7 +73,13 @@ const CONFIGS = [
 
 class DemoAlarmPanelEntity extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -82,6 +88,7 @@ class DemoAlarmPanelEntity extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/demos/demo-hui-conditional-card.ts

@@ -55,7 +55,13 @@ const CONFIGS = [
 
 class DemoConditional extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -64,6 +70,7 @@ class DemoConditional extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/demos/demo-hui-entity-button-card.ts

@@ -20,10 +20,10 @@ const CONFIGS = [
     `,
   },
   {
-    heading: "With Name (defined in card)",
+    heading: "With Name",
     config: `
 - type: button
-  name: Custom Name
+  name: Bedroom
   entity: light.bed_light
     `,
   },
@@ -32,7 +32,7 @@ const CONFIGS = [
     config: `
 - type: button
   entity: light.bed_light
-  icon: mdi:tools
+  icon: mdi:hotel
     `,
   },
   {
@@ -71,7 +71,13 @@ const CONFIGS = [
 
 class DemoButtonEntity extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -80,6 +86,7 @@ class DemoButtonEntity extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/demos/demo-hui-gauge-card.ts

@@ -7,8 +7,6 @@ import "../components/demo-cards";
 
 const ENTITIES = [
   getEntity("sensor", "brightness", "12", {}),
-  getEntity("sensor", "brightness_medium", "53", {}),
-  getEntity("sensor", "brightness_high", "87", {}),
   getEntity("plant", "bonsai", "ok", {}),
   getEntity("sensor", "not_working", "unavailable", {}),
   getEntity("sensor", "outside_humidity", "54", {
@@ -23,10 +21,16 @@ const CONFIGS = [
   {
     heading: "Basic example",
     config: `
+- type: gauge
+  entity: sensor.brightness
+    `,
+  },
+  {
+    heading: "With title",
+    config: `
 - type: gauge
   title: Humidity
   entity: sensor.outside_humidity
-  name: Outside Humidity
     `,
   },
   {
@@ -35,7 +39,6 @@ const CONFIGS = [
 - type: gauge
   entity: sensor.outside_temperature
   unit_of_measurement: C
-  name: Outside Temperature
     `,
   },
   {
@@ -43,45 +46,19 @@ const CONFIGS = [
     config: `
 - type: gauge
   entity: sensor.brightness
-  name: Brightness Low
   severity:
-    red: 75
+    red: 32
     green: 0
-    yellow: 50
+    yellow: 23
     `,
   },
   {
-    heading: "Setting Severity Levels",
+    heading: "Setting Min and Max Values",
-    config: `
-- type: gauge
-  entity: sensor.brightness_medium
-  name: Brightness Medium
-  severity:
-    red: 75
-    green: 0
-    yellow: 50
-    `,
-  },
-  {
-    heading: "Setting Severity Levels",
-    config: `
-- type: gauge
-  entity: sensor.brightness_high
-  name: Brightness High
-  severity:
-    red: 75
-    green: 0
-    yellow: 50
-    `,
-  },
-  {
-    heading: "Setting Min (0) and Max (15) Values",
     config: `
 - type: gauge
   entity: sensor.brightness
-  name: Brightness
   min: 0
-  max: 15
+  max: 38
     `,
   },
   {

gallery/src/demos/demo-hui-light-card.ts

@@ -8,43 +8,29 @@ import "../components/demo-cards";
 const ENTITIES = [
   getEntity("light", "bed_light", "on", {
     friendly_name: "Bed Light",
-    brightness: 255,
+    brightness: 130,
   }),
-  getEntity("light", "dim_on", "on", {
+  getEntity("light", "dim", "off", {
-    friendly_name: "Dining Room",
-    supported_features: 1,
-    brightness: 100,
-  }),
-  getEntity("light", "dim_off", "off", {
-    friendly_name: "Dining Room",
     supported_features: 1,
   }),
   getEntity("light", "unavailable", "unavailable", {
-    friendly_name: "Lost Light",
     supported_features: 1,
   }),
 ];
 
 const CONFIGS = [
   {
-    heading: "Switchable Light",
+    heading: "Basic example",
     config: `
 - type: light
   entity: light.bed_light
     `,
   },
   {
-    heading: "Dimmable Light On",
+    heading: "Dim",
     config: `
 - type: light
-  entity: light.dim_on
+  entity: light.dim
-    `,
-  },
-  {
-    heading: "Dimmable Light Off",
-    config: `
-- type: light
-  entity: light.dim_off
     `,
   },
   {

gallery/src/demos/demo-hui-map-card.ts

@@ -163,7 +163,13 @@ const CONFIGS = [
 
 class DemoMap extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -172,6 +178,7 @@ class DemoMap extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/demos/demo-hui-media-control-card.ts

@@ -146,21 +146,17 @@ const CONFIGS = [
     entity: media_player.receiver_off
     `,
   },
-  {
-    heading: "Grid Full Size",
-    config: `
-  - type: grid
-    columns: 1
-    cards:
-    - type: media-control
-      entity: media_player.music_paused
-    `,
-  },
 ];
 
 class DemoHuiMediControlCard extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -169,6 +165,7 @@ class DemoHuiMediControlCard extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/demos/demo-hui-media-player-rows.ts

@@ -57,7 +57,13 @@ const CONFIGS = [
 
 class DemoHuiMediaPlayerRows extends PolymerElement {
   static get template() {
-    return html` <demo-cards id="demos" configs="[[_configs]]"></demo-cards> `;
+    return html`
+      <demo-cards
+        id="demos"
+        hass="[[hass]]"
+        configs="[[_configs]]"
+      ></demo-cards>
+    `;
   }
 
   static get properties() {
@@ -66,6 +72,7 @@ class DemoHuiMediaPlayerRows extends PolymerElement {
         type: Object,
         value: CONFIGS,
       },
+      hass: Object,
     };
   }
 

gallery/src/ha-gallery.js

@@ -20,47 +20,48 @@ class HaGallery extends PolymerElement {
   static get template() {
     return html`
       <style include="iron-positioning ha-style">
-        :host {
+      :host {
-          -ms-user-select: initial;
+        -ms-user-select: initial;
-          -webkit-user-select: initial;
+        -webkit-user-select: initial;
-          -moz-user-select: initial;
+        -moz-user-select: initial;
-        }
+      }
-        app-header-layout {
+      app-header-layout {
-          min-height: 100vh;
+        min-height: 100vh;
-        }
+      }
-        ha-icon-button.invisible {
+      ha-icon-button.invisible {
-          visibility: hidden;
+        visibility: hidden;
-        }
+      }
 
-        .pickers {
+      .pickers {
-          display: flex;
+        display: flex;
-          flex-wrap: wrap;
+        flex-wrap: wrap;
-          justify-content: center;
+        justify-content: center;
-          align-items: start;
+        align-items: start;
-        }
+      }
 
-        .pickers ha-card {
+      .pickers ha-card {
-          width: 400px;
+        width: 400px;
-          display: block;
+        display: block;
-          margin: 16px 8px;
+        margin: 16px 8px;
-        }
+      }
 
-        .pickers ha-card:last-child {
+      .pickers ha-card:last-child {
-          margin-bottom: 16px;
+        margin-bottom: 16px;
-        }
+      }
 
-        .intro {
+      .intro {
-          margin: -1em 0;
+        margin: -1em 0;
-        }
+      }
 
-        p a {
+      p a {
-          color: var(--primary-color);
+        color: var(--primary-color);
-        }
+      }
+
+      a {
+        color: var(--primary-text-color);
+        text-decoration: none;
+      }
 
-        a {
-          color: var(--primary-text-color);
-          text-decoration: none;
-        }
       </style>
 
       <app-header-layout>
@@ -69,42 +70,32 @@ class HaGallery extends PolymerElement {
             <ha-icon-button
               icon="hass:arrow-left"
               on-click="_backTapped"
-              class$="[[_computeHeaderButtonClass(_demo)]]"
+              class$='[[_computeHeaderButtonClass(_demo)]]'
             ></ha-icon-button>
-            <div main-title>
+            <div main-title>[[_withDefault(_demo, "Home Assistant Gallery")]]</div>
-              [[_withDefault(_demo, "Home Assistant Gallery")]]
-            </div>
           </app-toolbar>
         </app-header>
 
-        <div class="content">
+        <div class='content'>
-          <div id="demo"></div>
+          <div id='demo'></div>
-          <template is="dom-if" if="[[!_demo]]">
+          <template is='dom-if' if='[[!_demo]]'>
-            <div class="pickers">
+            <div class='pickers'>
-              <ha-card header="Lovelace Card Demos">
+              <ha-card header="Lovelace card demos">
-                <div class="card-content intro">
+                <div class='card-content intro'>
                   <p>
-                    Lovelace has many different cards. Each card allows the user
+                    Lovelace has many different cards. Each card allows the user to tell a different story about what is going on in their house. These cards are very customizable, as no household is the same.
-                    to tell a different story about what is going on in their
-                    house. These cards are very customizable, as no household is
-                    the same.
                   </p>
 
                   <p>
-                    This gallery helps our developers and designers to see all
+                    This gallery helps our developers and designers to see all the different states that each card can be in.
-                    the different states that each card can be in.
                   </p>
 
                   <p>
-                    Check
+                    Check <a href='https://www.home-assistant.io/lovelace'>the official website</a> for instructions on how to get started with Lovelace.</a>.
-                    <a href="https://www.home-assistant.io/lovelace"
-                      >the official website</a
-                    >
-                    for instructions on how to get started with Lovelace.
                   </p>
                 </div>
-                <template is="dom-repeat" items="[[_lovelaceDemos]]">
+                <template is='dom-repeat' items='[[_lovelaceDemos]]'>
-                  <a href="#[[item]]">
+                  <a href='#[[item]]'>
                     <paper-item>
                       <paper-item-body>{{ item }}</paper-item-body>
                       <ha-icon icon="hass:chevron-right"></ha-icon>
@@ -113,14 +104,14 @@ class HaGallery extends PolymerElement {
                 </template>
               </ha-card>
 
-              <ha-card header="More Info Demos">
+              <ha-card header="More Info demos">
-                <div class="card-content intro">
+                <div class='card-content intro'>
                   <p>
                     More info screens show up when an entity is clicked.
                   </p>
                 </div>
-                <template is="dom-repeat" items="[[_moreInfoDemos]]">
+                <template is='dom-repeat' items='[[_moreInfoDemos]]'>
-                  <a href="#[[item]]">
+                  <a href='#[[item]]'>
                     <paper-item>
                       <paper-item-body>{{ item }}</paper-item-body>
                       <ha-icon icon="hass:chevron-right"></ha-icon>
@@ -129,14 +120,14 @@ class HaGallery extends PolymerElement {
                 </template>
               </ha-card>
 
-              <ha-card header="Util Demos">
+              <ha-card header="Util demos">
-                <div class="card-content intro">
+                <div class='card-content intro'>
                   <p>
                     Test pages for our utility functions.
                   </p>
                 </div>
-                <template is="dom-repeat" items="[[_utilDemos]]">
+                <template is='dom-repeat' items='[[_utilDemos]]'>
-                  <a href="#[[item]]">
+                  <a href='#[[item]]'>
                     <paper-item>
                       <paper-item-body>{{ item }}</paper-item-body>
                       <ha-icon icon="hass:chevron-right"></ha-icon>
@@ -148,10 +139,7 @@ class HaGallery extends PolymerElement {
           </template>
         </div>
       </app-header-layout>
-      <notification-manager
+      <notification-manager hass=[[_fakeHass]] id='notifications'></notification-manager>
-        hass="[[_fakeHass]]"
-        id="notifications"
-      ></notification-manager>
     `;
   }
 

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

@@ -27,8 +27,6 @@ declare global {
   }
 }
 
-const MAX_FILE_SIZE = 1 * 1024 * 1024 * 1024; // 1GB
-
 @customElement("hassio-upload-snapshot")
 export class HassioUploadSnapshot extends LitElement {
   public hass!: HomeAssistant;
@@ -53,20 +51,6 @@ export class HassioUploadSnapshot extends LitElement {
   private async _uploadFile(ev) {
     const file = ev.detail.files[0];
 
-    if (file.size > MAX_FILE_SIZE) {
-      showAlertDialog(this, {
-        title: "Snapshot file is too big",
-        text: html`The maximum allowed filesize is 1GB.<br />
-          <a
-            href="https://www.home-assistant.io/hassio/haos_common_tasks/#restoring-a-snapshot-on-a-new-install"
-            target="_blank"
-            >Have a look here on how to restore it.</a
-          >`,
-        confirmText: "ok",
-      });
-      return;
-    }
-
     if (!["application/x-tar"].includes(file.type)) {
       showAlertDialog(this, {
         title: "Unsupported file format",

hassio/src/dashboard/hassio-addons.ts

@@ -12,7 +12,7 @@ import { atLeastVersion } from "../../../src/common/config/version";
 import { navigate } from "../../../src/common/navigate";
 import { compare } from "../../../src/common/string/compare";
 import "../../../src/components/ha-card";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import { HassioAddonInfo } from "../../../src/data/hassio/addon";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import "../components/hassio-card-content";
@@ -22,14 +22,14 @@ import { hassioStyle } from "../resources/hassio-style";
 class HassioAddons extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property({ attribute: false }) public addons?: HassioAddonInfo[];
 
   protected render(): TemplateResult {
     return html`
       <div class="content">
         <h1>Add-ons</h1>
         <div class="card-group">
-          ${!this.supervisor.supervisor.addons?.length
+          ${!this.addons?.length
             ? html`
                 <ha-card>
                   <div class="card-content">
@@ -41,7 +41,7 @@ class HassioAddons extends LitElement {
                   </div>
                 </ha-card>
               `
-            : this.supervisor.supervisor.addons
+            : this.addons
                 .sort((a, b) => compare(a.name, b.name))
                 .map(
                   (addon) => html`

hassio/src/dashboard/hassio-dashboard.ts

@@ -7,7 +7,11 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import { HassioHassOSInfo } from "../../../src/data/hassio/host";
+import {
+  HassioHomeAssistantInfo,
+  HassioSupervisorInfo,
+} from "../../../src/data/hassio/supervisor";
 import "../../../src/layouts/hass-tabs-subpage";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant, Route } from "../../../src/types";
@@ -19,12 +23,16 @@ import "./hassio-update";
 class HassioDashboard extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ type: Boolean }) public narrow!: boolean;
 
   @property({ attribute: false }) public route!: Route;
 
+  @property({ attribute: false }) public supervisorInfo!: HassioSupervisorInfo;
+
+  @property({ attribute: false }) public hassInfo!: HassioHomeAssistantInfo;
+
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;
+
   protected render(): TemplateResult {
     return html`
       <hass-tabs-subpage
@@ -39,11 +47,13 @@ class HassioDashboard extends LitElement {
         <div class="content">
           <hassio-update
             .hass=${this.hass}
-            .supervisor=${this.supervisor}
+            .hassInfo=${this.hassInfo}
+            .supervisorInfo=${this.supervisorInfo}
+            .hassOsInfo=${this.hassOsInfo}
           ></hassio-update>
           <hassio-addons
             .hass=${this.hass}
-            .supervisor=${this.supervisor}
+            .addons=${this.supervisorInfo.addons}
           ></hassio-addons>
         </div>
       </hass-tabs-subpage>

hassio/src/dashboard/hassio-update.ts

@@ -23,7 +23,6 @@ import {
   HassioHomeAssistantInfo,
   HassioSupervisorInfo,
 } from "../../../src/data/hassio/supervisor";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -36,20 +35,31 @@ import { hassioStyle } from "../resources/hassio-style";
 export class HassioUpdate extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property({ attribute: false }) public hassInfo?: HassioHomeAssistantInfo;
 
-  private _pendingUpdates = memoizeOne((supervisor: Supervisor): number => {
+  @property({ attribute: false }) public hassOsInfo?: HassioHassOSInfo;
-    return Object.keys(supervisor).filter(
+
-      (value) => supervisor[value].update_available
+  @property({ attribute: false }) public supervisorInfo?: HassioSupervisorInfo;
-    ).length;
+
-  });
+  private _pendingUpdates = memoizeOne(
+    (
+      core?: HassioHomeAssistantInfo,
+      supervisor?: HassioSupervisorInfo,
+      os?: HassioHassOSInfo
+    ): number => {
+      return [core, supervisor, os].filter(
+        (value) => !!value && value?.update_available
+      ).length;
+    }
+  );
 
   protected render(): TemplateResult {
-    if (!this.supervisor) {
+    const updatesAvailable = this._pendingUpdates(
-      return html``;
+      this.hassInfo,
-    }
+      this.supervisorInfo,
+      this.hassOsInfo
+    );
 
-    const updatesAvailable = this._pendingUpdates(this.supervisor);
     if (!updatesAvailable) {
       return html``;
     }
@@ -64,24 +74,26 @@ export class HassioUpdate extends LitElement {
         <div class="card-group">
           ${this._renderUpdateCard(
             "Home Assistant Core",
-            this.supervisor.core,
+            this.hassInfo!,
             "hassio/homeassistant/update",
             `https://${
-              this.supervisor.core.version_latest.includes("b") ? "rc" : "www"
+              this.hassInfo?.version_latest.includes("b") ? "rc" : "www"
             }.home-assistant.io/latest-release-notes/`
           )}
           ${this._renderUpdateCard(
             "Supervisor",
-            this.supervisor.supervisor,
+            this.supervisorInfo!,
             "hassio/supervisor/update",
-            `https://github.com//home-assistant/hassio/releases/tag/${this.supervisor.supervisor.version_latest}`
+            `https://github.com//home-assistant/hassio/releases/tag/${
+              this.supervisorInfo!.version_latest
+            }`
           )}
-          ${this.supervisor.host.features.includes("hassos")
+          ${this.hassOsInfo
             ? this._renderUpdateCard(
                 "Operating System",
-                this.supervisor.os,
+                this.hassOsInfo,
                 "hassio/os/update",
-                `https://github.com//home-assistant/hassos/releases/tag/${this.supervisor.os.version_latest}`
+                `https://github.com//home-assistant/hassos/releases/tag/${this.hassOsInfo.version_latest}`
               )
             : ""}
         </div>

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

@@ -11,7 +11,10 @@ export const showHassioMarkdownDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-markdown",
-    dialogImport: () => import("./dialog-hassio-markdown"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-markdown" */ "./dialog-hassio-markdown"
+      ),
     dialogParams,
   });
 };

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

@@ -1,7 +1,5 @@
 import "@material/mwc-button/mwc-button";
 import "@material/mwc-icon-button";
-import "@material/mwc-list/mwc-list";
-import "@material/mwc-list/mwc-list-item";
 import "@material/mwc-tab";
 import "@material/mwc-tab-bar";
 import { mdiClose } from "@mdi/js";
@@ -18,22 +16,18 @@ import {
 } from "lit-element";
 import { cache } from "lit-html/directives/cache";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "../../../../src/components/ha-chips";
 import "../../../../src/components/ha-circular-progress";
 import "../../../../src/components/ha-dialog";
-import "../../../../src/components/ha-expansion-panel";
 import "../../../../src/components/ha-formfield";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-radio";
+import type { HaRadio } from "../../../../src/components/ha-radio";
 import "../../../../src/components/ha-related-items";
 import "../../../../src/components/ha-svg-icon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
-  AccessPoints,
-  accesspointScan,
   NetworkInterface,
   updateNetworkInterface,
-  WifiConfiguration,
 } from "../../../../src/data/hassio/network";
 import {
   showAlertDialog,
@@ -44,51 +38,54 @@ import { haStyleDialog } from "../../../../src/resources/styles";
 import type { HomeAssistant } from "../../../../src/types";
 import { HassioNetworkDialogParams } from "./show-dialog-network";
 
-const IP_VERSIONS = ["ipv4", "ipv6"];
-
 @customElement("dialog-hassio-network")
 export class DialogHassioNetwork extends LitElement
   implements HassDialog<HassioNetworkDialogParams> {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @internalProperty() private _accessPoints?: AccessPoints;
+  @internalProperty() private _prosessing = false;
-
-  @internalProperty() private _curTabIndex = 0;
-
-  @internalProperty() private _dirty = false;
-
-  @internalProperty() private _interface?: NetworkInterface;
-
-  @internalProperty() private _interfaces!: NetworkInterface[];
 
   @internalProperty() private _params?: HassioNetworkDialogParams;
 
-  @internalProperty() private _processing = false;
+  @internalProperty() private _network!: {
+    interface: string;
+    data: NetworkInterface;
+  }[];
 
-  @internalProperty() private _scanning = false;
+  @internalProperty() private _curTabIndex = 0;
 
-  @internalProperty() private _wifiConfiguration?: WifiConfiguration;
+  @internalProperty() private _device?: {
+    interface: string;
+    data: NetworkInterface;
+  };
+
+  @internalProperty() private _dirty = false;
 
   public async showDialog(params: HassioNetworkDialogParams): Promise<void> {
     this._params = params;
     this._dirty = false;
     this._curTabIndex = 0;
-    this._interfaces = params.network.interfaces.sort((a, b) => {
+    this._network = Object.keys(params.network?.interfaces)
-      return a.primary > b.primary ? -1 : 1;
+      .map((device) => ({
-    });
+        interface: device,
-    this._interface = { ...this._interfaces[this._curTabIndex] };
+        data: params.network.interfaces[device],
-
+      }))
+      .sort((a, b) => {
+        return a.data.primary > b.data.primary ? -1 : 1;
+      });
+    this._device = this._network[this._curTabIndex];
+    this._device.data.nameservers = String(this._device.data.nameservers);
     await this.updateComplete;
   }
 
   public closeDialog(): void {
     this._params = undefined;
-    this._processing = false;
+    this._prosessing = false;
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
   protected render(): TemplateResult {
-    if (!this._params || !this._interface) {
+    if (!this._params || !this._network) {
       return html``;
     }
 
@@ -110,11 +107,11 @@ export class DialogHassioNetwork extends LitElement
               <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
             </mwc-icon-button>
           </ha-header-bar>
-          ${this._interfaces.length > 1
+          ${this._network.length > 1
             ? html` <mwc-tab-bar
                 .activeIndex=${this._curTabIndex}
                 @MDCTabBar:activated=${this._handleTabActivated}
-                >${this._interfaces.map(
+                >${this._network.map(
                   (device) =>
                     html`<mwc-tab
                       .id=${device.interface}
@@ -132,302 +129,81 @@ export class DialogHassioNetwork extends LitElement
 
   private _renderTab() {
     return html` <div class="form container">
-        ${IP_VERSIONS.map((version) =>
+        <ha-formfield label="DHCP">
-          this._interface![version] ? this._renderIPConfiguration(version) : ""
+          <ha-radio
-        )}
+            @change=${this._handleRadioValueChanged}
-        ${this._interface?.type === "wireless"
+            value="dhcp"
-          ? html`
+            name="method"
-              <ha-expansion-panel header="Wi-Fi" outlined>
+            ?checked=${this._device!.data.method === "dhcp"}
-                ${this._interface?.wifi?.ssid
+          >
-                  ? html`<p>Connected to: ${this._interface?.wifi?.ssid}</p>`
+          </ha-radio>
-                  : ""}
+        </ha-formfield>
-                <mwc-button
+        <ha-formfield label="Static">
-                  class="scan"
+          <ha-radio
-                  @click=${this._scanForAP}
+            @change=${this._handleRadioValueChanged}
-                  .disabled=${this._scanning}
+            value="static"
-                >
+            name="method"
-                  ${this._scanning
+            ?checked=${this._device!.data.method === "static"}
-                    ? html`<ha-circular-progress active size="small">
+          >
-                      </ha-circular-progress>`
+          </ha-radio>
-                    : "Scan for accesspoints"}
+        </ha-formfield>
-                </mwc-button>
+        ${this._device!.data.method !== "dhcp"
-                ${this._accessPoints &&
+          ? html` <paper-input
-                this._accessPoints.accesspoints &&
-                this._accessPoints.accesspoints.length !== 0
-                  ? html`
-                      <mwc-list>
-                        ${this._accessPoints.accesspoints
-                          .filter((ap) => ap.ssid)
-                          .map(
-                            (ap) =>
-                              html`
-                                <mwc-list-item
-                                  twoline
-                                  @click=${this._selectAP}
-                                  .activated=${ap.ssid ===
-                                  this._wifiConfiguration?.ssid}
-                                  .ap=${ap}
-                                >
-                                  <span>${ap.ssid}</span>
-                                  <span slot="secondary">
-                                    ${ap.mac} - Strength: ${ap.signal}
-                                  </span>
-                                </mwc-list-item>
-                              `
-                          )}
-                      </mwc-list>
-                    `
-                  : ""}
-                ${this._wifiConfiguration
-                  ? html`
-                      <div class="radio-row">
-                        <ha-formfield label="open">
-                          <ha-radio
-                            @change=${this._handleRadioValueChangedAp}
-                            .ap=${this._wifiConfiguration}
-                            value="open"
-                            name="auth"
-                            .checked=${this._wifiConfiguration.auth ===
-                              undefined ||
-                            this._wifiConfiguration.auth === "open"}
-                          >
-                          </ha-radio>
-                        </ha-formfield>
-                        <ha-formfield label="wep">
-                          <ha-radio
-                            @change=${this._handleRadioValueChangedAp}
-                            .ap=${this._wifiConfiguration}
-                            value="wep"
-                            name="auth"
-                            .checked=${this._wifiConfiguration.auth === "wep"}
-                          >
-                          </ha-radio>
-                        </ha-formfield>
-                        <ha-formfield label="wpa-psk">
-                          <ha-radio
-                            @change=${this._handleRadioValueChangedAp}
-                            .ap=${this._wifiConfiguration}
-                            value="wpa-psk"
-                            name="auth"
-                            .checked=${this._wifiConfiguration.auth ===
-                            "wpa-psk"}
-                          >
-                          </ha-radio>
-                        </ha-formfield>
-                      </div>
-                      ${this._wifiConfiguration.auth === "wpa-psk" ||
-                      this._wifiConfiguration.auth === "wep"
-                        ? html`
-                            <paper-input
-                              class="flex-auto"
-                              type="password"
-                              id="psk"
-                              label="Password"
-                              version="wifi"
-                              @value-changed=${this
-                                ._handleInputValueChangedWifi}
-                            >
-                            </paper-input>
-                          `
-                        : ""}
-                    `
-                  : ""}
-              </ha-expansion-panel>
-            `
-          : ""}
-        ${this._dirty
-          ? html`<div class="warning">
-              If you are changing the Wi-Fi, IP or gateway addresses, you might
-              lose the connection!
-            </div>`
-          : ""}
-      </div>
-      <div class="buttons">
-        <mwc-button label="close" @click=${this.closeDialog}> </mwc-button>
-        <mwc-button @click=${this._updateNetwork} .disabled=${!this._dirty}>
-          ${this._processing
-            ? html`<ha-circular-progress active size="small">
-              </ha-circular-progress>`
-            : "Save"}
-        </mwc-button>
-      </div>`;
-  }
-
-  private _selectAP(event) {
-    this._wifiConfiguration = event.currentTarget.ap;
-    this._dirty = true;
-  }
-
-  private async _scanForAP() {
-    if (!this._interface) {
-      return;
-    }
-    this._scanning = true;
-    try {
-      this._accessPoints = await accesspointScan(
-        this.hass,
-        this._interface.interface
-      );
-    } catch (err) {
-      showAlertDialog(this, {
-        title: "Failed to scan for accesspoints",
-        text: extractApiErrorMessage(err),
-      });
-    } finally {
-      this._scanning = false;
-    }
-  }
-
-  private _renderIPConfiguration(version: string) {
-    return html`
-      <ha-expansion-panel
-        .header=${`IPv${version.charAt(version.length - 1)}`}
-        outlined
-      >
-        <div class="radio-row">
-          <ha-formfield label="DHCP">
-            <ha-radio
-              @change=${this._handleRadioValueChanged}
-              .version=${version}
-              value="auto"
-              name="${version}method"
-              .checked=${this._interface![version]?.method === "auto"}
-            >
-            </ha-radio>
-          </ha-formfield>
-          <ha-formfield label="Static">
-            <ha-radio
-              @change=${this._handleRadioValueChanged}
-              .version=${version}
-              value="static"
-              name="${version}method"
-              .checked=${this._interface![version]?.method === "static"}
-            >
-            </ha-radio>
-          </ha-formfield>
-          <ha-formfield label="Disabled" class="warning">
-            <ha-radio
-              @change=${this._handleRadioValueChanged}
-              .version=${version}
-              value="disabled"
-              name="${version}method"
-              .checked=${this._interface![version]?.method === "disabled"}
-            >
-            </ha-radio>
-          </ha-formfield>
-        </div>
-        ${this._interface![version].method === "static"
-          ? html`
-              <paper-input
                 class="flex-auto"
-                id="address"
+                id="ip_address"
                 label="IP address/Netmask"
-                .version=${version}
+                .value="${this._device!.data.ip_address}"
-                .value=${this._toString(this._interface![version].address)}
                 @value-changed=${this._handleInputValueChanged}
-              >
+              ></paper-input>
-              </paper-input>
               <paper-input
                 class="flex-auto"
                 id="gateway"
                 label="Gateway address"
-                .version=${version}
+                .value="${this._device!.data.gateway}"
-                .value=${this._interface![version].gateway}
                 @value-changed=${this._handleInputValueChanged}
-              >
+              ></paper-input>
-              </paper-input>
               <paper-input
                 class="flex-auto"
                 id="nameservers"
                 label="DNS servers"
-                .version=${version}
+                .value="${this._device!.data.nameservers as string}"
-                .value=${this._toString(this._interface![version].nameservers)}
                 @value-changed=${this._handleInputValueChanged}
-              >
+              ></paper-input>
-              </paper-input>
+              NB!: If you are changing IP or gateway addresses, you might lose
-            `
+              the connection.`
           : ""}
-      </ha-expansion-panel>
+      </div>
-    `;
+      <div class="buttons">
-  }
+        <mwc-button label="close" @click=${this.closeDialog}> </mwc-button>
-
+        <mwc-button @click=${this._updateNetwork} ?disabled=${!this._dirty}>
-  _toArray(data: string | string[]): string[] {
+          ${this._prosessing
-    if (Array.isArray(data)) {
+            ? html`<ha-circular-progress active></ha-circular-progress>`
-      if (data && typeof data[0] === "string") {
+            : "Update"}
-        data = data[0];
+        </mwc-button>
-      }
+      </div>`;
-    }
-    if (!data) {
-      return [];
-    }
-    if (typeof data === "string") {
-      return data.replace(/ /g, "").split(",");
-    }
-    return data;
-  }
-
-  _toString(data: string | string[]): string {
-    if (!data) {
-      return "";
-    }
-    if (Array.isArray(data)) {
-      return data.join(", ");
-    }
-    return data;
   }
 
   private async _updateNetwork() {
-    this._processing = true;
+    this._prosessing = true;
-    let interfaceOptions: Partial<NetworkInterface> = {};
+    let options: Partial<NetworkInterface> = {
-
+      method: this._device!.data.method,
-    IP_VERSIONS.forEach((version) => {
+    };
-      interfaceOptions[version] = {
+    if (options.method !== "dhcp") {
-        method: this._interface![version]?.method || "auto",
+      options = {
+        ...options,
+        address: this._device!.data.ip_address,
+        gateway: this._device!.data.gateway,
+        dns: String(this._device!.data.nameservers).split(","),
       };
-      if (this._interface![version]?.method === "static") {
-        interfaceOptions[version] = {
-          ...interfaceOptions[version],
-          address: this._toArray(this._interface![version]?.address),
-          gateway: this._interface![version]?.gateway,
-          nameservers: this._toArray(this._interface![version]?.nameservers),
-        };
-      }
-    });
-
-    if (this._wifiConfiguration) {
-      interfaceOptions = {
-        ...interfaceOptions,
-        wifi: {
-          ssid: this._wifiConfiguration.ssid,
-          mode: this._wifiConfiguration.mode,
-          auth: this._wifiConfiguration.auth || "open",
-        },
-      };
-      if (interfaceOptions.wifi!.auth !== "open") {
-        interfaceOptions.wifi = {
-          ...interfaceOptions.wifi,
-          psk: this._wifiConfiguration.psk,
-        };
-      }
     }
-
-    interfaceOptions.enabled =
-      this._wifiConfiguration !== undefined ||
-      interfaceOptions.ipv4?.method !== "disabled" ||
-      interfaceOptions.ipv6?.method !== "disabled";
-
     try {
-      await updateNetworkInterface(
+      await updateNetworkInterface(this.hass, this._device!.interface, options);
-        this.hass,
-        this._interface!.interface,
-        interfaceOptions
-      );
     } catch (err) {
       showAlertDialog(this, {
         title: "Failed to change network settings",
         text: extractApiErrorMessage(err),
       });
-      this._processing = false;
+      this._prosessing = false;
       return;
     }
     this._params?.loadData();
@@ -443,73 +219,40 @@ export class DialogHassioNetwork extends LitElement
         dismissText: "no",
       });
       if (!confirm) {
-        this.requestUpdate("_interface");
+        this.requestUpdate("_device");
         return;
       }
     }
     this._curTabIndex = ev.detail.index;
-    this._interface = { ...this._interfaces[ev.detail.index] };
+    this._device = this._network[ev.detail.index];
+    this._device.data.nameservers = String(this._device.data.nameservers);
   }
 
   private _handleRadioValueChanged(ev: CustomEvent): void {
-    const value = (ev.target as any).value as "disabled" | "auto" | "static";
+    const value = (ev.target as HaRadio).value as "dhcp" | "static";
-    const version = (ev.target as any).version as "ipv4" | "ipv6";
 
-    if (
+    if (!value || !this._device || this._device!.data.method === value) {
-      !value ||
-      !this._interface ||
-      this._interface[version]!.method === value
-    ) {
       return;
     }
+
     this._dirty = true;
 
-    this._interface[version]!.method = value;
+    this._device!.data.method = value;
-    this.requestUpdate("_interface");
+    this.requestUpdate("_device");
-  }
-
-  private _handleRadioValueChangedAp(ev: CustomEvent): void {
-    const value = ((ev.target as any).value as string) as
-      | "open"
-      | "wep"
-      | "wpa-psk";
-    this._wifiConfiguration!.auth = value;
-    this._dirty = true;
-    this.requestUpdate("_wifiConfiguration");
   }
 
   private _handleInputValueChanged(ev: CustomEvent): void {
     const value: string | null | undefined = (ev.target as PaperInputElement)
       .value;
-    const version = (ev.target as any).version as "ipv4" | "ipv6";
     const id = (ev.target as PaperInputElement).id;
 
-    if (
+    if (!value || !this._device || this._device.data[id] === value) {
-      !value ||
-      !this._interface ||
-      this._toString(this._interface[version]![id]) === this._toString(value)
-    ) {
       return;
     }
 
     this._dirty = true;
-    this._interface[version]![id] = value;
-  }
 
-  private _handleInputValueChangedWifi(ev: CustomEvent): void {
+    this._device.data[id] = value;
-    const value: string | null | undefined = (ev.target as PaperInputElement)
-      .value;
-    const id = (ev.target as PaperInputElement).id;
-
-    if (
-      !value ||
-      !this._wifiConfiguration ||
-      this._wifiConfiguration![id] === value
-    ) {
-      return;
-    }
-    this._dirty = true;
-    this._wifiConfiguration![id] = value;
   }
 
   static get styles(): CSSResult[] {
@@ -556,16 +299,12 @@ export class DialogHassioNetwork extends LitElement
           --mdc-theme-primary: var(--error-color);
         }
 
-        mwc-button.scan {
-          margin-left: 8px;
-        }
-
         :host([rtl]) app-toolbar {
           direction: rtl;
           text-align: right;
         }
         .container {
-          padding: 0 8px 4px;
+          padding: 20px 24px;
         }
         .form {
           margin-bottom: 53px;
@@ -583,24 +322,6 @@ export class DialogHassioNetwork extends LitElement
           padding-bottom: max(env(safe-area-inset-bottom), 8px);
           background-color: var(--mdc-theme-surface, #fff);
         }
-        .warning {
-          color: var(--error-color);
-          --primary-color: var(--error-color);
-        }
-        div.warning {
-          margin: 12px 4px -12px;
-        }
-
-        ha-expansion-panel {
-          --expansion-panel-summary-padding: 0 16px;
-          margin: 4px 0;
-        }
-        paper-input {
-          padding: 0 14px;
-        }
-        mwc-list-item {
-          --mdc-list-side-padding: 10px;
-        }
       `,
     ];
   }

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

@@ -13,7 +13,10 @@ export const showNetworkDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-network",
-    dialogImport: () => import("./dialog-hassio-network"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-network" */ "./dialog-hassio-network"
+      ),
     dialogParams,
   });
 };

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

@@ -4,7 +4,10 @@ import "./dialog-hassio-registries";
 export const showRegistriesDialog = (element: HTMLElement): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-registries",
-    dialogImport: () => import("./dialog-hassio-registries"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-registries" */ "./dialog-hassio-registries"
+      ),
     dialogParams: {},
   });
 };

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

@@ -13,7 +13,10 @@ export const showRepositoriesDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-repositories",
-    dialogImport: () => import("./dialog-hassio-repositories"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-repositories" */ "./dialog-hassio-repositories"
+      ),
     dialogParams,
   });
 };

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

@@ -109,7 +109,7 @@ class HassioSnapshotDialog extends LitElement {
       return html``;
     }
     return html`
-      <ha-dialog open @closing=${this._closeDialog} .heading=${true}>
+      <ha-dialog open stacked @closing=${this._closeDialog} .heading=${true}>
         <div slot="heading">
           <ha-header-bar>
             <span slot="title">
@@ -191,37 +191,47 @@ class HassioSnapshotDialog extends LitElement {
           : ""}
         ${this._error ? html` <p class="error">Error: ${this._error}</p> ` : ""}
 
-        <div class="button-row" slot="primaryAction">
+        <div>Actions:</div>
-          <mwc-button @click=${this._partialRestoreClicked}>
+        ${!this._onboarding
-            <ha-svg-icon .path=${mdiHistory} class="icon"></ha-svg-icon>
+          ? html`<mwc-button
-            Restore Selected
+              @click=${this._downloadClicked}
-          </mwc-button>
+              slot="primaryAction"
-          ${!this._onboarding
+            >
-            ? html`
+              <ha-svg-icon .path=${mdiDownload} class="icon"></ha-svg-icon>
-                <mwc-button @click=${this._deleteClicked}>
+              Download Snapshot
-                  <ha-svg-icon .path=${mdiDelete} class="icon warning">
+            </mwc-button>`
-                  </ha-svg-icon>
+          : ""}
-                  <span class="warning">Delete Snapshot</span>
+
-                </mwc-button>
+        <mwc-button
-              `
+          @click=${this._partialRestoreClicked}
-            : ""}
+          slot="secondaryAction"
-        </div>
+        >
-        <div class="button-row" slot="secondaryAction">
+          <ha-svg-icon .path=${mdiHistory} class="icon"></ha-svg-icon>
-          ${this._snapshot.type === "full"
+          Restore Selected
-            ? html`
+        </mwc-button>
-                <mwc-button @click=${this._fullRestoreClicked}>
+        ${this._snapshot.type === "full"
-                  <ha-svg-icon .path=${mdiHistory} class="icon"></ha-svg-icon>
+          ? html`
-                  Restore Everything
+              <mwc-button
-                </mwc-button>
+                @click=${this._fullRestoreClicked}
-              `
+                slot="secondaryAction"
-            : ""}
+              >
-          ${!this._onboarding
+                <ha-svg-icon .path=${mdiHistory} class="icon"></ha-svg-icon>
-            ? html`<mwc-button @click=${this._downloadClicked}>
+                Wipe &amp; restore
-                <ha-svg-icon .path=${mdiDownload} class="icon"></ha-svg-icon>
+              </mwc-button>
-                Download Snapshot
+            `
-              </mwc-button>`
+          : ""}
-            : ""}
+        ${!this._onboarding
-        </div>
+          ? html`<mwc-button
+              @click=${this._deleteClicked}
+              slot="secondaryAction"
+            >
+              <ha-svg-icon
+                .path=${mdiDelete}
+                class="icon warning"
+              ></ha-svg-icon>
+              <span class="warning">Delete Snapshot</span>
+            </mwc-button>`
+          : ""}
       </ha-dialog>
     `;
   }
@@ -235,14 +245,6 @@ class HassioSnapshotDialog extends LitElement {
           display: block;
           margin: 4px;
         }
-        mwc-button ha-svg-icon {
-          margin-right: 4px;
-        }
-        .button-row {
-          display: grid;
-          gap: 8px;
-          margin-right: 8px;
-        }
         .details {
           color: var(--secondary-text-color);
         }
@@ -250,6 +252,10 @@ class HassioSnapshotDialog extends LitElement {
         .error {
           color: var(--error-color);
         }
+        .buttons {
+          display: flex;
+          flex-direction: column;
+        }
         .buttons li {
           list-style-type: none;
         }

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

@@ -12,7 +12,10 @@ export const showHassioSnapshotDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-snapshot",
-    dialogImport: () => import("./dialog-hassio-snapshot"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-snapshot" */ "./dialog-hassio-snapshot"
+      ),
     dialogParams,
   });
 };

hassio/src/dialogs/snapshot/show-dialog-snapshot-upload.ts

@@ -13,7 +13,10 @@ export const showSnapshotUploadDialog = (
 ): void => {
   fireEvent(element, "show-dialog", {
     dialogTag: "dialog-hassio-snapshot-upload",
-    dialogImport: () => import("./dialog-hassio-snapshot-upload"),
+    dialogImport: () =>
+      import(
+        /* webpackChunkName: "dialog-hassio-snapshot-upload" */ "./dialog-hassio-snapshot-upload"
+      ),
     dialogParams,
   });
 };

hassio/src/hassio-main.ts

@@ -1,22 +1,29 @@
-import { html, PropertyValues, customElement, property } from "lit-element";
+import {
+  html,
+  PropertyValues,
+  customElement,
+  LitElement,
+  property,
+} from "lit-element";
 import "./hassio-router";
+import { urlSyncMixin } from "../../src/state/url-sync-mixin";
+import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
 import { HomeAssistant, Route } from "../../src/types";
 import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
 import { applyThemesOnElement } from "../../src/common/dom/apply_themes_on_element";
 import { fireEvent } from "../../src/common/dom/fire_event";
 import { makeDialogManager } from "../../src/dialogs/make-dialog-manager";
 import { atLeastVersion } from "../../src/common/config/version";
-import { SupervisorBaseElement } from "./supervisor-base-element";
 
 @customElement("hassio-main")
-export class HassioMain extends SupervisorBaseElement {
+export class HassioMain extends urlSyncMixin(ProvideHassLitMixin(LitElement)) {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public panel!: HassioPanelInfo;
+  @property() public panel!: HassioPanelInfo;
 
-  @property({ type: Boolean }) public narrow!: boolean;
+  @property() public narrow!: boolean;
 
-  @property({ attribute: false }) public route?: Route;
+  @property() public route?: Route;
 
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
@@ -70,13 +77,9 @@ export class HassioMain extends SupervisorBaseElement {
   }
 
   protected render() {
-    if (!this.supervisor || !this.hass) {
-      return html``;
-    }
     return html`
       <hassio-router
         .hass=${this.hass}
-        .supervisor=${this.supervisor}
         .route=${this.route}
         .panel=${this.panel}
         .narrow=${this.narrow}

hassio/src/hassio-panel-router.ts

@@ -1,5 +1,10 @@
 import { customElement, property } from "lit-element";
-import { Supervisor } from "../../src/data/supervisor/supervisor";
+import { HassioHassOSInfo, HassioHostInfo } from "../../src/data/hassio/host";
+import {
+  HassioHomeAssistantInfo,
+  HassioSupervisorInfo,
+  HassioInfo,
+} from "../../src/data/hassio/supervisor";
 import {
   HassRouterPage,
   RouterOptions,
@@ -16,12 +21,20 @@ import "./system/hassio-system";
 class HassioPanelRouter extends HassRouterPage {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ attribute: false }) public route!: Route;
 
   @property({ type: Boolean }) public narrow!: boolean;
 
+  @property({ attribute: false }) public supervisorInfo?: HassioSupervisorInfo;
+
+  @property({ attribute: false }) public hassioInfo!: HassioInfo;
+
+  @property({ attribute: false }) public hostInfo?: HassioHostInfo;
+
+  @property({ attribute: false }) public hassInfo?: HassioHomeAssistantInfo;
+
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;
+
   protected routerOptions: RouterOptions = {
     routes: {
       dashboard: {
@@ -41,9 +54,13 @@ class HassioPanelRouter extends HassRouterPage {
 
   protected updatePageEl(el) {
     el.hass = this.hass;
-    el.supervisor = this.supervisor;
     el.route = this.route;
     el.narrow = this.narrow;
+    el.supervisorInfo = this.supervisorInfo;
+    el.hassioInfo = this.hassioInfo;
+    el.hostInfo = this.hostInfo;
+    el.hassInfo = this.hassInfo;
+    el.hassOsInfo = this.hassOsInfo;
   }
 }
 

hassio/src/hassio-panel.ts

@@ -1,13 +1,18 @@
 import {
-  css,
-  CSSResult,
   customElement,
   html,
   LitElement,
   property,
   TemplateResult,
+  css,
+  CSSResult,
 } from "lit-element";
-import { Supervisor } from "../../src/data/supervisor/supervisor";
+import { HassioHassOSInfo, HassioHostInfo } from "../../src/data/hassio/host";
+import {
+  HassioHomeAssistantInfo,
+  HassioSupervisorInfo,
+  HassioInfo,
+} from "../../src/data/hassio/supervisor";
 import { HomeAssistant, Route } from "../../src/types";
 import "./hassio-panel-router";
 
@@ -15,19 +20,34 @@ import "./hassio-panel-router";
 class HassioPanel extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ type: Boolean }) public narrow!: boolean;
 
   @property({ attribute: false }) public route!: Route;
 
+  @property({ attribute: false }) public supervisorInfo!: HassioSupervisorInfo;
+
+  @property({ attribute: false }) public hassioInfo!: HassioInfo;
+
+  @property({ attribute: false }) public hostInfo!: HassioHostInfo;
+
+  @property({ attribute: false }) public hassInfo!: HassioHomeAssistantInfo;
+
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;
+
   protected render(): TemplateResult {
+    if (!this.supervisorInfo) {
+      return html``;
+    }
     return html`
       <hassio-panel-router
-        .hass=${this.hass}
-        .supervisor=${this.supervisor}
         .route=${this.route}
+        .hass=${this.hass}
         .narrow=${this.narrow}
+        .supervisorInfo=${this.supervisorInfo}
+        .hassioInfo=${this.hassioInfo}
+        .hostInfo=${this.hostInfo}
+        .hassInfo=${this.hassInfo}
+        .hassOsInfo=${this.hassOsInfo}
       ></hassio-panel-router>
     `;
   }

hassio/src/hassio-router.ts

@@ -1,6 +1,24 @@
-import { customElement, property } from "lit-element";
+import {
-import { HassioPanelInfo } from "../../src/data/hassio/supervisor";
+  customElement,
-import { Supervisor } from "../../src/data/supervisor/supervisor";
+  property,
+  internalProperty,
+  PropertyValues,
+} from "lit-element";
+import {
+  fetchHassioHassOsInfo,
+  fetchHassioHostInfo,
+  HassioHassOSInfo,
+  HassioHostInfo,
+} from "../../src/data/hassio/host";
+import {
+  fetchHassioHomeAssistantInfo,
+  fetchHassioSupervisorInfo,
+  fetchHassioInfo,
+  HassioHomeAssistantInfo,
+  HassioInfo,
+  HassioPanelInfo,
+  HassioSupervisorInfo,
+} from "../../src/data/hassio/supervisor";
 import {
   HassRouterPage,
   RouterOptions,
@@ -14,11 +32,9 @@ import "./hassio-panel";
 class HassioRouter extends HassRouterPage {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property() public panel!: HassioPanelInfo;
 
-  @property({ attribute: false }) public panel!: HassioPanelInfo;
+  @property() public narrow!: boolean;
-
-  @property({ type: Boolean }) public narrow!: boolean;
 
   protected routerOptions: RouterOptions = {
     // Hass.io has a page with tabs, so we route all non-matching routes to it.
@@ -35,22 +51,47 @@ class HassioRouter extends HassRouterPage {
       system: "dashboard",
       addon: {
         tag: "hassio-addon-dashboard",
-        load: () => import("./addon-view/hassio-addon-dashboard"),
+        load: () =>
+          import(
+            /* webpackChunkName: "hassio-addon-dashboard" */ "./addon-view/hassio-addon-dashboard"
+          ),
       },
       ingress: {
         tag: "hassio-ingress-view",
-        load: () => import("./ingress-view/hassio-ingress-view"),
+        load: () =>
+          import(
+            /* webpackChunkName: "hassio-ingress-view" */ "./ingress-view/hassio-ingress-view"
+          ),
       },
     },
   };
 
+  @internalProperty() private _supervisorInfo?: HassioSupervisorInfo;
+
+  @internalProperty() private _hostInfo?: HassioHostInfo;
+
+  @internalProperty() private _hassioInfo?: HassioInfo;
+
+  @internalProperty() private _hassOsInfo?: HassioHassOSInfo;
+
+  @internalProperty() private _hassInfo?: HassioHomeAssistantInfo;
+
+  protected firstUpdated(changedProps: PropertyValues) {
+    super.firstUpdated(changedProps);
+    this.addEventListener("hass-api-called", (ev) => this._apiCalled(ev));
+  }
+
   protected updatePageEl(el) {
     // the tabs page does its own routing so needs full route.
     const route = el.nodeName === "HASSIO-PANEL" ? this.route : this.routeTail;
 
     el.hass = this.hass;
-    el.supervisor = this.supervisor;
     el.narrow = this.narrow;
+    el.supervisorInfo = this._supervisorInfo;
+    el.hassioInfo = this._hassioInfo;
+    el.hostInfo = this._hostInfo;
+    el.hassInfo = this._hassInfo;
+    el.hassOsInfo = this._hassOsInfo;
     el.route = route;
 
     if (el.localName === "hassio-ingress-view") {
@@ -61,12 +102,45 @@ class HassioRouter extends HassRouterPage {
   private async _fetchData() {
     if (this.panel.config && this.panel.config.ingress) {
       this._redirectIngress(this.panel.config.ingress);
+      return;
+    }
+
+    const [supervisorInfo, hostInfo, hassInfo, hassioInfo] = await Promise.all([
+      fetchHassioSupervisorInfo(this.hass),
+      fetchHassioHostInfo(this.hass),
+      fetchHassioHomeAssistantInfo(this.hass),
+      fetchHassioInfo(this.hass),
+    ]);
+    this._supervisorInfo = supervisorInfo;
+    this._hassioInfo = hassioInfo;
+    this._hostInfo = hostInfo;
+    this._hassInfo = hassInfo;
+
+    if (this._hostInfo.features && this._hostInfo.features.includes("hassos")) {
+      this._hassOsInfo = await fetchHassioHassOsInfo(this.hass);
     }
   }
 
   private _redirectIngress(addonSlug: string) {
     this.route = { prefix: "/hassio", path: `/ingress/${addonSlug}` };
   }
+
+  private _apiCalled(ev) {
+    if (!ev.detail.success) {
+      return;
+    }
+
+    let tries = 1;
+
+    const tryUpdate = () => {
+      this._fetchData().catch(() => {
+        tries += 1;
+        setTimeout(tryUpdate, Math.min(tries, 5) * 1000);
+      });
+    };
+
+    tryUpdate();
+  }
 }
 
 declare global {

hassio/src/snapshots/hassio-snapshots.ts

@@ -26,6 +26,7 @@ import {
   TemplateResult,
 } from "lit-element";
 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-button-menu";
 import "../../../src/components/ha-card";
@@ -40,7 +41,7 @@ import {
   HassioSnapshot,
   reloadHassioSnapshots,
 } from "../../../src/data/hassio/snapshot";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import { HassioSupervisorInfo } from "../../../src/data/hassio/supervisor";
 import "../../../src/layouts/hass-tabs-subpage";
 import { PolymerChangedEvent } from "../../../src/polymer-types";
 import { haStyle } from "../../../src/resources/styles";
@@ -66,7 +67,7 @@ class HassioSnapshots extends LitElement {
 
   @property({ attribute: false }) public route!: Route;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property({ attribute: false }) public supervisorInfo!: HassioSupervisorInfo;
 
   @internalProperty() private _snapshotName = "";
 
@@ -265,7 +266,7 @@ class HassioSnapshots extends LitElement {
 
   protected updated(changedProps: PropertyValues) {
     if (changedProps.has("supervisorInfo")) {
-      this._addonList = this.supervisor.supervisor.addons
+      this._addonList = this.supervisorInfo.addons
         .map((addon) => ({
           slug: addon.slug,
           name: addon.name,
@@ -371,6 +372,7 @@ class HassioSnapshots extends LitElement {
         await createHassioPartialSnapshot(this.hass, data);
       }
       this._updateSnapshots();
+      fireEvent(this, "hass-api-called", { success: true, response: null });
     } catch (err) {
       this._error = extractApiErrorMessage(err);
     }

hassio/src/supervisor-base-element.ts

@@ -1,69 +0,0 @@
-import { LitElement, property, PropertyValues } from "lit-element";
-import {
-  fetchHassioHassOsInfo,
-  fetchHassioHostInfo,
-} from "../../src/data/hassio/host";
-import { fetchNetworkInfo } from "../../src/data/hassio/network";
-import { fetchHassioResolution } from "../../src/data/hassio/resolution";
-import {
-  fetchHassioHomeAssistantInfo,
-  fetchHassioInfo,
-  fetchHassioSupervisorInfo,
-} from "../../src/data/hassio/supervisor";
-import { Supervisor } from "../../src/data/supervisor/supervisor";
-import { ProvideHassLitMixin } from "../../src/mixins/provide-hass-lit-mixin";
-import { urlSyncMixin } from "../../src/state/url-sync-mixin";
-
-declare global {
-  interface HASSDomEvents {
-    "supervisor-update": Partial<Supervisor>;
-  }
-}
-
-export class SupervisorBaseElement extends urlSyncMixin(
-  ProvideHassLitMixin(LitElement)
-) {
-  @property({ attribute: false }) public supervisor?: Supervisor;
-
-  protected _updateSupervisor(obj: Partial<Supervisor>): void {
-    this.supervisor = { ...this.supervisor!, ...obj };
-  }
-
-  protected firstUpdated(changedProps: PropertyValues): void {
-    super.firstUpdated(changedProps);
-    this._initSupervisor();
-    this.addEventListener("supervisor-update", (ev) =>
-      this._updateSupervisor(ev.detail)
-    );
-  }
-
-  private async _initSupervisor(): Promise<void> {
-    const [
-      supervisor,
-      host,
-      core,
-      info,
-      os,
-      network,
-      resolution,
-    ] = await Promise.all([
-      fetchHassioSupervisorInfo(this.hass),
-      fetchHassioHostInfo(this.hass),
-      fetchHassioHomeAssistantInfo(this.hass),
-      fetchHassioInfo(this.hass),
-      fetchHassioHassOsInfo(this.hass),
-      fetchNetworkInfo(this.hass),
-      fetchHassioResolution(this.hass),
-    ]);
-
-    this.supervisor = {
-      supervisor,
-      host,
-      core,
-      info,
-      os,
-      network,
-      resolution,
-    };
-  }
-}

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

@@ -8,12 +8,12 @@ import {
   CSSResult,
   customElement,
   html,
+  internalProperty,
   LitElement,
   property,
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/buttons/ha-progress-button";
 import "../../../src/components/ha-button-menu";
 import "../../../src/components/ha-card";
@@ -27,6 +27,8 @@ import {
   changeHostOptions,
   configSyncOS,
   fetchHassioHostInfo,
+  HassioHassOSInfo,
+  HassioHostInfo as HassioHostInfoType,
   rebootHost,
   shutdownHost,
   updateOS,
@@ -35,7 +37,7 @@ import {
   fetchNetworkInfo,
   NetworkInfo,
 } from "../../../src/data/hassio/network";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import { HassioInfo } from "../../../src/data/hassio/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -51,22 +53,28 @@ import { hassioStyle } from "../resources/hassio-style";
 class HassioHostInfo extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property() public hostInfo!: HassioHostInfoType;
+
+  @property({ attribute: false }) public hassioInfo!: HassioInfo;
+
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;
+
+  @internalProperty() public _networkInfo?: NetworkInfo;
 
   protected render(): TemplateResult | void {
-    const primaryIpAddress = this.supervisor.host.features.includes("network")
+    const primaryIpAddress = this.hostInfo.features.includes("network")
-      ? this._primaryIpAddress(this.supervisor.network!)
+      ? this._primaryIpAddress(this._networkInfo!)
       : "";
     return html`
       <ha-card header="Host System">
         <div class="card-content">
-          ${this.supervisor.host.features.includes("hostname")
+          ${this.hostInfo.features.includes("hostname")
             ? html`<ha-settings-row>
                 <span slot="heading">
                   Hostname
                 </span>
                 <span slot="description">
-                  ${this.supervisor.host.hostname}
+                  ${this.hostInfo.hostname}
                 </span>
                 <mwc-button
                   title="Change the hostname"
@@ -76,7 +84,7 @@ class HassioHostInfo extends LitElement {
                 </mwc-button>
               </ha-settings-row>`
             : ""}
-          ${this.supervisor.host.features.includes("network")
+          ${this.hostInfo.features.includes("network")
             ? html` <ha-settings-row>
                 <span slot="heading">
                   IP Address
@@ -98,9 +106,10 @@ class HassioHostInfo extends LitElement {
               Operating System
             </span>
             <span slot="description">
-              ${this.supervisor.host.operating_system}
+              ${this.hostInfo.operating_system}
             </span>
-            ${this.supervisor.os.update_available
+            ${this.hostInfo.features.includes("hassos") &&
+            this.hassOsInfo.update_available
               ? html`
                   <ha-progress-button
                     title="Update the host OS"
@@ -111,29 +120,29 @@ class HassioHostInfo extends LitElement {
                 `
               : ""}
           </ha-settings-row>
-          ${!this.supervisor.host.features.includes("hassos")
+          ${!this.hostInfo.features.includes("hassos")
             ? html`<ha-settings-row>
                 <span slot="heading">
                   Docker version
                 </span>
                 <span slot="description">
-                  ${this.supervisor.info.docker}
+                  ${this.hassioInfo.docker}
                 </span>
               </ha-settings-row>`
             : ""}
-          ${this.supervisor.host.deployment
+          ${this.hostInfo.deployment
             ? html`<ha-settings-row>
                 <span slot="heading">
                   Deployment
                 </span>
                 <span slot="description">
-                  ${this.supervisor.host.deployment}
+                  ${this.hostInfo.deployment}
                 </span>
               </ha-settings-row>`
             : ""}
         </div>
         <div class="card-actions">
-          ${this.supervisor.host.features.includes("reboot")
+          ${this.hostInfo.features.includes("reboot")
             ? html`
                 <ha-progress-button
                   title="Reboot the host OS"
@@ -144,7 +153,7 @@ class HassioHostInfo extends LitElement {
                 </ha-progress-button>
               `
             : ""}
-          ${this.supervisor.host.features.includes("shutdown")
+          ${this.hostInfo.features.includes("shutdown")
             ? html`
                 <ha-progress-button
                   title="Shutdown the host OS"
@@ -166,7 +175,7 @@ class HassioHostInfo extends LitElement {
             <mwc-list-item title="Show a list of hardware">
               Hardware
             </mwc-list-item>
-            ${this.supervisor.host.features.includes("hassos")
+            ${this.hostInfo.features.includes("hassos")
               ? html`<mwc-list-item
                   title="Load HassOS configs or updates from USB"
                 >
@@ -184,10 +193,12 @@ class HassioHostInfo extends LitElement {
   }
 
   private _primaryIpAddress = memoizeOne((network_info: NetworkInfo) => {
-    if (!network_info || !network_info.interfaces) {
+    if (!network_info) {
       return "";
     }
-    return network_info.interfaces.find((a) => a.primary)?.ipv4?.address![0];
+    return Object.keys(network_info?.interfaces)
+      .map((device) => network_info.interfaces[device])
+      .find((device) => device.primary)?.ip_address;
   });
 
   private async _handleMenuAction(ev: CustomEvent<ActionDetail>) {
@@ -305,13 +316,13 @@ class HassioHostInfo extends LitElement {
 
   private async _changeNetworkClicked(): Promise<void> {
     showNetworkDialog(this, {
-      network: this.supervisor.network!,
+      network: this._networkInfo!,
       loadData: () => this._loadData(),
     });
   }
 
   private async _changeHostnameClicked(): Promise<void> {
-    const curHostname: string = this.supervisor.host.hostname;
+    const curHostname: string = this.hostInfo.hostname;
     const hostname = await showPromptDialog(this, {
       title: "Change Hostname",
       inputLabel: "Please enter a new hostname:",
@@ -322,8 +333,7 @@ class HassioHostInfo extends LitElement {
     if (hostname && hostname !== curHostname) {
       try {
         await changeHostOptions(this.hass, { hostname });
-        const host = await fetchHassioHostInfo(this.hass);
+        this.hostInfo = await fetchHassioHostInfo(this.hass);
-        fireEvent(this, "supervisor-update", { host });
       } catch (err) {
         showAlertDialog(this, {
           title: "Setting hostname failed",
@@ -336,8 +346,7 @@ class HassioHostInfo extends LitElement {
   private async _importFromUSB(): Promise<void> {
     try {
       await configSyncOS(this.hass);
-      const host = await fetchHassioHostInfo(this.hass);
+      this.hostInfo = await fetchHassioHostInfo(this.hass);
-      fireEvent(this, "supervisor-update", { host });
     } catch (err) {
       showAlertDialog(this, {
         title: "Failed to import from USB",
@@ -347,8 +356,7 @@ class HassioHostInfo extends LitElement {
   }
 
   private async _loadData(): Promise<void> {
-    const network = await fetchNetworkInfo(this.hass);
+    this._networkInfo = await fetchNetworkInfo(this.hass);
-    fireEvent(this, "supervisor-update", { network });
   }
 
   static get styles(): CSSResult[] {

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

@@ -13,15 +13,16 @@ import "../../../src/components/ha-card";
 import "../../../src/components/ha-settings-row";
 import "../../../src/components/ha-switch";
 import { extractApiErrorMessage } from "../../../src/data/hassio/common";
+import { HassioHostInfo as HassioHostInfoType } from "../../../src/data/hassio/host";
+import { fetchHassioResolution } from "../../../src/data/hassio/resolution";
 import {
   fetchHassioSupervisorInfo,
+  HassioSupervisorInfo as HassioSupervisorInfoType,
   reloadSupervisor,
-  restartSupervisor,
   setSupervisorOption,
   SupervisorOptions,
   updateSupervisor,
 } from "../../../src/data/hassio/supervisor";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -31,7 +32,7 @@ import { HomeAssistant } from "../../../src/types";
 import { documentationUrl } from "../../../src/util/documentation-url";
 import { hassioStyle } from "../resources/hassio-style";
 
-const UNSUPPORTED_REASON = {
+const ISSUES = {
   container: {
     title: "Containers known to cause issues",
     url: "/more-info/unsupported/container",
@@ -45,10 +46,6 @@ const UNSUPPORTED_REASON = {
     title: "Docker Version",
     url: "/more-info/unsupported/docker_version",
   },
-  job_conditions: {
-    title: "Ignored job conditions",
-    url: "/more-info/unsupported/job_conditions",
-  },
   lxc: { title: "LXC", url: "/more-info/unsupported/lxc" },
   network_manager: {
     title: "Network Manager",
@@ -62,30 +59,14 @@ const UNSUPPORTED_REASON = {
   systemd: { title: "Systemd", url: "/more-info/unsupported/systemd" },
 };
 
-const UNHEALTHY_REASON = {
-  privileged: {
-    title: "Supervisor is not privileged",
-    url: "/more-info/unsupported/privileged",
-  },
-  supervisor: {
-    title: "Supervisor was not able to update",
-    url: "/more-info/unhealthy/supervisor",
-  },
-  setup: {
-    title: "Setup of the Supervisor failed",
-    url: "/more-info/unhealthy/setup",
-  },
-  docker: {
-    title: "The Docker environment is not working properly",
-    url: "/more-info/unhealthy/docker",
-  },
-};
-
 @customElement("hassio-supervisor-info")
 class HassioSupervisorInfo extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property({ attribute: false })
+  public supervisorInfo!: HassioSupervisorInfoType;
+
+  @property() public hostInfo!: HassioHostInfoType;
 
   protected render(): TemplateResult | void {
     return html`
@@ -96,7 +77,7 @@ class HassioSupervisorInfo extends LitElement {
               Version
             </span>
             <span slot="description">
-              ${this.supervisor.supervisor.version}
+              ${this.supervisorInfo.version}
             </span>
           </ha-settings-row>
           <ha-settings-row>
@@ -104,9 +85,9 @@ class HassioSupervisorInfo extends LitElement {
               Newest Version
             </span>
             <span slot="description">
-              ${this.supervisor.supervisor.version_latest}
+              ${this.supervisorInfo.version_latest}
             </span>
-            ${this.supervisor.supervisor.update_available
+            ${this.supervisorInfo.update_available
               ? html`
                   <ha-progress-button
                     title="Update the supervisor"
@@ -122,9 +103,9 @@ class HassioSupervisorInfo extends LitElement {
               Channel
             </span>
             <span slot="description">
-              ${this.supervisor.supervisor.channel}
+              ${this.supervisorInfo.channel}
             </span>
-            ${this.supervisor.supervisor.channel === "beta"
+            ${this.supervisorInfo.channel === "beta"
               ? html`
                   <ha-progress-button
                     @click=${this._toggleBeta}
@@ -133,7 +114,7 @@ class HassioSupervisorInfo extends LitElement {
                     Leave beta channel
                   </ha-progress-button>
                 `
-              : this.supervisor.supervisor.channel === "stable"
+              : this.supervisorInfo.channel === "stable"
               ? html`
                   <ha-progress-button
                     @click=${this._toggleBeta}
@@ -145,7 +126,7 @@ class HassioSupervisorInfo extends LitElement {
               : ""}
           </ha-settings-row>
 
-          ${this.supervisor.supervisor.supported
+          ${this.supervisorInfo?.supported
             ? html` <ha-settings-row three-line>
                 <span slot="heading">
                   Share Diagnostics
@@ -162,7 +143,7 @@ class HassioSupervisorInfo extends LitElement {
                 </div>
                 <ha-switch
                   haptic
-                  .checked=${this.supervisor.supervisor.diagnostics}
+                  .checked=${this.supervisorInfo.diagnostics}
                   @change=${this._toggleDiagnostics}
                 ></ha-switch>
               </ha-settings-row>`
@@ -176,33 +157,14 @@ class HassioSupervisorInfo extends LitElement {
                   Learn more
                 </button>
               </div>`}
-          ${!this.supervisor.supervisor.healthy
-            ? html`<div class="error">
-                Your installtion is running in an unhealthy state.
-                <button
-                  class="link"
-                  title="Learn more about why your system is marked as unhealthy"
-                  @click=${this._unhealthyDialog}
-                >
-                  Learn more
-                </button>
-              </div>`
-            : ""}
         </div>
         <div class="card-actions">
           <ha-progress-button
             @click=${this._supervisorReload}
-            title="Reload parts of the Supervisor"
+            title="Reload parts of the supervisor"
           >
             Reload
           </ha-progress-button>
-          <ha-progress-button
-            class="warning"
-            @click=${this._supervisorRestart}
-            title="Restart the Supervisor"
-          >
-            Restart
-          </ha-progress-button>
         </div>
       </ha-card>
     `;
@@ -212,7 +174,7 @@ class HassioSupervisorInfo extends LitElement {
     const button = ev.currentTarget as any;
     button.progress = true;
 
-    if (this.supervisor.supervisor.channel === "stable") {
+    if (this.supervisorInfo.channel === "stable") {
       const confirmed = await showConfirmationDialog(this, {
         title: "WARNING",
         text: html` Beta releases are for testers and early adopters and can
@@ -241,19 +203,18 @@ class HassioSupervisorInfo extends LitElement {
 
     try {
       const data: Partial<SupervisorOptions> = {
-        channel:
+        channel: this.supervisorInfo.channel === "stable" ? "beta" : "stable",
-          this.supervisor.supervisor.channel === "stable" ? "beta" : "stable",
       };
       await setSupervisorOption(this.hass, data);
-      await this._reloadSupervisor();
+      await reloadSupervisor(this.hass);
+      fireEvent(this, "hass-api-called", { success: true, response: null });
     } catch (err) {
       showAlertDialog(this, {
         title: "Failed to set supervisor option",
         text: extractApiErrorMessage(err),
       });
-    } finally {
-      button.progress = false;
     }
+    button.progress = false;
   }
 
   private async _supervisorReload(ev: CustomEvent): Promise<void> {
@@ -261,37 +222,15 @@ class HassioSupervisorInfo extends LitElement {
     button.progress = true;
 
     try {
-      await this._reloadSupervisor();
+      await reloadSupervisor(this.hass);
+      this.supervisorInfo = await fetchHassioSupervisorInfo(this.hass);
     } catch (err) {
       showAlertDialog(this, {
         title: "Failed to reload the supervisor",
         text: extractApiErrorMessage(err),
       });
-    } finally {
-      button.progress = false;
-    }
-  }
-
-  private async _reloadSupervisor(): Promise<void> {
-    await reloadSupervisor(this.hass);
-    const supervisor = await fetchHassioSupervisorInfo(this.hass);
-    fireEvent(this, "supervisor-update", { supervisor });
-  }
-
-  private async _supervisorRestart(ev: CustomEvent): Promise<void> {
-    const button = ev.currentTarget as any;
-    button.progress = true;
-
-    try {
-      await restartSupervisor(this.hass);
-    } catch (err) {
-      showAlertDialog(this, {
-        title: "Failed to restart the supervisor",
-        text: extractApiErrorMessage(err),
-      });
-    } finally {
-      button.progress = false;
     }
+    button.progress = false;
   }
 
   private async _supervisorUpdate(ev: CustomEvent): Promise<void> {
@@ -300,7 +239,7 @@ class HassioSupervisorInfo extends LitElement {
 
     const confirmed = await showConfirmationDialog(this, {
       title: "Update Supervisor",
-      text: `Are you sure you want to update supervisor to version ${this.supervisor.supervisor.version_latest}?`,
+      text: `Are you sure you want to update supervisor to version ${this.supervisorInfo.version_latest}?`,
       confirmText: "update",
       dismissText: "cancel",
     });
@@ -317,9 +256,8 @@ class HassioSupervisorInfo extends LitElement {
         title: "Failed to update the supervisor",
         text: extractApiErrorMessage(err),
       });
-    } finally {
-      button.progress = false;
     }
+    button.progress = false;
   }
 
   private async _diagnosticsInformationDialog(): Promise<void> {
@@ -338,53 +276,22 @@ class HassioSupervisorInfo extends LitElement {
   }
 
   private async _unsupportedDialog(): Promise<void> {
+    const resolution = await fetchHassioResolution(this.hass);
     await showAlertDialog(this, {
       title: "You are running an unsupported installation",
       text: html`Below is a list of issues found with your installation, click
         on the links to learn how you can resolve the issues. <br /><br />
         <ul>
-          ${this.supervisor.resolution.unsupported.map(
+          ${resolution.unsupported.map(
             (issue) => html`
               <li>
-                ${UNSUPPORTED_REASON[issue]
+                ${ISSUES[issue]
                   ? html`<a
-                      href="${documentationUrl(
+                      href="${documentationUrl(this.hass, ISSUES[issue].url)}"
-                        this.hass,
-                        UNSUPPORTED_REASON[issue].url
-                      )}"
                       target="_blank"
                       rel="noreferrer"
                     >
-                      ${UNSUPPORTED_REASON[issue].title}
+                      ${ISSUES[issue].title}
-                    </a>`
-                  : issue}
-              </li>
-            `
-          )}
-        </ul>`,
-    });
-  }
-
-  private async _unhealthyDialog(): Promise<void> {
-    await showAlertDialog(this, {
-      title: "Your installation is unhealthy",
-      text: html`Running an unhealthy installation will cause issues. Below is a
-        list of issues found with your installation, click on the links to learn
-        how you can resolve the issues. <br /><br />
-        <ul>
-          ${this.supervisor.resolution.unhealthy.map(
-            (issue) => html`
-              <li>
-                ${UNHEALTHY_REASON[issue]
-                  ? html`<a
-                      href="${documentationUrl(
-                        this.hass,
-                        UNHEALTHY_REASON[issue].url
-                      )}"
-                      target="_blank"
-                      rel="noreferrer"
-                    >
-                      ${UNHEALTHY_REASON[issue].title}
                     </a>`
                   : issue}
               </li>
@@ -397,7 +304,7 @@ class HassioSupervisorInfo extends LitElement {
   private async _toggleDiagnostics(): Promise<void> {
     try {
       const data: SupervisorOptions = {
-        diagnostics: !this.supervisor.supervisor?.diagnostics,
+        diagnostics: !this.supervisorInfo?.diagnostics,
       };
       await setSupervisorOption(this.hass, data);
     } catch (err) {

hassio/src/system/hassio-system-metrics.ts

@@ -19,7 +19,6 @@ import "../../../src/components/ha-card";
 import "../../../src/components/ha-settings-row";
 import { fetchHassioStats, HassioStats } from "../../../src/data/hassio/common";
 import { HassioHostInfo } from "../../../src/data/hassio/host";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import { bytesToString } from "../../../src/util/bytes-to-string";
@@ -33,7 +32,7 @@ import { hassioStyle } from "../resources/hassio-style";
 class HassioSystemMetrics extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
+  @property() public hostInfo!: HassioHostInfo;
 
   @internalProperty() private _supervisorMetrics?: HassioStats;
 
@@ -65,8 +64,8 @@ class HassioSystemMetrics extends LitElement {
       },
       {
         description: "Used Space",
-        value: this._getUsedSpace(this.supervisor.host),
+        value: this._getUsedSpace(this.hostInfo),
-        tooltip: `${this.supervisor.host.disk_used} GB/${this.supervisor.host.disk_total} GB`,
+        tooltip: `${this.hostInfo.disk_used} GB/${this.hostInfo.disk_total} GB`,
       },
     ];
 

hassio/src/system/hassio-system.ts

@@ -7,7 +7,14 @@ import {
   property,
   TemplateResult,
 } from "lit-element";
-import { Supervisor } from "../../../src/data/supervisor/supervisor";
+import {
+  HassioHassOSInfo,
+  HassioHostInfo,
+} from "../../../src/data/hassio/host";
+import {
+  HassioInfo,
+  HassioSupervisorInfo,
+} from "../../../src/data/hassio/supervisor";
 import "../../../src/layouts/hass-tabs-subpage";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant, Route } from "../../../src/types";
@@ -22,12 +29,18 @@ import "./hassio-system-metrics";
 class HassioSystem extends LitElement {
   @property({ attribute: false }) public hass!: HomeAssistant;
 
-  @property({ attribute: false }) public supervisor!: Supervisor;
-
   @property({ type: Boolean }) public narrow!: boolean;
 
   @property({ attribute: false }) public route!: Route;
 
+  @property() public supervisorInfo!: HassioSupervisorInfo;
+
+  @property({ attribute: false }) public hassioInfo!: HassioInfo;
+
+  @property() public hostInfo!: HassioHostInfo;
+
+  @property({ attribute: false }) public hassOsInfo!: HassioHassOSInfo;
+
   protected render(): TemplateResult | void {
     return html`
       <hass-tabs-subpage
@@ -43,15 +56,18 @@ class HassioSystem extends LitElement {
           <div class="card-group">
             <hassio-supervisor-info
               .hass=${this.hass}
-              .supervisor=${this.supervisor}
+              .hostInfo=${this.hostInfo}
+              .supervisorInfo=${this.supervisorInfo}
             ></hassio-supervisor-info>
             <hassio-host-info
               .hass=${this.hass}
-              .supervisor=${this.supervisor}
+              .hassioInfo=${this.hassioInfo}
+              .hostInfo=${this.hostInfo}
+              .hassOsInfo=${this.hassOsInfo}
             ></hassio-host-info>
             <hassio-system-metrics
               .hass=${this.hass}
-              .supervisor=${this.supervisor}
+              .hostInfo=${this.hostInfo}
             ></hassio-system-metrics>
           </div>
           <hassio-supervisor-log .hass=${this.hass}></hassio-supervisor-log>

package.json

@@ -83,9 +83,6 @@
     "@types/sortablejs": "^1.10.6",
     "@vaadin/vaadin-combo-box": "^5.0.10",
     "@vaadin/vaadin-date-picker": "^4.0.7",
-    "@vibrant/color": "^3.2.1-alpha.1",
-    "@vibrant/core": "^3.2.1-alpha.1",
-    "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
     "@vue/web-component-wrapper": "^1.2.0",
     "@webcomponents/webcomponentsjs": "^2.2.7",
     "chart.js": "~2.8.0",
@@ -112,7 +109,7 @@
     "marked": "^1.1.1",
     "mdn-polyfills": "^5.16.0",
     "memoize-one": "^5.0.2",
-    "node-vibrant": "3.2.1-alpha.1",
+    "node-vibrant": "^3.1.6",
     "proxy-polyfill": "^0.3.1",
     "punycode": "^2.1.1",
     "qrcode": "^1.4.4",
@@ -123,8 +120,6 @@
     "superstruct": "^0.10.12",
     "tinykeys": "^1.1.1",
     "unfetch": "^4.1.0",
-    "vis-data": "^7.1.1",
-    "vis-network": "^8.5.4",
     "vue": "^2.6.11",
     "vue2-daterange-picker": "^0.5.1",
     "web-animations-js": "^2.3.2",
@@ -146,9 +141,6 @@
     "@babel/plugin-syntax-import-meta": "^7.10.4",
     "@babel/preset-env": "^7.11.5",
     "@babel/preset-typescript": "^7.10.4",
-    "@koa/cors": "^3.1.0",
-    "@open-wc/dev-server-hmr": "^0.0.2",
-    "@rollup/plugin-babel": "^5.2.1",
     "@rollup/plugin-commonjs": "^11.1.0",
     "@rollup/plugin-json": "^4.0.3",
     "@rollup/plugin-node-resolve": "^7.1.3",
@@ -167,8 +159,6 @@
     "@types/webspeechapi": "^0.0.29",
     "@typescript-eslint/eslint-plugin": "^4.4.0",
     "@typescript-eslint/parser": "^4.4.0",
-    "@web/dev-server": "^0.0.24",
-    "@web/dev-server-rollup": "^0.2.11",
     "babel-loader": "^8.1.0",
     "chai": "^4.2.0",
     "cpx": "^1.5.0",
@@ -205,6 +195,7 @@
     "raw-loader": "^2.0.0",
     "require-dir": "^1.2.0",
     "rollup": "^2.8.2",
+    "rollup-plugin-babel": "^4.4.0",
     "rollup-plugin-string": "^3.0.0",
     "rollup-plugin-terser": "^5.3.0",
     "rollup-plugin-visualizer": "^4.0.4",
@@ -218,6 +209,7 @@
     "typescript": "^4.0.3",
     "vinyl-buffer": "^1.0.1",
     "vinyl-source-stream": "^2.0.0",
+    "vite": "^1.0.0-rc.9",
     "webpack": "5.1.3",
     "webpack-cli": "4.1.0",
     "webpack-dev-server": "^3.11.0",

polymer.json

@@ -0,0 +1,40 @@
+{
+  "entrypoint": "index.html",
+  "shell": "src/entrypoints/app.js",
+  "fragments": [
+    "src/panels/config/ha-panel-config.js",
+    "src/panels/dev-event/ha-panel-dev-event.js",
+    "src/panels/dev-info/ha-panel-dev-info.js",
+    "src/panels/dev-mqtt/ha-panel-dev-mqtt.js",
+    "src/panels/dev-service/ha-panel-dev-service.js",
+    "src/panels/dev-state/ha-panel-dev-state.js",
+    "src/panels/dev-template/ha-panel-dev-template.js",
+    "src/panels/history/ha-panel-history.js",
+    "src/panels/iframe/ha-panel-iframe.js",
+    "src/panels/logbook/ha-panel-logbook.js",
+    "src/panels/map/ha-panel-map.js",
+    "src/panels/mailbox/ha-panel-mailbox.js",
+    "hassio/src/entrypoint.js"
+  ],
+  "sources": ["src/**/*", "!src/translations/*"],
+  "lint": {
+    "rules": ["polymer-3"],
+    "ignoreWarnings": ["could-not-resolve-reference", "could-not-load"],
+    "filesToIgnore": [
+      "**/*.html",
+      "**/src/panels/config/js/**/*.js",
+      "**/ha-iconset-svg.js",
+      "**/ha-script-editor.js",
+      "**/ha-automation-editor.js",
+      "**/ha-big-calendar.js"
+    ]
+  },
+  "builds": [
+    {
+      "preset": "es5-bundled"
+    },
+    {
+      "preset": "es6-bundled"
+    }
+  ]
+}

script/core

@@ -1,55 +0,0 @@
-#!/bin/sh
-# Helper to start Home Assistant Core inside the devcontainer
-
-# Stop on errors
-set -e
-
-if [ -z "${DEVCONTAINER}" ]; then
-  echo "This task should only run inside a devcontainer, for local install HA Core in a venv."
-  exit 1
-fi
-
-if [ ! -z "${CODESPACES}" ]; then
-  WORKSPACE="/root/workspace/frontend"
-else
-  WORKSPACE="/workspaces/frontend"
-fi
-
-if [ -z $(which hass) ]; then
-  echo "Installing Home Asstant core from dev."
-  python3 -m pip install --upgrade \
-    colorlog \
-    git+git://github.com/home-assistant/home-assistant.git@dev
-fi
-
-if [ ! -d "${WORKSPACE}/config" ]; then
-  echo "Creating default configuration."
-  mkdir -p "${WORKSPACE}/config";
-  hass --script ensure_config -c config
-  echo "demo:
-
-logger:
-  default: info
-  logs:
-    homeassistant.components.frontend: debug
-" >> "${WORKSPACE}/config/configuration.yaml"
-
-  if [ ! -z "${HASSIO}" ]; then
-  echo "
-# frontend:
-#   development_repo: ${WORKSPACE}
-
-hassio:
-  development_repo: ${WORKSPACE}" >> "${WORKSPACE}/config/configuration.yaml"
-  else
-  echo "
-frontend:
-  development_repo: ${WORKSPACE}
-
-# hassio:
-#   development_repo: ${WORKSPACE}" >> "${WORKSPACE}/config/configuration.yaml"
-  fi
-
-fi
-
-hass -c "${WORKSPACE}/config"

setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="home-assistant-frontend",
-    version="20201212.0",
+    version="20201111.0",
     description="The Home Assistant frontend",
     url="https://github.com/home-assistant/home-assistant-polymer",
     author="The Home Assistant Authors",

src/auth/ha-authorize.ts

@@ -18,7 +18,7 @@ import "./ha-auth-flow";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import punycode from "punycode";
 
-import("./ha-pick-auth-provider");
+import(/* webpackChunkName: "pick-auth-provider" */ "./ha-pick-auth-provider");
 
 class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
   @property() public clientId?: string;

src/common/color/rgb.ts

@@ -22,8 +22,3 @@ export const rgbContrast = (
 
   return (lum2 + 0.05) / (lum1 + 0.05);
 };
-
-export const getRGBContrastRatio = (
-  rgb1: [number, number, number],
-  rgb2: [number, number, number]
-) => Math.round((rgbContrast(rgb1, rgb2) + Number.EPSILON) * 100) / 100;

src/common/dom/apply_themes_on_element.ts

@@ -1,6 +1,5 @@
-import { Theme } from "../../data/ws-themes";
 import { darkStyles, derivedStyles } from "../../resources/styles";
-import type { HomeAssistant } from "../../types";
+import { HomeAssistant, Theme } from "../../types";
 import {
   hex2rgb,
   lab2hex,
@@ -14,10 +13,10 @@ import { rgbContrast } from "../color/rgb";
 
 interface ProcessedTheme {
   keys: { [key: string]: "" };
-  styles: Record<string, string>;
+  styles: { [key: string]: string };
 }
 
-let PROCESSED_THEMES: Record<string, ProcessedTheme> = {};
+let PROCESSED_THEMES: { [key: string]: ProcessedTheme } = {};
 
 /**
  * Apply a theme to an element by setting the CSS variables on it.

src/common/dom/dynamic-element-directive.ts

@@ -1,7 +1,7 @@
 import { directive, NodePart, Part } from "lit-html";
 
 export const dynamicElement = directive(
-  (tag: string, properties?: Record<string, any>) => (part: Part): void => {
+  (tag: string, properties?: { [key: string]: any }) => (part: Part): void => {
     if (!(part instanceof NodePart)) {
       throw new Error(
         "dynamicElementDirective can only be used in content bindings"

src/common/dom/setup-leaflet-map.ts

@@ -13,12 +13,13 @@ export const setupLeafletMap = async (
     throw new Error("Cannot setup Leaflet map on disconnected element");
   }
   // eslint-disable-next-line
-  const Leaflet = ((await import("leaflet")) as any)
+  const Leaflet = ((await import(
-    .default as LeafletModuleType;
+    /* webpackChunkName: "leaflet" */ "leaflet"
+  )) as any).default as LeafletModuleType;
   Leaflet.Icon.Default.imagePath = "/static/images/leaflet/images/";
 
   if (draw) {
-    await import("leaflet-draw");
+    await import(/* webpackChunkName: "leaflet-draw" */ "leaflet-draw");
   }
 
   const map = Leaflet.map(mapElement);

src/common/ensure-array.ts

@@ -1,6 +0,0 @@
-export const ensureArray = (value?: any) => {
-  if (!value || Array.isArray(value)) {
-    return value;
-  }
-  return [value];
-};

src/common/entity/compute_state_display.ts

@@ -5,7 +5,7 @@ import { formatDateTime } from "../datetime/format_date_time";
 import { formatTime } from "../datetime/format_time";
 import { LocalizeFunc } from "../translations/localize";
 import { computeStateDomain } from "./compute_state_domain";
-import { formatNumber } from "../string/format_number";
+import { numberFormat } from "../string/number-format";
 
 export const computeStateDisplay = (
   localize: LocalizeFunc,
@@ -20,7 +20,7 @@ export const computeStateDisplay = (
   }
 
   if (stateObj.attributes.unit_of_measurement) {
-    return `${formatNumber(compareState, language)} ${
+    return `${numberFormat(compareState, language)} ${
       stateObj.attributes.unit_of_measurement
     }`;
   }
@@ -67,10 +67,6 @@ export const computeStateDisplay = (
     }
   }
 
-  if (domain === "counter") {
-    return formatNumber(compareState, language);
-  }
-
   return (
     // Return device class translation
     (stateObj.attributes.device_class &&

src/common/entity/domain_icon.ts

@@ -77,11 +77,6 @@ export const domainIcon = (
         return "hass:calendar";
       }
       break;
-
-    case "sun":
-      return stateObj?.state === "above_horizon"
-        ? FIXED_DOMAIN_ICONS[domain]
-        : "hass:weather-night";
   }
 
   if (domain in FIXED_DOMAIN_ICONS) {

src/common/entity/extract_views.ts

@@ -1,5 +1,5 @@
 import { HassEntities } from "home-assistant-js-websocket";
-import type { GroupEntity } from "../../data/group";
+import { GroupEntity } from "../../types";
 import { DEFAULT_VIEW_ENTITY_ID } from "../const";
 
 // Return an ordered array of available views

src/common/entity/get_group_entities.ts

@@ -1,5 +1,5 @@
 import { HassEntities } from "home-assistant-js-websocket";
-import { GroupEntity } from "../../data/group";
+import { GroupEntity } from "../../types";
 
 export const getGroupEntities = (
   entities: HassEntities,

src/common/entity/get_view_entities.ts

@@ -1,5 +1,5 @@
 import { HassEntities } from "home-assistant-js-websocket";
-import { GroupEntity } from "../../data/group";
+import { GroupEntity } from "../../types";
 import { computeDomain } from "./compute_domain";
 import { getGroupEntities } from "./get_group_entities";
 

src/common/entity/split_by_groups.ts

@@ -1,5 +1,5 @@
 import { HassEntities } from "home-assistant-js-websocket";
-import { GroupEntity } from "../../data/group";
+import { GroupEntity } from "../../types";
 import { computeDomain } from "./compute_domain";
 
 // Split a collection into a list of groups and a 'rest' list of ungrouped

src/common/image/extract_color.ts

@@ -1,132 +0,0 @@
-import Vibrant from "node-vibrant/lib/browser";
-import MMCQ from "@vibrant/quantizer-mmcq";
-import { BasicPipeline } from "@vibrant/core/lib/pipeline";
-import { Swatch, Vec3 } from "@vibrant/color";
-import { getRGBContrastRatio } from "../color/rgb";
-
-const CONTRAST_RATIO = 4.5;
-
-// How much the total diff between 2 RGB colors can be
-// to be considered similar.
-const COLOR_SIMILARITY_THRESHOLD = 150;
-
-// For debug purposes, is being tree shaken.
-const DEBUG_COLOR = __DEV__ && false;
-
-const logColor = (
-  color: Swatch,
-  label = `${color.hex} - ${color.population}`
-) =>
-  // eslint-disable-next-line no-console
-  console.log(
-    `%c${label}`,
-    `color: ${color.bodyTextColor}; background-color: ${color.hex}`
-  );
-
-const customGenerator = (colors: Swatch[]) => {
-  colors.sort((colorA, colorB) => colorB.population - colorA.population);
-
-  const backgroundColor = colors[0];
-  let foregroundColor: Vec3 | undefined;
-
-  const contrastRatios = new Map<string, number>();
-  const approvedContrastRatio = (hex: string, rgb: Swatch["rgb"]) => {
-    if (!contrastRatios.has(hex)) {
-      contrastRatios.set(hex, getRGBContrastRatio(backgroundColor.rgb, rgb));
-    }
-
-    return contrastRatios.get(hex)! > CONTRAST_RATIO;
-  };
-
-  // We take each next color and find one that has better contrast.
-  for (let i = 1; i < colors.length && foregroundColor === undefined; i++) {
-    // If this color matches, score, take it.
-    if (approvedContrastRatio(colors[i].hex, colors[i].rgb)) {
-      if (DEBUG_COLOR) {
-        logColor(colors[i], "PICKED");
-      }
-      foregroundColor = colors[i].rgb;
-      break;
-    }
-
-    // This color has the wrong contrast ratio, but it is the right color.
-    // Let's find similar colors that might have the right contrast ratio
-
-    const currentColor = colors[i];
-    if (DEBUG_COLOR) {
-      logColor(colors[i], "Finding similar color with better contrast");
-    }
-
-    for (let j = i + 1; j < colors.length; j++) {
-      const compareColor = colors[j];
-
-      // difference. 0 is same, 765 max difference
-      const diffScore =
-        Math.abs(currentColor.rgb[0] - compareColor.rgb[0]) +
-        Math.abs(currentColor.rgb[1] - compareColor.rgb[1]) +
-        Math.abs(currentColor.rgb[2] - compareColor.rgb[2]);
-
-      if (DEBUG_COLOR) {
-        logColor(colors[j], `${colors[j].hex} - ${diffScore}`);
-      }
-
-      if (diffScore > COLOR_SIMILARITY_THRESHOLD) {
-        continue;
-      }
-
-      if (approvedContrastRatio(compareColor.hex, compareColor.rgb)) {
-        if (DEBUG_COLOR) {
-          logColor(compareColor, "PICKED");
-        }
-        foregroundColor = compareColor.rgb;
-        break;
-      }
-    }
-  }
-
-  if (foregroundColor === undefined) {
-    foregroundColor =
-      // @ts-expect-error
-      backgroundColor.getYiq() < 200 ? [255, 255, 255] : [0, 0, 0];
-  }
-
-  if (DEBUG_COLOR) {
-    // eslint-disable-next-line no-console
-    console.log();
-    // eslint-disable-next-line no-console
-    console.log(
-      "%cPicked colors",
-      `color: ${foregroundColor}; background-color: ${backgroundColor.hex}; font-weight: bold; padding: 16px;`
-    );
-    colors.forEach((color) => logColor(color));
-    // eslint-disable-next-line no-console
-    console.log();
-  }
-
-  return {
-    foreground: new Swatch(foregroundColor, 0),
-    background: backgroundColor,
-  };
-};
-
-Vibrant.use(
-  new BasicPipeline().filter
-    .register(
-      "default",
-      (r: number, g: number, b: number, a: number) =>
-        a >= 125 && !(r > 250 && g > 250 && b > 250)
-    )
-    .quantizer.register("mmcq", MMCQ)
-    // Our generator has different output
-    // @ts-expect-error
-    .generator.register("default", customGenerator)
-);
-
-export const extractColors = (url: string, downsampleColors = 16) =>
-  new Vibrant(url, {
-    colorCount: downsampleColors,
-  })
-    .getPalette()
-    .then(({ foreground, background }) => {
-      return { background: background!, foreground: foreground! };
-    });

src/common/string/format_number.ts

@@ -1,54 +0,0 @@
-/**
- * Formats a number based on the specified language with thousands separator(s) and decimal character for better legibility.
- *
- * @param num The number to format
- * @param language The language to use when formatting the number
- */
-export const formatNumber = (
-  num: string | number,
-  language: string,
-  options?: Intl.NumberFormatOptions
-): string => {
-  // Polyfill for Number.isNaN, which is more reliable than the global isNaN()
-  Number.isNaN =
-    Number.isNaN ||
-    function isNaN(input) {
-      return typeof input === "number" && isNaN(input);
-    };
-
-  if (!Number.isNaN(Number(num)) && Intl) {
-    return new Intl.NumberFormat(
-      language,
-      getDefaultFormatOptions(num, options)
-    ).format(Number(num));
-  }
-  return num.toString();
-};
-
-/**
- * Generates default options for Intl.NumberFormat
- * @param num The number to be formatted
- * @param options The Intl.NumberFormatOptions that should be included in the returned options
- */
-const getDefaultFormatOptions = (
-  num: string | number,
-  options?: Intl.NumberFormatOptions
-): Intl.NumberFormatOptions => {
-  const defaultOptions: Intl.NumberFormatOptions = options || {};
-
-  if (typeof num !== "string") {
-    return defaultOptions;
-  }
-
-  // Keep decimal trailing zeros if they are present in a string numeric value
-  if (
-    !options ||
-    (!options.minimumFractionDigits && !options.maximumFractionDigits)
-  ) {
-    const digits = num.indexOf(".") > -1 ? num.split(".")[1].length : 0;
-    defaultOptions.minimumFractionDigits = digits;
-    defaultOptions.maximumFractionDigits = digits;
-  }
-
-  return defaultOptions;
-};

src/common/string/number-format.ts

@@ -0,0 +1,22 @@
+/**
+ * Formats a number based on the specified language with thousands separator(s) and decimal character for better legibility.
+ *
+ * @param num The number to format
+ * @param language The language to use when formatting the number
+ */
+export const numberFormat = (
+  num: string | number,
+  language: string
+): string => {
+  // Polyfill for Number.isNaN, which is more reliable that the global isNaN()
+  Number.isNaN =
+    Number.isNaN ||
+    function isNaN(input) {
+      return typeof input === "number" && isNaN(input);
+    };
+
+  if (!Number.isNaN(Number(num)) && Intl) {
+    return new Intl.NumberFormat(language).format(Number(num));
+  }
+  return num.toString();
+};

src/common/translations/localize.ts

@@ -102,7 +102,7 @@ export const computeLocalize = async (
 export const localizeKey = (
   localize: LocalizeFunc,
   key: string,
-  placeholders?: Record<string, string>
+  placeholders?: { [key: string]: string }
 ) => {
   const args: [string, ...string[]] = [key];
   if (placeholders) {

src/common/url/search-params.ts

@@ -1,4 +1,4 @@
-export const extractSearchParamsObject = (): Record<string, string> => {
+export const extractSearchParamsObject = (): { [key: string]: string } => {
   const query = {};
   const searchParams = new URLSearchParams(location.search);
   for (const [key, value] of searchParams.entries()) {

src/common/util/copy-clipboard.ts

@@ -1,12 +1,8 @@
 export const copyToClipboard = (str) => {
-  if (navigator.clipboard) {
+  const el = document.createElement("textarea");
-    navigator.clipboard.writeText(str);
+  el.value = str;
-  } else {
+  document.body.appendChild(el);
-    const el = document.createElement("textarea");
+  el.select();
-    el.value = str;
+  document.execCommand("copy");
-    document.body.appendChild(el);
+  document.body.removeChild(el);
-    el.select();
-    document.execCommand("copy");
-    document.body.removeChild(el);
-  }
 };

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

@@ -98,12 +98,6 @@ export class HaDataTable extends LitElement {
 
   @property({ type: Boolean }) public hasFab = false;
 
-  /**
-   * Add an extra rows at the bottom of the datatabel
-   * @type {TemplateResult}
-   */
-  @property({ attribute: false }) public appendRow?;
-
   @property({ type: Boolean, attribute: "auto-height" })
   public autoHeight = false;
 
@@ -132,8 +126,6 @@ export class HaDataTable extends LitElement {
 
   @query("slot[name='header']") private _header!: HTMLSlotElement;
 
-  private _items: DataTableRowData[] = [];
-
   private _checkableRowsCount?: number;
 
   private _checkedRows: string[] = [];
@@ -326,13 +318,10 @@ export class HaDataTable extends LitElement {
                   @scroll=${this._saveScrollPos}
                 >
                   ${scroll({
-                    items: this._items,
+                    items: !this.hasFab
+                      ? this._filteredData
+                      : [...this._filteredData, ...[{ empty: true }]],
                     renderItem: (row: DataTableRowData, index) => {
-                      if (row.append) {
-                        return html`
-                          <div class="mdc-data-table__row">${row.content}</div>
-                        `;
-                      }
                       if (row.empty) {
                         return html` <div class="mdc-data-table__row"></div> `;
                       }
@@ -458,20 +447,6 @@ export class HaDataTable extends LitElement {
     if (this.curRequest !== curRequest) {
       return;
     }
-
-    if (this.appendRow || this.hasFab) {
-      this._items = [...data];
-
-      if (this.appendRow) {
-        this._items.push({ append: true, content: this.appendRow });
-      }
-
-      if (this.hasFab) {
-        this._items.push({ empty: true });
-      }
-    } else {
-      this._items = data;
-    }
     this._filteredData = data;
   }
 

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

@@ -139,7 +139,7 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
 
   private _filteredDevices: DeviceRegistryEntry[] = [];
 
-  private _getAreasWithDevices = memoizeOne(
+  private _getDevices = memoizeOne(
     (
       devices: DeviceRegistryEntry[],
       areas: AreaRegistryEntry[],
@@ -277,7 +277,7 @@ export class HaAreaDevicesPicker extends SubscribeMixin(LitElement) {
     if (!this._devices || !this._areas || !this._entities) {
       return html``;
     }
-    const areas = this._getAreasWithDevices(
+    const areas = this._getDevices(
       this._devices,
       this._areas,
       this._entities,

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

@@ -1,5 +1,4 @@
-import "../ha-svg-icon";
+import "../ha-icon-button";
-import "@material/mwc-icon-button/mwc-icon-button";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
@@ -13,8 +12,6 @@ import {
   html,
   LitElement,
   property,
-  PropertyValues,
-  query,
   TemplateResult,
 } from "lit-element";
 import memoizeOne from "memoize-one";
@@ -38,7 +35,6 @@ import {
 import { SubscribeMixin } from "../../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../../polymer-types";
 import { HomeAssistant } from "../../types";
-import { mdiClose, mdiMenuUp, mdiMenuDown } from "@mdi/js";
 
 interface Device {
   name: string;
@@ -46,10 +42,6 @@ interface Device {
   id: string;
 }
 
-export type HaDevicePickerDeviceFilterFunc = (
-  device: DeviceRegistryEntry
-) => boolean;
-
 const rowRenderer = (root: HTMLElement, _owner, model: { item: Device }) => {
   if (!root.firstElementChild) {
     root.innerHTML = `
@@ -110,15 +102,9 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
   @property({ type: Array, attribute: "include-device-classes" })
   public includeDeviceClasses?: string[];
 
-  @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
-
   @property({ type: Boolean })
   private _opened?: boolean;
 
-  @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement;
-
-  private _init = false;
-
   private _getDevices = memoizeOne(
     (
       devices: DeviceRegistryEntry[],
@@ -126,31 +112,21 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
       entities: EntityRegistryEntry[],
       includeDomains: this["includeDomains"],
       excludeDomains: this["excludeDomains"],
-      includeDeviceClasses: this["includeDeviceClasses"],
+      includeDeviceClasses: this["includeDeviceClasses"]
-      deviceFilter: this["deviceFilter"]
     ): Device[] => {
       if (!devices.length) {
-        return [
+        return [];
-          {
-            id: "",
-            area: "",
-            name: this.hass.localize("ui.components.device-picker.no_devices"),
-          },
-        ];
       }
 
       const deviceEntityLookup: DeviceEntityLookup = {};
-
+      for (const entity of entities) {
-      if (includeDomains || excludeDomains || includeDeviceClasses) {
+        if (!entity.device_id) {
-        for (const entity of entities) {
+          continue;
-          if (!entity.device_id) {
-            continue;
-          }
-          if (!(entity.device_id in deviceEntityLookup)) {
-            deviceEntityLookup[entity.device_id] = [];
-          }
-          deviceEntityLookup[entity.device_id].push(entity);
         }
+        if (!(entity.device_id in deviceEntityLookup)) {
+          deviceEntityLookup[entity.device_id] = [];
+        }
+        deviceEntityLookup[entity.device_id].push(entity);
       }
 
       const areaLookup: { [areaId: string]: AreaRegistryEntry } = {};
@@ -158,9 +134,7 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
         areaLookup[area.area_id] = area;
       }
 
-      let inputDevices = devices.filter(
+      let inputDevices = [...devices];
-        (device) => device.id === this.value || !device.disabled_by
-      );
 
       if (includeDomains) {
         inputDevices = inputDevices.filter((device) => {
@@ -206,14 +180,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
         });
       }
 
-      if (deviceFilter) {
-        inputDevices = inputDevices.filter(
-          (device) =>
-            // We always want to include the device of the current value
-            device.id === this.value || deviceFilter!(device)
-        );
-      }
-
       const outputDevices = inputDevices.map((device) => {
         return {
           id: device.id,
@@ -227,15 +193,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
             : this.hass.localize("ui.components.device-picker.no_area"),
         };
       });
-      if (!outputDevices.length) {
-        return [
-          {
-            id: "",
-            area: "",
-            name: this.hass.localize("ui.components.device-picker.no_match"),
-          },
-        ];
-      }
       if (outputDevices.length === 1) {
         return outputDevices;
       }
@@ -243,18 +200,6 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
     }
   );
 
-  public open() {
-    this.updateComplete.then(() => {
-      (this.shadowRoot?.querySelector("vaadin-combo-box-light") as any)?.open();
-    });
-  }
-
-  public focus() {
-    this.updateComplete.then(() => {
-      this.shadowRoot?.querySelector("paper-input")?.focus();
-    });
-  }
-
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeDeviceRegistry(this.hass.connection!, (devices) => {
@@ -269,33 +214,24 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
     ];
   }
 
-  protected updated(changedProps: PropertyValues) {
-    if (
-      (!this._init && this.devices && this.areas && this.entities) ||
-      (changedProps.has("_opened") && this._opened)
-    ) {
-      this._init = true;
-      (this._comboBox as any).items = this._getDevices(
-        this.devices!,
-        this.areas!,
-        this.entities!,
-        this.includeDomains,
-        this.excludeDomains,
-        this.includeDeviceClasses,
-        this.deviceFilter
-      );
-    }
-  }
-
   protected render(): TemplateResult {
     if (!this.devices || !this.areas || !this.entities) {
       return html``;
     }
+    const devices = this._getDevices(
+      this.devices,
+      this.areas,
+      this.entities,
+      this.includeDomains,
+      this.excludeDomains,
+      this.includeDeviceClasses
+    );
     return html`
       <vaadin-combo-box-light
         item-value-path="id"
         item-id-path="id"
         item-label-path="name"
+        .items=${devices}
         .value=${this._value}
         .renderer=${rowRenderer}
         @opened-changed=${this._openedChanged}
@@ -313,30 +249,34 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
         >
           ${this.value
             ? html`
-                <mwc-icon-button
+                <ha-icon-button
-                  .label=${this.hass.localize(
+                  aria-label=${this.hass.localize(
                     "ui.components.device-picker.clear"
                   )}
                   slot="suffix"
                   class="clear-button"
+                  icon="hass:close"
                   @click=${this._clearValue}
+                  no-ripple
                 >
-                  <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+                  Clear
-                </mwc-icon-button>
+                </ha-icon-button>
+              `
+            : ""}
+          ${devices.length > 0
+            ? html`
+                <ha-icon-button
+                  aria-label=${this.hass.localize(
+                    "ui.components.device-picker.show_devices"
+                  )}
+                  slot="suffix"
+                  class="toggle-button"
+                  .icon=${this._opened ? "hass:menu-up" : "hass:menu-down"}
+                >
+                  Toggle
+                </ha-icon-button>
               `
             : ""}
-
-          <mwc-icon-button
-            .label=${this.hass.localize(
-              "ui.components.device-picker.show_devices"
-            )}
-            slot="suffix"
-            class="toggle-button"
-          >
-            <ha-svg-icon
-              .path=${this._opened ? mdiMenuUp : mdiMenuDown}
-            ></ha-svg-icon>
-          </mwc-icon-button>
         </paper-input>
       </vaadin-combo-box-light>
     `;
@@ -373,7 +313,7 @@ export class HaDevicePicker extends SubscribeMixin(LitElement) {
 
   static get styles(): CSSResult {
     return css`
-      paper-input > mwc-icon-button {
+      paper-input > ha-icon-button {
         --mdc-icon-button-size: 24px;
         padding: 2px;
         color: var(--secondary-text-color);

src/components/entity/ha-chart-base.js

@@ -230,7 +230,9 @@ class HaChartBase extends mixinBehaviors(
     }
 
     if (scriptsLoaded === null) {
-      scriptsLoaded = import("../../resources/ha-chart-scripts.js");
+      scriptsLoaded = import(
+        /* webpackChunkName: "load_chart" */ "../../resources/ha-chart-scripts.js"
+      );
     }
     scriptsLoaded.then((ChartModule) => {
       this.ChartClass = ChartModule.default;

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

@@ -101,18 +101,6 @@ export class HaEntityPicker extends LitElement {
 
   @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement;
 
-  public open() {
-    this.updateComplete.then(() => {
-      (this.shadowRoot?.querySelector("vaadin-combo-box-light") as any)?.open();
-    });
-  }
-
-  public focus() {
-    this.updateComplete.then(() => {
-      this.shadowRoot?.querySelector("paper-input")?.focus();
-    });
-  }
-
   private _initedStates = false;
 
   private _states: HassEntity[] = [];
@@ -165,24 +153,6 @@ export class HaEntityPicker extends LitElement {
         );
       }
 
-      if (!states.length) {
-        return [
-          {
-            entity_id: "",
-            state: "",
-            last_changed: "",
-            last_updated: "",
-            context: { id: "", user_id: null },
-            attributes: {
-              friendly_name: this.hass!.localize(
-                "ui.components.entity.entity-picker.no_match"
-              ),
-              icon: "mdi:magnify",
-            },
-          },
-        ];
-      }
-
       return states;
     }
   );
@@ -233,6 +203,7 @@ export class HaEntityPicker extends LitElement {
           .label=${this.label === undefined
             ? this.hass.localize("ui.components.entity.entity-picker.entity")
             : this.label}
+          .value=${this._value}
           .disabled=${this.disabled}
           class="input"
           autocapitalize="none"

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

@@ -21,7 +21,6 @@ import { timerTimeRemaining } from "../../common/entity/timer_time_remaining";
 import { HomeAssistant } from "../../types";
 import "../ha-label-badge";
 import { UNAVAILABLE, UNKNOWN } from "../../data/entity";
-import { formatNumber } from "../../common/string/format_number";
 
 @customElement("ha-state-label-badge")
 export class HaStateLabelBadge extends LitElement {
@@ -116,7 +115,7 @@ export class HaStateLabelBadge extends LitElement {
           : state.state === UNKNOWN
           ? "-"
           : state.attributes.unit_of_measurement
-          ? formatNumber(state.state, this.hass!.language)
+          ? state.state
           : computeStateDisplay(
               this.hass!.localize,
               state,
@@ -155,8 +154,11 @@ export class HaStateLabelBadge extends LitElement {
       case "device_tracker":
       case "updater":
       case "person":
-      case "sun":
         return stateIcon(state);
+      case "sun":
+        return state.state === "above_horizon"
+          ? domainIcon(domain)
+          : "hass:brightness-3";
       case "timer":
         return state.state === "active"
           ? "hass:timer-outline"

src/components/entity/state-info.ts

@@ -94,6 +94,7 @@ class StateInfo extends LitElement {
   static get styles(): CSSResult {
     return css`
       :host {
+        @apply --paper-font-body1;
         min-width: 120px;
         white-space: nowrap;
       }
@@ -117,10 +118,9 @@ class StateInfo extends LitElement {
       }
 
       .name {
+        @apply --paper-font-common-nowrap;
         color: var(--primary-text-color);
-        white-space: nowrap;
+        line-height: 40px;
-        overflow: hidden;
-        text-overflow: ellipsis;
       }
 
       .name[in-dialog],
@@ -131,10 +131,8 @@ class StateInfo extends LitElement {
       .time-ago,
       .extra-info,
       .extra-info > * {
+        @apply --paper-font-common-nowrap;
         color: var(--secondary-text-color);
-        white-space: nowrap;
-        overflow: hidden;
-        text-overflow: ellipsis;
       }
 
       .row {

src/components/ha-area-picker.ts

@@ -1,5 +1,4 @@
-import "./ha-svg-icon";
+import "./ha-icon-button";
-import "@material/mwc-icon-button/mwc-icon-button";
 import "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
@@ -15,8 +14,6 @@ import {
   property,
   internalProperty,
   TemplateResult,
-  PropertyValues,
-  query,
 } from "lit-element";
 import { fireEvent } from "../common/dom/fire_event";
 import {
@@ -31,19 +28,6 @@ import {
 import { SubscribeMixin } from "../mixins/subscribe-mixin";
 import { PolymerChangedEvent } from "../polymer-types";
 import { HomeAssistant } from "../types";
-import memoizeOne from "memoize-one";
-import {
-  DeviceEntityLookup,
-  DeviceRegistryEntry,
-  subscribeDeviceRegistry,
-} from "../data/device_registry";
-import {
-  EntityRegistryEntry,
-  subscribeEntityRegistry,
-} from "../data/entity_registry";
-import { computeDomain } from "../common/entity/compute_domain";
-import type { HaDevicePickerDeviceFilterFunc } from "./device/ha-device-picker";
-import { mdiClose, mdiMenuDown, mdiMenuUp } from "@mdi/js";
 
 const rowRenderer = (
   root: HTMLElement,
@@ -84,252 +68,31 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
 
   @property() public value?: string;
 
-  @property() public placeholder?: string;
+  @property() public _areas?: AreaRegistryEntry[];
 
   @property({ type: Boolean, attribute: "no-add" })
   public noAdd?: boolean;
 
-  /**
-   * Show only areas with entities from specific domains.
-   * @type {Array}
-   * @attr include-domains
-   */
-  @property({ type: Array, attribute: "include-domains" })
-  public includeDomains?: string[];
-
-  /**
-   * Show no areas with entities of these domains.
-   * @type {Array}
-   * @attr exclude-domains
-   */
-  @property({ type: Array, attribute: "exclude-domains" })
-  public excludeDomains?: string[];
-
-  /**
-   * Show only areas with entities of these device classes.
-   * @type {Array}
-   * @attr include-device-classes
-   */
-  @property({ type: Array, attribute: "include-device-classes" })
-  public includeDeviceClasses?: string[];
-
-  @property() public deviceFilter?: HaDevicePickerDeviceFilterFunc;
-
-  @property() public entityFilter?: (entity: EntityRegistryEntry) => boolean;
-
-  @internalProperty() private _areas?: AreaRegistryEntry[];
-
-  @internalProperty() private _devices?: DeviceRegistryEntry[];
-
-  @internalProperty() private _entities?: EntityRegistryEntry[];
-
   @internalProperty() private _opened?: boolean;
 
-  @query("vaadin-combo-box-light", true) private _comboBox!: HTMLElement;
-
-  private _init = false;
-
   public hassSubscribe(): UnsubscribeFunc[] {
     return [
       subscribeAreaRegistry(this.hass.connection!, (areas) => {
-        this._areas = areas;
+        this._areas = this.noAdd
-      }),
+          ? areas
-      subscribeDeviceRegistry(this.hass.connection!, (devices) => {
+          : [
-        this._devices = devices;
+              ...areas,
-      }),
+              {
-      subscribeEntityRegistry(this.hass.connection!, (entities) => {
+                area_id: "add_new",
-        this._entities = entities;
+                name: this.hass.localize("ui.components.area-picker.add_new"),
+              },
+            ];
       }),
     ];
   }
 
-  public open() {
-    this.updateComplete.then(() => {
-      (this.shadowRoot?.querySelector("vaadin-combo-box-light") as any)?.open();
-    });
-  }
-
-  public focus() {
-    this.updateComplete.then(() => {
-      this.shadowRoot?.querySelector("paper-input")?.focus();
-    });
-  }
-
-  private _getAreas = memoizeOne(
-    (
-      areas: AreaRegistryEntry[],
-      devices: DeviceRegistryEntry[],
-      entities: EntityRegistryEntry[],
-      includeDomains: this["includeDomains"],
-      excludeDomains: this["excludeDomains"],
-      includeDeviceClasses: this["includeDeviceClasses"],
-      deviceFilter: this["deviceFilter"],
-      entityFilter: this["entityFilter"],
-      noAdd: this["noAdd"]
-    ): AreaRegistryEntry[] => {
-      if (!areas.length) {
-        return [
-          {
-            area_id: "",
-            name: this.hass.localize("ui.components.area-picker.no_areas"),
-          },
-        ];
-      }
-
-      const deviceEntityLookup: DeviceEntityLookup = {};
-      let inputDevices: DeviceRegistryEntry[] | undefined;
-      let inputEntities: EntityRegistryEntry[] | undefined;
-
-      if (includeDomains || excludeDomains || includeDeviceClasses) {
-        for (const entity of entities) {
-          if (!entity.device_id) {
-            continue;
-          }
-          if (!(entity.device_id in deviceEntityLookup)) {
-            deviceEntityLookup[entity.device_id] = [];
-          }
-          deviceEntityLookup[entity.device_id].push(entity);
-        }
-        inputDevices = devices;
-        inputEntities = entities.filter((entity) => entity.area_id);
-      } else if (deviceFilter) {
-        inputDevices = devices;
-      } else if (entityFilter) {
-        inputEntities = entities.filter((entity) => entity.area_id);
-      }
-
-      if (includeDomains) {
-        inputDevices = inputDevices!.filter((device) => {
-          const devEntities = deviceEntityLookup[device.id];
-          if (!devEntities || !devEntities.length) {
-            return false;
-          }
-          return deviceEntityLookup[device.id].some((entity) =>
-            includeDomains.includes(computeDomain(entity.entity_id))
-          );
-        });
-        inputEntities = inputEntities!.filter((entity) =>
-          includeDomains.includes(computeDomain(entity.entity_id))
-        );
-      }
-
-      if (excludeDomains) {
-        inputDevices = inputDevices!.filter((device) => {
-          const devEntities = deviceEntityLookup[device.id];
-          if (!devEntities || !devEntities.length) {
-            return true;
-          }
-          return entities.every(
-            (entity) =>
-              !excludeDomains.includes(computeDomain(entity.entity_id))
-          );
-        });
-        inputEntities = inputEntities!.filter(
-          (entity) => !excludeDomains.includes(computeDomain(entity.entity_id))
-        );
-      }
-
-      if (includeDeviceClasses) {
-        inputDevices = inputDevices!.filter((device) => {
-          const devEntities = deviceEntityLookup[device.id];
-          if (!devEntities || !devEntities.length) {
-            return false;
-          }
-          return deviceEntityLookup[device.id].some((entity) => {
-            const stateObj = this.hass.states[entity.entity_id];
-            if (!stateObj) {
-              return false;
-            }
-            return (
-              stateObj.attributes.device_class &&
-              includeDeviceClasses.includes(stateObj.attributes.device_class)
-            );
-          });
-        });
-        inputEntities = inputEntities!.filter((entity) => {
-          const stateObj = this.hass.states[entity.entity_id];
-          return (
-            stateObj.attributes.device_class &&
-            includeDeviceClasses.includes(stateObj.attributes.device_class)
-          );
-        });
-      }
-
-      if (deviceFilter) {
-        inputDevices = inputDevices!.filter((device) => deviceFilter!(device));
-      }
-
-      if (entityFilter) {
-        inputEntities = inputEntities!.filter((entity) =>
-          entityFilter!(entity)
-        );
-      }
-
-      let outputAreas = areas;
-
-      let areaIds: string[] | undefined;
-
-      if (inputDevices) {
-        areaIds = inputDevices
-          .filter((device) => device.area_id)
-          .map((device) => device.area_id!);
-      }
-
-      if (inputEntities) {
-        areaIds = (areaIds ?? []).concat(
-          inputEntities
-            .filter((entity) => entity.area_id)
-            .map((entity) => entity.area_id!)
-        );
-      }
-
-      if (areaIds) {
-        outputAreas = areas.filter((area) => areaIds!.includes(area.area_id));
-      }
-
-      if (!outputAreas.length) {
-        outputAreas = [
-          {
-            area_id: "",
-            name: this.hass.localize("ui.components.area-picker.no_match"),
-          },
-        ];
-      }
-
-      return noAdd
-        ? outputAreas
-        : [
-            ...outputAreas,
-            {
-              area_id: "add_new",
-              name: this.hass.localize("ui.components.area-picker.add_new"),
-            },
-          ];
-    }
-  );
-
-  protected updated(changedProps: PropertyValues) {
-    if (
-      (!this._init && this._devices && this._areas && this._entities) ||
-      (changedProps.has("_opened") && this._opened)
-    ) {
-      this._init = true;
-      (this._comboBox as any).items = this._getAreas(
-        this._areas!,
-        this._devices!,
-        this._entities!,
-        this.includeDomains,
-        this.excludeDomains,
-        this.includeDeviceClasses,
-        this.deviceFilter,
-        this.entityFilter,
-        this.noAdd
-      );
-    }
-  }
-
   protected render(): TemplateResult {
-    if (!this._devices || !this._areas || !this._entities) {
+    if (!this._areas) {
       return html``;
     }
     return html`
@@ -337,6 +100,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
         item-value-path="area_id"
         item-id-path="area_id"
         item-label-path="name"
+        .items=${this._areas}
         .value=${this._value}
         .renderer=${rowRenderer}
         @opened-changed=${this._openedChanged}
@@ -346,9 +110,6 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
           .label=${this.label === undefined && this.hass
             ? this.hass.localize("ui.components.area-picker.area")
             : this.label}
-          .placeholder=${this.placeholder
-            ? this._area(this.placeholder)?.name
-            : undefined}
           class="input"
           autocapitalize="none"
           autocomplete="off"
@@ -357,39 +118,39 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
         >
           ${this.value
             ? html`
-                <mwc-icon-button
+                <ha-icon-button
-                  .label=${this.hass.localize(
+                  aria-label=${this.hass.localize(
                     "ui.components.area-picker.clear"
                   )}
                   slot="suffix"
                   class="clear-button"
+                  icon="hass:close"
                   @click=${this._clearValue}
+                  no-ripple
                 >
-                  <ha-svg-icon .path=${mdiClose}></ha-svg-icon>
+                  ${this.hass.localize("ui.components.area-picker.clear")}
-                </mwc-icon-button>
+                </ha-icon-button>
+              `
+            : ""}
+          ${this._areas.length > 0
+            ? html`
+                <ha-icon-button
+                  aria-label=${this.hass.localize(
+                    "ui.components.area-picker.show_areas"
+                  )}
+                  slot="suffix"
+                  class="toggle-button"
+                  .icon=${this._opened ? "hass:menu-up" : "hass:menu-down"}
+                >
+                  ${this.hass.localize("ui.components.area-picker.toggle")}
+                </ha-icon-button>
               `
             : ""}
-
-          <mwc-icon-button
-            .label=${this.hass.localize("ui.components.area-picker.toggle")}
-            slot="suffix"
-            class="toggle-button"
-          >
-            <ha-svg-icon
-              .path=${this._opened ? mdiMenuUp : mdiMenuDown}
-            ></ha-svg-icon>
-          </mwc-icon-button>
         </paper-input>
       </vaadin-combo-box-light>
     `;
   }
 
-  private _area = memoizeOne((areaId: string):
-    | AreaRegistryEntry
-    | undefined => {
-    return this._areas?.find((area) => area.area_id === areaId);
-  });
-
   private _clearValue(ev: Event) {
     ev.stopPropagation();
     this._setValue("");
@@ -454,7 +215,7 @@ export class HaAreaPicker extends SubscribeMixin(LitElement) {
 
   static get styles(): CSSResult {
     return css`
-      paper-input > mwc-icon-button {
+      paper-input > ha-icon-button {
         --mdc-icon-button-size: 24px;
         padding: 2px;
         color: var(--secondary-text-color);

src/components/ha-attributes.ts

@@ -107,7 +107,7 @@ class HaAttributes extends LitElement {
       (!Array.isArray(value) && value instanceof Object)
     ) {
       if (!jsYamlPromise) {
-        jsYamlPromise = import("js-yaml");
+        jsYamlPromise = import(/* webpackChunkName: "js-yaml" */ "js-yaml");
       }
       const yaml = jsYamlPromise.then((jsYaml) => jsYaml.safeDump(value));
       return html` <pre>${until(yaml, "")}</pre> `;

src/components/ha-blueprint-picker.ts

@@ -1,125 +0,0 @@
-import "@polymer/paper-dropdown-menu/paper-dropdown-menu-light";
-import "@polymer/paper-item/paper-item";
-import "@polymer/paper-listbox/paper-listbox";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  LitElement,
-  property,
-  TemplateResult,
-} from "lit-element";
-import memoizeOne from "memoize-one";
-import { fireEvent } from "../common/dom/fire_event";
-import { compare } from "../common/string/compare";
-import { Blueprint, Blueprints, fetchBlueprints } from "../data/blueprint";
-import { HomeAssistant } from "../types";
-
-@customElement("ha-blueprint-picker")
-class HaBluePrintPicker extends LitElement {
-  public hass?: HomeAssistant;
-
-  @property() public label?: string;
-
-  @property() public value = "";
-
-  @property() public domain = "automation";
-
-  @property() public blueprints?: Blueprints;
-
-  @property({ type: Boolean }) public disabled = false;
-
-  private _processedBlueprints = memoizeOne((blueprints?: Blueprints) => {
-    if (!blueprints) {
-      return [];
-    }
-    const result = Object.entries(blueprints)
-      .filter(([_path, blueprint]) => !("error" in blueprint))
-      .map(([path, blueprint]) => ({
-        ...(blueprint as Blueprint).metadata,
-        path,
-      }));
-    return result.sort((a, b) => compare(a.name, b.name));
-  });
-
-  protected render(): TemplateResult {
-    if (!this.hass) {
-      return html``;
-    }
-    return html`
-      <paper-dropdown-menu-light
-        .label=${this.label ||
-        this.hass.localize("ui.components.blueprint-picker.label")}
-        .disabled=${this.disabled}
-        horizontal-align="left"
-      >
-        <paper-listbox
-          slot="dropdown-content"
-          .selected=${this.value}
-          attr-for-selected="data-blueprint-path"
-          @iron-select=${this._blueprintChanged}
-        >
-          <paper-item data-blueprint-path="">
-            ${this.hass.localize(
-              "ui.components.blueprint-picker.select_blueprint"
-            )}
-          </paper-item>
-          ${this._processedBlueprints(this.blueprints).map(
-            (blueprint) => html`
-              <paper-item data-blueprint-path=${blueprint.path}>
-                ${blueprint.name}
-              </paper-item>
-            `
-          )}
-        </paper-listbox>
-      </paper-dropdown-menu-light>
-    `;
-  }
-
-  protected firstUpdated(changedProps) {
-    super.firstUpdated(changedProps);
-    if (this.blueprints === undefined) {
-      fetchBlueprints(this.hass!, this.domain).then((blueprints) => {
-        this.blueprints = blueprints;
-      });
-    }
-  }
-
-  private _blueprintChanged(ev) {
-    const newValue = ev.detail.item.dataset.blueprintPath;
-
-    if (newValue !== this.value) {
-      this.value = ev.detail.value;
-      setTimeout(() => {
-        fireEvent(this, "value-changed", { value: newValue });
-        fireEvent(this, "change");
-      }, 0);
-    }
-  }
-
-  static get styles(): CSSResult {
-    return css`
-      :host {
-        display: inline-block;
-      }
-      paper-dropdown-menu-light {
-        width: 100%;
-        min-width: 200px;
-        display: block;
-      }
-      paper-listbox {
-        min-width: 200px;
-      }
-      paper-item {
-        cursor: pointer;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-blueprint-picker": HaBluePrintPicker;
-  }
-}

src/components/ha-button-toggle-group.ts

@@ -11,7 +11,6 @@ import {
 import { fireEvent } from "../common/dom/fire_event";
 import type { ToggleButton } from "../types";
 import "./ha-svg-icon";
-import "@material/mwc-button/mwc-button";
 
 @customElement("ha-button-toggle-group")
 export class HaButtonToggleGroup extends LitElement {
@@ -22,22 +21,17 @@ export class HaButtonToggleGroup extends LitElement {
   protected render(): TemplateResult {
     return html`
       <div>
-        ${this.buttons.map((button) =>
+        ${this.buttons.map(
-          button.iconPath
+          (button) => html`
-            ? html`<mwc-icon-button
+            <mwc-icon-button
-                .label=${button.label}
+              .label=${button.label}
-                .value=${button.value}
+              .value=${button.value}
-                ?active=${this.active === button.value}
+              ?active=${this.active === button.value}
-                @click=${this._handleClick}
+              @click=${this._handleClick}
-              >
+            >
-                <ha-svg-icon .path=${button.iconPath}></ha-svg-icon>
+              <ha-svg-icon .path=${button.iconPath}></ha-svg-icon>
-              </mwc-icon-button>`
+            </mwc-icon-button>
-            : html`<mwc-button
+          `
-                .value=${button.value}
-                ?active=${this.active === button.value}
-                @click=${this._handleClick}
-                >${button.label}</mwc-button
-              >`
         )}
       </div>
     `;
@@ -55,15 +49,13 @@ export class HaButtonToggleGroup extends LitElement {
         --mdc-icon-button-size: var(--button-toggle-size, 36px);
         --mdc-icon-size: var(--button-toggle-icon-size, 20px);
       }
-      mwc-icon-button,
+      mwc-icon-button {
-      mwc-button {
         border: 1px solid var(--primary-color);
         border-right-width: 0px;
         position: relative;
         cursor: pointer;
       }
-      mwc-icon-button::before,
+      mwc-icon-button::before {
-      mwc-button::before {
         top: 0;
         left: 0;
         width: 100%;
@@ -75,21 +67,17 @@ export class HaButtonToggleGroup extends LitElement {
         content: "";
         transition: opacity 15ms linear, background-color 15ms linear;
       }
-      mwc-icon-button[active]::before,
+      mwc-icon-button[active]::before {
-      mwc-button[active]::before {
         opacity: var(--mdc-icon-button-ripple-opacity, 0.12);
       }
-      mwc-icon-button:first-child,
+      mwc-icon-button:first-child {
-      mwc-button:first-child {
         border-radius: 4px 0 0 4px;
       }
-      mwc-icon-button:last-child,
+      mwc-icon-button:last-child {
-      mwc-button:last-child {
         border-radius: 0 4px 4px 0;
         border-right-width: 1px;
       }
-      mwc-icon-button:only-child,
+      mwc-icon-button:only-child {
-      mwc-button:only-child {
         border-radius: 4px;
         border-right-width: 1px;
       }

src/components/ha-camera-stream.ts

@@ -13,12 +13,11 @@ import { fireEvent } from "../common/dom/fire_event";
 import { computeStateName } from "../common/entity/compute_state_name";
 import { supportsFeature } from "../common/entity/supports-feature";
 import {
-  CameraEntity,
   CAMERA_SUPPORT_STREAM,
   computeMJPEGStreamUrl,
   fetchStreamUrl,
 } from "../data/camera";
-import { HomeAssistant } from "../types";
+import { CameraEntity, HomeAssistant } from "../types";
 import "./ha-hls-player";
 
 @customElement("ha-camera-stream")

src/components/ha-climate-state.ts

@@ -11,7 +11,6 @@ import { HassEntity } from "home-assistant-js-websocket";
 
 import { CLIMATE_PRESET_NONE } from "../data/climate";
 import type { HomeAssistant } from "../types";
-import { formatNumber } from "../common/string/format_number";
 
 @customElement("ha-climate-state")
 class HaClimateState extends LitElement {
@@ -52,17 +51,11 @@ class HaClimateState extends LitElement {
     }
 
     if (this.stateObj.attributes.current_temperature != null) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.current_temperature} ${this.hass.config.unit_system.temperature}`;
-        this.stateObj.attributes.current_temperature,
-        this.hass!.language
-      )} ${this.hass.config.unit_system.temperature}`;
     }
 
     if (this.stateObj.attributes.current_humidity != null) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.current_humidity} %`;
-        this.stateObj.attributes.current_humidity,
-        this.hass!.language
-      )} %`;
     }
 
     return undefined;
@@ -77,39 +70,21 @@ class HaClimateState extends LitElement {
       this.stateObj.attributes.target_temp_low != null &&
       this.stateObj.attributes.target_temp_high != null
     ) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.target_temp_low}-${this.stateObj.attributes.target_temp_high} ${this.hass.config.unit_system.temperature}`;
-        this.stateObj.attributes.target_temp_low,
-        this.hass!.language
-      )}-${formatNumber(
-        this.stateObj.attributes.target_temp_high,
-        this.hass!.language
-      )} ${this.hass.config.unit_system.temperature}`;
     }
 
     if (this.stateObj.attributes.temperature != null) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.temperature} ${this.hass.config.unit_system.temperature}`;
-        this.stateObj.attributes.temperature,
-        this.hass!.language
-      )} ${this.hass.config.unit_system.temperature}`;
     }
     if (
       this.stateObj.attributes.target_humidity_low != null &&
       this.stateObj.attributes.target_humidity_high != null
     ) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.target_humidity_low}-${this.stateObj.attributes.target_humidity_high}%`;
-        this.stateObj.attributes.target_humidity_low,
-        this.hass!.language
-      )}-${formatNumber(
-        this.stateObj.attributes.target_humidity_high,
-        this.hass!.language
-      )}%`;
     }
 
     if (this.stateObj.attributes.humidity != null) {
-      return `${formatNumber(
+      return `${this.stateObj.attributes.humidity} %`;
-        this.stateObj.attributes.humidity,
-        this.hass!.language
-      )} %`;
     }
 
     return "";

src/components/ha-cover-tilt-controls.ts

@@ -41,7 +41,7 @@ class HaCoverTiltControls extends LitElement {
 
     return html` <ha-icon-button
         class=${classMap({
-          invisible: !this._entityObj.supportsOpenTilt,
+          invisible: !this._entityObj.supportsStop,
         })}
         label=${this.hass.localize(
           "ui.dialogs.more_info_control.open_tilt_cover"
@@ -61,10 +61,10 @@ class HaCoverTiltControls extends LitElement {
       ></ha-icon-button>
       <ha-icon-button
         class=${classMap({
-          invisible: !this._entityObj.supportsCloseTilt,
+          invisible: !this._entityObj.supportsStop,
         })}
         label=${this.hass.localize(
-          "ui.dialogs.more_info_control.close_tilt_cover"
+          "ui.dialogs.more_info_control.open_tilt_cover"
         )}
         icon="hass:arrow-bottom-left"
         @click=${this._onCloseTiltTap}

src/components/ha-date-input.ts

@@ -2,22 +2,6 @@ import "@vaadin/vaadin-date-picker/theme/material/vaadin-date-picker";
 
 const VaadinDatePicker = customElements.get("vaadin-date-picker");
 
-const documentContainer = document.createElement("template");
-documentContainer.setAttribute("style", "display: none;");
-documentContainer.innerHTML = `
-  <dom-module id="ha-date-input-styles" theme-for="vaadin-text-field">
-    <template>
-      <style>
-      [part="input-field"] {
-        top: 2px;
-        height: 30px;
-      }
-      </style>
-    </template>
-  </dom-module>
-`;
-document.head.appendChild(documentContainer.content);
-
 export class HaDateInput extends VaadinDatePicker {
   constructor() {
     super();

src/components/ha-expansion-panel.ts

@@ -19,14 +19,12 @@ class HaExpansionPanel extends LitElement {
 
   @property({ type: Boolean, reflect: true }) outlined = false;
 
-  @property() header?: string;
-
   @query(".container") private _container!: HTMLDivElement;
 
   protected render(): TemplateResult {
     return html`
       <div class="summary" @click=${this._toggleContainer}>
-        <slot name="header">${this.header}</slot>
+        <slot name="title"></slot>
         <ha-svg-icon
           .path=${mdiChevronDown}
           class="summary-icon ${classMap({ expanded: this.expanded })}"
@@ -78,7 +76,7 @@ class HaExpansionPanel extends LitElement {
 
       .summary {
         display: flex;
-        padding: var(--expansion-panel-summary-padding, 0);
+        padding: 0px 16px;
         min-height: 48px;
         align-items: center;
         cursor: pointer;

src/components/ha-fab.ts

@@ -1,20 +0,0 @@
-import type { Fab } from "@material/mwc-fab";
-import "@material/mwc-fab";
-import { customElement } from "lit-element";
-import { Constructor } from "../types";
-
-const MwcFab = customElements.get("mwc-fab") as Constructor<Fab>;
-
-@customElement("ha-fab")
-export class HaFab extends MwcFab {
-  protected firstUpdated(changedProperties) {
-    super.firstUpdated(changedProperties);
-    this.style.setProperty("--mdc-theme-secondary", "var(--primary-color)");
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-fab": HaFab;
-  }
-}

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

@@ -54,7 +54,7 @@ export interface HaFormSelectSchema extends HaFormBaseSchema {
 
 export interface HaFormMultiSelectSchema extends HaFormBaseSchema {
   type: "multi_select";
-  options?: Record<string, string> | string[] | Array<[string, string]>;
+  options?: { [key: string]: string } | string[] | Array<[string, string]>;
 }
 
 export interface HaFormFloatSchema extends HaFormBaseSchema {

src/components/ha-gauge.ts

@@ -12,7 +12,6 @@ import { afterNextRender } from "../common/util/render-status";
 import { ifDefined } from "lit-html/directives/if-defined";
 
 import { getValueInPercentage, normalize } from "../util/calculate";
-import { formatNumber } from "../common/string/format_number";
 
 const getAngle = (value: number, min: number, max: number) => {
   const percentage = getValueInPercentage(normalize(value, min, max), min, max);
@@ -30,8 +29,6 @@ export class Gauge extends LitElement {
 
   @property({ type: Number }) public value = 0;
 
-  @property({ type: String }) public language = "";
-
   @property() public label = "";
 
   @internalProperty() private _angle = 0;
@@ -91,7 +88,7 @@ export class Gauge extends LitElement {
       </svg>
       <svg class="text">
         <text class="value-text">
-          ${formatNumber(this.value, this.language)} ${this.label}
+          ${this.value} ${this.label}
         </text>
       </svg>`;
   }

src/components/ha-hls-player.ts

@@ -107,7 +107,9 @@ class HaHLSPlayer extends LitElement {
     const useExoPlayerPromise = this._getUseExoPlayer();
     const masterPlaylistPromise = fetch(this.url);
 
-    const hls = ((await import("hls.js")) as any).default as HLSModule;
+    const hls = ((await import(
+      /* webpackChunkName: "hls.js" */ "hls.js"
+    )) as any).default as HLSModule;
     let hlsSupported = hls.isSupported();
 
     if (!hlsSupported) {
@@ -127,7 +129,7 @@ class HaHLSPlayer extends LitElement {
 
     // Parse playlist assuming it is a master playlist. Match group 1 is whether hevc, match group 2 is regular playlist url
     // See https://tools.ietf.org/html/rfc8216 for HLS spec details
-    const playlistRegexp = /#EXT-X-STREAM-INF:.*?(?:CODECS=".*?(hev1|hvc1)?\..*?".*?)?(?:\n|\r\n)(.+)/g;
+    const playlistRegexp = /#EXT-X-STREAM-INF:.*?(?:CODECS=".*?(?<isHevc>hev1|hvc1)?\..*?".*?)?(?:\n|\r\n)(?<streamUrl>.+)/g;
     const match = playlistRegexp.exec(masterPlaylist);
     const matchTwice = playlistRegexp.exec(masterPlaylist);
 
@@ -136,13 +138,17 @@ class HaHLSPlayer extends LitElement {
     let playlist_url: string;
     if (match !== null && matchTwice === null) {
       // Only send the regular playlist url if we match exactly once
-      playlist_url = new URL(match[2], this.url).href;
+      playlist_url = new URL(match.groups!.streamUrl, this.url).href;
     } else {
       playlist_url = this.url;
     }
 
     // If codec is HEVC and ExoPlayer is supported, use ExoPlayer.
-    if (this._useExoPlayer && match !== null && match[1] !== undefined) {
+    if (
+      this._useExoPlayer &&
+      match !== null &&
+      match.groups!.isHevc !== undefined
+    ) {
       this._renderHLSExoPlayer(playlist_url);
     } else if (hls.isSupported()) {
       this._renderHLSPolyfill(videoEl, hls, playlist_url);

src/components/ha-icon-input.ts

@@ -60,9 +60,8 @@ export class HaIconInput extends LitElement {
   static get styles() {
     return css`
       ha-icon {
-        position: absolute;
+        position: relative;
-        bottom: 2px;
+        bottom: 4px;
-        right: 0;
       }
     `;
   }

src/components/ha-icon.ts

@@ -39,7 +39,7 @@ checkCacheVersion();
 
 const debouncedWriteCache = debounce(() => writeCache(chunks), 2000);
 
-const cachedIcons: Record<string, string> = {};
+const cachedIcons: { [key: string]: string } = {};
 
 @customElement("ha-icon")
 export class HaIcon extends LitElement {

src/components/ha-labeled-slider.js

@@ -14,7 +14,7 @@ class HaLabeledSlider extends PolymerElement {
         }
 
         .title {
-          margin: 5px 0 8px;
+          margin: 4px 0 8px;
           color: var(--primary-text-color);
         }