Merge branch 'seek-feature' of https://github.com/zsarnett/home-assistant-polymer into zsarnett-seek-feature

.eslintrc-hound.json

@@ -0,0 +1,80 @@
+{
+  "extends": ["airbnb-base", "prettier"],
+  "parserOptions": {
+    "ecmaVersion": "2020",
+    "ecmaFeatures": {
+      "jsx": true,
+      "modules": true
+    }
+  },
+  "settings": {
+    "react": {
+      "pragma": "h",
+      "version": "15.0"
+    },
+    "import/resolver": {
+      "webpack": {
+        "config": "webpack.config.js"
+      }
+    }
+  },
+  "globals": {
+    "__DEV__": false,
+    "__DEMO__": false,
+    "__BUILD__": false,
+    "__VERSION__": false,
+    "__STATIC_PATH__": false,
+    "Polymer": true,
+    "webkitSpeechRecognition": false,
+    "ResizeObserver": false
+  },
+  "env": {
+    "browser": true,
+    "mocha": true
+  },
+  "rules": {
+    "class-methods-use-this": 0,
+    "new-cap": 0,
+    "prefer-template": 0,
+    "object-shorthand": 0,
+    "func-names": 0,
+    "prefer-arrow-callback": 0,
+    "no-underscore-dangle": 0,
+    "no-var": 0,
+    "strict": 0,
+    "prefer-spread": 0,
+    "no-plusplus": 0,
+    "no-bitwise": 0,
+    "comma-dangle": 0,
+    "vars-on-top": 0,
+    "no-continue": 0,
+    "no-param-reassign": 0,
+    "no-multi-assign": 0,
+    "radix": 0,
+    "no-alert": 0,
+    "no-return-await": 0,
+    "prefer-destructuring": 0,
+    "no-restricted-globals": [2, "event"],
+    "prefer-promise-reject-errors": 0,
+    "import/prefer-default-export": 0,
+    "import/no-unresolved": 0,
+    "import/extensions": [2, "ignorePackages"],
+    "object-curly-newline": 0,
+    "default-case": 0,
+    "react/jsx-no-bind": [2, { "ignoreRefs": true }],
+    "react/jsx-no-duplicate-props": 2,
+    "react/self-closing-comp": 2,
+    "react/prefer-es6-class": 2,
+    "react/no-string-refs": 2,
+    "react/require-render-return": 2,
+    "react/no-find-dom-node": 2,
+    "react/no-is-mounted": 2,
+    "react/jsx-no-comment-textnodes": 2,
+    "react/jsx-no-undef": 2,
+    "react/jsx-uses-react": 2,
+    "react/jsx-uses-vars": 2,
+    "no-restricted-syntax": [0, "ForOfStatement"],
+    "prettier/prettier": "error"
+  },
+  "plugins": ["react", "prettier"]
+}

.eslintrc.json

@@ -1,88 +1,12 @@
 {
-  "extends": [
-    "plugin:@typescript-eslint/recommended",
-    "airbnb-typescript/base",
-    "plugin:wc/recommended",
-    "plugin:lit/recommended",
-    "prettier",
-    "prettier/@typescript-eslint"
-  ],
-  "parser": "@typescript-eslint/parser",
-  "parserOptions": {
-    "ecmaVersion": 2020,
-    "ecmaFeatures": {
-      "modules": true
-    },
-    "sourceType": "module",
-    "project": "./tsconfig.json"
-  },
-  "settings": {
-    "import/resolver": {
-      "webpack": {
-        "config": "./webpack.config.js"
-      }
-    }
-  },
-  "globals": {
-    "__DEV__": false,
-    "__DEMO__": false,
-    "__BUILD__": false,
-    "__VERSION__": false,
-    "__STATIC_PATH__": false,
-    "Polymer": true,
-    "webkitSpeechRecognition": false,
-    "ResizeObserver": false
-  },
+  "extends": "./.eslintrc-hound.json",
+  "plugins": ["react"],
   "env": {
-    "browser": true,
-    "es6": true
+    "browser": true
   },
   "rules": {
-    "class-methods-use-this": 0,
-    "new-cap": 0,
-    "prefer-template": 0,
-    "object-shorthand": 0,
-    "func-names": 0,
-    "prefer-arrow-callback": 0,
-    "no-underscore-dangle": 0,
-    "no-var": 0,
-    "strict": 0,
-    "prefer-spread": 0,
-    "no-plusplus": 0,
-    "no-bitwise": 0,
-    "comma-dangle": 0,
-    "vars-on-top": 0,
-    "no-continue": 0,
-    "no-param-reassign": 0,
-    "no-multi-assign": 0,
-    "radix": 0,
-    "no-alert": 0,
-    "no-return-await": 0,
-    "no-nested-ternary": 0,
-    "prefer-destructuring": 0,
-    "no-restricted-globals": [2, "event"],
-    "prefer-promise-reject-errors": 0,
-    "import/order": 0,
-    "import/prefer-default-export": 0,
-    "import/no-unresolved": 0,
-    "import/no-cycle": 0,
-    "import/extensions": [
-      2,
-      "ignorePackages",
-      { "ts": "never", "js": "never" }
-    ],
-    "no-restricted-syntax": ["error", "LabeledStatement", "WithStatement"],
-    "object-curly-newline": 0,
-    "default-case": 0,
-    "wc/no-self-class": 0,
-    "@typescript-eslint/camelcase": 0,
-    "@typescript-eslint/ban-ts-ignore": 0,
-    "@typescript-eslint/no-use-before-define": 0,
-    "@typescript-eslint/no-non-null-assertion": 0,
-    "@typescript-eslint/no-explicit-any": 0,
-    "@typescript-eslint/no-unused-vars": 0,
-    "@typescript-eslint/explicit-function-return-type": 0
-  },
-  "plugins": ["disable", "import", "lit", "prettier", "@typescript-eslint"],
-  "processor": "disable/disable"
+    "import/no-unresolved": 2,
+    "linebreak-style": 0,
+    "implicit-arrow-linebreak": 0
+  }
 }

.gitattributes

@@ -11,4 +11,3 @@
 *.mp3 binary
 
 demo/public/api/camera_proxy_stream/* binary
-demo/public/api/media_player_proxy/* binary

.github/ISSUE_TEMPLATE/BUG_REPORT.md

@@ -3,7 +3,6 @@ name: Report a bug with the UI, Frontend or Lovelace
 about: Report an issue related to the Home Assistant frontend.
 labels: bug
 ---
-
 <!-- READ THIS FIRST:
 - If you need additional help with this template please refer to https://www.home-assistant.io/help/reporting_issues/
 - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/home-assistant/releases
@@ -11,7 +10,6 @@ labels: bug
 - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
 DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
 -->
-
 ## Checklist
 
 - [ ] I have updated to the latest available Home Assistant version.
@@ -19,22 +17,21 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 - [ ] I have tried a different browser to see if it is related to my browser.
 
 ## The problem
-
 <!--
   Describe the issue you are experiencing here to communicate to the
   maintainers. Tell us about the current behavior.
   If possible provide a screenshot with a description.
 -->
 
-## Expected behavior
 
-<!--
+## Expected behavior
+<!-- 
   Describe what you expected to happen or it should look/behave.
   If possible provide a screenshot with a description.
 -->
 
-## Steps to reproduce
 
+## Steps to reproduce
 <!--
   Provide steps for us, that helps reproducing your issue.
   For example:
@@ -46,8 +43,8 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
     6. Set the HVAC action to cool
 -->
 
-## Environment
 
+## Environment
 <!--
   Provide details about the versions you are using, which helps us reproducing
   and finding the issue quicker. Version information is found in the
@@ -57,25 +54,13 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
   your issue in a different browser and be sure to include your findings.
 -->
 
-- Home Assistant release with the issue:
-- Last working Home Assistant release (if known):
-- Browser and browser version:
-- Operating system:
-
-## State of relevant entities
-
-<!--
-  If your issue is about how an entity is shown in the UI, please add the state
-  and attributes for all situations with a screenshot of the UI.
-  You can find this information at `/developer-tools/state`
--->
-
-```yaml
-
-```
+- Home Assistant release with the issue: 
+- Last working Home Assistant release (if known): 
+- UI Type (States or Lovelace): 
+- Browser and browser version: 
+- Operating system: 
 
 ## Problem-relevant configuration
-
 <!--
   An example configuration that caused the problem for you. Fill this out even
   if it seems unimportant to you. Please be sure to remove personal information
@@ -87,7 +72,6 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 ```
 
 ## Javascript errors shown in your browser console/inspector
-
 <!--
   If you come across any javascript or other error logs, e.g., in your browser
   console/inspector please provide them.
@@ -98,3 +82,4 @@ DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed w
 ```
 
 ## Additional information
+

.github/ISSUE_TEMPLATE/FEATURE_REQUEST.md

@@ -3,24 +3,23 @@ name: Request a feature for the UI, Frontend or Lovelace
 about: Request an new feature for the Home Assistant frontend.
 labels: feature request
 ---
-
 <!--
   DO NOT DELETE ANY TEXT from this template!
   Otherwise, your request may be closed without comment.
 -->
-
 ## The request
-
-<!--
+<!-- 
   Describe to our maintainers, the feature you would like to be added.
   Please be clear and concise and, if possible, provide a screenshot or mockup.
 -->
 
-## The alternatives
 
+## The alternatives
 <!--
   Are you currently using, or have you considered alternatives?
   If so, could you please describe those?
 -->
 
+
 ## Additional information
+

.github/ISSUE_TEMPLATE/config.yml

@@ -1,7 +1,7 @@
 blank_issues_enabled: false
 contact_links:
   - name: Report a bug that is NOT related to the UI, Frontend or Lovelace
-    url: https://github.com/home-assistant/core/issues
+    url: https://github.com/home-assistant/home-assistant/issues
     about: This is the issue tracker for our frontend. Please report other issues with the backend repository.
   - name: Report incorrect or missing information on our website
     url: https://github.com/home-assistant/home-assistant.io/issues

.github/PULL_REQUEST_TEMPLATE.md

@@ -2,9 +2,7 @@
   You are amazing! Thanks for contributing to our project!
   Please, DO NOT DELETE ANY TEXT from this template! (unless instructed).
 -->
-
 ## Breaking change
-
 <!--
   If your PR contains a breaking change for existing users, it is important
   to tell them what breaks, how to make it work again and why we did this.
@@ -13,20 +11,20 @@
   Note: Remove this section if this PR is NOT a breaking change.
 -->
 
-## Proposed change
 
-<!--
+## Proposed change
+<!-- 
   Describe the big picture of your changes here to communicate to the
   maintainers why we should accept this pull request. If it fixes a bug
   or resolves a feature request, be sure to link to that issue in the
   additional information section.
 -->
 
-## Type of change
 
+## Type of change
 <!--
   What type of change does your PR introduce to the Home Assistant frontend?
-  NOTE: Please, check only 1! box!
+  NOTE: Please, check only 1! box! 
   If your PR requires multiple boxes to be checked, you'll most likely need to
   split it into multiple PRs. This makes things easier and faster to code review.
 -->
@@ -38,7 +36,6 @@
 - [ ] Code quality improvements to existing code or addition of tests
 
 ## Example configuration
-
 <!--
   Supplying a configuration snippet, makes it easier for a maintainer to test
   your PR.
@@ -49,18 +46,16 @@
 ```
 
 ## Additional information
-
 <!--
   Details are important, and help maintainers processing your PR.
   Please be sure to fill out additional details, if applicable.
 -->
 
 - This PR fixes or closes issue: fixes #
-- This PR is related to issue:
-- Link to documentation pull request:
+- This PR is related to issue: 
+- Link to documentation pull request: 
 
 ## Checklist
-
 <!--
   Put an `x` in the boxes that apply. You can also fill these out after
   creating the PR. If you're unsure about any of them, don't hesitate to ask.
@@ -79,5 +74,4 @@ If user exposed functionality or configuration variables are added/changed:
 <!--
   Thank you for contributing <3
 -->
-
 [docs-repository]: https://github.com/home-assistant/home-assistant.io

.github/lock.yml

@@ -24,4 +24,4 @@ only: pulls
 
 # Optionally, specify configuration settings just for `issues` or `pulls`
 issues:
-  daysUntilLock: 30
+   daysUntilLock: 30

.github/workflows/ci.yaml

@@ -1,125 +0,0 @@
-name: CI
-
-on:
-  push:
-    branches:
-      - dev
-      - master
-  pull_request:
-    branches:
-      - dev
-      - master
-
-jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v2
-      - name: Setting up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Get yarn cache path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Fetching Yarn cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-      - name: Build icons
-        run: ./node_modules/.bin/gulp gen-icons-json
-      - name: Build translations
-        run: ./node_modules/.bin/gulp build-translations
-      - name: Run eslint
-        run: ./node_modules/.bin/eslint '{**/src,src}/**/*.{js,ts,html}' --ignore-path .gitignore
-      - name: Run tsc
-        run: ./node_modules/.bin/tsc
-  test:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v2
-      - name: Setting up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Get yarn cache path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Fetching Yarn cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-      - name: Run Mocha
-        run: npm run mocha
-  build:
-    runs-on: ubuntu-latest
-    needs: [lint, test]
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v2
-      - name: Setting up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Get yarn cache path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Fetching Yarn cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-      - name: Build Application
-        run: ./node_modules/.bin/gulp build-app
-        env:
-          IS_TEST: "true"
-  supervisor:
-    runs-on: ubuntu-latest
-    needs: [lint, test]
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v2
-      - name: Setting up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Get yarn cache path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Fetching Yarn cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-      - name: Build Application
-        run: ./node_modules/.bin/gulp build-hassio
-        env:
-          IS_TEST: "true"

.github/workflows/demo.yaml

@@ -1,39 +0,0 @@
-name: Demo
-
-on:
-  push:
-    branches:
-      - dev
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
-      - name: Check out files from GitHub
-        uses: actions/checkout@v2
-      - name: Setting up Node.js
-        uses: actions/setup-node@v1
-        with:
-          node-version: 12.x
-      - name: Get yarn cache path
-        id: yarn-cache-dir-path
-        run: echo "::set-output name=dir::$(yarn cache dir)"
-      - name: Fetching Yarn cache
-        uses: actions/cache@v1
-        with:
-          path: ${{ steps.yarn-cache-dir-path.outputs.dir }}
-          key: ${{ runner.os }}-yarn-${{ hashFiles('**/yarn.lock') }}
-          restore-keys: |
-            ${{ runner.os }}-yarn-
-      - name: Install dependencies
-        run: yarn install
-        env:
-          CI: true
-      - name: Build Demo
-        run: ./node_modules/.bin/gulp build-demo
-      - name: Deploy to Netlify
-        uses: netlify/actions/cli@master
-        env:
-          NETLIFY_AUTH_TOKEN: ${{ secrets.NETLIFY_AUTH_TOKEN }}
-          NETLIFY_SITE_ID: ${{ secrets.NETLIFY_DEMO_DEV_SITE_ID }}
-        with:
-          args: deploy --dir=demo/dist --prod

.github/workflows/release-drafter.yaml

