feat: use latest oclif/core (#566)

Author: mdonnalley

package.json

@@ -6,10 +6,10 @@
   "main": "lib/index.js",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^1.26.1",
+    "@oclif/core": "^2.0.7",
     "@salesforce/core": "^3.33.1",
     "@salesforce/kit": "^1.8.3",
-    "@salesforce/sf-plugins-core": "^1.22.1",
+    "@salesforce/sf-plugins-core": "^2.0.1",
     "open": "8.4.0",
     "tslib": "^2"
   },
@@ -223,4 +223,4 @@
       "output": []
     }
   }
-}
+}

src/commands/force/org/clone.ts

@@ -48,11 +48,12 @@ export class OrgCloneCommand extends SfCommand<SandboxProcessObject> {
   public static readonly flags = {
     'target-org': requiredOrgFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
-    type: Flags.enum({
+    type: Flags.custom<'sandbox'>({
+      options: ['sandbox'],
+    })({
       char: 't',
       summary: messages.getMessage('flags.type'),
       required: true,
-      options: ['sandbox'],
     }),
     definitionfile: Flags.file({
       char: 'f',
@@ -81,7 +82,7 @@ export class OrgCloneCommand extends SfCommand<SandboxProcessObject> {
   public async run(): Promise<SandboxProcessObject> {
     const { flags, args, argv } = await this.parse(OrgCloneCommand);
     const logger = await Logger.child(this.constructor.name);
-    const varargs = parseVarArgs(args, argv);
+    const varargs = parseVarArgs(args, argv as string[]);
 
     const lifecycle = Lifecycle.getInstance();
     if (flags.type === OrgTypes.Sandbox) {

src/commands/force/org/create.ts

@@ -67,10 +67,11 @@ export class Create extends SfCommand<CreateResult> {
     'target-dev-hub': optionalHubFlagWithDeprecations,
     'api-version': orgApiVersionFlagWithDeprecations,
     loglevel,
-    type: Flags.enum({
+    type: Flags.custom<OrgTypes>({
+      options: [OrgTypes.Scratch, OrgTypes.Sandbox],
+    })({
       char: 't',
       summary: messages.getMessage('flags.type'),
-      options: [OrgTypes.Scratch, OrgTypes.Sandbox],
       default: OrgTypes.Scratch,
     }),
     definitionfile: Flags.file({
@@ -128,7 +129,7 @@ export class Create extends SfCommand<CreateResult> {
     const { flags, args, argv } = await this.parse(Create);
 
     this.flags = flags;
-    this.varArgs = parseVarArgs(args, argv);
+    this.varArgs = parseVarArgs(args, argv as string[]);
     this.logger = await Logger.child(this.constructor.name);
     this.logger.debug('Create started with args %s ', flags);
 

src/commands/org/create/sandbox.ts

@@ -93,11 +93,12 @@ export default class CreateSandbox extends SandboxCommandBase<SandboxProcessObje
       description: messages.getMessage('flags.clone.description'),
       exclusive: ['license-type'],
     }),
-    'license-type': Flags.enum({
+    'license-type': Flags.custom<SandboxLicenseType>({
+      options: getLicenseTypes(),
+    })({
       char: 'l',
       summary: messages.getMessage('flags.licenseType.summary'),
       exclusive: ['definition-file', 'clone'],
-      options: getLicenseTypes(),
       default: SandboxLicenseType.developer,
     }),
     'target-org': Flags.requiredOrg({

src/shared/orgHooks.ts

@@ -7,7 +7,7 @@
 
 import { Optional } from '@salesforce/ts-types';
 import { AuthFields } from '@salesforce/core';
-import { Command, Hook, Hooks } from '@oclif/core/lib/interfaces';
+import { Command, Interfaces, Hook } from '@oclif/core';
 
 type HookOpts<T> = {
   options: { Command: Command.Class; argv: string[]; commandId: string };
@@ -33,12 +33,12 @@ type PostOrgCreateOpts = HookOpts<OrgCreateResult>;
 /**
  * Extends OCLIF's Hooks interface to add types for hooks that run on org commands
  */
-export interface OrgHooks extends Hooks {
+export interface OrgHooks extends Interfaces.Hooks {
   postorgcreate: PostOrgCreateOpts;
 }
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
-export type OrgHook<T> = (this: Hook.Context, options: T extends keyof Hooks ? OrgHooks[T] : T) => any;
+export type OrgHook<T> = (this: Hook.Context, options: T extends keyof Interfaces.Hooks ? OrgHooks[T] : T) => any;
 
 // eslint-disable-next-line no-redeclare
 export declare namespace OrgHook {

src/shared/sandboxProgress.ts

@@ -7,7 +7,7 @@
 import * as os from 'os';
 import { StatusEvent, ResultEvent, SandboxProcessObject } from '@salesforce/core';
 import { Ux } from '@salesforce/sf-plugins-core/lib/ux';
-import { CliUx } from '@oclif/core';
+import { ux } from '@oclif/core';
 import { getClockForSeconds } from '../shared/timeUtils';
 import { StagedProgress } from './stagedProgress';
 
@@ -118,7 +118,7 @@ export const getSandboxTableAsText = (sandboxUsername?: string, sandboxProgress?
     return [];
   }
   const tableRows: string[] = [];
-  CliUx.ux.table(getTableDataFromProcessObj(sandboxProgress, sandboxUsername), columns, {
+  ux.table(getTableDataFromProcessObj(sandboxProgress, sandboxUsername), columns, {
     printLine: (s: string): void => {
       tableRows.push(s);
     },

yarn.lock

@@ -699,7 +699,7 @@
     is-wsl "^2.1.1"
     tslib "^2.3.1"
 
-"@oclif/core@^1.20.3", "@oclif/core@^1.20.4", "@oclif/core@^1.21.0", "@oclif/core@^1.23.1", "@oclif/core@^1.26.1":
+"@oclif/core@^1.20.3", "@oclif/core@^1.20.4", "@oclif/core@^1.21.0", "@oclif/core@^1.23.1":
   version "1.26.1"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.26.1.tgz#26e46c96143d3e2b1dd9bd558ae1653fe9a4f3fa"
   integrity sha512-g+OWJcM7JOVI53caTEtq0BB1nPotWctRLUyFODPgvDqXhVR7QED+Qz3LwFAMD8dt7/Ar2ZNq15U3bnpnOv453A==
@@ -733,7 +733,7 @@
     widest-line "^3.1.0"
     wrap-ansi "^7.0.0"
 
-"@oclif/core@^2.0.2-beta.6", "@oclif/core@^2.0.3":
+"@oclif/core@^2.0.2-beta.6", "@oclif/core@^2.0.3", "@oclif/core@^2.0.7":
   version "2.0.7"
   resolved "https://registry.yarnpkg.com/@oclif/core/-/core-2.0.7.tgz#a17a85dfa105dda120fbc5647432010feaa97a9e"
   integrity sha512-pj7hIH8SBeH3qha47fmyqdaBdNVEqesRgnKFh8Ytdb4S41/4BYOiQuyQGuvnKgvicH6DMxp4FbM9EQEW46V9xw==
@@ -1129,7 +1129,7 @@
   resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.4.0.tgz#7dff427c8059895d8108176047aee600703c82d6"
   integrity sha512-BJ25uphssN42Zy6kksheFHMTLiR98AAHe/Wxnv0T4dYxtrEbUjSXVAGKZqfewJPFXA4xB5gxC+rQZtfz6xKCFg==
 
-"@salesforce/sf-plugins-core@^1.21.5", "@salesforce/sf-plugins-core@^1.22.1":
+"@salesforce/sf-plugins-core@^1.21.5":
   version "1.22.2"
   resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-1.22.2.tgz#56aa9c490a64a53142160eb0b67bc32331ad0674"
   integrity sha512-T6TsDoj5DzZTW5XvggbCropfAB3V88V48dzcZU2vsy5zI6ZQdHVO0xa6T5ylJAvuyOrmmtkVq3wlwoQj9Jz+ow==
@@ -1141,6 +1141,18 @@
     chalk "^4"
     inquirer "^8.2.5"
 
+"@salesforce/sf-plugins-core@^2.0.1":
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-2.0.1.tgz#079d6cc200ea53ce7fb60aafb5eaf5f2b48e46c9"
+  integrity sha512-vT4Y9n/4lStSWrfMAlgQB/XzwJAYK6ibcsFykHNCl86NCoebVGzg5KDIxYjHpidrt2PG/nPk7NL9iBtTH/p8Yg==
+  dependencies:
+    "@oclif/core" "^2.0.7"
+    "@salesforce/core" "^3.33.1"
+    "@salesforce/kit" "^1.8.3"
+    "@salesforce/ts-types" "^1.7.1"
+    chalk "^4"
+    inquirer "^8.2.5"
+
 "@salesforce/[email protected]":
   version "1.4.4"
   resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.4.tgz#ee7039f7eb6c488d58b0a3365e7196e9b1b1ebb4"