oclif 3.16.0 → 3.17.1

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.16.0",
+  "version": "3.17.1",
   "commands": {
     "generate": {
       "id": "generate",

package/lib/commands/manifest.d.ts

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

package/lib/commands/manifest.js

@@ -6,6 +6,11 @@ const path = require("path");
 const os = require("os");
 const semver = require("semver");
 const shelljs_1 = require("shelljs");
+const got_1 = require("got");
+const util_1 = require("util");
+const stream_1 = require("stream");
+const util_2 = require("../util");
+const pipeline = (0, util_1.promisify)(stream_1.pipeline);
 async function fileExists(filePath) {
     try {
         await fs.access(filePath);
@@ -32,20 +37,26 @@ class Manifest extends core_1.Command {
             const tmpDir = os.tmpdir();
             const promises = Object.entries(packageJson.oclif.jitPlugins).map(async ([jitPlugin, version]) => {
                 const pluginDir = jitPlugin.replace('/', '-').replace('@', '');
-                const repo = this.executeCommand(`npm view ${jitPlugin}@latest repository --json`);
-                const stdout = JSON.parse(repo.stdout);
-                const repoUrl = stdout.url.replace(`${stdout.type}+`, '');
                 const fullPath = path.join(tmpDir, pluginDir);
                 if (await fileExists(fullPath))
                     await fs.remove(fullPath);
-                const versions = JSON.parse(this.executeCommand(`npm view ${jitPlugin}@latest versions --json`).stdout);
-                const maxSatisfying = semver.maxSatisfying(versions, version);
-                this.cloneRepo(repoUrl, fullPath, maxSatisfying);
-                this.executeCommand('yarn --ignore-scripts', { cwd: fullPath });
-                this.executeCommand('yarn tsc', { cwd: fullPath });
-                const plugin = new core_1.Plugin({ root: fullPath, type: 'jit', ignoreManifest: true, errorOnManifestCreate: true });
-                await plugin.load();
-                return plugin.manifest;
+                await fs.mkdir(fullPath, { recursive: true });
+                const resolvedVersion = this.getVersion(jitPlugin, version);
+                const tarballUrl = this.getTarballUrl(jitPlugin, resolvedVersion);
+                const tarball = path.join(fullPath, path.basename(tarballUrl));
+                await pipeline(got_1.default.stream(tarballUrl), fs.createWriteStream(tarball));
+                if (process.platform === 'win32') {
+                    await (0, util_2.checkFor7Zip)();
+                    (0, shelljs_1.exec)(`7z x -bd -y "${tarball}"`, { cwd: fullPath });
+                }
+                else {
+                    (0, shelljs_1.exec)(`tar -xzf "${tarball}"`, { cwd: fullPath });
+                }
+                const manifest = await fs.readJSON(path.join(fullPath, 'package', 'oclif.manifest.json'));
+                for (const command of Object.values(manifest.commands)) {
+                    command.pluginType = 'jit';
+                }
+                return manifest;
             });
             core_1.ux.action.start('Generating JIT plugin manifests');
             jitPluginManifests = await Promise.all(promises);
@@ -72,18 +83,23 @@ class Manifest extends core_1.Command {
         fs.writeFileSync(file, JSON.stringify(plugin.manifest, null, 2));
         this.log(`wrote manifest to ${file}`);
     }
-    cloneRepo(repoUrl, fullPath, tag) {
-        try {
-            this.executeCommand(`git clone --branch ${tag} ${repoUrl} ${fullPath} --depth 1`);
-        }
-        catch (_a) {
-            try {
-                this.executeCommand(`git clone --branch v${tag} ${repoUrl} ${fullPath} --depth 1`);
-            }
-            catch (_b) {
-                throw new Error(`Unable to clone repo ${repoUrl} with tag ${tag}`);
-            }
+    getVersion(plugin, version) {
+        var _a;
+        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 { versions } = JSON.parse(this.executeCommand(`npm view ${plugin}@latest --json`).stdout);
+            return (_a = semver.maxSatisfying(versions, version)) !== null && _a !== void 0 ? _a : version.replace('^', '').replace('~', '');
         }
+        return version;
+    }
+    getTarballUrl(plugin, version) {
+        const { dist } = JSON.parse(this.executeCommand(`npm view ${plugin}@${version} --json`).stdout);
+        return dist.tarball;
     }
     executeCommand(command, options) {
         const debugString = (options === null || options === void 0 ? void 0 : options.cwd) ? `executing command: ${command} in ${options.cwd}` : `executing command: ${command}`;

package/lib/tarballs/node.js

@@ -1,29 +1,18 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNodeBinary = void 0;
-const core_1 = require("@oclif/core");
 const path = require("path");
 const fs = require("fs-extra");
-const node_stream_1 = require("node:stream");
+const stream_1 = require("stream");
 const log_1 = require("../log");
-const node_child_process_1 = require("node:child_process");
-const node_util_1 = require("node:util");
+const child_process_1 = require("child_process");
+const util_1 = require("util");
 const got_1 = require("got");
 const retry = require("async-retry");
-const pipeline = (0, node_util_1.promisify)(node_stream_1.pipeline);
-const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
+const util_2 = require("../util");
+const pipeline = (0, util_1.promisify)(stream_1.pipeline);
+const exec = (0, util_1.promisify)(child_process_1.exec);
 const RETRY_TIMEOUT_MS = 1000;
-async function checkFor7Zip() {
-    try {
-        await exec('7z');
-    }
-    catch (error) {
-        if (error.code === 127)
-            core_1.Errors.error('install 7-zip to package windows tarball');
-        else
-            throw error;
-    }
-}
 async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
     if (arch === 'arm')
         arch = 'armv7l';
@@ -31,7 +20,7 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
     let tarball = path.join(tmp, 'node', `${nodeBase}.tar.xz`);
     let url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.tar.xz`;
     if (platform === 'win32') {
-        await checkFor7Zip();
+        await (0, util_2.checkFor7Zip)();
         nodeBase = `node-v${nodeVersion}-win-${arch}`;
         tarball = path.join(tmp, 'node', `${nodeBase}.7z`);
         url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.7z`;

package/lib/util.d.ts

@@ -12,4 +12,5 @@ interface VersionsObject {
 export declare const sortVersionsObjectByKeysDesc: (input: VersionsObject) => VersionsObject;
 export declare const prettifyPaths: (input: string) => string;
 export declare const hash: (algo: string, fp: string | string[]) => Promise<string>;
+export declare function checkFor7Zip(): Promise<void>;
 export {};

package/lib/util.js

@@ -1,11 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.hash = exports.prettifyPaths = exports.sortVersionsObjectByKeysDesc = exports.template = exports.sortBy = exports.compact = exports.uniqBy = exports.castArray = void 0;
+exports.checkFor7Zip = exports.hash = exports.prettifyPaths = exports.sortVersionsObjectByKeysDesc = exports.template = exports.sortBy = exports.compact = exports.uniqBy = exports.castArray = void 0;
+const core_1 = require("@oclif/core");
 const _ = require("lodash");
 const os = require("os");
-const crypto = require("node:crypto");
+const crypto = require("crypto");
 const log_1 = require("./log");
 const fs = require("fs-extra");
+const child_process_1 = require("child_process");
+const util_1 = require("util");
+const exec = (0, util_1.promisify)(child_process_1.exec);
 function castArray(input) {
     if (input === undefined)
         return [];
@@ -91,3 +95,15 @@ const hash = async (algo, fp) => {
     });
 };
 exports.hash = hash;
+async function checkFor7Zip() {
+    try {
+        await exec('7z');
+    }
+    catch (error) {
+        if (error.code === 127)
+            core_1.Errors.error('install 7-zip to package windows tarball');
+        else
+            throw error;
+    }
+}
+exports.checkFor7Zip = checkFor7Zip;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.16.0",
+  "version": "3.17.1",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
@@ -128,7 +128,7 @@
     "posttest": "yarn run lint",
     "prepack": "shx rm -rf lib && tsc && bin/dev manifest .",
     "test": "nps test && yarn test:unit && yarn test:integration",
-    "test:integration": "mocha --forbid-only \"test/integration/*.test.ts\"",
+    "test:integration": "mocha --forbid-only \"test/integration/*.test.ts\" --timeout 600000",
     "test:unit": "mocha --forbid-only \"test/unit/*.test.ts\"",
     "version": "bin/dev readme && git add README.md"
   },