oclif 1.18.0 → 1.18.2-dev.2

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"1.18.0","commands":{"base":{"id":"base","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"command":{"id":"command","description":"add a command to an existing CLI or plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"hook":{"id":"hook","description":"add a hook to an existing CLI or plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"multi":{"id":"multi","description":"generate a new multi-command CLI","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"plugin":{"id":"plugin","description":"create a new CLI plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"deb":{"name":"deb","type":"boolean","char":"d","description":"promote debian artifacts","allowNo":false},"macos":{"name":"macos","type":"boolean","char":"m","description":"promote macOS pkg","allowNo":false},"win":{"name":"win","type":"boolean","char":"w","description":"promote Windows exe","allowNo":false},"max-age":{"name":"max-age","type":"option","char":"a","description":"cache control max-age in seconds","default":"86400"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true},"indexes":{"name":"indexes","type":"boolean","description":"append the promoted urls into the index files","allowNo":false}},"args":[]},"readme":{"id":"readme","description":"adds commands to README.md in current directory\nThe readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:\n# Usage\n<!-- usage -->\n# Commands\n<!-- commands -->\n\nCustomize the code URL prefix by setting oclif.repositoryPrefix in package.json.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false}},"args":[]},"single":{"id":"single","description":"generate a new single-command CLI","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"pack:tarballs":{"id":"pack:tarballs","description":"packages oclif CLI into tarballs\n\nThis can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true}},"args":[]},"pack:win":{"id":"pack:win","description":"create windows installer from oclif CLI","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"upload:tarballs":{"id":"upload:tarballs","description":"upload an oclif CLI to S3\n\n\"aws-sdk\" will need to be installed as a devDependency to upload.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true}},"args":[]},"upload:win":{"id":"upload:win","description":"upload windows installers built with pack:win","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]}}}
+{"version":"1.18.2-dev.2","commands":{"base":{"id":"base","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"command":{"id":"command","description":"add a command to an existing CLI or plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"hook":{"id":"hook","description":"add a hook to an existing CLI or plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"multi":{"id":"multi","description":"generate a new multi-command CLI","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"plugin":{"id":"plugin","description":"create a new CLI plugin","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"deb":{"name":"deb","type":"boolean","char":"d","description":"promote debian artifacts","allowNo":false},"macos":{"name":"macos","type":"boolean","char":"m","description":"promote macOS pkg","allowNo":false},"win":{"name":"win","type":"boolean","char":"w","description":"promote Windows exe","allowNo":false},"max-age":{"name":"max-age","type":"option","char":"a","description":"cache control max-age in seconds","default":"86400"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true},"indexes":{"name":"indexes","type":"boolean","description":"append the promoted urls into the index files","allowNo":false}},"args":[]},"readme":{"id":"readme","description":"adds commands to README.md in current directory\nThe readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:\n# Usage\n<!-- usage -->\n# Commands\n<!-- commands -->\n\nCustomize the code URL prefix by setting oclif.repositoryPrefix in package.json.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false}},"args":[]},"single":{"id":"single","description":"generate a new single-command CLI","pluginName":"oclif","pluginType":"core","aliases":[],"flags":{"defaults":{"name":"defaults","type":"boolean","description":"use defaults for every setting","allowNo":false},"options":{"name":"options","type":"option","description":"(yarn|typescript|eslint|mocha)"},"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"path","description":"path to project, defaults to current directory","required":false}]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"additional-executable":{"name":"additional-executable","type":"option","description":"an executable other than the one listed in config.bin that should be made available to the user\nthe executable should already exist in the tarball produced by \"oclif pack:tarballs\""}},"args":[]},"pack:tarballs":{"id":"pack:tarballs","description":"packages oclif CLI into tarballs\n\nThis can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true}},"args":[]},"pack:win":{"id":"pack:win","description":"create windows installer from oclif CLI","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"additional-executable":{"name":"additional-executable","type":"option","description":"an executable other than the one listed in config.bin that should be made available to the user\nthe executable should already exist in the tarball produced by \"oclif pack:tarballs\""}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]},"upload:tarballs":{"id":"upload:tarballs","description":"upload an oclif CLI to S3\n\n\"aws-sdk\" will need to be installed as a devDependency to upload.\n","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64"},"xz":{"name":"xz","type":"boolean","description":"also upload xz","allowNo":true}},"args":[]},"upload:win":{"id":"upload:win","description":"upload windows installers built with pack:win","pluginName":"oclif","pluginType":"core","hidden":true,"aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"default":"."}},"args":[]}}}

package/CHANGELOG.md

@@ -1,3 +1,42 @@
+# Changelog
+
+All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
+
+### [1.18.2-dev.2](https://github.com/oclif/oclif/compare/v1.18.1...v1.18.2-dev.2) (2021-10-28)
+
+
+### ⚠ BREAKING CHANGES
+
+* require node 12+ (#676)
+
+### Features
+
+* add additional executable to mac installer ([015d10a](https://github.com/oclif/oclif/commit/015d10ac904fe25bc699e5381d643067fba489da))
+* add additional executable to win installer ([cfd831e](https://github.com/oclif/oclif/commit/cfd831e4c03ab70dff0fcd330a84f0f3905153c3))
+
+
+### Bug Fixes
+
+* build and find tarballs using the same version ([44c4177](https://github.com/oclif/oclif/commit/44c41774c262c85eebd1a0eb8afce07edfd5ef8c))
+* lint ([110e659](https://github.com/oclif/oclif/commit/110e6597c3fe41a1453c0034b166b23419324b71))
+* release new dev version ([cb63e9c](https://github.com/oclif/oclif/commit/cb63e9c508dbbf7dea0ed44a3bd082be7fbc122b))
+* tests ([7a68684](https://github.com/oclif/oclif/commit/7a68684cd25ba4b770d16904fc22eb266c0c4b1f))
+
+
+### build
+
+* require node 12+ ([#676](https://github.com/oclif/oclif/issues/676)) ([f4b648c](https://github.com/oclif/oclif/commit/f4b648c244c8806c999ad2e636c446414b14c5a5))
+
+### [1.18.1](https://github.com/oclif/oclif/compare/v1.18.0...v1.18.1) (2021-07-01)
+
+
+### Bug Fixes
+
+* add setup_git script ([35d0920](https://github.com/oclif/oclif/commit/35d0920eae2958d7e9ae394523f06b1f034396ad))
+* move pretarball step ([#617](https://github.com/oclif/oclif/issues/617)) ([cd74340](https://github.com/oclif/oclif/commit/cd743408e5a8fd3e4f7e6effd6ec91adbe1121d4))
+* update config.yml ([97b630c](https://github.com/oclif/oclif/commit/97b630c2d1ac36b1975057fbc18caa420f828981))
+* update release job ([eb05cd5](https://github.com/oclif/oclif/commit/eb05cd5511dfac27617e916aa0415cdb5647f11e))
+
 # [1.17.0](https://github.com/oclif/oclif/compare/v1.16.2...v1.17.0) (2021-03-15)
 
 

package/README.md

@@ -146,7 +146,7 @@ OPTIONS
   --force     overwrite existing files
 ```
 
-_See code: [src/commands/command.ts](https://github.com/oclif/oclif/blob/v1.18.0/src/commands/command.ts)_
+_See code: [src/commands/command.ts](https://github.com/oclif/oclif/blob/v1.18.2-dev.2/src/commands/command.ts)_
 
 ## `oclif help [COMMAND]`
 
@@ -182,7 +182,7 @@ OPTIONS
   --force        overwrite existing files
 ```
 
-_See code: [src/commands/hook.ts](https://github.com/oclif/oclif/blob/v1.18.0/src/commands/hook.ts)_
+_See code: [src/commands/hook.ts](https://github.com/oclif/oclif/blob/v1.18.2-dev.2/src/commands/hook.ts)_
 
 ## `oclif multi [PATH]`
 
@@ -201,7 +201,7 @@ OPTIONS
   --options=options  (yarn|typescript|eslint|mocha)
 ```
 
-_See code: [src/commands/multi.ts](https://github.com/oclif/oclif/blob/v1.18.0/src/commands/multi.ts)_
+_See code: [src/commands/multi.ts](https://github.com/oclif/oclif/blob/v1.18.2-dev.2/src/commands/multi.ts)_
 
 ## `oclif plugin [PATH]`
 
@@ -220,7 +220,7 @@ OPTIONS
   --options=options  (yarn|typescript|eslint|mocha)
 ```
 
-_See code: [src/commands/plugin.ts](https://github.com/oclif/oclif/blob/v1.18.0/src/commands/plugin.ts)_
+_See code: [src/commands/plugin.ts](https://github.com/oclif/oclif/blob/v1.18.2-dev.2/src/commands/plugin.ts)_
 
 ## `oclif single [PATH]`
 
@@ -239,7 +239,7 @@ OPTIONS
   --options=options  (yarn|typescript|eslint|mocha)
 ```
 
-_See code: [src/commands/single.ts](https://github.com/oclif/oclif/blob/v1.18.0/src/commands/single.ts)_
+_See code: [src/commands/single.ts](https://github.com/oclif/oclif/blob/v1.18.2-dev.2/src/commands/single.ts)_
 <!-- commandsstop -->
 
 # 🏭 Related Repositories

package/lib/commands/pack/macos.d.ts

@@ -4,6 +4,7 @@ export default class PackMacos extends Command {
     static description: string;
     static flags: {
         root: flags.IOptionFlag<string>;
+        'additional-executable': flags.IOptionFlag<string | undefined>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/macos.js

@@ -6,17 +6,21 @@ const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 const scripts = {
-    preinstall: (config) => `#!/usr/bin/env bash
+    preinstall: (config, additionalExecutable) => `#!/usr/bin/env bash
 sudo rm -rf /usr/local/lib/${config.dirname}
 sudo rm -rf /usr/local/${config.bin}
 sudo rm -rf /usr/local/bin/${config.bin}
+${additionalExecutable ?
+        `sudo rm -rf /usr/local/${additionalExecutable}
+sudo rm -rf /usr/local/bin/${additionalExecutable}` : ''}
 `,
-    postinstall: (config) => `#!/usr/bin/env bash
+    postinstall: (config, additionalExecutable) => `#!/usr/bin/env bash
 set -x
 sudo mkdir -p /usr/local/bin
 sudo ln -sf /usr/local/lib/${config.dirname}/bin/${config.bin} /usr/local/bin/${config.bin}
+${additionalExecutable ? `sudo ln -sf /usr/local/lib/${config.dirname}/bin/${additionalExecutable} /usr/local/bin/${additionalExecutable}` : ''}
 `,
-    uninstall: (config) => {
+    uninstall: (config, additionalExecutable) => {
         const packageIdentifier = config.pjson.oclif.macos.identifier;
         return `#!/usr/bin/env bash
 
@@ -57,6 +61,7 @@ done
 echo "Application uninstalling process started"
 # remove link to shorcut file
 find "/usr/local/bin/" -name "${config.bin}" | xargs rm
+${additionalExecutable ? `find "/usr/local/bin/" -name "${additionalExecutable}" | xargs rm` : ''}
 if [ $? -eq 0 ]
 then
   echo "[1/3] [DONE] Successfully deleted shortcut links"
@@ -110,7 +115,7 @@ class PackMacos extends command_1.Command {
         const writeScript = async (script) => {
             const path = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
             path.push(script);
-            await qq.write(path, scripts[script](config));
+            await qq.write(path, scripts[script](config, flags['additional-executable']));
             await qq.chmod(path, 0o755);
         };
         await writeScript('preinstall');
@@ -141,4 +146,6 @@ PackMacos.hidden = true;
 PackMacos.description = 'pack CLI into macOS .pkg';
 PackMacos.flags = {
     root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    'additional-executable': command_1.flags.string({ description: `an executable other than the one listed in config.bin that should be made available to the user
+the executable should already exist in the tarball produced by "oclif pack:tarballs"` }),
 };

package/lib/commands/pack/win.d.ts

@@ -4,6 +4,7 @@ export default class PackWin extends Command {
     static description: string;
     static flags: {
         root: flags.IOptionFlag<string>;
+        'additional-executable': flags.IOptionFlag<string | undefined>;
     };
     run(): Promise<void>;
     private checkForNSIS;

package/lib/commands/pack/win.js

@@ -6,20 +6,20 @@ const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 const scripts = {
     /* eslint-disable no-useless-escape */
-    cmd: (config) => `@echo off
+    cmd: (config, additionalExecutable = '') => `@echo off
 setlocal enableextensions
 
-set ${config.scopedEnvVarKey('BINPATH')}=%~dp0\\${config.bin}.cmd
-if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${config.bin}.cmd" (
-  "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${config.bin}.cmd" %*
+set ${config.scopedEnvVarKey('BINPATH')}=%~dp0\\${additionalExecutable ? additionalExecutable : config.bin}.cmd
+if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalExecutable ? additionalExecutable : config.bin}.cmd" (
+  "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalExecutable ? additionalExecutable : config.bin}.cmd" %*
 ) else (
-  "%~dp0\\..\\client\\bin\\node.exe" "%~dp0\\..\\client\\bin\\run" %*
+  "%~dp0\\..\\client\\bin\\node.exe" "%~dp0\\..\\client\\bin\\${additionalExecutable ? additionalExecutable : 'run'}" %*
 )
 `,
-    sh: (config) => `#!/bin/sh
+    sh: (config, additionalExecutable = '') => `#!/bin/sh
 basedir=$(dirname "$(echo "$0" | sed -e 's,\\\\,/,g')")
 
-"$basedir/../client/bin/${config.bin}.cmd" "$@"
+"$basedir/../client/bin/${additionalExecutable ? additionalExecutable : config.bin}.cmd" "$@"
 ret=$?
 exit $ret
 `,
@@ -203,6 +203,10 @@ class PackWin extends command_1.Command {
             await qq.write([installerBase, `bin/${config.bin}.cmd`], scripts.cmd(config));
             // eslint-disable-next-line no-await-in-loop
             await qq.write([installerBase, `bin/${config.bin}`], scripts.sh(config));
+            if (flags['additional-executable']) {
+                await qq.write([installerBase, `bin/${flags['additional-executable']}.cmd`], scripts.cmd(config, flags['additional-executable'])); // eslint-disable-line no-await-in-loop
+                await qq.write([installerBase, `bin/${flags['additional-executable']}`], scripts.sh(config, flags['additional-executable'])); // eslint-disable-line no-await-in-loop
+            }
             // eslint-disable-next-line no-await-in-loop
             await qq.write([installerBase, `${config.bin}.nsi`], scripts.nsis(config, arch));
             // eslint-disable-next-line no-await-in-loop
@@ -255,4 +259,6 @@ PackWin.hidden = true;
 PackWin.description = 'create windows installer from oclif CLI';
 PackWin.flags = {
     root: command_1.flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
+    'additional-executable': command_1.flags.string({ description: `an executable other than the one listed in config.bin that should be made available to the user
+the executable should already exist in the tarball produced by "oclif pack:tarballs"` }),
 };

package/lib/commands/promote.js

@@ -2,12 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const command_1 = require("@oclif/command");
 const cli_ux_1 = require("cli-ux");
-const fs = require("fs-extra");
 const path = require("path");
 const aws_1 = require("../aws");
 const Tarballs = require("../tarballs");
 const upload_util_1 = require("../upload-util");
-const util_1 = require("../util");
+const version_indexes_1 = require("../version-indexes");
 class Promote extends command_1.Command {
     async run() {
         const { flags } = this.parse(Promote);
@@ -15,38 +14,10 @@ class Promote extends command_1.Command {
         const targets = flags.targets.split(',');
         const buildConfig = await Tarballs.buildConfig(flags.root, { targets });
         const { s3Config, config } = buildConfig;
-        const appendToIndex = async (input) => {
-            var _a;
-            // these checks are both nice for users AND helpful for TS
-            if (!s3Config.bucket)
-                throw new Error('[package.json].oclif.s3.bucket is required for indexes');
-            if (!s3Config.host)
-                throw new Error('[package.json].oclif.s3.host is required for indexes');
-            // json-friendly filenames like sfdx-linux-x64-tar-gz
-            const jsonFileName = `${input.filename.replace(/\./g, '-')}.json`;
-            const key = path.join(s3Config.folder, 'versions', jsonFileName);
-            // retrieve existing index file
-            let existing = {};
-            try {
-                existing = JSON.parse((_a = (await aws_1.default.s3.getObject({
-                    Bucket: s3Config.bucket,
-                    Key: key,
-                })).Body) === null || _a === void 0 ? void 0 : _a.toString());
-                this.log('appending to existing index file');
-            }
-            catch (error) {
-                this.error(`error on ${key}`, error);
-            }
-            // appends new version from this promotion if not already present (idempotent)
-            await fs.writeJSON(jsonFileName, util_1.sortVersionsObjectByKeysDesc(Object.assign(Object.assign({}, existing), { [flags.version]: input.originalUrl.replace(s3Config.bucket, s3Config.host) })), { spaces: 2 });
-            // put the file back in the same place
-            await aws_1.default.s3.uploadFile(jsonFileName, {
-                Bucket: s3Config.bucket,
-                Key: key,
-                CacheControl: maxAge,
-            });
-            // cleans up local fs
-            await fs.remove(jsonFileName);
+        const indexDefaults = {
+            version: flags.version,
+            s3Config,
+            maxAge,
         };
         if (!s3Config.bucket)
             this.error('Cannot determine S3 bucket for promotion');
@@ -96,7 +67,7 @@ class Promote extends command_1.Command {
             });
             // eslint-disable-next-line no-await-in-loop
             if (flags.indexes)
-                await appendToIndex({ originalUrl: versionedTarGzKey, filename: unversionedTarGzName });
+                await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarGzKey, filename: unversionedTarGzName }));
             if (flags.xz) {
                 const versionedTarXzName = upload_util_1.templateShortKey('versioned', '.tar.xz', {
                     arch: target.arch,
@@ -119,7 +90,7 @@ class Promote extends command_1.Command {
                 });
                 // eslint-disable-next-line no-await-in-loop
                 if (flags.indexes)
-                    await appendToIndex({ originalUrl: versionedTarXzKey, filename: unversionedTarXzName });
+                    await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: versionedTarXzKey, filename: unversionedTarXzName }));
             }
         }
         // copy darwin pkg
@@ -138,7 +109,7 @@ class Promote extends command_1.Command {
                 MetadataDirective: 'REPLACE',
             });
             if (flags.indexes)
-                await appendToIndex({ originalUrl: darwinCopySource, filename: unversionedPkg });
+                await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
         }
         // copy win exe
         if (flags.win) {
@@ -159,7 +130,7 @@ class Promote extends command_1.Command {
                 });
                 // eslint-disable-next-line no-await-in-loop
                 if (flags.indexes)
-                    await appendToIndex({ originalUrl: winCopySource, filename: unversionedExe });
+                    await version_indexes_1.appendToIndex(Object.assign(Object.assign({}, indexDefaults), { originalUrl: winCopySource, filename: unversionedExe }));
                 cli_ux_1.cli.action.stop('successfully');
             }
         }

package/lib/commands/upload/tarballs.js

@@ -16,12 +16,14 @@ class UploadTarballs extends command_1.Command {
         const { s3Config, dist, version, config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
-            const tarball = dist(upload_util_1.templateShortKey('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version, sha: buildConfig.gitSha }, target)));
+            log_1.log(`Looking for ${config.bin}-v${config.version}-${buildConfig.gitSha}-${target.platform}-${target.arch}.tar.gz ...`);
+            const tarball = dist(upload_util_1.templateShortKey('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
             // eslint-disable-next-line no-await-in-loop
             if (!await qq.exists(tarball))
-                this.error(`Cannot find a tarball for ${target.platform}-${target.arch}`, {
+                this.error(`Cannot find a tarball ${tarball} for ${target.platform}-${target.arch}`, {
                     suggestions: [`Run "oclif-dev pack --target ${target.platform}-${target.arch}" before uploading`],
                 });
+            log_1.log('Found it.');
         }
         const S3Options = {
             Bucket: s3Config.bucket,

package/lib/generators/app.d.ts

@@ -5,7 +5,6 @@ declare class App extends Generator {
         mocha: boolean;
         circleci: boolean;
         appveyor: boolean;
-        codecov: boolean;
         typescript: boolean;
         eslint: boolean;
         yarn: boolean;
@@ -37,14 +36,12 @@ declare class App extends Generator {
         ci: {
             circleci: boolean;
             appveyor: boolean;
-            codecov: boolean;
             travisci: boolean;
         };
     };
     mocha: boolean;
     circleci: boolean;
     appveyor: boolean;
-    codecov: boolean;
     ts: boolean;
     eslint: boolean;
     yarn: boolean;

package/lib/generators/app.js

@@ -39,7 +39,6 @@ class App extends Generator {
             mocha: opts.options.includes('mocha'),
             circleci: opts.options.includes('circleci'),
             appveyor: opts.options.includes('appveyor'),
-            codecov: opts.options.includes('codecov'),
             typescript: opts.options.includes('typescript'),
             eslint: opts.options.includes('eslint'),
             yarn: opts.options.includes('yarn') || hasYarn,
@@ -179,7 +178,6 @@ class App extends Generator {
                     choices: [
                         { name: 'circleci (continuous integration/delivery service)', value: 'circleci' },
                         { name: 'appveyor (continuous integration/delivery service)', value: 'appveyor' },
-                        { name: 'codecov (online code coverage report viewer)', value: 'codecov' },
                         { name: 'travisci (continuous integration/delivery service)', value: 'travisci' },
                     ],
                     filter: ((arr) => _.keyBy(arr)),
@@ -195,7 +193,6 @@ class App extends Generator {
         this.mocha = this.options.mocha;
         this.circleci = this.options.circleci;
         this.appveyor = this.options.appveyor;
-        this.codecov = this.options.codecov;
         this.eslint = this.options.eslint;
         this.travisci = this.options.travisci;
         this.pjson.name = this.answers.name || defaults.name;
@@ -365,9 +362,10 @@ class App extends Generator {
             }
         }
         if (this.eslint) {
-            devDependencies.push('eslint@^5.13', 'eslint-config-oclif@^3.1');
+            devDependencies.push('eslint@^7.3.0', // this should stay in sync with the eslint dependency in this repo's package.json
+            'eslint-config-oclif@^3.1');
             if (this.ts) {
-                devDependencies.push('eslint-config-oclif-typescript@^0.1');
+                devDependencies.push('eslint-config-oclif-typescript@^0.2.0');
             }
         }
         if (isWindows)

package/lib/tarballs/build.js

@@ -47,15 +47,11 @@ async function build(c, options = {}) {
     };
     const addDependencies = async () => {
         qq.cd(c.workspace());
-        const pjson = await qq.readJSON('package.json');
         const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
         const yarn = await qq.exists([yarnRoot, 'yarn.lock']);
         if (yarn) {
             await qq.cp([yarnRoot, 'yarn.lock'], '.');
             await qq.x('yarn --no-progress --production --non-interactive');
-            if (pjson.scripts.pretarball) {
-                await qq.x('yarn run pretarball');
-            }
         }
         else {
             let lockpath = qq.join(c.root, 'package-lock.json');
@@ -64,9 +60,17 @@ async function build(c, options = {}) {
             }
             await qq.cp(lockpath, '.');
             await qq.x('npm install --production');
-            if (pjson.scripts.pretarball) {
+        }
+    };
+    const pretarball = async () => {
+        qq.cd(c.workspace());
+        const pjson = await qq.readJSON('package.json');
+        const yarnRoot = findYarnWorkspaceRoot(c.root) || c.root;
+        const yarn = await qq.exists([yarnRoot, 'yarn.lock']);
+        if (pjson.scripts.pretarball) {
+            yarn ?
+                await qq.x('yarn run pretarball') :
                 await qq.x('npm run pretarball', {});
-            }
         }
     };
     const buildTarget = async (target) => {
@@ -135,6 +139,7 @@ async function build(c, options = {}) {
     await updatePJSON();
     await addDependencies();
     await bin_1.writeBinScripts({ config, baseWorkspace: c.workspace(), nodeVersion: c.nodeVersion });
+    await pretarball();
     for (const target of c.targets) {
         if (!options.platform || options.platform === target.platform) {
             // eslint-disable-next-line no-await-in-loop

package/lib/tarballs/config.d.ts

@@ -10,6 +10,7 @@ export interface BuildConfig {
     updateConfig: BuildConfig['config']['pjson']['oclif']['update'];
     s3Config: BuildConfig['updateConfig']['s3'] & {
         folder?: string;
+        indexVersionLimit?: number;
     };
     xz: boolean;
     targets: {

package/lib/version-indexes.d.ts

@@ -0,0 +1,10 @@
+export declare const appendToIndex: (input: {
+    version: string;
+    originalUrl: string;
+    filename: string;
+    maxAge: string;
+    s3Config: import("@oclif/config").PJSON.S3 & {
+        folder?: string | undefined;
+        indexVersionLimit?: number | undefined;
+    };
+}) => Promise<void>;

package/lib/version-indexes.js

@@ -0,0 +1,69 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs-extra");
+const path = require("path");
+const aws_1 = require("./aws");
+const log_1 = require("./log");
+const debug = log_1.debug.new('version-indexes');
+const sortVersionsObjectByKeysDesc = (input, keyLimit) => {
+    const keys = Reflect.ownKeys(input).sort((a, b) => {
+        const splitA = a.split('.').map(part => parseInt(part, 10));
+        const splitB = b.split('.').map(part => parseInt(part, 10));
+        // sort by major
+        if (splitA[0] < splitB[0])
+            return 1;
+        if (splitA[0] > splitB[0])
+            return -1;
+        // sort by minor
+        if (splitA[1] < splitB[1])
+            return 1;
+        if (splitA[1] > splitB[1])
+            return -1;
+        // sort by patch
+        if (splitA[2] < splitB[2])
+            return 1;
+        if (splitA[2] > splitB[2])
+            return -1;
+        return 0;
+    }).slice(0, keyLimit); // undefined keyLimit returns the entire array
+    const result = {};
+    keys.forEach(key => {
+        result[key] = input[key];
+    });
+    return result;
+};
+// appends to an existing file (or writes a new one) with the versions in descending order, with an optional limit from the pjson file
+exports.appendToIndex = async (input) => {
+    var _a;
+    const { version, originalUrl, filename, maxAge, s3Config } = input;
+    // these checks are both nice for users AND helpful for TS
+    if (!s3Config.bucket)
+        throw new Error('[package.json].oclif.s3.bucket is required for indexes');
+    if (!s3Config.host)
+        throw new Error('[package.json].oclif.s3.host is required for indexes');
+    // json-friendly filenames like sfdx-linux-x64-tar-gz
+    const jsonFileName = `${filename.replace(/\./g, '-')}.json`;
+    const key = path.join(s3Config.folder, 'versions', jsonFileName);
+    // retrieve existing index file
+    let existing = {};
+    try {
+        existing = JSON.parse((_a = (await aws_1.default.s3.getObject({
+            Bucket: s3Config.bucket,
+            Key: key,
+        })).Body) === null || _a === void 0 ? void 0 : _a.toString());
+        debug('appending to existing index file');
+    }
+    catch (error) {
+        debug(`error on ${key}`, error);
+    }
+    // appends new version from this promotion if not already present (idempotent)
+    await fs.writeJSON(jsonFileName, sortVersionsObjectByKeysDesc(Object.assign(Object.assign({}, existing), { [version]: originalUrl.replace(s3Config.bucket, s3Config.host) }), s3Config.indexVersionLimit), { spaces: 2 });
+    // put the file back in the same place
+    await aws_1.default.s3.uploadFile(jsonFileName, {
+        Bucket: s3Config.bucket,
+        Key: key,
+        CacheControl: maxAge,
+    });
+    // cleans up local fs
+    await fs.remove(jsonFileName);
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "1.18.0",
+  "version": "1.18.2-dev.2",
   "author": "Jeff Dickey @jdxcode",
   "bin": {
     "oclif": "bin/run"
@@ -60,12 +60,13 @@
     "npm-run-path": "^4.0.1",
     "nps": "^5.9.3",
     "shelljs": "^0.8.3",
+    "shx": "^0.3.3",
     "tmp": "^0.2.1",
     "ts-node": "^9.0.0",
     "typescript": "3.8.3"
   },
   "engines": {
-    "node": ">=8.0.0"
+    "node": ">=12.0.0"
   },
   "files": [
     ".oclif.manifest.json",
@@ -116,14 +117,14 @@
   },
   "repository": "oclif/oclif",
   "scripts": {
-    "build": "rm -rf lib && tsc",
+    "build": "shx rm -rf lib && tsc",
     "devcli:lint": "eslint . --ext .ts --config .eslintrc",
     "devcli:test": "mocha --forbid-only \"test/*.test.ts\"",
     "devcli": "yarn build --noEmit && yarn run devcli:test && yarn run devcli:lint",
     "lint": "nps lint",
-    "postpack": "rm .oclif.manifest.json",
+    "postpack": "shx rm .oclif.manifest.json",
     "posttest": "yarn run lint",
-    "prepack": "rm -rf lib && tsc && oclif-dev manifest",
+    "prepack": "shx rm -rf lib && tsc && oclif-dev manifest",
     "version": "oclif-dev readme && git add README.md",
     "test": "nps test"
   },

package/templates/README.md.ejs

@@ -11,9 +11,6 @@
 <%_ if (appveyor) { _%>
 [![Appveyor CI](https://ci.appveyor.com/api/projects/status/github/<%= repository %>?branch=master&svg=true)](https://ci.appveyor.com/project/<%= repository %>/branch/master)
 <%_ } _%>
-<%_ if (codecov) { _%>
-[![Codecov](https://codecov.io/gh/<%= repository %>/branch/master/graph/badge.svg)](https://codecov.io/gh/<%= repository %>)
-<%_ } _%>
 [![Downloads/week](https://img.shields.io/npm/dw/<%= pjson.name %>.svg)](https://npmjs.org/package/<%= pjson.name %>)
 [![License](https://img.shields.io/npm/l/<%= pjson.name %>.svg)](https://github.com/<%= repository %>/blob/master/package.json)
 

package/templates/appveyor.yml.ejs

@@ -24,13 +24,9 @@ test_script:
   - .\bin\run --help
 <%_ } _%>
   - <%- yarn ? 'yarn' : 'npm' %> test
-<% if (mocha && codecov) { %>
+<% if (mocha) { %>
 after_test:
   - .\node_modules\.bin\nyc report --reporter text-lcov > coverage.lcov
-  - ps: |
-      $env:PATH = 'C:\msys64\usr\bin;' + $env:PATH
-      Invoke-WebRequest -Uri 'https://codecov.io/bash' -OutFile codecov.sh
-      bash codecov.sh
 <% } %>
 
 build: off

package/templates/circle.yml.ejs

@@ -23,13 +23,6 @@ jobs:
       - run:
           name: Testing
           command: <%- yarn ? 'yarn' : 'npm' %> test
-      <%_ if (mocha && codecov) { _%>
-      - run:
-          name: Submitting code coverage to codecov
-          command: |
-            ./node_modules/.bin/nyc report --reporter text-lcov > coverage.lcov
-            curl -s https://codecov.io/bash | bash
-      <%_ } _%>
   node-12:
     <<: *test
     docker:

package/templates/eslintrc.typescript

@@ -2,5 +2,11 @@
   "extends": [
     "oclif",
     "oclif-typescript"
-  ]
+  ],
+  "settings": {
+    "node": {
+      "tryExtensions": [".js", ".ts"]
+    }
+  },
+  "root": true
 }

package/templates/travis.yml.ejs

@@ -12,9 +12,3 @@ script:
   - ./bin/run --help
 <%_ } _%>
   - <%- yarn ? 'yarn' : 'npm' %> run test
-
-<% if(mocha && codecov) { %>
-after_success:
-  - ./node_modules/.bin/nyc report --reporter text-lcov > coverage.lcov
-  - bash < (curl -s https://codecov.io/bash)
-<% } %>