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

refactor: devScripts update

package.json

@@ -7,7 +7,7 @@
   "dependencies": {
     "@oclif/core": "^3.14.1",
     "@octokit/rest": "^19.0.13",
-    "@salesforce/core": "^6.4.1",
+    "@salesforce/core": "^6.4.2",
     "@salesforce/kit": "^3.0.15",
     "@salesforce/sf-plugins-core": "^5.0.10",
     "@salesforce/ts-types": "^2.0.9",
@@ -25,14 +25,14 @@
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.0.5",
     "@salesforce/cli-plugins-testkit": "^5.1.1",
-    "@salesforce/dev-scripts": "^8.1.2",
+    "@salesforce/dev-scripts": "^8.1.3",
     "@salesforce/plugin-command-reference": "^3.0.54",
     "@types/js-yaml": "^4.0.5",
     "@types/lodash.defaultsdeep": "^4.6.9",
     "@types/shelljs": "^0.8.14",
     "@types/yeoman-generator": "^5.2.14",
     "@types/yeoman-test": "^4.0.3",
-    "eslint-plugin-sf-plugin": "^1.16.15",
+    "eslint-plugin-sf-plugin": "^1.17.0",
     "oclif": "^4.1.0",
     "shx": "^0.3.3",
     "ts-node": "^10.9.2",

src/commands/dev/audit/messages.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 fs from 'node:fs';
-import { dirname, join, parse, relative, resolve } from 'node:path';
-import { fileURLToPath } from 'node:url';
+import { join, parse, relative, resolve } from 'node:path';
+
 import { ensureString } from '@salesforce/ts-types';
 import { Logger, Messages } from '@salesforce/core';
 import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
@@ -50,7 +50,7 @@ type MessageRefNode = NodeType & {
 
 type Node = FileNode | BundleNode | MessageNode | MessageRefNode | BundleRefNode;
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'audit.messages');
 
 export default class AuditMessages extends SfCommand<AuditResults> {

src/commands/dev/configure/repo.ts

@@ -7,14 +7,14 @@
 
 // because github api isn't camelcased
 /* eslint-disable camelcase */
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Flags, SfCommand } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 import { Octokit } from '@octokit/rest';
 import { OctokitError } from '../../../types.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'configure.repo');
 
 export type ConfigureRepoResult = {

src/commands/dev/configure/secrets.ts

@@ -8,8 +8,8 @@
 // because github api isn't camelcased
 /* eslint-disable camelcase */
 
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import fs from 'node:fs';
 import { ux } from '@oclif/core';
 
@@ -21,7 +21,7 @@ import shelljs from 'shelljs';
 import yaml from 'js-yaml';
 import { OctokitError } from '../../../types.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'configure.secrets');
 
 type SecretClassification =

src/commands/dev/convert/messages.ts

@@ -7,11 +7,11 @@
 import fs from 'node:fs';
 import { EOL } from 'node:os';
 import path from 'node:path';
-import { fileURLToPath } from 'node:url';
+
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
 
-Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'dev.convert.messages');
 
 export type DevConvertMessagesResult = {

src/commands/dev/convert/script.ts

@@ -6,12 +6,12 @@
  */
 import fs from 'node:fs';
 import os from 'node:os';
-import { dirname } from 'node:path';
-import { fileURLToPath } from 'node:url';
+
+
 import { Flags, SfCommand } 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-dev', 'dev.convert.script');
 
 type Flag = {

src/commands/dev/generate/command.ts

@@ -4,13 +4,13 @@
  * 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 } from '@salesforce/core';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { fileExists, generate } from '../../../util.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'dev.generate.command');
 
 export default class GenerateCommand extends SfCommand<void> {

src/commands/dev/generate/flag.ts

@@ -8,7 +8,7 @@
 import path from 'node:path';
 import os from 'node:os';
 import fs from 'node:fs/promises';
-import { fileURLToPath } from 'node:url';
+
 import shelljs from 'shelljs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
 import { Messages } from '@salesforce/core';
@@ -20,7 +20,7 @@ import fg from 'fast-glob';
 import { fileExists, FlagBuilder } from '../../../util.js';
 import { FlagAnswers } from '../../../types.js';
 
-Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'dev.generate.flag');
 
 const toLowerKebabCase = (str: string): string =>

src/commands/dev/generate/library.ts

@@ -4,13 +4,13 @@
  * 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 } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { generate } from '../../../util.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'dev.generate.library');
 
 export default class GenerateLibrary extends SfCommand<void> {

src/commands/dev/generate/plugin.ts

@@ -4,13 +4,13 @@
  * 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 } from '@salesforce/core';
 import { SfCommand } from '@salesforce/sf-plugins-core';
 import { generate } from '../../../util.js';
 
-Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'dev.generate.plugin');
 
 export default class GeneratePlugin extends SfCommand<void> {

src/generators/plugin.ts

@@ -15,7 +15,7 @@ import { Messages } from '@salesforce/core';
 import { NYC, PackageJson } from '../types.js';
 import { readJson, validatePluginName } from '../util.js';
 
-Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url)));
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url)
 const messages = Messages.loadMessages('@salesforce/plugin-dev', 'plugin.generator');
 
 const TEMPLATES_DIR = path.join(path.dirname(fileURLToPath(import.meta.url)), '../../templates');