diff --git a/automation/capitanodoc/utils.ts b/automation/capitanodoc/utils.ts index 5d6c9b81..0b77f049 100644 --- a/automation/capitanodoc/utils.ts +++ b/automation/capitanodoc/utils.ts @@ -36,7 +36,7 @@ export function getOptionSignature(signature: string) { export function parseCapitanoOption(option: OptionDefinition): string { let result = getOptionSignature(option.signature); - if (_.isArray(option.alias)) { + if (Array.isArray(option.alias)) { for (const alias of option.alias) { result += `, ${getOptionSignature(alias)}`; } diff --git a/lib/actions/logs.ts b/lib/actions/logs.ts index 1d41165d..4e4bc4ef 100644 --- a/lib/actions/logs.ts +++ b/lib/actions/logs.ts @@ -86,7 +86,6 @@ export const logs: CommandDefinition< async action(params, options, done) { normalizeUuidProp(params); const balena = getBalenaSdk(); - const isArray = await import('lodash/isArray'); const { serviceIdToName } = await import('../utils/cloud'); const { displayDeviceLogs, displayLogObject } = await import( '../utils/device/logs' @@ -101,7 +100,7 @@ export const logs: CommandDefinition< const servicesToDisplay = options.service != null - ? isArray(options.service) + ? Array.isArray(options.service) ? options.service : [options.service] : undefined; diff --git a/lib/actions/preload.coffee b/lib/actions/preload.coffee index c55a9070..4ab8f7b9 100644 --- a/lib/actions/preload.coffee +++ b/lib/actions/preload.coffee @@ -249,7 +249,7 @@ module.exports = options.pinDevice = options['pin-device-to-release'] || false delete options['pin-device-to-release'] - if _.isArray(options['add-certificate']) + if Array.isArray(options['add-certificate']) certificates = options['add-certificate'] else if options['add-certificate'] == undefined certificates = [] diff --git a/lib/actions/push.ts b/lib/actions/push.ts index 2aa36f2a..8284e104 100644 --- a/lib/actions/push.ts +++ b/lib/actions/push.ts @@ -263,7 +263,6 @@ export const push: CommandDefinition< async action(params, options) { const sdk = getBalenaSdk(); const Bluebird = await import('bluebird'); - const isArray = await import('lodash/isArray'); const remote = await import('../utils/remote-build'); const deviceDeploy = await import('../utils/device/deploy'); const { checkLoggedIn } = await import('../utils/patterns'); @@ -348,7 +347,7 @@ export const push: CommandDefinition< const device = appOrDevice; const servicesToDisplay = options.service != null - ? isArray(options.service) + ? Array.isArray(options.service) ? options.service : [options.service] : undefined; diff --git a/lib/actions/tunnel.ts b/lib/actions/tunnel.ts index 9536d673..bab3ec83 100644 --- a/lib/actions/tunnel.ts +++ b/lib/actions/tunnel.ts @@ -18,7 +18,6 @@ import { CommandDefinition } from 'capitano'; import { stripIndent } from 'common-tags'; import * as _ from 'lodash'; import { createServer, Server, Socket } from 'net'; -import { isArray } from 'util'; import { getBalenaSdk } from '../utils/lazy'; import { getOnlineTargetUuid } from '../utils/patterns'; @@ -121,7 +120,7 @@ export const tunnel: CommandDefinition = { } const ports = - typeof options.port !== 'string' && isArray(options.port) + typeof options.port !== 'string' && Array.isArray(options.port) ? (options.port as string[]) : [options.port as string]; diff --git a/lib/utils/compose.coffee b/lib/utils/compose.coffee index 98a3ebac..5e199811 100644 --- a/lib/utils/compose.coffee +++ b/lib/utils/compose.coffee @@ -376,9 +376,7 @@ getPreviousRepos = (sdk, docker, logger, appID) -> logger.logDebug("Failed to access previously pushed image repo: #{e}") authorizePush = (sdk, logger, tokenAuthEndpoint, registry, images, previousRepos) -> - _ = require('lodash') - - if not _.isArray(images) + if not Array.isArray(images) images = [ images ] images.push previousRepos... diff --git a/lib/utils/docker-coffee.coffee b/lib/utils/docker-coffee.coffee index e79aaa2a..cce74782 100644 --- a/lib/utils/docker-coffee.coffee +++ b/lib/utils/docker-coffee.coffee @@ -148,8 +148,7 @@ generateConnectOpts = (opts) -> return connectOpts parseBuildArgs = (args) -> - _ = require('lodash') - if not _.isArray(args) + if not Array.isArray(args) args = [ args ] buildArgs = {} args.forEach (arg) ->