diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile index 32df1809..98422602 100644 --- a/.devcontainer/Dockerfile +++ b/.devcontainer/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/devcontainers/base:ubuntu-22.04 +FROM mcr.microsoft.com/devcontainers/base:ubuntu-24.04 USER vscode diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 7c51330b..89bc094a 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -9,15 +9,15 @@ }, "updateRemoteUserUID": true, "workspaceFolder": "${localWorkspaceFolder}", - "initializeCommand": [".devcontainer/initialize.sh"], + "initializeCommand": [".devcontainer/scripts/devcontainer_initialize.sh"], "postCreateCommand": ["yarn", "install"], - "forwardPorts": [10001, "hass:8123", "frigate:5000"], + "forwardPorts": [10001, "homeassistant:8123", "frigate:5000"], "portsAttributes": { "10001": { "label": "Rollup", "onAutoForward": "silent" }, - "hass:8123": { + "homeassistant:8123": { "label": "Home Assistant", "onAutoForward": "silent" }, @@ -29,17 +29,16 @@ "customizations": { "vscode": { "extensions": [ - "github.vscode-pull-request-github", - "eamodio.gitlens", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", - "bierner.lit-html", "runem.lit-plugin", "davidanson.vscode-markdownlint", "redhat.vscode-yaml", - "lokalise.i18n-ally", "vitest.explorer", "inlang.vs-code-extension", + "YoavBls.pretty-ts-errors", + "github.vscode-pull-request-github", + "github.vscode-github-actions", "ms-azuretools.vscode-docker" ], "settings": { @@ -50,10 +49,7 @@ "editor.formatOnSave": true, "editor.formatOnType": true, "files.trimTrailingWhitespace": true, - "[json]": { - "editor.defaultFormatter": "esbenp.prettier-vscode" - }, - "[jsonc]": { + "[json][jsonc][yaml][markdown][typescript][javascript]": { "editor.defaultFormatter": "esbenp.prettier-vscode" } } diff --git a/.devcontainer/frigate-hass-integration b/.devcontainer/frigate-hass-integration index 070fbf2e..421ed659 160000 --- a/.devcontainer/frigate-hass-integration +++ b/.devcontainer/frigate-hass-integration @@ -1 +1 @@ -Subproject commit 070fbf2eccda6c8437b82c3bc23dc95e80826375 +Subproject commit 421ed6594bad4ff78960abb92924fcafa038c08b diff --git a/.devcontainer/preconfig/.storage/lovelace b/.devcontainer/homeassistant_preconfig/.storage/lovelace similarity index 100% rename from .devcontainer/preconfig/.storage/lovelace rename to .devcontainer/homeassistant_preconfig/.storage/lovelace diff --git a/.devcontainer/preconfig/.storage/lovelace_resources b/.devcontainer/homeassistant_preconfig/.storage/lovelace_resources similarity index 100% rename from .devcontainer/preconfig/.storage/lovelace_resources rename to .devcontainer/homeassistant_preconfig/.storage/lovelace_resources diff --git a/.devcontainer/initialize.sh b/.devcontainer/initialize.sh deleted file mode 100755 index c908909b..00000000 --- a/.devcontainer/initialize.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -set -euxo pipefail - -git submodule update --init - -.devcontainer/frigate-hass-integration/.devcontainer/set_dot_env.sh diff --git a/.devcontainer/scripts/devcontainer_initialize.sh b/.devcontainer/scripts/devcontainer_initialize.sh new file mode 100755 index 00000000..bb816f17 --- /dev/null +++ b/.devcontainer/scripts/devcontainer_initialize.sh @@ -0,0 +1,9 @@ +#!/bin/bash + +set -euxo pipefail + +git submodule update --init + +.devcontainer/frigate-hass-integration/.devcontainer/scripts/devcontainer_initialize.sh + +echo "$0 finished." >&2 diff --git a/.vscode/extensions.json b/.vscode/extensions.json index d2f09548..100e2d03 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,16 +1,14 @@ { "recommendations": [ - "github.vscode-pull-request-github", - "eamodio.gitlens", "dbaeumer.vscode-eslint", "esbenp.prettier-vscode", - "bierner.lit-html", "runem.lit-plugin", "davidanson.vscode-markdownlint", "redhat.vscode-yaml", - "lokalise.i18n-ally", "vitest.explorer", "inlang.vs-code-extension", - "yoavbls.pretty-ts-errors" + "yoavbls.pretty-ts-errors", + "github.vscode-pull-request-github", + "github.vscode-github-actions" ] } diff --git a/.vscode/i18n-ally-custom-framework.yml b/.vscode/i18n-ally-custom-framework.yml deleted file mode 100644 index 4c691479..00000000 --- a/.vscode/i18n-ally-custom-framework.yml +++ /dev/null @@ -1,23 +0,0 @@ -# An array of strings which contain Language Ids defined by VS Code -# You can check avaliable language ids here: https://code.visualstudio.com/docs/languages/overview#_language-id -languageIds: - - typescript - -# An array of RegExes to find the key usage. **The key should be captured in the first match group**. -# You should unescape RegEx strings in order to fit in the YAML file -# To help with this, you can use https://www.freeformatter.com/json-escape.html -usageMatchRegex: - # The following example shows how to detect `t("your.i18n.keys")` - # the `{key}` will be placed by a proper keypath matching regex, - # you can ignore it and use your own matching rules as well - - "[^\\w\\d]localize\\(['\"`]({key})['\"`]" - -# An array of strings containing refactor templates. -# The "$1" will be replaced by the keypath specified. -# Optional: uncomment the following two lines to use - -# refactorTemplates: -# - i18n.get("$1") - -# If set to true, only enables this custom framework (will disable all built-in frameworks) -monopoly: true diff --git a/.vscode/i18n-ally-reviews.yml b/.vscode/i18n-ally-reviews.yml deleted file mode 100644 index 011ea0f3..00000000 --- a/.vscode/i18n-ally-reviews.yml +++ /dev/null @@ -1,66 +0,0 @@ -# Review comments generated by i18n-ally. Please commit this file. - -reviews: - config.live.show_image_during_load: - locales: - it: - translation_candidate: - source: en - text: Mostra l'immagine fissa durante il caricamento del live streaming - time: '2022-08-07T23:00:31.001Z' - config.common.layout.fit: - locales: - it: - translation_candidate: - source: en - text: Disposizione adatta - time: '2022-08-12T03:00:50.438Z' - config.common.layout.fits.contain: - locales: - it: - translation_candidate: - source: en - text: I media sono contenuti/incartati - time: '2022-08-12T03:01:00.885Z' - config.common.layout.fits.cover: - locales: - it: - translation_candidate: - source: en - text: Il supporto si espande proporzionalmente per coprire la scheda - time: '2022-08-12T03:01:09.001Z' - config.common.layout.fits.fill: - locales: - it: - translation_candidate: - source: en - text: Il supporto viene allungato per riempire la scheda - time: '2022-08-12T03:01:14.657Z' - config.common.layout.position.x: - locales: - it: - translation_candidate: - source: en - text: Percentuale di posizionamento orizzontale - time: '2022-08-12T03:01:20.714Z' - config.common.layout.position.y: - locales: - it: - translation_candidate: - source: en - text: Percentuale di posizionamento verticale - time: '2022-08-12T03:01:26.332Z' - config.image.layout: - locales: - it: - translation_candidate: - source: en - text: Disposizione dell'immagine - time: '2022-08-12T03:01:33.020Z' - config.media_viewer.layout: - locales: - it: - translation_candidate: - source: en - text: Layout del visualizzatore multimediale - time: '2022-08-12T03:01:45.033Z' diff --git a/.vscode/launch.json b/.vscode/launch.json index 0c322e3a..1d42b6e6 100644 --- a/.vscode/launch.json +++ b/.vscode/launch.json @@ -2,7 +2,7 @@ "version": "0.2.0", "configurations": [ { - "type": "pwa-chrome", + "type": "chrome", "request": "launch", "name": "Launch Chrome against Home Assistant", "url": "http://localhost:8123", diff --git a/.vscode/settings.json b/.vscode/settings.json deleted file mode 100644 index a4a10938..00000000 --- a/.vscode/settings.json +++ /dev/null @@ -1,8 +0,0 @@ -{ - "i18n-ally.localesPaths": ["src/localize/languages"], - "i18n-ally.keystyle": "nested", - "i18n-ally.sortKeys": true, - "i18n-ally.keepFulfilled": true, - "i18n-ally.editor.preferEditor": true, - "i18n-ally.translate.saveAsCandidates": true -} diff --git a/docker-compose.yml b/docker-compose.yml index 84415b0e..2af85e60 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,12 +8,12 @@ services: volumes: - /var/run/docker.sock:/var/run/docker-host.sock - .:${LOCAL_WORKSPACE_FOLDER}:cached - hass: + homeassistant: extends: file: .devcontainer/frigate-hass-integration/docker-compose.yml - service: hass + service: homeassistant volumes: - - .devcontainer/preconfig:/preconfig.d/02-card:ro + - .devcontainer/homeassistant_preconfig:/preconfig.d/02-card:ro frigate: extends: file: .devcontainer/frigate-hass-integration/docker-compose.yml diff --git a/package.json b/package.json index 49931e87..ddf53742 100644 --- a/package.json +++ b/package.json @@ -188,7 +188,7 @@ "coverage": "vitest run --coverage" }, "volta": { - "node": "20.14.0", - "yarn": "4.3.0" + "node": "22.14.0", + "yarn": "4.9.1" } }