oclif 2.1.5 → 2.2.0

package/.oclif.manifest.json

@@ -1 +1 @@
-{"version":"2.1.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,"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":"."}},"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,darwin-arm64"},"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,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.2.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,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":[]}}}

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.2.0](https://github.com/oclif/oclif/compare/v2.1.8...v2.2.0) (2022-01-13)
+
+
+### Features
+
+* optionally include tarball path as input ([#764](https://github.com/oclif/oclif/issues/764)) ([#796](https://github.com/oclif/oclif/issues/796)) ([ee6ff99](https://github.com/oclif/oclif/commit/ee6ff99ad5e11cb1abe1de17791a8b987833e381))
+
+### [2.1.8](https://github.com/oclif/oclif/compare/v2.1.7...v2.1.8) (2022-01-12)
+
+
+### Bug Fixes
+
+* remove unnecessary dependency ([#794](https://github.com/oclif/oclif/issues/794)) ([f814f00](https://github.com/oclif/oclif/commit/f814f009b9b203c8917e265c16015a08af911537))
+
+### [2.1.7](https://github.com/oclif/oclif/compare/v2.1.6...v2.1.7) (2022-01-11)
+
+
+### Bug Fixes
+
+* correct package name ([#792](https://github.com/oclif/oclif/issues/792)) ([7197f98](https://github.com/oclif/oclif/commit/7197f98233d4391e4f322d16ff4a0cc92f7a4a6f))
+
+### [2.1.6](https://github.com/oclif/oclif/compare/v2.1.5...v2.1.6) (2022-01-11)
+
+
+### Bug Fixes
+
+* remove fixpack dependency ([#791](https://github.com/oclif/oclif/issues/791)) ([823300e](https://github.com/oclif/oclif/commit/823300e103bac560fd1e9e8748b33be59a80b066))
+
 ### [2.1.5](https://github.com/oclif/oclif/compare/v2.1.4...v2.1.5) (2022-01-10)
 
 ### [2.1.4](https://github.com/oclif/oclif/compare/v2.1.3...v2.1.4) (2022-01-10)

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.1.4/src/commands/generate.ts)_
+_See code: [src/commands/generate.ts](https://github.com/oclif/oclif/blob/v2.1.8/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.1.4/src/commands/manifest.ts)_
+_See code: [src/commands/manifest.ts](https://github.com/oclif/oclif/blob/v2.1.8/src/commands/manifest.ts)_
 
 ## `oclif pack deb`
 
@@ -228,10 +228,11 @@ pack CLI into debian package
 
 ```
 USAGE
-  $ oclif pack deb -r <value>
+  $ oclif pack deb -r <value> [-t <value>]
 
 FLAGS
-  -r, --root=<value>  (required) [default: .] path to oclif CLI root
+  -r, --root=<value>     (required) [default: .] path to oclif CLI root
+  -t, --tarball=<value>  optionally specify a path to a tarball already generated by NPM
 
 DESCRIPTION
   pack CLI into debian package
@@ -243,10 +244,11 @@ pack CLI into macOS .pkg
 
 ```
 USAGE
-  $ oclif pack macos -r <value>
+  $ oclif pack macos -r <value> [-t <value>]
 
 FLAGS
-  -r, --root=<value>  (required) [default: .] path to oclif CLI root
+  -r, --root=<value>     (required) [default: .] path to oclif CLI root
+  -t, --tarball=<value>  optionally specify a path to a tarball already generated by NPM
 
 DESCRIPTION
   pack CLI into macOS .pkg
@@ -258,10 +260,11 @@ packages oclif CLI into tarballs
 
 ```
 USAGE
-  $ oclif pack tarballs -r <value> [-t <value>] [--xz]
+  $ oclif pack tarballs -r <value> [-t <value>] [--xz] [-t <value>]
 
 FLAGS
   -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)
   --[no-]xz              also build xz
@@ -278,10 +281,11 @@ create windows installer from oclif CLI
 
 ```
 USAGE
-  $ oclif pack win -r <value>
+  $ oclif pack win -r <value> [-t <value>]
 
 FLAGS
-  -r, --root=<value>  (required) [default: .] path to oclif CLI root
+  -r, --root=<value>     (required) [default: .] path to oclif CLI root
+  -t, --tarball=<value>  optionally specify a path to a tarball already generated by NPM
 
 DESCRIPTION
   create windows installer from oclif CLI
@@ -317,7 +321,7 @@ DESCRIPTION
   promote CLI builds to a S3 release channel
 ```
 
-_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.1.4/src/commands/promote.ts)_
+_See code: [src/commands/promote.ts](https://github.com/oclif/oclif/blob/v2.1.8/src/commands/promote.ts)_
 
 ## `oclif readme`
 
@@ -347,7 +351,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.1.4/src/commands/readme.ts)_
+_See code: [src/commands/readme.ts](https://github.com/oclif/oclif/blob/v2.1.8/src/commands/readme.ts)_
 
 ## `oclif upload deb`
 

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

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

package/lib/commands/pack/deb.js

@@ -48,7 +48,7 @@ class PackDeb extends core_1.Command {
         const { flags } = await this.parse(PackDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config } = buildConfig;
-        await Tarballs.build(buildConfig, { platform: 'linux', pack: false });
+        await Tarballs.build(buildConfig, { platform: 'linux', pack: false, tarball: flags.tarball });
         const dist = buildConfig.dist('deb');
         await qq.emptyDir(dist);
         const build = async (arch) => {
@@ -92,4 +92,5 @@ exports.default = PackDeb;
 PackDeb.description = 'pack CLI into debian package';
 PackDeb.flags = {
     root: core_1.Flags.string({ char: 'r', description: 'path to oclif CLI root', default: '.', required: 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/macos.d.ts

@@ -5,6 +5,7 @@ export default class PackMacos extends Command {
     static flags: {
         root: Interfaces.OptionFlag<string>;
         'additional-cli': Interfaces.OptionFlag<string | undefined>;
+        tarball: Interfaces.OptionFlag<string | undefined>;
     };
     run(): Promise<void>;
 }

package/lib/commands/pack/macos.js

@@ -106,7 +106,7 @@ class PackMacos extends core_1.Command {
             this.error('package.json must have oclif.macos.identifier set');
         const macos = c.macos;
         const packageIdentifier = macos.identifier;
-        await Tarballs.build(buildConfig, { platform: 'darwin', pack: false });
+        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));
@@ -147,4 +147,5 @@ 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 })
 };

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

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

package/lib/commands/pack/tarballs.js

@@ -14,7 +14,9 @@ class PackTarballs extends core_1.Command {
         if (buildConfig.targets.length === 0) {
             throw new Error('Please specify one or more valid targets.');
         }
-        await Tarballs.build(buildConfig);
+        await Tarballs.build(buildConfig, {
+            tarball: flags.tarball
+        });
         qq.cd(prevCwd);
     }
 }
@@ -30,4 +32,5 @@ PackTarballs.flags = {
         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 })
 };

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

@@ -5,6 +5,7 @@ export default class PackWin extends Command {
     static flags: {
         root: Interfaces.OptionFlag<string>;
         'additional-cli': Interfaces.OptionFlag<string | undefined>;
+        tarball: Interfaces.OptionFlag<string | undefined>;
     };
     run(): Promise<void>;
     private checkForNSIS;

package/lib/commands/pack/win.js

@@ -199,7 +199,7 @@ class PackWin extends core_1.Command {
         const { flags } = await this.parse(PackWin);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config } = buildConfig;
-        await Tarballs.build(buildConfig, { platform: 'win32', pack: false });
+        await Tarballs.build(buildConfig, { platform: 'win32', pack: false, tarball: flags.tarball });
         const arches = buildConfig.targets.filter(t => t.platform === 'win32').map(t => t.arch);
         for (const arch of arches) {
             const installerBase = qq.join(buildConfig.tmp, `windows-${arch}-installer`);
@@ -270,4 +270,5 @@ 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 })
 };

package/lib/generators/cli.js

@@ -6,8 +6,6 @@ const _ = require("lodash");
 const path = require("path");
 const Generator = require("yeoman-generator");
 const yosay = require("yosay");
-const sortPjson = require('sort-pjson');
-const fixpack = require('@oclif/fixpack');
 const debug = require('debug')('generator-oclif');
 const { version } = require('../../package.json');
 const isWindows = process.platform === 'win32';
@@ -34,11 +32,12 @@ class CLI extends Generator {
         this.destinationRoot(path.resolve(this.name));
         process.chdir(this.destinationRoot());
         this.githubUser = await this.user.github.username().catch(debug);
-        this.pjson = Object.assign({ scripts: {}, engines: {}, devDependencies: {}, dependencies: {}, oclif: {} }, this.fs.readJSON('package.json', {}));
+        // establish order of properties in the resulting package.json
+        this.pjson = Object.assign({ name: '', version: '', description: '', author: '', bin: {}, homepage: '', license: '', main: '', repository: '', files: [], dependencies: {}, devDependencies: {}, oclif: {}, scripts: {}, engines: {} }, this.fs.readJSON('package.json', {}));
         let repository = this.destinationRoot().split(path.sep).slice(-2).join('/');
         if (this.githubUser)
             repository = `${this.githubUser}/${repository.split('/')[1]}`;
-        const defaults = Object.assign(Object.assign({ name: this.determineAppname().replace(/ /g, '-'), version: '0.0.0', license: 'MIT', author: this.githubUser ? `${this.user.git.name()} @${this.githubUser}` : this.user.git.name(), dependencies: {}, repository }, this.pjson), { engines: Object.assign({ node: '>=12.0.0' }, this.pjson.engines), options: this.options });
+        const defaults = Object.assign(Object.assign({}, this.pjson), { name: this.name ? this.name.replace(/ /g, '-') : this.determineAppname().replace(/ /g, '-'), version: '0.0.0', license: 'MIT', author: this.githubUser ? `${this.user.git.name()} @${this.githubUser}` : this.user.git.name(), dependencies: {}, repository, engines: Object.assign({ node: '>=12.0.0' }, this.pjson.engines), options: this.options });
         this.repository = defaults.repository;
         if (this.repository && this.repository.url) {
             this.repository = this.repository.url;
@@ -133,13 +132,10 @@ class CLI extends Generator {
         if (this.pjson.oclif && Array.isArray(this.pjson.oclif.plugins)) {
             this.pjson.oclif.plugins.sort();
         }
-        if (this.fs.exists(this.destinationPath('./package.json'))) {
-            fixpack(this.destinationPath('./package.json'), require('@oclif/fixpack/config.json'));
-        }
         if (_.isEmpty(this.pjson.oclif))
             delete this.pjson.oclif;
         this.pjson.files = _.uniq((this.pjson.files || []).sort());
-        this.fs.writeJSON(this.destinationPath('./package.json'), sortPjson(this.pjson));
+        this.fs.writeJSON(this.destinationPath('./package.json'), this.pjson);
         this.fs.write(this.destinationPath('.gitignore'), this._gitignore());
     }
     async install() {

package/lib/tarballs/build.d.ts

@@ -2,4 +2,5 @@ import { BuildConfig } from './config';
 export declare function build(c: BuildConfig, options?: {
     platform?: string;
     pack?: boolean;
+    tarball?: string;
 }): Promise<void>;

package/lib/tarballs/build.js

@@ -136,7 +136,7 @@ async function build(c, options = {}) {
         await qq.writeJSON(manifestFilepath, manifest);
     };
     (0, log_1.log)(`gathering workspace for ${config.bin} to ${c.workspace()}`);
-    await extractCLI(await packCLI());
+    await extractCLI(options.tarball ? options.tarball : await packCLI());
     await updatePJSON();
     await addDependencies();
     await (0, bin_1.writeBinScripts)({ config, baseWorkspace: c.workspace(), nodeVersion: c.nodeVersion });

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "2.1.5",
+  "version": "2.2.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
@@ -9,7 +9,6 @@
   "bugs": "https://github.com/oclif/oclif/issues",
   "dependencies": {
     "@oclif/core": "^1.0.11",
-    "@oclif/fixpack": "^2.3.1",
     "@oclif/plugin-help": "^5.1.10",
     "@oclif/plugin-not-found": "^2.2.3",
     "@oclif/plugin-warn-if-update-available": "^2.0.3",
@@ -22,10 +21,8 @@
     "lodash": "^4.17.11",
     "normalize-package-data": "^3.0.3",
     "nps-utils": "^1.7.0",
-    "oclif": "^2.1.1",
     "qqjs": "^0.3.10",
     "semver": "^7.3.5",
-    "sort-pjson": "^1.0.3",
     "tslib": "^2.3.1",
     "yeoman-environment": "^2.3.4",
     "yeoman-generator": "3",