ExternalVendorCode/balena-cli
1
0
Fork 0
mirror of https://github.com/balena-io/balena-cli.git synced 2024-12-19 21:57:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update dependencies

Browse Source 
Update balena-sdk from 12.26.7 to 12.29.1

Change-type: minor
This commit is contained in:
Pagan Gazzard 2020-03-02 17:13:16 +00:00 committed by Balena CI
parent 26803067f1
commit 3d2e109e7f
11 changed files with 1809 additions and 1751 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
automation/build-bin.ts
View File

@ -98,7 +98,7 @@ async function buildPkg() {
const paths: Array<[string, string[], string[]]> = [
// [platform, [source path], [destination path]]
['*', ['open', 'xdg-open'], ['xdg-open']],
['*', ['opn-cli', 'node_modules', 'opn', 'xdg-open'], ['xdg-open-402']],
['*', ['opn', 'xdg-open'], ['xdg-open-402']],
['darwin', ['denymount', 'bin', 'denymount'], ['denymount']],
];
await Bluebird.map(paths, ([platform, source, dest]) => {

4
automation/deploy-bin.ts
View File

@ -15,8 +15,6 @@
* limitations under the License.
*/
import * as _ocktokit from '@octokit/rest';
import * as Bluebird from 'bluebird';
import * as _ from 'lodash';
import * as semver from 'semver';
@ -64,7 +62,7 @@ export async function release() {
/** Return a cached Octokit instance, creating a new one as needed. */
const getOctokit = _.once(function() {
const Octokit = (require('@octokit/rest') as typeof _ocktokit).plugin(
const Octokit = (require('@octokit/rest') as typeof import('@octokit/rest')).Octokit.plugin(
require('@octokit/plugin-throttling'),
);
return new Octokit({

2
lib/actions/ssh.ts
View File

@ -34,7 +34,7 @@ async function getContainerId(
version?: string,
id?: number,
): Promise<string> {
const semver = await import('resin-semver');
const semver = await import('balena-semver');
if (version == null || id == null) {
const device = await sdk.models.device.get(uuid, {

2
lib/utils/config.ts
View File

@ -14,8 +14,8 @@ See the License for the specific language governing permissions and
limitations under the License.
*/
import BalenaSdk = require('balena-sdk');
import * as semver from 'balena-semver';
import Promise = require('bluebird');
import * as semver from 'resin-semver';
import { getBalenaSdk } from './lazy';
export interface ImgConfig {

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

@ -15,6 +15,7 @@
* limitations under the License.
*/
import * as semver from 'balena-semver';
import * as Bluebird from 'bluebird';
import * as Docker from 'dockerode';
import * as _ from 'lodash';
@ -25,7 +26,6 @@ import {
LocalImage,
RegistrySecrets,
} from 'resin-multibuild';
import * as semver from 'resin-semver';
import { Readable } from 'stream';
import { BALENA_ENGINE_TMP_PATH } from '../../config';

4
lib/utils/lazy.ts
View File

@ -15,7 +15,7 @@ limitations under the License.
*/
import * as BalenaSdk from 'balena-sdk';
import chalk from 'chalk';
import { Chalk } from 'chalk';
import * as visuals from 'resin-cli-visuals';
// Equivalent of _.once but avoiding the need to import lodash for lazy deps
@ -37,4 +37,4 @@ export const getVisuals = once(
() => require('resin-cli-visuals') as typeof visuals,
);
export const getChalk = once(() => require('chalk') as typeof chalk);
export const getChalk = once(() => require('chalk') as Chalk);

3395
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

67
package.json
View File

@ -33,7 +33,7 @@
"build/auth/pages/*.ejs",
"build/hooks",
"node_modules/resin-discoverable-services/services/**/*",
"node_modules/opn-cli/node_modules/opn/xdg-open",
"node_modules/opn/xdg-open",
"node_modules/open/xdg-open",
"node_modules/windosu/*.bat",
"node_modules/windosu/*.cmd"
@ -93,21 +93,21 @@
}
},
"devDependencies": {
"@oclif/config": "^1.13.3",
"@oclif/config": "^1.14.0",
"@oclif/dev-cli": "1.22.0",
"@oclif/parser": "^3.8.4",
"@octokit/plugin-throttling": "^2.7.1",
"@octokit/rest": "^16.38.1",
"@octokit/rest": "^16.43.1",
"@types/archiver": "^2.1.3",
"@types/bluebird": "^3.5.29",
"@types/bluebird": "^3.5.30",
"@types/body-parser": "^1.19.0",
"@types/chai": "^4.2.9",
"@types/chai": "^4.2.10",
"@types/chai-as-promised": "^7.1.1",
"@types/chokidar": "^2.1.3",
"@types/common-tags": "^1.8.0",
"@types/dockerode": "^2.5.24",
"@types/ejs": "^3.0.1",
"@types/express": "^4.17.2",
"@types/express": "^4.17.3",
"@types/fs-extra": "^8.1.0",
"@types/global-agent": "^2.1.0",
"@types/global-tunnel-ng": "^2.1.0",
@ -129,7 +129,7 @@
"@types/shell-escape": "^0.2.0",
"@types/sinon": "^7.5.2",
"@types/stream-to-promise": "2.2.0",
"@types/tar-stream": "^1.6.1",
"@types/tar-stream": "^2.1.0",
"@types/through2": "^2.0.34",
"@types/which": "^1.3.2",
"catch-uncommitted": "^1.5.0",
@ -146,7 +146,7 @@
"intercept-stdout": "^0.1.2",
"mocha": "^6.2.2",
"mock-require": "^3.0.3",
"nock": "^11.7.2",
"nock": "^11.9.1",
"parse-link-header": "~1.0.1",
"pkg": "^4.4.2",
"prettier": "^1.19.1",
@ -162,26 +162,27 @@
"@oclif/command": "^1.5.19",
"@oclif/errors": "^1.2.2",
"@resin.io/valid-email": "^0.1.0",
"@sentry/node": "^5.13.1",
"@sentry/node": "^5.13.2",
"@types/update-notifier": "^4.1.0",
"@zeit/dockerignore": "0.0.3",
"JSONStream": "^1.0.3",
"ansi-escapes": "^2.0.0",
"any-promise": "^1.3.0",
"archiver": "^2.1.0",
"archiver": "^3.1.1",
"balena-config-json": "^2.1.1",
"balena-device-init": "^5.0.1",
"balena-device-init": "^5.0.2",
"balena-device-status": "^3.2.1",
"balena-errors": "^4.2.1",
"balena-image-manager": "^6.1.1",
"balena-preload": "^8.3.1",
"balena-sdk": "^12.26.7",
"balena-settings-client": "^4.0.3",
"balena-sync": "^10.1.0",
"balena-image-manager": "^6.1.2",
"balena-preload": "^8.4.0",
"balena-sdk": "^12.29.1",
"balena-semver": "^2.2.0",
"balena-settings-client": "^4.0.4",
"balena-sync": "^10.2.0",
"bash": "0.0.1",
"bluebird": "^3.7.2",
"body-parser": "^1.19.0",
"capitano": "^1.9.2",
"chalk": "^2.3.0",
"chalk": "^3.0.0",
"chokidar": "^2.1.8",
"cli-truncate": "^1.1.0",
"coffeescript": "^1.12.6",
@ -190,12 +191,12 @@
"common-tags": "^1.7.2",
"denymount": "^2.3.0",
"docker-modem": "^2.1.1",
"docker-progress": "^4.0.0",
"docker-qemu-transpose": "^1.0.3",
"docker-toolbelt": "^3.3.7",
"docker-progress": "^4.0.1",
"docker-qemu-transpose": "^1.0.4",
"docker-toolbelt": "^3.3.8",
"dockerode": "^2.5.8",
"ejs": "^3.0.1",
"etcher-sdk": "^2.0.17",
"etcher-sdk": "^2.0.20",
"event-stream": "3.3.4",
"express": "^4.13.3",
"fast-boot2": "^1.0.9",
@ -204,7 +205,7 @@
"global-tunnel-ng": "^2.1.1",
"humanize": "0.0.9",
"ignore": "^5.1.4",
"inquirer": "^3.1.1",
"inquirer": "^7.0.6",
"is-elevated": "^3.0.0",
"is-root": "^2.1.0",
"js-yaml": "^3.13.1",
@ -226,29 +227,29 @@
"progress-stream": "^2.0.0",
"reconfix": "^0.1.0",
"request": "^2.88.2",
"resin-cli-form": "^2.0.1",
"resin-cli-visuals": "^1.4.6",
"resin-cli-form": "^2.0.2",
"resin-cli-visuals": "^1.7.0",
"resin-compose-parse": "^2.1.0",
"resin-doodles": "^0.1.1",
"resin-image-fs": "^5.0.8",
"resin-multibuild": "^4.4.1",
"resin-image-fs": "^5.0.9",
"resin-multibuild": "^4.4.2",
"resin-release": "^1.2.0",
"resin-semver": "^1.6.0",
"resin-stream-logger": "^0.1.2",
"rimraf": "^3.0.2",
"rindle": "^1.3.4",
"semver": "^7.1.1",
"semver": "^7.1.3",
"shell-escape": "^0.2.0",
"split": "^1.0.1",
"string-width": "^2.1.1",
"stream-to-promise": "^2.2.0",
"string-width": "^4.2.0",
"strip-ansi-stream": "^1.0.0",
"tar-stream": "^1.6.2",
"tar-utils": "^2.0.0",
"tar-stream": "^2.1.0",
"tar-utils": "^2.1.0",
"through2": "^2.0.3",
"tmp": "0.0.31",
"typed-error": "^3.2.0",
"umount": "^1.1.6",
"update-notifier": "^2.2.0",
"update-notifier": "^4.1.0",
"which": "^2.0.2",
"window-size": "^1.1.0"
},

8
patches/opn-cli++opn+4.0.2.patch
View File

@ -1,7 +1,7 @@
diff --git a/node_modules/opn-cli/node_modules/opn/index.js b/node_modules/opn-cli/node_modules/opn/index.js
diff --git a/node_modules/opn/index.js b/node_modules/opn/index.js
index 13dcb66..16c5b2a 100644
--- a/node_modules/opn-cli/node_modules/opn/index.js
+++ b/node_modules/opn-cli/node_modules/opn/index.js
--- a/node_modules/opn/index.js
+++ b/node_modules/opn/index.js
@@ -52,6 +52,9 @@ module.exports = function (target, opts) {
cmd = opts.app;
} else {
@ -10,5 +10,5 @@ index 13dcb66..16c5b2a 100644
+ ? path.join(path.dirname(process.execPath), 'xdg-open-402')
+ : path.join(__dirname, 'xdg-open');
}
if (appArgs.length > 0) {

1
tests/utils/eol-conversion.spec.ts
View File

@ -64,7 +64,6 @@ describe('detectEncoding() function', function() {
const sampleBinary = [
'ext2fs/build/Release/bindings.node',
'drivelist/build/Release/drivelist.node',
'resin-cli-visuals/node_modules/drivelist/build/Release/drivelist.node',
'@balena.io/usb/build/Release/usb_bindings.node',
'xxhash/build/Release/hash.node',
'mountutils/build/Release/MountUtils.node',

73
typings/update-notifier/index.d.ts vendored
View File

@ -1,73 +0,0 @@
/**
* @license
* Copyright 2019 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.
*/
// Based on the official types at:
// https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/update-notifier/index.d.ts
// but fixed to handle options correctly
declare module 'update-notifier' {
export = UpdateNotifier;
function UpdateNotifier(
settings?: UpdateNotifier.Settings,
): UpdateNotifier.UpdateNotifier;
namespace UpdateNotifier {
class UpdateNotifier {
constructor(settings?: Settings);
public update: UpdateInfo;
public check(): void;
public checkNpm(): void;
public notify(customMessage?: NotifyOptions): void;
}
interface Settings {
pkg?: Package;
callback?(update?: UpdateInfo): any;
packageName?: string;
packageVersion?: string;
updateCheckInterval?: number; // in milliseconds, default 1000 * 60 * 60 * 24 (1 day)
}
interface BoxenOptions {
padding: number;
margin: number;
align: string;
borderColor: string;
borderStyle: string;
}
interface NotifyOptions {
message?: string;
defer?: boolean;
boxenOpts?: BoxenOptions;
}
interface Package {
name: string;
version: string;
}
interface UpdateInfo {
latest: string;
current: string;
type: string;
name: string;
}
}
}