refactor: devScripts update

eslint.config.mjs

@@ -0,0 +1 @@
+export { default } from 'eslint-config-salesforce-typescript';

package.json

@@ -19,10 +19,12 @@
     "@oclif/plugin-command-snapshot": "^5.3.34",
     "@oclif/plugin-help": "^6.2.55",
     "@salesforce/cli-plugins-testkit": "^5.3.58",
-    "@salesforce/dev-scripts": "^11.0.4",
+    "@salesforce/dev-scripts": "^13.0.1",
     "@salesforce/plugin-command-reference": "^3.1.81",
     "@salesforce/ts-sinon": "^1.4.36",
     "@types/debug": "^4.1.13",
+    "eslint": "^10.4.0",
+    "eslint-config-salesforce-typescript": "^6.0.0",
     "oclif": "^4.22.96",
     "ts-node": "^10.9.2",
     "typescript": "^5.9.3"
@@ -121,6 +123,7 @@
         "src/**/*.ts",
         "test/**/*.ts",
         "messages/**",
+        "**/eslint.config.*",
         "**/.eslint*",
         "**/tsconfig.json"
       ],

src/commandExecution.ts

@@ -175,7 +175,7 @@ export class CommandExecution extends AsyncCreatable {
         (flags['metadata'] as unknown as string[])?.some((metadata) => metadata.toLowerCase().startsWith('agent')) ??
         false;
       this.argKeys = [...new Set(Object.keys(parseVarArgs(parseResult.args, parseResult.argv as string[])))];
-    } catch (error) {
+    } catch {
       debug('Error parsing flags');
     }
     const targetOrg = flags['target-org'] ? (flags['target-org'] as unknown as Org) : undefined;
@@ -203,7 +203,7 @@ export class CommandExecution extends AsyncCreatable {
       const pjson = JSON.parse(pjsonContents) as Record<string, unknown>;
       const rawEnableO11y = pjson.enableO11y;
       this.enableO11y =
-        typeof rawEnableO11y === 'boolean' ? rawEnableO11y : String(rawEnableO11y ?? '').toLowerCase() === 'true';
+        typeof rawEnableO11y === 'boolean' ? rawEnableO11y : String(rawEnableO11y ?? '').toLowerCase() === 'true'; // eslint-disable-line @typescript-eslint/no-base-to-string
       const endpoint = pjson.o11yUploadEndpoint;
       this.o11yUploadEndpoint = typeof endpoint === 'string' && endpoint.length > 0 ? endpoint : undefined;
       const productFeatureId = pjson.productFeatureId;

src/commands/telemetry.ts

@@ -33,7 +33,7 @@ export default class TelemetryGet extends SfCommand<TelemetryGetResult> {
 
   public async run(): Promise<TelemetryGetResult> {
     const enabled = await isEnabled();
-    const cliId = global.cliTelemetry?.getCLIId();
+    const cliId: string | undefined = global.cliTelemetry?.getCLIId();
 
     this.log(`Telemetry is ${enabled ? 'enabled' : 'disabled'}.`);
     this.log(`Telemetry tmp directory is ${Telemetry.tmpDir}.`);

src/hooks/telemetryPrerun.ts

@@ -27,7 +27,7 @@ declare const global: TelemetryGlobal;
 type CommonData = {
   nodeVersion: string;
   plugin?: string;
-  // eslint-disable-next-line camelcase
+   
   plugin_version?: string;
   command?: string;
 };
@@ -46,11 +46,11 @@ const hook: Hook.Prerun = async function (options): Promise<void> {
 
   try {
     const [path, Performance, Lifecycle, Telemetry, CommandExecution] = await Promise.all([
-      await import('node:path'),
-      (await import('@oclif/core')).Performance,
-      (await import('@salesforce/core')).Lifecycle,
-      (await import('../telemetry.js')).default,
-      (await import('../commandExecution.js')).CommandExecution,
+      import('node:path'),
+      import('@oclif/core').then((m) => m.Performance),
+      import('@salesforce/core').then((m) => m.Lifecycle),
+      import('../telemetry.js').then((m) => m.default),
+      import('../commandExecution.js').then((m) => m.CommandExecution),
     ]);
 
     const errors: Array<{ event: JsonMap; error: SfError }> = [];

src/telemetry.ts

@@ -129,7 +129,7 @@ export default class Telemetry extends AsyncCreatable {
 
     try {
       this.cliId = fs.readFileSync(cliIdPath, 'utf8');
-    } catch (err) {
+    } catch {
       debug('Unique CLI ID not found, generating and writing new ID to ', cliIdPath);
       this.cliId = generateRandomId();
       fs.writeFileSync(cliIdPath, this.cliId, 'utf8');
@@ -158,9 +158,7 @@ export default class Telemetry extends AsyncCreatable {
       return map;
     }, {});
 
-    if (!dataToRecord.type) {
-      dataToRecord.type = Telemetry.EVENT;
-    }
+    dataToRecord.type ??= Telemetry.EVENT;
 
     if (!dataToRecord.eventName) {
       // This would mean a consumer forgot to set this.

test/hooks/telemetryPrerun.nut.ts

@@ -13,7 +13,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-/* eslint-disable no-console */
 
 import fs from 'node:fs';
 import { assert, expect, config } from 'chai';

test/hooks/telemetryPrerun.test.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable @typescript-eslint/no-unsafe-call */
 
 import { Hook, Config } from '@oclif/core';
 

test/telemetry.test.ts

@@ -14,7 +14,7 @@
  * limitations under the License.
  */
 
-/* eslint-disable @typescript-eslint/no-unsafe-argument */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access, @typescript-eslint/no-unsafe-argument */
 
 import cp from 'node:child_process';
 import { EOL } from 'node:os';

test/uploader.test.ts

@@ -13,6 +13,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
+/* eslint-disable @typescript-eslint/no-unsafe-member-access */
 
 import TelemetryReporter from '@salesforce/telemetry';
 import { stubMethod } from '@salesforce/ts-sinon';