Adjust to new element name/API/css vars/events

.browserslistrc

@@ -1,21 +0,0 @@
-[modern]
-# Support for dynamic import is the main litmus test for serving modern builds.
-# Although officially a ES2020 feature, browsers implemented it early, so this
-# enables all of ES2017 and some features in ES2018.
-supports es6-module-dynamic-import
-
-# Exclude Safari 11-12 because of a bug in tagged template literals
-# https://bugs.webkit.org/show_bug.cgi?id=190756
-# Note: Dropping version 11 also enables several more ES2018 features
-not Safari < 13
-not iOS < 13
-
-# Exclude unsupported browsers
-not dead
-
-[legacy]
-# Legacy builds are transpiled to ES5 (strict mode) but also must support some features that cannot be polyfilled:
-# - web sockets to communicate with backend
-# - inline SVG used widely in buttons, widgets, etc.
-# - custom events used for most user interactions
-supports use-strict and supports websockets and supports svg-html5 and supports customevent

.eslintrc.json

@@ -20,7 +20,7 @@
   "settings": {
     "import/resolver": {
       "webpack": {
-        "config": "./webpack.config.cjs"
+        "config": "./webpack.config.js"
       }
     }
   },

.github/workflows/cast_deployment.yaml

@@ -22,7 +22,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
         with:
           ref: dev
 
@@ -58,7 +58,7 @@ jobs:
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
         with:
           ref: master
 

.github/workflows/ci.yaml

@@ -25,7 +25,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
       - name: Set up Node ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3.6.0
         with:
@@ -48,7 +48,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
       - name: Set up Node ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3.6.0
         with:
@@ -66,7 +66,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
       - name: Set up Node ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3.6.0
         with:
@@ -84,7 +84,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
       - name: Set up Node ${{ env.NODE_VERSION }}
         uses: actions/setup-node@v3.6.0
         with:

.github/workflows/codeql-analysis.yml

@@ -23,7 +23,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v3.5.2
+      uses: actions/checkout@v3.3.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

@@ -17,13 +17,13 @@ jobs:
   deploy_dev:
     runs-on: ubuntu-latest
     name: Demo Development
-    if: github.event_name != 'push' || github.ref_name != 'master'
+    if: github.event_name != 'push' || github.ref != 'master'
     environment:
       name: Demo Development
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
         with:
           ref: dev
 
@@ -53,13 +53,13 @@ jobs:
   deploy_master:
     runs-on: ubuntu-latest
     name: Demo Production
-    if: github.event_name == 'push' && github.ref_name == 'master'
+    if: github.event_name == 'push' && github.ref == 'master'
     environment:
       name: Demo Production
       url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
         with:
           ref: master
 

.github/workflows/design_deployment.yaml

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

.github/workflows/design_preview.yaml

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

.github/workflows/nightly.yaml

@@ -21,7 +21,7 @@ jobs:
       contents: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
 
       - name: Set up Python ${{ env.PYTHON_VERSION }}
         uses: actions/setup-python@v4
@@ -43,7 +43,7 @@ jobs:
           LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
 
       - name: Bump version
-        run: script/version_bump.cjs nightly
+        run: script/version_bump.js nightly
 
       - name: Build nightly Python wheels
         run: |

.github/workflows/release.yaml

@@ -24,7 +24,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v3.3.0
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -75,7 +75,7 @@ jobs:
           echo "home-assistant-frontend==$version" > ./requirements.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2022.10.1
         with:
           abi: cp310
           tag: musllinux_1_2

.github/workflows/stale.yml

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

.github/workflows/translations.yaml

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

build-scripts/bundle.js

@@ -1,6 +1,6 @@
 const path = require("path");
-const env = require("./env.cjs");
-const paths = require("./paths.cjs");
+const env = require("./env.js");
+const paths = require("./paths.js");
 
 // GitHub base URL to use for production source maps
 // Nightly builds use the commit SHA, otherwise assumes there is a tag that matches the version
@@ -62,7 +62,7 @@ module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
   ...defineOverlay,
 });
 
