Merge pull request #468 from salesforcecli/devScripts2023-12-28

refactor: devScripts update
salesforcecli · Dec 28, 2023 · 6a10351 · 6a10351
2 parents 4cb253c + 12c5433
commit 6a10351
Show file tree

Hide file tree

Showing 12 changed files with 110 additions and 187 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.12",
     "chalk": "^5.3.0",
@@ -15,14 +15,14 @@
   "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.54",
     "@salesforce/ts-types": "^2.0.9",
     "@types/chai-as-promised": "^7.1.8",
     "@types/chai-string": "^1.4.5",
     "chai-as-promised": "7.1.1",
     "chai-string": "^1.5.0",
-    "eslint-plugin-sf-plugin": "^1.16.15",
+    "eslint-plugin-sf-plugin": "^1.17.0",
     "jsforce": "^2.0.0-beta.28",
     "oclif": "^4.1.0",
     "shx": "0.3.4",

diff --git a/src/commands/org/create/shape.ts b/src/commands/org/create/shape.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 {
   SfCommand,
   requiredOrgFlagWithDeprecations,
@@ -17,7 +17,7 @@ import { Messages, Connection, Logger } from '@salesforce/core';
 import type { SaveResult } from 'jsforce';
 import { isShapeEnabled, JsForceError } from '../../../shared/orgShapeListUtils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'shape.create');
 
 export interface ShapeCreateResult {

diff --git a/src/commands/org/create/snapshot.ts b/src/commands/org/create/snapshot.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 {
   Flags,
   SfCommand,
@@ -16,7 +16,7 @@ import {
 import { StateAggregator, Messages, SfError } from '@salesforce/core';
 import { OrgSnapshot, queryByNameOrId, printSingleRecordTable } from '../../../shared/snapshot.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'snapshot.create');
 
 export class SnapshotCreate extends SfCommand<OrgSnapshot> {

diff --git a/src/commands/org/delete/shape.ts b/src/commands/org/delete/shape.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 {
   Flags,
   SfCommand,
@@ -18,7 +18,7 @@ import { Messages, SfError } from '@salesforce/core';
 import { isShapeEnabled } from '../../../shared/orgShapeListUtils.js';
 import utils, { DeleteAllResult } from '../../../shared/deleteUtils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'shape.delete');
 
 export interface OrgShapeDeleteResult extends DeleteAllResult {

diff --git a/src/commands/org/delete/snapshot.ts b/src/commands/org/delete/snapshot.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 { EOL } from 'node:os';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import {
   Flags,
   SfCommand,
@@ -18,7 +18,7 @@ import { Messages } from '@salesforce/core';
 import type { SaveResult, SaveError } from 'jsforce';
 import { queryByNameOrId } from '../../../shared/snapshot.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'snapshot.delete');
 
 // jsforce can return SaveError[] or never[]

diff --git a/src/commands/org/get/snapshot.ts b/src/commands/org/get/snapshot.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 {
   Flags,
   SfCommand,
@@ -16,7 +16,7 @@ import {
 import { Messages } from '@salesforce/core';
 import { OrgSnapshot, queryByNameOrId, printSingleRecordTable } from '../../../shared/snapshot.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'snapshot.get');
 
 export class SnapshotGet extends SfCommand<OrgSnapshot> {

diff --git a/src/commands/org/list/shape.ts b/src/commands/org/list/shape.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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Flags, loglevel, SfCommand } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import chalk from 'chalk';
 import utils, { OrgShapeListResult } from '../../../shared/orgShapeListUtils.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'shape.list');
 
 // default columns for the shape list

diff --git a/src/commands/org/list/snapshot.ts b/src/commands/org/list/snapshot.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 {
   loglevel,
   orgApiVersionFlagWithDeprecations,
@@ -15,7 +15,7 @@ import {
 import { Messages } from '@salesforce/core';
 import { OrgSnapshot, queryAll, printRecordTable } from '../../../shared/snapshot.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'snapshot.list');
 
 export class SnapshotList extends SfCommand<OrgSnapshot[]> {

diff --git a/src/shared/deleteUtils.ts b/src/shared/deleteUtils.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 { Messages, Connection } from '@salesforce/core';
 import { JsForceError } from './orgShapeListUtils.js';
 
@@ -49,7 +49,7 @@ export const deleteAll = async (conn: Connection, username: string): Promise<Del
   } catch (err) {
     const JsForceErr = err as JsForceError;
     if (JsForceErr.errorCode && JsForceErr.errorCode === 'INVALID_TYPE') {
-      Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+      Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
       const messages = Messages.loadMessages('@salesforce/plugin-signups', 'shape.delete');
 
       // ShapeExportPref is not enabled, or user does not have CRUD access

diff --git a/src/shared/orgShapeListUtils.ts b/src/shared/orgShapeListUtils.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 { AuthInfo, Connection, Logger, Messages, Org, OrgAuthorization, SfError } from '@salesforce/core';
 import { settleAll } from '@salesforce/kit';
 
@@ -61,7 +61,7 @@ export async function getAllShapesFromOrg(orgAuth: OrgAuthorization): Promise<Or
     } else {
       logger.error(false, 'Error finding org shapes', JsForceErr);
       const error = SfError.wrap(JsForceErr);
-      Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+      Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
       const messages = Messages.loadMessages('@salesforce/plugin-signups', 'messages');
       error.message = messages.getMessage('errorWithOrg', [orgAuth.username, JsForceErr.message]);
       return Promise.reject(error);
@@ -86,7 +86,7 @@ export const getAllOrgShapesFromAuthenticatedOrgs = async (): Promise<{
 }> => {
   const orgs = await AuthInfo.listAllAuthorizations((orgAuth) => !orgAuth.error && !orgAuth.isScratchOrg);
   if (orgs.length === 0) {
-    Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+    Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
     const messages = Messages.loadMessages('@salesforce/plugin-signups', 'messages');
     throw messages.createError('noAuthFound');
   }

diff --git a/src/shared/snapshot.ts b/src/shared/snapshot.ts
@@ -5,13 +5,13 @@
  * 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 { ux } from '@oclif/core';
 import { Connection, SfError, Messages } from '@salesforce/core';
 import { capitalCase } from 'change-case';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-signups', 'snapshot');
 
 export interface OrgSnapshotRequest {