Bump version to 2023.6.0

Bump version to 2023.6.0b7
Bump version to 2023.6.0b6
2023-06-22 05:35:28 +00:00 · 2023-06-22 01:33:26 +00:00 · 2023-06-21 23:24:57 +00:00 · 2023-06-22 08:22:09 +12:00 · 2023-06-21 23:03:42 +12:00 · 2023-06-21 10:56:33 +00:00
51 changed files with 988 additions and 371 deletions
--- a/.devcontainer/Dockerfile
+++ b/.devcontainer/Dockerfile
@@ -0,0 +1,10 @@
+FROM ghcr.io/home-assistant/devcontainer:addons
+
+RUN \
+  apt-get update \
+  && apt-get install -y --no-install-recommends \
+    python3-pip
+
+COPY script/requirements.txt /
+
+RUN pip install -r /requirements.txt
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -0,0 +1,36 @@
+{
+  "name": "ESPHome Home Assistant add-on devcontainer",
+  "image": "ghcr.io/esphome/devcontainer:addons",
+  "appPort": [
+    "7123:8123",
+    "7357:4357"
+  ],
+  "postStartCommand": "bash devcontainer_bootstrap",
+  "runArgs": [
+    "-e",
+    "GIT_EDITOR=code --wait",
+    "--privileged"
+  ],
+  "containerEnv": {
+    "WORKSPACE_DIRECTORY": "${containerWorkspaceFolder}"
+  },
+  "extensions": [
+    "timonwong.shellcheck",
+    "esbenp.prettier-vscode"
+  ],
+  "mounts": [
+    "type=volume,target=/var/lib/docker"
+  ],
+  "settings": {
+    "terminal.integrated.profiles.linux": {
+      "zsh": {
+        "path": "/usr/bin/zsh"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh",
+    "editor.formatOnPaste": false,
+    "editor.formatOnSave": true,
+    "editor.formatOnType": true,
+    "files.trimTrailingWhitespace": true
+  }
+}
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: daily
+    open-pull-requests-limit: 10
--- a/.github/workflows/bump-version.yml
+++ b/.github/workflows/bump-version.yml
@@ -6,18 +6,36 @@ on:
      version:
        description: The version to release
        required: true
+      content:
+        description: The content of the release-notes
+        required: true

 jobs:
  create-release:
    runs-on: ubuntu-latest
    continue-on-error: true
    steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/checkout@v3.5.3
+    - uses: actions/setup-python@v4
      with:
        python-version: '3.x'
    - run: pip install -r script/requirements.txt
    - run: script/bump-version.py ${{ github.event.inputs.version }}
+    - name: Write Beta changelog
+      run: |
+        cat > esphome-beta/CHANGELOG.md << 'EOF'
+        ## ${{ github.event.inputs.version }}
+
+        ${{ github.event.inputs.content }}
+        EOF
+    - name: Write Stable changelog
+      if: ${{ !contains(github.event.inputs.version, 'b') }}
+      run: |
+        cat > esphome/CHANGELOG.md << 'EOF'
+        ## ${{ github.event.inputs.version }}
+
+        ${{ github.event.inputs.content }}
+        EOF
    - name: Commit version bump
      id: commit_version
      run: |
@@ -28,59 +46,14 @@ jobs:
        git push
        COMMIT=$(git rev-parse HEAD)
        echo "::set-output name=commit_sha::${COMMIT}"
-    - if: ${{ contains(github.event.inputs.version, 'b') }}
-      name: Create Beta Release
-      uses: actions/create-release@v1
+    - name: Create a Release
+      uses: actions/create-release@v1.1.4
      continue-on-error: true
      env:
        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
      with:
-        tag_name: v${{ github.event.inputs.version }}
+        tag_name: ${{ github.event.inputs.version }}
        release_name: ${{ github.event.inputs.version }}
-        body: 'See https://beta.esphome.io/changelog/index.html'
-        prerelease: true
+        body: ${{ github.event.inputs.content }}
+        prerelease: ${{ contains(github.event.inputs.version, 'b') }}
        commitish: ${{ steps.commit_version.outputs.commit_sha }}
-    - if: ${{ !contains(github.event.inputs.version, 'b') }}
-      name: Create Stable Release
-      uses: actions/create-release@v1
-      continue-on-error: true
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      with:
-        tag_name: v${{ github.event.inputs.version }}
-        release_name: ${{ github.event.inputs.version }}
-        body: 'See https://esphome.io/changelog/index.html'
-        prerelease: false
-        commitish: ${{ steps.commit_version.outputs.commit_sha }}
-
-  deploy-community-addons:
-    runs-on: ubuntu-latest
-    needs: [create-release]
-    steps:
-      - name: Publish beta release to community-addons repository
-        uses: peter-evans/repository-dispatch@v1.1.3
-        with:
-          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-          repository: hassio-addons/repository-beta
-          event-type: update
-          client-payload: >
-            {
-              "addon": "esphome",
-              "name": "ESPHome",
-              "repository": "esphome/home-assistant-addon",
-              "version": "${{ github.event.inputs.version }}"
-            }
-      - if: ${{ !contains(github.event.inputs.version, 'b') }}
-        name: Publish stable release to community-addons repository
-        uses: peter-evans/repository-dispatch@v1.1.3
-        with:
-          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-          repository: hassio-addons/repository
-          event-type: update
-          client-payload: >
-            {
-              "addon": "esphome",
-              "name": "ESPHome",
-              "repository": "esphome/home-assistant-addon",
-              "version": "${{ github.event.inputs.version }}"
-            }
--- a/.github/workflows/deploy-community.yml
+++ b/.github/workflows/deploy-community.yml
@@ -1,46 +0,0 @@
-name: Update Community Repo
-
-on:
-  workflow_dispatch:
-    inputs:
-      version:
-        description: The version to release
-        required: true
-      beta:
-        description: Whether to release a beta version
-        type: boolean
-        required: false
-        default: false
-
-jobs:
-  deploy-community-addons:
-    runs-on: ubuntu-latest
-    steps:
-      - if: ${{ contains(github.event.inputs.version, 'b') || github.event.inputs.beta == 'true' }}
-        name: Publish beta release to community-addons repository
-        uses: peter-evans/repository-dispatch@v1.1.3
-        with:
-          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-          repository: hassio-addons/repository-beta
-          event-type: update
-          client-payload: >
-            {
-              "addon": "esphome",
-              "name": "ESPHome",
-              "repository": "esphome/home-assistant-addon",
-              "version": "${{ github.event.inputs.version }}"
-            }
-      - if: ${{ !contains(github.event.inputs.version, 'b') }}
-        name: Publish stable release to community-addons repository
-        uses: peter-evans/repository-dispatch@v1.1.3
-        with:
-          token: ${{ secrets.COMMUNITY_ADDONS_TOKEN }}
-          repository: hassio-addons/repository
-          event-type: update
-          client-payload: >
-            {
-              "addon": "esphome",
-              "name": "ESPHome",
-              "repository": "esphome/home-assistant-addon",
-              "version": "${{ github.event.inputs.version }}"
-            }
--- a/.github/workflows/devcontainer-build.yaml
+++ b/.github/workflows/devcontainer-build.yaml
@@ -0,0 +1,41 @@
+name: Build devcontainer image
+
+on:
+  workflow_dispatch:
+  push:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+  schedule:
+    - cron: '0 0 1 * *'
+  pull_request:
+    branches:
+      - main
+    paths:
+      - .devcontainer/**
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3.5.3
+      - name: Log in to the GitHub container registry
+        uses: docker/login-action@v2.2.0
+        if: github.event_name != 'pull_request'
+        with:
+            registry: ghcr.io
+            username: ${{ github.repository_owner }}
+            password: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v2.2.0
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v2.7.0
+      - name: Build and Push
+        uses: docker/build-push-action@v4.1.1
+        with:
+          context: .
+          file: .devcontainer/Dockerfile
+          tags: ghcr.io/${{ github.repository_owner }}/devcontainer:addons
+          push: ${{ github.event_name != 'pull_request' }}
+          platforms: linux/amd64,linux/arm64
--- a/.github/workflows/lint.yml
+++ b/.github/workflows/lint.yml
@@ -19,9 +19,9 @@ jobs:
            channel: dev
    steps:
      - name: ⤵️ Check out code from GitHub
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3.5.3
      - name: 🛠 Setup Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v4
        with:
          python-version: '3.x'
      - name: 🛠 Install dependencies
@@ -29,6 +29,6 @@ jobs:
      - name: 🛠 Generate files from template
        run: python script/generate.py ${{ matrix.channels.channel }}
      - name: 🚀 Run Home Assistant Add-on Lint on ${{ matrix.channels.channel }}
-        uses: frenck/action-addon-linter@v2
+        uses: frenck/action-addon-linter@v2.13.1
        with:
          path: "./${{ matrix.channels.folder }}"
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -0,0 +1,19 @@
+{
+  "version": "2.0.0",
+  "tasks": [
+    {
+      "label": "Start Home Assistant",
+      "type": "shell",
+      "command": "supervisor_run",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    }
+  ]
+}
--- a/esphome-beta/CHANGELOG.md
+++ b/esphome-beta/CHANGELOG.md
@@ -1 +1,122 @@
-See https://esphome.io/changelog/index.html
+## 2023.6.0
+
+## Full list of changes
+
+### New Components
+
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+
+### Breaking Changes
+
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+
+### Beta Changes
+
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
+### All changes
+
+- Add minimum RSSI check to ble presence [esphome#4646](https://github.com/esphome/esphome/pull/4646) by [@nielsnl68](https://github.com/nielsnl68)
+- Run black over tests folder [esphome#4824](https://github.com/esphome/esphome/pull/4824) by [@jesserockz](https://github.com/jesserockz)
+- Use token so PR checks are run [esphome#4834](https://github.com/esphome/esphome/pull/4834) by [@jesserockz](https://github.com/jesserockz)
+- Fix stale bot ignoring not-stale [esphome#4836](https://github.com/esphome/esphome/pull/4836) by [@jesserockz](https://github.com/jesserockz)
+- Rework CI into multiple dependent jobs [esphome#4823](https://github.com/esphome/esphome/pull/4823) by [@jesserockz](https://github.com/jesserockz)
+- Add DNS to Text info [esphome#4821](https://github.com/esphome/esphome/pull/4821) by [@max246](https://github.com/max246)
+- allow to use MQTT for discovery of IPs if mDNS is no option  [esphome#3887](https://github.com/esphome/esphome/pull/3887) by [@Links2004](https://github.com/Links2004)
+- Move some I2C logic out of header file [esphome#4839](https://github.com/esphome/esphome/pull/4839) by [@CarsonF](https://github.com/CarsonF)
+- Allow substitutions to be valid names [esphome#4726](https://github.com/esphome/esphome/pull/4726) by [@jgoguen](https://github.com/jgoguen)
+- Insert Europe Tank Types from mopeka_std_check [esphome#4757](https://github.com/esphome/esphome/pull/4757) by [@lukasl96](https://github.com/lukasl96)
+- Bump tornado from 6.3.1 to 6.3.2 [esphome#4841](https://github.com/esphome/esphome/pull/4841) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pylint from 2.17.3 to 2.17.4 [esphome#4843](https://github.com/esphome/esphome/pull/4843) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.60.0 to 0.62.0 [esphome#4781](https://github.com/esphome/esphome/pull/4781) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.3.2 to 3.4.0 [esphome#4842](https://github.com/esphome/esphome/pull/4842) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump platformio from 6.1.6 to 6.1.7 [esphome#4795](https://github.com/esphome/esphome/pull/4795) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Migrate e131 to use socket instead of WiFiUDP arduino library [esphome#4832](https://github.com/esphome/esphome/pull/4832) by [@jesserockz](https://github.com/jesserockz)
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Run YAML test 8 during CI and fix board used [esphome#4862](https://github.com/esphome/esphome/pull/4862) by [@kroimon](https://github.com/kroimon)
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- [ILI9xxx] Update ili9xxx_init.h code for the ILI9488 display for correct white balance [esphome#4849](https://github.com/esphome/esphome/pull/4849) by [@lucasreiners](https://github.com/lucasreiners)
+- Update codeowners [esphome#4875](https://github.com/esphome/esphome/pull/4875) by [@freekode](https://github.com/freekode)
+- Fix rp2040_pio_led_strip color modes [esphome#4887](https://github.com/esphome/esphome/pull/4887) by [@jesserockz](https://github.com/jesserockz)
+- Add i2s mclk [esphome#4885](https://github.com/esphome/esphome/pull/4885) by [@rpatel3001](https://github.com/rpatel3001)
+- Allow partially looping animations [esphome#4693](https://github.com/esphome/esphome/pull/4693) by [@guillempages](https://github.com/guillempages)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- move pio tools to LED component [esphome#4903](https://github.com/esphome/esphome/pull/4903) by [@ssieb](https://github.com/ssieb)
+- add SUB_SELECT macro [esphome#4897](https://github.com/esphome/esphome/pull/4897) by [@regevbr](https://github.com/regevbr)
+- add SUB_SWITCH macro [esphome#4898](https://github.com/esphome/esphome/pull/4898) by [@regevbr](https://github.com/regevbr)
+- esp32_rmt_led_strip: fix compile with ESP-IDF >= 5 [esphome#4856](https://github.com/esphome/esphome/pull/4856) by [@stintel](https://github.com/stintel)
+- Bump aioesphomeapi from 13.7.5 to 13.9.0 [esphome#4907](https://github.com/esphome/esphome/pull/4907) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- ota: fix compile with ESP-IDF >= 5 [esphome#4857](https://github.com/esphome/esphome/pull/4857) by [@stintel](https://github.com/stintel)
+- ota: fix TWDT with ESP-IDF >= 5 [esphome#4858](https://github.com/esphome/esphome/pull/4858) by [@stintel](https://github.com/stintel)
+- light: fix compile with ESP-IDF >= 5 [esphome#4855](https://github.com/esphome/esphome/pull/4855) by [@stintel](https://github.com/stintel)
+- Continuous voice_assistant and silence detection [esphome#4892](https://github.com/esphome/esphome/pull/4892) by [@jesserockz](https://github.com/jesserockz)
+- Allow WIFI to be disabled and enabled [esphome#4810](https://github.com/esphome/esphome/pull/4810) by [@jesserockz](https://github.com/jesserockz)
+- Bump frenck/action-yamllint from 1.4.0 to 1.4.1 [esphome#4876](https://github.com/esphome/esphome/pull/4876) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-cov from 4.0.0 to 4.1.0 [esphome#4888](https://github.com/esphome/esphome/pull/4888) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.62.0 to 0.63.0 [esphome#4890](https://github.com/esphome/esphome/pull/4890) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump esptool from 4.5.1 to 4.6 [esphome#4906](https://github.com/esphome/esphome/pull/4906) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- prometheus: fix compilation with EntityBase [esphome#4895](https://github.com/esphome/esphome/pull/4895) by [@mischief](https://github.com/mischief)
+- Support for Adafruit ESP32-S2 TFT Feather [esphome#4912](https://github.com/esphome/esphome/pull/4912) by [@PlainTechEnthusiast](https://github.com/PlainTechEnthusiast)
+- Add support for mdi images [esphome#4654](https://github.com/esphome/esphome/pull/4654) by [@guillempages](https://github.com/guillempages)
+- Increase SNTP setup priority [esphome#4917](https://github.com/esphome/esphome/pull/4917) by [@droscy](https://github.com/droscy)
+- Bump aioesphomeapi from 13.9.0 to 14.0.0 [esphome#4925](https://github.com/esphome/esphome/pull/4925) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bluetooth Proxy: Raw bundled advertisements [esphome#4924](https://github.com/esphome/esphome/pull/4924) by [@jesserockz](https://github.com/jesserockz)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Allow multiple MAC addresses for 'on_ble_advertise' filter [esphome#4773](https://github.com/esphome/esphome/pull/4773) by [@RoboMagus](https://github.com/RoboMagus)
+- Add SVG image support [esphome#4922](https://github.com/esphome/esphome/pull/4922) by [@guillempages](https://github.com/guillempages)
+- Add !extend to devcontainer's customTags [esphome#4749](https://github.com/esphome/esphome/pull/4749) by [@jimtng](https://github.com/jimtng)
+- [max7219digit] fix 270° rotation [esphome#4930](https://github.com/esphome/esphome/pull/4930) by [@spezifisch](https://github.com/spezifisch)
+- proto generation updates [esphome#4653](https://github.com/esphome/esphome/pull/4653) by [@jesserockz](https://github.com/jesserockz)
+- I2S media player allow setting communication format for external DACs [esphome#4918](https://github.com/esphome/esphome/pull/4918) by [@ccorderor](https://github.com/ccorderor)
+- Add MULTI_CONF to pn53_i2c [esphome#4938](https://github.com/esphome/esphome/pull/4938) by [@jesserockz](https://github.com/jesserockz)
+- display: Improve Image rendering by removing usage of virtual functions [esphome#4931](https://github.com/esphome/esphome/pull/4931) by [@ayufan](https://github.com/ayufan)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
--- a/esphome-beta/DOCS.md
+++ b/esphome-beta/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
--- a/esphome-beta/README.md
+++ b/esphome-beta/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Beta Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/
--- a/esphome-beta/config.json
+++ b/esphome-beta/config.json
@@ -1,44 +0,0 @@
-{
-  "advanced": true,
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "backup_exclude": [
-    "*/*/"
-  ],
-  "description": "Beta version of ESPHome add-on",
-  "hassio_api": true,
-  "host_network": true,
-  "image": "ghcr.io/esphome/esphome-hassio-{arch}",
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome (beta)",
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome-beta",
-  "stage": "experimental",
-  "uart": true,
-  "url": "https://beta.esphome.io/",
-  "version": "2022.2.1"
-}
--- a/esphome-beta/config.yaml
+++ b/esphome-beta/config.yaml
@@ -0,0 +1,42 @@
+---
+url: https://beta.esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome (beta)
+version: 2023.6.0
+slug: esphome-beta
+description: Beta version of ESPHome add-on
+image: ghcr.io/esphome/esphome-hassio
+stage: experimental
+advanced: true
+options:
+  home_assistant_dashboard_integration: false
--- a/esphome-beta/images/dht-example.png
+++ b/esphome-beta/images/dht-example.png
--- a/esphome-beta/images/screenshot.png
+++ b/esphome-beta/images/screenshot.png
--- a/esphome-beta/images/temperature-humidity.png
+++ b/esphome-beta/images/temperature-humidity.png
--- a/esphome-beta/logo.png
+++ b/esphome-beta/logo.png
--- a/esphome-beta/translations/en.yaml
+++ b/esphome-beta/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/esphome-dev/DOCS.md
+++ b/esphome-dev/DOCS.md
@@ -1,40 +1,31 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome DEV add on

