oclif 2.4.4 → 2.6.0

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.4.4","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,darwin-arm64"},"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,"default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64,darwin-arm64"},"xz":{"name":"xz","type":"boolean","description":"also build xz","allowNo":true},"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: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,"default":"linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64,darwin-arm64"},"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.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,22 @@
 
 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.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.3/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v2.5.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.3/src/commands/manifest.ts)_
+_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.5.0/src/commands/manifest.ts)_
 
 ## `oclif pack deb`
 
@@ -260,13 +260,12 @@ packages oclif CLI into tarballs
 
 ```
 USAGE
-  $ oclif pack tarballs -r <value> [-t <value>] [--xz] [-t <value>]
+  $ oclif pack tarballs -r <value> [-t <value>] [--xz] [-l <value>]
 
 FLAGS
+  -l, --tarball=<value>  optionally specify a path to a tarball already generated by NPM
   -r, --root=<value>     (required) [default: .] path to oclif CLI root
-  -t, --tarball=<value>  optionally specify a path to a tarball already generated by NPM
-  -t, --targets=<value>  [default: linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64,darwin-arm64] comma-separated
-                         targets to pack (e.g.: linux-arm,win32-x64)
+  -t, --targets=<value>  comma-separated targets to pack (e.g.: linux-arm,win32-x64)
   --[no-]xz              also build xz
 
 DESCRIPTION
@@ -308,8 +307,7 @@ FLAGS
   -d, --deb              promote debian artifacts
   -m, --macos            promote macOS pkg
   -r, --root=<value>     (required) [default: .] path to the oclif CLI project root
-  -t, --targets=<value>  [default: linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64,darwin-arm64] comma-separated
-                         targets to promote (e.g.: linux-arm,win32-x64)
+  -t, --targets=<value>  comma-separated targets to promote (e.g.: linux-arm,win32-x64)
   -w, --win              promote Windows exe
   --channel=<value>      (required) [default: stable] which channel to promote to
   --indexes              append the promoted urls into the index files
@@ -321,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.3/src/commands/promote.ts)_
+_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.5.0/src/commands/promote.ts)_
 
 ## `oclif readme`
 
@@ -351,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.3/src/commands/readme.ts)_
+_See code: [src/commands/readme.ts](https://github.com/oclif/oclif/blob/v2.5.0/src/commands/readme.ts)_
 
 ## `oclif upload deb`
 
@@ -393,8 +391,7 @@ USAGE
 
 FLAGS
   -r, --root=<value>     (required) [default: .] path to oclif CLI root
-  -t, --targets=<value>  [default: linux-x64,linux-arm,win32-x64,win32-x86,darwin-x64,darwin-arm64] comma-separated
-                         targets to upload (e.g.: linux-arm,win32-x64)
+  -t, --targets=<value>  comma-separated targets to upload (e.g.: linux-arm,win32-x64)
   --[no-]xz              also upload xz
 
 DESCRIPTION

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 });
+            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/tarballs.d.ts

@@ -3,7 +3,7 @@ export default class PackTarballs extends Command {
     static description: string;
     static flags: {
         root: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         tarball: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };

package/lib/commands/pack/tarballs.js

@@ -5,12 +5,12 @@ const qq = require("qqjs");
 const Tarballs = require("../../tarballs");
 class PackTarballs extends core_1.Command {
     async run() {
+        var _a;
         const prevCwd = qq.cwd();
         if (process.platform === 'win32')
             throw new Error('pack does not function on windows');
         const { flags } = await this.parse(PackTarballs);
-        const targets = flags.targets.split(',');
-        const buildConfig = await Tarballs.buildConfig(flags.root, { xz: flags.xz, targets: targets });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { xz: flags.xz, targets: (_a = flags === null || flags === void 0 ? void 0 : flags.targets) === null || _a === void 0 ? void 0 : _a.split(',') });
         if (buildConfig.targets.length === 0) {
             throw new Error('Please specify one or more valid targets.');
         }
@@ -27,10 +27,7 @@ This can be used to create oclif CLIs that use the system node or that come prel
 `;
 PackTarballs.flags = {
     root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    targets: core_1.Flags.string({ char: 't',
-        description: 'comma-separated targets to pack (e.g.: linux-arm,win32-x64)',
-        default: Tarballs.TARGETS.join(','),
-    }),
-    xz: core_1.Flags.boolean({ description: 'also build xz', allowNo: true, default: true }),
-    tarball: core_1.Flags.string({ char: 't', description: 'optionally specify a path to a tarball already generated by NPM', required: false }),
+    targets: core_1.Flags.string({ char: 't', description: 'comma-separated targets to pack (e.g.: linux-arm,win32-x64)' }),
+    xz: core_1.Flags.boolean({ description: 'also build xz', allowNo: true }),
+    tarball: core_1.Flags.string({ char: 'l', 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.d.ts

@@ -6,7 +6,7 @@ export default class Promote extends Command {
         version: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         sha: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         channel: import("@oclif/core/lib/interfaces").OptionFlag<string>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string>;
+        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         deb: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         macos: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         win: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;

package/lib/commands/promote.js

@@ -8,10 +8,10 @@ const upload_util_1 = require("../upload-util");
 const version_indexes_1 = require("../version-indexes");
 class Promote extends core_1.Command {
     async run() {
+        var _a;
         const { flags } = await this.parse(Promote);
         const maxAge = `max-age=${flags['max-age']}`;
-        const targets = flags.targets.split(',');
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: (_a = flags === null || flags === void 0 ? void 0 : flags.targets) === null || _a === void 0 ? void 0 : _a.split(',') });
         const { s3Config, config } = buildConfig;
         const indexDefaults = {
             version: flags.version,
@@ -168,15 +168,11 @@ Promote.flags = {
     version: core_1.Flags.string({ description: 'semantic version of the CLI to promote', required: true }),
     sha: core_1.Flags.string({ description: '7-digit short git commit SHA of the CLI to promote', required: true }),
     channel: core_1.Flags.string({ description: 'which channel to promote to', required: true, default: 'stable' }),
-    targets: core_1.Flags.string({
-        char: 't',
-        description: 'comma-separated targets to promote (e.g.: linux-arm,win32-x64)',
-        default: Tarballs.TARGETS.join(','),
-    }),
+    targets: core_1.Flags.string({ char: 't', description: 'comma-separated targets to promote (e.g.: linux-arm,win32-x64)' }),
     deb: core_1.Flags.boolean({ char: 'd', description: 'promote debian artifacts' }),
     macos: core_1.Flags.boolean({ char: 'm', description: 'promote macOS pkg' }),
     win: core_1.Flags.boolean({ char: 'w', description: 'promote Windows exe' }),
     'max-age': core_1.Flags.string({ char: 'a', description: 'cache control max-age in seconds', default: '86400' }),
-    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
+    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true }),
     indexes: core_1.Flags.boolean({ description: 'append the promoted urls into the index files' }),
 };

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

@@ -4,7 +4,7 @@ export default class UploadTarballs extends Command {
     static description: string;
     static flags: {
         root: Interfaces.OptionFlag<string>;
-        targets: Interfaces.OptionFlag<string>;
+        targets: Interfaces.OptionFlag<string | undefined>;
         xz: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<void>;

package/lib/commands/upload/tarballs.js

@@ -8,11 +8,11 @@ const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
 class UploadTarballs extends core_1.Command {
     async run() {
+        var _a;
         const { flags } = await this.parse(UploadTarballs);
         if (process.platform === 'win32')
             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 buildConfig = await Tarballs.buildConfig(flags.root, { xz: flags.xz, targets: (_a = flags === null || flags === void 0 ? void 0 : flags.targets) === null || _a === void 0 ? void 0 : _a.split(',') });
         const { s3Config, dist, config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {
@@ -58,7 +58,7 @@ class UploadTarballs extends core_1.Command {
             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)
+        if (buildConfig.targets.length > 0)
             (0, log_1.log)('uploading targets');
         // eslint-disable-next-line no-await-in-loop
         for (const target of buildConfig.targets)
@@ -73,10 +73,6 @@ UploadTarballs.description = `upload an oclif CLI to S3
 `;
 UploadTarballs.flags = {
     root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: true }),
-    targets: core_1.Flags.string({
-        char: 't',
-        description: 'comma-separated targets to upload (e.g.: linux-arm,win32-x64)',
-        default: Tarballs.TARGETS.join(','),
-    }),
-    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true, default: true }),
+    targets: core_1.Flags.string({ char: 't', description: 'comma-separated targets to upload (e.g.: linux-arm,win32-x64)' }),
+    xz: core_1.Flags.boolean({ description: 'also upload xz', allowNo: true }),
 };

package/lib/tarballs/config.js

@@ -26,6 +26,7 @@ async function Tmp(config) {
     return tmp;
 }
 async function buildConfig(root, options = {}) {
+    var _a, _b, _c;
     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 });
@@ -52,7 +53,7 @@ async function buildConfig(root, options = {}) {
         config,
         tmp,
         updateConfig,
-        xz: typeof options.xz === 'boolean' ? options.xz : Boolean(updateConfig.s3.xz),
+        xz: (_c = (_a = options === null || options === void 0 ? void 0 : options.xz) !== null && _a !== void 0 ? _a : (_b = updateConfig === null || updateConfig === void 0 ? void 0 : updateConfig.s3) === null || _b === void 0 ? void 0 : _b.xz) !== null && _c !== void 0 ? _c : true,
         dist: (...args) => path.join(config.root, 'dist', ...args),
         s3Config: updateConfig.s3,
         nodeVersion,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "2.4.4",
+  "version": "2.6.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"