-module.exports.htmlMinifierOptions = {
+const htmlMinifierOptions = {
   caseSensitive: true,
   collapseWhitespace: true,
   conservativeCollapse: true,
@@ -70,7 +70,7 @@ module.exports.htmlMinifierOptions = {
   removeComments: true,
   removeRedundantAttributes: true,
   minifyCSS: {
-    compatibility: "*,-properties.zeroUnits",
+    level: 0,
   },
 };
 
@@ -84,36 +84,45 @@ module.exports.terserOptions = ({ latestBuild, isTestBuild }) => ({
 module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
   babelrc: false,
   compact: false,
-  assumptions: {
-    privateFieldsAsProperties: true,
-    setPublicClassFields: true,
-    setSpreadProperties: true,
-  },
-  browserslistEnv: latestBuild ? "modern" : "legacy",
   presets: [
-    [
+    !latestBuild && [
       "@babel/preset-env",
       {
-        useBuiltIns: latestBuild ? false : "entry",
-        corejs: latestBuild ? false : { version: "3.30", proposals: true },
+        useBuiltIns: "entry",
+        corejs: { version: "3.29", proposals: true },
         bugfixes: true,
       },
     ],
     "@babel/preset-typescript",
-  ],
+  ].filter(Boolean),
   plugins: [
     [
       path.resolve(
         paths.polymer_dir,
-        "build-scripts/babel-plugins/inline-constants-plugin.cjs"
+        "build-scripts/babel-plugins/inline-constants-plugin.js"
       ),
       {
         modules: ["@mdi/js"],
         ignoreModuleNotFound: true,
       },
     ],
-    // Support  some proposals still in TC39 process
+    // Part of ES2018. Converts {...a, b: 2} to Object.assign({}, a, {b: 2})
+    !latestBuild && [
+      "@babel/plugin-proposal-object-rest-spread",
+      { loose: true, useBuiltIns: true },
+    ],
+    // Only support the syntax, Webpack will handle it.
+    "@babel/plugin-syntax-import-meta",
+    "@babel/plugin-syntax-dynamic-import",
+    "@babel/plugin-syntax-top-level-await",
+    // Support  various proposals
+    "@babel/plugin-proposal-optional-chaining",
+    "@babel/plugin-proposal-nullish-coalescing-operator",
     ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
+    "@babel/plugin-proposal-class-static-block",
+    ["@babel/plugin-proposal-private-methods", { loose: true }],
+    ["@babel/plugin-proposal-private-property-in-object", { loose: true }],
+    ["@babel/plugin-proposal-class-properties", { loose: true }],
     // Minify template literals for production
     isProdBuild && [
       "template-html-minifier",
@@ -127,7 +136,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
           "@polymer/polymer/lib/utils/html-tag": ["html"],
         },
         strictCSS: true,
-        htmlMinifier: module.exports.htmlMinifierOptions,
+        htmlMinifier: htmlMinifierOptions,
         failOnError: true, // we can turn this off in case of false positives
       },
     ],

build-scripts/env.js

@@ -1,6 +1,6 @@
 const fs = require("fs");
 const path = require("path");
-const paths = require("./paths.cjs");
+const paths = require("./paths.js");
 
 module.exports = {
   useRollup() {

build-scripts/gulp/app.js

@@ -1,18 +1,18 @@
 // Run HA develop mode
 
 const gulp = require("gulp");
-const env = require("../env.cjs");
-require("./clean.cjs");
-require("./translations.cjs");
-require("./locale-data.cjs");
-require("./gen-icons-json.cjs");
-require("./gather-static.cjs");
-require("./compress.cjs");
-require("./webpack.cjs");
-require("./service-worker.cjs");
-require("./entry-html.cjs");
-require("./rollup.cjs");
-require("./wds.cjs");
+const env = require("../env");
+require("./clean.js");
+require("./translations.js");
+require("./locale-data.js");
+require("./gen-icons-json.js");
+require("./gather-static.js");
+require("./compress.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+require("./rollup.js");
+require("./wds.js");
 
 gulp.task(
   "develop-app",
@@ -24,7 +24,8 @@ gulp.task(
     gulp.parallel(
       "gen-service-worker-app-dev",
       "gen-icons-json",
-      "gen-pages-app-dev",
+      "gen-pages-dev",
+      "gen-index-app-dev",
       "build-translations",
       "build-locale-data"
     ),
@@ -49,6 +50,10 @@ gulp.task(
     env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
     // Don't compress running tests
     ...(env.isTestBuild() ? [] : ["compress-app"]),
-    gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod")
+    gulp.parallel(
+      "gen-pages-prod",
+      "gen-index-app-prod",
+      "gen-service-worker-app-prod"
+    )
   )
 );

build-scripts/gulp/cast.js

@@ -1,13 +1,14 @@
 const gulp = require("gulp");
-const env = require("../env.cjs");
 
-require("./clean.cjs");
-require("./translations.cjs");
-require("./gather-static.cjs");
-require("./webpack.cjs");
-require("./service-worker.cjs");
-require("./entry-html.cjs");
-require("./rollup.cjs");
+const env = require("../env");
+
+require("./clean.js");
+require("./translations.js");
+require("./gather-static.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+require("./rollup.js");
 
 gulp.task(
   "develop-cast",
@@ -19,7 +20,7 @@ gulp.task(
     "translations-enable-merge-backend",
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-cast",
-    "gen-pages-cast-dev",
+    "gen-index-cast-dev",
     env.useRollup() ? "rollup-dev-server-cast" : "webpack-dev-server-cast"
   )
 );
@@ -35,6 +36,6 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-cast",
     env.useRollup() ? "rollup-prod-cast" : "webpack-prod-cast",
-    "gen-pages-cast-prod"
+    "gen-index-cast-prod"
   )
 );

build-scripts/gulp/clean.js

@@ -1,7 +1,7 @@
 const del = import("del");
 const gulp = require("gulp");
-const paths = require("../paths.cjs");
-require("./translations.cjs");
+const paths = require("../paths");
+require("./translations");
 
 gulp.task(
   "clean",

build-scripts/gulp/compress.js

@@ -4,7 +4,7 @@ const gulp = require("gulp");
 const zopfli = require("gulp-zopfli-green");
 const merge = require("merge-stream");
 const path = require("path");
-const paths = require("../paths.cjs");
+const paths = require("../paths");
 
 const zopfliOptions = { threshold: 150 };
 

build-scripts/gulp/demo.js

@@ -1,15 +1,16 @@
 // Run demo develop mode
 const gulp = require("gulp");
-const env = require("../env.cjs");
 
-require("./clean.cjs");
-require("./translations.cjs");
-require("./gen-icons-json.cjs");
-require("./gather-static.cjs");
-require("./webpack.cjs");
-require("./service-worker.cjs");
-require("./entry-html.cjs");
-require("./rollup.cjs");
+const env = require("../env");
+
+require("./clean.js");
+require("./translations.js");
+require("./gen-icons-json.js");
+require("./gather-static.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+require("./rollup.js");
 
 gulp.task(
   "develop-demo",
@@ -21,7 +22,7 @@ gulp.task(
     "translations-enable-merge-backend",
     gulp.parallel(
       "gen-icons-json",
-      "gen-pages-demo-dev",
+      "gen-index-demo-dev",
       "build-translations",
       "build-locale-data"
     ),
@@ -42,6 +43,6 @@ gulp.task(
     gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
     "copy-static-demo",
     env.useRollup() ? "rollup-prod-demo" : "webpack-prod-demo",
-    "gen-pages-demo-prod"
+    "gen-index-demo-prod"
   )
 );

build-scripts/gulp/entry-html.cjs

@@ -1,230 +0,0 @@
-// Tasks to generate entry HTML
-const gulp = require("gulp");
-const fs = require("fs-extra");
-const path = require("path");
-const template = require("lodash.template");
-const { minify } = require("html-minifier-terser");
-const paths = require("../paths.cjs");
-const env = require("../env.cjs");
-const { htmlMinifierOptions, terserOptions } = require("../bundle.cjs");
-
-const renderTemplate = (templateFile, data = {}) => {
-  const compiled = template(
-    fs.readFileSync(templateFile, { encoding: "utf-8" })
-  );
-  return compiled({
-    ...data,
-    useRollup: env.useRollup(),
-    useWDS: env.useWDS(),
-    // Resolve any child/nested templates relative to the parent and pass the same data
-    renderTemplate: (childTemplate) =>
-      renderTemplate(
-        path.resolve(path.dirname(templateFile), childTemplate),
-        data
-      ),
-  });
-};
-
-const WRAP_TAGS = { ".js": "script", ".css": "style" };
-
-const minifyHtml = (content, ext) => {
-  const wrapTag = WRAP_TAGS[ext] || "";
-  const begTag = wrapTag && `<${wrapTag}>`;
-  const endTag = wrapTag && `</${wrapTag}>`;
-  return minify(begTag + content + endTag, {
-    ...htmlMinifierOptions,
-    conservativeCollapse: false,
-    minifyJS: terserOptions({
-      latestBuild: false, // Shared scripts should be ES5
-      isTestBuild: true, // Don't need source maps
-    }),
-  }).then((wrapped) =>
-    wrapTag ? wrapped.slice(begTag.length, -endTag.length) : wrapped
-  );
-};
-
-// Function to generate a dev task for each project's configuration
-// Note Currently WDS paths are hard-coded to only work for app
-const genPagesDevTask =
-  (
-    pageEntries,
-    inputRoot,
-    outputRoot,
-    useWDS = false,
-    inputSub = "src/html",
-    publicRoot = ""
-  ) =>
-  async () => {
-    for (const [page, entries] of Object.entries(pageEntries)) {
-      const content = renderTemplate(
-        path.resolve(inputRoot, inputSub, `${page}.template`),
-        {
-          latestEntryJS: entries.map((entry) =>
-            useWDS
-              ? `http://localhost:8000/src/entrypoints/${entry}.ts`
-              : `${publicRoot}/frontend_latest/${entry}.js`
-          ),
-          es5EntryJS: entries.map(
-            (entry) => `${publicRoot}/frontend_es5/${entry}.js`
-          ),
-          latestCustomPanelJS: useWDS
-            ? "http://localhost:8000/src/entrypoints/custom-panel.ts"
-            : `${publicRoot}/frontend_latest/custom-panel.js`,
-          es5CustomPanelJS: `${publicRoot}/frontend_es5/custom-panel.js`,
-        }
-      );
-      fs.outputFileSync(path.resolve(outputRoot, page), content);
-    }
-  };
-
-// Same as previous but for production builds
-// (includes minification and hashed file names from manifest)
-const genPagesProdTask =
-  (
-    pageEntries,
-    inputRoot,
-    outputRoot,
-    outputLatest,
-    outputES5,
-    inputSub = "src/html"
-  ) =>
-  async () => {
-    const latestManifest = require(path.resolve(outputLatest, "manifest.json"));
-    const es5Manifest = outputES5
-      ? require(path.resolve(outputES5, "manifest.json"))
-      : {};
-    const minifiedHTML = [];
-    for (const [page, entries] of Object.entries(pageEntries)) {
-      const content = renderTemplate(
-        path.resolve(inputRoot, inputSub, `${page}.template`),
-        {
-          latestEntryJS: entries.map((entry) => latestManifest[`${entry}.js`]),
-          es5EntryJS: entries.map((entry) => es5Manifest[`${entry}.js`]),
-          latestCustomPanelJS: latestManifest["custom-panel.js"],
-          es5CustomPanelJS: es5Manifest["custom-panel.js"],
-        }
-      );
-      minifiedHTML.push(
-        minifyHtml(content, path.extname(page)).then((minified) =>
-          fs.outputFileSync(path.resolve(outputRoot, page), minified)
-        )
-      );
-    }
-    await Promise.all(minifiedHTML);
-  };
-
-// Map HTML pages to their required entrypoints
-const APP_PAGE_ENTRIES = {
-  "authorize.html": ["authorize"],
-  "onboarding.html": ["onboarding"],
-  "index.html": ["core", "app"],
-};
-
-gulp.task(
-  "gen-pages-app-dev",
-  genPagesDevTask(
-    APP_PAGE_ENTRIES,
-    paths.polymer_dir,
-    paths.app_output_root,
-    env.useWDS()
-  )
-);
-
-gulp.task(
-  "gen-pages-app-prod",
-  genPagesProdTask(
-    APP_PAGE_ENTRIES,
-    paths.polymer_dir,
-    paths.app_output_root,
-    paths.app_output_latest,
-    paths.app_output_es5
-  )
-);
-
-const CAST_PAGE_ENTRIES = {
-  "faq.html": ["launcher"],
-  "index.html": ["launcher"],
-  "media.html": ["media"],
-  "receiver.html": ["receiver"],
-};
-
-gulp.task(
-  "gen-pages-cast-dev",
-  genPagesDevTask(CAST_PAGE_ENTRIES, paths.cast_dir, paths.cast_output_root)
-);
-
-gulp.task(
-  "gen-pages-cast-prod",
-  genPagesProdTask(
-    CAST_PAGE_ENTRIES,
-    paths.cast_dir,
-    paths.cast_output_root,
-    paths.cast_output_latest,
-    paths.cast_output_es5
-  )
-);
-
-const DEMO_PAGE_ENTRIES = { "index.html": ["main"] };
-
-gulp.task(
-  "gen-pages-demo-dev",
-  genPagesDevTask(DEMO_PAGE_ENTRIES, paths.demo_dir, paths.demo_output_root)
-);
-
-gulp.task(
-  "gen-pages-demo-prod",
-  genPagesProdTask(
-    DEMO_PAGE_ENTRIES,
-    paths.demo_dir,
-    paths.demo_output_root,
-    paths.demo_output_latest,
-    paths.demo_output_es5
-  )
-);
-
-const GALLERY_PAGE_ENTRIES = { "index.html": ["entrypoint"] };
-
-gulp.task(
-  "gen-pages-gallery-dev",
-  genPagesDevTask(
-    GALLERY_PAGE_ENTRIES,
-    paths.gallery_dir,
-    paths.gallery_output_root
-  )
-);
-
-gulp.task(
-  "gen-pages-gallery-prod",
-  genPagesProdTask(
-    GALLERY_PAGE_ENTRIES,
-    paths.gallery_dir,
-    paths.gallery_output_root,
-    paths.gallery_output_latest
-  )
-);
-
-const HASSIO_PAGE_ENTRIES = { "entrypoint.js": ["entrypoint"] };
-
-gulp.task(
-  "gen-pages-hassio-dev",
-  genPagesDevTask(
-    HASSIO_PAGE_ENTRIES,
-    paths.hassio_dir,
-    paths.hassio_output_root,
-    undefined,
-    "src",
-    paths.hassio_publicPath
-  )
-);
-
-gulp.task(
-  "gen-pages-hassio-prod",
-  genPagesProdTask(
-    HASSIO_PAGE_ENTRIES,
-    paths.hassio_dir,
-    paths.hassio_output_root,
-    paths.hassio_output_latest,
-    paths.hassio_output_es5,
-    "src"
-  )
-);

build-scripts/gulp/entry-html.js

@@ -0,0 +1,344 @@
+// Tasks to generate entry HTML
+const gulp = require("gulp");
+const fs = require("fs-extra");
+const path = require("path");
+const template = require("lodash.template");
+const minify = require("html-minifier").minify;
+const paths = require("../paths.js");
+const env = require("../env.js");
+
+const templatePath = (tpl) =>
+  path.resolve(paths.polymer_dir, "src/html/", `${tpl}.html.template`);
+
+const readFile = (pth) => fs.readFileSync(pth).toString();
+
+const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
+  const compiled = template(readFile(pathFunc(pth)));
+  return compiled({
+    ...data,
+    useRollup: env.useRollup(),
+    useWDS: env.useWDS(),
+    renderTemplate,
+  });
+};
+
+const renderDemoTemplate = (pth, data = {}) =>
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(paths.demo_dir, "src/html/", `${tpl}.html.template`)
+  );
+
+const renderCastTemplate = (pth, data = {}) =>
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(paths.cast_dir, "src/html/", `${tpl}.html.template`)
+  );
+
+const renderGalleryTemplate = (pth, data = {}) =>
+  renderTemplate(pth, data, (tpl) =>
+    path.resolve(paths.gallery_dir, "src/html/", `${tpl}.html.template`)
+  );
+
+const minifyHtml = (content) =>
+  minify(content, {
+    collapseWhitespace: true,
+    minifyJS: true,
+    minifyCSS: true,
+    removeComments: true,
+  });
+
+const PAGES = ["onboarding", "authorize"];
+
+gulp.task("gen-pages-dev", (done) => {
+  for (const page of PAGES) {
+    const content = renderTemplate(page, {
+      latestPageJS: `/frontend_latest/${page}.js`,
+
+      es5PageJS: `/frontend_es5/${page}.js`,
+    });
+
+    fs.outputFileSync(
+      path.resolve(paths.app_output_root, `${page}.html`),
+      content
+    );
+  }
+  done();
+});
+
+gulp.task("gen-pages-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    paths.app_output_latest,
+    "manifest.json"
+  ));
+  const es5Manifest = require(path.resolve(
+    paths.app_output_es5,
+    "manifest.json"
+  ));
+
+  for (const page of PAGES) {
+    const content = renderTemplate(page, {
+      latestPageJS: latestManifest[`${page}.js`],
+
+      es5PageJS: es5Manifest[`${page}.js`],
+    });
+
+    fs.outputFileSync(
+      path.resolve(paths.app_output_root, `${page}.html`),
+      minifyHtml(content)
+    );
+  }
+  done();
+});
+
+gulp.task("gen-index-app-dev", (done) => {
+  let latestAppJS;
+  let latestCoreJS;
+  let latestCustomPanelJS;
+
+  if (env.useWDS()) {
+    latestAppJS = "http://localhost:8000/src/entrypoints/app.ts";
+    latestCoreJS = "http://localhost:8000/src/entrypoints/core.ts";
+    latestCustomPanelJS =
+      "http://localhost:8000/src/entrypoints/custom-panel.ts";
+  } else {
+    latestAppJS = "/frontend_latest/app.js";
+    latestCoreJS = "/frontend_latest/core.js";
+    latestCustomPanelJS = "/frontend_latest/custom-panel.js";
+  }
+
+  const content = renderTemplate("index", {
+    latestAppJS,
+    latestCoreJS,
+    latestCustomPanelJS,
+
+    es5AppJS: "/frontend_es5/app.js",
+    es5CoreJS: "/frontend_es5/core.js",
+    es5CustomPanelJS: "/frontend_es5/custom-panel.js",
+  }).replace(/#THEMEC/g, "{{ theme_color }}");
+
+  fs.outputFileSync(path.resolve(paths.app_output_root, "index.html"), content);
+  done();
+});
+
+gulp.task("gen-index-app-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    paths.app_output_latest,
+    "manifest.json"
+  ));
+  const es5Manifest = require(path.resolve(
+    paths.app_output_es5,
+    "manifest.json"
+  ));
+  const content = renderTemplate("index", {
+    latestAppJS: latestManifest["app.js"],
+    latestCoreJS: latestManifest["core.js"],
+    latestCustomPanelJS: latestManifest["custom-panel.js"],
+
+    es5AppJS: es5Manifest["app.js"],
+    es5CoreJS: es5Manifest["core.js"],
+    es5CustomPanelJS: es5Manifest["custom-panel.js"],
+  });
+  const minified = minifyHtml(content).replace(/#THEMEC/g, "{{ theme_color }}");
+
+  fs.outputFileSync(
+    path.resolve(paths.app_output_root, "index.html"),
+    minified
+  );
+  done();
+});
+
+gulp.task("gen-index-cast-dev", (done) => {
+  const contentReceiver = renderCastTemplate("receiver", {
+    latestReceiverJS: "/frontend_latest/receiver.js",
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "receiver.html"),
+    contentReceiver
+  );
+
+  const contentMedia = renderCastTemplate("media", {
+    latestMediaJS: "/frontend_latest/media.js",
+    es5MediaJS: "/frontend_es5/media.js",
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "media.html"),
+    contentMedia
+  );
+
+  const contentFAQ = renderCastTemplate("launcher-faq", {
+    latestLauncherJS: "/frontend_latest/launcher.js",
+    es5LauncherJS: "/frontend_es5/launcher.js",
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "faq.html"),
+    contentFAQ
+  );
+
+  const contentLauncher = renderCastTemplate("launcher", {
+    latestLauncherJS: "/frontend_latest/launcher.js",
+    es5LauncherJS: "/frontend_es5/launcher.js",
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "index.html"),
+    contentLauncher
+  );
+  done();
+});
+
+gulp.task("gen-index-cast-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    paths.cast_output_latest,
+    "manifest.json"
+  ));
+  const es5Manifest = require(path.resolve(
+    paths.cast_output_es5,
+    "manifest.json"
+  ));
+
+  const contentReceiver = renderCastTemplate("receiver", {
+    latestReceiverJS: latestManifest["receiver.js"],
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "receiver.html"),
+    contentReceiver
+  );
+
+  const contentMedia = renderCastTemplate("media", {
+    latestMediaJS: latestManifest["media.js"],
+    es5MediaJS: es5Manifest["media.js"],
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "media.html"),
+    contentMedia
+  );
+
+  const contentFAQ = renderCastTemplate("launcher-faq", {
+    latestLauncherJS: latestManifest["launcher.js"],
+    es5LauncherJS: es5Manifest["launcher.js"],
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "faq.html"),
+    contentFAQ
+  );
+
+  const contentLauncher = renderCastTemplate("launcher", {
+    latestLauncherJS: latestManifest["launcher.js"],
+    es5LauncherJS: es5Manifest["launcher.js"],
+  });
+  fs.outputFileSync(
+    path.resolve(paths.cast_output_root, "index.html"),
+    contentLauncher
+  );
+  done();
+});
+
+gulp.task("gen-index-demo-dev", (done) => {
+  const content = renderDemoTemplate("index", {
+    latestDemoJS: "/frontend_latest/main.js",
+
+    es5DemoJS: "/frontend_es5/main.js",
+  });
+
+  fs.outputFileSync(
+    path.resolve(paths.demo_output_root, "index.html"),
+    content
+  );
+  done();
+});
+
+gulp.task("gen-index-demo-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    paths.demo_output_latest,
+    "manifest.json"
+  ));
+  const es5Manifest = require(path.resolve(
+    paths.demo_output_es5,
+    "manifest.json"
+  ));
+  const content = renderDemoTemplate("index", {
+    latestDemoJS: latestManifest["main.js"],
+
+    es5DemoJS: es5Manifest["main.js"],
+  });
+  const minified = minifyHtml(content);
+
+  fs.outputFileSync(
+    path.resolve(paths.demo_output_root, "index.html"),
+    minified
+  );
+  done();
+});
+
+gulp.task("gen-index-gallery-dev", (done) => {
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: "./frontend_latest/entrypoint.js",
+  });
+
+  fs.outputFileSync(
+    path.resolve(paths.gallery_output_root, "index.html"),
+    content
+  );
+  done();
+});
+
+gulp.task("gen-index-gallery-prod", (done) => {
+  const latestManifest = require(path.resolve(
+    paths.gallery_output_latest,
+    "manifest.json"
+  ));
+  const content = renderGalleryTemplate("index", {
+    latestGalleryJS: latestManifest["entrypoint.js"],
+  });
+  const minified = minifyHtml(content);
+
+  fs.outputFileSync(
+    path.resolve(paths.gallery_output_root, "index.html"),
+    minified
+  );
+  done();
+});
+
+gulp.task("gen-index-hassio-dev", async () => {
+  writeHassioEntrypoint(
+    `${paths.hassio_publicPath}/frontend_latest/entrypoint.js`,
+    `${paths.hassio_publicPath}/frontend_es5/entrypoint.js`
+  );
+});
+
+gulp.task("gen-index-hassio-prod", async () => {
+  const latestManifest = require(path.resolve(
+    paths.hassio_output_latest,
+    "manifest.json"
+  ));
+  const es5Manifest = require(path.resolve(
+    paths.hassio_output_es5,
+    "manifest.json"
+  ));
+  writeHassioEntrypoint(
+    latestManifest["entrypoint.js"],
+    es5Manifest["entrypoint.js"]
+  );
+});
+
+function writeHassioEntrypoint(latestEntrypoint, es5Entrypoint) {
+  fs.mkdirSync(paths.hassio_output_root, { recursive: true });
+  // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
+  fs.writeFileSync(
+    path.resolve(paths.hassio_output_root, "entrypoint.js"),
+    `
+function loadES5() {
+  var el = document.createElement('script');
+  el.src = '${es5Entrypoint}';
+  document.body.appendChild(el);
+}
+if (/.*Version\\/(?:11|12)(?:\\.\\d+)*.*Safari\\//.test(navigator.userAgent)) {
+    loadES5();
+} else {
+  try {
+    new Function("import('${latestEntrypoint}')")();
+  } catch (err) {
+    loadES5();
+  }
+}
+  `,
+    { encoding: "utf-8" }
+  );
+}

