chore: updates from devScripts

salesforcecli · Dec 28, 2023 · 79ba656 · 79ba656
1 parent af778cd
commit 79ba656
Show file tree

Hide file tree

Showing 11 changed files with 100 additions and 144 deletions.
diff --git a/package.json b/package.json
@@ -17,10 +17,10 @@
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.0.5",
     "@salesforce/cli-plugins-testkit": "^5.1.2",
-    "@salesforce/dev-scripts": "^8.1.2",
+    "@salesforce/dev-scripts": "^8.1.3",
     "@salesforce/plugin-command-reference": "^3.0.56",
     "@types/color-convert": "^2.0.3",
-    "eslint-plugin-sf-plugin": "^1.16.15",
+    "eslint-plugin-sf-plugin": "^1.17.0",
     "oclif": "^4.1.0",
     "shx": "^0.3.4",
     "ts-node": "^10.9.2",

diff --git a/src/commands/apex/get/log.ts b/src/commands/apex/get/log.ts
@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { LogService } from '@salesforce/apex-node';
 import {
   Flags,
@@ -18,7 +18,7 @@ import {
 import { Messages } from '@salesforce/core';
 import { colorLogs } from '../../../utils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'get');
 
 export type LogGetResult = Array<{ log: string } | string>;

diff --git a/src/commands/apex/get/test.ts b/src/commands/apex/get/test.ts
@@ -4,8 +4,8 @@
  * 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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { TestService } from '@salesforce/apex-node';
 import {
   Flags,
@@ -19,7 +19,7 @@ import { Messages } from '@salesforce/core';
 import { RunResult, TestReporter } from '../../../reporters/index.js';
 import { resultFormat } from '../../../utils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'report');
 export default class Test extends SfCommand<RunResult> {
   public static readonly summary = messages.getMessage('summary');

diff --git a/src/commands/apex/list/log.ts b/src/commands/apex/list/log.ts
@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { LogRecord, LogService } from '@salesforce/apex-node';
 import {
   SfCommand,
@@ -16,7 +16,7 @@ import {
 } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'list');
 
 export type LogListResult = LogRecord[];

diff --git a/src/commands/apex/run.ts b/src/commands/apex/run.ts
@@ -4,8 +4,8 @@
  * 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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { ApexExecuteOptions, ExecuteService } from '@salesforce/apex-node';
 import {
   Flags,
@@ -17,7 +17,7 @@ import {
 import { Messages, SfError } from '@salesforce/core';
 import RunReporter from '../../reporters/runReporter.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'run');
 
 export type ExecuteResult = {

diff --git a/src/commands/apex/run/test.ts b/src/commands/apex/run/test.ts
@@ -4,8 +4,8 @@
  * 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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { CancellationTokenSource, TestLevel, TestResult, TestRunIdResult, TestService } from '@salesforce/apex-node';
 import {
   arrayWithDeprecation,
@@ -22,7 +22,7 @@ import { Duration } from '@salesforce/kit';
 import { RunResult, TestReporter } from '../../../reporters/index.js';
 import { resultFormat } from '../../../utils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'runtest');
 
 export const TestLevelValues = ['RunLocalTests', 'RunAllTestsInOrg', 'RunSpecifiedTests'];

diff --git a/src/commands/apex/tail/log.ts b/src/commands/apex/tail/log.ts
@@ -5,8 +5,8 @@
  * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
  */
 
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { LogService } from '@salesforce/apex-node';
 import {
   Flags,
@@ -18,7 +18,7 @@ import {
 import { Connection, Messages } from '@salesforce/core';
 import { colorizeLog } from '../../../legacyColorization.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'tail');
 
 export default class Log extends SfCommand<void> {

diff --git a/src/reporters/runReporter.ts b/src/reporters/runReporter.ts
@@ -5,14 +5,14 @@
  * 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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { ExecuteAnonymousResponse } from '@salesforce/apex-node';
 import { Messages } from '@salesforce/core';
 import { colorError, colorSuccess } from '../utils.js';
 import { ExecuteResult } from '../commands/apex/run.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'run');
 
 export default class RunReporter {

diff --git a/src/reporters/testReporter.ts b/src/reporters/testReporter.ts
@@ -4,8 +4,8 @@
  * 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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import {
   HumanReporter,
   JUnitReporter,
@@ -22,7 +22,7 @@ import { Duration } from '@salesforce/kit';
 import { FAILURE_EXIT_CODE } from '../utils.js';
 import { JsonReporter, RunResult } from './jsonReporter.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'runtest');
 
 export class TestReporter {

diff --git a/test/commands/apex/run/test.test.ts b/test/commands/apex/run/test.test.ts
@@ -22,7 +22,7 @@ import {
   testRunWithFailuresResult,
 } from '../../../testData.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-apex', 'runtest');
 
 let logStub: sinon.SinonStub;