v18.2.16

Update dependency etcher-sdk to v9.0.11

.github/actions/publish/action.yml

@@ -28,7 +28,7 @@ runs:
   using: 'composite'
   steps:
     - name: Download custom source artifact
-      uses: actions/download-artifact@f44cd7b40bfd40b6aa1cc1b9b5b7bf03d3c67110 # v4.1.0
+      uses: actions/download-artifact@65a9edc5881444af0b9093a5e628f2fe47ea3b2e # v4.1.7
       with:
         name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
         path: ${{ runner.temp }}
@@ -39,11 +39,17 @@ runs:
       run: tar -xf ${{ runner.temp }}/custom.tgz
 
     - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
       with:
         node-version: ${{ inputs.NODE_VERSION }}
         cache: npm
 
+    - name: Set up Python 3.11
+      if: runner.os == 'macOS'
+      uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4
+      with:
+        python-version: "3.11"
+
     - name: Install additional tools
       if: runner.os == 'Windows'
       shell: bash
@@ -60,7 +66,7 @@ runs:
     # https://github.com/Apple-Actions/import-codesign-certs
     - name: Import Apple code signing certificate
       if: runner.os == 'macOS'
-      uses: apple-actions/import-codesign-certs@v1
+      uses: apple-actions/import-codesign-certs@253ddeeac23f2bdad1646faac5c8c2832e800071 # v1
       with:
         p12-file-base64: ${{ fromJSON(inputs.secrets).APPLE_SIGNING }}
         p12-password: ${{ fromJSON(inputs.secrets).APPLE_SIGNING_PASSWORD }}
@@ -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,15 +127,15 @@ 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 }}
         XCODE_APP_LOADER_TEAM_ID: ${{ inputs.XCODE_APP_LOADER_TEAM_ID }}
 
     - name: Upload artifacts
-      uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
       with:
         name: gh-release-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ strategy.job-index }}
         path: dist

.github/actions/test/action.yml

@@ -26,14 +26,14 @@ runs:
   steps:
     # https://github.com/actions/setup-node#caching-global-packages-data
     - name: Setup Node.js
-      uses: actions/setup-node@v3
+      uses: actions/setup-node@1a4442cacd436585916779262731d5b162bc6ec7 # v3
       with:
         node-version: ${{ inputs.NODE_VERSION }}
         cache: npm
 
     - name: Set up Python 3.11
       if: runner.os == 'macOS'
-      uses: actions/setup-python@d27e3f3d7c64b4bbf8e4abfb9b63b83e846e0435 # v4
+      uses: actions/setup-python@65d7f2d534ac1bc67fcd62888c5f4f3d2cb2b236 # v4
       with:
         python-version: "3.11"
 
@@ -58,7 +58,7 @@ runs:
       run: tar --exclude-vcs -acf ${{ runner.temp }}/custom.tgz .
 
     - name: Upload custom artifact
-      uses: actions/upload-artifact@c7d193f32edcb7bfad88892161225aeda64e9392 # v4
+      uses: actions/upload-artifact@65462800fd760344b1a7b4382951275a0abb4808 # v4
       with:
         name: custom-${{ github.event.pull_request.head.sha || github.event.head_commit.id }}-${{ runner.os }}-${{ runner.arch }}
         path: ${{ runner.temp }}/custom.tgz

.github/renovate.json

@@ -0,0 +1,4 @@
+{
+	"extends": ["github>balena-io/renovate-config"],
+	"postUpdateOptions": ["npmDedupe"]
+}

.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

CHANGELOG.md

