v18.2.6

Merge pull request #2770 from balena-io/bump-oclif-core
Update @oclif/core from 3.26.9 to 3.27.0
2025-06-24 18:45:07 +00:00 · 2024-06-21 15:23:25 +00:00 · 2024-06-21 15:22:19 +00:00 · 2024-06-21 09:49:38 -03:00 · 2024-06-21 12:11:21 +00:00 · 2024-06-21 12:10:18 +00:00
72 changed files with 2725 additions and 22889 deletions
--- a/.github/actions/publish/action.yml
+++ b/.github/actions/publish/action.yml
@ -44,6 +44,12 @@ runs:
        node-version: ${{ inputs.NODE_VERSION }}
        cache: npm

+    - name: Set up Python 3.11
+      if: runner.os == 'macOS'
+      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+      with:
+        python-version: "3.11"
+
    - name: Install additional tools
      if: runner.os == 'Windows'
      shell: bash
@ -69,18 +75,11 @@ runs:
      if: runner.os == 'Windows'
      shell: powershell
      run: |
-        Set-Content -Path ${{ runner.temp }}/certificate.base64 -Value $env:WINDOWS_CERTIFICATE
-        certutil -decode ${{ runner.temp }}/certificate.base64 ${{ runner.temp }}/certificate.pfx
+        Set-Content -Path ${{ runner.temp }}/certificate.base64 -Value $env:SM_CLIENT_CERT_FILE_B64
+        certutil -decode ${{ runner.temp }}/certificate.base64 ${{ runner.temp }}/Certificate_pkcs12.p12
        Remove-Item -path ${{ runner.temp }} -include certificate.base64
-
-        Import-PfxCertificate `
-          -FilePath ${{ runner.temp }}/certificate.pfx `
-          -CertStoreLocation Cert:\CurrentUser\My `
-          -Password (ConvertTo-SecureString -String $env:WINDOWS_CERTIFICATE_PASSWORD -Force -AsPlainText)
-
      env:
-        WINDOWS_CERTIFICATE: ${{ fromJSON(inputs.secrets).WINDOWS_SIGNING }}
-        WINDOWS_CERTIFICATE_PASSWORD: ${{ fromJSON(inputs.secrets).WINDOWS_SIGNING_PASSWORD }}
+        SM_CLIENT_CERT_FILE_B64: ${{ fromJSON(inputs.secrets).SM_CLIENT_CERT_FILE_B64 }}

    # https://github.com/product-os/scripts/tree/master/shared
    # https://github.com/product-os/balena-concourse/blob/master/pipelines/github-events/template.yml
@ -100,12 +99,21 @@ runs:
            CSC_LINK=${{ fromJSON(inputs.secrets).APPLE_SIGNING }}

        elif [[ $runner_os =~ windows|win ]]; then
-            CSC_KEY_PASSWORD=${{ fromJSON(inputs.secrets).WINDOWS_SIGNING_PASSWORD }}
-            CSC_LINK='${{ runner.temp }}\certificate.pfx'
+            SM_HOST=${{ fromJSON(inputs.secrets).SM_HOST }}
+            SM_API_KEY=${{ fromJSON(inputs.secrets).SM_API_KEY }}
+            SM_CLIENT_CERT_FILE='${{ runner.temp }}\Certificate_pkcs12.p12'
+            SM_CLIENT_CERT_PASSWORD=${{ fromJSON(inputs.secrets).SM_CLIENT_CERT_PASSWORD }}
+            SM_CODE_SIGNING_CERT_SHA1_HASH=${{ fromJSON(inputs.secrets).SM_CODE_SIGNING_CERT_SHA1_HASH }}

-            # patches/all/oclif.patch
-            MSYSSHELLPATH="$(which bash)"
-            MSYSTEM=MSYS
+            curl --silent --retry 3 --fail https://one.digicert.com/signingmanager/api-ui/v1/releases/smtools-windows-x64.msi/download \
+              -H "x-api-key:$SM_API_KEY" \
+              -o smtools-windows-x64.msi
+            msiexec -i smtools-windows-x64.msi -qn
+            PATH="/c/Program Files/DigiCert/DigiCert One Signing Manager Tools:${PATH}"
+            smksp_registrar.exe list
+            smctl.exe keypair ls
+            /c/Windows/System32/certutil.exe -csp "DigiCert Signing Manager KSP" -key -user
+            smksp_cert_sync.exe

            # (signtool.exe) https://github.com/actions/runner-images/blob/main/images/win/Windows2019-Readme.md#installed-windows-sdks
            PATH="/c/Program Files (x86)/Windows Kits/10/bin/${runner_arch}:${PATH}"
@ -119,8 +127,8 @@ runs:
        # https://github.blog/2020-08-03-github-actions-improvements-for-fork-and-pull-request-workflows/#improvements-for-public-repository-forks
        # https://docs.github.com/en/actions/managing-workflow-runs/approving-workflow-runs-from-public-forks#about-workflow-runs-from-public-forks
        CSC_FOR_PULL_REQUEST: true
-        # https://sectigo.com/resource-library/time-stamping-server
-        TIMESTAMP_SERVER: http://timestamp.sectigo.com
+        # https://docs.digicert.com/es/software-trust-manager/ci-cd-integrations/plugins/github-custom-action-for-keypair-signing.html
+        TIMESTAMP_SERVER: http://timestamp.digicert.com
        # Apple notarization (automation/build-bin.ts)
        XCODE_APP_LOADER_EMAIL: ${{ inputs.XCODE_APP_LOADER_EMAIL }}
        XCODE_APP_LOADER_PASSWORD: ${{ fromJSON(inputs.secrets).XCODE_APP_LOADER_PASSWORD }}
--- a/.github/renovate.json
+++ b/.github/renovate.json
@ -0,0 +1,4 @@
+{
+	"extends": ["github>balena-io/renovate-config"],
+	"postUpdateOptions": ["npmDedupe"]
+}
--- a/.github/workflows/flowzone.yml
+++ b/.github/workflows/flowzone.yml
@ -21,6 +21,25 @@ jobs:
      )
    secrets: inherit
    with:
-      custom_runs_on: '[["self-hosted","Linux","distro:focal","X64"],["self-hosted","Linux","distro:focal","ARM64"],["macos-12"],["windows-2019"]]'
+      custom_test_matrix: >
+        {
+          "os": [
+            ["actuated-4cpu-8gb"],
+            ["actuated-arm64-4cpu-8gb"],
+            ["macos-12"],
+            ["windows-2019"],
+            ["macos-latest-xlarge"]
+          ]
+        }
+      custom_publish_matrix: >
+        {
+          "os": [
+            ["actuated-4cpu-8gb"],
+            ["actuated-arm64-4cpu-8gb"],
+            ["macos-12"],
+            ["windows-2019"],
+            ["macos-latest-xlarge"]
+          ]
+        }
      github_prerelease: false
      restrict_custom_actions: false
--- a/.versionbot/CHANGELOG.yml
+++ b/.versionbot/CHANGELOG.yml
@ -1,3 +1,384 @@
+- commits:
+    - subject: Update @oclif/core from 3.26.9 to 3.27.0
+      hash: 75d2d7d37543d179bc05b85de89ec7e2f33e5272
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.2.6
+  title: ""
+  date: 2024-06-21T15:23:21.818Z
+- commits:
+    - subject: Limit @oclif/core to ~3.26 so that npm dedupe doesn't auto-bump it
+      hash: 5a3f0ea453bf88f04c883411460f188028eee5ac
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update TypeScript to 5.5.2
+      hash: 7959e23cd3e6b506750fbd841ad0893400b4e68e
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+  version: 18.2.5
+  title: ""
+  date: 2024-06-21T12:11:16.888Z
+- commits:
+    - subject: 'patch: fix outdated doc for "os configure"'
+      hash: 163dcf596e8e318570f5f1c27485b2b834c21214
+      body: |
+        There were an outdated warning for `os configure` on windows.
+        The command actually works fine on windows.
+      footer:
+        see: https://balena.zulipchat.com/#narrow/stream/403752-channel.2Fsupport-help/topic/Cytiva.20image.20downloads/near/438786503
+      author: Edwin Joassart
+      nested: []
+  version: 18.2.4
+  title: ""
+  date: 2024-05-17T12:04:06.637Z
+- commits:
+    - subject: Pluralize command categories in docs
+      hash: 233bc705dee0ec2e6efe4375deac1889d91f5718
+      body: >
+        Pluralize command categories, eg. "Device" -> "Devices”.
+
+
+        Results in much fewer categories in our docs pages and we no longer have
+        the somewhat silly separate singular and plural categories for commands
+        such as `devices` and `device <command>`.
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: dfunckt
+      nested: []
+  version: 18.2.3
+  title: ""
+  date: 2024-05-15T13:32:49.489Z
+- commits:
+    - subject: Upgrade dockerode and docker-modem dependencies
+      hash: aa9a148c462d5a03d534b7fd8edc8687af82fb6c
+      body: |
+        Includes test fixes due to an interface change in docker-modem.
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Ken Bannister <kb2ma@runbox.com>
+        signed-off-by: Ken Bannister <kb2ma@runbox.com>
+      author: Ken Bannister
+      nested: []
+  version: 18.2.2
+  title: ""
+  date: 2024-04-30T13:57:45.085Z
+- commits:
+    - subject: Use Actuated runners for Linux test and publish
+      hash: 954de13b100bb78680d7797d7c34487eaa5fa2a7
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Kyle Harding <kyle@balena.io>
+        signed-off-by: Kyle Harding <kyle@balena.io>
+      author: Kyle Harding
+      nested: []
+  version: 18.2.1
+  title: ""
+  date: 2024-04-23T12:08:51.532Z
+- commits:
+    - subject: "build: Auto-resolve the cpu arch when the --deviceType is provided"
+      hash: 766e6d4e5e54fed3094cf8906e773869d23dd1f1
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Thodoris Greasidis
+      nested: []
+  version: 18.2.0
+  title: ""
+  date: 2024-04-17T16:13:08.810Z
+- commits:
+    - subject: Mark node 20.6.0 as the minimum working version
+      hash: b29aae1821bbaac87ceffd5eaee775afa7277927
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+  version: 18.1.10
+  title: ""
+  date: 2024-04-16T14:17:03.542Z
+- commits:
+    - subject: Enable npm dedupe as part of Renovate postUpdateOptions
+      hash: 2a970478bd576d3887e64cd9398b890a8a503be6
+      body: ""
+      footer:
+        See: https://docs.renovatebot.com/configuration-options/#postupdateoptions
+        see: https://docs.renovatebot.com/configuration-options/#postupdateoptions
+        Change-type: patch
+        change-type: patch
+        Signed-off-by: Kyle Harding <kyle@balena.io>
+        signed-off-by: Kyle Harding <kyle@balena.io>
+      author: Kyle Harding
+      nested: []
+  version: 18.1.9
+  title: ""
+  date: 2024-04-10T15:24:25.946Z
+- commits:
+    - subject: Bump patch-package to 6.5.1
+      hash: 6178f34f88377d64d331e027d6c0da7165c0df5e
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: "npm-shrinkwrap.json: Recreate with lockfileVersion 3"
+      hash: c5ecf692bb568900583680e871b4aba2cae7ab30
+      body: |
+        npm ci && \
+          rm npm-shrinkwrap.json && \
+          npm shrinkwrap
+
+        I confirmed that it generates the same
+        node_modules structure but cuts the
+        shrinkwrap file size by 43%.
+      footer:
+        Change-type: patch
+        change-type: patch
+        See: https://docs.npmjs.com/cli/v9/configuring-npm/package-lock-json#lockfileversion
+        see: https://docs.npmjs.com/cli/v9/configuring-npm/package-lock-json#lockfileversion
+      author: Thodoris Greasidis
+      nested: []
+  version: 18.1.8
+  title: ""
+  date: 2024-04-09T17:29:44.329Z
+- commits:
+    - subject: Update balena-preload to 15.0.5
+      hash: 3caf54aa16affeb8606671dfacf58c94d2bcdc68
+      body: |
+        Update balena-preload from 15.0.4 to 15.0.5
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested:
+        - commits:
+            - subject: Remove unused dependencies
+              hash: 429315f21df769a3408610cdcacfa3a02ac3edc1
+              body: ""
+              footer:
+                Change-type: patch
+                change-type: patch
+              author: Otavio Jacobi
+              nested: []
+          version: balena-preload-15.0.5
+          title: ""
+          date: 2024-04-09T15:24:21.255Z
+  version: 18.1.7
+  title: ""
+  date: 2024-04-09T16:03:31.270Z
+- commits:
+    - subject: Update @oclif/core to 3.26.2
+      hash: 48110311724767aac70485ce075a90cc816605e5
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Drop the keep-alive package in favor of node's setKeepAlive defaults
+      hash: be682c742604593b986ee66a69b6a722007d76a8
+      body: |
+        Since node 12.17.0 setKeepAlive also sets
+        TCP_KEEPCNT=10 (vs 5 that we had)
+        TCP_KEEPINTVL=1 (vs 5s that we had)
+      footer:
+        Change-type: patch
+        change-type: patch
+        See: https://github.com/balena-io/balena-cli/pull/1220
+        see: https://github.com/balena-io/balena-cli/pull/1220
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update balena-preload to v15.0.4
+      hash: c6827ee51da2d919dd292516b293462986f90646
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update resin-cli-form to v3
+      hash: 2cba3bbc22bae7543ac70141fdb60d12900c007b
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update resin-cli-visuals to v2
+      hash: 933eacf2754619e681dad2cfd70f732e0063c0ef
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update balena-device-init to v7.0.1
+      hash: e7869f4c6d81cfe6cd831c616546dc47f23cfb28
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Update etcher-sdk to v9.0.8
+      hash: 1a246a9ba5d92fbc8abc271e6918268c353ef982
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+    - subject: Mark bin/dev & bin/run as executable
+      hash: e26895085d377b86268a20f72ac31090dffd9271
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Thodoris Greasidis
+      nested: []
+  version: 18.1.6
+  title: ""
+  date: 2024-04-09T15:04:36.569Z
+- commits:
+    - subject: Move klaw library to dev dependency
+      hash: bb4713ab9a2445cc7adab24f7d9549331f1c72e8
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.1.5
+  title: ""
+  date: 2024-03-14T15:52:35.043Z
+- commits:
+    - subject: Update @balena/lint to 8.0.0
+      hash: 634ad156ce9a6557102f438715c4a90fccf2db9c
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: myarmolinsky
+      nested: []
+  version: 18.1.4
+  title: ""
+  date: 2024-03-14T14:34:45.902Z
+- commits:
+    - subject: Use standard oclif run.js & dev.js
+      hash: 742c015f21b36685c8dcd9ba494ef0298924bcc9
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.1.3
+  title: ""
+  date: 2024-03-14T12:57:18.555Z
+- commits:
+    - subject: Move macos binary signing to oclif pretarball lifecycle
+      hash: 7f11805a7fdd9dbfebae198321bfd0640769092b
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.1.2
+  title: ""
+  date: 2024-03-13T13:49:08.000Z
+- commits:
+    - subject: Remove patching tmp for windows runners
+      hash: 6515d6ae10ea9bb43793ebfc3843150bce6e8864
+      body: ""
+      footer:
+        See: https://github.com/balena-io/balena-cli/pull/1298/files#r297236577
+        see: https://github.com/balena-io/balena-cli/pull/1298/files#r297236577
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.1.1
+  title: ""
+  date: 2024-03-12T17:39:11.347Z
+- commits:
+    - subject: Add support for macos arm64 builds
+      hash: 38a2817587030678f316d55828b9ce73481716b8
+      body: ""
+      footer:
+        Change-type: minor
+        change-type: minor
+      author: Otavio Jacobi
+      nested: []
+  version: 18.1.0
+  title: ""
+  date: 2024-03-12T14:21:26.866Z
+- commits:
+    - subject: Update dependencies
+      hash: 756f6b328b10f3f5bfffbcca8078a2ad03c99287
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.0.4
+  title: ""
+  date: 2024-03-11T22:19:04.713Z
+- commits:
+    - subject: Removes signing patches
+      hash: f9f41eef4bae9e41531a149fed029c0cea23f3d1
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.0.3
+  title: ""
+  date: 2024-03-11T14:25:45.117Z
+- commits:
+    - subject: Remove no longer needed windows oclif patches
+      hash: ecfd4a260e4734c768480b98d05cee08f366a672
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.0.2
+  title: ""
+  date: 2024-03-07T19:40:22.571Z
+- commits:
+    - subject: Fix windows signing
+      hash: 2e061845ae01fd6d3aa10c97bf8a68a8dba5dfd9
+      body: ""
+      footer:
+        Change-type: patch
+        change-type: patch
+      author: Otavio Jacobi
+      nested: []
+  version: 18.0.1
+  title: ""
+  date: 2024-03-07T16:30:09.344Z
 - commits:
    - subject: Update to Node 20
      hash: bf5e61a61c542f0c0a57ae49bb9a9998588d6851
@ -1049,9 +1430,11 @@
                Bumps [lint-staged](https://github.com/okonet/lint-staged) from
                13.3.0 to 14.0.0.

-                - [Release notes](https://github.com/okonet/lint-staged/releases)
+                - [Release
+                notes](https://github.com/okonet/lint-staged/releases)

-                - [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)
+                -
+                [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)


                ---
@ -1391,9 +1774,11 @@
                        [lint-staged](https://github.com/okonet/lint-staged)
                        from 13.3.0 to 14.0.0.

-                        - [Release notes](https://github.com/okonet/lint-staged/releases)
+                        - [Release
+                        notes](https://github.com/okonet/lint-staged/releases)

-                        - [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)
+                        -
+                        [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)


                        ---
@ -1768,9 +2153,11 @@
                        [lint-staged](https://github.com/okonet/lint-staged)
                        from 13.3.0 to 14.0.0.

-                        - [Release notes](https://github.com/okonet/lint-staged/releases)
+                        - [Release
+                        notes](https://github.com/okonet/lint-staged/releases)

-                        - [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)
+                        -
+                        [Commits](https://github.com/okonet/lint-staged/compare/v13.3.0...v14.0.0)


                        ---
@ -2969,7 +3356,8 @@
                                Be more lenient with decoding compressed
                                responses, since (very rarely)

-                                servers send slightly invalid gzip responses that are still accepted
+                                servers send slightly invalid gzip responses
+                                that are still accepted

                                by common browsers.

@ -2989,7 +3377,8 @@
                              body: >
                                The only breaking change is dropping support

-                                for node v8 but we have already done that in v11.
+                                for node v8 but we have already done that in
+                                v11.
                              footer:
                                Change-type: minor
                                change-type: minor
@ -3018,7 +3407,8 @@
                              body: >
                                Otherwise request from the browser could end up

-                                on the domain of the current url. For the dashboard
+                                on the domain of the current url. For the
+                                dashboard

                                this would mean the UI nginx would respond with

@ -4296,7 +4686,8 @@
                                Be more lenient with decoding compressed
                                responses, since (very rarely)

-                                servers send slightly invalid gzip responses that are still accepted
+                                servers send slightly invalid gzip responses
+                                that are still accepted

                                by common browsers.

@ -4316,7 +4707,8 @@
                              body: >
                                The only breaking change is dropping support

-                                for node v8 but we have already done that in v11.
+                                for node v8 but we have already done that in
+                                v11.
                              footer:
                                Change-type: minor
                                change-type: minor
@ -4345,7 +4737,8 @@
                              body: >
                                Otherwise request from the browser could end up

-                                on the domain of the current url. For the dashboard
+                                on the domain of the current url. For the
+                                dashboard

                                this would mean the UI nginx would respond with

@ -5566,7 +5959,8 @@
                        Be more lenient with decoding compressed responses,
                        since (very rarely)

-                        servers send slightly invalid gzip responses that are still accepted
+                        servers send slightly invalid gzip responses that are
+                        still accepted

                        by common browsers.

@ -7402,7 +7796,9 @@

        ```

