oclif 4.17.19 → 4.17.20

package/bin/dev.js

@@ -1,5 +1,6 @@
 #!/usr/bin/env ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
+
+// eslint-disable-next-line unicorn/prefer-top-level-await
 ;(async () => {
   const oclif = await import('@oclif/core')
   await oclif.execute({development: true, dir: __dirname})

package/lib/commands/generate.js

@@ -180,6 +180,21 @@ Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
         debug(`${moduleType} files %O`, moduleSpecificFiles);
         await Promise.all([...sharedFiles, ...moduleSpecificFiles].map(async (file) => {
             switch (file.name) {
+                case '.gitignore.ejs': {
+                    await this.template(file.src, file.destination, { packageManager });
+                    break;
+                }
+                case 'onPushToMain.yml.ejs':
+                case 'onRelease.yml.ejs':
+                case 'test.yml.ejs': {
+                    await this.template(file.src, file.destination, {
+                        exec: packageManager === 'yarn' ? packageManager : `${packageManager} exec`,
+                        install: packageManager === 'yarn' ? packageManager : `${packageManager} install`,
+                        packageManager,
+                        run: packageManager === 'yarn' ? packageManager : `${packageManager} run`,
+                    });
+                    break;
+                }
                 case 'package.json.ejs': {
                     const data = {
                         author,
@@ -195,25 +210,10 @@ Head to oclif.io/docs/introduction to learn more about building CLIs with oclif.
                     await this.template(file.src, file.destination, data);
                     break;
                 }
-                case '.gitignore.ejs': {
-                    await this.template(file.src, file.destination, { packageManager });
-                    break;
-                }
                 case 'README.md.ejs': {
                     await this.template(file.src, file.destination, { description, name, repository });
                     break;
                 }
-                case 'onPushToMain.yml.ejs':
-                case 'onRelease.yml.ejs':
-                case 'test.yml.ejs': {
-                    await this.template(file.src, file.destination, {
-                        exec: packageManager === 'yarn' ? packageManager : `${packageManager} exec`,
-                        install: packageManager === 'yarn' ? packageManager : `${packageManager} install`,
-                        packageManager,
-                        run: packageManager === 'yarn' ? packageManager : `${packageManager} run`,
-                    });
-                    break;
-                }
                 default: {
                     await this.template(file.src, file.destination);
                 }

package/lib/commands/manifest.js

@@ -32,12 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const os = __importStar(require("node:os"));
-const path = __importStar(require("node:path"));
+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");
@@ -70,7 +73,7 @@ class Manifest extends core_1.Command {
         }
         catch { }
         const { args } = await this.parse(Manifest);
-        const root = path.resolve(args.path);
+        const root = node_path_1.default.resolve(args.path);
         const packageJson = (0, fs_extra_1.readJSONSync)('package.json');
         let jitPluginManifests = [];
         if (flags.jit && packageJson.oclif?.jitPlugins) {
@@ -79,16 +82,16 @@ class Manifest extends core_1.Command {
             const { default: got } = await import('got');
             const promises = Object.entries(packageJson.oclif.jitPlugins).map(async ([jitPlugin, version]) => {
                 const pluginDir = jitPlugin.replace('/', '-').replace('@', '');
-                const fullPath = path.join(tmpDir, pluginDir);
+                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 = path.join(fullPath, path.basename(tarballUrl));
+                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));
                 await this.executeCommand(`tar -xzf "${tarball}"`, { cwd: fullPath });
-                const manifest = (await (0, fs_extra_1.readJSON)(path.join(fullPath, 'package', 'oclif.manifest.json')));
+                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';
                 }
@@ -123,7 +126,7 @@ class Manifest extends core_1.Command {
             });
         }
         const dotfile = plugin.pjson.files.find((f) => f.endsWith('.oclif.manifest.json'));
-        const file = path.join(plugin.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
+        const file = node_path_1.default.join(plugin.root, `${dotfile ? '.' : ''}oclif.manifest.json`);
         for (const manifest of jitPluginManifests) {
             plugin.manifest.commands = { ...plugin.manifest.commands, ...manifest.commands };
         }

package/lib/commands/pack/deb.js

@@ -32,12 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
 const node_child_process_1 = require("node:child_process");
 const fsPromises = __importStar(require("node:fs/promises"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -123,29 +126,29 @@ class PackDeb extends core_1.Command {
                 bin: config.bin,
                 versionShaRevision: (0, upload_util_1.debVersion)(buildConfig),
             });
-            const workspace = path.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
+            const workspace = node_path_1.default.join(buildConfig.tmp, 'apt', versionedDebBase.replace('.deb', '.apt'));
             await fs.remove(workspace);
             await Promise.all([
-                fsPromises.mkdir(path.join(workspace, 'DEBIAN'), { recursive: true }),
-                fsPromises.mkdir(path.join(workspace, 'usr', 'bin'), { recursive: true }),
+                fsPromises.mkdir(node_path_1.default.join(workspace, 'DEBIAN'), { recursive: true }),
+                fsPromises.mkdir(node_path_1.default.join(workspace, 'usr', 'bin'), { recursive: true }),
             ]);
-            await fs.copy(buildConfig.workspace(target), path.join(workspace, 'usr', 'lib', config.dirname));
+            await fs.copy(buildConfig.workspace(target), node_path_1.default.join(workspace, 'usr', 'lib', config.dirname));
             await Promise.all([
                 // usr/lib/oclif/bin/oclif (the executable)
-                fsPromises.writeFile(path.join(workspace, 'usr', 'lib', config.dirname, 'bin', config.bin), scripts.bin(config), { mode: 0o755 }),
-                fsPromises.writeFile(path.join(workspace, 'DEBIAN', 'control'), scripts.control(buildConfig, (0, upload_util_1.debArch)(arch))),
+                fsPromises.writeFile(node_path_1.default.join(workspace, 'usr', 'lib', config.dirname, 'bin', config.bin), scripts.bin(config), { mode: 0o755 }),
+                fsPromises.writeFile(node_path_1.default.join(workspace, 'DEBIAN', 'control'), scripts.control(buildConfig, (0, upload_util_1.debArch)(arch))),
             ]);
             // symlink usr/bin/oclif points to usr/lib/oclif/bin/oclif
-            await exec(`ln -s "${path.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${config.bin}"`, {
-                cwd: path.join(workspace, 'usr', 'bin'),
+            await exec(`ln -s "${node_path_1.default.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${config.bin}"`, {
+                cwd: node_path_1.default.join(workspace, 'usr', 'bin'),
             });
-            config.binAliases?.map((alias) => exec(`ln -sf "${path.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${alias}"`, {
-                cwd: path.join(workspace, 'usr', 'bin'),
+            config.binAliases?.map((alias) => exec(`ln -sf "${node_path_1.default.join('..', 'lib', config.dirname, 'bin', config.bin)}" "${alias}"`, {
+                cwd: node_path_1.default.join(workspace, 'usr', 'bin'),
             }));
             await exec(`sudo chown -R root "${workspace}"`);
             await exec(`sudo chgrp -R root "${workspace}"`);
             const dpkgDeb = flags.compression ? `dpkg-deb --build "-Z${flags.compression}"` : 'dpkg-deb --build';
-            await exec(`${dpkgDeb} "${workspace}" "${path.join(dist, versionedDebBase)}"`);
+            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));
@@ -170,8 +173,8 @@ class PackDeb extends core_1.Command {
 }
 exports.default = PackDeb;
 async function packForFTP(buildConfig, config, dist) {
-    const ftparchive = path.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
-    await fsPromises.mkdir(path.basename(ftparchive), { recursive: true });
+    const ftparchive = node_path_1.default.join(buildConfig.tmp, 'apt', 'apt-ftparchive.conf');
+    await fsPromises.mkdir(node_path_1.default.basename(ftparchive), { recursive: true });
     await fs.writeFile(ftparchive, scripts.ftparchive(config));
     await exec(`apt-ftparchive -c "${ftparchive}" release . > Release`, { cwd: dist });
 }

package/lib/commands/pack/macos.js

@@ -32,12 +32,15 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
 const node_child_process_1 = require("node:child_process");
 const os = __importStar(require("node:os"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -205,9 +208,9 @@ the CLI should already exist in a directory named after the CLI that is the root
             pruneLockfiles: flags['prune-lockfiles'],
             tarball: flags.tarball,
         });
-        const scriptsDir = path.join(buildConfig.tmp, 'macos/scripts');
+        const scriptsDir = node_path_1.default.join(buildConfig.tmp, 'macos/scripts');
         await fs.emptyDir(buildConfig.dist('macos'));
-        const noBundleConfigurationPath = path.join(buildConfig.tmp, 'macos', 'no-bundle.plist');
+        const noBundleConfigurationPath = node_path_1.default.join(buildConfig.tmp, 'macos', 'no-bundle.plist');
         const build = async (arch) => {
             const templateKey = (0, upload_util_1.templateShortKey)('macos', {
                 arch,
@@ -218,14 +221,14 @@ the CLI should already exist in a directory named after the CLI that is the root
             const dist = buildConfig.dist(`macos/${templateKey}`);
             const rootDir = buildConfig.workspace({ arch, platform: 'darwin' });
             const writeNoBundleConfiguration = async () => {
-                await fs.mkdir(path.dirname(noBundleConfigurationPath), { recursive: true });
+                await fs.mkdir(node_path_1.default.dirname(noBundleConfigurationPath), { recursive: true });
                 await fs.writeFile(noBundleConfigurationPath, noBundleConfiguration, { mode: 0o755 });
             };
             const writeScript = async (script) => {
                 const scriptLocation = script === 'uninstall' ? [rootDir, 'bin'] : [scriptsDir];
                 scriptLocation.push(script);
-                await fs.mkdir(path.dirname(path.join(...scriptLocation)), { recursive: true });
-                await fs.writeFile(path.join(...scriptLocation), scripts[script](config, flags['additional-cli']), {
+                await fs.mkdir(node_path_1.default.dirname(node_path_1.default.join(...scriptLocation)), { recursive: true });
+                await fs.writeFile(node_path_1.default.join(...scriptLocation), scripts[script](config, flags['additional-cli']), {
                     mode: 0o755,
                 });
             };

package/lib/commands/pack/win.js

@@ -32,13 +32,16 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const Tarballs = __importStar(require("../../tarballs"));
 const upload_util_1 = require("../../upload-util");
@@ -52,7 +55,7 @@ set ${additionalCLI ? `${additionalCLI.toUpperCase()}_BINPATH` : config.scopedEn
 if exist "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI ?? config.bin}.cmd" (
   "%LOCALAPPDATA%\\${config.dirname}\\client\\bin\\${additionalCLI ?? config.bin}.cmd" %*
 ) else (
-  "%~dp0\\..\\client\\bin\\node.exe" ${`${nodeOptions?.join(' ')} `}"%~dp0\\..\\client\\${additionalCLI ? `${additionalCLI}\\bin\\run` : 'bin\\run'}" %*
+  "%~dp0\\..\\client\\bin\\node.exe" ${`${nodeOptions?.join(' ')} `}"%~dp0\\..\\client\\${additionalCLI ? `${additionalCLI}\\bin\\run` : String.raw `bin\run`}" %*
 )
 `,
     nsis: ({ arch, config, customization, defenderOptional, hideDefenderOption, }) => `!include MUI2.nsh
@@ -285,13 +288,13 @@ the CLI should already exist in a directory named after the CLI that is the root
             tarball: flags.tarball,
         });
         await Promise.all(arches.map(async (arch) => {
-            const installerBase = path.join(buildConfig.tmp, `windows-${arch}-installer`);
+            const installerBase = node_path_1.default.join(buildConfig.tmp, `windows-${arch}-installer`);
             await (0, promises_1.rm)(installerBase, { force: true, recursive: true });
-            await (0, promises_1.mkdir)(path.join(installerBase, 'bin'), { recursive: true });
+            await (0, promises_1.mkdir)(node_path_1.default.join(installerBase, 'bin'), { recursive: true });
             await Promise.all([
-                (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config, undefined, buildConfig.nodeOptions)),
-                (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
-                (0, promises_1.writeFile)(path.join(installerBase, `${config.bin}.nsi`), scripts.nsis({
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${config.bin}.cmd`), scripts.cmd(config, undefined, buildConfig.nodeOptions)),
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${config.bin}`), scripts.sh(config)),
+                (0, promises_1.writeFile)(node_path_1.default.join(installerBase, `${config.bin}.nsi`), scripts.nsis({
                     arch,
                     config,
                     customization: nsisCustomization,
@@ -304,18 +307,18 @@ the CLI should already exist in a directory named after the CLI that is the root
                     // write duplicate files for windows aliases
                     // this avoids mklink which can require admin privileges which not everyone has
                     [
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${alias}.cmd`), scripts.cmd(config)),
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${alias}`), scripts.sh(config)),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${alias}.cmd`), scripts.cmd(config)),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${alias}`), scripts.sh(config)),
                     ])
                     : []),
                 ...(flags['additional-cli']
                     ? [
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${flags['additional-cli']}.cmd`), scripts.cmd(config, flags['additional-cli'])),
-                        (0, promises_1.writeFile)(path.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${flags['additional-cli']}.cmd`), scripts.cmd(config, flags['additional-cli'])),
+                        (0, promises_1.writeFile)(node_path_1.default.join(installerBase, 'bin', `${flags['additional-cli']}`), scripts.sh({ bin: flags['additional-cli'] })),
                     ]
                     : []),
             ]);
-            await (0, fs_extra_1.move)(buildConfig.workspace({ arch, platform: 'win32' }), path.join(installerBase, 'client'));
+            await (0, fs_extra_1.move)(buildConfig.workspace({ arch, platform: 'win32' }), node_path_1.default.join(installerBase, 'client'));
             await exec(`makensis "${installerBase}/${config.bin}.nsi" | grep -v "\\[compress\\]" | grep -v "^File: Descending to"`);
             const templateKey = (0, upload_util_1.templateShortKey)('win32', {
                 arch,
@@ -324,7 +327,7 @@ the CLI should already exist in a directory named after the CLI that is the root
                 version: config.version,
             });
             const o = buildConfig.dist(`win32/${templateKey}`);
-            await (0, fs_extra_1.move)(path.join(installerBase, 'installer.exe'), o);
+            await (0, fs_extra_1.move)(node_path_1.default.join(installerBase, 'installer.exe'), o);
             const { windows } = config.pjson.oclif;
             if (windows && windows.name && windows.keypath) {
                 await signWindows(o, arch, config, windows);

package/lib/commands/promote.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const client_s3_1 = require("@aws-sdk/client-s3");
 const core_1 = require("@oclif/core");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const aws_1 = __importDefault(require("../aws"));
 const Tarballs = __importStar(require("../tarballs"));
 const upload_util_1 = require("../upload-util");
@@ -86,8 +86,8 @@ class Promote extends core_1.Command {
             CacheControl: indexDefaults.maxAge,
             MetadataDirective: client_s3_1.MetadataDirective.REPLACE,
         };
-        const cloudBucketCommitKey = (shortKey) => path.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
-        const cloudChannelKey = (shortKey) => path.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
+        const cloudBucketCommitKey = (shortKey) => node_path_1.default.join(s3Config.bucket, (0, upload_util_1.commitAWSDir)(flags.version, flags.sha, s3Config), shortKey);
+        const cloudChannelKey = (shortKey) => node_path_1.default.join((0, upload_util_1.channelAWSDir)(flags.channel, s3Config), shortKey);
         // copy tarballs manifests
         const promoteManifest = async (target) => {
             const manifest = (0, upload_util_1.templateShortKey)('manifest', {

package/lib/commands/readme.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("fs-extra"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const readme_generator_1 = __importDefault(require("../readme-generator"));
 class Readme extends core_1.Command {
     static description = `The readme must have any of the following tags inside of it for it to be replaced or else it will do nothing:
@@ -98,8 +98,8 @@ Customize the code URL prefix by setting oclif.repositoryPrefix in package.json.
         const { flags } = await this.parse(Readme);
         this.flags = flags;
         this.flags['plugin-directory'] ??= process.cwd();
-        const readmePath = path.resolve(this.flags['plugin-directory'], flags['readme-path']);
-        const tsConfigPath = path.resolve(this.flags['plugin-directory'], flags['tsconfig-path']);
+        const readmePath = node_path_1.default.resolve(this.flags['plugin-directory'], flags['readme-path']);
+        const tsConfigPath = node_path_1.default.resolve(this.flags['plugin-directory'], flags['tsconfig-path']);
         if (await fs.pathExists(tsConfigPath)) {
             const { default: JSONC } = await import('tiny-jsonc');
             const tsConfigRaw = await fs.readFile(tsConfigPath, 'utf8');

package/lib/commands/upload/deb.js

@@ -38,7 +38,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const core_1 = require("@oclif/core");
 const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const aws_1 = __importDefault(require("../../aws"));
 const log_1 = require("../../log");
 const Tarballs = __importStar(require("../../tarballs"));
@@ -53,7 +53,7 @@ class UploadDeb extends core_1.Command {
         const { flags } = await this.parse(UploadDeb);
         const buildConfig = await Tarballs.buildConfig(flags.root);
         const { config, s3Config } = buildConfig;
-        const dist = (f) => buildConfig.dist(path.join('deb', f));
+        const dist = (f) => buildConfig.dist(node_path_1.default.join('deb', f));
         const S3Options = {
             ACL: s3Config.acl || 'public-read',
             Bucket: s3Config.bucket,

package/lib/generator.d.ts

@@ -27,15 +27,15 @@ export type GetFlagOrPromptOptions = {
      */
     type: 'input' | 'select';
 };
-export declare function exec(command: string, opts?: {
+export declare function exec(command: string, opts?: ExecOptions & {
     silent?: boolean;
-} & ExecOptions): Promise<{
+}): Promise<{
     stderr: string;
     stdout: string;
 }>;
-export declare function readPJSON(location: string): Promise<({
+export declare function readPJSON(location: string): Promise<(Interfaces.PJSON & {
     scripts: Record<string, string>;
-} & Interfaces.PJSON) | undefined>;
+}) | undefined>;
 export declare function makeFlags<T extends Record<string, FlaggablePrompt>>(flaggablePrompts: T): FlagsOfPrompts<T>;
 export declare abstract class GeneratorCommand<T extends typeof Command> extends Command {
     protected args: Args<T>;

package/lib/generator.js

@@ -99,28 +99,28 @@ class GeneratorCommand extends core_1.Command {
             }
         };
         switch (type) {
-            case 'select': {
+            case 'input': {
                 return (maybeFlag() ??
                     (await checkMaybeOtherValue()) ??
                     maybeDefault() ??
-                    // Dynamic import because @inquirer/select is ESM only. Once oclif is ESM, we can make this a normal import
+                    // Dynamic import because @inquirer/input is ESM only. Once oclif is ESM, we can make this a normal import
                     // so that we can avoid importing on every single question.
-                    (await import('@inquirer/select')).default({
-                        choices: (this.flaggablePrompts[name].options ?? []).map((o) => ({ name: o, value: o })),
+                    (await import('@inquirer/input')).default({
                         default: defaultValue,
                         message: this.flaggablePrompts[name].message,
+                        validate: this.flaggablePrompts[name].validate,
                     }));
             }
-            case 'input': {
+            case 'select': {
                 return (maybeFlag() ??
                     (await checkMaybeOtherValue()) ??
                     maybeDefault() ??
-                    // Dynamic import because @inquirer/input is ESM only. Once oclif is ESM, we can make this a normal import
+                    // Dynamic import because @inquirer/select is ESM only. Once oclif is ESM, we can make this a normal import
                     // so that we can avoid importing on every single question.
-                    (await import('@inquirer/input')).default({
+                    (await import('@inquirer/select')).default({
+                        choices: (this.flaggablePrompts[name].options ?? []).map((o) => ({ name: o, value: o })),
                         default: defaultValue,
                         message: this.flaggablePrompts[name].message,
-                        validate: this.flaggablePrompts[name].validate,
                     }));
             }
             default: {

package/lib/log.js

@@ -1,46 +1,13 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.debug = void 0;
 exports.log = log;
 const core_1 = require("@oclif/core");
-const util = __importStar(require("node:util"));
+const node_util_1 = require("node:util");
 const util_1 = require("./util");
 exports.debug = require('debug')('oclif');
 exports.debug.new = (name) => require('debug')(`oclif:${name}`);
 function log(format, ...args) {
     args = args.map((arg) => (0, util_1.prettifyPaths)(arg));
-    exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.ux.stdout(`oclif: ${util.format(format, ...args)}`);
+    return exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.ux.stdout(`oclif: ${(0, node_util_1.format)(format, ...args)}`);
 }

package/lib/readme-generator.js

@@ -227,6 +227,7 @@ USAGE
     /**
      * fetches the path to a command
      */
+    // eslint-disable-next-line complexity
     commandPath(plugin, c) {
         const strategy = typeof plugin.pjson.oclif?.commands === 'string' ? 'pattern' : plugin.pjson.oclif?.commands?.strategy;
         // if the strategy is explicit, we can't determine the path so return undefined

package/lib/tarballs/bin.js

@@ -32,11 +32,14 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.writeBinScripts = writeBinScripts;
 const node_child_process_1 = require("node:child_process");
 const fs = __importStar(require("node:fs"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 async function writeBinScripts({ baseWorkspace, config, nodeOptions, nodeVersion, }) {
@@ -44,7 +47,7 @@ async function writeBinScripts({ baseWorkspace, config, nodeOptions, nodeVersion
     const redirectedEnvVar = config.scopedEnvVarKey('REDIRECTED');
     const clientHomeEnvVar = config.scopedEnvVarKey('OCLIF_CLIENT_HOME');
     const writeWin32 = async (bin) => {
-        await fs.promises.writeFile(path.join(baseWorkspace, 'bin', `${bin}.cmd`), `@echo off
+        await fs.promises.writeFile(node_path_1.default.join(baseWorkspace, 'bin', `${bin}.cmd`), `@echo off
 setlocal enableextensions
 
 if not "%${redirectedEnvVar}%"=="1" if exist "%LOCALAPPDATA%\\${bin}\\client\\bin\\${bin}.cmd" (
@@ -65,7 +68,7 @@ if exist "%~dp0..\\bin\\node.exe" (
 `);
     };
     const writeUnix = async () => {
-        const bin = path.join(baseWorkspace, 'bin', config.bin);
+        const bin = node_path_1.default.join(baseWorkspace, 'bin', config.bin);
         await fs.promises.writeFile(bin, `#!/usr/bin/env bash
 set -e
 echoerr() { echo "$@" 1>&2; }
@@ -118,6 +121,6 @@ fi
         writeUnix(),
         ...(config.binAliases?.map((alias) => process.platform === 'win32'
             ? writeWin32(alias)
-            : exec(`ln -sf ${config.bin} ${alias}`, { cwd: path.join(baseWorkspace, 'bin') })) ?? []),
+            : exec(`ln -sf ${config.bin} ${alias}`, { cwd: node_path_1.default.join(baseWorkspace, 'bin') })) ?? []),
     ]);
 }

package/lib/tarballs/build.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -43,7 +10,7 @@ const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const path = __importStar(require("node:path"));
+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");
@@ -53,21 +20,24 @@ const bin_1 = require("./bin");
 const node_1 = require("./node");
 const exec = (0, node_util_1.promisify)(node_child_process_1.exec);
 const pack = async (from, to) => {
-    const cwd = path.dirname(from);
-    await (0, promises_1.mkdir)(path.dirname(to), { recursive: true });
-    (0, log_1.log)(`packing tarball from ${(0, util_1.prettifyPaths)(path.dirname(from))} to ${(0, util_1.prettifyPaths)(to)}`);
-    to.endsWith('gz')
-        ? await exec(`tar czf ${to} ${path.basename(from)}${process.platform === 'win32' ? ' --force-local' : ''}`, { cwd })
-        : await exec(`tar cfJ ${to} ${path.basename(from)}${process.platform === 'win32' ? ' --force-local' : ''}`, { cwd });
+    const cwd = node_path_1.default.dirname(from);
+    await (0, promises_1.mkdir)(node_path_1.default.dirname(to), { recursive: true });
+    (0, log_1.log)(`packing tarball from ${(0, util_1.prettifyPaths)(node_path_1.default.dirname(from))} to ${(0, util_1.prettifyPaths)(to)}`);
+    if (to.endsWith('gz')) {
+        return exec(`tar czf ${to} ${node_path_1.default.basename(from)}${process.platform === 'win32' ? ' --force-local' : ''}`, {
+            cwd,
+        });
+    }
+    await exec(`tar cfJ ${to} ${node_path_1.default.basename(from)}${process.platform === 'win32' ? ' --force-local' : ''}`, { cwd });
 };
 const isYarnProject = (yarnRootPath) => {
     const yarnLockFileName = 'yarn.lock';
-    const rootYarnLockFilePath = path.join(yarnRootPath, yarnLockFileName);
+    const rootYarnLockFilePath = node_path_1.default.join(yarnRootPath, yarnLockFileName);
     return (0, node_fs_1.existsSync)(rootYarnLockFilePath);
 };
 const copyYarnDirectory = async (relativePath, yarnRootPath, workspacePath) => {
-    const rootYarnDirectoryPath = path.join(yarnRootPath, relativePath);
-    const workspaceYarnDirectoryPath = path.join(workspacePath, relativePath);
+    const rootYarnDirectoryPath = node_path_1.default.join(yarnRootPath, relativePath);
+    const workspaceYarnDirectoryPath = node_path_1.default.join(workspacePath, relativePath);
     if ((0, node_fs_1.existsSync)(rootYarnDirectoryPath)) {
         // create the directory if it does not exist
         if (!(0, node_fs_1.existsSync)(workspaceYarnDirectoryPath)) {
@@ -80,15 +50,15 @@ const copyYarnDirectory = async (relativePath, yarnRootPath, workspacePath) => {
 const copyCoreYarnFiles = async (yarnRootPath, workspacePath) => {
     // copy yarn dependencies lock file
     const yarnLockFileName = 'yarn.lock';
-    const rootYarnLockFilePath = path.join(yarnRootPath, yarnLockFileName);
-    const workspaceYarnLockFilePath = path.join(workspacePath, yarnLockFileName);
+    const rootYarnLockFilePath = node_path_1.default.join(yarnRootPath, yarnLockFileName);
+    const workspaceYarnLockFilePath = node_path_1.default.join(workspacePath, yarnLockFileName);
     if ((0, node_fs_1.existsSync)(rootYarnLockFilePath)) {
         await (0, fs_extra_1.copy)(rootYarnLockFilePath, workspaceYarnLockFilePath);
     }
     // copy yarn configuration file
     const yarnConfigFileName = '.yarnrc.yml';
-    const rootYarnConfigFilePath = path.join(yarnRootPath, yarnConfigFileName);
-    const workspaceYarnConfigFilePath = path.join(workspacePath, yarnConfigFileName);
+    const rootYarnConfigFilePath = node_path_1.default.join(yarnRootPath, yarnConfigFileName);
+    const workspaceYarnConfigFilePath = node_path_1.default.join(workspacePath, yarnConfigFileName);
     if ((0, node_fs_1.existsSync)(rootYarnConfigFilePath)) {
         await (0, fs_extra_1.copy)(rootYarnConfigFilePath, workspaceYarnConfigFilePath);
     }
@@ -137,26 +107,26 @@ const isLockFile = (f) => f.endsWith('package-lock.json') ||
 /** recursively remove all lockfiles from tarball after installing dependencies */
 const removeLockfiles = async (c) => {
     const files = await (0, promises_1.readdir)(c.workspace(), { recursive: true });
-    const lockfiles = files.filter((f) => isLockFile(f)).map((f) => path.join(c.workspace(), f));
+    const lockfiles = files.filter((f) => isLockFile(f)).map((f) => node_path_1.default.join(c.workspace(), f));
     (0, log_1.log)(`removing ${lockfiles.length} lockfiles`);
     await Promise.all(lockfiles.map((f) => (0, fs_extra_1.remove)(f)));
 };
 /** runs the pretarball script from the cli being packed */
 const pretarball = async (c) => {
-    const pjson = await (0, fs_extra_1.readJSON)(path.join(c.workspace(), 'package.json'));
+    const pjson = await (0, fs_extra_1.readJSON)(node_path_1.default.join(c.workspace(), 'package.json'));
     if (!pjson.scripts.pretarball)
         return;
     const yarnRoot = (0, find_yarn_workspace_root_1.default)(c.root) || c.root;
     let script = 'npm run pretarball';
-    if ((0, node_fs_1.existsSync)(path.join(yarnRoot, 'yarn.lock')))
+    if ((0, node_fs_1.existsSync)(node_path_1.default.join(yarnRoot, 'yarn.lock')))
         script = 'yarn run pretarball';
-    else if ((0, node_fs_1.existsSync)(path.join(c.root, 'pnpm-lock.yaml')))
+    else if ((0, node_fs_1.existsSync)(node_path_1.default.join(c.root, 'pnpm-lock.yaml')))
         script = 'pnpm run pretarball';
     (0, log_1.log)(`running pretarball via ${script} in ${c.workspace()}`);
     await exec(script, { cwd: c.workspace() });
 };
 const updatePJSON = async (c) => {
-    const pjsonPath = path.join(c.workspace(), 'package.json');
+    const pjsonPath = node_path_1.default.join(c.workspace(), 'package.json');
     const pjson = await (0, fs_extra_1.readJSON)(pjsonPath);
     pjson.version = c.config.version;
     pjson.oclif.update = pjson.oclif.update ?? {};
@@ -188,35 +158,35 @@ const addDependencies = async (c) => {
             }
         }
     }
-    else if ((0, node_fs_1.existsSync)(path.join(c.root, 'pnpm-lock.yaml'))) {
-        await (0, fs_extra_1.copy)(path.join(c.root, 'pnpm-lock.yaml'), path.join(c.workspace(), 'pnpm-lock.yaml'));
+    else if ((0, node_fs_1.existsSync)(node_path_1.default.join(c.root, 'pnpm-lock.yaml'))) {
+        await (0, fs_extra_1.copy)(node_path_1.default.join(c.root, 'pnpm-lock.yaml'), node_path_1.default.join(c.workspace(), 'pnpm-lock.yaml'));
         await exec('pnpm install --production', { cwd: c.workspace() });
     }
     else {
-        const lockpath = (0, node_fs_1.existsSync)(path.join(c.root, 'package-lock.json'))
-            ? path.join(c.root, 'package-lock.json')
-            : path.join(c.root, 'npm-shrinkwrap.json');
-        await (0, fs_extra_1.copy)(lockpath, path.join(c.workspace(), path.basename(lockpath)));
+        const lockpath = (0, node_fs_1.existsSync)(node_path_1.default.join(c.root, 'package-lock.json'))
+            ? node_path_1.default.join(c.root, 'package-lock.json')
+            : node_path_1.default.join(c.root, 'npm-shrinkwrap.json');
+        await (0, fs_extra_1.copy)(lockpath, node_path_1.default.join(c.workspace(), node_path_1.default.basename(lockpath)));
         await exec('npm install --production', { cwd: c.workspace() });
     }
 };
 const packCLI = async (c) => {
     const { stdout } = await exec('npm pack --unsafe-perm', { cwd: c.root });
-    return path.join(c.root, stdout.trim().split('\n').pop());
+    return node_path_1.default.join(c.root, stdout.trim().split('\n').pop());
 };
 const extractCLI = async (tarball, c) => {
     const workspace = c.workspace();
     await (0, fs_extra_1.emptyDir)(workspace);
-    const tarballNewLocation = path.join(workspace, path.basename(tarball));
+    const tarballNewLocation = node_path_1.default.join(workspace, node_path_1.default.basename(tarball));
     await (0, fs_extra_1.move)(tarball, tarballNewLocation);
     const tarCommand = `tar -xzf "${tarballNewLocation}"${process.platform === 'win32' ? ' --force-local' : ''}`;
     await exec(tarCommand, { cwd: workspace });
-    const files = await (0, promises_1.readdir)(path.join(workspace, 'package'), { withFileTypes: true });
-    await Promise.all(files.map((i) => (0, fs_extra_1.move)(path.join(workspace, 'package', i.name), path.join(workspace, i.name))));
+    const files = await (0, promises_1.readdir)(node_path_1.default.join(workspace, 'package'), { withFileTypes: true });
+    await Promise.all(files.map((i) => (0, fs_extra_1.move)(node_path_1.default.join(workspace, 'package', i.name), node_path_1.default.join(workspace, i.name))));
     await Promise.all([
-        (0, promises_1.rm)(path.join(workspace, 'package'), { recursive: true }),
-        (0, promises_1.rm)(path.join(workspace, path.basename(tarball)), { recursive: true }),
-        (0, fs_extra_1.remove)(path.join(workspace, 'bin', 'run.cmd')),
+        (0, promises_1.rm)(node_path_1.default.join(workspace, 'package'), { recursive: true }),
+        (0, promises_1.rm)(node_path_1.default.join(workspace, node_path_1.default.basename(tarball)), { recursive: true }),
+        (0, fs_extra_1.remove)(node_path_1.default.join(workspace, 'bin', 'run.cmd')),
     ]);
 };
 const buildTarget = async (target, c, options) => {
@@ -230,7 +200,7 @@ const buildTarget = async (target, c, options) => {
     const { gitSha: sha } = c;
     const templateShortKeyCommonOptions = { arch, bin, platform, sha, version };
     const [gzLocalKey, xzLocalKey] = ['.tar.gz', '.tar.xz'].map((ext) => (0, upload_util_1.templateShortKey)('versioned', { ...templateShortKeyCommonOptions, ext }));
-    const base = path.basename(gzLocalKey);
+    const base = node_path_1.default.basename(gzLocalKey);
     (0, log_1.log)(`building target ${base}`);
     (0, log_1.log)('copying workspace', c.workspace(), workspace);
     await (0, fs_extra_1.emptyDir)(workspace);
@@ -238,9 +208,9 @@ const buildTarget = async (target, c, options) => {
     await (0, node_1.fetchNodeBinary)({
         arch,
         nodeVersion: c.nodeVersion,
-        output: path.join(workspace, 'bin', 'node'),
+        output: node_path_1.default.join(workspace, 'bin', 'node'),
         platform,
-        tmp: path.join(c.config.root, 'tmp'),
+        tmp: node_path_1.default.join(c.config.root, 'tmp'),
     });
     if (options.pack === false)
         return;

package/lib/tarballs/config.d.ts

@@ -1,17 +1,17 @@
 import { ObjectCannedACL } from '@aws-sdk/client-s3';
 import { Interfaces } from '@oclif/core';
 export declare const TARGETS: string[];
-export type S3Config = {
+export type S3Config = BuildConfig['updateConfig']['s3'] & {
     acl?: ObjectCannedACL;
 } & {
     folder?: string;
     indexVersionLimit?: number;
-} & BuildConfig['updateConfig']['s3'];
-export type UpdateConfig = {
-    s3?: {
+};
+export type UpdateConfig = Interfaces.OclifConfiguration['update'] & {
+    s3?: Interfaces.S3 & {
         acl?: ObjectCannedACL;
-    } & Interfaces.S3;
-} & Interfaces.OclifConfiguration['update'];
+    };
+};
 export type BuildConfig = {
     config: Interfaces.Config;
     dist(input: string): string;

package/lib/tarballs/config.js

@@ -32,6 +32,9 @@ var __importStar = (this && this.__importStar) || (function () {
         return result;
     };
 })();
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.TARGETS = void 0;
 exports.gitSha = gitSha;
@@ -39,7 +42,7 @@ exports.buildConfig = buildConfig;
 const core_1 = require("@oclif/core");
 const node_child_process_1 = require("node:child_process");
 const promises_1 = require("node:fs/promises");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const node_util_1 = require("node:util");
 const semver = __importStar(require("semver"));
 const upload_util_1 = require("../upload-util");
@@ -61,12 +64,12 @@ async function gitSha(cwd, options = {}) {
     return stdout.trim();
 }
 async function Tmp(config) {
-    const tmp = path.join(config.root, 'tmp');
+    const tmp = node_path_1.default.join(config.root, 'tmp');
     await (0, promises_1.mkdir)(tmp, { recursive: true });
     return tmp;
 }
 async function buildConfig(root, options = {}) {
-    const config = await core_1.Config.load({ devPlugins: false, root: path.resolve(root), userPlugins: false });
+    const config = await core_1.Config.load({ devPlugins: false, root: node_path_1.default.resolve(root), userPlugins: false });
     root = config.root;
     const _gitSha = await gitSha(root, { short: true });
     // eslint-disable-next-line new-cap
@@ -93,7 +96,7 @@ async function buildConfig(root, options = {}) {
     };
     return {
         config,
-        dist: (...args) => path.join(config.root, 'dist', ...args),
+        dist: (...args) => node_path_1.default.join(config.root, 'dist', ...args),
         gitSha: _gitSha,
         nodeOptions,
         nodeVersion,
@@ -103,10 +106,10 @@ async function buildConfig(root, options = {}) {
         tmp,
         updateConfig,
         workspace(target) {
-            const base = path.join(config.root, 'tmp');
+            const base = node_path_1.default.join(config.root, 'tmp');
             if (target && target.platform)
-                return path.join(base, [target.platform, target.arch].join('-'), (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
-            return path.join(base, (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
+                return node_path_1.default.join(base, [target.platform, target.arch].join('-'), (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
+            return node_path_1.default.join(base, (0, upload_util_1.templateShortKey)('baseDir', { bin: config.bin }));
         },
         xz: options?.xz ?? updateConfig?.s3?.xz ?? true,
     };

package/lib/tarballs/node.js

@@ -1,37 +1,4 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -42,7 +9,7 @@ const fs_extra_1 = require("fs-extra");
 const node_child_process_1 = require("node:child_process");
 const node_fs_1 = require("node:fs");
 const promises_1 = require("node:fs/promises");
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const promises_2 = require("node:stream/promises");
 const node_util_1 = require("node:util");
 const log_1 = require("../log");
@@ -53,44 +20,44 @@ async function fetchNodeBinary({ arch, nodeVersion, output, platform, tmp }) {
     if (arch === 'arm')
         arch = 'armv7l';
     let nodeBase = `node-v${nodeVersion}-${platform}-${arch}`;
-    let tarball = path.join(tmp, 'node', `${nodeBase}.tar.xz`);
+    let tarball = node_path_1.default.join(tmp, 'node', `${nodeBase}.tar.xz`);
     let url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.tar.xz`;
     if (platform === 'win32') {
         await (0, util_1.checkFor7Zip)();
         nodeBase = `node-v${nodeVersion}-win-${arch}`;
-        tarball = path.join(tmp, 'node', `${nodeBase}.7z`);
+        tarball = node_path_1.default.join(tmp, 'node', `${nodeBase}.7z`);
         url = `https://nodejs.org/dist/v${nodeVersion}/${nodeBase}.7z`;
         output += '.exe';
     }
-    let cache = path.join(tmp, 'cache', `node-v${nodeVersion}-${platform}-${arch}`);
+    let cache = node_path_1.default.join(tmp, 'cache', `node-v${nodeVersion}-${platform}-${arch}`);
     if (platform === 'win32')
         cache += '.exe';
     const download = async () => {
         (0, log_1.log)(`downloading ${nodeBase} (${url})`);
-        await Promise.all([(0, fs_extra_1.ensureDir)(path.join(tmp, 'cache', nodeVersion)), (0, fs_extra_1.ensureDir)(path.join(tmp, 'node'))]);
-        const shasums = path.join(tmp, 'cache', nodeVersion, 'SHASUMS256.txt.asc');
+        await Promise.all([(0, fs_extra_1.ensureDir)(node_path_1.default.join(tmp, 'cache', nodeVersion)), (0, fs_extra_1.ensureDir)(node_path_1.default.join(tmp, 'node'))]);
+        const shasums = node_path_1.default.join(tmp, 'cache', nodeVersion, 'SHASUMS256.txt.asc');
         const { default: got } = await import('got');
         if (!(0, node_fs_1.existsSync)(shasums)) {
             await (0, promises_2.pipeline)(got.stream(`https://nodejs.org/dist/v${nodeVersion}/SHASUMS256.txt.asc`), (0, node_fs_1.createWriteStream)(shasums));
         }
-        const basedir = path.dirname(tarball);
+        const basedir = node_path_1.default.dirname(tarball);
         await (0, promises_1.mkdir)(basedir, { recursive: true });
         await (0, promises_2.pipeline)(got.stream(url), (0, node_fs_1.createWriteStream)(tarball));
         if (platform !== 'win32')
-            await exec(`grep "${path.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
+            await exec(`grep "${node_path_1.default.basename(tarball)}" "${shasums}" | shasum -a 256 -c -`, { cwd: basedir });
     };
     const extract = async () => {
         (0, log_1.log)(`extracting ${nodeBase}`);
-        const nodeTmp = path.join(tmp, 'node');
+        const nodeTmp = node_path_1.default.join(tmp, 'node');
         await (0, promises_1.mkdir)(nodeTmp, { recursive: true });
-        await (0, promises_1.mkdir)(path.dirname(cache), { recursive: true });
+        await (0, promises_1.mkdir)(node_path_1.default.dirname(cache), { recursive: true });
         if (platform === 'win32') {
             await exec(`7z x -bd -y "${tarball}"`, { cwd: nodeTmp });
-            await (0, fs_extra_1.move)(path.join(nodeTmp, nodeBase, 'node.exe'), path.join(cache, 'node.exe'));
+            await (0, fs_extra_1.move)(node_path_1.default.join(nodeTmp, nodeBase, 'node.exe'), node_path_1.default.join(cache, 'node.exe'));
         }
         else {
             await exec(`tar -C "${tmp}/node" -xJf "${tarball}"`);
-            await (0, fs_extra_1.move)(path.join(nodeTmp, nodeBase, 'bin', 'node'), path.join(cache, 'node'));
+            await (0, fs_extra_1.move)(node_path_1.default.join(nodeTmp, nodeBase, 'bin', 'node'), node_path_1.default.join(cache, 'node'));
         }
     };
     if (!(0, node_fs_1.existsSync)(cache)) {
@@ -105,7 +72,7 @@ async function fetchNodeBinary({ arch, nodeVersion, output, platform, tmp }) {
         });
         await extract();
     }
-    await (0, fs_extra_1.copy)(path.join(cache, getFilename(platform)), output);
+    await (0, fs_extra_1.copy)(node_path_1.default.join(cache, getFilename(platform)), output);
     return output;
 }
 const getFilename = (platform) => (platform === 'win32' ? 'node.exe' : 'node');

package/lib/upload-util.d.ts

@@ -2,14 +2,14 @@ import { Interfaces } from '@oclif/core';
 import { BuildConfig as TarballConfig } from './tarballs/config';
 export declare function commitAWSDir(version: string, sha: string, s3Config: TarballConfig['s3Config']): string;
 export declare function channelAWSDir(channel: string, s3Config: TarballConfig['s3Config']): string;
-type TemplateOptions = {
+type TemplateOptions = Interfaces.Config.s3Key.Options | {
     arch?: DebArch | Interfaces.ArchTypes;
     bin?: string;
     ext?: '.tar.gz' | '.tar.xz';
     sha?: string;
     version?: string;
     versionShaRevision?: string;
-} | Interfaces.Config.s3Key.Options;
+};
 export declare function templateShortKey(type: 'deb' | 'macos' | 'win32' | keyof Interfaces.S3Templates, options?: TemplateOptions): string;
 export type DebArch = 'amd64' | 'arm64' | 'armel' | 'i386';
 export declare function debArch(arch: Interfaces.ArchTypes): DebArch;

package/lib/util.js

@@ -116,7 +116,7 @@ const sortVersionsObjectByKeysDesc = (input) => {
     return result;
 };
 exports.sortVersionsObjectByKeysDesc = sortVersionsObjectByKeysDesc;
-const homeRegexp = new RegExp(`\\B${os.homedir().replace('/', '\\/')}`, 'g');
+const homeRegexp = new RegExp(`\\B${os.homedir().replace('/', String.raw `\/`)}`, 'g');
 const curRegexp = new RegExp(`\\B${process.cwd()}`, 'g');
 const prettifyPaths = (input) => (input ?? '').toString().replace(curRegexp, '.').replace(homeRegexp, '~');
 exports.prettifyPaths = prettifyPaths;

package/lib/version-indexes.js

@@ -39,7 +39,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.appendToIndex = void 0;
 const client_s3_1 = require("@aws-sdk/client-s3");
 const fs = __importStar(require("fs-extra"));
-const path = __importStar(require("node:path"));
+const node_path_1 = __importDefault(require("node:path"));
 const aws_1 = __importDefault(require("./aws"));
 const log_1 = require("./log");
 const debug = log_1.debug.new('version-indexes');
@@ -81,7 +81,7 @@ const appendToIndex = async (input) => {
     // json-friendly filenames like sfdx-linux-x64-tar-gz
     const jsonFileName = `${filename.replaceAll('.', '-')}.json`;
     // folder is optional, but honored if present
-    const key = path.join(s3Config.folder ?? '', 'versions', jsonFileName);
+    const key = node_path_1.default.join(s3Config.folder ?? '', 'versions', jsonFileName);
     // retrieve existing index file
     let existing = {};
     try {

package/oclif.manifest.json

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.17.19",
+  "version": "4.17.20",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -35,6 +35,7 @@
   },
   "devDependencies": {
     "@commitlint/config-conventional": "^19",
+    "@eslint/compat": "^1.2.5",
     "@oclif/plugin-legacy": "^2.0.19",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
@@ -53,11 +54,10 @@
     "@types/validate-npm-package-name": "^4.0.2",
     "chai": "^4.5.0",
     "commitlint": "^19",
-    "eslint": "^8.57.1",
-    "eslint-config-oclif": "^5.2.2",
-    "eslint-config-oclif-typescript": "^3.1.13",
-    "eslint-config-prettier": "^9.0.0",
-    "eslint-plugin-perfectionist": "^2.11.0",
+    "eslint": "^9",
+    "eslint-config-oclif": "^6",
+    "eslint-config-prettier": "^10",
+    "eslint-plugin-perfectionist": "^4",
     "husky": "^9.1.7",
     "lint-staged": "^15",
     "mocha": "^10.8.2",
@@ -74,9 +74,9 @@
   },
   "files": [
     "oclif.manifest.json",
-    "/bin",
-    "/lib",
-    "/templates"
+    "./bin",
+    "./lib",
+    "./templates"
   ],
   "homepage": "https://github.com/oclif/oclif",
   "keywords": [
@@ -129,7 +129,7 @@
     "commitlint": "commitlint",
     "compile": "tsc",
     "format": "prettier --write \"+(src|test)/**/*.+(ts|js|json)\"",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint",
     "postpack": "shx rm oclif.manifest.json",
     "posttest": "yarn run lint",
     "prepack": "yarn build && bin/run.js manifest",

package/templates/cli/commonjs/bin/dev.js.ejs

@@ -1,5 +1,6 @@
 #!/usr/bin/env node_modules/.bin/ts-node
-// eslint-disable-next-line node/shebang, unicorn/prefer-top-level-await
+
+// eslint-disable-next-line unicorn/prefer-top-level-await
 ;(async () => {
   const oclif = await import('@oclif/core')
   await oclif.execute({development: true, dir: __dirname})

package/templates/cli/commonjs/eslint.config.mjs.ejs

@@ -0,0 +1,19 @@
+import {includeIgnoreFile} from '@eslint/compat'
+import oclif from 'eslint-config-oclif'
+import prettier from 'eslint-config-prettier'
+import path from 'node:path'
+import {fileURLToPath} from 'node:url'
+
+const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore')
+
+export default [
+  includeIgnoreFile(gitignorePath),
+  ...oclif,
+  prettier,
+  {
+    rules: {
+      // Turn off to support Node 18. You can remove this rule if you don't need to support Node 18.
+      'unicorn/prefer-module': 'off',
+    }
+  }
+]

package/templates/cli/esm/bin/dev.js.ejs

@@ -1,6 +1,5 @@
 #!/usr/bin/env -S node --loader ts-node/esm --disable-warning=ExperimentalWarning
 
-// eslint-disable-next-line n/shebang
 import {execute} from '@oclif/core'
 
 await execute({development: true, dir: import.meta.url})

package/templates/cli/esm/eslint.config.mjs.ejs

@@ -0,0 +1,9 @@
+import {includeIgnoreFile} from '@eslint/compat'
+import oclif from 'eslint-config-oclif'
+import prettier from 'eslint-config-prettier'
+import path from 'node:path'
+import {fileURLToPath} from 'node:url'
+
+const gitignorePath = path.resolve(path.dirname(fileURLToPath(import.meta.url)), '.gitignore')
+
+export default [includeIgnoreFile(gitignorePath), ...oclif, prettier]

package/templates/cli/shared/package.json.ejs

@@ -13,16 +13,16 @@
     "@oclif/plugin-plugins": "^5"
   },
   "devDependencies": {
+    "@eslint/compat": "^1",
     "@oclif/prettier-config": "^0.2.1",
     "@oclif/test": "^4",
     "@types/chai": "^4",
     "@types/mocha": "^10",
     "@types/node": "^18",
     "chai": "^4",
-    "eslint": "^8",
-    "eslint-config-oclif": "^5",
-    "eslint-config-oclif-typescript": "^3",
-    "eslint-config-prettier": "^9",
+    "eslint": "^9",
+    "eslint-config-oclif": "^6",
+    "eslint-config-prettier": "^10",
     "mocha": "^10",
     "oclif": "^4",
     "shx": "^0.3.3",
@@ -33,9 +33,9 @@
     "node": ">=18.0.0"
   },
   "files": [
-    "/bin",
-    "/dist",
-    "/oclif.manifest.json"
+    "./bin",
+    "./dist",
+    "./oclif.manifest.json"
   ],
   "homepage": "https://github.com/<%- owner %>/<%- repository %>",
   "keywords": [
@@ -62,7 +62,7 @@
   "repository": "<%- owner %>/<%- repository %>",
   "scripts": {
     "build": "shx rm -rf dist && tsc -b",
-    "lint": "eslint . --ext .ts",
+    "lint": "eslint",
     "postpack": "shx rm -f oclif.manifest.json",
     "posttest": "<%- pkgManagerScript %> lint",
     "prepack": "oclif manifest && oclif readme",

package/templates/cli/shared/src/commands/hello/index.ts.ejs

@@ -4,15 +4,12 @@ export default class Hello extends Command {
   static args = {
     person: Args.string({description: 'Person to say hello to', required: true}),
   }
-
   static description = 'Say hello'
-
   static examples = [
     `<%%= config.bin %> <%%= command.id %> friend --from oclif
 hello friend from oclif! (./src/commands/hello/index.ts)
 `,
   ]
-
   static flags = {
     from: Flags.string({char: 'f', description: 'Who is saying hello', required: true}),
   }

package/templates/cli/shared/src/commands/hello/world.ts.ejs

@@ -2,15 +2,12 @@ import {Command} from '@oclif/core'
 
 export default class World extends Command {
   static args = {}
-
   static description = 'Say hello world'
-
   static examples = [
     `<%%= config.bin %> <%%= command.id %>
 hello world! (./src/commands/hello/world.ts)
 `,
   ]
-
   static flags = {}
 
   async run(): Promise<void> {

package/templates/src/command.ts.ejs

@@ -4,13 +4,10 @@ export default class <%- className %> extends Command {
   static override args = {
     file: Args.string({description: 'file to read'}),
   }
-
   static override description = 'describe the command here'
-
   static override examples = [
     '<%%= config.bin %> <%%= command.id %>',
   ]
-
   static override flags = {
     // flag with no value (-f, --force)
     force: Flags.boolean({char: 'f'}),

package/templates/cli/shared/.eslintignore.ejs

@@ -1 +0,0 @@
-/dist

package/templates/cli/shared/.eslintrc.json.ejs

@@ -1,3 +0,0 @@
-{
-  "extends": ["oclif", "oclif-typescript", "prettier"]
-}