oclif 2.0.0-dev.0 → 2.0.0-dev.1

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.0.0-dev.0","commands":{"generate":{"id":"generate","description":"generate a new CLI\nThis will clone the template repo 'oclif/hello-world' and update package properties","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"directory name of new project","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"multiple":false,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true,"multiple":false},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true,"multiple":false},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"multiple":false,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","multiple":false,"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","multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"multiple":false,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false}},"args":[]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false}},"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","multiple":false,"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\n\n  This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]}}}
+{"version":"2.0.0-dev.1","commands":{"generate":{"id":"generate","description":"generate a new CLI\nThis will clone the template repo 'oclif/hello-world' and update package properties","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"name","description":"directory name of new project","required":true}]},"manifest":{"id":"manifest","description":"generates plugin manifest json","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{},"args":[{"name":"path","description":"path to plugin","default":"."}]},"promote":{"id":"promote","description":"promote CLI builds to a S3 release channel","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to the oclif CLI project root","required":true,"multiple":false,"default":"."},"version":{"name":"version","type":"option","description":"semantic version of the CLI to promote","required":true,"multiple":false},"sha":{"name":"sha","type":"option","description":"7-digit short git commit SHA of the CLI to promote","required":true,"multiple":false},"channel":{"name":"channel","type":"option","description":"which channel to promote to","required":true,"multiple":false,"default":"stable"},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to promote (e.g.: linux-arm,win32-x64)","multiple":false,"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","multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"dir":{"name":"dir","type":"option","description":"output directory for multi docs","required":true,"multiple":false,"default":"docs"},"multi":{"name":"multi","type":"boolean","description":"create a different markdown page for each topic","allowNo":false}},"args":[]},"pack:deb":{"id":"pack:deb","description":"pack CLI into debian package","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"pack:macos":{"id":"pack:macos","description":"pack CLI into macOS .pkg","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false}},"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to pack (e.g.: linux-arm,win32-x64)","multiple":false,"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\n\n  This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"additional-cli":{"name":"additional-cli","type":"option","description":"an Oclif CLI other than the one listed in config.bin that should be made available to the user\nthe CLI should already exist in a directory named after the CLI that is the root of the tarball produced by \"oclif pack:tarballs\"","hidden":true,"multiple":false}},"args":[]},"upload:deb":{"id":"upload:deb","description":"upload deb package built with pack:deb","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]},"upload:macos":{"id":"upload:macos","description":"upload macos installers built with pack:macos","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."},"targets":{"name":"targets","type":"option","char":"t","description":"comma-separated targets to upload (e.g.: linux-arm,win32-x64)","multiple":false,"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","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"root":{"name":"root","type":"option","char":"r","description":"path to oclif CLI root","required":true,"multiple":false,"default":"."}},"args":[]}}}

package/CHANGELOG.md

@@ -2,24 +2,12 @@
 
 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.
 
