feat: use oclif/core v4 and sf-plugins-core v10 (#1087)

* feat: use oclif/core v4 and sf-plugins-core v10

* fix: bump oclif/core

* test: make windows happy

* fix(deps): non-beta plugins-core, other bumps

---------

Co-authored-by: mshanemc <[email protected]>

Author: mdonnalley

package.json

@@ -5,25 +5,25 @@
   "author": "Salesforce",
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
-    "@oclif/core": "^3.26.4",
-    "@salesforce/core": "^7.3.9",
+    "@oclif/core": "^4.0.2",
+    "@salesforce/core": "^7.3.10",
     "@salesforce/kit": "^3.1.1",
-    "@salesforce/sf-plugins-core": "^9.1.1",
-    "@salesforce/source-deploy-retrieve": "^11.6.4",
-    "chalk": "^5.3.0",
+    "@salesforce/sf-plugins-core": "^10.0.0",
+    "@salesforce/source-deploy-retrieve": "^11.6.5",
+    "ansis": "^3.2.0",
     "change-case": "^5.4.4",
     "is-wsl": "^3.1.0",
     "open": "^10.1.0"
   },
   "devDependencies": {
-    "@oclif/plugin-command-snapshot": "^5.1.9",
+    "@oclif/plugin-command-snapshot": "^5.2.1",
     "@salesforce/cli-plugins-testkit": "^5.3.9",
-    "@salesforce/dev-scripts": "^9.1.3",
+    "@salesforce/dev-scripts": "^10",
     "@salesforce/plugin-command-reference": "^3.0.89",
     "@salesforce/ts-sinon": "1.4.19",
     "eslint-plugin-sf-plugin": "^1.18.5",
     "moment": "^2.30.1",
-    "oclif": "^4.12.1",
+    "oclif": "^4.13.0",
     "ts-node": "^10.9.2",
     "typescript": "^5.4.5"
   },

src/commands/force/org/create.ts

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { Interfaces } from '@oclif/core';
+import Interfaces from '@oclif/core/interfaces';
 import {
   Flags,
   loglevel,
@@ -45,7 +45,7 @@ export type ScratchOrgProcessObject = {
   authFields?: AuthFields;
   warnings: string[];
   orgId: string;
-}
+};
 
 export type CreateResult = ScratchOrgProcessObject | SandboxProcessObject;
 

src/commands/org/list.ts

@@ -8,7 +8,7 @@
 import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
 import { AuthInfo, ConfigAggregator, ConfigInfo, Connection, Org, SfError, Messages, Logger } from '@salesforce/core';
 import { Interfaces } from '@oclif/core';
-import chalk, { ChalkInstance } from 'chalk';
+import ansis, { type Ansis } from 'ansis';
 import { OrgListUtil, identifyActiveOrgByStatus } from '../../shared/orgListUtil.js';
 import { getStyledObject } from '../../shared/orgHighlighter.js';
 import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from '../../shared/orgTypes.js';
