Compare commits

..

6 Commits

Author SHA1 Message Date
J. Nick Koston
23ba92e4ad avoid downloading the whole entity registry again as well 2023-02-24 18:29:30 -06:00
J. Nick Koston
c636eacc51 Merge branch 'energy_no_ids' into ii2 2023-02-24 17:34:27 -06:00
J. Nick Koston
f75d17e10c Avoid fetching all stats metadata when there are no entities
Fetch all the data at once since it is not dependant
2023-02-24 17:26:29 -06:00
J. Nick Koston
2c6acecb60 Merge branch 'dupe_calls' into ii2 2023-02-24 17:14:15 -06:00
J. Nick Koston
225a3c3f50 Avoid fetching all stats metadata when there are no entities
Fetch all the data at once since it is not dependant
2023-02-24 17:12:01 -06:00
J. Nick Koston
19c125f7be Fix duplicate fetch of stats metadata in more info 2023-02-24 16:51:18 -06:00
1693 changed files with 55295 additions and 114663 deletions

View File

@@ -1,39 +0,0 @@
[modern]
# Support for dynamic import is the main litmus test for serving modern builds.
# Although officially a ES2020 feature, browsers implemented it early, so this
# enables all of ES2017 and some features in ES2018.
supports es6-module-dynamic-import
# Exclude Safari 11-12 because of a bug in tagged template literals
# https://bugs.webkit.org/show_bug.cgi?id=190756
# Note: Dropping version 11 also enables several more ES2018 features
not Safari < 13
not iOS < 13
# Exclude KaiOS, QQ, and UC browsers due to lack of sufficient feature support data
# Babel ignores these automatically, but we need here for Webpack to output ESM with dynamic imports
not KaiOS > 0
not QQAndroid > 0
not UCAndroid > 0
# Exclude unsupported browsers
not dead
[legacy]
# Legacy builds are served when modern requirements are not met and support browsers:
# - released in the last 7 years + current alpha/beta versionss
# - with global utilization above 0.05%
# The lattermost query ensures that support for popular old browsers is not dropped too early
# (e.g. IE 11, Android 4.4, or Samsung 4).
#
# In addition, legacy browsers must support some minimum features that cannot be polyfilled:
# - ES5 (strict mode)
# - web sockets to communicate with backend
# - inline SVG used widely in buttons, widgets, etc.
# - custom events used for most user interactions
# - CSS flexbox used in the majority of the layout
# Nearly all of these are redundant with the above rules.
# As of May 2023, only web sockets must be added to the query.
unreleased versions
last 7 years
> 0.05% and supports websockets

View File

@@ -1,7 +1,13 @@
# See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile # See here for image contents: https://github.com/microsoft/vscode-dev-containers/tree/v0.148.1/containers/python-3/.devcontainer/base.Dockerfile
FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11 FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10
ENV \ ENV \
DEBIAN_FRONTEND=noninteractive \ DEBIAN_FRONTEND=noninteractive \
DEVCONTAINER=true \ DEVCONTAINER=true \
PATH=$PATH:./node_modules/.bin PATH=$PATH:./node_modules/.bin
# Install nvm
COPY .nvmrc /tmp/.nvmrc
RUN \
su vscode -c \
"source /usr/local/share/nvm/nvm.sh && nvm install $(cat /tmp/.nvmrc) 2>&1"

View File

@@ -5,8 +5,7 @@
"context": ".." "context": ".."
}, },
"appPort": "8124:8123", "appPort": "8124:8123",
"postCreateCommand": "sudo apt update && sudo apt upgrade -y && sudo apt install -y libpcap-dev", "postCreateCommand": "script/bootstrap",
"postStartCommand": "script/bootstrap",
"containerEnv": { "containerEnv": {
"WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}" "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
}, },

View File

@@ -20,7 +20,7 @@
"settings": { "settings": {
"import/resolver": { "import/resolver": {
"webpack": { "webpack": {
"config": "./webpack.config.cjs" "config": "./webpack.config.js"
} }
} }
}, },
@@ -59,6 +59,7 @@
"prefer-destructuring": "off", "prefer-destructuring": "off",
"no-restricted-globals": [2, "event"], "no-restricted-globals": [2, "event"],
"prefer-promise-reject-errors": "off", "prefer-promise-reject-errors": "off",
"no-unsafe-optional-chaining": "warn",
"import/prefer-default-export": "off", "import/prefer-default-export": "off",
"import/no-default-export": "off", "import/no-default-export": "off",
"import/no-unresolved": "off", "import/no-unresolved": "off",
@@ -119,6 +120,7 @@
"lit/no-template-map": "off", "lit/no-template-map": "off",
"lit/no-native-attributes": "warn", "lit/no-native-attributes": "warn",
"lit/no-this-assign-in-render": "warn", "lit/no-this-assign-in-render": "warn",
"lit/prefer-nothing": "warn",
"lit-a11y/click-events-have-key-events": ["off"], "lit-a11y/click-events-have-key-events": ["off"],
"lit-a11y/no-autofocus": "off", "lit-a11y/no-autofocus": "off",
"lit-a11y/alt-text": "warn", "lit-a11y/alt-text": "warn",

View File

