Merge pull request #1994 from balena-io/update-deps

Update dependencies

package.json

@@ -112,55 +112,54 @@
   },
   "devDependencies": {
     "@balena/lint": "^5.1.0",
-    "@oclif/config": "^1.14.0",
+    "@oclif/config": "^1.17.0",
-    "@oclif/dev-cli": "1.22.0",
+    "@oclif/dev-cli": "^1.22.2",
-    "@oclif/parser": "^3.8.4",
+    "@oclif/parser": "^3.8.5",
     "@octokit/plugin-throttling": "^3.3.0",
-    "@octokit/rest": "^16.43.1",
+    "@octokit/rest": "^16.43.2",
     "@types/archiver": "^2.1.3",
-    "@types/bluebird": "^3.5.31",
+    "@types/bluebird": "^3.5.32",
     "@types/body-parser": "^1.19.0",
-    "@types/chai": "^4.2.11",
+    "@types/chai": "^4.2.12",
-    "@types/chai-as-promised": "^7.1.1",
+    "@types/chai-as-promised": "^7.1.3",
     "@types/cli-truncate": "^1.1.0",
     "@types/common-tags": "^1.8.0",
     "@types/dockerode": "^2.5.34",
-    "@types/ejs": "^3.0.2",
+    "@types/ejs": "^3.0.4",
-    "@types/express": "^4.17.3",
+    "@types/express": "^4.17.7",
-    "@types/fs-extra": "^8.1.0",
+    "@types/fs-extra": "^8.1.1",
     "@types/global-agent": "^2.1.0",
     "@types/global-tunnel-ng": "^2.1.0",
     "@types/http-proxy": "^1.17.4",
     "@types/intercept-stdout": "^0.1.0",
     "@types/is-root": "^2.1.2",
-    "@types/js-yaml": "^3.12.3",
+    "@types/js-yaml": "^3.12.5",
     "@types/jsonwebtoken": "^8.5.0",
     "@types/klaw": "^3.0.1",
     "@types/lodash": "^4.14.159",
     "@types/mixpanel": "^2.14.2",
-    "@types/mkdirp": "^0.5.2",
     "@types/mocha": "^5.2.7",
     "@types/mock-require": "^2.0.0",
     "@types/moment-duration-format": "^2.2.2",
-    "@types/net-keepalive": "^0.4.0",
+    "@types/net-keepalive": "^0.4.1",
     "@types/nock": "^11.0.7",
-    "@types/node": "^10.17.20",
+    "@types/node": "^10.17.28",
     "@types/node-cleanup": "^2.1.1",
     "@types/parse-link-header": "^1.0.0",
     "@types/prettyjson": "0.0.29",
     "@types/progress-stream": "^2.0.0",
-    "@types/request": "^2.48.4",
+    "@types/request": "^2.48.5",
     "@types/rewire": "^2.5.28",
     "@types/rimraf": "^3.0.0",
     "@types/shell-escape": "^0.2.0",
-    "@types/sinon": "^9.0.3",
+    "@types/sinon": "^9.0.4",
     "@types/split": "^1.0.0",
     "@types/stream-to-promise": "2.2.0",
     "@types/tar-stream": "^2.1.0",
-    "@types/through2": "^2.0.34",
+    "@types/through2": "^2.0.36",
     "@types/tmp": "^0.2.0",
     "@types/which": "^1.3.2",
-    "catch-uncommitted": "^1.5.0",
+    "catch-uncommitted": "^1.6.2",
     "chai": "^4.2.0",
     "chai-as-promised": "^7.1.1",
     "cross-env": "^7.0.2",
@@ -175,6 +174,7 @@
     "husky": "^4.2.5",
     "intercept-stdout": "^0.1.2",
     "jsonwebtoken": "^8.5.1",
+    "mkdirp": "^0.5.5",
     "mocha": "^6.2.3",
     "mock-require": "^3.0.3",
     "nock": "^12.0.3",
@@ -182,18 +182,18 @@
     "pkg": "^4.4.9",
     "publish-release": "^1.6.1",
     "rewire": "^4.0.1",
-    "simple-git": "^1.131.0",
+    "simple-git": "^1.132.0",
-    "sinon": "^9.0.2",
+    "sinon": "^9.0.3",
-    "ts-node": "^8.10.1",
+    "ts-node": "^8.10.2",
-    "typescript": "^3.9.2"
+    "typescript": "^3.9.7"
   },
   "dependencies": {
     "@balena/dockerignore": "^1.0.2",
     "@balena/es-version": "^1.0.0",
-    "@oclif/command": "^1.5.19",
+    "@oclif/command": "^1.8.0",
     "@resin.io/valid-email": "^0.1.0",
-    "@sentry/node": "^5.13.2",
+    "@sentry/node": "^5.21.1",
-    "@types/update-notifier": "^4.1.0",
+    "@types/update-notifier": "^4.1.1",
     "@zeit/dockerignore": "0.0.3",
     "JSONStream": "^1.0.3",
     "archiver": "^3.1.1",
@@ -203,7 +203,7 @@
     "balena-image-manager": "^7.0.3",
     "balena-preload": "^10.2.4",
     "balena-release": "^3.0.0",
-    "balena-sdk": "^15.2.3",
+    "balena-sdk": "^15.3.0",
     "balena-semver": "^2.3.0",
     "balena-settings-client": "^4.0.5",
     "balena-settings-storage": "^6.0.1",
@@ -218,12 +218,12 @@
     "columnify": "^1.5.2",
     "common-tags": "^1.7.2",
     "denymount": "^2.3.0",
-    "docker-modem": "^2.1.3",
+    "docker-modem": "^2.1.4",
     "docker-progress": "^4.0.1",
     "docker-qemu-transpose": "^1.1.1",
     "docker-toolbelt": "^3.3.8",
     "dockerode": "^2.5.8",
-    "ejs": "^3.0.1",
+    "ejs": "^3.1.3",
     "etcher-sdk": "^2.0.20",
     "event-stream": "3.3.4",
     "express": "^4.13.3",
@@ -232,23 +232,22 @@
     "global-agent": "^2.1.12",
     "global-tunnel-ng": "^2.1.1",
     "humanize": "0.0.9",
-    "ignore": "^5.1.4",
+    "ignore": "^5.1.8",
-    "inquirer": "^7.0.6",
+    "inquirer": "^7.3.3",
     "is-elevated": "^3.0.0",
     "is-root": "^2.1.0",
-    "js-yaml": "^3.13.1",
+    "js-yaml": "^3.14.0",
     "klaw": "^3.0.0",
     "livepush": "^3.5.0",
     "lodash": "^4.17.19",
     "minimatch": "^3.0.4",
     "mixpanel": "^0.10.3",
-    "mkdirp": "^0.5.1",
+    "moment": "^2.27.0",
-    "moment": "^2.24.0",
     "moment-duration-format": "^2.3.2",
     "node-cleanup": "^2.1.2",
     "node-unzip-2": "^0.2.8",
-    "oclif": "^1.15.2",
+    "oclif": "^1.16.1",
-    "open": "^7.0.2",
+    "open": "^7.1.0",
     "patch-package": "6.2.2",
     "prettyjson": "^1.1.3",
     "progress-stream": "^2.0.0",
@@ -256,19 +255,19 @@
     "request": "^2.88.2",
     "resin-cli-form": "^2.0.2",
     "resin-cli-visuals": "^1.7.0",
-    "resin-compose-parse": "^2.1.0",
+    "resin-compose-parse": "^2.1.2",
     "resin-doodles": "^0.1.1",
     "resin-image-fs": "^5.0.9",
-    "resin-multibuild": "^4.5.1",
+    "resin-multibuild": "^4.7.2",
     "resin-stream-logger": "^0.1.2",
     "rimraf": "^3.0.2",
-    "semver": "^7.1.3",
+    "semver": "^7.3.2",
     "shell-escape": "^0.2.0",
     "split": "^1.0.1",
     "stream-to-promise": "^2.2.0",
     "string-width": "^4.2.0",
     "strip-ansi-stream": "^1.0.0",
-    "tar-stream": "^2.1.0",
+    "tar-stream": "^2.1.3",
     "tar-utils": "^2.1.0",
     "through2": "^2.0.3",
     "tmp": "^0.2.1",
@@ -279,7 +278,7 @@
     "window-size": "^1.1.0"
   },
   "optionalDependencies": {
-    "net-keepalive": "^1.3.3",
+    "net-keepalive": "^1.3.6",
     "windosu": "^0.3.0"
   }
 }

