Fix background overflow on outlined text field

.browserslistrc

@@ -1,25 +1,28 @@
 [modern]
-# Modern builds target recent browsers supporting the latest features to minimize transpilation, polyfills, etc.
+# Support for dynamic import is the main litmus test for serving modern builds.
-# It is served to browsers meeting the following requirements:
+# Although officially a ES2020 feature, browsers implemented it early, so this
-# - released in the last year + current alpha/beta versions
+# enables all of ES2017 and some features in ES2018.
-# - Firefox extended support release (ESR)
+supports es6-module-dynamic-import
-# - with global utilization at or above 0.5%
+
-# - must support dynamic import of ES modules
+# Exclude Safari 11-12 because of a bug in tagged template literals
-# - exclude browsers no longer being maintained
+# https://bugs.webkit.org/show_bug.cgi?id=190756
-# - exclude KaiOS, QQ, and UC browsers due to lack of sufficient feature support data
+# Note: Dropping version 11 also enables several more ES2018 features
-unreleased versions
+not Safari < 13
-last 1 year
+not iOS < 13
-Firefox ESR
+
->= 0.5% and supports es6-module-dynamic-import
+# Exclude KaiOS, QQ, and UC browsers due to lack of sufficient feature support data
-not dead
+# Babel ignores these automatically, but we need here for Webpack to output ESM with dynamic imports
 not KaiOS > 0
 not QQAndroid > 0
 not UCAndroid > 0
 
+# Exclude unsupported browsers
+not dead
+
 [legacy]
 # Legacy builds are served when modern requirements are not met and support browsers:
 # - released in the last 7 years + current alpha/beta versionss
-# - with global utilization at or above 0.05%
+# - with global utilization above 0.05%
 # The lattermost query ensures that support for popular old browsers is not dropped too early
 # (e.g. IE 11, Android 4.4, or Samsung 4).
 #
@@ -33,10 +36,4 @@ not UCAndroid > 0
 # As of May 2023, only web sockets must be added to the query.
 unreleased versions
 last 7 years
->= 0.05% and supports websockets
+> 0.05% and supports websockets
-
-[legacy-sw]
-# Same as legacy plus supports service workers
-unreleased versions
-last 7 years
->= 0.05% and supports websockets and supports serviceworkers

.devcontainer/devcontainer.json

@@ -8,7 +8,6 @@
   "postCreateCommand": "sudo apt update && sudo apt upgrade -y && sudo apt install -y libpcap-dev",
   "postStartCommand": "script/bootstrap",
   "containerEnv": {
-    "DEV_CONTAINER": "1",
     "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
   },
   "customizations": {

.eslintrc.json

@@ -115,7 +115,6 @@
       }
     ],
     "unused-imports/no-unused-imports": "error",
-    "lit/attribute-names": "warn",
     "lit/attribute-value-entities": "off",
     "lit/no-template-map": "off",
     "lit/no-native-attributes": "warn",
@@ -124,9 +123,8 @@
     "lit-a11y/no-autofocus": "off",
     "lit-a11y/alt-text": "warn",
     "lit-a11y/anchor-is-valid": "warn",
-    "lit-a11y/role-has-required-aria-attrs": "warn",
+    "lit-a11y/role-has-required-aria-attrs": "warn"
-    "@typescript-eslint/consistent-type-imports": "error",
-    "@typescript-eslint/no-import-type-side-effects": "error"
   },
-  "plugins": ["unused-imports"]
+  "plugins": ["disable", "unused-imports"],
+  "processor": "disable/disable"
 }

.github/workflows/cast_deployment.yaml

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

.github/workflows/ci.yaml

@@ -24,9 +24,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -37,7 +37,7 @@ jobs:
       - name: Build resources
         run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
       - name: Setup lint cache
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: |
             node_modules/.cache/prettier
@@ -58,9 +58,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -76,9 +76,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -89,7 +89,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: frontend-bundle-stats
           path: build/stats/*.json
@@ -100,9 +100,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Check out files from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.2
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -113,7 +113,7 @@ jobs:
         env:
           IS_TEST: "true"
       - name: Upload bundle stats
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.1
         with:
           name: supervisor-bundle-stats
           path: build/stats/*.json

.github/workflows/codeql-analysis.yml

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

.github/workflows/demo_deployment.yaml

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

.github/workflows/design_deployment.yaml

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

.github/workflows/design_preview.yaml

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

.github/workflows/nightly.yaml

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

.github/workflows/relative-ci.yaml

@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Send bundle stats and build information to RelativeCI
-        uses: relative-ci/agent-action@v2.1.12
+        uses: relative-ci/agent-action@v2.1.10
         with:
           key: ${{ secrets[format('RELATIVE_CI_KEY_{0}_{1}', matrix.bundle, matrix.build)] }}
           token: ${{ github.token }}

.github/workflows/release.yaml

@@ -23,7 +23,7 @@ jobs:
       contents: write # Required to upload release assets
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.2
 
       - name: Verify version
         uses: home-assistant/actions/helpers/verify-version@master
@@ -34,7 +34,7 @@ jobs:
           python-version: ${{ env.PYTHON_VERSION }}
 
       - name: Setup Node
-        uses: actions/setup-node@v4.1.0
+        uses: actions/setup-node@v4.0.2
         with:
           node-version-file: ".nvmrc"
           cache: yarn
@@ -55,7 +55,7 @@ jobs:
           script/release
 
       - name: Upload release assets
-        uses: softprops/action-gh-release@v2.0.8
+        uses: softprops/action-gh-release@v2.0.4
         with:
           files: |
             dist/*.whl
@@ -74,9 +74,9 @@ jobs:
           echo "home-assistant-frontend==$version" > ./requirements.txt
 
       - name: Build wheels
-        uses: home-assistant/wheels@2024.07.1
+        uses: home-assistant/wheels@2024.01.0
         with:
-          abi: cp312
+          abi: cp311
           tag: musllinux_1_2
           arch: amd64
           wheels-key: ${{ secrets.WHEELS_KEY }}

.github/workflows/translations.yaml

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

.husky/pre-commit

@@ -1 +1,4 @@
+#!/usr/bin/env sh
+. "$(dirname -- "$0")/_/husky.sh"
+
 yarn run lint-staged --relative --shell "/bin/bash"

.yarn/patches/sortablejs-npm-1.15.2-73347ae85a.patch

@@ -1,7 +1,16 @@
 diff --git a/modular/sortable.core.esm.js b/modular/sortable.core.esm.js
-index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa526090a00 100644
+index 93ba17509e2e8583ab241fea6845fbe714c584a2..de0651ddb5dced30d36f7d764da0dd0b441f523f 100644
 --- a/modular/sortable.core.esm.js
 +++ b/modular/sortable.core.esm.js
+@@ -1461,7 +1461,7 @@ Sortable.prototype = /** @lends Sortable.prototype */{
+           }
+           target = parent; // store last element
+         }
+-        /* jshint boss:true */ while (parent = parent.parentNode);
++        /* jshint boss:true */ while (parent = parent.parentNode || parent.getRootNode().host);
+       }
+       _unhideGhostForTarget();
+     }
 @@ -1781,11 +1781,16 @@ Sortable.prototype = /** @lends Sortable.prototype */{
          }
          if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, !!target) !== false) {
@@ -24,7 +33,7 @@ index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa5
            }
            parentEl = el; // actualization
  