-## Installation
+This is **development** version of the ESPHome add on.

-The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
+To deploy production nodes please use mainstream release add on.

-1. Search for the “ESPHome” add-on in the Supervisor add-on store.
-2. Press install to download the add-on and unpack it on your machine. This can take some time.
-3. Optional: If you're using SSL/TLS certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly.
-4. Start the add-on, check the logs of the add-on to see if everything went well.
-5. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Home Assistant's authentication system to log you in.
-
-You can view the ESPHome documentation at https://esphome.io/
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.

 ## Configuration

 **Note**: _Remember to restart the add-on when the configuration is changed._

-Example add-on configuration:
-
-```json
-{
-  "ssl": false,
-  "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem"
-}
-```
-
 ### Option: `esphome_fork`

 Install ESPHome from a fork or branch.
 For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
 or you can specify the username of the fork owner and branch `username:branch` which
-assumes the repository is named `esphome` still. 
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.

 Please note that the fork or branch you are using **must** be up to date with ESPHome dev
-or the add-on **will not start**. 
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.

 ### Option: `ssl`

--- a/esphome-dev/README.md
+++ b/esphome-dev/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Dev Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/
--- a/esphome-dev/build.json
+++ b/esphome-dev/build.json
@@ -1,7 +0,0 @@
-{
-  "build_from": {
-    "aarch64": "ghcr.io/esphome/esphome-hassio-aarch64:dev",
-    "amd64": "ghcr.io/esphome/esphome-hassio-amd64:dev",
-    "armv7": "ghcr.io/esphome/esphome-hassio-armv7:dev"
-  }
-}
--- a/esphome-dev/build.yaml
+++ b/esphome-dev/build.yaml
@@ -0,0 +1,5 @@
+---
+build_from:
+  aarch64: ghcr.io/esphome/esphome-hassio:dev
+  amd64: ghcr.io/esphome/esphome-hassio:dev
+  armv7: ghcr.io/esphome/esphome-hassio:dev
--- a/esphome-dev/config.json
+++ b/esphome-dev/config.json
@@ -1,44 +0,0 @@
-{
-  "advanced": true,
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "backup_exclude": [
-    "*/*/"
-  ],
-  "description": "Development version of ESPHome add-on",
-  "hassio_api": true,
-  "host_network": true,
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome (dev)",
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "esphome_fork": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome-dev",
-  "stage": "experimental",
-  "uart": true,
-  "url": "https://next.esphome.io/",
-  "version": "dev"
-}
--- a/esphome-dev/config.yaml
+++ b/esphome-dev/config.yaml
@@ -0,0 +1,42 @@
+---
+url: https://next.esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  esphome_fork: str?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome (dev)
+version: dev
+slug: esphome-dev
+description: Development version of ESPHome add-on
+stage: experimental
+advanced: true
+options:
+  home_assistant_dashboard_integration: false
--- a/esphome-dev/logo.png
+++ b/esphome-dev/logo.png
--- a/esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh
+++ b/esphome-dev/rootfs/etc/cont-init.d/30-esphome-fork.sh
@@ -25,10 +25,11 @@ if bashio::config.has_value 'esphome_fork'; then
    curl -L -o /tmp/esphome.tar.gz "${full_url}" -qq \
      || bashio::exit.nok "Failed downloading ESPHome fork."
    bashio::log.info "Installing ESPHome from fork '${esphome_fork}' (${full_url})..."
