chore(dev): release 1.35.3 (#21139)

Co-authored-by: Koenkk <2892853+Koenkk@users.noreply.github.com>

.github/ISSUE_TEMPLATE/config.yml

@@ -2,7 +2,7 @@ blank_issues_enabled: false
 contact_links:
   - name: "IMPORTANT: Check development branch changelog first!!"
     url: https://gist.github.com/Koenkk/bfd4c3d1725a2cccacc11d6ba51008ba
-    about: "Before submitting an issue, check if the issue hasn't already been solved in the development branch. Click 'Open' to see the release notes of the development branch. In case it is, you can read here how to switch to the development branch: https://www.zigbee2mqtt.io/advanced/more/switch-to-dev-branch.html"
+    about: "Before submitting an issue, check that the issue hasn't already been solved in the development branch. Click 'Open' to see the release notes of the development branch. In case it is, you can read here how to switch to the development branch: https://www.zigbee2mqtt.io/advanced/more/switch-to-dev-branch.html"
   - name: Questions/discussion
     url: https://github.com/Koenkk/zigbee2mqtt/discussions/new
     about: Ask questions, discuss about devices or show things you made

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -7,12 +7,12 @@ body:
     attributes:
       value: |
         **IMPORTANT:** Before submitting:
-        - Is your feature request related to the fronted? Then click [here](https://github.com/nurikk/zigbee2mqtt-frontend/issues/new?assignees=&labels=&template=feature_request.md&title=)
+        - Is your feature request related to the frontend? Then click [here](https://github.com/nurikk/zigbee2mqtt-frontend/issues/new?assignees=&labels=&template=feature_request.md&title=)
   - type: textarea
     id: textarea1
     attributes:
       label: Is your feature request related to a problem? Please describe
-      placeholder: A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+      placeholder: A clear and concise description of what the problem is. Eg. I'm always frustrated when [...]
     validations:
       required: true
   - type: textarea

.github/ISSUE_TEMPLATE/new_device_support.yaml

@@ -36,7 +36,7 @@ body:
       required: true
   - type: textarea
     attributes:
-      label: External defintion
+      label: External definition
       description: See [Creating the external definition](https://www.zigbee2mqtt.io/advanced/support-new-devices/01_support_new_devices.html#_2-creating-the-external-definition)
       render: shell
     validations:

.github/ISSUE_TEMPLATE/problem_report.yaml

@@ -11,7 +11,7 @@ body:
         - Make sure the bug also occurs in the [dev branch](https://www.zigbee2mqtt.io/advanced/more/switch-to-dev-branch.html)
         - Make sure you are using the [latest firmware](https://www.zigbee2mqtt.io/guide/adapters/#recommended) on your adapter
         - The issue has not been [reported already](https://github.com/Koenkk/zigbee2mqtt/issues)
-        - Is your issue related to the fronted? Then click [here](https://github.com/nurikk/zigbee2mqtt-frontend/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+)
+        - Is your issue related to the frontend? Then click [here](https://github.com/nurikk/zigbee2mqtt-frontend/issues/new?assignees=&labels=bug%2Ctriage&template=bug_report.yaml&title=%5BBug%5D%3A+)
         - If you are using the Home Assistant addon and are still on 1.18.1, check the first point of [this](https://github.com/Koenkk/zigbee2mqtt/releases/tag/1.19.0)
   - type: textarea
     id: what_happend
@@ -30,7 +30,7 @@ body:
     id: reproduce
     attributes:
       label: How to reproduce it (minimal and precise)
-      placeholder: First do this, than this..
+      placeholder: First do this, then this..
     validations:
       required: false
   - type: input

.github/workflows/ci.yml

@@ -96,9 +96,10 @@ jobs:
         TAG=${GITHUB_REF#refs/*/}
         git config --local user.email "41898282+github-actions[bot]@users.noreply.github.com"
         git config --local user.name "github-actions[bot]"
+        git fetch --unshallow
         git fetch origin
         git checkout master
-        git merge -m 'chore: merge dev to master' origin/dev
+        git merge --ff-only origin/dev
         git push origin master
         git checkout dev
         jq ".version = \"$TAG-dev\"" package.json > package.json.tmp

.release-please-manifest.json

@@ -1,3 +1,3 @@
 {
-  ".": "1.35.2"
+  ".": "1.35.3"
 }

CHANGELOG.md

@@ -1,5 +1,25 @@
 # Changelog
 
+## [1.35.3](https://github.com/Koenkk/zigbee2mqtt/compare/1.35.2...1.35.3) (2024-02-06)
+
+
+### Bug Fixes
+
+* **ignore:** set zhc logger ([f83709d](https://github.com/Koenkk/zigbee2mqtt/commit/f83709d96c4a98b2c5f34a2e06fe2ea26f9cb9d5))
+* **ignore:** update dependencies ([#21204](https://github.com/Koenkk/zigbee2mqtt/issues/21204)) ([1df54f0](https://github.com/Koenkk/zigbee2mqtt/commit/1df54f071f301240f4a7efeb8db87a9a66babf44))
+* **ignore:** update zigbee-herdsman to 0.33.7 ([#21178](https://github.com/Koenkk/zigbee2mqtt/issues/21178)) ([3d1336d](https://github.com/Koenkk/zigbee2mqtt/commit/3d1336dc6cb3f73810f4ed467df443e46cca23e0))
+* **ignore:** update zigbee-herdsman-converters to 18.26.0 ([#21145](https://github.com/Koenkk/zigbee2mqtt/issues/21145)) ([08c03e4](https://github.com/Koenkk/zigbee2mqtt/commit/08c03e48cc47b344c3f5664147afd3c4fe8c1802))
+* **ignore:** update zigbee-herdsman-converters to 18.27.0 ([#21184](https://github.com/Koenkk/zigbee2mqtt/issues/21184)) ([a678a1c](https://github.com/Koenkk/zigbee2mqtt/commit/a678a1c652a1a77fe80245d5944945ab7c75352b))
+* **ignore:** update zigbee-herdsman-converters to 18.27.1 ([#21189](https://github.com/Koenkk/zigbee2mqtt/issues/21189)) ([4b17217](https://github.com/Koenkk/zigbee2mqtt/commit/4b1721721b1580115ff952a2f49cd0c4e0dabafb))
+* **ignore:** update zigbee-herdsman-converters to 18.28.0 ([#21207](https://github.com/Koenkk/zigbee2mqtt/issues/21207)) ([3d37892](https://github.com/Koenkk/zigbee2mqtt/commit/3d3789229692eb522ef3f4b5d920f90336cf2be9))
+* **ignore:** update zigbee-herdsman-converters to 18.28.1 ([#21222](https://github.com/Koenkk/zigbee2mqtt/issues/21222)) ([a6d51a6](https://github.com/Koenkk/zigbee2mqtt/commit/a6d51a60a8b338f1245a17d228212364a6bf235c))
+* **ignore:** update zigbee-herdsman-converters to 18.28.2 ([#21245](https://github.com/Koenkk/zigbee2mqtt/issues/21245)) ([250d5bf](https://github.com/Koenkk/zigbee2mqtt/commit/250d5bfc24c146e6055db7f069770af02fccca7c))
+* **ignore:** update zigbee-herdsman-converters to 18.28.3 ([#21265](https://github.com/Koenkk/zigbee2mqtt/issues/21265)) ([29bae3a](https://github.com/Koenkk/zigbee2mqtt/commit/29bae3a73421c18c8437d21d727d70f10e08a1e9))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.153 ([#21187](https://github.com/Koenkk/zigbee2mqtt/issues/21187)) ([7295955](https://github.com/Koenkk/zigbee2mqtt/commit/7295955397dd829a15de08081c08ed236dee2c21))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.154 ([#21188](https://github.com/Koenkk/zigbee2mqtt/issues/21188)) ([2db0723](https://github.com/Koenkk/zigbee2mqtt/commit/2db07236dbc3b8ed2817209c72fd7103efb5fba7))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.155 ([#21228](https://github.com/Koenkk/zigbee2mqtt/issues/21228)) ([8ab6c16](https://github.com/Koenkk/zigbee2mqtt/commit/8ab6c16f6ecbf8dde9a208ea51f48603f5e21b68))
+* **ignore:** update zigbee2mqtt-frontend to 0.6.156 ([#21229](https://github.com/Koenkk/zigbee2mqtt/issues/21229)) ([dfda631](https://github.com/Koenkk/zigbee2mqtt/commit/dfda63138ff4e0c6a0b28503d3e9c9482991b8b8))
+
 ## [1.35.2](https://github.com/Koenkk/zigbee2mqtt/compare/1.35.1...1.35.2) (2024-01-31)
 
 

lib/controller.ts

@@ -8,6 +8,7 @@ import utils from './util/utils';
 import stringify from 'json-stable-stringify-without-jsonify';
 import assert from 'assert';
 import bind from 'bind-decorator';
+import * as zhc from 'zigbee-herdsman-converters';
 
 // Extensions
 import ExtensionFrontend from './extension/frontend';
@@ -91,6 +92,8 @@ export class Controller {
             /* istanbul ignore next */
             settings.get().advanced.soft_reset_timeout !== 0 && new ExtensionSoftReset(...this.extensionArgs),
         ].filter((n) => n);
+
+        zhc.setLogger(logger);
     }
 
     async start(): Promise<void> {

lib/extension/bridge.ts

@@ -536,7 +536,7 @@ export default class Bridge extends Extension {
                 }
 
                 if (force) {
-                    await entity.zh.removeFromDatabase();
+                    entity.zh.removeFromDatabase();
                 } else {
                     await entity.zh.removeFromNetwork();
                 }

lib/extension/legacy/bridgeLegacy.ts

@@ -320,7 +320,7 @@ export default class BridgeLegacy extends Extension {
         try {
             logger.info(`${lookup[action][1]} '${entity.name}'`);
             if (action === 'force_remove') {
-                await entity.zh.removeFromDatabase();
+                entity.zh.removeFromDatabase();
             } else {
                 await entity.zh.removeFromNetwork();
             }

package.json

@@ -1,6 +1,6 @@
 {
   "name": "zigbee2mqtt",
-  "version": "1.35.2",
+  "version": "1.35.3",
   "description": "Zigbee to MQTT bridge using Zigbee-herdsman",
   "main": "index.js",
   "repository": {
@@ -49,7 +49,7 @@
     "jszip": "^3.10.1",
     "mkdir-recursive": "^0.4.0",
     "moment": "^2.30.1",
-    "mqtt": "^5.3.4",
+    "mqtt": "^5.3.5",
     "object-assign-deep": "^0.4.0",
     "rimraf": "^5.0.5",
     "semver": "^7.5.4",
@@ -57,33 +57,32 @@
     "uri-js": "^4.4.1",
     "winston": "^3.11.0",
     "winston-syslog": "^2.7.0",
-    "winston-transport": "^4.6.0",
+    "winston-transport": "^4.7.0",
     "ws": "^8.16.0",
-    "zigbee-herdsman": "0.33.5",
-    "zigbee-herdsman-converters": "18.25.1",
-    "zigbee2mqtt-frontend": "0.6.152"
+    "zigbee-herdsman": "0.33.8",
+    "zigbee-herdsman-converters": "18.28.3",
+    "zigbee2mqtt-frontend": "0.6.156"
   },
   "devDependencies": {
-    "@babel/core": "^7.23.7",
-    "@babel/plugin-proposal-decorators": "^7.23.7",
-    "@babel/preset-env": "^7.23.7",
+    "@babel/core": "^7.23.9",
+    "@babel/plugin-proposal-decorators": "^7.23.9",
+    "@babel/preset-env": "^7.23.9",
     "@babel/preset-typescript": "^7.23.3",
     "@types/debounce": "^1.2.4",
     "@types/finalhandler": "^1.2.3",
-    "@types/humanize-duration": "^3.27.3",
-    "@types/jest": "^29.5.11",
+    "@types/humanize-duration": "^3.27.4",
+    "@types/jest": "^29.5.12",
     "@types/js-yaml": "^4.0.9",
-    "@types/node": "^20.10.6",
+    "@types/node": "^20.11.16",
     "@types/object-assign-deep": "^0.4.3",
     "@types/readable-stream": "4.0.10",
-    "@types/rimraf": "^3.0.2",
     "@types/ws": "8.5.10",
-    "@typescript-eslint/eslint-plugin": "^6.16.0",
-    "@typescript-eslint/parser": "^6.16.0",
+    "@typescript-eslint/eslint-plugin": "^6.20.0",
+    "@typescript-eslint/parser": "^6.20.0",
     "babel-jest": "^29.7.0",
     "eslint": "^8.56.0",
     "eslint-config-google": "^0.14.0",
-    "eslint-plugin-jest": "^27.6.0",
+    "eslint-plugin-jest": "^27.6.3",
     "jest": "^29.7.0",
     "tmp": "^0.2.1",
     "typescript": "^5.3.3"

scripts/generateChangelog.js

@@ -100,7 +100,7 @@ for (const changelog of changelogs) {
         } else if (line === '# Changelog' || line === '### ⚠ BREAKING CHANGES' || !line) {
             continue;
         } else {
-            throw new Error(`Unmatched line: ${line}`);
+            changes['error'].push(`- Unmatched line: ${line}`);
         }
     }
 }