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

Update oclif

Browse Source 
Change-type: patch
This commit is contained in:
Pagan Gazzard 2021-12-24 15:50:38 +00:00
parent 31f927c27c
commit acd352cb3c
6 changed files with 748 additions and 465 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1159
npm-shrinkwrap.json generated
View File

File diff suppressed because it is too large Load Diff

6
package.json
View File

@ -116,7 +116,7 @@
}, },
"devDependencies": { "devDependencies": {
"@balena/lint": "^6.2.0", "@balena/lint": "^6.2.0",
"@oclif/config": "^1.17.0", "@oclif/config": "^1.18.2",
"@oclif/parser": "^3.8.6", "@oclif/parser": "^3.8.6",
"@octokit/plugin-throttling": "^3.5.1", "@octokit/plugin-throttling": "^3.5.1",
"@octokit/rest": "^18.6.7", "@octokit/rest": "^18.6.7",
@ -195,7 +195,7 @@
"dependencies": { "dependencies": {
"@balena/dockerignore": "^1.0.2", "@balena/dockerignore": "^1.0.2",
"@balena/es-version": "^1.0.1", "@balena/es-version": "^1.0.1",
"@oclif/command": "^1.8.0", "@oclif/command": "^1.8.16",
"@resin.io/valid-email": "^0.1.0", "@resin.io/valid-email": "^0.1.0",
"@sentry/node": "^6.13.2", "@sentry/node": "^6.13.2",
"@types/fast-levenshtein": "0.0.1", "@types/fast-levenshtein": "0.0.1",
@ -254,7 +254,7 @@
"net-keepalive": "^3.0.0", "net-keepalive": "^3.0.0",
"node-cleanup": "^2.1.2", "node-cleanup": "^2.1.2",
"node-unzip-2": "^0.2.8", "node-unzip-2": "^0.2.8",
"oclif": "^1.18.1", "oclif": "^1.18.4",
"open": "^7.1.0", "open": "^7.1.0",
"patch-package": "^6.4.7", "patch-package": "^6.4.7",
"prettyjson": "^1.1.3", "prettyjson": "^1.1.3",

0
patches/all/@oclif+config+1.17.0.patch → patches/all/@oclif+config+1.18.2.patch
View File

0
patches/all/@oclif+parser+3.8.5.patch → patches/all/@oclif+parser+3.8.6.patch
View File

18
patches/all/@oclif+plugin-help+3.2.0.patch → patches/all/@oclif+plugin-help+3.2.15.patch
View File

@ -1,17 +1,17 @@
diff --git a/node_modules/@oclif/plugin-help/lib/command.js b/node_modules/@oclif/plugin-help/lib/command.js diff --git a/node_modules/@oclif/plugin-help/lib/command.js b/node_modules/@oclif/plugin-help/lib/command.js
index 1caa65b..e205faf 100644 index b3b9010..788e5c6 100644
--- a/node_modules/@oclif/plugin-help/lib/command.js --- a/node_modules/@oclif/plugin-help/lib/command.js
+++ b/node_modules/@oclif/plugin-help/lib/command.js +++ b/node_modules/@oclif/plugin-help/lib/command.js
@@ -87,7 +87,7 @@ class CommandHelp { @@ -88,7 +88,7 @@ class CommandHelp {
if (args.filter(a => a.description).length === 0)
return; return;
const body = list_1.renderList(args.map(a => { const body = list_1.renderList(args.map(a => {
var _a;
- const name = a.name.toUpperCase(); - const name = a.name.toUpperCase();
+ const name = a.required ? `<${a.name}>` : `[${a.name}]`; + const name = a.required ? `<${a.name}>` : `[${a.name}]`;
let description = a.description || ''; let description = a.description || '';
if (a.default) // `a.default` is actually not always a string (typing bug), hence `toString()`
description = `[default: ${a.default}] ${description}`; if (a.default || ((_a = a.default) === null || _a === void 0 ? void 0 : _a.toString()) === '0')
@@ -130,9 +130,7 @@ class CommandHelp { @@ -133,9 +133,7 @@ class CommandHelp {
if (!flag.helpValue && flag.options) { if (!flag.helpValue && flag.options) {
value = flag.options.join('|'); value = flag.options.join('|');
} }
@ -21,12 +21,12 @@ index 1caa65b..e205faf 100644
+ left += ` <${value}>`; + left += ` <${value}>`;
} }
let right = flag.description || ''; let right = flag.description || '';
if (flag.type === 'option' && flag.default) { // `flag.default` is not always a string (typing bug), hence `toString()`
diff --git a/node_modules/@oclif/plugin-help/lib/index.js b/node_modules/@oclif/plugin-help/lib/index.js diff --git a/node_modules/@oclif/plugin-help/lib/index.js b/node_modules/@oclif/plugin-help/lib/index.js
index 02646b6..525e19f 100644 index 04d7861..c2fb591 100644
--- a/node_modules/@oclif/plugin-help/lib/index.js --- a/node_modules/@oclif/plugin-help/lib/index.js
+++ b/node_modules/@oclif/plugin-help/lib/index.js +++ b/node_modules/@oclif/plugin-help/lib/index.js
@@ -95,11 +95,12 @@ class Help extends HelpBase { @@ -98,11 +98,12 @@ class Help extends HelpBase {
console.log(title + '\n'); console.log(title + '\n');
console.log(this.formatCommand(command)); console.log(this.formatCommand(command));
console.log(''); console.log('');

24
patches/all/oclif+1.18.1.patch → patches/all/oclif+1.18.4.patch
View File

@ -1,5 +1,5 @@
diff --git a/node_modules/oclif/lib/commands/pack/macos.js b/node_modules/oclif/lib/commands/pack/macos.js diff --git a/node_modules/oclif/lib/commands/pack/macos.js b/node_modules/oclif/lib/commands/pack/macos.js
index 2a7bcdd..c3df321 100644 index 924f092..a69e60b 100644
--- a/node_modules/oclif/lib/commands/pack/macos.js --- a/node_modules/oclif/lib/commands/pack/macos.js
+++ b/node_modules/oclif/lib/commands/pack/macos.js +++ b/node_modules/oclif/lib/commands/pack/macos.js
@@ -133,6 +133,7 @@ class PackMacos extends command_1.Command { @@ -133,6 +133,7 @@ class PackMacos extends command_1.Command {
@ -11,7 +11,7 @@ index 2a7bcdd..c3df321 100644
} }
} }
diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js diff --git a/node_modules/oclif/lib/commands/pack/win.js b/node_modules/oclif/lib/commands/pack/win.js
index 7547ad2..df9e4b5 100644 index bf4657e..fd58c7d 100644
--- a/node_modules/oclif/lib/commands/pack/win.js --- a/node_modules/oclif/lib/commands/pack/win.js
+++ b/node_modules/oclif/lib/commands/pack/win.js +++ b/node_modules/oclif/lib/commands/pack/win.js
@@ -52,6 +52,13 @@ VIAddVersionKey /LANG=\${LANG_ENGLISH} "ProductVersion" "\${VERSION}.0" @@ -52,6 +52,13 @@ VIAddVersionKey /LANG=\${LANG_ENGLISH} "ProductVersion" "\${VERSION}.0"
@ -42,11 +42,11 @@ index 7547ad2..df9e4b5 100644
await this.checkForNSIS(); await this.checkForNSIS();
const { flags } = this.parse(PackWin); const { flags } = this.parse(PackWin);
- const buildConfig = await Tarballs.buildConfig(flags.root); - const buildConfig = await Tarballs.buildConfig(flags.root);
+ const targets = flags.targets ? flags.targets.split(',') : undefined; + const $targets = flags.targets ? flags.targets.split(',') : undefined;
+ const buildConfig = await Tarballs.buildConfig(flags.root, { targets }); + const buildConfig = await Tarballs.buildConfig(flags.root, { targets: $targets });
const { config } = buildConfig; const { config, version, gitSha, targets, tmp } = buildConfig;
await Tarballs.build(buildConfig, { platform: 'win32', pack: false }); await Tarballs.build(buildConfig, { platform: 'win32', pack: false });
const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch); const arches = targets.filter(t => t.platform === 'win32').map(t => t.arch);
@@ -208,7 +218,8 @@ class PackWin extends command_1.Command { @@ -208,7 +218,8 @@ class PackWin extends command_1.Command {
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
await qq.mv(buildConfig.workspace({ platform: 'win32', arch }), [installerBase, 'client']); await qq.mv(buildConfig.workspace({ platform: 'win32', arch }), [installerBase, 'client']);
@ -54,7 +54,7 @@ index 7547ad2..df9e4b5 100644
- await qq.x(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`); - await qq.x(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
+ const { msysExec, toMsysPath } = require("../../util"); + const { msysExec, toMsysPath } = require("../../util");
+ await msysExec(`makensis ${toMsysPath(installerBase)}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`); + await msysExec(`makensis ${toMsysPath(installerBase)}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
const templateKey = upload_util_1.templateShortKey('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch }); const templateKey = upload_util_1.templateShortKey('win32', { bin: config.bin, version: version, sha: gitSha, arch });
const o = buildConfig.dist(`win32/${templateKey}`); const o = buildConfig.dist(`win32/${templateKey}`);
// eslint-disable-next-line no-await-in-loop // eslint-disable-next-line no-await-in-loop
@@ -255,4 +266,5 @@ PackWin.hidden = true; @@ -255,4 +266,5 @@ PackWin.hidden = true;
@ -64,15 +64,15 @@ index 7547ad2..df9e4b5 100644
+ targets: command_1.flags.string({char: 't', description: 'comma-separated targets to pack (e.g.: win32-x86,win32-x64)'}), + targets: command_1.flags.string({char: 't', description: 'comma-separated targets to pack (e.g.: win32-x86,win32-x64)'}),
}; };
diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js diff --git a/node_modules/oclif/lib/tarballs/build.js b/node_modules/oclif/lib/tarballs/build.js
index 39aae96..6e88b74 100644 index d3e8e89..a5d29e2 100644
--- a/node_modules/oclif/lib/tarballs/build.js --- a/node_modules/oclif/lib/tarballs/build.js
+++ b/node_modules/oclif/lib/tarballs/build.js +++ b/node_modules/oclif/lib/tarballs/build.js
@@ -18,8 +18,9 @@ const pack = async (from, to) => { @@ -18,8 +18,9 @@ const pack = async (from, to) => {
qq.cd(prevCwd); qq.cd(prevCwd);
}; };
async function build(c, options = {}) { async function build(c, options = {}) {
- const { xz, config } = c; - const { xz, config, version, s3Config, gitSha, nodeVersion, targets, updateConfig } = c;
+ const { xz, config, tmp } = c; + const { xz, config, version, s3Config, gitSha, nodeVersion, targets, updateConfig, tmp } = c;
const prevCwd = qq.cwd(); const prevCwd = qq.cwd();
+ console.error(`[debug] oclif cwd="${prevCwd}"\n c.root="${c.root}" c.workspace()="${c.workspace()}"`); + console.error(`[debug] oclif cwd="${prevCwd}"\n c.root="${c.root}" c.workspace()="${c.workspace()}"`);
const packCLI = async () => { const packCLI = async () => {
@ -225,11 +225,11 @@ index 45392cb..3c806c7 100644
}; };
return _.template(templates[type])(Object.assign({}, options)); return _.template(templates[type])(Object.assign({}, options));
diff --git a/node_modules/oclif/lib/util.js b/node_modules/oclif/lib/util.js diff --git a/node_modules/oclif/lib/util.js b/node_modules/oclif/lib/util.js
index 910315f..71d7649 100644 index 17748ad..4928fc9 100644
--- a/node_modules/oclif/lib/util.js --- a/node_modules/oclif/lib/util.js
+++ b/node_modules/oclif/lib/util.js +++ b/node_modules/oclif/lib/util.js
@@ -67,3 +67,47 @@ exports.sortVersionsObjectByKeysDesc = (input) => { @@ -67,3 +67,47 @@ exports.sortVersionsObjectByKeysDesc = (input) => {
}); }
return result; return result;
}; };
+ +