oclif 4.17.20 → 4.17.22

package/lib/commands/manifest.d.ts

@@ -8,7 +8,6 @@ export default class Manifest extends Command {
         jit: Interfaces.BooleanFlag<boolean>;
     };
     run(): Promise<Interfaces.Manifest>;
+    private downloadTarball;
     private executeCommand;
-    private getTarballUrl;
-    private getVersion;
 }

package/lib/commands/manifest.js

@@ -41,10 +41,6 @@ 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"));
-const node_stream_1 = require("node:stream");
-const node_util_1 = require("node:util");
-const semver_1 = require("semver");
-const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
 async function fileExists(filePath) {
     try {
         await (0, fs_extra_1.access)(filePath);
@@ -74,22 +70,18 @@ class Manifest extends core_1.Command {
         catch { }
         const { args } = await this.parse(Manifest);
         const root = node_path_1.default.resolve(args.path);
-        const packageJson = (0, fs_extra_1.readJSONSync)('package.json');
+        const packageJson = (0, fs_extra_1.readJSONSync)(node_path_1.default.join(root, 'package.json'));
         let jitPluginManifests = [];
         if (flags.jit && packageJson.oclif?.jitPlugins) {
             this.debug('jitPlugins: %s', packageJson.oclif.jitPlugins);
             const tmpDir = os.tmpdir();
-            const { default: got } = await import('got');
             const promises = Object.entries(packageJson.oclif.jitPlugins).map(async ([jitPlugin, version]) => {
                 const pluginDir = jitPlugin.replace('/', '-').replace('@', '');
                 const fullPath = node_path_1.default.join(tmpDir, pluginDir);
                 if (await fileExists(fullPath))
                     await (0, fs_extra_1.remove)(fullPath);
                 await (0, fs_extra_1.mkdir)(fullPath, { recursive: true });
-                const resolvedVersion = await this.getVersion(jitPlugin, version);
-                const tarballUrl = await this.getTarballUrl(jitPlugin, resolvedVersion);
-                const tarball = node_path_1.default.join(fullPath, node_path_1.default.basename(tarballUrl));
-                await pipeline(got.stream(tarballUrl), (0, fs_extra_1.createWriteStream)(tarball));
+                const tarball = await this.downloadTarball(jitPlugin, version, 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)) {
@@ -134,6 +126,17 @@ class Manifest extends core_1.Command {
         this.log(`wrote manifest to ${file}`);
         return plugin.manifest;
     }
+    async downloadTarball(plugin, version, tarballStoragePath) {
+        const { stderr } = 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);
+        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) => {
@@ -149,24 +152,5 @@ class Manifest extends core_1.Command {
             });
         });
     }
-    async getTarballUrl(plugin, version) {
-        const { stderr } = await this.executeCommand(`npm view ${plugin}@${version} --json`);
-        const { dist } = JSON.parse(stderr);
-        return dist.tarball;
-    }
-    async getVersion(plugin, version) {
-        if (version.startsWith('^') || version.startsWith('~')) {
-            // Grab latest from npm to get all the versions so we can find the max satisfying version.
-            // We explicitly ask for latest since this command is typically run inside of `npm prepack`,
-            // which sets the npm_config_tag env var, which is used as the default anytime a tag isn't
-            // provided to `npm view`. This can be problematic if you're building the `nightly` version
-            // of a CLI and all the JIT plugins don't have a `nightly` tag themselves.
-            // TL;DR - always ask for latest to avoid potentially requesting a non-existent tag.
-            const { stderr } = await this.executeCommand(`npm view ${plugin}@latest --json`);
-            const { versions } = JSON.parse(stderr);
-            return (0, semver_1.maxSatisfying)(versions, version) ?? version.replace('^', '').replace('~', '');
-        }
-        return version;
-    }
 }
 exports.default = Manifest;

package/oclif.manifest.json

@@ -1131,5 +1131,5 @@
       ]
     }
   },
-  "version": "4.17.20"
+  "version": "4.17.22"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.17.20",
+  "version": "4.17.22",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -14,7 +14,7 @@
     "@inquirer/input": "^2.2.4",
     "@inquirer/select": "^2.5.0",
     "@oclif/core": "^4.2.3",
-    "@oclif/plugin-help": "^6.2.21",
+    "@oclif/plugin-help": "^6.2.23",
     "@oclif/plugin-not-found": "^3.2.32",
     "@oclif/plugin-warn-if-update-available": "^3.1.31",
     "async-retry": "^1.3.3",