ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-20 22:23:07 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update balena-compose-parse to v3.0.0

Browse Source 
Update balena-compose-parse from v2.1.3 to v3.0.0

Change-type: patch
This commit is contained in:
Akis Kesoglou 2021-10-22 18:26:43 +03:00
parent 8e712ac910
commit 6b900e5227
10 changed files with 66 additions and 187 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/commands/deploy.ts
View File

@ -16,7 +16,7 @@
*/ */
import { flags } from '@oclif/command'; import { flags } from '@oclif/command';
import type { ImageDescriptor } from 'resin-compose-parse'; import type { ImageDescriptor } from '@balena/compose-parse';
import Command from '../command'; import Command from '../command';
import { ExpectedError } from '../errors'; import { ExpectedError } from '../errors';

2
lib/utils/compose-types.d.ts vendored
View File

@ -15,7 +15,7 @@
* limitations under the License. * limitations under the License.
*/ */
import type { Composition, ImageDescriptor } from 'resin-compose-parse'; import type { Composition, ImageDescriptor } from '@balena/compose-parse';
import type { Pack } from 'tar-stream'; import type { Pack } from 'tar-stream';
interface Image { interface Image {

4
lib/utils/compose.js
View File

@ -60,7 +60,7 @@ export function createProject(
imageTag = '', imageTag = '',
) { ) {
const yml = require('js-yaml'); const yml = require('js-yaml');
const compose = require('resin-compose-parse'); const compose = require('@balena/compose-parse');
// both methods below may throw. // both methods below may throw.
const rawComposition = yml.load(composeStr); const rawComposition = yml.load(composeStr);
@ -180,7 +180,7 @@ export async function originalTarDirectory(dir, param) {
* @param {string} auth * @param {string} auth
* @param {number} userId * @param {number} userId
* @param {number} appId * @param {number} appId
* @param {import('resin-compose-parse').Composition} composition * @param {import('@balena/compose-parse').Composition} composition
* @param {boolean} draft * @param {boolean} draft
* @param {string|undefined} semver * @param {string|undefined} semver
* @param {string|undefined} contract * @param {string|undefined} contract

14
lib/utils/compose_ts.ts
View File

@ -26,7 +26,7 @@ import type {
BuildConfig, BuildConfig,
Composition, Composition,
ImageDescriptor, ImageDescriptor,
} from 'resin-compose-parse'; } from '@balena/compose-parse';
import type * as MultiBuild from 'resin-multibuild'; import type * as MultiBuild from 'resin-multibuild';
import type { Duplex, Readable } from 'stream'; import type { Duplex, Readable } from 'stream';
import type { Pack } from 'tar-stream'; import type { Pack } from 'tar-stream';
@ -120,7 +120,7 @@ export async function loadProject(
image?: string, image?: string,
imageTag?: string, imageTag?: string,
): Promise<ComposeProject> { ): Promise<ComposeProject> {
const compose = await import('resin-compose-parse'); const compose = await import('@balena/compose-parse');
const { createProject } = await import('./compose'); const { createProject } = await import('./compose');
let composeName: string; let composeName: string;
let composeStr: string; let composeStr: string;
@ -265,7 +265,7 @@ export async function buildProject(
opts: BuildProjectOpts, opts: BuildProjectOpts,
): Promise<BuiltImage[]> { ): Promise<BuiltImage[]> {
await checkBuildSecretsRequirements(opts.docker, opts.projectPath); await checkBuildSecretsRequirements(opts.docker, opts.projectPath);
const compose = await import('resin-compose-parse'); const compose = await import('@balena/compose-parse');
const imageDescriptors = compose.parse(opts.composition); const imageDescriptors = compose.parse(opts.composition);
const renderer = await startRenderer({ imageDescriptors, ...opts }); const renderer = await startRenderer({ imageDescriptors, ...opts });
let buildSummaryByService: Dictionary<string> | undefined; let buildSummaryByService: Dictionary<string> | undefined;
@ -727,16 +727,16 @@ export async function getServiceDirsFromComposition(
* *
* The `image` argument may therefore refer to either a `build` or `image` property * The `image` argument may therefore refer to either a `build` or `image` property
* of a service in a docker-compose.yml file, which is a bit confusing but it matches * of a service in a docker-compose.yml file, which is a bit confusing but it matches
* the `ImageDescriptor.image` property as defined by `resin-compose-parse`. * the `ImageDescriptor.image` property as defined by `@balena/compose-parse`.
* *
* Note that `resin-compose-parse` "normalizes" the docker-compose.yml file such * Note that `@balena/compose-parse` "normalizes" the docker-compose.yml file such
* that, if `services.service.build` is a string, it is converted to a BuildConfig * that, if `services.service.build` is a string, it is converted to a BuildConfig
* object with the string value assigned to `services.service.build.context`: * object with the string value assigned to `services.service.build.context`:
* https://github.com/balena-io-modules/resin-compose-parse/blob/v2.1.3/src/compose.ts#L166-L167 * https://github.com/balena-io-modules/balena-compose-parse/blob/v3.0.0/src/compose.ts#L314-L315
* This is why this implementation works when `services.service.build` is defined * This is why this implementation works when `services.service.build` is defined
* as a string in the docker-compose.yml file. * as a string in the docker-compose.yml file.
* *
* @param image The `ImageDescriptor.image` attribute parsed with `resin-compose-parse` * @param image The `ImageDescriptor.image` attribute parsed with `@balena/compose-parse`
*/ */
export function isBuildConfig( export function isBuildConfig(
image: string | BuildConfig, image: string | BuildConfig,

2
lib/utils/device/deploy.ts
View File

@ -18,7 +18,7 @@
import * as semver from 'balena-semver'; import * as semver from 'balena-semver';
import * as Docker from 'dockerode'; import * as Docker from 'dockerode';
import * as _ from 'lodash'; import * as _ from 'lodash';
import { Composition } from 'resin-compose-parse'; import { Composition } from '@balena/compose-parse';
import { import {
BuildTask, BuildTask,
getAuthConfigObj, getAuthConfigObj,

2
lib/utils/device/live.ts
View File

@ -21,7 +21,7 @@ import * as fs from 'fs';
import Livepush, { ContainerNotRunningError } from 'livepush'; import Livepush, { ContainerNotRunningError } from 'livepush';
import * as _ from 'lodash'; import * as _ from 'lodash';
import * as path from 'path'; import * as path from 'path';
import type { Composition } from 'resin-compose-parse'; import type { Composition } from '@balena/compose-parse';
import type { BuildTask } from 'resin-multibuild'; import type { BuildTask } from 'resin-multibuild';
import { instanceOf } from '../../errors'; import { instanceOf } from '../../errors';

213
npm-shrinkwrap.json generated
View File

@ -1235,6 +1235,25 @@
"sax": "^1.2.4" "sax": "^1.2.4"
} }
}, },
"@balena/compose-parse": {
"version": "3.0.0",
"resolved": "https://registry.npmjs.org/@balena/compose-parse/-/compose-parse-3.0.0.tgz",
"integrity": "sha512-Wd2DSwcjtj+Nt7z2P9dqt2C8jHZWPxNhVGOsAgyxBfDP61s8v49iv8trb/3cPaGupwM3JZx2FJ8yIj0YJWfwoA==",
"requires": {
"@types/lodash": "^4.14.86",
"@types/node": "^8.0.55",
"ajv": "^6.0.1",
"lodash": "^4.17.4",
"typed-error": "^3.0.0"
},
"dependencies": {
"@types/node": {
"version": "8.10.66",
"resolved": "https://registry.npmjs.org/@types/node/-/node-8.10.66.tgz",
"integrity": "sha512-tktOkFUA4kXx2hhhrB8bIFb5TbwzS4uOhKEmwiD+NoiL0qtP2OQ9mFldbgD4dV1djrlBYP6eBuQZiWjuHUpqFw=="
}
}
},
"@balena/dockerignore": { "@balena/dockerignore": {
"version": "1.0.2", "version": "1.0.2",
"resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz", "resolved": "https://registry.npmjs.org/@balena/dockerignore/-/dockerignore-1.0.2.tgz",
@ -3952,16 +3971,16 @@
} }
}, },
"balena-release": { "balena-release": {
"version": "3.2.0", "version": "3.3.0",
"resolved": "https://registry.npmjs.org/balena-release/-/balena-release-3.2.0.tgz", "resolved": "https://registry.npmjs.org/balena-release/-/balena-release-3.3.0.tgz",
"integrity": "sha512-jwmAjIZCJ5I46/yQNN+dA73RWlre0+jBVmo2QeJl1pK83obTLyifJeWNVf5irzP8KFE7WQzo9ICK1cCpLtygFA==", "integrity": "sha512-Ult7Tdg12ASCphDze6wkqrh3nx3bEkHsXF8jFz6vJ/HNmcojOJlZxlgbQbnhxxTsJa045QCW3wXvqgPFf06ckQ==",
"requires": { "requires": {
"@balena/compose-parse": "^3.0.0",
"@types/bluebird": "^3.5.18", "@types/bluebird": "^3.5.18",
"@types/node": "^8.0.55", "@types/node": "^8.0.55",
"@types/request": "^2.0.8", "@types/request": "^2.0.8",
"bluebird": "^3.5.1", "bluebird": "^3.5.1",
"pinejs-client-request": "^7.1.0", "pinejs-client-request": "^7.1.0",
"resin-compose-parse": "^2.0.0",
"typed-error": "^3.0.0" "typed-error": "^3.0.0"
}, },
"dependencies": { "dependencies": {
@ -8180,9 +8199,9 @@
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
}, },
"fp-ts": { "fp-ts": {
"version": "2.11.3", "version": "2.11.5",
"resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.3.tgz", "resolved": "https://registry.npmjs.org/fp-ts/-/fp-ts-2.11.5.tgz",
"integrity": "sha512-qHI5iaVSFNFmdl6yDensWfFMk32iafAINCnqx8m486DV1+Jht/bTnA9CyahL+Xm7h2y3erinviVBIAWvv5bPYw==" "integrity": "sha512-OqlwJq1BdpB83BZXTqI+dNcA6uYk6qk4u9Cgnt64Y+XS7dwdbp/mobx8S2KXf2AXH+scNmA/UVK3SEFHR3vHZA=="
}, },
"fragment-cache": { "fragment-cache": {
"version": "0.2.1", "version": "0.2.1",
@ -15423,9 +15442,9 @@
} }
}, },
"resin-compose-parse": { "resin-compose-parse": {
"version": "2.1.3", "version": "2.4.0",
"resolved": "https://registry.npmjs.org/resin-compose-parse/-/resin-compose-parse-2.1.3.tgz", "resolved": "https://registry.npmjs.org/resin-compose-parse/-/resin-compose-parse-2.4.0.tgz",
"integrity": "sha512-X5WQo+OHoPe+FV8JliGzSIL4glLX0PPFvtnopppYef1UqKcJm+GHaiEZBOj3C7vIEDqQrsNrKXY/BpadlOFiWA==", "integrity": "sha512-JldqZbHp+YWSC7UwIrI5ZZJwNPln+28a+nIM2cDMVIJliE8ofQFLTwEQzvvh8SoLqJgGh9cXtKEA7vkS3V9W7A==",
"requires": { "requires": {
"@types/lodash": "^4.14.86", "@types/lodash": "^4.14.86",
"@types/node": "^8.0.55", "@types/node": "^8.0.55",
@ -15701,23 +15720,23 @@
} }
}, },
"resin-multibuild": { "resin-multibuild": {
"version": "4.12.2", "version": "4.13.0-rgz-pass-build-options-fc2a1fc5c5111d5c371fcc162d3586360d13b728",
"resolved": "https://registry.npmjs.org/resin-multibuild/-/resin-multibuild-4.12.2.tgz", "resolved": "https://registry.npmjs.org/resin-multibuild/-/resin-multibuild-4.13.0-rgz-pass-build-options-fc2a1fc5c5111d5c371fcc162d3586360d13b728.tgz",
"integrity": "sha512-FkRqGEM588wA6v03pQbodPqWQdAs6aMh+GWvYQBz5IxqSVecn4FLHaRE0pF6VFKtjf/XBuPw7dtqiFzH+NIz5g==", "integrity": "sha512-Cz40vMSN3orA1WPgpJ3SVImGXVhod/7XQl4zIVNZqRSg9QtaexTHD8+p1GBRUD8JapPviAHvGL5xNBzk19/nEg==",
"requires": { "requires": {
"ajv": "^6.12.3", "ajv": "^6.12.3",
"bluebird": "^3.7.2", "bluebird": "^3.7.2",
"docker-progress": "^5.0.0", "docker-progress": "^5.0.0",
"dockerfile-ast": "^0.2.1", "dockerfile-ast": "^0.2.1",
"dockerfile-template": "^0.2.0", "dockerfile-template": "^0.2.0",
"dockerode": "^2.5.8", "dockerode": "^3.3.1",
"fp-ts": "^2.8.1", "fp-ts": "^2.8.1",
"io-ts": "^2.2.9", "io-ts": "^2.2.9",
"io-ts-reporters": "^1.2.2", "io-ts-reporters": "^1.2.2",
"js-yaml": "^4.1.0", "js-yaml": "^4.1.0",
"lodash": "^4.17.19", "lodash": "^4.17.19",
"resin-bundle-resolve": "^4.3.0", "resin-bundle-resolve": "^4.3.0",
"resin-compose-parse": "^2.1.2", "resin-compose-parse": "^2.4.0",
"resin-docker-build": "^1.1.5", "resin-docker-build": "^1.1.5",
"semver": "^7.3.5", "semver": "^7.3.5",
"tar-stream": "^2.1.3", "tar-stream": "^2.1.3",
@ -15725,92 +15744,20 @@
"typed-error": "^3.2.1" "typed-error": "^3.2.1"
}, },
"dependencies": { "dependencies": {
"JSONStream": {
"version": "1.3.2",
"resolved": "https://registry.npmjs.org/JSONStream/-/JSONStream-1.3.2.tgz",
"integrity": "sha1-wQI3G27Dp887hHygDCC7D85Mbeo=",
"requires": {
"jsonparse": "^1.2.0",
"through": ">=2.2.7 <3"
}
},
"argparse": { "argparse": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz", "resolved": "https://registry.npmjs.org/argparse/-/argparse-2.0.1.tgz",
"integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q==" "integrity": "sha512-8+9WqebbFzpX9OR+Wa6O29asIogeRMzcGtAINdpMHHyAg10f05aSFVBbcEqGf/PXw1EjAZ+q2/bEBg3DvurK3Q=="
}, },
"bl": {
"version": "1.2.3",
"resolved": "https://registry.npmjs.org/bl/-/bl-1.2.3.tgz",
"integrity": "sha512-pvcNpa0UU69UT341rO6AYy4FVAIkUHuZXRIWbq+zHnsVcRzDDjIAhGuuYoi0d//cwIwtt4pkpKycWEfjdV+vww==",
"requires": {
"readable-stream": "^2.3.5",
"safe-buffer": "^5.1.1"
},
"dependencies": {
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
},
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
}
}
},
"debug": {
"version": "3.2.7",
"resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
"integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
"requires": {
"ms": "^2.1.1"
}
},
"docker-modem": {
"version": "1.0.9",
"resolved": "https://registry.npmjs.org/docker-modem/-/docker-modem-1.0.9.tgz",
"integrity": "sha512-lVjqCSCIAUDZPAZIeyM125HXfNvOmYYInciphNrLrylUtKyW66meAjSPXWchKVzoIYZx69TPnAepVSSkeawoIw==",
"requires": {
"JSONStream": "1.3.2",
"debug": "^3.2.6",
"readable-stream": "~1.0.26-4",
"split-ca": "^1.0.0"
}
},
"dockerode": { "dockerode": {
"version": "2.5.8", "version": "3.3.1",
"resolved": "https://registry.npmjs.org/dockerode/-/dockerode-2.5.8.tgz", "resolved": "https://registry.npmjs.org/dockerode/-/dockerode-3.3.1.tgz",
"integrity": "sha512-+7iOUYBeDTScmOmQqpUYQaE7F4vvIt6+gIZNHWhqAQEI887tiPFB9OvXI/HzQYqfUNvukMK+9myLW63oTJPZpw==", "integrity": "sha512-AS2mr8Lp122aa5n6d99HkuTNdRV1wkkhHwBdcnY6V0+28D3DSYwhxAk85/mM9XwD3RMliTxyr63iuvn5ZblFYQ==",
"requires": { "requires": {
"concat-stream": "~1.6.2", "docker-modem": "^3.0.0",
"docker-modem": "^1.0.8", "tar-fs": "~2.0.1"
"tar-fs": "~1.16.3"
} }
}, },
"isarray": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
"integrity": "sha1-ihis/Kmo9Bd+Cav8YDiTmwXR7t8="
},
"js-yaml": { "js-yaml": {
"version": "4.1.0", "version": "4.1.0",
"resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz", "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-4.1.0.tgz",
@ -15819,26 +15766,6 @@
"argparse": "^2.0.1" "argparse": "^2.0.1"
} }
}, },
"pump": {
"version": "1.0.3",
"resolved": "https://registry.npmjs.org/pump/-/pump-1.0.3.tgz",
"integrity": "sha512-8k0JupWme55+9tCVE+FS5ULT3K6AbgqrGa58lTT49RpyfwwcGedHqaC5LlQNdEAumn/wFsu6aPwkuPMioy8kqw==",
"requires": {
"end-of-stream": "^1.1.0",
"once": "^1.3.1"
}
},
"readable-stream": {
"version": "1.0.34",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
"integrity": "sha1-Elgg40vIQtLyqq+v5MKRbuMsFXw=",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.1",
"isarray": "0.0.1",
"string_decoder": "~0.10.x"
}
},
"semver": { "semver": {
"version": "7.3.5", "version": "7.3.5",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz", "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.5.tgz",
@ -15847,63 +15774,15 @@
"lru-cache": "^6.0.0" "lru-cache": "^6.0.0"
} }
}, },
"string_decoder": {
"version": "0.10.31",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
"integrity": "sha1-YuIDvEF2bGwoyfyEMB2rHFMQ+pQ="
},
"tar-fs": { "tar-fs": {
"version": "1.16.3", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-1.16.3.tgz", "resolved": "https://registry.npmjs.org/tar-fs/-/tar-fs-2.0.1.tgz",
"integrity": "sha512-NvCeXpYx7OsmOh8zIOP/ebG55zZmxLE0etfWRbWok+q2Qo8x/vOR/IJT1taADXPe+jsiu9axDb3X4B+iIgNlKw==", "integrity": "sha512-6tzWDMeroL87uF/+lin46k+Q+46rAJ0SyPGz7OW7wTgblI273hsBqk2C1j0/xNadNLKDTUL9BukSjB7cwgmlPA==",
"requires": { "requires": {
"chownr": "^1.0.1", "chownr": "^1.1.1",
"mkdirp": "^0.5.1", "mkdirp-classic": "^0.5.2",
"pump": "^1.0.0", "pump": "^3.0.0",
"tar-stream": "^1.1.2" "tar-stream": "^2.0.0"
},
"dependencies": {
"isarray": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
"integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
},
"readable-stream": {
"version": "2.3.7",
"resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
"integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
"requires": {
"core-util-is": "~1.0.0",
"inherits": "~2.0.3",
"isarray": "~1.0.0",
"process-nextick-args": "~2.0.0",
"safe-buffer": "~5.1.1",
"string_decoder": "~1.1.1",
"util-deprecate": "~1.0.1"
}
},
"string_decoder": {
"version": "1.1.1",
"resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
"integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
"requires": {
"safe-buffer": "~5.1.0"
}
},
"tar-stream": {
"version": "1.6.2",
"resolved": "https://registry.npmjs.org/tar-stream/-/tar-stream-1.6.2.tgz",
"integrity": "sha512-rzS0heiNf8Xn7/mpdSVVSMAWAoy9bfb1WOTYC78Z0UQKeKa/CWS8FOq0lKGNa8DWKAn9gxjCvMLYc5PGXYlK2A==",
"requires": {
"bl": "^1.0.0",
"buffer-alloc": "^1.2.0",
"end-of-stream": "^1.0.0",
"fs-constants": "^1.0.0",
"readable-stream": "^2.3.0",
"to-buffer": "^1.1.1",
"xtend": "^4.0.0"
}
}
} }
} }
} }

