diff --git a/lib/commands/preload.ts b/lib/commands/preload.ts index a50d4d82..ceda876e 100644 --- a/lib/commands/preload.ts +++ b/lib/commands/preload.ts @@ -242,7 +242,7 @@ Can be repeated to add multiple certificates.\ const dockerUtils = await import('../utils/docker'); const docker = await dockerUtils.getDocker(options); const preloader = new balenaPreload.Preloader( - null, + undefined, docker, fleetSlug, commit, @@ -512,7 +512,7 @@ Would you like to disable automatic updates for this fleet now?\ const application = options.slug ? await this.getAppWithReleases(balenaSdk, options.slug) - : await this.selectApplication(preloader.config.deviceType); + : await this.selectApplication(preloader.config!.deviceType); let commit: string; // commit hash or the strings 'latest' or 'current' diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json index 3ead1e32..f84c34b6 100644 --- a/npm-shrinkwrap.json +++ b/npm-shrinkwrap.json @@ -22,8 +22,8 @@ "balena-device-init": "^6.0.0", "balena-errors": "^4.7.3", "balena-image-fs": "^7.0.6", - "balena-image-manager": "^8.0.0", - "balena-preload": "^13.0.0", + "balena-image-manager": "^9.0.0", + "balena-preload": "^14.0.0", "balena-sdk": "^17.0.0", "balena-semver": "^2.3.0", "balena-settings-client": "^4.0.7", @@ -3980,86 +3980,26 @@ } }, "node_modules/balena-image-manager": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/balena-image-manager/-/balena-image-manager-8.0.1.tgz", - "integrity": "sha512-ShvuspPRO36J+ACQ6bE8t+RC7WstWnPvk6B5c9oTV2qzzegIZAMWvdqBG3tpCng+tBBeYjQ0IdwTDG/THQjVaA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/balena-image-manager/-/balena-image-manager-9.0.0.tgz", + "integrity": "sha512-DOtcpqnLhRcEETqFPlfM6XDmsgexr0ykahtrYki9DU0JNuK5OJlhgkE2/HgVOFWHWnslmcqnCTmGHkh7mJd1Dw==", "dependencies": { - "balena-sdk": "^16.8.0", + "balena-sdk": "^17.0.0", "mime": "^2.4.6", "mkdirp": "^1.0.4", "rimraf": "^3.0.2" }, "engines": { - "node": ">=12.0.0" - } - }, - "node_modules/balena-image-manager/node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" - }, - "node_modules/balena-image-manager/node_modules/balena-hup-action-utils": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/balena-hup-action-utils/-/balena-hup-action-utils-4.1.3.tgz", - "integrity": "sha512-98SK5oTPgTKWsbEmPk0juI/ivT5qADsj/y+/B39I47lbDfPuhF/kHpgMI+xQCtT/GS+Dy3omkgY4nEcRI4CeoQ==", - "dependencies": { - "balena-semver": "^2.0.0", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/balena-image-manager/node_modules/balena-sdk": { - "version": "16.45.1", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-16.45.1.tgz", - "integrity": "sha512-pY3anTkmEcOp8GEgjkeJl8aj7SZBWifh4DSp8sUnryE0U7IGA3UcKggsfMjYsP1ZKvPlAvweNHQuUujfBOHbXg==", - "dependencies": { - "@balena/es-version": "^1.0.0", - "@types/json-schema": "^7.0.9", - "@types/node": "^12.20.50", - "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.1.0", - "balena-errors": "^4.7.3", - "balena-hup-action-utils": "~4.1.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", - "balena-semver": "^2.3.0", - "balena-settings-client": "^4.0.6", - "date-fns": "^2.29.3", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", - "memoizee": "^0.4.15", - "ndjson": "^2.0.0", - "pinejs-client-core": "^6.12.0", - "tslib": "^2.1.0" - }, - "engines": { - "node": ">=12.0" - } - }, - "node_modules/balena-image-manager/node_modules/date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "dependencies": { - "@babel/runtime": "^7.21.0" - }, - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" + "node": ">=16.0.0" } }, "node_modules/balena-preload": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-13.0.0.tgz", - "integrity": "sha512-UUmRAYtZ3IN1iq49qPQvuBHD3qh15M2N7aGcQ9SJfa+Nt84JbTY0EUn+CWRqZrsuGBrkFxHJlPeBNhyc+Wt9HA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-14.0.0.tgz", + "integrity": "sha512-LWA/WgckfWxI2VFrefatUlMsYuM+zVbUqoDhPx95VQh4ArJXxbo8s9ADgl/yQGt0e4qUciMu8fuzxaZXZvwS2A==", "dependencies": { "archiver": "^3.1.1", - "balena-sdk": "^16.0.0", + "balena-sdk": "^17.0.0", "bluebird": "^3.7.2", "compare-versions": "^3.6.0", "docker-progress": "^5.0.0", @@ -4076,14 +4016,9 @@ "unzipper": "^0.8.14" }, "engines": { - "node": ">=12" + "node": ">=16" } }, - "node_modules/balena-preload/node_modules/@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" - }, "node_modules/balena-preload/node_modules/archiver": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz", @@ -4101,46 +4036,6 @@ "node": ">= 6" } }, - "node_modules/balena-preload/node_modules/balena-hup-action-utils": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/balena-hup-action-utils/-/balena-hup-action-utils-4.1.3.tgz", - "integrity": "sha512-98SK5oTPgTKWsbEmPk0juI/ivT5qADsj/y+/B39I47lbDfPuhF/kHpgMI+xQCtT/GS+Dy3omkgY4nEcRI4CeoQ==", - "dependencies": { - "balena-semver": "^2.0.0", - "tslib": "^2.0.0" - }, - "engines": { - "node": ">=10" - } - }, - "node_modules/balena-preload/node_modules/balena-sdk": { - "version": "16.45.1", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-16.45.1.tgz", - "integrity": "sha512-pY3anTkmEcOp8GEgjkeJl8aj7SZBWifh4DSp8sUnryE0U7IGA3UcKggsfMjYsP1ZKvPlAvweNHQuUujfBOHbXg==", - "dependencies": { - "@balena/es-version": "^1.0.0", - "@types/json-schema": "^7.0.9", - "@types/node": "^12.20.50", - "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.1.0", - "balena-errors": "^4.7.3", - "balena-hup-action-utils": "~4.1.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", - "balena-semver": "^2.3.0", - "balena-settings-client": "^4.0.6", - "date-fns": "^2.29.3", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", - "memoizee": "^0.4.15", - "ndjson": "^2.0.0", - "pinejs-client-core": "^6.12.0", - "tslib": "^2.1.0" - }, - "engines": { - "node": ">=12.0" - } - }, "node_modules/balena-preload/node_modules/compress-commons": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", @@ -4181,21 +4076,6 @@ "node": ">= 6.9.0" } }, - "node_modules/balena-preload/node_modules/date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "dependencies": { - "@babel/runtime": "^7.21.0" - }, - "engines": { - "node": ">=0.11" - }, - "funding": { - "type": "opencollective", - "url": "https://opencollective.com/date-fns" - } - }, "node_modules/balena-preload/node_modules/readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", @@ -25832,72 +25712,23 @@ } }, "balena-image-manager": { - "version": "8.0.1", - "resolved": "https://registry.npmjs.org/balena-image-manager/-/balena-image-manager-8.0.1.tgz", - "integrity": "sha512-ShvuspPRO36J+ACQ6bE8t+RC7WstWnPvk6B5c9oTV2qzzegIZAMWvdqBG3tpCng+tBBeYjQ0IdwTDG/THQjVaA==", + "version": "9.0.0", + "resolved": "https://registry.npmjs.org/balena-image-manager/-/balena-image-manager-9.0.0.tgz", + "integrity": "sha512-DOtcpqnLhRcEETqFPlfM6XDmsgexr0ykahtrYki9DU0JNuK5OJlhgkE2/HgVOFWHWnslmcqnCTmGHkh7mJd1Dw==", "requires": { - "balena-sdk": "^16.8.0", + "balena-sdk": "^17.0.0", "mime": "^2.4.6", "mkdirp": "^1.0.4", "rimraf": "^3.0.2" - }, - "dependencies": { - "@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" - }, - "balena-hup-action-utils": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/balena-hup-action-utils/-/balena-hup-action-utils-4.1.3.tgz", - "integrity": "sha512-98SK5oTPgTKWsbEmPk0juI/ivT5qADsj/y+/B39I47lbDfPuhF/kHpgMI+xQCtT/GS+Dy3omkgY4nEcRI4CeoQ==", - "requires": { - "balena-semver": "^2.0.0", - "tslib": "^2.0.0" - } - }, - "balena-sdk": { - "version": "16.45.1", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-16.45.1.tgz", - "integrity": "sha512-pY3anTkmEcOp8GEgjkeJl8aj7SZBWifh4DSp8sUnryE0U7IGA3UcKggsfMjYsP1ZKvPlAvweNHQuUujfBOHbXg==", - "requires": { - "@balena/es-version": "^1.0.0", - "@types/json-schema": "^7.0.9", - "@types/node": "^12.20.50", - "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.1.0", - "balena-errors": "^4.7.3", - "balena-hup-action-utils": "~4.1.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", - "balena-semver": "^2.3.0", - "balena-settings-client": "^4.0.6", - "date-fns": "^2.29.3", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", - "memoizee": "^0.4.15", - "ndjson": "^2.0.0", - "pinejs-client-core": "^6.12.0", - "tslib": "^2.1.0" - } - }, - "date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "requires": { - "@babel/runtime": "^7.21.0" - } - } } }, "balena-preload": { - "version": "13.0.0", - "resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-13.0.0.tgz", - "integrity": "sha512-UUmRAYtZ3IN1iq49qPQvuBHD3qh15M2N7aGcQ9SJfa+Nt84JbTY0EUn+CWRqZrsuGBrkFxHJlPeBNhyc+Wt9HA==", + "version": "14.0.0", + "resolved": "https://registry.npmjs.org/balena-preload/-/balena-preload-14.0.0.tgz", + "integrity": "sha512-LWA/WgckfWxI2VFrefatUlMsYuM+zVbUqoDhPx95VQh4ArJXxbo8s9ADgl/yQGt0e4qUciMu8fuzxaZXZvwS2A==", "requires": { "archiver": "^3.1.1", - "balena-sdk": "^16.0.0", + "balena-sdk": "^17.0.0", "bluebird": "^3.7.2", "compare-versions": "^3.6.0", "docker-progress": "^5.0.0", @@ -25914,11 +25745,6 @@ "unzipper": "^0.8.14" }, "dependencies": { - "@types/node": { - "version": "12.20.55", - "resolved": "https://registry.npmjs.org/@types/node/-/node-12.20.55.tgz", - "integrity": "sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ==" - }, "archiver": { "version": "3.1.1", "resolved": "https://registry.npmjs.org/archiver/-/archiver-3.1.1.tgz", @@ -25933,40 +25759,6 @@ "zip-stream": "^2.1.2" } }, - "balena-hup-action-utils": { - "version": "4.1.3", - "resolved": "https://registry.npmjs.org/balena-hup-action-utils/-/balena-hup-action-utils-4.1.3.tgz", - "integrity": "sha512-98SK5oTPgTKWsbEmPk0juI/ivT5qADsj/y+/B39I47lbDfPuhF/kHpgMI+xQCtT/GS+Dy3omkgY4nEcRI4CeoQ==", - "requires": { - "balena-semver": "^2.0.0", - "tslib": "^2.0.0" - } - }, - "balena-sdk": { - "version": "16.45.1", - "resolved": "https://registry.npmjs.org/balena-sdk/-/balena-sdk-16.45.1.tgz", - "integrity": "sha512-pY3anTkmEcOp8GEgjkeJl8aj7SZBWifh4DSp8sUnryE0U7IGA3UcKggsfMjYsP1ZKvPlAvweNHQuUujfBOHbXg==", - "requires": { - "@balena/es-version": "^1.0.0", - "@types/json-schema": "^7.0.9", - "@types/node": "^12.20.50", - "abortcontroller-polyfill": "^1.7.1", - "balena-auth": "^4.1.0", - "balena-errors": "^4.7.3", - "balena-hup-action-utils": "~4.1.0", - "balena-register-device": "^8.0.0", - "balena-request": "^11.5.5", - "balena-semver": "^2.3.0", - "balena-settings-client": "^4.0.6", - "date-fns": "^2.29.3", - "handlebars": "^4.7.7", - "lodash": "^4.17.21", - "memoizee": "^0.4.15", - "ndjson": "^2.0.0", - "pinejs-client-core": "^6.12.0", - "tslib": "^2.1.0" - } - }, "compress-commons": { "version": "2.1.1", "resolved": "https://registry.npmjs.org/compress-commons/-/compress-commons-2.1.1.tgz", @@ -26003,14 +25795,6 @@ "readable-stream": "^3.4.0" } }, - "date-fns": { - "version": "2.30.0", - "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-2.30.0.tgz", - "integrity": "sha512-fnULvOpxnC5/Vg3NCiWelDsLiUc9bRwAPs/+LfTLNvetFCtCTN+yQz15C/fs4AwX1R9K5GLtLfn8QW+dWisaAw==", - "requires": { - "@babel/runtime": "^7.21.0" - } - }, "readable-stream": { "version": "3.6.2", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz", diff --git a/package.json b/package.json index 70d54c4a..f02053a4 100644 --- a/package.json +++ b/package.json @@ -205,8 +205,8 @@ "balena-device-init": "^6.0.0", "balena-errors": "^4.7.3", "balena-image-fs": "^7.0.6", - "balena-image-manager": "^8.0.0", - "balena-preload": "^13.0.0", + "balena-image-manager": "^9.0.0", + "balena-preload": "^14.0.0", "balena-sdk": "^17.0.0", "balena-semver": "^2.3.0", "balena-settings-client": "^4.0.7", diff --git a/typings/balena-image-manager/index.d.ts b/typings/balena-image-manager/index.d.ts deleted file mode 100644 index 75297d3f..00000000 --- a/typings/balena-image-manager/index.d.ts +++ /dev/null @@ -1,27 +0,0 @@ -/** - * @license - * Copyright 2020 Balena Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -declare module 'balena-image-manager' { - export function cleanCache(): Promise; - - export function get( - deviceType: string, - versionOrRange: string, - ): Promise; - - export function isESR(version: string): boolean; -} diff --git a/typings/balena-preload/index.d.ts b/typings/balena-preload/index.d.ts deleted file mode 100644 index 144136fa..00000000 --- a/typings/balena-preload/index.d.ts +++ /dev/null @@ -1,19 +0,0 @@ -declare module 'balena-preload' { - export class Preloader { - constructor(...args: any[]); - - cleanup(): Promise; - - on(...args: any[]): void; - - preload(): Promise; - - prepare(): Promise; - - setAppIdAndCommit(appId: string | number, commit: string): Promise; - - config: any; - - stderr: any; - } -}