oclif 4.22.4 → 4.22.6

package/lib/commands/pack/deb.js

@@ -42,6 +42,7 @@ const node_child_process_1 = require("node:child_process");
 const fsPromises = __importStar(require("node:fs/promises"));
 const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
+const semver_1 = require("semver");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
 const util_1 = require("../../util");
@@ -155,7 +156,16 @@ class PackDeb extends core_1.Command {
             await exec(`${dpkgDeb} "${workspace}" "${node_path_1.default.join(dist, versionedDebBase)}"`);
             this.log(`finished building debian / ${arch}`);
         };
-        const arches = (0, util_1.uniq)(buildConfig.targets.filter((t) => t.platform === 'linux').map((t) => t.arch));
+        const arches = (0, util_1.uniq)(buildConfig.targets
+            .filter((t) => t.platform === 'linux')
+            .filter((t) => {
+            // Skip 32-bit Arm for Node.js 24+
+            if (t.arch === 'arm' && (0, semver_1.gt)(buildConfig.nodeVersion, '24.0.0')) {
+                return false;
+            }
+            return true;
+        })
+            .map((t) => t.arch));
         await Promise.all(arches.map((a) => build(a)));
         await exec('apt-ftparchive packages . > Packages', { cwd: dist });
         this.log('debian packages created');

package/lib/commands/upload/tarballs.js

