Enable compression for development

Co-authored-by: Bram Kragten <mail@bramkragten.nl>

.eslintrc.json

@@ -20,7 +20,7 @@
   "settings": {
     "import/resolver": {
       "webpack": {
-        "config": "./webpack.config.cjs"
+        "config": "./webpack.config.js"
       }
     }
   },
@@ -119,6 +119,7 @@
     "lit/no-template-map": "off",
     "lit/no-native-attributes": "warn",
     "lit/no-this-assign-in-render": "warn",
+    "lit/prefer-nothing": "warn",
     "lit-a11y/click-events-have-key-events": ["off"],
     "lit-a11y/no-autofocus": "off",
     "lit-a11y/alt-text": "warn",

.github/dependabot.yml

@@ -6,3 +6,16 @@ updates:
       interval: weekly
       time: "06:00"
     open-pull-requests-limit: 10
+  - package-ecosystem: "npm"
+    directory: "/"
+    schedule:
+      interval: "daily"
+      time: "03:00"
+    open-pull-requests-limit: 10
+    labels:
+      - "dependencies"
+    ignore:
+      # Ignore rollup and plugins until everything else is updated
+      - dependency-name: "*rollup*"
+      - dependency-name: "@rollup/*"
+      - dependency-name: "serve"

.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.0
+        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.0
+        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.0
+        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.0
+        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.0
+        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.0
+        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.0
+      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

@@ -23,7 +23,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.0
+        uses: actions/checkout@v3.3.0
         with:
           ref: dev
 
@@ -59,7 +59,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.0
+        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.0
+        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.0
+        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.0
+        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.0
+        uses: actions/checkout@v3.3.0
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master

.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.0
+        uses: actions/checkout@v3.3.0
 
       - name: Upload Translations
         run: |

.yarnrc.yml

@@ -1,5 +1,3 @@
-defaultSemverRangePrefix: ""
-
 nodeLinker: node-modules
 
 plugins:
@@ -8,4 +6,4 @@ plugins:
   - path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
     spec: "@yarnpkg/plugin-interactive-tools"
 
-yarnPath: .yarn/releases/yarn-3.5.0.cjs
+yarnPath: .yarn/releases/yarn-3.3.1.cjs

build-scripts/bundle.js

@@ -1,15 +1,6 @@
 const path = require("path");
-const env = require("./env.cjs");
-const paths = require("./paths.cjs");
-
-// 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
-module.exports.sourceMapURL = () => {
-  const ref = env.version().endsWith("dev")
-    ? process.env.GITHUB_SHA || "dev"
-    : env.version();
-  return `https://raw.githubusercontent.com/home-assistant/frontend/${ref}`;
-};
+const env = require("./env.js");
+const paths = require("./paths.js");
 
 // Files from NPM Packages that should not be imported
 // eslint-disable-next-line unused-imports/no-unused-vars
@@ -62,26 +53,13 @@ module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
   ...defineOverlay,
 });
 
