oclif 4.20.8 → 4.21.1

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

@@ -5,6 +5,7 @@ export default class PackDeb extends Command {
         compression: Interfaces.OptionFlag<"xz" | "none" | "gzip" | "zstd" | undefined, Interfaces.CustomOptions>;
         'prune-lockfiles': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        sha: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         tarball: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };
     static summary: string;

package/lib/commands/pack/deb.js

@@ -95,6 +95,10 @@ class PackDeb extends core_1.Command {
         }),
         'prune-lockfiles': core_1.Flags.boolean({ description: 'remove lockfiles in the tarball.', exclusive: ['tarball'] }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         tarball: core_1.Flags.string({
             char: 't',
             description: 'Optionally specify a path to a tarball already generated by NPM.',
@@ -107,7 +111,7 @@ class PackDeb extends core_1.Command {
         if (process.platform !== 'linux')
             throw new Error('debian packing must be run on linux');
         const { flags } = await this.parse(PackDeb);
-        const buildConfig = await Tarballs.buildConfig(flags.root);
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha });
         const { config } = buildConfig;
         await Tarballs.build(buildConfig, {
             pack: false,

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

@@ -5,6 +5,7 @@ export default class PackMacos extends Command {
         'additional-cli': Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         'prune-lockfiles': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        sha: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         tarball: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         targets: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };

package/lib/commands/pack/macos.js

@@ -177,6 +177,10 @@ the CLI should already exist in a directory named after the CLI that is the root
             description: 'Path to oclif CLI root.',
             required: true,
         }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         tarball: core_1.Flags.string({
             char: 't',
             description: 'Optionally specify a path to a tarball already generated by NPM.',
@@ -192,7 +196,7 @@ the CLI should already exist in a directory named after the CLI that is the root
         if (process.platform !== 'darwin')
             this.error('must be run from macos');
         const { flags } = await this.parse(PackMacos);
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(',') });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha, targets: flags?.targets?.split(',') });
         const { config } = buildConfig;
         const c = config.pjson.oclif;
         if (!c.macos)

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

@@ -5,6 +5,7 @@ export default class PackTarballs extends Command {
         parallel: import("@oclif/core/interfaces").BooleanFlag<boolean>;
         'prune-lockfiles': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        sha: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         tarball: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         targets: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         xz: import("@oclif/core/interfaces").BooleanFlag<boolean>;

package/lib/commands/pack/tarballs.js

@@ -43,6 +43,10 @@ Add a pretarball script to your package.json if you need to run any scripts befo
         parallel: core_1.Flags.boolean({ description: 'Build tarballs in parallel.' }),
         'prune-lockfiles': core_1.Flags.boolean({ description: 'remove lockfiles in the tarball.' }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         tarball: core_1.Flags.string({
             char: 'l',
             description: 'Optionally specify a path to a tarball already generated by NPM.',
@@ -54,7 +58,11 @@ Add a pretarball script to your package.json if you need to run any scripts befo
     static summary = 'Package oclif CLI into tarballs.';
     async run() {
         const { flags } = await this.parse(PackTarballs);
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(','), xz: flags.xz });
+        const buildConfig = await Tarballs.buildConfig(flags.root, {
+            sha: flags?.sha,
+            targets: flags?.targets?.split(','),
+            xz: flags.xz,
+        });
         if (buildConfig.targets.length === 0) {
             throw new Error('Please specify one or more valid targets.');
         }

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

@@ -6,6 +6,7 @@ export default class PackWin extends Command {
         'defender-exclusion': Interfaces.OptionFlag<"hidden" | "checked" | "unchecked", Interfaces.CustomOptions>;
         'prune-lockfiles': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        sha: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         tarball: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         targets: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };

package/lib/commands/pack/win.js

@@ -262,6 +262,10 @@ the CLI should already exist in a directory named after the CLI that is the root
             description: 'Path to oclif CLI root.',
             required: true,
         }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         tarball: core_1.Flags.string({
             char: 't',
             description: 'Optionally specify a path to a tarball already generated by NPM.',
@@ -276,7 +280,7 @@ the CLI should already exist in a directory named after the CLI that is the root
     async run() {
         await this.checkForNSIS();
         const { flags } = await this.parse(PackWin);
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(',') });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha, targets: flags?.targets?.split(',') });
         const { config } = buildConfig;
         const nsisCustomization = config.nsisCustomization ? (0, node_fs_1.readFileSync)(config.nsisCustomization, 'utf8') : '';
         const arches = buildConfig.targets.filter((t) => t.platform === 'win32').map((t) => t.arch);

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

@@ -4,6 +4,7 @@ export default class UploadDeb extends Command {
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        sha: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/deb.js

@@ -48,10 +48,14 @@ class UploadDeb extends core_1.Command {
     static flags = {
         'dry-run': core_1.Flags.boolean({ description: 'Run the command without uploading to S3.' }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
     };
     async run() {
         const { flags } = await this.parse(UploadDeb);
-        const buildConfig = await Tarballs.buildConfig(flags.root);
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha });
         const { config, s3Config } = buildConfig;
         const dist = (f) => buildConfig.dist(node_path_1.default.join('deb', f));
         const S3Options = {

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

@@ -4,6 +4,7 @@ export default class UploadMacos extends Command {
     static flags: {
         'dry-run': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        sha: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         targets: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
     };
     run(): Promise<void>;

package/lib/commands/upload/macos.js

@@ -48,6 +48,10 @@ class UploadMacos extends core_1.Command {
     static flags = {
         'dry-run': core_1.Flags.boolean({ description: 'Run the command without uploading to S3.' }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         targets: core_1.Flags.string({
             char: 't',
             description: 'Comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64).',
@@ -55,7 +59,7 @@ class UploadMacos extends core_1.Command {
     };
     async run() {
         const { flags } = await this.parse(UploadMacos);
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(',') });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha, targets: flags?.targets?.split(',') });
         const { config, dist, s3Config } = buildConfig;
         const S3Options = {
             ACL: s3Config.acl || 'public-read',

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

@@ -4,6 +4,7 @@ export default class UploadTarballs extends Command {
     static flags: {
         'dry-run': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
+        sha: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         targets: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;
         xz: Interfaces.BooleanFlag<boolean>;
     };

package/lib/commands/upload/tarballs.js

@@ -47,6 +47,10 @@ class UploadTarballs extends core_1.Command {
     static flags = {
         'dry-run': core_1.Flags.boolean({ description: 'Run the command without uploading to S3.' }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         targets: core_1.Flags.string({ char: 't', description: 'Comma-separated targets to upload (e.g.: linux-arm,win32-x64).' }),
         xz: core_1.Flags.boolean({ allowNo: true, description: 'Also upload xz.' }),
     };
@@ -54,7 +58,11 @@ class UploadTarballs extends core_1.Command {
         const { flags } = await this.parse(UploadTarballs);
         if (process.platform === 'win32')
             throw new Error('upload does not function on windows');
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(','), xz: flags.xz });
+        const buildConfig = await Tarballs.buildConfig(flags.root, {
+            sha: flags?.sha,
+            targets: flags?.targets?.split(','),
+            xz: flags.xz,
+        });
         const { config, dist, s3Config, xz } = buildConfig;
         // fail early if targets are not built
         for (const target of buildConfig.targets) {

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

@@ -4,6 +4,7 @@ export default class UploadWin extends Command {
     static flags: {
         'dry-run': import("@oclif/core/interfaces").BooleanFlag<boolean>;
         root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        sha: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
         targets: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;

package/lib/commands/upload/win.js

@@ -47,11 +47,15 @@ class UploadWin extends core_1.Command {
     static flags = {
         'dry-run': core_1.Flags.boolean({ description: 'Run the command without uploading to S3.' }),
         root: core_1.Flags.string({ char: 'r', default: '.', description: 'Path to oclif CLI root.', required: true }),
+        sha: core_1.Flags.string({
+            description: '7-digit short git commit SHA (defaults to current checked out commit).',
+            required: false,
+        }),
         targets: core_1.Flags.string({ description: 'Comma-separated targets to pack (e.g.: win32-x64,win32-x86,win32-arm64).' }),
     };
     async run() {
         const { flags } = await this.parse(UploadWin);
-        const buildConfig = await Tarballs.buildConfig(flags.root, { targets: flags?.targets?.split(',') });
+        const buildConfig = await Tarballs.buildConfig(flags.root, { sha: flags?.sha, targets: flags?.targets?.split(',') });
         const { config, dist, s3Config } = buildConfig;
         const S3Options = {
             ACL: s3Config.acl || 'public-read',

package/lib/tarballs/config.d.ts

@@ -38,6 +38,7 @@ export declare function gitSha(cwd: string, options?: {
     short?: boolean;
 }): Promise<string>;
 export declare function buildConfig(root: string, options?: {
+    sha?: string;
     targets?: string[];
     xz?: boolean;
 }): Promise<BuildConfig>;

package/lib/tarballs/config.js

@@ -72,7 +72,7 @@ async function Tmp(config) {
 async function buildConfig(root, options = {}) {
     const config = await core_1.Config.load({ devPlugins: false, root: node_path_1.default.resolve(root), userPlugins: false });
     root = config.root;
-    const _gitSha = await gitSha(root, { short: true });
+    const _gitSha = options.sha ?? (await gitSha(root, { short: true }));
     // eslint-disable-next-line new-cap
     const tmp = await Tmp(config);
     const updateConfig = (config.pjson.oclif.update || {});

package/oclif.manifest.json

@@ -699,6 +699,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "tarball": {
           "char": "t",
           "description": "Optionally specify a path to a tarball already generated by NPM.",
@@ -761,6 +769,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "tarball": {
           "char": "t",
           "description": "Optionally specify a path to a tarball already generated by NPM.",
@@ -825,6 +841,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "tarball": {
           "char": "l",
           "description": "Optionally specify a path to a tarball already generated by NPM.",
@@ -912,6 +936,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "tarball": {
           "char": "t",
           "description": "Optionally specify a path to a tarball already generated by NPM.",
@@ -969,6 +1001,14 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
@@ -1008,6 +1048,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "targets": {
           "char": "t",
           "description": "Comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64).",
@@ -1054,6 +1102,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "targets": {
           "char": "t",
           "description": "Comma-separated targets to upload (e.g.: linux-arm,win32-x64).",
@@ -1106,6 +1162,14 @@
           "multiple": false,
           "type": "option"
         },
+        "sha": {
+          "description": "7-digit short git commit SHA (defaults to current checked out commit).",
+          "name": "sha",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "targets": {
           "description": "Comma-separated targets to pack (e.g.: win32-x64,win32-x86,win32-arm64).",
           "name": "targets",
@@ -1131,5 +1195,5 @@
       ]
     }
   },
-  "version": "4.20.8"
+  "version": "4.21.1"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.20.8",
+  "version": "4.21.1",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -16,7 +16,7 @@
     "@oclif/core": "^4.5.1",
     "@oclif/plugin-help": "^6.2.29",
     "@oclif/plugin-not-found": "^3.2.59",
-    "@oclif/plugin-warn-if-update-available": "^3.1.42",
+    "@oclif/plugin-warn-if-update-available": "^3.1.44",
     "ansis": "^3.16.0",
     "async-retry": "^1.3.3",
     "change-case": "^4",