-## [2.0.0-dev.0](https://github.com/oclif/oclif/compare/v2.0.0-main.8...v2.0.0-dev.0) (2021-11-01)
-
-
-### Features
-
-* add additional executable to mac installer ([fefe2d9](https://github.com/oclif/oclif/commit/fefe2d90c87194d3a254a1bb16d32d3eaadd2d36))
-* add additional executable to win installer ([f28639a](https://github.com/oclif/oclif/commit/f28639af361925c2878602b96cf5ab5415b3a72c))
+## [2.0.0-dev.1](https://github.com/oclif/oclif/compare/v2.0.0-dev.0...v2.0.0-dev.1) (2021-11-01)
 
 
 ### Bug Fixes
 
-* allow additional oclif CLIs, not executables in general ([4791a10](https://github.com/oclif/oclif/commit/4791a10292c85920ac3c68d5fae3bda3aeb38ad1))
-* build and find tarballs using the same version ([66904a7](https://github.com/oclif/oclif/commit/66904a7180ed32e0e9152e4429358697af85af26))
-* hide additional-cli flags ([4140b09](https://github.com/oclif/oclif/commit/4140b096de26cd319e24c19615f63387de311fe4))
-* lint ([b23ceb2](https://github.com/oclif/oclif/commit/b23ceb2568a4d343f771269f20e1bb990deec588))
-* tests ([d66b08c](https://github.com/oclif/oclif/commit/d66b08cb40fe9d1fb45e7dc6cb0dc07c468c19df))
-* upload tarballs using same version as they were built with ([29e6c84](https://github.com/oclif/oclif/commit/29e6c84ba60648e6e5cdf2f16a12296a04f5bc8a))
-* use same version to produce and upload macos pkg ([9114ca1](https://github.com/oclif/oclif/commit/9114ca1476da7c5c242f0a645460b99897412117))
+* straighten out versions once and for all ([f1001a5](https://github.com/oclif/oclif/commit/f1001a5993a4c54e6e437b992eae69685e1a356f))
 
 ## [2.0.0-main.8](https://github.com/oclif/oclif/compare/v2.0.0-main.7...v2.0.0-main.8) (2021-10-08)
 

package/README.md

@@ -121,7 +121,7 @@ DESCRIPTION
   This will clone the template repo 'oclif/hello-world' and update package properties
 ```
 
-_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/generate.ts)_
 
 ## `oclif help [COMMAND]`
 
@@ -158,7 +158,7 @@ DESCRIPTION
   generates plugin manifest json
 ```
 
-_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/manifest.ts)_
+_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/manifest.ts)_
 
 ## `oclif pack:deb`
 
@@ -175,7 +175,7 @@ DESCRIPTION
   pack CLI into debian package
 ```
 
-_See code: [src/commands/pack/deb.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/pack/deb.ts)_
+_See code: [src/commands/pack/deb.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/pack/deb.ts)_
 
 ## `oclif pack:macos`
 
@@ -192,7 +192,7 @@ DESCRIPTION
   pack CLI into macOS .pkg
 ```
 
-_See code: [src/commands/pack/macos.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/pack/macos.ts)_
+_See code: [src/commands/pack/macos.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/pack/macos.ts)_
 
 ## `oclif pack:tarballs`
 
@@ -214,7 +214,7 @@ DESCRIPTION
   This can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.
 ```
 
-_See code: [src/commands/pack/tarballs.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/pack/tarballs.ts)_
+_See code: [src/commands/pack/tarballs.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/pack/tarballs.ts)_
 
 ## `oclif pack:win`
 
@@ -234,7 +234,7 @@ DESCRIPTION
   be set in the environment
 ```
 
-_See code: [src/commands/pack/win.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/pack/win.ts)_
+_See code: [src/commands/pack/win.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/pack/win.ts)_
 
 ## `oclif promote`
 
@@ -263,7 +263,7 @@ DESCRIPTION
   promote CLI builds to a S3 release channel
 ```
 
-_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/promote.ts)_
+_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/promote.ts)_
 
 ## `oclif readme`
 
@@ -293,7 +293,7 @@ DESCRIPTION
   Customize the code URL prefix by setting oclif.repositoryPrefix in package.json.
 ```
 
-_See code: [src/commands/readme.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/readme.ts)_
+_See code: [src/commands/readme.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/readme.ts)_
 
 ## `oclif upload:deb`
 
@@ -310,7 +310,7 @@ DESCRIPTION
   upload deb package built with pack:deb
 ```
 
-_See code: [src/commands/upload/deb.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/upload/deb.ts)_
+_See code: [src/commands/upload/deb.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/upload/deb.ts)_
 
 ## `oclif upload:macos`
 
@@ -327,7 +327,7 @@ DESCRIPTION
   upload macos installers built with pack:macos
 ```
 
-_See code: [src/commands/upload/macos.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/upload/macos.ts)_
+_See code: [src/commands/upload/macos.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/upload/macos.ts)_
 
 ## `oclif upload:tarballs`
 
@@ -349,7 +349,7 @@ DESCRIPTION
   "aws-sdk" will need to be installed as a devDependency to upload.
 ```
 
-_See code: [src/commands/upload/tarballs.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/upload/tarballs.ts)_
+_See code: [src/commands/upload/tarballs.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/upload/tarballs.ts)_
 
 ## `oclif upload:win`
 
@@ -366,7 +366,7 @@ DESCRIPTION
   upload windows installers built with pack:win
 ```
 
-_See code: [src/commands/upload/win.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.0/src/commands/upload/win.ts)_
+_See code: [src/commands/upload/win.ts](https://github.com/oclif/oclif/blob/v2.0.0-dev.1/src/commands/upload/win.ts)_
 <!-- commandsstop -->
 
 # 🏭 Related Repositories

package/lib/commands/pack/macos.js

@@ -107,7 +107,7 @@ class PackMacos extends core_1.Command {
         const macos = c.macos;
         const packageIdentifier = macos.identifier;
         await Tarballs.build(buildConfig, { platform: 'darwin', pack: false });
-        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha });
+        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha });
         const dist = buildConfig.dist(`macos/${templateKey}`);
         await qq.emptyDir(path.dirname(dist));
         const scriptsDir = qq.join(buildConfig.tmp, 'macos/scripts');
@@ -125,7 +125,7 @@ class PackMacos extends core_1.Command {
         const args = [
             '--root', rootDir,
             '--identifier', packageIdentifier,
-            '--version', buildConfig.version,
+            '--version', config.version,
             '--install-location', `/usr/local/lib/${config.dirname}`,
             '--scripts', scriptsDir,
         ];

package/lib/commands/pack/win.js

@@ -214,7 +214,7 @@ class PackWin extends core_1.Command {
             await qq.mv(buildConfig.workspace({ platform: 'win32', arch }), [installerBase, 'client']);
             // eslint-disable-next-line no-await-in-loop
             await qq.x(`makensis ${installerBase}/${config.bin}.nsi | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
-            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const o = buildConfig.dist(`win32/${templateKey}`);
             // eslint-disable-next-line no-await-in-loop
             await qq.mv([installerBase, 'installer.exe'], o);

package/lib/commands/upload/macos.js

@@ -10,13 +10,13 @@ class UploadMacos extends core_1.Command {
     async run() {
         const { flags } = await this.parse(UploadMacos);
         const buildConfig = await Tarballs.buildConfig(flags.root);
-        const { s3Config, version, config, dist } = buildConfig;
+        const { s3Config, config, dist } = buildConfig;
         const S3Options = {
             Bucket: s3Config.bucket,
             ACL: s3Config.acl || 'public-read',
         };
-        const cloudKeyBase = (0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config);
-        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version, sha: buildConfig.gitSha });
+        const cloudKeyBase = (0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config);
+        const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha });
         const cloudKey = `${cloudKeyBase}/${templateKey}`;
         const localPkg = dist(`macos/${templateKey}`);
         if (await qq.exists(localPkg))
@@ -25,7 +25,7 @@ class UploadMacos extends core_1.Command {
             this.error('Cannot find macOS pkg', {
                 suggestions: ['Run "oclif-dev pack:macos" before uploading'],
             });
-        (0, log_1.log)(`done uploading macos pkg for v${version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading macos pkg for v${config.version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadMacos;

package/lib/commands/upload/tarballs.js

@@ -13,7 +13,7 @@ class UploadTarballs extends core_1.Command {
             throw new Error('upload does not function on windows');
         const targets = flags.targets.split(',');
         const buildConfig = await Tarballs.buildConfig(flags.root, { targets, xz: flags.xz });
-        const { s3Config, dist, version, config, xz } = buildConfig;
+        const { s3Config, dist, config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
             const tarball = dist((0, upload_util_1.templateShortKey)('versioned', Object.assign({ ext: '.tar.gz', bin: config.bin, version: config.version, sha: buildConfig.gitSha }, target)));
@@ -37,7 +37,7 @@ class UploadTarballs extends core_1.Command {
                     sha: buildConfig.gitSha,
                     version: config.version,
                 });
-                const cloudKey = `${(0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config)}/${localKey}`;
+                const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${localKey}`;
                 await aws_1.default.s3.uploadFile(dist(localKey), Object.assign(Object.assign({}, TarballS3Options), { ContentType: 'application/gzip', Key: cloudKey }));
             };
             await releaseTarballs('.tar.gz');
@@ -51,7 +51,7 @@ class UploadTarballs extends core_1.Command {
                 sha: buildConfig.gitSha,
                 version: config.version,
             });
-            const cloudKey = `${(0, upload_util_1.commitAWSDir)(version, buildConfig.gitSha, s3Config)}/${manifest}`;
+            const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${manifest}`;
             await aws_1.default.s3.uploadFile(dist(manifest), Object.assign(Object.assign({}, ManifestS3Options), { Key: cloudKey }));
         };
         if (targets.length > 0)

package/lib/commands/upload/win.js

@@ -10,14 +10,14 @@ class UploadWin extends core_1.Command {
     async run() {
         const { flags } = await this.parse(UploadWin);
         const buildConfig = await Tarballs.buildConfig(flags.root);
-        const { s3Config, version, config, dist } = buildConfig;
+        const { s3Config, config, dist } = buildConfig;
         const S3Options = {
             Bucket: s3Config.bucket,
             ACL: s3Config.acl || 'public-read',
         };
         const archs = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
         for (const arch of archs) {
-            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const localKey = dist(`win32/${templateKey}`);
             // eslint-disable-next-line no-await-in-loop
             if (!await qq.exists(localKey))
@@ -27,7 +27,7 @@ class UploadWin extends core_1.Command {
         }
         const cloudKeyBase = (0, upload_util_1.commitAWSDir)(config.pjson.version, buildConfig.gitSha, s3Config);
         const uploadWin = async (arch) => {
-            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: buildConfig.version, sha: buildConfig.gitSha, arch });
+            const templateKey = (0, upload_util_1.templateShortKey)('win32', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
             const localExe = dist(`win32/${templateKey}`);
             const cloudKey = `${cloudKeyBase}/${templateKey}`;
             if (await qq.exists(localExe))
@@ -35,7 +35,7 @@ class UploadWin extends core_1.Command {
         };
         await uploadWin('x64');
         await uploadWin('x86');
-        (0, log_1.log)(`done uploading windows executables for v${version}-${buildConfig.gitSha}`);
+        (0, log_1.log)(`done uploading windows executables for v${config.version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadWin;

package/lib/tarballs/build.js

@@ -40,7 +40,7 @@ async function build(c, options = {}) {
     const updatePJSON = async () => {
         qq.cd(c.workspace());
         const pjson = await qq.readJSON('package.json');
-        pjson.version = c.version;
+        pjson.version = config.version;
         pjson.oclif.update = pjson.oclif.update || {};
         pjson.oclif.update.s3 = pjson.oclif.update.s3 || {};
         pjson.oclif.update.s3.bucket = c.s3Config.bucket;
@@ -110,11 +110,11 @@ async function build(c, options = {}) {
         if (!c.updateConfig.s3.host)
             return;
         const rollout = (typeof c.updateConfig.autoupdate === 'object' && c.updateConfig.autoupdate.rollout);
-        const gzCloudKey = `${(0, upload_util_1.commitAWSDir)(c.version, c.gitSha, c.updateConfig.s3)}/${gzLocalKey}`;
-        const xzCloudKey = `${(0, upload_util_1.commitAWSDir)(c.version, c.gitSha, c.updateConfig.s3)}/${xzLocalKey}`;
+        const gzCloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, c.gitSha, c.updateConfig.s3)}/${gzLocalKey}`;
+        const xzCloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, c.gitSha, c.updateConfig.s3)}/${xzLocalKey}`;
         const manifest = {
             rollout: rollout === false ? undefined : rollout,
-            version: c.version,
+            version: config.version,
             sha: c.gitSha,
             baseDir: (0, upload_util_1.templateShortKey)('baseDir', target, { bin: c.config.bin }),
             gz: config.s3Url(gzCloudKey),

package/lib/tarballs/config.d.ts

@@ -5,7 +5,6 @@ export interface BuildConfig {
     gitSha: string;
     config: Interfaces.Config;
     nodeVersion: string;
-    version: string;
     tmp: string;
     updateConfig: BuildConfig['config']['pjson']['oclif']['update'];
     s3Config: BuildConfig['updateConfig']['s3'] & {

package/lib/tarballs/config.js

@@ -27,7 +27,6 @@ async function buildConfig(root, options = {}) {
     const config = await core_1.Config.load({ root: path.resolve(root), devPlugins: false, userPlugins: false });
     root = config.root;
     const _gitSha = await gitSha(root, { short: true });
-    const version = config.version.includes('-') ? `${config.version}.${_gitSha}` : config.version;
     // eslint-disable-next-line new-cap
     const tmp = await Tmp(config);
     const updateConfig = config.pjson.oclif.update || {};
@@ -38,7 +37,6 @@ async function buildConfig(root, options = {}) {
         config,
         tmp,
         updateConfig,
-        version,
         xz: typeof options.xz === 'boolean' ? options.xz : Boolean(updateConfig.s3.xz),
         dist: (...args) => path.join(config.root, 'dist', ...args),
         s3Config: updateConfig.s3,

package/lib/upload-util.js

@@ -49,7 +49,7 @@ function debArch(arch) {
 }
 exports.debArch = debArch;
 function debVersion(buildConfig) {
-    return `${buildConfig.version.split('-')[0]}.${buildConfig.gitSha}-1`;
+    return `${buildConfig.config.version.split('-')[0]}.${buildConfig.gitSha}-1`;
     // see debian_revision: https://www.debian.org/doc/debian-policy/ch-controlfields.html
 }
 exports.debVersion = debVersion;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "2.0.0-dev.0",
+  "version": "2.0.0-dev.1",
   "author": "Jeff Dickey @jdxcode",
   "bin": {
     "oclif": "bin/run"
@@ -123,8 +123,8 @@
     "postpack": "shx rm .oclif.manifest.json",
     "posttest": "yarn run lint",
     "prepack": "shx rm -rf lib && tsc && bin/dev manifest .",
-    "version": "bin/dev readme && git add README.md",
-    "test": "nps test"
+    "test": "nps test",
+    "version": "bin/dev readme && git add README.md"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org"