-module.exports.htmlMinifierOptions = {
-  caseSensitive: true,
-  collapseWhitespace: true,
-  conservativeCollapse: true,
-  decodeEntities: true,
-  removeComments: true,
-  removeRedundantAttributes: true,
-  minifyCSS: {
-    compatibility: "*,-properties.zeroUnits",
-  },
-};
-
-module.exports.terserOptions = ({ latestBuild, isTestBuild }) => ({
+module.exports.terserOptions = (latestBuild) => ({
   safari10: !latestBuild,
   ecma: latestBuild ? undefined : 5,
-  format: { comments: false },
-  sourceMap: !isTestBuild,
+  output: { comments: false },
 });
 
-module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
+module.exports.babelOptions = ({ latestBuild }) => ({
   babelrc: false,
   compact: false,
   presets: [
@@ -89,7 +67,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
       "@babel/preset-env",
       {
         useBuiltIns: "entry",
-        corejs: { version: "3.29", proposals: true },
+        corejs: { version: "3.28", proposals: true },
         bugfixes: true,
       },
     ],
@@ -99,7 +77,7 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
     [
       path.resolve(
         paths.polymer_dir,
-        "build-scripts/babel-plugins/inline-constants-plugin.cjs"
+        "build-scripts/babel-plugins/inline-constants-plugin.js"
       ),
       {
         modules: ["@mdi/js"],
@@ -115,41 +93,20 @@ module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
     "@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-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",
-      {
-        modules: {
-          lit: [
-            "html",
-            { name: "svg", encapsulation: "svg" },
-            { name: "css", encapsulation: "style" },
-          ],
-          "@polymer/polymer/lib/utils/html-tag": ["html"],
-        },
-        strictCSS: true,
-        htmlMinifier: module.exports.htmlMinifierOptions,
-        failOnError: true, // we can turn this off in case of false positives
-      },
-    ],
   ].filter(Boolean),
   exclude: [
     // \\ for Windows, / for Mac OS and Linux
     /node_modules[\\/]core-js/,
     /node_modules[\\/]webpack[\\/]buildin/,
   ],
-  sourceMaps: !isTestBuild,
 });
 
-const nameSuffix = (latestBuild) => (latestBuild ? "-latest" : "-es5");
-
 const outputPath = (outputRoot, latestBuild) =>
   path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5");
 
@@ -172,17 +129,14 @@ BundleConfig {
   latestBuild: boolean,
   // If we're doing a stats build (create nice chunk names)
   isStatsBuild: boolean,
-  // If it's just a test build in CI, skip time on source map generation
-  isTestBuild: boolean,
   // Names of entrypoints that should not be hashed
   dontHash: Set<string>
 }
 */
 
 module.exports.config = {
-  app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild, isWDS }) {
+  app({ isProdBuild, latestBuild, isStatsBuild, isWDS }) {
     return {
-      name: "app" + nameSuffix(latestBuild),
       entry: {
         service_worker: "./src/entrypoints/service_worker.ts",
         app: "./src/entrypoints/app.ts",
@@ -196,14 +150,12 @@ module.exports.config = {
       isProdBuild,
       latestBuild,
       isStatsBuild,
-      isTestBuild,
       isWDS,
     };
   },
 
   demo({ isProdBuild, latestBuild, isStatsBuild }) {
     return {
-      name: "demo" + nameSuffix(latestBuild),
       entry: {
         main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
       },
@@ -233,7 +185,6 @@ module.exports.config = {
     }
 
     return {
-      name: "cast" + nameSuffix(latestBuild),
       entry,
       outputPath: outputPath(paths.cast_output_root, latestBuild),
       publicPath: publicPath(latestBuild),
@@ -245,9 +196,8 @@ module.exports.config = {
     };
   },
 
-  hassio({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) {
+  hassio({ isProdBuild, latestBuild }) {
     return {
-      name: "supervisor" + nameSuffix(latestBuild),
       entry: {
         entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"),
       },
@@ -255,8 +205,6 @@ module.exports.config = {
       publicPath: publicPath(latestBuild, paths.hassio_publicPath),
       isProdBuild,
       latestBuild,
-      isStatsBuild,
-      isTestBuild,
       isHassioBuild: true,
       defineOverlay: {
         __SUPERVISOR__: true,
@@ -266,7 +214,6 @@ module.exports.config = {
 
   gallery({ isProdBuild, latestBuild }) {
     return {
-      name: "gallery" + nameSuffix(latestBuild),
       entry: {
         entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
       },

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() {
@@ -17,7 +17,7 @@ module.exports = {
   isStatsBuild() {
     return process.env.STATS === "1";
   },
-  isTestBuild() {
+  isTest() {
     return process.env.IS_TEST === "true";
   },
   isNetlify() {

build-scripts/gulp/app.js

@@ -1,18 +1,19 @@
 // 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",
@@ -49,7 +50,7 @@ gulp.task(
     "copy-static-app",
     env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
     // Don't compress running tests
-    ...(env.isTestBuild() ? [] : ["compress-app"]),
+    ...(env.isTest() ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-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",

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",

build-scripts/gulp/entry-html.js

@@ -3,10 +3,9 @@ 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 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`);
@@ -40,12 +39,10 @@ const renderGalleryTemplate = (pth, data = {}) =>
 
 const minifyHtml = (content) =>
   minify(content, {
-    ...htmlMinifierOptions,
-    conservativeCollapse: false,
-    minifyJS: terserOptions({
-      latestBuild: false, // Shared scripts should be ES5
-      isTestBuild: true, // Don't need source maps
-    }),
+    collapseWhitespace: true,
+    minifyJS: true,
+    minifyCSS: true,
+    removeComments: true,
   });
 
 const PAGES = ["onboarding", "authorize"];
@@ -66,7 +63,7 @@ gulp.task("gen-pages-dev", (done) => {
   done();
 });
 
-gulp.task("gen-pages-prod", async () => {
+gulp.task("gen-pages-prod", (done) => {
   const latestManifest = require(path.resolve(
     paths.app_output_latest,
     "manifest.json"
@@ -76,23 +73,19 @@ gulp.task("gen-pages-prod", async () => {
     "manifest.json"
   ));
 
-  const minifiedHTML = [];
   for (const page of PAGES) {
     const content = renderTemplate(page, {
       latestPageJS: latestManifest[`${page}.js`],
+
       es5PageJS: es5Manifest[`${page}.js`],
     });
 
-    minifiedHTML.push(
-      minifyHtml(content).then((minified) =>
-        fs.outputFileSync(
-          path.resolve(paths.app_output_root, `${page}.html`),
-          minified
-        )
-      )
+    fs.outputFileSync(
+      path.resolve(paths.app_output_root, `${page}.html`),
+      minifyHtml(content)
     );
   }
-  await Promise.all(minifiedHTML);
+  done();
 });
 
 gulp.task("gen-index-app-dev", (done) => {
@@ -125,7 +118,7 @@ gulp.task("gen-index-app-dev", (done) => {
   done();
 });
 
-gulp.task("gen-index-app-prod", async () => {
+gulp.task("gen-index-app-prod", (done) => {
   const latestManifest = require(path.resolve(
     paths.app_output_latest,
     "manifest.json"
@@ -143,15 +136,13 @@ gulp.task("gen-index-app-prod", async () => {
     es5CoreJS: es5Manifest["core.js"],
     es5CustomPanelJS: es5Manifest["custom-panel.js"],
   });
-  const minified = (await minifyHtml(content)).replace(
-    /#THEMEC/g,
-    "{{ theme_color }}"
-  );
+  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) => {
@@ -253,7 +244,7 @@ gulp.task("gen-index-demo-dev", (done) => {
   done();
 });
 
-gulp.task("gen-index-demo-prod", async () => {
+gulp.task("gen-index-demo-prod", (done) => {
   const latestManifest = require(path.resolve(
     paths.demo_output_latest,
     "manifest.json"
@@ -267,12 +258,13 @@ gulp.task("gen-index-demo-prod", async () => {
 
     es5DemoJS: es5Manifest["main.js"],
   });
-  const minified = await minifyHtml(content);
+  const minified = minifyHtml(content);
 
   fs.outputFileSync(
     path.resolve(paths.demo_output_root, "index.html"),
     minified
   );
+  done();
 });
 
 gulp.task("gen-index-gallery-dev", (done) => {
@@ -287,7 +279,7 @@ gulp.task("gen-index-gallery-dev", (done) => {
   done();
 });
 
-gulp.task("gen-index-gallery-prod", async () => {
+gulp.task("gen-index-gallery-prod", (done) => {
   const latestManifest = require(path.resolve(
     paths.gallery_output_latest,
     "manifest.json"
@@ -295,12 +287,13 @@ gulp.task("gen-index-gallery-prod", async () => {
   const content = renderGalleryTemplate("index", {
     latestGalleryJS: latestManifest["entrypoint.js"],
   });
-  const minified = await minifyHtml(content);
+  const minified = minifyHtml(content);
 
   fs.outputFileSync(
     path.resolve(paths.gallery_output_root, "index.html"),
     minified
   );
+  done();
 });
 
 gulp.task("gen-index-hassio-dev", async () => {

build-scripts/gulp/gallery.js

@@ -6,21 +6,21 @@ const { marked } = require("marked");
 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");
-  const files = await glob(path.resolve(pageDir, "**/*"));
+  const files = glob.sync(path.resolve(pageDir, "**/*"));
 
   const galleryBuild = path.resolve(paths.gallery_dir, "build");
   fs.mkdirSync(galleryBuild, { recursive: true });
@@ -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) {

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,15 @@
 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",
@@ -41,6 +43,6 @@ gulp.task(
     env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
     "gen-index-hassio-prod",
     ...// Don't compress running tests
-    (env.isTestBuild() ? [] : ["compress-hassio"])
+    (env.isTest() ? [] : ["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";
 

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,14 @@ 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 paths = require("../paths");
 const {
   createAppConfig,
   createDemoConfig,
   createCastConfig,
   createHassioConfig,
   createGalleryConfig,
-} = require("../webpack.cjs");
+} = require("../webpack");
 
 const bothBuilds = (createConfigFunc, params) => [
   createConfigFunc({ ...params, latestBuild: true }),
@@ -105,8 +104,6 @@ gulp.task("webpack-prod-app", () =>
   prodBuild(
     bothBuilds(createAppConfig, {
       isProdBuild: true,
-      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
     })
   )
 );
@@ -164,8 +161,6 @@ gulp.task("webpack-prod-hassio", () =>
   prodBuild(
     bothBuilds(createHassioConfig, {
       isProdBuild: true,
-      isStatsBuild: env.isStatsBuild(),
-      isTestBuild: env.isTestBuild(),
     })
   )
 );

build-scripts/removedIcons.json

@@ -1 +1,30 @@
-[]
+[
+  {
+    "path": "M20,20H7A2,2 0 0,1 5,18V8.94L2.23,5.64C2.09,5.47 2,5.24 2,5A1,1 0 0,1 3,4H20A2,2 0 0,1 22,6V18A2,2 0 0,1 20,20M8.5,7A0.5,0.5 0 0,0 8,7.5V8.5A0.5,0.5 0 0,0 8.5,9H18.5A0.5,0.5 0 0,0 19,8.5V7.5A0.5,0.5 0 0,0 18.5,7H8.5M8.5,11A0.5,0.5 0 0,0 8,11.5V12.5A0.5,0.5 0 0,0 8.5,13H18.5A0.5,0.5 0 0,0 19,12.5V11.5A0.5,0.5 0 0,0 18.5,11H8.5M8.5,15A0.5,0.5 0 0,0 8,15.5V16.5A0.5,0.5 0 0,0 8.5,17H13.5A0.5,0.5 0 0,0 14,16.5V15.5A0.5,0.5 0 0,0 13.5,15H8.5Z",
+    "name": "android-messages"
+  },
+  {
+    "path": "M4,6H2V20A2,2 0 0,0 4,22H18V20H4V6M20,2H8A2,2 0 0,0 6,4V16A2,2 0 0,0 8,18H20A2,2 0 0,0 22,16V4A2,2 0 0,0 20,2M20,12L17.5,10.5L15,12V4H20V12Z",
+    "name": "book-variant-multiple"
+  },
+  {
+    "path": "M21,14H3V4H21M21,2H3C1.89,2 1,2.89 1,4V16A2,2 0 0,0 3,18H10L8,21V22H16V21L14,18H21A2,2 0 0,0 23,16V4C23,2.89 22.1,2 21,2Z",
+    "name": "desktop-mac"
+  },
+  {
+    "path": "M21,14V4H3V14H21M21,2A2,2 0 0,1 23,4V16A2,2 0 0,1 21,18H14L16,21V22H8V21L10,18H3C1.89,18 1,17.1 1,16V4C1,2.89 1.89,2 3,2H21M4,5H15V10H4V5M16,5H20V7H16V5M20,8V13H16V8H20M4,11H9V13H4V11M10,11H15V13H10V11Z",
+    "name": "desktop-mac-dashboard"
+  },
+  {
+    "path": "M22,24L16.75,19L17.38,21H4.5A2.5,2.5 0 0,1 2,18.5V3.5A2.5,2.5 0 0,1 4.5,1H19.5A2.5,2.5 0 0,1 22,3.5V24M12,6.8C9.32,6.8 7.44,7.95 7.44,7.95C8.47,7.03 10.27,6.5 10.27,6.5L10.1,6.33C8.41,6.36 6.88,7.53 6.88,7.53C5.16,11.12 5.27,14.22 5.27,14.22C6.67,16.03 8.75,15.9 8.75,15.9L9.46,15C8.21,14.73 7.42,13.62 7.42,13.62C7.42,13.62 9.3,14.9 12,14.9C14.7,14.9 16.58,13.62 16.58,13.62C16.58,13.62 15.79,14.73 14.54,15L15.25,15.9C15.25,15.9 17.33,16.03 18.73,14.22C18.73,14.22 18.84,11.12 17.12,7.53C17.12,7.53 15.59,6.36 13.9,6.33L13.73,6.5C13.73,6.5 15.53,7.03 16.56,7.95C16.56,7.95 14.68,6.8 12,6.8M9.93,10.59C10.58,10.59 11.11,11.16 11.1,11.86C11.1,12.55 10.58,13.13 9.93,13.13C9.29,13.13 8.77,12.55 8.77,11.86C8.77,11.16 9.28,10.59 9.93,10.59M14.1,10.59C14.75,10.59 15.27,11.16 15.27,11.86C15.27,12.55 14.75,13.13 14.1,13.13C13.46,13.13 12.94,12.55 12.94,11.86C12.94,11.16 13.45,10.59 14.1,10.59Z",
+    "name": "discord"
+  },
+  {
+    "path": "M8.06,7.78C7.5,7.78 7.17,7.73 7.08,7.64L6.66,13.73C7.19,14.05 7.88,14.3 8.72,14.5C9.56,14.71 10.78,14.77 12.38,14.67C13.97,14.58 15.63,14.23 17.34,13.64L16.55,4.22C15.67,5.09 14.38,5.91 12.66,6.66C11.13,7.31 9.81,7.69 8.72,7.78H8.06M7.97,5.34C7.28,5.94 7,6.34 7.13,6.56C7.22,6.78 7.7,6.84 8.58,6.75C9.67,6.66 10.91,6.31 12.28,5.72C13.22,5.31 14.03,4.88 14.72,4.41C15.41,3.94 15.88,3.55 16.13,3.23C16.38,2.92 16.47,2.7 16.41,2.58C16.34,2.42 16.03,2.34 15.47,2.34C14.34,2.34 12.94,2.7 11.25,3.42C9.81,4.05 8.72,4.69 7.97,5.34M17.34,2.2C17.41,2.33 17.44,2.47 17.44,2.63L18.61,17C18.61,18.73 18,20.09 16.83,21.07C15.64,22.05 14.03,22.55 12,22.55C10,22.55 8.4,22.04 7.2,21C6,20 5.39,18.64 5.39,16.92L6.09,6.47C6.09,6.22 6.2,5.94 6.42,5.63C6.64,5.31 6.84,5.06 7.03,4.88L7.36,4.59C8.33,3.78 9.5,3.08 10.88,2.5C11.81,2.08 12.73,1.77 13.62,1.57C14.5,1.37 15.3,1.3 16,1.38C16.71,1.46 17.16,1.73 17.34,2.2Z",
+    "name": "google-home"
+  },
+  {
+    "path": "M19.25,19H4.75V3H19.25M14,22H10V21H14M18,0H6A3,3 0 0,0 3,3V21A3,3 0 0,0 6,24H18A3,3 0 0,0 21,21V3A3,3 0 0,0 18,0Z",
+    "name": "tablet-android"
+  }
+]

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"];
 
@@ -39,18 +39,11 @@ const createRollupConfig = ({
   inputOptions: {
     input: entry,
     // Some entry points contain no JavaScript. This setting silences a warning about that.
-    // https://rollupjs.org/configuration-options/#preserveentrysignatures
+    // https://rollupjs.org/guide/en/#preserveentrysignatures
     preserveEntrySignatures: false,
     plugins: [
       ignore({
-        files: bundle
-          .emptyPackages({ latestBuild })
-          // TEMP HACK: Makes Rollup build work again
-          .concat(
-            require.resolve(
-              "@webcomponents/scoped-custom-element-registry/scoped-custom-element-registry.min"
-            )
-          ),
+        files: bundle.emptyPackages({ latestBuild }),
       }),
       resolve({
         extensions,
@@ -61,7 +54,7 @@ const createRollupConfig = ({
       commonjs(),
       json(),
       babel({
-        ...bundle.babelOptions({ latestBuild, isProdBuild }),
+        ...bundle.babelOptions({ latestBuild }),
         extensions,
         babelHelpers: isWDS ? "inline" : "bundled",
       }),
@@ -76,7 +69,7 @@ const createRollupConfig = ({
         }),
       !isWDS && worker(),
       !isWDS && dontHashPlugin({ dontHash }),
-      !isWDS && isProdBuild && terser(bundle.terserOptions({ latestBuild })),
+      !isWDS && isProdBuild && terser(bundle.terserOptions(latestBuild)),
       !isWDS &&
         isStatsBuild &&
         visualizer({
@@ -90,20 +83,20 @@ const createRollupConfig = ({
    * @type { import("rollup").OutputOptions }
    */
   outputOptions: {
-    // https://rollupjs.org/configuration-options/#output-dir
+    // https://rollupjs.org/guide/en/#outputdir
     dir: outputPath,
-    // https://rollupjs.org/configuration-options/#output-format
+    // https://rollupjs.org/guide/en/#outputformat
     format: latestBuild ? "es" : "systemjs",
-    // https://rollupjs.org/configuration-options/#output-externallivebindings
+    // https://rollupjs.org/guide/en/#outputexternallivebindings
     externalLiveBindings: false,
-    // https://rollupjs.org/configuration-options/#output-entryfilenames
-    // https://rollupjs.org/configuration-options/#output-chunkfilenames
-    // https://rollupjs.org/configuration-options/#output-assetfilenames
+    // https://rollupjs.org/guide/en/#outputentryfilenames
+    // https://rollupjs.org/guide/en/#outputchunkfilenames
+    // https://rollupjs.org/guide/en/#outputassetfilenames
     entryFileNames:
       isProdBuild && !isStatsBuild ? "[name]-[hash].js" : "[name].js",
     chunkFileNames: isProdBuild && !isStatsBuild ? "c.[hash].js" : "[name].js",
     assetFileNames: isProdBuild && !isStatsBuild ? "a.[hash].js" : "[name].js",
-    // https://rollupjs.org/configuration-options/#output-sourcemap
+    // https://rollupjs.org/guide/en/#outputsourcemap
     sourcemap: isProdBuild ? true : "inline",
   },
 });

build-scripts/webpack.js

@@ -2,10 +2,11 @@ const webpack = require("webpack");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
 const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
+const CompressionWebpackPlugin = require("compression-webpack-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;
@@ -22,7 +23,6 @@ class LogStartCompilePlugin {
 }
 
 const createWebpackConfig = ({
-  name,
   entry,
   outputPath,
   publicPath,
@@ -30,7 +30,6 @@ const createWebpackConfig = ({
   isProdBuild,
   latestBuild,
   isStatsBuild,
-  isTestBuild,
   isHassioBuild,
   dontHash,
 }) => {
@@ -39,16 +38,10 @@ const createWebpackConfig = ({
   }
   const ignorePackages = bundle.ignorePackages({ latestBuild });
   return {
-    name,
     mode: isProdBuild ? "production" : "development",
     target: ["web", latestBuild ? "es2017" : "es5"],
-    // For tests/CI, source maps are skipped to gain build speed
-    // For production, generate source maps for accurate stack traces without source code
-    // For development, generate "cheap" versions that can map to original line numbers
-    devtool: isTestBuild
-      ? false
-      : isProdBuild
-      ? "nosources-source-map"
+    devtool: isProdBuild
+      ? "cheap-module-source-map"
       : "eval-cheap-module-source-map",
     entry,
     node: false,
@@ -59,14 +52,11 @@ const createWebpackConfig = ({
           use: {
             loader: "babel-loader",
             options: {
-              ...bundle.babelOptions({ latestBuild, isProdBuild, isTestBuild }),
+              ...bundle.babelOptions({ latestBuild }),
               cacheDirectory: !isProdBuild,
               cacheCompression: false,
             },
           },
-          resolve: {
-            fullySpecified: false,
-          },
         },
         {
           test: /\.css$/,
@@ -79,13 +69,14 @@ const createWebpackConfig = ({
         new TerserPlugin({
           parallel: true,
           extractComments: true,
-          terserOptions: bundle.terserOptions({ latestBuild, isTestBuild }),
+          terserOptions: bundle.terserOptions(latestBuild),
         }),
       ],
       moduleIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
       chunkIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
     },
     plugins: [
+      new CompressionWebpackPlugin(),
       !isStatsBuild && new WebpackBar({ fancy: !isProdBuild }),
       new WebpackManifestPlugin({
         // Only include the JS of entrypoints
@@ -164,22 +155,6 @@ const createWebpackConfig = ({
       publicPath,
       // To silence warning in worker plugin
       globalObject: "self",
-      // Since production source maps don't include sources, we need to point to them elsewhere
-      // For dependencies, just provide the path (no source in browser)
-      // Otherwise, point to the raw code on GitHub for browser to load
-      devtoolModuleFilenameTemplate:
-        !isTestBuild && isProdBuild
-          ? (info) => {
-              const sourcePath = info.resourcePath.replace(/^\.\//, "");
-              if (
-                sourcePath.startsWith("node_modules") ||
-                sourcePath.startsWith("webpack")
-              ) {
-                return `no-source/${sourcePath}`;
-              }
-              return `${bundle.sourceMapURL()}/${sourcePath}`;
-            }
-          : undefined,
     },
     experiments: {
       topLevelAwait: true,
@@ -187,14 +162,9 @@ const createWebpackConfig = ({
   };
 };
 
-const createAppConfig = ({
-  isProdBuild,
-  latestBuild,
-  isStatsBuild,
-  isTestBuild,
-}) =>
+const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
   createWebpackConfig(
-    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild })
+    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild })
   );
 
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
@@ -205,20 +175,8 @@ const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
 const createCastConfig = ({ isProdBuild, latestBuild }) =>
   createWebpackConfig(bundle.config.cast({ isProdBuild, latestBuild }));
 
-const createHassioConfig = ({
-  isProdBuild,
-  latestBuild,
-  isStatsBuild,
-  isTestBuild,
-}) =>
-  createWebpackConfig(
-    bundle.config.hassio({
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-      isTestBuild,
-    })
-  );
+const createHassioConfig = ({ isProdBuild, latestBuild }) =>
+  createWebpackConfig(bundle.config.hassio({ isProdBuild, latestBuild }));
 
 const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
   createWebpackConfig(bundle.config.gallery({ isProdBuild, latestBuild }));

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/receiver/layout/hc-demo.ts

@@ -1,4 +1,4 @@
-import { html, nothing } from "lit";
+import { html, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { mockHistory } from "../../../../demo/src/stubs/history";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
@@ -18,9 +18,9 @@ class HcDemo extends HassElement {
 
   @state() private _lovelaceConfig?: LovelaceConfig;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._lovelaceConfig) {
-      return nothing;
+      return html``;
     }
     return html`
       <hc-lovelace

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/custom-cards/cast-demo-row.ts

@@ -1,5 +1,5 @@
 import { mdiTelevision } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
 import { CastManager } from "../../../src/cast/cast_manager";
 import { castSendShowDemo } from "../../../src/cast/receiver_messages";
@@ -20,12 +20,12 @@ class CastDemoRow extends LitElement implements LovelaceRow {
     // No config possible.
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (
       !this._castManager ||
       this._castManager.castState === "NO_DEVICES_AVAILABLE"
     ) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-svg-icon .path=${mdiTelevision}></ha-svg-icon>

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

@@ -1,5 +1,5 @@
 import "@material/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { until } from "lit/directives/until";
 import "../../../src/components/ha-card";
@@ -30,9 +30,9 @@ export class HADemoCard extends LitElement implements LovelaceCard {
 
   public setConfig(_config: LovelaceCardConfig) {}
 
-  protected render() {
+  protected render(): TemplateResult {
     if (this._hidden) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-card>

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/components/page-description.ts

@@ -1,4 +1,4 @@
-import { css, html, nothing } from "lit";
+import { html, css } from "lit";
 import { customElement, property } from "lit/decorators";
 import { until } from "lit/directives/until";
 import { HaMarkdown } from "../../../src/components/ha-markdown";
@@ -10,7 +10,7 @@ class PageDescription extends HaMarkdown {
 
   render() {
     if (!PAGES[this.page].description) {
-      return nothing;
+      return html``;
     }
 
     return html`

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

@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -127,9 +127,9 @@ export class DemoAutomationDescribeAction extends LitElement {
 
   @state() _action = initialAction;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-card header="Actions">

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

@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -53,9 +53,9 @@ export class DemoAutomationDescribeCondition extends LitElement {
 
   @state() _condition = initialCondition;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
 
     return html`

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

@@ -1,5 +1,5 @@
 import { dump } from "js-yaml";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/ha-yaml-editor";
@@ -64,9 +64,9 @@ export class DemoAutomationDescribeTrigger extends LitElement {
 
   @state() _trigger = initialTrigger;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
 
     return html`

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

@@ -1,6 +1,5 @@
 /* eslint-disable lit/no-template-arrow */
-
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/trace/hat-script-graph";
@@ -30,9 +29,9 @@ const traces: DemoTrace[] = [
 export class DemoAutomationTraceTimeline extends LitElement {
   @property({ attribute: false }) hass?: HomeAssistant;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
     return html`
       ${traces.map(

gallery/src/pages/automation/trace.ts

@@ -1,15 +1,14 @@
 /* eslint-disable lit/no-template-arrow */
-
-import { css, html, LitElement, nothing } from "lit";
-import { customElement, property, state } from "lit/decorators";
+import { html, css, LitElement, TemplateResult } from "lit";
 import "../../../../src/components/ha-card";
 import "../../../../src/components/trace/hat-script-graph";
 import "../../../../src/components/trace/hat-trace-timeline";
+import { customElement, property, state } from "lit/decorators";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
 import { HomeAssistant } from "../../../../src/types";
+import { DemoTrace } from "../../data/traces/types";
 import { basicTrace } from "../../data/traces/basic_trace";
 import { motionLightTrace } from "../../data/traces/motion-light-trace";
-import { DemoTrace } from "../../data/traces/types";
 
 const traces: DemoTrace[] = [basicTrace, motionLightTrace];
 
@@ -19,9 +18,9 @@ export class DemoAutomationTrace extends LitElement {
 
   @state() private _selected = {};
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
     return html`
       ${traces.map(

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

@@ -1,3 +0,0 @@
----
-title: Control Select
----

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

@@ -1,212 +0,0 @@
-import { mdiFanOff, mdiFanSpeed1, mdiFanSpeed2, mdiFanSpeed3 } from "@mdi/js";
-import { css, html, LitElement, TemplateResult } from "lit";
-import { customElement, state } from "lit/decorators";
-import { ifDefined } from "lit/directives/if-defined";
-import { repeat } from "lit/directives/repeat";
-import "../../../../src/components/ha-card";
-import "../../../../src/components/ha-control-select";
-import type { ControlSelectOption } from "../../../../src/components/ha-control-select";
-
-const fullOptions: ControlSelectOption[] = [
-  {
-    value: "off",
-    label: "Off",
-    path: mdiFanOff,
-  },
-  {
-    value: "low",
-    label: "Low",
-    path: mdiFanSpeed1,
-  },
-  {
-    value: "medium",
-    label: "Medium",
-    path: mdiFanSpeed2,
-  },
-  {
-    value: "high",
-    label: "High",
-    path: mdiFanSpeed3,
-  },
-];
-
-const iconOptions: ControlSelectOption[] = [
-  {
-    value: "off",
-    path: mdiFanOff,
-  },
-  {
-    value: "low",
-    path: mdiFanSpeed1,
-  },
-  {
-    value: "medium",
-    path: mdiFanSpeed2,
-  },
-  {
-    value: "high",
-    path: mdiFanSpeed3,
-  },
-];
-
-const labelOptions: ControlSelectOption[] = [
-  {
-    value: "off",
-    label: "Off",
-  },
-  {
-    value: "low",
-    label: "Low",
-  },
-  {
-    value: "medium",
-    label: "Medium",
-  },
-  {
-    value: "high",
-    label: "High",
-  },
-];
-
-const selects: {
-  id: string;
-  label: string;
-  class?: string;
-  options: ControlSelectOption[];
-  disabled?: boolean;
-}[] = [
-  {
-    id: "label",
-    label: "Select with labels",
-    options: labelOptions,
-  },
-  {
-    id: "icon",
-    label: "Select with icons",
-    options: iconOptions,
-  },
-  {
-    id: "icon",
-    label: "Disabled select",
-    options: iconOptions,
-    disabled: true,
-  },
-  {
-    id: "custom",
-    label: "Select and custom style",
-    class: "custom",
-    options: fullOptions,
-  },
-];
-
-@customElement("demo-components-ha-control-select")
-export class DemoHaControlSelect extends LitElement {
-  @state() private value?: string = "off";
-
-  handleValueChanged(e: CustomEvent) {
-    this.value = e.detail.value as string;
-  }
-
-  protected render(): TemplateResult {
-    return html`
-      <ha-card>
-        <div class="card-content">
-          <p><b>Slider values</b></p>
-          <table>
-            <tbody>
-              <tr>
-                <td>value</td>
-                <td>${this.value ?? "-"}</td>
-              </tr>
-            </tbody>
-          </table>
-        </div>
-      </ha-card>
-      ${repeat(selects, (select) => {
-        const { id, label, options, ...config } = select;
-        return html`
-          <ha-card>
-            <div class="card-content">
-              <label id=${id}>${label}</label>
-              <pre>Config: ${JSON.stringify(config)}</pre>
-              <ha-control-select
-                .value=${this.value}
-                .options=${options}
-                class=${ifDefined(config.class)}
-                @value-changed=${this.handleValueChanged}
-                aria-labelledby=${id}
-                disabled=${ifDefined(config.disabled)}
-              >
-              </ha-control-select>
-            </div>
-          </ha-card>
-        `;
-      })}
-      <ha-card>
-        <div class="card-content">
-          <p class="title"><b>Vertical</b></p>
-          <div class="vertical-selects">
-            ${repeat(selects, (select) => {
-              const { id, label, options, ...config } = select;
-              return html`
-                <ha-control-select
-                  .value=${this.value}
-                  .options=${options}
-                  vertical
-                  class=${ifDefined(config.class)}
-                  @value-changed=${this.handleValueChanged}
-                  aria-labelledby=${id}
-                  disabled=${ifDefined(config.disabled)}
-                >
-                </ha-control-select>
-              `;
-            })}
-          </div>
-        </div>
-      </ha-card>
-    `;
-  }
-
-  static get styles() {
-    return css`
-      ha-card {
-        max-width: 600px;
-        margin: 24px auto;
-      }
-      pre {
-        margin-top: 0;
-        margin-bottom: 8px;
-      }
-      p {
-        margin: 0;
-      }
-      label {
-        font-weight: 600;
-      }
-      .custom {
-        --mdc-icon-size: 24px;
-        --control-select-color: var(--state-fan-active-color);
-        --control-select-thickness: 100px;
-        --control-select-border-radius: 24px;
-      }
-      .vertical-selects {
-        height: 300px;
-        display: flex;
-        flex-direction: row;
-        justify-content: space-between;
-      }
-      p.title {
-        margin-bottom: 12px;
-      }
-      .vertical-selects > *:not(:last-child) {
-        margin-right: 4px;
-      }
-    `;
-  }
-}
-
-declare global {
-  interface HTMLElementTagNameMap {
-    "demo-components-ha-control-select": DemoHaControlSelect;
-  }
-}

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

@@ -2,7 +2,7 @@ import {
   HassEntity,
   HassEntityAttributeBase,
 } from "home-assistant-js-websocket";
-import { css, html, LitElement, nothing } from "lit";
+import { css, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { computeDomain } from "../../../../src/common/entity/compute_domain";
@@ -387,9 +387,9 @@ export class DemoEntityState extends LitElement {
     hass.updateTranslations("config", "en");
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
 
     return html`

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

@@ -1,22 +1,22 @@
-import { css, html, LitElement, nothing } from "lit";
+import { html, css, LitElement, TemplateResult } from "lit";
 import "../../../../src/components/ha-formfield";
 import "../../../../src/components/ha-switch";
 
-import { customElement, property, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
+import { customElement, property, state } from "lit/decorators";
 import { IntegrationManifest } from "../../../../src/data/integration";
 
-import { DeviceRegistryEntry } from "../../../../src/data/device_registry";
-import { EntityRegistryEntry } from "../../../../src/data/entity_registry";
 import { provideHass } from "../../../../src/fake_data/provide_hass";
+import { HomeAssistant } from "../../../../src/types";
+import "../../../../src/panels/config/integrations/ha-integration-card";
+import "../../../../src/panels/config/integrations/ha-ignored-config-entry-card";
 import "../../../../src/panels/config/integrations/ha-config-flow-card";
 import type {
   ConfigEntryExtended,
   DataEntryFlowProgressExtended,
 } from "../../../../src/panels/config/integrations/ha-config-integrations";
-import "../../../../src/panels/config/integrations/ha-ignored-config-entry-card";
-import "../../../../src/panels/config/integrations/ha-integration-card";
-import { HomeAssistant } from "../../../../src/types";
+import { DeviceRegistryEntry } from "../../../../src/data/device_registry";
+import { EntityRegistryEntry } from "../../../../src/data/entity_registry";
 
 const createConfigEntry = (
   title: string,
@@ -231,9 +231,9 @@ export class DemoIntegrationCard extends LitElement {
 
   @state() isCloud = false;
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.hass) {
-      return nothing;
+      return html``;
     }
     return html`
       <div class="container">

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

@@ -6,7 +6,6 @@ import {
   CSSResultGroup,
   html,
   LitElement,
-  nothing,
   PropertyValues,
   TemplateResult,
 } from "lit";
@@ -74,8 +73,8 @@ export class HassioAddonStore extends LitElement {
     }
   }
 
-  protected render() {
-    let repos: (TemplateResult | typeof nothing)[] = [];
+  protected render(): TemplateResult {
+    let repos: TemplateResult[] = [];
 
     if (this.supervisor.store.repositories) {
       repos = this.addonRepositories(
@@ -174,7 +173,7 @@ export class HassioAddonStore extends LitElement {
                 .supervisor=${this.supervisor}
               ></hassio-addon-repository>
             `
-          : nothing;
+          : html``;
       })
   );
 

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-network.ts

@@ -4,7 +4,7 @@ import {
   html,
   LitElement,
   PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -47,9 +47,9 @@ class HassioAddonNetwork extends LitElement {
     this._setNetworkConfig();
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._config) {
-      return nothing;
+      return html``;
     }
 
     const hasHiddenOptions = Object.keys(this._config).find(

hassio/src/backups/hassio-backups.ts

@@ -8,7 +8,7 @@ import {
   html,
   LitElement,
   PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { classMap } from "lit/directives/class-map";
@@ -160,9 +160,9 @@ export class HassioBackups extends LitElement {
     }))
   );
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.supervisor) {
-      return nothing;
+      return html``;
     }
     return html`
       <hass-tabs-subpage-data-table
@@ -248,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/components/supervisor-backup-content.ts

@@ -1,13 +1,6 @@
 import { mdiFolder, mdiHomeAssistant, mdiPuzzle } from "@mdi/js";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
-import {
-  css,
-  CSSResultGroup,
-  html,
-  LitElement,
-  TemplateResult,
-  nothing,
-} from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query } from "lit/decorators";
 import { atLeastVersion } from "../../../src/common/config/version";
 import { formatDate } from "../../../src/common/datetime/format_date";
@@ -18,9 +11,9 @@ import "../../../src/components/ha-formfield";
 import "../../../src/components/ha-radio";
 import type { HaRadio } from "../../../src/components/ha-radio";
 import {
-  HassioBackupDetail,
   HassioFullBackupCreateParams,
   HassioPartialBackupCreateParams,
+  HassioBackupDetail,
 } from "../../../src/data/hassio/backup";
 import { Supervisor } from "../../../src/data/supervisor/supervisor";
 import { PolymerChangedEvent } from "../../../src/polymer-types";
@@ -122,9 +115,9 @@ export class SupervisorBackupContent extends LitElement {
     this.supervisor?.localize(`backup.${key}`) ||
     this.localize!(`ui.panel.page-onboarding.restore.${key}`);
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.onboarding && !this.supervisor) {
-      return nothing;
+      return html``;
     }
     const foldersSection =
       this.backupType === "partial" ? this._getSection("folders") : undefined;

hassio/src/dashboard/hassio-update.ts

@@ -1,6 +1,6 @@
 import "@material/mwc-button";
 import { mdiHomeAssistant } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import "../../../src/components/buttons/ha-progress-button";
@@ -33,14 +33,14 @@ export class HassioUpdate extends LitElement {
       ).length
   );
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.supervisor) {
-      return nothing;
+      return html``;
     }
 
     const updatesAvailable = this._pendingUpdates(this.supervisor);
     if (!updatesAvailable) {
-      return nothing;
+      return html``;
     }
 
     return html`
@@ -80,9 +80,9 @@ export class HassioUpdate extends LitElement {
     name: string,
     key: string,
     object: HassioHomeAssistantInfo | HassioSupervisorInfo | HassioHassOSInfo
-  ) {
+  ): TemplateResult {
     if (!object.update_available) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-card outlined>

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

@@ -1,5 +1,5 @@
 import { mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
 import "../../../../src/components/ha-header-bar";
@@ -36,9 +36,9 @@ export class DialogHassioBackupUpload
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._dialogParams) {
-      return nothing;
+      return html``;
     }
 
     return html`

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

@@ -1,11 +1,9 @@
 import { ActionDetail } from "@material/mwc-list";
 import "@material/mwc-list/mwc-list-item";
 import { mdiClose, mdiDotsVertical } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
-import { atLeastVersion } from "../../../../src/common/config/version";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
 import { slugify } from "../../../../src/common/string/slugify";
 import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
@@ -13,12 +11,11 @@ import "../../../../src/components/ha-button-menu";
 import "../../../../src/components/ha-header-bar";
 import "../../../../src/components/ha-icon-button";
 import { getSignedPath } from "../../../../src/data/auth";
+import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
   fetchHassioBackupInfo,
   HassioBackupDetail,
-  removeBackup,
 } from "../../../../src/data/hassio/backup";
-import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
   showAlertDialog,
   showConfirmationDialog,
@@ -30,6 +27,8 @@ import { fileDownload } from "../../../../src/util/file_download";
 import "../../components/supervisor-backup-content";
 import type { SupervisorBackupContent } from "../../components/supervisor-backup-content";
 import { HassioBackupDialogParams } from "./show-dialog-hassio-backup";
+import { atLeastVersion } from "../../../../src/common/config/version";
+import { stopPropagation } from "../../../../src/common/dom/stop_propagation";
 
 @customElement("dialog-hassio-backup")
 class HassioBackupDialog
@@ -63,9 +62,9 @@ class HassioBackupDialog
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._dialogParams || !this._backup) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-dialog
@@ -287,15 +286,24 @@ class HassioBackupDialog
       return;
     }
 
-    try {
-      await removeBackup(this.hass!, this._backup!.slug);
-      if (this._dialogParams!.onDelete) {
-        this._dialogParams!.onDelete();
+    this.hass!.callApi(
+      atLeastVersion(this.hass!.config.version, 2021, 9) ? "DELETE" : "POST",
+      `hassio/${
+        atLeastVersion(this.hass!.config.version, 2021, 9)
+          ? `backups/${this._backup!.slug}`
+          : `snapshots/${this._backup!.slug}/remove`
+      }`
+    ).then(
+      () => {
+        if (this._dialogParams!.onDelete) {
+          this._dialogParams!.onDelete();
+        }
+        this.closeDialog();
+      },
+      (error) => {
+        this._error = error.body.message;
       }
-      this.closeDialog();
-    } catch (err: any) {
-      this._error = err.body.message;
-    }
+    );
   }
 
   private async _downloadClicked() {

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

@@ -1,15 +1,15 @@
 import "@material/mwc-button";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import "../../../../src/components/buttons/ha-progress-button";
 import "../../../../src/components/ha-alert";
+import "../../../../src/components/buttons/ha-progress-button";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
+import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import {
   createHassioFullBackup,
   createHassioPartialBackup,
 } from "../../../../src/data/hassio/backup";
-import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
 import { showAlertDialog } from "../../../../src/dialogs/generic/show-dialog-box";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
 import { HomeAssistant } from "../../../../src/types";
@@ -42,9 +42,9 @@ class HassioCreateBackupDialog extends LitElement {
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._dialogParams) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-dialog

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

@@ -1,5 +1,5 @@
 import "@material/mwc-list/mwc-list-item";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -55,9 +55,9 @@ class HassioDatadiskDialog extends LitElement {
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this.dialogParams) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-dialog

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

@@ -1,13 +1,13 @@
 import { mdiClose } from "@mdi/js";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
+import "../../../../src/components/search-input";
 import { stringCompare } from "../../../../src/common/string/compare";
 import "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-expansion-panel";
 import "../../../../src/components/ha-icon-button";
-import "../../../../src/components/search-input";
 import { HassioHardwareInfo } from "../../../../src/data/hassio/hardware";
 import { dump } from "../../../../src/resources/js-yaml-dump";
 import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
@@ -53,9 +53,9 @@ class HassioHardwareDialog extends LitElement {
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._dialogParams) {
-      return nothing;
+      return html``;
     }
 
     const devices = _filterDevices(

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

@@ -1,4 +1,4 @@
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { createCloseHeading } from "../../../../src/components/ha-dialog";
 import "../../../../src/components/ha-markdown";
@@ -27,9 +27,9 @@ class HassioMarkdownDialog extends LitElement {
     this._opened = false;
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._opened) {
-      return nothing;
+      return html``;
     }
     return html`
       <ha-dialog
@@ -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

@@ -5,7 +5,7 @@ import "@material/mwc-tab";
 import "@material/mwc-tab-bar";
 import { mdiClose } from "@mdi/js";
 import { PaperInputElement } from "@polymer/paper-input/paper-input";
-import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { cache } from "lit/directives/cache";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -83,9 +83,9 @@ export class DialogHassioNetwork
     fireEvent(this, "dialog-closed", { dialog: this.localName });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._params || !this._interface) {
-      return nothing;
+      return html``;
     }
 
     return html`
@@ -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

@@ -1,11 +1,11 @@
+import "@polymer/paper-tooltip/paper-tooltip";
 import "@material/mwc-button/mwc-button";
 import { mdiDelete, mdiDeleteOff } from "@mdi/js";
 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 { css, CSSResultGroup, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property, query, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
@@ -19,14 +19,14 @@ import {
   HassioAddonRepository,
 } from "../../../../src/data/hassio/addon";
 import { extractApiErrorMessage } from "../../../../src/data/hassio/common";
+import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
+import type { HomeAssistant } from "../../../../src/types";
+import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
 import {
   addStoreRepository,
   fetchStoreRepositories,
   removeStoreRepository,
 } from "../../../../src/data/supervisor/store";
-import { haStyle, haStyleDialog } from "../../../../src/resources/styles";
-import type { HomeAssistant } from "../../../../src/types";
-import { HassioRepositoryDialogParams } from "./show-dialog-repositories";
 
 @customElement("dialog-hassio-repositories")
 class HassioRepositoriesDialog extends LitElement {
@@ -82,9 +82,9 @@ class HassioRepositoriesDialog extends LitElement {
         .map((repo) => repo.slug)
   );
 
-  protected render() {
+  protected render(): TemplateResult {
     if (!this._dialogParams?.supervisor || this._repositories === undefined) {
-      return nothing;
+      return html``;
     }
     const repositories = this._filteredRepositories(this._repositories);
     const usedRepositories = this._filteredUsedRepositories(
@@ -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/hassio-my-redirect.ts

@@ -1,5 +1,5 @@
 import { sanitizeUrl } from "@braintree/sanitize-url";
-import { html, LitElement, TemplateResult, nothing } from "lit";
+import { html, LitElement, TemplateResult } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { navigate } from "../../src/common/navigate";
 import {
@@ -101,13 +101,13 @@ class HassioMyRedirect extends LitElement {
     navigate(url, { replace: true });
   }
 
-  protected render() {
+  protected render(): TemplateResult {
     if (this._error) {
       return html`<hass-error-screen
         .error=${this._error}
       ></hass-error-screen>`;
     }
-    return nothing;
+    return html``;
   }
 
   private _createRedirectUrl(redirect: Redirect): string {

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

@@ -5,7 +5,7 @@ import {
   html,
   LitElement,
   PropertyValues,
-  nothing,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import memoizeOne from "memoize-one";
@@ -116,12 +116,12 @@ class UpdateAvailableCard extends LitElement {
       storeAddons.find((addon) => addon.slug === slug)
   );
 
-  protected render() {
+  protected render(): TemplateResult {
     if (
       !this._updateType ||
       (this._updateType === "addon" && !this._addonInfo)
     ) {
-      return nothing;
+      return html``;
     }
 
     const changelog = changelogUrl(this._updateType, this._version_latest);

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,244 +19,242 @@
     "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.4.2",
-    "@codemirror/commands": "6.2.2",
-    "@codemirror/language": "6.6.0",
-    "@codemirror/legacy-modes": "6.3.2",
-    "@codemirror/search": "6.3.0",
-    "@codemirror/state": "6.2.0",
-    "@codemirror/view": "6.9.3",
-    "@egjs/hammerjs": "2.0.17",
-    "@formatjs/intl-datetimeformat": "6.5.1",
-    "@formatjs/intl-getcanonicallocales": "2.1.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.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",
-    "@lit-labs/motion": "1.0.3",
-    "@lit-labs/virtualizer": "1.0.1",
-    "@lrnwebcomponents/simple-tooltip": "4.1.0",
+    "@braintree/sanitize-url": "^6.0.2",
+    "@codemirror/autocomplete": "^6.4.2",
+    "@codemirror/commands": "^6.2.1",
+    "@codemirror/language": "^6.6.0",
+    "@codemirror/legacy-modes": "^6.3.1",
+    "@codemirror/search": "^6.2.3",
+    "@codemirror/state": "^6.2.0",
+    "@codemirror/view": "^6.9.1",
+    "@egjs/hammerjs": "^2.0.17",
+    "@formatjs/intl-datetimeformat": "^6.5.1",
+    "@formatjs/intl-getcanonicallocales": "^2.1.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",
     "@material/chips": "=14.0.0-canary.53b3cad2f.0",
     "@material/data-table": "=14.0.0-canary.53b3cad2f.0",
-    "@material/mwc-button": "0.27.0",
-    "@material/mwc-checkbox": "0.27.0",
-    "@material/mwc-circular-progress": "0.27.0",
-    "@material/mwc-dialog": "0.27.0",
-    "@material/mwc-drawer": "0.27.0",
-    "@material/mwc-fab": "0.27.0",
-    "@material/mwc-formfield": "0.27.0",
-    "@material/mwc-icon-button": "0.27.0",
-    "@material/mwc-linear-progress": "0.27.0",
-    "@material/mwc-list": "0.27.0",
-    "@material/mwc-menu": "0.27.0",
-    "@material/mwc-radio": "0.27.0",
-    "@material/mwc-ripple": "0.27.0",
-    "@material/mwc-select": "0.27.0",
-    "@material/mwc-slider": "0.27.0",
-    "@material/mwc-switch": "0.27.0",
-    "@material/mwc-tab": "0.27.0",
-    "@material/mwc-tab-bar": "0.27.0",
-    "@material/mwc-textarea": "0.27.0",
-    "@material/mwc-textfield": "0.27.0",
-    "@material/mwc-top-app-bar": "0.27.0",
-    "@material/mwc-top-app-bar-fixed": "0.27.0",
+    "@material/mwc-button": "^0.27.0",
+    "@material/mwc-checkbox": "^0.27.0",
+    "@material/mwc-circular-progress": "^0.27.0",
+    "@material/mwc-dialog": "^0.27.0",
+    "@material/mwc-drawer": "^0.27.0",
+    "@material/mwc-fab": "^0.27.0",
+    "@material/mwc-formfield": "^0.27.0",
+    "@material/mwc-icon-button": "^0.27.0",
+    "@material/mwc-linear-progress": "^0.27.0",
+    "@material/mwc-list": "^0.27.0",
+    "@material/mwc-menu": "^0.27.0",
+    "@material/mwc-radio": "^0.27.0",
+    "@material/mwc-ripple": "^0.27.0",
+    "@material/mwc-select": "^0.27.0",
+    "@material/mwc-slider": "^0.27.0",
+    "@material/mwc-switch": "^0.27.0",
+    "@material/mwc-tab": "^0.27.0",
+    "@material/mwc-tab-bar": "^0.27.0",
+    "@material/mwc-textarea": "^0.27.0",
+    "@material/mwc-textfield": "^0.27.0",
+    "@material/mwc-top-app-bar-fixed": "^0.27.0",
     "@material/top-app-bar": "=14.0.0-canary.53b3cad2f.0",
-    "@material/web": "=1.0.0-pre.4",
-    "@mdi/js": "7.2.96",
-    "@mdi/svg": "7.2.96",
-    "@polymer/app-layout": "3.1.0",
-    "@polymer/iron-flex-layout": "3.0.1",
-    "@polymer/iron-input": "3.0.1",
-    "@polymer/iron-resizable-behavior": "3.0.1",
-    "@polymer/paper-input": "3.2.1",
-    "@polymer/paper-item": "3.0.1",
-    "@polymer/paper-listbox": "3.0.1",
-    "@polymer/paper-slider": "3.0.1",
-    "@polymer/paper-tabs": "3.1.0",
-    "@polymer/paper-toast": "3.0.1",
-    "@polymer/polymer": "3.5.1",
+    "@material/web": "=1.0.0-pre.3",
+    "@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/paper-tooltip": "^3.0.1",
+    "@polymer/polymer": "3.4.1",
     "@thomasloven/round-slider": "0.6.0",
-    "@vaadin/combo-box": "23.3.9",
-    "@vaadin/vaadin-themable-mixin": "23.3.9",
-    "@vibrant/color": "3.2.1-alpha.1",
-    "@vibrant/core": "3.2.1-alpha.1",
-    "@vibrant/quantizer-mmcq": "3.2.1-alpha.1",
-    "@vue/web-component-wrapper": "1.3.0",
-    "@webcomponents/scoped-custom-element-registry": "0.0.8",
-    "@webcomponents/webcomponentsjs": "2.7.0",
-    "app-datepicker": "5.1.1",
-    "chart.js": "3.3.2",
-    "comlink": "4.4.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.0.2",
-    "hls.js": "1.3.5",
-    "home-assistant-js-websocket": "8.0.1",
-    "idb-keyval": "6.2.0",
-    "intl-messageformat": "10.3.3",
-    "js-yaml": "4.1.0",
-    "leaflet": "1.9.3",
-    "leaflet-draw": "1.0.4",
-    "lit": "2.7.0",
-    "marked": "4.3.0",
-    "memoize-one": "6.0.0",
+    "@vaadin/combo-box": "^23.3.7",
+    "@vaadin/vaadin-themable-mixin": "^23.3.7",
+    "@vibrant/color": "^3.2.1-alpha.1",
+    "@vibrant/core": "^3.2.1-alpha.1",
+    "@vibrant/quantizer-mmcq": "^3.2.1-alpha.1",
+    "@vue/web-component-wrapper": "^1.3.0",
+    "@webcomponents/scoped-custom-element-registry": "^0.0.8",
+    "@webcomponents/webcomponentsjs": "^2.7.0",
+    "app-datepicker": "^5.1.0",
+    "chart.js": "^3.3.2",
+    "comlink": "^4.4.1",
+    "compression-webpack-plugin": "^10.0.0",
+    "core-js": "^3.28.0",
+    "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.0.2",
+    "hls.js": "^1.3.3",
+    "home-assistant-js-websocket": "^8.0.1",
+    "idb-keyval": "^6.2.0",
+    "intl-messageformat": "^10.3.1",
+    "js-yaml": "^4.1.0",
+    "leaflet": "^1.9.3",
+    "leaflet-draw": "^1.0.4",
+    "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",
-    "punycode": "2.3.0",
-    "qr-scanner": "1.4.2",
-    "qrcode": "1.5.1",
-    "regenerator-runtime": "0.13.11",
-    "resize-observer-polyfill": "1.5.1",
-    "roboto-fontface": "0.10.0",
-    "rrule": "2.7.2",
-    "sortablejs": "1.15.0",
-    "superstruct": "1.0.3",
-    "tinykeys": "1.4.0",
-    "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",
-    "vue": "2.7.14",
-    "vue2-daterange-picker": "0.6.8",
-    "weekstart": "2.0.0",
-    "workbox-cacheable-response": "6.5.4",
-    "workbox-core": "6.5.4",
-    "workbox-expiration": "6.5.4",
-    "workbox-precaching": "6.5.4",
-    "workbox-routing": "6.5.4",
-    "workbox-strategies": "6.5.4",
-    "xss": "1.0.14"
+    "proxy-polyfill": "^0.3.2",
+    "punycode": "^2.3.0",
+    "qr-scanner": "^1.4.2",
+    "qrcode": "^1.5.1",
+    "regenerator-runtime": "^0.13.11",
+    "resize-observer-polyfill": "^1.5.1",
+    "roboto-fontface": "^0.10.0",
+    "rrule": "^2.7.2",
+    "sortablejs": "^1.15.0",
+    "superstruct": "^1.0.3",
+    "tinykeys": "^1.4.0",
+    "tsparticles-engine": "^2.9.3",
+    "tsparticles-preset-links": "^2.9.3",
+    "unfetch": "^5.0.0",
+    "vis-data": "^7.1.4",
+    "vis-network": "^9.1.4",
+    "vue": "^2.7.14",
+    "vue2-daterange-picker": "^0.6.8",
+    "weekstart": "^2.0.0",
+    "workbox-cacheable-response": "^6.5.4",
+    "workbox-core": "^6.5.4",
+    "workbox-expiration": "^6.5.4",
+    "workbox-precaching": "^6.5.4",
+    "workbox-routing": "^6.5.4",
+    "workbox-strategies": "^6.5.4",
+    "xss": "^1.0.14"
   },
   "devDependencies": {
-    "@babel/core": "7.21.3",
-    "@babel/plugin-external-helpers": "7.18.6",
-    "@babel/plugin-proposal-class-properties": "7.18.6",
-    "@babel/plugin-proposal-decorators": "7.21.0",
-    "@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/rest": "19.0.7",
-    "@open-wc/dev-server-hmr": "0.1.4",
-    "@rollup/plugin-babel": "6.0.3",
-    "@rollup/plugin-commonjs": "24.0.1",
-    "@rollup/plugin-json": "6.0.0",
-    "@rollup/plugin-node-resolve": "15.0.1",
-    "@rollup/plugin-replace": "5.0.2",
+    "@babel/core": "^7.21.0",
+    "@babel/plugin-external-helpers": "^7.18.6",
+    "@babel/plugin-proposal-class-properties": "^7.18.6",
+    "@babel/plugin-proposal-decorators": "^7.21.0",
+    "@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/rest": "^19.0.7",
+    "@open-wc/dev-server-hmr": "^0.1.3",
+    "@rollup/plugin-babel": "^5.2.1",
+    "@rollup/plugin-commonjs": "^11.1.0",
+    "@rollup/plugin-json": "^4.0.3",
+    "@rollup/plugin-node-resolve": "^7.1.3",
+    "@rollup/plugin-replace": "^2.3.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",
-    "@types/marked": "4.0.8",
-    "@types/mocha": "10.0.1",
-    "@types/qrcode": "1.5.0",
-    "@types/serve-handler": "6.1.1",
-    "@types/sortablejs": "1.15.1",
-    "@types/tar": "6.1.4",
-    "@types/webspeechapi": "0.0.29",
-    "@typescript-eslint/eslint-plugin": "5.57.0",
-    "@typescript-eslint/parser": "5.57.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.36.0",
-    "eslint-config-airbnb-base": "15.0.0",
-    "eslint-config-airbnb-typescript": "17.0.0",
-    "eslint-config-prettier": "8.8.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.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": "9.3.2",
-    "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.1.0",
-    "husky": "8.0.3",
-    "instant-mocha": "1.5.0",
-    "jszip": "3.10.1",
-    "lint-staged": "13.2.0",
-    "lit-analyzer": "1.2.1",
-    "lodash.template": "4.5.0",
-    "magic-string": "0.30.0",
-    "map-stream": "0.0.7",
-    "merge-stream": "2.0.0",
-    "mocha": "10.2.0",
-    "object-hash": "3.0.0",
-    "open": "8.4.2",
-    "pinst": "3.0.0",
-    "prettier": "2.8.7",
-    "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.3",
-    "source-map-url": "0.4.1",
-    "systemjs": "6.14.1",
-    "tar": "6.1.13",
-    "terser-webpack-plugin": "5.3.7",
-    "ts-lit-plugin": "1.2.1",
-    "typescript": "4.9.5",
-    "vinyl-buffer": "1.0.1",
-    "vinyl-source-stream": "2.0.0",
+    "@types/chromecast-caf-sender": "^1.0.5",
+    "@types/esprima": "^4",
+    "@types/glob": "^8",
+    "@types/js-yaml": "^4",
+    "@types/leaflet": "^1",
+    "@types/leaflet-draw": "^1",
+    "@types/marked": "^4",
+    "@types/mocha": "^10",
+    "@types/qrcode": "^1.5.0",
+    "@types/sortablejs": "^1",
+    "@types/tar": "^6",
+    "@types/webspeechapi": "^0.0.29",
+    "@typescript-eslint/eslint-plugin": "^5.53.0",
+    "@typescript-eslint/parser": "^5.53.0",
+    "@web/dev-server": "^0.1.35",
+    "@web/dev-server-rollup": "^0.2.11",
+    "babel-loader": "^9.1.2",
+    "chai": "^4.3.7",
+    "del": "^7.0.0",
+    "eslint": "^8.35.0",
+    "eslint-config-airbnb-base": "^15.0.0",
+    "eslint-config-airbnb-typescript": "^17.0.0",
+    "eslint-config-prettier": "^8.6.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.2",
+    "eslint-plugin-lit-a11y": "^2.3.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.0",
+    "glob": "^8.1.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": "^4.0.0",
+    "husky": "^8.0.3",
+    "instant-mocha": "^1.5.0",
+    "jszip": "^3.10.1",
+    "lint-staged": "^13.1.2",
+    "lit-analyzer": "^1.2.1",
+    "lodash.template": "^4.5.0",
+    "magic-string": "^0.30.0",
+    "map-stream": "^0.0.7",
+    "merge-stream": "^2.0.0",
+    "mocha": "^10.2.0",
+    "object-hash": "^3.0.0",
+    "open": "^8.4.1",
+    "pinst": "^3.0.0",
+    "prettier": "^2.8.4",
+    "require-dir": "^1.2.0",
+    "rollup": "^2.8.2",
+    "rollup-plugin-string": "^3.0.0",
+    "rollup-plugin-terser": "^5.3.0",
+    "rollup-plugin-visualizer": "^5.9.0",
+    "serve": "^11.3.2",
+    "sinon": "^15.0.1",
+    "source-map-url": "^0.4.1",
+    "systemjs": "^6.14.0",
+    "tar": "^6.1.13",
+    "terser-webpack-plugin": "^5.3.6",
+    "ts-lit-plugin": "^1.2.1",
+    "typescript": "^4.9.5",
+    "vinyl-buffer": "^1.0.1",
+    "vinyl-source-stream": "^2.0.0",
     "webpack": "=5.72.1",
-    "webpack-cli": "5.0.1",
-    "webpack-dev-server": "4.13.1",
-    "webpack-manifest-plugin": "5.0.0",
-    "webpackbar": "5.0.2",
-    "workbox-build": "6.5.4"
+    "webpack-cli": "^5.0.1",
+    "webpack-dev-server": "^4.11.1",
+    "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"
   },
-  "packageManager": "yarn@3.5.0"
+  "packageManager": "yarn@3.3.1"
 }

pyproject.toml

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

renovate.json

@@ -1,32 +0,0 @@
-{
-  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
-  "extends": [
-    ":ignoreModulesAndTests",
-    ":label(dependencies)",
-    ":pinVersions",
-    ":prConcurrentLimit10",
-    ":semanticCommitsDisabled",
-    "group:monorepos",
-    "group:recommended",
-    "npm:unpublishSafe"
-  ],
-  "enabledManagers": ["npm"],
-  "postUpdateOptions": ["yarnDedupeHighest"],
-  "lockFileMaintenance": {
-    "description": ["Run after patch releases but before next beta"],
-    "enabled": true,
-    "schedule": ["on the 19th day of the month"]
-  },
-  "packageRules": [
-    {
-      "description": ["MDC packages are pinned to the same version as MWC"],
-      "extends": ["monorepo:material-components-web"],
-      "enabled": false
-    },
-    {
-      "description": ["Vue is only used by date range which is only v2"],
-      "matchPackageNames": ["vue"],
-      "allowedVersions": "< 3"
-    }
-  ]
-}

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

@@ -5,8 +5,8 @@ import {
   CSSResultGroup,
   html,
   LitElement,
-  nothing,
   PropertyValues,
+  TemplateResult,
 } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import "../components/ha-alert";
@@ -134,11 +134,11 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
     }, 500);
   }
 
-  private _renderForm() {
+  private _renderForm(): TemplateResult {
     switch (this._state) {
       case "step":
         if (this._step == null) {
-          return nothing;
+          return html``;
         }
         return html`
           ${this._renderStep(this._step)}
@@ -176,11 +176,11 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
           </ha-alert>
         `;
       default:
-        return nothing;
+        return html``;
     }
   }
 
-  private _renderStep(step: DataEntryFlowStep) {
+  private _renderStep(step: DataEntryFlowStep): TemplateResult {
     switch (step.type) {
       case "abort":
         return html`
@@ -202,7 +202,7 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
                   .content=${this._computeStepDescription(step)}
                 ></ha-markdown>
               `
-            : nothing}
+            : html``}
           <ha-form
             .data=${this._stepData}
             .schema=${autocompleteLoginFields(step.data_schema)}
@@ -228,7 +228,7 @@ export class HaAuthFlow extends litLocalizeLiteMixin(LitElement) {
             : ""}
         `;
       default:
-        return nothing;
+        return html``;
     }
   }
 

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

@@ -1,9 +1,9 @@
-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 "../components/ha-icon-next";
-import "../components/ha-list-item";
 import { AuthProvider } from "../data/auth";
 import { litLocalizeLiteMixin } from "../mixins/lit-localize-lite-mixin";
 
@@ -20,21 +20,18 @@ export class HaPickAuthProvider extends litLocalizeLiteMixin(LitElement) {
   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>
+        `
+      )}
     `;
   }
 
@@ -43,12 +40,11 @@ export class HaPickAuthProvider extends litLocalizeLiteMixin(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

@@ -1,6 +1,7 @@
 /** Constants to be used in the frontend. */
 
 import {
+  mdiAccount,
   mdiAirFilter,
   mdiAlert,
   mdiAngleAcute,
@@ -47,6 +48,7 @@ import {
   mdiProgressClock,
   mdiRayVertex,
   mdiRemote,
+  mdiRobot,
   mdiRobotVacuum,
   mdiScriptText,
   mdiSineWave,
@@ -57,12 +59,15 @@ import {
   mdiThermostat,
   mdiTimerOutline,
   mdiTransmissionTower,
+  mdiVideo,
   mdiWater,
   mdiWaterPercent,
+  mdiWeatherCloudy,
   mdiWeatherPouring,
   mdiWeatherRainy,
   mdiWeatherWindy,
   mdiWeight,
+  mdiWhiteBalanceSunny,
   mdiWifi,
 } from "@mdi/js";
 
@@ -77,7 +82,9 @@ export const DEFAULT_DOMAIN_ICON = mdiBookmark;
 export const FIXED_DOMAIN_ICONS = {
   alert: mdiAlert,
   air_quality: mdiAirFilter,
+  automation: mdiRobot,
   calendar: mdiCalendar,
+  camera: mdiVideo,
   climate: mdiThermostat,
   configurator: mdiCog,
   conversation: mdiMicrophoneMessage,
@@ -98,6 +105,7 @@ export const FIXED_DOMAIN_ICONS = {
   notify: mdiCommentAlert,
   number: mdiRayVertex,
   persistent_notification: mdiBell,
+  person: mdiAccount,
   plant: mdiFlower,
   proximity: mdiAppleSafari,
   remote: mdiRemote,
@@ -108,10 +116,13 @@ export const FIXED_DOMAIN_ICONS = {
   sensor: mdiEye,
   siren: mdiBullhorn,
   simple_alarm: mdiBell,
+  sun: mdiWhiteBalanceSunny,
   text: mdiFormTextbox,
   timer: mdiTimerOutline,
   updater: mdiCloudUpload,
   vacuum: mdiRobotVacuum,
+  water_heater: mdiThermometer,
+  weather: mdiWeatherCloudy,
   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/entity/compute_attribute_display.ts

@@ -1,126 +1,30 @@
 import { HassEntity } from "home-assistant-js-websocket";
-import { html, TemplateResult } from "lit";
-import { until } from "lit/directives/until";
 import { EntityRegistryDisplayEntry } from "../../data/entity_registry";
 import { HomeAssistant } from "../../types";
-import checkValidDate from "../datetime/check_valid_date";
-import { formatDate } from "../datetime/format_date";
-import { formatDateTimeWithSeconds } from "../datetime/format_date_time";
-import { formatNumber } from "../number/format_number";
-import { capitalizeFirstLetter } from "../string/capitalize-first-letter";
-import { isDate } from "../string/is_date";
-import { isTimestamp } from "../string/is_timestamp";
 import { LocalizeFunc } from "../translations/localize";
 import { computeDomain } from "./compute_domain";
-import { FrontendLocaleData } from "../../data/translation";
-
-let jsYamlPromise: Promise<typeof import("../../resources/js-yaml-dump")>;
 
 export const computeAttributeValueDisplay = (
   localize: LocalizeFunc,
   stateObj: HassEntity,
-  locale: FrontendLocaleData,
   entities: HomeAssistant["entities"],
   attribute: string,
   value?: any
-): string | TemplateResult => {
+): string => {
+  const entityId = stateObj.entity_id;
   const attributeValue =
     value !== undefined ? value : stateObj.attributes[attribute];
-
-  // Null value, the state is unknown
-  if (attributeValue === null) {
-    return localize("state.default.unknown");
-  }
-
-  // Number value, return formatted number
-  if (typeof attributeValue === "number") {
-    return formatNumber(attributeValue, locale);
-  }
-
-  // Special handling in case this is a string with an known format
-  if (typeof attributeValue === "string") {
-    // URL handling
-    if (attributeValue.startsWith("http")) {
-      try {
-        // If invalid URL, exception will be raised
-        const url = new URL(attributeValue);
-        if (url.protocol === "http:" || url.protocol === "https:")
-          return html`<a target="_blank" rel="noreferrer" href=${value}
-            >${attributeValue}</a
-          >`;
-      } catch (_) {
-        // Nothing to do here
-      }
-    }
-
-    // Date handling
-    if (isDate(attributeValue, true)) {
-      // Timestamp handling
-      if (isTimestamp(attributeValue)) {
-        const date = new Date(attributeValue);
-        if (checkValidDate(date)) {
-          return formatDateTimeWithSeconds(date, locale);
-        }
-      }
-
-      // Value was not a timestamp, so only do date formatting
-      const date = new Date(attributeValue);
-      if (checkValidDate(date)) {
-        return formatDate(date, locale);
-      }
-    }
-  }
-
-  // Values are objects, render object
-  if (
-    (Array.isArray(attributeValue) &&
-      attributeValue.some((val) => val instanceof Object)) ||
-    (!Array.isArray(attributeValue) && attributeValue instanceof Object)
-  ) {
-    if (!jsYamlPromise) {
-      jsYamlPromise = import("../../resources/js-yaml-dump");
-    }
-    const yaml = jsYamlPromise.then((jsYaml) => jsYaml.dump(attributeValue));
-    return html`<pre>${until(yaml, "")}</pre>`;
-  }
-
-  // If this is an array, try to determine the display value for each item
-  if (Array.isArray(attributeValue)) {
-    return attributeValue
-      .map((item) =>
-        computeAttributeValueDisplay(
-          localize,
-          stateObj,
-          locale,
-          entities,
-          attribute,
-          item
-        )
-      )
-      .join(", ");
-  }
-
-  // We've explored all known value handling, so now we'll try to find a
-  // translation for the value.
-  const entityId = stateObj.entity_id;
   const domain = computeDomain(entityId);
-  const deviceClass = stateObj.attributes.device_class;
-  const registryEntry = entities[entityId] as
-    | EntityRegistryDisplayEntry
-    | undefined;
-  const translationKey = registryEntry?.translation_key;
+  const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
+  const translationKey = entity?.translation_key;
 
   return (
     (translationKey &&
       localize(
-        `component.${registryEntry.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.state.${attributeValue}`
-      )) ||
-    (deviceClass &&
-      localize(
-        `component.${domain}.entity_component.${deviceClass}.state_attributes.${attribute}.state.${attributeValue}`
+        `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.state.${attributeValue}`
       )) ||
     localize(
-      `component.${domain}.entity_component._.state_attributes.${attribute}.state.${attributeValue}`
+      `component.${domain}.state_attributes._.${attribute}.state.${attributeValue}`
     ) ||
     attributeValue
   );
@@ -133,7 +37,6 @@ export const computeAttributeNameDisplay = (
   attribute: string
 ): string => {
   const entityId = stateObj.entity_id;
-  const deviceClass = stateObj.attributes.device_class;
   const domain = computeDomain(entityId);
   const entity = entities[entityId] as EntityRegistryDisplayEntry | undefined;
   const translationKey = entity?.translation_key;
@@ -143,20 +46,7 @@ export const computeAttributeNameDisplay = (
       localize(
         `component.${entity.platform}.entity.${domain}.${translationKey}.state_attributes.${attribute}.name`
       )) ||
-    (deviceClass &&
-      localize(
-        `component.${domain}.entity_component.${deviceClass}.state_attributes.${attribute}.name`
-      )) ||
-    localize(
-      `component.${domain}.entity_component._.state_attributes.${attribute}.name`
-    ) ||
-    capitalizeFirstLetter(
-      attribute
-        .replace(/_/g, " ")
-        .replace(/\bid\b/g, "ID")
-        .replace(/\bip\b/g, "IP")
-        .replace(/\bmac\b/g, "MAC")
-        .replace(/\bgps\b/g, "GPS")
-    )
+    localize(`component.${domain}.state_attributes._.${attribute}.name`) ||
+    attribute
   );
 };