From dfb03f72210cfb88c720fe4519afd2ef546318cf Mon Sep 17 00:00:00 2001 From: Willie Ruemmele Date: Wed, 1 Nov 2023 13:43:14 -0600 Subject: [PATCH] chore: merge main, resolve conflicts --- src/commands/force/source/push.ts | 4 +- src/commands/force/source/retrieve.ts | 2 +- src/formatters/deployReportResultFormatter.ts | 2 +- src/formatters/deployResultFormatter.ts | 7 +- .../mdapi/mdDeployResultFormatter.ts | 2 +- src/formatters/resultFormatter.ts | 3 +- src/formatters/source/pushResultFormatter.ts | 6 +- test/nuts/partialBundleDelete.nut.ts | 5 +- test/nuts/trackingCommands/basics.nut.ts | 6 +- test/nuts/trackingCommands/lwc.nut.ts | 7 +- yarn.lock | 225 ++++++++---------- 11 files changed, 128 insertions(+), 141 deletions(-) diff --git a/src/commands/force/source/push.ts b/src/commands/force/source/push.ts index bab43bf3b..f347d1c21 100644 --- a/src/commands/force/source/push.ts +++ b/src/commands/force/source/push.ts @@ -9,7 +9,7 @@ import { fileURLToPath } from 'node:url'; import { dirname } from 'node:path'; import { Duration, env } from '@salesforce/kit'; import { Lifecycle, Messages } from '@salesforce/core'; -import { DeployResult, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve'; +import { ComponentStatus, DeployResult, DeployVersionData, RequestStatus } from '@salesforce/source-deploy-retrieve'; import { SourceTracking } from '@salesforce/source-tracking'; import { getBoolean } from '@salesforce/ts-types'; import { @@ -211,7 +211,7 @@ export default class Push extends DeployCommand { result.response.status === RequestStatus.Succeeded || // successful-ish (only warnings about deleted things that are already deleted) (result.response.status === RequestStatus.Failed && - result.getFileResponses().every((fr) => fr.state !== 'Failed') && + result.getFileResponses().every((fr) => fr.state !== ComponentStatus.Failed) && !result.response.errorMessage); // all successes if (this.deployResults.every((result) => isSuccessLike(result))) { diff --git a/src/commands/force/source/retrieve.ts b/src/commands/force/source/retrieve.ts index 15c996abd..04417cb37 100644 --- a/src/commands/force/source/retrieve.ts +++ b/src/commands/force/source/retrieve.ts @@ -180,7 +180,7 @@ export class Retrieve extends SourceCommand { }, }); - if (this.flags.manifest || this.flags.metadata) { + if (this.flags.manifest ?? this.flags.metadata) { if (this.wantsToRetrieveCustomFields()) { this.warn(messages.getMessage('wantsToRetrieveCustomFields')); this.componentSet.add({ diff --git a/src/formatters/deployReportResultFormatter.ts b/src/formatters/deployReportResultFormatter.ts index d3d6cf45f..ed3d6e222 100644 --- a/src/formatters/deployReportResultFormatter.ts +++ b/src/formatters/deployReportResultFormatter.ts @@ -17,7 +17,7 @@ export type DeployReportCommandResult = MetadataApiDeployStatus; export class DeployReportResultFormatter extends DeployResultFormatter { public display(): void { - const status = getString(this, 'result.response.status', 'unknown'); + const status = getString(this, 'result.response.status', 'unknown') as RequestStatus; this.ux.log(`Status: ${status}`); if (!this.isVerbose()) { const componentsTotal = this.getNumResult('numberComponentsTotal'); diff --git a/src/formatters/deployResultFormatter.ts b/src/formatters/deployResultFormatter.ts index ff4e1457a..f2c94b0c9 100644 --- a/src/formatters/deployResultFormatter.ts +++ b/src/formatters/deployResultFormatter.ts @@ -24,6 +24,7 @@ import { Successes, } from '@salesforce/source-deploy-retrieve'; import { Ux } from '@salesforce/sf-plugins-core'; +import { ComponentStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types.js'; import { ResultFormatter, ResultFormatterOptions } from './resultFormatter.js'; import { MdDeployResult } from './mdapi/mdDeployResultFormatter.js'; import { maybePrintCodeCoverageTable } from './codeCoverageTable.js'; @@ -172,7 +173,7 @@ export class DeployResultFormatter extends ResultFormatter { } protected displayDeletions(): void { - const deletions = this.fileResponses.filter((f) => f.state === 'Deleted'); + const deletions = this.fileResponses.filter((f) => f.state === ComponentStatus.Deleted); if (!deletions.length) { return; } @@ -199,7 +200,7 @@ export class DeployResultFormatter extends ResultFormatter { if (this.fileResponses?.length) { const fileResponses: FileResponse[] = []; this.fileResponses - .filter((f) => f.state === 'Failed') + .filter((f) => f.state === ComponentStatus.Failed) .map((f) => { fileResponses.push(f); if ('error' in f) { @@ -317,7 +318,7 @@ export class DeployResultFormatter extends ResultFormatter { protected verboseTestTime(): void { if ( - this.result.response?.details?.runTestResult?.successes || + this.result.response?.details?.runTestResult?.successes ?? this.result?.response?.details?.runTestResult?.failures ) { this.ux.log(''); diff --git a/src/formatters/mdapi/mdDeployResultFormatter.ts b/src/formatters/mdapi/mdDeployResultFormatter.ts index 8984662ab..b76a1fca9 100644 --- a/src/formatters/mdapi/mdDeployResultFormatter.ts +++ b/src/formatters/mdapi/mdDeployResultFormatter.ts @@ -221,7 +221,7 @@ export class MdDeployResultFormatter extends ResultFormatter { protected verboseTestTime(): void { if ( - this.result.response?.details?.runTestResult?.successes || + this.result.response?.details?.runTestResult?.successes ?? this.result?.response?.details?.runTestResult?.failures ) { this.ux.log(''); diff --git a/src/formatters/resultFormatter.ts b/src/formatters/resultFormatter.ts index 6e0c0a174..abb3c3ca6 100644 --- a/src/formatters/resultFormatter.ts +++ b/src/formatters/resultFormatter.ts @@ -104,8 +104,7 @@ export abstract class ResultFormatter { } if ( this.options.testsRan && - this.options.coverageOptions && - this.options.coverageOptions.reportFormats && + this.options.coverageOptions?.reportFormats && this.options.coverageOptions?.reportFormats?.length > 0 ) { this.ux.log( diff --git a/src/formatters/source/pushResultFormatter.ts b/src/formatters/source/pushResultFormatter.ts index ca8291522..5f8d688b0 100644 --- a/src/formatters/source/pushResultFormatter.ts +++ b/src/formatters/source/pushResultFormatter.ts @@ -113,7 +113,7 @@ export class PushResultFormatter extends ResultFormatter { protected correctFileResponses(): FileResponse[] { const withoutUnchanged = this.results.some((result) => result.getFileResponses().length) ? this.results.flatMap((result) => - result.getFileResponses().filter((fileResponse) => fileResponse.state !== 'Unchanged') + result.getFileResponses().filter((fileResponse) => fileResponse.state !== ComponentStatus.Unchanged) ) : []; if (!this.deletes.length) { @@ -167,7 +167,7 @@ export class PushResultFormatter extends ResultFormatter { return; } if (this.isSuccess() && this.fileResponses?.length) { - const successes = this.fileResponses.filter((f) => f.state !== 'Failed'); + const successes = this.fileResponses.filter((f) => f.state !== ComponentStatus.Failed); if (!successes.length) { return; } @@ -217,7 +217,7 @@ export class PushResultFormatter extends ResultFormatter { if (this.fileResponses?.length) { const fileResponses: FileResponseFailure[] = []; this.fileResponses - .filter((f) => f.state === 'Failed') + .filter((f) => f.state === ComponentStatus.Failed) .map((f) => { // we've filtered all of the file responses to failed errors with the state filter above fileResponses.push(f as FileResponseFailure); diff --git a/test/nuts/partialBundleDelete.nut.ts b/test/nuts/partialBundleDelete.nut.ts index bb491dcbe..90b74e057 100644 --- a/test/nuts/partialBundleDelete.nut.ts +++ b/test/nuts/partialBundleDelete.nut.ts @@ -17,6 +17,7 @@ import { RetrieveSetOptions, } from '@salesforce/source-deploy-retrieve'; import { TestContext } from '@salesforce/core/lib/testSetup.js'; +import { ComponentStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types.js'; import { RetrieveCommandResult } from '../../src/formatters/retrieveResultFormatter.js'; import { Retrieve } from '../../src/commands/force/source/retrieve.js'; @@ -149,7 +150,7 @@ describe('Partial Bundle Delete Retrieves', () => { expect(inboundFiles).to.be.an('array').and.not.empty; // find the deleted entry for testFile.css - const deletedFileResponse = inboundFiles?.find((fr) => fr.state === 'Deleted'); + const deletedFileResponse = inboundFiles?.find((fr) => fr.state === ComponentStatus.Deleted); expect(deletedFileResponse).to.deep.equal({ fullName: 'pageTemplate_2_7_3', type: 'AuraDefinitionBundle', @@ -182,7 +183,7 @@ describe('Partial Bundle Delete Retrieves', () => { expect(inboundFiles).to.be.an('array').and.not.empty; // find the deleted entry for testFile.css - const deletedFileResponse = inboundFiles?.find((fr) => fr.state === 'Deleted'); + const deletedFileResponse = inboundFiles?.find((fr) => fr.state === ComponentStatus.Deleted); expect(deletedFileResponse).to.deep.equal({ fullName: 'propertyTile', type: 'LightningComponentBundle', diff --git a/test/nuts/trackingCommands/basics.nut.ts b/test/nuts/trackingCommands/basics.nut.ts index 4c958e580..223131b74 100644 --- a/test/nuts/trackingCommands/basics.nut.ts +++ b/test/nuts/trackingCommands/basics.nut.ts @@ -196,10 +196,12 @@ describe('end-to-end-test for tracking with an org (single packageDir)', () => { expect(failure).to.have.property('exitCode', 1); expect(failure).to.have.property('commandName', 'Push'); expect( - failure.result.every((r) => r.type === 'ApexClass' && r.state === 'Failed' && r.problemType === 'Error') + failure.result.every( + (r) => r.type === 'ApexClass' && r.state === ComponentStatus.Failed && r.problemType === 'Error' + ) ).to.equal(true); failure.result.forEach((f) => { - if (f.state === 'Failed') { + if (f.state === ComponentStatus.Failed) { expect(f.lineNumber).to.exist; expect(f.columnNumber).to.exist; expect(f.error).to.be.a('string'); diff --git a/test/nuts/trackingCommands/lwc.nut.ts b/test/nuts/trackingCommands/lwc.nut.ts index b6ee05e35..7fc97b94f 100644 --- a/test/nuts/trackingCommands/lwc.nut.ts +++ b/test/nuts/trackingCommands/lwc.nut.ts @@ -9,6 +9,7 @@ import path from 'node:path'; import fs from 'node:fs'; import { expect } from 'chai'; import { execCmd, TestSession } from '@salesforce/cli-plugins-testkit'; +import { ComponentStatus } from '@salesforce/source-deploy-retrieve/lib/src/client/types.js'; import { PushResponse } from '../../../src/formatters/source/pushResultFormatter.js'; import { StatusResult } from '../../../src/formatters/source/statusFormatter.js'; @@ -100,8 +101,8 @@ describe('lwc', () => { }).jsonOutput?.result.pushedSource; const bundleMembers = result?.filter((r) => r.fullName === 'heroDetails'); expect(bundleMembers).to.have.length(4); - expect(bundleMembers?.filter((r) => r.state === 'Deleted')).to.have.length(1); - expect(bundleMembers?.filter((r) => r.state === 'Changed')).to.have.length(3); + expect(bundleMembers?.filter((r) => r.state === ComponentStatus.Deleted)).to.have.length(1); + expect(bundleMembers?.filter((r) => r.state === ComponentStatus.Changed)).to.have.length(3); }); it('sees no local changes', () => { @@ -142,7 +143,7 @@ describe('lwc', () => { const bundleMembers = result?.filter((r) => r.fullName === 'heroDetails'); expect(bundleMembers).to.have.length(3); expect( - bundleMembers?.every((r) => r.state === 'Deleted'), + bundleMembers?.every((r) => r.state === ComponentStatus.Deleted), JSON.stringify(bundleMembers, undefined, 2) ).to.be.true; }); diff --git a/yarn.lock b/yarn.lock index ae852256d..e837105d8 100644 --- a/yarn.lock +++ b/yarn.lock @@ -127,7 +127,7 @@ resolved "https://registry.yarnpkg.com/@babel/helper-string-parser/-/helper-string-parser-7.22.5.tgz#533f36457a25814cf1df6488523ad547d784a99f" integrity sha512-mM4COjgZox8U+JcXQwPijIZLElkgEpO5rsERVDJTc2qfCDfERyob6k5WegS14SX18IIjv+XD+GrqNumY5JRCDw== -"@babel/helper-validator-identifier@^7.22.20", "@babel/helper-validator-identifier@^7.22.5": +"@babel/helper-validator-identifier@^7.22.20": version "7.22.20" resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.22.20.tgz#c4ae002c61d2879e724581d96665583dbc1dc0e0" integrity sha512-Y4OZ+ytlatR8AI+8KZfKuL5urKp7qey08ha31L8b3BwewJAoJamTzyvxPR/5D+KkdJCGPq/+8TukHBlY10FX9A== @@ -382,12 +382,12 @@ dependencies: "@jridgewell/trace-mapping" "0.3.9" -"@es-joy/jsdoccomment@~0.38.0": - version "0.38.0" - resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.38.0.tgz#2e74f8d824b4a4ec831eaabd4c3548fb11eae5cd" - integrity sha512-TFac4Bnv0ZYNkEeDnOWHQhaS1elWlvOCQxH06iHeu5iffs+hCaLVIZJwF+FqksQi68R4i66Pu+4DfFGvble+Uw== +"@es-joy/jsdoccomment@~0.40.1": + version "0.40.1" + resolved "https://registry.yarnpkg.com/@es-joy/jsdoccomment/-/jsdoccomment-0.40.1.tgz#13acd77fb372ed1c83b7355edd865a3b370c9ec4" + integrity sha512-YORCdZSusAlBrFpZ77pJjc5r1bQs5caPWtAu+WWmiSo+8XaUzseapVrfAtiRFbQWnrBxxLLEwF6f6ZG/UgCQCg== dependencies: - comment-parser "1.3.1" + comment-parser "1.4.0" esquery "^1.5.0" jsdoc-type-pratt-parser "~4.0.0" @@ -398,7 +398,7 @@ dependencies: eslint-visitor-keys "^3.3.0" -"@eslint-community/regexpp@^4.4.0", "@eslint-community/regexpp@^4.6.1": +"@eslint-community/regexpp@^4.5.1", "@eslint-community/regexpp@^4.6.1": version "4.10.0" resolved "https://registry.yarnpkg.com/@eslint-community/regexpp/-/regexpp-4.10.0.tgz#548f6de556857c8bb73bbee70c35dc82a2e74d63" integrity sha512-Cu96Sd2By9mCNTx2iyKOmq10v22jUVQv0lQnlGNy16oE9589yE+QADPbrMGCkA51cKZSg3Pu/aTJVTGfL/qjUA== @@ -1002,7 +1002,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.2.0", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.9": +"@salesforce/core@^5.2.0", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.16": version "5.3.16" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.16.tgz#93987b0bbe37b73146929ceab658b653215adbe6" integrity sha512-Q5BOFPwACXe/ebwROzpacwPA/WSRfOM7W63exX4b0Gv2rQoMB2NZLxHBQP3FZ4eH4PMHvBB16IzmtNq8vSJktw== @@ -1085,17 +1085,17 @@ tslib "^2" "@salesforce/plugin-deploy-retrieve@^1.19.2": - version "1.19.2" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.19.2.tgz#68d0bc165a1486a3dd0ee1af1f96fb096a6a5ea8" - integrity sha512-y8I7Pcc36EcZSziNBlFNkZSCDMw1nyiixh+LGXQsn5CVmL1eXq/PiExVGTxwkyVTNc2NO+q5sNzPCKIhcn+rIA== + version "1.19.3" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.19.3.tgz#b1703e5dd31d1a7605b6324f7eb1c39ad94769aa" + integrity sha512-NA8hUidc7RDmPJRfm7Ntbac1B/W1xGaZ4eZkXU94DYaDTHFTQSwmoazuV14XfgYe+XI2GQD/4r6GCFDDkL1+TA== dependencies: "@oclif/core" "^2.15.0" "@salesforce/apex-node" "^2.1.0" - "@salesforce/core" "^5.3.9" - "@salesforce/kit" "^3.0.13" + "@salesforce/core" "^5.3.16" + "@salesforce/kit" "^3.0.15" "@salesforce/sf-plugins-core" "^3.1.22" - "@salesforce/source-deploy-retrieve" "^9.7.27" - "@salesforce/source-tracking" "^4.2.17" + "@salesforce/source-deploy-retrieve" "^9.8.1" + "@salesforce/source-tracking" "^4.2.20" chalk "^4.1.2" shelljs "^0.8.5" tslib "^2" @@ -1187,13 +1187,13 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/source-deploy-retrieve@^9.7.24", "@salesforce/source-deploy-retrieve@^9.7.27": - version "9.8.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.8.0.tgz#c2643d0f413d9211f04245efab68f4d6e9a50f7b" - integrity sha512-coPkgS1CL7rJXtoozC/yR3GcrTmUsgv1s5FPyVXoXtMTALqS0iXcsyLw0J9CvrNiksPS3WbLlfUiEtgmvQyqdg== +"@salesforce/source-deploy-retrieve@^9.7.24", "@salesforce/source-deploy-retrieve@^9.7.28", "@salesforce/source-deploy-retrieve@^9.8.1": + version "9.8.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.8.1.tgz#be19edd97097cdbb535762a5c63c7919042f3e96" + integrity sha512-DMscuGAv/Ls/Vp0wqZmjjxxoaRm/2K7Np3KHvjml8hTop1EvnhmwbwsdLDABb+I1uYE8VtWV9RZV82GVTne3+w== dependencies: - "@salesforce/core" "^5.3.10" - "@salesforce/kit" "^3.0.13" + "@salesforce/core" "^5.3.16" + "@salesforce/kit" "^3.0.15" "@salesforce/ts-types" "^2.0.9" fast-levenshtein "^3.0.0" fast-xml-parser "^4.3.2" @@ -1205,25 +1205,6 @@ minimatch "^5.1.6" proxy-agent "^6.3.1" -"@salesforce/source-deploy-retrieve@^9.7.28": - version "9.7.28" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.28.tgz#7142733acfd269ba28212044cd8e024b3d8a3568" - integrity sha512-0dmPAqxH1aI3EN7rXA1pS9iuOaiW8FM6iuqyRZ3oJYPTW4JD6g1YsRAOdAzmIPjLzhMXFDDcSbS6/+ZfOTJPQg== - dependencies: - "@salesforce/core" "^5.3.10" - "@salesforce/kit" "^3.0.13" - "@salesforce/ts-types" "^2.0.7" - fast-levenshtein "^3.0.0" - fast-xml-parser "^4.3.2" - got "^11.8.6" - graceful-fs "^4.2.11" - ignore "^5.2.4" - jszip "^3.10.1" - mime "2.6.0" - minimatch "^5.1.6" - proxy-agent "^6.3.1" - unzipper "0.10.14" - "@salesforce/source-testkit@^2.1.34": version "2.1.60" resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.60.tgz#1a41b5e2c4f94ee4fbfcd7d9ed0b2a0b08e6718e" @@ -1240,15 +1221,15 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^4.2.17": - version "4.2.17" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.2.17.tgz#2f507a8352fecf6dbcddea074648fd898b142874" - integrity sha512-3tEXph7SiEFYY+eQEXFyEr6//7TlCLxWXS/YebY8gPY9zP/Ny6wVPP5E+A5QbN6GiXNMVJNmpq431b9NnQY8Fg== +"@salesforce/source-tracking@^4.2.17", "@salesforce/source-tracking@^4.2.20": + version "4.2.20" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.2.20.tgz#698fb0a0aa56be22daa9a85987aa1c88982d0d30" + integrity sha512-WWWtoYuX8R+cNY1nfX0XI2e7kbRNzQxX9kiVrA+66fR0ODEz2m4AJBQg4uO8bXJssND6a66yfEZi1jvdpYaiGA== dependencies: - "@salesforce/core" "^5.3.9" - "@salesforce/kit" "^3.0.13" - "@salesforce/source-deploy-retrieve" "^9.7.25" - "@salesforce/ts-types" "^2.0.8" + "@salesforce/core" "^5.3.16" + "@salesforce/kit" "^3.0.15" + "@salesforce/source-deploy-retrieve" "^9.8.1" + "@salesforce/ts-types" "^2.0.9" fast-xml-parser "^4.2.5" graceful-fs "^4.2.11" isomorphic-git "1.23.0" @@ -1688,30 +1669,32 @@ "@types/expect" "^1.20.4" "@types/node" "*" -"@typescript-eslint/eslint-plugin@^5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-5.62.0.tgz#aeef0328d172b9e37d9bab6dbc13b87ed88977db" - integrity sha512-TiZzBSJja/LbhNPvk6yc0JrX9XqhQ0hdh6M2svYfsHGejaKFIAGd9MQ+ERIMzLGlN/kZoYIgdxFV0PuljTKXag== +"@typescript-eslint/eslint-plugin@^6.9.1": + version "6.9.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-6.9.1.tgz#d8ce497dc0ed42066e195c8ecc40d45c7b1254f4" + integrity sha512-w0tiiRc9I4S5XSXXrMHOWgHgxbrBn1Ro+PmiYhSg2ZVdxrAJtQgzU5o2m1BfP6UOn7Vxcc6152vFjQfmZR4xEg== dependencies: - "@eslint-community/regexpp" "^4.4.0" - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/type-utils" "5.62.0" - "@typescript-eslint/utils" "5.62.0" + "@eslint-community/regexpp" "^4.5.1" + "@typescript-eslint/scope-manager" "6.9.1" + "@typescript-eslint/type-utils" "6.9.1" + "@typescript-eslint/utils" "6.9.1" + "@typescript-eslint/visitor-keys" "6.9.1" debug "^4.3.4" graphemer "^1.4.0" - ignore "^5.2.0" - natural-compare-lite "^1.4.0" - semver "^7.3.7" - tsutils "^3.21.0" + ignore "^5.2.4" + natural-compare "^1.4.0" + semver "^7.5.4" + ts-api-utils "^1.0.1" -"@typescript-eslint/parser@^5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-5.62.0.tgz#1b63d082d849a2fcae8a569248fbe2ee1b8a56c7" - integrity sha512-VlJEV0fOQ7BExOsHYAGrgbEiZoi8D+Bl2+f6V2RrXerRSylnp+ZBHmPvaIa8cz0Ajx7WO7Z5RqfgYg7ED1nRhA== +"@typescript-eslint/parser@^6.9.1": + version "6.9.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-6.9.1.tgz#4f685f672f8b9580beb38d5fb99d52fc3e34f7a3" + integrity sha512-C7AK2wn43GSaCUZ9do6Ksgi2g3mwFkMO3Cis96kzmgudoVaKyt62yNzJOktP0HDLb/iO2O0n2lBOzJgr6Q/cyg== dependencies: - "@typescript-eslint/scope-manager" "5.62.0" - "@typescript-eslint/types" "5.62.0" - "@typescript-eslint/typescript-estree" "5.62.0" + "@typescript-eslint/scope-manager" "6.9.1" + "@typescript-eslint/types" "6.9.1" + "@typescript-eslint/typescript-estree" "6.9.1" + "@typescript-eslint/visitor-keys" "6.9.1" debug "^4.3.4" "@typescript-eslint/scope-manager@5.62.0": @@ -1730,15 +1713,15 @@ "@typescript-eslint/types" "6.9.1" "@typescript-eslint/visitor-keys" "6.9.1" -"@typescript-eslint/type-utils@5.62.0": - version "5.62.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-5.62.0.tgz#286f0389c41681376cdad96b309cedd17d70346a" - integrity sha512-xsSQreu+VnfbqQpW5vnCJdq1Z3Q0U31qiWmRhr98ONQmcp/yhiPJFPq8MXiJVLiksmOKSjIldZzkebzHuCGzew== +"@typescript-eslint/type-utils@6.9.1": + version "6.9.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/type-utils/-/type-utils-6.9.1.tgz#efd5db20ed35a74d3c7d8fba51b830ecba09ce32" + integrity sha512-eh2oHaUKCK58qIeYp19F5V5TbpM52680sB4zNSz29VBQPTWIlE/hCj5P5B1AChxECe/fmZlspAWFuRniep1Skg== dependencies: - "@typescript-eslint/typescript-estree" "5.62.0" - "@typescript-eslint/utils" "5.62.0" + "@typescript-eslint/typescript-estree" "6.9.1" + "@typescript-eslint/utils" "6.9.1" debug "^4.3.4" - tsutils "^3.21.0" + ts-api-utils "^1.0.1" "@typescript-eslint/types@5.62.0": version "5.62.0" @@ -1776,7 +1759,20 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/utils@5.62.0", "@typescript-eslint/utils@^5.59.11": +"@typescript-eslint/utils@6.9.1", "@typescript-eslint/utils@^6.7.5": + version "6.9.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e" + integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA== + dependencies: + "@eslint-community/eslint-utils" "^4.4.0" + "@types/json-schema" "^7.0.12" + "@types/semver" "^7.5.0" + "@typescript-eslint/scope-manager" "6.9.1" + "@typescript-eslint/types" "6.9.1" + "@typescript-eslint/typescript-estree" "6.9.1" + 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== @@ -1790,19 +1786,6 @@ eslint-scope "^5.1.1" semver "^7.3.7" -"@typescript-eslint/utils@^6.7.5": - version "6.9.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-6.9.1.tgz#763da41281ef0d16974517b5f0d02d85897a1c1e" - integrity sha512-L1T0A5nFdQrMVunpZgzqPL6y2wVreSyHhKGZryS6jrEN7bD9NplVAyMryUhXsQ4TWLnZmxc2ekar/lSGIlprCA== - dependencies: - "@eslint-community/eslint-utils" "^4.4.0" - "@types/json-schema" "^7.0.12" - "@types/semver" "^7.5.0" - "@typescript-eslint/scope-manager" "6.9.1" - "@typescript-eslint/types" "6.9.1" - "@typescript-eslint/typescript-estree" "6.9.1" - semver "^7.5.4" - "@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" @@ -2848,10 +2831,10 @@ commander@^4.0.1: resolved "https://registry.yarnpkg.com/commander/-/commander-4.1.1.tgz#9fd602bd936294e9e9ef46a3f4d6964044b18068" integrity sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA== -comment-parser@1.3.1: - version "1.3.1" - resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.3.1.tgz#3d7ea3adaf9345594aedee6563f422348f165c1b" - integrity sha512-B52sN2VNghyq5ofvUsqZjmk6YkihBX5vMSChmSK9v4ShjKf3Vk5Xcmgpw4o+iIgtrnM/u5FiMpz9VKb8lpBveA== +comment-parser@1.4.0: + version "1.4.0" + resolved "https://registry.yarnpkg.com/comment-parser/-/comment-parser-1.4.0.tgz#0f8c560f59698193854f12884c20c0e39a26d32c" + integrity sha512-QLyTNiZ2KDOibvFPlZ6ZngVsZ/0gYnE6uTXi5aoDg8ed3AkJAz4sEje3Y8a29hQ1s6A99MZXe47fLAXQ1rTqaw== common-ancestor-path@^1.0.1: version "1.0.1" @@ -3413,10 +3396,10 @@ escodegen@^2.1.0: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^8.10.0: - version "8.10.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.10.0.tgz#3a06a662130807e2502fc3ff8b4143d8a0658e11" - integrity sha512-SM8AMJdeQqRYT9O9zguiruQZaN7+z+E4eAP9oiLNGKMtomwaB1E9dcgUD6ZAn/eQAb52USbvezbiljfZUhbJcg== +eslint-config-prettier@^9.0.0: + version "9.0.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-9.0.0.tgz#eb25485946dd0c66cd216a46232dc05451518d1f" + integrity sha512-IcJsTkJae2S35pRsRAwoCE+925rJJStOdkKnLVgtE+tEpqU0EVVM7OqrwxqgptKdX29NUwC82I5pXsGFIgSevw== eslint-config-salesforce-license@^0.2.0: version "0.2.0" @@ -3424,20 +3407,20 @@ eslint-config-salesforce-license@^0.2.0: integrity sha512-DJdBvgj82Erum82YMe+YvG/o6ukna3UA++lRl0HSTldj0VlBl3Q8hzCp97nRXZHra6JH1I912yievZzklXDw6w== eslint-config-salesforce-typescript@^3.0.1: - version "3.0.1" - resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.0.1.tgz#dd278345e344c03c5c7c4c5121c2b5b6f8de01b8" - integrity sha512-8ivDGo6yBHEVk3+J1cLIiHfT3BP3JAbBnx3BlDQ3z5IYftAJ6LGemPANp3vWD6Wx3YKkYiVaIRmmB9uScneKhQ== + version "3.0.2" + resolved "https://registry.yarnpkg.com/eslint-config-salesforce-typescript/-/eslint-config-salesforce-typescript-3.0.2.tgz#25e9e8797a109828a63a3893a15613c8ecefa1bf" + integrity sha512-3eNN2dKojedhxbsOGocXaU+83XoeOzc8pCiDjOvlUc7B9IYTgv7UwOgmIIoESmuHKcvsCDDFDttfLCSOCOaRtQ== dependencies: - "@typescript-eslint/eslint-plugin" "^5.62.0" - "@typescript-eslint/parser" "^5.62.0" + "@typescript-eslint/eslint-plugin" "^6.9.1" + "@typescript-eslint/parser" "^6.9.1" eslint "^8.52.0" - eslint-config-prettier "^8.10.0" + eslint-config-prettier "^9.0.0" eslint-config-salesforce "^2.0.2" eslint-config-salesforce-license "^0.2.0" eslint-plugin-header "^3.1.1" eslint-plugin-import "^2.29.0" - eslint-plugin-jsdoc "^43.0.5" - eslint-plugin-unicorn "^48.0.1" + eslint-plugin-jsdoc "^46.8.2" + eslint-plugin-unicorn "^49.0.0" eslint-config-salesforce@^2.0.2: version "2.0.2" @@ -3488,18 +3471,19 @@ eslint-plugin-import@^2.29.0: semver "^6.3.1" tsconfig-paths "^3.14.2" -eslint-plugin-jsdoc@^43.0.5: - version "43.2.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-43.2.0.tgz#9d0df2329100a6956635f26211d0723c3ff91f15" - integrity sha512-Hst7XUfqh28UmPD52oTXmjaRN3d0KrmOZdgtp4h9/VHUJD3Evoo82ZGXi1TtRDWgWhvqDIRI63O49H0eH7NrZQ== +eslint-plugin-jsdoc@^46.8.2: + version "46.8.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-jsdoc/-/eslint-plugin-jsdoc-46.8.2.tgz#3e6b1c93e91e38fe01874d45da121b56393c54a5" + integrity sha512-5TSnD018f3tUJNne4s4gDWQflbsgOycIKEUBoCLn6XtBMgNHxQFmV8vVxUtiPxAQq8lrX85OaSG/2gnctxw9uQ== dependencies: - "@es-joy/jsdoccomment" "~0.38.0" + "@es-joy/jsdoccomment" "~0.40.1" are-docs-informative "^0.0.2" - comment-parser "1.3.1" + comment-parser "1.4.0" debug "^4.3.4" escape-string-regexp "^4.0.0" esquery "^1.5.0" - semver "^7.5.0" + is-builtin-module "^3.2.1" + semver "^7.5.4" spdx-expression-parse "^3.0.1" eslint-plugin-perfectionist@^2.1.0: @@ -3519,12 +3503,12 @@ eslint-plugin-sf-plugin@^1.16.9: "@salesforce/core" "^5.3.14" "@typescript-eslint/utils" "^5.59.11" -eslint-plugin-unicorn@^48.0.1: - version "48.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-48.0.1.tgz#a6573bc1687ae8db7121fdd8f92394b6549a6959" - integrity sha512-FW+4r20myG/DqFcCSzoumaddKBicIPeFnTrifon2mWIzlfyvzwyqZjqVP7m4Cqr/ZYisS2aiLghkUWaPg6vtCw== +eslint-plugin-unicorn@^49.0.0: + version "49.0.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-unicorn/-/eslint-plugin-unicorn-49.0.0.tgz#4449ea954d7e1455eec8518f9417d7021b245fa8" + integrity sha512-0fHEa/8Pih5cmzFW5L7xMEfUTvI9WKeQtjmKpTUmY+BiFCDxkxrTdnURJOHKykhtwIeyYsxnecbGvDCml++z4Q== dependencies: - "@babel/helper-validator-identifier" "^7.22.5" + "@babel/helper-validator-identifier" "^7.22.20" "@eslint-community/eslint-utils" "^4.4.0" ci-info "^3.8.0" clean-regexp "^1.0.0" @@ -3532,7 +3516,6 @@ eslint-plugin-unicorn@^48.0.1: indent-string "^4.0.0" is-builtin-module "^3.2.1" jsesc "^3.0.2" - lodash "^4.17.21" pluralize "^8.0.0" read-pkg-up "^7.0.1" regexp-tree "^0.1.27" @@ -7414,7 +7397,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.0, 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.7, 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== @@ -8310,9 +8293,9 @@ universalify@^0.2.0: integrity sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg== universalify@^2.0.0: - version "2.0.0" - resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.0.tgz#75a4984efedc4b08975c5aeb73f530d02df25717" - integrity sha512-hAZsKq7Yy11Zu1DE0OzWjw7nnLZmJZYTDZZyEFHZdUhV8FkH5MCfoU1XMaxXovpyW5nq5scPqq0ZDP9Zyl04oQ== + version "2.0.1" + resolved "https://registry.yarnpkg.com/universalify/-/universalify-2.0.1.tgz#168efc2180964e6386d061e094df61afe239b18d" + integrity sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw== untildify@^4.0.0: version "4.0.0"