oclif 2.4.5 → 2.6.1-dev.0

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.4.5","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},"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":[]},"generate:command":{"id":"generate:command","description":"add a command to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"generate:hook":{"id":"generate:hook","description":"add a hook to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","multiple":false,"default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"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":"."},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"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},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"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},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true},"tarball":{"name":"tarball","type":"option","char":"l","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"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},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"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},"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.6.1-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},"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":[]},"generate:command":{"id":"generate:command","description":"add a command to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false}},"args":[{"name":"name","description":"name of command","required":true}]},"generate:hook":{"id":"generate:hook","description":"add a hook to an existing CLI or plugin","strict":true,"pluginName":"oclif","pluginAlias":"oclif","pluginType":"core","aliases":[],"flags":{"force":{"name":"force","type":"boolean","description":"overwrite existing files","allowNo":false},"event":{"name":"event","type":"option","description":"event to run hook on","multiple":false,"default":"init"}},"args":[{"name":"name","description":"name of hook (snake_case)","required":true}]},"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":"."},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"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},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"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},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true},"tarball":{"name":"tarball","type":"option","char":"l","description":"optionally specify a path to a tarball already generated by NPM","required":false,"multiple":false}},"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},"tarball":{"name":"tarball","type":"option","char":"t","description":"optionally specify a path to a tarball already generated by NPM","required":false,"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},"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,6 +2,34 @@
 
 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.6.1-dev.0](https://github.com/oclif/oclif/compare/v2.6.0...v2.6.1-dev.0) (2022-03-15)
+
+
+### Features
+
+* Add support to build darwin-arm64 for `oclif pack macos` ([17a123b](https://github.com/oclif/oclif/commit/17a123b102d5ba83fbcbf234819fc6bdba05e45b))
+
+
+### Bug Fixes
+
+* Add arch to macos pkg file ([8deb680](https://github.com/oclif/oclif/commit/8deb680c250536c2c3334b1e44ef7e10fd9f377c))
+* pass arch to all places where macos manifest are being used ([cc45ede](https://github.com/oclif/oclif/commit/cc45edee81add1fe29e0acf5955330b36105c896))
+* update integration tests to run against correct version of node ([228d9d1](https://github.com/oclif/oclif/commit/228d9d17dd39e12067435ac28227accfec055c35))
+
+## [2.6.0](https://github.com/oclif/oclif/compare/v2.5.0...v2.6.0) (2022-03-14)
+
+
+### Features
+
+* Add support to build darwin-arm64 for `oclif pack macos` ([#847](https://github.com/oclif/oclif/issues/847)) ([61a96c2](https://github.com/oclif/oclif/commit/61a96c2a1c435f5abce8c2348cf7756a4b997269))
+
+## [2.5.0](https://github.com/oclif/oclif/compare/v2.4.5...v2.5.0) (2022-02-24)
+
+
+### Features
+
+* remove all relevant directories on uninstall ([#831](https://github.com/oclif/oclif/issues/831)) ([acd986d](https://github.com/oclif/oclif/commit/acd986d53681b3840f17220b6e16fd8bb3c869f7))
+
 ### [2.4.5](https://github.com/oclif/oclif/compare/v2.4.4...v2.4.5) (2022-02-17)
 
 ### [2.4.4](https://github.com/oclif/oclif/compare/v2.4.3...v2.4.4) (2022-02-09)

package/README.md

@@ -146,7 +146,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.4.4/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v2.6.1-dev.0/src/commands/generate.ts)_
 
 ## `oclif generate command NAME`
 
@@ -220,7 +220,7 @@ DESCRIPTION
   generates plugin manifest json
 ```
 
-_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.4.4/src/commands/manifest.ts)_
+_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.6.1-dev.0/src/commands/manifest.ts)_
 
 ## `oclif pack deb`
 
@@ -319,7 +319,7 @@ DESCRIPTION
   promote CLI builds to a S3 release channel
 ```
 
-_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.4.4/src/commands/promote.ts)_
+_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.6.1-dev.0/src/commands/promote.ts)_
 
 ## `oclif readme`
 
@@ -349,7 +349,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.4.4/src/commands/readme.ts)_
+_See code: [src/commands/readme.ts](https://github.com/oclif/oclif/blob/v2.6.1-dev.0/src/commands/readme.ts)_
 
 ## `oclif upload deb`
 

package/lib/commands/pack/macos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const path = require("path");
+const _ = require("lodash");
 const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
@@ -80,6 +80,16 @@ fi
 
 #remove application source distribution
 [ -e "/usr/local/lib/${config.dirname}" ] && rm -rf "/usr/local/lib/${config.dirname}"
+
+#remove application data directory
+[ -e "${config.dataDir}" ] && rm -rf "${config.dataDir}"
+
+#remove application cache directory
+[ -e "${config.cacheDir}" ] && rm -rf "${config.cacheDir}"
+
+#remove application config directory
+[ -e "${config.configDir}" ] && rm -rf "${config.configDir}"
+
 if [ $? -eq 0 ]
 then
   echo "[3/3] [DONE] Successfully deleted application"
@@ -107,45 +117,65 @@ class PackMacos extends core_1.Command {
         const macos = c.macos;
         const packageIdentifier = macos.identifier;
         await Tarballs.build(buildConfig, { platform: 'darwin', pack: false, tarball: flags.tarball });
-        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');
-        const rootDir = buildConfig.workspace({ platform: 'darwin', arch: 'x64' });
-        const writeScript = async (script) => {
-            const path = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
-            path.push(script);
-            await qq.write(path, scripts[script](config, flags['additional-cli']));
-            await qq.chmod(path, 0o755);
+        await qq.emptyDir(buildConfig.dist('macos'));
+        const build = async (arch) => {
+            const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
+            const dist = buildConfig.dist(`macos/${templateKey}`);
+            const rootDir = buildConfig.workspace({ platform: 'darwin', arch });
+            const writeScript = async (script) => {
+                const path = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
+                path.push(script);
+                await qq.write(path, scripts[script](config, flags['additional-cli']));
+                await qq.chmod(path, 0o755);
+            };
+            await writeScript('preinstall');
+            await writeScript('postinstall');
+            await writeScript('uninstall');
+            /* eslint-disable array-element-newline */
+            const args = [
+                '--root', rootDir,
+                '--identifier', packageIdentifier,
+                '--version', config.version,
+                '--install-location', `/usr/local/lib/${config.dirname}`,
+                '--scripts', scriptsDir,
+            ];
+            /* eslint-enable array-element-newline */
+            if (macos.sign) {
+                args.push('--sign', macos.sign);
+            }
+            else
+                this.debug('Skipping macOS pkg signing');
+            if (process.env.OSX_KEYCHAIN)
+                args.push('--keychain', process.env.OSX_KEYCHAIN);
+            args.push(dist);
+            await qq.x('pkgbuild', args);
         };
-        await writeScript('preinstall');
-        await writeScript('postinstall');
-        await writeScript('uninstall');
-        /* eslint-disable array-element-newline */
-        const args = [
-            '--root', rootDir,
-            '--identifier', packageIdentifier,
-            '--version', config.version,
-            '--install-location', `/usr/local/lib/${config.dirname}`,
-            '--scripts', scriptsDir,
-        ];
-        /* eslint-enable array-element-newline */
-        if (macos.sign) {
-            args.push('--sign', macos.sign);
-        }
-        else
-            this.debug('Skipping macOS pkg signing');
-        if (process.env.OSX_KEYCHAIN)
-            args.push('--keychain', process.env.OSX_KEYCHAIN);
-        args.push(dist);
-        await qq.x('pkgbuild', args);
+        const arches = _.uniq(buildConfig.targets
+            .filter(t => t.platform === 'darwin')
+            .map(t => t.arch));
+        // eslint-disable-next-line no-await-in-loop
+        for (const a of arches)
+            await build(a);
     }
 }
 exports.default = PackMacos;
 PackMacos.description = 'pack CLI into macOS .pkg';
 PackMacos.flags = {
-    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    'additional-cli': core_1.Flags.string({ description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
-the 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 }),
-    tarball: core_1.Flags.string({ char: 't', description: 'optionally specify a path to a tarball already generated by NPM', required: false }),
+    root: core_1.Flags.string({
+        char: 'r',
+        description: 'path to oclif CLI root',
+        default: '.',
+        required: true,
+    }),
+    'additional-cli': core_1.Flags.string({
+        description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
+the 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,
+    }),
+    tarball: core_1.Flags.string({
+        char: 't',
+        description: 'optionally specify a path to a tarball already generated by NPM',
+        required: false,
+    }),
 };

package/lib/commands/pack/win.js

@@ -267,8 +267,20 @@ PackWin.description = `create windows installer from oclif CLI
 
   This command requires WINDOWS_SIGNING (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) to be set in the environment`;
 PackWin.flags = {
-    root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    'additional-cli': core_1.Flags.string({ description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
-the 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 }),
-    tarball: core_1.Flags.string({ char: 't', description: 'optionally specify a path to a tarball already generated by NPM', required: false }),
+    root: core_1.Flags.string({
+        char: 'r',
+        description: 'path to oclif CLI root',
+        default: '.',
+        required: true,
+    }),
+    'additional-cli': core_1.Flags.string({
+        description: `an Oclif CLI other than the one listed in config.bin that should be made available to the user
+the 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,
+    }),
+    tarball: core_1.Flags.string({
+        char: 't',
+        description: 'optionally specify a path to a tarball already generated by NPM',
+        required: false,
+    }),
 };

package/lib/commands/promote.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
 const path = require("path");
+const _ = require("lodash");
+const core_1 = require("@oclif/core");
 const aws_1 = require("../aws");
 const Tarballs = require("../tarballs");
 const upload_util_1 = require("../upload-util");
@@ -94,21 +95,26 @@ class Promote extends core_1.Command {
         }
         // copy darwin pkg
         if (flags.macos) {
-            this.log(`Promoting macos pkg to ${flags.channel}`);
-            const darwinPkg = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: flags.version, sha: flags.sha });
-            const darwinCopySource = cloudBucketCommitKey(darwinPkg);
-            // strip version & sha so scripts can point to a static channel pkg
-            const unversionedPkg = darwinPkg.replace(`-v${flags.version}-${flags.sha}`, '');
-            const darwinKey = cloudChannelKey(unversionedPkg);
-            await aws_1.default.s3.copyObject({
-                Bucket: s3Config.bucket,
-                CopySource: darwinCopySource,
-                Key: darwinKey,
-                CacheControl: maxAge,
-                MetadataDirective: 'REPLACE',
-            });
-            if (flags.indexes)
-                await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
+            this.log(`Promoting macos pkgs to ${flags.channel}`);
+            const arches = _.uniq(buildConfig.targets.filter(t => t.platform === 'darwin').map(t => t.arch));
+            for (const arch of arches) {
+                const darwinPkg = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: flags.version, sha: flags.sha, arch });
+                const darwinCopySource = cloudBucketCommitKey(darwinPkg);
+                // strip version & sha so scripts can point to a static channel pkg
+                const unversionedPkg = darwinPkg.replace(`-v${flags.version}-${flags.sha}`, '');
+                const darwinKey = cloudChannelKey(unversionedPkg);
+                // eslint-disable-next-line no-await-in-loop
+                await aws_1.default.s3.copyObject({
+                    Bucket: s3Config.bucket,
+                    CopySource: darwinCopySource,
+                    Key: darwinKey,
+                    CacheControl: maxAge,
+                    MetadataDirective: 'REPLACE',
+                });
+                // eslint-disable-next-line no-await-in-loop
+                if (flags.indexes)
+                    await (0, version_indexes_1.appendToIndex)(Object.assign(Object.assign({}, indexDefaults), { originalUrl: darwinCopySource, filename: unversionedPkg }));
+            }
         }
         // copy win exe
         if (flags.win) {

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

@@ -1,8 +1,8 @@
-import { Command } from '@oclif/core';
+import { Command, Interfaces } from '@oclif/core';
 export default class UploadMacos extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        root: Interfaces.OptionFlag<string>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/macos.js

@@ -1,7 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const core_1 = require("@oclif/core");
+const _ = require("lodash");
 const qq = require("qqjs");
+const core_1 = require("@oclif/core");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");
@@ -16,16 +17,24 @@ class UploadMacos extends core_1.Command {
             ACL: s3Config.acl || 'public-read',
         };
         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))
-            await aws_1.default.s3.uploadFile(localPkg, Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
-        else
-            this.error('Cannot find macOS pkg', {
-                suggestions: ['Run "oclif pack macos" before uploading'],
-            });
-        (0, log_1.log)(`done uploading macos pkg for v${config.version}-${buildConfig.gitSha}`);
+        const upload = async (arch) => {
+            const templateKey = (0, upload_util_1.templateShortKey)('macos', { bin: config.bin, version: config.version, sha: buildConfig.gitSha, arch });
+            const cloudKey = `${cloudKeyBase}/${templateKey}`;
+            const localPkg = dist(`macos/${templateKey}`);
+            if (await qq.exists(localPkg))
+                await aws_1.default.s3.uploadFile(localPkg, Object.assign(Object.assign({}, S3Options), { CacheControl: 'max-age=86400', Key: cloudKey }));
+            else
+                this.error('Cannot find macOS pkg', {
+                    suggestions: ['Run "oclif pack macos" before uploading'],
+                });
+        };
+        const arches = _.uniq(buildConfig.targets
+            .filter(t => t.platform === 'darwin')
+            .map(t => t.arch));
+        // eslint-disable-next-line no-await-in-loop
+        for (const a of arches)
+            await upload(a);
+        (0, log_1.log)(`done uploading macos pkgs for v${config.version}-${buildConfig.gitSha}`);
     }
 }
 exports.default = UploadMacos;

package/lib/upload-util.js

@@ -33,7 +33,7 @@ options = { root: '.' }) {
         unversioned: '<%- bin %>-<%- platform %>-<%- arch %><%- ext %>',
         versioned: '<%- bin %>-v<%- version %>-<%- sha %>-<%- platform %>-<%- arch %><%- ext %>',
         manifest: '<%- bin %>-v<%- version %>-<%- sha %>-<%- platform %>-<%- arch %>-buildmanifest',
-        macos: '<%- bin %>-v<%- version %>-<%- sha %>.pkg',
+        macos: '<%- bin %>-v<%- version %>-<%- sha %>-<%- arch %>.pkg',
         win32: '<%- bin %>-v<%- version %>-<%- sha %>-<%- arch %>.exe',
         deb: '<%- bin %>_<%- versionShaRevision %>_<%- arch %>.deb',
     };

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "2.4.5",
+  "version": "2.6.1-dev.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"