From 526a032db894e209e04d0c50eea944009b5bb266 Mon Sep 17 00:00:00 2001 From: svc-cli-bot <113140650+svc-cli-bot@users.noreply.github.com> Date: Thu, 28 Dec 2023 02:44:08 -0600 Subject: [PATCH] chore: updates from devScripts (#1043) --- package.json | 6 +- src/commands/force/mdapi/deploy.ts | 6 +- src/commands/force/mdapi/deploy/cancel.ts | 6 +- src/commands/force/mdapi/deploy/report.ts | 6 +- src/commands/force/mdapi/retrieve.ts | 6 +- src/commands/force/mdapi/retrieve/report.ts | 6 +- src/commands/force/source/deploy.ts | 6 +- src/commands/force/source/deploy/cancel.ts | 6 +- src/commands/force/source/deploy/report.ts | 6 +- src/commands/force/source/pull.ts | 6 +- src/commands/force/source/push.ts | 6 +- src/commands/force/source/retrieve.ts | 4 +- src/commands/force/source/status.ts | 6 +- src/deployCommand.ts | 4 +- src/formatters/deployReportResultFormatter.ts | 6 +- src/formatters/deployResultFormatter.ts | 6 +- .../mdapi/mdDeployAsyncResultFormatter.ts | 6 +- .../mdapi/mdDeployResultFormatter.ts | 6 +- src/formatters/retrieveFormatter.ts | 6 +- .../source/deployAsyncResultFormatter.ts | 6 +- src/formatters/source/pullFormatter.ts | 6 +- src/formatters/source/pushResultFormatter.ts | 6 +- src/formatters/source/statusFormatter.ts | 6 +- src/hooks/diagnostics.ts | 6 +- src/sourceCommand.ts | 4 +- src/stash.ts | 6 +- src/trackingFunctions.ts | 6 +- test/commands/source/deploy.test.ts | 6 +- test/commands/source/retrieve.test.ts | 6 +- test/hooks/diagnostics.test.ts | 6 +- yarn.lock | 200 +++++++----------- 31 files changed, 163 insertions(+), 211 deletions(-) diff --git a/package.json b/package.json index d4230d591..43ce9bc1e 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@oclif/core": "^3.13.1", "@salesforce/apex-node": "^2.1.7", - "@salesforce/core": "^6.4.0", + "@salesforce/core": "^6.4.2", "@salesforce/kit": "^3.0.15", "@salesforce/sf-plugins-core": "^5.0.10", "@salesforce/source-deploy-retrieve": "^10.2.1", @@ -20,7 +20,7 @@ "@oclif/plugin-command-snapshot": "^5.0.5", "@oclif/plugin-help": "^6.0.7", "@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", "@salesforce/plugin-info": "^2.6.50", "@salesforce/source-testkit": "^2.1.76", @@ -29,7 +29,7 @@ "archiver": "^5.3.2", "chai-each": "^0.0.1", "cross-env": "^7.0.3", - "eslint-plugin-sf-plugin": "^1.16.15", + "eslint-plugin-sf-plugin": "^1.17.0", "fast-glob": "^3.3.1", "oclif": "^4.0.4", "shx": "0.3.4", diff --git a/src/commands/force/mdapi/deploy.ts b/src/commands/force/mdapi/deploy.ts index e0b77cd9f..d00a9d5c7 100644 --- a/src/commands/force/mdapi/deploy.ts +++ b/src/commands/force/mdapi/deploy.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Duration, env } from '@salesforce/kit'; import { Lifecycle, Messages, Org } from '@salesforce/core'; import { AsyncResult, DeployVersionData, MetadataApiDeploy } from '@salesforce/source-deploy-retrieve'; @@ -32,7 +32,7 @@ import { DeployProgressStatusFormatter } from '../../../formatters/deployProgres import { MdDeployAsyncResultFormatter } from '../../../formatters/mdapi/mdDeployAsyncResultFormatter.js'; import { ResultFormatterOptions } from '../../../formatters/resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.deploy'); const deployMessages = Messages.loadMessages('@salesforce/plugin-source', 'deployCommand'); diff --git a/src/commands/force/mdapi/deploy/cancel.ts b/src/commands/force/mdapi/deploy/cancel.ts index 49ecdc21d..4ef88fdc1 100644 --- a/src/commands/force/mdapi/deploy/cancel.ts +++ b/src/commands/force/mdapi/deploy/cancel.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Connection, Messages, SfError } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { RequestStatus } from '@salesforce/source-deploy-retrieve'; @@ -23,7 +23,7 @@ import { DeployCancelResultFormatter, } from '../../../../formatters/deployCancelResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.cancel'); const replacement = 'project deploy cancel'; diff --git a/src/commands/force/mdapi/deploy/report.ts b/src/commands/force/mdapi/deploy/report.ts index 9593145db..674ee60df 100644 --- a/src/commands/force/mdapi/deploy/report.ts +++ b/src/commands/force/mdapi/deploy/report.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages, Org } from '@salesforce/core'; import { Duration, env } from '@salesforce/kit'; import { RequestStatus } from '@salesforce/source-deploy-retrieve'; @@ -24,7 +24,7 @@ import { ProgressFormatter } from '../../../../formatters/progressFormatter.js'; import { DeployProgressBarFormatter } from '../../../../formatters/deployProgressBarFormatter.js'; import { DeployProgressStatusFormatter } from '../../../../formatters/deployProgressStatusFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.deployreport'); const replacement = 'project deploy report'; diff --git a/src/commands/force/mdapi/retrieve.ts b/src/commands/force/mdapi/retrieve.ts index 0b4c0292f..54ddb20ec 100644 --- a/src/commands/force/mdapi/retrieve.ts +++ b/src/commands/force/mdapi/retrieve.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Lifecycle, Messages, Org, SfError, SfProject } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { @@ -32,7 +32,7 @@ import { RetrieveResultFormatter, } from '../../../formatters/mdapi/retrieveResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.retrieve'); const spinnerMessages = Messages.loadMessages('@salesforce/plugin-source', 'spinner'); const retrieveMessages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve'); diff --git a/src/commands/force/mdapi/retrieve/report.ts b/src/commands/force/mdapi/retrieve/report.ts index e772ce01e..e130f5ff1 100644 --- a/src/commands/force/mdapi/retrieve/report.ts +++ b/src/commands/force/mdapi/retrieve/report.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages, Org, SfError } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { MetadataApiRetrieve, MetadataApiRetrieveStatus, RetrieveResult } from '@salesforce/source-deploy-retrieve'; @@ -25,7 +25,7 @@ import { RetrieveResultFormatter, } from '../../../../formatters/mdapi/retrieveResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.retrieve'); const spinnerMessages = Messages.loadMessages('@salesforce/plugin-source', 'spinner'); export type ReportCommandResult = RetrieveCommandResult | RetrieveCommandAsyncResult; diff --git a/src/commands/force/source/deploy.ts b/src/commands/force/source/deploy.ts index db69e06d2..9b022b2de 100644 --- a/src/commands/force/source/deploy.ts +++ b/src/commands/force/source/deploy.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Lifecycle, Messages, Org } from '@salesforce/core'; import { Duration, env } from '@salesforce/kit'; import { SourceTracking } from '@salesforce/source-tracking'; @@ -37,7 +37,7 @@ import { DeployProgressStatusFormatter } from '../../../formatters/deployProgres import { filterConflictsByComponentSet, trackingSetup, updateTracking } from '../../../trackingFunctions.js'; import { ResultFormatterOptions } from '../../../formatters/resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'deploy'); const deployMessages = Messages.loadMessages('@salesforce/plugin-source', 'deployCommand'); diff --git a/src/commands/force/source/deploy/cancel.ts b/src/commands/force/source/deploy/cancel.ts index fd00f1f5a..a15594beb 100644 --- a/src/commands/force/source/deploy/cancel.ts +++ b/src/commands/force/source/deploy/cancel.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages, SfError } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { RequestStatus } from '@salesforce/source-deploy-retrieve'; @@ -23,7 +23,7 @@ import { DeployCancelResultFormatter, } from '../../../../formatters/deployCancelResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'cancel'); const replacement = 'project deploy cancel'; diff --git a/src/commands/force/source/deploy/report.ts b/src/commands/force/source/deploy/report.ts index 915becc64..45fd14634 100644 --- a/src/commands/force/source/deploy/report.ts +++ b/src/commands/force/source/deploy/report.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages, SfProject } from '@salesforce/core'; import { Duration, env } from '@salesforce/kit'; @@ -30,7 +30,7 @@ import { DeployProgressBarFormatter } from '../../../../formatters/deployProgres import { DeployProgressStatusFormatter } from '../../../../formatters/deployProgressStatusFormatter.js'; import { ResultFormatterOptions } from '../../../../formatters/resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'report'); const replacement = 'project deploy report'; diff --git a/src/commands/force/source/pull.ts b/src/commands/force/source/pull.ts index f51a99fc7..bd5798c9d 100644 --- a/src/commands/force/source/pull.ts +++ b/src/commands/force/source/pull.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Duration } from '@salesforce/kit'; import { Lifecycle, Messages } from '@salesforce/core'; import { FileResponse, RequestStatus, RetrieveVersionData, RetrieveResult } from '@salesforce/source-deploy-retrieve'; @@ -23,7 +23,7 @@ import { SourceCommand } from '../../../sourceCommand.js'; import { PullResponse, PullResultFormatter } from '../../../formatters/source/pullFormatter.js'; import { trackingSetup, updateTracking } from '../../../trackingFunctions.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'pull'); const retrieveMessages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve'); diff --git a/src/commands/force/source/push.ts b/src/commands/force/source/push.ts index f347d1c21..5bbff6b28 100644 --- a/src/commands/force/source/push.ts +++ b/src/commands/force/source/push.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Duration, env } from '@salesforce/kit'; import { Lifecycle, Messages } from '@salesforce/core'; import { ComponentStatus, DeployResult, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve'; @@ -27,7 +27,7 @@ import { DeployProgressBarFormatter } from '../../../formatters/deployProgressBa import { DeployProgressStatusFormatter } from '../../../formatters/deployProgressStatusFormatter.js'; import { trackingSetup, updateTracking } from '../../../trackingFunctions.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'push'); const deployMessages = Messages.loadMessages('@salesforce/plugin-source', 'deployCommand'); diff --git a/src/commands/force/source/retrieve.ts b/src/commands/force/source/retrieve.ts index 04417cb37..fd52102cf 100644 --- a/src/commands/force/source/retrieve.ts +++ b/src/commands/force/source/retrieve.ts @@ -8,7 +8,7 @@ import { dirname, join, resolve } from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Lifecycle, Messages, SfError, SfProject } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { @@ -39,7 +39,7 @@ import { import { filterConflictsByComponentSet, trackingSetup, updateTracking } from '../../../trackingFunctions.js'; import { promisesQueue } from '../../../promiseQueue.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve'); const spinnerMessages = Messages.loadMessages('@salesforce/plugin-source', 'spinner'); const retrieveMessages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve'); diff --git a/src/commands/force/source/status.ts b/src/commands/force/source/status.ts index 757ed66f1..6f2a8b53b 100644 --- a/src/commands/force/source/status.ts +++ b/src/commands/force/source/status.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages } from '@salesforce/core'; import { ChangeResult, StatusOutputRow } from '@salesforce/source-tracking'; import { Interfaces } from '@oclif/core'; @@ -26,7 +26,7 @@ import { } from '../../../formatters/source/statusFormatter.js'; import { trackingSetup } from '../../../trackingFunctions.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'status'); export type StatusCommandResult = StatusResult[]; diff --git a/src/deployCommand.ts b/src/deployCommand.ts index e8830fd26..2f1e77a30 100644 --- a/src/deployCommand.ts +++ b/src/deployCommand.ts @@ -7,7 +7,7 @@ import path from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { AsyncResult, ComponentSet, @@ -43,7 +43,7 @@ import { transformCoverageToApexCoverage, transformDeployTestsResultsToTestResul export type TestLevel = 'NoTestRun' | 'RunSpecifiedTests' | 'RunLocalTests' | 'RunAllTestsInOrg'; -Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'deployCommand'); export const reportsFormatters = Object.keys(DefaultReportOptions); diff --git a/src/formatters/deployReportResultFormatter.ts b/src/formatters/deployReportResultFormatter.ts index d60cbf182..e3f317547 100644 --- a/src/formatters/deployReportResultFormatter.ts +++ b/src/formatters/deployReportResultFormatter.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { MetadataApiDeployStatus, RequestStatus } from '@salesforce/source-deploy-retrieve'; import { SfError, Messages } from '@salesforce/core'; import { DeployResultFormatter } from './deployResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export type DeployReportCommandResult = MetadataApiDeployStatus; export class DeployReportResultFormatter extends DeployResultFormatter { diff --git a/src/formatters/deployResultFormatter.ts b/src/formatters/deployResultFormatter.ts index ebf54fff8..cf134986b 100644 --- a/src/formatters/deployResultFormatter.ts +++ b/src/formatters/deployResultFormatter.ts @@ -6,8 +6,8 @@ */ import path from 'node:path'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import chalk from 'chalk'; import { Messages, SfError } from '@salesforce/core'; @@ -29,7 +29,7 @@ import { ResultFormatter, ResultFormatterOptions } from './resultFormatter.js'; import { MdDeployResult } from './mdapi/mdDeployResultFormatter.js'; import { maybePrintCodeCoverageTable } from './codeCoverageTable.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'deploy'); export type DeployCommandResult = { diff --git a/src/formatters/mdapi/mdDeployAsyncResultFormatter.ts b/src/formatters/mdapi/mdDeployAsyncResultFormatter.ts index b16099891..86e0b2b0f 100644 --- a/src/formatters/mdapi/mdDeployAsyncResultFormatter.ts +++ b/src/formatters/mdapi/mdDeployAsyncResultFormatter.ts @@ -7,15 +7,15 @@ import { EOL } from 'node:os'; -import { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages } from '@salesforce/core'; import { AsyncResult } from '@salesforce/source-deploy-retrieve'; import { Ux } from '@salesforce/sf-plugins-core'; import { ResultFormatterOptions } from '../resultFormatter.js'; import { DeployAsyncResultFormatter } from '../source/deployAsyncResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.deploy'); export class MdDeployAsyncResultFormatter extends DeployAsyncResultFormatter { diff --git a/src/formatters/mdapi/mdDeployResultFormatter.ts b/src/formatters/mdapi/mdDeployResultFormatter.ts index b76a1fca9..8ec24e05c 100644 --- a/src/formatters/mdapi/mdDeployResultFormatter.ts +++ b/src/formatters/mdapi/mdDeployResultFormatter.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import chalk from 'chalk'; import { getNumber } from '@salesforce/ts-types'; import { Messages, SfError } from '@salesforce/core'; @@ -23,7 +23,7 @@ import { Ux } from '@salesforce/sf-plugins-core'; import { CoverageResultsFileInfo, ResultFormatter, ResultFormatterOptions } from '../resultFormatter.js'; import { maybePrintCodeCoverageTable } from '../codeCoverageTable.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'md.deploy'); export type MdDeployResult = { diff --git a/src/formatters/retrieveFormatter.ts b/src/formatters/retrieveFormatter.ts index 0638f057b..90dbd3181 100644 --- a/src/formatters/retrieveFormatter.ts +++ b/src/formatters/retrieveFormatter.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages, SfError } from '@salesforce/core'; import { get } from '@salesforce/ts-types'; import { @@ -20,7 +20,7 @@ import { ensureArray } from '@salesforce/kit'; import { Ux } from '@salesforce/sf-plugins-core'; import chalk from 'chalk'; import { ResultFormatter, ResultFormatterOptions } from './resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export abstract class RetrieveFormatter extends ResultFormatter { protected warnings: RetrieveMessage[]; diff --git a/src/formatters/source/deployAsyncResultFormatter.ts b/src/formatters/source/deployAsyncResultFormatter.ts index b84f755df..956934d20 100644 --- a/src/formatters/source/deployAsyncResultFormatter.ts +++ b/src/formatters/source/deployAsyncResultFormatter.ts @@ -7,15 +7,15 @@ import { EOL } from 'node:os'; -import { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages } from '@salesforce/core'; import { cloneJson } from '@salesforce/kit'; import { AsyncResult } from '@salesforce/source-deploy-retrieve'; import { Ux } from '@salesforce/sf-plugins-core'; import { ResultFormatter, ResultFormatterOptions } from '../resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'deploy'); export interface DeployCommandAsyncResult extends DeployAsyncStatus { diff --git a/src/formatters/source/pullFormatter.ts b/src/formatters/source/pullFormatter.ts index 8cf807363..5917d4221 100644 --- a/src/formatters/source/pullFormatter.ts +++ b/src/formatters/source/pullFormatter.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import chalk from 'chalk'; import { Messages, SfError } from '@salesforce/core'; @@ -22,7 +22,7 @@ import { import { Ux } from '@salesforce/sf-plugins-core'; import { ResultFormatter, ResultFormatterOptions } from '../resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'pull'); export type PullResponse = { pulledSource: Array> }; diff --git a/src/formatters/source/pushResultFormatter.ts b/src/formatters/source/pushResultFormatter.ts index 5f8d688b0..4e7c5f6fe 100644 --- a/src/formatters/source/pushResultFormatter.ts +++ b/src/formatters/source/pushResultFormatter.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, relative, resolve as pathResolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { relative, resolve as pathResolve } from 'node:path'; + import chalk from 'chalk'; import { Messages, SfError } from '@salesforce/core'; @@ -23,7 +23,7 @@ import { ensureArray } from '@salesforce/kit'; import { Ux } from '@salesforce/sf-plugins-core'; import { ResultFormatter, ResultFormatterOptions } from '../resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'push'); export type PushResponse = { diff --git a/src/formatters/source/statusFormatter.ts b/src/formatters/source/statusFormatter.ts index b59af85f1..bbf8fc372 100644 --- a/src/formatters/source/statusFormatter.ts +++ b/src/formatters/source/statusFormatter.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { Messages } from '@salesforce/core'; import { Ux } from '@salesforce/sf-plugins-core'; import { ResultFormatter, ResultFormatterOptions } from '../resultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'status'); type StatusActualState = 'Deleted' | 'Add' | 'Changed' | 'Unchanged'; diff --git a/src/hooks/diagnostics.ts b/src/hooks/diagnostics.ts index 92d3d7ef6..2d368ebe6 100644 --- a/src/hooks/diagnostics.ts +++ b/src/hooks/diagnostics.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { ConfigAggregator, Lifecycle, Logger, Messages, SfProject, OrgConfigProperties, Org } from '@salesforce/core'; import type { SfDoctor } from '@salesforce/plugin-info'; type HookFunction = (options: { doctor: SfDoctor }) => Promise<[void]>; @@ -19,7 +19,7 @@ const getLogger = (): Logger => { }; const pluginName = '@salesforce/plugin-source'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages(pluginName, 'diagnostics'); export const hook: HookFunction = async (options) => { diff --git a/src/sourceCommand.ts b/src/sourceCommand.ts index 6c36862cf..c0f3793f2 100644 --- a/src/sourceCommand.ts +++ b/src/sourceCommand.ts @@ -7,7 +7,7 @@ import { dirname, resolve, extname } from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Messages, SfError } from '@salesforce/core'; import { ComponentSet } from '@salesforce/source-deploy-retrieve'; import { getString, Optional } from '@salesforce/ts-types'; @@ -15,7 +15,7 @@ import { ux } from '@oclif/core'; import { SfCommand } from '@salesforce/sf-plugins-core'; import { EnsureFsFlagOptions, FsError, ProgressBar } from './types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'flags.validation'); export abstract class SourceCommand extends SfCommand { diff --git a/src/stash.ts b/src/stash.ts index 53291e4ef..180593b90 100644 --- a/src/stash.ts +++ b/src/stash.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 fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import { ConfigFile, Logger, Messages, SfError } from '@salesforce/core'; import { JsonMap, Optional } from '@salesforce/ts-types'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) interface StashFile { isGlobal: boolean; diff --git a/src/trackingFunctions.ts b/src/trackingFunctions.ts index b103a97d4..f66c8d321 100644 --- a/src/trackingFunctions.ts +++ b/src/trackingFunctions.ts @@ -6,8 +6,8 @@ */ import path from 'node:path'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import { ChangeResult, SourceTracking, SourceTrackingOptions } from '@salesforce/source-tracking'; import { Messages, SfError } from '@salesforce/core'; import { @@ -18,7 +18,7 @@ import { RetrieveResult, } from '@salesforce/source-deploy-retrieve'; import { Ux } from '@salesforce/sf-plugins-core'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'tracking'); interface TrackingSetupRequest extends SourceTrackingOptions { diff --git a/test/commands/source/deploy.test.ts b/test/commands/source/deploy.test.ts index 490da2636..7efb73753 100644 --- a/test/commands/source/deploy.test.ts +++ b/test/commands/source/deploy.test.ts @@ -6,8 +6,8 @@ */ import { join } from 'node:path'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import sinon from 'sinon'; import { expect } from 'chai'; import { ComponentSetBuilder, ComponentSetOptions, MetadataApiDeployOptions } from '@salesforce/source-deploy-retrieve'; @@ -28,7 +28,7 @@ import { DeployProgressStatusFormatter } from '../../../src/formatters/deployPro import { getDeployResult } from './deployResponses.js'; import { exampleSourceComponent } from './testConsts.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) describe('force:source:deploy', () => { const $$ = new TestContext(); const testOrg = new MockTestOrgData(); diff --git a/test/commands/source/retrieve.test.ts b/test/commands/source/retrieve.test.ts index 2032bc2cf..c90d0e487 100644 --- a/test/commands/source/retrieve.test.ts +++ b/test/commands/source/retrieve.test.ts @@ -7,8 +7,8 @@ import { join } from 'node:path'; import path from 'node:path'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import sinon from 'sinon'; import { expect } from 'chai'; import { @@ -31,7 +31,7 @@ import { getRetrieveResult } from './retrieveResponses.js'; import { exampleSourceComponent } from './testConsts.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-source', 'retrieve'); describe('force:source:retrieve', () => { diff --git a/test/hooks/diagnostics.test.ts b/test/hooks/diagnostics.test.ts index a4e35e4bd..ab39d3ef2 100644 --- a/test/hooks/diagnostics.test.ts +++ b/test/hooks/diagnostics.test.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 { fileURLToPath } from 'node:url'; -import { dirname } from 'node:path'; + + import sinon from 'sinon'; import { expect } from 'chai'; import { fromStub, StubbedType, stubInterface, stubMethod } from '@salesforce/ts-sinon'; @@ -16,7 +16,7 @@ import { TestContext } from '@salesforce/core/lib/testSetup.js'; import { hook } from '../../src/hooks/diagnostics.js'; const pluginName = '@salesforce/plugin-source'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages(pluginName, 'diagnostics'); describe('Doctor diagnostics', () => { diff --git a/yarn.lock b/yarn.lock index d23ca51c4..d71391f5e 100644 --- a/yarn.lock +++ b/yarn.lock @@ -991,7 +991,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.3.1", "@salesforce/core@^5.3.20": +"@salesforce/core@^5.3.1": version "5.3.20" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.20.tgz#4e934d4551bb70423cb1c4115615bc41cffca41e" integrity sha512-y+O6O2c8OYFDrAy2qsG+pAcNxoyL14nmBXcBRRcYA7Huj8ikK+aLJK84PuVAYdQz+hNwImQF+69IWtDkpK4Irg== @@ -1015,7 +1015,7 @@ semver "^7.5.4" ts-retry-promise "^0.7.1" -"@salesforce/core@^6.1.0", "@salesforce/core@^6.2.2", "@salesforce/core@^6.4.0", "@salesforce/core@^6.4.1": +"@salesforce/core@^6.1.0", "@salesforce/core@^6.2.2", "@salesforce/core@^6.4.0", "@salesforce/core@^6.4.1", "@salesforce/core@^6.4.2": version "6.4.2" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.4.2.tgz#e6e5e2d5e6ad17f1cbe0feb5a0e55e8b74c91e3c" integrity sha512-ZtLwgI18f1th6SY0fKmuiyVGGwTXPy4nI+KfXzkww/vqdPxDhAfoHwqvFeo4tjFE2rldK7IPiIIYdtpsaI8d5g== @@ -1044,16 +1044,16 @@ resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^8.1.2": - version "8.1.2" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.1.2.tgz#ec3e528328fe7c7b8b312688e970ea258913980b" - integrity sha512-DQscqQPMuj2b1D8sfh77zAKQVEuo0SQ05XlFSbVKgvxO/yPrSpUK0LgHsbyG4Js88TWBqsf4K7mkdaryukSnSA== +"@salesforce/dev-scripts@^8.1.3": + version "8.1.3" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.1.3.tgz#b33c53b4b648b5090322d1144c6852ca587d6eb7" + integrity sha512-mSWCab+uO3O2QNBCRJpKsHw/UYpOGpNFWT12BC85e+VyWBp4LTIAsssBKDY8czRI02K7NwiYaC34fNdP+yqrzA== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.8.1" "@salesforce/dev-config" "^4.1.0" "@salesforce/prettier-config" "^0.0.3" - "@types/chai" "^4.3.10" + "@types/chai" "^4.3.11" "@types/mocha" "^10.0.6" "@types/node" "^18" "@types/sinon" "^10.0.20" @@ -1423,10 +1423,10 @@ "@types/node" "*" "@types/responselike" "^1.0.0" -"@types/chai@^4.3.10": - version "4.3.10" - resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.10.tgz#2ad2959d1767edee5b0e4efb1a0cd2b500747317" - integrity sha512-of+ICnbqjmFCiixUnqRulbylyXQrPqIGf/B3Jax1wIF3DvSheysQxAWvqHhZiW3IQrycvokcLcFQlveGp+vyNg== +"@types/chai@^4.3.11": + version "4.3.11" + resolved "https://registry.yarnpkg.com/@types/chai/-/chai-4.3.11.tgz#e95050bf79a932cb7305dd130254ccdf9bde671c" + integrity sha512-qQR1dr2rGIHYlJulmr8Ioq3De0Le9E4MJ5AiaeAETJJpndT1uUNHsGFK3L/UIu+rbkQSdj8J/w2bCsBZc/Y5fQ== "@types/cli-progress@^3.11.0": version "3.11.5" @@ -1480,7 +1480,7 @@ dependencies: "@types/istanbul-lib-report" "*" -"@types/json-schema@^7.0.12", "@types/json-schema@^7.0.9": +"@types/json-schema@^7.0.12": version "7.0.15" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.15.tgz#596a1747233694d50f6ad8a7869fcb6f56cf5841" integrity sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA== @@ -1582,7 +1582,7 @@ dependencies: "@types/node" "*" -"@types/semver@^7.3.12", "@types/semver@^7.5.0", "@types/semver@^7.5.4", "@types/semver@^7.5.6": +"@types/semver@^7.5.0", "@types/semver@^7.5.4", "@types/semver@^7.5.6": version "7.5.6" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== @@ -1650,14 +1650,6 @@ "@typescript-eslint/visitor-keys" "6.11.0" debug "^4.3.4" -"@typescript-eslint/scope-manager@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-5.62.0.tgz#d9457ccc6a0b8d6b37d0eb252a23022478c5460c" - integrity sha512-VXuvVvZeQCQb5Zgf4HAxc04q5j+WrNAtNh9OwCsCgpKqESMTu3tF/jhZ3xG6T4NZwWl65Bg8KuS2uEvhSfLl0w== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - "@typescript-eslint/scope-manager@6.11.0": version "6.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.11.0.tgz#621f603537c89f4d105733d949aa4d55eee5cea8" @@ -1666,6 +1658,14 @@ "@typescript-eslint/types" "6.11.0" "@typescript-eslint/visitor-keys" "6.11.0" +"@typescript-eslint/scope-manager@6.16.0": + version "6.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-6.16.0.tgz#f3e9a00fbc1d0701356359cd56489c54d9e37168" + integrity sha512-0N7Y9DSPdaBQ3sqSCwlrm9zJwkpOuc6HYm7LpzLAPqBL7dmzAUimr4M29dMkOP/tEwvOCC/Cxo//yOfJD3HUiw== + dependencies: + "@typescript-eslint/types" "6.16.0" + "@typescript-eslint/visitor-keys" "6.16.0" + "@typescript-eslint/type-utils@6.11.0": version "6.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.11.0.tgz#d0b8b1ab6c26b974dbf91de1ebc5b11fea24e0d1" @@ -1676,28 +1676,15 @@ debug "^4.3.4" ts-api-utils "^1.0.1" -"@typescript-eslint/types@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-5.62.0.tgz#258607e60effa309f067608931c3df6fed41fd2f" - integrity sha512-87NVngcbVXUahrRTqIK27gD2t5Cu1yuCXxbLcFtCzZGlfyVWWh8mLHkoxzjsB6DDNnvdL+fW8MiwPEJyGJQDgQ== - "@typescript-eslint/types@6.11.0": version "6.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.11.0.tgz#8ad3aa000cbf4bdc4dcceed96e9b577f15e0bf53" integrity sha512-ZbEzuD4DwEJxwPqhv3QULlRj8KYTAnNsXxmfuUXFCxZmO6CF2gM/y+ugBSAQhrqaJL3M+oe4owdWunaHM6beqA== -"@typescript-eslint/typescript-estree@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-5.62.0.tgz#7d17794b77fabcac615d6a48fb143330d962eb9b" - integrity sha512-CmcQ6uY7b9y694lKdRB8FEel7JbU/40iSAPomu++SjLMntB+2Leay2LO6i8VnJk58MtE9/nQSFIH6jpyRWyYzA== - dependencies: - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/visitor-keys" "5.62.0" - debug "^4.3.4" - globby "^11.1.0" - is-glob "^4.0.3" - semver "^7.3.7" - tsutils "^3.21.0" +"@typescript-eslint/types@6.16.0": + version "6.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.16.0.tgz#a3abe0045737d44d8234708d5ed8fef5d59dc91e" + integrity sha512-hvDFpLEvTJoHutVl87+MG/c5C8I6LOgEx05zExTSJDEVU7hhR3jhV8M5zuggbdFCw98+HhZWPHZeKS97kS3JoQ== "@typescript-eslint/typescript-estree@6.11.0": version "6.11.0" @@ -1712,7 +1699,21 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@6.11.0", "@typescript-eslint/utils@^6.7.5": +"@typescript-eslint/typescript-estree@6.16.0": + version "6.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-6.16.0.tgz#d6e0578e4f593045f0df06c4b3a22bd6f13f2d03" + integrity sha512-VTWZuixh/vr7nih6CfrdpmFNLEnoVBF1skfjdyGnNwXOH1SLeHItGdZDHhhAIzd3ACazyY2Fg76zuzOVTaknGA== + dependencies: + "@typescript-eslint/types" "6.16.0" + "@typescript-eslint/visitor-keys" "6.16.0" + debug "^4.3.4" + globby "^11.1.0" + is-glob "^4.0.3" + minimatch "9.0.3" + semver "^7.5.4" + ts-api-utils "^1.0.1" + +"@typescript-eslint/utils@6.11.0": version "6.11.0" resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.11.0.tgz#11374f59ef4cea50857b1303477c08aafa2ca604" integrity sha512-p23ibf68fxoZy605dc0dQAEoUsoiNoP3MD9WQGiHLDuTSOuqoTsa4oAy+h3KDkTcxbbfOtUjb9h3Ta0gT4ug2g== @@ -1725,27 +1726,18 @@ "@typescript-eslint/typescript-estree" "6.11.0" semver "^7.5.4" -"@typescript-eslint/utils@^5.59.11": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-5.62.0.tgz#141e809c71636e4a75daa39faed2fb5f4b10df86" - integrity sha512-n8oxjeb5aIbPFEtmQxQYOLI0i9n5ySBEY/ZEHHZqKQSFnxio1rv6dthascc9dLuwrL0RC5mPCxB7vnAVGAYWAQ== +"@typescript-eslint/utils@^6.13.2", "@typescript-eslint/utils@^6.7.5": + version "6.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.16.0.tgz#1c291492d34670f9210d2b7fcf6b402bea3134ae" + integrity sha512-T83QPKrBm6n//q9mv7oiSvy/Xq/7Hyw9SzSEhMHJwznEmQayfBM87+oAlkNAMEO7/MjIwKyOHgBJbxB0s7gx2A== dependencies: - "@eslint-community/eslint-utils" "^4.2.0" - "@types/json-schema" "^7.0.9" - "@types/semver" "^7.3.12" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" - eslint-scope "^5.1.1" - semver "^7.3.7" - -"@typescript-eslint/visitor-keys@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-5.62.0.tgz#2174011917ce582875954ffe2f6912d5931e353e" - integrity sha512-07ny+LHRzQXepkGg6w0mFY41fVUNBrL2Roj/++7V1txKugfjm/Ci/qSND03r2RhlJhJYMcTn9AhhSSqQp0Ysyw== - dependencies: - "@typescript-eslint/types" "5.62.0" - eslint-visitor-keys "^3.3.0" + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "6.16.0" + "@typescript-eslint/types" "6.16.0" + "@typescript-eslint/typescript-estree" "6.16.0" + semver "^7.5.4" "@typescript-eslint/visitor-keys@6.11.0": version "6.11.0" @@ -1755,6 +1747,14 @@ "@typescript-eslint/types" "6.11.0" eslint-visitor-keys "^3.4.1" +"@typescript-eslint/visitor-keys@6.16.0": + version "6.16.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-6.16.0.tgz#d50da18a05d91318ed3e7e8889bda0edc35f3a10" + integrity sha512-QSFQLruk7fhs91a/Ep/LqRdbJCZ1Rq03rqBdKT5Ky17Sz8zRLUksqIe9DW0pKtg/Z35/ztbLQ6qpOCN6rOC11A== + dependencies: + "@typescript-eslint/types" "6.16.0" + eslint-visitor-keys "^3.4.1" + "@ungap/structured-clone@^1.2.0": version "1.2.0" resolved "https://registry.yarnpkg.com/@ungap/structured-clone/-/structured-clone-1.2.0.tgz#756641adb587851b5ccb3e095daf27ae581c8406" @@ -3509,13 +3509,13 @@ eslint-plugin-perfectionist@^2.1.0: minimatch "^9.0.3" natural-compare-lite "^1.4.0" -eslint-plugin-sf-plugin@^1.16.15: - version "1.16.15" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.16.15.tgz#99d0b522bb7eebefc8e456aa4b725f6fbbf2fa01" - integrity sha512-Vog0xc8DwLOCoPbwFx9GxaXHqpG0FvlpITkGzp//SdjcV7wqVW4CT76JES8IGenGv6mAecW5VqSyQzsIHFZGew== +eslint-plugin-sf-plugin@^1.17.0: + version "1.17.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.17.0.tgz#9a7e81cb63bc6f36aae7c7797f95e2179def7fd3" + integrity sha512-grW7leP0FJbKQZgDjBZanLSTYrus0itKaEmoflEuqTZSyqH4feP53rHby5ysbOnw9OvgZfuq9NSc0a/CzcIbtQ== dependencies: - "@salesforce/core" "^5.3.20" - "@typescript-eslint/utils" "^5.59.11" + "@salesforce/core" "^6.4.0" + "@typescript-eslint/utils" "^6.13.2" eslint-plugin-unicorn@^49.0.0: version "49.0.0" @@ -3537,14 +3537,6 @@ eslint-plugin-unicorn@^49.0.0: semver "^7.5.4" strip-indent "^3.0.0" -eslint-scope@^5.1.1: - version "5.1.1" - resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" - integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== - dependencies: - esrecurse "^4.3.0" - estraverse "^4.1.1" - eslint-scope@^7.2.2: version "7.2.2" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-7.2.2.tgz#deb4f92563390f32006894af62a22dba1c46423f" @@ -3630,11 +3622,6 @@ esrecurse@^4.3.0: dependencies: estraverse "^5.2.0" -estraverse@^4.1.1: - version "4.3.0" - resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" - integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw== - estraverse@^5.1.0, estraverse@^5.2.0: version "5.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.3.0.tgz#2eea5290702f26ab8fe5370370ff86c965d21123" @@ -4174,7 +4161,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6, glob@^7.2.3: once "^1.3.0" path-is-absolute "^1.0.0" -glob@^8.0.0, glob@^8.0.1, glob@^8.0.3: +glob@^8.0.1, glob@^8.0.3: version "8.1.0" resolved "https://registry.yarnpkg.com/glob/-/glob-8.1.0.tgz#d388f656593ef708ee3e34640fdfb99a9fd1c33e" integrity sha512-r8hpEjiQEYlF2QU0df3dS+nxxSIreXQS1qRhMJM0Q5NDdR386C7jb7Hwwod8Fgiuex+k0GFjgft18yvxm5XoCQ== @@ -4368,14 +4355,6 @@ header-case@^2.0.4: capital-case "^1.0.4" tslib "^2.0.3" -help-me@^4.0.1: - version "4.2.0" - resolved "https://registry.yarnpkg.com/help-me/-/help-me-4.2.0.tgz#50712bfd799ff1854ae1d312c36eafcea85b0563" - integrity sha512-TAOnTB8Tz5Dw8penUuzHVrKNKlCIbwwbHnXraNJxPwf8LRtE2HlM84RYuezMFcwOJmoYOCWVDyJ8TQGxn9PgxA== - dependencies: - glob "^8.0.0" - readable-stream "^3.6.0" - help-me@^5.0.0: version "5.0.0" resolved "https://registry.yarnpkg.com/help-me/-/help-me-5.0.0.tgz#b1ebe63b967b74060027c2ac61f9be12d354a6f6" @@ -5798,6 +5777,13 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" +minimatch@9.0.3, minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: + version "9.0.3" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" + integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== + dependencies: + brace-expansion "^2.0.1" + minimatch@^3.0.4, minimatch@^3.0.5, minimatch@^3.1.1, minimatch@^3.1.2: version "3.1.2" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.1.2.tgz#19cd194bfd3e428f049a70817c038d89ab4be35b" @@ -5819,13 +5805,6 @@ minimatch@^7.2.0: dependencies: brace-expansion "^2.0.1" -minimatch@^9.0.0, minimatch@^9.0.1, minimatch@^9.0.3: - version "9.0.3" - resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" - integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== - dependencies: - brace-expansion "^2.0.1" - minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -6871,27 +6850,7 @@ pino-abstract-transport@^1.0.0, pino-abstract-transport@^1.1.0, pino-abstract-tr readable-stream "^4.0.0" split2 "^4.0.0" -pino-pretty@^10.2.3: - version "10.2.3" - resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.2.3.tgz#db539c796a1421fd4d130734fa994f5a26027783" - integrity sha512-4jfIUc8TC1GPUfDyMSlW1STeORqkoxec71yhxIpLDQapUu8WOuoz2TTCoidrIssyz78LZC69whBMPIKCMbi3cw== - dependencies: - colorette "^2.0.7" - dateformat "^4.6.3" - fast-copy "^3.0.0" - fast-safe-stringify "^2.1.1" - help-me "^4.0.1" - joycon "^3.1.1" - minimist "^1.2.6" - on-exit-leak-free "^2.1.0" - pino-abstract-transport "^1.0.0" - pump "^3.0.0" - readable-stream "^4.0.0" - secure-json-parse "^2.4.0" - sonic-boom "^3.0.0" - strip-json-comments "^3.1.1" - -pino-pretty@^10.3.0: +pino-pretty@^10.2.3, pino-pretty@^10.3.0: version "10.3.0" resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.3.0.tgz#483ff78b98d277c33d00e0419c00601d9152bc7e" integrity sha512-JthvQW289q3454mhM3/38wFYGWPiBMR28T3CpDNABzoTQOje9UKS7XCJQSnjWF9LQGQkGd8D7h0oq+qwiM3jFA== @@ -7497,7 +7456,7 @@ secure-json-parse@^2.4.0: resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.2.tgz#48d55db737c3287cd4835e17fa13feace1c41ef8" integrity sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g== -semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.7, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: +semver@7.5.4, semver@^7.0.0, semver@^7.1.1, semver@^7.1.3, semver@^7.2.1, semver@^7.3.2, semver@^7.3.4, semver@^7.3.5, semver@^7.3.8, semver@^7.5.3, semver@^7.5.4: version "7.5.4" resolved "https://registry.yarnpkg.com/semver/-/semver-7.5.4.tgz#483986ec4ed38e1c6c48c34894a9182dbff68a6e" integrity sha512-1bCSESV6Pv+i21Hvpxp3Dx+pSD8lIPt8uVjRrxAUt/nbswYc+tK6Y2btiULjd4+fnq15PX+nqQDC7Oft7WkwcA== @@ -8197,7 +8156,7 @@ tsconfig-paths@^3.14.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -8207,13 +8166,6 @@ tslib@^2, tslib@^2.0.1, tslib@^2.0.3, tslib@^2.1.0, tslib@^2.5.0, tslib@^2.6.1, resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.2.tgz#703ac29425e7b37cd6fd456e92404d46d1f3e4ae" integrity sha512-AEYxH93jGFPn/a2iVAwW87VuUIkR1FVUKB77NwMF7nBTDkDrrT/Hpt/IrCJ0QXhW27jTBDcf5ZY7w6RiqTMw2Q== -tsutils@^3.21.0: - version "3.21.0" - resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623" - integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA== - dependencies: - tslib "^1.8.1" - tuf-js@^1.1.7: version "1.1.7" resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"