From 7b41d6a9fb1908215572c00b0d1237da7b312e7e Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Thu, 28 Dec 2023 05:52:33 +0000 Subject: [PATCH] chore: updates from devScripts --- package.json | 6 +- src/commands/deploy.ts | 6 +- src/commands/project/convert/mdapi.ts | 4 +- src/commands/project/convert/source.ts | 6 +- src/commands/project/delete/source.ts | 4 +- src/commands/project/delete/tracking.ts | 6 +- src/commands/project/deploy/cancel.ts | 6 +- src/commands/project/deploy/preview.ts | 6 +- src/commands/project/deploy/quick.ts | 6 +- src/commands/project/deploy/report.ts | 6 +- src/commands/project/deploy/resume.ts | 6 +- src/commands/project/deploy/start.ts | 6 +- src/commands/project/deploy/validate.ts | 6 +- src/commands/project/generate/manifest.ts | 6 +- src/commands/project/list/ignored.ts | 6 +- src/commands/project/reset/tracking.ts | 6 +- src/commands/project/retrieve/preview.ts | 6 +- src/commands/project/retrieve/start.ts | 4 +- src/configMeta.ts | 6 +- .../asyncDeployCancelResultFormatter.ts | 6 +- src/formatters/asyncDeployResultFormatter.ts | 6 +- .../metadataRetrieveResultFormatter.ts | 6 +- .../sourceConvertResultFormatter.ts | 6 +- src/utils/deploy.ts | 6 +- src/utils/errorCodes.ts | 6 +- src/utils/flags.ts | 6 +- src/utils/metadataDeployer.ts | 6 +- src/utils/previewOutput.ts | 6 +- src/utils/progressBar.ts | 6 +- test/commands/deploy/start.test.ts | 6 +- test/commands/retrieve/start.test.ts | 6 +- yarn.lock | 224 ++++++------------ 32 files changed, 166 insertions(+), 238 deletions(-) diff --git a/package.json b/package.json index 14ba0839..1dd7385f 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,7 @@ "dependencies": { "@oclif/core": "^3.12.0", "@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.3", @@ -18,13 +18,13 @@ "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.51", "@salesforce/plugin-source": "^2.11.4", "@salesforce/source-testkit": "^2.1.76", "@salesforce/ts-sinon": "^1.4.19", "cross-env": "^7.0.3", - "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/commands/deploy.ts b/src/commands/deploy.ts index a7ac0039..32257a88 100644 --- a/src/commands/deploy.ts +++ b/src/commands/deploy.ts @@ -10,8 +10,8 @@ import { EOL } from 'node:os'; import { writeFile, readFile } from 'node:fs/promises'; import { existsSync } from 'node:fs'; import { exec } from 'node:child_process'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import { Hook } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { Env, parseJsonMap } from '@salesforce/kit'; @@ -26,7 +26,7 @@ import { } from '@salesforce/sf-plugins-core'; import { DeployerResult } from '@salesforce/sf-plugins-core/lib/deployer.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy'); diff --git a/src/commands/project/convert/mdapi.ts b/src/commands/project/convert/mdapi.ts index 637f5869..aef6ddc7 100644 --- a/src/commands/project/convert/mdapi.ts +++ b/src/commands/project/convert/mdapi.ts @@ -7,7 +7,7 @@ import { dirname, resolve } from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Messages, SfError } from '@salesforce/core'; import { ComponentSet, @@ -26,7 +26,7 @@ import { Interfaces } from '@oclif/core'; import { ConvertMdapiJson } from '../../../utils/types.js'; import { MetadataConvertResultFormatter } from '../../../formatters/metadataConvertResultFormatter.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.mdapi'); export interface EnsureFsFlagOptions { diff --git a/src/commands/project/convert/source.ts b/src/commands/project/convert/source.ts index df9b1264..1664e798 100644 --- a/src/commands/project/convert/source.ts +++ b/src/commands/project/convert/source.ts @@ -5,9 +5,9 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ -import { resolve, dirname } from 'node:path'; +import { resolve } from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Messages } from '@salesforce/core'; import { ComponentSet, @@ -27,7 +27,7 @@ import { getPackageDirs, getSourceApiVersion } from '../../../utils/project.js'; import { SourceConvertResultFormatter } from '../../../formatters/sourceConvertResultFormatter.js'; import { ConvertResultJson } from '../../../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.source'); export class Source extends SfCommand { diff --git a/src/commands/project/delete/source.ts b/src/commands/project/delete/source.ts index 5ef74f57..bdd64314 100644 --- a/src/commands/project/delete/source.ts +++ b/src/commands/project/delete/source.ts @@ -8,7 +8,7 @@ import fs from 'node:fs'; import path from 'node:path'; import os from 'node:os'; -import { fileURLToPath } from 'node:url'; + import { Interfaces } from '@oclif/core'; import { Lifecycle, Messages, Org, SfError } from '@salesforce/core'; import { @@ -44,7 +44,7 @@ import { testLevelFlag, testsFlag } from '../../../utils/flags.js'; const fsPromises = fs.promises; const testFlags = 'Test'; -Messages.importMessagesDirectory(path.dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'delete.source'); const xorFlags = ['metadata', 'source-dir']; export class Source extends SfCommand { diff --git a/src/commands/project/delete/tracking.ts b/src/commands/project/delete/tracking.ts index 275bbd5c..3f42aa4d 100644 --- a/src/commands/project/delete/tracking.ts +++ b/src/commands/project/delete/tracking.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 { Messages } from '@salesforce/core'; import chalk from 'chalk'; import { SourceTracking } from '@salesforce/source-tracking'; @@ -18,7 +18,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-deploy-retrieve', 'delete.tracking'); export type DeleteTrackingResult = { diff --git a/src/commands/project/deploy/cancel.ts b/src/commands/project/deploy/cancel.ts index e34b1da1..a2ea31df 100644 --- a/src/commands/project/deploy/cancel.ts +++ b/src/commands/project/deploy/cancel.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 { Messages } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; @@ -17,7 +17,7 @@ import { AsyncDeployCancelResultFormatter } from '../../../formatters/asyncDeplo import { DeployCancelResultFormatter } from '../../../formatters/deployCancelResultFormatter.js'; import { DeployResultJson } from '../../../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.cancel'); export default class DeployMetadataCancel extends SfCommand { diff --git a/src/commands/project/deploy/preview.ts b/src/commands/project/deploy/preview.ts index 25e717a7..a2cc1537 100644 --- a/src/commands/project/deploy/preview.ts +++ b/src/commands/project/deploy/preview.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 } from '@salesforce/core'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; import { SourceTracking } from '@salesforce/source-tracking'; @@ -13,7 +13,7 @@ import { ForceIgnore } from '@salesforce/source-deploy-retrieve'; import { buildComponentSet } from '../../../utils/deploy.js'; import { PreviewResult, printTables, compileResults, getConflictFiles } from '../../../utils/previewOutput.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.preview'); const exclusiveFlags = ['manifest', 'source-dir', 'metadata']; diff --git a/src/commands/project/deploy/quick.ts b/src/commands/project/deploy/quick.ts index 674fad83..1e67b186 100644 --- a/src/commands/project/deploy/quick.ts +++ b/src/commands/project/deploy/quick.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 chalk from 'chalk'; import { Messages, Org } from '@salesforce/core'; import { SfCommand, toHelpSection, Flags } from '@salesforce/sf-plugins-core'; @@ -19,7 +19,7 @@ import { AsyncDeployResultFormatter } from '../../../formatters/asyncDeployResul import { DeployResultFormatter } from '../../../formatters/deployResultFormatter.js'; import { API, DeployResultJson } from '../../../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.quick'); export default class DeployMetadataQuick extends SfCommand { diff --git a/src/commands/project/deploy/report.ts b/src/commands/project/deploy/report.ts index 4019c26d..d0689611 100644 --- a/src/commands/project/deploy/report.ts +++ b/src/commands/project/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 { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import { Messages, Org, SfProject } from '@salesforce/core'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; import { ComponentSet, DeployResult, MetadataApiDeploy } from '@salesforce/source-deploy-retrieve'; @@ -17,7 +17,7 @@ import { DeployReportResultFormatter } from '../../../formatters/deployReportRes import { API, DeployResultJson } from '../../../utils/types.js'; import { coverageFormattersFlag } from '../../../utils/flags.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.report'); const deployMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata'); const testFlags = 'Test'; diff --git a/src/commands/project/deploy/resume.ts b/src/commands/project/deploy/resume.ts index 13a42965..d4c1c147 100644 --- a/src/commands/project/deploy/resume.ts +++ b/src/commands/project/deploy/resume.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 chalk from 'chalk'; import { EnvironmentVariable, Messages, Org, SfError } from '@salesforce/core'; import { SfCommand, toHelpSection, Flags } from '@salesforce/sf-plugins-core'; @@ -20,7 +20,7 @@ import { DeployCache } from '../../../utils/deployCache.js'; import { DEPLOY_STATUS_CODES_DESCRIPTIONS } from '../../../utils/errorCodes.js'; import { coverageFormattersFlag } from '../../../utils/flags.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.resume'); const testFlags = 'Test'; diff --git a/src/commands/project/deploy/start.ts b/src/commands/project/deploy/start.ts index fd7c43d7..33977744 100644 --- a/src/commands/project/deploy/start.ts +++ b/src/commands/project/deploy/start.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 chalk from 'chalk'; import { EnvironmentVariable, Lifecycle, Messages, OrgConfigProperties, SfError } from '@salesforce/core'; import { DeployVersionData } from '@salesforce/source-deploy-retrieve'; @@ -24,7 +24,7 @@ import { coverageFormattersFlag, fileOrDirFlag, testLevelFlag, testsFlag } from import { writeConflictTable } from '../../../utils/conflicts.js'; import { getOptionalProject } from '../../../utils/project.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata'); const exclusiveFlags = ['manifest', 'source-dir', 'metadata', 'metadata-dir']; diff --git a/src/commands/project/deploy/validate.ts b/src/commands/project/deploy/validate.ts index 1e9346e5..e7f416b6 100644 --- a/src/commands/project/deploy/validate.ts +++ b/src/commands/project/deploy/validate.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 * as os from 'node:os'; -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import chalk from 'chalk'; import { EnvironmentVariable, Lifecycle, Messages, OrgConfigProperties, SfError } from '@salesforce/core'; import { CodeCoverageWarnings, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve'; @@ -21,7 +21,7 @@ import { DEPLOY_STATUS_CODES_DESCRIPTIONS } from '../../../utils/errorCodes.js'; import { ConfigVars } from '../../../configMeta.js'; import { coverageFormattersFlag, fileOrDirFlag, testLevelFlag, testsFlag } from '../../../utils/flags.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata.validate'); const deployMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata'); diff --git a/src/commands/project/generate/manifest.ts b/src/commands/project/generate/manifest.ts index 91146dfe..6df6eeef 100644 --- a/src/commands/project/generate/manifest.ts +++ b/src/commands/project/generate/manifest.ts @@ -4,9 +4,9 @@ * 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 { join, dirname } from 'node:path'; +import { join } from 'node:path'; import * as fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Messages, Org } from '@salesforce/core'; import { ComponentSetBuilder } from '@salesforce/source-deploy-retrieve'; import { @@ -18,7 +18,7 @@ import { } from '@salesforce/sf-plugins-core'; import { getPackageDirs, getSourceApiVersion } from '../../../utils/project.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'manifest.generate'); const manifestTypes = { diff --git a/src/commands/project/list/ignored.ts b/src/commands/project/list/ignored.ts index 02eaac8d..61e3f7e6 100644 --- a/src/commands/project/list/ignored.ts +++ b/src/commands/project/list/ignored.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 { join, dirname } from 'node:path'; +import { join } from 'node:path'; import fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { Messages, SfError } from '@salesforce/core'; import { ForceIgnore } from '@salesforce/source-deploy-retrieve'; import { SfCommand, Flags } from '@salesforce/sf-plugins-core'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'list.ignored'); export type SourceIgnoredResults = { diff --git a/src/commands/project/reset/tracking.ts b/src/commands/project/reset/tracking.ts index f19b27ff..65bdd7ac 100644 --- a/src/commands/project/reset/tracking.ts +++ b/src/commands/project/reset/tracking.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 { Messages } from '@salesforce/core'; import { SourceTracking } from '@salesforce/source-tracking'; import { @@ -18,7 +18,7 @@ import { StandardColors, } from '@salesforce/sf-plugins-core'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'delete.tracking'); export type ResetTrackingResult = { diff --git a/src/commands/project/retrieve/preview.ts b/src/commands/project/retrieve/preview.ts index 5665f621..675d9c93 100644 --- a/src/commands/project/retrieve/preview.ts +++ b/src/commands/project/retrieve/preview.ts @@ -4,15 +4,15 @@ * 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 { SourceTracking } from '@salesforce/source-tracking'; import { ForceIgnore } from '@salesforce/source-deploy-retrieve'; import { PreviewResult, printTables, compileResults, getConflictFiles } from '../../../utils/previewOutput.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.metadata.preview'); export default class RetrieveMetadataPreview extends SfCommand { diff --git a/src/commands/project/retrieve/start.ts b/src/commands/project/retrieve/start.ts index 8ffcda2a..8abc44f2 100644 --- a/src/commands/project/retrieve/start.ts +++ b/src/commands/project/retrieve/start.ts @@ -9,7 +9,7 @@ import { rm } from 'node:fs/promises'; import { dirname, join, resolve } from 'node:path'; import * as fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; + import { EnvironmentVariable, Lifecycle, Messages, OrgConfigProperties, SfError, SfProject } from '@salesforce/core'; import { RetrieveResult, @@ -36,7 +36,7 @@ import { RetrieveResultJson } from '../../../utils/types.js'; import { writeConflictTable } from '../../../utils/conflicts.js'; import { promisesQueue } from '../../../utils/promiseQueue.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.start'); const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer'); diff --git a/src/configMeta.ts b/src/configMeta.ts index e2d8b7fe..823e2490 100644 --- a/src/configMeta.ts +++ b/src/configMeta.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 type { ConfigValue } from '@salesforce/core'; import { Messages } from '@salesforce/core/lib/messages.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'config'); export enum ConfigVars { diff --git a/src/formatters/asyncDeployCancelResultFormatter.ts b/src/formatters/asyncDeployCancelResultFormatter.ts index 06e11aa5..409d1b42 100644 --- a/src/formatters/asyncDeployCancelResultFormatter.ts +++ b/src/formatters/asyncDeployCancelResultFormatter.ts @@ -4,12 +4,12 @@ * 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 { ux } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { AsyncDeployResultJson, DeployResultJson, Formatter } from '../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export const deployAsyncMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.async'); diff --git a/src/formatters/asyncDeployResultFormatter.ts b/src/formatters/asyncDeployResultFormatter.ts index f43a3772..e2b7830e 100644 --- a/src/formatters/asyncDeployResultFormatter.ts +++ b/src/formatters/asyncDeployResultFormatter.ts @@ -4,12 +4,12 @@ * 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 { ux } from '@oclif/core'; import { Messages } from '@salesforce/core'; import { AsyncDeployResultJson, Formatter } from '../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export const deployAsyncMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.async'); export class AsyncDeployResultFormatter implements Formatter { diff --git a/src/formatters/metadataRetrieveResultFormatter.ts b/src/formatters/metadataRetrieveResultFormatter.ts index ef0f9076..592a1ee8 100644 --- a/src/formatters/metadataRetrieveResultFormatter.ts +++ b/src/formatters/metadataRetrieveResultFormatter.ts @@ -4,15 +4,15 @@ * 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 { join, parse, dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { join, parse } from 'node:path'; + import { ux } from '@oclif/core'; import { FileResponse, RetrieveResult } from '@salesforce/source-deploy-retrieve'; import { Messages } from '@salesforce/core'; import { Formatter, MetadataRetrieveResultJson } from '../utils/types.js'; import { sortFileResponses, asRelativePaths } from '../utils/output.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export const retrieveMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.start'); export class MetadataRetrieveResultFormatter implements Formatter { diff --git a/src/formatters/sourceConvertResultFormatter.ts b/src/formatters/sourceConvertResultFormatter.ts index d554f650..dd471227 100644 --- a/src/formatters/sourceConvertResultFormatter.ts +++ b/src/formatters/sourceConvertResultFormatter.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 { resolve, dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; + import { ux } from '@oclif/core'; import { ConvertResult } from '@salesforce/source-deploy-retrieve'; import { SfError, Messages } from '@salesforce/core'; import { ConvertResultJson, Formatter } from '../utils/types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export const convertMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'convert.source'); export class SourceConvertResultFormatter implements Formatter { diff --git a/src/utils/deploy.ts b/src/utils/deploy.ts index 466b8f91..ac4a5ee2 100644 --- a/src/utils/deploy.ts +++ b/src/utils/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 { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import { ConfigAggregator, Messages, Org, SfError, SfProject } from '@salesforce/core'; import { Duration } from '@salesforce/kit'; import { Nullable } from '@salesforce/ts-types'; @@ -26,7 +26,7 @@ import { DEPLOY_STATUS_CODES } from './errorCodes.js'; import { DeployCache } from './deployCache.js'; import { writeManifest } from './manifestCache.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) export const cacheMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'cache'); const deployMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata'); diff --git a/src/utils/errorCodes.ts b/src/utils/errorCodes.ts index bdfbea7a..011c4dce 100644 --- a/src/utils/errorCodes.ts +++ b/src/utils/errorCodes.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 { Messages } from '@salesforce/core'; import { RequestStatus } from '@salesforce/source-deploy-retrieve'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'errorCodes'); export const DEPLOY_STATUS_CODES = new Map([ diff --git a/src/utils/flags.ts b/src/utils/flags.ts index cf5e962a..1537f3e3 100644 --- a/src/utils/flags.ts +++ b/src/utils/flags.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 * as fs from 'node:fs'; -import { fileURLToPath } from 'node:url'; -import { resolve, extname, dirname } from 'node:path'; + +import { resolve, extname } from 'node:path'; import { Flags } from '@oclif/core'; import { Messages, Lifecycle } from '@salesforce/core'; import { PathInfo, TestLevel, reportsFormatters } from './types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'validation'); const commonFlagMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'commonFlags'); diff --git a/src/utils/metadataDeployer.ts b/src/utils/metadataDeployer.ts index 8e5662c0..bbfbebe5 100644 --- a/src/utils/metadataDeployer.ts +++ b/src/utils/metadataDeployer.ts @@ -6,8 +6,8 @@ */ /* eslint-disable class-methods-use-this */ -import { dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; + + import { EOL } from 'node:os'; import chalk from 'chalk'; import { Duration } from '@salesforce/kit'; @@ -28,7 +28,7 @@ import { TestLevel } from './types.js'; import { DeployProgress } from './progressBar.js'; import { determineExitCode, executeDeploy, resolveApi } from './deploy.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy'); type OrgAuthWithTimestamp = OrgAuthorization & { timestamp: Date }; diff --git a/src/utils/previewOutput.ts b/src/utils/previewOutput.ts index d9e726f3..0cd50a22 100644 --- a/src/utils/previewOutput.ts +++ b/src/utils/previewOutput.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 { isAbsolute, relative, resolve, dirname } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { isAbsolute, relative, resolve } from 'node:path'; + import { ux } from '@oclif/core'; import { StandardColors } from '@salesforce/sf-plugins-core'; import chalk from 'chalk'; @@ -24,7 +24,7 @@ import { filePathsFromMetadataComponent } from '@salesforce/source-deploy-retrie import { SourceTracking } from '@salesforce/source-tracking'; import { isSourceComponentWithXml } from './types.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'previewMessages'); type BaseOperation = 'deploy' | 'retrieve'; diff --git a/src/utils/progressBar.ts b/src/utils/progressBar.ts index 2a90907c..90995392 100644 --- a/src/utils/progressBar.ts +++ b/src/utils/progressBar.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 { envVars as env, EnvironmentVariable, Lifecycle, Messages } from '@salesforce/core'; import { MetadataApiDeploy, MetadataApiDeployStatus } from '@salesforce/source-deploy-retrieve'; import { Progress } from '@salesforce/sf-plugins-core'; import { SourceMemberPollingEvent } from '@salesforce/source-tracking'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const mdTransferMessages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'metadata.transfer'); const showBar = Boolean( diff --git a/test/commands/deploy/start.test.ts b/test/commands/deploy/start.test.ts index 39b2d801..fc41723d 100644 --- a/test/commands/deploy/start.test.ts +++ b/test/commands/deploy/start.test.ts @@ -5,15 +5,15 @@ * 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 { expect } from 'chai'; import { MockTestOrgData, TestContext } from '@salesforce/core/lib/testSetup.js'; import { stubSfCommandUx } from '@salesforce/sf-plugins-core'; import { Messages } from '@salesforce/core'; import DeployMetadata from '../../../src/commands/project/deploy/start.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'deploy.metadata'); describe('project deploy start', () => { diff --git a/test/commands/retrieve/start.test.ts b/test/commands/retrieve/start.test.ts index dbfdfceb..279f67bf 100644 --- a/test/commands/retrieve/start.test.ts +++ b/test/commands/retrieve/start.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 { dirname, resolve } from 'node:path'; -import { fileURLToPath } from 'node:url'; +import { resolve } from 'node:path'; + import sinon from 'sinon'; import { expect } from 'chai'; import { @@ -29,7 +29,7 @@ import { RetrieveResultJson } from '../../../src/utils/types.js'; import { exampleSourceComponent } from '../../utils/testConsts.js'; import RetrieveMetadata from '../../../src/commands/project/retrieve/start.js'; -Messages.importMessagesDirectory(dirname(fileURLToPath(import.meta.url))); +Messages.importMessagesDirectoryFromMetaUrl(import.meta.url) const messages = Messages.loadMessages('@salesforce/plugin-deploy-retrieve', 'retrieve.start'); describe('project retrieve start', () => { diff --git a/yarn.lock b/yarn.lock index a1a5318d..5adfb72f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -991,31 +991,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.3.20": - 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== - dependencies: - "@salesforce/kit" "^3.0.15" - "@salesforce/schemas" "^1.6.1" - "@salesforce/ts-types" "^2.0.9" - "@types/semver" "^7.5.4" - ajv "^8.12.0" - change-case "^4.1.2" - faye "^1.4.0" - form-data "^4.0.0" - js2xmlparser "^4.0.1" - jsforce "^2.0.0-beta.28" - jsonwebtoken "9.0.2" - jszip "3.10.1" - pino "^8.16.0" - pino-abstract-transport "^1.0.0" - pino-pretty "^10.2.3" - proper-lockfile "^4.1.2" - semver "^7.5.4" - ts-retry-promise "^0.7.1" - -"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.2", "@salesforce/core@^6.4.0", "@salesforce/core@^6.4.1": +"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@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 +1020,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" @@ -1377,10 +1353,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.0" @@ -1434,7 +1410,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.14" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1" integrity sha512-U3PUjAudAdJBeC2pgN8uTIKgxrb4nlDF3SF0++EldXQvQBGkpFZMSnwQiIoDU77tv45VgNkl/L4ouD+rEomujw== @@ -1522,7 +1498,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.6": version "7.5.6" resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.5.6.tgz#c65b2bfce1bec346582c07724e3f8c1017a20339" integrity sha512-dn1l8LaMea/IjDoHNd9J52uBbInB796CDffS6VdIxvqYCPSG0V0DzHp76GpaWnlhg88uYyPbXCDIowa86ybd5A== @@ -1590,14 +1566,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" @@ -1606,6 +1574,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" @@ -1616,28 +1592,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" @@ -1652,7 +1615,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== @@ -1665,27 +1642,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" @@ -1695,6 +1663,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" @@ -3421,13 +3397,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" @@ -3449,14 +3425,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" @@ -3542,11 +3510,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" @@ -4080,7 +4043,7 @@ glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: 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== @@ -4264,14 +4227,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" @@ -4996,7 +4951,7 @@ jsesc@~0.5.0: resolved "https://registry.yarnpkg.com/jsesc/-/jsesc-0.5.0.tgz#e7dee66e35d6fc16f710fe91d5cf69f70f08911d" integrity sha512-uZz5UnB7u4T9LvwmFqXii7pZSouaRPorGs5who1Ip7VO0wxanFvBL7GkM6dTHlgX+jhBApRetaWpnDabOeTcnA== -jsforce@^2.0.0-beta.28, jsforce@^2.0.0-beta.29: +jsforce@^2.0.0-beta.29: version "2.0.0-beta.29" resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.29.tgz#0b59b026eb0b90dfb199a53656af32a4c8acc48f" integrity sha512-Fq7xjOYOikyozZZDQNTfzsAdhcO0rUXwtavsjM+cCYUFiCMVOJJavgco303zOsJk3v8sdAYnGgHyKckLIhnyAg== @@ -5664,6 +5619,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" @@ -5685,13 +5647,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" @@ -6721,26 +6676,6 @@ 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: version "10.3.0" resolved "https://registry.yarnpkg.com/pino-pretty/-/pino-pretty-10.3.0.tgz#483ff78b98d277c33d00e0419c00601d9152bc7e" @@ -6766,7 +6701,7 @@ pino-std-serializers@^6.0.0: resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-6.2.2.tgz#d9a9b5f2b9a402486a5fc4db0a737570a860aab3" integrity sha512-cHjPPsE+vhj/tnhCy/wiMh3M3z3h/j15zHQX+S9GkTBgqJuTuJzYJ4gUyACLhDaJ7kk9ba9iRDmbH2tJU03OiA== -pino@^8.16.0, pino@^8.16.2: +pino@^8.16.2: version "8.16.2" resolved "https://registry.yarnpkg.com/pino/-/pino-8.16.2.tgz#7a906f2d9a8c5b4c57412c9ca95d6820bd2090cd" integrity sha512-2advCDGVEvkKu9TTVSa/kWW7Z3htI/sBKEZpqiHk6ive0i/7f5b1rsU8jn0aimxqfnSz5bj/nOYkwhBUn5xxvg== @@ -7352,7 +7287,7 @@ semver@^6.0.0, semver@^6.3.0, semver@^6.3.1: resolved "https://registry.yarnpkg.com/semver/-/semver-6.3.1.tgz#556d2ef8689146e46dcea4bfdd095f3434dffcb4" integrity sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA== -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.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== @@ -8058,7 +7993,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== @@ -8068,13 +8003,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.3: version "1.1.7" resolved "https://registry.yarnpkg.com/tuf-js/-/tuf-js-1.1.7.tgz#21b7ae92a9373015be77dfe0cb282a80ec3bbe43"