-@@ -1802,7 +1807,12 @@ Sortable.prototype = /** @lends Sortable.prototype */{
+@@ -1802,7 +1807,13 @@ Sortable.prototype = /** @lends Sortable.prototype */{
          targetRect = getRect(target);
          if (_onMove(rootEl, el, dragEl, dragRect, target, targetRect, evt, false) !== false) {
            capture();
@@ -35,10 +44,11 @@ index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa5
 +          catch(err) {
 +            return completed(false);
 +          }
++          
            parentEl = el; // actualization
  
            changed();
-@@ -1849,10 +1859,15 @@ Sortable.prototype = /** @lends Sortable.prototype */{
+@@ -1849,12 +1860,17 @@ Sortable.prototype = /** @lends Sortable.prototype */{
            _silent = true;
            setTimeout(_unsilent, 30);
            capture();
@@ -46,6 +56,8 @@ index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa5
 -            el.appendChild(dragEl);
 -          } else {
 -            target.parentNode.insertBefore(dragEl, after ? nextSibling : target);
+-          }
+ 
 +          try {
 +            if (after && !nextSibling) {
 +              el.appendChild(dragEl);
@@ -55,6 +67,7 @@ index 8b5e49b011713c8859c669069fbe85ce53974e1d..6a0afc92787157b8a31c38cc5f67dfa5
 +          }
 +          catch(err) {
 +            return completed(false);
-           }
++          }
- 
            // Undo chrome's scroll adjustment (has no effect on other browsers)
+           if (scrolledPastTop) {
+             scrollBy(scrolledPastTop, 0, scrollBefore - scrolledPastTop.scrollTop);

.yarn/patches/workbox-build-npm-7.1.1-a854f3faae.patch

@@ -1,55 +0,0 @@
-diff --git a/build/inject-manifest.js b/build/inject-manifest.js
-index 60e3d2bb51c11a19fbbedbad65e101082ec41c36..fed6026630f43f86e25446383982cf6fb694313b 100644
---- a/build/inject-manifest.js
-+++ b/build/inject-manifest.js
-@@ -104,7 +104,7 @@ async function injectManifest(config) {
-             replaceString: manifestString,
-             searchString: options.injectionPoint,
-         });
--        filesToWrite[options.swDest] = source;
-+        filesToWrite[options.swDest] = source.replace(url, encodeURI(upath_1.default.basename(destPath)));
-         filesToWrite[destPath] = map;
-     }
-     else {
-diff --git a/build/lib/translate-url-to-sourcemap-paths.js b/build/lib/translate-url-to-sourcemap-paths.js
-index 3220c5474eeac6e8a56ca9b2ac2bd9be48529e43..5f003879a904d4840529a42dd056d288fd213771 100644
---- a/build/lib/translate-url-to-sourcemap-paths.js
-+++ b/build/lib/translate-url-to-sourcemap-paths.js
-@@ -22,7 +22,7 @@ function translateURLToSourcemapPaths(url, swSrc, swDest) {
-         const possibleSrcPath = upath_1.default.resolve(upath_1.default.dirname(swSrc), url);
-         if (fs_extra_1.default.existsSync(possibleSrcPath)) {
-             srcPath = possibleSrcPath;
--            destPath = upath_1.default.resolve(upath_1.default.dirname(swDest), url);
-+            destPath = `${swDest}.map`;
-         }
-         else {
-             warning = `${errors_1.errors['cant-find-sourcemap']} ${possibleSrcPath}`;
-diff --git a/src/inject-manifest.ts b/src/inject-manifest.ts
-index 8795ddcaa77aea7b0356417e4bc4b19e2b3f860c..fcdc68342d9ac53936c9ed40a9ccfc2f5070cad3 100644
---- a/src/inject-manifest.ts
-+++ b/src/inject-manifest.ts
-@@ -129,7 +129,10 @@ export async function injectManifest(
-       searchString: options.injectionPoint!,
-     });
- 
--    filesToWrite[options.swDest] = source;
-+    filesToWrite[options.swDest] = source.replace(
-+      url!,
-+      encodeURI(upath.basename(destPath)),
-+    );
-     filesToWrite[destPath] = map;
-   } else {
-     // If there's no sourcemap associated with swSrc, a simple string
-diff --git a/src/lib/translate-url-to-sourcemap-paths.ts b/src/lib/translate-url-to-sourcemap-paths.ts
-index 072eac40d4ef5d095a01cb7f7e392a9e034853bd..f0bbe69e88ef3a415de18a7e9cb264daea273d71 100644
---- a/src/lib/translate-url-to-sourcemap-paths.ts
-+++ b/src/lib/translate-url-to-sourcemap-paths.ts
-@@ -28,7 +28,7 @@ export function translateURLToSourcemapPaths(
-     const possibleSrcPath = upath.resolve(upath.dirname(swSrc), url);
-     if (fse.existsSync(possibleSrcPath)) {
-       srcPath = possibleSrcPath;
--      destPath = upath.resolve(upath.dirname(swDest), url);
-+      destPath = `${swDest}.map`;
-     } else {
-       warning = `${errors['cant-find-sourcemap']} ${possibleSrcPath}`;
-     }

.yarnrc.yml

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

README.md

@@ -27,5 +27,3 @@ A complete guide can be found at the following [link](https://www.home-assistant
 Home Assistant is open-source and Apache 2 licensed. Feel free to browse the repository, learn and reuse parts in your own projects.
 
 We use [BrowserStack](https://www.browserstack.com) to test Home Assistant on a large variety of devices.
-
-[![Home Assistant - A project from the Open Home Foundation](https://www.openhomefoundation.org/badges/home-assistant.png)](https://www.openhomefoundation.org/)

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

@@ -1,56 +1,7 @@
 import defineProvider from "@babel/helper-define-polyfill-provider";
-import { join } from "node:path";
-import paths from "../paths.cjs";
-
-const POLYFILL_DIR = join(paths.polymer_dir, "src/resources/polyfills");
 
 // List of polyfill keys with supported browser targets for the functionality
 const PolyfillSupport = {
-  // Note states and shadowRoot properties should be supported.
-  "element-internals": {
-    android: 90,
-    chrome: 90,
-    edge: 90,
-    firefox: 126,
-    ios: 17.4,
-    opera: 76,
-    opera_mobile: 64,
-    safari: 17.4,
-    samsung: 15.0,
-  },
-  "element-append": {
-    android: 54,
-    chrome: 54,
-    edge: 17,
-    firefox: 49,
-    ios: 10.0,
-    opera: 41,
-    opera_mobile: 41,
-    safari: 10.0,
-    samsung: 6.0,
-  },
-  "element-getattributenames": {
-    android: 61,
-    chrome: 61,
-    edge: 18,
-    firefox: 45,
-    ios: 10.3,
-    opera: 48,
-    opera_mobile: 45,
-    safari: 10.1,
-    samsung: 8.0,
-  },
-  "element-toggleattribute": {
-    android: 69,
-    chrome: 69,
-    edge: 18,
-    firefox: 63,
-    ios: 12.0,
-    opera: 56,
-    opera_mobile: 48,
-    safari: 12.0,
-    samsung: 10.0,
-  },
   fetch: {
     android: 42,
     chrome: 42,
@@ -62,31 +13,6 @@ const PolyfillSupport = {
     safari: 10.1,
     samsung: 4.0,
   },
-  "intl-getcanonicallocales": {
-    android: 54,
-    chrome: 54,
-    edge: 16,
-    firefox: 48,
-    ios: 10.3,
-    opera: 41,
-    opera_mobile: 41,
-    safari: 10.1,
-    samsung: 6.0,
-  },
-  "intl-locale": {
-    android: 74,
-    chrome: 74,
-    edge: 79,
-    firefox: 75,
-    ios: 14.0,
-    opera: 62,
-    opera_mobile: 53,
-    safari: 14.0,
-    samsung: 11.0,
-  },
-  "intl-other": {
-    // Not specified (i.e. always try polyfill) since compatibility depends on supported locales
-  },
   proxy: {
     android: 49,
     chrome: 49,
@@ -98,67 +24,17 @@ const PolyfillSupport = {
     safari: 10.0,
     samsung: 5.0,
   },
-  "resize-observer": {
-    android: 64,
-    chrome: 64,
-    edge: 79,
-    firefox: 69,
-    ios: 13.4,
-    opera: 51,
-    opera_mobile: 47,
-    safari: 13.1,
-    samsung: 9.0,
-  },
 };
 
 // Map of global variables and/or instance and static properties to the
 // corresponding polyfill key and actual module to import
 const polyfillMap = {
   global: {
-    fetch: { key: "fetch", module: "unfetch/polyfill" },
     Proxy: { key: "proxy", module: "proxy-polyfill" },
-    ResizeObserver: {
+    fetch: { key: "fetch", module: "unfetch/polyfill" },
-      key: "resize-observer",
-      module: join(POLYFILL_DIR, "resize-observer.ts"),
-    },
-  },
-  instance: {
-    attachInternals: {
-      key: "element-internals",
-      module: "element-internals-polyfill",
-    },
-    ...Object.fromEntries(
-      ["append", "getAttributeNames", "toggleAttribute"].map((prop) => {
-        const key = `element-${prop.toLowerCase()}`;
-        return [prop, { key, module: join(POLYFILL_DIR, `${key}.ts`) }];
-      })
-    ),
-  },
-  static: {
-    Intl: {
-      getCanonicalLocales: {
-        key: "intl-getcanonicallocales",
-        module: join(POLYFILL_DIR, "intl-polyfill.ts"),
-      },
-      Locale: {
-        key: "intl-locale",
-        module: join(POLYFILL_DIR, "intl-polyfill.ts"),
-      },
-      ...Object.fromEntries(
-        [
-          "DateTimeFormat",
-          "DisplayNames",
-          "ListFormat",
-          "NumberFormat",
-          "PluralRules",
-          "RelativeTimeFormat",
-        ].map((obj) => [
-          obj,
-          { key: "intl-other", module: join(POLYFILL_DIR, "intl-polyfill.ts") },
-        ])
-      ),
-    },
   },
+  instance: {},
+  static: {},
 };
 
 // Create plugin using the same factory as for CoreJS
@@ -166,16 +42,14 @@ export default defineProvider(
   ({ createMetaResolver, debug, shouldInjectPolyfill }) => {
     const resolvePolyfill = createMetaResolver(polyfillMap);
     return {
-      name: "custom-polyfill",
+      name: "HA Custom",
       polyfills: PolyfillSupport,
       usageGlobal(meta, utils) {
         const polyfill = resolvePolyfill(meta);
         if (polyfill && shouldInjectPolyfill(polyfill.desc.key)) {
           debug(polyfill.desc.key);
           utils.injectGlobalImport(polyfill.desc.module);
-          return true;
         }
-        return false;
       },
     };
   }

build-scripts/bundle.cjs

@@ -3,8 +3,6 @@ const env = require("./env.cjs");
 const paths = require("./paths.cjs");
 const { dependencies } = require("../package.json");
 
-const BABEL_PLUGINS = path.join(__dirname, "babel-plugins");
-
 // 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 = () => {
@@ -47,7 +45,7 @@ module.exports.emptyPackages = ({ latestBuild, isHassioBuild }) =>
 
 module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
   __DEV__: !isProdBuild,
-  __BUILD__: JSON.stringify(latestBuild ? "modern" : "legacy"),
+  __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
   __VERSION__: JSON.stringify(env.version()),
   __DEMO__: false,
   __SUPERVISOR__: false,
@@ -79,12 +77,7 @@ module.exports.terserOptions = ({ latestBuild, isTestBuild }) => ({
   sourceMap: !isTestBuild,
 });
 
-module.exports.babelOptions = ({
+module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({
-  latestBuild,
-  isProdBuild,
-  isTestBuild,
-  sw,
-}) => ({
   babelrc: false,
   compact: false,
   assumptions: {
@@ -92,13 +85,13 @@ module.exports.babelOptions = ({
     setPublicClassFields: true,
     setSpreadProperties: true,
   },
-  browserslistEnv: latestBuild ? "modern" : `legacy${sw ? "-sw" : ""}`,
+  browserslistEnv: latestBuild ? "modern" : "legacy",
   presets: [
     [
       "@babel/preset-env",
       {
-        useBuiltIns: "usage",
+        useBuiltIns: latestBuild ? false : "usage",
-        corejs: dependencies["core-js"],
+        corejs: latestBuild ? false : dependencies["core-js"],
         bugfixes: true,
         shippedProposals: true,
       },
@@ -107,12 +100,22 @@ module.exports.babelOptions = ({
   ],
   plugins: [
     [
-      path.join(BABEL_PLUGINS, "inline-constants-plugin.cjs"),
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/inline-constants-plugin.cjs"
+      ),
       {
         modules: ["@mdi/js"],
         ignoreModuleNotFound: true,
       },
     ],
+    [
+      path.resolve(
+        paths.polymer_dir,
+        "build-scripts/babel-plugins/custom-polyfill-plugin.js"
+      ),
+      { method: "usage-global" },
+    ],
     // Minify template literals for production
     isProdBuild && [
       "template-html-minifier",
@@ -140,14 +143,8 @@ module.exports.babelOptions = ({
       "@babel/plugin-transform-runtime",
       { version: dependencies["@babel/runtime"] },
     ],
-    // Transpile decorators (still in TC39 process)
+    // Support  some proposals still in TC39 process
-    // Modern browsers support class fields and private methods, but transform is required with the older decorator version dictated by Lit
+    ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
-    [
-      "@babel/plugin-proposal-decorators",
-      { version: "2018-09", decoratorsBeforeExport: true },
-    ],
-    "@babel/plugin-transform-class-properties",
-    "@babel/plugin-transform-private-methods",
   ].filter(Boolean),
   exclude: [
     // \\ for Windows, / for Mac OS and Linux
@@ -156,27 +153,6 @@ module.exports.babelOptions = ({
   ],
   sourceMaps: !isTestBuild,
   overrides: [
-    {
-      // Add plugin to inject various polyfills, excluding the polyfills
-      // themselves to prevent self-injection.
-      plugins: [
-        [
-          path.join(BABEL_PLUGINS, "custom-polyfill-plugin.js"),
-          { method: "usage-global" },
-        ],
-      ],
-      exclude: [
-        path.join(paths.polymer_dir, "src/resources/polyfills"),
-        ...[
-          "@formatjs/(?:ecma402-abstract|intl-\\w+)",
-          "@lit-labs/virtualizer/polyfills",
-          "@webcomponents/scoped-custom-element-registry",
-          "element-internals-polyfill",
-          "proxy-polyfill",
-          "unfetch",
-        ].map((p) => new RegExp(`/node_modules/${p}/`)),
-      ],
-    },
     {
       // Use unambiguous for dependencies so that require() is correctly injected into CommonJS files
       // Exclusions are needed in some cases where ES modules have no static imports or exports, such as polyfills
@@ -226,13 +202,7 @@ module.exports.config = {
     return {
       name: "frontend" + nameSuffix(latestBuild),
       entry: {
-        "service-worker":
+        service_worker: "./src/entrypoints/service_worker.ts",
-          !env.useRollup() && !latestBuild
-            ? {
-                import: "./src/entrypoints/service-worker.ts",
-                layer: "sw",
-              }
-            : "./src/entrypoints/service-worker.ts",
         app: "./src/entrypoints/app.ts",
         authorize: "./src/entrypoints/authorize.ts",
         onboarding: "./src/entrypoints/onboarding.ts",

build-scripts/env.cjs

@@ -32,7 +32,4 @@ module.exports = {
     }
     return version[1];
   },
-  isDevContainer() {
-    return process.env.DEV_CONTAINER === "1";
-  },
 };

build-scripts/gulp/compress.js

@@ -1,68 +1,19 @@
 // Tasks to compress
 
-import { constants } from "node:zlib";
 import gulp from "gulp";
-import brotli from "gulp-brotli";
 import zopfli from "gulp-zopfli-green";
 import paths from "../paths.cjs";
 
-const filesGlob = "*.{js,json,css,svg,xml}";
-const brotliOptions = {
-  skipLarger: true,
-  params: {
-    [constants.BROTLI_PARAM_QUALITY]: constants.BROTLI_MAX_QUALITY,
-  },
-};
 const zopfliOptions = { threshold: 150 };
 
-const compressDistBrotli = (rootDir, modernDir, compressServiceWorker = true) =>
+const compressDist = (rootDir) =>
   gulp
-    .src(
+    .src([
-      [
+      `${rootDir}/**/*.{js,json,css,svg,xml}`,
-        `${modernDir}/**/${filesGlob}`,
+      `${rootDir}/{authorize,onboarding}.html`,
-        compressServiceWorker ? `${rootDir}/sw-modern.js` : undefined,
+    ])
-      ].filter(Boolean),
-      {
-        base: rootDir,
-      }
-    )
-    .pipe(brotli(brotliOptions))
-    .pipe(gulp.dest(rootDir));
-
-const compressDistZopfli = (rootDir, modernDir, compressModern = false) =>
-  gulp
-    .src(
-      [
-        `${rootDir}/**/${filesGlob}`,
-        compressModern ? undefined : `!${modernDir}/**/${filesGlob}`,
-        `!${rootDir}/{sw-modern,service_worker}.js`,
-        `${rootDir}/{authorize,onboarding}.html`,
-      ].filter(Boolean),
-      { base: rootDir }
-    )
     .pipe(zopfli(zopfliOptions))
     .pipe(gulp.dest(rootDir));
 
-const compressAppBrotli = () =>
+gulp.task("compress-app", () => compressDist(paths.app_output_root));
-  compressDistBrotli(paths.app_output_root, paths.app_output_latest);
+gulp.task("compress-hassio", () => compressDist(paths.hassio_output_root));
-const compressHassioBrotli = () =>
-  compressDistBrotli(
-    paths.hassio_output_root,
-    paths.hassio_output_latest,
-    false
-  );
-
-const compressAppZopfli = () =>
-  compressDistZopfli(paths.app_output_root, paths.app_output_latest);
-const compressHassioZopfli = () =>
-  compressDistZopfli(
-    paths.hassio_output_root,
-    paths.hassio_output_latest,
-    true
-  );
-
-gulp.task("compress-app", gulp.parallel(compressAppBrotli, compressAppZopfli));
-gulp.task(
-  "compress-hassio",
-  gulp.parallel(compressHassioBrotli, compressHassioZopfli)
-);

build-scripts/gulp/download-translations.js

@@ -13,7 +13,7 @@ const srcMeta = "src/translations/translationMetadata.json";
 const encoding = "utf8";
 
 function hasHtml(data) {
-  return /<\S*>/i.test(data);
+  return /<[a-z][\s\S]*>/i.test(data);
 }
 
 function recursiveCheckHasHtml(file, data, errors, recKey) {

build-scripts/gulp/entry-html.js

@@ -1,76 +1,28 @@
 // Tasks to generate entry HTML
 
-import {
-  applyVersionsToRegexes,
-  compileRegex,
-  getPreUserAgentRegexes,
-} from "browserslist-useragent-regexp";
 import fs from "fs-extra";
 import gulp from "gulp";
 import { minify } from "html-minifier-terser";
 import template from "lodash.template";
-import { dirname, extname, resolve } from "node:path";
+import path from "path";
 import { htmlMinifierOptions, terserOptions } from "../bundle.cjs";
 import env from "../env.cjs";
 import paths from "../paths.cjs";
 
-// macOS companion app has no way to obtain the Safari version used by WKWebView,
-// and it is not in the default user agent string. So we add an additional regex
-// to serve modern based on a minimum macOS version. We take the minimum Safari
-// major version from browserslist and manually map that to a supported macOS
-// version. Note this assumes the user has kept Safari updated.
-const HA_MACOS_REGEX =
-  /Home Assistant\/[\d.]+ \(.+; macOS (\d+)\.(\d+)(?:\.(\d+))?\)/;
-const SAFARI_TO_MACOS = {
-  15: [10, 15, 0],
-  16: [11, 0, 0],
-  17: [12, 0, 0],
-  18: [13, 0, 0],
-};
-
-const getCommonTemplateVars = () => {
-  const browserRegexes = getPreUserAgentRegexes({
-    env: "modern",
-    allowHigherVersions: true,
-    mobileToDesktop: true,
-    throwOnMissing: true,
-  });
-  const minSafariVersion = browserRegexes.find(
-    (regex) => regex.family === "safari"
-  )?.matchedVersions[0][0];
-  const minMacOSVersion = SAFARI_TO_MACOS[minSafariVersion];
-  if (!minMacOSVersion) {
-    throw Error(
-      `Could not find minimum MacOS version for Safari ${minSafariVersion}.`
-    );
-  }
-  const haMacOSRegex = applyVersionsToRegexes(
-    [
-      {
-        family: "ha_macos",
-        regex: HA_MACOS_REGEX,
-        matchedVersions: [minMacOSVersion],
-        requestVersions: [minMacOSVersion],
-      },
-    ],
-    { ignorePatch: true, allowHigherVersions: true }
-  );
-  return {
-    useRollup: env.useRollup(),
-    useWDS: env.useWDS(),
-    modernRegex: compileRegex(browserRegexes.concat(haMacOSRegex)).toString(),
-  };
-};
-
 const renderTemplate = (templateFile, data = {}) => {
   const compiled = template(
     fs.readFileSync(templateFile, { encoding: "utf-8" })
   );
   return compiled({
     ...data,
+    useRollup: env.useRollup(),
+    useWDS: env.useWDS(),
     // Resolve any child/nested templates relative to the parent and pass the same data
     renderTemplate: (childTemplate) =>
-      renderTemplate(resolve(dirname(templateFile), childTemplate), data),
+      renderTemplate(
+        path.resolve(path.dirname(templateFile), childTemplate),
+        data
+      ),
   });
 };
 
@@ -104,12 +56,10 @@ const genPagesDevTask =
     publicRoot = ""
   ) =>
   async () => {
-    const commonVars = getCommonTemplateVars();
     for (const [page, entries] of Object.entries(pageEntries)) {
       const content = renderTemplate(
-        resolve(inputRoot, inputSub, `${page}.template`),
+        path.resolve(inputRoot, inputSub, `${page}.template`),
         {
-          ...commonVars,
           latestEntryJS: entries.map((entry) =>
             useWDS
               ? `http://localhost:8000/src/entrypoints/${entry}.ts`
@@ -124,7 +74,7 @@ const genPagesDevTask =
           es5CustomPanelJS: `${publicRoot}/frontend_es5/custom-panel.js`,
         }
       );
-      fs.outputFileSync(resolve(outputRoot, page), content);
+      fs.outputFileSync(path.resolve(outputRoot, page), content);
     }
   };
 
@@ -141,18 +91,16 @@ const genPagesProdTask =
   ) =>
   async () => {
     const latestManifest = fs.readJsonSync(
-      resolve(outputLatest, "manifest.json")
+      path.resolve(outputLatest, "manifest.json")
     );
     const es5Manifest = outputES5
-      ? fs.readJsonSync(resolve(outputES5, "manifest.json"))
+      ? fs.readJsonSync(path.resolve(outputES5, "manifest.json"))
       : {};
-    const commonVars = getCommonTemplateVars();
     const minifiedHTML = [];
     for (const [page, entries] of Object.entries(pageEntries)) {
       const content = renderTemplate(
-        resolve(inputRoot, inputSub, `${page}.template`),
+        path.resolve(inputRoot, inputSub, `${page}.template`),
         {
-          ...commonVars,
           latestEntryJS: entries.map((entry) => latestManifest[`${entry}.js`]),
           es5EntryJS: entries.map((entry) => es5Manifest[`${entry}.js`]),
           latestCustomPanelJS: latestManifest["custom-panel.js"],
@@ -160,8 +108,8 @@ const genPagesProdTask =
         }
       );
       minifiedHTML.push(
-        minifyHtml(content, extname(page)).then((minified) =>
+        minifyHtml(content, path.extname(page)).then((minified) =>
-          fs.outputFileSync(resolve(outputRoot, page), minified)
+          fs.outputFileSync(path.resolve(outputRoot, page), minified)
         )
       );
     }

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

@@ -9,7 +9,7 @@ import gulp from "gulp";
 import jszip from "jszip";
 import path from "path";
 import process from "process";
-import { extract } from "tar";
+import tar from "tar";
 
 const MAX_AGE = 24; // hours
 const OWNER = "home-assistant";
@@ -156,7 +156,7 @@ gulp.task("fetch-nightly-translations", async function () {
   console.log("Unpacking downloaded translations...");
   const zip = await jszip.loadAsync(downloadResponse.data);
   await deleteCurrent;
-  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(extract());
+  const extractStream = zip.file(/.*/)[0].nodeStream().pipe(tar.extract());
   await new Promise((resolve, reject) => {
     extractStream.on("close", resolve).on("error", reject);
   });

build-scripts/gulp/gather-static.js

@@ -60,12 +60,6 @@ function copyPolyfills(staticDir) {
     npmPath("@webcomponents/webcomponentsjs/webcomponents-bundle.js.map"),
     staticPath("polyfills/")
   );
-
-  // dialog-polyfill css
-  copyFileDir(
-    npmPath("dialog-polyfill/dialog-polyfill.css"),
-    staticPath("polyfills/")
-  );
 }
 
 function copyLoaderJS(staticDir) {

build-scripts/gulp/locale-data.js

@@ -24,11 +24,8 @@ const convertToJSON = async (
 ) => {
   let localeData;
   try {
-    // use "pt" for "pt-BR", because "pt-BR" is unsupported by @formatjs
-    const language = lang === "pt-BR" ? "pt" : lang;
-
     localeData = await readFile(
-      join(formatjsDir, pkg, subDir, `${language}.js`),
+      join(formatjsDir, pkg, subDir, `${lang}.js`),
       "utf-8"
     );
   } catch (e) {

build-scripts/gulp/service-worker.js

@@ -1,19 +1,20 @@
-// Generate service workers
+// Generate service worker.
+// Based on manifest, create a file with the content as service_worker.js
 
-import { deleteAsync } from "del";
+import fs from "fs-extra";
 import gulp from "gulp";
-import { mkdir, readFile, symlink, writeFile } from "node:fs/promises";
+import path from "path";
-import { basename, join, relative } from "node:path";
+import sourceMapUrl from "source-map-url";
-import { injectManifest } from "workbox-build";
+import workboxBuild from "workbox-build";
 import paths from "../paths.cjs";
 
-const SW_MAP = {
+const swDest = path.resolve(paths.app_output_root, "service_worker.js");
-  [paths.app_output_latest]: "modern",
-  [paths.app_output_es5]: "legacy",
-};
 
-const SW_DEV =
+const writeSW = (content) => fs.outputFileSync(swDest, content.trim() + "\n");
-  `
+
+gulp.task("gen-service-worker-app-dev", (done) => {
+  writeSW(
+    `
 console.debug('Service worker disabled in development');
 
 self.addEventListener('install', (event) => {
@@ -21,67 +22,72 @@ self.addEventListener('install', (event) => {
   // removing any prod service worker the dev might have running
   self.skipWaiting();
 });
-  `.trim() + "\n";
+  `
-
-gulp.task("gen-service-worker-app-dev", async () => {
-  await mkdir(paths.app_output_root, { recursive: true });
-  await Promise.all(
-    Object.values(SW_MAP).map((build) =>
-      writeFile(join(paths.app_output_root, `sw-${build}.js`), SW_DEV, {
-        encoding: "utf-8",
-      })
-    )
   );
+  done();
 });
 
-gulp.task("gen-service-worker-app-prod", () =>
+gulp.task("gen-service-worker-app-prod", async () => {
-  Promise.all(
+  // Read bundled source file
-    Object.entries(SW_MAP).map(async ([outPath, build]) => {
+  const bundleManifestLatest = fs.readJsonSync(
-      const manifest = JSON.parse(
+    path.resolve(paths.app_output_latest, "manifest.json")
-        await readFile(join(outPath, "manifest.json"), "utf-8")
+  );
-      );
+  let serviceWorkerContent = fs.readFileSync(
-      const swSrc = join(paths.app_output_root, manifest["service-worker.js"]);
+    paths.app_output_root + bundleManifestLatest["service_worker.js"],
-      const swDest = join(paths.app_output_root, `sw-${build}.js`);
+    "utf-8"
-      const buildDir = relative(paths.app_output_root, outPath);
+  );
-      const { warnings } = await injectManifest({
+
-        swSrc,
+  // Delete old file from frontend_latest so manifest won't pick it up
-        swDest,
+  fs.removeSync(
-        injectionPoint: "__WB_MANIFEST__",
+    paths.app_output_root + bundleManifestLatest["service_worker.js"]
-        // Files that mach this pattern will be considered unique and skip revision check
+  );
-        // ignore JS files + translation files
+  fs.removeSync(
-        dontCacheBustURLsMatching: new RegExp(
+    paths.app_output_root + bundleManifestLatest["service_worker.js.map"]
-          `(?:${buildDir}/.+|static/translations/.+)`
+  );
-        ),
+
-        globDirectory: paths.app_output_root,
+  // Remove ES5
-        globPatterns: [
+  const bundleManifestES5 = fs.readJsonSync(
-          `${buildDir}/*.js`,
+    path.resolve(paths.app_output_es5, "manifest.json")
-          // Cache all English translations because we catch them as fallback
+  );
-          // Using pattern to match hash instead of * to avoid caching en-GB
+  fs.removeSync(paths.app_output_root + bundleManifestES5["service_worker.js"]);
-          // 'v' added as valid hash letter because in dev we hash with 'dev'
+  fs.removeSync(
-          "static/translations/**/en-+([a-fv0-9]).json",
+    paths.app_output_root + bundleManifestES5["service_worker.js.map"]
-          // Icon shown on splash screen
+  );
-          "static/icons/favicon-192x192.png",
+
-          "static/icons/favicon.ico",
+  const workboxManifest = await workboxBuild.getManifest({
-          // Common fonts
+    // Files that mach this pattern will be considered unique and skip revision check
-          "static/fonts/roboto/Roboto-Light.woff2",
+    // ignore JS files + translation files
-          "static/fonts/roboto/Roboto-Medium.woff2",
+    dontCacheBustURLsMatching: /(frontend_latest\/.+|static\/translations\/.+)/,
-          "static/fonts/roboto/Roboto-Regular.woff2",
+
-          "static/fonts/roboto/Roboto-Bold.woff2",
+    globDirectory: paths.app_output_root,
-        ],
+    globPatterns: [
-        globIgnores: [`${buildDir}/service-worker*`],
+      "frontend_latest/*.js",
-      });
+      // Cache all English translations because we catch them as fallback
-      if (warnings.length > 0) {
+      // Using pattern to match hash instead of * to avoid caching en-GB
-        console.warn(
+      // 'v' added as valid hash letter because in dev we hash with 'dev'
-          `Problems while injecting ${build} service worker:\n`,
+      "static/translations/**/en-+([a-fv0-9]).json",
-          warnings.join("\n")
+      // Icon shown on splash screen
-        );
+      "static/icons/favicon-192x192.png",
-      }
+      "static/icons/favicon.ico",
-      await deleteAsync(`${swSrc}?(.map)`);
+      // Common fonts
-      // Needed to install new SW from a cached HTML
+      "static/fonts/roboto/Roboto-Light.woff2",
-      if (build === "modern") {
+      "static/fonts/roboto/Roboto-Medium.woff2",
-        const swOld = join(paths.app_output_root, "service_worker.js");
+      "static/fonts/roboto/Roboto-Regular.woff2",
-        await symlink(basename(swDest), swOld);
+      "static/fonts/roboto/Roboto-Bold.woff2",
-      }
+    ],
-    })
+  });
-  )
+
-);
+  for (const warning of workboxManifest.warnings) {
+    console.warn(warning);
+  }
+
+  // remove source map and add WB manifest
+  serviceWorkerContent = sourceMapUrl.removeFrom(serviceWorkerContent);
+  serviceWorkerContent = serviceWorkerContent.replace(
+    "WB_MANIFEST",
+    JSON.stringify(workboxManifest.manifestEntries)
+  );
+
+  // Write new file to root
+  fs.writeFileSync(swDest, serviceWorkerContent);
+});

build-scripts/gulp/translations.js

@@ -1,112 +1,92 @@
-/* eslint-disable max-classes-per-file */
+import { createHash } from "crypto";
-
+import { deleteSync } from "del";
-import { deleteAsync } from "del";
+import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs";
-import { glob } from "glob";
+import { writeFile } from "node:fs/promises";
 import gulp from "gulp";
+import flatmap from "gulp-flatmap";
+import transform from "gulp-json-transform";
+import merge from "gulp-merge-json";
 import rename from "gulp-rename";
-import merge from "lodash.merge";
+import path from "path";
-import { createHash } from "node:crypto";
+import vinylBuffer from "vinyl-buffer";
-import { mkdir, readFile } from "node:fs/promises";
+import source from "vinyl-source-stream";
-import { basename, join } from "node:path";
-import { PassThrough, Transform } from "node:stream";
-import { finished } from "node:stream/promises";
 import env from "../env.cjs";
 import paths from "../paths.cjs";
+import { mapFiles } from "../util.cjs";
 import "./fetch-nightly-translations.js";
 
 const inFrontendDir = "translations/frontend";
 const inBackendDir = "translations/backend";
 const workDir = "build/translations";
-const outDir = join(workDir, "output");
+const fullDir = workDir + "/full";
-const EN_SRC = join(paths.translations_src, "en.json");
+const coreDir = workDir + "/core";
-const TEST_LOCALE = "en-x-test";
+const outDir = workDir + "/output";
-
 let mergeBackend = false;
 
 gulp.task(
   "translations-enable-merge-backend",
-  gulp.parallel(async () => {
+  gulp.parallel((done) => {
     mergeBackend = true;
+    done();
   }, "allow-setup-fetch-nightly-translations")
 );
 
-// Transform stream to apply a function on Vinyl JSON files (buffer mode only).
+// Panel translations which should be split from the core translations.
-// The provided function can either return a new object, or an array of
+const TRANSLATION_FRAGMENTS = Object.keys(
-// [object, subdirectory] pairs for fragmentizing the JSON.
+  JSON.parse(
-class CustomJSON extends Transform {
+    readFileSync(
-  constructor(func, reviver = null) {
+      path.resolve(paths.polymer_dir, "src/translations/en.json"),
-    super({ objectMode: true });
+      "utf-8"
-    this._func = func;
+    )
-    this._reviver = reviver;
+  ).ui.panel
-  }
+);
 
-  async _transform(file, _, callback) {
+function recursiveFlatten(prefix, data) {
-    try {
+  let output = {};
-      let obj = JSON.parse(file.contents.toString(), this._reviver);
+  Object.keys(data).forEach((key) => {
-      if (this._func) obj = this._func(obj, file.path);
+    if (typeof data[key] === "object") {
-      for (const [outObj, dir] of Array.isArray(obj) ? obj : [[obj, ""]]) {
+      output = {
-        const outFile = file.clone({ contents: false });
+        ...output,
-        outFile.contents = Buffer.from(JSON.stringify(outObj));
+        ...recursiveFlatten(prefix + key + ".", data[key]),
-        outFile.dirname += `/${dir}`;
+      };
-        this.push(outFile);
-      }
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Transform stream to merge Vinyl JSON files (buffer mode only).
-class MergeJSON extends Transform {
-  _objects = [];
-
-  constructor(stem, startObj = {}, reviver = null) {
-    super({ objectMode: true, allowHalfOpen: false });
-    this._stem = stem;
-    this._startObj = structuredClone(startObj);
-    this._reviver = reviver;
-  }
-
-  async _transform(file, _, callback) {
-    try {
-      this._objects.push(JSON.parse(file.contents.toString(), this._reviver));
-      if (!this._outFile) this._outFile = file.clone({ contents: false });
-      callback(null);
-    } catch (err) {
-      callback(err);
-    }
-  }
-
-  async _flush(callback) {
-    try {
-      const mergedObj = merge(this._startObj, ...this._objects);
-      this._outFile.contents = Buffer.from(JSON.stringify(mergedObj));
-      this._outFile.stem = this._stem;
-      callback(null, this._outFile);
-    } catch (err) {
-      callback(err);
-    }
-  }
-}
-
-// Utility to flatten object keys to single level using separator
-const flatten = (data, prefix = "", sep = ".") => {
-  const output = {};
-  for (const [key, value] of Object.entries(data)) {
-    if (typeof value === "object") {
-      Object.assign(output, flatten(value, prefix + key + sep, sep));
     } else {
-      output[prefix + key] = value;
+      output[prefix + key] = data[key];
     }
-  }
+  });
   return output;
-};
+}
 
-// Filter functions that can be passed directly to JSON.parse()
+function flatten(data) {
-const emptyReviver = (_key, value) => value || undefined;
+  return recursiveFlatten("", data);
-const testReviver = (_key, value) =>
+}
-  value && typeof value === "string" ? "TRANSLATED" : value;
+
+function emptyFilter(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = emptyFilter(data[key]);
+      } else {
+        newData[key] = data[key];
+      }
+    }
+  });
+  return newData;
+}
+
+function recursiveEmpty(data) {
+  const newData = {};
+  Object.keys(data).forEach((key) => {
+    if (data[key]) {
+      if (typeof data[key] === "object") {
+        newData[key] = recursiveEmpty(data[key]);
+      } else {
+        newData[key] = "TRANSLATED";
+      }
+    }
+  });
+  return newData;
+}
 
 /**
  * Replace Lokalise key placeholders with their actual values.
@@ -115,44 +95,60 @@ const testReviver = (_key, value) =>
  * be included in src/translations/en.json, but still be usable while
  * developing locally.
  *
- * @link https://docs.lokalise.com/en/articles/1400528-key-referencing
+ * @link https://docs.lokalise.co/article/KO5SZWLLsy-key-referencing
  */
-const KEY_REFERENCE = /\[%key:([^%]+)%\]/;
+const re_key_reference = /\[%key:([^%]+)%\]/;
-const lokaliseTransform = (data, path, original = data) => {
+function lokaliseTransform(data, original, file) {
   const output = {};
-  for (const [key, value] of Object.entries(data)) {
+  Object.entries(data).forEach(([key, value]) => {
-    if (typeof value === "object") {
+    if (value instanceof Object) {
-      output[key] = lokaliseTransform(value, path, original);
+      output[key] = lokaliseTransform(value, original, file);
     } else {
-      output[key] = value.replace(KEY_REFERENCE, (_match, lokalise_key) => {
+      output[key] = value.replace(re_key_reference, (_match, lokalise_key) => {
         const replace = lokalise_key.split("::").reduce((tr, k) => {
           if (!tr) {
-            throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+            throw Error(
+              `Invalid key placeholder ${lokalise_key} in ${file.path}`
+            );
           }
           return tr[k];
         }, original);
         if (typeof replace !== "string") {
-          throw Error(`Invalid key placeholder ${lokalise_key} in ${path}`);
+          throw Error(
+            `Invalid key placeholder ${lokalise_key} in ${file.path}`
+          );
         }
         return replace;
       });
     }
-  }
+  });
   return output;
-};
+}
 
-gulp.task("clean-translations", () => deleteAsync([workDir]));
+gulp.task("clean-translations", async () => deleteSync([workDir]));
 
-const makeWorkDir = () => mkdir(workDir, { recursive: true });
+gulp.task("ensure-translations-build-dir", async () => {
+  mkdirSync(workDir, { recursive: true });
+});
 
-const createTestTranslation = () =>
+gulp.task("create-test-metadata", () =>
+  env.isProdBuild()
+    ? Promise.resolve()
+    : writeFile(
+        workDir + "/testMetadata.json",
+        JSON.stringify({ test: { nativeName: "Test" } })
+      )
+);
+
+gulp.task("create-test-translation", () =>
   env.isProdBuild()
     ? Promise.resolve()
     : gulp
-        .src(EN_SRC)
+        .src(path.join(paths.translations_src, "en.json"))
-        .pipe(new CustomJSON(null, testReviver))
+        .pipe(transform((data, _file) => recursiveEmpty(data)))
-        .pipe(rename(`${TEST_LOCALE}.json`))
+        .pipe(rename("test.json"))
-        .pipe(gulp.dest(workDir));
+        .pipe(gulp.dest(workDir))
+);
 
 /**
  * This task will build a master translation file, to be used as the base for
@@ -163,164 +159,279 @@ const createTestTranslation = () =>
  * project is buildable immediately after merging new translation keys, since
  * the Lokalise update to translations/en.json will not happen immediately.
  */
-const createMasterTranslation = () =>
+gulp.task("build-master-translation", () => {
-  gulp
+  const src = [path.join(paths.translations_src, "en.json")];
-    .src([EN_SRC, ...(mergeBackend ? [`${inBackendDir}/en.json`] : [])])
-    .pipe(new CustomJSON(lokaliseTransform))
-    .pipe(new MergeJSON("en"))
-    .pipe(gulp.dest(workDir));
 
-const FRAGMENTS = ["base"];
+  if (mergeBackend) {
-
+    src.push(path.join(inBackendDir, "en.json"));
-const toggleSupervisorFragment = async () => {
-  FRAGMENTS[0] = "supervisor";
-};
-
-const panelFragment = (fragment) =>
-  fragment !== "base" && fragment !== "supervisor";
-
-const HASHES = new Map();
-
-const createTranslations = async () => {
-  // Parse and store the master to avoid repeating this for each locale, then
-  // add the panel fragments when processing the app.
-  const enMaster = JSON.parse(await readFile(`${workDir}/en.json`, "utf-8"));
-  if (FRAGMENTS[0] === "base") {
-    FRAGMENTS.push(...Object.keys(enMaster.ui.panel));
   }
 
-  // The downstream pipeline is setup first.  It hashes the merged data for
+  return gulp
-  // each locale, then fragmentizes and flattens the data for final output.
+    .src(src)
-  const translationFiles = await glob([
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
-    `${inFrontendDir}/!(en).json`,
-    ...(env.isProdBuild() ? [] : [`${workDir}/${TEST_LOCALE}.json`]),
-  ]);
-  const hashStream = new Transform({
-    objectMode: true,
-    transform: async (file, _, callback) => {
-      const hash = env.isProdBuild()
-        ? createHash("md5").update(file.contents).digest("hex")
-        : "dev";
-      HASHES.set(file.stem, hash);
-      file.stem += `-${hash}`;
-      callback(null, file);
-    },
-  }).setMaxListeners(translationFiles.length + 1);
-  const fragmentsStream = hashStream
     .pipe(
-      new CustomJSON((data) =>
+      merge({
-        FRAGMENTS.map((fragment) => {
+        fileName: "en.json",
-          switch (fragment) {
-            case "base":
-              // Remove the panels and supervisor to create the base translations
-              return [
-                flatten({
-                  ...data,
-                  ui: { ...data.ui, panel: undefined },
-                  supervisor: undefined,
-                }),
-                "",
-              ];
-            case "supervisor":
-              // Supervisor key is at the top level
-              return [flatten(data.supervisor), ""];
-            default:
-              // Create a fragment with only the given panel
-              return [
-                flatten(data.ui.panel[fragment], `ui.panel.${fragment}.`),
-                fragment,
-              ];
-          }
-        })
-      )
-    )
-    .pipe(gulp.dest(outDir));
-
-  // Send the English master downstream first, then for each other locale
-  // generate merged JSON data to continue piping. It begins with the master
-  // translation as a failsafe for untranslated strings, and merges all parent
-  // tags into one file for each specific subtag
-  //
-  // TODO: This is a naive interpretation of BCP47 that should be improved.
-  //       Will be OK for now as long as we don't have anything more complicated
-  // than a base translation + region.
-  const masterStream = gulp
-    .src(`${workDir}/en.json`)
-    .pipe(new PassThrough({ objectMode: true }));
-  masterStream.pipe(hashStream, { end: false });
-  const mergesFinished = [finished(masterStream)];
-  for (const translationFile of translationFiles) {
-    const locale = basename(translationFile, ".json");
-    const subtags = locale.split("-");
-    const mergeFiles = [];
-    for (let i = 1; i <= subtags.length; i++) {
-      const lang = subtags.slice(0, i).join("-");
-      if (lang === TEST_LOCALE) {
-        mergeFiles.push(`${workDir}/${TEST_LOCALE}.json`);
-      } else if (lang !== "en") {
-        mergeFiles.push(`${inFrontendDir}/${lang}.json`);
-        if (mergeBackend) {
-          mergeFiles.push(`${inBackendDir}/${lang}.json`);
-        }
-      }
-    }
-    const mergeStream = gulp
-      .src(mergeFiles, { allowEmpty: true })
-      .pipe(new MergeJSON(locale, enMaster, emptyReviver));
-    mergesFinished.push(finished(mergeStream));
-    mergeStream.pipe(hashStream, { end: false });
-  }
-
-  // Wait for all merges to finish, then it's safe to end writing to the
-  // downstream pipeline and wait for all fragments to finish writing.
-  await Promise.all(mergesFinished);
-  hashStream.end();
-  await finished(fragmentsStream);
-};
-
-const writeTranslationMetaData = () =>
-  gulp
-    .src([`${paths.translations_src}/translationMetadata.json`])
-    .pipe(
-      new CustomJSON((meta) => {
-        // Add the test translation in development.
-        if (!env.isProdBuild()) {
-          meta[TEST_LOCALE] = { nativeName: "Translation Test" };
-        }
-        // Filter out locales without a native name, and add the hashes.
-        for (const locale of Object.keys(meta)) {
-          if (!meta[locale].nativeName) {
-            meta[locale] = undefined;
-            console.warn(
-              `Skipping locale ${locale} because native name is not translated.`
-            );
-          } else {
-            meta[locale].hash = HASHES.get(locale);
-          }
-        }
-        return {
-          fragments: FRAGMENTS.filter(panelFragment),
-          translations: meta,
-        };
       })
     )
-    .pipe(gulp.dest(workDir));
+    .pipe(gulp.dest(fullDir));
+});
+
+gulp.task("build-merged-translations", () =>
+  gulp
+    .src([
+      inFrontendDir + "/*.json",
+      "!" + inFrontendDir + "/en.json",
+      ...(env.isProdBuild() ? [] : [workDir + "/test.json"]),
+    ])
+    .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
+    .pipe(
+      flatmap((stream, file) => {
+        // For each language generate a merged json file. It begins with the master
+        // translation as a failsafe for untranslated strings, and merges all parent
+        // tags into one file for each specific subtag
+        //
+        // TODO: This is a naive interpretation of BCP47 that should be improved.
+        //       Will be OK for now as long as we don't have anything more complicated
+        //       than a base translation + region.
+        const tr = path.basename(file.history[0], ".json");
+        const subtags = tr.split("-");
+        const src = [fullDir + "/en.json"];
+        for (let i = 1; i <= subtags.length; i++) {
+          const lang = subtags.slice(0, i).join("-");
+          if (lang === "test") {
+            src.push(workDir + "/test.json");
+          } else if (lang !== "en") {
+            src.push(inFrontendDir + "/" + lang + ".json");
+            if (mergeBackend) {
+              src.push(inBackendDir + "/" + lang + ".json");
+            }
+          }
+        }
+        return gulp
+          .src(src, { allowEmpty: true })
+          .pipe(transform((data) => emptyFilter(data)))
+          .pipe(
+            merge({
+              fileName: tr + ".json",
+            })
+          )
+          .pipe(gulp.dest(fullDir));
+      })
+    )
+);
+
+let taskName;
+
+const splitTasks = [];
+TRANSLATION_FRAGMENTS.forEach((fragment) => {
+  taskName = "build-translation-fragment-" + fragment;
+  gulp.task(taskName, () =>
+    // Return only the translations for this fragment.
+    gulp
+      .src(fullDir + "/*.json")
+      .pipe(
+        transform((data) => ({
+          ui: {
+            panel: {
+              [fragment]: data.ui.panel[fragment],
+            },
+          },
+        }))
+      )
+      .pipe(gulp.dest(workDir + "/" + fragment))
+  );
+  splitTasks.push(taskName);
+});
+
+taskName = "build-translation-core";
+gulp.task(taskName, () =>
+  // Remove the fragment translations from the core translation.
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(
+      transform((data, _file) => {
+        TRANSLATION_FRAGMENTS.forEach((fragment) => {
+          delete data.ui.panel[fragment];
+        });
+        delete data.supervisor;
+        return data;
+      })
+    )
+    .pipe(gulp.dest(coreDir))
+);
+
+splitTasks.push(taskName);
+
+gulp.task("build-flattened-translations", () =>
+  // Flatten the split versions of our translations, and move them into outDir
+  gulp
+    .src(
+      TRANSLATION_FRAGMENTS.map(
+        (fragment) => workDir + "/" + fragment + "/*.json"
+      ).concat(coreDir + "/*.json"),
+      { base: workDir }
+    )
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(
+      rename((filePath) => {
+        if (filePath.dirname === "core") {
+          filePath.dirname = "";
+        }
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+const fingerprints = {};
+
+gulp.task("build-translation-fingerprints", () => {
+  // Fingerprint full file of each language
+  const files = readdirSync(fullDir);
+
+  for (let i = 0; i < files.length; i++) {
+    fingerprints[files[i].split(".")[0]] = {
+      // In dev we create fake hashes
+      hash: env.isProdBuild()
+        ? createHash("md5")
+            .update(readFileSync(path.join(fullDir, files[i]), "utf-8"))
+            .digest("hex")
+        : "dev",
+    };
+  }
+
+  // In dev we create the file with the fake hash in the filename
+  if (env.isProdBuild()) {
+    mapFiles(outDir, ".json", (filename) => {
+      const parsed = path.parse(filename);
+
+      // nl.json -> nl-<hash>.json
+      if (!(parsed.name in fingerprints)) {
+        throw new Error(`Unable to find hash for ${filename}`);
+      }
+
+      renameSync(
+        filename,
+        `${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${
+          parsed.ext
+        }`
+      );
+    });
+  }
+
+  const stream = source("translationFingerprints.json");
+  stream.write(JSON.stringify(fingerprints));
+  process.nextTick(() => stream.end());
+  return stream.pipe(vinylBuffer()).pipe(gulp.dest(workDir));
+});
+
+gulp.task("build-translation-fragment-supervisor", () =>
+  gulp
+    .src(fullDir + "/*.json")
+    .pipe(transform((data) => data.supervisor))
+    .pipe(
+      rename((filePath) => {
+        // In dev we create the file with the fake hash in the filename
+        if (!env.isProdBuild()) {
+          filePath.basename += "-dev";
+        }
+      })
+    )
+    .pipe(gulp.dest(workDir + "/supervisor"))
+);
+
+gulp.task("build-translation-flatten-supervisor", () =>
+  gulp
+    .src(workDir + "/supervisor/*.json")
+    .pipe(
+      transform((data) =>
+        // Polymer.AppLocalizeBehavior requires flattened json
+        flatten(data)
+      )
+    )
+    .pipe(gulp.dest(outDir))
+);
+
+gulp.task("build-translation-write-metadata", () =>
+  gulp
+    .src([
+      path.join(paths.translations_src, "translationMetadata.json"),
+      ...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]),
+      workDir + "/translationFingerprints.json",
+    ])
+    .pipe(merge({}))
+    .pipe(
+      transform((data) => {
+        const newData = {};
+        Object.entries(data).forEach(([key, value]) => {
+          // Filter out translations without native name.
+          if (value.nativeName) {
+            newData[key] = value;
+          } else {
+            console.warn(
+              `Skipping language ${key}. Native name was not translated.`
+            );
+          }
+        });
+        return newData;
+      })
+    )
+    .pipe(
+      transform((data) => ({
+        fragments: TRANSLATION_FRAGMENTS,
+        translations: data,
+      }))
+    )
+    .pipe(rename("translationMetadata.json"))
+    .pipe(gulp.dest(workDir))
+);
+
+gulp.task(
+  "create-translations",
+  gulp.series(
+    gulp.parallel("create-test-metadata", "create-test-translation"),
+    "build-master-translation",
+    "build-merged-translations",
+    gulp.parallel(...splitTasks),
+    "build-flattened-translations"
+  )
+);
 
 gulp.task(
   "build-translations",
   gulp.series(
     gulp.parallel(
       "fetch-nightly-translations",
-      gulp.series("clean-translations", makeWorkDir)
+      gulp.series("clean-translations", "ensure-translations-build-dir")
     ),
-    createTestTranslation,
+    "create-translations",
-    createMasterTranslation,
+    "build-translation-fingerprints",
-    createTranslations,
+    "build-translation-write-metadata"
-    writeTranslationMetaData
   )
 );
 
 gulp.task(
   "build-supervisor-translations",
-  gulp.series(toggleSupervisorFragment, "build-translations")
+  gulp.series(
+    gulp.parallel(
+      "fetch-nightly-translations",
+      gulp.series("clean-translations", "ensure-translations-build-dir")
+    ),
+    gulp.parallel("create-test-metadata", "create-test-translation"),
+    "build-master-translation",
+    "build-merged-translations",
+    "build-translation-fragment-supervisor",
+    "build-translation-flatten-supervisor",
+    "build-translation-fingerprints",
+    "build-translation-write-metadata"
+  )
 );

build-scripts/gulp/webpack.js

@@ -40,12 +40,8 @@ const runDevServer = async ({
   compiler,
   contentBase,
   port,
-  listenHost = undefined,
+  listenHost = "localhost",
 }) => {
-  if (listenHost === undefined) {
-    // For dev container, we need to listen on all hosts
-    listenHost = env.isDevContainer() ? "0.0.0.0" : "localhost";
-  }
   const server = new WebpackDevServer(
     {
       hot: false,
@@ -103,7 +99,7 @@ gulp.task("webpack-watch-app", () => {
   ).watch({ poll: isWsl }, doneHandler());
   gulp.watch(
     path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
+    gulp.series("create-translations", "copy-translations-app")
   );
 });
 

build-scripts/util.cjs

@@ -0,0 +1,16 @@
+const path = require("path");
+const fs = require("fs");
+
+// Helper function to map recursively over files in a folder and it's subfolders
+module.exports.mapFiles = function mapFiles(startPath, filter, mapFunc) {
+  const files = fs.readdirSync(startPath);
+  for (let i = 0; i < files.length; i++) {
+    const filename = path.join(startPath, files[i]);
+    const stat = fs.lstatSync(filename);
+    if (stat.isDirectory()) {
+      mapFiles(filename, filter, mapFunc);
+    } else if (filename.indexOf(filter) >= 0) {
+      mapFunc(filename);
+    }
+  }
+};

build-scripts/webpack.cjs

@@ -10,7 +10,6 @@ const WebpackBar = require("webpackbar");
 const {
   TransformAsyncModulesPlugin,
 } = require("transform-async-modules-webpack-plugin");
-const { dependencies } = require("../package.json");
 const paths = require("./paths.cjs");
 const bundle = require("./bundle.cjs");
 
@@ -63,25 +62,17 @@ const createWebpackConfig = ({
       rules: [
         {
           test: /\.m?js$|\.ts$/,
-          use: (info) => ({
+          use: {
             loader: "babel-loader",
             options: {
-              ...bundle.babelOptions({
+              ...bundle.babelOptions({ latestBuild, isProdBuild, isTestBuild }),
-                latestBuild,
-                isProdBuild,
-                isTestBuild,
-                sw: info.issuerLayer === "sw",
-              }),
               cacheDirectory: !isProdBuild,
               cacheCompression: false,
             },
-          }),
+          },
           resolve: {
             fullySpecified: false,
           },
-          parser: {
-            worker: ["*context.audioWorklet.addModule()", "..."],
-          },
         },
         {
           test: /\.css$/,
@@ -100,15 +91,11 @@ const createWebpackConfig = ({
       moduleIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
       chunkIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
       splitChunks: {
-        // Disable splitting for web workers and worklets because imports of
+        // Disable splitting for web workers with ESM output
-        // external chunks are broken for:
+        // Imports of external chunks are broken
-        // - ESM output: https://github.com/webpack/webpack/issues/17014
+        chunks: latestBuild
-        // - Worklets use `importScripts`: https://github.com/webpack/webpack/issues/11543
+          ? (chunk) => !chunk.canBeInitial() && !/^.+-worker$/.test(chunk.name)
-        chunks: (chunk) =>
+          : undefined,
-          !chunk.canBeInitial() &&
-          !new RegExp(`^.+-work${latestBuild ? "(?:let|er)" : "let"}$`).test(
-            chunk.name
-          ),
       },
     },
     plugins: [
@@ -169,15 +156,11 @@ const createWebpackConfig = ({
           transform: (stats) => JSON.stringify(filterStats(stats)),
         }),
       !latestBuild &&
-        new TransformAsyncModulesPlugin({
+        new TransformAsyncModulesPlugin({ browserslistEnv: "legacy" }),
-          browserslistEnv: "legacy",
-          runtime: { version: dependencies["@babel/runtime"] },
-        }),
     ].filter(Boolean),
     resolve: {
       extensions: [".ts", ".js", ".json"],
       alias: {
-        "lit/static-html$": "lit/static-html.js",
         "lit/decorators$": "lit/decorators.js",
         "lit/directive$": "lit/directive.js",
         "lit/directives/until$": "lit/directives/until.js",
@@ -240,7 +223,6 @@ const createWebpackConfig = ({
       ),
     },
     experiments: {
-      layers: true,
       outputModule: true,
     },
   };

cast/public/sw-legacy.js

@@ -1,5 +0,0 @@
-"use strict";
-
-self.addEventListener("fetch", (event) => {
-  event.respondWith(fetch(event.request));
-});

cast/src/html/faq.html.template

@@ -36,7 +36,13 @@
   </head>
   <body>
     <%= renderTemplate("../../../src/html/_js_base.html.template") %>
-    <%= renderTemplate("../../../src/html/_script_loader.html.template") %>
+    <script>
+      <% for (const entry of latestEntryJS) { %>
+        import("<%= entry %>");
+      <% } %>
+      window.latestJS = true;
+    </script>
+    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
     <hc-layout subtitle="FAQ">
       <style>
         a {
@@ -139,7 +145,7 @@
         </p>
       </div>
 
-      <div class="section-header">What does Home Assistant Cast do?</div>
+      <div class="section-header">Wat does Home Assistant Cast do?</div>
       <div class="card-content">
         <p>
           Home Assistant Cast is a receiver application for the Chromecast. When
@@ -226,5 +232,17 @@ http:
         </p>
       </div>
     </hc-layout>
+
+    <script>
+      var _gaq = [["_setAccount", "UA-57927901-9"], ["_trackPageview"]];
+      (function (d, t) {
+        var g = d.createElement(t),
+          s = d.getElementsByTagName(t)[0];
+        g.src =
+          ("https:" == location.protocol ? "//ssl" : "//www") +
+          ".google-analytics.com/ga.js";
+        s.parentNode.insertBefore(g, s);
+      })(document, "script");
+    </script>
   </body>
 </html>

cast/src/html/index.html.template

@@ -13,9 +13,15 @@
     <%= renderTemplate("_social_meta.html.template") %>
   </head>
   <body>
-    <hc-connect></hc-connect>
     <%= renderTemplate("../../../src/html/_js_base.html.template") %>
-    <%= renderTemplate("../../../src/html/_script_loader.html.template") %>
+    <hc-connect></hc-connect>
+    <script>
+      <% for (const entry of latestEntryJS) { %>
+        import("<%= entry %>");
+      <% } %>
+      window.latestJS = true;
+    </script>
+    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
     <script>
     (function(i,s,o,g,r,a,m){i['GoogleAnalyticsObject']=r;i[r]=i[r]||function(){
     (i[r].q=i[r].q||[]).push(arguments)},i[r].l=1*new Date();a=s.createElement(o),

cast/src/html/media.html.template

@@ -14,10 +14,22 @@
         --background-color: #41bdf5;
       }
     </style>
+    <script>
+      var _gaq=[['_setAccount','UA-57927901-10'],['_trackPageview']];
+      (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+      g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+      s.parentNode.insertBefore(g,s)}(document,'script'));
+    </script>
   </head>
   <body>
-    <cast-media-player></cast-media-player>
     <%= renderTemplate("../../../src/html/_js_base.html.template") %>
-    <%= renderTemplate("../../../src/html/_script_loader.html.template") %>
+    <cast-media-player></cast-media-player>
+    <script>
+      <% for (const entry of latestEntryJS) { %>
+        import("<%= entry %>");
+      <% } %>
+      window.latestJS = true;
+    </script>
+    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
   </body>
 </html>

cast/src/html/receiver.html.template

@@ -11,4 +11,10 @@
       font-size: initial;
     }
   </style>
+  <script>
+  var _gaq=[['_setAccount','UA-57927901-10'],['_trackPageview']];
+  (function(d,t){var g=d.createElement(t),s=d.getElementsByTagName(t)[0];
+  g.src=('https:'==location.protocol?'//ssl':'//www')+'.google-analytics.com/ga.js';
+  s.parentNode.insertBefore(g,s)}(document,'script'));
+  </script>
 </html>

cast/src/launcher/entrypoint.ts

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

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

@@ -1,12 +1,11 @@
 import "@material/mwc-button/mwc-button";
-import "@material/mwc-list/mwc-list";
+import { mdiCast, mdiCastConnected } from "@mdi/js";
-import type { ActionDetail } from "@material/mwc-list/mwc-list";
+import "@polymer/paper-item/paper-icon-item";
-import { mdiCast, mdiCastConnected, mdiViewDashboard } from "@mdi/js";
+import "@polymer/paper-listbox/paper-listbox";
-import type { Auth, Connection } from "home-assistant-js-websocket";
+import { Auth, Connection } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit";
-import { LitElement, css, html } from "lit";
 import { customElement, property, state } from "lit/decorators";
-import type { CastManager } from "../../../../src/cast/cast_manager";
+import { CastManager } from "../../../../src/cast/cast_manager";
 import {
   castSendShowLovelaceView,
   ensureConnectedCastSession,
@@ -25,11 +24,10 @@ import {
   getLovelaceCollection,
 } from "../../../../src/data/lovelace";
 import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
-import type { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
+import { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
 import "../../../../src/layouts/hass-loading-screen";
 import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
 import "./hc-layout";
-import "../../../../src/components/ha-list-item";
 
 @customElement("hc-cast")
 class HcCast extends LitElement {
@@ -85,38 +83,34 @@ class HcCast extends LitElement {
               `
             : html`
                 <div class="section-header">PICK A VIEW</div>
-                <mwc-list @action=${this._handlePickView} activatable>
+                <paper-listbox
+                  attr-for-selected="data-path"
+                  .selected=${this.castManager.status.lovelacePath || ""}
+                >
                   ${(
                     this.lovelaceViews ?? [
                       generateDefaultViewConfig({}, {}, {}, {}, () => ""),
                     ]
                   ).map(
                     (view, idx) => html`
-                      <ha-list-item
+                      <paper-icon-item
-                        graphic="avatar"
+                        @click=${this._handlePickView}
-                        .activated=${this.castManager.status?.lovelacePath ===
+                        data-path=${view.path || idx}
-                        (view.path ?? idx)}
-                        .selected=${this.castManager.status?.lovelacePath ===
-                        (view.path ?? idx)}
                       >
-                        ${view.title || view.path || "Unnamed view"}
                         ${view.icon
                           ? html`
                               <ha-icon
                                 .icon=${view.icon}
-                                slot="graphic"
+                                slot="item-icon"
                               ></ha-icon>
                             `
-                          : html`<ha-svg-icon
+                          : ""}
-                              slot="item-icon"
+                        ${view.title || view.path}
-                              .path=${mdiViewDashboard}
+                      </paper-icon-item>
-                            ></ha-svg-icon>`}
-                      </ha-list-item>
                     `
-                  )}</mwc-list
+                  )}
-                >
+                </paper-listbox>
               `}
-
         <div class="card-actions">
           ${this.castManager.status
             ? html`
@@ -188,8 +182,8 @@ class HcCast extends LitElement {
     this.castManager.requestSession();
   }
 
-  private async _handlePickView(ev: CustomEvent<ActionDetail>) {
+  private async _handlePickView(ev: Event) {
-    const path = this.lovelaceViews![ev.detail.index].path ?? ev.detail.index;
+    const path = (ev.currentTarget as any).getAttribute("data-path");
     await ensureConnectedCastSession(this.castManager!, this.auth!);
     castSendShowLovelaceView(this.castManager, this.auth.data.hassUrl, path);
   }
@@ -252,14 +246,25 @@ class HcCast extends LitElement {
         height: 18px;
       }
 
-      ha-list-item ha-icon,
+      paper-listbox {
-      ha-list-item ha-svg-icon {
+        padding-top: 0;
+      }
+
+      paper-listbox ha-icon {
         padding: 12px;
         color: var(--secondary-text-color);
       }
 
-      :host([hide-icons]) ha-icon {
+      paper-icon-item {
-        display: none;
+        cursor: pointer;
+      }
+
+      paper-icon-item[disabled] {
+        cursor: initial;
+      }
+
+      :host([hide-icons]) paper-icon-item {
+        --paper-item-icon-width: 0px;
       }
 
       .spacer {

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

@@ -1,23 +1,19 @@
 import "@material/mwc-button";
 import { mdiCastConnected, mdiCast } from "@mdi/js";
-import type {
+import {
   Auth,
   Connection,
-  getAuthOptions,
-} from "home-assistant-js-websocket";
-import {
   createConnection,
   ERR_CANNOT_CONNECT,
   ERR_HASS_HOST_REQUIRED,
   ERR_INVALID_AUTH,
   ERR_INVALID_HTTPS_TO_HTTP,
   getAuth,
+  getAuthOptions,
 } from "home-assistant-js-websocket";
-import type { CSSResultGroup, TemplateResult } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { css, html, LitElement } from "lit";
 import { customElement, state } from "lit/decorators";
-import type { CastManager } from "../../../../src/cast/cast_manager";
+import { CastManager, getCastManager } from "../../../../src/cast/cast_manager";
-import { getCastManager } from "../../../../src/cast/cast_manager";
 import { castSendShowDemo } from "../../../../src/cast/receiver_messages";
 import {
   loadTokens,

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

@@ -1,7 +1,10 @@
-import type { Auth, Connection, HassUser } from "home-assistant-js-websocket";
+import {
-import { getUser } from "home-assistant-js-websocket";
+  Auth,
-import type { CSSResultGroup, TemplateResult } from "lit";
+  Connection,
-import { css, html, LitElement } from "lit";
+  getUser,
+  HassUser,
+} from "home-assistant-js-websocket";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
 import { customElement, property } from "lit/decorators";
 import "../../../../src/components/ha-card";
 
@@ -85,7 +88,7 @@ class HcLayout extends LitElement {
       }
 
       .card-header {
-        color: var(--ha-card-header-color, var(--primary-text-color));
+        color: var(--ha-card-header-color, --primary-text-color);
         font-family: var(--ha-card-header-font-family, inherit);
         font-size: var(--ha-card-header-font-size, 24px);
         letter-spacing: -0.012em;

cast/src/receiver/demo/cast-demo-entities.ts

@@ -1,5 +1,4 @@
-import type { Entity } from "../../../../src/fake_data/entity";
+import { convertEntities, Entity } from "../../../../src/fake_data/entity";
-import { convertEntities } from "../../../../src/fake_data/entity";
 
 export const castDemoEntities: () => Entity[] = () =>
   convertEntities({

cast/src/receiver/demo/cast-demo-lovelace.ts

@@ -1,5 +1,5 @@
-import type { LovelaceCardConfig } from "../../../../src/data/lovelace/config/card";
+import { LovelaceCardConfig } from "../../../../src/data/lovelace/config/card";
-import type { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
 import { castContext } from "../cast_context";
 
 export const castDemoLovelace: () => LovelaceConfig = () => {

cast/src/receiver/entrypoint.ts

@@ -1,10 +1,10 @@
 import { framework } from "./cast_framework";
 import { CAST_NS } from "../../../src/cast/const";
-import type { HassMessage } from "../../../src/cast/receiver_messages";
+import { HassMessage } from "../../../src/cast/receiver_messages";
 import "../../../src/resources/custom-card-support";
 import { castContext } from "./cast_context";
 import { HcMain } from "./layout/hc-main";
-import type { ReceivedMessage } from "./types";
+import { ReceivedMessage } from "./types";
 
 const lovelaceController = new HcMain();
 document.body.append(lovelaceController);

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

@@ -1,11 +1,13 @@
 import { html, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { mockHistory } from "../../../../demo/src/stubs/history";
-import type { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
-import type { MockHomeAssistant } from "../../../../src/fake_data/provide_hass";
+import {
-import { provideHass } from "../../../../src/fake_data/provide_hass";
+  MockHomeAssistant,
+  provideHass,
+} from "../../../../src/fake_data/provide_hass";
 import { HassElement } from "../../../../src/state/hass-element";
-import type { HomeAssistant } from "../../../../src/types";
+import { HomeAssistant } from "../../../../src/types";
 import { castDemoEntities } from "../demo/cast-demo-entities";
 import { castDemoLovelace } from "../demo/cast-demo-lovelace";
 import "./hc-lovelace";

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

@@ -1,7 +1,6 @@
-import type { CSSResultGroup, TemplateResult } from "lit";
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-import { css, html, LitElement } from "lit";
 import { customElement, property } from "lit/decorators";
-import type { HomeAssistant } from "../../../../src/types";
+import { HomeAssistant } from "../../../../src/types";
 
 @customElement("hc-launch-screen")
 class HcLaunchScreen extends LitElement {

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

@@ -1,18 +1,10 @@
-import {
+import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
-  css,
+import { customElement, property, query } from "lit/decorators";
-  type CSSResultGroup,
-  html,
-  LitElement,
-  type TemplateResult,
-} from "lit";
-import { customElement, property } from "lit/decorators";
 import { fireEvent } from "../../../../src/common/dom/fire_event";
-import type { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
+import { LovelaceConfig } from "../../../../src/data/lovelace/config/types";
-import { getPanelTitleFromUrlPath } from "../../../../src/data/panel";
+import { Lovelace } from "../../../../src/panels/lovelace/types";
-import type { Lovelace } from "../../../../src/panels/lovelace/types";
 import "../../../../src/panels/lovelace/views/hui-view";
-import "../../../../src/panels/lovelace/views/hui-view-container";
+import { HomeAssistant } from "../../../../src/types";
-import type { HomeAssistant } from "../../../../src/types";
 import "./hc-launch-screen";
 
 (window as any).loadCardHelpers = () =>
@@ -29,6 +21,8 @@ class HcLovelace extends LitElement {
 
   @property() public urlPath: string | null = null;
 
+  @query("hui-view") private _huiView?: HTMLElement;
+
   protected render(): TemplateResult {
     const index = this._viewIndex;
     if (index === undefined) {
@@ -50,24 +44,13 @@ class HcLovelace extends LitElement {
       saveConfig: async () => undefined,
       deleteConfig: async () => undefined,
       setEditMode: () => undefined,
-      showToast: () => undefined,
     };
-
-    const viewConfig = this.lovelaceConfig.views[index];
-    const background = viewConfig.background || this.lovelaceConfig.background;
-
     return html`
-      <hui-view-container
+      <hui-view
         .hass=${this.hass}
-        .background=${background}
+        .lovelace=${lovelace}
-        .theme=${viewConfig.theme}
+        .index=${index}
-      >
+      ></hui-view>
-        <hui-view
-          .hass=${this.hass}
-          .lovelace=${lovelace}
-          .index=${index}
-        ></hui-view>
-      </hui-view-container>
     `;
   }
 
@@ -78,12 +61,7 @@ class HcLovelace extends LitElement {
       const index = this._viewIndex;
 
       if (index !== undefined) {
-        const title = getPanelTitleFromUrlPath(
+        const dashboardTitle = this.lovelaceConfig.title || this.urlPath;
-          this.hass,
-          this.urlPath || "lovelace"
-        );
-
-        const dashboardTitle = title || this.urlPath;
 
         const viewTitle =
           this.lovelaceConfig.views[index].title ||
@@ -97,6 +75,19 @@ class HcLovelace extends LitElement {
                 }${viewTitle || ""}`
               : undefined,
         });
+
+        const configBackground =
+          this.lovelaceConfig.views[index].background ||
+          this.lovelaceConfig.background;
+
+        if (configBackground) {
+          this._huiView!.style.setProperty(
+            "--lovelace-background",
+            configBackground
+          );
+        } else {
+          this._huiView!.style.removeProperty("--lovelace-background");
+        }
       }
     }
   }
@@ -120,15 +111,19 @@ class HcLovelace extends LitElement {
 
   static get styles(): CSSResultGroup {
     return css`
-      hui-view-container {
+      :host {
-        display: flex;
-        position: relative;
         min-height: 100vh;
+        height: 0;
+        display: flex;
+        flex-direction: column;
         box-sizing: border-box;
+        background: var(--primary-background-color);
+      }
+      :host > * {
+        flex: 1;
       }
       hui-view {
-        flex: 1 1 100%;
+        background: var(--lovelace-background, var(--primary-background-color));
-        max-width: 100%;
       }
     `;
   }

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

@@ -1,40 +1,40 @@
-import type { UnsubscribeFunc } from "home-assistant-js-websocket";
+import {
-import { createConnection, getAuth } from "home-assistant-js-websocket";
+  createConnection,
-import type { TemplateResult } from "lit";
+  getAuth,
-import { html } from "lit";
+  UnsubscribeFunc,
+} from "home-assistant-js-websocket";
+import { html, TemplateResult } from "lit";
 import { customElement, state } from "lit/decorators";
 import { CAST_NS } from "../../../../src/cast/const";
-import type {
+import {
   ConnectMessage,
   GetStatusMessage,
   HassMessage,
   ShowDemoMessage,
   ShowLovelaceViewMessage,
 } from "../../../../src/cast/receiver_messages";
-import type {
+import {
+  ReceiverErrorCode,
   ReceiverErrorMessage,
   ReceiverStatusMessage,
 } from "../../../../src/cast/sender_messages";
-import { ReceiverErrorCode } from "../../../../src/cast/sender_messages";
 import { atLeastVersion } from "../../../../src/common/config/version";
 import { isNavigationClick } from "../../../../src/common/dom/is-navigation-click";
 import {
   getLegacyLovelaceCollection,
   getLovelaceCollection,
 } from "../../../../src/data/lovelace";
-import type {
+import {
+  isStrategyDashboard,
   LegacyLovelaceConfig,
   LovelaceConfig,
   LovelaceDashboardStrategyConfig,
 } from "../../../../src/data/lovelace/config/types";
-import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
 import { fetchResources } from "../../../../src/data/lovelace/resource";
 import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources";
 import { HassElement } from "../../../../src/state/hass-element";
 import { castContext } from "../cast_context";
 import "./hc-launch-screen";
-import { getPanelTitleFromUrlPath } from "../../../../src/data/panel";
-import { checkLovelaceConfig } from "../../../../src/panels/lovelace/common/check-lovelace-config";
 
 const DEFAULT_CONFIG: LovelaceDashboardStrategyConfig = {
   strategy: {
@@ -359,14 +359,8 @@ export class HcMain extends HassElement {
   }
 
   private _handleNewLovelaceConfig(lovelaceConfig: LovelaceConfig) {
-    const title = getPanelTitleFromUrlPath(
+    castContext.setApplicationState(lovelaceConfig.title || "");
-      this.hass!,
+    this._lovelaceConfig = lovelaceConfig;
-      this._urlPath || "lovelace"
-    );
-    castContext.setApplicationState(title || "");
-    this._lovelaceConfig = checkLovelaceConfig(
-      lovelaceConfig
-    ) as LovelaceConfig;
   }
 
   private _handleShowDemo(_msg: ShowDemoMessage) {

demo/public/sw-legacy.js

@@ -1,5 +0,0 @@
-"use strict";
-
-self.addEventListener("fetch", (event) => {
-  event.respondWith(fetch(event.request));
-});

demo/src/configs/arsaboo/entities.ts

@@ -1,5 +1,5 @@
 import { convertEntities } from "../../../../src/fake_data/entity";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoEntitiesArsaboo: DemoConfig["entities"] = (localize) =>
   convertEntities({

demo/src/configs/arsaboo/index.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 import { demoEntitiesArsaboo } from "./entities";
 import { demoLovelaceArsaboo } from "./lovelace";
 import { demoThemeArsaboo } from "./theme";

demo/src/configs/arsaboo/lovelace.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoLovelaceArsaboo: DemoConfig["lovelace"] = (localize) => ({
   title: "Home Assistant",

demo/src/configs/demo-configs.ts

@@ -1,7 +1,7 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-import type { Lovelace } from "../../../src/panels/lovelace/types";
+import { Lovelace } from "../../../src/panels/lovelace/types";
 import { energyEntities } from "../stubs/entities";
-import type { DemoConfig } from "./types";
+import { DemoConfig } from "./types";
 
 export const demoConfigs: Array<() => Promise<DemoConfig>> = [
   () => import("./sections").then((mod) => mod.demoSections),

demo/src/configs/jimpower/entities.ts

@@ -1,5 +1,5 @@
 import { convertEntities } from "../../../../src/fake_data/entity";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoEntitiesJimpower: DemoConfig["entities"] = () =>
   convertEntities({

demo/src/configs/jimpower/index.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 import { demoEntitiesJimpower } from "./entities";
 import { demoLovelaceJimpower } from "./lovelace";
 import { demoThemeJimpower } from "./theme";

demo/src/configs/jimpower/lovelace.ts

@@ -1,5 +1,5 @@
 import "../../custom-cards/card-modder";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoLovelaceJimpower: DemoConfig["lovelace"] = () => ({
   name: "Kingia Castle",

demo/src/configs/kernehed/entities.ts

@@ -1,5 +1,5 @@
 import { convertEntities } from "../../../../src/fake_data/entity";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoEntitiesKernehed: DemoConfig["entities"] = () =>
   convertEntities({

demo/src/configs/kernehed/index.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 import { demoEntitiesKernehed } from "./entities";
 import { demoLovelaceKernehed } from "./lovelace";
 import { demoThemeKernehed } from "./theme";

demo/src/configs/kernehed/lovelace.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoLovelaceKernehed: DemoConfig["lovelace"] = () => ({
   name: "Hem",

demo/src/configs/sections/description.ts

@@ -1,5 +1,5 @@
 import { html } from "lit";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoLovelaceDescription: DemoConfig["description"] = (
   localize

demo/src/configs/sections/entities.ts

@@ -1,7 +1,7 @@
 import { convertEntities } from "../../../../src/fake_data/entity";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
-export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
+export const demoEntitiesSections: DemoConfig["entities"] = () =>
   convertEntities({
     "cover.living_room_garden_shutter": {
       entity_id: "cover.living_room_garden_shutter",
@@ -111,70 +111,13 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
         friendly_name: "Living room Temperature",
       },
     },
-    "sensor.living_room_humidity": {
-      entity_id: "sensor.living_room_humidity",
-      state: "57",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "%",
-        device_class: "humidity",
-        friendly_name: "Living room Humidity",
-      },
-    },
-    "sensor.outdoor_temperature": {
-      entity_id: "sensor.outdoor_temperature",
-      state: "10.5",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "°C",
-        device_class: "temperature",
-        friendly_name: "Outdoor temperature",
-      },
-    },
-    "sensor.outdoor_humidity": {
-      entity_id: "sensor.outdoor_humidity",
-      state: "70.4",
-      attributes: {
-        state_class: "measurement",
-        unit_of_measurement: "%",
-        device_class: "humidity",
-        friendly_name: "Outdoor humidity",
-      },
-    },
-    "device_tracker.car": {
-      entity_id: "sensor.outdoor_humidity",
-      state: "not_home",
-      attributes: {
-        friendly_name: "Car",
-        icon: "mdi:car",
-      },
-    },
     "media_player.living_room_nest_mini": {
       entity_id: "media_player.living_room_nest_mini",
-      state: "playing",
+      state: "off",
       attributes: {
         device_class: "speaker",
-        volume_level: 0.18,
+        friendly_name: "Living room Nest Mini",
-        is_volume_muted: false,
+        supported_features: 152461,
-        media_content_type: "music",
-        media_duration: 300,
-        media_position: 0,
-        media_position_updated_at: new Date(
-          // 23 seconds in
-          new Date().getTime() - 23000
-        ).toISOString(),
-        media_title: "I Wasn't Born To Follow",
-        media_artist: "The Byrds",
-        media_album_name: "The Notorious Byrd Brothers",
-        source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"],
-        shuffle: false,
-        night_sound: false,
-        speech_enhance: false,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.sections.entities.media_player.living_room_nest_mini"
-        ),
-        entity_picture: "/assets/sections/images/media_player_family_room.jpg",
-        supported_features: 64063,
       },
     },
     "cover.kitchen_shutter": {
@@ -199,14 +142,6 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
         supported_features: 32,
       },
     },
-    "binary_sensor.kitchen_motion": {
-      entity_id: "light.kitchen_motion",
-      state: "on",
-      attributes: {
-        device_class: "motion",
-        friendly_name: "Kitchen motion",
-      },
-    },
     "light.worktop_spotlights": {
       entity_id: "light.worktop_spotlights",
       state: "off",
@@ -233,27 +168,8 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       state: "on",
       attributes: {
         device_class: "speaker",
-        volume_level: 0.18,
+        friendly_name: "Kitchen Nest Audio",
-        is_volume_muted: false,
+        supported_features: 152461,
-        media_content_type: "music",
-        media_duration: 300,
-        media_position: 0,
-        media_position_updated_at: new Date(
-          // 23 seconds in
-          new Date().getTime() - 23000
-        ).toISOString(),
-        media_title: "I Wasn't Born To Follow",
-        media_artist: "The Byrds",
-        media_album_name: "The Notorious Byrd Brothers",
-        source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"],
-        shuffle: false,
-        night_sound: false,
-        speech_enhance: false,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.sections.entities.media_player.kitchen_nest_audio"
-        ),
-        entity_picture: "/assets/sections/images/media_player_family_room.jpg",
-        supported_features: 64063,
       },
     },
     "binary_sensor.tesla_wall_connector_vehicle_connected": {
@@ -417,36 +333,8 @@ export const demoEntitiesSections: DemoConfig["entities"] = (localize) =>
       entity_id: "media_player.study_nest_hub",
       state: "off",
       attributes: {
-        device_class: "speaker",
+        friendly_name: "Study Nest Hub",
-        volume_level: 0.18,
+        supported_features: 152461,
-        is_volume_muted: false,
-        media_content_type: "music",
-        media_duration: 300,
-        media_position: 0,
-        media_position_updated_at: new Date(
-          // 23 seconds in
-          new Date().getTime() - 23000
-        ).toISOString(),
-        media_title: "I Wasn't Born To Follow",
-        media_artist: "The Byrds",
-        media_album_name: "The Notorious Byrd Brothers",
-        source_list: ["It's A Party", "Radio HSL", "Retro 70s and 80s"],
-        shuffle: false,
-        night_sound: false,
-        speech_enhance: false,
-        friendly_name: localize(
-          "ui.panel.page-demo.config.sections.entities.media_player.study_nest_hub"
-        ),
-        entity_picture: "/assets/sections/images/media_player_family_room.jpg",
-        supported_features: 64063,
-      },
-    },
-    "switch.in_meeting": {
-      entity_id: "switch.in_meeting",
-      state: "on",
-      attributes: {
-        icon: "mdi:laptop-account",
-        friendly_name: "In a meeting",
       },
     },
     "sensor.standing_desk_height": {

demo/src/configs/sections/index.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 import { demoLovelaceDescription } from "./description";
 import { demoEntitiesSections } from "./entities";
 import { demoLovelaceSections } from "./lovelace";

demo/src/configs/sections/lovelace.ts

@@ -1,64 +1,39 @@
-import { isFrontpageEmbed } from "../../util/is_frontpage";
+import { DemoConfig } from "../types";
-import type { DemoConfig } from "../types";
 
-export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
+export const demoLovelaceSections: DemoConfig["lovelace"] = () => ({
   title: "Home Assistant Demo",
   views: [
     {
       type: "sections",
-      title: isFrontpageEmbed ? "Home Assistant" : "Demo",
+      title: "Demo",
       path: "home",
       icon: "mdi:home-assistant",
-      badges: [
-        {
-          type: "entity",
-          entity: "sensor.outdoor_temperature",
-          color: "red",
-        },
-        {
-          type: "entity",
-          entity: "sensor.outdoor_humidity",
-          color: "indigo",
-        },
-        {
-          type: "entity",
-          entity: "device_tracker.car",
-        },
-      ],
       sections: [
-        ...(isFrontpageEmbed
+        {
-          ? []
+          title: "Welcome 👋",
-          : [
+          cards: [{ type: "custom:ha-demo-card" }],
-              {
+        },
-                cards: [
-                  {
-                    type: "heading",
-                    heading: `${localize("ui.panel.page-demo.config.sections.titles.welcome")} 👋`,
-                  },
-                  { type: "custom:ha-demo-card" },
-                ],
-              },
-            ]),
         {
           cards: [
             {
-              type: "heading",
+              type: "tile",
-              heading: localize(
+              entity: "cover.living_room_garden_shutter",
-                "ui.panel.page-demo.config.sections.titles.living_room"
+              name: "Garden",
-              ),
+            },
-              icon: "mdi:sofa",
+            {
-              badges: [
+              type: "tile",
-                {
+              entity: "cover.living_room_graveyard_shutter",
-                  type: "entity",
+              name: "Rear",
-                  entity: "sensor.living_room_temperature",
+            },
-                  color: "red",
+            {
-                },
+              type: "tile",
-                {
+              entity: "cover.living_room_left_shutter",
-                  type: "entity",
+              name: "Left",
-                  entity: "sensor.living_room_humidity",
+            },
-                  color: "indigo",
+            {
-                },
+              type: "tile",
-              ],
+              entity: "cover.living_room_right_shutter",
+              name: "Right",
             },
             {
               type: "tile",
@@ -79,34 +54,23 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               entity: "light.bar_lamp",
             },
             {
-              type: "tile",
+              graph: "line",
-              entity: "cover.living_room_garden_shutter",
+              type: "sensor",
-              name: "Blinds",
+              entity: "sensor.living_room_temperature",
+              detail: 1,
+              name: "Temperature",
             },
             {
               type: "tile",
               entity: "media_player.living_room_nest_mini",
+              name: "Nest Mini",
             },
           ],
+          title: "🛋️ Living room ",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.kitchen"
-              ),
-              icon: "mdi:fridge",
-              badges: [
-                {
-                  type: "entity",
-                  entity: "binary_sensor.kitchen_motion",
-                  show_state: false,
-                  color: "blue",
-                },
-              ],
-            },
             {
               type: "tile",
               entity: "cover.kitchen_shutter",
@@ -135,19 +99,14 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
             {
               type: "tile",
               entity: "media_player.kitchen_nest_audio",
+              name: "Nest Audio",
             },
           ],
+          title: "👩‍🍳 Kitchen",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.energy"
-              ),
-              icon: "mdi:transmission-tower",
-            },
             {
               type: "tile",
               entity: "binary_sensor.tesla_wall_connector_vehicle_connected",
@@ -185,17 +144,11 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               color: "dark-grey",
             },
           ],
+          title: "⚡️ Energy",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.climate"
-              ),
-              icon: "mdi:thermometer",
-            },
             {
               type: "tile",
               entity: "sun.sun",
@@ -228,38 +181,16 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               state_content: ["preset_mode", "current_temperature"],
             },
           ],
+          title: "🌤️ Climate",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.study"
-              ),
-              icon: "mdi:desk-lamp",
-              badges: [
-                {
-                  type: "entity",
-                  entity: "switch.in_meeting",
-                  state: "on",
-                  state_content: "name",
-                  visibility: [
-                    {
-                      condition: "state",
-                      state: "on",
-                      entity: "switch.in_meeting",
-                    },
-                  ],
-                },
-              ],
-            },
             {
               type: "tile",
               entity: "cover.study_shutter",
               name: "Shutter",
             },
-
             {
               type: "tile",
               entity: "light.study_spotlights",
@@ -268,6 +199,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
             {
               type: "tile",
               entity: "media_player.study_nest_hub",
+              name: "Nest Hub",
             },
             {
               type: "tile",
@@ -276,23 +208,12 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               color: "brown",
               icon: "mdi:desk",
             },
-            {
-              type: "tile",
-              entity: "switch.in_meeting",
-              name: "Meeting mode",
-            },
           ],
+          title: "🧑‍💻 Study",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.outdoor"
-              ),
-              icon: "mdi:tree",
-            },
             {
               type: "tile",
               entity: "light.outdoor_light",
@@ -322,17 +243,11 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               name: "Illuminance",
             },
           ],
+          title: "🌳 Outdoor",
         },
         {
           type: "grid",
           cards: [
-            {
-              type: "heading",
-              heading: localize(
-                "ui.panel.page-demo.config.sections.titles.updates"
-              ),
-              icon: "mdi:update",
-            },
             {
               type: "tile",
               entity: "automation.home_assistant_auto_update",
@@ -358,6 +273,7 @@ export const demoLovelaceSections: DemoConfig["lovelace"] = (localize) => ({
               icon: "mdi:home-assistant",
             },
           ],
+          title: "🎉 Updates",
         },
       ],
     },

demo/src/configs/teachingbirds/entities.ts

@@ -1,5 +1,5 @@
 import { convertEntities } from "../../../../src/fake_data/entity";
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoEntitiesTeachingbirds: DemoConfig["entities"] = () =>
   convertEntities({

demo/src/configs/teachingbirds/index.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 import { demoEntitiesTeachingbirds } from "./entities";
 import { demoLovelaceTeachingbirds } from "./lovelace";
 import { demoThemeTeachingbirds } from "./theme";

demo/src/configs/teachingbirds/lovelace.ts

@@ -1,4 +1,4 @@
-import type { DemoConfig } from "../types";
+import { DemoConfig } from "../types";
 
 export const demoLovelaceTeachingbirds: DemoConfig["lovelace"] = () => ({
   title: "Home",

demo/src/configs/types.ts

@@ -1,7 +1,7 @@
-import type { TemplateResult } from "lit";
+import { TemplateResult } from "lit";
-import type { LocalizeFunc } from "../../../src/common/translations/localize";
+import { LocalizeFunc } from "../../../src/common/translations/localize";
-import type { LovelaceConfig } from "../../../src/data/lovelace/config/types";
+import { LovelaceConfig } from "../../../src/data/lovelace/config/types";
-import type { Entity } from "../../../src/fake_data/entity";
+import { Entity } from "../../../src/fake_data/entity";
 
 export interface DemoConfig {
   index?: number;

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

@@ -1,15 +1,14 @@
 import { mdiTelevision } from "@mdi/js";
-import type { CSSResultGroup } from "lit";
+import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
-import { css, html, LitElement, nothing } from "lit";
 import { customElement, state } from "lit/decorators";
-import type { CastManager } from "../../../src/cast/cast_manager";
+import { CastManager } from "../../../src/cast/cast_manager";
 import { castSendShowDemo } from "../../../src/cast/receiver_messages";
 import "../../../src/components/ha-icon";
-import type {
+import {
   CastConfig,
   LovelaceRow,
 } from "../../../src/panels/lovelace/entity-rows/types";
-import type { HomeAssistant } from "../../../src/types";
+import { HomeAssistant } from "../../../src/types";
 
 @customElement("cast-demo-row")
 class CastDemoRow extends LitElement implements LovelaceRow {

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

@@ -1,21 +1,17 @@
-import type { CSSResultGroup } from "lit";
+import "@material/mwc-button";
-import { css, html, LitElement, nothing } from "lit";
+import { css, CSSResultGroup, html, LitElement, nothing } from "lit";
 import { customElement, property, state } from "lit/decorators";
 import { until } from "lit/directives/until";
-import { fireEvent } from "../../../src/common/dom/fire_event";
 import "../../../src/components/ha-card";
-import "../../../src/components/ha-button";
 import "../../../src/components/ha-circular-progress";
-import type { LovelaceCardConfig } from "../../../src/data/lovelace/config/card";
+import { LovelaceCardConfig } from "../../../src/data/lovelace/config/card";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-import type {
+import { Lovelace, LovelaceCard } from "../../../src/panels/lovelace/types";
-  Lovelace,
-  LovelaceCard,
-} from "../../../src/panels/lovelace/types";
 import {
   demoConfigs,
   selectedDemoConfig,
   selectedDemoConfigIndex,
+  setDemoConfig,
 } from "../configs/demo-configs";
 
 @customElement("ha-demo-card")
@@ -68,9 +64,9 @@ export class HADemoCard extends LitElement implements LovelaceCard {
                 )}
           </div>
 
-          <ha-button @click=${this._nextConfig} .disabled=${this._switching}>
+          <mwc-button @click=${this._nextConfig} .disabled=${this._switching}>
             ${this.hass.localize("ui.panel.page-demo.cards.demo.next_demo")}
-          </ha-button>
+          </mwc-button>
         </div>
         <div class="content">
           <p class="small-hidden">
@@ -91,9 +87,9 @@ export class HADemoCard extends LitElement implements LovelaceCard {
         </div>
         <div class="actions small-hidden">
           <a href="https://www.home-assistant.io" target="_blank">
-            <ha-button>
+            <mwc-button>
               ${this.hass.localize("ui.panel.page-demo.cards.demo.learn_more")}
-            </ha-button>
+            </mwc-button>
           </a>
         </div>
       </ha-card>
@@ -117,7 +113,13 @@ export class HADemoCard extends LitElement implements LovelaceCard {
 
   private async _updateConfig(index: number) {
     this._switching = true;
-    fireEvent(this, "set-demo-config" as any, { index });
+    try {
+      await setDemoConfig(this.hass, this.lovelace!, index);
+    } catch (err: any) {
+      alert("Failed to switch config :-(");
+    } finally {
+      this._switching = false;
+    }
   }
 
   static get styles(): CSSResultGroup {
@@ -147,7 +149,7 @@ export class HADemoCard extends LitElement implements LovelaceCard {
           height: 60px;
         }
 
-        .picker ha-button {
+        .picker mwc-button {
           margin-right: 8px;
         }
 

demo/src/entrypoint.ts

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

demo/src/ha-demo.ts

@@ -3,12 +3,13 @@ import "../../src/resources/compatibility";
 import { customElement } from "lit/decorators";
 import { isNavigationClick } from "../../src/common/dom/is-navigation-click";
 import { navigate } from "../../src/common/navigate";
-import type { MockHomeAssistant } from "../../src/fake_data/provide_hass";
+import {
-import { provideHass } from "../../src/fake_data/provide_hass";
+  MockHomeAssistant,
+  provideHass,
+} from "../../src/fake_data/provide_hass";
 import { HomeAssistantAppEl } from "../../src/layouts/home-assistant";
-import type { HomeAssistant } from "../../src/types";
+import { HomeAssistant } from "../../src/types";
 import { selectedDemoConfig } from "./configs/demo-configs";
-import { mockAreaRegistry } from "./stubs/area_registry";
 import { mockAuth } from "./stubs/auth";
 import { mockConfigEntries } from "./stubs/config_entries";
 import { mockEnergy } from "./stubs/energy";
@@ -22,10 +23,10 @@ import { mockLovelace } from "./stubs/lovelace";
 import { mockMediaPlayer } from "./stubs/media_player";
 import { mockPersistentNotification } from "./stubs/persistent_notification";
 import { mockRecorder } from "./stubs/recorder";
+import { mockTodo } from "./stubs/todo";
 import { mockSensor } from "./stubs/sensor";
 import { mockSystemLog } from "./stubs/system_log";
 import { mockTemplate } from "./stubs/template";
-import { mockTodo } from "./stubs/todo";
 import { mockTranslations } from "./stubs/translations";
 
 @customElement("ha-demo")
@@ -61,7 +62,6 @@ export class HaDemo extends HomeAssistantAppEl {
     mockEnergy(hass);
     mockPersistentNotification(hass);
     mockConfigEntries(hass);
-    mockAreaRegistry(hass);
     mockEntityRegistry(hass, [
       {
         config_entry_id: "co2signal",
@@ -80,8 +80,6 @@ export class HaDemo extends HomeAssistantAppEl {
         has_entity_name: false,
         unique_id: "co2_intensity",
         options: null,
-        created_at: 0,
-        modified_at: 0,
       },
       {
         config_entry_id: "co2signal",
@@ -100,8 +98,6 @@ export class HaDemo extends HomeAssistantAppEl {
         has_entity_name: false,
         unique_id: "grid_fossil_fuel_percentage",
         options: null,
-        created_at: 0,
-        modified_at: 0,
       },
     ]);
 

demo/src/html/index.html.template

@@ -63,47 +63,46 @@
         align-items: center;
       }
       #ha-launch-screen svg {
-        width: 112px;
+        width: 170px;
         flex-shrink: 0;
       }
-      #ha-launch-screen .ha-launch-screen-spacer-top {
+      #ha-launch-screen .ha-launch-screen-spacer {
         flex: 1;
-        margin-top: calc( 2 * max(env(safe-area-inset-bottom), 48px) + 46px );
-        padding-top: 48px;
-      }
-      #ha-launch-screen .ha-launch-screen-spacer-bottom {
-        flex: 1;
-        padding-top: 48px;
-      }
-      .ohf-logo {
-        margin: max(env(safe-area-inset-bottom), 48px) 0;
-        display: flex;
-        flex-direction: column;
-        align-items: center;
-        opacity: .66;
-      }
-      @media (prefers-color-scheme: dark) {
-        .ohf-logo {
-          filter: invert(1);
-        }
       }
     </style>
   </head>
   <body>
     <div id="ha-launch-screen">
-      <div class="ha-launch-screen-spacer-top"></div>
+      <div class="ha-launch-screen-spacer"></div>
       <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 240 240">
         <path fill="#18BCF2" d="M240 224.762a15 15 0 0 1-15 15H15a15 15 0 0 1-15-15v-90c0-8.25 4.77-19.769 10.61-25.609l98.78-98.7805c5.83-5.83 15.38-5.83 21.21 0l98.79 98.7895c5.83 5.83 10.61 17.36 10.61 25.61v90-.01Z"/>
         <path fill="#F2F4F9" d="m107.27 239.762-40.63-40.63c-2.09.72-4.32 1.13-6.64 1.13-11.3 0-20.5-9.2-20.5-20.5s9.2-20.5 20.5-20.5 20.5 9.2 20.5 20.5c0 2.33-.41 4.56-1.13 6.65l31.63 31.63v-115.88c-6.8-3.3395-11.5-10.3195-11.5-18.3895 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5c0 8.07-4.7 15.05-11.5 18.3895v81.27l31.46-31.46c-.62-1.96-.96-4.04-.96-6.2 0-11.3 9.2-20.5 20.5-20.5s20.5 9.2 20.5 20.5-9.2 20.5-20.5 20.5c-2.5 0-4.88-.47-7.09-1.29L129 208.892v30.88z"/>
       </svg>
-      <div id="ha-launch-screen-info-box" class="ha-launch-screen-spacer-bottom"></div>
+      <div id="ha-launch-screen-info-box" class="ha-launch-screen-spacer"></div>
-      <div class="ohf-logo">
-        <img src="/static/images/ohf-badge.svg" alt="Home Assistant is a project by the Open Home Foundation" height="46">
-      </div>
     </div>
     <ha-demo></ha-demo>
     <%= renderTemplate("../../../src/html/_js_base.html.template") %>
     <%= renderTemplate("../../../src/html/_preload_roboto.html.template") %>
-    <%= renderTemplate("../../../src/html/_script_loader.html.template") %>
+    <script>
+      // Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
+      if (!isS11_12) {
+        <% for (const entry of latestEntryJS) { %>
+          import("<%= entry %>");
+        <% } %>
+        window.latestJS = true;
+      }
+    </script>
+    <%= renderTemplate("../../../src/html/_script_load_es5.html.template") %>
+    <script>
+      var _gaq = [["_setAccount", "UA-57927901-5"], ["_trackPageview"]];
+      (function (d, t) {
+        var g = d.createElement(t),
+          s = d.getElementsByTagName(t)[0];
+        g.src =
+          ("https:" == location.protocol ? "//ssl" : "//www") +
+          ".google-analytics.com/ga.js";
+        s.parentNode.insertBefore(g, s);
+      })(document, "script");
+    </script>
   </body>
 </html>

demo/src/stubs/area_registry.ts

@@ -1,4 +1,4 @@
-import type { AreaRegistryEntry } from "../../../src/data/area_registry";
+import { AreaRegistryEntry } from "../../../src/data/area_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockAreaRegistry = (

demo/src/stubs/auth.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockAuth = (hass: MockHomeAssistant) => {
   hass.mockWS("config/auth/list", () => []);

demo/src/stubs/config.ts

@@ -1,9 +0,0 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockConfig = (hass: MockHomeAssistant) => {
-  hass.mockWS("validate_config", () => ({
-    actions: { valid: true },
-    conditions: { valid: true },
-    triggers: { valid: true },
-  }));
-};

demo/src/stubs/config_entries.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockConfigEntries = (hass: MockHomeAssistant) => {
   hass.mockWS("config_entries/get", () => ({

demo/src/stubs/device_registry.ts

@@ -1,4 +1,4 @@
-import type { DeviceRegistryEntry } from "../../../src/data/device_registry";
+import { DeviceRegistryEntry } from "../../../src/data/device_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockDeviceRegistry = (

demo/src/stubs/energy.ts

@@ -1,11 +1,11 @@
-import { format, startOfToday, startOfTomorrow } from "date-fns";
+import { format, startOfToday, startOfTomorrow } from "date-fns/esm";
-import type {
+import {
   EnergyInfo,
   EnergyPreferences,
   EnergySolarForecasts,
   FossilEnergyConsumption,
 } from "../../../src/data/energy";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEnergy = (hass: MockHomeAssistant) => {
   hass.mockWS(

demo/src/stubs/entities.ts

@@ -1,55 +1,5 @@
 import { convertEntities } from "../../../src/fake_data/entity";
 
-export const mapEntities = () =>
-  convertEntities({
-    "zone.home": {
-      entity_id: "zone.home",
-      state: "zoning",
-      attributes: {
-        hidden: true,
-        latitude: 52.3631339,
-        longitude: 4.8903147,
-        radius: 200,
-        friendly_name: "Home",
-        icon: "hademo:home",
-      },
-    },
-    "zone.uva": {
-      entity_id: "zone.buckhead",
-      state: "zoning",
-      attributes: {
-        hidden: true,
-        radius: 400,
-        friendly_name: "UvA",
-        icon: "hademo:school",
-        latitude: 52.3558182,
-        longitude: 4.9535376,
-      },
-    },
-    "person.arsaboo": {
-      entity_id: "person.arsaboo",
-      state: "not_home",
-      attributes: {
-        radius: 50,
-        friendly_name: "Arsaboo",
-        latitude: 52.3579946,
-        longitude: 4.8664597,
-        entity_picture: "/assets/arsaboo/images/arsaboo.jpg",
-      },
-    },
-    "person.melody": {
-      entity_id: "person.melody",
-      state: "not_home",
-      attributes: {
-        radius: 50,
-        friendly_name: "Melody",
-        latitude: 52.3408927,
-        longitude: 4.8711073,
-        entity_picture: "/assets/arsaboo/images/melody.jpg",
-      },
-    },
-  });
-
 export const energyEntities = () =>
   convertEntities({
     "sensor.grid_fossil_fuel_percentage": {

demo/src/stubs/entity_registry.ts

@@ -1,4 +1,4 @@
-import type { EntityRegistryEntry } from "../../../src/data/entity_registry";
+import { EntityRegistryEntry } from "../../../src/data/entity_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEntityRegistry = (

demo/src/stubs/events.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockEvents = (hass: MockHomeAssistant) => {
   hass.mockAPI("events", () => []);

demo/src/stubs/floor_registry.ts

@@ -1,4 +1,4 @@
-import type { FloorRegistryEntry } from "../../../src/data/floor_registry";
+import { FloorRegistryEntry } from "../../../src/data/floor_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockFloorRegistry = (

demo/src/stubs/frontend.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockFrontend = (hass: MockHomeAssistant) => {
   hass.mockWS("frontend/get_user_data", () => ({

demo/src/stubs/hassio_supervisor.ts

@@ -1,4 +1,4 @@
-import type { HassioSupervisorInfo } from "../../../src/data/hassio/supervisor";
+import { HassioSupervisorInfo } from "../../../src/data/hassio/supervisor";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockHassioSupervisor = (hass: MockHomeAssistant) => {

demo/src/stubs/history.ts

@@ -1,6 +1,6 @@
-import type { HassEntity } from "home-assistant-js-websocket";
+import { HassEntity } from "home-assistant-js-websocket";
-import type { HistoryStates } from "../../../src/data/history";
+import { HistoryStates } from "../../../src/data/history";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 const generateStateHistory = (
   state: HassEntity,

demo/src/stubs/icons.ts

@@ -1,6 +1,6 @@
-import type { IconCategory } from "../../../src/data/icons";
+import { IconCategory } from "../../../src/data/icons";
 import { ENTITY_COMPONENT_ICONS } from "../../../src/fake_data/entity_component_icons";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockIcons = (hass: MockHomeAssistant) => {
   hass.mockWS(

demo/src/stubs/label_registry.ts

@@ -1,4 +1,4 @@
-import type { LabelRegistryEntry } from "../../../src/data/label_registry";
+import { LabelRegistryEntry } from "../../../src/data/label_registry";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockLabelRegistry = (

demo/src/stubs/lovelace.ts

@@ -1,52 +1,35 @@
 import type { LocalizeFunc } from "../../../src/common/translations/localize";
 import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-import {
+import { selectedDemoConfig } from "../configs/demo-configs";
-  selectedDemoConfig,
-  selectedDemoConfigIndex,
-  setDemoConfig,
-} from "../configs/demo-configs";
 import "../custom-cards/cast-demo-row";
 import "../custom-cards/ha-demo-card";
-import { mapEntities } from "./entities";
+import type { HADemoCard } from "../custom-cards/ha-demo-card";
 
 export const mockLovelace = (
   hass: MockHomeAssistant,
   localizePromise: Promise<LocalizeFunc>
 ) => {
-  hass.mockWS("lovelace/config", ({ url_path }) => {
+  hass.mockWS("lovelace/config", () =>
-    if (url_path === "map") {
+    Promise.all([selectedDemoConfig, localizePromise]).then(
-      hass.addEntities(mapEntities());
-      return {
-        strategy: {
-          type: "map",
-        },
-      };
-    }
-    return Promise.all([selectedDemoConfig, localizePromise]).then(
       ([config, localize]) => config.lovelace(localize)
-    );
+    )
-  });
+  );
 
   hass.mockWS("lovelace/config/save", () => Promise.resolve());
   hass.mockWS("lovelace/resources", () => Promise.resolve([]));
 };
 
-customElements.whenDefined("hui-root").then(() => {
+customElements.whenDefined("hui-view").then(() => {
   // eslint-disable-next-line
-  const HUIRoot = customElements.get("hui-root")!;
+  const HUIView = customElements.get("hui-view");
+  // Patch HUI-VIEW to make the lovelace object available to the demo card
+  const oldCreateCard = HUIView!.prototype.createCardElement;
 
-  const oldFirstUpdated = HUIRoot.prototype.firstUpdated;
+  HUIView!.prototype.createCardElement = function (config) {
-
+    const el = oldCreateCard.call(this, config);
-  HUIRoot.prototype.firstUpdated = function (changedProperties) {
+    if (el.tagName === "HA-DEMO-CARD") {
-    oldFirstUpdated.call(this, changedProperties);
+      (el as HADemoCard).lovelace = this.lovelace;
-    this.addEventListener("set-demo-config", async (ev) => {
+    }
-      const index = (ev as CustomEvent).detail.index;
+    return el;
-      try {
-        await setDemoConfig(this.hass, this.lovelace!, index);
-      } catch (err: any) {
-        setDemoConfig(this.hass, this.lovelace!, selectedDemoConfigIndex);
-        alert("Failed to switch config :-(");
-      }
-    });
   };
 });

demo/src/stubs/media_player.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockMediaPlayer = (hass: MockHomeAssistant) => {
   hass.mockWS("media_player_thumbnail", () => Promise.reject());

demo/src/stubs/persistent_notification.ts

@@ -1,5 +1,5 @@
-import type { PersistentNotificationMessage } from "../../../src/data/persistent_notification";
+import { PersistentNotificationMessage } from "../../../src/data/persistent_notification";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockPersistentNotification = (hass: MockHomeAssistant) => {
   hass.mockWS("persistent_notification/subscribe", (_msg, _hass, onChange) => {

demo/src/stubs/recorder.ts

@@ -5,12 +5,12 @@ import {
   differenceInHours,
   endOfDay,
 } from "date-fns";
-import type {
+import {
   Statistics,
   StatisticsMetaData,
   StatisticValue,
 } from "../../../src/data/recorder";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 const generateMeanStatistics = (
   start: Date,

demo/src/stubs/sensor.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockSensor = (hass: MockHomeAssistant) => {
   hass.mockWS("sensor/numeric_device_classes", () => [

demo/src/stubs/system_log.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockSystemLog = (hass: MockHomeAssistant) => {
   hass.mockAPI("error/all", () => []);

demo/src/stubs/tags.ts

@@ -1,6 +0,0 @@
-import type { Tag } from "../../../src/data/tag";
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
-
-export const mockTags = (hass: MockHomeAssistant) => {
-  hass.mockWS("tag/list", () => [{ id: "my-tag", name: "My Tag" }] as Tag[]);
-};

demo/src/stubs/template.ts

@@ -1,4 +1,4 @@
-import type { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
+import { MockHomeAssistant } from "../../../src/fake_data/provide_hass";
 
 export const mockTemplate = (hass: MockHomeAssistant) => {
   hass.mockAPI("template", () =>