testing updated, nodeJS >=18 and js-controller >= 5

.github/workflows/dependabot-auto-merge.yml

@@ -0,0 +1,27 @@
+# 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:
+  # WARNING: This needs to be run in the PR base, DO NOT build untrusted code in this action
+  # details under https://github.blog/changelog/2021-02-19-github-actions-workflows-triggered-by-dependabot-prs-will-run-with-read-only-permissions/
+  pull_request_target:
+
+jobs:
+  auto-merge:
+    if: github.actor == 'dependabot[bot]'
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Check if PR should be auto-merged
+        uses: ahmadnassri/action-dependabot-auto-merge@v2
+        with:
+          # In order to use this, you need to go to https://github.com/settings/tokens and
+          # create a Personal Access Token with the permission "public_repo".
+          # Enter this token in your repository settings under "Secrets" and name it AUTO_MERGE_TOKEN
+          github-token: ${{ secrets.AUTO_MERGE_TOKEN }}
+          # By default, squash and merge, so Github chooses nice commit messages
+          command: squash and merge

.github/workflows/test-and-release.yml

@@ -1,166 +1,92 @@
-# This is a composition of lint and test scripts
-# Make sure to update this file along with the others
-
 name: Test and Release
 
 # Run this job on all pushes and pull requests
 # as well as tags with a semantic version
 on:
   push:
     branches:
-      - '*'
+      - "master"
     tags:
       # normal versions
-      - "v?[0-9]+.[0-9]+.[0-9]+"
+      - "v[0-9]+.[0-9]+.[0-9]+"
       # pre-releases
-      - "v?[0-9]+.[0-9]+.[0-9]+-**"
+      - "v[0-9]+.[0-9]+.[0-9]+-**"
   pull_request: {}
 
+# Cancel previous PR/branch runs when a new commit is pushed
+concurrency:
+  group: ${{ github.ref }}
+  cancel-in-progress: true
+
 jobs:
   # Performs quick checks before the expensive test runs
   check-and-lint:
     if: contains(github.event.head_commit.message, '[skip ci]') == false
 
     runs-on: ubuntu-latest
 
-    strategy:
-      matrix:
-        node-version: [18.x]
-
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - uses: ioBroker/testing-action-check@v1
         with:
-          node-version: ${{ matrix.node-version }}
-
-
-      - name: Install Dependencies
-        run: npm install
-
-#      - name: Perform a type check
-#        run: npm run check:ts
-#        env:
-#          CI: true
-      # - name: Lint TypeScript code
-      #   run: npm run lint
-#      - name: Test package files
-#        run: npm run test:package
+          node-version: '18.x'
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+          lint: true
 
   # Runs adapter tests on all supported node versions and OSes
   adapter-tests:
     if: contains(github.event.head_commit.message, '[skip ci]') == false
 
-    needs: [check-and-lint]
-
     runs-on: ${{ matrix.os }}
     strategy:
       matrix:
-        node-version: [16.x, 18.x, 20.x]
+        node-version: [18.x, 20.x]
         os: [ubuntu-latest, windows-latest, macos-latest]
 
     steps:
-      - uses: actions/checkout@v1
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
+      - uses: ioBroker/testing-action-adapter@v1
         with:
           node-version: ${{ matrix.node-version }}
+          os: ${{ matrix.os }}
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
 
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Run local tests
-        #         npm downgrade to 6 (mainly for node.js 16) is needed because else testing fails
-        #         after installing additional adapters
-        run: |
-          npm install -g npm@6
-          npm test
-#      - name: Run unit tests
-#        run: npm run test:unit
-#      - name: Run integration tests # (linux/osx)
-#        if: startsWith(runner.OS, 'windows') == false
-#        run: DEBUG=testing:* npm run test:integration
-#      - name: Run integration tests # (windows)
-#        if: startsWith(runner.OS, 'windows')
-#        run: set DEBUG=testing:* & npm run test:integration
+# TODO: To enable automatic npm releases, create a token on npmjs.org 
+# Enter this token as a GitHub secret (with name NPM_TOKEN) in the repository options
+# Then uncomment the following block:
 
   # Deploys the final package to NPM
   deploy:
-    needs: [adapter-tests]
+    needs: [check-and-lint, adapter-tests]
 
-    # Trigger this step only when a commit on master is tagged with a version number
+    # Trigger this step only when a commit on any branch is tagged with a version number
     if: |
       contains(github.event.head_commit.message, '[skip ci]') == false &&
       github.event_name == 'push' &&
-      startsWith(github.ref, 'refs/tags/')
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        node-version: [18.x]
-
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v2
-
-      - name: Use Node.js ${{ matrix.node-version }}
-        uses: actions/setup-node@v1
-        with:
-          node-version: ${{ matrix.node-version }}
-
-      - name: Extract the version and commit body from the tag
-        id: extract_release
-        # The body may be multiline, therefore we need to escape some characters
-        run: |
-          VERSION="${{ github.ref }}"
-          VERSION=${VERSION##*/}
-          VERSION=${VERSION##*v}
-          echo "::set-output name=VERSION::$VERSION"
-          BODY=$(git show -s --format=%b)
-          BODY="${BODY//'%'/'%25'}"
-          BODY="${BODY//$'\n'/'%0A'}"
-          BODY="${BODY//$'\r'/'%0D'}"
-          echo "::set-output name=BODY::$BODY"
+      startsWith(github.ref, 'refs/tags/v')
 
-      - name: Install Dependencies
-        run: npm install
-
-      - name: Bower
-        run: npm run bower
-
-      - name: Build
-        run: npm run build
+    runs-on: ubuntu-latest
 
-#      - name: Create a clean build
-#        run: npm run build
-      - name: Publish package to npm
-        run: |
-          npm config set //registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}
-          npm whoami
-          npm publish
+    # Write permissions are required to create Github releases
+    permissions:
+      contents: write
 
-      - name: Create Github Release
-        uses: actions/create-release@v1
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+    steps:
+      - uses: ioBroker/testing-action-deploy@v1
         with:
-          tag_name: ${{ github.ref }}
-          release_name: Release v${{ steps.extract_release.outputs.VERSION }}
-          draft: false
-          # Prerelease versions create pre-releases on GitHub
-          prerelease: ${{ contains(steps.extract_release.outputs.VERSION, '-') }}
-          body: ${{ steps.extract_release.outputs.BODY }}
-
-#      - name: Notify Sentry.io about the release
-#        run: |
-#          npm i -g @sentry/cli
-#          export SENTRY_AUTH_TOKEN=${{ secrets.SENTRY_AUTH_TOKEN }}
-#          export SENTRY_URL=https://sentry.iobroker.net
-#          export SENTRY_ORG=iobroker
-#          export SENTRY_PROJECT=iobroker-habpanel
-#          export SENTRY_VERSION=iobroker.habpanel@${{ steps.extract_release.outputs.VERSION }}
-#          sentry-cli releases new $SENTRY_VERSION
-#          sentry-cli releases set-commits $SENTRY_VERSION --auto
-#          sentry-cli releases finalize $SENTRY_VERSION
-
-        # Add the following line BEFORE finalize if sourcemap uploads are needed
-        # sentry-cli releases files $SENTRY_VERSION upload-sourcemaps build/
+          node-version: '18.x'
+          # Uncomment the following line if your adapter cannot be installed using 'npm ci'
+          # install-command: 'npm install'
+          npm-token: ${{ secrets.NPM_TOKEN }}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+
+#          # When using Sentry for error reporting, Sentry can be informed about new releases
+#          # To enable create a API-Token in Sentry (User settings, API keys)
+#          # Enter this token as a GitHub secret (with name SENTRY_AUTH_TOKEN) in the repository options
+#          # Then uncomment and customize the following block:
+#          sentry: true
+#          sentry-token: ${{ secrets.SENTRY_AUTH_TOKEN }}
+#          sentry-project: "iobroker-envertech-pv-new"
+#          sentry-version-prefix: "iobroker.envertech-pv-new"
+#          # If your sentry project is linked to a GitHub repository, you can enable the following option
+#          # sentry-github-integration: true

README.md

@@ -44,12 +44,15 @@ This adapter cannot be installed directly from GitHub. Only from npm.
 
 ![](doc/images/habpanel_screenshot6.png)
 
+## Changelog
 <!--
 	Placeholder for the next version (at the beginning of the line):
 	### __WORK IN PROGRESS__
 -->
+### __WORK IN PROGRESS__
+-   (mcm1957) Adapter requires nodeJS >=18 and js-controller >= 5 now.
+-   (mcm1957) Dependencies have been updated.
 
-## Changelog
 ### 0.5.0 (2022-02-16)
 * (jogibear9988) added on support for new websockets
 

io-package.json

@@ -88,7 +88,19 @@
         "zh-cn": "图表和时间线功能已修复"
       }
     },