-        Error: Could not detect abi for version 16.13.0 and runtime node.  Updating "node-abi" might help solve this issue if it is a new release of node
+        Error: Could not detect abi for version 16.13.0 and runtime
+        node.  Updating "node-abi" might help solve this issue if it is a new
+        release of node

        ```
      footer:
@ -7538,7 +7934,8 @@
                - getAllByApplication


-                Changelog-entry: Enable audit logging and reviewing device changes. The SDK defaults to fetch last 7 days of history
+                Changelog-entry: Enable audit logging and reviewing device
+                changes. The SDK defaults to fetch last 7 days of history
              footer:
                Change-type: minor
                change-type: minor
@ -7736,7 +8133,8 @@
                This is part of the work for enabling the creation of
                configuration

-                variables with a colon character as a means to allow Raspberry PI users
+                variables with a colon character as a means to allow Raspberry
+                PI users

                to enable the second HDMI port on RPI4 and others.
              footer:
@ -7896,11 +8294,14 @@
                [catch-uncommitted](https://github.com/resin-io-modules/catch-uncommitted)
                from 1.6.2 to 2.0.0.

-                - [Release notes](https://github.com/resin-io-modules/catch-uncommitted/releases)
+                - [Release
+                notes](https://github.com/resin-io-modules/catch-uncommitted/releases)

-                - [Changelog](https://github.com/balena-io-modules/catch-uncommitted/blob/master/CHANGELOG.md)
+                -
+                [Changelog](https://github.com/balena-io-modules/catch-uncommitted/blob/master/CHANGELOG.md)

-                - [Commits](https://github.com/resin-io-modules/catch-uncommitted/compare/v1.6.2...v2.0.0)
+                -
+                [Commits](https://github.com/resin-io-modules/catch-uncommitted/compare/v1.6.2...v2.0.0)


                ---
@ -8771,9 +9172,11 @@
        Bumps [parse-link-header](https://github.com/thlorenz/parse-link-header)
        from 1.0.1 to 2.0.0.

-        - [Release notes](https://github.com/thlorenz/parse-link-header/releases)
+        - [Release
+        notes](https://github.com/thlorenz/parse-link-header/releases)

-        - [Commits](https://github.com/thlorenz/parse-link-header/compare/v1.0.1...v2.0.0)
+        -
+        [Commits](https://github.com/thlorenz/parse-link-header/compare/v1.0.1...v2.0.0)


        ---
@ -9723,11 +10126,14 @@
                Bumps [browserify](https://github.com/browserify/browserify)
                from 14.5.0 to 17.0.0.

-                - [Release notes](https://github.com/browserify/browserify/releases)
+                - [Release
+                notes](https://github.com/browserify/browserify/releases)

-                - [Changelog](https://github.com/browserify/browserify/blob/master/changelog.markdown)
+                -
+                [Changelog](https://github.com/browserify/browserify/blob/master/changelog.markdown)

-                - [Commits](https://github.com/browserify/browserify/compare/14.5.0...v17.0.0)
+                -
+                [Commits](https://github.com/browserify/browserify/compare/14.5.0...v17.0.0)


                ---
@ -9755,9 +10161,11 @@

                - [Release notes](https://github.com/raszi/node-tmp/releases)

-                - [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)
+                -
+                [Changelog](https://github.com/raszi/node-tmp/blob/master/CHANGELOG.md)

-                - [Commits](https://github.com/raszi/node-tmp/compare/v0.0.31...v0.2.1)
+                -
+                [Commits](https://github.com/raszi/node-tmp/compare/v0.0.31...v0.2.1)


                ---
@ -9839,9 +10247,11 @@

                - [Release notes](https://github.com/mochajs/mocha/releases)

-                - [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)
+                -
+                [Changelog](https://github.com/mochajs/mocha/blob/master/CHANGELOG.md)

-                - [Commits](https://github.com/mochajs/mocha/compare/v3.5.3...v10.0.0)
+                -
+                [Commits](https://github.com/mochajs/mocha/compare/v3.5.3...v10.0.0)


                ---
@ -9881,9 +10291,11 @@
                Bumps [mockttp](https://github.com/httptoolkit/mockttp) from
                0.9.1 to 2.7.0.

-                - [Release notes](https://github.com/httptoolkit/mockttp/releases)
+                - [Release
+                notes](https://github.com/httptoolkit/mockttp/releases)

-                - [Commits](https://github.com/httptoolkit/mockttp/compare/v0.9.1...v2.7.0)
+                -
+                [Commits](https://github.com/httptoolkit/mockttp/compare/v0.9.1...v2.7.0)


                ---
@ -9955,9 +10367,11 @@
                Bumps [superagent](https://github.com/visionmedia/superagent)
                from 3.8.3 to 7.1.2.

-                - [Release notes](https://github.com/visionmedia/superagent/releases)
+                - [Release
+                notes](https://github.com/visionmedia/superagent/releases)

-                - [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md)
+                -
+                [Changelog](https://github.com/visionmedia/superagent/blob/master/HISTORY.md)

                - [Commits](https://github.com/visionmedia/superagent/commits)

@ -9987,9 +10401,11 @@

                - [Release notes](https://github.com/motdotla/dotenv/releases)

-                - [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)
+                -
+                [Changelog](https://github.com/motdotla/dotenv/blob/master/CHANGELOG.md)

-                - [Commits](https://github.com/motdotla/dotenv/compare/v4.0.0...v16.0.0)
+                -
+                [Commits](https://github.com/motdotla/dotenv/compare/v4.0.0...v16.0.0)


                ---
@ -10584,9 +11000,11 @@
                Using build instead of pull allows to add metadata (e.g. labels)
                to pulled images in an

-                atomic way. This commit adds the `DockerProgres.build()` method to
+                atomic way. This commit adds the `DockerProgres.build()` method
+                to

-                build an image from a remote (or local) source and track the progress of
+                build an image from a remote (or local) source and track the
+                progress of

                the build.
              footer:
@ -10617,7 +11035,8 @@
              body: >
                Starting in balenaOS v2.93.0 the supervisor images are tagged

-                as balena_supervisor after being pulled from the balena registry.
+                as balena_supervisor after being pulled from the balena
+                registry.
              footer:
                Change-type: patch
                change-type: patch
@ -11674,7 +12093,8 @@
                                Be more lenient with decoding compressed
                                responses, since (very rarely)

-                                servers send slightly invalid gzip responses that are still accepted
+                                servers send slightly invalid gzip responses
+                                that are still accepted

                                by common browsers.

@ -13348,7 +13768,8 @@
        This changes improves the speed that the project is tarballed by
        switching from

-        `klaw` to `recursive-fs` and not running `lstat` on files that are ignored.
+        `klaw` to `recursive-fs` and not running `lstat` on files that are
+        ignored.

        Whilst testing with the Jellyfish repository, which contains a number of

@ -13373,9 +13794,11 @@
        Fixes #2394


-        When pushing to a device in local mode, if a service is not external, and uses
+        When pushing to a device in local mode, if a service is not external,
+        and uses

-        an `image` field, that value should be used for tags and target state, otherwise
+        an `image` field, that value should be used for tags and target state,
+        otherwise

        it won't match the image name generated on the device by balenaEngine.
      footer:
@ -13553,7 +13976,11 @@
        https://github.com/compose-spec/compose-spec/blob/43f6537b2c8f01b6d3f0e184d13a0f3cb93d38d7/spec.md#fragments


-        Removing the FAILSAFE_SCHEMA flag is not expected to break existing project files, since the default behaviour is more liberal, or cause problems down the road given we perform validation immediately after. Docs for the flag: https://github.com/nodeca/js-yaml#load-string---options-
+        Removing the FAILSAFE_SCHEMA flag is not expected to break existing
+        project files, since the default behaviour is more liberal, or cause
+        problems down the road given we perform validation immediately after.
+        Docs for the flag:
+        https://github.com/nodeca/js-yaml#load-string---options-
      footer:
        Change-type: minor
        change-type: minor
@ -13860,7 +14287,8 @@
                        Be more lenient with decoding compressed responses,
                        since (very rarely)

-                        servers send slightly invalid gzip responses that are still accepted
+                        servers send slightly invalid gzip responses that are
+                        still accepted

                        by common browsers.

@ -14159,7 +14587,8 @@
        This change allows use of a contract and release semver when doing a
        push,

-        and is part of the larger feature to use the builder as part of a CI/CD pipeline.
+        and is part of the larger feature to use the builder as part of a CI/CD
+        pipeline.
      footer:
        Change-type: minor
        change-type: minor
@ -14610,7 +15039,8 @@
      body: >
        This change will allow to build releases as draft and have them being

-        set as final at a later stage. This change is part of a larger feature towards
+        set as final at a later stage. This change is part of a larger feature
+        towards

        using the builder as part of CI/CD pipelines.
      footer:
@ -15091,7 +15521,8 @@
      body: >
        When using deploy to create a release for a multi-container project one

-        needs to follow this to avoid triggering a build. Relevant for CI/CD scenarios
+        needs to follow this to avoid triggering a build. Relevant for CI/CD
+        scenarios

        with their own build pipeline.
      footer:
@ -15133,7 +15564,8 @@
        users to configure the image with system connection settings.


-        This change affects both the `balena local configure` and `balena os configure` commands.
+        This change affects both the `balena local configure` and `balena os
+        configure` commands.
      footer:
        Change-type: patch
        change-type: patch
@ -15530,10 +15962,12 @@
        The `local` logging driver captures output from container’s
        stdout/stderr

-        and writes them to an internal storage that is optimized for performance and disk use.
+        and writes them to an internal storage that is optimized for performance
+        and disk use.


-        We also want to capture these logs on startup to wait for success/failure.
+        We also want to capture these logs on startup to wait for
+        success/failure.


        Advise the use of `--privileged` when running Docker-in-Docker to avoid
@ -15972,7 +16406,8 @@
      body: >
        10.4.0 improves image size estimation

-        10.4.1 prevents running out of space while pulling images because of temporary files
+        10.4.1 prevents running out of space while pulling images because of
+        temporary files
      footer:
        Change-type: patch
        change-type: patch
@ -24351,7 +24786,8 @@
        This fixes a build error caused by a recent version bump of
        'patch-package':

-        "Patch file found for package execa which is not present at node_modules/qqjs/node_modules/execa"
+        "Patch file found for package execa which is not present at
+        node_modules/qqjs/node_modules/execa"
      footer:
        Change-type: patch
        change-type: patch
@ -24636,7 +25072,8 @@
        any balenaOS devices' message - if the OS is Windows.


-        Also updated the INSTALL instructions with details of the dependency on Bonjour.
+        Also updated the INSTALL instructions with details of the dependency on
+        Bonjour.
      footer:
        Change-type: patch
        change-type: patch
@ -25522,11 +25959,17 @@
      body: >
        The full warning output was:

-        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory leak detected. 11 drain listeners added. Use emitter.setMaxListeners() to increase limit
+        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory
+        leak detected. 11 drain listeners added. Use emitter.setMaxListeners()
+        to increase limit

-        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory leak detected. 11 error listeners added. Use emitter.setMaxListeners() to increase limit
+        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory
+        leak detected. 11 error listeners added. Use emitter.setMaxListeners()
+        to increase limit

-        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory leak detected. 11 close listeners added. Use emitter.setMaxListeners() to increase limit
+        (node:43572) MaxListenersExceededWarning: Possible EventEmitter memory
+        leak detected. 11 close listeners added. Use emitter.setMaxListeners()
+        to increase limit
      footer:
        Change-type: patch
        change-type: patch
@ -25628,13 +26071,17 @@
        E.g. "balena build -e -h <IP> -p 2375" with the CLI running on a Mac
        laptop,

-        using balenaEngine on an Intel NUC device, building an image for the RPi (ARM
+        using balenaEngine on an Intel NUC device, building an image for the RPi
+        (ARM

-        image arch). Previously, QEMU setup by the CLI assumed that docker ran on the
+        image arch). Previously, QEMU setup by the CLI assumed that docker ran
+        on the

-        same OS as the CLI (Docker for Mac has built-in binfmt_misc support and does
+        same OS as the CLI (Docker for Mac has built-in binfmt_misc support and
+        does

-        not require additional setup, but balenaEngine on Linux requires explicit QEMU
+        not require additional setup, but balenaEngine on Linux requires
+        explicit QEMU

        setup.)
      footer:
@ -25725,7 +26172,8 @@
        Fixes #1380


-        Argument parsing of "env rm" command was improved by migrating it to oclif
+        Argument parsing of "env rm" command was improved by migrating it to
+        oclif
      footer:
        Change-type: patch
        change-type: patch
@ -25753,16 +26201,24 @@

        ```

-        lib/actions-oclif/env/add.ts(73,16): error TS2742: The inferred type of 'flags' cannot be named without a reference to '../../../../../../../../../volumes/live/c64feead-f78e-4bd4-742d-ccd29aef53c4/volume/node_modules/@oclif/parser/lib/flags'. This is likely not portable. A type annotation is necessary.
+        lib/actions-oclif/env/add.ts(73,16): error TS2742: The inferred type of
+        'flags' cannot be named without a reference to
+        '../../../../../../../../../volumes/live/c64feead-f78e-4bd4-742d-ccd29aef53c4/volume/node_modules/@oclif/parser/lib/flags'.
+        This is likely not portable. A type annotation is necessary.