@@ -1,14 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - dev
-
-jobs:
-  update_release_draft:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -5,6 +5,7 @@ npm-debug.log
 .DS_Store
 hass_frontend/*
 .reify-cache
+demo/hademo-icons.html
 
 # Python stuff
 *.py[cod]
@@ -30,6 +31,3 @@ src/cast/dev_const.ts
 # Secrets
 .lokalise_token
 yarn-error.log
-
-#asdf
-.tool-versions

.prettierignore

@@ -1,10 +0,0 @@
-build
-build-translations/*
-translations/*
-node_modules/*
-hass_frontend/*
-pip-selfcheck.json
-
-# vscode
-.vscode/*
-!.vscode/extensions.json

.travis.yml

@@ -0,0 +1,18 @@
+sudo: false
+language: node_js
+cache:
+  yarn: true
+  directories:
+    - bower_components
+install: yarn install
+script:
+  - npm run build
+  - hassio/script/build_hassio
+  # Because else eslint fails because hassio has cleaned that build
+  - ./node_modules/.bin/gulp gen-icons-app
+  - npm run test
+  # - xvfb-run wct --module-resolution=node --npm
+  # - 'if [ "${TRAVIS_PULL_REQUEST}" = "false" ]; then wct --module-resolution=node --npm --plugin sauce; fi'
+dist: trusty
+addons:
+  sauce_connect: true

.vscode/extensions.json

@@ -1,6 +1,7 @@
 {
   "recommendations": [
     "dbaeumer.vscode-eslint",
+    "ms-vscode.vscode-typescript-tslint-plugin",
     "esbenp.prettier-vscode",
     "bierner.lit-html",
     "runem.lit-plugin"

CODE_OF_CONDUCT.md

@@ -2,139 +2,79 @@
 
 ## Our Pledge
 
-We as members, contributors, and leaders pledge to make participation in our
-community a harassment-free experience for everyone, regardless of age, body
-size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
-nationality, personal appearance, race, religion, or sexual identity
-and orientation.
-
-We pledge to act and interact in ways that contribute to an open, welcoming,
-diverse, inclusive, and healthy community.
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
 
 ## Our Standards
 
-Examples of behavior that contributes to a positive environment for our
-community include:
+Examples of behavior that contributes to creating a positive environment
+include:
 
-* Demonstrating empathy and kindness toward other people
-* Being respectful of differing opinions, viewpoints, and experiences
-* Giving and gracefully accepting constructive feedback
-* Accepting responsibility and apologizing to those affected by our mistakes,
-  and learning from the experience
-* Focusing on what is best not just for us as individuals, but for the
-  overall community
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
 
-Examples of unacceptable behavior include:
+Examples of unacceptable behavior by participants include:
 
-* The use of sexualized language or imagery, and sexual attention or
-  advances of any kind
-* Trolling, insulting or derogatory comments, and personal or political attacks
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
 * Public or private harassment
-* Publishing others' private information, such as a physical or email
-  address, without their explicit permission
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
 * Other conduct which could reasonably be considered inappropriate in a
   professional setting
 
-## Enforcement Responsibilities
+## Our Responsibilities
 
-Community leaders are responsible for clarifying and enforcing our standards of
-acceptable behavior and will take appropriate and fair corrective action in
-response to any behavior that they deem inappropriate, threatening, offensive,
-or harmful.
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
 
-Community leaders have the right and responsibility to remove, edit, or reject
-comments, commits, code, wiki edits, issues, and other contributions that are
-not aligned to this Code of Conduct, and will communicate reasons for moderation
-decisions when appropriate.
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
 
 ## Scope
 
-This Code of Conduct applies within all community spaces, and also applies when
-an individual is officially representing the community in public spaces.
-Examples of representing our community include using an official e-mail address,
-posting via an official social media account, or acting as an appointed
-representative at an online or offline event.
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
 
 ## Enforcement
 
 Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported to the community leaders responsible for enforcement at
-[safety@home-assistant.io][email] or by using the report/flag feature of
-the medium used. All complaints will be reviewed and investigated promptly and
-fairly.
+reported by contacting the project team at [safety@home-assistant.io][email]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
 
-All community leaders are obligated to respect the privacy and security of the
-reporter of any incident.
-
-## Enforcement Guidelines
-
-Community leaders will follow these Community Impact Guidelines in determining
-the consequences for any action they deem in violation of this Code of Conduct:
-
-### 1. Correction
-
-**Community Impact**: Use of inappropriate language or other behavior deemed
-unprofessional or unwelcome in the community.
-
-**Consequence**: A private, written warning from community leaders, providing
-clarity around the nature of the violation and an explanation of why the
-behavior was inappropriate. A public apology may be requested.
-
-### 2. Warning
-
-**Community Impact**: A violation through a single incident or series
-of actions.
-
-**Consequence**: A warning with consequences for continued behavior. No
-interaction with the people involved, including unsolicited interaction with
-those enforcing the Code of Conduct, for a specified period of time. This
-includes avoiding interactions in community spaces as well as external channels
-like social media. Violating these terms may lead to a temporary or
-permanent ban.
-
-### 3. Temporary Ban
-
-**Community Impact**: A serious violation of community standards, including
-sustained inappropriate behavior.
-
-**Consequence**: A temporary ban from any sort of interaction or public
-communication with the community for a specified period of time. No public or
-private interaction with the people involved, including unsolicited interaction
-with those enforcing the Code of Conduct, is allowed during this period.
-Violating these terms may lead to a permanent ban.
-
-### 4. Permanent Ban
-
-**Community Impact**: Demonstrating a pattern of violation of community
-standards, including sustained inappropriate behavior,  harassment of an
-individual, or aggression toward or disparagement of classes of individuals.
-
-**Consequence**: A permanent ban from any sort of public interaction within
-the community.
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
 
 ## Attribution
 
-This Code of Conduct is adapted from the [Contributor Covenant][homepage],
-version 2.0, available [here][version].
-
-Community Impact Guidelines were inspired by [Mozilla's code of conduct
-enforcement ladder][mozilla].
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available [here][version].
 
 ## Adoption
 
-This Code of Conduct was first adopted January 21st, 2017 and announced in
-[this][coc-blog] blog post and has been updated on May 25th, 2020 to version
-2.0 of the [Contributor Covenant][homepage] as announced in [this][coc2-blog]
-blog post.
+This Code of Conduct was first adopted January 21st, 2017 and announced in [this][coc-blog] blog post.
 
-For answers to common questions about this code of conduct, see the FAQ at
-<https://www.contributor-covenant.org/faq>. Translations are available at
-<https://www.contributor-covenant.org/translations>.
-
-[coc-blog]: /blog/2017/01/21/home-assistant-governance/
-[coc2-blog]: /blog/2020/05/25/code-of-conduct-updated/
-[email]: mailto:safety@home-assistant.io
 [homepage]: http://contributor-covenant.org
-[mozilla]: https://github.com/mozilla/diversity
-[version]: https://www.contributor-covenant.org/version/2/0/code_of_conduct.html
+[version]: http://contributor-covenant.org/version/1/4/
+[email]: mailto:safety@home-assistant.io
+[coc-blog]: https://home-assistant.io/blog/2017/01/21/home-assistant-governance/

README.md

@@ -1,4 +1,4 @@
-# Home Assistant Frontend
+# Home Assistant Polymer [![Build Status](https://travis-ci.org/home-assistant/home-assistant-polymer.svg?branch=master)](https://travis-ci.org/home-assistant/home-assistant-polymer)
 
 This is the repository for the official [Home Assistant](https://home-assistant.io) frontend.
 
@@ -6,12 +6,12 @@ This is the repository for the official [Home Assistant](https://home-assistant.
 
 - [View demo of Home Assistant](https://demo.home-assistant.io/)
 - [More information about Home Assistant](https://home-assistant.io)
-- [Frontend development instructions](https://developers.home-assistant.io/docs/frontend/development/)
+- [Frontend development instructions](https://developers.home-assistant.io/docs/en/frontend_index.html)
 
 ## Development
 
 - Initial setup: `script/setup`
-- Development: [Instructions](https://developers.home-assistant.io/docs/frontend/development/)
+- Development: [Instructions](https://developers.home-assistant.io/docs/en/frontend_development.html)
 - Production build: `script/build_frontend`
 - Gallery: `cd gallery && script/develop_gallery`
 - Hass.io: [Instructions](https://developers.home-assistant.io/docs/en/hassio_hass.html)
@@ -19,15 +19,12 @@ This is the repository for the official [Home Assistant](https://home-assistant.
 ## Frontend development
 
 ### Classic environment
-
 A complete guide can be found at the following [link](https://www.home-assistant.io/developers/frontend/). It describes a short guide for the build of project.
 
 ### Docker environment
-
 It is possible to compile the project and/or run commands in the development environment having only the [Docker](https://www.docker.com) pre-installed in the system. On the root of project you can do:
-
-- `sh ./script/docker_run.sh build` Build all the project with one command
-- `sh ./script/docker_run.sh bash` Open an interactive shell (the same environment generated by the _classic environment_) where you can run commands. This bash work on your project directory and any change on your file is automatically present within your build bash.
+* `sh ./script/docker_run.sh build` Build all the project with one command
+* `sh ./script/docker_run.sh bash` Open an interactive shell (the same environment generated by the *classic environment*) where you can run commands. This bash work on your project directory and any change on your file is automatically present within your build bash.
 
 **Note**: if you have installed `npm` in addition to the `docker`, you can use the commands `npm run docker_build` and `npm run bash` to get a full build or bash as explained above
 

azure-pipelines-netlify.yml

@@ -8,7 +8,7 @@ schedules:
     branches:
       include:
       - dev
-    always: true
+    always: false
 variables:
   - group: netlify
 
@@ -24,7 +24,4 @@ jobs:
 
       # Demo
       curl -X POST -d {} https://api.netlify.com/build_hooks/${NETLIFY_DEMO}
-
-      # Gallery
-      curl -X POST -d {} https://api.netlify.com/build_hooks/${NETLIFY_GALLERY}
     displayName: 'Trigger netlify build preview'

azure-pipelines-release.yml

@@ -8,7 +8,7 @@ trigger:
 pr: none
 variables:
   - name: versionWheels
-    value: '1.10.1-3.7-alpine3.11'
+    value: '1.3-3.7-alpine3.10'
   - name: versionNode
     value: '12.1'
   - group: twine
@@ -47,13 +47,18 @@ stages:
 
               script/release
             displayName: "Build and release package"
-  - stage: "Wheels"
-    jobs:
       - template: templates/azp-job-wheels.yaml@azure
         parameters:
           builderVersion: '$(versionWheels)'
-          wheelsRequirement: 'requirement.txt'
+          builderApk: 'build-base'
+          wheelsLocal: true
           preBuild:
+          - task: NodeTool@0
+            displayName: "Use Node $(versionNode)"
+            inputs:
+              versionSpec: "$(versionNode)"
           - script: |
-              sleep 240
-              echo "home-assistant-frontend==$(Build.SourceBranchName)" > requirement.txt
+              set -e
+
+              yarn install
+              script/build_frontend

azure-pipelines-translation.yml

@@ -11,7 +11,7 @@ trigger:
 pr: none
 schedules:
   - cron: "30 0 * * *"
-    displayName: "frontend translation update"
+    displayName: "translation update"
     branches:
       include:
       - dev

build-scripts/babel.js

@@ -0,0 +1,50 @@
+module.exports.babelLoaderConfig = ({ latestBuild }) => {
+  if (latestBuild === undefined) {
+    throw Error("latestBuild not defined for babel loader config");
+  }
+  return {
+    test: /\.m?js$|\.tsx?$/,
+    use: {
+      loader: "babel-loader",
+      options: {
+        presets: [
+          !latestBuild && [
+            require("@babel/preset-env").default,
+            { modules: false },
+          ],
+          [
+            require("@babel/preset-typescript").default,
+            {
+              jsxPragma: "h",
+            },
+          ],
+        ].filter(Boolean),
+        plugins: [
+          // Part of ES2018. Converts {...a, b: 2} to Object.assign({}, a, {b: 2})
+          [
+            "@babel/plugin-proposal-object-rest-spread",
+            { loose: true, useBuiltIns: true },
+          ],
+          // Only support the syntax, Webpack will handle it.
+          "@babel/syntax-dynamic-import",
+          [
+            "@babel/transform-react-jsx",
+            {
+              pragma: "h",
+            },
+          ],
+          "@babel/plugin-proposal-optional-chaining",
+          "@babel/plugin-proposal-nullish-coalescing-operator",
+          [
+            require("@babel/plugin-proposal-decorators").default,
+            { decoratorsBeforeExport: true },
+          ],
+          [
+            require("@babel/plugin-proposal-class-properties").default,
+            { loose: true },
+          ],
+        ],
+      },
+    },
+  };
+};

build-scripts/bundle.js

@@ -1,196 +0,0 @@
-const path = require("path");
-const env = require("./env.js");
-const paths = require("./paths.js");
-
-// Files from NPM Packages that should not be imported
-module.exports.ignorePackages = ({ latestBuild }) => [
-  // Bloats bundle and it's not used.
-  path.resolve(require.resolve("moment"), "../locale"),
-  // Part of yaml.js and only used for !!js functions that we don't use
-  require.resolve("esprima"),
-];
-
-// Files from NPM packages that we should replace with empty file
-module.exports.emptyPackages = ({ latestBuild }) =>
-  [
-    // Contains all color definitions for all material color sets.
-    // We don't use it
-    require.resolve("@polymer/paper-styles/color.js"),
-    require.resolve("@polymer/paper-styles/default-theme.js"),
-    // Loads stuff from a CDN
-    require.resolve("@polymer/font-roboto/roboto.js"),
-    require.resolve("@vaadin/vaadin-material-styles/font-roboto.js"),
-    // Compatibility not needed for latest builds
-    latestBuild &&
-      path.resolve(paths.polymer_dir, "src/entrypoints/compatibility.ts"),
-    // This polyfill is loaded in workers to support ES5, filter it out.
-    latestBuild && require.resolve("proxy-polyfill/src/index.js"),
-  ].filter(Boolean);
-
-module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
-  __DEV__: !isProdBuild,
-  __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
-  __VERSION__: JSON.stringify(env.version()),
-  __DEMO__: false,
-  __BACKWARDS_COMPAT__: false,
-  __STATIC_PATH__: "/static/",
-  "process.env.NODE_ENV": JSON.stringify(
-    isProdBuild ? "production" : "development"
-  ),
-  ...defineOverlay,
-});
-
-module.exports.terserOptions = (latestBuild) => ({
-  safari10: true,
-  ecma: latestBuild ? undefined : 5,
-  output: { comments: false },
-});
-
-module.exports.babelOptions = ({ latestBuild }) => ({
-  babelrc: false,
-  presets: [
-    !latestBuild && [require("@babel/preset-env").default, { modules: false }],
-    require("@babel/preset-typescript").default,
-  ].filter(Boolean),
-  plugins: [
-    // Part of ES2018. Converts {...a, b: 2} to Object.assign({}, a, {b: 2})
-    [
-      "@babel/plugin-proposal-object-rest-spread",
-      { loose: true, useBuiltIns: true },
-    ],
-    // Only support the syntax, Webpack will handle it.
-    "@babel/syntax-dynamic-import",
-    "@babel/plugin-proposal-optional-chaining",
-    "@babel/plugin-proposal-nullish-coalescing-operator",
-    [
-      require("@babel/plugin-proposal-decorators").default,
-      { decoratorsBeforeExport: true },
-    ],
-    [
-      require("@babel/plugin-proposal-class-properties").default,
-      { loose: true },
-    ],
-  ],
-});
-
-// Are already ES5, cause warnings when babelified.
-module.exports.babelExclude = () => [
-  require.resolve("@mdi/js/mdi.js"),
-  require.resolve("hls.js"),
-];
-
-const outputPath = (outputRoot, latestBuild) =>
-  path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5");
-
-const publicPath = (latestBuild) =>
-  latestBuild ? "/frontend_latest/" : "/frontend_es5/";
-
-/*
-BundleConfig {
-  // Object with entrypoints that need to be bundled
-  entry: { [name: string]: pathToFile },
-  // Folder where bundled files need to be written
-  outputPath: string,
-  // absolute url-path where bundled files can be found
-  publicPath: string,
-  // extra definitions that we need to replace in source
-  defineOverlay: {[name: string]: value },
-  // if this is a production build
-  isProdBuild: boolean,
-  // If we're targeting latest browsers
-  latestBuild: boolean,
-  // If we're doing a stats build (create nice chunk names)
-  isStatsBuild: boolean,
-  // Names of entrypoints that should not be hashed
-  dontHash: Set<string>
-}
-*/
-
-module.exports.config = {
-  app({ isProdBuild, latestBuild, isStatsBuild }) {
-    return {
-      entry: {
-        service_worker: "./src/entrypoints/service_worker.ts",
-        app: "./src/entrypoints/app.ts",
-        authorize: "./src/entrypoints/authorize.ts",
-        onboarding: "./src/entrypoints/onboarding.ts",
-        core: "./src/entrypoints/core.ts",
-        "custom-panel": "./src/entrypoints/custom-panel.ts",
-      },
-      outputPath: outputPath(paths.app_output_root, latestBuild),
-      publicPath: publicPath(latestBuild),
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-    };
-  },
-
-  demo({ isProdBuild, latestBuild, isStatsBuild }) {
-    return {
-      entry: {
-        main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
-      },
-      outputPath: outputPath(paths.demo_output_root, latestBuild),
-      publicPath: publicPath(latestBuild),
-      defineOverlay: {
-        __VERSION__: JSON.stringify(`DEMO-${env.version()}`),
-        __DEMO__: true,
-      },
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-    };
-  },
-
-  cast({ isProdBuild, latestBuild }) {
-    const entry = {
-      launcher: path.resolve(paths.cast_dir, "src/launcher/entrypoint.ts"),
-    };
-
-    if (latestBuild) {
-      entry.receiver = path.resolve(
-        paths.cast_dir,
-        "src/receiver/entrypoint.ts"
-      );
-    }
-
-    return {
-      entry,
-      outputPath: outputPath(paths.cast_output_root, latestBuild),
-      publicPath: publicPath(latestBuild),
-      isProdBuild,
-      latestBuild,
-      defineOverlay: {
-        __BACKWARDS_COMPAT__: true,
-      },
-    };
-  },
-
-  hassio({ isProdBuild, latestBuild }) {
-    if (latestBuild) {
-      throw new Error("Hass.io does not support latest build!");
-    }
-    return {
-      entry: {
-        entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"),
-      },
-      outputPath: paths.hassio_output_root,
-      publicPath: paths.hassio_publicPath,
-      isProdBuild,
-      latestBuild,
-      dontHash: new Set(["entrypoint"]),
-    };
-  },
-
-  gallery({ isProdBuild, latestBuild }) {
-    return {
-      entry: {
-        entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
-      },
-      outputPath: outputPath(paths.gallery_output_root, latestBuild),
-      publicPath: publicPath(latestBuild),
-      isProdBuild,
-      latestBuild,
-    };
-  },
-};

build-scripts/env.js

@@ -1,32 +1,6 @@
-const fs = require("fs");
-const path = require("path");
-const paths = require("./paths.js");
-
 module.exports = {
-  useRollup() {
-    return process.env.ROLLUP === "1";
-  },
-  isProdBuild() {
-    return (
-      process.env.NODE_ENV === "production" || module.exports.isStatsBuild()
-    );
-  },
-  isStatsBuild() {
-    return process.env.STATS === "1";
-  },
-  isTest() {
-    return process.env.IS_TEST === "true";
-  },
-  isNetlify() {
-    return process.env.NETLIFY === "true";
-  },
-  version() {
-    const version = fs
-      .readFileSync(path.resolve(paths.polymer_dir, "setup.py"), "utf8")
-      .match(/\d{8}\.\d+/);
-    if (!version) {
-      throw Error("Version not found");
-    }
-    return version[0];
-  },
+  isProdBuild: process.env.NODE_ENV === "production",
+  isStatsBuild: process.env.STATS === "1",
+  isTravis: process.env.TRAVIS === "true",
+  isNetlify: process.env.NETLIFY === "true",
 };

build-scripts/gulp/app.js

@@ -1,17 +1,16 @@
 // Run HA develop mode
 const gulp = require("gulp");
 
-const env = require("../env");
+const envVars = require("../env");
 
 require("./clean.js");
 require("./translations.js");