patches/all/@oclif+dev-cli+1.22.2.patch

@@ -187,7 +187,7 @@ index 320fc52..efe3f2f 100644
                  return qq.join(base, [target.platform, target.arch].join('-'), config.s3Key('baseDir', target));
              return qq.join(base, config.s3Key('baseDir', target));
 diff --git a/node_modules/@oclif/dev-cli/lib/tarballs/node.js b/node_modules/@oclif/dev-cli/lib/tarballs/node.js
-index 343eb00..5521e2d 100644
+index b3918c5..073515a 100644
 --- a/node_modules/@oclif/dev-cli/lib/tarballs/node.js
 +++ b/node_modules/@oclif/dev-cli/lib/tarballs/node.js
 @@ -1,28 +1,58 @@
@@ -248,14 +248,13 @@ index 343eb00..5521e2d 100644
 +    console.log(`fetchNodeBinary using tmp="${tmp}`);
 +
      if (arch === 'arm')
-         arch = 'armv6l';
+         arch = 'armv7l';
      let nodeBase = `node-v${nodeVersion}-${platform}-${arch}`;
      let tarball = path.join(tmp, 'node', `${nodeBase}.tar.xz`);
      let url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.tar.xz`;
--    if (platform === 'win32') {
++    let zPath = '';
+     if (platform === 'win32') {
 -        await checkFor7Zip();
-+	let zPath = '';
-+	if (platform === 'win32') {
 +        zPath = await checkFor7Zip(projectRootPath);
          nodeBase = `node-v${nodeVersion}-win-${arch}`;
          tarball = path.join(tmp, 'node', `${nodeBase}.7z`);

patches/all/@oclif+parser+3.8.5.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/@oclif/parser/lib/errors.js b/node_modules/@oclif/parser/lib/errors.js
-index 93912ca..c4cac1d 100644
+index 0c93a81..95d06be 100644
 --- a/node_modules/@oclif/parser/lib/errors.js
 +++ b/node_modules/@oclif/parser/lib/errors.js
-@@ -10,7 +10,8 @@ const m = deps_1.default()
+@@ -13,7 +13,8 @@ const m = deps_1.default()
      .add('list', () => require('./list'));
  class CLIParseError extends errors_1.CLIError {
      constructor(options) {
@@ -12,7 +12,7 @@ index 93912ca..c4cac1d 100644
          super(options.message);
          this.parse = options.parse;
      }
-@@ -31,22 +32,24 @@ class InvalidArgsSpecError extends CLIParseError {
+@@ -34,22 +35,24 @@ class InvalidArgsSpecError extends CLIParseError {
  exports.InvalidArgsSpecError = InvalidArgsSpecError;
  class RequiredArgsError extends CLIParseError {
      constructor({ args, parse }) {
@@ -20,7 +20,7 @@ index 93912ca..c4cac1d 100644
 +        const command = 'balena ' + parse.input.context.id.replace(/:/g, ' ');
 +        let message = `Missing ${args.length} required argument${args.length === 1 ? '' : 's'}`;
          const namedArgs = args.filter(a => a.name);
-         if (namedArgs.length) {
+         if (namedArgs.length > 0) {
              const list = m.list.renderList(namedArgs.map(a => [a.name, a.description]));
              message += `:\n${list}`;
          }

patches/all/@oclif+plugin-help+3.2.0.patch

@@ -1,37 +1,42 @@
 diff --git a/node_modules/@oclif/plugin-help/lib/command.js b/node_modules/@oclif/plugin-help/lib/command.js
-index ab72c1b..75078d5 100644
+index 1caa65b..b84a5b5 100644
 --- a/node_modules/@oclif/plugin-help/lib/command.js
 +++ b/node_modules/@oclif/plugin-help/lib/command.js
-@@ -86,7 +86,7 @@ class CommandHelp {
+@@ -87,7 +87,7 @@ class CommandHelp {
-         if (!args.filter(a => a.description).length)
+         if (args.filter(a => a.description).length === 0)
              return;
-         let body = list_1.renderList(args.map(a => {
+         const body = list_1.renderList(args.map(a => {
 -            const name = a.name.toUpperCase();
 +            const name = a.required ? `<${a.name}>` : `[${a.name}]`;
              let description = a.description || '';
              if (a.default)
                  description = `[default: ${a.default}] ${description}`;
-@@ -130,8 +130,7 @@ class CommandHelp {
+@@ -131,8 +131,7 @@ class CommandHelp {
                      value = flag.options.join('|');
                  }
                  if (!value.includes('|'))
 -                    value = underline(value);
 -                left += `=${value}`;
-+                left += ` <${value}>`;
++                    left += ` <${value}>`;
              }
              let right = flag.description || '';
              if (flag.type === 'option' && flag.default) {
 diff --git a/node_modules/@oclif/plugin-help/lib/index.js b/node_modules/@oclif/plugin-help/lib/index.js
-index 43acf30..bebefa6 100644
+index 02646b6..525e19f 100644
 --- a/node_modules/@oclif/plugin-help/lib/index.js
 +++ b/node_modules/@oclif/plugin-help/lib/index.js
-@@ -74,7 +74,8 @@ class Help {
+@@ -95,11 +95,12 @@ class Help extends HelpBase {
              console.log(title + '\n');
-         console.log(this.command(command));
+         console.log(this.formatCommand(command));
-         console.log();
+         console.log('');
--        if (topics.length) {
+-        if (subTopics.length > 0) {
 +        const SUPPRESS_SUBTOPICS = true;
-+        if (topics.length && !SUPPRESS_SUBTOPICS) {
++        if (subTopics.length > 0 && !SUPPRESS_SUBTOPICS) {
-             console.log(this.topics(topics));
+             console.log(this.formatTopics(subTopics));
-             console.log();
+             console.log('');
+         }
+-        if (subCommands.length > 0) {
++        if (subCommands.length > 0 && !SUPPRESS_SUBTOPICS) {
+             console.log(this.formatCommands(subCommands));
+             console.log('');
          }

patches/all/open+7.1.0.patch

@@ -1,8 +1,8 @@
 diff --git a/node_modules/open/index.js b/node_modules/open/index.js
-index 5fe49ad..c9194ba 100644
+index 3bf5373..e042b64 100644
 --- a/node_modules/open/index.js
 +++ b/node_modules/open/index.js
-@@ -10,7 +10,9 @@ const pAccess = promisify(fs.access);
+@@ -11,7 +11,9 @@ const pAccess = promisify(fs.access);
  const pExecFile = promisify(childProcess.execFile);
  
  // Path to included `xdg-open`.

patches/all/qqjs+0.3.11.patch

@@ -1,5 +1,5 @@
 diff --git a/node_modules/qqjs/lib/exec.js b/node_modules/qqjs/lib/exec.js
-index 835f565..84bb5be 100644
+index d9293a9..442fea8 100644
 --- a/node_modules/qqjs/lib/exec.js
 +++ b/node_modules/qqjs/lib/exec.js
 @@ -5,6 +5,11 @@ const m = {