-        lib/actions-oclif/version.ts(42,16): error TS2742: The inferred type of 'flags' cannot be named without a reference to '../../../../../../../../volumes/live/c64feead-f78e-4bd4-742d-ccd29aef53c4/volume/node_modules/@oclif/parser/lib/flags.js'. This is likely not portable. A type annotation is necessary.
+        lib/actions-oclif/version.ts(42,16): error TS2742: The inferred type of
+        'flags' cannot be named without a reference to
+        '../../../../../../../../volumes/live/c64feead-f78e-4bd4-742d-ccd29aef53c4/volume/node_modules/@oclif/parser/lib/flags.js'.
+        This is likely not portable. A type annotation is necessary.

        ```


-        This appears to be reported on the Typescript repo here https://github.com/microsoft/TypeScript/issues/29221
+        This appears to be reported on the Typescript repo here
+        https://github.com/microsoft/TypeScript/issues/29221

-        The suggested workaround is to explicitly set the type of the `flags` static
+        The suggested workaround is to explicitly set the type of the `flags`
+        static

        property.
      footer:
@ -26817,7 +27273,8 @@
        To fix the same error as here
        https://github.com/nodejs/node/issues/20285

-        Task changes as described at https://fettblog.eu/gulp-4-parallel-and-series/
+        Task changes as described at
+        https://fettblog.eu/gulp-4-parallel-and-series/
      footers:
        change-type: patch
        signed-off-by: Gergely Imreh <gergely@balena.io>
@ -27724,7 +28181,11 @@
        for is to determine whether the command should issue a legacy user API
        key or a provisioning key.

-        This makes version optional but tries to figure it out by itself by reading os-release from the image's boot partition. This is not foul-proof however, and while it'll work with most recent images it won't work with all and in that case it'll bail out and only then warn the user to specify it via the --version argument.
+        This makes version optional but tries to figure it out by itself by
+        reading os-release from the image's boot partition. This is not
+        foul-proof however, and while it'll work with most recent images it
+        won't work with all and in that case it'll bail out and only then warn
+        the user to specify it via the --version argument.
      footers:
        change-type: minor
      hash: 8291c96e69407a4c691a35c27ff3cd406794e946
@ -28364,9 +28825,21 @@
        compatibility merely by looking for the `os-config` executable in the
        device, and bail out if it’s not present.

-        `join` and `leave` accept a couple of optional arguments and implement a wizard-style interface if these are not given. They allow to interactively select the device and the application to promote to. If the user has no apps, `join` will offer the user to create one. `join` will also offer the user to login or create an account if they’re not logged in already without exiting the wizard.
+        `join` and `leave` accept a couple of optional arguments and implement a
+        wizard-style interface if these are not given. They allow to
+        interactively select the device and the application to promote to. If
+        the user has no apps, `join` will offer the user to create one. `join`
+        will also offer the user to login or create an account if they’re not
+        logged in already without exiting the wizard.

-        `resin-sync` (that's used internally to discover local devices) requires admin privileges. If no device has been specified as an argument, the commands will launch the device scanning process in a privileged subprocess via two new internal commands: `internal sudo` and `internal scanDevices`. This avoids having the user to invoke the commands with sudo and only request escalation if truly needed. This commit also removes the dependency to “president”, implementing “sudo” functionality within the CLI.
+        `resin-sync` (that's used internally to discover local devices) requires
+        admin privileges. If no device has been specified as an argument, the
+        commands will launch the device scanning process in a privileged
+        subprocess via two new internal commands: `internal sudo` and `internal
+        scanDevices`. This avoids having the user to invoke the commands with
+        sudo and only request escalation if truly needed. This commit also
+        removes the dependency to “president”, implementing “sudo” functionality
+        within the CLI.
      footers:
        change-type: minor
      hash: 5cbe1c410f7081ff78b41e8a6d9c0f06ad92934e
@ -28835,7 +29308,8 @@
        image tars via the builder. It’s needed for users to avoid having to
        switch between CLI versions in order to push to legacy apps as well.

-        Note: this pins resin-sdk to 9.0.0-beta14 as I couldn’t get it to install otherwise — npm would always install 9.0.0-beta9 instead.
+        Note: this pins resin-sdk to 9.0.0-beta14 as I couldn’t get it to
+        install otherwise — npm would always install 9.0.0-beta9 instead.
      footers:
        change-type: minor
      hash: 62f006b89ab0fa8a1575f213579910f732f17c0f
@ -28965,7 +29439,8 @@

        * all 'resin-sdk' requires replaced with 'resin-sdk-preconfigured'

-        * resin-sdk-preconfigured TS typings are copy pasted from the current resin-sdk master
+        * resin-sdk-preconfigured TS typings are copy pasted from the current
+        resin-sdk master

        The idea is to progressively replace all 'resin-sdk-preconfigured'

@ -29015,7 +29490,10 @@
      body: >-
        New version is 3.1.0.

-        The updated version is not backwards compatible as it removes all *Async methods that are in wide use in the CLI. The workaround for now is to manually promisify the client and replace all `new Docker()` calls with a shared function that returns a promisified client.
+        The updated version is not backwards compatible as it removes all *Async
+        methods that are in wide use in the CLI. The workaround for now is to
+        manually promisify the client and replace all `new Docker()` calls with
+        a shared function that returns a promisified client.
      hash: 299bc0db132e5b04894b6b955aa469666a66ce8c
      subject: Update docker-toolbelt
    - author: Akis Kesoglou
@ -29040,9 +29518,11 @@

        - Adds a utility file to retrieve the CLI version and its parts

-        - Adds a helper that can be used to manipulate display on capable clients
+        - Adds a helper that can be used to manipulate display on capable
+        clients

-        - Declares several new dependencies. Most are already indirectly installed via some dependency
+        - Declares several new dependencies. Most are already indirectly
+        installed via some dependency
      footers:
        change-type: minor
      hash: 14a3f51b730b12ad66462342888fb2b4bcf1f1ea
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -4,6 +4,112 @@ All notable changes to this project will be documented in this file
 automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
 This project adheres to [Semantic Versioning](http://semver.org/).

+## 18.2.6 - 2024-06-21
+
+* Update @oclif/core from 3.26.9 to 3.27.0 [Otavio Jacobi]
+
+## 18.2.5 - 2024-06-21
+
+* Limit @oclif/core to ~3.26 so that npm dedupe doesn't auto-bump it [Thodoris Greasidis]
+* Update TypeScript to 5.5.2 [Thodoris Greasidis]
+
+## 18.2.4 - 2024-05-17
+
+* patch: fix outdated doc for "os configure" [Edwin Joassart]
+
+## 18.2.3 - 2024-05-15
+
+* Pluralize command categories in docs [dfunckt]
+
+## 18.2.2 - 2024-04-30
+
+* Upgrade dockerode and docker-modem dependencies [Ken Bannister]
+
+## 18.2.1 - 2024-04-23
+
+* Use Actuated runners for Linux test and publish [Kyle Harding]
+
+## 18.2.0 - 2024-04-17
+
+* build: Auto-resolve the cpu arch when the --deviceType is provided [Thodoris Greasidis]
+
+## 18.1.10 - 2024-04-16
+
+* Mark node 20.6.0 as the minimum working version [Thodoris Greasidis]
+
+## 18.1.9 - 2024-04-10
+
+* Enable npm dedupe as part of Renovate postUpdateOptions [Kyle Harding]
+
+## 18.1.8 - 2024-04-09
+
+* Bump patch-package to 6.5.1 [Thodoris Greasidis]
+* npm-shrinkwrap.json: Recreate with lockfileVersion 3 [Thodoris Greasidis]
+
+## 18.1.7 - 2024-04-09
+
+
+<details>
+<summary> Update balena-preload to 15.0.5 [Thodoris Greasidis] </summary>
+
+> ### balena-preload-15.0.5 - 2024-04-09
+> 
+> * Remove unused dependencies [Otavio Jacobi]
+> 
+
+</details>
+
+## 18.1.6 - 2024-04-09
+
+* Update @oclif/core to 3.26.2 [Thodoris Greasidis]
+* Drop the keep-alive package in favor of node's setKeepAlive defaults [Thodoris Greasidis]
+* Update balena-preload to v15.0.4 [Thodoris Greasidis]
+* Update resin-cli-form to v3 [Thodoris Greasidis]
+* Update resin-cli-visuals to v2 [Thodoris Greasidis]
+* Update balena-device-init to v7.0.1 [Thodoris Greasidis]
+* Update etcher-sdk to v9.0.8 [Thodoris Greasidis]
+* Mark bin/dev & bin/run as executable [Thodoris Greasidis]
+
+## 18.1.5 - 2024-03-14
+
+* Move klaw library to dev dependency [Otavio Jacobi]
+
+## 18.1.4 - 2024-03-14
+
+* Update @balena/lint to 8.0.0 [myarmolinsky]
+
+## 18.1.3 - 2024-03-14
+
+* Use standard oclif run.js & dev.js [Otavio Jacobi]
+
+## 18.1.2 - 2024-03-13
+
+* Move macos binary signing to oclif pretarball lifecycle [Otavio Jacobi]
+
+## 18.1.1 - 2024-03-12
+
+* Remove patching tmp for windows runners [Otavio Jacobi]
+
+## 18.1.0 - 2024-03-12
+
+* Add support for macos arm64 builds [Otavio Jacobi]
+
+## 18.0.4 - 2024-03-11
+
+* Update dependencies [Otavio Jacobi]
+
+## 18.0.3 - 2024-03-11
+
+* Removes signing patches [Otavio Jacobi]
+
+## 18.0.2 - 2024-03-07
+
+* Remove no longer needed windows oclif patches [Otavio Jacobi]
+
+## 18.0.1 - 2024-03-07
+
+* Fix windows signing [Otavio Jacobi]
+
 ## 18.0.0 - 2024-02-06

 * Update to Node 20 [Otávio Jacobi]
--- a/INSTALL-ADVANCED.md
+++ b/INSTALL-ADVANCED.md
@ -78,7 +78,7 @@ If you are a Node.js developer, you may wish to install the balena CLI via [npm]
 The npm installation involves building native (platform-specific) binary modules, which require
 some development tools to be installed first, as follows.

-> **The balena CLI currently requires Node.js version 20.**
+> **The balena CLI currently requires Node.js version ^20.6.0**
 > **Versions 21 and later are not yet fully supported.**

 ### Install development tools
--- a/automation/build-bin.ts
+++ b/automation/build-bin.ts
@ -20,9 +20,9 @@ import type { JsonVersions } from '../lib/commands/version/index';
 import { run as oclifRun } from '@oclif/core';
 import * as archiver from 'archiver';
 import * as Bluebird from 'bluebird';
-import { execFile } from 'child_process';
+import { exec, execFile } from 'child_process';
 import * as filehound from 'filehound';
-import { Stats } from 'fs';
+import type { Stats } from 'fs';
 import * as fs from 'fs-extra';
 import * as klaw from 'klaw';
 import * as path from 'path';
@ -41,6 +41,7 @@ import {
 } from './utils';

 const execFileAsync = promisify(execFile);
+const execAsync = promisify(exec);

 export const packageJSON = loadPackageJson();
 export const version = 'v' + packageJSON.version;
@ -60,9 +61,13 @@ const standaloneZips: PathByPlatform = {
 	win32: dPath(`balena-cli-${version}-windows-${arch}-standalone.zip`),
 };

-const oclifInstallers: PathByPlatform = {
-	darwin: dPath('macos', `balena-${version}.pkg`),
-	win32: dPath('win32', `balena-${version}-${arch}.exe`),
+const getOclifInstallersOriginalNames = async (): Promise<PathByPlatform> => {
+	const { stdout } = await execAsync('git rev-parse --short HEAD');
+	const sha = stdout.trim();
+	return {
+		darwin: dPath('macos', `balena-${version}-${sha}-${arch}.pkg`),
+		win32: dPath('win32', `balena-${version}-${sha}-${arch}.exe`),
+	};
 };

 const renamedOclifInstallers: PathByPlatform = {
@ -182,10 +187,10 @@ async function execPkg(...args: any[]) {
 async function buildPkg() {
 	// https://github.com/vercel/pkg#targets
 	let targets = `linux-${arch}`;
-	// TBC: not possible to build for macOS or Windows arm64 on x64 nodes
 	if (process.platform === 'darwin') {
-		targets = `macos-x64`;
+		targets = `macos-${arch}`;
 	}
+	// TBC: not yet possible to build for Windows arm64 on x64 nodes
 	if (process.platform === 'win32') {
 		targets = `win-x64`;
 	}
@ -321,7 +326,11 @@ async function zipPkg() {
 	});
 }

-async function signFilesForNotarization() {
+export async function signFilesForNotarization() {
+	console.log('Signing files for notarization');
+	if (process.platform !== 'darwin') {
+		return;
+	}
 	console.log('Deleting unneeded zip files...');
 	await new Promise((resolve, reject) => {
 		klaw('node_modules/')
@ -421,6 +430,7 @@ export async function buildStandaloneZip() {
 }

 async function renameInstallerFiles() {
+	const oclifInstallers = await getOclifInstallersOriginalNames();
 	if (await fs.pathExists(oclifInstallers[process.platform])) {
 		await fs.rename(
 			oclifInstallers[process.platform],
@ -435,18 +445,20 @@ async function renameInstallerFiles() {
 * https://learn.microsoft.com/en-us/dotnet/framework/tools/signtool-exe
 */
 async function signWindowsInstaller() {
-	if (process.env.CSC_LINK && process.env.CSC_KEY_PASSWORD) {
+	if (process.env.SM_CODE_SIGNING_CERT_SHA1_HASH) {
 		const exeName = renamedOclifInstallers[process.platform];
 		console.log(`Signing installer "${exeName}"`);
 		// trust ...
 		await execFileAsync('signtool.exe', [
 			'sign',
-			'-t',
+			'-sha1',
+			process.env.SM_CODE_SIGNING_CERT_SHA1_HASH,
+			'-tr',
 			process.env.TIMESTAMP_SERVER || 'http://timestamp.comodoca.com',
-			'-f',
-			process.env.CSC_LINK,
-			'-p',
-			process.env.CSC_KEY_PASSWORD,
+			'-td',
+			'SHA256',
+			'-fd',
+			'SHA256',
 			'-d',
 			`balena-cli ${version}`,
 			exeName,
@ -491,7 +503,7 @@ export async function buildOclifInstaller() {
 	let packOpts = ['-r', ROOT];
 	if (process.platform === 'darwin') {
 		packOS = 'macos';
-		packOpts = packOpts.concat('--targets', 'darwin-x64');
+		packOpts = packOpts.concat('--targets', `darwin-${arch}`);
 	} else if (process.platform === 'win32') {
 		packOS = 'win';
 		packOpts = packOpts.concat('--targets', 'win32-x64');
@ -507,10 +519,6 @@ export async function buildOclifInstaller() {
 			console.log(`rimraf(${dir})`);
 			await Bluebird.fromCallback((cb) => rimraf(dir, cb));
 		}
-		if (process.platform === 'darwin') {
-			console.log('Signing files for notarization...');
-			await signFilesForNotarization();
-		}
 		console.log('=======================================================');
 		console.log(`oclif ${packCmd} ${packOpts.join(' ')}`);
 		console.log(`cwd="${process.cwd()}" ROOT="${ROOT}"`);
--- a/automation/capitanodoc/capitanodoc.ts
+++ b/automation/capitanodoc/capitanodoc.ts
@ -54,15 +54,15 @@ interface Documentation {

 // Mapping folders names to custom headings in the docs
 const commandHeadings: { [key: string]: string } = {
-	'api-key': 'API Key',
+	'api-key': 'API Keys',
 	'api-keys': 'API Keys',
 	login: 'Authentication',
 	whoami: 'Authentication',
 	logout: 'Authentication',
-	env: 'Environment Variable',
+	env: 'Environment Variables',
 	envs: 'Environment Variables',
 	help: 'Help and Version',
-	key: 'SSH Key',
+	key: 'SSH Keys',
 	keys: 'SSH Keys',
 	orgs: 'Organizations',
 	os: 'OS',
@ -73,6 +73,12 @@ const commandHeadings: { [key: string]: string } = {
 	build: 'Deploy',
 	join: 'Platform',
 	leave: 'Platform',
+	app: 'Apps',
+	block: 'Blocks',
+	device: 'Devices',
+	fleet: 'Fleets',
+	release: 'Releases',
+	tag: 'Tags',
 };

 // Fetch all available commands
--- a/automation/capitanodoc/doc-types.d.ts
+++ b/automation/capitanodoc/doc-types.d.ts
@ -14,7 +14,7 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import { Command as OclifCommandClass } from '@oclif/core';
+import type { Command as OclifCommandClass } from '@oclif/core';

 type OclifCommand = typeof OclifCommandClass;

--- a/automation/capitanodoc/index.ts
+++ b/automation/capitanodoc/index.ts
@ -16,7 +16,7 @@
 */
 import * as path from 'path';
 import { getCapitanoDoc } from './capitanodoc';
-import { Category, Document, OclifCommand } from './doc-types';
+import type { Category, Document, OclifCommand } from './doc-types';
 import * as markdown from './markdown';
 import { stripIndent } from '../../lib/utils/lazy';

--- a/automation/capitanodoc/markdown.ts
+++ b/automation/capitanodoc/markdown.ts
@ -20,7 +20,7 @@ import * as _ from 'lodash';

 import { getManualSortCompareFunction } from '../../lib/utils/helpers';
 import { capitanoizeOclifUsage } from '../../lib/utils/oclif-utils';
-import { Category, Document, OclifCommand } from './doc-types';
+import type { Category, Document, OclifCommand } from './doc-types';

 function renderOclifCommand(command: OclifCommand): string[] {
 	const result = [`## ${ent.encode(command.usage || '')}`];
