Delay display of init page

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,7 +2,9 @@
   You are amazing! Thanks for contributing to our project!
   Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
 -->
+
 ## Breaking change
+
 <!--
   If your PR contains a breaking change for existing users, it is important
   to tell them what breaks, how to make it work again and why we did this.
@@ -11,8 +13,8 @@
   Note: Remove this section if this PR is NOT a breaking change.
 -->
 
-
 ## Proposed change
+
 <!--
   Describe the big picture of your changes here to communicate to the
   maintainers why we should accept this pull request. If it fixes a bug
@@ -20,8 +22,8 @@
   in the additional information section.
 -->
 
-
 ## Type of change
+
 <!--
   What type of change does your PR introduce to the Home Assistant frontend?
   NOTE: Please, check only 1! box!
@@ -36,6 +38,7 @@
 - [ ] Code quality improvements to existing code or addition of tests
 
 ## Example configuration
+
 <!--
   Supplying a configuration snippet, makes it easier for a maintainer to test
   your PR.
@@ -46,6 +49,7 @@
 ```
 
 ## Additional information
+
 <!--
   Details are important, and help maintainers processing your PR.
   Please be sure to fill out additional details, if applicable.
@@ -56,6 +60,7 @@
 - Link to documentation pull request:
 
 ## Checklist
+
 <!--
   Put an `x` in the boxes that apply. You can also fill these out after
   creating the PR. If you're unsure about any of them, don't hesitate to ask.

.github/workflows/cast_deployment.yaml

@@ -21,12 +21,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
         with:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -57,12 +57,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
         with:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/ci.yaml

@@ -24,9 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -55,9 +55,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -73,9 +73,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -85,21 +85,15 @@ jobs:
         run: ./node_modules/.bin/gulp build-app
         env:
           IS_TEST: "true"
-      - name: Upload bundle stats
-        uses: actions/upload-artifact@v3.1.3
-        with:
-          name: frontend-bundle-stats
-          path: build/stats/*.json
-          if-no-files-found: error
   supervisor:
     name: Build supervisor
     needs: [lint, test]
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -109,9 +103,3 @@ jobs:
         run: ./node_modules/.bin/gulp build-hassio
         env:
           IS_TEST: "true"
-      - name: Upload bundle stats
-        uses: actions/upload-artifact@v3.1.3
-        with:
-          name: supervisor-bundle-stats
-          path: build/stats/*.json
-          if-no-files-found: error

.github/workflows/codeql-analysis.yml

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

.github/workflows/demo_deployment.yaml

@@ -22,12 +22,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
         with:
           ref: dev
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -58,12 +58,12 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
         with:
           ref: master
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_deployment.yaml

@@ -16,10 +16,10 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/design_preview.yaml

@@ -21,10 +21,10 @@ jobs:
     if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn

.github/workflows/nightly.yaml

@@ -20,7 +20,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v4
@@ -28,7 +28,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -57,14 +57,14 @@ jobs:
         run: tar -czvf translations.tar.gz translations
 
       - name: Upload build artifacts
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v3
         with:
           name: wheels
           path: dist/home_assistant_frontend*.whl
           if-no-files-found: error
 
       - name: Upload translations
-        uses: actions/upload-artifact@v3.1.3
+        uses: actions/upload-artifact@v3
         with:
           name: translations
           path: translations.tar.gz

.github/workflows/relative-ci.yaml

@@ -1,25 +0,0 @@
-name: RelativeCI
-
-on:
-  workflow_run:
-    workflows: [CI]
-    types:
-      - completed
-
-jobs:
-  upload:
-    name: Upload stats
-    if: ${{ github.event.workflow_run.conclusion == 'success' }}
-    strategy:
-      matrix:
-        bundle: [frontend, supervisor]
-        build: [modern, legacy]
-    runs-on: ubuntu-latest
-    steps:
-      - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/agent-action@v2.1.10
-        with:
-          key: ${{ secrets[format('RELATIVE_CI_KEY_{0}_{1}', matrix.bundle, matrix.build)] }}
-          token: ${{ github.token }}
-          artifactName: ${{ format('{0}-bundle-stats', matrix.bundle) }}
-          webpackStatsFile: ${{ format('{0}-{1}.json', matrix.bundle, matrix.build) }}

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.0.0
+        uses: actions/setup-node@v3.8.1
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -74,7 +74,7 @@ jobs:
           echo "home-assistant-frontend==$version" > ./requirements.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2023.10.5
+        uses: home-assistant/wheels@2023.04.0
         with:
           abi: cp311
           tag: musllinux_1_2

.github/workflows/translations.yaml

@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.0.0
 
       - name: Upload Translations
         run: |

.gitignore

@@ -47,6 +47,3 @@ src/cast/dev_const.ts
 
 # Home Assistant config
 /config/
-
-# Jetbrains
-/.idea/

.prettierignore

@@ -1,4 +1,3 @@
 CLA.md
 CODE_OF_CONDUCT.md
 LICENSE.md
-PULL_REQUEST_TEMPLATE.md

.yarnrc.yml

@@ -8,4 +8,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.6.4.cjs
+yarnPath: .yarn/releases/yarn-3.6.3.cjs

build-scripts/bundle.cjs

@@ -98,7 +98,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
       "@babel/preset-env",
       {
         useBuiltIns: latestBuild ? false : "entry",
-        corejs: latestBuild ? false : { version: "3.33", proposals: true },
+        corejs: latestBuild ? false : { version: "3.32", proposals: true },
         bugfixes: true,
         shippedProposals: true,
       },
@@ -149,7 +149,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
   sourceMaps: !isTestBuild,
 });
 
-const nameSuffix = (latestBuild) => (latestBuild ? "-modern" : "-legacy");
+const nameSuffix = (latestBuild) => (latestBuild ? "-latest" : "-es5");
 
 const outputPath = (outputRoot, latestBuild) =>
   path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5");
@@ -183,7 +183,7 @@ const publicPath = (latestBuild, root = "") =>
 module.exports.config = {
   app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild, isWDS }) {
     return {
-      name: "frontend" + nameSuffix(latestBuild),
+      name: "app" + nameSuffix(latestBuild),
       entry: {
         service_worker: "./src/entrypoints/service_worker.ts",
         app: "./src/entrypoints/app.ts",

build-scripts/gulp/app.js

@@ -45,8 +45,8 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-app",
     env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
-    gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod"),
     // Don't compress running tests
-    ...(env.isTestBuild() ? [] : ["compress-app"])
+    ...(env.isTestBuild() ? [] : ["compress-app"]),
+    gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod")
   )
 );

build-scripts/gulp/gather-static.js

@@ -4,7 +4,6 @@ import fs from "fs-extra";
 import gulp from "gulp";
 import path from "path";
 import paths from "../paths.cjs";
-import env from "../env.cjs";
 
 const npmPath = (...parts) =>
   path.resolve(paths.polymer_dir, "node_modules", ...parts);
@@ -63,9 +62,6 @@ function copyPolyfills(staticDir) {
 }
 
 function copyLoaderJS(staticDir) {
-  if (!env.useRollup()) {
-    return;
-  }
   const staticPath = genStaticPath(staticDir);
   copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js"));
   copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js"));

build-scripts/gulp/locale-data.js

@@ -1,54 +1,51 @@
 import { deleteSync } from "del";
 import { mkdir, readFile, writeFile } from "fs/promises";
 import gulp from "gulp";
-import { join, resolve } from "node:path";
+import path from "path";
 import paths from "../paths.cjs";
 
-const formatjsDir = join(paths.polymer_dir, "node_modules", "@formatjs");
+const outDir = path.join(paths.build_dir, "locale-data");
-const outDir = join(paths.build_dir, "locale-data");
 
-const INTL_POLYFILLS = {
+const INTL_PACKAGES = {
+  "intl-relativetimeformat": "RelativeTimeFormat",
   "intl-datetimeformat": "DateTimeFormat",
+  "intl-numberformat": "NumberFormat",
   "intl-displaynames": "DisplayNames",
   "intl-listformat": "ListFormat",
-  "intl-numberformat": "NumberFormat",
-  "intl-relativetimeformat": "RelativeTimeFormat",
 };
 
-const convertToJSON = async (
+const convertToJSON = async (pkg, lang) => {
-  pkg,
-  lang,
-  subDir = "locale-data",
-  addFunc = "__addLocaleData",
-  skipMissing = true
-) => {
   let localeData;
   try {
     localeData = await readFile(
-      join(formatjsDir, pkg, subDir, `${lang}.js`),
+      path.resolve(
+        paths.polymer_dir,
+        `node_modules/@formatjs/${pkg}/locale-data/${lang}.js`
+      ),
       "utf-8"
     );
   } catch (e) {
     // Ignore if language is missing (i.e. not supported by @formatjs)
-    if (e.code === "ENOENT" && skipMissing) {
+    if (e.code === "ENOENT") {
-      console.warn(`Skipped missing data for language ${lang} from ${pkg}`);
       return;
+    } else {
+      throw e;
     }
-    throw e;
   }
   // Convert to JSON
-  const obj = INTL_POLYFILLS[pkg];
+  const className = INTL_PACKAGES[pkg];
-  const dataRegex = new RegExp(
+  localeData = localeData
-    `Intl\\.${obj}\\.${addFunc}\\((?<data>.*)\\)`,
+    .replace(
-    "s"
+      new RegExp(
-  );
+        `\\/\\*\\s*@generated\\s*\\*\\/\\s*\\/\\/\\s*prettier-ignore\\s*if\\s*\\(Intl\\.${className}\\s*&&\\s*typeof\\s*Intl\\.${className}\\.__addLocaleData\\s*===\\s*'function'\\)\\s*{\\s*Intl\\.${className}\\.__addLocaleData\\(`,
-  localeData = localeData.match(dataRegex)?.groups?.data;
+        "im"
-  if (!localeData) {
+      ),
-    throw Error(`Failed to extract data for language ${lang} from ${pkg}`);
+      ""
-  }
+    )
+    .replace(/\)\s*}/im, "");
   // Parse to validate JSON, then stringify to minify
   localeData = JSON.stringify(JSON.parse(localeData));
-  await writeFile(join(outDir, `${pkg}/${lang}.json`), localeData);
+  await writeFile(path.join(outDir, `${pkg}/${lang}.json`), localeData);
 };
 
 gulp.task("clean-locale-data", async () => deleteSync([outDir]));
@@ -56,27 +53,17 @@ gulp.task("clean-locale-data", async () => deleteSync([outDir]));
 gulp.task("create-locale-data", async () => {
   const translationMeta = JSON.parse(
     await readFile(
-      resolve(paths.translations_src, "translationMetadata.json"),
+      path.resolve(paths.translations_src, "translationMetadata.json"),
       "utf-8"
     )
   );
   const conversions = [];
-  for (const pkg of Object.keys(INTL_POLYFILLS)) {
+  for (const pkg of Object.keys(INTL_PACKAGES)) {
-    // eslint-disable-next-line no-await-in-loop
+    await mkdir(path.join(outDir, pkg), { recursive: true });
-    await mkdir(join(outDir, pkg), { recursive: true });
     for (const lang of Object.keys(translationMeta)) {
       conversions.push(convertToJSON(pkg, lang));
     }
   }
-  conversions.push(
-    convertToJSON(
-      "intl-datetimeformat",
-      "add-all-tz",
-      ".",
-      "__addTZData",
-      false
-    )
-  );
   await Promise.all(conversions);
 });
 

build-scripts/gulp/translations.js

@@ -1,7 +1,12 @@
 import { createHash } from "crypto";
 import { deleteSync } from "del";
-import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs";
+import {
-import { writeFile } from "node:fs/promises";
+  mkdirSync,
+  readdirSync,
+  readFileSync,
+  renameSync,
+  writeFile,
+} from "fs";
 import gulp from "gulp";
 import flatmap from "gulp-flatmap";
 import transform from "gulp-json-transform";
@@ -131,23 +136,27 @@ gulp.task("ensure-translations-build-dir", async () => {
   mkdirSync(workDir, { recursive: true });
 });
 
-gulp.task("create-test-metadata", () =>
+gulp.task("create-test-metadata", (cb) => {
-  env.isProdBuild()
+  writeFile(
-    ? Promise.resolve()
+    workDir + "/testMetadata.json",
-    : writeFile(
+    JSON.stringify({
-        workDir + "/testMetadata.json",
+      test: {
-        JSON.stringify({ test: { nativeName: "Test" } })
+        nativeName: "Test",
-      )
+      },
-);
+    }),
+    cb
+  );
+});
 
-gulp.task("create-test-translation", () =>
+gulp.task(
-  env.isProdBuild()
+  "create-test-translation",
-    ? Promise.resolve()
+  gulp.series("create-test-metadata", () =>
-    : gulp
+    gulp
-        .src(path.join(paths.translations_src, "en.json"))
+      .src(path.join(paths.translations_src, "en.json"))
-        .pipe(transform((data, _file) => recursiveEmpty(data)))
+      .pipe(transform((data, _file) => recursiveEmpty(data)))
-        .pipe(rename("test.json"))
+      .pipe(rename("test.json"))
-        .pipe(gulp.dest(workDir))
+      .pipe(gulp.dest(workDir))
+  )
 );
 
 /**
@@ -179,11 +188,16 @@ gulp.task("build-master-translation", () => {
 
 gulp.task("build-merged-translations", () =>
   gulp
-    .src([
+    .src(
-      inFrontendDir + "/*.json",
+      [
-      "!" + inFrontendDir + "/en.json",
+        inFrontendDir + "/*.json",
-      ...(env.isProdBuild() ? [] : [workDir + "/test.json"]),
+        "!" + inFrontendDir + "/en.json",
-    ])
+        workDir + "/test.json",
+      ],
+      {
+        allowEmpty: true,
+      }
+    )
     .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
     .pipe(
       flatmap((stream, file) => {
@@ -363,11 +377,14 @@ gulp.task("build-translation-flatten-supervisor", () =>
 
 gulp.task("build-translation-write-metadata", () =>
   gulp
-    .src([
+    .src(
-      path.join(paths.translations_src, "translationMetadata.json"),
+      [
-      ...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]),
+        path.join(paths.translations_src, "translationMetadata.json"),
-      workDir + "/translationFingerprints.json",
+        workDir + "/testMetadata.json",
-    ])
+        workDir + "/translationFingerprints.json",
+      ],
+      { allowEmpty: true }
+    )
     .pipe(merge({}))
     .pipe(
       transform((data) => {
@@ -398,7 +415,7 @@ gulp.task("build-translation-write-metadata", () =>
 gulp.task(
   "create-translations",
   gulp.series(
-    gulp.parallel("create-test-metadata", "create-test-translation"),
+    ...(env.isProdBuild() ? [] : ["create-test-translation"]),
     "build-master-translation",
     "build-merged-translations",
     gulp.parallel(...splitTasks),

build-scripts/webpack.cjs

@@ -1,8 +1,6 @@
 const { existsSync } = require("fs");
 const path = require("path");
 const webpack = require("webpack");
-const { StatsWriterPlugin } = require("webpack-stats-plugin");
-const filterStats = require("@bundle-stats/plugin-webpack-filter").default;
 const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
 const log = require("fancy-log");
@@ -154,15 +152,6 @@ const createWebpackConfig = ({
           )
         ),
       !isProdBuild && new LogStartCompilePlugin(),
-      isProdBuild &&
-        new StatsWriterPlugin({
-          filename: path.relative(
-            outputPath,
-            path.join(paths.build_dir, "stats", `${name}.json`)
-          ),
-          stats: { assets: true, chunks: true, modules: true },
-          transform: (stats) => JSON.stringify(filterStats(stats)),
-        }),
     ].filter(Boolean),
     resolve: {
       extensions: [".ts", ".js", ".json"],
@@ -176,14 +165,11 @@ const createWebpackConfig = ({
         "lit/directives/guard$": "lit/directives/guard.js",
         "lit/directives/cache$": "lit/directives/cache.js",
         "lit/directives/repeat$": "lit/directives/repeat.js",
-        "lit/directives/live$": "lit/directives/live.js",
         "lit/polyfill-support$": "lit/polyfill-support.js",
         "@lit-labs/virtualizer/layouts/grid":
           "@lit-labs/virtualizer/layouts/grid.js",
         "@lit-labs/virtualizer/polyfills/resize-observer-polyfill/ResizeObserver":
           "@lit-labs/virtualizer/polyfills/resize-observer-polyfill/ResizeObserver.js",
-        "@lit-labs/observers/resize-controller":
-          "@lit-labs/observers/resize-controller.js",
       },
     },
     output: {
@@ -196,7 +182,6 @@ const createWebpackConfig = ({
         isProdBuild && !isStatsBuild ? "[id]-[contenthash].js" : "[name].js",
       assetModuleFilename:
         isProdBuild && !isStatsBuild ? "[id]-[contenthash][ext]" : "[id][ext]",
-      crossOriginLoading: "use-credentials",
       hashFunction: "xxhash64",
       hashDigest: "base64url",
       hashDigestLength: 11, // full length of 64 bit base64url

cast/src/launcher/entrypoint.ts

@@ -1,4 +1,4 @@
 import "../../../src/resources/safari-14-attachshadow-patch";
+import "../../../src/resources/ha-style";
+import "../../../src/resources/roboto";
 import "./layout/hc-connect";
-
-import("../../../src/resources/ha-style");

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

@@ -32,8 +32,6 @@ import { HassElement } from "../../../../src/state/hass-element";
 import { castContext } from "../cast_context";
 import "./hc-launch-screen";
 
-const DEFAULT_STRATEGY = "original-states";
-
 let resourcesLoaded = false;
 @customElement("hc-main")
 export class HcMain extends HassElement {
@@ -100,9 +98,7 @@ export class HcMain extends HassElement {
 
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
-    import("./hc-lovelace");
+    import("../second-load");
-    import("../../../../src/resources/ha-style");
-
     window.addEventListener("location-changed", () => {
       const panelPath = `/${this._urlPath || "lovelace"}/`;
       if (location.pathname.startsWith(panelPath)) {
@@ -262,6 +258,7 @@ export class HcMain extends HassElement {
           {
             strategy: {
               type: "energy",
+              options: { show_date_selection: true },
             },
           },
         ],
@@ -309,7 +306,7 @@ export class HcMain extends HassElement {
         ? await fetchResources(this.hass!.connection)
         : (this._lovelaceConfig as LegacyLovelaceConfig).resources;
       if (resources) {
-        loadLovelaceResources(resources, this.hass!);
+        loadLovelaceResources(resources, this.hass!.auth.data.hassUrl);
       }
     }
 
@@ -323,9 +320,10 @@ export class HcMain extends HassElement {
     this._handleNewLovelaceConfig(
       await generateLovelaceDashboardStrategy(
         {
-          type: DEFAULT_STRATEGY,
+          hass: this.hass!,
+          narrow: false,
         },
-        this.hass!
+        "original-states"
       )
     );
   }

cast/src/receiver/second-load.ts

@@ -0,0 +1,3 @@
+import "../../../src/resources/ha-style";
+import "../../../src/resources/roboto";
+import "./layout/hc-lovelace";

demo/public/manifest.json

@@ -8,67 +8,25 @@
       "src": "/static/icons/favicon-192x192.png",
       "sizes": "192x192",
       "type": "image/png",
-      "purpose": "any"
+      "purpose": "maskable any"
     },
     {
       "src": "/static/icons/favicon-384x384.png",
       "sizes": "384x384",
       "type": "image/png",
-      "purpose": "any"
+      "purpose": "maskable any"
     },
     {
       "src": "/static/icons/favicon-512x512.png",
       "sizes": "512x512",
       "type": "image/png",
-      "purpose": "any"
+      "purpose": "maskable any"
     },
     {
       "src": "/static/icons/favicon-1024x1024.png",
       "sizes": "1024x1024",
       "type": "image/png",
-      "purpose": "any"
+      "purpose": "maskable any"
-    },
-    {
-      "src": "/static/icons/maskable_icon-48x48.png",
-      "sizes": "48x48",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-72x72.png",
-      "sizes": "72x72",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-96x96.png",
-      "sizes": "96x96",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-128x128.png",
-      "sizes": "128x128",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-192x192.png",
-      "sizes": "192x192",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-384x384.png",
-      "sizes": "384x384",
-      "type": "image/png",
-      "purpose": "maskable"
-    },
-    {
-      "src": "/static/icons/maskable_icon-512x512.png",
-      "sizes": "512x512",
-      "type": "image/png",
-      "purpose": "maskable"
     }
   ],
   "lang": "en-US",

demo/src/configs/arsaboo/entities.ts

@@ -3,15 +3,6 @@ import { DemoConfig } from "../types";
 
 export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
   convertEntities({
-    "todo.shopping_list": {
-      entity_id: "todo.shopping_list",
-      state: "2",
-      attributes: {
-        supported_features: 15,
-        friendly_name: "Shopping List",
-        icon: "mdi:cart",
-      },
-    },
     "zone.home": {
       entity_id: "zone.home",
       state: "zoning",

demo/src/configs/jimpower/entities.ts

@@ -3,15 +3,6 @@ import { DemoConfig } from "../types";
 
 export const demoEntitiesJimpower: DemoConfig["entities"] = () =>
   convertEntities({
-    "todo.shopping_list": {
-      entity_id: "todo.shopping_list",
-      state: "2",
-      attributes: {
-        supported_features: 15,
-        friendly_name: "Shopping List",
-        icon: "mdi:cart",
-      },
-    },
     "zone.powertec": {
       entity_id: "zone.powertec",
       state: "zoning",

demo/src/configs/jimpower/theme.ts

@@ -4,11 +4,16 @@ export const demoThemeJimpower = () => ({
   "primary-color": "#5294E2",
   "label-badge-red": "var(--accent-color)",
   "paper-tabs-selection-bar-color": "green",
+  "paper-slider-knob-color": "var(--accent-color)",
   "light-primary-color": "var(--accent-color)",
   "primary-background-color": "#383C45",
   "primary-text-color": "#FFFFFF",
   "paper-item-selected_-_background-color": "#434954",
+  "paper-slider-active-color": "var(--accent-color)",
   "secondary-background-color": "#383C45",
+  "paper-slider-container-color":
+    "linear-gradient(var(--primary-background-color), var(--secondary-background-color)) no-repeat",
+  "paper-slider-disabled-active-color": "var(--disabled-text-color)",
   "disabled-text-color": "#7F848E",
   "paper-item-icon_-_color": "green",
   "paper-grey-200": "#414A59",
@@ -27,10 +32,14 @@ export const demoThemeJimpower = () => ({
   "switch-unchecked-button-color": "var(--disabled-text-color)",
   "label-badge-border-color": "green",
   "paper-listbox-color": "var(--primary-color)",
+  "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
   "card-background-color": "#434954",
   "label-badge-text-color": "var(--primary-text-color)",
+  "paper-slider-knob-start-color": "var(--accent-color)",
   "switch-unchecked-track-color": "var(--disabled-text-color)",
   "dark-primary-color": "var(--accent-color)",
+  "paper-slider-secondary-color": "var(--secondary-background-color)",
+  "paper-slider-pin-color": "var(--accent-color)",
   "paper-item-icon-active-color": "#F9C536",
   "accent-color": "#E45E65",
   "table-row-alternative-background-color": "#3E424B",

demo/src/configs/kernehed/entities.ts

@@ -3,15 +3,6 @@ import { DemoConfig } from "../types";
 
 export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
   convertEntities({
-    "todo.shopping_list": {
-      entity_id: "todo.shopping_list",
-      state: "2",
-      attributes: {
-        supported_features: 15,
-        friendly_name: "Shopping List",
-        icon: "mdi:cart",
-      },
-    },
     "zone.anna": {
       entity_id: "zone.anna",
       state: "zoning",

demo/src/configs/kernehed/theme.ts

@@ -5,12 +5,17 @@ export const demoThemeKernehed = () => ({
   "primary-color": "#2980b9",
   "label-badge-red": "var(--accent-color)",
   "paper-tabs-selection-bar-color": "green",
+  "paper-slider-knob-color": "var(--accent-color)",
   "primary-text-color": "#FFFFFF",
   "light-primary-color": "var(--accent-color)",
   "primary-background-color": "#222222",
   "sidebar-icon-color": "#777777",
   "paper-item-selected_-_background-color": "#292929",
+  "paper-slider-active-color": "var(--accent-color)",
   "secondary-background-color": "#222222",
+  "paper-slider-container-color":
+    "linear-gradient(var(--primary-background-color), var(--secondary-background-color)) no-repeat",
+  "paper-slider-disabled-active-color": "var(--disabled-text-color)",
   "disabled-text-color": "#777777",
   "paper-item-icon_-_color": "green",
   "paper-grey-200": "#222222",
@@ -28,10 +33,14 @@ export const demoThemeKernehed = () => ({
   "switch-unchecked-button-color": "var(--disabled-text-color)",
   "label-badge-border-color": "green",
   "paper-listbox-color": "#777777",
+  "paper-slider-disabled-secondary-color": "var(--disabled-text-color)",
   "card-background-color": "#292929",
   "label-badge-text-color": "var(--primary-text-color)",
+  "paper-slider-knob-start-color": "var(--accent-color)",
   "switch-unchecked-track-color": "var(--disabled-text-color)",
   "dark-primary-color": "var(--accent-color)",
+  "paper-slider-secondary-color": "var(--secondary-background-color)",
+  "paper-slider-pin-color": "var(--accent-color)",
   "paper-item-icon-active-color": "#b58e31",
   "accent-color": "#2980b9",
   "table-row-alternative-background-color": "#292929",

demo/src/configs/teachingbirds/entities.ts

@@ -3,15 +3,6 @@ import { DemoConfig } from "../types";
 
 export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
   convertEntities({
-    "todo.shopping_list": {
-      entity_id: "todo.shopping_list",
-      state: "2",
-      attributes: {
-        supported_features: 15,
-        friendly_name: "Shopping List",
-        icon: "mdi:cart",
-      },
-    },
     "sensor.pollen_grabo": {
       entity_id: "sensor.pollen_grabo",
       state: "",

demo/src/configs/teachingbirds/lovelace.ts

@@ -220,8 +220,7 @@ export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
           state_filter: ["on"],
         },
         {
-          type: "todo-list",
+          type: "shopping-list",
-          entity: "todo.shopping_list",
         },
         {
           entities: [

demo/src/configs/teachingbirds/theme.ts

@@ -1,5 +1,6 @@
 export const demoThemeTeachingbirds = () => ({
   "paper-card-header-color": "var(--paper-item-icon-color)",
+  "paper-slider-pin-color": "var(--primary-color)",
   "paper-listbox-background-color": "#202020",
   "paper-grey-50": "var(--primary-text-color)",
   "paper-item-icon-color": "#d3d3d3",
@@ -7,6 +8,8 @@ export const demoThemeTeachingbirds = () => ({
   "primary-color": "#389638",
   "light-primary-color": "#6f956f",
   "label-badge-red": "var(--primary-color)",
+  "paper-slider-secondary-color": "var(--light-primary-color)",
+  "paper-slider-knob-color": "var(--primary-color)",
   "paper-listbox-color": "#FFFFFF",
   "paper-toggle-button-checked-bar-color": "var(--light-primary-color)",
   "switch-unchecked-track-color": "var(--primary-text-color)",
@@ -14,7 +17,9 @@ export const demoThemeTeachingbirds = () => ({
   "label-badge-text-color": "var(--text-primary-color)",
   "primary-background-color": "#303030",
   "sidebar-icon-color": "var(--paper-item-icon-color)",
+  "paper-slider-active-color": "#d8bf50",
   "secondary-background-color": "#2b2b2b",
+  "paper-slider-knob-start-color": "var(--primary-color)",
   "paper-item-icon-active-color": "#d8bf50",
   "switch-checked-color": "var(--primary-color)",
   "secondary-text-color": "#389638",

demo/src/entrypoint.ts

@@ -1,4 +1,4 @@
+import "../../src/resources/ha-style";
+import "../../src/resources/roboto";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./ha-demo";
-
-import("../../src/resources/ha-style");

demo/src/ha-demo.ts

@@ -22,7 +22,7 @@ import { mockLovelace } from "./stubs/lovelace";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { mockPersistentNotification } from "./stubs/persistent_notification";
 import { mockRecorder } from "./stubs/recorder";
-import { mockTodo } from "./stubs/todo";
+import { mockShoppingList } from "./stubs/shopping_list";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
 import { mockTranslations } from "./stubs/translations";
@@ -49,7 +49,7 @@ export class HaDemo extends HomeAssistantAppEl {
     mockTranslations(hass);
     mockHistory(hass);
     mockRecorder(hass);
-    mockTodo(hass);
+    mockShoppingList(hass);
     mockSystemLog(hass);
     mockTemplate(hass);
     mockEvents(hass);

demo/src/html/index.html.template

@@ -62,34 +62,10 @@
         justify-content: center;
         align-items: center;
       }
-      #ha-launch-screen svg {
-        width: 170px;
-        flex-shrink: 0;
-      }
-      #ha-launch-screen .ha-launch-screen-spacer {
-        flex: 1;
-      }
     </style>
   </head>
   <body>
-    <div id="ha-launch-screen">
+    <div id="ha-launch-screen"></div>
-      <div class="ha-launch-screen-spacer"></div>
-      <svg
-        viewBox="0 0 240 240"
-        fill="none"
-        xmlns="http://www.w3.org/2000/svg"
-      >
-        <path
-          d="M240 224.762C240 233.012 233.25 239.762 225 239.762H15C6.75 239.762 0 233.012 0 224.762V134.762C0 126.512 4.77 114.993 10.61 109.153L109.39 10.3725C115.22 4.5425 124.77 4.5425 130.6 10.3725L229.39 109.162C235.22 114.992 240 126.522 240 134.772V224.772V224.762Z"
-          fill="#F2F4F9"
-        />
-        <path
-          d="M229.39 109.153L130.61 10.3725C124.78 4.5425 115.23 4.5425 109.4 10.3725L10.61 109.153C4.78 114.983 0 126.512 0 134.762V224.762C0 233.012 6.75 239.762 15 239.762H107.27L66.64 199.132C64.55 199.852 62.32 200.262 60 200.262C48.7 200.262 39.5 191.062 39.5 179.762C39.5 168.462 48.7 159.262 60 159.262C71.3 159.262 80.5 168.462 80.5 179.762C80.5 182.092 80.09 184.322 79.37 186.412L111 218.042V102.162C104.2 98.8225 99.5 91.8425 99.5 83.7725C99.5 72.4725 108.7 63.2725 120 63.2725C131.3 63.2725 140.5 72.4725 140.5 83.7725C140.5 91.8425 135.8 98.8225 129 102.162V183.432L160.46 151.972C159.84 150.012 159.5 147.932 159.5 145.772C159.5 134.472 168.7 125.272 180 125.272C191.3 125.272 200.5 134.472 200.5 145.772C200.5 157.072 191.3 166.272 180 166.272C177.5 166.272 175.12 165.802 172.91 164.982L129 208.892V239.772H225C233.25 239.772 240 233.022 240 224.772V134.772C240 126.522 235.23 115.002 229.39 109.162V109.153Z"
-          fill="#18BCF2"
-        />
-      </svg>
-      <div id="ha-launch-screen-info-box" class="ha-launch-screen-spacer"></div>
-    </div>
     <ha-demo></ha-demo>
     <%= renderTemplate("../../../src/html/_js_base.html.template") %>
     <%= renderTemplate("../../../src/html/_preload_roboto.html.template") %>

demo/src/stubs/shopping_list.ts

@@ -0,0 +1,44 @@
+import { ShoppingListItem } from "../../../src/data/shopping-list";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+
+let items: ShoppingListItem[] = [
+  {
+    id: 12,
+    name: "Milk",
+    complete: false,
+  },
+  {
+    id: 13,
+    name: "Eggs",
+    complete: false,
+  },
+  {
+    id: 14,
+    name: "Oranges",
+    complete: true,
+  },
+];
+
+export const mockShoppingList = (hass: MockHomeAssistant) => {
+  hass.mockWS("shopping_list/items", () => items);
+  hass.mockWS("shopping_list/items/add", (msg) => {
+    const item: ShoppingListItem = {
+      id: new Date().getTime(),
+      complete: false,
+      name: msg.name,
+    };
+    items.push(item);
+    hass.mockEvent("shopping_list_updated");
+    return item;
+  });
+  hass.mockWS("shopping_list/items/update", ({ type, item_id, ...updates }) => {
+    items = items.map((item) =>
+      item.id === item_id ? { ...item, ...updates } : item
+    );
+    hass.mockEvent("shopping_list_updated");
+  });
+  hass.mockWS("shopping_list/items/clear", () => {
+    items = items.filter((item) => !item.complete);
+    hass.mockEvent("shopping_list_updated");
+  });
+};

demo/src/stubs/todo.ts

@@ -1,24 +0,0 @@
-import { TodoItem, TodoItemStatus } from "../../../src/data/todo";
-import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockTodo = (hass: MockHomeAssistant) => {
-  hass.mockWS("todo/item/list", () => ({
-    items: [
-      {
-        uid: "12",
-        summary: "Milk",
-        status: TodoItemStatus.NeedsAction,
-      },
-      {
-        uid: "13",
-        summary: "Eggs",
-        status: TodoItemStatus.NeedsAction,
-      },
-      {
-        uid: "14",
-        summary: "Oranges",
-        status: TodoItemStatus.Completed,
-      },
-    ] as TodoItem[],
-  }));
-};

gallery/src/entrypoint.js

@@ -1,5 +1,5 @@
+import "../../src/resources/ha-style";
+import "../../src/resources/roboto";
 import "./ha-gallery";
 
-import("../../src/resources/ha-style");
-
 document.body.appendChild(document.createElement("ha-gallery"));

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

@@ -1,10 +1,10 @@
+import { mdiHomeAssistant } from "@mdi/js";
 import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-chip";
 import "../../../../src/components/ha-chip-set";
 import "../../../../src/components/ha-svg-icon";
-import { mdiHomeAssistant } from "../../../../src/resources/home-assistant-logo-svg";
 
 const chips: {
   icon?: string;

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

@@ -49,11 +49,11 @@ export class DemoHaCircularSlider extends LitElement {
           <div class="field">
             <p>Current</p>
             <ha-slider
-              labeled
               min="10"
               max="30"
               .value=${this.current}
               @change=${this._currentChanged}
+              pin
             ></ha-slider>
             <p>${this.current} °C</p>
           </div>

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

@@ -57,7 +57,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
   {
     area_id: "backyard",
@@ -75,7 +74,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
   {
     area_id: null,
@@ -93,7 +91,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
 ];
 

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

@@ -57,8 +57,8 @@ export class DemoHaHsColorPicker extends LitElement {
           ></ha-hs-color-picker>
           <p>Hue : ${this.value[0]}</p>
           <ha-slider
-            labeled
             step="1"
+            pin
             min="0"
             max="360"
             .value=${this.value[0]}
@@ -67,8 +67,8 @@ export class DemoHaHsColorPicker extends LitElement {
           </ha-slider>
           <p>Saturation : ${this.value[1]}</p>
           <ha-slider
-            labeled
             step="0.01"
+            pin
             min="0"
             max="1"
             .value=${this.value[1]}
@@ -77,8 +77,8 @@ export class DemoHaHsColorPicker extends LitElement {
           </ha-slider>
           <p>Color Brighness : ${this.brightness}</p>
           <ha-slider
-            labeled
             step="1"
+            pin
             min="0"
             max="255"
             .value=${this.brightness}

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

@@ -53,7 +53,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
   {
     area_id: "backyard",
@@ -71,7 +70,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
   {
     area_id: null,
@@ -89,7 +87,6 @@ const DEVICES = [
     sw_version: null,
     hw_version: null,
     via_device_id: null,
-    serial_number: null,
   },
 ];
 

gallery/src/pages/lovelace/shopping-list-card.markdown

@@ -0,0 +1,3 @@
+---
+title: Shopping List Card
+---

gallery/src/pages/lovelace/shopping-list-card.ts

@@ -2,39 +2,25 @@ import { html, LitElement, PropertyValues, TemplateResult } from "lit";
 import { customElement, query } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import "../../components/demo-cards";
-import { getEntity } from "../../../../src/fake_data/entity";
-import { mockTodo } from "../../../../demo/src/stubs/todo";
-
-const ENTITIES = [
-  getEntity("todo", "shopping_list", "2", {
-    friendly_name: "Shopping List",
-    supported_features: 15,
-  }),
-  getEntity("todo", "read_only", "2", {
-    friendly_name: "Read only",
-  }),
-];
 
 const CONFIGS = [
   {
     heading: "List example",
     config: `
-- type: todo-list
+- type: shopping-list
-  entity: todo.shopping_list
     `,
   },
   {
     heading: "List with title example",
     config: `
-- type: todo-list
+- type: shopping-list
   title: Shopping List
-  entity: todo.read_only
     `,
   },
 ];
 
-@customElement("demo-lovelace-todo-list-card")
+@customElement("demo-lovelace-shopping-list-card")
-class DemoTodoListEntity extends LitElement {
+class DemoShoppingListEntity extends LitElement {
   @query("#demos") private _demoRoot!: HTMLElement;
 
   protected render(): TemplateResult {
@@ -46,14 +32,18 @@ class DemoTodoListEntity extends LitElement {
     const hass = provideHass(this._demoRoot);
     hass.updateTranslations(null, "en");
     hass.updateTranslations("lovelace", "en");
-    hass.addEntities(ENTITIES);
 
-    mockTodo(hass);
+    hass.mockAPI("shopping_list", () => [
+      { name: "list", id: 1, complete: false },
+      { name: "all", id: 2, complete: false },
+      { name: "the", id: 3, complete: false },
+      { name: "things", id: 4, complete: true },
+    ]);
   }
 }
 
 declare global {
   interface HTMLElementTagNameMap {
-    "demo-lovelace-todo-list-card": DemoTodoListEntity;
+    "demo-lovelace-shopping-list-card": DemoShoppingListEntity;
   }
 }

gallery/src/pages/lovelace/todo-list-card.markdown

@@ -1,3 +0,0 @@
----
-title: Todo List Card
----

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

@@ -213,7 +213,6 @@ const createDeviceRegistryEntries = (
     name: "Tag Reader",
     sw_version: null,
     hw_version: "1.0.0",
-    serial_number: "00_12_4B_00_22_98_88_7F",
     id: "mock-device-id",
     identifiers: [],
     via_device_id: null,

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

@@ -7,6 +7,7 @@ import {
   mdiDocker,
   mdiExclamationThick,
   mdiFlask,
+  mdiHomeAssistant,
   mdiKey,
   mdiLinkLock,
   mdiNetwork,
@@ -21,7 +22,7 @@ import {
   mdiPound,
   mdiShield,
 } from "@mdi/js";
-import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
 import memoizeOne from "memoize-one";
@@ -39,11 +40,11 @@ import "../../../../src/components/ha-svg-icon";
 import "../../../../src/components/ha-switch";
 import {
   AddonCapability,
+  fetchHassioAddonChangelog,
+  fetchHassioAddonInfo,
   HassioAddonDetails,
   HassioAddonSetOptionParams,
   HassioAddonSetSecurityParams,
-  fetchHassioAddonChangelog,
-  fetchHassioAddonInfo,
   installHassioAddon,
   rebuildLocalAddon,
   restartHassioAddon,
@@ -55,9 +56,9 @@ import {
   validateHassioAddonOption,
 } from "../../../../src/data/hassio/addon";
 import {
-  HassioStats,
   extractApiErrorMessage,
   fetchHassioStats,
+  HassioStats,
 } from "../../../../src/data/hassio/common";
 import {
   StoreAddon,
@@ -68,7 +69,6 @@ import {
   showAlertDialog,
   showConfirmationDialog,
 } from "../../../../src/dialogs/generic/show-dialog-box";
-import { mdiHomeAssistant } from "../../../../src/resources/home-assistant-logo-svg";
 import { haStyle } from "../../../../src/resources/styles";
 import { HomeAssistant, Route } from "../../../../src/types";
 import { bytesToString } from "../../../../src/util/bytes-to-string";

hassio/src/backups/hassio-backups.ts

@@ -360,9 +360,11 @@ export class HassioBackups extends LitElement {
     if (this.supervisor!.info.state !== "running") {
       showAlertDialog(this, {
         title: this.supervisor!.localize("backup.could_not_create"),
-        text: this.supervisor!.localize("backup.create_blocked_not_running", {
+        text: this.supervisor!.localize(
-          state: this.supervisor!.info.state,
+          "backup.create_blocked_not_running",
-        }),
+          "state",
+          this.supervisor!.info.state
+        ),
       });
       return;
     }

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

@@ -1,9 +1,8 @@
 import Fuse from "fuse.js";
-import type { IFuseOptions } from "fuse.js";
 import { StoreAddon } from "../../../src/data/supervisor/store";
 
 export function filterAndSort(addons: StoreAddon[], filter: string) {
-  const options: IFuseOptions<StoreAddon> = {
+  const options: Fuse.IFuseOptions<StoreAddon> = {
     keys: ["name", "description", "slug"],
     isCaseSensitive: false,
     minMatchCharLength: 2,

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

@@ -1,13 +1,13 @@
-import { mdiFolder, mdiPuzzle } from "@mdi/js";
+import { mdiFolder, mdiHomeAssistant, mdiPuzzle } from "@mdi/js";
 import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
 import {
-  CSSResultGroup,
-  LitElement,
-  TemplateResult,
   css,
+  CSSResultGroup,
   html,
+  LitElement,
   nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
@@ -24,7 +24,6 @@ import {
   HassioPartialBackupCreateParams,
 } from "../../../src/data/hassio/backup";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import { mdiHomeAssistant } from "../../../src/resources/home-assistant-logo-svg";
 import {
   HomeAssistant,
   TranslationDict,

hassio/src/dashboard/hassio-update.ts

@@ -1,4 +1,5 @@
 import "@material/mwc-button";
+import { mdiHomeAssistant } from "@mdi/js";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -12,7 +13,6 @@ import {
   HassioSupervisorInfo,
 } from "../../../src/data/hassio/supervisor";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
-import { mdiHomeAssistant } from "../../../src/resources/home-assistant-logo-svg";
 import { haStyle } from "../../../src/resources/styles";
 import { HomeAssistant } from "../../../src/types";
 import { hassioStyle } from "../resources/hassio-style";

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

@@ -31,7 +31,6 @@ import { fileDownload } from "../../../../src/util/file_download";
 import "../../components/supervisor-backup-content";
 import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
 import { HassioBackupDialogParams } from "./show-dialog-hassio-backup";
-import { BackupOrRestoreKey } from "../../util/translations";
 
 @customElement("dialog-hassio-backup")
 class HassioBackupDialog
@@ -65,13 +64,6 @@ class HassioBackupDialog
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  private _localize(key: BackupOrRestoreKey) {
-    return (
-      this._dialogParams!.supervisor?.localize(`backup.${key}`) ||
-      this._dialogParams!.localize!(`ui.panel.page-onboarding.restore.${key}`)
-    );
-  }
-
   protected render() {
     if (!this._dialogParams || !this._backup) {
       return nothing;
@@ -87,7 +79,7 @@ class HassioBackupDialog
           <ha-header-bar>
             <span slot="title">${this._backup.name}</span>
             <ha-icon-button
-              .label=${this._localize("close")}
+              .label=${this.hass?.localize("ui.common.close") || "Close"}
               .path=${mdiClose}
               slot="actionItems"
               dialogAction="cancel"
@@ -95,31 +87,29 @@ class HassioBackupDialog
           </ha-header-bar>
         </div>
         ${this._restoringBackup
-          ? html`<ha-circular-progress active></ha-circular-progress>`
+          ? html` <ha-circular-progress active></ha-circular-progress>`
-          : html`
+          : html`<supervisor-backup-content
-              <supervisor-backup-content
+              .hass=${this.hass}
-                .hass=${this.hass}
+              .supervisor=${this._dialogParams.supervisor}
-                .supervisor=${this._dialogParams.supervisor}
+              .backup=${this._backup}
-                .backup=${this._backup}
+              .onboarding=${this._dialogParams.onboarding || false}
-                .onboarding=${this._dialogParams.onboarding || false}
+              .localize=${this._dialogParams.localize}
-                .localize=${this._dialogParams.localize}
+              dialogInitialFocus
-                dialogInitialFocus
+            >
-              >
+            </supervisor-backup-content>`}
-              </supervisor-backup-content>
-            `}
         ${this._error
           ? html`<ha-alert alert-type="error">${this._error}</ha-alert>`
-          : nothing}
+          : ""}
 
         <mwc-button
           .disabled=${this._restoringBackup}
           slot="secondaryAction"
           @click=${this._restoreClicked}
         >
-          ${this._localize("restore")}
+          Restore
         </mwc-button>
 
-        ${!this._dialogParams.onboarding && this._dialogParams.supervisor
+        ${!this._dialogParams.onboarding
           ? html`<ha-button-menu
               fixed
               slot="primaryAction"
@@ -127,24 +117,22 @@ class HassioBackupDialog
               @closed=${stopPropagation}
             >
               <ha-icon-button
-                .label=${this._dialogParams.supervisor.localize(
+                .label=${this.hass!.localize("ui.common.menu") || "Menu"}
-                  "backup.more_actions"
-                )}
                 .path=${mdiDotsVertical}
                 slot="trigger"
               ></ha-icon-button>
               <mwc-list-item
-                >${this._dialogParams.supervisor.localize(
+                >${this._dialogParams.supervisor?.localize(
                   "backup.download_backup"
                 )}</mwc-list-item
               >
               <mwc-list-item class="error"
-                >${this._dialogParams.supervisor.localize(
+                >${this._dialogParams.supervisor?.localize(
                   "backup.delete_backup_title"
                 )}</mwc-list-item
               >
             </ha-button-menu>`
-          : nothing}
+          : ""}
       </ha-dialog>
     `;
   }
@@ -195,22 +183,21 @@ class HassioBackupDialog
   }
 
   private async _partialRestoreClicked(backupDetails) {
-    const supervisor = this._dialogParams?.supervisor;
+    if (
-    if (supervisor !== undefined && supervisor.info.state !== "running") {
+      this._dialogParams?.supervisor !== undefined &&
+      this._dialogParams?.supervisor.info.state !== "running"
+    ) {
       await showAlertDialog(this, {
-        title: supervisor.localize("backup.could_not_restore"),
+        title: "Could not restore backup",
-        text: supervisor.localize("backup.restore_blocked_not_running", {
+        text: `Restoring a backup is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
-          state: supervisor.info.state,
-        }),
       });
       return;
     }
     if (
       !(await showConfirmationDialog(this, {
-        title: this._localize("confirm_restore_partial_backup_title"),
+        title: "Are you sure you want to restore this partial backup?",
-        text: this._localize("confirm_restore_partial_backup_text"),
+        confirmText: "restore",
-        confirmText: this._localize("restore"),
+        dismissText: "cancel",
-        dismissText: this._localize("cancel"),
       }))
     ) {
       return;
@@ -243,22 +230,22 @@ class HassioBackupDialog
   }
 
   private async _fullRestoreClicked(backupDetails) {
-    const supervisor = this._dialogParams?.supervisor;
+    if (
-    if (supervisor !== undefined && supervisor.info.state !== "running") {
+      this._dialogParams?.supervisor !== undefined &&
+      this._dialogParams?.supervisor.info.state !== "running"
+    ) {
       await showAlertDialog(this, {
-        title: supervisor.localize("backup.could_not_restore"),
+        title: "Could not restore backup",
-        text: supervisor.localize("backup.restore_blocked_not_running", {
+        text: `Restoring a backup is not possible right now because the system is in ${this._dialogParams?.supervisor.info.state} state.`,
-          state: supervisor.info.state,
-        }),
       });
       return;
     }
     if (
       !(await showConfirmationDialog(this, {
-        title: this._localize("confirm_restore_full_backup_title"),
+        title:
-        text: this._localize("confirm_restore_full_backup_text"),
+          "Are you sure you want to wipe your system and restore this backup?",
-        confirmText: this._localize("restore"),
+        confirmText: "restore",
-        dismissText: this._localize("cancel"),
+        dismissText: "cancel",
       }))
     ) {
       return;
@@ -292,15 +279,11 @@ class HassioBackupDialog
   }
 
   private async _deleteClicked() {
-    const supervisor = this._dialogParams?.supervisor;
-    if (!supervisor) return;
-
     if (
       !(await showConfirmationDialog(this, {
-        title: supervisor!.localize("backup.confirm_delete_title"),
+        title: "Are you sure you want to delete this backup?",
-        text: supervisor!.localize("backup.confirm_delete_text"),
+        confirmText: "delete",
-        confirmText: supervisor!.localize("backup.delete"),
+        dismissText: "cancel",
-        dismissText: supervisor!.localize("backup.cancel"),
       }))
     ) {
       return;
@@ -318,9 +301,6 @@ class HassioBackupDialog
   }
 
   private async _downloadClicked() {
-    const supervisor = this._dialogParams?.supervisor;
-    if (!supervisor) return;
-
     let signedPath: { path: string };
     try {
       signedPath = await getSignedPath(
@@ -340,10 +320,10 @@ class HassioBackupDialog
 
     if (window.location.href.includes("ui.nabu.casa")) {
       const confirm = await showConfirmationDialog(this, {
-        title: supervisor.localize("backup.remote_download_title"),
+        title: "Potential slow download",
-        text: supervisor.localize("backup.remote_download_text"),
+        text: "Downloading backups over the Nabu Casa URL will take some time, it is recomended to use your local URL instead, do you want to continue?",
-        confirmText: supervisor.localize("backup.download"),
+        confirmText: "continue",
-        dismissText: this._localize("cancel"),
+        dismissText: "cancel",
       });
       if (!confirm) {
         return;

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

@@ -89,7 +89,8 @@ class HassioCreateBackupDialog extends LitElement {
         ),
         text: this._dialogParams!.supervisor.localize(
           "backup.create_blocked_not_running",
-          { state: this._dialogParams!.supervisor.info.state }
+          "state",
+          this._dialogParams!.supervisor.info.state
         ),
       });
       return;

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

@@ -1,5 +1,4 @@
 import { mdiClose } from "@mdi/js";
-import { dump } from "js-yaml";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -10,6 +9,7 @@ import "../../../../src/components/ha-expansion-panel";
 import "../../../../src/components/ha-icon-button";
 import "../../../../src/components/search-input";
 import { HassioHardwareInfo } from "../../../../src/data/hassio/hardware";
+import { dump } from "../../../../src/resources/js-yaml-dump";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
 import { HassioHardwareDialogParams } from "./show-dialog-hassio-hardware";

hassio/src/entrypoint.ts

@@ -1,15 +1,15 @@
 // Compat needs to be first import
 import "../../src/resources/compatibility";
+import { setCancelSyntheticClickEvents } from "@polymer/polymer/lib/utils/settings";
+import "../../src/resources/roboto";
+import "../../src/resources/ha-style";
 import "../../src/resources/safari-14-attachshadow-patch";
 import "./hassio-main";
 
-import("../../src/resources/ha-style");
+setCancelSyntheticClickEvents(false);
-import("@polymer/polymer/lib/utils/settings").then(
-  ({ setCancelSyntheticClickEvents }) => setCancelSyntheticClickEvents(false)
-);
 
 const styleEl = document.createElement("style");
-styleEl.textContent = `
+styleEl.innerHTML = `
 body {
   font-family: Roboto, sans-serif;
   -moz-osx-font-smoothing: grayscale;

hassio/src/util/translations.ts

@@ -1,4 +0,0 @@
-import type { TranslationDict } from "../../../src/types";
-
-export type BackupOrRestoreKey = keyof TranslationDict["supervisor"]["backup"] &
-  keyof TranslationDict["ui"]["panel"]["page-onboarding"]["restore"];

package.json

@@ -25,46 +25,43 @@
   "license": "Apache-2.0",
   "type": "module",
   "dependencies": {
-    "@babel/runtime": "7.23.2",
+    "@babel/runtime": "7.22.15",
     "@braintree/sanitize-url": "6.0.4",
-    "@codemirror/autocomplete": "6.10.2",
+    "@codemirror/autocomplete": "6.9.1",
-    "@codemirror/commands": "6.3.0",
+    "@codemirror/commands": "6.2.5",
-    "@codemirror/language": "6.9.2",
+    "@codemirror/language": "6.9.0",
     "@codemirror/legacy-modes": "6.3.3",
-    "@codemirror/search": "6.5.4",
+    "@codemirror/search": "6.5.3",
-    "@codemirror/state": "6.3.1",
+    "@codemirror/state": "6.2.1",
-    "@codemirror/view": "6.21.4",
+    "@codemirror/view": "6.19.0",
     "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "6.11.1",
+    "@formatjs/intl-datetimeformat": "6.10.2",
-    "@formatjs/intl-displaynames": "6.6.1",
+    "@formatjs/intl-displaynames": "6.5.2",
-    "@formatjs/intl-getcanonicallocales": "2.3.0",
+    "@formatjs/intl-getcanonicallocales": "2.2.1",
-    "@formatjs/intl-listformat": "7.5.0",
+    "@formatjs/intl-listformat": "7.4.2",
-    "@formatjs/intl-locale": "3.4.0",
+    "@formatjs/intl-locale": "3.3.4",
-    "@formatjs/intl-numberformat": "8.8.0",
+    "@formatjs/intl-numberformat": "8.7.2",
-    "@formatjs/intl-pluralrules": "5.2.7",
+    "@formatjs/intl-pluralrules": "5.2.6",
-    "@formatjs/intl-relativetimeformat": "11.2.7",
+    "@formatjs/intl-relativetimeformat": "11.2.6",
-    "@fullcalendar/core": "6.1.9",
+    "@fullcalendar/core": "6.1.8",
-    "@fullcalendar/daygrid": "6.1.9",
+    "@fullcalendar/daygrid": "6.1.8",
-    "@fullcalendar/interaction": "6.1.9",
+    "@fullcalendar/interaction": "6.1.8",
-    "@fullcalendar/list": "6.1.9",
+    "@fullcalendar/list": "6.1.8",
-    "@fullcalendar/luxon3": "6.1.9",
+    "@fullcalendar/luxon3": "6.1.8",
-    "@fullcalendar/timegrid": "6.1.9",
+    "@fullcalendar/timegrid": "6.1.8",
     "@lezer/highlight": "1.1.6",
     "@lit-labs/context": "0.4.1",
     "@lit-labs/motion": "1.0.4",
-    "@lit-labs/observers": "2.0.1",
     "@lit-labs/virtualizer": "2.0.7",
     "@lrnwebcomponents/simple-tooltip": "7.0.18",
     "@material/chips": "=14.0.0-canary.53b3cad2f.0",
     "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
-    "@material/mwc-base": "0.27.0",
     "@material/mwc-button": "0.27.0",
     "@material/mwc-checkbox": "0.27.0",
     "@material/mwc-circular-progress": "0.27.0",
     "@material/mwc-dialog": "0.27.0",
     "@material/mwc-drawer": "0.27.0",
     "@material/mwc-fab": "0.27.0",
-    "@material/mwc-floating-label": "0.27.0",
     "@material/mwc-formfield": "0.27.0",
     "@material/mwc-icon-button": "0.27.0",
     "@material/mwc-linear-progress": "0.27.0",
@@ -73,6 +70,7 @@
     "@material/mwc-radio": "0.27.0",
     "@material/mwc-ripple": "0.27.0",
     "@material/mwc-select": "0.27.0",
+    "@material/mwc-slider": "0.27.0",
     "@material/mwc-switch": "0.27.0",
     "@material/mwc-tab": "0.27.0",
     "@material/mwc-tab-bar": "0.27.0",
@@ -81,21 +79,22 @@
     "@material/mwc-top-app-bar": "0.27.0",
     "@material/mwc-top-app-bar-fixed": "0.27.0",
     "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "=1.0.1",
+    "@material/web": "=1.0.0-pre.17",
-    "@mdi/js": "7.3.67",
+    "@mdi/js": "7.2.96",
-    "@mdi/svg": "7.3.67",
+    "@mdi/svg": "7.2.96",
     "@polymer/iron-flex-layout": "3.0.1",
     "@polymer/iron-input": "3.0.1",
     "@polymer/iron-resizable-behavior": "3.0.1",
     "@polymer/paper-input": "3.2.1",
     "@polymer/paper-item": "3.0.1",
     "@polymer/paper-listbox": "3.0.1",
+    "@polymer/paper-slider": "3.0.1",
     "@polymer/paper-tabs": "3.1.0",
     "@polymer/paper-toast": "3.0.1",
     "@polymer/polymer": "3.5.1",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "24.2.1",
+    "@vaadin/combo-box": "24.1.7",
-    "@vaadin/vaadin-themable-mixin": "24.2.1",
+    "@vaadin/vaadin-themable-mixin": "24.1.7",
     "@vibrant/color": "3.2.1-alpha.1",
     "@vibrant/core": "3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
@@ -103,26 +102,26 @@
     "@webcomponents/scoped-custom-element-registry": "0.0.9",
     "@webcomponents/webcomponentsjs": "2.8.0",
     "app-datepicker": "5.1.1",
-    "chart.js": "4.4.0",
+    "chart.js": "4.3.3",
     "comlink": "4.4.1",
-    "core-js": "3.33.1",
+    "core-js": "3.32.2",
-    "cropperjs": "1.6.1",
+    "cropperjs": "1.6.0",
     "date-fns": "2.30.0",
     "date-fns-tz": "2.0.0",
     "deep-clone-simple": "1.1.1",
     "deep-freeze": "0.0.1",
-    "fuse.js": "7.0.0",
+    "fuse.js": "6.6.2",
     "google-timezones-json": "1.2.0",
     "hls.js": "1.4.12",
-    "home-assistant-js-websocket": "9.1.0",
+    "home-assistant-js-websocket": "8.2.0",
     "idb-keyval": "6.2.1",
-    "intl-messageformat": "10.5.4",
+    "intl-messageformat": "10.5.2",
     "js-yaml": "4.1.0",
     "leaflet": "1.9.4",
     "leaflet-draw": "1.0.4",
     "lit": "2.8.0",
     "luxon": "3.4.3",
-    "marked": "9.1.2",
+    "marked": "7.0.5",
     "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "0.3.2",
@@ -138,11 +137,11 @@
     "tinykeys": "2.1.0",
     "tsparticles-engine": "2.12.0",
     "tsparticles-preset-links": "2.12.0",
-    "ua-parser-js": "1.0.37",
+    "ua-parser-js": "1.0.36",
     "unfetch": "5.0.0",
     "vis-data": "7.1.7",
-    "vis-network": "9.1.8",
+    "vis-network": "9.1.6",
-    "vue": "2.7.15",
+    "vue": "2.7.14",
     "vue2-daterange-picker": "0.6.8",
     "weekstart": "2.0.0",
     "workbox-cacheable-response": "7.0.0",
@@ -154,63 +153,62 @@
     "xss": "1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "7.23.2",
+    "@babel/core": "7.22.20",
-    "@babel/plugin-proposal-decorators": "7.23.2",
+    "@babel/plugin-proposal-decorators": "7.22.15",
-    "@babel/plugin-transform-runtime": "7.23.2",
+    "@babel/plugin-transform-runtime": "7.22.15",
-    "@babel/preset-env": "7.23.2",
+    "@babel/preset-env": "7.22.20",
-    "@babel/preset-typescript": "7.23.2",
+    "@babel/preset-typescript": "7.22.15",
-    "@bundle-stats/plugin-webpack-filter": "4.7.8",
     "@koa/cors": "4.0.0",
-    "@lokalise/node-api": "12.0.0",
+    "@lokalise/node-api": "11.0.1",
-    "@octokit/auth-oauth-device": "6.0.1",
+    "@octokit/auth-oauth-device": "6.0.0",
-    "@octokit/plugin-retry": "6.0.1",
+    "@octokit/plugin-retry": "6.0.0",
-    "@octokit/rest": "20.0.2",
+    "@octokit/rest": "20.0.1",
     "@open-wc/dev-server-hmr": "0.1.4",
-    "@rollup/plugin-babel": "6.0.4",
+    "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-commonjs": "25.0.7",
+    "@rollup/plugin-commonjs": "25.0.4",
-    "@rollup/plugin-json": "6.0.1",
+    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.2.3",
+    "@rollup/plugin-node-resolve": "15.2.1",
-    "@rollup/plugin-replace": "5.0.4",
+    "@rollup/plugin-replace": "5.0.2",
-    "@types/babel__plugin-transform-runtime": "7.9.4",
+    "@types/babel__plugin-transform-runtime": "7.9.3",
-    "@types/chromecast-caf-receiver": "6.0.11",
+    "@types/chromecast-caf-receiver": "6.0.10",
-    "@types/chromecast-caf-sender": "1.0.7",
+    "@types/chromecast-caf-sender": "1.0.6",
-    "@types/esprima": "4.0.5",
+    "@types/esprima": "4.0.3",
     "@types/glob": "8.1.0",
-    "@types/html-minifier-terser": "7.0.1",
+    "@types/html-minifier-terser": "7.0.0",
-    "@types/js-yaml": "4.0.8",
+    "@types/js-yaml": "4.0.6",
-    "@types/leaflet": "1.9.7",
+    "@types/leaflet": "1.9.4",
-    "@types/leaflet-draw": "1.0.9",
+    "@types/leaflet-draw": "1.0.8",
-    "@types/luxon": "3.3.3",
+    "@types/luxon": "3.3.2",
-    "@types/mocha": "10.0.3",
+    "@types/mocha": "10.0.1",
-    "@types/qrcode": "1.5.4",
+    "@types/qrcode": "1.5.2",
-    "@types/serve-handler": "6.1.3",
+    "@types/serve-handler": "6.1.1",
-    "@types/sortablejs": "1.15.4",
+    "@types/sortablejs": "1.15.2",
-    "@types/tar": "6.1.7",
+    "@types/tar": "6.1.6",
-    "@types/ua-parser-js": "0.7.38",
+    "@types/ua-parser-js": "0.7.37",
     "@types/webspeechapi": "0.0.29",
-    "@typescript-eslint/eslint-plugin": "6.9.0",
+    "@typescript-eslint/eslint-plugin": "6.7.0",
-    "@typescript-eslint/parser": "6.9.0",
+    "@typescript-eslint/parser": "6.7.0",
     "@web/dev-server": "0.1.38",
     "@web/dev-server-rollup": "0.4.1",
     "babel-loader": "9.1.3",
     "babel-plugin-template-html-minifier": "4.1.0",
-    "chai": "4.3.10",
+    "chai": "4.3.8",
     "del": "7.1.0",
-    "eslint": "8.52.0",
+    "eslint": "8.49.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.1.0",
     "eslint-config-prettier": "9.0.0",
-    "eslint-import-resolver-webpack": "0.13.8",
+    "eslint-import-resolver-webpack": "0.13.7",
     "eslint-plugin-disable": "2.0.3",
-    "eslint-plugin-import": "2.29.0",
+    "eslint-plugin-import": "2.28.1",
-    "eslint-plugin-lit": "1.10.1",
+    "eslint-plugin-lit": "1.9.1",
-    "eslint-plugin-lit-a11y": "4.1.0",
+    "eslint-plugin-lit-a11y": "3.0.0",
     "eslint-plugin-unused-imports": "3.0.0",
-    "eslint-plugin-wc": "2.0.4",
+    "eslint-plugin-wc": "1.5.0",
     "esprima": "4.0.1",
     "fancy-log": "2.0.0",
     "fs-extra": "11.1.1",
-    "glob": "10.3.10",
+    "glob": "10.3.4",
     "gulp": "4.0.2",
     "gulp-flatmap": "1.0.2",
     "gulp-json-transform": "0.4.8",
@@ -221,10 +219,10 @@
     "husky": "8.0.3",
     "instant-mocha": "1.5.2",
     "jszip": "3.10.1",
-    "lint-staged": "15.0.2",
+    "lint-staged": "14.0.1",
-    "lit-analyzer": "2.0.1",
+    "lit-analyzer": "2.0.0-pre.3",
     "lodash.template": "4.5.0",
-    "magic-string": "0.30.5",
+    "magic-string": "0.30.3",
     "map-stream": "0.0.7",
     "mocha": "10.2.0",
     "object-hash": "3.0.0",
@@ -236,20 +234,19 @@
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-visualizer": "5.9.2",
     "serve-handler": "6.1.5",
-    "sinon": "17.0.0",
+    "sinon": "16.0.0",
     "source-map-url": "0.4.1",
     "systemjs": "6.14.2",
     "tar": "6.2.0",
     "terser-webpack-plugin": "5.3.9",
-    "ts-lit-plugin": "2.0.1",
+    "ts-lit-plugin": "2.0.0-pre.1",
     "typescript": "5.2.2",
     "vinyl-buffer": "1.0.1",
     "vinyl-source-stream": "2.0.0",
-    "webpack": "5.89.0",
+    "webpack": "5.88.2",
     "webpack-cli": "5.1.4",
     "webpack-dev-server": "4.15.1",
     "webpack-manifest-plugin": "5.0.0",
-    "webpack-stats-plugin": "1.1.3",
     "webpackbar": "5.0.2",
     "workbox-build": "7.0.0"
   },
@@ -257,9 +254,8 @@
   "resolutions": {
     "@polymer/polymer": "patch:@polymer/polymer@3.5.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
     "@material/mwc-button@^0.25.3": "^0.27.0",
-    "lit@^2.7.4 || ^3.0.0": "^2.7.4",
     "sortablejs@1.15.0": "patch:sortablejs@npm%3A1.15.0#./.yarn/patches/sortablejs-npm-1.15.0-f3a393abcc.patch",
     "leaflet-draw@1.0.4": "patch:leaflet-draw@npm%3A1.0.4#./.yarn/patches/leaflet-draw-npm-1.0.4-0ca0ebcf65.patch"
   },
-  "packageManager": "yarn@3.6.4"
+  "packageManager": "yarn@3.6.3"
 }

public/static/icons/browserconfig.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<browserconfig>
-    <msapplication>
-        <tile>
-            <square70x70logo src="/static/icons/tile-win-70x70.png"/>
-            <square150x150logo src="/static/icons/tile-win-150x150.png"/>
-			<wide310x150logo src="/static/icons/tile-win-310x150.png"/>
-			<square310x310logo src="/static/icons/tile-win-310x310.png"/>
-            <TileColor>#18bcf2</TileColor>
-        </tile>
-    </msapplication>
-</browserconfig>

public/static/icons/mask-icon.svg

@@ -1,23 +1 @@
-<?xml version="1.0" standalone="no"?>
+<svg width="16" height="16" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink"><path fill-rule="nonzero" fill="#000" d="M9,16 L9,17 L7,17 L7,16 L1,16 L1,9 L-1,9 L8.00163907,0 L13,4.785368 L13,3 L15,3 L15,7.035368 L17,9 L15,9 L15,16 L9,16 Z M9,16 L9,13.5 C9.49775077,13.0022492 10.1813086,12.3186914 11.0506735,11.4493265 C11.1951058,11.4824829 11.3455072,11.5 11.5,11.5 C12.6045695,11.5 13.5,10.6045695 13.5,9.5 C13.5,8.3954305 12.6045695,7.5 11.5,7.5 C10.3954305,7.5 9.5,8.3954305 9.5,9.5 C9.5,9.65449279 9.5175171,9.80489423 9.55067348,9.94932652 L9,10.5 L9,7.73243561 C9.59780137,7.38662619 10,6.74028236 10,6 C10,4.8954305 9.1045695,4 8,4 C6.8954305,4 6,4.8954305 6,6 C6,6.74028236 6.40219863,7.38662619 7,7.73243561 L7,10.5 L6.44932652,9.94932652 C6.4824829,9.80489423 6.5,9.65449279 6.5,9.5 C6.5,8.3954305 5.6045695,7.5 4.5,7.5 C3.3954305,7.5 2.5,8.3954305 2.5,9.5 C2.5,10.6045695 3.3954305,11.5 4.5,11.5 C4.65352068,11.5 4.80300134,11.4827027 4.9465994,11.4499505 C5.81726201,12.3268973 6.50172888,13.0147433 7,13.5134884 L7,16 L9,16 Z M11.5,10 C11.2238576,10 11,9.77614237 11,9.5 C11,9.22385763 11.2238576,9 11.5,9 C11.7761424,9 12,9.22385763 12,9.5 C12,9.77614237 11.7761424,10 11.5,10 Z M4.5,10 C4.22385763,10 4,9.77614237 4,9.5 C4,9.22385763 4.22385763,9 4.5,9 C4.77614237,9 5,9.22385763 5,9.5 C5,9.77614237 4.77614237,10 4.5,10 Z M8,6.5 C7.72385763,6.5 7.5,6.27614237 7.5,6 C7.5,5.72385763 7.72385763,5.5 8,5.5 C8.27614237,5.5 8.5,5.72385763 8.5,6 C8.5,6.27614237 8.27614237,6.5 8,6.5 Z" id="house-small-tree"/></svg>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20010904//EN"
- "http://www.w3.org/TR/2001/REC-SVG-20010904/DTD/svg10.dtd">
-<svg version="1.0" xmlns="http://www.w3.org/2000/svg"
- width="480.000000pt" height="480.000000pt" viewBox="0 0 480.000000 480.000000"
- preserveAspectRatio="xMidYMid meet">
-<g transform="translate(0.000000,480.000000) scale(0.100000,-0.100000)"
-fill="#000000" stroke="none">
-<path d="M2313 4666 c-23 -7 -56 -23 -75 -34 -47 -30 -2059 -2048 -2095 -2102
--45 -67 -77 -135 -109 -230 l-29 -85 0 -995 0 -995 27 -51 c31 -59 93 -118
-152 -145 39 -18 83 -19 1001 -19 l960 0 -406 405 c-395 395 -406 406 -433 395
--15 -5 -63 -10 -107 -10 -429 0 -566 577 -181 767 67 34 86 38 164 42 105 4
-165 -13 246 -67 113 -74 175 -190 176 -327 1 -44 -3 -96 -7 -115 l-8 -35 316
--315 315 -315 0 1160 -1 1160 -51 35 c-260 177 -226 567 62 704 82 39 209 48
-293 21 239 -78 354 -352 242 -575 -32 -63 -89 -125 -141 -156 l-44 -26 0 -811
-0 -812 315 315 c218 217 313 320 309 330 -14 35 -16 134 -4 190 26 122 111
-227 230 284 82 39 209 48 293 21 115 -38 214 -130 258 -242 19 -46 23 -78 24
--153 0 -86 -3 -101 -32 -163 -40 -84 -118 -163 -198 -202 -49 -23 -77 -29
--150 -33 -50 -2 -108 1 -130 7 l-40 11 -437 -438 -438 -437 0 -307 0 -308 998
-0 c981 0 998 1 1042 21 58 26 115 81 148 144 l27 50 0 995 0 995 -33 95 c-72
-209 -6 135 -1147 1278 -840 843 -1040 1037 -1082 1059 -64 31 -159 39 -220 19z"/>
-</g>
-</svg>

pyproject.toml

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

script/core

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 # Helper to start Home Assistant Core inside the devcontainer
 
 # Stop on errors
@@ -11,35 +11,11 @@ if [ -z "${DEVCONTAINER}" ]; then
   exit 1
 fi
 
-# Default to installing (or upgrading to) dev branch
+if [ -z $(which hass) ]; then
-coreURL="https://github.com/home-assistant/core.git"
+  echo "Installing Home Asstant core from dev."
-ref="dev"
+  python3 -m pip install --upgrade \
-
+    colorlog \
-while getopts "hr:s" opt; do
+    git+https://github.com/home-assistant/home-assistant.git@dev
-  case $opt in
-    h) # Help
-      echo "Usage: $0 [-h|-r <ref>|-s]"
-      echo -n "Install and run core at the given ref, i.e. branch, tag, or commit. The dev branch is used if no option is specified."
-      echo "The -s flag skips the install/upgrade, using whatever version is currently installed."
-      exit 0
-      ;;
-    r) # Git ref
-      ref="${OPTARG}"
-      ;;
-    s) # Skip (use current install)
-      ref=""
-      ;;
-    *)
-      echo "Try $0 -h for help" >&2
-      exit 1
-      ;;
-  esac
-done
-
-if [ -n "$ref" ]; then
-  echo "Installing Home Assistant core at ${ref}..."
-  python3 -m pip install --user --upgrade --src "$HOME/src" \
-  --editable "git+${coreURL}@${ref}#egg=homeassistant"
 fi
 
 if [ ! -d "${WD}/config" ]; then
@@ -54,7 +30,7 @@ logger:
     homeassistant.components.frontend: debug
 " >> "${WD}/config/configuration.yaml"
 
-  if [ -n "${HASSIO}" ]; then
+  if [ ! -z "${HASSIO}" ]; then
   echo "
 # frontend:
 #   development_repo: ${WD}
@@ -70,7 +46,7 @@ frontend:
 #   development_repo: ${WD}" >> "${WD}/config/configuration.yaml"
   fi
 
-  if [ -n "${CODESPACES}" ]; then
+  if [ ! -z "${CODESPACES}" ]; then
   echo "
 http:
   use_x_forwarded_for: true

script/translations_upload_base

@@ -33,7 +33,7 @@ fi
 
 docker run \
     -v ${LOCAL_FILE}:/opt/src/${LOCAL_FILE} \
-     lokalise/lokalise-cli-2:v2.6.10 lokalise2 \
+     lokalise/lokalise-cli-2@sha256:f1860b26be22fa73b8c93bc5f8690f2afc867610a42de6fc27adc790e5d4425d lokalise2 \
     --token ${LOKALISE_TOKEN} \
     --project-id ${PROJECT_ID} \
     file upload \

src/auth/ha-auth-flow.ts

@@ -1,12 +1,19 @@
-/* eslint-disable lit/prefer-static-styles */
 import "@material/mwc-button";
 import { genClientId } from "home-assistant-js-websocket";
-import { html, LitElement, nothing, PropertyValues } from "lit";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  nothing,
+  PropertyValues,
+} from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-alert";
 import "../components/ha-checkbox";
 import { computeInitialHaFormData } from "../components/ha-form/compute-initial-ha-form-data";
+import "../components/ha-form/ha-form";
 import "../components/ha-formfield";
 import "../components/ha-markdown";
 import { AuthProvider, autocompleteLoginFields } from "../data/auth";
@@ -14,7 +21,7 @@ import {
   DataEntryFlowStep,
   DataEntryFlowStepForm,
 } from "../data/data_entry_flow";
-import "./ha-auth-form";
+import "./ha-password-manager-polyfill";
 
 type State = "loading" | "error" | "step";
 
@@ -42,10 +49,6 @@ export class HaAuthFlow extends LitElement {
 
   @state() private _storeToken = false;
 
-  createRenderRoot() {
-    return this;
-  }
-
   willUpdate(changedProps: PropertyValues) {
     super.willUpdate(changedProps);
 
@@ -76,17 +79,13 @@ export class HaAuthFlow extends LitElement {
 
   protected render() {
     return html`
-      <style>
-        ha-auth-flow .action {
-          margin: 24px 0 8px;
-          text-align: center;
-        }
-        ha-auth-flow .store-token {
-          margin-top: 10px;
-          margin-left: -16px;
-        }
-      </style>
       <form>${this._renderForm()}</form>
+      <ha-password-manager-polyfill
+        .step=${this._step}
+        .stepData=${this._stepData}
+        @form-submitted=${this._handleSubmit}
+        @value-changed=${this._stepDataChanged}
+      ></ha-password-manager-polyfill>
     `;
   }
 
@@ -129,6 +128,12 @@ export class HaAuthFlow extends LitElement {
         (form as any).focus();
       }
     }, 100);
+
+    setTimeout(() => {
+      this.renderRoot.querySelector(
+        "ha-password-manager-polyfill"
+      )!.boundingRect = this.getBoundingClientRect();
+    }, 500);
   }
 
   private _renderForm() {
@@ -200,7 +205,7 @@ export class HaAuthFlow extends LitElement {
                 ></ha-markdown>
               `
             : nothing}
-          <ha-auth-form
+          <ha-form
             .data=${this._stepData}
             .schema=${autocompleteLoginFields(step.data_schema)}
             .error=${step.errors}
@@ -208,7 +213,7 @@ export class HaAuthFlow extends LitElement {
             .computeLabel=${this._computeLabelCallback(step)}
             .computeError=${this._computeErrorCallback(step)}
             @value-changed=${this._stepDataChanged}
-          ></ha-auth-form>
+          ></ha-form>
           ${this.clientId === genClientId() &&
           !["select_mfa_module", "mfa"].includes(step.step_id)
             ? html`
@@ -390,6 +395,20 @@ export class HaAuthFlow extends LitElement {
       this._submitting = false;
     }
   }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      .action {
+        margin: 24px 0 8px;
+        text-align: center;
+      }
+      /* Align with the rest of the form. */
+      .store-token {
+        margin-top: 10px;
+        margin-left: -16px;
+      }
+    `;
+  }
 }
 
 declare global {

src/auth/ha-auth-form-string.ts

@@ -1,76 +0,0 @@
-/* eslint-disable lit/prefer-static-styles */
-import { TemplateResult, html } from "lit";
-import { customElement } from "lit/decorators";
-import { HaFormString } from "../components/ha-form/ha-form-string";
-import "../components/ha-icon-button";
-import "./ha-auth-textfield";
-
-@customElement("ha-auth-form-string")
-export class HaAuthFormString extends HaFormString {
-  protected createRenderRoot() {
-    return this;
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      <style>
-        ha-auth-form-string {
-          display: block;
-          position: relative;
-        }
-        ha-auth-form-string[own-margin] {
-          margin-bottom: 5px;
-        }
-        ha-auth-form-string ha-auth-textfield {
-          display: block !important;
-        }
-        ha-auth-form-string ha-icon-button {
-          position: absolute;
-          top: 8px;
-          right: 8px;
-          inset-inline-start: initial;
-          inset-inline-end: 8px;
-          --mdc-icon-button-size: 40px;
-          --mdc-icon-size: 20px;
-          color: var(--secondary-text-color);
-          direction: var(--direction);
-        }
-      </style>
-      <ha-auth-textfield
-      .type=${
-        !this.isPassword
-          ? this.stringType
-          : this.unmaskedPassword
-          ? "text"
-          : "password"
-      }
-        .label=${this.label}
-        .value=${this.data || ""}
-        .helper=${this.helper}
-        helperPersistent
-        .disabled=${this.disabled}
-        .required=${this.schema.required}
-        .autoValidate=${this.schema.required}
-        .name=${this.schema.name}
-        .autocomplete=${this.schema.autocomplete}
-        .suffix=${
-          this.isPassword
-            ? // reserve some space for the icon.
-              html`<div style="width: 24px"></div>`
-            : this.schema.description?.suffix
-        }
-        .validationMessage=${this.schema.required ? "Required" : undefined}
-        @input=${this._valueChanged}
-        @change=${this._valueChanged}
-        ></ha-auth-textfield>
-        ${this.renderIcon()}
-      </ha-auth-textfield>
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-auth-form-string": HaAuthFormString;
-  }
-}

src/auth/ha-auth-form.ts

@@ -1,44 +0,0 @@
-/* eslint-disable lit/prefer-static-styles */
-import { html } from "lit";
-import { customElement } from "lit/decorators";
-import { HaForm } from "../components/ha-form/ha-form";
-import "./ha-auth-form-string";
-
-@customElement("ha-auth-form")
-export class HaAuthForm extends HaForm {
-  protected fieldElementName(type: string): string {
-    if (type === "string") {
-      return `ha-auth-form-${type}`;
-    }
-    return super.fieldElementName(type);
-  }
-
-  protected createRenderRoot() {
-    // attach it as soon as possible to make sure we fetch all events.
-    this.addValueChangedListener(this);
-    return this;
-  }
-
-  protected render() {
-    return html`
-      <style>
-        ha-auth-form .root > * {
-          display: block;
-        }
-        ha-auth-form .root > *:not([own-margin]):not(:last-child) {
-          margin-bottom: 24px;
-        }
-        ha-auth-form ha-alert[own-margin] {
-          margin-bottom: 4px;
-        }
-      </style>
-      ${super.render()}
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-auth-form": HaAuthForm;
-  }
-}

src/auth/ha-auth-textfield.ts

@@ -1,254 +0,0 @@
-/* eslint-disable lit/value-after-constraints */
-/* eslint-disable lit/prefer-static-styles */
-import { floatingLabel } from "@material/mwc-floating-label/mwc-floating-label-directive";
-import { TemplateResult, html } from "lit";
-import { customElement } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { live } from "lit/directives/live";
-import { HaTextField } from "../components/ha-textfield";
-
-@customElement("ha-auth-textfield")
-export class HaAuthTextField extends HaTextField {
-  protected renderLabel(): TemplateResult | string {
-    return !this.label
-      ? ""
-      : html`
-          <span
-            .floatingLabelFoundation=${floatingLabel(
-              this.label
-            ) as unknown as any}
-            .id=${this.name}
-            >${this.label}</span
-          >
-        `;
-  }
-
-  protected renderInput(shouldRenderHelperText: boolean): TemplateResult {
-    const minOrUndef = this.minLength === -1 ? undefined : this.minLength;
-    const maxOrUndef = this.maxLength === -1 ? undefined : this.maxLength;
-    const autocapitalizeOrUndef = this.autocapitalize
-      ? (this.autocapitalize as
-          | "off"
-          | "none"
-          | "on"
-          | "sentences"
-          | "words"
-          | "characters")
-      : undefined;
-    const showValidationMessage = this.validationMessage && !this.isUiValid;
-    const ariaLabelledbyOrUndef = this.label ? this.name : undefined;
-    const ariaControlsOrUndef = shouldRenderHelperText
-      ? "helper-text"
-      : undefined;
-    const ariaDescribedbyOrUndef =
-      this.focused || this.helperPersistent || showValidationMessage
-        ? "helper-text"
-        : undefined;
-    // TODO: live() directive needs casting for lit-analyzer
-    // https://github.com/runem/lit-analyzer/pull/91/files
-    // TODO: lit-analyzer labels min/max as (number|string) instead of string
-    return html` <input
-      aria-labelledby=${ifDefined(ariaLabelledbyOrUndef)}
-      aria-controls=${ifDefined(ariaControlsOrUndef)}
-      aria-describedby=${ifDefined(ariaDescribedbyOrUndef)}
-      class="mdc-text-field__input"
-      type=${this.type}
-      .value=${live(this.value) as unknown as string}
-      ?disabled=${this.disabled}
-      placeholder=${this.placeholder}
-      ?required=${this.required}
-      ?readonly=${this.readOnly}
-      minlength=${ifDefined(minOrUndef)}
-      maxlength=${ifDefined(maxOrUndef)}
-      pattern=${ifDefined(this.pattern ? this.pattern : undefined)}
-      min=${ifDefined(this.min === "" ? undefined : (this.min as number))}
-      max=${ifDefined(this.max === "" ? undefined : (this.max as number))}
-      step=${ifDefined(this.step === null ? undefined : (this.step as number))}
-      size=${ifDefined(this.size === null ? undefined : this.size)}
-      name=${ifDefined(this.name === "" ? undefined : this.name)}
-      inputmode=${ifDefined(this.inputMode)}
-      autocapitalize=${ifDefined(autocapitalizeOrUndef)}
-      @input=${this.handleInputChange}
-      @focus=${this.onInputFocus}
-      @blur=${this.onInputBlur}
-    />`;
-  }
-
-  public render() {
-    return html`
-      <style>
-        ha-auth-textfield {
-          display: inline-flex;
-          flex-direction: column;
-          outline: none;
-        }
-        ha-auth-textfield:not([disabled]):hover
-          :not(.mdc-text-field--invalid):not(.mdc-text-field--focused)
-          mwc-notched-outline {
-          --mdc-notched-outline-border-color: var(
-            --mdc-text-field-outlined-hover-border-color,
-            rgba(0, 0, 0, 0.87)
-          );
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field:not(.mdc-text-field--outlined) {
-          background-color: var(--mdc-text-field-fill-color, whitesmoke);
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--invalid
-          mwc-notched-outline {
-          --mdc-notched-outline-border-color: var(
-            --mdc-text-field-error-color,
-            var(--mdc-theme-error, #b00020)
-          );
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--invalid
-          + .mdc-text-field-helper-line
-          .mdc-text-field-character-counter,
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--invalid
-          .mdc-text-field__icon {
-          color: var(
-            --mdc-text-field-error-color,
-            var(--mdc-theme-error, #b00020)
-          );
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field:not(.mdc-text-field--invalid):not(
-            .mdc-text-field--focused
-          )
-          .mdc-floating-label,
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field:not(.mdc-text-field--invalid):not(
-            .mdc-text-field--focused
-          )
-          .mdc-floating-label::after {
-          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--focused
-          mwc-notched-outline {
-          --mdc-notched-outline-stroke-width: 2px;
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
-          mwc-notched-outline {
-          --mdc-notched-outline-border-color: var(
-            --mdc-text-field-focused-label-color,
-            var(--mdc-theme-primary, rgba(98, 0, 238, 0.87))
-          );
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
-          .mdc-floating-label {
-          color: #6200ee;
-          color: var(--mdc-theme-primary, #6200ee);
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field
-          .mdc-text-field__input {
-          color: var(--mdc-text-field-ink-color, rgba(0, 0, 0, 0.87));
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field
-          .mdc-text-field__input::placeholder {
-          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
-        }
-
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field-helper-line
-          .mdc-text-field-helper-text:not(
-            .mdc-text-field-helper-text--validation-msg
-          ),
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field-helper-line:not(.mdc-text-field--invalid)
-          .mdc-text-field-character-counter {
-          color: var(--mdc-text-field-label-ink-color, rgba(0, 0, 0, 0.6));
-        }
-
-        ha-auth-textfield[disabled]
-          .mdc-text-field:not(.mdc-text-field--outlined) {
-          background-color: var(--mdc-text-field-disabled-fill-color, #fafafa);
-        }
-
-        ha-auth-textfield[disabled]
-          .mdc-text-field.mdc-text-field--outlined
-          mwc-notched-outline {
-          --mdc-notched-outline-border-color: var(
-            --mdc-text-field-outlined-disabled-border-color,
-            rgba(0, 0, 0, 0.06)
-          );
-        }
-
-        ha-auth-textfield[disabled]
-          .mdc-text-field:not(.mdc-text-field--invalid):not(
-            .mdc-text-field--focused
-          )
-          .mdc-floating-label,
-        ha-auth-textfield[disabled]
-          .mdc-text-field:not(.mdc-text-field--invalid):not(
-            .mdc-text-field--focused
-          )
-          .mdc-floating-label::after {
-          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
-        }
-
-        ha-auth-textfield[disabled] .mdc-text-field .mdc-text-field__input,
-        ha-auth-textfield[disabled]
-          .mdc-text-field
-          .mdc-text-field__input::placeholder {
-          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
-        }
-
-        ha-auth-textfield[disabled]
-          .mdc-text-field-helper-line
-          .mdc-text-field-helper-text,
-        ha-auth-textfield[disabled]
-          .mdc-text-field-helper-line
-          .mdc-text-field-character-counter {
-          color: var(--mdc-text-field-disabled-ink-color, rgba(0, 0, 0, 0.38));
-        }
-        ha-auth-textfield:not([disabled])
-          .mdc-text-field.mdc-text-field--focused:not(.mdc-text-field--invalid)
-          .mdc-floating-label {
-          color: var(--mdc-theme-primary, #6200ee);
-        }
-        ha-auth-textfield[no-spinner] input::-webkit-outer-spin-button,
-        ha-auth-textfield[no-spinner] input::-webkit-inner-spin-button {
-          -webkit-appearance: none;
-          margin: 0;
-        }
-
-        /* Firefox */
-        ha-auth-textfield[no-spinner] input[type="number"] {
-          -moz-appearance: textfield;
-        }
-      </style>
-      ${super.render()}
-    `;
-  }
-
-  protected createRenderRoot() {
-    // add parent style to light dom
-    const style = document.createElement("style");
-    style.textContent = HaTextField.elementStyles as unknown as string;
-    this.append(style);
-    return this;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "ha-auth-textfield": HaAuthTextField;
-  }
-}

src/auth/ha-authorize.ts

@@ -1,7 +1,13 @@
-/* eslint-disable lit/prefer-static-styles */
-import { html, LitElement, nothing, PropertyValues } from "lit";
-import { customElement, property, state } from "lit/decorators";
 import punycode from "punycode";
+import {
+  css,
+  CSSResultGroup,
+  html,
+  LitElement,
+  nothing,
+  PropertyValues,
+} from "lit";
+import { customElement, property, state } from "lit/decorators";
 import { applyThemesOnElement } from "../common/dom/apply_themes_on_element";
 import { extractSearchParamsObject } from "../common/url/search-params";
 import "../components/ha-alert";
@@ -55,27 +61,13 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
 
   protected render() {
     if (this._error) {
-      return html`
+      return html`<ha-alert alert-type="error"
-        <style>
+        >${this._error} ${this.redirectUri}</ha-alert
-          ha-authorize ha-alert {
+      >`;
-            display: block;
-            margin: 16px 0;
-          }
-        </style>
-        <ha-alert alert-type="error"
-          >${this._error} ${this.redirectUri}</ha-alert
-        >
-      `;
     }
 
     if (!this._authProviders) {
       return html`
-        <style>
-          ha-authorize p {
-            font-size: 14px;
-            line-height: 20px;
-          }
-        </style>
         <p>${this.localize("ui.panel.page-authorize.initializing")}</p>
       `;
     }
@@ -87,25 +79,6 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
     const app = this.clientId && this.clientId in appNames;
 
     return html`
-      <style>
-        ha-pick-auth-provider {
-          display: block;
-          margin-top: 48px;
-        }
-        ha-auth-flow {
-          display: block;
-          margin-top: 24px;
-        }
-        ha-alert {
-          display: block;
-          margin: 16px 0;
-        }
-        p {
-          font-size: 14px;
-          line-height: 20px;
-        }
-      </style>
-
       ${!this._ownInstance
         ? html`<ha-alert .alertType=${app ? "info" : "warning"}>
             ${app
@@ -150,10 +123,6 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
     `;
   }
 
-  createRenderRoot() {
-    return this;
-  }
-
   protected firstUpdated(changedProps: PropertyValues) {
     super.firstUpdated(changedProps);
 
@@ -248,4 +217,25 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
   private async _handleAuthProviderPick(ev) {
     this._authProvider = ev.detail;
   }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      ha-pick-auth-provider {
+        display: block;
+        margin-top: 48px;
+      }
+      ha-auth-flow {
+        display: block;
+        margin-top: 24px;
+      }
+      ha-alert {
+        display: block;
+        margin: 16px 0;
+      }
+      p {
+        font-size: 14px;
+        line-height: 20px;
+      }
+    `;
+  }
 }

src/auth/ha-password-manager-polyfill.ts

@@ -0,0 +1,172 @@
+import { css, html, LitElement, nothing } from "lit";
+import { customElement, property } from "lit/decorators";
+import { styleMap } from "lit/directives/style-map";
+import { fireEvent } from "../common/dom/fire_event";
+import type { HaFormSchema } from "../components/ha-form/types";
+import { autocompleteLoginFields } from "../data/auth";
+import type { DataEntryFlowStep } from "../data/data_entry_flow";
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-password-manager-polyfill": HaPasswordManagerPolyfill;
+  }
+  interface HASSDomEvents {
+    "form-submitted": undefined;
+  }
+}
+
+const ENABLED_HANDLERS = [
+  "homeassistant",
+  "legacy_api_password",
+  "command_line",
+];
+
+@customElement("ha-password-manager-polyfill")
+export class HaPasswordManagerPolyfill extends LitElement {
+  @property({ attribute: false }) public step?: DataEntryFlowStep;
+
+  @property({ attribute: false }) public stepData: any;
+
+  @property({ attribute: false }) public boundingRect?: DOMRect;
+
+  private _styleElement?: HTMLStyleElement;
+
+  public connectedCallback() {
+    super.connectedCallback();
+    this._styleElement = document.createElement("style");
+    this._styleElement.textContent = css`
+      /* Polyfill form is sized and vertically aligned with true form, then positioned offscreen
+      rather than hiding so it does not create a new stacking context */
+      .password-manager-polyfill {
+        position: absolute;
+        box-sizing: border-box;
+      }
+      /* Excluding our wrapper, move any children back on screen, including anything injected that might not already be positioned */
+      .password-manager-polyfill > *:not(.wrapper),
+      .password-manager-polyfill > .wrapper > * {
+        position: relative;
+        left: 10000px;
+      }
+      /* Size and hide our polyfill fields */
+      .password-manager-polyfill .underneath {
+        display: block;
+        box-sizing: border-box;
+        width: 100%;
+        padding: 0 16px;
+        border: 0;
+        z-index: -1;
+        height: 21px;
+        /* Transparency is only needed to hide during paint or in case of misalignment,
+        but LastPass will fail if it's 0, so we use 1% */
+        opacity: 0.01;
+      }
+      .password-manager-polyfill input.underneath {
+        height: 28px;
+        margin-bottom: 30.5px;
+      }
+      /* Button position is not important, but size should not be zero */
+      .password-manager-polyfill > input.underneath[type="submit"] {
+        width: 1px;
+        height: 1px;
+        margin: 0 auto;
+        overflow: hidden;
+      }
+      /* Ensure injected elements will be on top */
+      .password-manager-polyfill > *:not(.underneath, .wrapper),
+      .password-manager-polyfill > .wrapper > *:not(.underneath) {
+        isolation: isolate;
+        z-index: auto;
+      }
+    `.toString();
+    document.head.append(this._styleElement);
+  }
+
+  public disconnectedCallback() {
+    super.disconnectedCallback();
+    this._styleElement?.remove();
+    delete this._styleElement;
+  }
+
+  protected createRenderRoot() {
+    // Add under document body so the element isn't placed inside any shadow roots
+    return document.body;
+  }
+
+  protected render() {
+    if (
+      this.step &&
+      this.step.type === "form" &&
+      this.step.step_id === "init" &&
+      ENABLED_HANDLERS.includes(this.step.handler[0])
+    ) {
+      return html`
+        <form
+          class="password-manager-polyfill"
+          style=${styleMap({
+            top: `${this.boundingRect?.y || 148}px`,
+            left: `calc(50% - ${
+              (this.boundingRect?.width || 360) / 2
+            }px - 10000px)`,
+            width: `${this.boundingRect?.width || 360}px`,
+          })}
+          action="/auth"
+          method="post"
+          @submit=${this._handleSubmit}
+        >
+          ${autocompleteLoginFields(this.step.data_schema).map((input) =>
+            this.render_input(input)
+          )}
+          <input
+            type="submit"
+            value="Login"
+            class="underneath"
+            tabindex="-2"
+            aria-hidden="true"
+          />
+        </form>
+      `;
+    }
+    return nothing;
+  }
+
+  private render_input(schema: HaFormSchema) {
+    const inputType = schema.name.includes("password") ? "password" : "text";
+    if (schema.type !== "string") {
+      return "";
+    }
+    return html`
+      <!-- Label is a sibling so it can be stacked underneath without affecting injections adjacent to input (e.g. LastPass) -->
+      <label for=${schema.name} class="underneath" aria-hidden="true">
+        ${schema.name}
+      </label>
+      <!-- LastPass fails if the input is hidden directly, so we trick it and hide a wrapper instead -->
+      <div class="wrapper" aria-hidden="true">
+        <!-- LastPass fails with tabindex of -1, so we trick with -2 -->
+        <input
+          class="underneath"
+          tabindex="-2"
+          .id=${schema.name}
+          .name=${schema.name}
+          .type=${inputType}
+          .value=${this.stepData[schema.name] || ""}
+          .autocomplete=${schema.autocomplete}
+          @input=${this._valueChanged}
+          @change=${this._valueChanged}
+        />
+      </div>
+    `;
+  }
+
+  private _handleSubmit(ev: SubmitEvent) {
+    ev.preventDefault();
+    fireEvent(this, "form-submitted");
+  }
+
+  private _valueChanged(ev: Event) {
+    const target = ev.target as HTMLInputElement;
+    this.stepData = { ...this.stepData, [target.id]: target.value };
+    fireEvent(this, "value-changed", {
+      value: this.stepData,
+    });
+  }
+}

src/common/array/combinations.ts

@@ -1,9 +0,0 @@
-export function getAllCombinations<T>(arr: T[]) {
-  return arr.reduce<T[][]>(
-    (combinations, element) =>
-      combinations.concat(
-        combinations.map((combination) => [...combination, element])
-      ),
-    [[]]
-  );
-}

src/common/const.ts

@@ -15,8 +15,6 @@ import {
   mdiCalendarClock,
   mdiCarCoolantLevel,
   mdiCash,
-  mdiChatSleep,
-  mdiClipboardList,
   mdiClock,
   mdiCloudUpload,
   mdiCog,
@@ -33,6 +31,7 @@ import {
   mdiGauge,
   mdiGoogleAssistant,
   mdiGoogleCirclesCommunities,
+  mdiHomeAssistant,
   mdiHomeAutomation,
   mdiImage,
   mdiImageFilterFrames,
@@ -71,8 +70,6 @@ import {
   mdiWifi,
 } from "@mdi/js";
 
-import { mdiHomeAssistant } from "../resources/home-assistant-logo-svg";
-
 // Constants should be alphabetically sorted by name.
 // Arrays with values should be alphabetically sorted if order doesn't matter.
 // Each constant should have a description what it is supposed to be used for.
@@ -121,13 +118,11 @@ export const FIXED_DOMAIN_ICONS = {
   siren: mdiBullhorn,
   stt: mdiMicrophoneMessage,
   text: mdiFormTextbox,
-  todo: mdiClipboardList,
   time: mdiClock,
   timer: mdiTimerOutline,
   tts: mdiSpeakerMessage,
   updater: mdiCloudUpload,
   vacuum: mdiRobotVacuum,
-  wake_word: mdiChatSleep,
   zone: mdiMapMarkerRadius,
 };
 

src/common/datetime/calc_date.ts

@@ -5,15 +5,12 @@ import { FrontendLocaleData, TimeZone } from "../../data/translation";
 const calcZonedDate = (
   date: Date,
   tz: string,
-  fn: (date: Date, options?: any) => Date | number | boolean,
+  fn: (date: Date, options?: any) => Date,
   options?
 ) => {
   const inputZoned = utcToZonedTime(date, tz);
   const fnZoned = fn(inputZoned, options);
-  if (fnZoned instanceof Date) {
+  return zonedTimeToUtc(fnZoned, tz);
-    return zonedTimeToUtc(fnZoned, tz) as Date;
-  }
-  return fnZoned;
 };
 
 export const calcDate = (
@@ -24,16 +21,5 @@ export const calcDate = (
   options?
 ) =>
   locale.time_zone === TimeZone.server
-    ? (calcZonedDate(date, config.time_zone, fn, options) as Date)
+    ? calcZonedDate(date, config.time_zone, fn, options)
-    : fn(date, options);
-
-export const calcDateProperty = (
-  date: Date,
-  fn: (date: Date, options?: any) => boolean | number,
-  locale: FrontendLocaleData,
-  config: HassConfig,
-  options?
-) =>
-  locale.time_zone === TimeZone.server
-    ? (calcZonedDate(date, config.time_zone, fn, options) as number | boolean)
     : fn(date, options);

src/common/datetime/format_date.ts

@@ -37,23 +37,6 @@ const formatDateMem = memoizeOne(
     })
 );
 
-// Aug 10, 2021
-export const formatDateShort = (
-  dateObj: Date,
-  locale: FrontendLocaleData,
-  config: HassConfig
-) => formatDateShortMem(locale, config.time_zone).format(dateObj);
-
-const formatDateShortMem = memoizeOne(
-  (locale: FrontendLocaleData, serverTimeZone: string) =>
-    new Intl.DateTimeFormat(locale.language, {
-      year: "numeric",
-      month: "short",
-      day: "numeric",
-      timeZone: locale.time_zone === "server" ? serverTimeZone : undefined,
-    })
-);
-
 // 10/08/2021
 export const formatDateNumeric = (
   dateObj: Date,
@@ -119,13 +102,13 @@ const formatDateNumericMem = memoizeOne(
 );
 
 // Aug 10
-export const formatDateVeryShort = (
+export const formatDateShort = (
   dateObj: Date,
   locale: FrontendLocaleData,
   config: HassConfig
-) => formatDateVeryShortMem(locale, config.time_zone).format(dateObj);
+) => formatDateShortMem(locale, config.time_zone).format(dateObj);
 
-const formatDateVeryShortMem = memoizeOne(
+const formatDateShortMem = memoizeOne(
   (locale: FrontendLocaleData, serverTimeZone: string) =>
     new Intl.DateTimeFormat(locale.language, {
       day: "numeric",

src/common/datetime/format_duration.ts

@@ -1,13 +1,8 @@
 import { HaDurationData } from "../../components/ha-duration-input";
-import { FrontendLocaleData } from "../../data/translation";
-import "../../resources/intl-polyfill";
 
 const leftPad = (num: number) => (num < 10 ? `0${num}` : num);
 
-export const formatDuration = (
+export const formatDuration = (duration: HaDurationData) => {
-  locale: FrontendLocaleData,
-  duration: HaDurationData
-) => {
   const d = duration.days || 0;
   const h = duration.hours || 0;
   const m = duration.minutes || 0;
@@ -15,11 +10,7 @@ export const formatDuration = (
   const ms = duration.milliseconds || 0;
 
   if (d > 0) {
-    return `${Intl.NumberFormat(locale.language, {
+    return `${d} day${d === 1 ? "" : "s"} ${h}:${leftPad(m)}:${leftPad(s)}`;
-      style: "unit",
-      unit: "day",
-      unitDisplay: "long",
-    }).format(d)} ${h}:${leftPad(m)}:${leftPad(s)}`;
   }
   if (h > 0) {
     return `${h}:${leftPad(m)}:${leftPad(s)}`;
@@ -28,18 +19,10 @@ export const formatDuration = (
     return `${m}:${leftPad(s)}`;
   }
   if (s > 0) {
-    return Intl.NumberFormat(locale.language, {
+    return `${s} second${s === 1 ? "" : "s"}`;
-      style: "unit",
-      unit: "second",
-      unitDisplay: "long",
-    }).format(s);
   }
   if (ms > 0) {
-    return Intl.NumberFormat(locale.language, {
+    return `${ms} millisecond${ms === 1 ? "" : "s"}`;
-      style: "unit",
-      unit: "millisecond",
-      unitDisplay: "long",
-    }).format(ms);
   }
   return null;
 };