@@ -9,7 +9,7 @@ body:
If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue. If you have a feature or enhancement request for the frontend, please [start an discussion][fr] instead of creating an issue.
**Please do not report issues for custom cards.** **Please not not report issues for custom cards.**
[fr]: https://github.com/home-assistant/frontend/discussions [fr]: https://github.com/home-assistant/frontend/discussions
[releases]: https://github.com/home-assistant/home-assistant/releases [releases]: https://github.com/home-assistant/home-assistant/releases
@@ -24,7 +24,6 @@ body:
required: true required: true
- label: I have tried a different browser to see if it is related to my browser. - label: I have tried a different browser to see if it is related to my browser.
required: true required: true
- label: I have tried reproducing the issue in [safe mode](https://www.home-assistant.io/blog/2023/11/01/release-202311/#restarting-into-safe-mode) to rule out problems with unsupported custom resources.
- type: markdown - type: markdown
attributes: attributes:
value: | value: |

View File

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

View File

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

51
.github/labeler.yml vendored
View File

@@ -1,51 +0,0 @@
Build:
- changed-files:
- any-glob-to-any-file:
- build-scripts/**
- .browserslistrc
- gulpfile.js
Cast:
- changed-files:
- any-glob-to-any-file:
- cast/src/**
- src/cast/**
Demo:
- changed-files:
- any-glob-to-any-file:
- demo/src/**
- src/fake_data/**
Design:
- changed-files:
- any-glob-to-any-file:
- gallery/src/**
- src/fake_data/**
Dependencies:
- any:
- changed-files:
# Match when only these files are changed (i.e. don't match PRs that happen to add or remove packages)
- any-glob-to-all-files:
- package.json
- renovate.json
- yarn.lock
- .yarn/**
- .yarnrc.yml
- .nvmrc
# Dependabot and Renovate branches always match (i.e. compatibility tweaks by members considered minor)
- head-branch:
- "^renovate/"
- "^dependabot/"
GitHub Actions:
- changed-files:
- any-glob-to-any-file:
- .github/workflows/**
- .github/*.yml
Supervisor:
- changed-files:
- any-glob-to-any-file:
- hassio/src/**

View File

@@ -1,8 +1,3 @@
categories:
- title: "Dependency updates"
collapse-after: 3
labels:
- "Dependencies"
template: | template: |
## What's Changed ## What's Changed

View File

@@ -9,6 +9,7 @@ on:
- master - master
env: env:
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
jobs: jobs:
@@ -21,14 +22,14 @@ jobs:
url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
with: with:
ref: dev ref: dev
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
@@ -57,14 +58,14 @@ jobs:
url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
with: with:
ref: master ref: master
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies

View File

@@ -11,6 +11,7 @@ on:
- master - master
env: env:
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -24,11 +25,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
run: yarn install --immutable run: yarn install --immutable
@@ -36,21 +37,10 @@ jobs:
run: yarn dedupe --check run: yarn dedupe --check
- name: Build resources - name: Build resources
run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data gather-gallery-pages
- name: Setup lint cache
uses: actions/cache@v4.0.0
with:
path: |
node_modules/.cache/prettier
node_modules/.cache/eslint
node_modules/.cache/typescript
key: lint-${{ github.sha }}
restore-keys: lint-
- name: Run eslint - name: Run eslint
run: yarn run lint:eslint --quiet run: yarn run lint:eslint --quiet
- name: Run tsc - name: Run tsc
run: yarn run lint:types run: yarn run lint:types
- name: Run lit-analyzer
run: yarn run lint:lit --quiet
- name: Run prettier - name: Run prettier
run: yarn run lint:prettier run: yarn run lint:prettier
test: test:
@@ -58,16 +48,16 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
run: yarn install --immutable run: yarn install --immutable
- name: Build resources - name: Build resources
run: ./node_modules/.bin/gulp gen-icons-json build-translations build-locale-data run: ./node_modules/.bin/gulp build-translations build-locale-data
- name: Run Tests - name: Run Tests
run: yarn run test run: yarn run test
build: build:
@@ -76,11 +66,11 @@ jobs:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
run: yarn install --immutable run: yarn install --immutable
@@ -88,23 +78,17 @@ jobs:
run: ./node_modules/.bin/gulp build-app run: ./node_modules/.bin/gulp build-app
env: env:
IS_TEST: "true" IS_TEST: "true"
- name: Upload bundle stats
uses: actions/upload-artifact@v4.3.1
with:
name: frontend-bundle-stats
path: build/stats/*.json
if-no-files-found: error
supervisor: supervisor:
name: Build supervisor name: Build supervisor
needs: [lint, test] needs: [lint, test]
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
run: yarn install --immutable run: yarn install --immutable
@@ -112,9 +96,3 @@ jobs:
run: ./node_modules/.bin/gulp build-hassio run: ./node_modules/.bin/gulp build-hassio
env: env:
IS_TEST: "true" IS_TEST: "true"
- name: Upload bundle stats
uses: actions/upload-artifact@v4.3.1
with:
name: supervisor-bundle-stats
path: build/stats/*.json
if-no-files-found: error

View File

@@ -17,44 +17,44 @@ jobs:
matrix: matrix:
# Override automatic language detection by changing the below list # Override automatic language detection by changing the below list
# Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python'] # Supported options are ['csharp', 'cpp', 'go', 'java', 'javascript', 'python']
language: ["javascript"] language: ['javascript']
# Learn more... # Learn more...
# https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection # https://docs.github.com/en/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#overriding-automatic-language-detection
steps: steps:
- name: Checkout repository - name: Checkout repository
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
with: with:
# We must fetch at least the immediate parents so that if this is # We must fetch at least the immediate parents so that if this is
# a pull request then we can checkout the head. # a pull request then we can checkout the head.
fetch-depth: 2 fetch-depth: 2
# If this run was triggered by a pull request event, then checkout # If this run was triggered by a pull request event, then checkout
# the head of the pull request instead of the merge commit. # the head of the pull request instead of the merge commit.
- run: git checkout HEAD^2 - run: git checkout HEAD^2
if: ${{ github.event_name == 'pull_request' }} if: ${{ github.event_name == 'pull_request' }}
# Initializes the CodeQL tools for scanning. # Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL - name: Initialize CodeQL
uses: github/codeql-action/init@v3 uses: github/codeql-action/init@v2
with: with:
languages: ${{ matrix.language }} languages: ${{ matrix.language }}
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java). # Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below) # If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild - name: Autobuild
uses: github/codeql-action/autobuild@v3 uses: github/codeql-action/autobuild@v2
# Command-line programs to run using the OS shell. # Command-line programs to run using the OS shell.
# 📚 https://git.io/JvXDl # 📚 https://git.io/JvXDl
# ✏️ If the Autobuild fails above, remove it and uncomment the following three lines # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
# and modify them (or add more) to build your code if your project # and modify them (or add more) to build your code if your project
# uses a compiled language # uses a compiled language
#- run: | #- run: |
# make bootstrap # make bootstrap
# make release # make release
- name: Perform CodeQL Analysis - name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v3 uses: github/codeql-action/analyze@v2

View File

@@ -10,26 +10,27 @@ on:
- master - master
env: env:
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
jobs: jobs:
deploy_dev: deploy_dev:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Demo Development name: Demo Development
if: github.event_name != 'push' || github.ref_name != 'master' if: github.event_name != 'push' || github.ref != 'master'
environment: environment:
name: Demo Development name: Demo Development
url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
with: with:
ref: dev ref: dev
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
@@ -52,20 +53,20 @@ jobs:
deploy_master: deploy_master:
runs-on: ubuntu-latest runs-on: ubuntu-latest
name: Demo Production name: Demo Production
if: github.event_name == 'push' && github.ref_name == 'master' if: github.event_name == 'push' && github.ref == 'master'
environment: environment:
name: Demo Production name: Demo Production
url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
with: with:
ref: master ref: master
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies

View File

@@ -6,6 +6,7 @@ on:
- cron: "0 0 * * *" - cron: "0 0 * * *"
env: env:
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
jobs: jobs:
@@ -16,12 +17,12 @@ jobs:
url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }} url: ${{ steps.deploy.outputs.NETLIFY_LIVE_URL || steps.deploy.outputs.NETLIFY_URL }}
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies

View File

@@ -11,6 +11,7 @@ on:
- dev - dev
env: env:
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
jobs: jobs:
@@ -21,12 +22,12 @@ jobs:
if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview') if: github.repository == 'home-assistant/frontend' && contains(github.event.pull_request.labels.*.name, 'needs design preview')
steps: steps:
- name: Check out files from GitHub - name: Check out files from GitHub
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies

View File

@@ -1,15 +0,0 @@
name: "Pull Request Labeler"
on: pull_request_target
jobs:
triage:
permissions:
contents: read
pull-requests: write
runs-on: ubuntu-latest
steps:
- name: Apply labels
uses: actions/labeler@v5.0.0
with:
sync-labels: true

View File

@@ -9,10 +9,9 @@ jobs:
lock: lock:
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: dessant/lock-threads@v5.0.1 - uses: dessant/lock-threads@v4.0.0
with: with:
github-token: ${{ github.token }} github-token: ${{ github.token }}
process-only: "issues, prs"
issue-lock-inactive-days: "30" issue-lock-inactive-days: "30"
issue-exclude-created-before: "2020-10-01T00:00:00Z" issue-exclude-created-before: "2020-10-01T00:00:00Z"
issue-lock-reason: "" issue-lock-reason: ""

View File

@@ -6,7 +6,8 @@ on:
- cron: "0 1 * * *" - cron: "0 1 * * *"
env: env:
PYTHON_VERSION: "3.11" PYTHON_VERSION: "3.10"
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
permissions: permissions:
@@ -20,17 +21,17 @@ jobs:
contents: write contents: write
steps: steps:
- name: Checkout the repository - name: Checkout the repository
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Set up Python ${{ env.PYTHON_VERSION }} - name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v5 uses: actions/setup-python@v4
with: with:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
@@ -57,14 +58,14 @@ jobs:
run: tar -czvf translations.tar.gz translations run: tar -czvf translations.tar.gz translations
- name: Upload build artifacts - name: Upload build artifacts
uses: actions/upload-artifact@v4.3.1 uses: actions/upload-artifact@v3
with: with:
name: wheels name: wheels
path: dist/home_assistant_frontend*.whl path: dist/home_assistant_frontend*.whl
if-no-files-found: error if-no-files-found: error
- name: Upload translations - name: Upload translations
uses: actions/upload-artifact@v4.3.1 uses: actions/upload-artifact@v3
with: with:
name: translations name: translations
path: translations.tar.gz path: translations.tar.gz

View File

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

View File

@@ -5,19 +5,10 @@ on:
branches: branches:
- dev - dev
permissions:
contents: read
jobs: jobs:
update_release_draft: update_release_draft:
permissions:
# write permission for contents is required to create a github release
contents: write
# write permission for pull-requests is required for autolabeler
# otherwise, read permission is required at least
pull-requests: read
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- uses: release-drafter/release-drafter@v6.0.0 - uses: release-drafter/release-drafter@v5
env: env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

View File

@@ -6,7 +6,8 @@ on:
- published - published
env: env:
PYTHON_VERSION: "3.11" PYTHON_VERSION: "3.10"
NODE_VERSION: 16
NODE_OPTIONS: --max_old_space_size=6144 NODE_OPTIONS: --max_old_space_size=6144
# Set default workflow permissions # Set default workflow permissions
@@ -23,20 +24,20 @@ jobs:
contents: write # Required to upload release assets contents: write # Required to upload release assets
steps: steps:
- name: Checkout the repository - name: Checkout the repository
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Verify version - name: Verify version
uses: home-assistant/actions/helpers/verify-version@master uses: home-assistant/actions/helpers/verify-version@master
- name: Set up Python ${{ env.PYTHON_VERSION }} - name: Set up Python ${{ env.PYTHON_VERSION }}
uses: actions/setup-python@v5 uses: actions/setup-python@v4
with: with:
python-version: ${{ env.PYTHON_VERSION }} python-version: ${{ env.PYTHON_VERSION }}
- name: Setup Node - name: Set up Node ${{ env.NODE_VERSION }}
uses: actions/setup-node@v4.0.2 uses: actions/setup-node@v3.6.0
with: with:
node-version-file: ".nvmrc" node-version: ${{ env.NODE_VERSION }}
cache: yarn cache: yarn
- name: Install dependencies - name: Install dependencies
@@ -74,9 +75,9 @@ jobs:
echo "home-assistant-frontend==$version" > ./requirements.txt echo "home-assistant-frontend==$version" > ./requirements.txt
- name: Build wheels - name: Build wheels
uses: home-assistant/wheels@2024.01.0 uses: home-assistant/wheels@2022.10.1
with: with:
abi: cp311 abi: cp310
tag: musllinux_1_2 tag: musllinux_1_2
arch: amd64 arch: amd64
wheels-key: ${{ secrets.WHEELS_KEY }} wheels-key: ${{ secrets.WHEELS_KEY }}

View File

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

View File

@@ -7,15 +7,19 @@ on:
paths: paths:
- src/translations/en.json - src/translations/en.json
env:
NODE_VERSION: 16
jobs: jobs:
upload: upload:
name: Upload name: Upload
runs-on: ubuntu-latest runs-on: ubuntu-latest
steps: steps:
- name: Checkout the repository - name: Checkout the repository
uses: actions/checkout@v4.1.1 uses: actions/checkout@v3.3.0
- name: Upload Translations - name: Upload Translations
run: | run: |
export LOKALISE_TOKEN="${{ secrets.LOKALISE_TOKEN }}" export LOKALISE_TOKEN="${{ secrets.LOKALISE_TOKEN }}"
./script/translations_upload_base ./script/translations_upload_base

3
.gitignore vendored
View File

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

2
.nvmrc
View File

@@ -1 +1 @@
lts/iron 16

View File

@@ -1,4 +1,9 @@
CLA.md build
CODE_OF_CONDUCT.md translations/*
LICENSE.md node_modules/*
PULL_REQUEST_TEMPLATE.md hass_frontend/*
pip-selfcheck.json
# vscode
.vscode/*
!.vscode/extensions.json

6
.vscode/launch.json vendored
View File

@@ -9,7 +9,9 @@
"webRoot": "${workspaceFolder}/hass_frontend", "webRoot": "${workspaceFolder}/hass_frontend",
"disableNetworkCache": true, "disableNetworkCache": true,
"preLaunchTask": "Develop Frontend", "preLaunchTask": "Develop Frontend",
"outFiles": ["${workspaceFolder}/hass_frontend/frontend_latest/*.js"] "outFiles": [
"${workspaceFolder}/hass_frontend/frontend_latest/*.js"
]
}, },
{ {
"name": "Debug Gallery", "name": "Debug Gallery",
@@ -37,6 +39,6 @@
"webRoot": "${workspaceFolder}/cast/dist", "webRoot": "${workspaceFolder}/cast/dist",
"disableNetworkCache": true, "disableNetworkCache": true,
"preLaunchTask": "Develop Cast" "preLaunchTask": "Develop Cast"
} },
] ]
} }

2
.vscode/tasks.json vendored
View File

@@ -197,7 +197,7 @@
"type": "gulp", "type": "gulp",
"task": "setup-and-fetch-nightly-translations", "task": "setup-and-fetch-nightly-translations",
"problemMatcher": [] "problemMatcher": []
} }
], ],
"inputs": [ "inputs": [
{ {

View File

@@ -1,13 +0,0 @@
diff --git a/simple-tooltip.js b/simple-tooltip.js
index 78a87f6a223925f0e29fbedb268c85a142ec6985..3d686dd6a3d5a93342b4b01408089fc316b408ca 100644
--- a/simple-tooltip.js
+++ b/simple-tooltip.js
@@ -195,6 +195,8 @@ class SimpleTooltip extends LitElement {
.hidden {
position: absolute;
left: -10000px;
+ inset-inline-start: -10000px;
+ inset-inline-end: initial;
top: auto;
width: 1px;
height: 1px;

File diff suppressed because one or more lines are too long

View File

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

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

823
.yarn/releases/yarn-3.3.1.cjs vendored Executable file

File diff suppressed because one or more lines are too long

File diff suppressed because one or more lines are too long

View File

@@ -1,9 +1,9 @@
compressionLevel: mixed
defaultSemverRangePrefix: ""
enableGlobalCache: false
nodeLinker: node-modules nodeLinker: node-modules
yarnPath: .yarn/releases/yarn-4.1.0.cjs plugins:
- path: .yarn/plugins/@yarnpkg/plugin-typescript.cjs
spec: "@yarnpkg/plugin-typescript"
- path: .yarn/plugins/@yarnpkg/plugin-interactive-tools.cjs
spec: "@yarnpkg/plugin-interactive-tools"
yarnPath: .yarn/releases/yarn-3.3.1.cjs

View File

@@ -1,56 +0,0 @@
import defineProvider from "@babel/helper-define-polyfill-provider";
// List of polyfill keys with supported browser targets for the functionality
const PolyfillSupport = {
fetch: {
android: 42,
chrome: 42,
edge: 14,
firefox: 39,
ios: 10.3,
opera: 29,
opera_mobile: 29,
safari: 10.1,
samsung: 4.0,
},
proxy: {
android: 49,
chrome: 49,
edge: 12,
firefox: 18,
ios: 10.0,
opera: 36,
opera_mobile: 36,
safari: 10.0,
samsung: 5.0,
},
};
// Map of global variables and/or instance and static properties to the
// corresponding polyfill key and actual module to import
const polyfillMap = {
global: {
Proxy: { key: "proxy", module: "proxy-polyfill" },
fetch: { key: "fetch", module: "unfetch/polyfill" },
},
instance: {},
static: {},
};
// Create plugin using the same factory as for CoreJS
export default defineProvider(
({ createMetaResolver, debug, shouldInjectPolyfill }) => {
const resolvePolyfill = createMetaResolver(polyfillMap);
return {
name: "HA Custom",
polyfills: PolyfillSupport,
usageGlobal(meta, utils) {
const polyfill = resolvePolyfill(meta);
if (polyfill && shouldInjectPolyfill(polyfill.desc.key)) {
debug(polyfill.desc.key);
utils.injectGlobalImport(polyfill.desc.module);
}
},
};
}
);

View File

@@ -1,19 +1,13 @@
const path = require("path"); const path = require("path");
const env = require("./env.cjs"); const env = require("./env.js");
const paths = require("./paths.cjs"); const paths = require("./paths.js");
const { dependencies } = require("../package.json");
// GitHub base URL to use for production source maps
// Nightly builds use the commit SHA, otherwise assumes there is a tag that matches the version
module.exports.sourceMapURL = () => {
const ref = env.version().endsWith("dev")
? process.env.GITHUB_SHA || "dev"
: env.version();
return `https://raw.githubusercontent.com/home-assistant/frontend/${ref}/`;
};
// Files from NPM Packages that should not be imported // Files from NPM Packages that should not be imported
module.exports.ignorePackages = () => []; // eslint-disable-next-line unused-imports/no-unused-vars
module.exports.ignorePackages = ({ latestBuild }) => [
// 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 // Files from NPM packages that we should replace with empty file
module.exports.emptyPackages = ({ latestBuild, isHassioBuild }) => module.exports.emptyPackages = ({ latestBuild, isHassioBuild }) =>
@@ -32,6 +26,8 @@ module.exports.emptyPackages = ({ latestBuild, isHassioBuild }) =>
require.resolve( require.resolve(
path.resolve(paths.polymer_dir, "src/resources/compatibility.ts") path.resolve(paths.polymer_dir, "src/resources/compatibility.ts")
), ),
// This polyfill is loaded in workers to support ES5, filter it out.
latestBuild && require.resolve("proxy-polyfill/src/index.js"),
// Icons in supervisor conflict with icons in HA so we don't load. // Icons in supervisor conflict with icons in HA so we don't load.
isHassioBuild && isHassioBuild &&
require.resolve( require.resolve(
@@ -57,117 +53,60 @@ module.exports.definedVars = ({ isProdBuild, latestBuild, defineOverlay }) => ({
...defineOverlay, ...defineOverlay,
}); });
module.exports.htmlMinifierOptions = { module.exports.terserOptions = (latestBuild) => ({
caseSensitive: true,
collapseWhitespace: true,
conservativeCollapse: true,
decodeEntities: true,
removeComments: true,
removeRedundantAttributes: true,
minifyCSS: {
compatibility: "*,-properties.zeroUnits",
},
};
module.exports.terserOptions = ({ latestBuild, isTestBuild }) => ({
safari10: !latestBuild, safari10: !latestBuild,
ecma: latestBuild ? 2015 : 5, ecma: latestBuild ? undefined : 5,
module: latestBuild, output: { comments: false },
format: { comments: false },
sourceMap: !isTestBuild,
}); });
module.exports.babelOptions = ({ latestBuild, isProdBuild, isTestBuild }) => ({ module.exports.babelOptions = ({ latestBuild }) => ({
babelrc: false, babelrc: false,
compact: false, compact: false,
assumptions: {
privateFieldsAsProperties: true,
setPublicClassFields: true,
setSpreadProperties: true,
},
browserslistEnv: latestBuild ? "modern" : "legacy",
presets: [ presets: [
[ !latestBuild && [
"@babel/preset-env", "@babel/preset-env",
{ {
useBuiltIns: latestBuild ? false : "usage", useBuiltIns: "entry",
corejs: latestBuild ? false : dependencies["core-js"], corejs: { version: "3.28", proposals: true },
bugfixes: true, bugfixes: true,
shippedProposals: true,
}, },
], ],
"@babel/preset-typescript", "@babel/preset-typescript",
], ].filter(Boolean),
plugins: [ plugins: [
[ [
path.resolve( path.resolve(
paths.polymer_dir, paths.polymer_dir,
"build-scripts/babel-plugins/inline-constants-plugin.cjs" "build-scripts/babel-plugins/inline-constants-plugin.js"
), ),
{ {
modules: ["@mdi/js"], modules: ["@mdi/js"],
ignoreModuleNotFound: true, ignoreModuleNotFound: true,
}, },
], ],
[ // Part of ES2018. Converts {...a, b: 2} to Object.assign({}, a, {b: 2})
path.resolve( !latestBuild && [
paths.polymer_dir, "@babel/plugin-proposal-object-rest-spread",
"build-scripts/babel-plugins/custom-polyfill-plugin.js" { loose: true, useBuiltIns: true },
),
{ method: "usage-global" },
], ],
// Minify template literals for production // Only support the syntax, Webpack will handle it.
isProdBuild && [ "@babel/plugin-syntax-import-meta",
"template-html-minifier", "@babel/plugin-syntax-dynamic-import",
{ "@babel/plugin-syntax-top-level-await",
modules: { "@babel/plugin-proposal-optional-chaining",
...Object.fromEntries( "@babel/plugin-proposal-nullish-coalescing-operator",
["lit", "lit-element", "lit-html"].map((m) => [
m,
[
"html",
{ name: "svg", encapsulation: "svg" },
{ name: "css", encapsulation: "style" },
],
])
),
"@polymer/polymer/lib/utils/html-tag.js": ["html"],
},
strictCSS: true,
htmlMinifier: module.exports.htmlMinifierOptions,
failOnError: false, // we can turn this off in case of false positives
},
],
// Import helpers and regenerator from runtime package
[
"@babel/plugin-transform-runtime",
{ version: dependencies["@babel/runtime"] },
],
// Support some proposals still in TC39 process
["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }], ["@babel/plugin-proposal-decorators", { decoratorsBeforeExport: true }],
["@babel/plugin-proposal-private-methods", { loose: true }],
["@babel/plugin-proposal-private-property-in-object", { loose: true }],
["@babel/plugin-proposal-class-properties", { loose: true }],
].filter(Boolean), ].filter(Boolean),
exclude: [ exclude: [
// \\ for Windows, / for Mac OS and Linux // \\ for Windows, / for Mac OS and Linux
/node_modules[\\/]core-js/, /node_modules[\\/]core-js/,
/node_modules[\\/]webpack[\\/]buildin/, /node_modules[\\/]webpack[\\/]buildin/,
], ],
sourceMaps: !isTestBuild,
overrides: [
{
// Use unambiguous for dependencies so that require() is correctly injected into CommonJS files
// Exclusions are needed in some cases where ES modules have no static imports or exports, such as polyfills
sourceType: "unambiguous",
include: /\/node_modules\//,
exclude: [
"element-internals-polyfill",
"@?lit(?:-labs|-element|-html)?",
].map((p) => new RegExp(`/node_modules/${p}/`)),
},
],
}); });
const nameSuffix = (latestBuild) => (latestBuild ? "-modern" : "-legacy");
const outputPath = (outputRoot, latestBuild) => const outputPath = (outputRoot, latestBuild) =>
path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5"); path.resolve(outputRoot, latestBuild ? "frontend_latest" : "frontend_es5");
@@ -175,32 +114,29 @@ const publicPath = (latestBuild, root = "") =>
latestBuild ? `${root}/frontend_latest/` : `${root}/frontend_es5/`; latestBuild ? `${root}/frontend_latest/` : `${root}/frontend_es5/`;
/* /*
BundleConfig { BundleConfig {
// Object with entrypoints that need to be bundled // Object with entrypoints that need to be bundled
entry: { [name: string]: pathToFile }, entry: { [name: string]: pathToFile },
// Folder where bundled files need to be written // Folder where bundled files need to be written
outputPath: string, outputPath: string,
// absolute url-path where bundled files can be found // absolute url-path where bundled files can be found
publicPath: string, publicPath: string,
// extra definitions that we need to replace in source // extra definitions that we need to replace in source
defineOverlay: {[name: string]: value }, defineOverlay: {[name: string]: value },
// if this is a production build // if this is a production build
isProdBuild: boolean, isProdBuild: boolean,
// If we're targeting latest browsers // If we're targeting latest browsers
latestBuild: boolean, latestBuild: boolean,
// If we're doing a stats build (create nice chunk names) // If we're doing a stats build (create nice chunk names)
isStatsBuild: boolean, isStatsBuild: boolean,
// If it's just a test build in CI, skip time on source map generation // Names of entrypoints that should not be hashed
isTestBuild: boolean, dontHash: Set<string>
// Names of entrypoints that should not be hashed }
dontHash: Set<string> */
}
*/
module.exports.config = { module.exports.config = {
app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild, isWDS }) { app({ isProdBuild, latestBuild, isStatsBuild, isWDS }) {
return { return {
name: "frontend" + nameSuffix(latestBuild),
entry: { entry: {
service_worker: "./src/entrypoints/service_worker.ts", service_worker: "./src/entrypoints/service_worker.ts",
app: "./src/entrypoints/app.ts", app: "./src/entrypoints/app.ts",
@@ -214,14 +150,12 @@ module.exports.config = {
isProdBuild, isProdBuild,
latestBuild, latestBuild,
isStatsBuild, isStatsBuild,
isTestBuild,
isWDS, isWDS,
}; };
}, },
demo({ isProdBuild, latestBuild, isStatsBuild }) { demo({ isProdBuild, latestBuild, isStatsBuild }) {
return { return {
name: "demo" + nameSuffix(latestBuild),
entry: { entry: {
main: path.resolve(paths.demo_dir, "src/entrypoint.ts"), main: path.resolve(paths.demo_dir, "src/entrypoint.ts"),
}, },
@@ -251,7 +185,6 @@ module.exports.config = {
} }
return { return {
name: "cast" + nameSuffix(latestBuild),
entry, entry,
outputPath: outputPath(paths.cast_output_root, latestBuild), outputPath: outputPath(paths.cast_output_root, latestBuild),
publicPath: publicPath(latestBuild), publicPath: publicPath(latestBuild),
@@ -263,9 +196,8 @@ module.exports.config = {
}; };
}, },
hassio({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) { hassio({ isProdBuild, latestBuild }) {
return { return {
name: "supervisor" + nameSuffix(latestBuild),
entry: { entry: {
entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"), entrypoint: path.resolve(paths.hassio_dir, "src/entrypoint.ts"),
}, },
@@ -273,19 +205,15 @@ module.exports.config = {
publicPath: publicPath(latestBuild, paths.hassio_publicPath), publicPath: publicPath(latestBuild, paths.hassio_publicPath),
isProdBuild, isProdBuild,
latestBuild, latestBuild,
isStatsBuild,
isTestBuild,
isHassioBuild: true, isHassioBuild: true,
defineOverlay: { defineOverlay: {
__SUPERVISOR__: true, __SUPERVISOR__: true,
__STATIC_PATH__: `"${paths.hassio_publicPath}/static/"`,
}, },
}; };
}, },
gallery({ isProdBuild, latestBuild }) { gallery({ isProdBuild, latestBuild }) {
return { return {
name: "gallery" + nameSuffix(latestBuild),
entry: { entry: {
entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"), entrypoint: path.resolve(paths.gallery_dir, "src/entrypoint.js"),
}, },

View File

@@ -1,6 +1,6 @@
const fs = require("fs"); const fs = require("fs");
const path = require("path"); const path = require("path");
const paths = require("./paths.cjs"); const paths = require("./paths.js");
module.exports = { module.exports = {
useRollup() { useRollup() {
@@ -17,7 +17,7 @@ module.exports = {
isStatsBuild() { isStatsBuild() {
return process.env.STATS === "1"; return process.env.STATS === "1";
}, },
isTestBuild() { isTest() {
return process.env.IS_TEST === "true"; return process.env.IS_TEST === "true";
}, },
isNetlify() { isNetlify() {

View File

@@ -1,16 +1,19 @@
import gulp from "gulp"; // Run HA develop mode
import env from "../env.cjs"; const gulp = require("gulp");
import "./clean.js";
import "./compress.js"; const env = require("../env");
import "./entry-html.js";
import "./gather-static.js"; require("./clean.js");
import "./gen-icons-json.js"; require("./translations.js");
import "./locale-data.js"; require("./locale-data.js");
import "./rollup.js"; require("./gen-icons-json.js");
import "./service-worker.js"; require("./gather-static.js");
import "./translations.js"; require("./compress.js");
import "./wds.js"; require("./webpack.js");
import "./webpack.js"; require("./service-worker.js");
require("./entry-html.js");
require("./rollup.js");
require("./wds.js");
gulp.task( gulp.task(
"develop-app", "develop-app",
@@ -22,7 +25,8 @@ gulp.task(
gulp.parallel( gulp.parallel(
"gen-service-worker-app-dev", "gen-service-worker-app-dev",
"gen-icons-json", "gen-icons-json",
"gen-pages-app-dev", "gen-pages-dev",
"gen-index-app-dev",
"build-translations", "build-translations",
"build-locale-data" "build-locale-data"
), ),
@@ -30,8 +34,8 @@ gulp.task(
env.useWDS() env.useWDS()
? "wds-watch-app" ? "wds-watch-app"
: env.useRollup() : env.useRollup()
? "rollup-watch-app" ? "rollup-watch-app"
: "webpack-watch-app" : "webpack-watch-app"
) )
); );
@@ -45,8 +49,12 @@ gulp.task(
gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"), gulp.parallel("gen-icons-json", "build-translations", "build-locale-data"),
"copy-static-app", "copy-static-app",
env.useRollup() ? "rollup-prod-app" : "webpack-prod-app", env.useRollup() ? "rollup-prod-app" : "webpack-prod-app",
gulp.parallel("gen-pages-app-prod", "gen-service-worker-app-prod"),
// Don't compress running tests // Don't compress running tests
...(env.isTestBuild() ? [] : ["compress-app"]) ...(env.isTest() ? [] : ["compress-app"]),
gulp.parallel(
"gen-pages-prod",
"gen-index-app-prod",
"gen-service-worker-app-prod"
)
) )
); );

View File

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

View File

@@ -1,37 +1,37 @@
import { deleteSync } from "del"; const del = import("del");
import gulp from "gulp"; const gulp = require("gulp");
import paths from "../paths.cjs"; const paths = require("../paths");
import "./translations.js"; require("./translations");
gulp.task( gulp.task(
"clean", "clean",
gulp.parallel("clean-translations", async () => gulp.parallel("clean-translations", async () =>
deleteSync([paths.app_output_root, paths.build_dir]) (await del).deleteSync([paths.app_output_root, paths.build_dir])
) )
); );
gulp.task( gulp.task(
"clean-demo", "clean-demo",
gulp.parallel("clean-translations", async () => gulp.parallel("clean-translations", async () =>
deleteSync([paths.demo_output_root, paths.build_dir]) (await del).deleteSync([paths.demo_output_root, paths.build_dir])
) )
); );
gulp.task( gulp.task(
"clean-cast", "clean-cast",
gulp.parallel("clean-translations", async () => gulp.parallel("clean-translations", async () =>
deleteSync([paths.cast_output_root, paths.build_dir]) (await del).deleteSync([paths.cast_output_root, paths.build_dir])
) )
); );
gulp.task("clean-hassio", async () => gulp.task("clean-hassio", async () =>
deleteSync([paths.hassio_output_root, paths.build_dir]) (await del).deleteSync([paths.hassio_output_root, paths.build_dir])
); );
gulp.task( gulp.task(
"clean-gallery", "clean-gallery",
gulp.parallel("clean-translations", async () => gulp.parallel("clean-translations", async () =>
deleteSync([ (await del).deleteSync([
paths.gallery_output_root, paths.gallery_output_root,
paths.gallery_build, paths.gallery_build,
paths.build_dir, paths.build_dir,

View File

@@ -1,26 +1,45 @@
// Tasks to compress // Tasks to compress
import { deleteAsync } from "del"; const gulp = require("gulp");
import gulp from "gulp"; const zopfli = require("gulp-zopfli-green");
import gulpIf from "gulp-if"; const merge = require("merge-stream");
import vinylPaths from "vinyl-paths"; const path = require("path");
import zopfli from "gulp-zopfli-green"; const paths = require("../paths");
import paths from "../paths.cjs";
const zopfliOptions = { threshold: 150 }; const zopfliOptions = { threshold: 150 };
const compressedExt = /\.gz$/; gulp.task("compress-app", function compressApp() {
const deleteUncompressed = (p) => deleteAsync(p.replace(compressedExt, "")); const jsLatest = gulp
.src(path.resolve(paths.app_output_latest, "**/*.js"))
const compressDist = (rootDir) =>
gulp
.src([
`${rootDir}/**/*.{js?(.map),json,css,svg,xml}`,
`${rootDir}/{authorize,onboarding}.html`,
])
.pipe(zopfli(zopfliOptions)) .pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(rootDir)) .pipe(gulp.dest(paths.app_output_latest));
.pipe(gulpIf(compressedExt, vinylPaths(deleteUncompressed)));
gulp.task("compress-app", () => compressDist(paths.app_output_root)); const jsEs5 = gulp
gulp.task("compress-hassio", () => compressDist(paths.hassio_output_root)); .src(path.resolve(paths.app_output_es5, "**/*.js"))
.pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(paths.app_output_es5));
const polyfills = gulp
.src(path.resolve(paths.app_output_static, "polyfills/*.js"))
.pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(path.resolve(paths.app_output_static, "polyfills")));
const translations = gulp
.src(path.resolve(paths.app_output_static, "translations/**/*.json"))
.pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(path.resolve(paths.app_output_static, "translations")));
const icons = gulp
.src(path.resolve(paths.app_output_static, "mdi/*.json"))
.pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(path.resolve(paths.app_output_static, "mdi")));
return merge(jsLatest, jsEs5, polyfills, translations, icons);
});
gulp.task("compress-hassio", function compressApp() {
return gulp
.src(path.resolve(paths.hassio_output_root, "**/*.js"))
.pipe(zopfli(zopfliOptions))
.pipe(gulp.dest(paths.hassio_output_root));
});

View File

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

View File

@@ -1,180 +0,0 @@
import fs from "fs/promises";
import gulp from "gulp";
import path from "path";
import mapStream from "map-stream";
import transform from "gulp-json-transform";
import { LokaliseApi } from "@lokalise/node-api";
import JSZip from "jszip";
const inDir = "translations";
const inDirFrontend = `${inDir}/frontend`;
const inDirBackend = `${inDir}/backend`;
const srcMeta = "src/translations/translationMetadata.json";
const encoding = "utf8";
function hasHtml(data) {
return /<[a-z][\s\S]*>/i.test(data);
}
function recursiveCheckHasHtml(file, data, errors, recKey) {
Object.keys(data).forEach(function (key) {
if (typeof data[key] === "object") {
const nextRecKey = recKey ? `${recKey}.${key}` : key;
recursiveCheckHasHtml(file, data[key], errors, nextRecKey);
} else if (hasHtml(data[key])) {
errors.push(`HTML found in ${file.path} at key ${recKey}.${key}`);
}
});
}
function checkHtml() {
const errors = [];
return mapStream(function (file, cb) {
const content = file.contents;
let error;
if (content) {
if (hasHtml(String(content))) {
const data = JSON.parse(String(content));
recursiveCheckHasHtml(file, data, errors);
if (errors.length > 0) {
error = errors.join("\r\n");
}
}
}
cb(error, file);
});
}
function convertBackendTranslations(data, _file) {
const output = { component: {} };
if (!data.component) {
return output;
}
Object.keys(data.component).forEach((domain) => {
if (!("entity_component" in data.component[domain])) {
return;
}
output.component[domain] = { entity_component: {} };
Object.keys(data.component[domain].entity_component).forEach((key) => {
output.component[domain].entity_component[key] =
data.component[domain].entity_component[key];
});
});
return output;
}
gulp.task("convert-backend-translations", function () {
return gulp
.src([`${inDirBackend}/*.json`])
.pipe(transform((data, file) => convertBackendTranslations(data, file)))
.pipe(gulp.dest(inDirBackend));
});
gulp.task("check-translations-html", function () {
return gulp
.src([`${inDirFrontend}/*.json`, `${inDirBackend}/*.json`])
.pipe(checkHtml());
});
gulp.task("check-all-files-exist", async function () {
const file = await fs.readFile(srcMeta, { encoding });
const meta = JSON.parse(file);
const writings = [];
Object.keys(meta).forEach((lang) => {
writings.push(
fs.writeFile(`${inDirFrontend}/${lang}.json`, JSON.stringify({}), {
flag: "wx",
}),
fs.writeFile(`${inDirBackend}/${lang}.json`, JSON.stringify({}), {
flag: "wx",
})
);
});
await Promise.allSettled(writings);
});
const lokaliseProjects = {
backend: "130246255a974bd3b5e8a1.51616605",
frontend: "3420425759f6d6d241f598.13594006",
};
gulp.task("fetch-lokalise", async function () {
let apiKey;
try {
apiKey =
process.env.LOKALISE_TOKEN ||
(await fs.readFile(".lokalise_token", { encoding }));
} catch {
throw new Error(
"An Administrator Lokalise API token is required to download the latest set of translations. Place your token in a new file `.lokalise_token` in the repo root directory."
);
}
const lokaliseApi = new LokaliseApi({ apiKey });
const mkdirPromise = Promise.all([
fs.mkdir(inDirFrontend, { recursive: true }),
fs.mkdir(inDirBackend, { recursive: true }),
]);
await Promise.all(
Object.entries(lokaliseProjects).map(([project, projectId]) =>
lokaliseApi
.files()
.download(projectId, {
format: "json",
original_filenames: false,
replace_breaks: false,
json_unescaped_slashes: true,
export_empty_as: "skip",
})
.then((download) => fetch(download.bundle_url))
.then((response) => {
if (response.status === 200 || response.status === 0) {
return response.arrayBuffer();
}
throw new Error(response.statusText);
})
.then(JSZip.loadAsync)
.then(async (contents) => {
await mkdirPromise;
return Promise.all(
Object.keys(contents.files).map(async (filename) => {
const file = contents.file(filename);
if (!file) {
// no file, probably a directory
return Promise.resolve();
}
return file
.async("nodebuffer")
.then((content) =>
fs.writeFile(
path.join(
inDir,
project,
filename.split("/").splice(-1)[0]
),
content,
{ flag: "w", encoding }
)
);
})
);
})
.catch((err) => {
console.error(err);
throw err;
})
)
);
});
gulp.task(
"download-translations",
gulp.series(
"fetch-lokalise",
"convert-backend-translations",
"check-translations-html",
"check-all-files-exist"
)
);

View File

@@ -0,0 +1,69 @@
const gulp = require("gulp");
const fs = require("fs/promises");
const mapStream = require("map-stream");
const inDirFrontend = "translations/frontend";
const inDirBackend = "translations/backend";
const srcMeta = "src/translations/translationMetadata.json";
const encoding = "utf8";
function hasHtml(data) {
return /<[a-z][\s\S]*>/i.test(data);
}
function recursiveCheckHasHtml(file, data, errors, recKey) {
Object.keys(data).forEach(function (key) {
if (typeof data[key] === "object") {
const nextRecKey = recKey ? `${recKey}.${key}` : key;
recursiveCheckHasHtml(file, data[key], errors, nextRecKey);
} else if (hasHtml(data[key])) {
errors.push(`HTML found in ${file.path} at key ${recKey}.${key}`);
}
});
}
function checkHtml() {
const errors = [];
return mapStream(function (file, cb) {
const content = file.contents;
let error;
if (content) {
if (hasHtml(String(content))) {
const data = JSON.parse(String(content));
recursiveCheckHasHtml(file, data, errors);
if (errors.length > 0) {
error = errors.join("\r\n");
}
}
}
cb(error, file);
});
}
// Backend translations do not currently pass HTML check so are excluded here for now
gulp.task("check-translations-html", function () {
return gulp.src([`${inDirFrontend}/*.json`]).pipe(checkHtml());
});
gulp.task("check-all-files-exist", async function () {
const file = await fs.readFile(srcMeta, { encoding });
const meta = JSON.parse(file);
const writings = [];
Object.keys(meta).forEach((lang) => {
writings.push(
fs.writeFile(`${inDirFrontend}/${lang}.json`, JSON.stringify({}), {
flag: "wx",
}),
fs.writeFile(`${inDirBackend}/${lang}.json`, JSON.stringify({}), {
flag: "wx",
})
);
});
await Promise.allSettled(writings);
});
gulp.task(
"check-downloaded-translations",
gulp.series("check-translations-html", "check-all-files-exist")
);

View File

@@ -1,233 +1,344 @@
// Tasks to generate entry HTML // Tasks to generate entry HTML
const gulp = require("gulp");
const fs = require("fs-extra");
const path = require("path");
const template = require("lodash.template");
const minify = require("html-minifier").minify;
const paths = require("../paths.js");
const env = require("../env.js");
import fs from "fs-extra"; const templatePath = (tpl) =>
import gulp from "gulp"; path.resolve(paths.polymer_dir, "src/html/", `${tpl}.html.template`);
import { minify } from "html-minifier-terser";
import template from "lodash.template";
import path from "path";
import { htmlMinifierOptions, terserOptions } from "../bundle.cjs";
import env from "../env.cjs";
import paths from "../paths.cjs";
const renderTemplate = (templateFile, data = {}) => { const readFile = (pth) => fs.readFileSync(pth).toString();
const compiled = template(
fs.readFileSync(templateFile, { encoding: "utf-8" }) const renderTemplate = (pth, data = {}, pathFunc = templatePath) => {
); const compiled = template(readFile(pathFunc(pth)));
return compiled({ return compiled({
...data, ...data,
useRollup: env.useRollup(), useRollup: env.useRollup(),
useWDS: env.useWDS(), useWDS: env.useWDS(),
// Resolve any child/nested templates relative to the parent and pass the same data renderTemplate,
renderTemplate: (childTemplate) =>
renderTemplate(
path.resolve(path.dirname(templateFile), childTemplate),
data
),
}); });
}; };
const WRAP_TAGS = { ".js": "script", ".css": "style" }; const renderDemoTemplate = (pth, data = {}) =>
renderTemplate(pth, data, (tpl) =>
const minifyHtml = (content, ext) => { path.resolve(paths.demo_dir, "src/html/", `${tpl}.html.template`)
const wrapTag = WRAP_TAGS[ext] || "";
const begTag = wrapTag && `<${wrapTag}>`;
const endTag = wrapTag && `</${wrapTag}>`;
return minify(begTag + content + endTag, {
...htmlMinifierOptions,
conservativeCollapse: false,
minifyJS: terserOptions({
latestBuild: false, // Shared scripts should be ES5
isTestBuild: true, // Don't need source maps
}),
}).then((wrapped) =>
wrapTag ? wrapped.slice(begTag.length, -endTag.length) : wrapped
); );
};
// Function to generate a dev task for each project's configuration const renderCastTemplate = (pth, data = {}) =>
// Note Currently WDS paths are hard-coded to only work for app renderTemplate(pth, data, (tpl) =>
const genPagesDevTask = path.resolve(paths.cast_dir, "src/html/", `${tpl}.html.template`)
( );
pageEntries,
inputRoot,
outputRoot,
useWDS = false,
inputSub = "src/html",
publicRoot = ""
) =>
async () => {
for (const [page, entries] of Object.entries(pageEntries)) {
const content = renderTemplate(
path.resolve(inputRoot, inputSub, `${page}.template`),
{
latestEntryJS: entries.map((entry) =>
useWDS
? `http://localhost:8000/src/entrypoints/${entry}.ts`
: `${publicRoot}/frontend_latest/${entry}.js`
),
es5EntryJS: entries.map(
(entry) => `${publicRoot}/frontend_es5/${entry}.js`
),
latestCustomPanelJS: useWDS
? "http://localhost:8000/src/entrypoints/custom-panel.ts"
: `${publicRoot}/frontend_latest/custom-panel.js`,
es5CustomPanelJS: `${publicRoot}/frontend_es5/custom-panel.js`,
}
);
fs.outputFileSync(path.resolve(outputRoot, page), content);
}
};
// Same as previous but for production builds const renderGalleryTemplate = (pth, data = {}) =>
// (includes minification and hashed file names from manifest) renderTemplate(pth, data, (tpl) =>
const genPagesProdTask = path.resolve(paths.gallery_dir, "src/html/", `${tpl}.html.template`)
( );
pageEntries,
inputRoot, const minifyHtml = (content) =>
outputRoot, minify(content, {
outputLatest, collapseWhitespace: true,
outputES5, minifyJS: true,
inputSub = "src/html" minifyCSS: true,
) => removeComments: true,
async () => { });
const latestManifest = fs.readJsonSync(
path.resolve(outputLatest, "manifest.json") const PAGES = ["onboarding", "authorize"];
gulp.task("gen-pages-dev", (done) => {
for (const page of PAGES) {
const content = renderTemplate(page, {
latestPageJS: `/frontend_latest/${page}.js`,
es5PageJS: `/frontend_es5/${page}.js`,
});
fs.outputFileSync(
path.resolve(paths.app_output_root, `${page}.html`),
content
); );
const es5Manifest = outputES5 }
? fs.readJsonSync(path.resolve(outputES5, "manifest.json")) done();
: {}; });
const minifiedHTML = [];
for (const [page, entries] of Object.entries(pageEntries)) {
const content = renderTemplate(
path.resolve(inputRoot, inputSub, `${page}.template`),
{
latestEntryJS: entries.map((entry) => latestManifest[`${entry}.js`]),
es5EntryJS: entries.map((entry) => es5Manifest[`${entry}.js`]),
latestCustomPanelJS: latestManifest["custom-panel.js"],
es5CustomPanelJS: es5Manifest["custom-panel.js"],
}
);
minifiedHTML.push(
minifyHtml(content, path.extname(page)).then((minified) =>
fs.outputFileSync(path.resolve(outputRoot, page), minified)
)
);
}
await Promise.all(minifiedHTML);
};
// Map HTML pages to their required entrypoints gulp.task("gen-pages-prod", (done) => {
const APP_PAGE_ENTRIES = { const latestManifest = require(path.resolve(
"authorize.html": ["authorize"],
"onboarding.html": ["onboarding"],
"index.html": ["core", "app"],
};
gulp.task(
"gen-pages-app-dev",
genPagesDevTask(
APP_PAGE_ENTRIES,
paths.polymer_dir,
paths.app_output_root,
env.useWDS()
)
);
gulp.task(
"gen-pages-app-prod",
genPagesProdTask(
APP_PAGE_ENTRIES,
paths.polymer_dir,
paths.app_output_root,
paths.app_output_latest, paths.app_output_latest,
paths.app_output_es5 "manifest.json"
) ));
); const es5Manifest = require(path.resolve(
paths.app_output_es5,
"manifest.json"
));
const CAST_PAGE_ENTRIES = { for (const page of PAGES) {
"faq.html": ["launcher"], const content = renderTemplate(page, {
"index.html": ["launcher"], latestPageJS: latestManifest[`${page}.js`],
"media.html": ["media"],
"receiver.html": ["receiver"],
};
gulp.task( es5PageJS: es5Manifest[`${page}.js`],
"gen-pages-cast-dev", });
genPagesDevTask(CAST_PAGE_ENTRIES, paths.cast_dir, paths.cast_output_root)
);
gulp.task( fs.outputFileSync(
"gen-pages-cast-prod", path.resolve(paths.app_output_root, `${page}.html`),
genPagesProdTask( minifyHtml(content)
CAST_PAGE_ENTRIES, );
paths.cast_dir, }
paths.cast_output_root, done();
});
gulp.task("gen-index-app-dev", (done) => {
let latestAppJS;
let latestCoreJS;
let latestCustomPanelJS;
if (env.useWDS()) {
latestAppJS = "http://localhost:8000/src/entrypoints/app.ts";
latestCoreJS = "http://localhost:8000/src/entrypoints/core.ts";
latestCustomPanelJS =
"http://localhost:8000/src/entrypoints/custom-panel.ts";
} else {
latestAppJS = "/frontend_latest/app.js";
latestCoreJS = "/frontend_latest/core.js";
latestCustomPanelJS = "/frontend_latest/custom-panel.js";
}
const content = renderTemplate("index", {
latestAppJS,
latestCoreJS,
latestCustomPanelJS,
es5AppJS: "/frontend_es5/app.js",
es5CoreJS: "/frontend_es5/core.js",
es5CustomPanelJS: "/frontend_es5/custom-panel.js",
}).replace(/#THEMEC/g, "{{ theme_color }}");
fs.outputFileSync(path.resolve(paths.app_output_root, "index.html"), content);
done();
});
gulp.task("gen-index-app-prod", (done) => {
const latestManifest = require(path.resolve(
paths.app_output_latest,
"manifest.json"
));
const es5Manifest = require(path.resolve(
paths.app_output_es5,
"manifest.json"
));
const content = renderTemplate("index", {
latestAppJS: latestManifest["app.js"],
latestCoreJS: latestManifest["core.js"],
latestCustomPanelJS: latestManifest["custom-panel.js"],
es5AppJS: es5Manifest["app.js"],
es5CoreJS: es5Manifest["core.js"],
es5CustomPanelJS: es5Manifest["custom-panel.js"],
});
const minified = minifyHtml(content).replace(/#THEMEC/g, "{{ theme_color }}");
fs.outputFileSync(
path.resolve(paths.app_output_root, "index.html"),
minified
);
done();
});
gulp.task("gen-index-cast-dev", (done) => {
const contentReceiver = renderCastTemplate("receiver", {
latestReceiverJS: "/frontend_latest/receiver.js",
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "receiver.html"),
contentReceiver
);
const contentMedia = renderCastTemplate("media", {
latestMediaJS: "/frontend_latest/media.js",
es5MediaJS: "/frontend_es5/media.js",
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "media.html"),
contentMedia
);
const contentFAQ = renderCastTemplate("launcher-faq", {
latestLauncherJS: "/frontend_latest/launcher.js",
es5LauncherJS: "/frontend_es5/launcher.js",
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "faq.html"),
contentFAQ
);
const contentLauncher = renderCastTemplate("launcher", {
latestLauncherJS: "/frontend_latest/launcher.js",
es5LauncherJS: "/frontend_es5/launcher.js",
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "index.html"),
contentLauncher
);
done();
});
gulp.task("gen-index-cast-prod", (done) => {
const latestManifest = require(path.resolve(
paths.cast_output_latest, paths.cast_output_latest,
paths.cast_output_es5 "manifest.json"
) ));
); const es5Manifest = require(path.resolve(
paths.cast_output_es5,
"manifest.json"
));
const DEMO_PAGE_ENTRIES = { "index.html": ["main"] }; const contentReceiver = renderCastTemplate("receiver", {
latestReceiverJS: latestManifest["receiver.js"],
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "receiver.html"),
contentReceiver
);
gulp.task( const contentMedia = renderCastTemplate("media", {
"gen-pages-demo-dev", latestMediaJS: latestManifest["media.js"],
genPagesDevTask(DEMO_PAGE_ENTRIES, paths.demo_dir, paths.demo_output_root) es5MediaJS: es5Manifest["media.js"],
); });
fs.outputFileSync(
path.resolve(paths.cast_output_root, "media.html"),
contentMedia
);
gulp.task( const contentFAQ = renderCastTemplate("launcher-faq", {
"gen-pages-demo-prod", latestLauncherJS: latestManifest["launcher.js"],
genPagesProdTask( es5LauncherJS: es5Manifest["launcher.js"],
DEMO_PAGE_ENTRIES, });
paths.demo_dir, fs.outputFileSync(
paths.demo_output_root, path.resolve(paths.cast_output_root, "faq.html"),
contentFAQ
);
const contentLauncher = renderCastTemplate("launcher", {
latestLauncherJS: latestManifest["launcher.js"],
es5LauncherJS: es5Manifest["launcher.js"],
});
fs.outputFileSync(
path.resolve(paths.cast_output_root, "index.html"),
contentLauncher
);
done();
});
gulp.task("gen-index-demo-dev", (done) => {
const content = renderDemoTemplate("index", {
latestDemoJS: "/frontend_latest/main.js",
es5DemoJS: "/frontend_es5/main.js",
});
fs.outputFileSync(
path.resolve(paths.demo_output_root, "index.html"),
content
);
done();
});
gulp.task("gen-index-demo-prod", (done) => {
const latestManifest = require(path.resolve(
paths.demo_output_latest, paths.demo_output_latest,
paths.demo_output_es5 "manifest.json"
) ));
); const es5Manifest = require(path.resolve(
paths.demo_output_es5,
"manifest.json"
));
const content = renderDemoTemplate("index", {
latestDemoJS: latestManifest["main.js"],
const GALLERY_PAGE_ENTRIES = { "index.html": ["entrypoint"] }; es5DemoJS: es5Manifest["main.js"],
});
const minified = minifyHtml(content);
gulp.task( fs.outputFileSync(
"gen-pages-gallery-dev", path.resolve(paths.demo_output_root, "index.html"),
genPagesDevTask( minified
GALLERY_PAGE_ENTRIES, );
paths.gallery_dir, done();
paths.gallery_output_root });
)
);
gulp.task( gulp.task("gen-index-gallery-dev", (done) => {
"gen-pages-gallery-prod", const content = renderGalleryTemplate("index", {
genPagesProdTask( latestGalleryJS: "./frontend_latest/entrypoint.js",
GALLERY_PAGE_ENTRIES, });
paths.gallery_dir,
paths.gallery_output_root,
paths.gallery_output_latest
)
);
const HASSIO_PAGE_ENTRIES = { "entrypoint.js": ["entrypoint"] }; fs.outputFileSync(
path.resolve(paths.gallery_output_root, "index.html"),
content
);
done();
});
gulp.task( gulp.task("gen-index-gallery-prod", (done) => {
"gen-pages-hassio-dev", const latestManifest = require(path.resolve(
genPagesDevTask( paths.gallery_output_latest,
HASSIO_PAGE_ENTRIES, "manifest.json"
paths.hassio_dir, ));
paths.hassio_output_root, const content = renderGalleryTemplate("index", {
undefined, latestGalleryJS: latestManifest["entrypoint.js"],
"src", });
paths.hassio_publicPath const minified = minifyHtml(content);
)
);
gulp.task( fs.outputFileSync(
"gen-pages-hassio-prod", path.resolve(paths.gallery_output_root, "index.html"),
genPagesProdTask( minified
HASSIO_PAGE_ENTRIES, );
paths.hassio_dir, done();
paths.hassio_output_root, });
gulp.task("gen-index-hassio-dev", async () => {
writeHassioEntrypoint(
`${paths.hassio_publicPath}/frontend_latest/entrypoint.js`,
`${paths.hassio_publicPath}/frontend_es5/entrypoint.js`
);
});
gulp.task("gen-index-hassio-prod", async () => {
const latestManifest = require(path.resolve(
paths.hassio_output_latest, paths.hassio_output_latest,
"manifest.json"
));
const es5Manifest = require(path.resolve(
paths.hassio_output_es5, paths.hassio_output_es5,
"src" "manifest.json"
) ));
); writeHassioEntrypoint(
latestManifest["entrypoint.js"],
es5Manifest["entrypoint.js"]
);
});
function writeHassioEntrypoint(latestEntrypoint, es5Entrypoint) {
fs.mkdirSync(paths.hassio_output_root, { recursive: true });
// Safari 12 and below does not have a compliant ES2015 implementation of template literals, so we ship ES5
fs.writeFileSync(
path.resolve(paths.hassio_output_root, "entrypoint.js"),
`
function loadES5() {
var el = document.createElement('script');
el.src = '${es5Entrypoint}';
document.body.appendChild(el);
}
if (/.*Version\\/(?:11|12)(?:\\.\\d+)*.*Safari\\//.test(navigator.userAgent)) {
loadES5();
} else {
try {
new Function("import('${latestEntrypoint}')")();
} catch (err) {
loadES5();
}
}
`,
{ encoding: "utf-8" }
);
}

View File

@@ -1,15 +1,14 @@
// Task to download the latest Lokalise translations from the nightly workflow artifacts // Task to download the latest Lokalise translations from the nightly workflow artifacts
import { createOAuthDeviceAuth } from "@octokit/auth-oauth-device"; const del = import("del");
import { retry } from "@octokit/plugin-retry"; const fs = require("fs/promises");
import { Octokit } from "@octokit/rest"; const path = require("path");
import { deleteAsync } from "del"; const process = require("process");
import { mkdir, readFile, writeFile } from "fs/promises"; const gulp = require("gulp");
import gulp from "gulp"; const jszip = require("jszip");
import jszip from "jszip"; const tar = require("tar");
import path from "path"; const { Octokit } = require("@octokit/rest");
import process from "process"; const { createOAuthDeviceAuth } = require("@octokit/auth-oauth-device");
import tar from "tar";
const MAX_AGE = 24; // hours const MAX_AGE = 24; // hours
const OWNER = "home-assistant"; const OWNER = "home-assistant";
@@ -38,7 +37,7 @@ gulp.task("fetch-nightly-translations", async function () {
// and stop if they are not old enough // and stop if they are not old enough
let currentArtifact; let currentArtifact;
try { try {
currentArtifact = JSON.parse(await readFile(ARTIFACT_FILE, "utf-8")); currentArtifact = JSON.parse(await fs.readFile(ARTIFACT_FILE, "utf-8"));
const currentAge = const currentAge =
(Date.now() - Date.parse(currentArtifact.created_at)) / 3600000; (Date.now() - Date.parse(currentArtifact.created_at)) / 3600000;
if (currentAge < MAX_AGE) { if (currentAge < MAX_AGE) {
@@ -53,7 +52,7 @@ gulp.task("fetch-nightly-translations", async function () {
} }
// To store file writing promises // To store file writing promises
const createExtractDir = mkdir(EXTRACT_DIR, { recursive: true }); const createExtractDir = fs.mkdir(EXTRACT_DIR, { recursive: true });
const writings = []; const writings = [];
// Authenticate to GitHub using GitHub action token if it exists, // Authenticate to GitHub using GitHub action token if it exists,
@@ -63,7 +62,7 @@ gulp.task("fetch-nightly-translations", async function () {
tokenAuth = { token: process.env.GITHUB_TOKEN }; tokenAuth = { token: process.env.GITHUB_TOKEN };
} else { } else {
try { try {
tokenAuth = JSON.parse(await readFile(TOKEN_FILE, "utf-8")); tokenAuth = JSON.parse(await fs.readFile(TOKEN_FILE, "utf-8"));
} catch { } catch {
if (!allowTokenSetup) { if (!allowTokenSetup) {
console.log("No token found so build wil continue with English only"); console.log("No token found so build wil continue with English only");
@@ -88,7 +87,7 @@ gulp.task("fetch-nightly-translations", async function () {
tokenAuth = await auth({ type: "oauth" }); tokenAuth = await auth({ type: "oauth" });
writings.push( writings.push(
createExtractDir.then( createExtractDir.then(
writeFile(TOKEN_FILE, JSON.stringify(tokenAuth, null, 2)) fs.writeFile(TOKEN_FILE, JSON.stringify(tokenAuth, null, 2))
) )
); );
} }
@@ -96,7 +95,7 @@ gulp.task("fetch-nightly-translations", async function () {
// Authenticate with token and request workflow runs from GitHub // Authenticate with token and request workflow runs from GitHub
console.log("Fetching new translations..."); console.log("Fetching new translations...");
const octokit = new (Octokit.plugin(retry))({ const octokit = new Octokit({
userAgent: "Fetch Nightly Translations", userAgent: "Fetch Nightly Translations",
auth: tokenAuth.token, auth: tokenAuth.token,
}); });
@@ -132,13 +131,17 @@ gulp.task("fetch-nightly-translations", async function () {
} }
writings.push( writings.push(
createExtractDir.then( createExtractDir.then(
writeFile(ARTIFACT_FILE, JSON.stringify(latestArtifact, null, 2)) fs.writeFile(ARTIFACT_FILE, JSON.stringify(latestArtifact, null, 2))
) )
); );
// Remove the current translations // Remove the current translations
const deleteCurrent = Promise.all(writings).then( const deleteCurrent = Promise.all(writings).then(
deleteAsync([`${EXTRACT_DIR}/*`, `!${ARTIFACT_FILE}`, `!${TOKEN_FILE}`]) (await del).deleteAsync([
`${EXTRACT_DIR}/*`,
`!${ARTIFACT_FILE}`,
`!${TOKEN_FILE}`,
])
); );
// Get the download URL and follow the redirect to download (stored as ArrayBuffer) // Get the download URL and follow the redirect to download (stored as ArrayBuffer)

View File

@@ -1,23 +1,26 @@
import fs from "fs"; // Run demo develop mode
import { glob } from "glob"; const gulp = require("gulp");
import gulp from "gulp"; const fs = require("fs");
import yaml from "js-yaml"; const path = require("path");
import { marked } from "marked"; const { marked } = require("marked");
import path from "path"; const glob = require("glob");
import env from "../env.cjs"; const yaml = require("js-yaml");
import paths from "../paths.cjs";
import "./clean.js"; const env = require("../env");
import "./entry-html.js"; const paths = require("../paths");
import "./gather-static.js";
import "./gen-icons-json.js"; require("./clean.js");
import "./rollup.js"; require("./translations.js");
import "./service-worker.js"; require("./gen-icons-json.js");
import "./translations.js"; require("./gather-static.js");
import "./webpack.js"; require("./webpack.js");
require("./service-worker.js");
require("./entry-html.js");
require("./rollup.js");
gulp.task("gather-gallery-pages", async function gatherPages() { gulp.task("gather-gallery-pages", async function gatherPages() {
const pageDir = path.resolve(paths.gallery_dir, "src/pages"); const pageDir = path.resolve(paths.gallery_dir, "src/pages");
const files = await glob(path.resolve(pageDir, "**/*")); const files = glob.sync(path.resolve(pageDir, "**/*"));
const galleryBuild = path.resolve(paths.gallery_dir, "build"); const galleryBuild = path.resolve(paths.gallery_dir, "build");
fs.mkdirSync(galleryBuild, { recursive: true }); fs.mkdirSync(galleryBuild, { recursive: true });
@@ -86,7 +89,9 @@ gulp.task("gather-gallery-pages", async function gatherPages() {
// Generate sidebar // Generate sidebar
const sidebarPath = path.resolve(paths.gallery_dir, "sidebar.js"); const sidebarPath = path.resolve(paths.gallery_dir, "sidebar.js");
const sidebar = (await import(sidebarPath)).default; // To make watch work during development
delete require.cache[sidebarPath];
const sidebar = require(sidebarPath);
const pagesToProcess = {}; const pagesToProcess = {};
for (const key of processed) { for (const key of processed) {
@@ -156,7 +161,7 @@ gulp.task(
"gather-gallery-pages" "gather-gallery-pages"
), ),
"copy-static-gallery", "copy-static-gallery",
"gen-pages-gallery-dev", "gen-index-gallery-dev",
gulp.parallel( gulp.parallel(
env.useRollup() env.useRollup()
? "rollup-dev-server-gallery" ? "rollup-dev-server-gallery"
@@ -190,6 +195,6 @@ gulp.task(
), ),
"copy-static-gallery", "copy-static-gallery",
env.useRollup() ? "rollup-prod-gallery" : "webpack-prod-gallery", env.useRollup() ? "rollup-prod-gallery" : "webpack-prod-gallery",
"gen-pages-gallery-prod" "gen-index-gallery-prod"
) )
); );

View File

@@ -1,10 +1,9 @@
// Gulp task to gather all static files. // Gulp task to gather all static files.
import fs from "fs-extra"; const gulp = require("gulp");
import gulp from "gulp"; const path = require("path");
import path from "path"; const fs = require("fs-extra");
import paths from "../paths.cjs"; const paths = require("../paths");
import env from "../env.cjs";
const npmPath = (...parts) => const npmPath = (...parts) =>
path.resolve(paths.polymer_dir, "node_modules", ...parts); path.resolve(paths.polymer_dir, "node_modules", ...parts);
@@ -63,9 +62,6 @@ function copyPolyfills(staticDir) {
} }
function copyLoaderJS(staticDir) { function copyLoaderJS(staticDir) {
if (!env.useRollup()) {
return;
}
const staticPath = genStaticPath(staticDir); const staticPath = genStaticPath(staticDir);
copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js")); copyFileDir(npmPath("systemjs/dist/s.min.js"), staticPath("js"));
copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js")); copyFileDir(npmPath("systemjs/dist/s.min.js.map"), staticPath("js"));
@@ -115,10 +111,9 @@ gulp.task("copy-translations-supervisor", async () => {
copyTranslations(staticDir); copyTranslations(staticDir);
}); });
gulp.task("copy-static-supervisor", async () => { gulp.task("copy-locale-data-supervisor", async () => {
const staticDir = paths.hassio_output_static; const staticDir = paths.hassio_output_static;
copyLocaleData(staticDir); copyLocaleData(staticDir);
copyFonts(staticDir);
}); });
gulp.task("copy-static-app", async () => { gulp.task("copy-static-app", async () => {

View File

@@ -1,15 +1,17 @@
import fs from "fs"; const gulp = require("gulp");
import gulp from "gulp"; const path = require("path");
import hash from "object-hash"; const fs = require("fs");
import path from "path"; const hash = require("object-hash");
import paths from "../paths.cjs";
const ICON_PACKAGE_PATH = path.resolve("node_modules/@mdi/svg/"); const ICON_PACKAGE_PATH = path.resolve(
__dirname,
"../../node_modules/@mdi/svg/"
);
const META_PATH = path.resolve(ICON_PACKAGE_PATH, "meta.json"); const META_PATH = path.resolve(ICON_PACKAGE_PATH, "meta.json");
const PACKAGE_PATH = path.resolve(ICON_PACKAGE_PATH, "package.json"); const PACKAGE_PATH = path.resolve(ICON_PACKAGE_PATH, "package.json");
const ICON_PATH = path.resolve(ICON_PACKAGE_PATH, "svg"); const ICON_PATH = path.resolve(ICON_PACKAGE_PATH, "svg");
const OUTPUT_DIR = path.resolve(paths.build_dir, "mdi"); const OUTPUT_DIR = path.resolve(__dirname, "../../build/mdi");
const REMOVED_ICONS_PATH = new URL("../removedIcons.json", import.meta.url); const REMOVED_ICONS_PATH = path.resolve(__dirname, "../removedIcons.json");
const encoding = "utf8"; const encoding = "utf8";
@@ -132,11 +134,11 @@ gulp.task("gen-icons-json", (done) => {
}); });
const file = fs.readFileSync(PACKAGE_PATH, { encoding }); const file = fs.readFileSync(PACKAGE_PATH, { encoding });
const packageMeta = JSON.parse(file); const package = JSON.parse(file);
fs.writeFileSync( fs.writeFileSync(
path.resolve(OUTPUT_DIR, "iconMetadata.json"), path.resolve(OUTPUT_DIR, "iconMetadata.json"),
JSON.stringify({ version: packageMeta.version, parts }) JSON.stringify({ version: package.version, parts })
); );
fs.writeFileSync( fs.writeFileSync(

View File

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

View File

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

View File

@@ -1,14 +1,13 @@
// Tasks to run Rollup // Tasks to run Rollup
const path = require("path");
import log from "fancy-log"; const gulp = require("gulp");
import gulp from "gulp"; const rollup = require("rollup");
import http from "http"; const handler = require("serve-handler");
import open from "open"; const http = require("http");
import path from "path"; const log = require("fancy-log");
import { rollup } from "rollup"; const open = require("open");
import handler from "serve-handler"; const rollupConfig = require("../rollup");
import paths from "../paths.cjs"; const paths = require("../paths");
import rollupConfig from "../rollup.cjs";
const bothBuilds = (createConfigFunc, params) => const bothBuilds = (createConfigFunc, params) =>
gulp.series( gulp.series(
@@ -47,7 +46,7 @@ function createServer(serveOptions) {
); );
} }
function watchRollup(createConfig, extraWatchSrc = [], serveOptions = null) { function watchRollup(createConfig, extraWatchSrc = [], serveOptions) {
const { inputOptions, outputOptions } = createConfig({ const { inputOptions, outputOptions } = createConfig({
isProdBuild: false, isProdBuild: false,
latestBuild: true, latestBuild: true,

View File

@@ -1,12 +1,11 @@
// Generate service worker. // Generate service worker.
// Based on manifest, create a file with the content as service_worker.js // Based on manifest, create a file with the content as service_worker.js
const gulp = require("gulp");
import fs from "fs-extra"; const path = require("path");
import gulp from "gulp"; const fs = require("fs-extra");
import path from "path"; const workboxBuild = require("workbox-build");
import sourceMapUrl from "source-map-url"; const sourceMapUrl = require("source-map-url");
import workboxBuild from "workbox-build"; const paths = require("../paths.js");
import paths from "../paths.cjs";
const swDest = path.resolve(paths.app_output_root, "service_worker.js"); const swDest = path.resolve(paths.app_output_root, "service_worker.js");
@@ -29,9 +28,10 @@ self.addEventListener('install', (event) => {
gulp.task("gen-service-worker-app-prod", async () => { gulp.task("gen-service-worker-app-prod", async () => {
// Read bundled source file // Read bundled source file
const bundleManifestLatest = fs.readJsonSync( const bundleManifestLatest = require(path.resolve(
path.resolve(paths.app_output_latest, "manifest.json") paths.app_output_latest,
); "manifest.json"
));
let serviceWorkerContent = fs.readFileSync( let serviceWorkerContent = fs.readFileSync(
paths.app_output_root + bundleManifestLatest["service_worker.js"], paths.app_output_root + bundleManifestLatest["service_worker.js"],
"utf-8" "utf-8"
@@ -46,9 +46,10 @@ gulp.task("gen-service-worker-app-prod", async () => {
); );
// Remove ES5 // Remove ES5
const bundleManifestES5 = fs.readJsonSync( const bundleManifestES5 = require(path.resolve(
path.resolve(paths.app_output_es5, "manifest.json") 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"]);
fs.removeSync( fs.removeSync(
paths.app_output_root + bundleManifestES5["service_worker.js.map"] paths.app_output_root + bundleManifestES5["service_worker.js.map"]

View File

@@ -1,19 +1,19 @@
import { createHash } from "crypto"; const del = import("del");
import { deleteSync } from "del"; const crypto = require("crypto");
import { mkdirSync, readdirSync, readFileSync, renameSync } from "fs"; const path = require("path");
import { writeFile } from "node:fs/promises"; const source = require("vinyl-source-stream");
import gulp from "gulp"; const vinylBuffer = require("vinyl-buffer");
import flatmap from "gulp-flatmap"; const gulp = require("gulp");
import transform from "gulp-json-transform"; const fs = require("fs");
import merge from "gulp-merge-json"; const flatmap = require("gulp-flatmap");
import rename from "gulp-rename"; const merge = require("gulp-merge-json");
import path from "path"; const rename = require("gulp-rename");
import vinylBuffer from "vinyl-buffer"; const transform = require("gulp-json-transform");
import source from "vinyl-source-stream"; const { mapFiles } = require("../util");
import env from "../env.cjs"; const env = require("../env");
import paths from "../paths.cjs"; const paths = require("../paths");
import { mapFiles } from "../util.cjs";
import "./fetch-nightly-translations.js"; require("./fetch-nightly-translations");
const inFrontendDir = "translations/frontend"; const inFrontendDir = "translations/frontend";
const inBackendDir = "translations/backend"; const inBackendDir = "translations/backend";
@@ -33,12 +33,7 @@ gulp.task(
// Panel translations which should be split from the core translations. // Panel translations which should be split from the core translations.
const TRANSLATION_FRAGMENTS = Object.keys( const TRANSLATION_FRAGMENTS = Object.keys(
JSON.parse( require("../../src/translations/en.json").ui.panel
readFileSync(
path.resolve(paths.polymer_dir, "src/translations/en.json"),
"utf-8"
)
).ui.panel
); );
function recursiveFlatten(prefix, data) { function recursiveFlatten(prefix, data) {
@@ -125,29 +120,36 @@ function lokaliseTransform(data, original, file) {
return output; return output;
} }
gulp.task("clean-translations", async () => deleteSync([workDir])); gulp.task("clean-translations", async () => (await del).deleteSync([workDir]));
gulp.task("ensure-translations-build-dir", async () => { gulp.task("ensure-translations-build-dir", (done) => {
mkdirSync(workDir, { recursive: true }); if (!fs.existsSync(workDir)) {
fs.mkdirSync(workDir, { recursive: true });
}
done();
}); });
gulp.task("create-test-metadata", () => gulp.task("create-test-metadata", (cb) => {
env.isProdBuild() fs.writeFile(
? Promise.resolve() workDir + "/testMetadata.json",
: writeFile( JSON.stringify({
workDir + "/testMetadata.json", test: {
JSON.stringify({ test: { nativeName: "Test" } }) nativeName: "Test",
) },
); }),
cb
);
});
gulp.task("create-test-translation", () => gulp.task(
env.isProdBuild() "create-test-translation",
? Promise.resolve() gulp.series("create-test-metadata", () =>
: gulp gulp
.src(path.join(paths.translations_src, "en.json")) .src(path.join(paths.translations_src, "en.json"))
.pipe(transform((data, _file) => recursiveEmpty(data))) .pipe(transform((data, _file) => recursiveEmpty(data)))
.pipe(rename("test.json")) .pipe(rename("test.json"))
.pipe(gulp.dest(workDir)) .pipe(gulp.dest(workDir))
)
); );
/** /**
@@ -179,11 +181,16 @@ gulp.task("build-master-translation", () => {
gulp.task("build-merged-translations", () => gulp.task("build-merged-translations", () =>
gulp gulp
.src([ .src(
inFrontendDir + "/*.json", [
"!" + inFrontendDir + "/en.json", inFrontendDir + "/*.json",
...(env.isProdBuild() ? [] : [workDir + "/test.json"]), "!" + inFrontendDir + "/en.json",
]) workDir + "/test.json",
],
{
allowEmpty: true,
}
)
.pipe(transform((data, file) => lokaliseTransform(data, data, file))) .pipe(transform((data, file) => lokaliseTransform(data, data, file)))
.pipe( .pipe(
flatmap((stream, file) => { flatmap((stream, file) => {
@@ -296,14 +303,15 @@ const fingerprints = {};
gulp.task("build-translation-fingerprints", () => { gulp.task("build-translation-fingerprints", () => {
// Fingerprint full file of each language // Fingerprint full file of each language
const files = readdirSync(fullDir); const files = fs.readdirSync(fullDir);
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
fingerprints[files[i].split(".")[0]] = { fingerprints[files[i].split(".")[0]] = {
// In dev we create fake hashes // In dev we create fake hashes
hash: env.isProdBuild() hash: env.isProdBuild()
? createHash("md5") ? crypto
.update(readFileSync(path.join(fullDir, files[i]), "utf-8")) .createHash("md5")
.update(fs.readFileSync(path.join(fullDir, files[i]), "utf-8"))
.digest("hex") .digest("hex")
: "dev", : "dev",
}; };
@@ -319,7 +327,7 @@ gulp.task("build-translation-fingerprints", () => {
throw new Error(`Unable to find hash for ${filename}`); throw new Error(`Unable to find hash for ${filename}`);
} }
renameSync( fs.renameSync(
filename, filename,
`${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${ `${parsed.dir}/${parsed.name}-${fingerprints[parsed.name].hash}${
parsed.ext parsed.ext
@@ -363,11 +371,14 @@ gulp.task("build-translation-flatten-supervisor", () =>
gulp.task("build-translation-write-metadata", () => gulp.task("build-translation-write-metadata", () =>
gulp gulp
.src([ .src(
path.join(paths.translations_src, "translationMetadata.json"), [
...(env.isProdBuild() ? [] : [workDir + "/testMetadata.json"]), path.join(paths.translations_src, "translationMetadata.json"),
workDir + "/translationFingerprints.json", workDir + "/testMetadata.json",
]) workDir + "/translationFingerprints.json",
],
{ allowEmpty: true }
)
.pipe(merge({})) .pipe(merge({}))
.pipe( .pipe(
transform((data) => { transform((data) => {
@@ -398,7 +409,7 @@ gulp.task("build-translation-write-metadata", () =>
gulp.task( gulp.task(
"create-translations", "create-translations",
gulp.series( gulp.series(
gulp.parallel("create-test-metadata", "create-test-translation"), env.isProdBuild() ? (done) => done() : "create-test-translation",
"build-master-translation", "build-master-translation",
"build-merged-translations", "build-merged-translations",
gulp.parallel(...splitTasks), gulp.parallel(...splitTasks),
@@ -426,7 +437,6 @@ gulp.task(
"fetch-nightly-translations", "fetch-nightly-translations",
gulp.series("clean-translations", "ensure-translations-build-dir") gulp.series("clean-translations", "ensure-translations-build-dir")
), ),
gulp.parallel("create-test-metadata", "create-test-translation"),
"build-master-translation", "build-master-translation",
"build-merged-translations", "build-merged-translations",
"build-translation-fragment-supervisor", "build-translation-fragment-supervisor",

View File

@@ -1,7 +1,8 @@
import gulp from "gulp"; // Tasks to run Rollup
import { startDevServer } from "@web/dev-server"; const gulp = require("gulp");
const { startDevServer } = require("@web/dev-server");
gulp.task("wds-watch-app", async () => { gulp.task("wds-watch-app", () => {
startDevServer({ startDevServer({
config: { config: {
watch: true, watch: true,

View File

@@ -1,20 +1,18 @@
// Tasks to run webpack. // Tasks to run webpack.
const fs = require("fs");
import fs from "fs"; const gulp = require("gulp");
import path from "path"; const webpack = require("webpack");
import log from "fancy-log"; const WebpackDevServer = require("webpack-dev-server");
import gulp from "gulp"; const log = require("fancy-log");
import webpack from "webpack"; const path = require("path");
import WebpackDevServer from "webpack-dev-server"; const paths = require("../paths");
import env from "../env.cjs"; const {
import paths from "../paths.cjs";
import {
createAppConfig, createAppConfig,
createCastConfig,
createDemoConfig, createDemoConfig,
createGalleryConfig, createCastConfig,
createHassioConfig, createHassioConfig,
} from "../webpack.cjs"; createGalleryConfig,
} = require("../webpack");
const bothBuilds = (createConfigFunc, params) => [ const bothBuilds = (createConfigFunc, params) => [
createConfigFunc({ ...params, latestBuild: true }), createConfigFunc({ ...params, latestBuild: true }),
@@ -44,7 +42,6 @@ const runDevServer = async ({
}) => { }) => {
const server = new WebpackDevServer( const server = new WebpackDevServer(
{ {
hot: false,
open: true, open: true,
host: listenHost, host: listenHost,
port, port,
@@ -107,17 +104,13 @@ gulp.task("webpack-prod-app", () =>
prodBuild( prodBuild(
bothBuilds(createAppConfig, { bothBuilds(createAppConfig, {
isProdBuild: true, isProdBuild: true,
isStatsBuild: env.isStatsBuild(),
isTestBuild: env.isTestBuild(),
}) })
) )
); );
gulp.task("webpack-dev-server-demo", () => gulp.task("webpack-dev-server-demo", () =>
runDevServer({ runDevServer({
compiler: webpack( compiler: webpack(bothBuilds(createDemoConfig, { isProdBuild: false })),
createDemoConfig({ isProdBuild: false, latestBuild: true })
),
contentBase: paths.demo_output_root, contentBase: paths.demo_output_root,
port: 8090, port: 8090,
}) })
@@ -133,9 +126,7 @@ gulp.task("webpack-prod-demo", () =>
gulp.task("webpack-dev-server-cast", () => gulp.task("webpack-dev-server-cast", () =>
runDevServer({ runDevServer({
compiler: webpack( compiler: webpack(bothBuilds(createCastConfig, { isProdBuild: false })),
createCastConfig({ isProdBuild: false, latestBuild: true })
),
contentBase: paths.cast_output_root, contentBase: paths.cast_output_root,
port: 8080, port: 8080,
// Accessible from the network, because that's how Cast hits it. // Accessible from the network, because that's how Cast hits it.
@@ -170,17 +161,14 @@ gulp.task("webpack-prod-hassio", () =>
prodBuild( prodBuild(
bothBuilds(createHassioConfig, { bothBuilds(createHassioConfig, {
isProdBuild: true, isProdBuild: true,
isStatsBuild: env.isStatsBuild(),
isTestBuild: env.isTestBuild(),
}) })
) )
); );
gulp.task("webpack-dev-server-gallery", () => gulp.task("webpack-dev-server-gallery", () =>
runDevServer({ runDevServer({
compiler: webpack( // We don't use the es5 build, but the dev server will fuck up the publicPath if we don't
createGalleryConfig({ isProdBuild: false, latestBuild: true }) compiler: webpack(bothBuilds(createGalleryConfig, { isProdBuild: false })),
),
contentBase: paths.gallery_output_root, contentBase: paths.gallery_output_root,
port: 8100, port: 8100,
listenHost: "0.0.0.0", listenHost: "0.0.0.0",

View File

@@ -1,83 +0,0 @@
#!/usr/bin/env node
// Script to print Babel plugins and Core JS polyfills that will be used by browserslist environments
import { version as babelVersion } from "@babel/core";
import presetEnv from "@babel/preset-env";
import compilationTargets from "@babel/helper-compilation-targets";
import coreJSCompat from "core-js-compat";
import { logPlugin } from "@babel/preset-env/lib/debug.js";
// eslint-disable-next-line import/no-relative-packages
import shippedPolyfills from "../node_modules/babel-plugin-polyfill-corejs3/lib/shipped-proposals.js";
import { babelOptions } from "./bundle.cjs";
const detailsOpen = (heading) =>
`<details>\n<summary><h4>${heading}</h4></summary>\n`;
const detailsClose = "</details>\n";
const dummyAPI = {
version: babelVersion,
assertVersion: () => {},
caller: (callback) =>
callback({
name: "Dummy Bundler",
supportsStaticESM: true,
supportsDynamicImport: true,
supportsTopLevelAwait: true,
supportsExportNamespaceFrom: true,
}),
targets: () => ({}),
};
// Generate filter function based on proposal/method inputs
// Copied and adapted from babel-plugin-polyfill-corejs3/esm/index.mjs
const polyfillFilter = (method, proposals, shippedProposals) => (name) => {
if (proposals || method === "entry-global") return true;
if (shippedProposals && shippedPolyfills.default.has(name)) {
return true;
}
if (name.startsWith("esnext.")) {
const esName = `es.${name.slice(7)}`;
// If its imaginative esName is not in latest compat data, it means the proposal is not stage 4
return esName in coreJSCompat.data;
}
return true;
};
// Log the plugins and polyfills for each build environment
for (const buildType of ["Modern", "Legacy"]) {
const browserslistEnv = buildType.toLowerCase();
const babelOpts = babelOptions({ latestBuild: browserslistEnv === "modern" });
const presetEnvOpts = babelOpts.presets[0][1];
// Invoking preset-env in debug mode will log the included plugins
console.log(detailsOpen(`${buildType} Build Babel Plugins`));
presetEnv.default(dummyAPI, {
...presetEnvOpts,
browserslistEnv,
debug: true,
});
console.log(detailsClose);
// Manually log the Core-JS polyfills using the same technique
if (presetEnvOpts.useBuiltIns) {
console.log(detailsOpen(`${buildType} Build Core-JS Polyfills`));
const targets = compilationTargets.default(babelOpts?.targets, {
browserslistEnv,
});
const polyfillList = coreJSCompat({ targets }).list.filter(
polyfillFilter(
`${presetEnvOpts.useBuiltIns}-global`,
presetEnvOpts?.corejs?.proposals,
presetEnvOpts?.shippedProposals
)
);
console.log(
"The following %i polyfills may be injected by Babel:\n",
polyfillList.length
);
for (const polyfill of polyfillList) {
logPlugin(polyfill, targets, coreJSCompat.data);
}
console.log(detailsClose);
}
}

View File

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

View File

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

View File

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

View File

@@ -1,17 +1,11 @@
const { existsSync } = require("fs");
const path = require("path");
const webpack = require("webpack"); const webpack = require("webpack");
const { StatsWriterPlugin } = require("webpack-stats-plugin"); const path = require("path");
const filterStats = require("@bundle-stats/plugin-webpack-filter").default;
const TerserPlugin = require("terser-webpack-plugin"); const TerserPlugin = require("terser-webpack-plugin");
const { WebpackManifestPlugin } = require("webpack-manifest-plugin"); const { WebpackManifestPlugin } = require("webpack-manifest-plugin");
const log = require("fancy-log"); const log = require("fancy-log");
const WebpackBar = require("webpackbar"); const WebpackBar = require("webpackbar");
const { const paths = require("./paths.js");
TransformAsyncModulesPlugin, const bundle = require("./bundle.js");
} = require("transform-async-modules-webpack-plugin");
const paths = require("./paths.cjs");
const bundle = require("./bundle.cjs");
class LogStartCompilePlugin { class LogStartCompilePlugin {
ignoredFirst = false; ignoredFirst = false;
@@ -28,7 +22,6 @@ class LogStartCompilePlugin {
} }
const createWebpackConfig = ({ const createWebpackConfig = ({
name,
entry, entry,
outputPath, outputPath,
publicPath, publicPath,
@@ -36,7 +29,6 @@ const createWebpackConfig = ({
isProdBuild, isProdBuild,
latestBuild, latestBuild,
isStatsBuild, isStatsBuild,
isTestBuild,
isHassioBuild, isHassioBuild,
dontHash, dontHash,
}) => { }) => {
@@ -45,17 +37,11 @@ const createWebpackConfig = ({
} }
const ignorePackages = bundle.ignorePackages({ latestBuild }); const ignorePackages = bundle.ignorePackages({ latestBuild });
return { return {
name,
mode: isProdBuild ? "production" : "development", mode: isProdBuild ? "production" : "development",
target: `browserslist:${latestBuild ? "modern" : "legacy"}`, target: ["web", latestBuild ? "es2017" : "es5"],
// For tests/CI, source maps are skipped to gain build speed devtool: isProdBuild
// For production, generate source maps for accurate stack traces without source code ? "cheap-module-source-map"
// For development, generate "cheap" versions that can map to original line numbers : "eval-cheap-module-source-map",
devtool: isTestBuild
? false
: isProdBuild
? "nosources-source-map"
: "eval-cheap-module-source-map",
entry, entry,
node: false, node: false,
module: { module: {
@@ -65,14 +51,11 @@ const createWebpackConfig = ({
use: { use: {
loader: "babel-loader", loader: "babel-loader",
options: { options: {
...bundle.babelOptions({ latestBuild, isProdBuild, isTestBuild }), ...bundle.babelOptions({ latestBuild }),
cacheDirectory: !isProdBuild, cacheDirectory: !isProdBuild,
cacheCompression: false, cacheCompression: false,
}, },
}, },
resolve: {
fullySpecified: false,
},
}, },
{ {
test: /\.css$/, test: /\.css$/,
@@ -85,18 +68,11 @@ const createWebpackConfig = ({
new TerserPlugin({ new TerserPlugin({
parallel: true, parallel: true,
extractComments: true, extractComments: true,
terserOptions: bundle.terserOptions({ latestBuild, isTestBuild }), terserOptions: bundle.terserOptions(latestBuild),
}), }),
], ],
moduleIds: isProdBuild && !isStatsBuild ? "deterministic" : "named", moduleIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
chunkIds: isProdBuild && !isStatsBuild ? "deterministic" : "named", chunkIds: isProdBuild && !isStatsBuild ? "deterministic" : "named",
splitChunks: {
// Disable splitting for web workers with ESM output
// Imports of external chunks are broken
chunks: latestBuild
? (chunk) => !chunk.canBeInitial() && !/^.+-worker$/.test(chunk.name)
: undefined,
},
}, },
plugins: [ plugins: [
!isStatsBuild && new WebpackBar({ fancy: !isProdBuild }), !isStatsBuild && new WebpackBar({ fancy: !isProdBuild }),
@@ -146,17 +122,6 @@ const createWebpackConfig = ({
path.resolve(paths.polymer_dir, "src/util/empty.js") path.resolve(paths.polymer_dir, "src/util/empty.js")
), ),
!isProdBuild && new LogStartCompilePlugin(), !isProdBuild && new LogStartCompilePlugin(),
isProdBuild &&
new StatsWriterPlugin({
filename: path.relative(
outputPath,
path.join(paths.build_dir, "stats", `${name}.json`)
),
stats: { assets: true, chunks: true, modules: true },
transform: (stats) => JSON.stringify(filterStats(stats)),
}),
!latestBuild &&
new TransformAsyncModulesPlugin({ browserslistEnv: "legacy" }),
].filter(Boolean), ].filter(Boolean),
resolve: { resolve: {
extensions: [".ts", ".js", ".json"], extensions: [".ts", ".js", ".json"],
@@ -170,72 +135,34 @@ const createWebpackConfig = ({
"lit/directives/guard$": "lit/directives/guard.js", "lit/directives/guard$": "lit/directives/guard.js",
"lit/directives/cache$": "lit/directives/cache.js", "lit/directives/cache$": "lit/directives/cache.js",
"lit/directives/repeat$": "lit/directives/repeat.js", "lit/directives/repeat$": "lit/directives/repeat.js",
"lit/directives/live$": "lit/directives/live.js",
"lit/polyfill-support$": "lit/polyfill-support.js", "lit/polyfill-support$": "lit/polyfill-support.js",
"@lit-labs/virtualizer/layouts/grid": "@lit-labs/virtualizer/layouts/grid":
"@lit-labs/virtualizer/layouts/grid.js", "@lit-labs/virtualizer/layouts/grid.js",
"@lit-labs/virtualizer/polyfills/resize-observer-polyfill/ResizeObserver":
"@lit-labs/virtualizer/polyfills/resize-observer-polyfill/ResizeObserver.js",
"@lit-labs/observers/resize-controller":
"@lit-labs/observers/resize-controller.js",
}, },
}, },
output: { output: {
module: latestBuild, filename: ({ chunk }) => {
filename: ({ chunk }) => if (!isProdBuild || isStatsBuild || dontHash.has(chunk.name)) {
!isProdBuild || isStatsBuild || dontHash.has(chunk.name) return `${chunk.name}.js`;
? "[name].js" }
: "[name].[contenthash].js", return `${chunk.name}.${chunk.hash.substr(0, 8)}.js`;
},
chunkFilename: chunkFilename:
isProdBuild && !isStatsBuild ? "[name].[contenthash].js" : "[name].js", isProdBuild && !isStatsBuild ? "[chunkhash:8].js" : "[id].chunk.js",
assetModuleFilename:
isProdBuild && !isStatsBuild ? "[id].[contenthash][ext]" : "[id][ext]",
crossOriginLoading: "use-credentials",
hashFunction: "xxhash64",
hashDigest: "base64url",
hashDigestLength: 11, // full length of 64 bit base64url
path: outputPath, path: outputPath,
publicPath, publicPath,
// To silence warning in worker plugin // To silence warning in worker plugin
globalObject: "self", globalObject: "self",
// Since production source maps don't include sources, we need to point to them elsewhere
// For dependencies, just provide the path (no source in browser)
// Otherwise, point to the raw code on GitHub for browser to load
...Object.fromEntries(
["", "Fallback"].map((v) => [
`devtool${v}ModuleFilenameTemplate`,
!isTestBuild && isProdBuild
? (info) => {
if (
!path.isAbsolute(info.absoluteResourcePath) ||
!existsSync(info.resourcePath) ||
info.resourcePath.startsWith("./node_modules")
) {
// Source URLs are unknown for dependencies, so we use a relative URL with a
// non - existent top directory. This results in a clean source tree in browser
// dev tools, and they stay happy getting 404s with valid requests.
return `/unknown${path.resolve("/", info.resourcePath)}`;
}
return new URL(info.resourcePath, bundle.sourceMapURL()).href;
}
: undefined,
])
),
}, },
experiments: { experiments: {
outputModule: true, topLevelAwait: true,
}, },
}; };
}; };
const createAppConfig = ({ const createAppConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
isProdBuild,
latestBuild,
isStatsBuild,
isTestBuild,
}) =>
createWebpackConfig( createWebpackConfig(
bundle.config.app({ isProdBuild, latestBuild, isStatsBuild, isTestBuild }) bundle.config.app({ isProdBuild, latestBuild, isStatsBuild })
); );
const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) => const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
@@ -246,20 +173,8 @@ const createDemoConfig = ({ isProdBuild, latestBuild, isStatsBuild }) =>
const createCastConfig = ({ isProdBuild, latestBuild }) => const createCastConfig = ({ isProdBuild, latestBuild }) =>
createWebpackConfig(bundle.config.cast({ isProdBuild, latestBuild })); createWebpackConfig(bundle.config.cast({ isProdBuild, latestBuild }));
const createHassioConfig = ({ const createHassioConfig = ({ isProdBuild, latestBuild }) =>
isProdBuild, createWebpackConfig(bundle.config.hassio({ isProdBuild, latestBuild }));
latestBuild,
isStatsBuild,
isTestBuild,
}) =>
createWebpackConfig(
bundle.config.hassio({
isProdBuild,
latestBuild,
isStatsBuild,
isTestBuild,
})
);
const createGalleryConfig = ({ isProdBuild, latestBuild }) => const createGalleryConfig = ({ isProdBuild, latestBuild }) =>
createWebpackConfig(bundle.config.gallery({ isProdBuild, latestBuild })); createWebpackConfig(bundle.config.gallery({ isProdBuild, latestBuild }));
@@ -270,5 +185,4 @@ module.exports = {
createCastConfig, createCastConfig,
createHassioConfig, createHassioConfig,
createGalleryConfig, createGalleryConfig,
createWebpackConfig,
}; };

Binary file not shown.

Before

Width:  |  Height:  |  Size: 15 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.8 KiB

View File

@@ -1,3 +1,3 @@
self.addEventListener("fetch", (event) => { self.addEventListener("fetch", function(event) {
event.respondWith(fetch(event.request)); event.respondWith(fetch(event.request));
}); });

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@@ -3,7 +3,7 @@ import { mdiCast, mdiCastConnected } from "@mdi/js";
import "@polymer/paper-item/paper-icon-item"; import "@polymer/paper-item/paper-icon-item";
import "@polymer/paper-listbox/paper-listbox"; import "@polymer/paper-listbox/paper-listbox";
import { Auth, Connection } from "home-assistant-js-websocket"; import { Auth, Connection } from "home-assistant-js-websocket";
import { CSSResultGroup, LitElement, TemplateResult, css, html } from "lit"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, state } from "lit/decorators"; import { customElement, property, state } from "lit/decorators";
import { CastManager } from "../../../../src/cast/cast_manager"; import { CastManager } from "../../../../src/cast/cast_manager";
import { import {
@@ -22,27 +22,26 @@ import "../../../../src/components/ha-svg-icon";
import { import {
getLegacyLovelaceCollection, getLegacyLovelaceCollection,
getLovelaceCollection, getLovelaceCollection,
LovelaceConfig,
} from "../../../../src/data/lovelace"; } from "../../../../src/data/lovelace";
import { isStrategyDashboard } from "../../../../src/data/lovelace/config/types";
import { LovelaceViewConfig } from "../../../../src/data/lovelace/config/view";
import "../../../../src/layouts/hass-loading-screen"; import "../../../../src/layouts/hass-loading-screen";
import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config"; import { generateDefaultViewConfig } from "../../../../src/panels/lovelace/common/generate-lovelace-config";
import "./hc-layout"; import "./hc-layout";
@customElement("hc-cast") @customElement("hc-cast")
class HcCast extends LitElement { class HcCast extends LitElement {
@property({ attribute: false }) public auth!: Auth; @property() public auth!: Auth;
@property({ attribute: false }) public connection!: Connection; @property() public connection!: Connection;
@property({ attribute: false }) public castManager!: CastManager; @property() public castManager!: CastManager;
@state() private askWrite = false; @state() private askWrite = false;
@state() private lovelaceViews?: LovelaceViewConfig[] | null; @state() private lovelaceConfig?: LovelaceConfig | null;
protected render(): TemplateResult { protected render(): TemplateResult {
if (this.lovelaceViews === undefined) { if (this.lovelaceConfig === undefined) {
return html`<hass-loading-screen no-toolbar></hass-loading-screen>`; return html`<hass-loading-screen no-toolbar></hass-loading-screen>`;
} }
@@ -73,44 +72,43 @@ class HcCast extends LitElement {
${error ${error
? html` <div class="card-content">${error}</div> ` ? html` <div class="card-content">${error}</div> `
: !this.castManager.status : !this.castManager.status
? html` ? html`
<p class="center-item"> <p class="center-item">
<mwc-button raised @click=${this._handleLaunch}> <mwc-button raised @click=${this._handleLaunch}>
<ha-svg-icon .path=${mdiCast}></ha-svg-icon> <ha-svg-icon .path=${mdiCast}></ha-svg-icon>
Start Casting Start Casting
</mwc-button> </mwc-button>
</p> </p>
` `
: html` : html`
<div class="section-header">PICK A VIEW</div> <div class="section-header">PICK A VIEW</div>
<paper-listbox <paper-listbox
attr-for-selected="data-path" attr-for-selected="data-path"
.selected=${this.castManager.status.lovelacePath || ""} .selected=${this.castManager.status.lovelacePath || ""}
> >
${( ${(this.lovelaceConfig
this.lovelaceViews ?? [ ? this.lovelaceConfig.views
generateDefaultViewConfig({}, {}, {}, {}, () => ""), : [generateDefaultViewConfig({}, {}, {}, {}, () => "")]
] ).map(
).map( (view, idx) => html`
(view, idx) => html` <paper-icon-item
<paper-icon-item @click=${this._handlePickView}
@click=${this._handlePickView} data-path=${view.path || idx}
data-path=${view.path || idx} >
> ${view.icon
${view.icon ? html`
? html` <ha-icon
<ha-icon .icon=${view.icon}
.icon=${view.icon} slot="item-icon"
slot="item-icon" ></ha-icon>
></ha-icon> `
` : ""}
: ""} ${view.title || view.path}
${view.title || view.path} </paper-icon-item>
</paper-icon-item> `
` )}
)} </paper-listbox>
</paper-listbox> `}
`}
<div class="card-actions"> <div class="card-actions">
${this.castManager.status ${this.castManager.status
? html` ? html`
@@ -138,15 +136,11 @@ class HcCast extends LitElement {
llColl.refresh().then( llColl.refresh().then(
() => { () => {
llColl.subscribe((config) => { llColl.subscribe((config) => {
if (isStrategyDashboard(config)) { this.lovelaceConfig = config;
this.lovelaceViews = null;
} else {
this.lovelaceViews = config.views;
}
}); });
}, },
async () => { async () => {
this.lovelaceViews = null; this.lovelaceConfig = null;
} }
); );
@@ -165,7 +159,9 @@ class HcCast extends LitElement {
toggleAttribute( toggleAttribute(
this, this,
"hide-icons", "hide-icons",
this.lovelaceViews ? !this.lovelaceViews.some((view) => view.icon) : true this.lovelaceConfig
? !this.lovelaceConfig.views.some((view) => view.icon)
: true
); );
} }
@@ -241,8 +237,6 @@ class HcCast extends LitElement {
mwc-button ha-svg-icon { mwc-button ha-svg-icon {
margin-right: 8px; margin-right: 8px;
margin-inline-end: 8px;
margin-inline-start: initial;
height: 18px; height: 18px;
} }

View File

@@ -1,5 +1,6 @@
import "@material/mwc-button"; import "@material/mwc-button";
import { mdiCastConnected, mdiCast } from "@mdi/js"; import { mdiCastConnected, mdiCast } from "@mdi/js";
import "@polymer/paper-input/paper-input";
import { import {
Auth, Auth,
Connection, Connection,
@@ -23,7 +24,6 @@ import "../../../../src/components/ha-svg-icon";
import "../../../../src/layouts/hass-loading-screen"; import "../../../../src/layouts/hass-loading-screen";
import { registerServiceWorker } from "../../../../src/util/register-service-worker"; import { registerServiceWorker } from "../../../../src/util/register-service-worker";
import "./hc-layout"; import "./hc-layout";
import "../../../../src/components/ha-textfield";
const seeFAQ = (qid) => html` const seeFAQ = (qid) => html`
See <a href="./faq.html${qid ? `#${qid}` : ""}">the FAQ</a> for more See <a href="./faq.html${qid ? `#${qid}` : ""}">the FAQ</a> for more
@@ -33,13 +33,13 @@ const translateErr = (err) =>
err === ERR_CANNOT_CONNECT err === ERR_CANNOT_CONNECT
? "Unable to connect" ? "Unable to connect"
: err === ERR_HASS_HOST_REQUIRED : err === ERR_HASS_HOST_REQUIRED
? "Please enter a Home Assistant URL." ? "Please enter a Home Assistant URL."
: err === ERR_INVALID_HTTPS_TO_HTTP : err === ERR_INVALID_HTTPS_TO_HTTP
? html` ? html`
Cannot connect to Home Assistant instances over "http://". Cannot connect to Home Assistant instances over "http://".
${seeFAQ("https")} ${seeFAQ("https")}
` `
: `Unknown error (${err}).`; : `Unknown error (${err}).`;
const INTRO = html` const INTRO = html`
<p> <p>
@@ -116,11 +116,13 @@ export class HcConnect extends LitElement {
To get started, enter your Home Assistant URL and click authorize. To get started, enter your Home Assistant URL and click authorize.
If you want a preview instead, click the show demo button. If you want a preview instead, click the show demo button.
</p> </p>
<ha-textfield <p>
label="Home Assistant URL" <paper-input
placeholder="https://abcdefghijklmnop.ui.nabu.casa" label="Home Assistant URL"
@keydown=${this._handleInputKeyDown} placeholder="https://abcdefghijklmnop.ui.nabu.casa"
></ha-textfield> @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>
<div class="card-actions"> <div class="card-actions">
@@ -188,13 +190,13 @@ export class HcConnect extends LitElement {
private _handleInputKeyDown(ev: KeyboardEvent) { private _handleInputKeyDown(ev: KeyboardEvent) {
// Handle pressing enter. // Handle pressing enter.
if (ev.key === "Enter") { if (ev.keyCode === 13) {
this._handleConnect(); this._handleConnect();
} }
} }
private async _handleConnect() { private async _handleConnect() {
const inputEl = this.shadowRoot!.querySelector("ha-textfield")!; const inputEl = this.shadowRoot!.querySelector("paper-input")!;
const value = inputEl.value || ""; const value = inputEl.value || "";
this.error = undefined; this.error = undefined;
@@ -313,10 +315,6 @@ export class HcConnect extends LitElement {
.spacer { .spacer {
flex: 1; flex: 1;
} }
ha-textfield {
width: 100%;
}
`; `;
} }
} }

View File

@@ -10,13 +10,13 @@ import "../../../../src/components/ha-card";
@customElement("hc-layout") @customElement("hc-layout")
class HcLayout extends LitElement { class HcLayout extends LitElement {
@property() public subtitle?: string; @property() public subtitle?: string | undefined;
@property({ attribute: false }) public auth?: Auth; @property() public auth?: Auth;
@property({ attribute: false }) public connection?: Connection; @property() public connection?: Connection;
@property({ attribute: false }) public user?: HassUser; @property() public user?: HassUser;
protected render(): TemplateResult { protected render(): TemplateResult {
return html` return html`

View File

@@ -1,21 +1,19 @@
import { framework } from "../receiver/cast_framework"; const castContext = cast.framework.CastReceiverContext.getInstance();
const castContext = framework.CastReceiverContext.getInstance();
const playerManager = castContext.getPlayerManager(); const playerManager = castContext.getPlayerManager();
playerManager.setMessageInterceptor( playerManager.setMessageInterceptor(
framework.messages.MessageType.LOAD, cast.framework.messages.MessageType.LOAD,
(loadRequestData) => { (loadRequestData) => {
const media = loadRequestData.media; const media = loadRequestData.media;
// Special handling if it came from Google Assistant // Special handling if it came from Google Assistant
if (media.entity) { if (media.entity) {
media.contentId = media.entity; media.contentId = media.entity;
media.streamType = framework.messages.StreamType.LIVE; media.streamType = cast.framework.messages.StreamType.LIVE;
media.contentType = "application/vnd.apple.mpegurl"; media.contentType = "application/vnd.apple.mpegurl";
// @ts-ignore // @ts-ignore
media.hlsVideoSegmentFormat = media.hlsVideoSegmentFormat =
framework.messages.HlsVideoSegmentFormat.FMP4; cast.framework.messages.HlsVideoSegmentFormat.FMP4;
} }
return loadRequestData; return loadRequestData;
} }

View File

@@ -1,3 +1,2 @@
import { framework } from "./cast_framework"; /* eslint-disable no-undef */
export const castContext = cast.framework.CastReceiverContext.getInstance();
export const castContext = framework.CastReceiverContext.getInstance();

View File

@@ -1,3 +0,0 @@
import type { cast as ReceiverCast } from "chromecast-caf-receiver";
export const framework = (cast as unknown as typeof ReceiverCast).framework;

View File

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

View File

@@ -1,4 +1,4 @@
import { framework } from "./cast_framework"; /* eslint-disable no-undef */
import { CAST_NS } from "../../../src/cast/const"; import { CAST_NS } from "../../../src/cast/const";
import { HassMessage } from "../../../src/cast/receiver_messages"; import { HassMessage } from "../../../src/cast/receiver_messages";
import "../../../src/resources/custom-card-support"; import "../../../src/resources/custom-card-support";
@@ -34,14 +34,14 @@ const setTouchControlsVisibility = (visible: boolean) => {
let timeOut: number | undefined; let timeOut: number | undefined;
const playDummyMedia = (viewTitle?: string) => { const playDummyMedia = (viewTitle?: string) => {
const loadRequestData = new framework.messages.LoadRequestData(); const loadRequestData = new cast.framework.messages.LoadRequestData();
loadRequestData.autoplay = true; loadRequestData.autoplay = true;
loadRequestData.media = new framework.messages.MediaInformation(); loadRequestData.media = new cast.framework.messages.MediaInformation();
loadRequestData.media.contentId = loadRequestData.media.contentId =
"https://cast.home-assistant.io/images/google-nest-hub.png"; "https://cast.home-assistant.io/images/google-nest-hub.png";
loadRequestData.media.contentType = "image/jpeg"; loadRequestData.media.contentType = "image/jpeg";
loadRequestData.media.streamType = framework.messages.StreamType.NONE; loadRequestData.media.streamType = cast.framework.messages.StreamType.NONE;
const metadata = new framework.messages.GenericMediaMetadata(); const metadata = new cast.framework.messages.GenericMediaMetadata();
metadata.title = viewTitle; metadata.title = viewTitle;
loadRequestData.media.metadata = metadata; loadRequestData.media.metadata = metadata;
@@ -86,10 +86,10 @@ const showMediaPlayer = () => {
} }
}; };
const options = new framework.CastReceiverOptions(); const options = new cast.framework.CastReceiverOptions();
options.disableIdleTimeout = true; options.disableIdleTimeout = true;
options.customNamespaces = { options.customNamespaces = {
[CAST_NS]: framework.system.MessageType.JSON, [CAST_NS]: cast.framework.system.MessageType.JSON,
}; };
castContext.addCustomMessageListener( castContext.addCustomMessageListener(
@@ -98,7 +98,8 @@ castContext.addCustomMessageListener(
(ev: ReceivedMessage<HassMessage>) => { (ev: ReceivedMessage<HassMessage>) => {
// We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller // We received a show Lovelace command, stop media from playing, hide media player and show Lovelace controller
if ( if (
playerManager.getPlayerState() !== framework.messages.PlayerState.IDLE playerManager.getPlayerState() !==
cast.framework.messages.PlayerState.IDLE
) { ) {
playerManager.stop(); playerManager.stop();
} else { } else {
@@ -113,7 +114,7 @@ castContext.addCustomMessageListener(
const playerManager = castContext.getPlayerManager(); const playerManager = castContext.getPlayerManager();
playerManager.setMessageInterceptor( playerManager.setMessageInterceptor(
framework.messages.MessageType.LOAD, cast.framework.messages.MessageType.LOAD,
(loadRequestData) => { (loadRequestData) => {
if ( if (
loadRequestData.media.contentId === loadRequestData.media.contentId ===
@@ -127,24 +128,25 @@ playerManager.setMessageInterceptor(
// Special handling if it came from Google Assistant // Special handling if it came from Google Assistant
if (media.entity) { if (media.entity) {
media.contentId = media.entity; media.contentId = media.entity;
media.streamType = framework.messages.StreamType.LIVE; media.streamType = cast.framework.messages.StreamType.LIVE;
media.contentType = "application/vnd.apple.mpegurl"; media.contentType = "application/vnd.apple.mpegurl";
// @ts-ignore // @ts-ignore
media.hlsVideoSegmentFormat = media.hlsVideoSegmentFormat =
framework.messages.HlsVideoSegmentFormat.FMP4; cast.framework.messages.HlsVideoSegmentFormat.FMP4;
} }
return loadRequestData; return loadRequestData;
} }
); );
playerManager.addEventListener( playerManager.addEventListener(
framework.events.EventType.MEDIA_STATUS, cast.framework.events.EventType.MEDIA_STATUS,
(event) => { (event) => {
if ( if (
event.mediaStatus?.playerState === framework.messages.PlayerState.IDLE && event.mediaStatus?.playerState ===
cast.framework.messages.PlayerState.IDLE &&
event.mediaStatus?.idleReason && event.mediaStatus?.idleReason &&
event.mediaStatus?.idleReason !== event.mediaStatus?.idleReason !==
framework.messages.IdleReason.INTERRUPTED cast.framework.messages.IdleReason.INTERRUPTED
) { ) {
// media finished or stopped, return to default Lovelace // media finished or stopped, return to default Lovelace
showLovelaceController(); showLovelaceController();

View File

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

View File

@@ -12,8 +12,8 @@ class HcLaunchScreen extends LitElement {
return html` return html`
<div class="container"> <div class="container">
<img <img
alt="Nabu Casa logo on left, Home Assistant logo on right, and red heart in center" alt="Home Assistant logo on left, Nabu Casa logo on right, and red heart in center"
src="https://cast.home-assistant.io/images/nabu-loves-hass.png" src="https://www.home-assistant.io/images/blog/2018-09-thinking-big/social.png"
/> />
<div class="status"> <div class="status">
${this.hass ? "Connected" : "Not Connected"} ${this.hass ? "Connected" : "Not Connected"}
@@ -28,6 +28,7 @@ class HcLaunchScreen extends LitElement {
:host { :host {
display: block; display: block;
height: 100vh; height: 100vh;
padding-top: 64px;
background-color: white; background-color: white;
font-size: 24px; font-size: 24px;
} }
@@ -35,13 +36,15 @@ class HcLaunchScreen extends LitElement {
display: flex; display: flex;
flex-direction: column; flex-direction: column;
text-align: center; text-align: center;
align-items: center;
height: 100%;
justify-content: space-evenly;
} }
img { img {
max-width: 80%; width: 717px;
object-fit: cover; height: 376px;
display: block;
margin: 0 auto;
}
.status {
padding-right: 54px;
} }
`; `;
} }

View File

@@ -1,7 +1,7 @@
import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit"; import { css, CSSResultGroup, html, LitElement, TemplateResult } from "lit";
import { customElement, property, query } from "lit/decorators"; import { customElement, property, query } from "lit/decorators";
import { fireEvent } from "../../../../src/common/dom/fire_event"; import { fireEvent } from "../../../../src/common/dom/fire_event";
import { LovelaceConfig } from "../../../../src/data/lovelace/config/types"; import { LovelaceConfig } from "../../../../src/data/lovelace";
import { Lovelace } from "../../../../src/panels/lovelace/types"; import { Lovelace } from "../../../../src/panels/lovelace/types";
import "../../../../src/panels/lovelace/views/hui-view"; import "../../../../src/panels/lovelace/views/hui-view";
import { HomeAssistant } from "../../../../src/types"; import { HomeAssistant } from "../../../../src/types";
@@ -14,10 +14,9 @@ import "./hc-launch-screen";
class HcLovelace extends LitElement { class HcLovelace extends LitElement {
@property({ attribute: false }) public hass!: HomeAssistant; @property({ attribute: false }) public hass!: HomeAssistant;
@property({ attribute: false }) @property({ attribute: false }) public lovelaceConfig!: LovelaceConfig;
public lovelaceConfig!: LovelaceConfig;
@property() public viewPath?: string | number | null; @property() public viewPath?: string | number;
@property() public urlPath: string | null = null; @property() public urlPath: string | null = null;
@@ -93,9 +92,6 @@ class HcLovelace extends LitElement {
} }
private get _viewIndex() { private get _viewIndex() {
if (this.viewPath === null) {
return 0;
}
const selectedView = this.viewPath; const selectedView = this.viewPath;
const selectedViewInt = parseInt(selectedView as string, 10); const selectedViewInt = parseInt(selectedView as string, 10);
for (let i = 0; i < this.lovelaceConfig.views.length; i++) { for (let i = 0; i < this.lovelaceConfig.views.length; i++) {

View File

@@ -21,27 +21,17 @@ import {
import { atLeastVersion } from "../../../../src/common/config/version"; import { atLeastVersion } from "../../../../src/common/config/version";
import { isNavigationClick } from "../../../../src/common/dom/is-navigation-click"; import { isNavigationClick } from "../../../../src/common/dom/is-navigation-click";
import { import {
fetchResources,
getLegacyLovelaceCollection, getLegacyLovelaceCollection,
getLovelaceCollection, getLovelaceCollection,
} from "../../../../src/data/lovelace";
import {
isStrategyDashboard,
LegacyLovelaceConfig, LegacyLovelaceConfig,
LovelaceConfig, LovelaceConfig,
LovelaceDashboardStrategyConfig, } from "../../../../src/data/lovelace";
} from "../../../../src/data/lovelace/config/types";
import { fetchResources } from "../../../../src/data/lovelace/resource";
import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources"; import { loadLovelaceResources } from "../../../../src/panels/lovelace/common/load-resources";
import { HassElement } from "../../../../src/state/hass-element"; import { HassElement } from "../../../../src/state/hass-element";
import { castContext } from "../cast_context"; import { castContext } from "../cast_context";
import "./hc-launch-screen"; import "./hc-launch-screen";
const DEFAULT_CONFIG: LovelaceDashboardStrategyConfig = {
strategy: {
type: "original-states",
},
};
let resourcesLoaded = false; let resourcesLoaded = false;
@customElement("hc-main") @customElement("hc-main")
export class HcMain extends HassElement { export class HcMain extends HassElement {
@@ -51,10 +41,10 @@ export class HcMain extends HassElement {
@state() private _lovelacePath: string | number | null = null; @state() private _lovelacePath: string | number | null = null;
@state() private _urlPath?: string | null;
@state() private _error?: string; @state() private _error?: string;
@state() private _urlPath?: string | null;
private _hassUUID?: string; private _hassUUID?: string;
private _unsubLovelace?: UnsubscribeFunc; private _unsubLovelace?: UnsubscribeFunc;
@@ -81,7 +71,7 @@ export class HcMain extends HassElement {
if ( if (
!this._lovelaceConfig || !this._lovelaceConfig ||
this._urlPath === undefined || this._lovelacePath === null ||
// Guard against part of HA not being loaded yet. // Guard against part of HA not being loaded yet.
!this.hass || !this.hass ||
!this.hass.states || !this.hass.states ||
@@ -99,18 +89,16 @@ export class HcMain extends HassElement {
<hc-lovelace <hc-lovelace
.hass=${this.hass} .hass=${this.hass}
.lovelaceConfig=${this._lovelaceConfig} .lovelaceConfig=${this._lovelaceConfig}
.urlPath=${this._urlPath}
.viewPath=${this._lovelacePath} .viewPath=${this._lovelacePath}
@config-refresh=${this._generateDefaultLovelaceConfig} .urlPath=${this._urlPath}
@config-refresh=${this._generateLovelaceConfig}
></hc-lovelace> ></hc-lovelace>
`; `;
} }
protected firstUpdated(changedProps) { protected firstUpdated(changedProps) {
super.firstUpdated(changedProps); super.firstUpdated(changedProps);
import("./hc-lovelace"); import("../second-load");
import("../../../../src/resources/ha-style");
window.addEventListener("location-changed", () => { window.addEventListener("location-changed", () => {
const panelPath = `/${this._urlPath || "lovelace"}/`; const panelPath = `/${this._urlPath || "lovelace"}/`;
if (location.pathname.startsWith(panelPath)) { if (location.pathname.startsWith(panelPath)) {
@@ -205,6 +193,7 @@ export class HcMain extends HassElement {
expires_in: 0, expires_in: 0,
}), }),
}); });
this._hassUUID = msg.hassUUID;
} catch (err: any) { } catch (err: any) {
const errorMessage = this._getErrorMessage(err); const errorMessage = this._getErrorMessage(err);
this._error = errorMessage; this._error = errorMessage;
@@ -224,17 +213,6 @@ export class HcMain extends HassElement {
this.hass.connection.close(); this.hass.connection.close();
} }
this.initializeHass(auth, connection); this.initializeHass(auth, connection);
if (this._hassUUID !== msg.hassUUID) {
this._hassUUID = msg.hassUUID;
this._lovelaceConfig = undefined;
this._urlPath = undefined;
this._lovelacePath = null;
if (this._unsubLovelace) {
this._unsubLovelace();
this._unsubLovelace = undefined;
}
resourcesLoaded = false;
}
this._error = undefined; this._error = undefined;
this._sendStatus(); this._sendStatus();
} }
@@ -243,7 +221,7 @@ export class HcMain extends HassElement {
this._showDemo = false; this._showDemo = false;
// We should not get this command before we are connected. // We should not get this command before we are connected.
// Means a client got out of sync. Let's send status to them. // Means a client got out of sync. Let's send status to them.
if (!this.hass?.connected) { if (!this.hass) {
this._sendStatus(msg.senderId!); this._sendStatus(msg.senderId!);
this._error = "Cannot show Lovelace because we're not connected."; this._error = "Cannot show Lovelace because we're not connected.";
this._sendError( this._sendError(
@@ -280,12 +258,13 @@ export class HcMain extends HassElement {
{ {
strategy: { strategy: {
type: "energy", type: "energy",
options: { show_date_selection: true },
}, },
}, },
], ],
}; };
this._urlPath = "energy"; this._urlPath = "energy";
this._lovelacePath = null; this._lovelacePath = 0;
this._sendStatus(); this._sendStatus();
return; return;
} }
@@ -294,7 +273,6 @@ export class HcMain extends HassElement {
this._lovelaceConfig = undefined; this._lovelaceConfig = undefined;
if (this._unsubLovelace) { if (this._unsubLovelace) {
this._unsubLovelace(); this._unsubLovelace();
this._unsubLovelace = undefined;
} }
const llColl = atLeastVersion(this.hass.connection.haVersion, 0, 107) const llColl = atLeastVersion(this.hass.connection.haVersion, 0, 107)
? getLovelaceCollection(this.hass.connection, msg.urlPath) ? getLovelaceCollection(this.hass.connection, msg.urlPath)
@@ -303,20 +281,9 @@ export class HcMain extends HassElement {
// configuration. // configuration.
try { try {
await llColl.refresh(); await llColl.refresh();
this._unsubLovelace = llColl.subscribe(async (rawConfig) => { this._unsubLovelace = llColl.subscribe((lovelaceConfig) =>
if (isStrategyDashboard(rawConfig)) { this._handleNewLovelaceConfig(lovelaceConfig)
const { generateLovelaceDashboardStrategy } = await import( );
"../../../../src/panels/lovelace/strategies/get-strategy"
);
const config = await generateLovelaceDashboardStrategy(
rawConfig.strategy,
this.hass!
);
this._handleNewLovelaceConfig(config);
} else {
this._handleNewLovelaceConfig(rawConfig);
}
});
} catch (err: any) { } catch (err: any) {
if ( if (
atLeastVersion(this.hass.connection.haVersion, 0, 107) && atLeastVersion(this.hass.connection.haVersion, 0, 107) &&
@@ -330,7 +297,7 @@ export class HcMain extends HassElement {
} }
// Generate a Lovelace config. // Generate a Lovelace config.
this._unsubLovelace = () => undefined; this._unsubLovelace = () => undefined;
await this._generateDefaultLovelaceConfig(); await this._generateLovelaceConfig();
} }
} }
if (!resourcesLoaded) { if (!resourcesLoaded) {
@@ -339,21 +306,24 @@ export class HcMain extends HassElement {
? await fetchResources(this.hass!.connection) ? await fetchResources(this.hass!.connection)
: (this._lovelaceConfig as LegacyLovelaceConfig).resources; : (this._lovelaceConfig as LegacyLovelaceConfig).resources;
if (resources) { if (resources) {
loadLovelaceResources(resources, this.hass!); loadLovelaceResources(resources, this.hass!.auth.data.hassUrl);
} }
} }
this._sendStatus(); this._sendStatus();
} }
private async _generateDefaultLovelaceConfig() { private async _generateLovelaceConfig() {
const { generateLovelaceDashboardStrategy } = await import( const { generateLovelaceDashboardStrategy } = await import(
"../../../../src/panels/lovelace/strategies/get-strategy" "../../../../src/panels/lovelace/strategies/get-strategy"
); );
this._handleNewLovelaceConfig( this._handleNewLovelaceConfig(
await generateLovelaceDashboardStrategy( await generateLovelaceDashboardStrategy(
DEFAULT_CONFIG.strategy, {
this.hass! hass: this.hass!,
narrow: false,
},
"original-states"
) )
); );
} }

View File

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

View File

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

View File

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

View File

@@ -1,3 +1,3 @@
self.addEventListener("fetch", (event) => { self.addEventListener("fetch", function(event) {
event.respondWith(fetch(event.request)); event.respondWith(fetch(event.request));
}); });

View File

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

View File

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

View File

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

View File

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

Some files were not shown because too many files have changed in this diff Show More