--- a/automation/run.ts
+++ b/automation/run.ts
@ -21,6 +21,7 @@ import {
 	buildOclifInstaller,
 	buildStandaloneZip,
 	catchUncommitted,
+	signFilesForNotarization,
 	testShrinkwrap,
 } from './build-bin';
 import {
@ -54,6 +55,7 @@ async function parse(args?: string[]) {
 	const commands: { [cmd: string]: () => void | Promise<void> } = {
 		'build:installer': buildOclifInstaller,
 		'build:standalone': buildStandaloneZip,
+		'sign:binaries': signFilesForNotarization,
 		'catch-uncommitted': catchUncommitted,
 		'test-shrinkwrap': testShrinkwrap,
 		fix1359: updateDescriptionOfReleasesAffectedByIssue1359,
@ -65,21 +67,6 @@ async function parse(args?: string[]) {
 		}
 	}

-	// The BUILD_TMP env var is used as an alternative location for oclif
-	// (patched) to copy/extract the CLI files, run npm install and then
-	// create the NSIS executable installer for Windows. This was necessary
-	// to avoid issues with a 260-char limit on Windows paths (possibly a
-	// limitation of some library used by NSIS), as the "current working dir"
-	// provided by balena CI is a rather long path to start with.
-	if (process.platform === 'win32' && !process.env.BUILD_TMP) {
-		const randID = (await import('crypto'))
-			.randomBytes(6)
-			.toString('base64')
-			.replace(/\+/g, '-')
-			.replace(/\//g, '_'); // base64url (RFC 4648)
-		process.env.BUILD_TMP = `C:\\tmp\\${randID}`;
-	}
-
 	for (const arg of args) {
 		try {
 			const cmdFunc = commands[arg];
--- a/automation/update-module.ts
+++ b/automation/update-module.ts
@ -107,11 +107,11 @@ async function $main() {

 	const changeType = process.argv[4]
 		? // if the caller specified a change type, use that one
-		  validateChangeType(process.argv[4])
+			validateChangeType(process.argv[4])
 		: // use the same change type as in the dependency, but avoid major bumps
-		semverChangeType && semverChangeType !== 'major'
-		? semverChangeType
-		: 'minor';
+			semverChangeType && semverChangeType !== 'major'
+			? semverChangeType
+			: 'minor';
 	console.log(`Using Change-type: ${changeType}`);

 	let { stdout: currentBranch } = await run('git rev-parse --abbrev-ref HEAD');
--- a/automation/utils.ts
+++ b/automation/utils.ts
@ -76,8 +76,8 @@ export function diffLines(str1: string, str2: string): string {
 			return part.added
 				? prefix(part.value, '+')
 				: part.removed
-				? prefix(part.value, '-')
-				: prefix(part.value, ' ');
+					? prefix(part.value, '-')
+					: prefix(part.value, ' ');
 		})
 		.join('\n');
 	return diffStr;
--- a/bin/balena
+++ b/bin/balena
@ -1,21 +0,0 @@
-#!/usr/bin/env node
-
-// We boost the threadpool size as ext2fs can deadlock with some
-// operations otherwise, if the pool runs out.
-process.env.UV_THREADPOOL_SIZE = '64';
-
-// Disable oclif registering ts-node
-process.env.OCLIF_TS_NODE = 0;
-
-async function run() {
-	// Use fast-boot to cache require lookups, speeding up startup
-	await require('../build/fast-boot').start();
-
-	// Set the desired es version for downstream modules that support it
-	require('@balena/es-version').set('es2018');
-
-	// Run the CLI
-	await require('../build/app').run(undefined, { dir: __dirname });
-}
-
-run();
--- a/bin/balena
+++ b/bin/balena
@ -0,0 +1 @@
+run.js
--- a/bin/balena-dev
+++ b/bin/balena-dev
@ -1,87 +0,0 @@
-#!/usr/bin/env node
-
-// ****************************************************************************
-// THIS IS FOR DEV PURPOSES ONLY AND WILL NOT BE PART OF THE PUBLISHED PACKAGE
-// Before opening a PR you should build and test your changes using bin/balena
-// ****************************************************************************
-
-// We boost the threadpool size as ext2fs can deadlock with some
-// operations otherwise, if the pool runs out.
-process.env.UV_THREADPOOL_SIZE = '64';
-
-// Note on `fast-boot2`: We do not use `fast-boot2` with `balena-dev` because:
-// * fast-boot2's cacheKiller option is configured to include the timestamps of
-//   the package.json and npm-shrinkwrap.json files, to avoid unexpected CLI
-//   behavior when changes are made to dependencies during development. This is
-//   generally a good thing, however, `balena-dev` (a few lines below) edits
-//   `package.json` to modify oclif paths, and this results in cache
-//   invalidation and a performance hit rather than speedup.
-// * Even if the timestamps are removed from cacheKiller, so that there is no
-//   cache invalidation, fast-boot's speedup is barely noticeable when ts-node
-//   is used, e.g. 1.43s vs 1.4s when running `balena version`.
-// * `fast-boot` causes unexpected behavior when used with `npm link` or
-//   when the `node_modules` folder is manually modified (affecting transitive
-//   dependencies) during development (e.g. bug investigations). A workaround
-//   is to use `balena-dev` without `fast-boot`. See also notes in
-//   `CONTRIBUTING.md`.
-
-const path = require('path');
-const rootDir = path.join(__dirname, '..');
-
-// Allow balena-dev to work with oclif by temporarily
-// pointing oclif config options to lib/ instead of build/
-modifyOclifPaths();
-// Undo changes on exit
-process.on('exit', function () {
-	modifyOclifPaths(true);
-});
-// Undo changes in case of ctrl-c
-process.on('SIGINT', function () {
-	modifyOclifPaths(true);
-	// Note process exit here will interfere with commands that do their own SIGINT handling,
-	// but without it commands can not be exited.
-	// So currently using balena-dev does not guarantee proper exit behaviour when using ctrl-c.
-	// Ideally a better solution is needed.
-	process.exit();
-});
-
-// Set the desired es version for downstream modules that support it
-require('@balena/es-version').set('es2018');
-
-// Note: before ts-node v6.0.0, 'transpile-only' (no type checking) was the
-// default option. We upgraded ts-node and found that adding 'transpile-only'
-// was necessary to avoid a mysterious 'null' error message. On the plus side,
-// it is supposed to run faster. We still benefit from type checking when
-// running 'npm run build'.
-require('ts-node').register({
-	project: path.join(rootDir, 'tsconfig.json'),
-	transpileOnly: true,
-});
-require('../lib/app').run(undefined, { dir: __dirname, development: true });
-
-// Modify package.json oclif paths from build/ -> lib/, or vice versa
-function modifyOclifPaths(revert) {
-	const fs = require('fs');
-	const packageJsonPath = path.join(rootDir, 'package.json');
-
-	const packageJson = fs.readFileSync(packageJsonPath, 'utf8');
-	const packageObj = JSON.parse(packageJson);
-
-	if (!packageObj.oclif) {
-		return;
-	}
-
-	let oclifSectionText = JSON.stringify(packageObj.oclif);
-	if (!revert) {
-		oclifSectionText = oclifSectionText.replace(/\/build\//g, '/lib/');
-	} else {
-		oclifSectionText = oclifSectionText.replace(/\/lib\//g, '/build/');
-	}
-
-	packageObj.oclif = JSON.parse(oclifSectionText);
-	fs.writeFileSync(
-		packageJsonPath,
-		`${JSON.stringify(packageObj, null, 2)}\n`,
-		'utf8',
-	);
-}
--- a/bin/balena-dev
+++ b/bin/balena-dev
@ -0,0 +1 @@
+dev.js
--- a/bin/dev.cmd
+++ b/bin/dev.cmd
@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run" %*
--- a/bin/dev.js
+++ b/bin/dev.js
@ -0,0 +1,87 @@
+#!/usr/bin/env node
+
+// ****************************************************************************
+// THIS IS FOR DEV PURPOSES ONLY AND WILL NOT BE PART OF THE PUBLISHED PACKAGE
+// Before opening a PR you should build and test your changes using bin/balena
+// ****************************************************************************
+
+// We boost the threadpool size as ext2fs can deadlock with some
+// operations otherwise, if the pool runs out.
+process.env.UV_THREADPOOL_SIZE = '64';
+
+// Note on `fast-boot2`: We do not use `fast-boot2` with `balena-dev` because:
+// * fast-boot2's cacheKiller option is configured to include the timestamps of
+//   the package.json and npm-shrinkwrap.json files, to avoid unexpected CLI
+//   behavior when changes are made to dependencies during development. This is
+//   generally a good thing, however, `balena-dev` (a few lines below) edits
+//   `package.json` to modify oclif paths, and this results in cache
+//   invalidation and a performance hit rather than speedup.
+// * Even if the timestamps are removed from cacheKiller, so that there is no
+//   cache invalidation, fast-boot's speedup is barely noticeable when ts-node
+//   is used, e.g. 1.43s vs 1.4s when running `balena version`.
+// * `fast-boot` causes unexpected behavior when used with `npm link` or
+//   when the `node_modules` folder is manually modified (affecting transitive
+//   dependencies) during development (e.g. bug investigations). A workaround
+//   is to use `balena-dev` without `fast-boot`. See also notes in
+//   `CONTRIBUTING.md`.
+
+const path = require('path');
+const rootDir = path.join(__dirname, '..');
+
+// Allow balena-dev to work with oclif by temporarily
+// pointing oclif config options to lib/ instead of build/
+modifyOclifPaths();
+// Undo changes on exit
+process.on('exit', function () {
+	modifyOclifPaths(true);
+});
+// Undo changes in case of ctrl-c
+process.on('SIGINT', function () {
+	modifyOclifPaths(true);
+	// Note process exit here will interfere with commands that do their own SIGINT handling,
+	// but without it commands can not be exited.
+	// So currently using balena-dev does not guarantee proper exit behaviour when using ctrl-c.
+	// Ideally a better solution is needed.
+	process.exit();
+});
+
+// Set the desired es version for downstream modules that support it
+require('@balena/es-version').set('es2018');
+
+// Note: before ts-node v6.0.0, 'transpile-only' (no type checking) was the
+// default option. We upgraded ts-node and found that adding 'transpile-only'
+// was necessary to avoid a mysterious 'null' error message. On the plus side,
+// it is supposed to run faster. We still benefit from type checking when
+// running 'npm run build'.
+require('ts-node').register({
+	project: path.join(rootDir, 'tsconfig.json'),
+	transpileOnly: true,
+});
+require('../lib/app').run(undefined, { dir: __dirname, development: true });
+
+// Modify package.json oclif paths from build/ -> lib/, or vice versa
+function modifyOclifPaths(revert) {
+	const fs = require('fs');
+	const packageJsonPath = path.join(rootDir, 'package.json');
+
+	const packageJson = fs.readFileSync(packageJsonPath, 'utf8');
+	const packageObj = JSON.parse(packageJson);
+
+	if (!packageObj.oclif) {
+		return;
+	}
+
+	let oclifSectionText = JSON.stringify(packageObj.oclif);
+	if (!revert) {
+		oclifSectionText = oclifSectionText.replace(/\/build\//g, '/lib/');
+	} else {
+		oclifSectionText = oclifSectionText.replace(/\/lib\//g, '/build/');
+	}
+
+	packageObj.oclif = JSON.parse(oclifSectionText);
+	fs.writeFileSync(
+		packageJsonPath,
+		`${JSON.stringify(packageObj, null, 2)}\n`,
+		'utf8',
+	);
+}
--- a/bin/run.cmd
+++ b/bin/run.cmd
@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run" %*
--- a/bin/run.js
+++ b/bin/run.js
@ -0,0 +1,21 @@
+#!/usr/bin/env node
+
+// We boost the threadpool size as ext2fs can deadlock with some
+// operations otherwise, if the pool runs out.
+process.env.UV_THREADPOOL_SIZE = '64';
+
+// Disable oclif registering ts-node
+process.env.OCLIF_TS_NODE = 0;
+
+async function run() {
+	// Use fast-boot to cache require lookups, speeding up startup
+	await require('../build/fast-boot').start();
+
+	// Set the desired es version for downstream modules that support it
+	require('@balena/es-version').set('es2018');
+
+	// Run the CLI
+	await require('../build/app').run(undefined, { dir: __dirname });
+}
+
+run();
--- a/docs/balena-cli.md
+++ b/docs/balena-cli.md
@ -160,16 +160,13 @@ are encouraged to regularly update the balena CLI to the latest version.

 # CLI Command Reference

- API Key
+- API Keys

 	- [api-key generate &#60;name&#62;](#api-key-generate-name)
 	- [api-key revoke &#60;ids&#62;](#api-key-revoke-ids)
-
- API Keys
-
 	- [api-keys](#api-keys)

- App
+- Apps

 	- [app create &#60;name&#62;](#app-create-name)

@ -179,7 +176,7 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [logout](#logout)
 	- [whoami](#whoami)

- Block
+- Blocks

 	- [block create &#60;name&#62;](#block-create-name)

@ -196,7 +193,7 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [build [source]](#build-source)
 	- [deploy &#60;fleet&#62; [image]](#deploy-fleet-image)

- Device
+- Devices

 	- [device deactivate &#60;uuid&#62;](#device-deactivate-uuid)
 	- [device identify &#60;uuid&#62;](#device-identify-uuid)
@ -217,23 +214,17 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [device start-service &#60;uuid&#62;](#device-start-service-uuid)
 	- [device stop-service &#60;uuid&#62;](#device-stop-service-uuid)
 	- [device track-fleet &#60;uuid&#62;](#device-track-fleet-uuid)
-
- Devices
-
 	- [devices](#devices)
 	- [devices supported](#devices-supported)

- Environment Variable
-
-	- [env add &#60;name&#62; [value]](#env-add-name-value)
-	- [env rename &#60;id&#62; &#60;value&#62;](#env-rename-id-value)
-	- [env rm &#60;id&#62;](#env-rm-id)
-
 - Environment Variables

 	- [envs](#envs)
+	- [env rm &#60;id&#62;](#env-rm-id)
+	- [env add &#60;name&#62; [value]](#env-add-name-value)
+	- [env rename &#60;id&#62; &#60;value&#62;](#env-rename-id-value)

- Fleet
+- Fleets

 	- [fleet create &#60;name&#62;](#fleet-create-name)
 	- [fleet &#60;fleet&#62;](#fleet-fleet)
@ -243,9 +234,6 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [fleet restart &#60;fleet&#62;](#fleet-restart-fleet)
 	- [fleet rm &#60;fleet&#62;](#fleet-rm-fleet)
 	- [fleet track-latest &#60;slug&#62;](#fleet-track-latest-slug)
-
- Fleets
-
 	- [fleets](#fleets)

 - Local
@ -292,42 +280,33 @@ are encouraged to regularly update the balena CLI to the latest version.

 	- [push &#60;fleetordevice&#62;](#push-fleetordevice)

- Release
+- Releases

 	- [release finalize &#60;commitorid&#62;](#release-finalize-commitorid)
 	- [release &#60;commitorid&#62;](#release-commitorid)
 	- [release invalidate &#60;commitorid&#62;](#release-invalidate-commitorid)
 	- [release validate &#60;commitorid&#62;](#release-validate-commitorid)
-
- Releases
-
 	- [releases &#60;fleet&#62;](#releases-fleet)

 - Settings

 	- [settings](#settings)

- SSH Key
+- SSH Keys

 	- [key add &#60;name&#62; [path]](#key-add-name-path)
 	- [key &#60;id&#62;](#key-id)
 	- [key rm &#60;id&#62;](#key-rm-id)
-
- SSH Keys
-
 	- [keys](#keys)

 - Support

 	- [support &#60;action&#62;](#support-action)

- Tag
+- Tags

 	- [tag rm &#60;tagkey&#62;](#tag-rm-tagkey)
 	- [tag set &#60;tagkey&#62; [value]](#tag-set-tagkey-value)
-
- Tags
-
 	- [tags](#tags)

 - Utilities
@ -338,7 +317,7 @@ are encouraged to regularly update the balena CLI to the latest version.

 	- [version](#version)

-# API Key
+# API Keys

 ## api-key generate &#60;name&#62;

@ -380,8 +359,6 @@ the API key ids

 ### Options

-# API Keys
-
 ## api-keys

 Print a list of balenaCloud API keys.
@ -402,7 +379,7 @@ show API keys for your user

 fleet name or slug (preferred)

-# App
+# Apps

 ## app create &#60;name&#62;

@ -524,7 +501,7 @@ Examples:

 	$ balena whoami

-# Block
+# Blocks

 ## block create &#60;name&#62;

@ -882,6 +859,7 @@ Examples:

 	$ balena build --fleet myFleet
 	$ balena build ./source/ --fleet myorg/myfleet
+	$ balena build --deviceType raspberrypi3 --emulated
 	$ balena build --deviceType raspberrypi3 --arch armv7hf --emulated
 	$ balena build --docker /var/run/docker.sock --fleet myFleet   # Linux, Mac
 	$ balena build --docker //./pipe/docker_engine --fleet myFleet # Windows
@ -1214,7 +1192,7 @@ Docker host TLS certificate file

 Docker host TLS key file

-# Device
+# Devices

 ## device deactivate &#60;uuid&#62;

@ -1774,8 +1752,6 @@ the uuid of the device to make track the fleet's release

 ### Options

-# Devices
-
 ## devices

 List all of your devices.
@ -1835,7 +1811,149 @@ Examples:

 produce JSON output instead of tabular output

-# Environment Variable
+# Environment Variables
+
+## envs
+
+List the environment or configuration variables of a fleet, device or
+service, as selected by the respective command-line options. (A service
+corresponds to a Docker image/container in a microservices fleet.)
+
+The results include fleet-wide (multiple devices), device-specific (multiple
+services on a specific device) and service-specific variables that apply to the
+selected fleet, device or service. It can be thought of as including inherited
+variables; for example, a service inherits device-wide variables, and a device
+inherits fleet-wide variables.
+
+The printed output may include DEVICE and/or SERVICE columns to distinguish
+between fleet-wide, device-specific and service-specific variables.
+An asterisk in these columns indicates that the variable applies to
+"all devices" or "all services".
+
+The --config option is used to list "configuration variables" that control
+balena platform features, as opposed to custom environment variables defined
+by the user. The --config and the --service options are mutually exclusive
+because configuration variables cannot be set for specific services.
+
+The --json option is recommended when scripting the output of this command,
+because the JSON format is less likely to change and it better represents data
+types like lists and empty strings. The 'jq' utility may be helpful in shell
+scripts (https://stedolan.github.io/jq/manual/). When --json is used, an empty
+JSON array ([]) is printed instead of an error message when no variables exist
+for the given query. When querying variables for a device, note that the fleet
+name may be null in JSON output (or 'N/A' in tabular output) if the fleet that
+the device belonged to is no longer accessible by the current user (for example,
+in case the current user was removed from the fleet by the fleet's owner).
+
+Fleets may be specified by fleet name or slug. Fleet slugs are
+the recommended option, as they are unique and unambiguous. Slugs can be
+listed with the `balena fleets` command. Note that slugs may change if the
+fleet is renamed. Fleet names are not unique and may result in  "Fleet is
+ambiguous" errors at any time (even if it "used to work in the past"), for
+example if the name clashes with a newly created public fleet, or with fleets
+from other balena accounts that you may be invited to join under any role.
+For this reason, fleet names are especially discouraged in scripts (e.g. CI
+environments).
+
+Examples:
+
+	$ balena envs --fleet myorg/myfleet
+	$ balena envs --fleet MyFleet --json
+	$ balena envs --fleet MyFleet --service MyService
+	$ balena envs --fleet MyFleet --config
+	$ balena envs --device 7cf02a6
+	$ balena envs --device 7cf02a6 --json
+	$ balena envs --device 7cf02a6 --config --json
+	$ balena envs --device 7cf02a6 --service MyService
+
+### Options
+
+#### -f, --fleet FLEET
+
+fleet name or slug (preferred)
+
+#### -c, --config
+
+show configuration variables only
+
+#### -d, --device DEVICE
+
+device UUID
+
+#### -j, --json
+
+produce JSON output instead of tabular output
+
+#### -s, --service SERVICE
+
+service name
+
+## env rm &#60;id&#62;
+
+Remove a configuration or environment variable from a fleet, device
+or service, as selected by command-line options.
+
+Variables are selected by their database ID (as reported by the 'balena envs'
+command) and one of six database "resource types":
+
+- fleet environment variable
+- fleet configuration variable (--config)
+- fleet service variable (--service)
+- device environment variable (--device)
+- device configuration variable (--device --config)
+- device service variable (--device --service)
+
+The --device option selects a device-specific variable instead of a fleet
+variable.
+
+The --config option selects a configuration variable. Configuration variable
+names typically start with the 'BALENA_' or 'RESIN_' prefixes and are used to
+configure balena platform features.
+
+The --service option selects a service variable, which is an environment variable
+that applies to a specifc service (container) in a microservices (multicontainer)
+fleet.
+
+The --service and --config options cannot be used together, but they can be
+used alongside the --device option to select a device-specific service or
+configuration variable.
+
+Interactive confirmation is normally asked before the variable is deleted.
+The --yes option disables this behavior.
+
+Examples:
+
+	$ balena env rm 123123
+	$ balena env rm 234234 --yes
+	$ balena env rm 345345 --config
+	$ balena env rm 456456 --service
+	$ balena env rm 567567 --device
+	$ balena env rm 678678 --device --config
+	$ balena env rm 789789 --device --service --yes
+
+### Arguments
+
+#### ID
+
+variable's numeric database ID
+
+### Options
+
+#### -c, --config
+
+select a configuration variable (may be used together with the --device option)
+
+#### -d, --device
+
+select a device-specific variable instead of a fleet variable
+
+#### -s, --service
+
+select a service variable (may be used together with the --device option)
+
+#### -y, --yes
+
+do not prompt for confirmation before deleting the variable

 ## env add &#60;name&#62; [value]

@ -1975,151 +2093,7 @@ select a device-specific variable instead of a fleet variable

 select a service variable (may be used together with the --device option)

-## env rm &#60;id&#62;
-
-Remove a configuration or environment variable from a fleet, device
-or service, as selected by command-line options.
-
-Variables are selected by their database ID (as reported by the 'balena envs'
-command) and one of six database "resource types":
-
- fleet environment variable
- fleet configuration variable (--config)
- fleet service variable (--service)
- device environment variable (--device)
- device configuration variable (--device --config)
- device service variable (--device --service)
-
-The --device option selects a device-specific variable instead of a fleet
-variable.
-
-The --config option selects a configuration variable. Configuration variable
-names typically start with the 'BALENA_' or 'RESIN_' prefixes and are used to
-configure balena platform features.
-
-The --service option selects a service variable, which is an environment variable
-that applies to a specifc service (container) in a microservices (multicontainer)
-fleet.
-
-The --service and --config options cannot be used together, but they can be
-used alongside the --device option to select a device-specific service or
-configuration variable.
-
-Interactive confirmation is normally asked before the variable is deleted.
-The --yes option disables this behavior.
-
-Examples:
-
-	$ balena env rm 123123
-	$ balena env rm 234234 --yes
-	$ balena env rm 345345 --config
-	$ balena env rm 456456 --service
-	$ balena env rm 567567 --device
-	$ balena env rm 678678 --device --config
-	$ balena env rm 789789 --device --service --yes
-
-### Arguments
-
-#### ID
-
-variable's numeric database ID
-
-### Options
-
-#### -c, --config
-
-select a configuration variable (may be used together with the --device option)
-
-#### -d, --device
-
-select a device-specific variable instead of a fleet variable
-
-#### -s, --service
-
-select a service variable (may be used together with the --device option)
-
-#### -y, --yes
-
-do not prompt for confirmation before deleting the variable
-
-# Environment Variables
-
-## envs
-
-List the environment or configuration variables of a fleet, device or
-service, as selected by the respective command-line options. (A service
-corresponds to a Docker image/container in a microservices fleet.)
-
-The results include fleet-wide (multiple devices), device-specific (multiple
-services on a specific device) and service-specific variables that apply to the
-selected fleet, device or service. It can be thought of as including inherited
-variables; for example, a service inherits device-wide variables, and a device
-inherits fleet-wide variables.
-
-The printed output may include DEVICE and/or SERVICE columns to distinguish
-between fleet-wide, device-specific and service-specific variables.
-An asterisk in these columns indicates that the variable applies to
-"all devices" or "all services".
-
-The --config option is used to list "configuration variables" that control
-balena platform features, as opposed to custom environment variables defined
-by the user. The --config and the --service options are mutually exclusive
-because configuration variables cannot be set for specific services.
-
-The --json option is recommended when scripting the output of this command,
-because the JSON format is less likely to change and it better represents data
-types like lists and empty strings. The 'jq' utility may be helpful in shell
-scripts (https://stedolan.github.io/jq/manual/). When --json is used, an empty
-JSON array ([]) is printed instead of an error message when no variables exist
-for the given query. When querying variables for a device, note that the fleet
-name may be null in JSON output (or 'N/A' in tabular output) if the fleet that
-the device belonged to is no longer accessible by the current user (for example,
-in case the current user was removed from the fleet by the fleet's owner).
-
-Fleets may be specified by fleet name or slug. Fleet slugs are
-the recommended option, as they are unique and unambiguous. Slugs can be
-listed with the `balena fleets` command. Note that slugs may change if the
-fleet is renamed. Fleet names are not unique and may result in  "Fleet is
-ambiguous" errors at any time (even if it "used to work in the past"), for
-example if the name clashes with a newly created public fleet, or with fleets
-from other balena accounts that you may be invited to join under any role.
-For this reason, fleet names are especially discouraged in scripts (e.g. CI
-environments).
-
-Examples:
-
-	$ balena envs --fleet myorg/myfleet
-	$ balena envs --fleet MyFleet --json
-	$ balena envs --fleet MyFleet --service MyService
-	$ balena envs --fleet MyFleet --config
-	$ balena envs --device 7cf02a6
-	$ balena envs --device 7cf02a6 --json
-	$ balena envs --device 7cf02a6 --config --json
-	$ balena envs --device 7cf02a6 --service MyService
-
-### Options
-
-#### -f, --fleet FLEET
-
-fleet name or slug (preferred)
-
-#### -c, --config
-
-show configuration variables only
-
-#### -d, --device DEVICE
-
-device UUID
-
-#### -j, --json
-
-produce JSON output instead of tabular output
-
-#### -s, --service SERVICE
-
-service name
-
-# Fleet
+# Fleets

 ## fleet create &#60;name&#62;

@ -2366,8 +2340,6 @@ the slug of the fleet to make track the latest release

 ### Options

-# Fleets
-
 ## fleets

 List all your balena fleets.
@ -2862,11 +2834,6 @@ from other balena accounts that you may be invited to join under any role.
 For this reason, fleet names are especially discouraged in scripts (e.g. CI
 environments).

-Note: This command is currently not supported on Windows natively. Windows users
-are advised to install the Windows Subsystem for Linux (WSL) with Ubuntu, and use
-the Linux release of the balena CLI:
-https://docs.microsoft.com/en-us/windows/wsl/about
-
 Examples:

 	$ balena os configure ../path/rpi3.img --device 7cf02a6
@ -3400,7 +3367,7 @@ as final by default unless this option is given.

 The notes for this release

-# Release
+# Releases

 ## release finalize &#60;commitOrId&#62;

@ -3499,8 +3466,6 @@ the commit or ID of the release to validate

 ### Options

-# Releases
-
 ## releases &#60;fleet&#62;

 List all releases of the given fleet.
@ -3549,7 +3514,7 @@ Examples:

 ### Options

-# SSH Key
+# SSH Keys

 ## key add &#60;name&#62; [path]

@ -3629,8 +3594,6 @@ balenaCloud ID for the SSH key

 answer "yes" to all questions (non interactive use)

-# SSH Keys
-
 ## keys

 List all SSH keys registered in balenaCloud for the logged in user.
@ -3691,7 +3654,7 @@ comma-separated list (no spaces) of fleet names or slugs (preferred)

 length of time to enable support for, in (h)ours or (d)ays, e.g. 12h, 2d

-# Tag
+# Tags

 ## tag rm &#60;tagKey&#62;

@ -3788,8 +3751,6 @@ device UUID

 release id

-# Tags
-
 ## tags

 List all tags and their values for the specified fleet, device or release.
--- a/lib/app.ts
+++ b/lib/app.ts
@ -16,8 +16,8 @@
 */

 import * as packageJSON from '../package.json';
+import type { AppOptions } from './preparser';
 import {
-	AppOptions,
 	checkDeletedCommand,
 	preparseArgs,
 	unsupportedFlag,
@ -157,7 +157,7 @@ async function oclifRun(command: string[], options: AppOptions) {
 	await Promise.all([trackPromise, deprecationPromise, runPromise]);
 }

-/** CLI entrypoint. Called by the `bin/balena` and `bin/balena-dev` scripts. */
+/** CLI entrypoint. Called by the `bin/run.js` and `bin/dev.js` scripts. */
 export async function run(cliArgs = process.argv, options: AppOptions) {
 	try {
 		const { setOfflineModeEnvVars, normalizeEnvVars, pkgExec } = await import(
--- a/lib/commands/api-keys/index.ts
+++ b/lib/commands/api-keys/index.ts
@ -52,7 +52,7 @@ export default class ApiKeysCmd extends Command {
 					await getApplication(getBalenaSdk(), options.fleet, {
 						$select: 'actor',
 					})
-			  ).actor
+				).actor
 			: await getBalenaSdk().auth.getActorId();
 		const keys = await getBalenaSdk().pine.get({
 			resource: 'api_key',
@ -65,7 +65,7 @@ export default class ApiKeysCmd extends Command {
 								name: {
 									$ne: null,
 								},
-						  }
+							}
 						: {}),
 				},
 				$orderby: 'name asc',
--- a/lib/commands/build/index.ts
+++ b/lib/commands/build/index.ts
@ -20,7 +20,13 @@ import Command from '../../command';
 import { getBalenaSdk } from '../../utils/lazy';
 import * as cf from '../../utils/common-flags';
 import * as compose from '../../utils/compose';
-import type { ApplicationType, BalenaSDK } from 'balena-sdk';
+import type {
+	ApplicationType,
+	BalenaSDK,
+	DeviceType,
+	PineOptions,
+	PineTypedResult,
+} from 'balena-sdk';
 import {
 	buildArgDeprecation,
 	dockerignoreHelp,
@ -67,6 +73,7 @@ ${dockerignoreHelp}
 	public static examples = [
 		'$ balena build --fleet myFleet',
 		'$ balena build ./source/ --fleet myorg/myfleet',
+		'$ balena build --deviceType raspberrypi3 --emulated',
 		'$ balena build --deviceType raspberrypi3 --arch armv7hf --emulated',
 		'$ balena build --docker /var/run/docker.sock --fleet myFleet   # Linux, Mac',
 		'$ balena build --docker //./pipe/docker_engine --fleet myFleet # Windows',
@ -114,6 +121,8 @@ ${dockerignoreHelp}
 		options.source = params.source;
 		delete params.source;

+		await this.resolveArchFromDeviceType(sdk, options);
+
 		await this.validateOptions(options, sdk);

 		// Build args are under consideration for removal - warn user
@ -127,7 +136,7 @@ ${dockerignoreHelp}

 		try {
 			await this.buildProject(docker, logger, composeOpts, {
-				app,
+				appType: app?.application_type?.[0],
 				arch: options.arch!,
 				deviceType: options.deviceType!,
 				buildEmulated: options.emulated,
@ -150,7 +159,7 @@ ${dockerignoreHelp}
 		) {
 			const { ExpectedError } = await import('../../errors');
 			throw new ExpectedError(
-				'You must specify either a fleet (-f), or the device type (-d) and architecture (-A)',
+				'You must specify either a fleet (-f), or the device type (-d) and optionally the architecture (-A)',
 			);
 		}

@ -170,6 +179,39 @@ ${dockerignoreHelp}
 		opts['registry-secrets'] = registrySecrets;
 	}

+	protected async resolveArchFromDeviceType(sdk: BalenaSDK, opts: FlagsDef) {
+		if (opts.deviceType != null && opts.arch == null) {
+			try {
+				const deviceTypeOpts = {
+					$select: 'is_of__cpu_architecture',
+					$expand: {
+						is_of__cpu_architecture: {
+							$select: 'slug',
+						},
+					},
+				} satisfies PineOptions<DeviceType>;
+				opts.arch = (
+					(await sdk.models.deviceType.get(
+						opts.deviceType,
+						deviceTypeOpts,
+					)) as PineTypedResult<DeviceType, typeof deviceTypeOpts>
+				).is_of__cpu_architecture[0].slug;
+			} catch (err) {
+				const { ExpectedError } = await import('../../errors');
+				if (err instanceof sdk.errors.BalenaInvalidDeviceType) {
+					let message = err.message;
+					if (!(await sdk.auth.isLoggedIn())) {
+						message = `${message}. In case you are trying to use a private device type, please try to log in first.`;
+					}
+					throw new ExpectedError(message);
+				}
+				throw new ExpectedError(
+					'Failed to resolve the architecture of the provided device type. If you are in an air-gapped environment please also define the architecture (-A) parameter.',
+				);
+			}
+		}
+	}
+
 	protected async getAppAndResolveArch(opts: FlagsDef) {
 		if (opts.fleet) {
 			const { getAppWithArch } = await import('../../utils/helpers');
@ -212,9 +254,7 @@ ${dockerignoreHelp}
 		logger: import('../../utils/logger'),
 		composeOpts: ComposeOpts,
 		opts: {
-			app?: {
-				application_type: [Pick<ApplicationType, 'supports_multicontainer'>];
-			};
+			appType?: Pick<ApplicationType, 'supports_multicontainer'>;
 			arch: string;
 			deviceType: string;
 			buildEmulated: boolean;
@ -230,11 +270,10 @@ ${dockerignoreHelp}
 			opts.buildOpts.t,
 		);

-		const appType = opts.app?.application_type?.[0];
 		if (
-			appType != null &&
+			opts.appType != null &&
 			project.descriptors.length > 1 &&
-			!appType.supports_multicontainer
+			!opts.appType.supports_multicontainer
 		) {
 			logger.logWarn(
 				'Target fleet does not support multiple containers.\n' +
--- a/lib/commands/device/index.ts
+++ b/lib/commands/device/index.ts
@ -91,7 +91,7 @@ export default class DeviceCmd extends Command {
 							},
 							...expandForAppName.$expand,
 						},
-				  }
+					}
 				: {
 						$select: [
 							'device_name',
@ -118,7 +118,7 @@ export default class DeviceCmd extends Command {
 							'is_undervolted',
 						],
 						...expandForAppName,
-				  },
+					},
 		)) as ExtendedDevice;

 		if (options.view) {
--- a/lib/commands/device/init.ts
+++ b/lib/commands/device/init.ts
@ -132,7 +132,7 @@ export default class DeviceInitCmd extends Command {
 							$select: 'slug',
 						},
 					},
-			  })
+				})
 			: await (await import('../../utils/patterns')).selectApplication();

 		// Register new device
--- a/lib/commands/envs/index.ts
+++ b/lib/commands/envs/index.ts
@ -126,7 +126,7 @@ export default class EnvsCmd extends Command {
 		let fleetSlug: string | undefined = options.fleet
 			? await (
 					await import('../../utils/sdk')
-			  ).getFleetSlug(balena, options.fleet)
+				).getFleetSlug(balena, options.fleet)
 			: undefined;
 		let fullUUID: string | undefined; // as oppposed to the short, 7-char UUID

--- a/lib/commands/logs/index.ts
+++ b/lib/commands/logs/index.ts
@ -19,7 +19,7 @@ import { Flags, Args } from '@oclif/core';
 import Command from '../../command';
 import * as cf from '../../utils/common-flags';
 import { getBalenaSdk, stripIndent } from '../../utils/lazy';
-import { LogMessage } from 'balena-sdk';
+import type { LogMessage } from 'balena-sdk';

 const MAX_RETRY = 1000;

--- a/lib/commands/os/configure.ts
+++ b/lib/commands/os/configure.ts
@ -75,11 +75,6 @@ export default class OsConfigureCmd extends Command {
 		https://developer.gnome.org/NetworkManager/stable/ref-settings.html

 		${applicationIdInfo.split('\n').join('\n\t\t')}
-
-		Note: This command is currently not supported on Windows natively. Windows users
-		are advised to install the Windows Subsystem for Linux (WSL) with Ubuntu, and use
-		the Linux release of the balena CLI:
-		https://docs.microsoft.com/en-us/windows/wsl/about
 	`;

 	public static examples = [
--- a/lib/commands/preload/index.ts
+++ b/lib/commands/preload/index.ts
@ -173,7 +173,7 @@ Can be repeated to add multiple certificates.\
 		const fleetSlug: string | undefined = options.fleet
 			? await (
 					await import('../../utils/sdk')
-			  ).getFleetSlug(balena, options.fleet)
+				).getFleetSlug(balena, options.fleet)
 			: undefined;

 		const progressBars: {
--- a/lib/commands/push/index.ts
+++ b/lib/commands/push/index.ts
@ -23,7 +23,7 @@ import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { dockerignoreHelp, registrySecretsHelp } from '../../utils/messages';
 import type { BalenaSDK } from 'balena-sdk';
 import { ExpectedError, instanceOf } from '../../errors';
-import { RegistrySecrets } from '@balena/compose/dist/multibuild';
+import type { RegistrySecrets } from '@balena/compose/dist/multibuild';
 import { lowercaseIfSlug } from '../../utils/normalization';
 import {
 	applyReleaseTagKeysAndValues,
--- a/lib/commands/releases/index.ts
+++ b/lib/commands/releases/index.ts
@ -78,7 +78,7 @@ export default class ReleasesCmd extends Command {
 								$select: ['tag_key', 'value'],
 							},
 						},
-				  }
+					}
 				: { $select: fields },
 		);

--- a/lib/fast-boot.ts
+++ b/lib/fast-boot.ts
@ -20,7 +20,7 @@
 * we have permissions over the cache file before even attempting to load
 * fast boot.
 * DON'T IMPORT BALENA-CLI MODULES HERE, as this module is loaded directly
- * from `bin/balena`, before the CLI's entrypoint in `lib/app.ts`.
+ * from `bin/run.js`, before the CLI's entrypoint in `lib/app.ts`.
 */

 import * as fs from 'fs';
--- a/lib/framework/output.ts
+++ b/lib/framework/output.ts
@ -88,7 +88,7 @@ async function outputDataSet(
 			...(options.json
 				? {
 						output: 'json',
-				  }
+					}
 				: {}),
 			columns: options.fields,
 			printLine,
@ -147,7 +147,7 @@ function getLongestObjectKeyLength(o: any): number {
 	return Object.keys(o).length >= 1
 		? Object.keys(o).reduce((a, b) => {
 				return a.length > b.length ? a : b;
-		  }).length
+			}).length
 		: 0;
 }

--- a/lib/utils/compose.ts
+++ b/lib/utils/compose.ts
@ -30,7 +30,7 @@ import type {
 } from './compose-types';
 import { getChalk } from './lazy';
 import Logger = require('./logger');
-import { ProgressCallback } from 'docker-progress';
+import type { ProgressCallback } from 'docker-progress';

 export function generateOpts(options: {
 	source?: string;
--- a/lib/utils/compose_ts.ts
+++ b/lib/utils/compose_ts.ts
@ -15,7 +15,7 @@
 * limitations under the License.
 */
 import { Flags } from '@oclif/core';
-import { BalenaSDK } from 'balena-sdk';
+import type { BalenaSDK } from 'balena-sdk';
 import type { TransposeOptions } from '@balena/compose/dist/emulate';
 import type * as Dockerode from 'dockerode';
 import { promises as fs } from 'fs';
@ -32,7 +32,7 @@ import * as semver from 'semver';
 import type { Duplex, Readable } from 'stream';
 import type { Pack } from 'tar-stream';
 import { ExpectedError } from '../errors';
-import {
+import type {
 	BuiltImage,
 	ComposeOpts,
 	ComposeProject,
--- a/lib/utils/device/api.ts
+++ b/lib/utils/device/api.ts
@ -15,8 +15,6 @@
 * limitations under the License.
 */
 import * as _ from 'lodash';
-import type { NodeJSSocketWithFileDescriptor } from 'net-keepalive';
-import * as os from 'os';
 import * as request from 'request';
 import type * as Stream from 'stream';

@ -214,17 +212,6 @@ export class DeviceAPI {
 				}
 				try {
 					res.socket.setKeepAlive(true, 1000);
-					if (os.platform() !== 'win32') {
-						const NetKeepalive = await import('net-keepalive');
-						// Certain versions of typescript won't convert
-						// this automatically
-						const sock = res.socket as any as NodeJSSocketWithFileDescriptor;
-						// We send a tcp keepalive probe once every 5 seconds
-						NetKeepalive.setKeepAliveInterval(sock, 5000);
-						// After 5 failed probes, the connection is marked as
-						// closed
-						NetKeepalive.setKeepAliveProbes(sock, 5);
-					}
 				} catch (error) {
 					reject(error);
 				}
--- a/lib/utils/device/deploy.ts
+++ b/lib/utils/device/deploy.ts
@ -18,13 +18,13 @@
 import * as semver from 'balena-semver';
 import * as Docker from 'dockerode';
 import * as _ from 'lodash';
-import { Composition } from '@balena/compose/dist/parse';
-import {
+import type { Composition } from '@balena/compose/dist/parse';
+import type {
 	BuildTask,
-	getAuthConfigObj,
 	LocalImage,
 	RegistrySecrets,
 } from '@balena/compose/dist/multibuild';
+import { getAuthConfigObj } from '@balena/compose/dist/multibuild';
 import type { Readable } from 'stream';

 import { BALENA_ENGINE_TMP_PATH } from '../../config';
@ -37,7 +37,8 @@ import {
 	makeImageName,
 } from '../compose_ts';
 import Logger = require('../logger');
-import { DeviceAPI, DeviceInfo } from './api';
+import type { DeviceInfo } from './api';
+import { DeviceAPI } from './api';
 import * as LocalPushErrors from './errors';
 import LivepushManager from './live';
 import { displayBuildLog } from './logs';
--- a/lib/utils/device/live.ts
+++ b/lib/utils/device/live.ts
@ -30,11 +30,8 @@ import Logger = require('../logger');
 import { Dockerfile } from 'livepush';
 import type DeviceAPI from './api';
 import type { DeviceInfo, Status } from './api';
-import {
-	DeviceDeployOptions,
-	generateTargetState,
-	rebuildSingleTask,
-} from './deploy';
+import type { DeviceDeployOptions } from './deploy';
+import { generateTargetState, rebuildSingleTask } from './deploy';
 import { BuildError } from './errors';
 import { getServiceColourFn } from './logs';
 import { delay } from '../helpers';
--- a/lib/utils/device/ssh.ts
+++ b/lib/utils/device/ssh.ts
@ -17,11 +17,11 @@ limitations under the License.
 import { ExpectedError } from '../../errors';
 import { stripIndent } from '../lazy';

+import type { SshRemoteCommandOpts } from '../ssh';
 import {
 	findBestUsernameForDevice,
 	getRemoteCommandOutput,
 	runRemoteCommand,
-	SshRemoteCommandOpts,
 } from '../ssh';

 export interface DeviceSSHOpts extends SshRemoteCommandOpts {
--- a/lib/utils/env-common.ts
+++ b/lib/utils/env-common.ts
@ -85,13 +85,13 @@ export function getVarResourceName(
 		? isConfig
 			? 'device_config_variable'
 			: isService
-			? 'device_service_environment_variable'
-			: 'device_environment_variable'
+				? 'device_service_environment_variable'
+				: 'device_environment_variable'
 		: isConfig
-		? 'application_config_variable'
-		: isService
-		? 'service_environment_variable'
-		: 'application_environment_variable';
+			? 'application_config_variable'
+			: isService
+				? 'service_environment_variable'
+				: 'application_environment_variable';
 }

 /**
--- a/lib/utils/ignore.ts
+++ b/lib/utils/ignore.ts
@ -15,7 +15,8 @@
 * limitations under the License.
 */
 import * as _ from 'lodash';
-import { promises as fs, Stats } from 'fs';
+import type { Stats } from 'fs';
+import { promises as fs } from 'fs';
 import * as path from 'path';

 import type { Ignore } from '@balena/dockerignore';
--- a/lib/utils/proxy.ts
+++ b/lib/utils/proxy.ts
@ -18,7 +18,7 @@
 import type { Options as GlobalTunnelNgConfig } from 'global-tunnel-ng';
 export type { GlobalTunnelNgConfig };

-import { CliSettings } from './bootstrap';
+import type { CliSettings } from './bootstrap';

 type ProxyConfig = string | GlobalTunnelNgConfig;

--- a/lib/utils/remote-build.ts
+++ b/lib/utils/remote-build.ts
@ -17,7 +17,7 @@ import type { BalenaSDK } from 'balena-sdk';
 import * as JSONStream from 'JSONStream';
 import * as readline from 'readline';
 import * as request from 'request';
-import { RegistrySecrets } from '@balena/compose/dist/multibuild';
+import type { RegistrySecrets } from '@balena/compose/dist/multibuild';
 import type * as Stream from 'stream';
 import streamToPromise = require('stream-to-promise');
 import type { Pack } from 'tar-stream';
--- a/lib/utils/ssh.ts
+++ b/lib/utils/ssh.ts
@ -14,7 +14,8 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import { spawn, StdioOptions } from 'child_process';
+import type { StdioOptions } from 'child_process';
+import { spawn } from 'child_process';
 import * as _ from 'lodash';

 import { ExpectedError } from '../errors';
--- a/lib/utils/sudo.ts
+++ b/lib/utils/sudo.ts
@ -15,7 +15,8 @@
 * limitations under the License.
 */

-import { ChildProcess, spawn, SpawnOptions } from 'child_process';
+import type { ChildProcess, SpawnOptions } from 'child_process';
+import { spawn } from 'child_process';
 import { stripIndent } from './lazy';

 /**
--- a/lib/utils/tunnel.ts
+++ b/lib/utils/tunnel.ts
@ -14,7 +14,7 @@ See the License for the specific language governing permissions and
 limitations under the License.
 */
 import type { BalenaSDK } from 'balena-sdk';
-import { Socket } from 'net';
+import type { Socket } from 'net';
 import * as tls from 'tls';
 import { TypedError } from 'typed-error';
 import { ExpectedError } from '../errors';
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
--- a/package.json
+++ b/package.json
@ -1,6 +1,6 @@
 {
  "name": "balena-cli",
-  "version": "18.0.0",
+  "version": "18.2.6",
  "description": "The official balena Command Line Interface",
  "main": "./build/app.js",
  "homepage": "https://github.com/balena-io/balena-cli",
@ -22,7 +22,7 @@
    "oclif.manifest.json"
  ],
  "bin": {
-    "balena": "./bin/balena"
+    "balena": "./bin/run.js"
  },
  "pkg": {
    "scripts": [
@ -48,6 +48,7 @@
  "scripts": {
    "postinstall": "node patches/apply-patches.js",
    "prebuild": "rimraf build/ build-bin/",
+    "pretarball": "ts-node --transpile-only ../../automation/run.ts sign:binaries",
    "build": "npm run build:src && npm run catch-uncommitted",
    "build:t": "npm run lint && npm run build:fast && npm run build:test",
    "build:src": "npm run lint && npm run build:fast && npm run build:test && npm run build:doc && npm run build:completion",
@ -74,7 +75,7 @@
    "ci": "npm run test && npm run catch-uncommitted",
    "lint": "npm run lint-tsconfig && npm run lint-other",
    "lint-tsconfig": "balena-lint -e ts -e js -t tsconfig.dev.json --fix automation/ lib/ tests/ typings/",
-    "lint-other": "balena-lint -e ts -e js --fix bin/balena bin/balena-dev completion/ .mocharc.js .mocharc-standalone.js",
+    "lint-other": "balena-lint -e ts -e js --fix bin/run.js bin/dev.js completion/ .mocharc.js .mocharc-standalone.js",
    "update": "ts-node --transpile-only ./automation/update-module.ts",
    "prepare": "echo {} > bin/.fast-boot.json",
    "prepublishOnly": "npm run build"
@ -91,7 +92,7 @@
  "author": "Balena Inc. (https://balena.io/)",
  "license": "Apache-2.0",
  "engines": {
-    "node": ">=20 <21"
+    "node": "^20.6.0"
  },
  "husky": {
    "hooks": {
@ -102,6 +103,7 @@
    "bin": "balena",
    "commands": "./build/commands",
    "helpClass": "./build/help",
+    "topicSeparator": " ",
    "hooks": {
      "prerun": "./build/hooks/prerun/track",
      "command_not_found": "./build/hooks/command-not-found/suggest"
@ -111,11 +113,11 @@
    ],
    "macos": {
      "identifier": "io.balena.cli",
-      "sign": "Developer ID Installer: Balena Ltd (66H43P8FRG)"
+      "sign": "\"Developer ID Installer: Balena Ltd (66H43P8FRG)\""
    }
  },
  "devDependencies": {
-    "@balena/lint": "^7.2.1",
+    "@balena/lint": "^8.0.0",
    "@electron/notarize": "^2.0.0",
    "@octokit/plugin-throttling": "^3.5.1",
    "@octokit/rest": "^18.6.7",
@ -127,7 +129,7 @@
    "@types/cli-truncate": "^2.0.0",
    "@types/common-tags": "^1.8.1",
    "@types/diff": "^5.0.3",
-    "@types/dockerode": "^3.3.9",
+    "@types/dockerode": "3.3.23",
    "@types/ejs": "^3.1.0",
    "@types/express": "^4.17.13",
    "@types/fs-extra": "^9.0.13",
@ -181,6 +183,7 @@
    "inline-source-cli": "^2.0.0",
    "intercept-stdout": "^0.1.2",
    "jsonwebtoken": "^8.5.1",
+    "klaw": "^3.0.0",
    "mkdirp": "^1.0.4",
    "mocha": "^8.4.0",
    "mock-require": "^3.0.3",
@ -192,25 +195,25 @@
    "simple-git": "^3.14.1",
    "sinon": "^11.1.2",
    "ts-node": "^10.4.0",
-    "typescript": "^5.3.2"
+    "typescript": "^5.5.2"
  },
  "dependencies": {
-    "@balena/compose": "^3.2.0",
+    "@balena/compose": "^3.2.1",
    "@balena/dockerignore": "^1.0.2",
    "@balena/env-parsing": "^1.1.8",
    "@balena/es-version": "^1.0.1",
-    "@oclif/core": "^3.14.1",
+    "@oclif/core": "^3.27.0",
    "@resin.io/valid-email": "^0.1.0",
    "@sentry/node": "^6.16.1",
    "@types/fast-levenshtein": "0.0.1",
    "@types/update-notifier": "^4.1.1",
    "@yao-pkg/pkg": "^5.11.1",
    "balena-config-json": "^4.2.0",
-    "balena-device-init": "^6.0.0",
+    "balena-device-init": "^7.0.1",
    "balena-errors": "^4.7.3",
    "balena-image-fs": "^7.0.6",
    "balena-image-manager": "^10.0.1",
-    "balena-preload": "^15.0.1",
+    "balena-preload": "^15.0.5",
    "balena-sdk": "^19.4.0",
    "balena-semver": "^2.3.0",
    "balena-settings-client": "^5.0.2",
@ -224,11 +227,11 @@
    "columnify": "^1.5.2",
    "common-tags": "^1.7.2",
    "denymount": "^2.3.0",
-    "docker-modem": "3.0.0",
+    "docker-modem": "^5.0.3",
    "docker-progress": "^5.1.3",
-    "dockerode": "3.3.3",
+    "dockerode": "^4.0.2",
    "ejs": "^3.1.6",
-    "etcher-sdk": "9.0.6",
+    "etcher-sdk": "9.0.8",
    "event-stream": "3.3.4",
    "express": "^4.17.2",
    "fast-boot2": "^1.1.0",
@ -245,24 +248,22 @@
    "is-root": "^2.1.0",
    "js-yaml": "^4.1.0",
    "JSONStream": "^1.0.3",
-    "klaw": "^3.0.0",
    "livepush": "^3.5.1",
    "lodash": "^4.17.21",
    "minimatch": "^3.0.4",
    "moment": "^2.29.1",
    "moment-duration-format": "^2.3.2",
    "ndjson": "^2.0.0",
-    "net-keepalive": "^3.0.0",
    "node-cleanup": "^2.1.2",
    "node-unzip-2": "^0.2.8",
    "open": "^7.1.0",
-    "patch-package": "^6.4.7",
+    "patch-package": "^6.5.1",
    "prettyjson": "^1.2.5",
    "progress-stream": "^2.0.0",
    "reconfix": "^1.0.0-v0-1-0-fork-46760acff4d165f5238bfac5e464256ef1944476",
    "request": "^2.88.2",
-    "resin-cli-form": "^2.0.2",
-    "resin-cli-visuals": "^1.8.3",
+    "resin-cli-form": "^3.0.0",
+    "resin-cli-visuals": "^2.0.0",
    "resin-discoverable-services": "^2.0.4",
    "resin-doodles": "^0.2.0",
    "resin-stream-logger": "^0.1.2",
@ -286,6 +287,6 @@
    "windosu": "^0.3.0"
  },
  "versionist": {
-    "publishedAt": "2024-02-06T12:19:36.007Z"
+    "publishedAt": "2024-06-21T15:23:22.790Z"
  }
 }
--- a/patches/all/@oclif+core+3.27.0.patch
+++ b/patches/all/@oclif+core+3.27.0.patch
@ -12,40 +12,24 @@ index 607d8dc..07ba1f2 100644
     return lines.join('\n');
 }
 diff --git a/node_modules/@oclif/core/lib/help/command.js b/node_modules/@oclif/core/lib/help/command.js
-index 63c0545..7caad4a 100644
+index 930598f..867799b 100644
 --- a/node_modules/@oclif/core/lib/help/command.js
 +++ b/node_modules/@oclif/core/lib/help/command.js
-@@ -58,7 +58,7 @@ class CommandHelp extends formatter_1.HelpFormatter {
-         if (args.filter((a) => a.description).length === 0)
+@@ -59,7 +59,8 @@ class CommandHelp extends formatter_1.HelpFormatter {
             return;
         return args.map((a) => {
-            const name = a.name.toUpperCase();
-+            const name = a.required ? `<${a.name}>` : `[${a.name}]`;
+             // Add ellipsis to indicate that the argument takes multiple values if strict is false
+-            const name = this.command.strict === false ? `${a.name.toUpperCase()}...` : a.name.toUpperCase();
+            let name = this.command.strict === false ? `${a.name.toUpperCase()}...` : a.name.toUpperCase();
+            name = a.required ? `<${name}>` : `[${name}]`;
             let description = a.description || '';
             if (a.default)
                 description = `${(0, theme_1.colorize)(this.config?.theme?.flagDefaultValue, `[default: ${a.default}]`)} ${description}`;
-@@ -153,14 +153,12 @@ class CommandHelp extends formatter_1.HelpFormatter {
-             label = labels.join(flag.char ? (0, theme_1.colorize)(this.config?.theme?.flagSeparator, ', ') : '  ');
-         }
-         if (flag.type === 'option') {
-            let value = flag.helpValue || (this.opts.showFlagNameInTitle ? flag.name : '<value>');
-+            let value = flag.helpValue || (this.opts.showFlagNameInTitle ? flag.name : `<${flag.name}>`);
-             if (!flag.helpValue && flag.options) {
-                 value = showOptions || this.opts.showFlagOptionsInTitle ? `${flag.options.join('|')}` : '<option>';
-             }
-             if (flag.multiple)
-                value += '...';
-            if (!value.includes('|'))
-                value = chalk_1.default.underline(value);
-+                value += ' ...';
-             label += `=${value}`;
-         }
-         return (0, theme_1.colorize)(this.config.theme?.flag, label);
 diff --git a/node_modules/@oclif/core/lib/help/index.js b/node_modules/@oclif/core/lib/help/index.js
-index 242538a..efde8ac 100644
+index e1859e1..756654c 100644
 --- a/node_modules/@oclif/core/lib/help/index.js
 +++ b/node_modules/@oclif/core/lib/help/index.js
-@@ -168,11 +168,12 @@ class Help extends HelpBase {
+@@ -172,11 +172,12 @@ class Help extends HelpBase {
         }
         this.log(this.formatCommand(command));
         this.log('');
@ -56,17 +40,17 @@ index 242538a..efde8ac 100644
             this.log('');
         }
 -        if (subCommands.length > 0) {
-+        if (subTopics.length > 0 && !SUPPRESS_SUBTOPICS) {
+        if (subCommands.length > 0 && !SUPPRESS_SUBTOPICS) {
             const aliases = [];
             const uniqueSubCommands = subCommands.filter((p) => {
                 aliases.push(...p.aliases);
 diff --git a/node_modules/@oclif/core/lib/parser/errors.js b/node_modules/@oclif/core/lib/parser/errors.js
-index 656ec6b..2bbf36b 100644
+index b37743a..6b2e5c3 100644
 --- a/node_modules/@oclif/core/lib/parser/errors.js
 +++ b/node_modules/@oclif/core/lib/parser/errors.js
-@@ -14,7 +14,8 @@ Object.defineProperty(exports, "CLIError", { enumerable: true, get: function ()
- class CLIParseError extends errors_1.CLIError {
+@@ -15,7 +15,8 @@ class CLIParseError extends errors_1.CLIError {
     parse;
+     showHelp = false;
     constructor(options) {
 -        options.message += '\nSee more help with --help';
 +        const help = options.command ? `\`${options.command} --help\`` : '--help';
@ -74,7 +58,7 @@ index 656ec6b..2bbf36b 100644
         super(options.message, { exit: options.exit });
         this.parse = options.parse;
     }
-@@ -37,7 +38,8 @@ exports.InvalidArgsSpecError = InvalidArgsSpecError;
+@@ -38,7 +39,8 @@ exports.InvalidArgsSpecError = InvalidArgsSpecError;
 class RequiredArgsError extends CLIParseError {
     args;
     constructor({ args, exit, flagsWithMultiple, parse, }) {
@ -83,13 +67,13 @@ index 656ec6b..2bbf36b 100644
 +        let message = `Missing ${args.length} required argument${args.length === 1 ? '' : 's'}`;
         const namedArgs = args.filter((a) => a.name);
         if (namedArgs.length > 0) {
-             const list = (0, list_1.renderList)(namedArgs.map((a) => [a.name, a.description]));
-@@ -48,7 +50,7 @@ class RequiredArgsError extends CLIParseError {
+             const list = (0, list_1.renderList)(namedArgs.map((a) => {
+@@ -52,7 +54,7 @@ class RequiredArgsError extends CLIParseError {
             message += `\n\nNote: ${flags} allow${flagsWithMultiple.length === 1 ? 's' : ''} multiple values. Because of this you need to provide all arguments before providing ${flagsWithMultiple.length === 1 ? 'that flag' : 'those flags'}.`;
             message += '\nAlternatively, you can use "--" to signify the end of the flags and the beginning of arguments.';
         }
 -        super({ exit: cache_1.default.getInstance().get('exitCodes')?.requiredArgs ?? exit, message, parse });
 +        super({ exit: cache_1.default.getInstance().get('exitCodes')?.requiredArgs ?? exit, message, parse, command });
         this.args = args;
+         this.showHelp = true;
     }
- }
--- a/patches/all/oclif+3.17.2.dev.patch
+++ b/patches/all/oclif+3.17.2.dev.patch
@ -1,19 +1,5 @@
-diff --git a/node_modules/oclif/lib/commands/pack/macos.js b/node_modules/oclif/lib/commands/pack/macos.js
-index d06d0b3..c571fe3 100644
--- a/node_modules/oclif/lib/commands/pack/macos.js
-+++ b/node_modules/oclif/lib/commands/pack/macos.js
-@@ -177,7 +177,8 @@ class PackMacos extends core_1.Command {
-             if (process.env.OSX_KEYCHAIN)
-                 args.push('--keychain', process.env.OSX_KEYCHAIN);
-             args.push(dist);
-            await exec(`pkgbuild  ${args.join(' ')}`);
-+            console.error(`[debug] oclif pkgbuild "${args.join('" "')}"`);
-+            await exec(`pkgbuild  "${args.join('" "')}"`);
-         };
-         const arches = _.uniq(buildConfig.targets
-             .filter(t => t.platform === 'darwin')
 diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js
-index c0926bd..a37cd6e 100644
+index c0926bd..e4f645c 100644
 --- a/node_modules/oclif/lib/commands/pack/win.js
 +++ b/node_modules/oclif/lib/commands/pack/win.js
@@ -59,6 +59,12 @@ InstallDir "\$PROGRAMFILES${arch === 'x64' ? '64' : ''}\\${config.dirname}"
@ -29,46 +15,25 @@ index c0926bd..a37cd6e 100644
   SetOutPath $INSTDIR
   File /r bin
   File /r client
-@@ -226,7 +232,8 @@ class PackWin extends core_1.Command {
-                 fs.writeFile(path.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
-             ] : []));
-             await fs.move(buildConfig.workspace({ platform: 'win32', arch }), path.join(installerBase, 'client'));
-            await exec(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
-+            const { msysExec, toMsysPath } = require("../../util");
-+            await msysExec(`makensis ${toMsysPath(installerBase)}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
-             const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
-             const o = buildConfig.dist(`win32/${templateKey}`);
-             await fs.move(path.join(installerBase, 'installer.exe'), o);
 diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
-index 384ea4b..602daa4 100644
+index 384ea4b..c9607f3 100644
 --- a/node_modules/oclif/lib/tarballs/build.js
 +++ b/node_modules/oclif/lib/tarballs/build.js
-@@ -21,7 +21,8 @@ const pack = async (from, to) => {
-         await exec(`tar cfJ ${to} ${(path.basename(from))}`, { cwd }));
- };
- async function build(c, options = {}) {
-    const { xz, config } = c;
-+    const { xz, config, tmp } = c;
-+    console.error(`[debug] oclif c.root="${c.root}" c.workspace()="${c.workspace()}"`);
-     const packCLI = async () => {
-         const { stdout } = await exec('npm pack --unsafe-perm', { cwd: c.root });
-         return path.join(c.root, stdout.trim().split('\n').pop());
-@@ -30,7 +31,8 @@ async function build(c, options = {}) {
+@@ -30,7 +30,9 @@ async function build(c, options = {}) {
         await fs.emptyDir(c.workspace());
         const tarballNewLocation = path.join(c.workspace(), path.basename(tarball));
         await fs.move(tarball, tarballNewLocation);
 -        await exec(`tar -xzf "${tarballNewLocation}"`, { cwd: c.workspace() });
-+        const { msysExec, toMsysPath } = require("../util");
-+        await msysExec(`tar -xzf ${toMsysPath(tarballNewLocation)}`, { cwd: c.workspace() });
+        let tarCmd = `tar -xzf "${tarballNewLocation}"`;
+        if (process.platform === 'win32') tarCmd += ' --force-local';
+        await exec(tarCmd, { cwd: c.workspace() });
         await Promise.all((await fs.promises.readdir(path.join(c.workspace(), 'package'), { withFileTypes: true }))
             .map(i => fs.move(path.join(c.workspace(), 'package', i.name), path.join(c.workspace(), i.name))));
         await Promise.all([
-@@ -38,6 +40,13 @@ async function build(c, options = {}) {
+@@ -38,6 +40,11 @@ async function build(c, options = {}) {
             fs.promises.rm(path.join(c.workspace(), path.basename(tarball)), { recursive: true }),
             fs.remove(path.join(c.workspace(), 'bin', 'run.cmd')),
         ]);
-+        // rename the original balena-cli ./bin/balena entry point for oclif compatibility
-+        await fs.move(path.join(c.workspace(), 'bin', 'balena'), path.join(c.workspace(), 'bin', 'run'));
 +        // The oclif installers are a production installation, while the source
 +        // `bin` folder may contain a `.fast-boot.json` file of a dev installation.
 +        // This has previously led to issues preventing the CLI from starting, so
@ -77,209 +42,3 @@ index 384ea4b..602daa4 100644
     };
     const updatePJSON = async () => {
         const pjsonPath = path.join(c.workspace(), 'package.json');
-@@ -49,35 +58,20 @@ async function build(c, options = {}) {
-         await fs.writeJSON(pjsonPath, pjson, { spaces: 2 });
-     };
-     const addDependencies = async () => {
-        const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
-        if (fs.existsSync(path.join(yarnRoot, 'yarn.lock'))) {
-            await fs.copy(path.join(yarnRoot, 'yarn.lock'), path.join(c.workspace(), 'yarn.lock'));
-            const yarnVersion = (await exec('yarn -v')).stdout.charAt(0);
-            if (yarnVersion === '1') {
-                await exec('yarn --no-progress --production --non-interactive', { cwd: c.workspace() });
-            }
-            else if (yarnVersion === '2') {
-                throw new Error('Yarn 2 is not supported yet. Try using Yarn 1, or Yarn 3');
-            }
-            else {
-                try {
-                    await exec('yarn workspaces focus --production', { cwd: c.workspace() });
-                }
-                catch (error) {
-                    if (error instanceof Error && error.message.includes('Command not found')) {
-                        throw new Error('Missing workspace tools. Run `yarn plugin import workspace-tools`.');
-                    }
-                    throw error;
-                }
-            }
-        }
-        else {
-            const lockpath = fs.existsSync(path.join(c.root, 'package-lock.json')) ?
-                path.join(c.root, 'package-lock.json') :
-                path.join(c.root, 'npm-shrinkwrap.json');
-            await fs.copy(lockpath, path.join(c.workspace(), path.basename(lockpath)));
-            await exec('npm install --production', { cwd: c.workspace() });
-+        const ws = c.workspace();
-+        exec(`cd ${ws}`);
-+        console.error(`[debug] oclif copying node_modules to "${ws}"`)
-+        const source = path.join(c.root, 'node_modules');
-+        if (process.platform === 'win32') {
-+            await exec(`xcopy "${source}" "${ws}\\node_modules" /S /E /B /I /K /Q /Y`);
-+        } else {
-+            // use the shell's `cp` on macOS in order to preserve extended
-+            // file attributes containing `codesign` digital signatures
-+            await exec(`cp -pR "${source}" "${ws}"`);
-         }
-+        console.error(`[debug] oclif running "npm prune --production" in "${ws}"`);
-+        await exec('npm prune --production', { cwd: c.workspace() });
-+        console.error(`[debug] oclif done`);
-     };
-     const pretarball = async () => {
-         const pjson = await fs.readJSON(path.join(c.workspace(), 'package.json'));
-@@ -115,7 +109,8 @@ async function build(c, options = {}) {
-             output: path.join(workspace, 'bin', 'node'),
-             platform: target.platform,
-             arch: target.arch,
-            tmp: path.join(config.root, 'tmp'),
-+            tmp,
-+            projectRootPath: c.root
-         });
-         if (options.pack === false)
-             return;
-@@ -158,6 +153,7 @@ async function build(c, options = {}) {
-         await fs.writeJSON(manifestFilepath, manifest, { spaces: 2 });
-     };
-     (0, log_1.log)(`gathering workspace for ${config.bin} to ${c.workspace()}`);
-+    console.error(`[debug] ${options.tarball}`);
-     await extractCLI(options.tarball ? options.tarball : await packCLI());
-     await updatePJSON();
-     await addDependencies();
-diff --git a/node_modules/oclif/lib/tarballs/config.js b/node_modules/oclif/lib/tarballs/config.js
-index 216759d..cab0e6e 100644
--- a/node_modules/oclif/lib/tarballs/config.js
-+++ b/node_modules/oclif/lib/tarballs/config.js
-@@ -25,7 +25,10 @@ async function gitSha(cwd, options = {}) {
- }
- exports.gitSha = gitSha;
- async function Tmp(config) {
-    const tmp = path.join(config.root, 'tmp');
-+     const tmp = process.env.BUILD_TMP
-+         ? path.join(process.env.BUILD_TMP, 'oclif')
-+         : path.join(config.root, 'tmp');
-+    console.error(`[debug] oclif tmp="${tmp}"`);
-     await fs.promises.mkdir(tmp, { recursive: true });
-     return tmp;
- }
-@@ -62,7 +65,7 @@ async function buildConfig(root, options = {}) {
-         s3Config: updateConfig.s3,
-         nodeVersion,
-         workspace(target) {
-            const base = path.join(config.root, 'tmp');
-+            const base = tmp;
-             if (target && target.platform)
-                 return path.join(base, [target.platform, target.arch].join('-'), (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
-             return path.join(base, (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
-diff --git a/node_modules/oclif/lib/tarballs/node.js b/node_modules/oclif/lib/tarballs/node.js
-index 35f1d0c..5349eaa 100644
--- a/node_modules/oclif/lib/tarballs/node.js
-+++ b/node_modules/oclif/lib/tarballs/node.js
-@@ -12,6 +12,7 @@ const retry = require("async-retry");
- const util_2 = require("../util");
- const pipeline = (0, util_1.promisify)(stream_1.pipeline);
- const exec = (0, util_1.promisify)(child_process_1.exec);
-+const { isMSYS2, msysExec, toMsysPath } = require("../util");
- const RETRY_TIMEOUT_MS = 1000;
- async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
-     if (arch === 'arm')
-@@ -42,8 +43,10 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
-         const basedir = path.dirname(tarball);
-         await fs.promises.mkdir(basedir, { recursive: true });
-         await pipeline(got_1.default.stream(url), fs.createWriteStream(tarball));
-        if (platform !== 'win32')
-            await exec(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
-+        if (platform !== 'win32') {
-+            const shaCmd = isMSYS2 ? 'sha256sum -c -' : 'shasum -a 256 -c -';
-+            await msysExec(`grep ${path.basename(tarball)} ${toMsysPath(shasums)} | ${shaCmd}`, { cwd: basedir });
-+        }
-     };
-     const extract = async () => {
-         (0, log_1.log)(`extracting ${nodeBase}`);
-@@ -51,7 +54,7 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
-         await fs.promises.mkdir(nodeTmp, { recursive: true });
-         await fs.promises.mkdir(path.dirname(cache), { recursive: true });
-         if (platform === 'win32') {
-            await exec(`7z x -bd -y "${tarball}"`, { cwd: nodeTmp });
-+            await msysExec(`7z x -bd -y ${toMsysPath(tarball)} > /dev/null`, { cwd: nodeTmp });
-             await fs.move(path.join(nodeTmp, nodeBase, 'node.exe'), path.join(cache, 'node.exe'));
-         }
-         else {
-diff --git a/node_modules/oclif/lib/upload-util.js b/node_modules/oclif/lib/upload-util.js
-index 6963e4d..430472d 100644
--- a/node_modules/oclif/lib/upload-util.js
-+++ b/node_modules/oclif/lib/upload-util.js
-@@ -31,10 +31,10 @@ options = { root: '.' }) {
-     const templates = {
-         baseDir: '<%- bin %>',
-         unversioned: '<%- bin %>-<%- platform %>-<%- arch %><%- ext %>',
-        versioned: '<%- bin %>-v<%- version %>-<%- sha %>-<%- platform %>-<%- arch %><%- ext %>',
-        manifest: '<%- bin %>-v<%- version %>-<%- sha %>-<%- platform %>-<%- arch %>-buildmanifest',
-        macos: '<%- bin %>-v<%- version %>-<%- sha %>-<%- arch %>.pkg',
-        win32: '<%- bin %>-v<%- version %>-<%- sha %>-<%- arch %>.exe',
-+        versioned: '<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %><%- ext %>',
-+        manifest: '<%- bin %>-v<%- version %>-<%- platform %>-<%- arch %>-buildmanifest',
-+        macos: '<%- bin %>-v<%- version %>.pkg',
-+        win32: '<%- bin %>-v<%- version %>-<%- arch %>.exe',
-         deb: '<%- bin %>_<%- versionShaRevision %>_<%- arch %>.deb',
-     };
-     return _.template(templates[type])(Object.assign({}, options));
-diff --git a/node_modules/oclif/lib/util.js b/node_modules/oclif/lib/util.js
-index 816c71b..1384aa6 100644
--- a/node_modules/oclif/lib/util.js
-+++ b/node_modules/oclif/lib/util.js
-@@ -95,9 +95,10 @@ const hash = async (algo, fp) => {
-     });
- };
- exports.hash = hash;
-+
- async function checkFor7Zip() {
-     try {
-        await exec('7z');
-+        await msysExec('7z', { stdio: [0, null, 2] });
-     }
-     catch (error) {
-         if (error.code === 127)
-@@ -107,3 +108,44 @@ async function checkFor7Zip() {
-     }
- }
- exports.checkFor7Zip = checkFor7Zip;
-+
-+// OSTYPE is 'msys' for MSYS 1.0 and for MSYS2, or 'cygwin' for Cygwin
-+// but note that OSTYPE is not "exported" by default, so run: export OSTYPE=$OSTYPE
-+// MSYSTEM is 'MINGW32' for MSYS 1.0, 'MSYS' for MSYS2, and undefined for Cygwin
-+const isCygwin = process.env.OSTYPE === 'cygwin';
-+const isMinGW = process.env.MSYSTEM && process.env.MSYSTEM.startsWith('MINGW');
-+const isMSYS2 = process.env.MSYSTEM && process.env.MSYSTEM.startsWith('MSYS');
-+const MSYSSHELLPATH = process.env.MSYSSHELLPATH ||
-+    (isMSYS2 ? 'C:\\msys64\\usr\\bin\\bash.exe' :
-+        (isMinGW ? 'C:\\MinGW\\msys\\1.0\\bin\\bash.exe' :
-+            (isCygwin ? 'C:\\cygwin64\\bin\\bash.exe' : '/bin/sh')));
-+
-+exports.isCygwin = isCygwin;
-+exports.isMinGW = isMinGW;
-+exports.isMSYS2 = isMSYS2;
-+console.error(`[debug] oclif MSYSSHELLPATH=${MSYSSHELLPATH} MSYSTEM=${process.env.MSYSTEM} OSTYPE=${process.env.OSTYPE} isMSYS2=${isMSYS2} isMingGW=${isMinGW} isCygwin=${isCygwin}`);
-+
-+/* Convert a Windows path like 'C:\tmp' to a MSYS path like '/c/tmp' */
-+function toMsysPath(windowsPath) {
-+    // 'c:\myfolder' -> '/c/myfolder' or '/cygdrive/c/myfolder'
-+    let msysPath = windowsPath.replace(/\\/g, '/');
-+    if (isMSYS2 || isMinGW) {
-+        msysPath = msysPath.replace(/^([a-zA-Z]):/, '/$1');
-+    } else if (isCygwin) {
-+        msysPath = msysPath.replace(/^([a-zA-Z]):/, '/cygdrive/$1');
-+    }
-+    console.error(`[debug] oclif toMsysPath before="${windowsPath}" after="${msysPath}"`);
-+    return msysPath;
-+}
-+exports.toMsysPath = toMsysPath;
-+
-+async function msysExec(cmd, options = {}) {
-+    if (process.platform !== 'win32') {
-+        return exec(cmd, options);
-+    }
-+    const sh = MSYSSHELLPATH;
-+    const args = ['-c', cmd];
-+    console.error(`[debug] oclif msysExec sh="${sh}" args=${JSON.stringify(args)} options=${JSON.stringify(options)}`);
-+    return exec(`"${sh}" "${args.join('" "')}"`, options);
-+}
-+exports.msysExec = msysExec;
--- a/tests/commands/build.spec.ts
+++ b/tests/commands/build.spec.ts
@ -26,9 +26,11 @@ import { BalenaAPIMock } from '../nock/balena-api-mock';
 import { expectStreamNoCRLF, testDockerBuildStream } from '../docker-build';
 import { DockerMock, dockerResponsePath } from '../nock/docker-mock';
 import { cleanOutput, runCommand } from '../helpers';
-import {
+import type {
 	ExpectedTarStreamFiles,
 	ExpectedTarStreamFilesByService,
+} from '../projects';
+import {
 	getDockerignoreWarn1,
 	getDockerignoreWarn2,
 	getDockerignoreWarn3,
--- a/tests/commands/deploy.spec.ts
+++ b/tests/commands/deploy.spec.ts
@ -20,7 +20,7 @@ import type { Request as ReleaseRequest } from '@balena/compose/dist/release';
 import { expect } from 'chai';
 import { promises as fs } from 'fs';
 import * as _ from 'lodash';
-import * as nock from 'nock';
+import type * as nock from 'nock';
 import * as path from 'path';
 import * as sinon from 'sinon';

@ -28,12 +28,11 @@ import { BalenaAPIMock } from '../nock/balena-api-mock';
 import { expectStreamNoCRLF, testDockerBuildStream } from '../docker-build';
 import { DockerMock, dockerResponsePath } from '../nock/docker-mock';
 import { cleanOutput, runCommand, switchSentry } from '../helpers';
-import {
+import type {
 	ExpectedTarStreamFiles,
 	ExpectedTarStreamFilesByService,
-	getDockerignoreWarn1,
-	getDockerignoreWarn3,
 } from '../projects';
+import { getDockerignoreWarn1, getDockerignoreWarn3 } from '../projects';

 const repoPath = path.normalize(path.join(__dirname, '..', '..'));
 const projectsPath = path.join(repoPath, 'tests', 'test-data', 'projects');
--- a/tests/commands/push.spec.ts
+++ b/tests/commands/push.spec.ts
@ -23,10 +23,10 @@ import { BalenaAPIMock } from '../nock/balena-api-mock';
 import { BuilderMock, builderResponsePath } from '../nock/builder-mock';
 import { expectStreamNoCRLF, testPushBuildStream } from '../docker-build';
 import { cleanOutput, runCommand } from '../helpers';
+import type { ExpectedTarStreamFiles } from '../projects';
 import {
 	addRegSecretsEntries,
 	exists,
-	ExpectedTarStreamFiles,
 	getDockerignoreWarn1,
 	getDockerignoreWarn2,
 	getDockerignoreWarn3,
--- a/tests/commands/ssh.spec.ts
+++ b/tests/commands/ssh.spec.ts
@ -17,7 +17,8 @@

 import { expect } from 'chai';
 import mock = require('mock-require');
-import { createServer, Server } from 'net';
+import type { Server } from 'net';
+import { createServer } from 'net';

 import { BalenaAPIMock } from '../nock/balena-api-mock';
 import { cleanOutput, runCommand } from '../helpers';
--- a/tests/deprecation.spec.ts
+++ b/tests/deprecation.spec.ts
@ -23,13 +23,12 @@ import * as semver from 'semver';
 import * as sinon from 'sinon';

 import * as packageJSON from '../package.json';
-import {
-	DeprecationChecker,
-	ReleaseTimestampsByVersion,
-} from '../build/deprecation';
+import type { ReleaseTimestampsByVersion } from '../build/deprecation';
+import { DeprecationChecker } from '../build/deprecation';
 import { BalenaAPIMock } from './nock/balena-api-mock';
 import { NpmMock } from './nock/npm-mock';
-import { runCommand, TestOutput } from './helpers';
+import type { TestOutput } from './helpers';
+import { runCommand } from './helpers';

 // "itSS" means "it() Skip Standalone"
 const itSS = process.env.BALENA_CLI_TEST_TYPE === 'standalone' ? it.skip : it;
--- a/tests/docker-build.ts
+++ b/tests/docker-build.ts
@ -29,15 +29,15 @@ import { URL } from 'url';

 import { makeImageName } from '../build/utils/compose_ts';
 import { stripIndent } from '../build/utils/lazy';
-import { BuilderMock } from './nock/builder-mock';
-import { DockerMock } from './nock/docker-mock';
+import type { BuilderMock } from './nock/builder-mock';
+import type { DockerMock } from './nock/docker-mock';
 import {
 	cleanOutput,
 	deepJsonParse,
 	deepTemplateReplace,
 	runCommand,
 } from './helpers';
-import {
+import type {
 	ExpectedTarStreamFile,
 	ExpectedTarStreamFiles,
 	ExpectedTarStreamFilesByService,
--- a/tests/helpers.ts
+++ b/tests/helpers.ts
@ -26,7 +26,7 @@ const standalonePath = path.resolve(__dirname, '..', 'build-bin', balenaExe);
 export interface TestOutput {
 	err: string[]; // stderr
 	out: string[]; // stdout
-	exitCode?: number; // process.exitCode
+	exitCode?: string | number; // process.exitCode
 }

 function matchesNodeEngineVersionWarn(msg: string) {
--- a/tests/nock/balena-api-mock.ts
+++ b/tests/nock/balena-api-mock.ts
@ -18,7 +18,8 @@
 import * as _ from 'lodash';
 import * as path from 'path';

-import { NockMock, ScopeOpts } from './nock-mock';
+import type { ScopeOpts } from './nock-mock';
+import { NockMock } from './nock-mock';

 export const apiResponsePath = path.normalize(
 	path.join(__dirname, '..', 'test-data', 'api-response'),
--- a/tests/nock/docker-mock.ts
+++ b/tests/nock/docker-mock.ts
@ -18,7 +18,8 @@
 import * as path from 'path';
 import * as qs from 'querystring';

-import { NockMock, ScopeOpts } from './nock-mock';
+import type { ScopeOpts } from './nock-mock';
+import { NockMock } from './nock-mock';

 export const dockerResponsePath = path.normalize(
 	path.join(__dirname, '..', 'test-data', 'docker-response'),
--- a/tests/nock/supervisor-mock.ts
+++ b/tests/nock/supervisor-mock.ts
@ -17,7 +17,8 @@
 import * as path from 'path';
 import { Readable } from 'stream';

-import { NockMock, ScopeOpts } from './nock-mock';
+import type { ScopeOpts } from './nock-mock';
+import { NockMock } from './nock-mock';

 export const dockerResponsePath = path.normalize(
 	path.join(__dirname, '..', 'test-data', 'docker-response'),
--- a/tests/proxy.spec.ts
+++ b/tests/proxy.spec.ts
@ -17,10 +17,8 @@

 import { expect } from 'chai';

-import {
-	GlobalTunnelNgConfig,
-	makeUrlFromTunnelNgConfig,
-} from '../build/utils/proxy';
+import type { GlobalTunnelNgConfig } from '../build/utils/proxy';
+import { makeUrlFromTunnelNgConfig } from '../build/utils/proxy';

 describe('makeUrlFromTunnelNgConfig() function', function () {
 	it('should return a URL given a GlobalTunnelNgConfig object', () => {
--- a/tests/test-data/pkg/expected-warnings-darwin-arm64.txt
+++ b/tests/test-data/pkg/expected-warnings-darwin-arm64.txt
@ -0,0 +1,101 @@
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/open/xdg-open
+  %2: path-to-executable/xdg-open
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/open/xdg-open
+  %2: path-to-executable/xdg-open
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/build/Release/drivelist.node
+  %2: path-to-executable/drivelist.node
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/darwin.sh
+  %2: path-to-executable/drivelist/darwin.sh
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/linux.sh
+  %2: path-to-executable/drivelist/linux.sh
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/win32.bat
+  %2: path-to-executable/drivelist/win32.bat
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/build/Release/drivelist.node
+  %2: path-to-executable/drivelist.node
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/darwin.sh
+  %2: path-to-executable/drivelist/darwin.sh
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/linux.sh
+  %2: path-to-executable/drivelist/linux.sh
+> Warning Cannot include file %1 into executable.
+  The file must be distributed with executable as %2.
+  %1: node_modules/drivelist/scripts/win32.bat
+  %2: path-to-executable/drivelist/win32.bat
+> Warning Cannot resolve 'path'
+  node_modules/@balena/compose/dist/parse/schemas/index.js
+  Dynamic require may fail at run time, because the requested file
+  is unknown at compilation time and not included into executable.
+  Use a string literal as an argument for 'require', or leave it
+  as is and specify the resolved file name in 'scripts' option.
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/axios.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/utils.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/adapters.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/http.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/adapters/xhr.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/CancelToken.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/CanceledError.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/cancel/isCancel.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/Axios.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/AxiosError.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/AxiosHeaders.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/InterceptorManager.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/buildFullPath.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/dispatchRequest.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/mergeConfig.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/settle.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/core/transformData.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/defaults/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/defaults/transitional.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/env/data.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/AxiosTransformStream.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/AxiosURLSearchParams.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/HttpStatusCode.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/ZlibHeaderTransformStream.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/bind.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/buildURL.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/callbackify.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/combineURLs.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/cookies.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/formDataToJSON.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/formDataToStream.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/fromDataURI.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isAbsoluteURL.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isAxiosError.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/isURLSameOrigin.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/parseHeaders.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/parseProtocol.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/readBlob.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/speedometer.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/spread.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/throttle.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/toFormData.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/toURLEncodedForm.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/helpers/validator.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/common/utils.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/FormData.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/URLSearchParams.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/string-width/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/strip-ansi/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/wrap-ansi/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js
+> Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js
--- a/tests/test-data/pkg/expected-warnings-darwin-x64.txt
+++ b/tests/test-data/pkg/expected-warnings-darwin-x64.txt
@ -8,35 +8,35 @@
  %2: path-to-executable/xdg-open
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot resolve 'path'
  node_modules/@balena/compose/dist/parse/schemas/index.js
@ -44,70 +44,6 @@
  is unknown at compilation time and not included into executable.
  Use a string literal as an argument for 'require', or leave it
  as is and specify the resolved file name in 'scripts' option.
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/axios.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/utils.js
@ -158,14 +94,8 @@
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/classes/FormData.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/classes/URLSearchParams.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/string-width/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/strip-ansi/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/wrap-ansi/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js
-> Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=darwin)
+> Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js
--- a/tests/test-data/pkg/expected-warnings-linux-arm64.txt
+++ b/tests/test-data/pkg/expected-warnings-linux-arm64.txt
@ -8,35 +8,35 @@
  %2: path-to-executable/xdg-open
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot resolve 'path'
  node_modules/@balena/compose/dist/parse/schemas/index.js
@ -44,70 +44,6 @@
  is unknown at compilation time and not included into executable.
  Use a string literal as an argument for 'require', or leave it
  as is and specify the resolved file name in 'scripts' option.
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/index.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/axios.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/utils.js
@ -158,13 +94,8 @@
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/index.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/FormData.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/axios/lib/platform/node/classes/URLSearchParams.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=linux)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=linux)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=linux)
 > Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/string-width/index.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/strip-ansi/index.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/wrap-ansi/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=linux)
 > Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js
 > Warning Failed to make bytecode node20-arm64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=arm64 libc= platform=linux)
--- a/tests/test-data/pkg/expected-warnings-linux-x64.txt
+++ b/tests/test-data/pkg/expected-warnings-linux-x64.txt
@ -8,35 +8,35 @@
  %2: path-to-executable/xdg-open
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/build/Release/drivelist.node
+  %1: node_modules/drivelist/build/Release/drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/darwin.sh
+  %1: node_modules/drivelist/scripts/darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/linux.sh
+  %1: node_modules/drivelist/scripts/linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules/etcher-sdk/node_modules/drivelist/scripts/win32.bat
+  %1: node_modules/drivelist/scripts/win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot resolve 'path'
  node_modules/@balena/compose/dist/parse/schemas/index.js
@ -44,70 +44,6 @@
  is unknown at compilation time and not included into executable.
  Use a string literal as an argument for 'require', or leave it
  as is and specify the resolved file name in 'scripts' option.
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules/resin-cli-visuals/node_modules/drivelist/scripts/win32.bat
-  %2: path-to-executable/drivelist/win32.bat
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/axios.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/utils.js
@ -158,13 +94,8 @@
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/classes/FormData.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/axios/lib/platform/node/classes/URLSearchParams.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=linux)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=linux)
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=linux)
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/string-width/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/strip-ansi/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/wrap-ansi/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=linux)
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/ansi-regex/index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules/@isaacs/cliui/node_modules/ansi-styles/index.js
-prebuild-install warn install No prebuilt binaries found (target=v20.10.0 runtime=node arch=x64 libc= platform=linux)
--- a/tests/test-data/pkg/expected-warnings-win32-x64.txt
+++ b/tests/test-data/pkg/expected-warnings-win32-x64.txt
@ -8,35 +8,35 @@
  %2: path-to-executable/xdg-open
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\build\Release\drivelist.node
+  %1: node_modules\drivelist\build\Release\drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\darwin.sh
+  %1: node_modules\drivelist\scripts\darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\linux.sh
+  %1: node_modules\drivelist\scripts\linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\win32.bat
+  %1: node_modules\drivelist\scripts\win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\build\Release\drivelist.node
+  %1: node_modules\drivelist\build\Release\drivelist.node
  %2: path-to-executable/drivelist.node
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\darwin.sh
+  %1: node_modules\drivelist\scripts\darwin.sh
  %2: path-to-executable/drivelist/darwin.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\linux.sh
+  %1: node_modules\drivelist\scripts\linux.sh
  %2: path-to-executable/drivelist/linux.sh
 > Warning Cannot include file %1 into executable.
  The file must be distributed with executable as %2.
-  %1: node_modules\etcher-sdk\node_modules\drivelist\scripts\win32.bat
+  %1: node_modules\drivelist\scripts\win32.bat
  %2: path-to-executable/drivelist/win32.bat
 > Warning Cannot resolve 'path'
  node_modules\@balena\compose\dist\parse\schemas\index.js
@ -44,70 +44,6 @@
  is unknown at compilation time and not included into executable.
  Use a string literal as an argument for 'require', or leave it
  as is and specify the resolved file name in 'scripts' option.
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\build\Release\drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\build\Release\drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\drivelist\scripts\win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\build\Release\drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\win32.bat
-  %2: path-to-executable/drivelist/win32.bat
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\build\Release\drivelist.node
-  %2: path-to-executable/drivelist.node
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\darwin.sh
-  %2: path-to-executable/drivelist/darwin.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\linux.sh
-  %2: path-to-executable/drivelist/linux.sh
-> Warning Cannot include file %1 into executable.
-  The file must be distributed with executable as %2.
-  %1: node_modules\resin-cli-visuals\node_modules\drivelist\scripts\win32.bat
-  %2: path-to-executable/drivelist/win32.bat
 > Warning Failed to make bytecode node20-x64 for file node_modules\axios\index.js
 > Warning Failed to make bytecode node20-x64 for file node_modules\axios\lib\axios.js
 > Warning Failed to make bytecode node20-x64 for file node_modules\axios\lib\utils.js
--- a/tests/utils/device/live.spec.ts
+++ b/tests/utils/device/live.spec.ts
@ -16,7 +16,7 @@
 */

 import { expect } from 'chai';
-import * as chokidar from 'chokidar';
+import type * as chokidar from 'chokidar';
 import { promises as fs } from 'fs';
 import * as path from 'path';
 import { promisify } from 'util';
--- a/tests/utils/docker.spec.ts
+++ b/tests/utils/docker.spec.ts
@ -17,8 +17,8 @@

 import { expect } from 'chai';

+import type { DockerConnectionCliFlags } from '../../build/utils/docker';
 import {
-	DockerConnectionCliFlags,
 	generateConnectOpts,
 	getDefaultDockerModemOpts,
 } from '../../build/utils/docker';
@ -29,7 +29,7 @@ const defaultSocketPath =
 		: '/var/run/docker.sock';

 describe('getDefaultDockerModemOpts() function', function () {
-	it('should use a Unix socket when --dockerHost is not used', () => {
+	it('should use a Unix socket when --dockerHost is not used', async () => {
 		const cliFlags: DockerConnectionCliFlags = {
 			dockerPort: 2376,
 		};
@ -38,8 +38,15 @@ describe('getDefaultDockerModemOpts() function', function () {
 			host: undefined,
 			port: undefined,
 			protocol: 'http',
-			socketPath: defaultSocketPath,
 		});
+		if (typeof defaultOps.socketPath === 'function') {
+			// Function is always findDefaultUnixSocket(), which returns a promise.
+			// Must override type since @types/dockerode not updated yet.
+			const socketPath: () => Promise<string> = defaultOps.socketPath;
+			expect(await socketPath()).to.equal(defaultSocketPath);
+		} else {
+			expect(defaultOps.socketPath).to.equal(defaultSocketPath);
+		}
 	});

 	it('should use the HTTP protocol when --dockerPort is 2375', () => {
@ -131,7 +138,14 @@ describe('generateConnectOpts() function', function () {
 			host: undefined,
 			port: undefined,
 			protocol: 'https',
-			socketPath: defaultSocketPath,
 		});
+		if (typeof connectOpts.socketPath === 'function') {
+			// Function is always findDefaultUnixSocket(), which returns a promise.
+			// Must override type since @types/dockerode not updated yet.
+			const socketPath: () => Promise<string> = connectOpts.socketPath;
+			expect(await socketPath()).to.equal(defaultSocketPath);
+		} else {
+			expect(connectOpts.socketPath).to.equal(defaultSocketPath);
+		}
 	});
 });
--- a/tests/utils/eol-conversion.spec.ts
+++ b/tests/utils/eol-conversion.spec.ts
@ -66,7 +66,6 @@ describe('detectEncoding() function', function () {
 			'mountutils/build/Release/MountUtils.node',
 		];
 		const sampleText = [
-			'node_modules/.bin/etcher-image-write',
 			'node_modules/.bin/mocha',
 			'node_modules/.bin/rimraf',
 			'node_modules/.bin/tsc',
--- a/typings/balena-device-init/index.d.ts
+++ b/typings/balena-device-init/index.d.ts
@ -17,7 +17,7 @@

 declare module 'balena-device-init' {
 	import { DeviceTypeJson } from 'balena-sdk';
-	import * as Bluebird from 'bluebird';
+	import type * as Bluebird from 'bluebird';

 	interface OperationState {
 		operation:
--- a/typings/global.d.ts
+++ b/typings/global.d.ts
@ -1,4 +1,4 @@
-import { Application, DeviceType, Device } from 'balena-sdk';
+import type { Application, DeviceType, Device } from 'balena-sdk';

 declare global {
 	type ApplicationWithDeviceTypeSlug = Omit<
Author	SHA1	Message	Date
flowzone-app[bot]	edff14fa72	v18.2.6	2024-06-21 15:23:25 +00:00
flowzone-app[bot]	9de753d9d3	Merge pull request #2770 from balena-io/bump-oclif-core Update @oclif/core from 3.26.9 to 3.27.0	2024-06-21 15:22:19 +00:00
Otavio Jacobi	75d2d7d375	Update @oclif/core from 3.26.9 to 3.27.0 Change-type: patch	2024-06-21 09:49:38 -03:00
flowzone-app[bot]	d9b193acc1	v18.2.5	2024-06-21 12:11:21 +00:00
flowzone-app[bot]	2e42999642	Merge pull request #2769 from balena-io/bump-ts Update TypeScript to 5.5.2	2024-06-21 12:10:18 +00:00
Thodoris Greasidis	5a3f0ea453	Limit @oclif/core to ~3.26 so that npm dedupe doesn't auto-bump it Change-type: patch	2024-06-21 01:37:00 +03:00
Thodoris Greasidis	e1cd30060c	Deduplicate dependencies	2024-06-21 01:31:53 +03:00
Thodoris Greasidis	7959e23cd3	Update TypeScript to 5.5.2 Change-type: patch	2024-06-21 00:18:36 +03:00
flowzone-app[bot]	9c4d788d6d	v18.2.4	2024-05-17 12:04:11 +00:00
flowzone-app[bot]	181f5a6a2f	Merge pull request #2767 from balena-io/aethernet-patch-1 patch: fix outdated doc for "os configure"	2024-05-17 12:03:17 +00:00
Edwin Joassart	163dcf596e	patch: fix outdated doc for "os configure" There were an outdated warning for `os configure` on windows. The command actually works fine on windows. see: https://balena.zulipchat.com/#narrow/stream/403752-channel.2Fsupport-help/topic/Cytiva.20image.20downloads/near/438786503	2024-05-17 13:39:22 +02:00
flowzone-app[bot]	1724187466	v18.2.3	2024-05-15 13:32:53 +00:00
flowzone-app[bot]	b27dcdd582	Merge pull request #2765 from balena-io/dfunckt-patch-1 Pluralize command categories in docs	2024-05-15 13:31:57 +00:00
Akis Kesoglou	c28039a3f2	Fix exitCode type	2024-05-15 16:01:38 +03:00
dfunckt	233bc705de	Pluralize command categories in docs Pluralize command categories, eg. "Device" -> "Devices”. Results in much fewer categories in our docs pages and we no longer have the somewhat silly separate singular and plural categories for commands such as `devices` and `device <command>`. Change-type: patch	2024-05-15 15:49:57 +03:00
flowzone-app[bot]	71518678e1	v18.2.2	2024-04-30 13:57:49 +00:00
flowzone-app[bot]	88a705c935	Merge pull request #2754 from balena-io/upgrade_dockerode Upgrade dockerode and docker-modem dependencies	2024-04-30 13:56:52 +00:00
Ken Bannister	55d06aced2	Deduplicate npm dependencies Signed-off-by: Ken Bannister <kb2ma@runbox.com>	2024-04-29 08:20:02 -04:00
Ken Bannister	aa9a148c46	Upgrade dockerode and docker-modem dependencies Includes test fixes due to an interface change in docker-modem. Change-type: patch Signed-off-by: Ken Bannister <kb2ma@runbox.com>	2024-04-29 07:56:53 -04:00
flowzone-app[bot]	10ca5b4f59	v18.2.1	2024-04-23 12:08:57 +00:00
flowzone-app[bot]	47e11d5f9b	Merge pull request #2758 from balena-io/kyle/actuated Use Actuated runners for Linux test and publish	2024-04-23 12:07:47 +00:00
Kyle Harding	6fb65bcf22	Re-run npm install and npm dedupe Signed-off-by: Kyle Harding <kyle@balena.io>	2024-04-22 17:56:20 +03:00
Kyle Harding	954de13b10	Use Actuated runners for Linux test and publish Change-type: patch Signed-off-by: Kyle Harding <kyle@balena.io>	2024-04-19 15:27:38 -04:00
flowzone-app[bot]	f81a27e931	v18.2.0	2024-04-17 16:13:12 +00:00
Thodoris Greasidis	e8815d0275	Merge pull request #2756 from balena-io/build-optional-arch build: Auto-resolve the cpu arch when the --deviceType is provided	2024-04-17 19:12:11 +03:00
Thodoris Greasidis	766e6d4e5e	build: Auto-resolve the cpu arch when the --deviceType is provided Change-type: minor	2024-04-17 18:10:30 +03:00
flowzone-app[bot]	7b46f65a01	v18.1.10	2024-04-16 14:17:07 +00:00
Thodoris Greasidis	db8df0ac35	Merge pull request #2755 from balena-io/node-20-6 Mark node 20.6.0 as the minimum working version	2024-04-16 17:16:00 +03:00
Thodoris Greasidis	7c7f46fe2b	Deduplicate dependencies	2024-04-16 16:46:25 +03:00
Thodoris Greasidis	b29aae1821	Mark node 20.6.0 as the minimum working version Change-type: patch	2024-04-16 15:42:41 +03:00
flowzone-app[bot]	0b10701015	v18.1.9	2024-04-10 15:24:31 +00:00
Thodoris Greasidis	1dbe08d7e0	Merge pull request #2748 from balena-io/kyle/renovate-npm-dedupe Enable npm dedupe as part of Renovate postUpdateOptions	2024-04-10 18:23:33 +03:00
Thodoris Greasidis	d01461ff3e	Deduplicate dependencies	2024-04-10 17:39:18 +03:00
Kyle Harding	2a970478bd	Enable npm dedupe as part of Renovate postUpdateOptions See: https://docs.renovatebot.com/configuration-options/#postupdateoptions Change-type: patch Signed-off-by: Kyle Harding <kyle@balena.io>	2024-04-10 10:03:01 -04:00
flowzone-app[bot]	ffd44d3fec	v18.1.8	2024-04-09 17:29:48 +00:00
Thodoris Greasidis	df51f87fbc	Merge pull request #2752 from balena-io/shrinkwrap-v3 npm-shrinkwrap.json: Recreate with lockfileVersion 3	2024-04-09 20:28:45 +03:00
Thodoris Greasidis	6178f34f88	Bump patch-package to 6.5.1 Change-type: patch	2024-04-09 19:25:17 +03:00
Thodoris Greasidis	c5ecf692bb	npm-shrinkwrap.json: Recreate with lockfileVersion 3 npm ci && \ rm npm-shrinkwrap.json && \ npm shrinkwrap I confirmed that it generates the same node_modules structure but cuts the shrinkwrap file size by 43%. Change-type: patch See: https://docs.npmjs.com/cli/v9/configuring-npm/package-lock-json#lockfileversion	2024-04-09 19:14:11 +03:00
flowzone-app[bot]	87f5f18721	v18.1.7	2024-04-09 16:03:36 +00:00
Thodoris Greasidis	e33810b448	Merge pull request #2753 from balena-io/preload-drop-unused-deps Update balena-preload to 15.0.5	2024-04-09 19:02:39 +03:00
Thodoris Greasidis	3caf54aa16	Update balena-preload to 15.0.5 Update balena-preload from 15.0.4 to 15.0.5 Change-type: patch	2024-04-09 18:26:11 +03:00
flowzone-app[bot]	9d3ee9eb49	v18.1.6	2024-04-09 15:04:42 +00:00
flowzone-app[bot]	3dac94db70	Merge pull request #2751 from balena-io/drivelist-v12 Update dependencies to get node-addon-api >=7.0.0 to fix builds on node 20.12.0	2024-04-09 15:03:45 +00:00
Thodoris Greasidis	04b4444fc2	Update expected build warning tests	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	98514cef09	Deduplicate dependencies	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	4811031172	Update @oclif/core to 3.26.2 Change-type: patch	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	be682c7426	Drop the keep-alive package in favor of node's setKeepAlive defaults Since node 12.17.0 setKeepAlive also sets TCP_KEEPCNT=10 (vs 5 that we had) TCP_KEEPINTVL=1 (vs 5s that we had) Change-type: patch See: https://nodejs.org/docs/latest-v14.x/api/net.html#net_socket_setkeepalive_enable_initialdelay See: https://github.com/balena-io/balena-cli/pull/1220	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	c6827ee51d	Update balena-preload to v15.0.4 Change-type: patch	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	2cba3bbc22	Update resin-cli-form to v3 Change-type: patch	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	933eacf275	Update resin-cli-visuals to v2 Change-type: patch	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	e7869f4c6d	Update balena-device-init to v7.0.1 Change-type: patch	2024-04-09 17:17:07 +03:00
Thodoris Greasidis	1a246a9ba5	Update etcher-sdk to v9.0.8 Change-type: patch	2024-04-09 17:16:30 +03:00
Thodoris Greasidis	e26895085d	Mark bin/dev & bin/run as executable Change-type: patch	2024-04-09 17:16:30 +03:00
flowzone-app[bot]	71345a8cc1	v18.1.5	2024-03-14 15:52:40 +00:00
flowzone-app[bot]	619f605eb2	Merge pull request #2747 from balena-io/move-claw-as-dev-dep Move klaw library to dev dependency	2024-03-14 15:51:48 +00:00
Otavio Jacobi	bb4713ab9a	Move klaw library to dev dependency Change-type: patch	2024-03-14 11:41:10 -03:00
flowzone-app[bot]	168bddf7db	v18.1.4	2024-03-14 14:34:50 +00:00
flowzone-app[bot]	24076e4f8d	Merge pull request #2746 from balena-io/update-balena-lint Update @balena/lint to 8.0.0	2024-03-14 14:33:48 +00:00
myarmolinsky	634ad156ce	Update @balena/lint to 8.0.0 Change-type: patch	2024-03-14 10:00:52 -04:00
flowzone-app[bot]	6ebeb97917	v18.1.3	2024-03-14 12:57:24 +00:00
Otávio Jacobi	cb444998cd	Merge pull request #2742 from balena-io/adds-runjs-for-plugin-compatibility Use standard oclif run.js & dev.js	2024-03-14 09:56:33 -03:00
Otavio Jacobi	742c015f21	Use standard oclif run.js & dev.js Change-type: patch	2024-03-14 09:21:11 -03:00
flowzone-app[bot]	556e50c87c	v18.1.2	2024-03-13 13:49:11 +00:00
Otávio Jacobi	3294f78b00	Merge pull request #2743 from balena-io/moves-signing-to-pretarball Move macos binary signing to oclif pretarball lifecycle	2024-03-13 10:48:14 -03:00
Otavio Jacobi	7f11805a7f	Move macos binary signing to oclif pretarball lifecycle Change-type: patch	2024-03-13 09:40:30 -03:00
flowzone-app[bot]	42dd732f68	v18.1.1	2024-03-12 17:39:15 +00:00
flowzone-app[bot]	aed50480c3	Merge pull request #2745 from balena-io/removes-tmp-workaround-for-windows-runners Remove patching tmp for windows runners	2024-03-12 17:38:18 +00:00
Otavio Jacobi	6515d6ae10	Remove patching tmp for windows runners See: https://github.com/balena-io/balena-cli/pull/1298/files#r297236577 Change-type: patch	2024-03-12 12:02:32 -03:00
flowzone-app[bot]	7903c82821	v18.1.0	2024-03-12 14:21:30 +00:00
Otávio Jacobi	eee8a0ecca	Merge pull request #2744 from balena-io/adds-arm64-macos-builds Add support for macos arm64 builds	2024-03-12 11:20:36 -03:00
Otavio Jacobi	38a2817587	Add support for macos arm64 builds Change-type: minor	2024-03-11 20:49:29 -03:00
flowzone-app[bot]	2bd0641d5f	v18.0.4	2024-03-11 22:19:10 +00:00
flowzone-app[bot]	122a763f82	Merge pull request #2739 from balena-io/update-dependencies Update dependencies	2024-03-11 22:18:03 +00:00
Otavio Jacobi	756f6b328b	Update dependencies Change-type: patch	2024-03-11 16:35:32 -03:00
flowzone-app[bot]	eb9db6f7b4	v18.0.3	2024-03-11 14:25:51 +00:00
flowzone-app[bot]	6f9e5a697c	Merge pull request #2740 from balena-io/removes-signing-patches Removes signing patches	2024-03-11 14:24:40 +00:00
Otavio Jacobi	f9f41eef4b	Removes signing patches Change-type: patch	2024-03-11 10:53:54 -03:00
flowzone-app[bot]	5371fea588	v18.0.2	2024-03-07 19:40:27 +00:00
flowzone-app[bot]	bacb55a1ea	Merge pull request #2735 from balena-io/removes-patches-windows Removes no longer needed patch	2024-03-07 19:39:38 +00:00
Otavio Jacobi	ecfd4a260e	Remove no longer needed windows oclif patches Change-type: patch	2024-03-07 15:51:00 -03:00
flowzone-app[bot]	1525822239	v18.0.1	2024-03-07 16:30:17 +00:00
flowzone-app[bot]	1614d9b2c8	Merge pull request #2733 from balena-io/fix-windows-signing Fix windows signing	2024-03-07 16:29:07 +00:00
Otavio Jacobi	2e061845ae	Fix windows signing Change-type: patch	2024-03-07 13:01:08 -03:00