oclif 4.11.3 → 4.12.0

package/lib/commands/generate/command.d.ts

@@ -1,12 +1,12 @@
 import { GeneratorCommand } from '../../generator';
 export default class GenerateCommand extends GeneratorCommand<typeof GenerateCommand> {
     static args: {
-        name: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static flags: {
-        'commands-dir': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        'commands-dir': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/generate/hook.d.ts

@@ -1,12 +1,12 @@
 import { GeneratorCommand } from '../../generator';
 export default class GenerateHook extends GeneratorCommand<typeof GenerateHook> {
     static args: {
-        name: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static flags: {
-        event: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        force: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        event: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        force: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/generate/hook.js

@@ -65,10 +65,7 @@ class GenerateHook extends generator_1.GeneratorCommand {
         const outDir = tsConfig.compilerOptions?.outDir ?? 'dist';
         const hooks = packageJSON.oclif?.hooks ?? {};
         hooks[this.flags.event] = hooks[this.flags.event]
-            ? (0, util_1.uniq)([
-                ...(0, util_1.castArray)(hooks[this.flags.event]),
-                `./${outDir}/hooks/${this.flags.event}/${this.args.name}`,
-            ]).sort()
+            ? (0, util_1.uniq)([...(0, util_1.castArray)(hooks[this.flags.event]), `./${outDir}/hooks/${this.flags.event}/${this.args.name}`]).sort()
             : `./${outDir}/hooks/${this.flags.event}/${this.args.name}`;
         const updatedPackageJSON = {
             ...packageJSON,

package/lib/commands/generate.d.ts

@@ -1,7 +1,7 @@
 import { GeneratorCommand } from '../generator';
 export default class Generate extends GeneratorCommand<typeof Generate> {
     static args: {
-        name: import("@oclif/core/lib/interfaces").Arg<string, Record<string, unknown>>;
+        name: import("@oclif/core/interfaces").Arg<string, Record<string, unknown>>;
     };
     static description: string;
     static examples: {
@@ -49,17 +49,17 @@ export default class Generate extends GeneratorCommand<typeof Generate> {
         };
     };
     static flags: {
-        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        yes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        name: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        description: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        repository: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        bin: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        author: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        license: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "module-type": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        owner: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "package-manager": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'output-dir': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        name: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        description: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        repository: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        bin: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        author: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        license: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        "module-type": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        owner: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        "package-manager": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static summary: string;
     run(): Promise<void>;

package/lib/commands/init.d.ts

@@ -27,12 +27,12 @@ export default class Generate extends GeneratorCommand<typeof Generate> {
         };
     };
     static flags: {
-        'output-dir': import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        yes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        bin: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "module-type": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "package-manager": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        "topic-separator": import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        'output-dir': import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        yes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        bin: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        "module-type": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        "package-manager": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        "topic-separator": import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     static summary: string;
     run(): Promise<void>;

package/lib/commands/manifest.js

@@ -100,6 +100,7 @@ class Manifest extends core_1.Command {
         await plugin.load();
         if (!plugin.valid) {
             const { PluginLegacy } = await import('@oclif/plugin-legacy');
+            // @ts-expect-error for now because PluginLegacy doesn't use the same major of @oclif/core
             plugin = new PluginLegacy(this.config, plugin);
             await plugin.load();
         }

package/lib/commands/pack/deb.d.ts

@@ -2,7 +2,7 @@ import { Command, Interfaces } from '@oclif/core';
 export default class PackDeb extends Command {
     static description: string;
     static flags: {
-        compression: Interfaces.OptionFlag<"xz" | "gzip" | "none" | "zstd" | undefined, Interfaces.CustomOptions>;
+        compression: Interfaces.OptionFlag<"xz" | "none" | "gzip" | "zstd" | undefined, Interfaces.CustomOptions>;
         'prune-lockfiles': Interfaces.BooleanFlag<boolean>;
         root: Interfaces.OptionFlag<string, Interfaces.CustomOptions>;
         tarball: Interfaces.OptionFlag<string | undefined, Interfaces.CustomOptions>;

package/lib/commands/pack/tarballs.d.ts

@@ -2,12 +2,12 @@ import { Command } from '@oclif/core';
 export default class PackTarballs extends Command {
     static description: string;
     static flags: {
-        parallel: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'prune-lockfiles': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        tarball: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        parallel: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'prune-lockfiles': import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        tarball: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        targets: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        xz: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     static summary: string;
     run(): Promise<void>;

package/lib/commands/pack/win.js

@@ -341,6 +341,9 @@ the CLI should already exist in a directory named after the CLI that is the root
 }
 exports.default = PackWin;
 async function signWindows(o, arch, config, windows) {
+    if (!windows) {
+        throw new Error('windows not set in oclif configuration');
+    }
     const buildLocationUnsigned = o.replace(`${arch}.exe`, `${arch}-unsigned.exe`);
     await (0, fs_extra_1.move)(o, buildLocationUnsigned);
     const pass = config.scopedEnvVar('WINDOWS_SIGNING_PASS');

package/lib/commands/promote.d.ts

@@ -2,17 +2,17 @@ import { Command } from '@oclif/core';
 export default class Promote extends Command {
     static description: string;
     static flags: {
-        channel: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        deb: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        indexes: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        macos: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        'max-age': import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        sha: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
-        version: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        win: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
-        xz: import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+        channel: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        deb: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        indexes: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        macos: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        'max-age': import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        sha: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        targets: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
+        version: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        win: import("@oclif/core/interfaces").BooleanFlag<boolean>;
+        xz: import("@oclif/core/interfaces").BooleanFlag<boolean>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/deb.d.ts

@@ -2,7 +2,7 @@ import { Command } from '@oclif/core';
 export default class UploadDeb extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
+        root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/commands/upload/win.d.ts

@@ -2,8 +2,8 @@ import { Command } from '@oclif/core';
 export default class UploadWin extends Command {
     static description: string;
     static flags: {
-        root: import("@oclif/core/lib/interfaces").OptionFlag<string, import("@oclif/core/lib/interfaces").CustomOptions>;
-        targets: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined, import("@oclif/core/lib/interfaces").CustomOptions>;
+        root: import("@oclif/core/interfaces").OptionFlag<string, import("@oclif/core/interfaces").CustomOptions>;
+        targets: import("@oclif/core/interfaces").OptionFlag<string | undefined, import("@oclif/core/interfaces").CustomOptions>;
     };
     run(): Promise<void>;
 }

package/lib/generator.d.ts

@@ -36,7 +36,7 @@ export declare function exec(command: string, opts?: {
 }>;
 export declare function readPJSON(location: string): Promise<({
     scripts: Record<string, string>;
-} & Interfaces.PJSON.CLI) | undefined>;
+} & Interfaces.PJSON) | 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

@@ -4,7 +4,6 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.GeneratorCommand = exports.makeFlags = exports.readPJSON = exports.exec = void 0;
-/* eslint-disable unicorn/no-await-expression-member */
 const core_1 = require("@oclif/core");
 const chalk_1 = __importDefault(require("chalk"));
 const ejs_1 = require("ejs");
@@ -17,7 +16,7 @@ async function exec(command, opts) {
     const silent = opts ? opts.silent : true;
     return new Promise((resolve, reject) => {
         if (!silent)
-            core_1.ux.log(chalk_1.default.dim(command));
+            core_1.ux.stdout(chalk_1.default.dim(command));
         const p = (0, node_child_process_1.exec)(command, opts ?? {}, (err, stdout, stderr) => {
             if (err)
                 return reject(err);

package/lib/log.js

@@ -31,6 +31,6 @@ 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.log(`oclif: ${util.format(format, ...args)}`);
+    exports.debug.enabled ? (0, exports.debug)(format, ...args) : core_1.ux.stdout(`oclif: ${util.format(format, ...args)}`);
 }
 exports.log = log;

package/lib/readme-generator.js

@@ -179,7 +179,7 @@ class ReadmeGenerator {
             if (readme.includes(`<!-- ${tag}stop -->`)) {
                 readme = readme.replace(new RegExp(`<!-- ${tag} -->(.|\n)*<!-- ${tag}stop -->`, 'm'), `<!-- ${tag} -->`);
             }
-            core_1.ux.log(`replacing <!-- ${tag} --> in ${this.options.readmePath}`);
+            core_1.ux.stdout(`replacing <!-- ${tag} --> in ${this.options.readmePath}`);
         }
         return readme.replace(`<!-- ${tag} -->`, `<!-- ${tag} -->\n${body}\n<!-- ${tag}stop -->`);
     }

package/lib/tarballs/build.js

@@ -227,7 +227,7 @@ const buildTarget = async (target, c, options) => {
         if (c.xz)
             await pack(workspace, c.dist(xzLocalKey));
     }
-    if (!c.updateConfig.s3.host)
+    if (!c.updateConfig.s3?.host)
         return;
     const rollout = typeof c.updateConfig.autoupdate === 'object' && c.updateConfig.autoupdate.rollout;
     const gzCloudKey = `${(0, upload_util_1.commitAWSDir)(version, sha, c.updateConfig.s3)}/${gzLocalKey}`;

package/lib/tarballs/config.d.ts

@@ -10,8 +10,8 @@ export type S3Config = {
 export type UpdateConfig = {
     s3?: {
         acl?: ObjectCannedACL;
-    } & BuildConfig['config']['pjson']['oclif']['update']['s3'];
-} & BuildConfig['config']['pjson']['oclif']['update'];
+    } & Interfaces.S3;
+} & Interfaces.OclifConfiguration['update'];
 export type BuildConfig = {
     config: Interfaces.Config;
     dist(input: string): string;

package/lib/tarballs/config.js

@@ -53,9 +53,9 @@ async function buildConfig(root, options = {}) {
     const tmp = await Tmp(config);
     const updateConfig = (config.pjson.oclif.update || {});
     updateConfig.s3 = updateConfig.s3 || {};
-    const nodeVersion = updateConfig.node.version || process.versions.node;
-    const nodeOptions = (0, util_1.castArray)(updateConfig.node.options ?? []);
-    const targets = (0, util_1.compact)(options.targets || updateConfig.node.targets || exports.TARGETS)
+    const nodeVersion = updateConfig.node?.version || process.versions.node;
+    const nodeOptions = (0, util_1.castArray)((updateConfig.node ?? {}).options ?? []);
+    const targets = (0, util_1.compact)(options.targets || updateConfig.node?.targets || exports.TARGETS)
         .filter((t) => {
         if (t === 'darwin-arm64' && semver.lt(nodeVersion, '16.0.0')) {
             core_1.ux.warn('darwin-arm64 is only supported for node >=16.0.0. Skipping...');

package/lib/upload-util.d.ts

@@ -10,7 +10,7 @@ type TemplateOptions = {
     version?: string;
     versionShaRevision?: string;
 } | Interfaces.Config.s3Key.Options;
-export declare function templateShortKey(type: 'deb' | 'macos' | 'win32' | keyof Interfaces.PJSON.S3.Templates, options?: TemplateOptions): string;
+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;
 export declare function debVersion(buildConfig: TarballConfig): string;

package/oclif.manifest.json

@@ -1080,5 +1080,5 @@
       ]
     }
   },
-  "version": "4.11.3"
+  "version": "4.12.0"
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "oclif",
   "description": "oclif: create your own CLI",
-  "version": "4.11.3",
+  "version": "4.12.0",
   "author": "Salesforce",
   "bin": {
     "oclif": "bin/run.js"
@@ -13,7 +13,7 @@
     "@inquirer/confirm": "^3.1.6",
     "@inquirer/input": "^2.1.8",
     "@inquirer/select": "^2.3.4",
-    "@oclif/core": "^3.26.5",
+    "@oclif/core": "^4.0.0-beta.12",
     "@oclif/plugin-help": "^6.0.21",
     "@oclif/plugin-not-found": "^3.1.10",
     "@oclif/plugin-warn-if-update-available": "^3.0.19",