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

refactor: devScripts update
salesforcecli · Dec 28, 2023 · f2a2920 · f2a2920
2 parents 82895d6 + 6cbb51a
commit f2a2920
Show file tree

Hide file tree

Showing 15 changed files with 117 additions and 189 deletions.
diff --git a/package.json b/package.json
@@ -6,18 +6,18 @@
   "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",
     "@salesforce/ts-types": "^2.0.9"
   },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.0.4",
     "@salesforce/cli-plugins-testkit": "^5.1.3",
-    "@salesforce/dev-scripts": "^8.1.2",
+    "@salesforce/dev-scripts": "^8.1.3",
     "@salesforce/plugin-command-reference": "^3.0.56",
     "chai-each": "^0.0.1",
-    "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/baseCommands/user/password/generate.ts b/src/baseCommands/user/password/generate.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 { EOL } from 'node:os';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { AuthInfo, Connection, Messages, Org, SfError, StateAggregator, User } from '@salesforce/core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export type PasswordData = {

diff --git a/src/baseCommands/user/permset/assign.ts b/src/baseCommands/user/permset/assign.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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Connection, Messages, Org, SfError, StateAggregator, User } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 
 type SuccessMsg = {
   name: string;

diff --git a/src/baseCommands/user/permsetlicense/assign.ts b/src/baseCommands/user/permsetlicense/assign.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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Connection, Logger, Messages, SfError, StateAggregator } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 type SuccessMsg = {

diff --git a/src/commands/force/user/password/generate.ts b/src/commands/force/user/password/generate.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 {
   arrayWithDeprecation,
   Flags,
@@ -17,7 +17,7 @@ import { Messages } from '@salesforce/core';
 import { ensureArray } from '@salesforce/kit';
 import { GenerateResult, UserPasswordGenerateBaseCommand } from '../../../../baseCommands/user/password/generate.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export class ForceUserPasswordGenerateCommand extends UserPasswordGenerateBaseCommand {

diff --git a/src/commands/force/user/permset/assign.ts b/src/commands/force/user/permset/assign.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 { Messages, Org } from '@salesforce/core';
 import { Flags, arrayWithDeprecation, loglevel, orgApiVersionFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PermsetAssignResult, UserPermSetAssignBaseCommand } from '../../../../baseCommands/user/permset/assign.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permset.assign');
 
 export class ForceUserPermSetAssignCommand extends UserPermSetAssignBaseCommand {

diff --git a/src/commands/force/user/permsetlicense/assign.ts b/src/commands/force/user/permsetlicense/assign.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 { Messages } from '@salesforce/core';
 import { arrayWithDeprecation, Flags, loglevel, orgApiVersionFlagWithDeprecations } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PSLResult, UserPermSetLicenseAssignBaseCommand } from '../../../../baseCommands/user/permsetlicense/assign.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 export class ForceUserPermSetLicenseAssignCommand extends UserPermSetLicenseAssignBaseCommand {

diff --git a/src/commands/org/assign/permset.ts b/src/commands/org/assign/permset.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 { Messages, Org } from '@salesforce/core';
 import { Flags } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PermsetAssignResult, UserPermSetAssignBaseCommand } from '../../../baseCommands/user/permset/assign.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permset.assign');
 
 export class AssignPermSetCommand extends UserPermSetAssignBaseCommand {

diff --git a/src/commands/org/assign/permsetlicense.ts b/src/commands/org/assign/permsetlicense.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 { Messages } from '@salesforce/core';
 import { arrayWithDeprecation, Flags } from '@salesforce/sf-plugins-core';
 import { ensureArray } from '@salesforce/kit';
 import { PSLResult, UserPermSetLicenseAssignBaseCommand } from '../../../baseCommands/user/permsetlicense/assign.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'permsetlicense.assign');
 
 export class AssignPermSetLicenseCommand extends UserPermSetLicenseAssignBaseCommand {

diff --git a/src/commands/org/create/user.ts b/src/commands/org/create/user.ts
@@ -6,8 +6,8 @@
  */
 import { EOL } from 'node:os';
 import fs from 'node:fs';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import {
   AuthInfo,
   Connection,
@@ -34,7 +34,7 @@ import {
 } from '@salesforce/sf-plugins-core';
 import { Interfaces } from '@oclif/core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'create');
 
 type SuccessMsg = {

diff --git a/src/commands/org/display/user.ts b/src/commands/org/display/user.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 { AuthFields, Connection, Logger, Messages, StateAggregator } from '@salesforce/core';
 import { ensureString } from '@salesforce/ts-types';
 import {
@@ -17,7 +17,7 @@ import {
   SfCommand,
 } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'display');
 
 export type DisplayUserResult = {

diff --git a/src/commands/org/generate/password.ts b/src/commands/org/generate/password.ts
@@ -4,14 +4,14 @@
  * 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 } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { ensureArray } from '@salesforce/kit';
 import { GenerateResult, UserPasswordGenerateBaseCommand } from '../../../baseCommands/user/password/generate.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 export type PasswordData = {

diff --git a/src/commands/org/list/users.ts b/src/commands/org/list/users.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 { Connection, Messages, StateAggregator } from '@salesforce/core';
 import {
   Flags,
@@ -15,7 +15,7 @@ import {
   SfCommand,
 } from '@salesforce/sf-plugins-core';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'list');
 
 export type AuthList = Partial<{

diff --git a/test/commands/password/generate.test.ts b/test/commands/password/generate.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 { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Connection, Messages, User } from '@salesforce/core';
 import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js';
 import { SecureBuffer } from '@salesforce/core/lib/crypto/secureBuffer.js';
 import { assert, expect } from 'chai';
 import { Config } from '@oclif/core';
 import { PasswordData, GenerateUserPasswordCommand } from '../../../src/commands/org/generate/password.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-user', 'password.generate');
 
 describe('org:generate:password', () => {