@@ -106,7 +106,9 @@ class UploadTarballs extends core_1.Command {
                 const manifest = (0, upload_util_1.templateShortKey)('manifest', shortKeyInputs);
                 const cloudKey = `${(0, upload_util_1.commitAWSDir)(config.version, buildConfig.gitSha, s3Config)}/${manifest}`;
                 const local = dist(manifest);
+                (0, log_1.log)(`checking for buildmanifest at ${local}`);
                 if (fs.existsSync(local)) {
+                    (0, log_1.log)(`uploading buildmanifest ${manifest}`);
                     return aws_1.default.s3.uploadFile(dist(manifest), {
                         ...S3Options,
                         CacheControl: 'max-age=86400',

package/lib/tarballs/build.js

@@ -12,7 +12,6 @@ const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
 const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
-const semver_1 = require("semver");
 const log_1 = require("../log");
 const upload_util_1 = require("../upload-util");
 const util_1 = require("../util");
@@ -191,10 +190,6 @@ const extractCLI = async (tarball, c) => {
     ]);
 };
 const buildTarget = async (target, c, options) => {
-    if (target.platform === 'win32' && target.arch === 'arm64' && (0, semver_1.lt)(c.nodeVersion, '20.0.0')) {
-        core_1.ux.warn('win32-arm64 is only supported for node >=20.0.0. Skipping...');
-        return;
-    }
     const workspace = c.workspace(target);
     const { arch, platform } = target;
     const { bin, version } = c.config;

package/lib/tarballs/config.js

@@ -85,6 +85,18 @@ async function buildConfig(root, options = {}) {
             core_1.ux.warn('darwin-arm64 is only supported for node >=16.0.0. Skipping...');
             return false;
         }
+        if (t === 'linux-arm' && semver.gt(nodeVersion, '24.0.0')) {
+            core_1.ux.warn('linux-arm is not supported for Node.js 24 and later. Skipping...');
+            return false;
+        }
+        if (t === 'win32-x86' && semver.gt(nodeVersion, '24.0.0')) {
+            core_1.ux.warn('win32-x86 is not supported for Node.js 24 and later. Skipping...');
+            return false;
+        }
+        if (t === 'win32-arm64' && semver.lt(nodeVersion, '20.0.0')) {
+            core_1.ux.warn('win32-arm64 is only supported for node >=20.0.0. Skipping...');
+            return false;
+        }
         return true;
     })
         .map((t) => {

package/oclif.manifest.json

@@ -660,14 +660,32 @@
         "hook.js"
       ]
     },
-    "upload:deb": {
+    "pack:deb": {
       "aliases": [],
       "args": {},
-      "description": "Upload deb package built with `pack deb`.",
+      "description": "Add a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
       "flags": {
-        "dry-run": {
-          "description": "Run the command without uploading to S3.",
-          "name": "dry-run",
+        "compression": {
+          "char": "z",
+          "description": "For more details see the `-Zcompress-type` section at https://man7.org/linux/man-pages/man1/dpkg-deb.1.html",
+          "name": "compression",
+          "summary": "Override the default compression used by dpkg-deb.",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "gzip",
+            "none",
+            "xz",
+            "zstd"
+          ],
+          "type": "option"
+        },
+        "prune-lockfiles": {
+          "description": "remove lockfiles in the tarball.",
+          "exclusive": [
+            "tarball"
+          ],
+          "name": "prune-lockfiles",
           "allowNo": false,
           "type": "boolean"
         },
@@ -688,32 +706,56 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
+        },
+        "tarball": {
+          "char": "t",
+          "description": "Optionally specify a path to a tarball already generated by NPM.",
+          "exclusive": [
+            "prune-lockfiles"
+          ],
+          "name": "tarball",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "upload:deb",
+      "id": "pack:deb",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
+      "summary": "Pack CLI into debian package.",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "upload",
+        "pack",
         "deb.js"
       ]
     },
-    "upload:macos": {
+    "pack:macos": {
       "aliases": [],
       "args": {},
-      "description": "Upload macos installers built with `pack macos`.",
+      "description": "Add a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
       "flags": {
-        "dry-run": {
-          "description": "Run the command without uploading to S3.",
-          "name": "dry-run",
+        "additional-cli": {
+          "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,
+          "name": "additional-cli",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "prune-lockfiles": {
+          "description": "remove lockfiles in the tarball.",
+          "exclusive": [
+            "tarball"
+          ],
+          "name": "prune-lockfiles",
           "allowNo": false,
           "type": "boolean"
         },
@@ -735,9 +777,20 @@
           "multiple": false,
           "type": "option"
         },
-        "targets": {
+        "tarball": {
           "char": "t",
-          "description": "Comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64).",
+          "description": "Optionally specify a path to a tarball already generated by NPM.",
+          "exclusive": [
+            "prune-lockfiles"
+          ],
+          "name": "tarball",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "targets": {
+          "description": "Comma-separated targets to pack (e.g.: darwin-x64,darwin-arm64).",
           "name": "targets",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -746,28 +799,35 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "upload:macos",
+      "id": "pack:macos",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
+      "summary": "Pack CLI into macOS .pkg",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "upload",
+        "pack",
         "macos.js"
       ]
     },
-    "upload:tarballs": {
+    "pack:tarballs": {
       "aliases": [],
       "args": {},
-      "description": "Upload an oclif CLI to S3.",
+      "description": "This can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n\nAdd a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
       "flags": {
-        "dry-run": {
-          "description": "Run the command without uploading to S3.",
-          "name": "dry-run",
+        "parallel": {
+          "description": "Build tarballs in parallel.",
+          "name": "parallel",
+          "allowNo": false,
+          "type": "boolean"
+        },
+        "prune-lockfiles": {
+          "description": "remove lockfiles in the tarball.",
+          "name": "prune-lockfiles",
           "allowNo": false,
           "type": "boolean"
         },
@@ -789,16 +849,25 @@
           "multiple": false,
           "type": "option"
         },
+        "tarball": {
+          "char": "l",
+          "description": "Optionally specify a path to a tarball already generated by NPM.",
+          "name": "tarball",
+          "required": false,
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
         "targets": {
           "char": "t",
-          "description": "Comma-separated targets to upload (e.g.: linux-arm,win32-x64).",
+          "description": "Comma-separated targets to pack (e.g.: linux-arm,win32-x64).",
           "name": "targets",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "xz": {
-          "description": "Also upload xz.",
+          "description": "Also build xz.",
           "name": "xz",
           "allowNo": true,
           "type": "boolean"
@@ -806,28 +875,54 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "upload:tarballs",
+      "id": "pack:tarballs",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
+      "summary": "Package oclif CLI into tarballs.",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "upload",
+        "pack",
         "tarballs.js"
       ]
     },
-    "upload:win": {
+    "pack:win": {
       "aliases": [],
       "args": {},
-      "description": "Upload windows installers built with `pack win`.",
+      "description": "You need to have 7zip, nsis (makensis), and grep installed on your machine in order to run this command.\n\nThis command will produce unsigned installers unless you supply WINDOWS_SIGNING_PASS (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) in the environment and have set the windows.name and windows.keypath properties in your package.json's oclif property.\n\nAdd a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
       "flags": {
-        "dry-run": {
-          "description": "Run the command without uploading to S3.",
-          "name": "dry-run",
+        "additional-cli": {
+          "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,
+          "name": "additional-cli",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "type": "option"
+        },
+        "defender-exclusion": {
+          "description": "There is no way to set a hidden checkbox with \"true\" as a default...the user can always allow full security",
+          "name": "defender-exclusion",
+          "summary": "Set to \"checked\" or \"unchecked\" to set the default value for the checkbox.  Set to \"hidden\" to hide the option (will let defender do its thing).",
+          "default": "checked",
+          "hasDynamicHelp": false,
+          "multiple": false,
+          "options": [
+            "checked",
+            "unchecked",
+            "hidden"
+          ],
+          "type": "option"
+        },
+        "prune-lockfiles": {
+          "description": "remove lockfiles in the tarball.",
+          "exclusive": [
+            "tarball"
+          ],
+          "name": "prune-lockfiles",
           "allowNo": false,
           "type": "boolean"
         },
@@ -849,6 +944,18 @@
           "multiple": false,
           "type": "option"
         },
+        "tarball": {
+          "char": "t",
+          "description": "Optionally specify a path to a tarball already generated by NPM.",
+          "exclusive": [
+            "prune-lockfiles"
+          ],
+          "name": "tarball",
+          "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",
@@ -859,46 +966,29 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "upload:win",
+      "id": "pack:win",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
+      "summary": "Create windows installer from oclif CLI",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "upload",
+        "pack",
         "win.js"
       ]
     },
-    "pack:deb": {
+    "upload:deb": {
       "aliases": [],
       "args": {},
-      "description": "Add a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
+      "description": "Upload deb package built with `pack deb`.",
       "flags": {
-        "compression": {
-          "char": "z",
-          "description": "For more details see the `-Zcompress-type` section at https://man7.org/linux/man-pages/man1/dpkg-deb.1.html",
-          "name": "compression",
-          "summary": "Override the default compression used by dpkg-deb.",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "gzip",
-            "none",
-            "xz",
-            "zstd"
-          ],
-          "type": "option"
-        },
-        "prune-lockfiles": {
-          "description": "remove lockfiles in the tarball.",
-          "exclusive": [
-            "tarball"
-          ],
-          "name": "prune-lockfiles",
+        "dry-run": {
+          "description": "Run the command without uploading to S3.",
+          "name": "dry-run",
           "allowNo": false,
           "type": "boolean"
         },
@@ -919,56 +1009,32 @@
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
-        },
-        "tarball": {
-          "char": "t",
-          "description": "Optionally specify a path to a tarball already generated by NPM.",
-          "exclusive": [
-            "prune-lockfiles"
-          ],
-          "name": "tarball",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
         }
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pack:deb",
+      "id": "upload:deb",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
-      "summary": "Pack CLI into debian package.",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "pack",
+        "upload",
         "deb.js"
       ]
     },
-    "pack:macos": {
+    "upload:macos": {
       "aliases": [],
       "args": {},
-      "description": "Add a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
+      "description": "Upload macos installers built with `pack macos`.",
       "flags": {
-        "additional-cli": {
-          "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,
-          "name": "additional-cli",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "prune-lockfiles": {
-          "description": "remove lockfiles in the tarball.",
-          "exclusive": [
-            "tarball"
-          ],
-          "name": "prune-lockfiles",
+        "dry-run": {
+          "description": "Run the command without uploading to S3.",
+          "name": "dry-run",
           "allowNo": false,
           "type": "boolean"
         },
@@ -990,20 +1056,9 @@
           "multiple": false,
           "type": "option"
         },
-        "tarball": {
-          "char": "t",
-          "description": "Optionally specify a path to a tarball already generated by NPM.",
-          "exclusive": [
-            "prune-lockfiles"
-          ],
-          "name": "tarball",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "targets": {
-          "description": "Comma-separated targets to pack (e.g.: darwin-x64,darwin-arm64).",
+          "char": "t",
+          "description": "Comma-separated targets to upload (e.g.: darwin-x64,darwin-arm64).",
           "name": "targets",
           "hasDynamicHelp": false,
           "multiple": false,
@@ -1012,35 +1067,28 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pack:macos",
+      "id": "upload:macos",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
-      "summary": "Pack CLI into macOS .pkg",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "pack",
+        "upload",
         "macos.js"
       ]
     },
-    "pack:tarballs": {
+    "upload:tarballs": {
       "aliases": [],
       "args": {},
-      "description": "This can be used to create oclif CLIs that use the system node or that come preloaded with a node binary.\n\nAdd a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
+      "description": "Upload an oclif CLI to S3.",
       "flags": {
-        "parallel": {
-          "description": "Build tarballs in parallel.",
-          "name": "parallel",
-          "allowNo": false,
-          "type": "boolean"
-        },
-        "prune-lockfiles": {
-          "description": "remove lockfiles in the tarball.",
-          "name": "prune-lockfiles",
+        "dry-run": {
+          "description": "Run the command without uploading to S3.",
+          "name": "dry-run",
           "allowNo": false,
           "type": "boolean"
         },
@@ -1062,25 +1110,16 @@
           "multiple": false,
           "type": "option"
         },
-        "tarball": {
-          "char": "l",
-          "description": "Optionally specify a path to a tarball already generated by NPM.",
-          "name": "tarball",
-          "required": false,
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
         "targets": {
           "char": "t",
-          "description": "Comma-separated targets to pack (e.g.: linux-arm,win32-x64).",
+          "description": "Comma-separated targets to upload (e.g.: linux-arm,win32-x64).",
           "name": "targets",
           "hasDynamicHelp": false,
           "multiple": false,
           "type": "option"
         },
         "xz": {
-          "description": "Also build xz.",
+          "description": "Also upload xz.",
           "name": "xz",
           "allowNo": true,
           "type": "boolean"
@@ -1088,54 +1127,28 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pack:tarballs",
+      "id": "upload:tarballs",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
-      "summary": "Package oclif CLI into tarballs.",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "pack",
+        "upload",
         "tarballs.js"
       ]
     },
-    "pack:win": {
+    "upload:win": {
       "aliases": [],
       "args": {},
-      "description": "You need to have 7zip, nsis (makensis), and grep installed on your machine in order to run this command.\n\nThis command will produce unsigned installers unless you supply WINDOWS_SIGNING_PASS (prefixed with the name of your executable, e.g. OCLIF_WINDOWS_SIGNING_PASS) in the environment and have set the windows.name and windows.keypath properties in your package.json's oclif property.\n\nAdd a pretarball script to your package.json if you need to run any scripts before the tarball is created.",
+      "description": "Upload windows installers built with `pack win`.",
       "flags": {
-        "additional-cli": {
-          "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,
-          "name": "additional-cli",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "type": "option"
-        },
-        "defender-exclusion": {
-          "description": "There is no way to set a hidden checkbox with \"true\" as a default...the user can always allow full security",
-          "name": "defender-exclusion",
-          "summary": "Set to \"checked\" or \"unchecked\" to set the default value for the checkbox.  Set to \"hidden\" to hide the option (will let defender do its thing).",
-          "default": "checked",
-          "hasDynamicHelp": false,
-          "multiple": false,
-          "options": [
-            "checked",
-            "unchecked",
-            "hidden"
-          ],
-          "type": "option"
-        },
-        "prune-lockfiles": {
-          "description": "remove lockfiles in the tarball.",
-          "exclusive": [
-            "tarball"
-          ],
-          "name": "prune-lockfiles",
+        "dry-run": {
+          "description": "Run the command without uploading to S3.",
+          "name": "dry-run",
           "allowNo": false,
           "type": "boolean"
         },
@@ -1157,18 +1170,6 @@
           "multiple": false,
           "type": "option"
         },
-        "tarball": {
-          "char": "t",
-          "description": "Optionally specify a path to a tarball already generated by NPM.",
-          "exclusive": [
-            "prune-lockfiles"
-          ],
-          "name": "tarball",
-          "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",
@@ -1179,21 +1180,20 @@
       },
       "hasDynamicHelp": false,
       "hiddenAliases": [],
-      "id": "pack:win",
+      "id": "upload:win",
       "pluginAlias": "oclif",
       "pluginName": "oclif",
       "pluginType": "core",
       "strict": true,
-      "summary": "Create windows installer from oclif CLI",
       "enableJsonFlag": false,
       "isESM": false,
       "relativePath": [
         "lib",
         "commands",
-        "pack",
+        "upload",
         "win.js"
       ]
     }
   },
-  "version": "4.22.4"
+  "version": "4.22.6"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.22.4",
+  "version": "4.22.6",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -13,7 +13,7 @@
     "@inquirer/confirm": "^3.1.22",
     "@inquirer/input": "^2.2.4",
     "@inquirer/select": "^2.5.0",
-    "@oclif/core": "^4.5.1",
+    "@oclif/core": "^4.5.2",
     "@oclif/plugin-help": "^6.2.29",
     "@oclif/plugin-not-found": "^3.2.61",
     "@oclif/plugin-warn-if-update-available": "^3.1.44",
@@ -60,7 +60,7 @@
     "eslint-plugin-perfectionist": "^4",
     "husky": "^9.1.7",
     "lint-staged": "^15",
-    "mocha": "^10.8.2",
+    "mocha": "^11",
     "nyc": "^15.1.0",
     "prettier": "^3.6.2",
     "shelljs": "^0.10.0",