fix(deps): devScripts update for oclif4

* chore: updates from devScripts * chore: fix some stubs for new oclif --------- Co-authored-by: mshanemc <[email protected]>
salesforcecli · Jun 5, 2024 · 1cdcde6 · 1cdcde6
1 parent c4d9c9f
commit 1cdcde6
Show file tree

Hide file tree

Showing 4 changed files with 126 additions and 75 deletions.
diff --git a/package.json b/package.json
@@ -7,10 +7,10 @@
   "dependencies": {
     "@inquirer/input": "^2.1.8",
     "@jsforce/jsforce-node": "^3.2.0",
-    "@oclif/core": "^3.26.5",
+    "@oclif/core": "^4",
     "@salesforce/core": "^7.3.9",
     "@salesforce/kit": "^3.1.0",
-    "@salesforce/sf-plugins-core": "^9.0.7",
+    "@salesforce/sf-plugins-core": "^10.0.0",
     "got": "^13.0.0",
     "marked": "^4.3.0",
     "marked-terminal": "^4.2.0",
@@ -21,7 +21,7 @@
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5",
     "@salesforce/cli-plugins-testkit": "^5.3.8",
-    "@salesforce/dev-scripts": "^9.1.3",
+    "@salesforce/dev-scripts": "^10.1.0",
     "@salesforce/plugin-command-reference": "^3.0.89",
     "@salesforce/ts-sinon": "^1.4.19",
     "@salesforce/ts-types": "^2.0.9",

diff --git a/src/doctor.ts b/src/doctor.ts
@@ -11,8 +11,7 @@ import { join, dirname, basename } from 'node:path';
 import { Messages, SfError } from '@salesforce/core';
 import { Env, omit } from '@salesforce/kit';
 import type { AnyJson, KeyValue } from '@salesforce/ts-types';
-import { Interfaces } from '@oclif/core';
-import { PluginVersionDetail } from '@oclif/core/lib/interfaces';
+import Interfaces from '@oclif/core/interfaces';
 import { Diagnostics, DiagnosticStatus } from './diagnostics.js';
 
 export type SfDoctor = {
@@ -264,7 +263,10 @@ export class Doctor implements SfDoctor {
   }
 }
 
-export function formatPlugins(config: Interfaces.Config, plugins: Record<string, PluginVersionDetail>): string[] {
+export function formatPlugins(
+  config: Interfaces.Config,
+  plugins: Record<string, Interfaces.PluginVersionDetail>
+): string[] {
   function getFriendlyName(name: string): string {
     const scope = config?.pjson?.oclif?.scope;
     if (!scope) return name;

diff --git a/test/diagnostics.test.ts b/test/diagnostics.test.ts
@@ -56,7 +56,7 @@ describe('Diagnostics', () => {
   let lifecycleEmitSpy: sinon.SinonSpy;
 
   beforeEach(() => {
-    stubMethod(sandbox, ux, 'log');
+    stubMethod(sandbox, ux, 'stdout');
     childProcessExecStub = stubMethod(sandbox, childProcess, 'exec');
     drAddSuggestionSpy = spyMethod(sandbox, Doctor.prototype, 'addSuggestion');
     lifecycleEmitSpy = spyMethod(sandbox, lifecycle, 'emit');