build-scripts/gulp/fetch-nightly-translations.js

@@ -8,7 +8,6 @@ const gulp = require("gulp");
 const jszip = require("jszip");
 const tar = require("tar");
 const { Octokit } = require("@octokit/rest");
-const { retry } = require("@octokit/plugin-retry");
 const { createOAuthDeviceAuth } = require("@octokit/auth-oauth-device");
 
 const MAX_AGE = 24; // hours
@@ -96,7 +95,7 @@ gulp.task("fetch-nightly-translations", async function () {
 
   // Authenticate with token and request workflow runs from GitHub
   console.log("Fetching new translations...");
-  const octokit = new (Octokit.plugin(retry))({
+  const octokit = new Octokit({
     userAgent: "Fetch Nightly Translations",
     auth: tokenAuth.token,
   });

build-scripts/gulp/gallery.js

@@ -3,20 +3,20 @@ const gulp = require("gulp");
 const fs = require("fs");
 const path = require("path");
 const { marked } = require("marked");
-const { glob } = require("glob");
+const glob = require("glob");
 const yaml = require("js-yaml");
 
-const env = require("../env.cjs");
-const paths = require("../paths.cjs");
+const env = require("../env");
+const paths = require("../paths");
 
-require("./clean.cjs");
-require("./translations.cjs");
-require("./gen-icons-json.cjs");
-require("./gather-static.cjs");
-require("./webpack.cjs");
-require("./service-worker.cjs");
-require("./entry-html.cjs");
-require("./rollup.cjs");
+require("./clean.js");
+require("./translations.js");
+require("./gen-icons-json.js");
+require("./gather-static.js");
+require("./webpack.js");
+require("./service-worker.js");
+require("./entry-html.js");
+require("./rollup.js");
 
 gulp.task("gather-gallery-pages", async function gatherPages() {
   const pageDir = path.resolve(paths.gallery_dir, "src/pages");
@@ -89,7 +89,9 @@ gulp.task("gather-gallery-pages", async function gatherPages() {
 
   // Generate sidebar
   const sidebarPath = path.resolve(paths.gallery_dir, "sidebar.js");
-  const sidebar = (await import(sidebarPath)).default;
+  // To make watch work during development
+  delete require.cache[sidebarPath];
+  const sidebar = require(sidebarPath);
 
   const pagesToProcess = {};
   for (const key of processed) {
@@ -159,7 +161,7 @@ gulp.task(
       "gather-gallery-pages"
     ),
     "copy-static-gallery",
-    "gen-pages-gallery-dev",
+    "gen-index-gallery-dev",
     gulp.parallel(
       env.useRollup()
         ? "rollup-dev-server-gallery"
@@ -193,6 +195,6 @@ gulp.task(
     ),
     "copy-static-gallery",
     env.useRollup() ? "rollup-prod-gallery" : "webpack-prod-gallery",
-    "gen-pages-gallery-prod"
+    "gen-index-gallery-prod"
   )
 );

build-scripts/gulp/gather-static.js

@@ -3,7 +3,7 @@
 const gulp = require("gulp");
 const path = require("path");
 const fs = require("fs-extra");
-const paths = require("../paths.cjs");
+const paths = require("../paths");
 
 const npmPath = (...parts) =>
   path.resolve(paths.polymer_dir, "node_modules", ...parts);

build-scripts/gulp/gen-icons-json.js

@@ -134,11 +134,11 @@ gulp.task("gen-icons-json", (done) => {
   });
 
   const file = fs.readFileSync(PACKAGE_PATH, { encoding });
-  const packageMeta = JSON.parse(file);
+  const package = JSON.parse(file);
 
   fs.writeFileSync(
     path.resolve(OUTPUT_DIR, "iconMetadata.json"),
-    JSON.stringify({ version: packageMeta.version, parts })
+    JSON.stringify({ version: package.version, parts })
   );
 
   fs.writeFileSync(

build-scripts/gulp/hassio.js

@@ -1,13 +1,13 @@
 const gulp = require("gulp");
-const env = require("../env.cjs");
-require("./clean.cjs");
-require("./compress.cjs");
-require("./entry-html.cjs");
-require("./gather-static.cjs");
-require("./gen-icons-json.cjs");
-require("./rollup.cjs");
-require("./translations.cjs");
-require("./webpack.cjs");
+const env = require("../env");
+require("./clean.js");
+require("./gen-icons-json.js");
+require("./webpack.js");
+require("./compress.js");
+require("./rollup.js");
+require("./gather-static.js");
+require("./translations.js");
+require("./gen-icons-json.js");
 
 gulp.task(
   "develop-hassio",
@@ -17,7 +17,7 @@ gulp.task(
     },
     "clean-hassio",
     "gen-dummy-icons-json",
-    "gen-pages-hassio-dev",
+    "gen-index-hassio-dev",
     "build-supervisor-translations",
     "copy-translations-supervisor",
     "build-locale-data",
@@ -39,7 +39,7 @@ gulp.task(
     "build-locale-data",
     "copy-locale-data-supervisor",
     env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
-    "gen-pages-hassio-prod",
+    "gen-index-hassio-prod",
     ...// Don't compress running tests
     (env.isTestBuild() ? [] : ["compress-hassio"])
   )

build-scripts/gulp/locale-data.js

@@ -2,7 +2,7 @@ const del = import("del");
 const path = require("path");
 const gulp = require("gulp");
 const fs = require("fs");
-const paths = require("../paths.cjs");
+const paths = require("../paths");
 
 const outDir = "build/locale-data";
 
@@ -19,7 +19,6 @@ const modules = {
   "intl-relativetimeformat": "RelativeTimeFormat",
   "intl-datetimeformat": "DateTimeFormat",
   "intl-numberformat": "NumberFormat",
-  "intl-displaynames": "DisplayNames",
 };
 
 gulp.task("create-locale-data", (done) => {

build-scripts/gulp/rollup.js

@@ -6,8 +6,8 @@ const handler = require("serve-handler");
 const http = require("http");
 const log = require("fancy-log");
 const open = require("open");
-const rollupConfig = require("../rollup.cjs");
-const paths = require("../paths.cjs");
+const rollupConfig = require("../rollup");
+const paths = require("../paths");
 
 const bothBuilds = (createConfigFunc, params) =>
   gulp.series(
@@ -46,7 +46,7 @@ function createServer(serveOptions) {
   );
 }
 
-function watchRollup(createConfig, extraWatchSrc = [], serveOptions = null) {
+function watchRollup(createConfig, extraWatchSrc = [], serveOptions) {
   const { inputOptions, outputOptions } = createConfig({
     isProdBuild: false,
     latestBuild: true,

build-scripts/gulp/service-worker.js

@@ -5,7 +5,7 @@ const path = require("path");
 const fs = require("fs-extra");
 const workboxBuild = require("workbox-build");
 const sourceMapUrl = require("source-map-url");
-const paths = require("../paths.cjs");
+const paths = require("../paths.js");
 
 const swDest = path.resolve(paths.app_output_root, "service_worker.js");
 

build-scripts/gulp/translations.js

@@ -9,11 +9,11 @@ const flatmap = require("gulp-flatmap");
 const merge = require("gulp-merge-json");
 const rename = require("gulp-rename");
 const transform = require("gulp-json-transform");
-const { mapFiles } = require("../util.cjs");
-const env = require("../env.cjs");
-const paths = require("../paths.cjs");
+const { mapFiles } = require("../util");
+const env = require("../env");
+const paths = require("../paths");
 
-require("./fetch-nightly-translations.cjs");
+require("./fetch-nightly-translations");
 
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";

build-scripts/gulp/webpack.js

@@ -5,15 +5,15 @@ const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const log = require("fancy-log");
 const path = require("path");
-const env = require("../env.cjs");
-const paths = require("../paths.cjs");
+const env = require("../env");
+const paths = require("../paths");
 const {
   createAppConfig,
   createDemoConfig,
   createCastConfig,
   createHassioConfig,
   createGalleryConfig,
-} = require("../webpack.cjs");
+} = require("../webpack");
 
 const bothBuilds = (createConfigFunc, params) => [
   createConfigFunc({ ...params, latestBuild: true }),

build-scripts/list-preset-env-plugins.js

@@ -1,30 +0,0 @@
-#!/usr/bin/env node
-// Script to print Babel plugins that will be used by browserslist environments
-
-import { version as babelVersion } from "@babel/core";
-import presetEnv from "@babel/preset-env";
-import { babelOptions } from "./bundle.cjs";
-
-const dummyAPI = {
-  version: babelVersion,
-  assertVersion: () => {},
-  caller: (callback) =>
-    callback({
-      name: "Dummy Bundler",
-      supportsStaticESM: true,
-      supportsDynamicImport: true,
-      supportsTopLevelAwait: true,
-      supportsExportNamespaceFrom: true,
-    }),
-  targets: () => ({}),
-};
-
-for (const browserslistEnv of ["modern", "legacy"]) {
-  console.log("\nBrowsersList Environment = %s\n", browserslistEnv);
-  presetEnv.default(dummyAPI, {
-    ...babelOptions({ latestBuild: browserslistEnv === "modern" })
-      .presets[0][1],
-    browserslistEnv,
-    debug: true,
-  });
-}

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

@@ -103,7 +103,7 @@ module.exports = function (opts = {}) {
         }
         delete optionsObject.type;
 
-        if (!/^.*\//.test(workerFile)) {
+        if (!new RegExp("^.*/").test(workerFile)) {
           this.warn(
             `Paths passed to the Worker constructor must be relative or absolute, i.e. start with /, ./ or ../ (just like dynamic import!). Ignoring "${workerFile}".`
           );

build-scripts/rollup.js

@@ -3,18 +3,18 @@ const path = require("path");
 const commonjs = require("@rollup/plugin-commonjs");
 const resolve = require("@rollup/plugin-node-resolve");
 const json = require("@rollup/plugin-json");
-const { babel } = require("@rollup/plugin-babel");
+const babel = require("@rollup/plugin-babel").babel;
 const replace = require("@rollup/plugin-replace");
 const visualizer = require("rollup-plugin-visualizer");
 const { string } = require("rollup-plugin-string");
 const { terser } = require("rollup-plugin-terser");
-const manifest = require("./rollup-plugins/manifest-plugin.cjs");
-const worker = require("./rollup-plugins/worker-plugin.cjs");
-const dontHashPlugin = require("./rollup-plugins/dont-hash-plugin.cjs");
-const ignore = require("./rollup-plugins/ignore-plugin.cjs");
+const manifest = require("./rollup-plugins/manifest-plugin");
+const worker = require("./rollup-plugins/worker-plugin");
+const dontHashPlugin = require("./rollup-plugins/dont-hash-plugin");
+const ignore = require("./rollup-plugins/ignore-plugin");
 
-const bundle = require("./bundle.cjs");
-const paths = require("./paths.cjs");
+const bundle = require("./bundle");
+const paths = require("./paths");
 
 const extensions = [".js", ".ts"];
 

build-scripts/webpack.js

@@ -4,8 +4,8 @@ const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
 const log = require("fancy-log");
 const WebpackBar = require("webpackbar");
-const paths = require("./paths.cjs");
-const bundle = require("./bundle.cjs");
+const paths = require("./paths.js");
+const bundle = require("./bundle.js");
 
 class LogStartCompilePlugin {
   ignoredFirst = false;
@@ -152,17 +152,14 @@ const createWebpackConfig = ({
       },
     },
     output: {
-      filename: ({ chunk }) =>
-        !isProdBuild || isStatsBuild || dontHash.has(chunk.name)
-          ? "[name].js"
-          : "[name]-[contenthash].js",
+      filename: ({ chunk }) => {
+        if (!isProdBuild || isStatsBuild || dontHash.has(chunk.name)) {
+          return `${chunk.name}.js`;
+        }
+        return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
+      },
       chunkFilename:
-        isProdBuild && !isStatsBuild ? "[id]-[contenthash].js" : "[name].js",
-      assetModuleFilename:
-        isProdBuild && !isStatsBuild ? "[id]-[contenthash][ext]" : "[id][ext]",
-      hashFunction: "xxhash64",
-      hashDigest: "base64url",
-      hashDigestLength: 11, // full length of 64 bit base64url
+        isProdBuild && !isStatsBuild ? "[chunkhash:8].js" : "[id].chunk.js",
       path: outputPath,
       publicPath,
       // To silence warning in worker plugin

cast/rollup.config.js

@@ -1,5 +1,5 @@
-import rollup from "../build-scripts/rollup.cjs";
-import env from "../build-scripts/env.cjs";
+const rollup = require("../build-scripts/rollup.js");
+const env = require("../build-scripts/env.js");
 
 const config = rollup.createCastConfig({
   isProdBuild: env.isProdBuild(),
@@ -7,4 +7,4 @@ const config = rollup.createCastConfig({
   isStatsBuild: env.isStatsBuild(),
 });
 
-export default { ...config.inputOptions, output: config.outputOptions };
+module.exports = { ...config.inputOptions, output: config.outputOptions };

cast/src/html/_social_meta.html.template

@@ -1,24 +0,0 @@
-<meta property="fb:app_id" content="338291289691179" />
-<meta property="og:title" content="Home Assistant Cast" />
-<meta property="og:site_name" content="Home Assistant Cast" />
-<meta property="og:url" content="https://cast.home-assistant.io/" />
-<meta property="og:type" content="website" />
-<meta
-  property="og:description"
-  content="Show Home Assistant on your Chromecast or Google Assistant devices with a screen."
-/>
-<meta
-  property="og:image"
-  content="https://cast.home-assistant.io/images/google-nest-hub.png"
-/>
-<meta name="twitter:card" content="summary_large_image" />
-<meta name="twitter:site" content="@home_assistant" />
-<meta name="twitter:title" content="Home Assistant Cast" />
-<meta
-  name="twitter:description"
-  content="Show Home Assistant on your Chromecast or Google Assistant devices with a screen."
-/>
-<meta
-  name="twitter:image"
-  content="https://cast.home-assistant.io/images/google-nest-hub.png"
-/>

cast/src/html/index.html.template

@@ -1,35 +0,0 @@
-<!DOCTYPE html>
-<html>
-  <head>
-    <title>Home Assistant Cast</title>
-    <link rel="manifest" href="/manifest.json" />
-    <link rel="icon" href="/images/ha-cast-icon.png" type="image/png" />
-    <%= renderTemplate("../../../src/html/_style_base.html.template") %>
-    <style>
-      body {
-        background-color: #e5e5e5;
-      }
-    </style>
-    <%= renderTemplate("_social_meta.html.template") %>
-  </head>
-  <body>
-    <%= renderTemplate("../../../src/html/_js_base.html.template") %>
-    <hc-connect></hc-connect>
-    <script>
-      <% for (const entry of latestEntryJS) { %>
-        import("<%= entry %>");
-      <% } %>
-      window.latestJS = true;
-    </script>
-    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
-    <script>
-    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
-    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
-    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
-    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
-
-    ga('create', 'UA-57927901-9', 'auto');
-    ga('send', 'pageview', location.pathname.includes("auth_callback") === -1 ? location.pathname : "/");
-    </script>
-  </body>
-</html>

cast/src/html/launcher-faq.html.template

@@ -3,7 +3,7 @@
   <head>
     <title>Home Assistant Cast - FAQ</title>
     <link rel="icon" href="/images/ha-cast-icon.png" type="image/png" />
-    <%= renderTemplate("../../../src/html/_style_base.html.template") %>
+    <%= renderTemplate('_style_base') %>
     <style>
       body {
         background-color: #e5e5e5;
@@ -35,14 +35,25 @@
     />
   </head>
   <body>
-    <%= renderTemplate("../../../src/html/_js_base.html.template") %>
+    <%= renderTemplate('_js_base') %>
+
     <script>
-      <% for (const entry of latestEntryJS) { %>
-        import("<%= entry %>");
-      <% } %>
+      import("<%= latestLauncherJS %>");
       window.latestJS = true;
     </script>
-    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
+
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5LauncherJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5LauncherJS %>");
+        <% } %>
+      }
+    </script>
+
     <hc-layout subtitle="FAQ">
       <style>
         a {

cast/src/html/launcher.html.template

@@ -0,0 +1,57 @@
+<!DOCTYPE html>
+<html>
+  <head>
+    <title>Home Assistant Cast</title>
+    <link rel="manifest" href="/manifest.json" />
+    <link rel="icon" href="/images/ha-cast-icon.png" type="image/png" />
+    <%= renderTemplate('_style_base') %>
+    <style>
+      body {
+        background-color: #e5e5e5;
+      }
+    </style>
+    <meta property="fb:app_id" content="338291289691179">
+    <meta property="og:title" content="Home Assistant Cast">
+    <meta property="og:site_name" content="Home Assistant Cast">
+    <meta property="og:url" content="https://cast.home-assistant.io/">
+    <meta property="og:type" content="website">
+    <meta property="og:description" content="Show Home Assistant on your Chromecast or Google Assistant devices with a screen.">
+    <meta property="og:image" content="https://cast.home-assistant.io/images/google-nest-hub.png">
+    <meta name="twitter:card" content="summary_large_image">
+    <meta name="twitter:site" content="@home_assistant">
+    <meta name="twitter:title" content="Home Assistant Cast">
+    <meta name="twitter:description" content="Show Home Assistant on your Chromecast or Google Assistant devices with a screen.">
+    <meta name="twitter:image" content="https://cast.home-assistant.io/images/google-nest-hub.png">
+  </head>
+  <body>
+    <%= renderTemplate('_js_base') %>
+
+    <hc-connect></hc-connect>
+
+    <script>
+      import("<%= latestLauncherJS %>");
+      window.latestJS = true;
+    </script>
+
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5LauncherJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5LauncherJS %>");
+        <% } %>
+      }
+    </script>
+    <script>
+    (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
+    (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),
+    m=s.getElementsByTagName(o)[0];a.async=1;a.src=g;m.parentNode.insertBefore(a,m)
+    })(window,document,'script','https://www.google-analytics.com/analytics.js','ga');
+
+    ga('create', 'UA-57927901-9', 'auto');
+    ga('send', 'pageview', location.pathname.includes("auth_callback") === -1 ? location.pathname : "/");
+    </script>
+  </body>
+</html>

cast/src/html/media.html.template

@@ -22,14 +22,25 @@
     </script>
   </head>
   <body>
-    <%= renderTemplate("../../../src/html/_js_base.html.template") %>
+    <%= renderTemplate('_js_base') %>
+
     <cast-media-player></cast-media-player>
+
     <script>
-      <% for (const entry of latestEntryJS) { %>
-        import("<%= entry %>");
-      <% } %>
+      import("<%= latestMediaJS %>");
       window.latestJS = true;
     </script>
-    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
+
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5MediaJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5MediaJS %>");
+        <% } %>
+      }
+    </script>
   </body>
 </html>

cast/src/html/receiver.html.template

@@ -1,10 +1,8 @@
 <!DOCTYPE html>
 <html>
   <script src="//www.gstatic.com/cast/sdk/libs/caf_receiver/v3/cast_receiver_framework.js"></script>
-  <% for (const entry of latestEntryJS) { %>
-    <script type="module" src="<%= entry %>"></script>
-  <% } %>
-  <%= renderTemplate("../../../src/html/_style_base.html.template") %>
+  <script type="module" src="<%= latestReceiverJS %>"></script>
+  <%= renderTemplate('_style_base') %>
   <style>
     body {
       background-color: white;

cast/webpack.config.js

@@ -1,8 +1,8 @@
-import webpack from "../build-scripts/webpack.cjs";
-import env from "../build-scripts/env.cjs";
+const { createCastConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");
 
-export default webpack.createCastConfig({
-  isProdBuild: env.isProdBuild(),
-  isStatsBuild: env.isStatsBuild(),
+module.exports = createCastConfig({
+  isProdBuild: isProdBuild(),
+  isStatsBuild: isStatsBuild(),
   latestBuild: true,
 });

demo/rollup.config.js

@@ -1,5 +1,5 @@
-import rollup from "../build-scripts/rollup.cjs";
-import env from "../build-scripts/env.cjs";
+const rollup = require("../build-scripts/rollup.js");
+const env = require("../build-scripts/env.js");
 
 const config = rollup.createDemoConfig({
   isProdBuild: env.isProdBuild(),
@@ -7,4 +7,4 @@ const config = rollup.createDemoConfig({
   isStatsBuild: env.isStatsBuild(),
 });
 
-export default { ...config.inputOptions, output: config.outputOptions };
+module.exports = { ...config.inputOptions, output: config.outputOptions };

demo/src/html/_social_meta.html.template

@@ -1,26 +0,0 @@
-<meta property="fb:app_id" content="338291289691179" />
-<meta property="og:title" content="Home Assistant Demo" />
-<meta property="og:site_name" content="Home Assistant" />
-<meta property="og:url" content="https://demo.home-assistant.io/" />
-<meta property="og:type" content="website" />
-<meta
-  property="og:description"
-  content="Open source home automation that puts local control and privacy first."
-/>
-<meta
-  property="og:image"
-  content="https://www.home-assistant.io/images/default-social.png"
-/>
-
-<meta name="twitter:card" content="summary_large_image" />
-<meta name="twitter:site" content="@home_assistant" />
-
-<meta name="twitter:title" content="Home Assistant" />
-<meta
-  name="twitter:description"
-  content="Open source home automation that puts local control and privacy first."
-/>
-<meta
-  name="twitter:image"
-  content="https://www.home-assistant.io/images/default-social.png"
-/>

demo/src/html/index.html.template

@@ -1,8 +1,9 @@
 <!DOCTYPE html>
 <html>
   <head>
-    <title>Home Assistant Demo</title>
-    <%= renderTemplate("../../../src/html/_header.html.template") %>
+    <meta charset="utf-8" />
+    <link rel="manifest" href="/manifest.json" crossorigin="use-credentials" />
+    <link rel="icon" href="/static/icons/favicon.ico" />
     <link rel="mask-icon" href="/static/icons/mask-icon.svg" color="#03a9f4" />
     <link
       rel="apple-touch-icon"
@@ -34,7 +35,33 @@
       content="width=device-width, initial-scale=1, shrink-to-fit=no"
     />
     <meta name="theme-color" content="#03a9f4" />
-    <%= renderTemplate("_social_meta.html.template") %>
+    <meta property="fb:app_id" content="338291289691179" />
+    <meta property="og:title" content="Home Assistant Demo" />
+    <meta property="og:site_name" content="Home Assistant" />
+    <meta property="og:url" content="https://demo.home-assistant.io/" />
+    <meta property="og:type" content="website" />
+    <meta
+      property="og:description"
+      content="Open source home automation that puts local control and privacy first."
+    />
+    <meta
+      property="og:image"
+      content="https://www.home-assistant.io/images/default-social.png"
+    />
+
+    <meta name="twitter:card" content="summary_large_image" />
+    <meta name="twitter:site" content="@home_assistant" />
+
+    <meta name="twitter:title" content="Home Assistant" />
+    <meta
+      name="twitter:description"
+      content="Open source home automation that puts local control and privacy first."
+    />
+    <meta
+      name="twitter:image"
+      content="https://www.home-assistant.io/images/default-social.png"
+    />
+    <title>Home Assistant Demo</title>
     <style>
       html {
         background-color: var(--primary-background-color, #fafafa);
@@ -80,22 +107,29 @@
       </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") %>
+
+    <%= renderTemplate('_js_base') %>
+    <%= renderTemplate('_preload_roboto') %>
+
     <script>
-      if (!window.globalThis) {
-        window.globalThis = window;
-      }
-      // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
-      if (!isS11_12) {
-        <% for (const entry of latestEntryJS) { %>
-          import("<%= entry %>");
+      import("<%= latestDemoJS %>");
+      window.latestJS = true;
+    </script>
+
+    <script>
+      if (!window.latestJS) {
+        <% if (useRollup) { %>
+          _ls("/static/js/s.min.js").onload = function() {
+            System.import("<%= es5DemoJS %>");
+          };
+        <% } else { %>
+          _ls("<%= es5DemoJS %>");
         <% } %>
-        window.latestJS = true;
       }
     </script>
-    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
+
     <script>
       var _gaq = [["_setAccount", "UA-57927901-5"], ["_trackPageview"]];
       (function (d, t) {

demo/src/stubs/history.ts

@@ -1,19 +1,39 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { HistoryStates } from "../../../src/data/history";
 import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
-const generateStateHistory = (
-  state: HassEntity,
-  deltas,
-  start_date: Date,
-  end_date: Date
-) => {
+interface HistoryQueryParams {
+  filter_entity_id: string;
+  end_time: string;
+}
+
+const parseQuery = <T>(queryString: string) => {
+  const query: any = {};
+  const items = queryString.split("&");
+  for (const item of items) {
+    const parts = item.split("=");
+    const key = decodeURIComponent(parts[0]);
+    const value = parts.length > 1 ? decodeURIComponent(parts[1]) : undefined;
+    query[key] = value;
+  }
+  return query as T;
+};
+
+const getTime = (minutesAgo) => {
+  const ts = new Date(Date.now() - minutesAgo * 60 * 1000);
+  return ts.toISOString();
+};
+
+const randomTimeAdjustment = (diff) => Math.random() * diff - diff / 2;
+
+const maxTime = 1440;
+
+const generateHistory = (state, deltas) => {
   const changes =
     typeof deltas[0] === "object"
       ? deltas
       : deltas.map((st) => ({ state: st }));
 
-  const timeDiff = (end_date.getTime() - start_date.getTime()) / changes.length;
+  const timeDiff = 900 / changes.length;
 
   return changes.map((change, index) => {
     let attributes;
@@ -27,13 +47,17 @@ const generateStateHistory = (
       attributes = { ...state.attributes, ...change.attributes };
     }
 
-    const time = start_date.getTime() + timeDiff * index;
+    const time =
+      index === 0
+        ? getTime(maxTime)
+        : getTime(maxTime - index * timeDiff + randomTimeAdjustment(timeDiff));
 
     return {
-      a: attributes,
-      s: change.state || state.state,
-      lc: time / 1000,
-      lu: time / 1000,
+      attributes,
+      entity_id: state.entity_id,
+      state: change.state || state.state,
+      last_changed: time,
+      last_updated: time,
     };
   });
 };
@@ -41,29 +65,15 @@ const generateStateHistory = (
 const incrementalUnits = ["clients", "queries", "ads"];
 
 export const mockHistory = (mockHass: MockHomeAssistant) => {
-  mockHass.mockWS(
-    "history/stream",
-    (
-      {
-        entity_ids,
-        start_time,
-        end_time,
-      }: {
-        entity_ids: string[];
-        start_time: string;
-        end_time?: string;
-      },
-      hass,
-      onChange
-    ) => {
-      const states: HistoryStates = {};
+  mockHass.mockAPI(
+    /history\/period\/.+/,
+    (hass, _method, path, _parameters) => {
+      const params = parseQuery<HistoryQueryParams>(path.split("?")[1]);
+      const entities = params.filter_entity_id.split(",");
 
-      const start = new Date(start_time);
-      const end = end_time ? new Date(end_time) : new Date();
-
-      for (const entityId of entity_ids) {
-        states[entityId] = [];
+      const results: HassEntity[][] = [];
 
+      for (const entityId of entities) {
         const state = hass.states[entityId];
 
         if (!state) {
@@ -71,12 +81,7 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
         }
 
         if (!state.attributes.unit_of_measurement) {
-          states[entityId] = generateStateHistory(
-            state,
-            [state.state],
-            start,
-            end
-          );
+          results.push(generateHistory(state, [state.state]));
           continue;
         }
 
@@ -115,23 +120,17 @@ export const mockHistory = (mockHass: MockHomeAssistant) => {
             numberState - diff + Math.floor(Math.random() * 2 * diff);
         }
 
-        states[entityId] = generateStateHistory(
-          state,
-          Array.from({ length: statesToGenerate }, genFunc),
-          start,
-          end
+        results.push(
+          generateHistory(
+            {
+              entity_id: state.entity_id,
+              attributes: state.attributes,
+            },
+            Array.from({ length: statesToGenerate }, genFunc)
+          )
         );
       }
-
-      setTimeout(() => {
-        onChange?.({
-          states,
-          start_time: start,
-          end_time: end,
-        });
-      }, 1);
-
-      return () => {};
+      return results;
     }
   );
 };

demo/webpack.config.js

@@ -1,11 +1,12 @@
-import webpack from "../build-scripts/webpack.cjs";
-import env from "../build-scripts/env.cjs";
+const { createDemoConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");
 
 // File just used for stats builds
+
 const latestBuild = true;
 
-export default webpack.createDemoConfig({
-  isProdBuild: env.isProdBuild(),
-  isStatsBuild: env.isStatsBuild(),
+module.exports = createDemoConfig({
+  isProdBuild: isProdBuild(),
+  isStatsBuild: isStatsBuild(),
   latestBuild,
 });

gallery/rollup.config.js

@@ -1,5 +1,5 @@
-import rollup from "../build-scripts/rollup.cjs";
-import env from "../build-scripts/env.cjs";
+const rollup = require("../build-scripts/rollup.js");
+const env = require("../build-scripts/env.js");
 
 const config = rollup.createGalleryConfig({
   isProdBuild: env.isProdBuild(),
@@ -7,4 +7,4 @@ const config = rollup.createGalleryConfig({
   isStatsBuild: env.isStatsBuild(),
 });
 
-export default { ...config.inputOptions, output: config.outputOptions };
+module.exports = { ...config.inputOptions, output: config.outputOptions };

gallery/sidebar.js

@@ -1,4 +1,4 @@
-export default [
+module.exports = [
   {
     // This section has no header and so all page links are shown directly in the sidebar
     category: "concepts",

gallery/src/html/index.html.template

@@ -8,9 +8,8 @@
     />
     <meta name="theme-color" content="#2157BC" />
     <title>Home Assistant Design</title>
-    <% for (const entry of latestEntryJS) { %>
-      <script type="module" src="<%= entry %>"></script>
-    <% } %>
+
+    <script type="module" src="<%= latestGalleryJS %>"></script>
     <style>
       body {
         font-family: Roboto, Noto, sans-serif;

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

@@ -336,7 +336,7 @@ const SCHEMAS: {
           ["and", "another_one"],
           ["option", "1000"],
         ],
-        name: "select many options",
+        name: "select many otions",
         default: "default",
       },
     ],
@@ -364,7 +364,7 @@ const SCHEMAS: {
           and: "another_one",
           option: "1000",
         },
-        name: "multi many options",
+        name: "multi many otions",
         default: ["default"],
       },
     ],

gallery/webpack.config.js

@@ -1,8 +1,8 @@
-import webpack from "../build-scripts/webpack.cjs";
-import env from "../build-scripts/env.cjs";
+const { createGalleryConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");
 
-export default webpack.createGalleryConfig({
-  isProdBuild: env.isProdBuild(),
-  isStatsBuild: env.isStatsBuild(),
+module.exports = createGalleryConfig({
+  isProdBuild: isProdBuild(),
+  isStatsBuild: isStatsBuild(),
   latestBuild: true,
 });

gulpfile.js

@@ -1,13 +1,3 @@
-import { globIterate } from "glob";
+var requireDir = require("require-dir");
 
-const gulpImports = [];
-
-for await (const gulpModule of globIterate("build-scripts/gulp/*.?(c|m)js", {
-  dotRelative: true,
-})) {
-  gulpImports.push(import(gulpModule));
-}
-
-// Since all tasks are currently registered with gulp.task(), this is enough
-// If any are converted to named exports, need to loop and aggregate exports here
-await Promise.all(gulpImports);
+requireDir("./build-scripts/gulp/");

hassio/rollup.config.js

@@ -1,5 +1,5 @@
-import rollup from "../build-scripts/rollup.cjs";
-import env from "../build-scripts/env.cjs";
+const rollup = require("../build-scripts/rollup.js");
+const env = require("../build-scripts/env.js");
 
 const config = rollup.createHassioConfig({
   isProdBuild: env.isProdBuild(),
@@ -7,4 +7,4 @@ const config = rollup.createHassioConfig({
   isStatsBuild: env.isStatsBuild(),
 });
 
-export default { ...config.inputOptions, output: config.outputOptions };
+module.exports = { ...config.inputOptions, output: config.outputOptions };

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

@@ -92,7 +92,11 @@ export class HassioAddonStore extends LitElement {
         .route=${this.route}
         .header=${this.supervisor.localize("panel.store")}
       >
-        <ha-button-menu slot="toolbar-icon" @action=${this._handleAction}>
+        <ha-button-menu
+          corner="BOTTOM_START"
+          slot="toolbar-icon"
+          @action=${this._handleAction}
+        >
           <ha-icon-button
             .label=${this.supervisor.localize("common.menu")}
             .path=${mdiDotsVertical}
@@ -216,7 +220,7 @@ export class HassioAddonStore extends LitElement {
     });
   }
 
-  private _filterChanged(e) {
+  private async _filterChanged(e) {
     this._filter = e.detail.value;
   }
 

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

@@ -114,6 +114,9 @@ class HassioAddonAudio extends LitElement {
         ha-card {
           display: block;
         }
+        paper-item {
+          width: 450px;
+        }
         .card-actions {
           text-align: right;
         }

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

@@ -168,7 +168,7 @@ class HassioAddonConfig extends LitElement {
             ${this.supervisor.localize("addon.configuration.options.header")}
           </h2>
           <div class="card-menu">
-            <ha-button-menu @action=${this._handleAction}>
+            <ha-button-menu corner="BOTTOM_START" @action=${this._handleAction}>
               <ha-icon-button
                 .label=${this.supervisor.localize("common.menu")}
                 .path=${mdiDotsVertical}

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

@@ -29,6 +29,7 @@ import memoizeOne from "memoize-one";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import { navigate } from "../../../../src/common/navigate";
+import "../../../../src/components/buttons/ha-call-api-button";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
 import "../../../../src/components/ha-card";
@@ -46,7 +47,6 @@ import {
   HassioAddonSetOptionParams,
   HassioAddonSetSecurityParams,
   installHassioAddon,
-  rebuildLocalAddon,
   restartHassioAddon,
   setHassioAddonOption,
   setHassioAddonSecurity,
@@ -640,12 +640,13 @@ class HassioAddonInfo extends LitElement {
                   </ha-progress-button>
                   ${this.addon.build
                     ? html`
-                        <ha-progress-button
+                        <ha-call-api-button
                           class="warning"
-                          @click=${this._rebuildClicked}
+                          .hass=${this.hass}
+                          .path="hassio/addons/${this.addon.slug}/rebuild"
                         >
                           ${this.supervisor.localize("addon.dashboard.rebuild")}
-                        </ha-progress-button>
+                        </ha-call-api-button>
                       `
                     : ""}`
               : ""}
@@ -965,21 +966,6 @@ class HassioAddonInfo extends LitElement {
     button.progress = false;
   }
 
-  private async _rebuildClicked(ev: CustomEvent): Promise<void> {
-    const button = ev.currentTarget as any;
-    button.progress = true;
-
-    try {
-      await rebuildLocalAddon(this.hass, this.addon.slug);
-    } catch (err: any) {
-      showAlertDialog(this, {
-        title: this.supervisor.localize("addon.dashboard.action_error.rebuild"),
-        text: extractApiErrorMessage(err),
-      });
-    }
-    button.progress = false;
-  }
-
   private async _startClicked(ev: CustomEvent): Promise<void> {
     const button = ev.currentTarget as any;
     button.progress = true;
@@ -1138,6 +1124,10 @@ class HassioAddonInfo extends LitElement {
         ha-svg-icon.stopped {
           color: var(--error-color);
         }
+        ha-call-api-button {
+          font-weight: 500;
+          color: var(--primary-color);
+        }
         protection-enable mwc-button {
           --mdc-theme-primary: white;
         }

hassio/src/backups/hassio-backups.ts

@@ -195,7 +195,11 @@ export class HassioBackups extends LitElement {
           : "/config"}
         supervisor
       >
-        <ha-button-menu slot="toolbar-icon" @action=${this._handleAction}>
+        <ha-button-menu
+          corner="BOTTOM_START"
+          slot="toolbar-icon"
+          @action=${this._handleAction}
+        >
           <ha-icon-button
             .label=${this.supervisor?.localize("common.menu")}
             .path=${mdiDotsVertical}
@@ -244,9 +248,9 @@ export class HassioBackups extends LitElement {
                         class="warning"
                         @click=${this._deleteSelected}
                       ></ha-icon-button>
-                      <simple-tooltip animation-delay="0" for="delete-btn">
+                      <paper-tooltip animation-delay="0" for="delete-btn">
                         ${this.supervisor.localize("backup.delete_selected")}
-                      </simple-tooltip>
+                      </paper-tooltip>
                     `}
               </div>
             </div> `

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

@@ -50,7 +50,20 @@ class HassioMarkdownDialog extends LitElement {
       haStyleDialog,
       hassioStyle,
       css`
+        app-toolbar {
+          margin: 0;
+          padding: 0 16px;
+          color: var(--primary-text-color);
+          background-color: var(--secondary-background-color);
+        }
+        app-toolbar [main-title] {
+          margin-left: 16px;
+        }
         @media all and (max-width: 450px), all and (max-height: 500px) {
+          app-toolbar {
+            color: var(--text-primary-color);
+            background-color: var(--primary-color);
+          }
           ha-markdown {
             padding: 16px;
           }

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

@@ -316,7 +316,7 @@ export class DialogHassioNetwork
       >
         <div class="radio-row">
           <ha-formfield
-            .label=${this.supervisor.localize("dialog.network.auto")}
+            .label=${this.supervisor.localize("dialog.network.dhcp")}
           >
             <ha-radio
               @change=${this._handleRadioValueChanged}
@@ -597,6 +597,10 @@ export class DialogHassioNetwork
           margin-left: 8px;
         }
 
+        :host([rtl]) app-toolbar {
+          direction: rtl;
+          text-align: right;
+        }
         .container {
           padding: 0 8px 4px;
         }

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

@@ -4,7 +4,7 @@ import "@polymer/paper-input/paper-input";
 import type { PaperInputElement } from "@polymer/paper-input/paper-input";
 import "@polymer/paper-item/paper-item";
 import "@polymer/paper-item/paper-item-body";
-import "@lrnwebcomponents/simple-tooltip/simple-tooltip";
+import "@polymer/paper-tooltip/paper-tooltip";
 import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -128,7 +128,7 @@ class HassioRepositoriesDialog extends LitElement {
                         @click=${this._removeRepository}
                       >
                       </ha-icon-button>
-                      <simple-tooltip
+                      <paper-tooltip
                         animation-delay="0"
                         position="bottom"
                         offset="1"
@@ -138,7 +138,7 @@ class HassioRepositoriesDialog extends LitElement {
                             ? "dialog.repositories.used"
                             : "dialog.repositories.remove"
                         )}
-                      </simple-tooltip>
+                      </paper-tooltip>
                     </div>
                   </paper-item>
                 `

hassio/src/entrypoint.js.template

@@ -1,22 +0,0 @@
-(function () {
-  function loadES5(src) {
-    var el = document.createElement("script");
-    el.src = src;
-    document.body.appendChild(el);
-  }
-  if (/.*Version\/(?:11|12)(?:\.\d+)*.*Safari\//.test(navigator.userAgent)) {
-    <% for (const entry of es5EntryJS) { %>
-      loadES5("<%= entry %>");
-    <% } %>
-  } else {
-    try {
-        <% for (const entry of latestEntryJS) { %>
-          new Function("import('<%= entry %>')")();
-        <% } %>
-    } catch (err) {
-      <% for (const entry of es5EntryJS) { %>
-        loadES5("<%= entry %>");
-      <% } %>
-  }
-  }
-})();

hassio/src/resources/hassio-style.ts

@@ -44,6 +44,10 @@ export const hassioStyle = css`
       grid-template-columns: repeat(auto-fit, minmax(300px, 0.25fr));
     }
   }
+  ha-call-api-button {
+    font-weight: 500;
+    color: var(--primary-color);
+  }
   .error {
     color: var(--error-color);
     margin-top: 16px;

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

@@ -184,7 +184,7 @@ class HassioHostInfo extends LitElement {
               `
             : ""}
 
-          <ha-button-menu>
+          <ha-button-menu corner="BOTTOM_START">
             <ha-icon-button
               .label=${this.supervisor.localize("common.menu")}
               .path=${mdiDotsVertical}

hassio/webpack.config.js

@@ -1,8 +1,8 @@
-import webpack from "../build-scripts/webpack.cjs";
-import env from "../build-scripts/env.cjs";
+const { createHassioConfig } = require("../build-scripts/webpack.js");
+const { isProdBuild, isStatsBuild } = require("../build-scripts/env.js");
 
-export default webpack.createHassioConfig({
-  isProdBuild: env.isProdBuild(),
-  isStatsBuild: env.isStatsBuild(),
+module.exports = createHassioConfig({
+  isProdBuild: isProdBuild(),
+  isStatsBuild: isStatsBuild(),
   latestBuild: true,
 });

lint-staged.config.js

@@ -1,5 +1,5 @@
-export default {
-  "*.?(c|m){js,ts}": ["eslint --fix", "prettier --write"],
+module.exports = {
+  "*.{js,ts}": ["prettier --write", "eslint --fix"],
   "!(/translations)*.{json,css,md,html}": "prettier --write",
   "translations/*/*.json": (files) =>
     'printf "%s\n" "Translation files should not be added or modified here. Instead, make the necessary modifications in src/translations/en.json. Other languages are managed externally. Please see https://developers.home-assistant.io/docs/translations/ for details." ' +

package.json

@@ -19,38 +19,34 @@
     "postinstall": "husky install",
     "prepack": "pinst --disable",
     "postpack": "pinst --enable",
-    "test": "instant-mocha --webpack-config ./test/webpack.config.js --require ./test/setup.cjs \"test/**/*.ts\""
+    "test": "instant-mocha --webpack-config ./test/webpack.config.js --require ./test/setup.js \"test/**/*.ts\""
   },
   "author": "Paulus Schoutsen <Paulus@PaulusSchoutsen.nl> (http://paulusschoutsen.nl)",
   "license": "Apache-2.0",
-  "type": "module",
   "dependencies": {
     "@braintree/sanitize-url": "6.0.2",
-    "@codemirror/autocomplete": "6.5.1",
-    "@codemirror/commands": "6.2.3",
+    "@codemirror/autocomplete": "6.4.2",
+    "@codemirror/commands": "6.2.2",
     "@codemirror/language": "6.6.0",
-    "@codemirror/legacy-modes": "6.3.2",
-    "@codemirror/search": "6.3.0",
+    "@codemirror/legacy-modes": "6.3.1",
+    "@codemirror/search": "6.2.3",
     "@codemirror/state": "6.2.0",
-    "@codemirror/view": "6.9.5",
+    "@codemirror/view": "6.9.2",
     "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "6.7.0",
-    "@formatjs/intl-displaynames": "6.3.1",
+    "@formatjs/intl-datetimeformat": "6.5.1",
     "@formatjs/intl-getcanonicallocales": "2.1.0",
-    "@formatjs/intl-locale": "3.2.1",
-    "@formatjs/intl-numberformat": "8.4.1",
-    "@formatjs/intl-pluralrules": "5.2.1",
-    "@formatjs/intl-relativetimeformat": "11.2.1",
-    "@fullcalendar/core": "6.1.5",
-    "@fullcalendar/daygrid": "6.1.5",
-    "@fullcalendar/interaction": "6.1.5",
-    "@fullcalendar/list": "6.1.5",
-    "@fullcalendar/timegrid": "6.1.5",
-    "@lezer/highlight": "1.1.4",
-    "@lit-labs/context": "0.3.0",
+    "@formatjs/intl-locale": "3.1.1",
+    "@formatjs/intl-numberformat": "8.3.5",
+    "@formatjs/intl-pluralrules": "5.1.10",
+    "@formatjs/intl-relativetimeformat": "11.1.10",
+    "@fullcalendar/core": "6.1.4",
+    "@fullcalendar/daygrid": "6.1.4",
+    "@fullcalendar/interaction": "6.1.4",
+    "@fullcalendar/list": "6.1.4",
+    "@fullcalendar/timegrid": "6.1.4",
+    "@lezer/highlight": "1.1.3",
     "@lit-labs/motion": "1.0.3",
     "@lit-labs/virtualizer": "1.0.1",
-    "@lrnwebcomponents/simple-tooltip": "4.1.0",
     "@material/chips": "=14.0.0-canary.53b3cad2f.0",
     "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
     "@material/mwc-button": "0.27.0",
@@ -73,52 +69,54 @@
     "@material/mwc-tab-bar": "0.27.0",
     "@material/mwc-textarea": "0.27.0",
     "@material/mwc-textfield": "0.27.0",
-    "@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.0-pre.4",
-    "@mdi/js": "7.2.96",
-    "@mdi/svg": "7.2.96",
+    "@mdi/js": "7.1.96",
+    "@mdi/svg": "7.1.96",
     "@polymer/app-layout": "3.1.0",
     "@polymer/iron-flex-layout": "3.0.1",
+    "@polymer/iron-icon": "3.0.1",
     "@polymer/iron-input": "3.0.1",
     "@polymer/iron-resizable-behavior": "3.0.1",
     "@polymer/paper-input": "3.2.1",
     "@polymer/paper-item": "3.0.1",
     "@polymer/paper-listbox": "3.0.1",
     "@polymer/paper-slider": "3.0.1",
+    "@polymer/paper-styles": "3.0.1",
     "@polymer/paper-tabs": "3.1.0",
     "@polymer/paper-toast": "3.0.1",
-    "@polymer/polymer": "3.5.1",
+    "@polymer/paper-tooltip": "3.0.1",
+    "@polymer/polymer": "3.4.1",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "23.3.11",
-    "@vaadin/vaadin-themable-mixin": "23.3.11",
+    "@vaadin/combo-box": "23.3.8",
+    "@vaadin/vaadin-themable-mixin": "23.3.8",
     "@vibrant/color": "3.2.1-alpha.1",
     "@vibrant/core": "3.2.1-alpha.1",
     "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
     "@vue/web-component-wrapper": "1.3.0",
-    "@webcomponents/scoped-custom-element-registry": "0.0.9",
-    "@webcomponents/webcomponentsjs": "2.8.0",
-    "app-datepicker": "5.1.1",
+    "@webcomponents/scoped-custom-element-registry": "0.0.8",
+    "@webcomponents/webcomponentsjs": "2.7.0",
+    "app-datepicker": "6.0.0-rc.32",
     "chart.js": "3.3.2",
     "comlink": "4.4.1",
-    "core-js": "3.30.1",
+    "core-js": "3.29.1",
     "cropperjs": "1.5.13",
     "date-fns": "2.29.3",
     "date-fns-tz": "2.0.0",
     "deep-clone-simple": "1.1.1",
     "deep-freeze": "0.0.1",
     "fuse.js": "6.6.2",
-    "google-timezones-json": "1.1.0",
-    "hls.js": "1.3.5",
+    "google-timezones-json": "1.0.2",
+    "hls.js": "1.3.4",
     "home-assistant-js-websocket": "8.0.1",
     "idb-keyval": "6.2.0",
-    "intl-messageformat": "10.3.4",
+    "intl-messageformat": "10.3.1",
     "js-yaml": "4.1.0",
     "leaflet": "1.9.3",
     "leaflet-draw": "1.0.4",
-    "lit": "2.7.2",
-    "marked": "4.3.0",
+    "lit": "2.6.1",
+    "marked": "4.2.12",
     "memoize-one": "6.0.0",
     "node-vibrant": "3.2.1-alpha.1",
     "proxy-polyfill": "0.3.2",
@@ -135,8 +133,8 @@
     "tsparticles-engine": "2.9.3",
     "tsparticles-preset-links": "2.9.3",
     "unfetch": "5.0.0",
-    "vis-data": "7.1.6",
-    "vis-network": "9.1.6",
+    "vis-data": "7.1.4",
+    "vis-network": "9.1.4",
     "vue": "2.7.14",
     "vue2-daterange-picker": "0.6.8",
     "weekstart": "2.0.0",
@@ -149,25 +147,32 @@
     "xss": "1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "7.21.4",
+    "@babel/core": "7.21.3",
+    "@babel/plugin-external-helpers": "7.18.6",
+    "@babel/plugin-proposal-class-properties": "7.18.6",
+    "@babel/plugin-proposal-class-static-block": "7.21.0",
     "@babel/plugin-proposal-decorators": "7.21.0",
-    "@babel/preset-env": "7.21.4",
-    "@babel/preset-typescript": "7.21.4",
+    "@babel/plugin-proposal-nullish-coalescing-operator": "7.18.6",
+    "@babel/plugin-proposal-object-rest-spread": "7.20.7",
+    "@babel/plugin-proposal-optional-chaining": "7.21.0",
+    "@babel/plugin-syntax-dynamic-import": "7.8.3",
+    "@babel/plugin-syntax-import-meta": "7.10.4",
+    "@babel/plugin-syntax-top-level-await": "7.14.5",
+    "@babel/preset-env": "7.20.2",
+    "@babel/preset-typescript": "7.21.0",
     "@koa/cors": "4.0.0",
     "@octokit/auth-oauth-device": "4.0.4",
-    "@octokit/plugin-retry": "4.1.3",
     "@octokit/rest": "19.0.7",
     "@open-wc/dev-server-hmr": "0.1.4",
     "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-commonjs": "24.1.0",
+    "@rollup/plugin-commonjs": "24.0.1",
     "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.2",
+    "@rollup/plugin-node-resolve": "15.0.1",
     "@rollup/plugin-replace": "5.0.2",
     "@types/chromecast-caf-receiver": "5.0.12",
     "@types/chromecast-caf-sender": "1.0.5",
     "@types/esprima": "4.0.3",
     "@types/glob": "8.1.0",
-    "@types/html-minifier-terser": "7.0.0",
     "@types/js-yaml": "4.0.5",
     "@types/leaflet": "1.9.3",
     "@types/leaflet-draw": "1.0.6",
@@ -178,40 +183,40 @@
     "@types/sortablejs": "1.15.1",
     "@types/tar": "6.1.4",
     "@types/webspeechapi": "0.0.29",
-    "@typescript-eslint/eslint-plugin": "5.59.0",
-    "@typescript-eslint/parser": "5.59.0",
-    "@web/dev-server": "0.1.38",
-    "@web/dev-server-rollup": "0.4.1",
+    "@typescript-eslint/eslint-plugin": "5.55.0",
+    "@typescript-eslint/parser": "5.55.0",
+    "@web/dev-server": "0.1.36",
+    "@web/dev-server-rollup": "0.4.0",
     "babel-loader": "9.1.2",
     "babel-plugin-template-html-minifier": "4.1.0",
     "chai": "4.3.7",
     "del": "7.0.0",
-    "eslint": "8.38.0",
+    "eslint": "8.36.0",
     "eslint-config-airbnb-base": "15.0.0",
     "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.8.0",
+    "eslint-config-prettier": "8.7.0",
     "eslint-import-resolver-webpack": "0.13.2",
     "eslint-plugin-disable": "2.0.3",
     "eslint-plugin-import": "2.27.5",
-    "eslint-plugin-lit": "1.8.3",
-    "eslint-plugin-lit-a11y": "2.4.1",
+    "eslint-plugin-lit": "1.8.2",
+    "eslint-plugin-lit-a11y": "2.4.0",
     "eslint-plugin-unused-imports": "2.0.0",
     "eslint-plugin-wc": "1.4.0",
     "esprima": "4.0.1",
     "fancy-log": "2.0.0",
-    "fs-extra": "11.1.1",
-    "glob": "10.2.1",
+    "fs-extra": "11.1.0",
+    "glob": "9.3.0",
     "gulp": "4.0.2",
     "gulp-flatmap": "1.0.2",
     "gulp-json-transform": "0.4.8",
     "gulp-merge-json": "2.1.2",
     "gulp-rename": "2.0.0",
     "gulp-zopfli-green": "6.0.1",
-    "html-minifier-terser": "7.2.0",
+    "html-minifier": "4.0.0",
     "husky": "8.0.3",
-    "instant-mocha": "1.5.1",
+    "instant-mocha": "1.5.0",
     "jszip": "3.10.1",
-    "lint-staged": "13.2.1",
+    "lint-staged": "13.2.0",
     "lit-analyzer": "1.2.1",
     "lodash.template": "4.5.0",
     "magic-string": "0.30.0",
@@ -221,15 +226,16 @@
     "object-hash": "3.0.0",
     "open": "8.4.2",
     "pinst": "3.0.0",
-    "prettier": "2.8.7",
+    "prettier": "2.8.4",
+    "require-dir": "1.2.0",
     "rollup": "2.79.1",
     "rollup-plugin-string": "3.0.0",
     "rollup-plugin-terser": "7.0.2",
     "rollup-plugin-visualizer": "5.9.0",
     "serve-handler": "6.1.5",
-    "sinon": "15.0.4",
+    "sinon": "15.0.2",
     "source-map-url": "0.4.1",
-    "systemjs": "6.14.1",
+    "systemjs": "6.14.0",
     "tar": "6.1.13",
     "terser-webpack-plugin": "5.3.7",
     "ts-lit-plugin": "1.2.1",
@@ -238,16 +244,16 @@
     "vinyl-source-stream": "2.0.0",
     "webpack": "=5.72.1",
     "webpack-cli": "5.0.1",
-    "webpack-dev-server": "4.13.3",
+    "webpack-dev-server": "4.12.0",
     "webpack-manifest-plugin": "5.0.0",
     "webpackbar": "5.0.2",
     "workbox-build": "6.5.4"
   },
   "_comment": "Polymer 3.2 contained a bug, fixed in https://github.com/Polymer/polymer/pull/5569, add as patch",
   "resolutions": {
-    "@polymer/polymer": "patch:@polymer/polymer@3.5.1#./.yarn/patches/@polymer/polymer/pr-5569.patch",
-    "@material/mwc-button@^0.25.3": "^0.27.0"
+    "@polymer/polymer": "patch:@polymer/polymer@3.4.1#./.yarn/patches/@polymer/polymer/pr-5569.patch"
   },
+  "main": "src/home-assistant.js",
   "prettier": {
     "trailingComma": "es5",
     "arrowParens": "always"

pyproject.toml

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

rollup.config.js

@@ -1,5 +1,5 @@
-import rollup from "../build-scripts/rollup.cjs";
-import env from "../build-scripts/env.cjs";
+const rollup = require("./build-scripts/rollup.js");
+const env = require("./build-scripts/env.js");
 
 const config = rollup.createAppConfig({
   isProdBuild: env.isProdBuild(),
@@ -7,4 +7,4 @@ const config = rollup.createAppConfig({
   isStatsBuild: env.isStatsBuild(),
 });
 
-export default { ...config.inputOptions, output: config.outputOptions };
+module.exports = { ...config.inputOptions, output: config.outputOptions };

src/auth/ha-auth-flow.ts

@@ -9,7 +9,6 @@ import {
   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";
@@ -21,12 +20,13 @@ import {
   DataEntryFlowStep,
   DataEntryFlowStepForm,
 } from "../data/data_entry_flow";
+import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 import "./ha-password-manager-polyfill";
 
 type State = "loading" | "error" | "step";
 
 @customElement("ha-auth-flow")
-export class HaAuthFlow extends LitElement {
+export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
   @property({ attribute: false }) public authProvider?: AuthProvider;
 
   @property() public clientId?: string;
@@ -35,8 +35,6 @@ export class HaAuthFlow extends LitElement {
 
   @property() public oauth2State?: string;
 
-  @property() public localize!: LocalizeFunc;
-
   @state() private _state: State = "loading";
 
   @state() private _stepData?: Record<string, any>;

src/auth/ha-authorize.ts

@@ -82,13 +82,12 @@ export class HaAuthorize extends litLocalizeLiteMixin(LitElement) {
         .redirectUri=${this.redirectUri}
         .oauth2State=${this.oauth2State}
         .authProvider=${this._authProvider}
-        .localize=${this.localize}
       ></ha-auth-flow>
 
       ${inactiveProviders.length > 0
         ? html`
             <ha-pick-auth-provider
-              .localize=${this.localize}
+              .resources=${this.resources}
               .clientId=${this.clientId}
               .authProviders=${inactiveProviders}
               @pick-auth-provider=${this._handleAuthProviderPick}

src/auth/ha-pick-auth-provider.ts

@@ -1,11 +1,11 @@
-import "@material/mwc-list";
+import "@polymer/paper-item/paper-item";
+import "@polymer/paper-item/paper-item-body";
 import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../common/dom/fire_event";
-import { LocalizeFunc } from "../common/translations/localize";
 import "../components/ha-icon-next";
-import "../components/ha-list-item";
 import { AuthProvider } from "../data/auth";
+import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 
 declare global {
   interface HASSDomEvents {
@@ -14,29 +14,24 @@ declare global {
 }
 
 @customElement("ha-pick-auth-provider")
-export class HaPickAuthProvider extends LitElement {
+export class HaPickAuthProvider extends litLocalizeLiteMixin(LitElement) {
   @property() public authProviders: AuthProvider[] = [];
 
-  @property() public localize!: LocalizeFunc;
-
   protected render() {
     return html`
       <p>${this.localize("ui.panel.page-authorize.pick_auth_provider")}:</p>
-      <mwc-list>
-        ${this.authProviders.map(
-          (provider) => html`
-            <ha-list-item
-              hasMeta
-              role="button"
-              .auth_provider=${provider}
-              @click=${this._handlePick}
-            >
-              ${provider.name}
-              <ha-icon-next slot="meta"></ha-icon-next>
-            </ha-list-item>
-          `
-        )}</mwc-list
-      >
+      ${this.authProviders.map(
+        (provider) => html`
+          <paper-item
+            role="button"
+            .auth_provider=${provider}
+            @click=${this._handlePick}
+          >
+            <paper-item-body>${provider.name}</paper-item-body>
+            <ha-icon-next></ha-icon-next>
+          </paper-item>
+        `
+      )}
     `;
   }
 
@@ -45,12 +40,11 @@ export class HaPickAuthProvider extends LitElement {
   }
 
   static styles = css`
+    paper-item {
+      cursor: pointer;
+    }
     p {
       margin-top: 0;
     }
-    mwc-list {
-      margin: 0 -16px;
-      --mdc-list-side-padding: 16px;
-    }
   `;
 }

src/common/const.ts

@@ -50,7 +50,6 @@ import {
   mdiRobotVacuum,
   mdiScriptText,
   mdiSineWave,
-  mdiSpeakerMessage,
   mdiSpeedometer,
   mdiSunWireless,
   mdiThermometer,
@@ -76,8 +75,8 @@ export const DEFAULT_DOMAIN_ICON = mdiBookmark;
 
 /** Icons for each domain */
 export const FIXED_DOMAIN_ICONS = {
-  air_quality: mdiAirFilter,
   alert: mdiAlert,
+  air_quality: mdiAirFilter,
   calendar: mdiCalendar,
   climate: mdiThermostat,
   configurator: mdiCog,
@@ -107,12 +106,10 @@ export const FIXED_DOMAIN_ICONS = {
   script: mdiScriptText,
   select: mdiFormatListBulleted,
   sensor: mdiEye,
-  simple_alarm: mdiBell,
   siren: mdiBullhorn,
-  stt: mdiMicrophoneMessage,
+  simple_alarm: mdiBell,
   text: mdiFormTextbox,
   timer: mdiTimerOutline,
-  tts: mdiSpeakerMessage,
   updater: mdiCloudUpload,
   vacuum: mdiRobotVacuum,
   zone: mdiMapMarkerRadius,

src/common/datetime/duration.ts

@@ -1,19 +1,16 @@
-import millisecondsToDuration from "./milliseconds_to_duration";
+import secondsToDuration from "./seconds_to_duration";
 
-const DAY_IN_MILLISECONDS = 86400000;
-const HOUR_IN_MILLISECONDS = 3600000;
-const MINUTE_IN_MILLISECONDS = 60000;
-const SECOND_IN_MILLISECONDS = 1000;
+const DAY_IN_SECONDS = 86400;
+const HOUR_IN_SECONDS = 3600;
+const MINUTE_IN_SECONDS = 60;
 
-export const UNIT_TO_MILLISECOND_CONVERT = {
-  ms: 1,
-  s: SECOND_IN_MILLISECONDS,
-  min: MINUTE_IN_MILLISECONDS,
-  h: HOUR_IN_MILLISECONDS,
-  d: DAY_IN_MILLISECONDS,
+export const UNIT_TO_SECOND_CONVERT = {
+  s: 1,
+  min: MINUTE_IN_SECONDS,
+  h: HOUR_IN_SECONDS,
+  d: DAY_IN_SECONDS,
 };
 
 export const formatDuration = (duration: string, units: string): string =>
-  millisecondsToDuration(
-    parseFloat(duration) * UNIT_TO_MILLISECOND_CONVERT[units]
-  ) || "0";
+  secondsToDuration(parseFloat(duration) * UNIT_TO_SECOND_CONVERT[units]) ||
+  "0";

src/common/datetime/milliseconds_to_duration.ts

@@ -1,25 +0,0 @@
-const leftPad = (num: number, digits = 2) => {
-  let paddedNum = "" + num;
-  for (let i = 1; i < digits; i++) {
-    paddedNum = parseInt(paddedNum) < 10 ** i ? `0${paddedNum}` : paddedNum;
-  }
-  return paddedNum;
-};
-
-export default function millisecondsToDuration(d: number) {
-  const h = Math.floor(d / 1000 / 3600);
-  const m = Math.floor(((d / 1000) % 3600) / 60);
-  const s = Math.floor(((d / 1000) % 3600) % 60);
-  const ms = Math.floor(d % 1000);
-
-  if (h > 0) {
-    return `${h}:${leftPad(m)}:${leftPad(s)}`;
-  }
-  if (m > 0) {
-    return `${m}:${leftPad(s)}`;
-  }
-  if (s > 0 || ms > 0) {
-    return `${s}${ms > 0 ? `.${leftPad(ms, 3)}` : ``}`;
-  }
-  return null;
-}

src/common/decorators/transform.ts

@@ -1,111 +0,0 @@
-import { PropertyDeclaration, PropertyValues, ReactiveElement } from "lit";
-import { ClassElement } from "../../types";
-import { shallowEqual } from "../util/shallow-equal";
-
-/**
- * Transform function type.
- */
-export interface Transformer<T = any, V = any> {
-  (value: V): T;
-}
-
-type ReactiveTransformElement = ReactiveElement & {
-  _transformers: Map<PropertyKey, Transformer>;
-  _watching: Map<PropertyKey, Set<PropertyKey>>;
-};
-
-type ReactiveElementClassWithTransformers = typeof ReactiveElement & {
-  prototype: ReactiveTransformElement;
-};
-
-/**
- * Specifies an tranformer callback that is run when the value of the decorated property, or any of the properties in the watching array, changes.
- * The result of the tranformer is assigned to the decorated property.
- * The tranformer receives the current as arguments.
- */
-export const transform =
-  <T, V>(config: {
-    transformer: Transformer<T, V>;
-    watch?: PropertyKey[];
-    propertyOptions?: PropertyDeclaration;
-  }): any =>
-  (clsElement: ClassElement) => {
-    const key = String(clsElement.key);
-    return {
-      ...clsElement,
-      kind: "method",
-      descriptor: {
-        set(this: ReactiveTransformElement, value: V) {
-          const oldValue = this[`__transform_${key}`];
-          const trnsformr: Transformer<T, V> | undefined =
-            this._transformers.get(key);
-          if (trnsformr) {
-            this[`__transform_${key}`] = trnsformr.call(this, value);
-          } else {
-            this[`__transform_${key}`] = value;
-          }
-          this[`__original_${key}`] = value;
-          this.requestUpdate(key, oldValue);
-        },
-        get(): T {
-          return this[`__transform_${key}`];
-        },
-        enumerable: true,
-        configurable: true,
-      },
-      finisher(cls: ReactiveElementClassWithTransformers) {
-        // if we haven't wrapped `willUpdate` in this class, do so
-        if (!cls.prototype._transformers) {
-          cls.prototype._transformers = new Map<PropertyKey, Transformer>();
-          cls.prototype._watching = new Map<PropertyKey, Set<PropertyKey>>();
-          // @ts-ignore
-          const userWillUpdate = cls.prototype.willUpdate;
-          // @ts-ignore
-          cls.prototype.willUpdate = function (
-            this: ReactiveTransformElement,
-            changedProperties: PropertyValues
-          ) {
-            userWillUpdate.call(this, changedProperties);
-            const keys = new Set<PropertyKey>();
-            changedProperties.forEach((_v, k) => {
-              const watchers = this._watching;
-              const ks: Set<PropertyKey> | undefined = watchers.get(k);
-              if (ks !== undefined) {
-                ks.forEach((wk) => keys.add(wk));
-              }
-            });
-            keys.forEach((k) => {
-              // trigger setter
-              this[k] = this[`__original_${String(k)}`];
-            });
-          };
-          // clone any existing observers (superclasses)
-          // eslint-disable-next-line no-prototype-builtins
-        } else if (!cls.prototype.hasOwnProperty("_transformers")) {
-          const tranformers = cls.prototype._transformers;
-          cls.prototype._transformers = new Map();
-          tranformers.forEach((v: any, k: PropertyKey) =>
-            cls.prototype._transformers.set(k, v)
-          );
-        }
-        // set this method
-        cls.prototype._transformers.set(clsElement.key, config.transformer);
-        if (config.watch) {
-          // store watchers
-          config.watch.forEach((k) => {
-            let curWatch = cls.prototype._watching.get(k);
-            if (!curWatch) {
-              curWatch = new Set();
-              cls.prototype._watching.set(k, curWatch);
-            }
-            curWatch.add(clsElement.key);
-          });
-        }
-        cls.createProperty(clsElement.key, {
-          noAccessor: true,
-          hasChanged: (v: any, o: any) => !shallowEqual(v, o),
-          ...config.propertyOptions,
-        });
-      },
-    };
-  };

src/common/dom/apply_themes_on_element.ts

@@ -93,7 +93,7 @@ export const applyThemesOnElement = (
     }
 
     // Nothing was changed
-    if (element.__themes?.cacheKey === cacheKey) {
+    if (element._themes?.cacheKey === cacheKey) {
       return;
     }
   }
@@ -119,7 +119,7 @@ export const applyThemesOnElement = (
     }
   }
 
-  if (!element.__themes?.keys && !Object.keys(themeRules).length) {
+  if (!element._themes?.keys && !Object.keys(themeRules).length) {
     // No styles to reset, and no styles to set
     return;
   }
@@ -130,8 +130,8 @@ export const applyThemesOnElement = (
       : undefined;
 
   // Add previous set keys to reset them, and new theme
-  const styles = { ...element.__themes?.keys, ...newTheme?.styles };
-  element.__themes = { cacheKey, keys: newTheme?.keys };
+  const styles = { ...element._themes?.keys, ...newTheme?.styles };
+  element._themes = { cacheKey, keys: newTheme?.keys };
 
   // Set and/or reset styles
   if (element.updateStyles) {

src/common/dom/speech-recognition.ts

@@ -0,0 +1,7 @@
+export const SpeechRecognition =
+  window.SpeechRecognition || window.webkitSpeechRecognition;
+export const SpeechGrammarList =
+  window.SpeechGrammarList || window.webkitSpeechGrammarList;
+export const SpeechRecognitionEvent =
+  // @ts-expect-error
+  window.SpeechRecognitionEvent || window.webkitSpeechRecognitionEvent;

src/common/entity/compute_state_display.ts

@@ -7,10 +7,7 @@ import {
   UPDATE_SUPPORT_PROGRESS,
 } from "../../data/update";
 import { HomeAssistant } from "../../types";
-import {
-  formatDuration,
-  UNIT_TO_MILLISECOND_CONVERT,
-} from "../datetime/duration";
+import { formatDuration, UNIT_TO_SECOND_CONVERT } from "../datetime/duration";
 import { formatDate } from "../datetime/format_date";
 import { formatDateTime } from "../datetime/format_date_time";
 import { formatTime } from "../datetime/format_time";
@@ -24,47 +21,26 @@ import { LocalizeFunc } from "../translations/localize";
 import { computeDomain } from "./compute_domain";
 import { supportsFeatureFromAttributes } from "./supports-feature";
 
-export const computeStateDisplaySingleEntity = (
-  localize: LocalizeFunc,
-  stateObj: HassEntity,
-  locale: FrontendLocaleData,
-  entity: EntityRegistryDisplayEntry | undefined,
-  state?: string
-): string =>
-  computeStateDisplayFromEntityAttributes(
-    localize,
-    locale,
-    entity,
-    stateObj.entity_id,
-    stateObj.attributes,
-    state !== undefined ? state : stateObj.state
-  );
-
 export const computeStateDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
   locale: FrontendLocaleData,
   entities: HomeAssistant["entities"],
   state?: string
-): string => {
-  const entity = entities[stateObj.entity_id] as
-    | EntityRegistryDisplayEntry
-    | undefined;
-
-  return computeStateDisplayFromEntityAttributes(
+): string =>
+  computeStateDisplayFromEntityAttributes(
     localize,
     locale,
-    entity,
+    entities,
     stateObj.entity_id,
     stateObj.attributes,
     state !== undefined ? state : stateObj.state
   );
-};
 
 export const computeStateDisplayFromEntityAttributes = (
   localize: LocalizeFunc,
   locale: FrontendLocaleData,
-  entity: EntityRegistryDisplayEntry | undefined,
+  entities: HomeAssistant["entities"],
   entityId: string,
   attributes: any,
   state: string
@@ -73,13 +49,15 @@ export const computeStateDisplayFromEntityAttributes = (
     return localize(`state.default.${state}`);
   }
 
+  const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
+
   // Entities with a `unit_of_measurement` or `state_class` are numeric values and should use `formatNumber`
   if (isNumericFromAttributes(attributes)) {
     // state is duration
     if (
       attributes.device_class === "duration" &&
       attributes.unit_of_measurement &&
-      UNIT_TO_MILLISECOND_CONVERT[attributes.unit_of_measurement]
+      UNIT_TO_SECOND_CONVERT[attributes.unit_of_measurement]
     ) {
       try {
         return formatDuration(state, attributes.unit_of_measurement);
@@ -193,9 +171,11 @@ export const computeStateDisplayFromEntityAttributes = (
     );
   }
 
-  // state is a timestamp
+  // state of button is a timestamp
   if (
-    ["button", "input_button", "scene", "stt", "tts"].includes(domain) ||
+    domain === "button" ||
+    domain === "input_button" ||
+    domain === "scene" ||
     (domain === "sensor" && attributes.device_class === "timestamp")
   ) {
     try {

src/common/entity/get_states.ts

@@ -118,40 +118,24 @@ const FIXED_DOMAIN_ATTRIBUTE_STATES = {
       "window",
     ],
   },
-  device_tracker: {
-    source_type: ["bluetooth", "bluetooth_le", "gps", "router"],
-  },
-  fan: {
-    direction: ["forward", "reverse"],
-  },
   humidifier: {
     device_class: ["humidifier", "dehumidifier"],
   },
   media_player: {
     device_class: ["tv", "speaker", "receiver"],
     media_content_type: [
-      "album",
       "app",
-      "artist",
       "channel",
-      "channels",
-      "composer",
-      "contibuting_artist",
       "episode",
       "game",
-      "genre",
       "image",
       "movie",
       "music",
       "playlist",
-      "podcast",
-      "season",
-      "track",
       "tvshow",
       "url",
       "video",
     ],
-    repeat: ["off", "one", "all"],
   },
   number: {
     device_class: ["temperature"],

src/common/entity/state_color.ts

@@ -1,7 +1,6 @@
 /** Return an color representing a state. */
 import { HassEntity } from "home-assistant-js-websocket";
 import { UNAVAILABLE } from "../../data/entity";
-import { computeGroupDomain, GroupEntity } from "../../data/group";
 import { computeCssVariable } from "../../resources/css-variables";
 import { slugify } from "../string/slugify";
 import { batteryStateColorProperty } from "./color/battery_color";
@@ -53,11 +52,11 @@ export const stateColorCss = (stateObj: HassEntity, state?: string) => {
 };
 
 export const domainStateColorProperties = (
-  domain: string,
   stateObj: HassEntity,
   state?: string
 ): string[] => {
   const compareState = state !== undefined ? state : stateObj.state;
+  const domain = computeDomain(stateObj.entity_id);
   const active = stateActive(stateObj, state);
 
   const properties: string[] = [];
@@ -96,16 +95,8 @@ export const stateColorProperties = (
     }
   }
 
-  // Special rules for group coloring
-  if (domain === "group") {
-    const groupDomain = computeGroupDomain(stateObj as GroupEntity);
-    if (groupDomain && STATE_COLORED_DOMAIN.has(groupDomain)) {
-      return domainStateColorProperties(groupDomain, stateObj, state);
-    }
-  }
-
   if (STATE_COLORED_DOMAIN.has(domain)) {
-    return domainStateColorProperties(domain, stateObj, state);
+    return domainStateColorProperties(stateObj, state);
   }
 
   return undefined;

src/common/language/format_language.ts

@@ -1,22 +0,0 @@
-import memoizeOne from "memoize-one";
-import { FrontendLocaleData } from "../../data/translation";
-
-export const formatLanguageCode = (
-  languageCode: string,
-  locale: FrontendLocaleData
-) => {
-  try {
-    return formatLanguageCodeMem(locale)?.of(languageCode) ?? languageCode;
-  } catch {
-    return languageCode;
-  }
-};
-
-const formatLanguageCodeMem = memoizeOne((locale: FrontendLocaleData) =>
-  Intl && "DisplayNames" in Intl
-    ? new Intl.DisplayNames(locale.language, {
-        type: "language",
-        fallback: "code",
-      })
-    : undefined
-);

src/common/structs/is-entity-id.ts

@@ -0,0 +1,17 @@
+import { refine, string } from "superstruct";
+
+const isEntityId = (value: string): boolean => value.includes(".");
+
+export const entityId = () =>
+  refine(string(), "entity ID (domain.entity)", isEntityId);
+
+const isEntityIdOrAll = (value: string): boolean => {
+  if (value === "all") {
+    return true;
+  }
+
+  return isEntityId(value);
+};
+
+export const entityIdOrAll = () =>
+  refine(string(), "entity ID (domain.entity or all)", isEntityIdOrAll);

src/common/translations/blank_before_percent.ts

@@ -4,7 +4,7 @@ import { FrontendLocaleData } from "../../data/translation";
 export const blankBeforePercent = (
   localeOptions: FrontendLocaleData
 ): string => {
-  switch (localeOptions?.language) {
+  switch (localeOptions.language) {
     case "cz":
     case "de":
     case "fi":

src/common/translations/localize.ts

@@ -2,7 +2,6 @@ import { shouldPolyfill as shouldPolyfillLocale } from "@formatjs/intl-locale/li
 import { shouldPolyfill as shouldPolyfillPluralRules } from "@formatjs/intl-pluralrules/lib/should-polyfill";
 import { shouldPolyfill as shouldPolyfillRelativeTime } from "@formatjs/intl-relativetimeformat/lib/should-polyfill";
 import { shouldPolyfill as shouldPolyfillDateTime } from "@formatjs/intl-datetimeformat/lib/should-polyfill";
-import { shouldPolyfill as shouldPolyfillDisplayName } from "@formatjs/intl-displaynames/lib/should-polyfill";
 import IntlMessageFormat from "intl-messageformat";
 import { Resources, TranslationDict } from "../../types";
 import { getLocalLanguage } from "../../util/common-translation";
@@ -84,10 +83,6 @@ if (__BUILD__ === "latest") {
     polyfills.push(import("@formatjs/intl-datetimeformat/polyfill"));
     polyfills.push(import("@formatjs/intl-datetimeformat/add-all-tz"));
   }
-  if (shouldPolyfillDisplayName(locale)) {
-    polyfills.push(import("@formatjs/intl-displaynames/polyfill"));
-    polyfills.push(import("@formatjs/intl-displaynames/locale-data/en"));
-  }
 }
 
 export const polyfillsLoaded =
@@ -221,17 +216,6 @@ export const loadPolyfillLocales = async (language: string) => {
       // @ts-ignore
       Intl.DateTimeFormat.__addLocaleData(await result.json());
     }
-    if (
-      Intl.DisplayNames &&
-      // @ts-ignore
-      typeof Intl.DisplayNames.__addLocaleData === "function"
-    ) {
-      const result = await fetch(
-        `/static/locale-data/intl-displaynames/${language}.json`
-      );
-      // @ts-ignore
-      Intl.DisplayNames.__addLocaleData(await result.json());
-    }
   } catch (e) {
     // Ignore
   }

src/common/util/shallow-equal.ts

@@ -1,108 +0,0 @@
-/**
- * Compares two values for shallow equality, only 1 level deep.
- */
-export const shallowEqual = (a: any, b: any): boolean => {
-  if (a === b) {
-    return true;
-  }
-
-  if (a && b && typeof a === "object" && typeof b === "object") {
-    if (a.constructor !== b.constructor) {
-      return false;
-    }
-
-    let i: number | [any, any];
-    let length: number;
-    if (Array.isArray(a)) {
-      length = a.length;
-      if (length !== b.length) {
-        return false;
-      }
-      for (i = length; i-- !== 0; ) {
-        if (a[i] !== b[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    if (a instanceof Map && b instanceof Map) {
-      if (a.size !== b.size) {
-        return false;
-      }
-      for (i of a.entries()) {
-        if (!b.has(i[0])) {
-          return false;
-        }
-      }
-      for (i of a.entries()) {
-        if (i[1] !== b.get(i[0])) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    if (a instanceof Set && b instanceof Set) {
-      if (a.size !== b.size) {
-        return false;
-      }
-      for (i of a.entries()) {
-        if (!b.has(i[0])) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    if (ArrayBuffer.isView(a) && ArrayBuffer.isView(b)) {
-      // @ts-ignore
-      length = a.length;
-      // @ts-ignore
-      if (length !== b.length) {
-        return false;
-      }
-      for (i = length; i-- !== 0; ) {
-        if (a[i] !== b[i]) {
-          return false;
-        }
-      }
-      return true;
-    }
-
-    if (a.constructor === RegExp) {
-      return a.source === b.source && a.flags === b.flags;
-    }
-    if (a.valueOf !== Object.prototype.valueOf) {
-      return a.valueOf() === b.valueOf();
-    }
-    if (a.toString !== Object.prototype.toString) {
-      return a.toString() === b.toString();
-    }
-
-    const keys = Object.keys(a);
-    length = keys.length;
-    if (length !== Object.keys(b).length) {
-      return false;
-    }
-    for (i = length; i-- !== 0; ) {
-      if (!Object.prototype.hasOwnProperty.call(b, keys[i])) {
-        return false;
-      }
-    }
-
-    for (i = length; i-- !== 0; ) {
-      const key = keys[i];
-
-      if (a[key] !== b[key]) {
-        return false;
-      }
-    }
-
-    return true;
-  }
-
-  // true if both NaN, false otherwise
-  // eslint-disable-next-line no-self-compare
-  return a !== a && b !== b;
-};

src/components/buttons/ha-call-api-button.ts

@@ -0,0 +1,77 @@
+import { css, CSSResultGroup, html, LitElement } from "lit";
+import { customElement, property, query } from "lit/decorators";
+import { fireEvent } from "../../common/dom/fire_event";
+import { HomeAssistant } from "../../types";
+import "./ha-progress-button";
+
+@customElement("ha-call-api-button")
+class HaCallApiButton extends LitElement {
+  @property({ attribute: false }) public hass!: HomeAssistant;
+
+  @property() public method: "POST" | "GET" | "PUT" | "DELETE" = "POST";
+
+  @property() public data = {};
+
+  @property({ type: Boolean, reflect: true }) public disabled = false;
+
+  @property({ type: Boolean }) public progress = false;
+
+  @property() public path?: string;
+
+  @query("ha-progress-button", true) private _progressButton;
+
+  render() {
+    return html`
+      <ha-progress-button
+        .progress=${this.progress}
+        @click=${this._buttonTapped}
+        ?disabled=${this.disabled}
+        ><slot></slot
+      ></ha-progress-button>
+    `;
+  }
+
+  async _buttonTapped() {
+    this.progress = true;
+    const eventData: {
+      method: string;
+      path: string;
+      data: any;
+      success?: boolean;
+      response?: any;
+    } = {
+      method: this.method,
+      path: this.path!,
+      data: this.data,
+    };
+
+    try {
+      const resp = await this.hass.callApi(this.method, this.path!, this.data);
+      this.progress = false;
+      this._progressButton.actionSuccess();
+      eventData.success = true;
+      eventData.response = resp;
+    } catch (err: any) {
+      this.progress = false;
+      this._progressButton.actionError();
+      eventData.success = false;
+      eventData.response = err;
+    }
+
+    fireEvent(this, "hass-api-called", eventData as any);
+  }
+
+  static get styles(): CSSResultGroup {
+    return css`
+      :host([disabled]) {
+        pointer-events: none;
+      }
+    `;
+  }
+}
+
+declare global {
+  interface HTMLElementTagNameMap {
+    "ha-call-api-button": HaCallApiButton;
+  }
+}

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

@@ -276,11 +276,7 @@ export default class HaChartBase extends LitElement {
       top: this.chart!.canvas.offsetTop + context.tooltip.caretY + 12 + "px",
       left:
         this.chart!.canvas.offsetLeft +
-        clamp(
-          context.tooltip.caretX,
-          100,
-          this.clientWidth - 100 - this.paddingYAxis
-        ) -
+        clamp(context.tooltip.caretX, 100, this.clientWidth - 100) -
         100 +
         "px",
     };
@@ -306,7 +302,6 @@ export default class HaChartBase extends LitElement {
     return css`
       :host {
         display: block;
-        position: var(--chart-base-position, relative);
       }
       .chartContainer {
         overflow: hidden;