@@ -163,18 +163,18 @@ Legend:  ${defaultHubEmoji}=Default DevHub, ${defaultOrgEmoji}=Default Org ${
     const allOrgs: Array<FullyPopulatedScratchOrgFields | ExtendedAuthFieldsWithType> = [
       ...devHubs
         .map(addType('DevHub'))
-        .map(colorEveryFieldButConnectedStatus(chalk.cyanBright))
+        .map(colorEveryFieldButConnectedStatus(ansis.cyanBright))
         .map((row) => getStyledObject(row))
         .map(statusToEmoji),
 
       ...other
-        .map(colorEveryFieldButConnectedStatus(chalk.magentaBright))
+        .map(colorEveryFieldButConnectedStatus(ansis.magentaBright))
         .map((row) => getStyledObject(row))
         .map(statusToEmoji),
 
       ...sandboxes
         .map(addType('Sandbox'))
-        .map(colorEveryFieldButConnectedStatus(chalk.yellowBright))
+        .map(colorEveryFieldButConnectedStatus(ansis.yellowBright))
         .map((row) => getStyledObject(row))
         .map(statusToEmoji),
 
@@ -254,7 +254,7 @@ const addType =
   (val: ExtendedAuthFields): ExtendedAuthFieldsWithType => ({ ...val, type });
 
 const colorEveryFieldButConnectedStatus =
-  (colorFn: ChalkInstance) =>
+  (colorFn: Ansis) =>
   (row: ExtendedAuthFieldsWithType): ExtendedAuthFieldsWithType =>
     Object.fromEntries(
       Object.entries(row).map(([key, val]) => [

src/shared/orgHighlighter.ts

@@ -4,23 +4,23 @@
  * Licensed under the BSD 3-Clause license.
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
-import chalk, { ChalkInstance } from 'chalk';
+import ansis, { type Ansis } from 'ansis';
 import { ExtendedAuthFields, FullyPopulatedScratchOrgFields } from './orgTypes.js';
 
-const styledProperties = new Map<string, Map<string, ChalkInstance>>([
+const styledProperties = new Map<string, Map<string, Ansis>>([
   [
     'status',
     new Map([
-      ['Active', chalk.green],
-      ['else', chalk.red],
+      ['Active', ansis.green],
+      ['else', ansis.red],
     ]),
   ],
   [
     'connectedStatus',
     new Map([
-      ['Connected', chalk.green],
-      ['Active', chalk.green],
-      ['else', chalk.red],
+      ['Connected', ansis.green],
+      ['Active', ansis.green],
+      ['else', ansis.red],
     ]),
   ],
 ]);
@@ -31,8 +31,8 @@ export const getStyledValue = (key: string, value: string): string => {
   if (!prop) return value;
 
   // I'm not sure how to type the inner Map so that it knows else is definitely there
-  const chalkMethod = prop.get(value) ?? (prop.get('else') as ChalkInstance);
-  return chalkMethod(value);
+  const colorMethod = prop.get(value) ?? (prop.get('else') as Ansis);
+  return colorMethod(value);
 };
 
 export const getStyledObject = <T extends ExtendedAuthFields | FullyPopulatedScratchOrgFields>(objectToStyle: T): T =>

src/shared/sandboxProgress.ts

@@ -7,7 +7,6 @@
 import os from 'node:os';
 import { StatusEvent, ResultEvent, SandboxProcessObject } from '@salesforce/core';
 import { Ux } from '@salesforce/sf-plugins-core';
-import { ux } from '@oclif/core';
 import { getClockForSeconds } from '../shared/timeUtils.js';
 import { StagedProgress } from './stagedProgress.js';
 import { isDefined } from './utils.js';
@@ -17,6 +16,8 @@ const columns: Ux.Table.Columns<{ key: string; value: string }> = {
   value: { header: 'Value' },
 };
 
+const ux = new Ux();
+
 export type SandboxProgressData = {
   id: string;
   status: string;

src/shared/scratchOrgOutput.ts

@@ -5,12 +5,12 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { ScratchOrgLifecycleEvent, scratchOrgLifecycleStages } from '@salesforce/core';
-import chalk from 'chalk';
+import ansis from 'ansis';
 import { capitalCase } from 'change-case';
 import { StandardColors } from '@salesforce/sf-plugins-core';
 
-const boldBlue = (input: string): string => chalk.rgb(81, 176, 235).bold(input);
-const boldPurple = (input: string): string => chalk.rgb(157, 129, 221).bold(input);
+const boldBlue = (input: string): string => ansis.rgb(81, 176, 235).bold(input);
+const boldPurple = (input: string): string => ansis.rgb(157, 129, 221).bold(input);
 
 export const buildStatus = (data: ScratchOrgLifecycleEvent, baseUrl: string): string => `
 RequestId: ${formatRequest(baseUrl, data.scratchOrgInfo?.Id)}
@@ -31,7 +31,7 @@ export const formatStage = (currentStage: ScratchOrgLifecycleEvent['stage']): st
     .join('\n');
 
 export const formatRequest = (baseUrl: string, id?: string): string =>
-  `${id ? `${chalk.bold(id)} (${baseUrl}/${id})` : ''}`;
+  `${id ? `${ansis.bold(id)} (${baseUrl}/${id})` : ''}`;
 
 export const formatUsername = (username?: string): string => `${username ? `${boldBlue(username)} ` : ''}`;
 export const formatOrgId = (id?: string): string => `${id ? `${boldBlue(id)} ` : ''}`;

src/shared/stagedProgress.ts

@@ -5,30 +5,30 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import os from 'node:os';
-import chalk, { ChalkInstance } from 'chalk';
+import ansis, { type Ansis } from 'ansis';
 import { StandardColors } from '@salesforce/sf-plugins-core';
 import { SfError } from '@salesforce/core';
 
 const compareStages = ([, aValue]: [string, StageAttributes], [, bValue]: [string, StageAttributes]): number =>
   aValue.index - bValue.index;
 
-export const boldPurple = chalk.rgb(157, 129, 221).bold;
+export const boldPurple = ansis.rgb(157, 129, 221).bold;
 
 export type State = 'inProgress' | 'completed' | 'failed' | 'unknown';
 
 export type StageAttributes = {
   state: State;
   char: string;
-  color: ChalkInstance;
+  color: Ansis;
   index: number;
   visited: boolean;
 };
 
 export const StateConstants: { [stage: string]: Omit<StageAttributes, 'index'> } = {
   inProgress: { color: boldPurple, char: '…', visited: false, state: 'inProgress' },
   completed: { color: StandardColors.success, char: '✓', visited: false, state: 'completed' },
-  failed: { color: chalk.bold.red, char: '✖', visited: false, state: 'failed' },
-  unknown: { color: chalk.dim, char: '…', visited: false, state: 'unknown' },
+  failed: { color: ansis.bold.red, char: '✖', visited: false, state: 'failed' },
+  unknown: { color: ansis.dim, char: '…', visited: false, state: 'unknown' },
 };
 
 export type Stage = {

test/shared/orgHighlighter.test.ts

@@ -5,16 +5,16 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect } from 'chai';
-import chalk from 'chalk';
+import ansis from 'ansis';
 import { ExtendedAuthFields } from '../../src/shared/orgTypes.js';
 import { getStyledObject, getStyledValue } from '../../src/shared/orgHighlighter.js';
 
 describe('highlights value from key-value pair', () => {
   it('colors matching property/value green', () => {
-    expect(getStyledValue('status', 'Active')).to.equal(chalk.green('Active'));
+    expect(getStyledValue('status', 'Active')).to.equal(ansis.green('Active'));
   });
   it('colors matching property/non-matching value red', () => {
-    expect(getStyledValue('status', 'otherVal')).to.equal(chalk.red('otherVal'));
+    expect(getStyledValue('status', 'otherVal')).to.equal(ansis.red('otherVal'));
   });
   it('ignores a non matched property', () => {
     expect(getStyledValue('otherProp', 'otherVal')).to.equal('otherVal');
@@ -30,9 +30,9 @@ describe('highlights object with green, red, and non-colored', () => {
       // I know it's not, but it's a test
     } as unknown as ExtendedAuthFields;
     expect(getStyledObject(object)).to.deep.equal({
-      status: chalk.green('Active'),
+      status: ansis.green('Active'),
       otherProp: 'foo',
-      connectedStatus: chalk.red('Not found'),
+      connectedStatus: ansis.red('Not found'),
     });
   });
 });

test/shared/stagedProgress.test.ts

@@ -5,7 +5,7 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 import { expect } from 'chai';
-import chalk from 'chalk';
+import ansis from 'ansis';
 import { StagedProgress, StateConstants } from '../../src/shared/stagedProgress.js';
 import { SandboxStatusData } from '../../src/shared/sandboxProgress.js';
 
@@ -73,7 +73,7 @@ describe('stagedProgress', () => {
       const formattedStages = stagedProgress.formatStages();
       expect(formattedStages).to.be.ok;
       expect(formattedStages).to.include(StateConstants.unknown.char);
-      expect(formattedStages).to.include(chalk.dim(''));
+      expect(formattedStages).to.include(ansis.dim(''));
     });
     it('should get formatted stages - pending in progress', () => {
       stagedProgress.updateStages('Pending', 'inProgress');

test/unit/force/org/delete.test.ts

@@ -31,18 +31,6 @@ describe('[DEPRECATED] force:org:delete', () => {
     sfCommandUxStubs = stubSfCommandUx($$.SANDBOX);
   });
 
-  it('will throw an error when no default set', async () => {
-    await $$.stubConfig({});
-    try {
-      await LegacyDelete.run();
-      expect.fail('should have thrown an error');
-    } catch (e) {
-      const err = e as SfError;
-      expect(err.name).to.equal('MissingUsernameError');
-      expect(err.message).to.equal(messages.getMessage('missingUsername'));
-    }
-  });
-
   it('will prompt before attempting to delete', async () => {
     await $$.stubConfig({ 'target-org': testOrg.username });
     const res = await LegacyDelete.run([]);
@@ -64,6 +52,18 @@ describe('[DEPRECATED] force:org:delete', () => {
     expect(res).to.deep.equal({ orgId: testOrg.orgId, username: testOrg.username });
   });
 
+  it('will throw an error when no default set', async () => {
+    await $$.stubConfig({});
+    try {
+      await LegacyDelete.run();
+      expect.fail('should have thrown an error');
+    } catch (e) {
+      const err = e as SfError;
+      expect(err.name).to.equal('MissingUsernameError');
+      expect(err.message).to.equal(messages.getMessage('missingUsername'));
+    }
+  });
+
   it('will determine sandbox vs scratch org and delete sandbox', async () => {
     $$.SANDBOX.stub(SandboxAccessor.prototype, 'hasFile').resolves(true);
     const res = await LegacyDelete.run(['--target-org', testOrg.username]);