-require("./gen-icons-json.js");
+require("./gen-icons.js");
 require("./gather-static.js");
 require("./compress.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
-require("./rollup.js");
 
 gulp.task(
   "develop-app",
@@ -21,14 +20,14 @@ gulp.task(
     },
     "clean",
     gulp.parallel(
-      "gen-service-worker-app-dev",
-      "gen-icons-json",
+      "gen-service-worker-dev",
+      gulp.parallel("gen-icons-app", "gen-icons-mdi"),
       "gen-pages-dev",
       "gen-index-app-dev",
-      "build-translations"
+      gulp.series("create-test-translation", "build-translations")
     ),
-    "copy-static-app",
-    env.useRollup() ? "rollup-watch-app" : "webpack-watch-app"
+    "copy-static",
+    "webpack-watch-app"
   )
 );
 
@@ -39,15 +38,15 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean",
-    gulp.parallel("gen-icons-json", "build-translations"),
-    "copy-static-app",
-    env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
+    "copy-static",
+    "webpack-prod-app",
     ...// Don't compress running tests
-    (env.isTest() ? [] : ["compress-app"]),
+    (envVars.isTravis ? [] : ["compress-app"]),
     gulp.parallel(
       "gen-pages-prod",
       "gen-index-app-prod",
-      "gen-service-worker-app-prod"
+      "gen-service-worker-prod"
     )
   )
 );

build-scripts/gulp/cast.js

@@ -1,14 +1,12 @@
 const gulp = require("gulp");
 
-const env = require("../env");
-
 require("./clean.js");
 require("./translations.js");
+require("./gen-icons.js");
 require("./gather-static.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
-require("./rollup.js");
 
 gulp.task(
   "develop-cast",
@@ -17,10 +15,14 @@ gulp.task(
       process.env.NODE_ENV = "development";
     },
     "clean-cast",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-index-cast-dev",
+      "build-translations"
+    ),
     "copy-static-cast",
-    env.useRollup() ? "rollup-dev-server-cast" : "webpack-dev-server-cast"
+    "webpack-dev-server-cast"
   )
 );
 
@@ -31,10 +33,9 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-cast",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
     "copy-static-cast",
-    env.useRollup() ? "rollup-prod-cast" : "webpack-prod-cast",
+    "webpack-prod-cast",
     "gen-index-cast-prod"
   )
 );

build-scripts/gulp/clean.js

@@ -6,34 +6,34 @@ require("./translations");
 gulp.task(
   "clean",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([config.app_output_root, config.build_dir]);
+    return del([config.root, config.build_dir]);
   })
 );
 
 gulp.task(
   "clean-demo",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([config.demo_output_root, config.build_dir]);
+    return del([config.demo_root, config.build_dir]);
   })
 );
 
 gulp.task(
   "clean-cast",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([config.cast_output_root, config.build_dir]);
+    return del([config.cast_root, config.build_dir]);
   })
 );
 
 gulp.task(
   "clean-hassio",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([config.hassio_output_root, config.build_dir]);
+    return del([config.hassio_root, config.build_dir]);
   })
 );
 
 gulp.task(
   "clean-gallery",
   gulp.parallel("clean-translations", function cleanOutputAndBuildDir() {
-    return del([config.gallery_output_root, config.build_dir]);
+    return del([config.gallery_root, config.build_dir]);
   })
 );

build-scripts/gulp/compress.js

@@ -8,36 +8,31 @@ const paths = require("../paths");
 
 gulp.task("compress-app", function compressApp() {
   const jsLatest = gulp
-    .src(path.resolve(paths.app_output_latest, "**/*.js"))
-    .pipe(zopfli({ threshold: 150 }))
-    .pipe(gulp.dest(paths.app_output_latest));
+    .src(path.resolve(paths.output, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output));
 
   const jsEs5 = gulp
-    .src(path.resolve(paths.app_output_es5, "**/*.js"))
-    .pipe(zopfli({ threshold: 150 }))
-    .pipe(gulp.dest(paths.app_output_es5));
+    .src(path.resolve(paths.output_es5, "**/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(paths.output_es5));
 
   const polyfills = gulp
-    .src(path.resolve(paths.app_output_static, "polyfills/*.js"))
-    .pipe(zopfli({ threshold: 150 }))
-    .pipe(gulp.dest(path.resolve(paths.app_output_static, "polyfills")));
+    .src(path.resolve(paths.static, "polyfills/*.js"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "polyfills")));
 
   const translations = gulp
-    .src(path.resolve(paths.app_output_static, "translations/**/*.json"))
-    .pipe(zopfli({ threshold: 150 }))
-    .pipe(gulp.dest(path.resolve(paths.app_output_static, "translations")));
+    .src(path.resolve(paths.static, "translations/*.json"))
+    .pipe(zopfli())
+    .pipe(gulp.dest(path.resolve(paths.static, "translations")));
 
-  const icons = gulp
-    .src(path.resolve(paths.app_output_static, "mdi/*.json"))
-    .pipe(zopfli({ threshold: 150 }))
-    .pipe(gulp.dest(path.resolve(paths.app_output_static, "mdi")));
-
-  return merge(jsLatest, jsEs5, polyfills, translations, icons);
+  return merge(jsLatest, jsEs5, polyfills, translations);
 });
 
 gulp.task("compress-hassio", function compressApp() {
   return gulp
-    .src(path.resolve(paths.hassio_output_root, "**/*.js"))
+    .src(path.resolve(paths.hassio_root, "**/*.js"))
     .pipe(zopfli())
-    .pipe(gulp.dest(paths.hassio_output_root));
+    .pipe(gulp.dest(paths.hassio_root));
 });

build-scripts/gulp/demo.js

@@ -1,16 +1,13 @@
 // Run demo develop mode
 const gulp = require("gulp");
 
-const env = require("../env");
-
 require("./clean.js");
 require("./translations.js");
-require("./gen-icons-json.js");
+require("./gen-icons.js");
 require("./gather-static.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
-require("./rollup.js");
 
 gulp.task(
   "develop-demo",
@@ -19,10 +16,15 @@ gulp.task(
       process.env.NODE_ENV = "development";
     },
     "clean-demo",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "gen-index-demo-dev", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-icons-demo",
+      "gen-index-demo-dev",
+      "build-translations"
+    ),
     "copy-static-demo",
-    env.useRollup() ? "rollup-dev-server-demo" : "webpack-dev-server-demo"
+    "webpack-dev-server-demo"
   )
 );
 
@@ -33,11 +35,14 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-demo",
-    // Cast needs to be backwards compatible and older HA has no translations
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations"),
+    gulp.parallel(
+      "gen-icons-app",
+      "gen-icons-mdi",
+      "gen-icons-demo",
+      "build-translations"
+    ),
     "copy-static-demo",
-    env.useRollup() ? "rollup-prod-demo" : "webpack-prod-demo",
+    "webpack-prod-demo",
     "gen-index-demo-prod"
   )
 );

build-scripts/gulp/download_translations.js

@@ -1,14 +1,9 @@
 const del = require("del");
 const gulp = require("gulp");
-const fs = require("fs");
 const mapStream = require("map-stream");
 
-const inDirFrontend = "translations/frontend";
-const inDirBackend = "translations/backend";
-const downloadDir = "translations/downloads";
-const srcMeta = "src/translations/translationMetadata.json";
-
-const encoding = "utf8";
+const inDir = "translations";
+const downloadDir = inDir + "/downloads";
 
 const tasks = [];
 
