diff --git a/.github/auto-merge.yml b/.github/auto-merge.yml new file mode 100644 index 0000000..3f5fbe3 --- /dev/null +++ b/.github/auto-merge.yml @@ -0,0 +1,17 @@ +# Configure here which dependency updates should be merged automatically. +# The recommended configuration is the following: +- match: + # Only merge patches for production dependencies + dependency_type: production + update_type: "semver:patch" +- match: + # Except for security fixes, here we allow minor patches + dependency_type: production + update_type: "security:minor" +- match: + # and development dependencies can have a minor update, too + dependency_type: development + update_type: "semver:minor" + +# The syntax is based on the legacy dependabot v1 automerged_updates syntax, see: +# https://dependabot.com/docs/config-file/#automerged_updates \ No newline at end of file diff --git a/.github/dependabot.yml b/.github/dependabot.yml new file mode 100644 index 0000000..c20ed4a --- /dev/null +++ b/.github/dependabot.yml @@ -0,0 +1,16 @@ +version: 2 +updates: + - package-ecosystem: github-actions + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + - package-ecosystem: npm + directory: "/" + schedule: + interval: monthly + time: "04:00" + timezone: Europe/Berlin + open-pull-requests-limit: 20 + versioning-strategy: increase \ No newline at end of file diff --git a/.github/workflows/dependabot-automerge.yml b/.github/workflows/dependabot-automerge.yml new file mode 100644 index 0000000..310f4a0 --- /dev/null +++ b/.github/workflows/dependabot-automerge.yml @@ -0,0 +1,22 @@ +# Automatically merge Dependabot PRs when version comparison is within the range +# that is configured in .github/auto-merge.yml + +name: Auto-Merge Dependabot PRs + +on: + pull_request_target: + +jobs: + auto-merge: + runs-on: ubuntu-latest + steps: + - name: Checkout code + uses: actions/checkout@v2 + + - name: Check if PR should be auto-merged + uses: ahmadnassri/action-dependabot-auto-merge@v2 + with: + # This must be a personal access token with push access + github-token: ${{ secrets.AUTO_MERGE_TOKEN }} + # By default, squash and merge, so Github chooses nice commit messages + command: squash and merge \ No newline at end of file diff --git a/README.md b/README.md index 051d777..6fc4a85 100644 --- a/README.md +++ b/README.md @@ -25,7 +25,9 @@ Please check it https://www.smarthomejetzt.de/mit-iobroker-auf-eine-home-assista ## Changelog ### __WORK IN PROGRESS__ +* IMPORTANT: js-controller 2.0 is needed st least! * (Apollon77) Fix start issue +* (Apollon77/Garfonso) Fix issue where value could not be set in hass ### 1.0.0 (2020-12-13) * (bluefox) added the support of compact mode diff --git a/io-package.json b/io-package.json index c1dbff5..e17d299 100644 --- a/io-package.json +++ b/io-package.json @@ -3,6 +3,18 @@ "name": "hass", "version": "1.0.0", "title": "Home Assistant", + "titleLang": { + "en": "Home Assistant", + "de": "Home-Assistent", + "ru": "Домашний помощник", + "pt": "Home Assistant", + "nl": "Thuisassistent", + "fr": "Assistante à domicile", + "it": "Assistente domiciliare", + "es": "Asistente de hogar", + "pl": "Asystent domowy", + "zh-cn": "家庭助理" + }, "desc": { "en": "Home Assistant connection for ioBroker", "de": "Home Assistant Verbindung für ioBroker", @@ -58,7 +70,15 @@ "type": "iot-systems", "authors": [ "bluefox " - ] + ], + "dependencies": [ + { + "js-controller": ">=2.0.0" + } + ], + "connectionType": "local", + "dataSource": "push", + "tier": 2 }, "native": { "host": "127.0.0.1", diff --git a/package.json b/package.json index 2186e72..0451e2f 100644 --- a/package.json +++ b/package.json @@ -25,16 +25,15 @@ "url": "https://github.com/ioBroker/ioBroker.hass" }, "dependencies": { - "home-assistant-js-websocket": "^1.1.4", - "websocket": "^1.0.33", - "ws": "^5.0.0", - "@iobroker/adapter-core": "^2.4.0" + "websocket": "^1.0.34", + "ws": "^8.2.1", + "@iobroker/adapter-core": "^2.5.1" }, "devDependencies": { - "@alcalzone/release-script": "^1.8.1", + "@alcalzone/release-script": "^2.2.1", "gulp": "^4.0.2", - "mocha": "^8.2.1", - "chai": "^4.2.0" + "mocha": "^9.1.1", + "chai": "^4.3.4" }, "main": "main.js", "scripts": {