chore: updates from devScripts

salesforcecli · Dec 31, 2023 · d8aec6d · d8aec6d
1 parent 5e1c141
commit d8aec6d
Show file tree

Hide file tree

Showing 7 changed files with 91 additions and 163 deletions.
diff --git a/package.json b/package.json
@@ -6,7 +6,7 @@
   "bugs": "https://github.com/forcedotcom/cli/issues",
   "dependencies": {
     "@oclif/core": "^3.15.1",
-    "@salesforce/core": "^6.4.0",
+    "@salesforce/core": "^6.4.2",
     "@salesforce/kit": "^3.0.15",
     "@salesforce/sf-plugins-core": "^5.0.13",
     "got": "^13.0.0",
@@ -19,15 +19,15 @@
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5",
     "@salesforce/cli-plugins-testkit": "^5",
-    "@salesforce/dev-scripts": "^8.1.2",
+    "@salesforce/dev-scripts": "^8.1.3",
     "@salesforce/plugin-command-reference": "^3.0.58",
     "@salesforce/ts-sinon": "^1.4.19",
     "@salesforce/ts-types": "^2.0.9",
     "@types/marked": "^4.0.8",
     "@types/marked-terminal": "^3.1.3",
     "@types/semver": "^7.5.6",
     "@types/sinon-chai": "^3.2.12",
-    "eslint-plugin-sf-plugin": "^1.16.15",
+    "eslint-plugin-sf-plugin": "^1.17.0",
     "oclif": "^4.1.0",
     "shx": "0.3.4",
     "sinon-chai": "^3.7.0",

diff --git a/src/commands/doctor.ts b/src/commands/doctor.ts
@@ -6,9 +6,9 @@
  */
 
 import { EOL } from 'node:os';
-import { dirname, resolve as pathResolve, join } from 'node:path';
+import { resolve as pathResolve, join } from 'node:path';
 import { spawn } from 'node:child_process';
-import { fileURLToPath } from 'node:url';
+
 import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
 import { Lifecycle, Messages, SfError } from '@salesforce/core';
 import open from 'open';
@@ -17,7 +17,7 @@ import { ProxyAgent } from 'proxy-agent';
 import { Doctor as SFDoctor, SfDoctor, SfDoctorDiagnosis } from '../doctor.js';
 import { DiagnosticStatus } from '../diagnostics.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-info', 'doctor');
 
 export default class Doctor extends SfCommand<SfDoctorDiagnosis> {

diff --git a/src/commands/info/releasenotes/display.ts b/src/commands/info/releasenotes/display.ts
@@ -6,8 +6,8 @@
  */
 
 import { EOL } from 'node:os';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { marked } from 'marked';
 import TerminalRenderer from 'marked-terminal';
 import { Env } from '@salesforce/kit';
@@ -17,7 +17,7 @@ import type { AnyJson, JsonMap } from '@salesforce/ts-types';
 import shared from '../../../shared/index.js';
 
 // Initialize Messages with the current plugin directory
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 
 const helpers = ['stable', 'stable-rc', 'latest', 'latest-rc', 'rc'];
 

diff --git a/src/diagnostics.ts b/src/diagnostics.ts
@@ -6,8 +6,8 @@
  */
 
 import childProcess from 'node:child_process';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Interfaces } from '@oclif/core';
 import { Lifecycle, Messages } from '@salesforce/core';
 import { SfDoctor, SfDoctorDiagnosis } from './doctor.js';
@@ -24,7 +24,7 @@ export interface DiagnosticStatus {
   status: 'pass' | 'fail' | 'warn' | 'unknown';
 }
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-info', 'diagnostics');
 
 /**

diff --git a/src/doctor.ts b/src/doctor.ts
@@ -7,7 +7,7 @@
 
 import fs from 'node:fs';
 import { join, dirname, basename } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
 import { Messages, SfError } from '@salesforce/core';
 import { Env, omit } from '@salesforce/kit';
 import type { AnyJson, KeyValue } from '@salesforce/ts-types';
@@ -48,7 +48,7 @@ export interface SfDoctorDiagnosis {
   logFilePaths: string[];
 }
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-info', 'doctor');
 
 const PINNED_SUGGESTIONS = [

diff --git a/test/commands/doctor.test.ts b/test/commands/doctor.test.ts
@@ -7,7 +7,7 @@
 
 import path from 'node:path';
 import childProcess from 'node:child_process';
-import { fileURLToPath } from 'node:url';
+
 import fs from 'node:fs';
 import Sinon from 'sinon';
 import { expect } from 'chai';
@@ -19,7 +19,7 @@ import DoctorCmd from '../../src/commands/doctor.js';
 import { Diagnostics, DiagnosticStatus, Doctor, SfDoctorDiagnosis } from '../../src/index.js';
 import { formatPlugins } from '../../src/doctor.js';
 
-Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-info', 'doctor');
 
 let oclifConfig: Config;