@@ -17,7 +12,7 @@ function hasHtml(data) {
 }
 
 function recursiveCheckHasHtml(file, data, errors, recKey) {
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(function(key) {
     if (typeof data[key] === "object") {
       const nextRecKey = recKey ? `${recKey}.${key}` : key;
       recursiveCheckHasHtml(file, data[key], errors, nextRecKey);
@@ -30,7 +25,7 @@ function recursiveCheckHasHtml(file, data, errors, recKey) {
 function checkHtml() {
   const errors = [];
 
-  return mapStream(function (file, cb) {
+  return mapStream(function(file, cb) {
     const content = file.contents;
     let error;
     if (content) {
@@ -47,36 +42,20 @@ function checkHtml() {
 }
 
 let taskName = "clean-downloaded-translations";
-gulp.task(taskName, function () {
+gulp.task(taskName, function() {
   return del([`${downloadDir}/**`]);
 });
 tasks.push(taskName);
 
 taskName = "check-translations-html";
-gulp.task(taskName, function () {
+gulp.task(taskName, function() {
   return gulp.src(`${downloadDir}/*.json`).pipe(checkHtml());
 });
 tasks.push(taskName);
 
-taskName = "check-all-files-exist";
-gulp.task(taskName, function () {
-  const file = fs.readFileSync(srcMeta, { encoding });
-  const meta = JSON.parse(file);
-  Object.keys(meta).forEach((lang) => {
-    if (!fs.existsSync(`${inDirFrontend}/${lang}.json`)) {
-      fs.writeFileSync(`${inDirFrontend}/${lang}.json`, JSON.stringify({}));
-    }
-    if (!fs.existsSync(`${inDirBackend}/${lang}.json`)) {
-      fs.writeFileSync(`${inDirBackend}/${lang}.json`, JSON.stringify({}));
-    }
-  });
-  return Promise.resolve();
-});
-tasks.push(taskName);
-
 taskName = "move-downloaded-translations";
-gulp.task(taskName, function () {
-  return gulp.src(`${downloadDir}/*.json`).pipe(gulp.dest(inDirFrontend));
+gulp.task(taskName, function() {
+  return gulp.src(`${downloadDir}/*.json`).pipe(gulp.dest(inDir));
 });
 tasks.push(taskName);
 
@@ -86,7 +65,6 @@ gulp.task(
   gulp.series(
     "check-translations-html",
     "move-downloaded-translations",
-    "check-all-files-exist",
     "clean-downloaded-translations"
   )
 );

build-scripts/gulp/entry-html.js

@@ -6,36 +6,31 @@ const fs = require("fs-extra");
 const path = require("path");
 const template = require("lodash.template");
 const minify = require("html-minifier").minify;
-const paths = require("../paths.js");
-const env = require("../env.js");
+const config = require("../paths.js");
 
 const templatePath = (tpl) =>
-  path.resolve(paths.polymer_dir, "src/html/", `${tpl}.html.template`);
+  path.resolve(config.polymer_dir, "src/html/", `${tpl}.html.template`);
 
 const readFile = (pth) => fs.readFileSync(pth).toString();
 
 const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
   const compiled = template(readFile(pathFunc(pth)));
-  return compiled({
-    ...data,
-    useRollup: env.useRollup(),
-    renderTemplate,
-  });
+  return compiled({ ...data, renderTemplate });
 };
 
 const renderDemoTemplate = (pth, data = {}) =>
   renderTemplate(pth, data, (tpl) =>
-    path.resolve(paths.demo_dir, "src/html/", `${tpl}.html.template`)
+    path.resolve(config.demo_dir, "src/html/", `${tpl}.html.template`)
   );
 
 const renderCastTemplate = (pth, data = {}) =>
   renderTemplate(pth, data, (tpl) =>
-    path.resolve(paths.cast_dir, "src/html/", `${tpl}.html.template`)
+    path.resolve(config.cast_dir, "src/html/", `${tpl}.html.template`)
   );
 
 const renderGalleryTemplate = (pth, data = {}) =>
   renderTemplate(pth, data, (tpl) =>
-    path.resolve(paths.gallery_dir, "src/html/", `${tpl}.html.template`)
+    path.resolve(config.gallery_dir, "src/html/", `${tpl}.html.template`)
   );
 
 const minifyHtml = (content) =>
@@ -52,37 +47,34 @@ gulp.task("gen-pages-dev", (done) => {
   for (const page of PAGES) {
     const content = renderTemplate(page, {
       latestPageJS: `/frontend_latest/${page}.js`,
+      latestHassIconsJS: "/frontend_latest/hass-icons.js",
 
+      es5Compatibility: "/frontend_es5/compatibility.js",
       es5PageJS: `/frontend_es5/${page}.js`,
+      es5HassIconsJS: "/frontend_es5/hass-icons.js",
     });
 
-    fs.outputFileSync(
-      path.resolve(paths.app_output_root, `${page}.html`),
-      content
-    );
+    fs.outputFileSync(path.resolve(config.root, `${page}.html`), content);
   }
   done();
 });
 
 gulp.task("gen-pages-prod", (done) => {
-  const latestManifest = require(path.resolve(
-    paths.app_output_latest,
-    "manifest.json"
-  ));
-  const es5Manifest = require(path.resolve(
-    paths.app_output_es5,
-    "manifest.json"
-  ));
+  const latestManifest = require(path.resolve(config.output, "manifest.json"));
+  const es5Manifest = require(path.resolve(config.output_es5, "manifest.json"));
 
   for (const page of PAGES) {
     const content = renderTemplate(page, {
       latestPageJS: latestManifest[`${page}.js`],
+      latestHassIconsJS: latestManifest["hass-icons.js"],
 
+      es5Compatibility: es5Manifest["compatibility.js"],
       es5PageJS: es5Manifest[`${page}.js`],
+      es5HassIconsJS: es5Manifest["hass-icons.js"],
     });
 
     fs.outputFileSync(
-      path.resolve(paths.app_output_root, `${page}.html`),
+      path.resolve(config.root, `${page}.html`),
       minifyHtml(content)
     );
   }
@@ -96,40 +88,37 @@ gulp.task("gen-index-app-dev", (done) => {
     latestAppJS: "/frontend_latest/app.js",
     latestCoreJS: "/frontend_latest/core.js",
     latestCustomPanelJS: "/frontend_latest/custom-panel.js",
+    latestHassIconsJS: "/frontend_latest/hass-icons.js",
 
+    es5Compatibility: "/frontend_es5/compatibility.js",
     es5AppJS: "/frontend_es5/app.js",
     es5CoreJS: "/frontend_es5/core.js",
     es5CustomPanelJS: "/frontend_es5/custom-panel.js",
+    es5HassIconsJS: "/frontend_es5/hass-icons.js",
   }).replace(/#THEMEC/g, "{{ theme_color }}");
 
-  fs.outputFileSync(path.resolve(paths.app_output_root, "index.html"), content);
+  fs.outputFileSync(path.resolve(config.root, "index.html"), content);
   done();
 });
 
 gulp.task("gen-index-app-prod", (done) => {
-  const latestManifest = require(path.resolve(
-    paths.app_output_latest,
-    "manifest.json"
-  ));
-  const es5Manifest = require(path.resolve(
-    paths.app_output_es5,
-    "manifest.json"
-  ));
+  const latestManifest = require(path.resolve(config.output, "manifest.json"));
+  const es5Manifest = require(path.resolve(config.output_es5, "manifest.json"));
   const content = renderTemplate("index", {
     latestAppJS: latestManifest["app.js"],
     latestCoreJS: latestManifest["core.js"],
     latestCustomPanelJS: latestManifest["custom-panel.js"],
+    latestHassIconsJS: latestManifest["hass-icons.js"],
 
+    es5Compatibility: es5Manifest["compatibility.js"],
     es5AppJS: es5Manifest["app.js"],
     es5CoreJS: es5Manifest["core.js"],
     es5CustomPanelJS: es5Manifest["custom-panel.js"],
+    es5HassIconsJS: es5Manifest["hass-icons.js"],
   });
   const minified = minifyHtml(content).replace(/#THEMEC/g, "{{ theme_color }}");
 
-  fs.outputFileSync(
-    path.resolve(paths.app_output_root, "index.html"),
-    minified
-  );
+  fs.outputFileSync(path.resolve(config.root, "index.html"), minified);
   done();
 });
 
@@ -138,7 +127,7 @@ gulp.task("gen-index-cast-dev", (done) => {
     latestReceiverJS: "/frontend_latest/receiver.js",
   });
   fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "receiver.html"),
+    path.resolve(config.cast_root, "receiver.html"),
     contentReceiver
   );
 
@@ -146,17 +135,14 @@ gulp.task("gen-index-cast-dev", (done) => {
     latestLauncherJS: "/frontend_latest/launcher.js",
     es5LauncherJS: "/frontend_es5/launcher.js",
   });
-  fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "faq.html"),
-    contentFAQ
-  );
+  fs.outputFileSync(path.resolve(config.cast_root, "faq.html"), contentFAQ);
 
   const contentLauncher = renderCastTemplate("launcher", {
     latestLauncherJS: "/frontend_latest/launcher.js",
     es5LauncherJS: "/frontend_es5/launcher.js",
   });
   fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "index.html"),
+    path.resolve(config.cast_root, "index.html"),
     contentLauncher
   );
   done();
@@ -164,11 +150,11 @@ gulp.task("gen-index-cast-dev", (done) => {
 
 gulp.task("gen-index-cast-prod", (done) => {
   const latestManifest = require(path.resolve(
-    paths.cast_output_latest,
+    config.cast_output,
     "manifest.json"
   ));
   const es5Manifest = require(path.resolve(
-    paths.cast_output_es5,
+    config.cast_output_es5,
     "manifest.json"
   ));
 
@@ -176,7 +162,7 @@ gulp.task("gen-index-cast-prod", (done) => {
     latestReceiverJS: latestManifest["receiver.js"],
   });
   fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "receiver.html"),
+    path.resolve(config.cast_root, "receiver.html"),
     contentReceiver
   );
 
@@ -184,17 +170,14 @@ gulp.task("gen-index-cast-prod", (done) => {
     latestLauncherJS: latestManifest["launcher.js"],
     es5LauncherJS: es5Manifest["launcher.js"],
   });
-  fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "faq.html"),
-    contentFAQ
-  );
+  fs.outputFileSync(path.resolve(config.cast_root, "faq.html"), contentFAQ);
 
   const contentLauncher = renderCastTemplate("launcher", {
     latestLauncherJS: latestManifest["launcher.js"],
     es5LauncherJS: es5Manifest["launcher.js"],
   });
   fs.outputFileSync(
-    path.resolve(paths.cast_output_root, "index.html"),
+    path.resolve(config.cast_root, "index.html"),
     contentLauncher
   );
   done();
@@ -206,36 +189,32 @@ gulp.task("gen-index-demo-dev", (done) => {
   const content = renderDemoTemplate("index", {
     latestDemoJS: "/frontend_latest/main.js",
 
+    es5Compatibility: "/frontend_es5/compatibility.js",
     es5DemoJS: "/frontend_es5/main.js",
   });
 
-  fs.outputFileSync(
-    path.resolve(paths.demo_output_root, "index.html"),
-    content
-  );
+  fs.outputFileSync(path.resolve(config.demo_root, "index.html"), content);
   done();
 });
 
 gulp.task("gen-index-demo-prod", (done) => {
   const latestManifest = require(path.resolve(
-    paths.demo_output_latest,
+    config.demo_output,
     "manifest.json"
   ));
   const es5Manifest = require(path.resolve(
-    paths.demo_output_es5,
+    config.demo_output_es5,
     "manifest.json"
   ));
   const content = renderDemoTemplate("index", {
     latestDemoJS: latestManifest["main.js"],
 
+    es5Compatibility: es5Manifest["compatibility.js"],
     es5DemoJS: es5Manifest["main.js"],
   });
   const minified = minifyHtml(content);
 
-  fs.outputFileSync(
-    path.resolve(paths.demo_output_root, "index.html"),
-    minified
-  );
+  fs.outputFileSync(path.resolve(config.demo_root, "index.html"), minified);
   done();
 });
 
@@ -243,19 +222,16 @@ gulp.task("gen-index-gallery-dev", (done) => {
   // In dev mode we don't mangle names, so we hardcode urls. That way we can
   // run webpack as last in watch mode, which blocks output.
   const content = renderGalleryTemplate("index", {
-    latestGalleryJS: "./frontend_latest/entrypoint.js",
+    latestGalleryJS: "./entrypoint.js",
   });
 
-  fs.outputFileSync(
-    path.resolve(paths.gallery_output_root, "index.html"),
-    content
-  );
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), content);
   done();
 });
 
 gulp.task("gen-index-gallery-prod", (done) => {
   const latestManifest = require(path.resolve(
-    paths.gallery_output_latest,
+    config.gallery_output,
     "manifest.json"
   ));
   const content = renderGalleryTemplate("index", {
@@ -263,9 +239,6 @@ gulp.task("gen-index-gallery-prod", (done) => {
   });
   const minified = minifyHtml(content);
 
-  fs.outputFileSync(
-    path.resolve(paths.gallery_output_root, "index.html"),
-    minified
-  );
+  fs.outputFileSync(path.resolve(config.gallery_root, "index.html"), minified);
   done();
 });

build-scripts/gulp/gallery.js

@@ -1,16 +1,13 @@
 // Run demo develop mode
 const gulp = require("gulp");
 
-const env = require("../env");
-
 require("./clean.js");
 require("./translations.js");
-require("./gen-icons-json.js");
+require("./gen-icons.js");
 require("./gather-static.js");
 require("./webpack.js");
 require("./service-worker.js");
 require("./entry-html.js");
-require("./rollup.js");
 
 gulp.task(
   "develop-gallery",
@@ -19,11 +16,10 @@ gulp.task(
       process.env.NODE_ENV = "development";
     },
     "clean-gallery",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-app", "build-translations"),
     "copy-static-gallery",
     "gen-index-gallery-dev",
-    env.useRollup() ? "rollup-dev-server-gallery" : "webpack-dev-server-gallery"
+    "webpack-dev-server-gallery"
   )
 );
 
@@ -34,10 +30,9 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-gallery",
-    "translations-enable-merge-backend",
-    gulp.parallel("gen-icons-json", "build-translations"),
+    gulp.parallel("gen-icons-app", "gen-icons-mdi", "build-translations"),
     "copy-static-gallery",
-    env.useRollup() ? "rollup-prod-gallery" : "webpack-prod-gallery",
+    "webpack-prod-gallery",
     "gen-index-gallery-prod"
   )
 );

build-scripts/gulp/gather-static.js

@@ -26,13 +26,6 @@ function copyTranslations(staticDir) {
   );
 }
 
-function copyMdiIcons(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-
-  // MDI icons output
-  fs.copySync(polyPath("build/mdi"), staticPath("mdi"));
-}
-
 function copyPolyfills(staticDir) {
   const staticPath = genStaticPath(staticDir);
 
@@ -51,12 +44,6 @@ function copyPolyfills(staticDir) {
   );
 }
 
-function copyLoaderJS(staticDir) {
-  const staticPath = genStaticPath(staticDir);
-  copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js"));
-  copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js"));
-}
-
 function copyFonts(staticDir) {
   const staticPath = genStaticPath(staticDir);
   // Local fonts
@@ -78,68 +65,61 @@ function copyMapPanel(staticDir) {
   );
 }
 
-gulp.task("copy-translations-app", async () => {
-  const staticDir = paths.app_output_static;
-  copyTranslations(staticDir);
-});
-
-gulp.task("copy-static-app", async () => {
-  const staticDir = paths.app_output_static;
+gulp.task("copy-static", (done) => {
+  const staticDir = paths.static;
+  const staticPath = genStaticPath(paths.static);
   // Basic static files
-  fs.copySync(polyPath("public"), paths.app_output_root);
+  fs.copySync(polyPath("public"), paths.root);
 
-  copyLoaderJS(staticDir);
   copyPolyfills(staticDir);
   copyFonts(staticDir);
   copyTranslations(staticDir);
-  copyMdiIcons(staticDir);
 
   // Panel assets
+  copyFileDir(
+    npmPath("react-big-calendar/lib/css/react-big-calendar.css"),
+    staticPath("panels/calendar/")
+  );
   copyMapPanel(staticDir);
+  done();
 });
 
-gulp.task("copy-static-demo", async () => {
+gulp.task("copy-static-demo", (done) => {
   // Copy app static files
   fs.copySync(
     polyPath("public/static"),
-    path.resolve(paths.demo_output_root, "static")
+    path.resolve(paths.demo_root, "static")
   );
   // Copy demo static files
-  fs.copySync(path.resolve(paths.demo_dir, "public"), paths.demo_output_root);
+  fs.copySync(path.resolve(paths.demo_dir, "public"), paths.demo_root);
 
-  copyLoaderJS(paths.demo_output_static);
-  copyPolyfills(paths.demo_output_static);
-  copyMapPanel(paths.demo_output_static);
-  copyFonts(paths.demo_output_static);
-  copyTranslations(paths.demo_output_static);
-  copyMdiIcons(paths.demo_output_static);
+  copyPolyfills(paths.demo_static);
+  copyMapPanel(paths.demo_static);
+  copyFonts(paths.demo_static);
+  copyTranslations(paths.demo_static);
+  done();
 });
 
-gulp.task("copy-static-cast", async () => {
+gulp.task("copy-static-cast", (done) => {
   // Copy app static files
-  fs.copySync(polyPath("public/static"), paths.cast_output_static);
+  fs.copySync(polyPath("public/static"), paths.cast_static);
   // Copy cast static files
-  fs.copySync(path.resolve(paths.cast_dir, "public"), paths.cast_output_root);
+  fs.copySync(path.resolve(paths.cast_dir, "public"), paths.cast_root);
 
-  copyLoaderJS(paths.cast_output_static);
-  copyPolyfills(paths.cast_output_static);
-  copyMapPanel(paths.cast_output_static);
-  copyFonts(paths.cast_output_static);
-  copyTranslations(paths.cast_output_static);
-  copyMdiIcons(paths.cast_output_static);
+  copyMapPanel(paths.cast_static);
+  copyFonts(paths.cast_static);
+  copyTranslations(paths.cast_static);
+  done();
 });
 
-gulp.task("copy-static-gallery", async () => {
+gulp.task("copy-static-gallery", (done) => {
   // Copy app static files
-  fs.copySync(polyPath("public/static"), paths.gallery_output_static);
+  fs.copySync(polyPath("public/static"), paths.gallery_static);
   // Copy gallery static files
-  fs.copySync(
-    path.resolve(paths.gallery_dir, "public"),
-    paths.gallery_output_root
-  );
+  fs.copySync(path.resolve(paths.gallery_dir, "public"), paths.gallery_root);
 
-  copyMapPanel(paths.gallery_output_static);
-  copyFonts(paths.gallery_output_static);
-  copyTranslations(paths.gallery_output_static);
-  copyMdiIcons(paths.gallery_output_static);
+  copyMapPanel(paths.gallery_static);
+  copyFonts(paths.gallery_static);
+  copyTranslations(paths.gallery_static);
+  done();
 });

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

@@ -1,112 +0,0 @@
-const gulp = require("gulp");
-const path = require("path");
-const fs = require("fs");
-const hash = require("object-hash");
-
-const ICON_PACKAGE_PATH = path.resolve(
-  __dirname,
-  "../../node_modules/@mdi/svg/"
-);
-const META_PATH = path.resolve(ICON_PACKAGE_PATH, "meta.json");
-const PACKAGE_PATH = path.resolve(ICON_PACKAGE_PATH, "package.json");
-const ICON_PATH = path.resolve(ICON_PACKAGE_PATH, "svg");
-const OUTPUT_DIR = path.resolve(__dirname, "../../build/mdi");
-
-const encoding = "utf8";
-
-const getMeta = () => {
-  const file = fs.readFileSync(META_PATH, { encoding });
-  const meta = JSON.parse(file);
-  return meta.map((icon) => {
-    const svg = fs.readFileSync(`${ICON_PATH}/${icon.name}.svg`, {
-      encoding,
-    });
-    return { path: svg.match(/ d="([^"]+)"/)[1], name: icon.name };
-  });
-};
-
-const splitBySize = (meta) => {
-  const chunks = [];
-  const CHUNK_SIZE = 50000;
-
-  let curSize = 0;
-  let startKey;
-  let icons = [];
-
-  Object.values(meta).forEach((icon) => {
-    if (startKey === undefined) {
-      startKey = icon.name;
-    }
-    curSize += icon.path.length;
-    icons.push(icon);
-    if (curSize > CHUNK_SIZE) {
-      chunks.push({
-        startKey,
-        endKey: icon.name,
-        icons,
-      });
-      curSize = 0;
-      startKey = undefined;
-      icons = [];
-    }
-  });
-
-  chunks.push({
-    startKey,
-    icons,
-  });
-
-  return chunks;
-};
-
-const findDifferentiator = (curString, prevString) => {
-  for (let i = 0; i < curString.length; i++) {
-    if (curString[i] !== prevString[i]) {
-      return curString.substring(0, i + 1);
-    }
-  }
-  throw new Error("Cannot find differentiator", curString, prevString);
-};
-
-gulp.task("gen-icons-json", (done) => {
-  const meta = getMeta();
-  const split = splitBySize(meta);
-
-  if (!fs.existsSync(OUTPUT_DIR)) {
-    fs.mkdirSync(OUTPUT_DIR, { recursive: true });
-  }
-  const parts = [];
-
-  let lastEnd;
-  split.forEach((chunk) => {
-    let startKey;
-    if (lastEnd === undefined) {
-      chunk.startKey = undefined;
-      startKey = undefined;
-    } else {
-      startKey = findDifferentiator(chunk.startKey, lastEnd);
-    }
-    lastEnd = chunk.endKey;
-
-    const output = {};
-    chunk.icons.forEach((icon) => {
-      output[icon.name] = icon.path;
-    });
-    const filename = hash(output);
-    parts.push({ start: startKey, file: filename });
-    fs.writeFileSync(
-      path.resolve(OUTPUT_DIR, `${filename}.json`),
-      JSON.stringify(output)
-    );
-  });
-
-  const file = fs.readFileSync(PACKAGE_PATH, { encoding });
-  const package = JSON.parse(file);
-
-  fs.writeFileSync(
-    path.resolve(OUTPUT_DIR, "iconMetadata.json"),
-    JSON.stringify({ version: package.version, parts })
-  );
-
-  done();
-});

build-scripts/gulp/gen-icons.js

@@ -0,0 +1,140 @@
+const gulp = require("gulp");
+const path = require("path");
+const fs = require("fs");
+const paths = require("../paths");
+
+const ICON_PACKAGE_PATH = path.resolve(
+  __dirname,
+  "../../node_modules/@mdi/svg/"
+);
+const META_PATH = path.resolve(ICON_PACKAGE_PATH, "meta.json");
+const ICON_PATH = path.resolve(ICON_PACKAGE_PATH, "svg");
+const OUTPUT_DIR = path.resolve(__dirname, "../../build");
+const MDI_OUTPUT_PATH = path.resolve(OUTPUT_DIR, "mdi.html");
+const HASS_OUTPUT_PATH = path.resolve(OUTPUT_DIR, "hass-icons.html");
+
+const BUILT_IN_PANEL_ICONS = [
+  "calendar", // Calendar
+  "settings", // Config
+  "home-assistant", // Hass.io
+  "poll-box", // History panel
+  "format-list-bulleted-type", // Logbook
+  "mailbox", // Mailbox
+  "tooltip-account", // Map
+  "cart", // Shopping List
+  "hammer", // developer-tools
+];
+
+// Given an icon name, load the SVG file
+function loadIcon(name) {
+  const iconPath = path.resolve(ICON_PATH, `${name}.svg`);
+  try {
+    return fs.readFileSync(iconPath, "utf-8");
+  } catch (err) {
+    return null;
+  }
+}
+
+// Given an SVG file, convert it to an iron-iconset-svg definition
+function transformXMLtoPolymer(name, xml) {
+  const start = xml.indexOf("><path") + 1;
+  const end = xml.length - start - 6;
+  const pth = xml.substr(start, end);
+  return `<g id="${name}">${pth}</g>`;
+}
+
+// Given an iconset name and icon names, generate a polymer iconset
+function generateIconset(iconsetName, iconNames) {
+  const iconDefs = Array.from(iconNames)
+    .map((name) => {
+      const iconDef = loadIcon(name);
+      if (!iconDef) {
+        throw new Error(`Unknown icon referenced: ${name}`);
+      }
+      return transformXMLtoPolymer(name, iconDef);
+    })
+    .join("");
+  return `<ha-iconset-svg name="${iconsetName}" size="24"><svg><defs>${iconDefs}</defs></svg></ha-iconset-svg>`;
+}
+
+// Helper function to map recursively over files in a folder and it's subfolders
+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);
+    }
+  }
+}
+
+// Find all icons used by the project.
+function findIcons(searchPath, iconsetName) {
+  const iconRegex = new RegExp(`${iconsetName}:[\\w-]+`, "g");
+  const icons = new Set();
+  function processFile(filename) {
+    const content = fs.readFileSync(filename);
+    let match;
+    // eslint-disable-next-line
+    while ((match = iconRegex.exec(content))) {
+      // strip off "hass:" and add to set
+      icons.add(match[0].substr(iconsetName.length + 1));
+    }
+  }
+  mapFiles(searchPath, ".js", processFile);
+  mapFiles(searchPath, ".ts", processFile);
+  return icons;
+}
+
+gulp.task("gen-icons-mdi", (done) => {
+  const meta = JSON.parse(
+    fs.readFileSync(path.resolve(ICON_PACKAGE_PATH, META_PATH), "UTF-8")
+  );
+  const iconNames = meta.map((iconInfo) => iconInfo.name);
+  if (!fs.existsSync(OUTPUT_DIR)) {
+    fs.mkdirSync(OUTPUT_DIR);
+  }
+  fs.writeFileSync(MDI_OUTPUT_PATH, generateIconset("mdi", iconNames));
+  done();
+});
+
+gulp.task("gen-icons-app", (done) => {
+  const iconNames = findIcons("./src", "hass");
+  BUILT_IN_PANEL_ICONS.forEach((name) => iconNames.add(name));
+  if (!fs.existsSync(OUTPUT_DIR)) {
+    fs.mkdirSync(OUTPUT_DIR);
+  }
+  fs.writeFileSync(HASS_OUTPUT_PATH, generateIconset("hass", iconNames));
+  done();
+});
+
+gulp.task("gen-icons-demo", (done) => {
+  const iconNames = findIcons(path.resolve(paths.demo_dir, "./src"), "hademo");
+  fs.writeFileSync(
+    path.resolve(paths.demo_dir, "hademo-icons.html"),
+    generateIconset("hademo", iconNames)
+  );
+  done();
+});
+
+gulp.task("gen-icons-hassio", (done) => {
+  const iconNames = findIcons(
+    path.resolve(paths.hassio_dir, "./src"),
+    "hassio"
+  );
+  // Find hassio icons inside HA main repo.
+  for (const item of findIcons(
+    path.resolve(paths.polymer_dir, "./src"),
+    "hassio"
+  )) {
+    iconNames.add(item);
+  }
+  fs.writeFileSync(
+    path.resolve(paths.hassio_dir, "hassio-icons.html"),
+    generateIconset("hassio", iconNames)
+  );
+  done();
+});

build-scripts/gulp/hassio.js

@@ -1,12 +1,11 @@
 const gulp = require("gulp");
 
-const env = require("../env");
+const envVars = require("../env");
 
 require("./clean.js");
-require("./gen-icons-json.js");
+require("./gen-icons.js");
 require("./webpack.js");
 require("./compress.js");
-require("./rollup.js");
 
 gulp.task(
   "develop-hassio",
@@ -15,8 +14,8 @@ gulp.task(
       process.env.NODE_ENV = "development";
     },
     "clean-hassio",
-    "gen-icons-json",
-    env.useRollup() ? "rollup-watch-hassio" : "webpack-watch-hassio"
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-watch-hassio"
   )
 );
 
@@ -27,9 +26,9 @@ gulp.task(
       process.env.NODE_ENV = "production";
     },
     "clean-hassio",
-    "gen-icons-json",
-    env.useRollup() ? "rollup-prod-hassio" : "webpack-prod-hassio",
+    gulp.parallel("gen-icons-hassio", "gen-icons-mdi"),
+    "webpack-prod-hassio",
     ...// Don't compress running tests
-    (env.isTest() ? [] : ["compress-hassio"])
+    (envVars.isTravis ? [] : ["compress-hassio"])
   )
 );

build-scripts/gulp/rollup.js

@@ -1,151 +0,0 @@
-// Tasks to run Rollup
-const path = require("path");
-const gulp = require("gulp");
-const rollup = require("rollup");
-const handler = require("serve-handler");
-const http = require("http");
-const log = require("fancy-log");
-const rollupConfig = require("../rollup");
-const paths = require("../paths");
-const open = require("open");
-
-const bothBuilds = (createConfigFunc, params) =>
-  gulp.series(
-    async function buildLatest() {
-      await buildRollup(
-        createConfigFunc({
-          ...params,
-          latestBuild: true,
-        })
-      );
-    },
-    async function buildES5() {
-      await buildRollup(
-        createConfigFunc({
-          ...params,
-          latestBuild: false,
-        })
-      );
-    }
-  );
-
-function createServer(serveOptions) {
-  const server = http.createServer((request, response) => {
-    return handler(request, response, {
-      public: serveOptions.root,
-    });
-  });
-
-  server.listen(
-    serveOptions.port,
-    serveOptions.networkAccess ? "0.0.0.0" : undefined,
-    () => {
-      log.info(`Available at http://localhost:${serveOptions.port}`);
-      open(`http://localhost:${serveOptions.port}`);
-    }
-  );
-}
-
-function watchRollup(createConfig, extraWatchSrc = [], serveOptions) {
-  const { inputOptions, outputOptions } = createConfig({
-    isProdBuild: false,
-    latestBuild: true,
-  });
-
-  const watcher = rollup.watch({
-    ...inputOptions,
-    output: [outputOptions],
-    watch: {
-      include: ["src/**"] + extraWatchSrc,
-    },
-  });
-
-  let startedHttp = false;
-
-  watcher.on("event", (event) => {
-    if (event.code === "BUNDLE_END") {
-      log(`Build done @ ${new Date().toLocaleTimeString()}`);
-    } else if (event.code === "ERROR") {
-      log.error(event.error);
-    } else if (event.code === "END") {
-      if (startedHttp || !serveOptions) {
-        return;
-      }
-      startedHttp = true;
-      createServer(serveOptions);
-    }
-  });
-
-  gulp.watch(
-    path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
-  );
-}
-
-async function buildRollup(config) {
-  const bundle = await rollup.rollup(config.inputOptions);
-  await bundle.write(config.outputOptions);
-}
-
-gulp.task("rollup-watch-app", () => {
-  watchRollup(rollupConfig.createAppConfig);
-});
-
-gulp.task("rollup-watch-hassio", () => {
-  watchRollup(rollupConfig.createHassioConfig, ["hassio/src/**"]);
-});
-
-gulp.task("rollup-dev-server-demo", () => {
-  watchRollup(rollupConfig.createDemoConfig, ["demo/src/**"], {
-    root: paths.demo_output_root,
-    port: 8090,
-  });
-});
-
-gulp.task("rollup-dev-server-cast", () => {
-  watchRollup(rollupConfig.createCastConfig, ["cast/src/**"], {
-    root: paths.cast_output_root,
-    port: 8080,
-    networkAccess: true,
-  });
-});
-
-gulp.task("rollup-dev-server-gallery", () => {
-  watchRollup(rollupConfig.createGalleryConfig, ["gallery/src/**"], {
-    root: paths.gallery_output_root,
-    port: 8100,
-  });
-});
-
-gulp.task(
-  "rollup-prod-app",
-  bothBuilds(rollupConfig.createAppConfig, { isProdBuild: true })
-);
-
-gulp.task(
-  "rollup-prod-demo",
-  bothBuilds(rollupConfig.createDemoConfig, { isProdBuild: true })
-);
-
-gulp.task(
-  "rollup-prod-cast",
-  bothBuilds(rollupConfig.createCastConfig, { isProdBuild: true })
-);
-
-gulp.task("rollup-prod-hassio", () =>
-  buildRollup(
-    rollupConfig.createHassioConfig({
-      isProdBuild: true,
-      latestBuild: false,
-    })
-  )
-);
-
-gulp.task("rollup-prod-gallery", () =>
-  buildRollup(
-    rollupConfig.createGalleryConfig({
-      isProdBuild: true,
-      latestBuild: true,
-    })
-  )
-);

build-scripts/gulp/service-worker.js

@@ -5,22 +5,18 @@
 const gulp = require("gulp");
 const path = require("path");
 const fs = require("fs-extra");
-const workboxBuild = require("workbox-build");
-const sourceMapUrl = require("source-map-url");
-const paths = require("../paths.js");
+const config = require("../paths.js");
 
-const swDest = path.resolve(paths.app_output_root, "service_worker.js");
+const swPath = path.resolve(config.root, "service_worker.js");
 
-const writeSW = (content) => fs.outputFileSync(swDest, content.trim() + "\n");
+const writeSW = (content) => fs.outputFileSync(swPath, content.trim() + "\n");
 
-gulp.task("gen-service-worker-app-dev", (done) => {
+gulp.task("gen-service-worker-dev", (done) => {
   writeSW(
     `
 console.debug('Service worker disabled in development');
 
 self.addEventListener('install', (event) => {
-  // This will activate the dev service worker,
-  // removing any prod service worker the dev might have running
   self.skipWaiting();
 });
   `
@@ -28,69 +24,10 @@ self.addEventListener('install', (event) => {
   done();
 });
 
-gulp.task("gen-service-worker-app-prod", async () => {
-  // Read bundled source file
-  const bundleManifestLatest = require(path.resolve(
-    paths.app_output_latest,
-    "manifest.json"
-  ));
-  let serviceWorkerContent = fs.readFileSync(
-    paths.app_output_root + bundleManifestLatest["service_worker.js"],
-    "utf-8"
+gulp.task("gen-service-worker-prod", (done) => {
+  fs.copySync(
+    path.resolve(config.output, "service_worker.js"),
+    path.resolve(config.root, "service_worker.js")
   );
-
-  // Delete old file from frontend_latest so manifest won't pick it up
-  fs.removeSync(
-    paths.app_output_root + bundleManifestLatest["service_worker.js"]
-  );
-  fs.removeSync(
-    paths.app_output_root + bundleManifestLatest["service_worker.js.map"]
-  );
-
-  // Remove ES5
-  const bundleManifestES5 = require(path.resolve(
-    paths.app_output_es5,
-    "manifest.json"
-  ));
-  fs.removeSync(paths.app_output_root + bundleManifestES5["service_worker.js"]);
-  fs.removeSync(
-    paths.app_output_root + bundleManifestES5["service_worker.js.map"]
-  );
-
-  const workboxManifest = await workboxBuild.getManifest({
-    // Files that mach this pattern will be considered unique and skip revision check
-    // ignore JS files + translation files
-    dontCacheBustURLsMatching: /(frontend_latest\/.+|static\/translations\/.+)/,
-
-    globDirectory: paths.app_output_root,
-    globPatterns: [
-      "frontend_latest/*.js",
-      // Cache all English translations because we catch them as fallback
-      // Using pattern to match hash instead of * to avoid caching en-GB
-      // 'v' added as valid hash letter because in dev we hash with 'dev'
-      "static/translations/**/en-+([a-fv0-9]).json",
-      // Icon shown on splash screen
-      "static/icons/favicon-192x192.png",
-      "static/icons/favicon.ico",
-      // Common fonts
-      "static/fonts/roboto/Roboto-Light.woff2",
-      "static/fonts/roboto/Roboto-Medium.woff2",
-      "static/fonts/roboto/Roboto-Regular.woff2",
-      "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);
+  done();
 });

build-scripts/gulp/translations.js

@@ -1,33 +1,22 @@
-const crypto = require("crypto");
 const del = require("del");
 const path = require("path");
-const source = require("vinyl-source-stream");
-const vinylBuffer = require("vinyl-buffer");
 const gulp = require("gulp");
 const fs = require("fs");
 const foreach = require("gulp-foreach");
+const hash = require("gulp-hash");
+const hashFilename = require("gulp-hash-filename");
 const merge = require("gulp-merge-json");
 const minify = require("gulp-jsonminify");
 const rename = require("gulp-rename");
 const transform = require("gulp-json-transform");
-const { mapFiles } = require("../util");
-const env = require("../env");
-const paths = require("../paths");
 
-const inFrontendDir = "translations/frontend";
-const inBackendDir = "translations/backend";
+const inDir = "translations";
 const workDir = "build-translations";
 const fullDir = workDir + "/full";
 const coreDir = workDir + "/core";
 const outDir = workDir + "/output";
-let mergeBackend = false;
 
-gulp.task("translations-enable-merge-backend", (done) => {
-  mergeBackend = true;
-  done();
-});
-
-String.prototype.rsplit = function (sep, maxsplit) {
+String.prototype.rsplit = function(sep, maxsplit) {
   var split = this.split(sep);
   return maxsplit
     ? [split.slice(0, -maxsplit).join(sep)].concat(split.slice(-maxsplit))
@@ -50,9 +39,11 @@ const TRANSLATION_FRAGMENTS = [
   "developer-tools",
 ];
 
+const tasks = [];
+
 function recursiveFlatten(prefix, data) {
   let output = {};
-  Object.keys(data).forEach(function (key) {
+  Object.keys(data).forEach(function(key) {
     if (typeof data[key] === "object") {
       output = {
         ...output,
@@ -114,12 +105,7 @@ function lokaliseTransform(data, original, file) {
       output[key] = lokaliseTransform(value, original, file);
     } else {
       output[key] = value.replace(re_key_reference, (match, key) => {
-        const replace = key.split("::").reduce((tr, k) => {
-          if (!tr) {
-            throw Error(`Invalid key placeholder ${key} in ${file.path}`);
-          }
-          return tr[k];
-        }, original);
+        const replace = key.split("::").reduce((tr, k) => tr[k], original);
         if (typeof replace !== "string") {
           throw Error(`Invalid key placeholder ${key} in ${file.path}`);
         }
@@ -130,9 +116,11 @@ function lokaliseTransform(data, original, file) {
   return output;
 }
 
-gulp.task("clean-translations", function () {
-  return del([workDir]);
+let taskName = "clean-translations";
+gulp.task(taskName, function() {
+  return del([`${outDir}/**/*.json`]);
 });
+tasks.push(taskName);
 
 gulp.task("ensure-translations-build-dir", (done) => {
   if (!fs.existsSync(workDir)) {
@@ -141,25 +129,31 @@ gulp.task("ensure-translations-build-dir", (done) => {
   done();
 });
 
-gulp.task("create-test-metadata", function (cb) {
-  fs.writeFile(
-    workDir + "/testMetadata.json",
-    JSON.stringify({
-      test: {
-        nativeName: "Test",
-      },
-    }),
-    cb
-  );
-});
-
+taskName = "create-test-metadata";
 gulp.task(
-  "create-test-translation",
-  gulp.series("create-test-metadata", function createTestTranslation() {
+  taskName,
+  gulp.series("ensure-translations-build-dir", function writeTestMetaData(cb) {
+    fs.writeFile(
+      workDir + "/testMetadata.json",
+      JSON.stringify({
+        test: {
+          nativeName: "Test",
+        },
+      }),
+      cb
+    );
+  })
+);
+tasks.push(taskName);
+
+taskName = "create-test-translation";
+gulp.task(
+  taskName,
+  gulp.series("create-test-metadata", function() {
     return gulp
-      .src(path.join(paths.translations_src, "en.json"))
+      .src("src/translations/en.json")
       .pipe(
-        transform(function (data, file) {
+        transform(function(data, file) {
           return recursiveEmpty(data);
         })
       )
@@ -167,6 +161,7 @@ gulp.task(
       .pipe(gulp.dest(workDir));
   })
 );
+tasks.push(taskName);
 
 /**
  * This task will build a master translation file, to be used as the base for
@@ -177,231 +172,235 @@ gulp.task(
  * project is buildable immediately after merging new translation keys, since
  * the Lokalise update to translations/en.json will not happen immediately.
  */
-gulp.task("build-master-translation", function () {
-  const src = [path.join(paths.translations_src, "en.json")];
+taskName = "build-master-translation";
+gulp.task(
+  taskName,
+  gulp.series("clean-translations", function() {
+    return gulp
+      .src("src/translations/en.json")
+      .pipe(
+        transform(function(data, file) {
+          return lokaliseTransform(data, data, file);
+        })
+      )
+      .pipe(rename("translationMaster.json"))
+      .pipe(gulp.dest(workDir));
+  })
+);
+tasks.push(taskName);
 
-  if (mergeBackend) {
-    src.push(path.join(inBackendDir, "en.json"));
-  }
-
-  return gulp
-    .src(src)
-    .pipe(
-      transform(function (data, file) {
-        return lokaliseTransform(data, data, file);
-      })
-    )
-    .pipe(
-      merge({
-        fileName: "translationMaster.json",
-      })
-    )
-    .pipe(gulp.dest(workDir));
-});
-
-gulp.task("build-merged-translations", function () {
-  return gulp
-    .src([inFrontendDir + "/*.json", workDir + "/test.json"], {
-      allowEmpty: true,
-    })
-    .pipe(
-      transform(function (data, file) {
-        return lokaliseTransform(data, data, file);
-      })
-    )
-    .pipe(
-      foreach(function (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 = [workDir + "/translationMaster.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");
+taskName = "build-merged-translations";
+gulp.task(
+  taskName,
+  gulp.series("build-master-translation", function() {
+    return gulp
+      .src([inDir + "/*.json", workDir + "/test.json"], { allowEmpty: true })
+      .pipe(
+        transform(function(data, file) {
+          return lokaliseTransform(data, data, file);
+        })
+      )
+      .pipe(
+        foreach(function(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 = [workDir + "/translationMaster.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(inDir + "/" + lang + ".json");
             }
           }
-        }
-        return gulp
-          .src(src, { allowEmpty: true })
-          .pipe(transform((data) => emptyFilter(data)))
-          .pipe(
-            merge({
-              fileName: tr + ".json",
-            })
-          )
-          .pipe(gulp.dest(fullDir));
-      })
-    );
-});
-
-var taskName;
+          return gulp
+            .src(src, { allowEmpty: true })
+            .pipe(transform((data) => emptyFilter(data)))
+            .pipe(
+              merge({
+                fileName: tr + ".json",
+              })
+            )
+            .pipe(gulp.dest(fullDir));
+        })
+      );
+  })
+);
+tasks.push(taskName);
 
 const splitTasks = [];
 TRANSLATION_FRAGMENTS.forEach((fragment) => {
   taskName = "build-translation-fragment-" + fragment;
-  gulp.task(taskName, function () {
-    // Return only the translations for this fragment.
-    return gulp
-      .src(fullDir + "/*.json")
-      .pipe(
-        transform((data) => ({
-          ui: {
-            panel: {
-              [fragment]: data.ui.panel[fragment],
+  gulp.task(
+    taskName,
+    gulp.series("build-merged-translations", function() {
+      // Return only the translations for this fragment.
+      return gulp
+        .src(fullDir + "/*.json")
+        .pipe(
+          transform((data) => ({
+            ui: {
+              panel: {
+                [fragment]: data.ui.panel[fragment],
+              },
             },
-          },
-        }))
-      )
-      .pipe(gulp.dest(workDir + "/" + fragment));
-  });
+          }))
+        )
+        .pipe(gulp.dest(workDir + "/" + fragment));
+    })
+  );
+  tasks.push(taskName);
   splitTasks.push(taskName);
 });
 
 taskName = "build-translation-core";
-gulp.task(taskName, function () {
-  // Remove the fragment translations from the core translation.
-  return gulp
-    .src(fullDir + "/*.json")
-    .pipe(
-      transform((data, file) => {
-        TRANSLATION_FRAGMENTS.forEach((fragment) => {
-          delete data.ui.panel[fragment];
-        });
-        return data;
-      })
-    )
-    .pipe(gulp.dest(coreDir));
-});
-
+gulp.task(
+  taskName,
+  gulp.series("build-merged-translations", function() {
+    // Remove the fragment translations from the core translation.
+    return gulp
+      .src(fullDir + "/*.json")
+      .pipe(
+        transform((data) => {
+          TRANSLATION_FRAGMENTS.forEach((fragment) => {
+            delete data.ui.panel[fragment];
+          });
+          return data;
+        })
+      )
+      .pipe(gulp.dest(coreDir));
+  })
+);
+tasks.push(taskName);
 splitTasks.push(taskName);
 
-gulp.task("build-flattened-translations", function () {
-  // Flatten the split versions of our translations, and move them into outDir
-  return gulp
-    .src(
-      TRANSLATION_FRAGMENTS.map(
-        (fragment) => workDir + "/" + fragment + "/*.json"
-      ).concat(coreDir + "/*.json"),
-      { base: workDir }
-    )
-    .pipe(
-      transform(function (data) {
-        // Polymer.AppLocalizeBehavior requires flattened json
-        return flatten(data);
-      })
-    )
-    .pipe(minify())
-    .pipe(
-      rename((filePath) => {
-        if (filePath.dirname === "core") {
-          filePath.dirname = "";
-        }
-      })
-    )
-    .pipe(gulp.dest(outDir));
-});
-
-const fingerprints = {};
-
+taskName = "build-flattened-translations";
 gulp.task(
-  "build-translation-fingerprints",
-  function fingerprintTranslationFiles() {
-    // Fingerprint full file of each language
-    const files = fs.readdirSync(fullDir);
-
-    for (let i = 0; i < files.length; i++) {
-      fingerprints[files[i].split(".")[0]] = {
-        // In dev we create fake hashes
-        hash: env.isProdBuild()
-          ? crypto
-              .createHash("md5")
-              .update(fs.readFileSync(path.join(fullDir, files[i]), "utf-8"))
-              .digest("hex")
-          : "dev",
-      };
-    }
-
-    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}`);
-      }
-
-      fs.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));
-  }
+  taskName,
+  gulp.series(...splitTasks, function() {
+    // Flatten the split versions of our translations, and move them into outDir
+    return gulp
+      .src(
+        TRANSLATION_FRAGMENTS.map(
+          (fragment) => workDir + "/" + fragment + "/*.json"
+        ).concat(coreDir + "/*.json"),
+        { base: workDir }
+      )
+      .pipe(
+        transform(function(data) {
+          // Polymer.AppLocalizeBehavior requires flattened json
+          return flatten(data);
+        })
+      )
+      .pipe(minify())
+      .pipe(hashFilename())
+      .pipe(
+        rename((filePath) => {
+          if (filePath.dirname === "core") {
+            filePath.dirname = "";
+          }
+        })
+      )
+      .pipe(gulp.dest(outDir));
+  })
 );
+tasks.push(taskName);
 
+taskName = "build-translation-fingerprints";
 gulp.task(
-  "build-translations",
-  gulp.series(
-    "clean-translations",
-    "ensure-translations-build-dir",
-    env.isProdBuild() ? (done) => done() : "create-test-translation",
-    "build-master-translation",
-    "build-merged-translations",
-    gulp.parallel(...splitTasks),
-    "build-flattened-translations",
-    "build-translation-fingerprints",
-    function writeMetadata() {
-      return gulp
-        .src(
-          [
-            path.join(paths.translations_src, "translationMetadata.json"),
-            workDir + "/testMetadata.json",
-            workDir + "/translationFingerprints.json",
-          ],
-          { allowEmpty: true }
-        )
-        .pipe(merge({}))
-        .pipe(
-          transform(function (data) {
-            const newData = {};
-            Object.entries(data).forEach(([key, value]) => {
-              // Filter out translations without native name.
-              if (data[key].nativeName) {
-                newData[key] = data[key];
-              } else {
-                console.warn(
-                  `Skipping language ${key}. Native name was not translated.`
-                );
-              }
-              if (data[key]) newData[key] = value;
-            });
-            return newData;
-          })
-        )
-        .pipe(
-          transform((data) => ({
-            fragments: TRANSLATION_FRAGMENTS,
-            translations: data,
-          }))
-        )
-        .pipe(rename("translationMetadata.json"))
-        .pipe(gulp.dest(workDir));
-    }
-  )
+  taskName,
+  gulp.series("build-flattened-translations", function() {
+    return gulp
+      .src(outDir + "/**/*.json")
+      .pipe(
+        rename({
+          extname: "",
+        })
+      )
+      .pipe(
+        hash({
+          algorithm: "md5",
+          hashLength: 32,
+          template: "<%= name %>.json",
+        })
+      )
+      .pipe(hash.manifest("translationFingerprints.json"))
+      .pipe(
+        transform(function(data) {
+          // After generating fingerprints of our translation files, consolidate
+          // all translation fragment fingerprints under the translation name key
+          const newData = {};
+          Object.entries(data).forEach(([key, value]) => {
+            const [path, _md5] = key.rsplit("-", 1);
+            // let translation = key;
+            let translation = path;
+            const parts = translation.split("/");
+            if (parts.length === 2) {
+              translation = parts[1];
+            }
+            if (!(translation in newData)) {
+              newData[translation] = {
+                fingerprints: {},
+              };
+            }
+            newData[translation].fingerprints[path] = value;
+          });
+          return newData;
+        })
+      )
+      .pipe(gulp.dest(workDir));
+  })
 );
+tasks.push(taskName);
+
+taskName = "build-translations";
+gulp.task(
+  taskName,
+  gulp.series("build-translation-fingerprints", function() {
+    return gulp
+      .src(
+        [
+          "src/translations/translationMetadata.json",
+          workDir + "/testMetadata.json",
+          workDir + "/translationFingerprints.json",
+        ],
+        { allowEmpty: true }
+      )
+      .pipe(merge({}))
+      .pipe(
+        transform(function(data) {
+          const newData = {};
+          Object.entries(data).forEach(([key, value]) => {
+            // Filter out translations without native name.
+            if (data[key].nativeName) {
+              newData[key] = data[key];
+            } else {
+              console.warn(
+                `Skipping language ${key}. Native name was not translated.`
+              );
+            }
+            if (data[key]) newData[key] = value;
+          });
+          return newData;
+        })
+      )
+      .pipe(
+        transform((data) => ({
+          fragments: TRANSLATION_FRAGMENTS,
+          translations: data,
+        }))
+      )
+      .pipe(rename("translationMetadata.json"))
+      .pipe(gulp.dest(workDir));
+  })
+);
+tasks.push(taskName);
+
+module.exports = tasks;

build-scripts/gulp/webpack.js

@@ -3,7 +3,6 @@ const gulp = require("gulp");
 const webpack = require("webpack");
 const WebpackDevServer = require("webpack-dev-server");
 const log = require("fancy-log");
-const path = require("path");
 const paths = require("../paths");
 const {
   createAppConfig,
@@ -28,7 +27,7 @@ const runDevServer = ({
     open: true,
     watchContentBase: true,
     contentBase,
-  }).listen(port, listenHost, function (err) {
+  }).listen(port, listenHost, function(err) {
     if (err) {
       throw err;
     }
@@ -38,9 +37,9 @@ const runDevServer = ({
 
 const handler = (done) => (err, stats) => {
   if (err) {
-    log.error(err.stack || err);
+    console.log(err.stack || err);
     if (err.details) {
-      log.error(err.details);
+      console.log(err.details);
     }
     return;
   }
@@ -48,7 +47,7 @@ const handler = (done) => (err, stats) => {
   log(`Build done @ ${new Date().toLocaleTimeString()}`);
 
   if (stats.hasErrors() || stats.hasWarnings()) {
-    log.warn(stats.toString("minimal"));
+    console.log(stats.toString("minimal"));
   }
 
   if (done) {
@@ -59,13 +58,9 @@ const handler = (done) => (err, stats) => {
 gulp.task("webpack-watch-app", () => {
   // we are not calling done, so this command will run forever
   webpack(createAppConfig({ isProdBuild: false, latestBuild: true })).watch(
-    { ignored: /build-translations/ },
+    {},
     handler()
   );
-  gulp.watch(
-    path.join(paths.translations_src, "en.json"),
-    gulp.series("build-translations", "copy-translations-app")
-  );
 });
 
 gulp.task(
@@ -82,7 +77,7 @@ gulp.task(
 gulp.task("webpack-dev-server-demo", () => {
   runDevServer({
     compiler: webpack(bothBuilds(createDemoConfig, { isProdBuild: false })),
-    contentBase: paths.demo_output_root,
+    contentBase: paths.demo_root,
     port: 8090,
   });
 });
@@ -103,7 +98,7 @@ gulp.task(
 gulp.task("webpack-dev-server-cast", () => {
   runDevServer({
     compiler: webpack(bothBuilds(createCastConfig, { isProdBuild: false })),
-    contentBase: paths.cast_output_root,
+    contentBase: paths.cast_root,
     port: 8080,
     // Accessible from the network, because that's how Cast hits it.
     listenHost: "0.0.0.0",
@@ -150,9 +145,10 @@ gulp.task(
 
 gulp.task("webpack-dev-server-gallery", () => {
   runDevServer({
-    // We don't use the es5 build, but the dev server will fuck up the publicPath if we don't
-    compiler: webpack(bothBuilds(createGalleryConfig, { isProdBuild: false })),
-    contentBase: paths.gallery_output_root,
+    compiler: webpack(
+      createGalleryConfig({ latestBuild: true, isProdBuild: false })
+    ),
+    contentBase: paths.gallery_root,
     port: 8100,
   });
 });

build-scripts/paths.js

@@ -4,37 +4,29 @@ module.exports = {
   polymer_dir: path.resolve(__dirname, ".."),
 
   build_dir: path.resolve(__dirname, "../build"),
-  app_output_root: path.resolve(__dirname, "../hass_frontend"),
-  app_output_static: path.resolve(__dirname, "../hass_frontend/static"),
-  app_output_latest: path.resolve(
-    __dirname,
-    "../hass_frontend/frontend_latest"
-  ),
-  app_output_es5: path.resolve(__dirname, "../hass_frontend/frontend_es5"),
+  root: path.resolve(__dirname, "../hass_frontend"),
+  static: path.resolve(__dirname, "../hass_frontend/static"),
+  output: path.resolve(__dirname, "../hass_frontend/frontend_latest"),
+  output_es5: path.resolve(__dirname, "../hass_frontend/frontend_es5"),
 
   demo_dir: path.resolve(__dirname, "../demo"),
-  demo_output_root: path.resolve(__dirname, "../demo/dist"),
-  demo_output_static: path.resolve(__dirname, "../demo/dist/static"),
-  demo_output_latest: path.resolve(__dirname, "../demo/dist/frontend_latest"),
+  demo_root: path.resolve(__dirname, "../demo/dist"),
+  demo_static: path.resolve(__dirname, "../demo/dist/static"),
+  demo_output: path.resolve(__dirname, "../demo/dist/frontend_latest"),
   demo_output_es5: path.resolve(__dirname, "../demo/dist/frontend_es5"),
 
   cast_dir: path.resolve(__dirname, "../cast"),
-  cast_output_root: path.resolve(__dirname, "../cast/dist"),
-  cast_output_static: path.resolve(__dirname, "../cast/dist/static"),
-  cast_output_latest: path.resolve(__dirname, "../cast/dist/frontend_latest"),
+  cast_root: path.resolve(__dirname, "../cast/dist"),
+  cast_static: path.resolve(__dirname, "../cast/dist/static"),
+  cast_output: path.resolve(__dirname, "../cast/dist/frontend_latest"),
   cast_output_es5: path.resolve(__dirname, "../cast/dist/frontend_es5"),
 
   gallery_dir: path.resolve(__dirname, "../gallery"),
-  gallery_output_root: path.resolve(__dirname, "../gallery/dist"),
-  gallery_output_latest: path.resolve(
-    __dirname,
-    "../gallery/dist/frontend_latest"
-  ),
-  gallery_output_static: path.resolve(__dirname, "../gallery/dist/static"),
+  gallery_root: path.resolve(__dirname, "../gallery/dist"),
+  gallery_output: path.resolve(__dirname, "../gallery/dist/frontend_latest"),
+  gallery_static: path.resolve(__dirname, "../gallery/dist/static"),
 
   hassio_dir: path.resolve(__dirname, "../hassio"),
-  hassio_output_root: path.resolve(__dirname, "../hassio/build"),
+  hassio_root: path.resolve(__dirname, "../hassio/build"),
   hassio_publicPath: "/api/hassio/app/",
-
-  translations_src: path.resolve(__dirname, "../src/translations"),
 };

build-scripts/rollup-plugins/dont-hash-plugin.js

@@ -1,14 +0,0 @@
-module.exports = function (opts = {}) {
-  const dontHash = opts.dontHash || new Set();
-
-  return {
-    name: "dont-hash",
-    renderChunk(_code, chunk, _options) {
-      if (!chunk.isEntry || !dontHash.has(chunk.name)) {
-        return null;
-      }
-      chunk.fileName = `${chunk.name}.js`;
-      return null;
-    },
-  };
-};

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

@@ -1,26 +0,0 @@
-const path = require("path");
-
-module.exports = function (userOptions = {}) {
-  // Files need to be absolute paths.
-  // This only works if the file has no exports
-  // and only is imported for its side effects
-  const files = userOptions.files || [];
-
-  if (files.length === 0) {
-    return {
-      name: "ignore",
-    };
-  }
-
-  return {
-    name: "ignore",
-
-    load(id) {
-      return files.some((toIgnorePath) => id.startsWith(toIgnorePath))
-        ? {
-            code: "",
-          }
-        : null;
-    },
-  };
-};

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

@@ -1,34 +0,0 @@
-const url = require("url");
-
-const defaultOptions = {
-  publicPath: "",
-};
-
-module.exports = function (userOptions = {}) {
-  const options = { ...defaultOptions, ...userOptions };
-
-  return {
-    name: "manifest",
-    generateBundle(outputOptions, bundle) {
-      const manifest = {};
-
-      for (const chunk of Object.values(bundle)) {
-        if (!chunk.isEntry) {
-          continue;
-        }
-        // Add js extension to mimic Webpack manifest.
-        manifest[`${chunk.name}.js`] = url.resolve(
-          options.publicPath,
-          chunk.fileName
-        );
-      }
-
-      this.emitFile({
-        type: "asset",
-        source: JSON.stringify(manifest, undefined, 2),
-        name: "manifest.json",
-        fileName: "manifest.json",
-      });
-    },
-  };
-};

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

@@ -1,149 +0,0 @@
-// Worker plugin
-// Each worker will include all of its dependencies
-// instead of relying on an importer.
-
-// Forked from v.1.4.1
-// https://github.com/surma/rollup-plugin-off-main-thread
-/**
- * Copyright 2018 Google Inc. All Rights Reserved.
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *     http://www.apache.org/licenses/LICENSE-2.0
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-const rollup = require("rollup");
-const path = require("path");
-const MagicString = require("magic-string");
-
-const defaultOpts = {
-  // A RegExp to find `new Workers()` calls. The second capture group _must_
-  // capture the provided file name without the quotes.
-  workerRegexp: /new Worker\((["'])(.+?)\1(,[^)]+)?\)/g,
-  plugins: ["node-resolve", "commonjs", "babel", "terser", "ignore"],
-};
-
-async function getBundledWorker(workerPath, rollupOptions) {
-  const bundle = await rollup.rollup({
-    ...rollupOptions,
-    input: {
-      worker: workerPath,
-    },
-  });
-  const { output } = await bundle.generate({
-    // Generates cleanest output, we shouldn't have any imports/exports
-    // that would be incompatible with ES5.
-    format: "es",
-    // We should not export anything. This will fail build if we are.
-    exports: "none",
-  });
-
-  let code;
-
-  for (const chunkOrAsset of output) {
-    if (chunkOrAsset.name === "worker") {
-      code = chunkOrAsset.code;
-    } else if (chunkOrAsset.type !== "asset") {
-      throw new Error("Unexpected extra output");
-    }
-  }
-
-  return code;
-}
-
-module.exports = function (opts = {}) {
-  opts = { ...defaultOpts, ...opts };
-
-  let rollupOptions;
-  let refIds;
-
-  return {
-    name: "hass-worker",
-
-    async buildStart(options) {
-      refIds = {};
-      rollupOptions = {
-        plugins: options.plugins.filter((plugin) =>
-          opts.plugins.includes(plugin.name)
-        ),
-      };
-    },
-
-    async transform(code, id) {
-      // Copy the regexp as they are stateful and this hook is async.
-      const workerRegexp = new RegExp(
-        opts.workerRegexp.source,
-        opts.workerRegexp.flags
-      );
-      if (!workerRegexp.test(code)) {
-        return;
-      }
-
-      const ms = new MagicString(code);
-      // Reset the regexp
-      workerRegexp.lastIndex = 0;
-      while (true) {
-        const match = workerRegexp.exec(code);
-        if (!match) {
-          break;
-        }
-
-        const workerFile = match[2];
-        let optionsObject = {};
-        // Parse the optional options object
-        if (match[3] && match[3].length > 0) {
-          // FIXME: ooooof!
-          optionsObject = new Function(`return ${match[3].slice(1)};`)();
-        }
-        delete optionsObject.type;
-
-        if (!new RegExp("^.*/").test(workerFile)) {
-          this.warn(
-            `Paths passed to the Worker constructor must be relative or absolute, i.e. start with /, ./ or ../ (just like dynamic import!). Ignoring "${workerFile}".`
-          );
-          continue;
-        }
-
-        // Find worker file and store it as a chunk with ID prefixed for our loader
-        const resolvedWorkerFile = (await this.resolve(workerFile, id)).id;
-        let chunkRefId;
-        if (resolvedWorkerFile in refIds) {
-          chunkRefId = refIds[resolvedWorkerFile];
-        } else {
-          this.addWatchFile(resolvedWorkerFile);
-          const source = await getBundledWorker(
-            resolvedWorkerFile,
-            rollupOptions
-          );
-          chunkRefId = refIds[resolvedWorkerFile] = this.emitFile({
-            name: path.basename(resolvedWorkerFile),
-            source,
-            type: "asset",
-          });
-        }
-
-        const workerParametersStartIndex = match.index + "new Worker(".length;
-        const workerParametersEndIndex =
-          match.index + match[0].length - ")".length;
-
-        ms.overwrite(
-          workerParametersStartIndex,
-          workerParametersEndIndex,
-          `import.meta.ROLLUP_FILE_URL_${chunkRefId}, ${JSON.stringify(
-            optionsObject
-          )}`
-        );
-      }
-
-      return {
-        code: ms.toString(),
-        map: ms.generateMap({ hires: true }),
-      };
-    },
-  };
-};

build-scripts/rollup.js

@@ -1,151 +0,0 @@
-const path = require("path");
-
-const commonjs = require("@rollup/plugin-commonjs");
-const resolve = require("@rollup/plugin-node-resolve");
-const json = require("@rollup/plugin-json");
-const babel = require("rollup-plugin-babel");
-const replace = require("@rollup/plugin-replace");
-const visualizer = require("rollup-plugin-visualizer");
-const { string } = require("rollup-plugin-string");
-const { terser } = require("rollup-plugin-terser");
-const manifest = require("./rollup-plugins/manifest-plugin");
-const worker = require("./rollup-plugins/worker-plugin");
-const dontHashPlugin = require("./rollup-plugins/dont-hash-plugin");
-const ignore = require("./rollup-plugins/ignore-plugin");
-
-const bundle = require("./bundle");
-const paths = require("./paths");
-
-const extensions = [".js", ".ts"];
-
-/**
- * @param {Object} arg
- * @param { import("rollup").InputOption } arg.input
- */
-const createRollupConfig = ({
-  entry,
-  outputPath,
-  defineOverlay,
-  isProdBuild,
-  latestBuild,
-  isStatsBuild,
-  publicPath,
-  dontHash,
-}) => {
-  return {
-    /**
-     * @type { import("rollup").InputOptions }
-     */
-    inputOptions: {
-      input: entry,
-      // Some entry points contain no JavaScript. This setting silences a warning about that.
-      // https://rollupjs.org/guide/en/#preserveentrysignatures
-      preserveEntrySignatures: false,
-      plugins: [
-        ignore({
-          files: bundle.emptyPackages({ latestBuild }),
-        }),
-        resolve({
-          extensions,
-          preferBuiltins: false,
-          browser: true,
-          rootDir: paths.polymer_dir,
-        }),
-        commonjs({
-          namedExports: {
-            "js-yaml": ["safeDump", "safeLoad"],
-          },
-        }),
-        json(),
-        babel({
-          ...bundle.babelOptions({ latestBuild }),
-          extensions,
-          exclude: bundle.babelExclude(),
-        }),
-        string({
-          // Import certain extensions as strings
-          include: [path.join(paths.polymer_dir, "node_modules/**/*.css")],
-        }),
-        replace(
-          bundle.definedVars({ isProdBuild, latestBuild, defineOverlay })
-        ),
-        manifest({
-          publicPath,
-        }),
-        worker(),
-        dontHashPlugin({ dontHash }),
-        isProdBuild && terser(bundle.terserOptions(latestBuild)),
-        isStatsBuild &&
-          visualizer({
-            // https://github.com/btd/rollup-plugin-visualizer#options
-            open: true,
-            sourcemap: true,
-          }),
-      ],
-    },
-    /**
-     * @type { import("rollup").OutputOptions }
-     */
-    outputOptions: {
-      // https://rollupjs.org/guide/en/#outputdir
-      dir: outputPath,
-      // https://rollupjs.org/guide/en/#outputformat
-      format: latestBuild ? "es" : "systemjs",
-      // https://rollupjs.org/guide/en/#outputexternallivebindings
-      externalLiveBindings: false,
-      // https://rollupjs.org/guide/en/#outputentryfilenames
-      // https://rollupjs.org/guide/en/#outputchunkfilenames
-      // https://rollupjs.org/guide/en/#outputassetfilenames
-      entryFileNames:
-        isProdBuild && !isStatsBuild ? "[name]-[hash].js" : "[name].js",
-      chunkFileNames:
-        isProdBuild && !isStatsBuild ? "c.[hash].js" : "[name].js",
-      assetFileNames:
-        isProdBuild && !isStatsBuild ? "a.[hash].js" : "[name].js",
-      // https://rollupjs.org/guide/en/#outputsourcemap
-      sourcemap: isProdBuild ? true : "inline",
-    },
-  };
-};
-
-const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return createRollupConfig(
-    bundle.config.app({
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-    })
-  );
-};
-
-const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return createRollupConfig(
-    bundle.config.demo({
-      isProdBuild,
-      latestBuild,
-      isStatsBuild,
-    })
-  );
-};
-
-const createCastConfig = ({ isProdBuild, latestBuild }) => {
-  return createRollupConfig(bundle.config.cast({ isProdBuild, latestBuild }));
-};
-
-const createHassioConfig = ({ isProdBuild, latestBuild }) => {
-  return createRollupConfig(bundle.config.hassio({ isProdBuild, latestBuild }));
-};
-
-const createGalleryConfig = ({ isProdBuild, latestBuild }) => {
-  return createRollupConfig(
-    bundle.config.gallery({ isProdBuild, latestBuild })
-  );
-};
-
-module.exports = {
-  createAppConfig,
-  createDemoConfig,
-  createCastConfig,
-  createHassioConfig,
-  createGalleryConfig,
-};

build-scripts/util.js

@@ -1,16 +0,0 @@
-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.js

@@ -1,15 +1,23 @@
 const webpack = require("webpack");
+const fs = require("fs");
 const path = require("path");
 const TerserPlugin = require("terser-webpack-plugin");
+const WorkboxPlugin = require("workbox-webpack-plugin");
 const ManifestPlugin = require("webpack-manifest-plugin");
-const WorkerPlugin = require("worker-plugin");
 const paths = require("./paths.js");
-const bundle = require("./bundle");
+const { babelLoaderConfig } = require("./babel.js");
+
+let version = fs
+  .readFileSync(path.resolve(paths.polymer_dir, "setup.py"), "utf8")
+  .match(/\d{8}\.\d+/);
+if (!version) {
+  throw Error("Version not found");
+}
+version = version[0];
 
 const createWebpackConfig = ({
   entry,
-  outputPath,
-  publicPath,
+  outputRoot,
   defineOverlay,
   isProdBuild,
   latestBuild,
@@ -19,28 +27,26 @@ const createWebpackConfig = ({
   if (!dontHash) {
     dontHash = new Set();
   }
-  const ignorePackages = bundle.ignorePackages({ latestBuild });
   return {
     mode: isProdBuild ? "production" : "development",
-    devtool: isProdBuild
-      ? "cheap-module-source-map"
-      : "eval-cheap-module-source-map",
+    devtool: isProdBuild ? "source-map" : "inline-cheap-module-source-map",
     entry,
-    node: false,
     module: {
       rules: [
-        {
-          test: /\.js$|\.ts$/,
-          exclude: bundle.babelExclude(),
-          use: {
-            loader: "babel-loader",
-            options: bundle.babelOptions({ latestBuild }),
-          },
-        },
+        babelLoaderConfig({ latestBuild }),
         {
           test: /\.css$/,
           use: "raw-loader",
         },
+        {
+          test: /\.(html)$/,
+          use: {
+            loader: "html-loader",
+            options: {
+              exportAsEs6Default: true,
+            },
+          },
+        },
       ],
     },
     optimization: {
@@ -50,52 +56,54 @@ const createWebpackConfig = ({
           parallel: true,
           extractComments: true,
           sourceMap: true,
-          terserOptions: bundle.terserOptions(latestBuild),
+          terserOptions: {
+            safari10: true,
+            ecma: latestBuild ? undefined : 5,
+          },
         }),
       ],
     },
     plugins: [
-      new WorkerPlugin(),
-      new ManifestPlugin({
-        // Only include the JS of entrypoints
-        filter: (file) => file.isInitial && !file.name.endsWith(".map"),
-      }),
-      new webpack.DefinePlugin(
-        bundle.definedVars({ isProdBuild, latestBuild, defineOverlay })
-      ),
-      new webpack.IgnorePlugin({
-        checkResource(resource, context) {
-          // Only use ignore to intercept imports that we don't control
-          // inside node_module dependencies.
-          if (
-            !context.includes("/node_modules/") ||
-            // calling define.amd will call require("!!webpack amd options")
-            resource.startsWith("!!webpack")
-          ) {
-            return false;
-          }
-          let fullPath;
-          try {
-            fullPath = resource.startsWith(".")
-              ? path.resolve(context, resource)
-              : require.resolve(resource);
-          } catch (err) {
-            console.error("Error in ignore plugin", resource, context);
-            throw err;
-          }
-
-          return ignorePackages.some((toIgnorePath) =>
-            fullPath.startsWith(toIgnorePath)
-          );
-        },
+      new ManifestPlugin(),
+      new webpack.DefinePlugin({
+        __DEV__: !isProdBuild,
+        __BUILD__: JSON.stringify(latestBuild ? "latest" : "es5"),
+        __VERSION__: JSON.stringify(version),
+        __DEMO__: false,
+        __STATIC_PATH__: "/static/",
+        "process.env.NODE_ENV": JSON.stringify(
+          isProdBuild ? "production" : "development"
+        ),
+        ...defineOverlay,
       }),
+      // Ignore moment.js locales
+      new webpack.IgnorePlugin(/^\.\/locale$/, /moment$/),
+      // Color.js is bloated, it contains all color definitions for all material color sets.
       new webpack.NormalModuleReplacementPlugin(
-        new RegExp(bundle.emptyPackages({ latestBuild }).join("|")),
+        /@polymer\/paper-styles\/color\.js$/,
         path.resolve(paths.polymer_dir, "src/util/empty.js")
       ),
-    ],
+      // Ignore roboto pointing at CDN. We use local font-roboto-local.
+      new webpack.NormalModuleReplacementPlugin(
+        /@polymer\/font-roboto\/roboto\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+      // Ignore mwc icons pointing at CDN.
+      new webpack.NormalModuleReplacementPlugin(
+        /@material\/mwc-icon\/mwc-icon-font\.js$/,
+        path.resolve(paths.polymer_dir, "src/util/empty.js")
+      ),
+    ].filter(Boolean),
     resolve: {
       extensions: [".ts", ".js", ".json"],
+      alias: {
+        react: "preact-compat",
+        "react-dom": "preact-compat",
+        // Not necessary unless you consume a module using `createClass`
+        "create-react-class": "preact-compat/lib/create-react-class",
+        // Not necessary unless you consume a module requiring `react-dom-factories`
+        "react-dom-factories": "preact-compat/lib/react-dom-factories",
+      },
     },
     output: {
       filename: ({ chunk }) => {
@@ -108,40 +116,142 @@ const createWebpackConfig = ({
         isProdBuild && !isStatsBuild
           ? "chunk.[chunkhash].js"
           : "[name].chunk.js",
-      path: outputPath,
-      publicPath,
-      // To silence warning in worker plugin
+      path: path.resolve(
+        outputRoot,
+        latestBuild ? "frontend_latest" : "frontend_es5"
+      ),
+      publicPath: latestBuild ? "/frontend_latest/" : "/frontend_es5/",
+      // For workerize loader
       globalObject: "self",
     },
   };
 };
 
 const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return createWebpackConfig(
-    bundle.config.app({ isProdBuild, latestBuild, isStatsBuild })
-  );
+  const config = createWebpackConfig({
+    entry: {
+      app: "./src/entrypoints/app.ts",
+      authorize: "./src/entrypoints/authorize.ts",
+      onboarding: "./src/entrypoints/onboarding.ts",
+      core: "./src/entrypoints/core.ts",
+      compatibility: "./src/entrypoints/compatibility.ts",
+      "custom-panel": "./src/entrypoints/custom-panel.ts",
+      "hass-icons": "./src/entrypoints/hass-icons.ts",
+    },
+    outputRoot: paths.root,
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
+
+  if (latestBuild) {
+    // Create an object mapping browser urls to their paths during build
+    const translationMetadata = require("../build-translations/translationMetadata.json");
+    const workBoxTranslationsTemplatedURLs = {};
+    const englishFP = translationMetadata.translations.en.fingerprints;
+    Object.keys(englishFP).forEach((key) => {
+      workBoxTranslationsTemplatedURLs[
+        `/static/translations/${englishFP[key]}`
+      ] = `build-translations/output/${key}.json`;
+    });
+
+    config.plugins.push(
+      new WorkboxPlugin.InjectManifest({
+        swSrc: "./src/entrypoints/service-worker-hass.js",
+        swDest: "service_worker.js",
+        importWorkboxFrom: "local",
+        include: [/\.js$/],
+        templatedURLs: {
+          ...workBoxTranslationsTemplatedURLs,
+          "/static/icons/favicon-192x192.png":
+            "public/icons/favicon-192x192.png",
+          "/static/fonts/roboto/Roboto-Light.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Light.woff2",
+          "/static/fonts/roboto/Roboto-Medium.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Medium.woff2",
+          "/static/fonts/roboto/Roboto-Regular.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Regular.woff2",
+          "/static/fonts/roboto/Roboto-Bold.woff2":
+            "node_modules/roboto-fontface/fonts/roboto/Roboto-Bold.woff2",
+        },
+      })
+    );
+  }
+
+  return config;
 };
 
 const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => {
-  return createWebpackConfig(
-    bundle.config.demo({ isProdBuild, latestBuild, isStatsBuild })
-  );
+  return createWebpackConfig({
+    entry: {
+      main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
+      compatibility: path.resolve(
+        paths.polymer_dir,
+        "src/entrypoints/compatibility.ts"
+      ),
+    },
+    outputRoot: paths.demo_root,
+    defineOverlay: {
+      __VERSION__: JSON.stringify(`DEMO-${version}`),
+      __DEMO__: true,
+    },
+    isProdBuild,
+    latestBuild,
+    isStatsBuild,
+  });
 };
 
 const createCastConfig = ({ isProdBuild, latestBuild }) => {
-  return createWebpackConfig(bundle.config.cast({ isProdBuild, latestBuild }));
+  const entry = {
+    launcher: path.resolve(paths.cast_dir, "src/launcher/entrypoint.ts"),
+  };
+
+  if (latestBuild) {
+    entry.receiver = path.resolve(paths.cast_dir, "src/receiver/entrypoint.ts");
+  }
+
+  return createWebpackConfig({
+    entry,
+    outputRoot: paths.cast_root,
+    isProdBuild,
+    latestBuild,
+  });
 };
 
 const createHassioConfig = ({ isProdBuild, latestBuild }) => {
-  return createWebpackConfig(
-    bundle.config.hassio({ isProdBuild, latestBuild })
-  );
+  if (latestBuild) {
+    throw new Error("Hass.io does not support latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"),
+    },
+    outputRoot: "",
+    isProdBuild,
+    latestBuild,
+    dontHash: new Set(["entrypoint"]),
+  });
+
+  config.output.path = paths.hassio_root;
+  config.output.publicPath = paths.hassio_publicPath;
+
+  return config;
 };
 
 const createGalleryConfig = ({ isProdBuild, latestBuild }) => {
-  return createWebpackConfig(
-    bundle.config.gallery({ isProdBuild, latestBuild })
-  );
+  if (!latestBuild) {
+    throw new Error("Gallery only supports latest build!");
+  }
+  const config = createWebpackConfig({
+    entry: {
+      entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
+    },
+    outputRoot: paths.gallery_root,
+    isProdBuild,
+    latestBuild,
+  });
+
+  return config;
 };
 
 module.exports = {

cast/rollup.config.js

@@ -1,10 +0,0 @@
-const rollup = require("../build-scripts/rollup.js");
-const env = require("../build-scripts/env.js");
-
-const config = rollup.createCastConfig({
-  isProdBuild: env.isProdBuild(),
-  latestBuild: true,
-  isStatsBuild: env.isStatsBuild(),
-});
-
-module.exports = { ...config.inputOptions, output: config.outputOptions };

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

@@ -46,13 +46,7 @@
         // // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
         if (!isS101) {
           _ls("/static/polyfills/custom-elements-es5-adapter.js");
-          <% if (useRollup) { %>
-            _ls("/static/js/s.min.js").onload = function() {
-              System.import("<%= es5LauncherJS %>");
-            };
-          <% } else { %>
-            _ls("<%= es5LauncherJS %>");
-          <% } %>
+          _ls("<%= es5LauncherJS %>");
         }
       })();
     </script>

cast/src/html/launcher.html.template

@@ -37,13 +37,7 @@
         // // Safari 10.1 supports type=module but ignores nomodule, so we add this check.
         if (!isS101) {
           _ls("/static/polyfills/custom-elements-es5-adapter.js");
-          <% if (useRollup) { %>
-            _ls("/static/js/s.min.js").onload = function() {
-              System.import("<%= es5LauncherJS %>");
-            };
-          <% } else { %>
-            _ls("<%= es5LauncherJS %>");
-          <% } %>
+          _ls("<%= es5LauncherJS %>");
         }
       })();
     </script>

cast/src/launcher/entrypoint.ts

@@ -1,3 +1,5 @@
 import "../../../src/resources/ha-style";
 import "../../../src/resources/roboto";
+import "../../../src/components/ha-iconset-svg";
+import "../../../src/resources/hass-icons";
 import "./layout/hc-connect";

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

@@ -1,53 +1,49 @@
-import "@polymer/paper-item/paper-icon-item";
-import "@polymer/paper-listbox/paper-listbox";
-import { Auth, Connection } from "home-assistant-js-websocket";
 import {
-  css,
-  CSSResult,
   customElement,
-  html,
   LitElement,
   property,
   TemplateResult,
+  html,
+  CSSResult,
+  css,
 } from "lit-element";
-import { CastManager } from "../../../../src/cast/cast_manager";
-import {
-  castSendShowLovelaceView,
-  ensureConnectedCastSession,
-} from "../../../../src/cast/receiver_messages";
-import {
-  askWrite,
-  enableWrite,
-  saveTokens,
-} from "../../../../src/common/auth/token_storage";
-import { atLeastVersion } from "../../../../src/common/config/version";
-import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";
+import { Connection, Auth } from "home-assistant-js-websocket";
+import "@polymer/iron-icon";
+import "@polymer/paper-listbox/paper-listbox";
+import "@polymer/paper-item/paper-icon-item";
 import "../../../../src/components/ha-icon";
 import {
-  getLegacyLovelaceCollection,
-  getLovelaceCollection,
-  LovelaceConfig,
-} from "../../../../src/data/lovelace";
+  enableWrite,
+  askWrite,
+  saveTokens,
+} from "../../../../src/common/auth/token_storage";
+import {
+  ensureConnectedCastSession,
+  castSendShowLovelaceView,
+} from "../../../../src/cast/receiver_messages";
 import "../../../../src/layouts/loading-screen";
-import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
+import { CastManager } from "../../../../src/cast/cast_manager";
+import {
+  LovelaceConfig,
+  getLovelaceCollection,
+} from "../../../../src/data/lovelace";
 import "./hc-layout";
-import "@material/mwc-button/mwc-button";
+import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
+import { toggleAttribute } from "../../../../src/common/dom/toggle_attribute";
 
 @customElement("hc-cast")
 class HcCast extends LitElement {
   @property() public auth!: Auth;
-
   @property() public connection!: Connection;
-
   @property() public castManager!: CastManager;
-
   @property() private askWrite = false;
-
   @property() private lovelaceConfig?: LovelaceConfig | null;
 
   protected render(): TemplateResult {
     if (this.lovelaceConfig === undefined) {
-      return html` <loading-screen></loading-screen>> `;
+      return html`
+        <loading-screen></loading-screen>>
+      `;
     }
 
     const error =
@@ -77,12 +73,14 @@ class HcCast extends LitElement {
             `
           : ""}
         ${error
-          ? html` <div class="card-content">${error}</div> `
+          ? html`
+              <div class="card-content">${error}</div>
+            `
           : !this.castManager.status
           ? html`
               <p class="center-item">
                 <mwc-button raised @click=${this._handleLaunch}>
-                  <ha-icon icon="hass:cast"></ha-icon>
+                  <iron-icon icon="hass:cast"></iron-icon>
                   Start Casting
                 </mwc-button>
               </p>
@@ -120,7 +118,7 @@ class HcCast extends LitElement {
           ${this.castManager.status
             ? html`
                 <mwc-button @click=${this._handleLaunch}>
-                  <ha-icon icon="hass:cast-connected"></ha-icon>
+                  <iron-icon icon="hass:cast-connected"></iron-icon>
                   Manage
                 </mwc-button>
               `
@@ -135,9 +133,7 @@ class HcCast extends LitElement {
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
 
-    const llColl = atLeastVersion(this.connection.haVersion, 0, 107)
-      ? getLovelaceCollection(this.connection)
-      : getLegacyLovelaceCollection(this.connection);
+    const llColl = getLovelaceCollection(this.connection);
     // We first do a single refresh because we need to check if there is LL
     // configuration.
     llColl.refresh().then(
@@ -242,7 +238,7 @@ class HcCast extends LitElement {
         color: var(--secondary-text-color);
       }
 
-      mwc-button ha-icon {
+      mwc-button iron-icon {
         margin-right: 8px;
         height: 18px;
       }

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

@@ -1,35 +1,35 @@
-import "@material/mwc-button";
-import "@polymer/paper-input/paper-input";
 import {
-  Auth,
-  Connection,
-  createConnection,
-  ERR_CANNOT_CONNECT,
-  ERR_HASS_HOST_REQUIRED,
-  ERR_INVALID_AUTH,
-  ERR_INVALID_HTTPS_TO_HTTP,
-  getAuth,
-  getAuthOptions,
-} from "home-assistant-js-websocket";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
   LitElement,
+  customElement,
   property,
   TemplateResult,
+  html,
+  CSSResult,
+  css,
 } from "lit-element";
-import { CastManager, getCastManager } from "../../../../src/cast/cast_manager";
-import { castSendShowDemo } from "../../../../src/cast/receiver_messages";
+import {
+  getAuth,
+  createConnection,
+  Auth,
+  getAuthOptions,
+  ERR_HASS_HOST_REQUIRED,
+  ERR_INVALID_HTTPS_TO_HTTP,
+  Connection,
+  ERR_CANNOT_CONNECT,
+  ERR_INVALID_AUTH,
+} from "home-assistant-js-websocket";
+import "@polymer/iron-icon";
+import "@material/mwc-button";
+import "@polymer/paper-input/paper-input";
 import {
   loadTokens,
   saveTokens,
 } from "../../../../src/common/auth/token_storage";
-import "../../../../src/components/ha-icon";
 import "../../../../src/layouts/loading-screen";
-import { registerServiceWorker } from "../../../../src/util/register-service-worker";
+import { CastManager, getCastManager } from "../../../../src/cast/cast_manager";
 import "./hc-layout";
+import { castSendShowDemo } from "../../../../src/cast/receiver_messages";
+import { registerServiceWorker } from "../../../../src/util/register-service-worker";
 
 const seeFAQ = (qid) => html`
   See <a href="./faq.html${qid ? `#${qid}` : ""}">the FAQ</a> for more
@@ -61,19 +61,13 @@ const INTRO = html`
 @customElement("hc-connect")
 export class HcConnect extends LitElement {
   @property() private loading = false;
-
   // If we had stored credentials but we cannot connect,
   // show a screen asking retry or logout.
   @property() private cannotConnect = false;
-
   @property() private error?: string | TemplateResult;
-
   @property() private auth?: Auth;
-
   @property() private connection?: Connection;
-
   @property() private castManager?: CastManager | null;
-
   private openDemo = false;
 
   protected render(): TemplateResult {
@@ -98,7 +92,9 @@ export class HcConnect extends LitElement {
     }
 
     if (this.castManager === undefined || this.loading) {
-      return html` <loading-screen></loading-screen> `;
+      return html`
+        <loading-screen></loading-screen>
+      `;
     }
 
     if (this.castManager === null) {
@@ -131,16 +127,20 @@ export class HcConnect extends LitElement {
                 @keydown=${this._handleInputKeyDown}
               ></paper-input>
             </p>
-            ${this.error ? html` <p class="error">${this.error}</p> ` : ""}
+            ${this.error
+              ? html`
+                  <p class="error">${this.error}</p>
+                `
+              : ""}
           </div>
           <div class="card-actions">
             <mwc-button @click=${this._handleDemo}>
               Show Demo
-              <ha-icon
+              <iron-icon
                 .icon=${this.castManager.castState === "CONNECTED"
                   ? "hass:cast-connected"
                   : "hass:cast"}
-              ></ha-icon>
+              ></iron-icon>
             </mwc-button>
             <div class="spacer"></div>
             <mwc-button @click=${this._handleConnect}>Authorize</mwc-button>
@@ -184,7 +184,7 @@ export class HcConnect extends LitElement {
         this.castManager = null;
       }
     );
-    registerServiceWorker(this, false);
+    registerServiceWorker(false);
   }
 
   private async _handleDemo() {
@@ -211,8 +211,7 @@ export class HcConnect extends LitElement {
     if (value === "") {
       this.error = "Please enter a Home Assistant URL.";
       return;
-    }
-    if (value.indexOf("://") === -1) {
+    } else if (value.indexOf("://") === -1) {
       this.error =
         "Please enter your full URL, including the protocol part (https://).";
       return;
@@ -316,7 +315,7 @@ export class HcConnect extends LitElement {
         color: darkred;
       }
 
-      mwc-button ha-icon {
+      mwc-button iron-icon {
         margin-left: 8px;
       }
 

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

@@ -1,28 +1,25 @@
+import {
+  customElement,
+  LitElement,
+  TemplateResult,
+  html,
+  CSSResult,
+  css,
+  property,
+} from "lit-element";
 import {
   Auth,
   Connection,
-  getUser,
   HassUser,
+  getUser,
 } from "home-assistant-js-websocket";
-import {
-  css,
-  CSSResult,
-  customElement,
-  html,
-  LitElement,
-  property,
-  TemplateResult,
-} from "lit-element";
 import "../../../../src/components/ha-card";
 
 @customElement("hc-layout")
 class HcLayout extends LitElement {
   @property() public subtitle?: string | undefined;
-
   @property() public auth?: Auth;
-
   @property() public connection?: Connection;
-
   @property() public user?: HassUser;
 
   protected render(): TemplateResult {
@@ -40,7 +37,11 @@ class HcLayout extends LitElement {
                         this.auth.data.hassUrl.indexOf("//") + 2
                       )}</a
                     >
-                    ${this.user ? html` – ${this.user.name} ` : ""}
+                    ${this.user
+                      ? html`
+                          – ${this.user.name}
+                        `
+                      : ""}
                   </div>
                 `
               : ""}

cast/src/receiver/cast_context.ts

@@ -1,2 +1 @@
-/* eslint-disable no-undef */
 export const castContext = cast.framework.CastReceiverContext.getInstance();

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

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

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

@@ -1,6 +1,6 @@
 import {
-  LovelaceCardConfig,
   LovelaceConfig,
+  LovelaceCardConfig,
 } from "../../../../src/data/lovelace";
 import { castContext } from "../cast_context";
 

cast/src/receiver/entrypoint.ts

@@ -1,10 +1,9 @@
-/* eslint-disable no-undef */
-import { CAST_NS } from "../../../src/cast/const";
-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 { ReceivedMessage } from "./types";
+import { HassMessage } from "../../../src/cast/receiver_messages";
+import { HcMain } from "./layout/hc-main";
+import { CAST_NS } from "../../../src/cast/const";
 
 const controller = new HcMain();
 document.body.append(controller);

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

@@ -1,20 +1,19 @@
-import { customElement, html, property, TemplateResult } from "lit-element";
-import { mockHistory } from "../../../../demo/src/stubs/history";
-import { LovelaceConfig } from "../../../../src/data/lovelace";
+import { HassElement } from "../../../../src/state/hass-element";
+import "./hc-lovelace";
+import { customElement, TemplateResult, html, property } from "lit-element";
 import {
   MockHomeAssistant,
   provideHass,
 } from "../../../../src/fake_data/provide_hass";
-import { HassElement } from "../../../../src/state/hass-element";
 import { HomeAssistant } from "../../../../src/types";
+import { LovelaceConfig } from "../../../../src/data/lovelace";
 import { castDemoEntities } from "../demo/cast-demo-entities";
 import { castDemoLovelace } from "../demo/cast-demo-lovelace";
-import "./hc-lovelace";
+import { mockHistory } from "../../../../demo/src/stubs/history";
 
 @customElement("hc-demo")
 class HcDemo extends HassElement {
   @property() public lovelacePath!: string;
-
   @property() private _lovelaceConfig?: LovelaceConfig;
 
   protected render(): TemplateResult {
@@ -29,7 +28,6 @@ class HcDemo extends HassElement {
       ></hc-lovelace>
     `;
   }
-
   protected firstUpdated(changedProps) {
     super.firstUpdated(changedProps);
     this._initialize();

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

@@ -1,18 +1,17 @@
 import {
-  css,
-  CSSResult,
-  customElement,
-  html,
   LitElement,
-  property,
   TemplateResult,
+  html,
+  customElement,
+  CSSResult,
+  css,
+  property,
 } from "lit-element";
 import { HomeAssistant } from "../../../../src/types";
 
 @customElement("hc-launch-screen")
 class HcLaunchScreen extends LitElement {
   @property() public hass?: HomeAssistant;
-
   @property() public error?: string;
 
   protected render(): TemplateResult {
@@ -23,7 +22,11 @@ class HcLaunchScreen extends LitElement {
         />
         <div class="status">
           ${this.hass ? "Connected" : "Not Connected"}
-          ${this.error ? html` <p>Error: ${this.error}</p> ` : ""}
+          ${this.error
+            ? html`
+                <p>Error: ${this.error}</p>
+              `
+            : ""}
         </div>
       </div>
     `;

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

@@ -1,17 +1,17 @@
 import {
-  css,
-  CSSResult,
-  customElement,
-  html,
   LitElement,
-  property,
   TemplateResult,
+  html,
+  customElement,
+  CSSResult,
+  css,
+  property,
 } from "lit-element";
 import { LovelaceConfig } from "../../../../src/data/lovelace";
-import { Lovelace } from "../../../../src/panels/lovelace/types";
-import "../../../../src/panels/lovelace/views/hui-panel-view";
 import "../../../../src/panels/lovelace/views/hui-view";
+import "../../../../src/panels/lovelace/views/hui-panel-view";
 import { HomeAssistant } from "../../../../src/types";
+import { Lovelace } from "../../../../src/panels/lovelace/types";
 import "./hc-launch-screen";
 
 @customElement("hc-lovelace")
@@ -46,7 +46,6 @@ class HcLovelace extends LitElement {
       ? html`
           <hui-panel-view
             .hass=${this.hass}
-            .lovelace=${lovelace}
             .config=${this.lovelaceConfig.views[index]}
           ></hui-panel-view>
         `

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

@@ -1,33 +1,27 @@
 import {
-  createConnection,
   getAuth,
+  createConnection,
   UnsubscribeFunc,
 } from "home-assistant-js-websocket";
-import { customElement, html, property, TemplateResult } from "lit-element";
-import { CAST_NS } from "../../../../src/cast/const";
-import {
-  ConnectMessage,
-  GetStatusMessage,
-  HassMessage,
-  ShowDemoMessage,
-  ShowLovelaceViewMessage,
-} from "../../../../src/cast/receiver_messages";
-import { ReceiverStatusMessage } from "../../../../src/cast/sender_messages";
-import { atLeastVersion } from "../../../../src/common/config/version";
-import { isNavigationClick } from "../../../../src/common/dom/is-navigation-click";
-import {
-  fetchResources,
-  getLegacyLovelaceCollection,
-  getLovelaceCollection,
-  LegacyLovelaceConfig,
-  LovelaceConfig,
-} from "../../../../src/data/lovelace";
-import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources";
+import { customElement, TemplateResult, html, property } from "lit-element";
 import { HassElement } from "../../../../src/state/hass-element";
-import { castContext } from "../cast_context";
+import {
+  HassMessage,
+  ConnectMessage,
+  ShowLovelaceViewMessage,
+  GetStatusMessage,
+  ShowDemoMessage,
+} from "../../../../src/cast/receiver_messages";
+import {
+  LovelaceConfig,
+  getLovelaceCollection,
+} from "../../../../src/data/lovelace";
 import "./hc-launch-screen";
-
-let resourcesLoaded = false;
+import { castContext } from "../cast_context";
+import { CAST_NS } from "../../../../src/cast/const";
+import { ReceiverStatusMessage } from "../../../../src/cast/sender_messages";
+import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources";
+import { isNavigationClick } from "../../../../src/common/dom/is-navigation-click";
 
 @customElement("hc-main")
 export class HcMain extends HassElement {
@@ -41,8 +35,6 @@ export class HcMain extends HassElement {
 
   private _unsubLovelace?: UnsubscribeFunc;
 
-  private _urlPath?: string | null;
-
   public processIncomingMessage(msg: HassMessage) {
     if (msg.type === "connect") {
       this._handleConnectMessage(msg);
@@ -53,14 +45,16 @@ export class HcMain extends HassElement {
     } else if (msg.type === "show_demo") {
       this._handleShowDemo(msg);
     } else {
-      // eslint-disable-next-line no-console
+      // tslint:disable-next-line: no-console
       console.warn("unknown msg type", msg);
     }
   }
 
   protected render(): TemplateResult {
     if (this._showDemo) {
-      return html` <hc-demo .lovelacePath=${this._lovelacePath}></hc-demo> `;
+      return html`
+        <hc-demo .lovelacePath=${this._lovelacePath}></hc-demo>
+      `;
     }
 
     if (
@@ -90,17 +84,15 @@ export class HcMain extends HassElement {
     super.firstUpdated(changedProps);
     import("../second-load");
     window.addEventListener("location-changed", () => {
-      const panelPath = `/${this._urlPath || "lovelace"}/`;
-      if (location.pathname.startsWith(panelPath)) {
-        this._lovelacePath = location.pathname.substr(panelPath.length);
+      if (location.pathname.startsWith("/lovelace/")) {
+        this._lovelacePath = location.pathname.substr(10);
         this._sendStatus();
       }
     });
     document.body.addEventListener("click", (ev) => {
-      const panelPath = `/${this._urlPath || "lovelace"}/`;
       const href = isNavigationClick(ev);
-      if (href && href.startsWith(panelPath)) {
-        this._lovelacePath = href.substr(panelPath.length);
+      if (href && href.startsWith("/lovelace/")) {
+        this._lovelacePath = href.substr(10);
         this._sendStatus();
       }
     });
@@ -116,7 +108,6 @@ export class HcMain extends HassElement {
     if (this.hass) {
       status.hassUrl = this.hass.auth.data.hassUrl;
       status.lovelacePath = this._lovelacePath!;
-      status.urlPath = this._urlPath;
     }
 
     if (senderId) {
@@ -172,17 +163,8 @@ export class HcMain extends HassElement {
       this._error = "Cannot show Lovelace because we're not connected.";
       return;
     }
-    if (msg.urlPath === "lovelace") {
-      msg.urlPath = null;
-    }
-    if (!this._unsubLovelace || this._urlPath !== msg.urlPath) {
-      this._urlPath = msg.urlPath;
-      if (this._unsubLovelace) {
-        this._unsubLovelace();
-      }
-      const llColl = atLeastVersion(this.hass.connection.haVersion, 0, 107)
-        ? getLovelaceCollection(this.hass!.connection, msg.urlPath)
-        : getLegacyLovelaceCollection(this.hass!.connection);
+    if (!this._unsubLovelace) {
+      const llColl = getLovelaceCollection(this.hass!.connection);
       // We first do a single refresh because we need to check if there is LL
       // configuration.
       try {
@@ -201,15 +183,6 @@ export class HcMain extends HassElement {
         );
       }
     }
-    if (!resourcesLoaded) {
-      resourcesLoaded = true;
-      const resources = atLeastVersion(this.hass.connection.haVersion, 0, 107)
-        ? await fetchResources(this.hass!.connection)
-        : (this._lovelaceConfig as LegacyLovelaceConfig).resources;
-      if (resources) {
-        loadLovelaceResources(resources, this.hass!.auth.data.hassUrl);
-      }
-    }
     this._showDemo = false;
     this._lovelacePath = msg.viewPath;
     if (castContext.getDeviceCapabilities().touch_input_supported) {
@@ -221,6 +194,12 @@ export class HcMain extends HassElement {
   private _handleNewLovelaceConfig(lovelaceConfig: LovelaceConfig) {
     castContext.setApplicationState(lovelaceConfig.title!);
     this._lovelaceConfig = lovelaceConfig;
+    if (lovelaceConfig.resources) {
+      loadLovelaceResources(
+        lovelaceConfig.resources,
+        this.hass!.auth.data.hassUrl
+      );
+    }
   }
 
   private _handleShowDemo(_msg: ShowDemoMessage) {

cast/src/receiver/second-load.ts

@@ -1,4 +1,5 @@
 import "web-animations-js/web-animations-next-lite.min";
+import "../../../src/resources/hass-icons";
 import "../../../src/resources/roboto";
-import "../../../src/resources/ha-style";
+import "../../../src/components/ha-iconset-svg";
 import "./layout/hc-lovelace";

cast/webpack.config.js

@@ -6,6 +6,6 @@ const { isProdBuild } = require("../build-scripts/env.js");
 const latestBuild = true;
 
 module.exports = createCastConfig({
-  isProdBuild: isProdBuild(),
+  isProdBuild,
   latestBuild,
 });