oclif 4.23.18 → 4.23.20

package/lib/commands/manifest.js

@@ -37,8 +37,8 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
+const cross_spawn_1 = require("cross-spawn");
 const fs_extra_1 = require("fs-extra");
-const node_child_process_1 = require("node:child_process");
 const os = __importStar(require("node:os"));
 const node_path_1 = __importDefault(require("node:path"));
 async function fileExists(filePath) {
@@ -82,7 +82,7 @@ class Manifest extends core_1.Command {
                     await (0, fs_extra_1.remove)(fullPath);
                 await (0, fs_extra_1.mkdir)(fullPath, { recursive: true });
                 const tarball = await this.downloadTarball(jitPlugin, version, fullPath);
-                await this.executeCommand(`tar -xzf "${tarball}"`, { cwd: fullPath });
+                await this.executeCommand('tar', ['-xzf', `${tarball}`], { cwd: fullPath });
                 const manifest = (await (0, fs_extra_1.readJSON)(node_path_1.default.join(fullPath, 'package', 'oclif.manifest.json')));
                 for (const command of Object.values(manifest.commands)) {
                     command.pluginType = 'jit';
@@ -127,28 +127,48 @@ class Manifest extends core_1.Command {
         return plugin.manifest;
     }
     async downloadTarball(plugin, version, tarballStoragePath) {
-        const { stderr } = await this.executeCommand(`npm pack ${plugin}@${version} --pack-destination "${tarballStoragePath}" --json`);
+        const { stdout } = await this.executeCommand('npm', [
+            'pack',
+            `${plugin}@${version}`,
+            '--pack-destination',
+            `${tarballStoragePath}`,
+            '--json',
+        ]);
         // You can `npm pack` with multiple modules to download multiple at a time. There will be at least 1 if the command
         // succeeded.
-        const tarballs = JSON.parse(stderr);
+        const tarballs = JSON.parse(stdout);
         if (!Array.isArray(tarballs) || tarballs.length !== 1) {
             throw new Error(`Could not download tarballs for ${plugin}. Tarball download was not in the correct format.`);
         }
         const { filename } = tarballs[0];
         return node_path_1.default.join(tarballStoragePath, filename);
     }
-    async executeCommand(command, options) {
-        return new Promise((resolve) => {
-            (0, node_child_process_1.exec)(command, options, (error, stderr, stdout) => {
-                if (error)
-                    this.error(error);
+    async executeCommand(command, args, options) {
+        return new Promise((resolve, reject) => {
+            const child = options ? (0, cross_spawn_1.spawn)(command, args, options) : (0, cross_spawn_1.spawn)(command, args);
+            let stdout = '';
+            let stderr = '';
+            child.stdout.on('data', (data) => {
+                stdout += data.toString();
+            });
+            child.stderr.on('data', (data) => {
+                stderr += data.toString();
+            });
+            child.on('error', (error) => {
+                reject(error);
+            });
+            child.on('close', (code) => {
+                if (code !== 0) {
+                    reject(new Error(stderr || `Command "${command}" failed with exit code ${code}`));
+                    return;
+                }
                 const debugString = options?.cwd
                     ? `executing command: ${command} in ${options.cwd}`
                     : `executing command: ${command}`;
                 this.debug(debugString);
                 this.debug(stdout);
                 this.debug(stderr);
-                resolve({ stderr: stderr.toString(), stdout: stdout.toString() });
+                resolve({ stderr, stdout });
             });
         });
     }

package/oclif.manifest.json

@@ -1201,5 +1201,5 @@
       ]
     }
   },
-  "version": "4.23.18"
+  "version": "4.23.20"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.23.18",
+  "version": "4.23.20",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -20,6 +20,7 @@
     "ansis": "^3.16.0",
     "async-retry": "^1.3.3",
     "change-case": "^4",
+    "cross-spawn": "^7.0.6",
     "debug": "^4.4.0",
     "ejs": "^3.1.10",
     "find-yarn-workspace-root": "^2.0.0",
@@ -27,7 +28,7 @@
     "github-slugger": "^2",
     "got": "^13",
     "normalize-package-data": "^6",
-    "semver": "^7.8.4",
+    "semver": "^7.8.5",
     "tiny-jsonc": "^1.0.2",
     "validate-npm-package-name": "^5.0.1"
   },
@@ -40,6 +41,7 @@
     "@types/async-retry": "^1.4.5",
     "@types/chai": "^4.3.17",
     "@types/cli-progress": "^3.11.6",
+    "@types/cross-spawn": "^6.0.6",
     "@types/debug": "^4.1.13",
     "@types/ejs": "^3.1.5",
     "@types/fs-extra": "^9.0",