balena-cli 17.4.1 → 17.4.2

package/build/commands/tunnel/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/tunnel/index.ts"],"names":[],"mappings":"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"}

package/build/commands/{version.d.ts → version/index.d.ts}

@@ -1,4 +1,4 @@
-import Command from '../command';
+import Command from '../../command';
 export interface JsonVersions {
     'balena-cli': string;
     'Node.js': string;

package/build/commands/{version.js → version/index.js}

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const command_1 = require("../command");
-const lazy_1 = require("../utils/lazy");
+const command_1 = require("../../command");
+const lazy_1 = require("../../utils/lazy");
 class VersionCmd extends command_1.default {
     async run() {
         const { flags: options } = await this.parse(VersionCmd);
         const versions = {
-            'balena-cli': (await Promise.resolve().then(() => require('../../package.json'))).version,
+            'balena-cli': (await Promise.resolve().then(() => require('../../../package.json'))).version,
             'Node.js': process.version && process.version.startsWith('v')
                 ? process.version.slice(1)
                 : process.version,
@@ -65,4 +65,4 @@ VersionCmd.flags = {
     help: core_1.Flags.help({ char: 'h' }),
 };
 exports.default = VersionCmd;
-//# sourceMappingURL=version.js.map
+//# sourceMappingURL=index.js.map

package/build/commands/version/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/version/index.ts"],"names":[],"mappings":";;AAiBA,sCAAoC;AACpC,2CAAoC;AACpC,2CAA+C;AAO/C,MAAqB,UAAW,SAAQ,iBAAO;IA6CvC,KAAK,CAAC,GAAG;QACf,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,UAAU,CAAC,CAAC;QACxD,MAAM,QAAQ,GAAiB;YAC9B,YAAY,EAAE,CAAC,2CAAa,uBAAuB,EAAC,CAAC,CAAC,OAAO;YAC7D,SAAS,EACR,OAAO,CAAC,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC;gBACjD,CAAC,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC;gBAC1B,CAAC,CAAC,OAAO,CAAC,OAAO;SACnB,CAAC;QACF,IAAI,OAAO,CAAC,IAAI,EAAE;YACjB,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,CAAC;SAC/C;aAAM;YACN,IAAI,OAAO,CAAC,GAAG,EAAE;gBAChB,OAAO,CAAC,GAAG,CAAC,uBAAuB,QAAQ,CAAC,YAAY,CAAC,GAAG,CAAC,CAAC;gBAC9D,OAAO,CAAC,GAAG,CAAC,oBAAoB,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;aACxD;iBAAM;gBAEN,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;aACpC;SACD;IACF,CAAC;;AAhEa,sBAAW,GAAG,IAAA,kBAAW,EAAA;;;;;;;;;;;;;;;CAevC,CAAC;AACa,mBAAQ,GAAG;IACxB,kBAAkB;IAClB,qBAAqB;IACrB,qBAAqB;IACrB,oBAAoB;IACpB,aAAa;CACb,CAAC;AAEY,gBAAK,GAAG,SAAS,CAAC;AAElB,4BAAiB,GAAG,IAAI,CAAC;AAEzB,gBAAK,GAAG;IACrB,GAAG,EAAE,YAAK,CAAC,OAAO,CAAC;QAClB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,GAAG;QACT,WAAW,EACV,iEAAiE;KAClE,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,OAAO,CAAC;QACnB,OAAO,EAAE,KAAK;QACd,IAAI,EAAE,GAAG;QACT,WAAW,EACV,gEAAgE;KACjE,CAAC;IACF,IAAI,EAAE,YAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,GAAG,EAAE,CAAC;CAC/B,CAAC;kBA3CkB,UAAU"}

package/build/commands/{whoami.d.ts → whoami/index.d.ts}

@@ -1,4 +1,4 @@
-import Command from '../command';
+import Command from '../../command';
 export default class WhoamiCmd extends Command {
     static description: string;
     static examples: string[];

package/build/commands/{whoami.js → whoami/index.js}

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const command_1 = require("../command");
-const lazy_1 = require("../utils/lazy");
+const command_1 = require("../../command");
+const lazy_1 = require("../../utils/lazy");
 class WhoamiCmd extends command_1.default {
     async run() {
         await this.parse(WhoamiCmd);
@@ -44,4 +44,4 @@ WhoamiCmd.examples = ['$ balena whoami'];
 WhoamiCmd.usage = 'whoami';
 WhoamiCmd.authenticated = true;
 exports.default = WhoamiCmd;
-//# sourceMappingURL=whoami.js.map
+//# sourceMappingURL=index.js.map

package/build/commands/whoami/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../lib/commands/whoami/index.ts"],"names":[],"mappings":";;AAiBA,2CAAoC;AACpC,2CAAyE;AAEzE,MAAqB,SAAU,SAAQ,iBAAO;IAatC,KAAK,CAAC,GAAG;QACf,MAAM,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;QAE5B,MAAM,MAAM,GAAG,IAAA,mBAAY,GAAE,CAAC;QAE9B,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC,GAAG,CAAC;YAC7C,MAAM,CAAC,IAAI,CAAC,MAAM,EAAE;YACpB,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC;SAChC,CAAC,CAAC;QAEH,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,MAAK,MAAM,EAAE;YACvC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,YAAY,CAAC;YACzC,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,EAAE;gBACrD,uBAAuB;gBACvB,UAAU;gBACV,OAAO;gBACP,KAAK;aACL,CAAC,CACF,CAAC;SACF;aAAM,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,MAAK,QAAQ,EAAE;YAChD,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,MAAM,EAAE,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBAC/D,uBAAuB;gBACvB,QAAQ;gBACR,KAAK;aACL,CAAC,CACF,CAAC;SACF;aAAM,IAAI,CAAA,YAAY,aAAZ,YAAY,uBAAZ,YAAY,CAAE,SAAS,MAAK,aAAa,EAAE;YACrD,OAAO,CAAC,GAAG,CACV,IAAA,iBAAU,GAAE,CAAC,KAAK,CAAC,QAAQ,CAAC,EAAE,WAAW,EAAE,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE;gBACpE,uBAAuB;gBACvB,aAAa;gBACb,KAAK;aACL,CAAC,CACF,CAAC;SACF;IACF,CAAC;;AAjDa,qBAAW,GAAG,IAAA,kBAAW,EAAA;;;;EAItC,CAAC;AAEY,kBAAQ,GAAG,CAAC,iBAAiB,CAAC,CAAC;AAE/B,eAAK,GAAG,QAAQ,CAAC;AAEjB,uBAAa,GAAG,IAAI,CAAC;kBAXf,SAAS"}

package/lib/commands/{build.ts → build/index.ts}

@@ -16,20 +16,20 @@
  */
 
 import { Args, Flags } from '@oclif/core';
-import Command from '../command';
-import { getBalenaSdk } from '../utils/lazy';
-import * as cf from '../utils/common-flags';
-import * as compose from '../utils/compose';
+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 {
 	buildArgDeprecation,
 	dockerignoreHelp,
 	registrySecretsHelp,
-} from '../utils/messages';
-import type { ComposeCliFlags, ComposeOpts } from '../utils/compose-types';
-import { buildProject, composeCliFlags } from '../utils/compose_ts';
-import type { BuildOpts, DockerCliFlags } from '../utils/docker';
-import { dockerCliFlags } from '../utils/docker';
+} from '../../utils/messages';
+import type { ComposeCliFlags, ComposeOpts } from '../../utils/compose-types';
+import { buildProject, composeCliFlags } from '../../utils/compose_ts';
+import type { BuildOpts, DockerCliFlags } from '../../utils/docker';
+import { dockerCliFlags } from '../../utils/docker';
 
 // TODO: For this special one we can't use Interfaces.InferredFlags/InferredArgs
 // because of the 'registry-secrets' type which is defined in the actual code
@@ -148,14 +148,14 @@ ${dockerignoreHelp}
 			(opts.fleet == null && (opts.arch == null || opts.deviceType == null)) ||
 			(opts.fleet != null && (opts.arch != null || opts.deviceType != null))
 		) {
-			const { ExpectedError } = await import('../errors');
+			const { ExpectedError } = await import('../../errors');
 			throw new ExpectedError(
 				'You must specify either a fleet (-f), or the device type (-d) and architecture (-A)',
 			);
 		}
 
 		// Validate project directory
-		const { validateProjectDirectory } = await import('../utils/compose_ts');
+		const { validateProjectDirectory } = await import('../../utils/compose_ts');
 		const { dockerfilePath, registrySecrets } = await validateProjectDirectory(
 			sdk,
 			{
@@ -172,7 +172,7 @@ ${dockerignoreHelp}
 
 	protected async getAppAndResolveArch(opts: FlagsDef) {
 		if (opts.fleet) {
-			const { getAppWithArch } = await import('../utils/helpers');
+			const { getAppWithArch } = await import('../../utils/helpers');
 			const app = await getAppWithArch(opts.fleet);
 			opts.arch = app.arch;
 			opts.deviceType = app.is_for__device_type[0].slug;
@@ -181,7 +181,7 @@ ${dockerignoreHelp}
 	}
 
 	protected async prepareBuild(options: FlagsDef) {
-		const { getDocker, generateBuildOpts } = await import('../utils/docker');
+		const { getDocker, generateBuildOpts } = await import('../../utils/docker');
 		const [docker, buildOpts, composeOpts] = await Promise.all([
 			getDocker(options),
 			generateBuildOpts(options),
@@ -209,7 +209,7 @@ ${dockerignoreHelp}
 	 */
 	protected async buildProject(
 		docker: import('dockerode'),
-		logger: import('../utils/logger'),
+		logger: import('../../utils/logger'),
 		composeOpts: ComposeOpts,
 		opts: {
 			app?: {
@@ -221,7 +221,7 @@ ${dockerignoreHelp}
 			buildOpts: BuildOpts;
 		},
 	) {
-		const { loadProject } = await import('../utils/compose_ts');
+		const { loadProject } = await import('../../utils/compose_ts');
 
 		const project = await loadProject(
 			logger,

package/lib/commands/{deploy.ts → deploy/index.ts}

@@ -18,31 +18,31 @@
 import { Args, Flags } from '@oclif/core';
 import type { ImageDescriptor } from '@balena/compose/dist/parse';
 
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import { getBalenaSdk, getChalk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import { getBalenaSdk, getChalk, stripIndent } from '../../utils/lazy';
 import {
 	dockerignoreHelp,
 	registrySecretsHelp,
 	buildArgDeprecation,
-} from '../utils/messages';
-import * as ca from '../utils/common-args';
-import * as compose from '../utils/compose';
+} from '../../utils/messages';
+import * as ca from '../../utils/common-args';
+import * as compose from '../../utils/compose';
 import type {
 	BuiltImage,
 	ComposeCliFlags,
 	ComposeOpts,
 	Release as ComposeReleaseInfo,
-} from '../utils/compose-types';
-import type { BuildOpts, DockerCliFlags } from '../utils/docker';
+} from '../../utils/compose-types';
+import type { BuildOpts, DockerCliFlags } from '../../utils/docker';
 import {
 	applyReleaseTagKeysAndValues,
 	buildProject,
 	composeCliFlags,
 	isBuildConfig,
 	parseReleaseTagKeysAndValues,
-} from '../utils/compose_ts';
-import { dockerCliFlags } from '../utils/docker';
+} from '../../utils/compose_ts';
+import { dockerCliFlags } from '../../utils/docker';
 import type { ApplicationType, DeviceType, Release } from 'balena-sdk';
 
 interface ApplicationWithArch {
@@ -175,7 +175,7 @@ ${dockerignoreHelp}
 
 		const sdk = getBalenaSdk();
 		const { getRegistrySecrets, validateProjectDirectory } = await import(
-			'../utils/compose_ts'
+			'../../utils/compose_ts'
 		);
 
 		const { releaseTagKeys, releaseTagValues } = parseReleaseTagKeysAndValues(
@@ -199,10 +199,10 @@ ${dockerignoreHelp}
 			(options as FlagsDef)['registry-secrets'] = registrySecrets;
 		}
 
-		const helpers = await import('../utils/helpers');
+		const helpers = await import('../../utils/helpers');
 		const app = await helpers.getAppWithArch(fleet);
 
-		const dockerUtils = await import('../utils/docker');
+		const dockerUtils = await import('../../utils/docker');
 		const [docker, buildOpts, composeOpts] = await Promise.all([
 			dockerUtils.getDocker(options),
 			dockerUtils.generateBuildOpts(options as FlagsDef),
@@ -232,7 +232,7 @@ ${dockerignoreHelp}
 
 	async deployProject(
 		docker: import('dockerode'),
-		logger: import('../utils/logger'),
+		logger: import('../../utils/logger'),
 		composeOpts: ComposeOpts,
 		opts: {
 			app: ApplicationWithArch; // the application instance to deploy to
@@ -250,7 +250,7 @@ ${dockerignoreHelp}
 		const doodles = await import('resin-doodles');
 		const sdk = getBalenaSdk();
 		const { deployProject: $deployProject, loadProject } = await import(
-			'../utils/compose_ts'
+			'../../utils/compose_ts'
 		);
 
 		const appType = opts.app.application_type[0];
@@ -332,7 +332,7 @@ ${dockerignoreHelp}
 
 			let release: Release | ComposeReleaseInfo['release'];
 			if (appType.slug === 'legacy-v1' || appType.slug === 'legacy-v2') {
-				const { deployLegacy } = require('../utils/deploy-legacy');
+				const { deployLegacy } = require('../../utils/deploy-legacy');
 
 				const msg = getChalk().yellow(
 					'Target fleet requires legacy deploy method.',

package/lib/commands/{envs.ts → envs/index.ts}

@@ -18,11 +18,11 @@ import { Flags } from '@oclif/core';
 import type { Interfaces } from '@oclif/core';
 import type * as SDK from 'balena-sdk';
 import * as _ from 'lodash';
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
-import { applicationIdInfo } from '../utils/messages';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
 
 type FlagsDef = Interfaces.InferredFlags<typeof EnvsCmd.flags>;
 
@@ -124,12 +124,16 @@ export default class EnvsCmd extends Command {
 		const balena = getBalenaSdk();
 
 		let fleetSlug: string | undefined = options.fleet
-			? await (await import('../utils/sdk')).getFleetSlug(balena, options.fleet)
+			? await (
+					await import('../../utils/sdk')
+			  ).getFleetSlug(balena, options.fleet)
 			: undefined;
 		let fullUUID: string | undefined; // as oppposed to the short, 7-char UUID
 
 		if (options.device) {
-			const { getDeviceAndMaybeAppFromUUID } = await import('../utils/cloud');
+			const { getDeviceAndMaybeAppFromUUID } = await import(
+				'../../utils/cloud'
+			);
 			const [device, app] = await getDeviceAndMaybeAppFromUUID(
 				balena,
 				options.device,
@@ -182,7 +186,7 @@ export default class EnvsCmd extends Command {
 		}
 
 		if (options.json) {
-			const { pickAndRename } = await import('../utils/helpers');
+			const { pickAndRename } = await import('../../utils/helpers');
 			const mapped = varArray.map((o) => pickAndRename(o, fields));
 			this.log(JSON.stringify(mapped, null, 4));
 		} else {

package/lib/commands/{fleets.ts → fleets/index.ts}

@@ -17,9 +17,9 @@
 
 import type * as BalenaSdk from 'balena-sdk';
 
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
 interface ExtendedApplication extends ApplicationWithDeviceTypeSlug {
 	device_count: number;

package/lib/commands/{join.ts → join/index.ts}

@@ -16,11 +16,11 @@
  */
 
 import { Args, Flags } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
-import { applicationIdInfo } from '../utils/messages';
-import { parseAsLocalHostnameOrIp } from '../utils/validation';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
+import { parseAsLocalHostnameOrIp } from '../../utils/validation';
 
 export default class JoinCmd extends Command {
 	public static description = stripIndent`
@@ -78,7 +78,7 @@ export default class JoinCmd extends Command {
 	public async run() {
 		const { args: params, flags: options } = await this.parse(JoinCmd);
 
-		const promote = await import('../utils/promote');
+		const promote = await import('../../utils/promote');
 		const sdk = getBalenaSdk();
 		const logger = await Command.getLogger();
 		return promote.join(

package/lib/commands/{keys.ts → keys/index.ts}

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 
 export default class KeysCmd extends Command {
 	public static description = stripIndent`

package/lib/commands/{leave.ts → leave/index.ts}

@@ -16,10 +16,10 @@
  */
 
 import { Args } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { stripIndent } from '../utils/lazy';
-import { parseAsLocalHostnameOrIp } from '../utils/validation';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { stripIndent } from '../../utils/lazy';
+import { parseAsLocalHostnameOrIp } from '../../utils/validation';
 
 export default class LeaveCmd extends Command {
 	public static description = stripIndent`
@@ -62,7 +62,7 @@ export default class LeaveCmd extends Command {
 	public async run() {
 		const { args: params } = await this.parse(LeaveCmd);
 
-		const promote = await import('../utils/promote');
+		const promote = await import('../../utils/promote');
 		const logger = await Command.getLogger();
 		return promote.leave(logger, params.deviceIpOrHostname);
 	}

package/lib/commands/{login.ts → login/index.ts}

@@ -16,10 +16,10 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent, getCliForm } from '../utils/lazy';
-import { ExpectedError } from '../errors';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent, getCliForm } from '../../utils/lazy';
+import { ExpectedError } from '../../errors';
 import type { WhoamiResult } from 'balena-sdk';
 
 interface FlagsDef {
@@ -123,7 +123,7 @@ export default class LoginCmd extends Command {
 		const { flags: options, args: params } = await this.parse(LoginCmd);
 
 		const balena = getBalenaSdk();
-		const messages = await import('../utils/messages');
+		const messages = await import('../../utils/messages');
 		const balenaUrl = await balena.settings.get('balenaUrl');
 
 		// Consolidate user/email options
@@ -202,16 +202,16 @@ ${messages.reachingOut}`);
 		}
 		// Credentials
 		else if (loginOptions.credentials) {
-			const patterns = await import('../utils/patterns');
+			const patterns = await import('../../utils/patterns');
 			return patterns.authenticate(loginOptions);
 		}
 		// Web
 		else if (loginOptions.web) {
-			const auth = await import('../auth');
+			const auth = await import('../../auth');
 			await auth.login({ port: loginOptions.port });
 			return;
 		} else {
-			const patterns = await import('../utils/patterns');
+			const patterns = await import('../../utils/patterns');
 			// User had not selected login preference, prompt interactively
 			const loginType = await patterns.askLoginType();
 			if (loginType === 'register') {

package/lib/commands/{logout.ts → logout/index.ts}

@@ -15,8 +15,8 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
 export default class LogoutCmd extends Command {
 	public static description = stripIndent`

package/lib/commands/{logs.ts → logs/index.ts}

@@ -16,9 +16,9 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 import { LogMessage } from 'balena-sdk';
 
 const MAX_RETRY = 1000;
@@ -96,14 +96,14 @@ export default class LogsCmd extends Command {
 		const { args: params, flags: options } = await this.parse(LogsCmd);
 
 		const balena = getBalenaSdk();
-		const { serviceIdToName } = await import('../utils/cloud');
+		const { serviceIdToName } = await import('../../utils/cloud');
 		const { connectAndDisplayDeviceLogs, displayLogObject } = await import(
-			'../utils/device/logs'
+			'../../utils/device/logs'
 		);
 		const { validateIPAddress, validateDotLocalUrl } = await import(
-			'../utils/validation'
+			'../../utils/validation'
 		);
-		const Logger = await import('../utils/logger');
+		const Logger = await import('../../utils/logger');
 
 		const logger = Logger.getLogger();
 
@@ -132,13 +132,13 @@ export default class LogsCmd extends Command {
 			validateDotLocalUrl(params.device)
 		) {
 			// Logs from local device
-			const { DeviceAPI } = await import('../utils/device/api');
+			const { DeviceAPI } = await import('../../utils/device/api');
 			const deviceApi = new DeviceAPI(logger, params.device);
 			logger.logDebug('Checking we can access device');
 			try {
 				await deviceApi.ping();
 			} catch (e) {
-				const { ExpectedError } = await import('../errors');
+				const { ExpectedError } = await import('../../errors');
 				throw new ExpectedError(
 					`Cannot access device at address ${params.device}.  Device may not be in local mode.`,
 				);

package/lib/commands/{note.ts → notes/index.ts}

@@ -16,10 +16,10 @@
  */
 
 import { Flags, Args } from '@oclif/core';
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, stripIndent } from '../../utils/lazy';
 
 export default class NoteCmd extends Command {
 	public static description = stripIndent`

package/lib/commands/{orgs.ts → orgs/index.ts}

@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import * as cf from '../utils/common-flags';
-import { getBalenaSdk, getVisuals, stripIndent } from '../utils/lazy';
+import Command from '../../command';
+import * as cf from '../../utils/common-flags';
+import { getBalenaSdk, getVisuals, stripIndent } from '../../utils/lazy';
 
 export default class OrgsCmd extends Command {
 	public static description = stripIndent`
@@ -38,7 +38,7 @@ export default class OrgsCmd extends Command {
 	public async run() {
 		await this.parse(OrgsCmd);
 
-		const { getOwnOrganizations } = await import('../utils/sdk');
+		const { getOwnOrganizations } = await import('../../utils/sdk');
 
 		// Get organizations
 		const organizations = await getOwnOrganizations(getBalenaSdk(), {

package/lib/commands/{preload.ts → preload/index.ts}

@@ -15,18 +15,18 @@
  * limitations under the License.
  */
 
-import Command from '../command';
-import { ExpectedError } from '../errors';
-import * as cf from '../utils/common-flags';
+import Command from '../../command';
+import { ExpectedError } from '../../errors';
+import * as cf from '../../utils/common-flags';
 import {
 	getBalenaSdk,
 	getCliForm,
 	getVisuals,
 	stripIndent,
-} from '../utils/lazy';
-import { applicationIdInfo } from '../utils/messages';
-import { dockerConnectionCliFlags } from '../utils/docker';
-import { parseAsInteger } from '../utils/validation';
+} from '../../utils/lazy';
+import { applicationIdInfo } from '../../utils/messages';
+import { dockerConnectionCliFlags } from '../../utils/docker';
+import { parseAsInteger } from '../../utils/validation';
 
 import { Flags, Args } from '@oclif/core';
 import * as _ from 'lodash';
@@ -148,7 +148,7 @@ Can be repeated to add multiple certificates.\
 		const balenaPreload = await import('balena-preload');
 		const visuals = getVisuals();
 		const nodeCleanup = await import('node-cleanup');
-		const { instanceOf } = await import('../errors');
+		const { instanceOf } = await import('../../errors');
 
 		// Check image file exists
 		try {
@@ -171,7 +171,9 @@ Can be repeated to add multiple certificates.\
 		// balena-preload currently does not work with numerical app IDs
 		// Load app here, and use app slug from hereon
 		const fleetSlug: string | undefined = options.fleet
-			? await (await import('../utils/sdk')).getFleetSlug(balena, options.fleet)
+			? await (
+					await import('../../utils/sdk')
+			  ).getFleetSlug(balena, options.fleet)
 			: undefined;
 
 		const progressBars: {
@@ -227,7 +229,7 @@ Can be repeated to add multiple certificates.\
 		}
 
 		// Get a configured dockerode instance
-		const dockerUtils = await import('../utils/docker');
+		const dockerUtils = await import('../../utils/docker');
 		const docker = await dockerUtils.getDocker(options);
 		const preloader = new balenaPreload.Preloader(
 			undefined,
@@ -479,7 +481,7 @@ Would you like to disable automatic updates for this fleet now?\
 	}
 
 	async getAppWithReleases(balenaSdk: BalenaSDK, slug: string) {
-		const { getApplication } = await import('../utils/sdk');
+		const { getApplication } = await import('../../utils/sdk');
 
 		return await getApplication(balenaSdk, slug, {
 			$expand: this.applicationExpandOptions,