oclif 3.17.1 → 4.0.0-beta.1

package/.oclif.manifest.json

@@ -1,5 +1,5 @@
 {
-  "version": "3.17.1",
+  "version": "4.0.0-beta.1",
   "commands": {
     "generate": {
       "id": "generate",

package/README.md

@@ -53,7 +53,7 @@ $ heroku info --app=<tab><tab> # will complete with all the Heroku apps a user h
 
 # 📌 Requirements
 
-Currently, Node 12+ is supported. We support the [LTS versions](https://nodejs.org/en/about/releases) of Node. You can add the [node](https://www.npmjs.com/package/node) package to your CLI to ensure users are running a specific version of Node.
+Currently, Node 18+ is supported. We support the [LTS versions](https://nodejs.org/en/about/releases) of Node. You can add the [node](https://www.npmjs.com/package/node) package to your CLI to ensure users are running a specific version of Node.
 
 # 📌 Migrating from V1
 

package/bin/dev

@@ -2,7 +2,7 @@
 
 const oclif = require('@oclif/core')
 
-const path = require('path')
+const path = require('node:path')
 const project = path.join(__dirname, '..', 'tsconfig.json')
 
 // In dev mode -> use ts-node and dev plugins

package/lib/commands/manifest.js

@@ -2,8 +2,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
-const path = require("path");
-const os = require("os");
+const path = require("node:path");
+const os = require("node:os");
 const semver = require("semver");
 const shelljs_1 = require("shelljs");
 const got_1 = require("got");

package/lib/commands/pack/deb.js

@@ -3,12 +3,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const _ = require("lodash");
-const path = require("path");
+const path = require("node:path");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
-const exec = (0, node_util_1.promisify)(child_process_1.exec);
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 const scripts = {
     /* eslint-disable no-useless-escape */
     bin: (config) => `#!/usr/bin/env bash

package/lib/commands/pack/macos.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
+const path = require("node:path");
 const _ = require("lodash");
 const fs = require("fs-extra");
 const core_1 = require("@oclif/core");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
-const os = require("os");
-const exec = (0, node_util_1.promisify)(child_process_1.exec);
+const os = require("node:os");
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 const noBundleConfiguration = `<?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">

package/lib/commands/pack/win.js

@@ -1,13 +1,13 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const path = require("path");
+const path = require("node:path");
 const fs = require("fs-extra");
 const Tarballs = require("../../tarballs");
 const upload_util_1 = require("../../upload-util");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
-const exec = (0, node_util_1.promisify)(child_process_1.exec);
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 const scripts = {
     /* eslint-disable no-useless-escape */
     // eslint-disable-next-line unicorn/no-useless-undefined

package/lib/commands/promote.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const path = require("path");
+const path = require("node:path");
 const _ = require("lodash");
 const core_1 = require("@oclif/core");
 const semver_1 = require("semver");

package/lib/commands/readme.js

@@ -1,11 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-// tslint:disable no-implicit-dependencies
 const core_1 = require("@oclif/core");
 const fs = require("fs-extra");
 const _ = require("lodash");
-const path = require("path");
-const url_1 = require("url");
+const path = require("node:path");
+const node_url_1 = require("node:url");
 const util_1 = require("../util");
 const help_compatibility_1 = require("../help-compatibility");
 const normalize = require('normalize-package-data');
@@ -13,9 +12,16 @@ const columns = Number.parseInt(process.env.COLUMNS, 10) || 120;
 const slugify = new (require('github-slugger'))();
 class Readme extends core_1.Command {
     async run() {
+        var _a, _b;
         this.flags = (await this.parse(Readme)).flags;
         const cwd = process.cwd();
         const readmePath = path.resolve(cwd, 'README.md');
+        const tsConfigPath = path.resolve(cwd, 'tsconfig.json');
+        const tsConfig = await fs.readJSON(tsConfigPath).catch(() => ({}));
+        const outDir = (_b = (_a = tsConfig.compilerOptions) === null || _a === void 0 ? void 0 : _a.outDir) !== null && _b !== void 0 ? _b : 'lib';
+        if (!await fs.pathExists(outDir)) {
+            this.warn(`No compiled source found at ${outDir}. Some commands may be missing.`);
+        }
         const config = await core_1.Config.load({ root: cwd, devPlugins: false, userPlugins: false });
         try {
             const p = require.resolve('@oclif/plugin-legacy', { paths: [cwd] });
@@ -23,7 +29,7 @@ class Readme extends core_1.Command {
             await plugin.load();
             config.plugins.push(plugin);
         }
-        catch (_a) { }
+        catch (_c) { }
         await config.runHook('init', { id: 'readme', argv: this.argv });
         this.HelpClass = await (0, core_1.loadHelpClass)(config);
         let readme = await fs.readFile(readmePath, 'utf8');
@@ -167,7 +173,7 @@ USAGE
         const repo = pjson.repository && pjson.repository.url;
         if (!repo)
             return;
-        const url = new url_1.URL(repo);
+        const url = new node_url_1.URL(repo);
         if (!['github.com', 'gitlab.com'].includes(url.hostname) && !pjson.oclif.repositoryPrefix && !this.flags['repository-prefix'])
             return;
         return `https://${url.hostname}${url.pathname.replace(/\.git$/, '')}`;
@@ -177,21 +183,24 @@ USAGE
      * fetches the path to a command
      */
     commandPath(plugin, c) {
+        var _a, _b;
         const commandsDir = plugin.pjson.oclif.commands;
         if (!commandsDir)
             return;
+        const hasTypescript = ((_a = plugin.pjson.devDependencies) === null || _a === void 0 ? void 0 : _a.typescript) || ((_b = plugin.pjson.dependencies) === null || _b === void 0 ? void 0 : _b.typescript);
         let p = path.join(plugin.root, commandsDir, ...c.id.split(':'));
-        const libRegex = new RegExp('^lib' + (path.sep === '\\' ? '\\\\' : path.sep));
+        const outDir = path.dirname(commandsDir.replace(`.${path.sep}`, ''));
+        const outDirRegex = new RegExp('^' + outDir + (path.sep === '\\' ? '\\\\' : path.sep));
         if (fs.pathExistsSync(path.join(p, 'index.js'))) {
             p = path.join(p, 'index.js');
         }
         else if (fs.pathExistsSync(p + '.js')) {
             p += '.js';
         }
-        else if (plugin.pjson.devDependencies && plugin.pjson.devDependencies.typescript) {
+        else if (hasTypescript) {
             // check if non-compiled scripts are available
             const base = p.replace(plugin.root + path.sep, '');
-            p = path.join(plugin.root, base.replace(libRegex, 'src' + path.sep));
+            p = path.join(plugin.root, base.replace(outDirRegex, 'src' + path.sep));
             if (fs.pathExistsSync(path.join(p, 'index.ts'))) {
                 p = path.join(p, 'index.ts');
             }
@@ -204,9 +213,8 @@ USAGE
         else
             return;
         p = p.replace(plugin.root + path.sep, '');
-        if (plugin.pjson.devDependencies && plugin.pjson.devDependencies.typescript) {
-            p = p.replace(libRegex, 'src' + path.sep);
-            p = p.replace(/\.js$/, '.ts');
+        if (hasTypescript) {
+            p = p.replace(outDirRegex, 'src' + path.sep).replace(/\.js$/, '.ts');
         }
         p = p.replace(/\\/g, '/'); // Replace windows '\' by '/'
         return p;

package/lib/commands/upload/deb.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");

package/lib/commands/upload/macos.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const fs = require("fs");
+const fs = require("node:fs");
 const core_1 = require("@oclif/core");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");

package/lib/commands/upload/tarballs.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const fs = require("fs");
+const fs = require("node:fs");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");

package/lib/commands/upload/win.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
-const fs = require("fs");
+const fs = require("node:fs");
 const aws_1 = require("../../aws");
 const log_1 = require("../../log");
 const Tarballs = require("../../tarballs");

package/lib/generators/cli.js

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const child_process_1 = require("child_process");
-const fs = require("fs");
+const node_child_process_1 = require("node:child_process");
+const fs = require("node:fs");
 const _ = require("lodash");
-const path = require("path");
+const path = require("node:path");
 const Generator = require("yeoman-generator");
 const debug = require('debug')('generator-oclif');
 const { version } = require('../../package.json');
 let hasYarn = false;
 try {
-    (0, child_process_1.execSync)('yarn -v', { stdio: 'ignore' });
+    (0, node_child_process_1.execSync)('yarn -v', { stdio: 'ignore' });
     hasYarn = true;
 }
 catch (_a) { }
@@ -40,7 +40,7 @@ class CLI extends Generator {
             },
         ]) : 'cjs';
         const repo = moduleType === 'esm' ? 'hello-world-esm' : 'hello-world';
-        (0, child_process_1.execSync)(`git clone https://github.com/oclif/${repo}.git "${path.resolve(this.name)}" --depth=1`);
+        (0, node_child_process_1.execSync)(`git clone https://github.com/oclif/${repo}.git "${path.resolve(this.name)}" --depth=1`);
         fs.rmSync(`${path.resolve(this.name, '.git')}`, { recursive: true });
         this.destinationRoot(path.resolve(this.name));
         this.env.cwd = this.destinationPath();

package/lib/generators/command.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const path = require("path");
+const path = require("node:path");
 const Generator = require("yeoman-generator");
 const { version } = require('../../package.json');
 class Command extends Generator {

package/lib/generators/hook.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const _ = require("lodash");
-const path = require("path");
+const path = require("node:path");
 const Generator = require("yeoman-generator");
 const { version } = require('../../package.json');
 class Hook extends Generator {

package/lib/log.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.log = exports.debug = void 0;
 const core_1 = require("@oclif/core");
-const util = require("util");
+const util = require("node:util");
 const util_1 = require("./util");
 exports.debug = require('debug')('oclif');
 exports.debug.new = (name) => require('debug')(`oclif:${name}`);

package/lib/tarballs/bin.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBinScripts = void 0;
-const fs = require("fs");
-const path = require("path");
+const fs = require("node:fs");
+const path = require("node:path");
 const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
 const exec = (0, node_util_1.promisify)(node_child_process_1.exec);

package/lib/tarballs/build.js

@@ -3,15 +3,15 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.build = void 0;
 const findYarnWorkspaceRoot = require("find-yarn-workspace-root");
 const log_1 = require("../log");
-const path = require("path");
+const path = require("node:path");
 const fs = require("fs-extra");
 const bin_1 = require("./bin");
 const node_1 = require("./node");
 const upload_util_1 = require("../upload-util");
 const util_1 = require("../util");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
-const exec = (0, node_util_1.promisify)(child_process_1.exec);
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 const pack = async (from, to) => {
     const cwd = path.dirname(from);
     await fs.promises.mkdir(path.dirname(to), { recursive: true });

package/lib/tarballs/config.js

@@ -2,14 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.buildConfig = exports.gitSha = exports.TARGETS = void 0;
 const core_1 = require("@oclif/core");
-const path = require("path");
+const path = require("node:path");
 const semver = require("semver");
 const fs = require("fs-extra");
 const util_1 = require("../util");
 const upload_util_1 = require("../upload-util");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const node_util_1 = require("node:util");
-const exec = (0, node_util_1.promisify)(child_process_1.exec);
+const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 exports.TARGETS = [
     'linux-x64',
     'linux-arm',

package/lib/tarballs/node.js

@@ -1,17 +1,16 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchNodeBinary = void 0;
-const path = require("path");
+const path = require("node:path");
 const fs = require("fs-extra");
-const stream_1 = require("stream");
+const promises_1 = require("node:stream/promises");
 const log_1 = require("../log");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const util_1 = require("util");
 const got_1 = require("got");
 const retry = require("async-retry");
 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 exec = (0, util_1.promisify)(node_child_process_1.exec);
 const RETRY_TIMEOUT_MS = 1000;
 async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
     if (arch === 'arm')
@@ -37,11 +36,11 @@ async function fetchNodeBinary({ nodeVersion, output, platform, arch, tmp }) {
         ]);
         const shasums = path.join(tmp, 'cache', nodeVersion, 'SHASUMS256.txt.asc');
         if (!fs.existsSync(shasums)) {
-            await pipeline(got_1.default.stream(`https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt.asc`), fs.createWriteStream(shasums));
+            await (0, promises_1.pipeline)(got_1.default.stream(`https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt.asc`), fs.createWriteStream(shasums));
         }
         const basedir = path.dirname(tarball);
         await fs.promises.mkdir(basedir, { recursive: true });
-        await pipeline(got_1.default.stream(url), fs.createWriteStream(tarball));
+        await (0, promises_1.pipeline)(got_1.default.stream(url), fs.createWriteStream(tarball));
         if (platform !== 'win32')
             await exec(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
     };

package/lib/upload-util.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debVersion = exports.debArch = exports.templateShortKey = exports.channelAWSDir = exports.commitAWSDir = void 0;
-const path = require("path");
+const path = require("node:path");
 function commitAWSDir(version, sha, s3Config) {
     let s3SubDir = s3Config.folder || '';
     if (s3SubDir !== '' && s3SubDir.slice(-1) !== '/')

package/lib/util.js

@@ -3,13 +3,13 @@ Object.defineProperty(exports, "__esModule", { value: true });
 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("crypto");
+const os = require("node:os");
+const crypto = require("node:crypto");
 const log_1 = require("./log");
 const fs = require("fs-extra");
-const child_process_1 = require("child_process");
+const node_child_process_1 = require("node:child_process");
 const util_1 = require("util");
-const exec = (0, util_1.promisify)(child_process_1.exec);
+const exec = (0, util_1.promisify)(node_child_process_1.exec);
 function castArray(input) {
     if (input === undefined)
         return [];

package/lib/version-indexes.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.appendToIndex = void 0;
 const fs = require("fs-extra");
-const path = require("path");
+const path = require("node:path");
 const aws_1 = require("./aws");
 const log_1 = require("./log");
 const debug = log_1.debug.new('version-indexes');

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "3.17.1",
+  "version": "4.0.0-beta.1",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run"
@@ -38,7 +38,7 @@
     "@types/lodash": "^4.14.191",
     "@types/lodash.template": "^4.5.0",
     "@types/mocha": "^8.2.3",
-    "@types/node": "^14.18.34",
+    "@types/node": "^18",
     "@types/semver": "^7.3.13",
     "@types/shelljs": "^0.8.11",
     "@types/yeoman-generator": "^5.2.11",
@@ -64,7 +64,7 @@
     "colors": "1.4.0"
   },
   "engines": {
-    "node": ">=12.0.0"
+    "node": ">=18.0.0"
   },
   "files": [
     ".oclif.manifest.json",
@@ -97,7 +97,7 @@
         "debounce": 60
       },
       "node": {
-        "version": "16.13.2"
+        "version": "18.17.1"
       },
       "s3": {
         "bucket": "dfc-data-production",