8
package.json
View File

@ -29,7 +29,7 @@
"node_modules/balena-sdk/es2018/index.js", "node_modules/balena-sdk/es2018/index.js",
"node_modules/balena-sync/build/**/*.js", "node_modules/balena-sync/build/**/*.js",
"node_modules/pinejs-client-request/node_modules/pinejs-client-core/es2018/index.js", "node_modules/pinejs-client-request/node_modules/pinejs-client-core/es2018/index.js",
"node_modules/resin-compose-parse/build/schemas/*.json" "node_modules/@balena/compose-parse/build/schemas/*.json"
], ],
"assets": [ "assets": [
"build/auth/pages/*.ejs", "build/auth/pages/*.ejs",
@ -192,6 +192,7 @@
"typescript": "^4.3.5" "typescript": "^4.3.5"
}, },
"dependencies": { "dependencies": {
"@balena/compose-parse": "^3.0.0",
"@balena/dockerignore": "^1.0.2", "@balena/dockerignore": "^1.0.2",
"@balena/es-version": "^1.0.0", "@balena/es-version": "^1.0.0",
"@oclif/command": "^1.8.0", "@oclif/command": "^1.8.0",
@ -207,7 +208,7 @@
"balena-image-fs": "^7.0.6", "balena-image-fs": "^7.0.6",
"balena-image-manager": "^7.0.3", "balena-image-manager": "^7.0.3",
"balena-preload": "^11.0.0", "balena-preload": "^11.0.0",
"balena-release": "^3.2.0", "balena-release": "^3.3.0",
"balena-sdk": "^15.51.1", "balena-sdk": "^15.51.1",
"balena-semver": "^2.3.0", "balena-semver": "^2.3.0",
"balena-settings-client": "^4.0.7", "balena-settings-client": "^4.0.7",
@ -265,9 +266,8 @@
"request": "^2.88.2", "request": "^2.88.2",
"resin-cli-form": "^2.0.2", "resin-cli-form": "^2.0.2",
"resin-cli-visuals": "^1.8.0", "resin-cli-visuals": "^1.8.0",
"resin-compose-parse": "^2.1.3",
"resin-doodles": "^0.1.1", "resin-doodles": "^0.1.1",
"resin-multibuild": "^4.12.2", "resin-multibuild": "^4.13.0-rgz-pass-build-options-fc2a1fc5c5111d5c371fcc162d3586360d13b728",
"resin-stream-logger": "^0.1.2", "resin-stream-logger": "^0.1.2",
"rimraf": "^3.0.2", "rimraf": "^3.0.2",
"semver": "^7.3.2", "semver": "^7.3.2",

4
repo.yml
View File

@ -14,5 +14,5 @@ upstream:
url: 'https://github.com/balena-io-modules/balena-sync' url: 'https://github.com/balena-io-modules/balena-sync'
- repo: 'etcher-sdk' - repo: 'etcher-sdk'
url: 'https://github.com/balena-io-modules/etcher-sdk/' url: 'https://github.com/balena-io-modules/etcher-sdk/'
- repo: 'resin-compose-parse' - repo: 'balena-compose-parse'
url: 'https://github.com/balena-io-modules/resin-compose-parse' url: 'https://github.com/balena-io-modules/balena-compose-parse'

2
tests/utils/device/live.spec.ts
View File

@ -79,7 +79,7 @@ describeSS('LivepushManager::setupFilesystemWatcher', function () {
async function createMonitors( async function createMonitors(
projectPath: string, projectPath: string,
composition: import('resin-compose-parse').Composition, composition: import('@balena/compose-parse').Composition,
multiDockerignore: boolean, multiDockerignore: boolean,
changedPathHandler: (serviceName: string, changedPath: string) => void, changedPathHandler: (serviceName: string, changedPath: string) => void,
): Promise<ByService<chokidar.FSWatcher>> { ): Promise<ByService<chokidar.FSWatcher>> {