@@ -4,6 +4,169 @@ 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.16 - 2024-07-02
+
+
+<details>
+<summary> Update dependency etcher-sdk to v9.0.11 [Self-hosted Renovate Bot] </summary>
+
+> ### etcher-sdk-9.0.11 - 2024-04-26
+> 
+> * patch: use http2 to fix issues with url source [Edwin Joassart]
+> 
+> ### etcher-sdk-9.0.10 - 2024-04-26
+> 
+> * patch: remove CI workaround [Edwin Joassart]
+> 
+> ### etcher-sdk-9.0.9 - 2024-04-24
+> 
+> * patch: add option to allow listing virtual drive on Mac [JOASSART Edwin]
+> 
+
+</details>
+
+## 18.2.15 - 2024-07-02
+
+* Update dependency event-stream to v3.3.5 [Self-hosted Renovate Bot]
+
+## 18.2.14 - 2024-07-02
+
+* Update dependency jsonwebtoken to v9 [SECURITY] [Self-hosted Renovate Bot]
+
+## 18.2.13 - 2024-07-02
+
+* Update dependency @types/prettyjson to ^0.0.33 [Self-hosted Renovate Bot]
+
+## 18.2.12 - 2024-07-02
+
+* Deduplicate dependencies [Thodoris Greasidis]
+
+## 18.2.11 - 2024-07-01
+
+* Update dependency @types/fast-levenshtein to v0.0.4 [Self-hosted Renovate Bot]
+
+## 18.2.10 - 2024-06-21
+
+* Update actions/download-artifact action to v4.1.7 [Self-hosted Renovate Bot]
+
+## 18.2.9 - 2024-06-21
+
+* Update actions/setup-python digest to 65d7f2d [Self-hosted Renovate Bot]
+
+## 18.2.8 - 2024-06-21
+
+* Update actions/upload-artifact digest to 6546280 [Self-hosted Renovate Bot]
+
+## 18.2.7 - 2024-06-21
+
+* Pin dependencies [Self-hosted Renovate Bot]
+
+## 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]

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

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}"`);

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

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;
 

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';
 

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 || '')}`];

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];

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');

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;

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();

bin/balena

@@ -0,0 +1 @@
+run.js

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',
-	);
-}

bin/balena-dev

@@ -0,0 +1 @@
+dev.js

bin/dev.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run" %*

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',
+	);
+}

bin/run.cmd

@@ -0,0 +1,3 @@
+@echo off
+
+node "%~dp0\run" %*

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();

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 <name>](#api-key-generate-name)
 	- [api-key revoke <ids>](#api-key-revoke-ids)
-
-- API Keys
-
 	- [api-keys](#api-keys)
 
-- App
+- Apps
 
 	- [app create <name>](#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 <name>](#block-create-name)
 
@@ -196,7 +193,7 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [build [source]](#build-source)
 	- [deploy <fleet> [image]](#deploy-fleet-image)
 
-- Device
+- Devices
 
 	- [device deactivate <uuid>](#device-deactivate-uuid)
 	- [device identify <uuid>](#device-identify-uuid)
@@ -217,23 +214,17 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [device start-service <uuid>](#device-start-service-uuid)
 	- [device stop-service <uuid>](#device-stop-service-uuid)
 	- [device track-fleet <uuid>](#device-track-fleet-uuid)
-
-- Devices
-
 	- [devices](#devices)
 	- [devices supported](#devices-supported)
 
-- Environment Variable
-
-	- [env add <name> [value]](#env-add-name-value)
-	- [env rename <id> <value>](#env-rename-id-value)
-	- [env rm <id>](#env-rm-id)
-
 - Environment Variables
 
 	- [envs](#envs)
+	- [env rm <id>](#env-rm-id)
+	- [env add <name> [value]](#env-add-name-value)
+	- [env rename <id> <value>](#env-rename-id-value)
 
-- Fleet
+- Fleets
 
 	- [fleet create <name>](#fleet-create-name)
 	- [fleet <fleet>](#fleet-fleet)
@@ -243,9 +234,6 @@ are encouraged to regularly update the balena CLI to the latest version.
 	- [fleet restart <fleet>](#fleet-restart-fleet)
 	- [fleet rm <fleet>](#fleet-rm-fleet)
 	- [fleet track-latest <slug>](#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 <fleetordevice>](#push-fleetordevice)
 
-- Release
+- Releases
 
 	- [release finalize <commitorid>](#release-finalize-commitorid)
 	- [release <commitorid>](#release-commitorid)
 	- [release invalidate <commitorid>](#release-invalidate-commitorid)
 	- [release validate <commitorid>](#release-validate-commitorid)
-
-- Releases
-
 	- [releases <fleet>](#releases-fleet)
 
 - Settings
 
 	- [settings](#settings)
 
-- SSH Key
+- SSH Keys
 
 	- [key add <name> [path]](#key-add-name-path)
 	- [key <id>](#key-id)
 	- [key rm <id>](#key-rm-id)
-
-- SSH Keys
-
 	- [keys](#keys)
 
 - Support
 
 	- [support <action>](#support-action)
 
-- Tag
+- Tags
 
 	- [tag rm <tagkey>](#tag-rm-tagkey)
 	- [tag set <tagkey> [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 <name>
 
@@ -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 <name>
 
@@ -524,7 +501,7 @@ Examples:
 
 	$ balena whoami
 
-# Block
+# Blocks
 
 ## block create <name>
 
@@ -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 <uuid>
 
@@ -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 <id>
+
+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 <name> [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 <id>
-
-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 <name>
 
@@ -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 <commitOrId>
 
@@ -3499,8 +3466,6 @@ the commit or ID of the release to validate
 
 ### Options
 
-# Releases
-
 ## releases <fleet>
 
 List all releases of the given fleet.
@@ -3549,7 +3514,7 @@ Examples:
 
 ### Options
 
-# SSH Key
+# SSH Keys
 
 ## key add <name> [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 <tagKey>
 
@@ -3788,8 +3751,6 @@ device UUID
 
 release id
 
-# Tags
-
 ## tags
 
 List all tags and their values for the specified fleet, device or release.

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(

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',

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' +

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) {

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

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
 

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;
 

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 = [

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: {

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,

lib/commands/releases/index.ts

@@ -78,7 +78,7 @@ export default class ReleasesCmd extends Command {
 								$select: ['tag_key', 'value'],
 							},
 						},
-				  }
+					}
 				: { $select: fields },
 		);
 

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';

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;
 }
 

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;

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,

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);
 				}

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';

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';

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 {

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';
 }
 
 /**

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';

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;
 

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';

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';

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';
 
 /**

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';

package.json

@@ -1,6 +1,6 @@
 {
   "name": "balena-cli",
-  "version": "18.0.0",
+  "version": "18.2.16",
   "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",
@@ -151,7 +153,7 @@
     "@types/node": "^20.0.0",
     "@types/node-cleanup": "^2.1.2",
     "@types/parse-link-header": "^1.0.1",
-    "@types/prettyjson": "^0.0.30",
+    "@types/prettyjson": "^0.0.33",
     "@types/progress-stream": "^2.0.2",
     "@types/request": "^2.48.7",
     "@types/rewire": "^2.5.28",
@@ -180,7 +182,8 @@
     "husky": "^4.3.8",
     "inline-source-cli": "^2.0.0",
     "intercept-stdout": "^0.1.2",
-    "jsonwebtoken": "^8.5.1",
+    "jsonwebtoken": "^9.0.0",
+    "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/fast-levenshtein": "0.0.4",
     "@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,12 +227,12 @@
     "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",
-    "event-stream": "3.3.4",
+    "etcher-sdk": "9.0.11",
+    "event-stream": "3.3.5",
     "express": "^4.17.2",
     "fast-boot2": "^1.1.0",
     "fast-levenshtein": "^3.0.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-07-02T12:14:20.217Z"
   }
 }

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;
      }
- }

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;

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,

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');

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,

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';

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;

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,

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) {

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'),

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'),

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'),

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', () => {

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

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

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)

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)

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

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';

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);
+		}
 	});
 });

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',

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:

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<