-    mkdir /esphome-fork
-    tar -zxf /tmp/esphome.tar.gz -C /esphome-fork --strip-components=1 \
+    rm -rf /esphome || bashio::exit.nok "Failed to remove ESPHome."
+    mkdir /esphome
+    tar -zxf /tmp/esphome.tar.gz -C /esphome --strip-components=1 \
      || bashio::exit.nok "Failed installing ESPHome from fork."
-    pip install -U -e /esphome-fork || bashio::exit.nok "Failed installing ESPHome from fork."
+    pip install -U -e /esphome || bashio::exit.nok "Failed installing ESPHome from fork."
    rm -f /tmp/esphome.tar.gz
    fork_version=$(python3 -c "from esphome.const import __version__; print(__version__)")

--- a/esphome-dev/translations/en.yaml
+++ b/esphome-dev/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/esphome/CHANGELOG.md
+++ b/esphome/CHANGELOG.md
@@ -1 +1,122 @@
-See https://esphome.io/changelog/index.html
+## 2023.6.0
+
+## Full list of changes
+
+### New Components
+
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+
+### Breaking Changes
+
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+
+### Beta Changes
+
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
+### All changes
+
+- Add minimum RSSI check to ble presence [esphome#4646](https://github.com/esphome/esphome/pull/4646) by [@nielsnl68](https://github.com/nielsnl68)
+- Run black over tests folder [esphome#4824](https://github.com/esphome/esphome/pull/4824) by [@jesserockz](https://github.com/jesserockz)
+- Use token so PR checks are run [esphome#4834](https://github.com/esphome/esphome/pull/4834) by [@jesserockz](https://github.com/jesserockz)
+- Fix stale bot ignoring not-stale [esphome#4836](https://github.com/esphome/esphome/pull/4836) by [@jesserockz](https://github.com/jesserockz)
+- Rework CI into multiple dependent jobs [esphome#4823](https://github.com/esphome/esphome/pull/4823) by [@jesserockz](https://github.com/jesserockz)
+- Add DNS to Text info [esphome#4821](https://github.com/esphome/esphome/pull/4821) by [@max246](https://github.com/max246)
+- allow to use MQTT for discovery of IPs if mDNS is no option  [esphome#3887](https://github.com/esphome/esphome/pull/3887) by [@Links2004](https://github.com/Links2004)
+- Move some I2C logic out of header file [esphome#4839](https://github.com/esphome/esphome/pull/4839) by [@CarsonF](https://github.com/CarsonF)
+- Allow substitutions to be valid names [esphome#4726](https://github.com/esphome/esphome/pull/4726) by [@jgoguen](https://github.com/jgoguen)
+- Insert Europe Tank Types from mopeka_std_check [esphome#4757](https://github.com/esphome/esphome/pull/4757) by [@lukasl96](https://github.com/lukasl96)
+- Bump tornado from 6.3.1 to 6.3.2 [esphome#4841](https://github.com/esphome/esphome/pull/4841) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pylint from 2.17.3 to 2.17.4 [esphome#4843](https://github.com/esphome/esphome/pull/4843) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.60.0 to 0.62.0 [esphome#4781](https://github.com/esphome/esphome/pull/4781) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pyupgrade from 3.3.2 to 3.4.0 [esphome#4842](https://github.com/esphome/esphome/pull/4842) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump platformio from 6.1.6 to 6.1.7 [esphome#4795](https://github.com/esphome/esphome/pull/4795) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Migrate e131 to use socket instead of WiFiUDP arduino library [esphome#4832](https://github.com/esphome/esphome/pull/4832) by [@jesserockz](https://github.com/jesserockz)
+- Add transparency support to all image types [esphome#4600](https://github.com/esphome/esphome/pull/4600) by [@guillempages](https://github.com/guillempages) (breaking-change)
+- Run YAML test 8 during CI and fix board used [esphome#4862](https://github.com/esphome/esphome/pull/4862) by [@kroimon](https://github.com/kroimon)
+- Rp2040 pio ledstrip [esphome#4818](https://github.com/esphome/esphome/pull/4818) by [@Papa-DMan](https://github.com/Papa-DMan) (new-integration)
+- [ILI9xxx] Update ili9xxx_init.h code for the ILI9488 display for correct white balance [esphome#4849](https://github.com/esphome/esphome/pull/4849) by [@lucasreiners](https://github.com/lucasreiners)
+- Update codeowners [esphome#4875](https://github.com/esphome/esphome/pull/4875) by [@freekode](https://github.com/freekode)
+- Fix rp2040_pio_led_strip color modes [esphome#4887](https://github.com/esphome/esphome/pull/4887) by [@jesserockz](https://github.com/jesserockz)
+- Add i2s mclk [esphome#4885](https://github.com/esphome/esphome/pull/4885) by [@rpatel3001](https://github.com/rpatel3001)
+- Allow partially looping animations [esphome#4693](https://github.com/esphome/esphome/pull/4693) by [@guillempages](https://github.com/guillempages)
+- Allow i2s microphone bits per sample to be configured [esphome#4884](https://github.com/esphome/esphome/pull/4884) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Add support for TMP1075 temperature sensor [esphome#4776](https://github.com/esphome/esphome/pull/4776) by [@sybrenstuvel](https://github.com/sybrenstuvel) (new-integration)
+- move pio tools to LED component [esphome#4903](https://github.com/esphome/esphome/pull/4903) by [@ssieb](https://github.com/ssieb)
+- add SUB_SELECT macro [esphome#4897](https://github.com/esphome/esphome/pull/4897) by [@regevbr](https://github.com/regevbr)
+- add SUB_SWITCH macro [esphome#4898](https://github.com/esphome/esphome/pull/4898) by [@regevbr](https://github.com/regevbr)
+- esp32_rmt_led_strip: fix compile with ESP-IDF >= 5 [esphome#4856](https://github.com/esphome/esphome/pull/4856) by [@stintel](https://github.com/stintel)
+- Bump aioesphomeapi from 13.7.5 to 13.9.0 [esphome#4907](https://github.com/esphome/esphome/pull/4907) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- ota: fix compile with ESP-IDF >= 5 [esphome#4857](https://github.com/esphome/esphome/pull/4857) by [@stintel](https://github.com/stintel)
+- ota: fix TWDT with ESP-IDF >= 5 [esphome#4858](https://github.com/esphome/esphome/pull/4858) by [@stintel](https://github.com/stintel)
+- light: fix compile with ESP-IDF >= 5 [esphome#4855](https://github.com/esphome/esphome/pull/4855) by [@stintel](https://github.com/stintel)
+- Continuous voice_assistant and silence detection [esphome#4892](https://github.com/esphome/esphome/pull/4892) by [@jesserockz](https://github.com/jesserockz)
+- Allow WIFI to be disabled and enabled [esphome#4810](https://github.com/esphome/esphome/pull/4810) by [@jesserockz](https://github.com/jesserockz)
+- Bump frenck/action-yamllint from 1.4.0 to 1.4.1 [esphome#4876](https://github.com/esphome/esphome/pull/4876) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump pytest-cov from 4.0.0 to 4.1.0 [esphome#4888](https://github.com/esphome/esphome/pull/4888) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump zeroconf from 0.62.0 to 0.63.0 [esphome#4890](https://github.com/esphome/esphome/pull/4890) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bump esptool from 4.5.1 to 4.6 [esphome#4906](https://github.com/esphome/esphome/pull/4906) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- prometheus: fix compilation with EntityBase [esphome#4895](https://github.com/esphome/esphome/pull/4895) by [@mischief](https://github.com/mischief)
+- Support for Adafruit ESP32-S2 TFT Feather [esphome#4912](https://github.com/esphome/esphome/pull/4912) by [@PlainTechEnthusiast](https://github.com/PlainTechEnthusiast)
+- Add support for mdi images [esphome#4654](https://github.com/esphome/esphome/pull/4654) by [@guillempages](https://github.com/guillempages)
+- Increase SNTP setup priority [esphome#4917](https://github.com/esphome/esphome/pull/4917) by [@droscy](https://github.com/droscy)
+- Bump aioesphomeapi from 13.9.0 to 14.0.0 [esphome#4925](https://github.com/esphome/esphome/pull/4925) by [@dependabot[bot]](https://github.com/apps/dependabot)
+- Bluetooth Proxy: Raw bundled advertisements [esphome#4924](https://github.com/esphome/esphome/pull/4924) by [@jesserockz](https://github.com/jesserockz)
+- Move ESPTime into core esphome namespace [esphome#4926](https://github.com/esphome/esphome/pull/4926) by [@jesserockz](https://github.com/jesserockz) (breaking-change)
+- Allow multiple MAC addresses for 'on_ble_advertise' filter [esphome#4773](https://github.com/esphome/esphome/pull/4773) by [@RoboMagus](https://github.com/RoboMagus)
+- Add SVG image support [esphome#4922](https://github.com/esphome/esphome/pull/4922) by [@guillempages](https://github.com/guillempages)
+- Add !extend to devcontainer's customTags [esphome#4749](https://github.com/esphome/esphome/pull/4749) by [@jimtng](https://github.com/jimtng)
+- [max7219digit] fix 270° rotation [esphome#4930](https://github.com/esphome/esphome/pull/4930) by [@spezifisch](https://github.com/spezifisch)
+- proto generation updates [esphome#4653](https://github.com/esphome/esphome/pull/4653) by [@jesserockz](https://github.com/jesserockz)
+- I2S media player allow setting communication format for external DACs [esphome#4918](https://github.com/esphome/esphome/pull/4918) by [@ccorderor](https://github.com/ccorderor)
+- Add MULTI_CONF to pn53_i2c [esphome#4938](https://github.com/esphome/esphome/pull/4938) by [@jesserockz](https://github.com/jesserockz)
+- display: Improve Image rendering by removing usage of virtual functions [esphome#4931](https://github.com/esphome/esphome/pull/4931) by [@ayufan](https://github.com/ayufan)
+- display: add `BaseImage` and provide only `Image::get_pixel` method [esphome#4932](https://github.com/esphome/esphome/pull/4932) by [@ayufan](https://github.com/ayufan) (breaking-change)
+- Add Alarm Control Panel [esphome#4770](https://github.com/esphome/esphome/pull/4770) by [@grahambrown11](https://github.com/grahambrown11) (new-integration)
+- Add support in vbus component for Deltasol BS 2009 [esphome#4943](https://github.com/esphome/esphome/pull/4943) by [@clydebarrow](https://github.com/clydebarrow)
+- fix vbus sensor offsets [esphome#4952](https://github.com/esphome/esphome/pull/4952) by [@ssieb](https://github.com/ssieb)
+- Add support for ESP32-S3-BOX-Lite displays [esphome#4941](https://github.com/esphome/esphome/pull/4941) by [@guillempages](https://github.com/guillempages)
+- Split display_buffer sub-components into own files [esphome#4950](https://github.com/esphome/esphome/pull/4950) by [@guillempages](https://github.com/guillempages)
+- Add support for S3 box display [esphome#4942](https://github.com/esphome/esphome/pull/4942) by [@guillempages](https://github.com/guillempages)
+- display: allow to align image with `ImageAlign` [esphome#4933](https://github.com/esphome/esphome/pull/4933) by [@ayufan](https://github.com/ayufan)
+- Use HW SPI for rp2040 [esphome#4955](https://github.com/esphome/esphome/pull/4955) by [@jesserockz](https://github.com/jesserockz)
+- Fix for Fujitsu AC not having Quiet Fan Mode [esphome#4962](https://github.com/esphome/esphome/pull/4962) by [@TaruDesigns](https://github.com/TaruDesigns)
+- Store app comment and compilation_time in flash [esphome#4945](https://github.com/esphome/esphome/pull/4945) by [@bdraco](https://github.com/bdraco)
+- Construct web_server assets at build time instead of run time [esphome#4944](https://github.com/esphome/esphome/pull/4944) by [@bdraco](https://github.com/bdraco)
+- Update pca9685_output.cpp [esphome#4929](https://github.com/esphome/esphome/pull/4929) by [@standahabich](https://github.com/standahabich)
+- Apply configured IIR filter setting in generated BMP280 code [esphome#4975](https://github.com/esphome/esphome/pull/4975) by [@murrayma](https://github.com/murrayma)
+- airthings_wave: refactor to eliminate code duplication [esphome#4910](https://github.com/esphome/esphome/pull/4910) by [@kpfleming](https://github.com/kpfleming) (new-integration)
+- Make growatt play nicer with other modbus components. [esphome#4947](https://github.com/esphome/esphome/pull/4947) by [@onnlucky](https://github.com/onnlucky)
+- Bump esphome-dashboard to 20230621.0 [esphome#4980](https://github.com/esphome/esphome/pull/4980) by [@jesserockz](https://github.com/jesserockz)
+- Fix pypi release [esphome#4983](https://github.com/esphome/esphome/pull/4983) by [@jesserockz](https://github.com/jesserockz)
+- Add configuration option to disable the log UI. [esphome#4419](https://github.com/esphome/esphome/pull/4419) by [@dd32](https://github.com/dd32)
+- Update webserver and captive portal pages to 67c48ee9 [esphome#4986](https://github.com/esphome/esphome/pull/4986) by [@jesserockz](https://github.com/jesserockz)
+- Migrate VOC sensors that use ppb to use volatile_organic_compounds_parts device class [esphome#4982](https://github.com/esphome/esphome/pull/4982) by [@bdraco](https://github.com/bdraco) (breaking-change)
+- dashboard: Adds "compressed=1" to /download.bin endpoint. (...) [esphome#4966](https://github.com/esphome/esphome/pull/4966) by [@fdcastel](https://github.com/fdcastel)
+
--- a/esphome/DOCS.md
+++ b/esphome/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
--- a/esphome/README.md
+++ b/esphome/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/
--- a/esphome/config.json
+++ b/esphome/config.json
@@ -1,42 +0,0 @@
-{
-  "arch": [
-    "amd64",
-    "armv7",
-    "aarch64"
-  ],
-  "auth_api": true,
-  "backup_exclude": [
-    "*/*/"
-  ],
-  "description": "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices",
-  "hassio_api": true,
-  "host_network": true,
-  "image": "ghcr.io/esphome/esphome-hassio-{arch}",
-  "ingress": true,
-  "ingress_port": 0,
-  "map": [
-    "ssl:ro",
-    "config:rw"
-  ],
-  "name": "ESPHome",
-  "panel_icon": "mdi:chip",
-  "ports": {
-    "6052/tcp": null
-  },
-  "ports_description": {
-    "6052/tcp": "Web interface (not required for Home Assistant ingress)"
-  },
-  "schema": {
-    "certfile": "str?",
-    "keyfile": "str?",
-    "leave_front_door_open": "bool?",
-    "relative_url": "str?",
-    "ssl": "bool?",
-    "status_use_ping": "bool?",
-    "streamer_mode": "bool?"
-  },
-  "slug": "esphome",
-  "uart": true,
-  "url": "https://esphome.io/",
-  "version": "2022.2.1"
-}
--- a/esphome/config.yaml
+++ b/esphome/config.yaml
@@ -0,0 +1,38 @@
+---
+url: https://esphome.io/
+arch:
+- amd64
+- armv7
+- aarch64
+hassio_api: true
+auth_api: true
+host_network: true
+ingress: true
+ingress_port: 0
+panel_icon: mdi:chip
+uart: true
+ports:
+  6052/tcp: null
+map:
+- ssl:ro
+- config:rw
+discovery:
+- esphome
+schema:
+  status_use_ping: bool?
+  streamer_mode: bool?
+  home_assistant_dashboard_integration: bool?
+  default_compile_process_limit: int(1,)?
+  ssl: bool?
+  certfile: str?
+  keyfile: str?
+  relative_url: str?
+  leave_front_door_open: bool?
+backup_exclude:
+- '*/*/'
+init: false
+name: ESPHome
+version: 2023.6.0
+slug: esphome
+description: ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices
+image: ghcr.io/esphome/esphome-hassio
--- a/esphome/images/dht-example.png
+++ b/esphome/images/dht-example.png
--- a/esphome/images/screenshot.png
+++ b/esphome/images/screenshot.png
--- a/esphome/images/temperature-humidity.png
+++ b/esphome/images/temperature-humidity.png
--- a/esphome/logo.png
+++ b/esphome/logo.png
--- a/esphome/translations/en.yaml
+++ b/esphome/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
--- a/script/generate.py
+++ b/script/generate.py
@@ -4,9 +4,9 @@ import argparse
 import yaml
 from pathlib import Path
 from enum import Enum
-import json
 from shutil import copyfile
 import sys
+import os


 class Channel(Enum):
@@ -34,11 +34,12 @@ def main(args):
        conf = config[f"esphome-{channel.value}"]
        base_image = conf.pop("base_image", None)
        dir_ = root / conf.pop("directory")
-        path = dir_ / "config.json"
+        path = dir_ / "config.yaml"
        with open(path, "w") as f:
-            json.dump(conf, f, indent=2, sort_keys=True)
+            yaml.dump(conf, f, indent=2, sort_keys=False, explicit_start=True)

-        for file_, conf_ in copyf.items():
+        for file_ in copyf:
+            os.makedirs(dir_ / Path(file_).parent, exist_ok=True)
            if Path.exists(templ / channel.value / file_):
                copyfile(templ / channel.value / file_, dir_ / file_)
            else:
@@ -49,16 +50,14 @@ def main(args):
            f.write("Any edits should be made to the files in the 'template' directory")

        if channel == Channel.dev:
-            path = dir_ / "build.json"
+            path = dir_ / "build.yaml"
            build_conf = {
                "build_from": {
-                    arch: base_image.format(arch=arch) for arch in conf["arch"]
+                    arch: base_image for arch in conf["arch"]
                }
            }
            with open(path, "w") as f:
-                json.dump(build_conf, f, indent=2, sort_keys=True)
-
-        print(f"Wrote {path}")
+                yaml.dump(build_conf, f, indent=2, sort_keys=True, explicit_start=True)


 if __name__ == "__main__":
--- a/script/requirements.txt
+++ b/script/requirements.txt
@@ -1 +1 @@
-PyYAML==5.4
+PyYAML==6.0
--- a/template/CHANGELOG.md
+++ b/template/CHANGELOG.md
@@ -1 +0,0 @@
-See https://esphome.io/changelog/index.html
--- a/template/DOCS.md
+++ b/template/DOCS.md
@@ -1,5 +1,4 @@
-# Home Assistant Community Add-on: ESPHome
-
+# ESPHome Add-on
 ## Installation

 The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
--- a/template/README.md
+++ b/template/README.md
@@ -1,9 +1,8 @@
-# ESPHome Home Assistant Add-On
+# ESPHome Add-On

-[![ESPHome logo](https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/logo.png)](https://esphome.io/)
+[![ESPHome logo][logo]][website]

-[![GitHub stars](https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000)](https://github.com/esphome/esphome)
-[![GitHub Release][releases-shield]][releases]
+[![GitHub stars][github-stars-shield]][repository]
 [![Discord][discord-shield]][discord]

 ## About
@@ -14,10 +13,10 @@ is write YAML configuration files; the rest (over-the-air updates, compiling) is
 handled by ESPHome.

 <p align="center">
-<img title="ESPHome dashboard screenshot" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/screenshot.png" width="700px"></img>
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/screenshot.png" width="700px"></img>
 </p>

-[View the ESPHome documentation](https://esphome.io/)
+[View the ESPHome documentation][website]

 ## Example

@@ -26,15 +25,17 @@ firmware. For example, to include a [DHT22][dht22].
 temperature and humidity sensor, you just need to include 8 lines of YAML
 in your configuration file:

-<img title="ESPHome DHT configuration example" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/dht-example.png" width="500px"></img>
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/dht-example.png" width="500px"></img>

 Then just click UPLOAD and the sensor will magically appear in Home Assistant:

-<img title="ESPHome Home Assistant MQTT discovery" src="https://raw.githubusercontent.com/esphome/hassio/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome/images/temperature-humidity.png" width="600px"></img>

-[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
-[dht22]: https://esphome.io/components/sensor/dht.html
 [discord]: https://discord.gg/KhAMKrd
-[releases-shield]: https://img.shields.io/github/release/esphome/esphome.svg
-[releases]: https://esphome.io/changelog/index.html
 [repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://esphome.io/components/sensor/dht.html
+[releases]: https://esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome/logo.png
+[website]: https://esphome.io/
--- a/template/addon_config.yaml
+++ b/template/addon_config.yaml
@@ -21,21 +21,25 @@ base: &base
  uart: true
  ports:
    '6052/tcp': null
-  ports_description:
-    '6052/tcp': "Web interface (not required for Home Assistant ingress)"
  map:
    - ssl:ro
    - config:rw
+  discovery:
+    - esphome
  schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
    ssl: bool?
    certfile: str?
    keyfile: str?
-    leave_front_door_open: bool?
-    streamer_mode: bool?
    relative_url: str?
-    status_use_ping: bool?
+    leave_front_door_open: bool?
  backup_exclude:
    - "*/*/"
+  # Disable docker init for s6
+  init: false

 esphome-dev:
  <<: *base
@@ -48,40 +52,49 @@ esphome-dev:
  stage: experimental
  advanced: true
  schema:
+    status_use_ping: bool?
+    streamer_mode: bool?
+    home_assistant_dashboard_integration: bool?
+    default_compile_process_limit: int(1,)?
+    esphome_fork: str?
    ssl: bool?
    certfile: str?
    keyfile: str?
-    leave_front_door_open: bool?
-    streamer_mode: bool?
    relative_url: str?
-    status_use_ping: bool?
-    esphome_fork: str?
-  base_image: ghcr.io/esphome/esphome-hassio-{arch}:dev
+    leave_front_door_open: bool?
+  base_image: ghcr.io/esphome/esphome-hassio:dev
+  options:
+      home_assistant_dashboard_integration: false

 esphome-beta:
  <<: *base
  directory: esphome-beta
  name: ESPHome (beta)
-  version: '2022.2.1'  # BETA
+  version: '2023.6.0'  # BETA
  slug: esphome-beta
  description: "Beta version of ESPHome add-on"
  url: https://beta.esphome.io/
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio
  stage: experimental
  advanced: true
+  options:
+      home_assistant_dashboard_integration: false

 esphome-stable:
  <<: *base
  directory: esphome
  name: ESPHome
-  version: '2022.2.1'  # STABLE
+  version: '2023.6.0'  # STABLE
  slug: esphome
  description: "ESPHome add-on for intelligently managing all your ESP8266/ESP32 devices"
-  image: ghcr.io/esphome/esphome-hassio-{arch}
+  image: ghcr.io/esphome/esphome-hassio

 copy_files:
-  icon.png:
-  logo.png:
-  README.md:
-  DOCS.md:
-  CHANGELOG.md:
+  - DOCS.md
+  - icon.png
+  - logo.png
+  - README.md
+  - translations/en.yaml
+  - images/dht-example.png
+  - images/screenshot.png
+  - images/temperature-humidity.png
--- a/template/beta/README.md
+++ b/template/beta/README.md
@@ -0,0 +1,41 @@
+# ESPHome Beta Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://beta.esphome.io/components/sensor/dht.html
+[releases]: https://beta.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-beta/logo.png
+[website]: https://beta.esphome.io/
--- a/template/dev/DOCS.md
+++ b/template/dev/DOCS.md
@@ -1,40 +1,31 @@
-# Home Assistant Community Add-on: ESPHome
+# ESPHome DEV add on

-## Installation
+This is **development** version of the ESPHome add on.

-The installation of this add-on is pretty straightforward and not different in comparison to installing any other Home Assistant add-on.
+To deploy production nodes please use mainstream release add on.

-1. Search for the “ESPHome” add-on in the Supervisor add-on store.
-2. Press install to download the add-on and unpack it on your machine. This can take some time.
-3. Optional: If you're using SSL/TLS certificates and want to encrypt your communication to this add-on, please enter `true` into the `ssl` field and set the `fullchain` and `certfile` options accordingly.
-4. Start the add-on, check the logs of the add-on to see if everything went well.
-5. Click "OPEN WEB UI" to open the ESPHome dashboard. You will be asked for your Home Assistant credentials - ESPHome uses Home Assistant's authentication system to log you in.
-
-You can view the ESPHome documentation at https://esphome.io/
+The add on uses a version of ESPHome built automatically every day at 02:00 UTC. and is used to test components in development. See the `esphome_fork` configuration below to properly configure the add on. Once you update the configuration make sure to rebuild the image.

 ## Configuration

 **Note**: _Remember to restart the add-on when the configuration is changed._

-Example add-on configuration:
-
-```json
-{
-  "ssl": false,
-  "certfile": "fullchain.pem",
-  "keyfile": "privkey.pem"
-}
-```
-
 ### Option: `esphome_fork`

 Install ESPHome from a fork or branch.
 For example to test a pull request, use `pull/XXXX/head` where `XXXX` is the PR number,
 or you can specify the username of the fork owner and branch `username:branch` which
-assumes the repository is named `esphome` still. 
+assumes the repository is named `esphome` still.
+
+If you need to test the latest commit on dev branch before the image is updated you can enter `dev` here.

 Please note that the fork or branch you are using **must** be up to date with ESPHome dev
-or the add-on **will not start**. 
+or the add-on **will not start**.
+
+
+## General ESPHome add on configurations
+
+General options also available in other versions.

 ### Option: `ssl`

--- a/template/dev/README.md
+++ b/template/dev/README.md
@@ -0,0 +1,41 @@
+# ESPHome Dev Add-On
+
+[![ESPHome logo][logo]][website]
+
+[![GitHub stars][github-stars-shield]][repository]
+[![Discord][discord-shield]][discord]
+
+## About
+
+This add-on allows you to manage and program your ESP8266 and ESP32 based microcontrollers
+directly through Home Assistant **with no programming experience required**. All you need to do
+is write YAML configuration files; the rest (over-the-air updates, compiling) is all
+handled by ESPHome.
+
+<p align="center">
+<img title="ESPHome dashboard screenshot" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/screenshot.png" width="700px"></img>
+</p>
+
+[View the ESPHome documentation][website]
+
+## Example
+
+With ESPHome, you can go from a few lines of YAML straight to a custom-made
+firmware. For example, to include a [DHT22][dht22].
+temperature and humidity sensor, you just need to include 8 lines of YAML
+in your configuration file:
+
+<img title="ESPHome DHT configuration example" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/dht-example.png" width="500px"></img>
+
+Then just click UPLOAD and the sensor will magically appear in Home Assistant:
+
+<img title="ESPHome Home Assistant discovery" src="https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/images/temperature-humidity.png" width="600px"></img>
+
+[discord]: https://discord.gg/KhAMKrd
+[repository]: https://github.com/esphome/esphome
+[discord-shield]: https://img.shields.io/discord/429907082951524364.svg
+[github-stars-shield]: https://img.shields.io/github/stars/esphome/esphome.svg?style=social&label=Star&maxAge=2592000
+[dht22]: https://next.esphome.io/components/sensor/dht.html
+[releases]: https://next.esphome.io/changelog/index.html
+[logo]: https://github.com/esphome/home-assistant-addon/raw/main/esphome-dev/logo.png
+[website]: https://next.esphome.io/
--- a/template/images/dht-example.png
+++ b/template/images/dht-example.png
--- a/template/images/screenshot.png
+++ b/template/images/screenshot.png
--- a/template/images/temperature-humidity.png
+++ b/template/images/temperature-humidity.png
--- a/template/logo.png
+++ b/template/logo.png
--- a/template/translations/en.yaml
+++ b/template/translations/en.yaml
@@ -0,0 +1,67 @@
+---
+configuration:
+  certfile:
+    name: Certificate file
+    description: >-
+      The certificate file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  default_compile_process_limit:
+    name: Default compile process limit
+    description: >-
+      The default compile process limit. This is the maximum number of
+      simultaneous compile processes that ESPHome will run.
+  esphome_fork:
+    name: Install ESPHome from a fork or branch
+    description: >-
+      For example to test a pull request, use `pull/XXXX/head` where `XXXX` is
+      the PR number, or you can specify the username of the fork owner and
+      branch `username:branch` which assumes the repository is named `esphome`
+      still.
+
+      If you need to test the latest commit on dev branch before the image is
+      updated you can enter `dev` here.
+
+      Please note that the fork or branch you are using **must** be up to
+      date with ESPHome dev or the add-on **will not start**.
+  home_assistant_dashboard_integration:
+    name: Home Assistant Dashboard Integration
+    description: >-
+      Enables/Disables the ESPHome dashboard integrating with Home Assistant
+      for automatic configuration of devices and device updates. If you use
+      multiple version of the ESPHome add-on, make sure it is enabled on a
+      single add-on only.
+  keyfile:
+    name: Private key file
+    description: >-
+      The private key file to use for SSL. Note that this file must
+      exist in the /ssl/ folder.
+  leave_front_door_open:
+    name: Disable external authentication
+    description: >-
+      Disables external authentication when having opened the add-on
+      on an external port. **WARNING**: This is a security risk!
+  relative_url:
+    name: Relative URL
+    description: >-
+      Host the ESPHome dashboard under a relative URL, so that it can be
+      integrated into existing web proxies like NGINX under a relative URL.
+      Defaults to `/`.
+  ssl:
+    name: SSL
+    description: >-
+      Enables/Disables SSL (HTTPS) on the web interface.
+  status_use_ping:
+    name: Use ping for status
+    description: >-
+      By default the dashboard uses mDNS to check if nodes are online. This does
+      not work across subnets unless your router supports mDNS forwarding
+      or avahi. Enabling this option will use ICMP ping to check if nodes are
+      online.
+  streamer_mode:
+    name: Streamer mode
+    description: >-
+      Enables/Disables streamer mode, which makes ESPHome hide all
+      potentially private information. So for example WiFi (B)SSIDs (which could
+      be used to find your location), usernames, etc.
+network:
+  6052/tcp: Web interface (to use without Home Assistant)
				`@@ -1 +0,0 @@`
				`See https://esphome.io/changelog/index.html`