-    "title": "HABpanel",
+    "titleLang": {
+      "en": "HABpanel",
+      "de": "HABpanel",
+      "ru": "HABpanel",
+      "pt": "HABpanel",
+      "nl": "HABpanel",
+      "fr": "HABpanel",
+      "it": "HABpanel",
+      "es": "HABpanel",
+      "pl": "Panel HABPanel",
+      "uk": "ХАБпанель",
+      "zh-cn": "卫生间"
+    },
     "desc": {
       "en": "HABpanel based ioBroker user interface",
       "de": "ioBroker GUI mit HABpanel",
@@ -101,23 +113,48 @@
       "pl": "Interfejs użytkownika ioBroker oparty na HABpanel",
       "zh-cn": "基于HABpanel的ioBroker用户界面"
     },
-    "platform": "Javascript/Node.js",
-    "loglevel": "info",
-    "dependencies": [
-      {
-        "web": ">=3.0.12"
-      }
+    "authors": [
+      "Yannick Schaus <[email protected]>",
+      "Kuba Wolanin <[email protected]>",
+      "Sam Turner <[email protected]>",
+      "Ingo Sigmund <[email protected]>",
+      "Andreas Gebauer <[email protected]>",
+      "bluefox <[email protected]>"
     ],
-    "icon": "habpanel.png",
-    "extIcon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.habpanel/master/admin/habpanel.png",
     "keywords": [
       "user",
       "interface",
       "webapp",
       "jquerymobile",
       "ui"
     ],
+    "licenseInformation": {
+      "license": "EPL-1.0",
+      "type": "free"
+    },
+    "platform": "Javascript/Node.js",
+    "icon": "habpanel.png",
+    "enabled": true,
+    "extIcon": "https://raw.githubusercontent.com/iobroker-community-adapters/ioBroker.habpanel/master/admin/habpanel.png",
     "readme": "https://github.com/iobroker-community-adapters/ioBroker.habpanel/blob/master/README.md",
+    "loglevel": "info",
+    "tier": 3,
+    "mode": "extension",
+    "type": "visualization",
+    "connectionType": "local",
+    "dataSource": "push",
+    "compact": false,
+    "dependencies": [
+      {
+        "js-controller": ">=5.0.0",
+        "web": ">=3.0.12"
+      }
+    ],
+    "globalDependencies": [
+      {
+        "admin": ">=5.1.13"
+      }
+    ],
     "singleton": true,
     "welcomeScreen": {
       "link": "habpanel/index.html",
@@ -127,24 +164,10 @@
       "order": 3
     },
     "preserveSettings": "habpanel",
-    "authors": [
-      "Yannick Schaus <[email protected]>",
-      "Kuba Wolanin <[email protected]>",
-      "Sam Turner <[email protected]>",
-      "Ingo Sigmund <[email protected]>",
-      "Andreas Gebauer <[email protected]>",
-      "bluefox <[email protected]>"
-    ],
     "localLink": "%web_protocol%://%ip%:%web_port%/habpanel/index.html",
-    "type": "visualization",
-    "license": "EPL-1.0",
     "noConfig": true,
-    "enabled": true,
     "onlyWWW": true,
     "nogit": true,
-    "mode": "extension",
-    "connectionType": "local",
-    "dataSource": "push",
     "webExtension": "lib/habpanelapi.js"
   },
   "native": {