From dcbe398bdb4578cf993f823c40655ece5901ee5d Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 07:35:42 -0500 Subject: [PATCH 1/9] fix: reuse already-generated registry for metadataKeys --- src/shared/metadataKeys.ts | 68 ++++++++++++++++++++------------------ src/sourceTracking.ts | 2 +- 2 files changed, 36 insertions(+), 34 deletions(-) diff --git a/src/shared/metadataKeys.ts b/src/shared/metadataKeys.ts index d2f5d436..e4252e77 100644 --- a/src/shared/metadataKeys.ts +++ b/src/shared/metadataKeys.ts @@ -6,7 +6,7 @@ */ import { basename, dirname, join, normalize, sep } from 'node:path'; import { ComponentSet, RegistryAccess } from '@salesforce/source-deploy-retrieve'; -import { Lifecycle } from '@salesforce/core'; +import { Lifecycle } from '@salesforce/core/lifecycle'; import { RemoteSyncInput } from './types'; import { getMetadataKey } from './functions'; @@ -20,13 +20,13 @@ const pathAfterFullName = (fileResponse: RemoteSyncInput): string => ).replace(/\\/gi, '/') : ''; -const registry = new RegistryAccess(); +const registryAccess = new RegistryAccess(); // only compute once -const aliasTypes: Array<[string, string]> = registry +const aliasTypes: Array<[string, string]> = registryAccess .getAliasTypes() // allow assertion because aliasTypes are defined as having that property - .map((aliasType) => [aliasType.name, registry.getTypeByName(aliasType.aliasFor!).name]); + .map((aliasType) => [aliasType.name, registryAccess.getTypeByName(aliasType.aliasFor!).name]); const reverseAliasTypes = new Map(aliasTypes.map(([alias, type]) => [type, alias])); @@ -79,32 +79,34 @@ export const mappingsForSourceMemberTypesToMetadataType = new Map { - if (mappingsForSourceMemberTypesToMetadataType.has(type)) { - return true; - } - if (type === 'PicklistValue') { - /* "PicklistValue" appears occasionally in sourceMembers, but it's not a real, addressable type in the registry - * It only appears when a picklist value is reactivated, so I'd call this a SourceMember bug - * We also can't make it a child type in the SDR registry because it it can be a parent of either CustomField/Picklist OR GlobalValueSet - * in both parent cases (GVS and CustomField), the the parent is marked as changed in SourceMembers, to the behavior is ok igoring the PicklistValue - * This suppresses the warning, and could be removed if the SourceMember bug is fixed - */ - return false; - } - if (type === 'ExperienceResource') { - /* ExperienceResource is a child of ExperienceBundle but fine-grained source tracking isn't supported for - * ExperienceBundle since it's not defined that way in the SDR registry. Since ExperienceBundle is - * essentially deprecated in favor of DigitalExperienceBundle this is not something we're going to support. - */ - return false; - } - try { - // this must use getTypeByName because findType doesn't support addressable child types (ex: customField!) - registry.getTypeByName(type); - return true; - } catch (e) { - void Lifecycle.getInstance().emitWarning(`Unable to find type ${type} in registry`); - return false; - } -}; +export const registrySupportsType = + (registry: RegistryAccess) => + (type: string): boolean => { + if (mappingsForSourceMemberTypesToMetadataType.has(type)) { + return true; + } + if (type === 'PicklistValue') { + /* "PicklistValue" appears occasionally in sourceMembers, but it's not a real, addressable type in the registry + * It only appears when a picklist value is reactivated, so I'd call this a SourceMember bug + * We also can't make it a child type in the SDR registry because it it can be a parent of either CustomField/Picklist OR GlobalValueSet + * in both parent cases (GVS and CustomField), the the parent is marked as changed in SourceMembers, to the behavior is ok igoring the PicklistValue + * This suppresses the warning, and could be removed if the SourceMember bug is fixed + */ + return false; + } + if (type === 'ExperienceResource') { + /* ExperienceResource is a child of ExperienceBundle but fine-grained source tracking isn't supported for + * ExperienceBundle since it's not defined that way in the SDR registry. Since ExperienceBundle is + * essentially deprecated in favor of DigitalExperienceBundle this is not something we're going to support. + */ + return false; + } + try { + // this must use getTypeByName because findType doesn't support addressable child types (ex: customField!) + registry.getTypeByName(type); + return true; + } catch (e) { + void Lifecycle.getInstance().emitWarning(`Unable to find type ${type} in registry`); + return false; + } + }; diff --git a/src/sourceTracking.ts b/src/sourceTracking.ts index 769c6791..4e218632 100644 --- a/src/sourceTracking.ts +++ b/src/sourceTracking.ts @@ -320,7 +320,7 @@ export class SourceTracking extends AsyncCreatable { const filteredChanges = remoteChanges .filter(remoteFilterByState[options.state]) // skip any remote types not in the registry. Will emit warnings - .filter((rce) => registrySupportsType(rce.type)); + .filter((rce) => registrySupportsType(this.registry)(rce.type)); if (options.format === 'ChangeResult') { return filteredChanges.map(remoteChangeElementToChangeResult); } From 099d1d4708ec77401db481718ef66a36641d7ed3 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 07:39:42 -0500 Subject: [PATCH 2/9] chore: use more top-level exports from sfdx-core --- src/shared/populateFilePaths.ts | 2 +- src/shared/populateTypesAndNames.ts | 2 +- src/shared/remoteChangeIgnoring.ts | 2 +- src/shared/types.ts | 4 ++-- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/shared/populateFilePaths.ts b/src/shared/populateFilePaths.ts index 6ce52871..3dd45156 100644 --- a/src/shared/populateFilePaths.ts +++ b/src/shared/populateFilePaths.ts @@ -5,7 +5,7 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import { EOL } from 'node:os'; -import { Logger } from '@salesforce/core'; +import { Logger } from '@salesforce/core/logger'; import { ComponentSet, RegistryAccess } from '@salesforce/source-deploy-retrieve'; import { ChangeResult } from './types'; import { isChangeResultWithNameAndType } from './guards'; diff --git a/src/shared/populateTypesAndNames.ts b/src/shared/populateTypesAndNames.ts index b429ebbb..73d909cd 100644 --- a/src/shared/populateTypesAndNames.ts +++ b/src/shared/populateTypesAndNames.ts @@ -4,7 +4,7 @@ * 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 { Logger } from '@salesforce/core'; +import { Logger } from '@salesforce/core/logger'; import { isString } from '@salesforce/ts-types'; import { MetadataResolver, diff --git a/src/shared/remoteChangeIgnoring.ts b/src/shared/remoteChangeIgnoring.ts index 80f8d00c..4cf7e418 100644 --- a/src/shared/remoteChangeIgnoring.ts +++ b/src/shared/remoteChangeIgnoring.ts @@ -5,7 +5,7 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import { ForceIgnore, MetadataComponent, MetadataMember, RegistryAccess } from '@salesforce/source-deploy-retrieve'; -import { SfError } from '@salesforce/core'; +import { SfError } from '@salesforce/core/sfError'; import { filePathsFromMetadataComponent } from '@salesforce/source-deploy-retrieve/lib/src/utils/filePathGenerator'; import { ChangeResult } from './types'; import { isChangeResultWithNameAndType } from './guards'; diff --git a/src/shared/types.ts b/src/shared/types.ts index 320c63d0..1fb16d96 100644 --- a/src/shared/types.ts +++ b/src/shared/types.ts @@ -6,7 +6,7 @@ */ import { FileResponse, SourceComponent } from '@salesforce/source-deploy-retrieve'; -import { SfError } from '@salesforce/core'; +import { SfError } from '@salesforce/core/sfError'; export type ChangeOptions = { origin: 'local' | 'remote'; @@ -69,7 +69,7 @@ export type ConflictResponse = { // there will be a data property of type ConflictResponse[] export type SourceConflictErrorType = { name: 'SourceConflictError'; -} & SfError +} & SfError; export class SourceConflictError extends SfError implements SourceConflictErrorType { public readonly name: SourceConflictErrorType['name']; From 3c5276b063d9616c325ddbab395486e8d126969d Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 07:45:05 -0500 Subject: [PATCH 3/9] test: default value for registry and ut adjustment --- src/shared/metadataKeys.ts | 2 +- test/unit/metadataKeys.test.ts | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/shared/metadataKeys.ts b/src/shared/metadataKeys.ts index e4252e77..ca263e0e 100644 --- a/src/shared/metadataKeys.ts +++ b/src/shared/metadataKeys.ts @@ -80,7 +80,7 @@ export const mappingsForSourceMemberTypesToMetadataType = new Map + (registry: RegistryAccess = new RegistryAccess()) => (type: string): boolean => { if (mappingsForSourceMemberTypesToMetadataType.has(type)) { return true; diff --git a/test/unit/metadataKeys.test.ts b/test/unit/metadataKeys.test.ts index 64647d34..df0d7079 100644 --- a/test/unit/metadataKeys.test.ts +++ b/test/unit/metadataKeys.test.ts @@ -109,12 +109,12 @@ describe('metadataKeys', () => { describe('registrySupportsType', () => { it('custom mapped types', () => { - expect(registrySupportsType('AuraDefinition')).to.equal(true); - expect(registrySupportsType('LightningComponentResource')).to.equal(true); + expect(registrySupportsType()('AuraDefinition')).to.equal(true); + expect(registrySupportsType()('LightningComponentResource')).to.equal(true); }); it('other real types types', () => { - expect(registrySupportsType('CustomObject')).to.equal(true); - expect(registrySupportsType('ApexClass')).to.equal(true); + expect(registrySupportsType()('CustomObject')).to.equal(true); + expect(registrySupportsType()('ApexClass')).to.equal(true); }); it('bad type returns false and emits warning', async () => { const warningEmitted: string[] = []; @@ -124,7 +124,7 @@ describe('registrySupportsType', () => { warningEmitted.push(w); return Promise.resolve(); }); - expect(registrySupportsType(badType)).to.equal(false); + expect(registrySupportsType()(badType)).to.equal(false); expect( warningEmitted.some((w) => w.includes(badType)), 'warning not emitted' From e13297c4643217f698b9777d2ee3e24f045717c5 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 08:21:44 -0500 Subject: [PATCH 4/9] fix: limit special label handling to original (non-preset) --- src/sourceTracking.ts | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/sourceTracking.ts b/src/sourceTracking.ts index 4e218632..b38b31c3 100644 --- a/src/sourceTracking.ts +++ b/src/sourceTracking.ts @@ -401,11 +401,14 @@ export class SourceTracking extends AsyncCreatable { ) ); + // original CustomLabels behavior + const nonDecomposedLabels = this.registry.getTypeByName('customlabel').strategies?.transformer === 'nonDecomposed'; + const filenames = Array.from(sourceComponentByFileName.keys()); // delete the files await Promise.all( filenames.map((filename) => - sourceComponentByFileName.get(filename)?.type.id === 'customlabel' + sourceComponentByFileName.get(filename)?.type.id === 'customlabel' && nonDecomposedLabels ? deleteCustomLabels(filename, changesToDelete.filter(sourceComponentIsCustomLabel)) : fs.promises.unlink(filename) ) From 259fe621e02dab29ab8d5f22b6cb9328c908dcbc Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 11:05:27 -0500 Subject: [PATCH 5/9] chore: lockfile --- yarn.lock | 31 +++---------------------------- 1 file changed, 3 insertions(+), 28 deletions(-) diff --git a/yarn.lock b/yarn.lock index e7f909a9..4b7608b4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -5132,16 +5132,7 @@ srcset@^5.0.0: resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5200,14 +5191,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -5707,7 +5691,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -5725,15 +5709,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From 85a8e8fd5ffa2bcf6d510ee457dac18107aaa73b Mon Sep 17 00:00:00 2001 From: mshanemc Date: Fri, 9 Aug 2024 11:07:26 -0500 Subject: [PATCH 6/9] chore: bump deps for xnuts --- package.json | 8 ++-- yarn.lock | 110 +++++++++++++++++++++++++-------------------------- 2 files changed, 59 insertions(+), 59 deletions(-) diff --git a/package.json b/package.json index fc9e2f60..6fa2465b 100644 --- a/package.json +++ b/package.json @@ -50,9 +50,9 @@ }, "dependencies": { "@oclif/core": "^4.0.17", - "@salesforce/core": "^8.2.7", + "@salesforce/core": "^8.3.0", "@salesforce/kit": "^3.2.0", - "@salesforce/source-deploy-retrieve": "^12.1.11", + "@salesforce/source-deploy-retrieve": "^12.1.12", "@salesforce/ts-types": "^2.0.12", "fast-xml-parser": "^4.4.1", "graceful-fs": "^4.2.11", @@ -60,11 +60,11 @@ "ts-retry-promise": "^0.8.1" }, "devDependencies": { - "@salesforce/cli-plugins-testkit": "^5.3.20", + "@salesforce/cli-plugins-testkit": "^5.3.23", "@salesforce/dev-scripts": "^10.2.9", "@salesforce/schemas": "^1.9.0", "@types/graceful-fs": "^4.1.9", - "eslint-plugin-sf-plugin": "^1.20.1", + "eslint-plugin-sf-plugin": "^1.20.3", "ts-node": "^10.9.2", "ts-patch": "^3.2.1", "typescript": "^5.5.4" diff --git a/yarn.lock b/yarn.lock index 4b7608b4..bf6e037a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -530,26 +530,26 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@salesforce/cli-plugins-testkit@^5.3.20": - version "5.3.20" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.20.tgz#03ecb0fe32345a8d468101d2c34bdd7235196b39" - integrity sha512-MRY3o8TXmiRmdDQ4orwnGhbxFHqX5xCKvGTIYwPRGSgMs2RHyyPrWrtS+aSC3IINEFJX7NSsXluTJIgl1R2fPA== +"@salesforce/cli-plugins-testkit@^5.3.23": + version "5.3.23" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.23.tgz#a7591d9f59fd312e04534082ae78035ad2faa241" + integrity sha512-6z5qi2mM6yPNorbicq/AWRDLSTN0q4h8UdmdFBGvhs7JlVpxRg93YLEchVsVrcifXKXwmBONm7KXMLF5GUP8fA== dependencies: - "@salesforce/core" "^8.2.3" - "@salesforce/kit" "^3.1.6" + "@salesforce/core" "^8.2.8" + "@salesforce/kit" "^3.2.0" "@salesforce/ts-types" "^2.0.10" "@types/shelljs" "^0.8.15" - debug "^4.3.5" + debug "^4.3.6" jszip "^3.10.1" shelljs "^0.8.4" sinon "^17.0.2" strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8": - version "8.2.8" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.2.8.tgz#1e93ddd8b9f348f1e20547de4cdff30062520fd9" - integrity sha512-Fyy1TG9cUtQV+YAjyYCHerZ0K/t9fuB6dU9HrXFvcjMKorMS5JaI1wkZh8w1+zfvu6GY/MOzeqVZCq2W+9ShLA== +"@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0": + version "8.3.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.3.0.tgz#b61fb6c0c0dec5664ce12ba62ebe35136ae33878" + integrity sha512-HZchC42oGJ5RQsG9HpAb1bT7ohjB31ATDz46ryMvLngMmrfHnyzv2mlIi6UdYkJ/2meH2BJkibHi8paPrtF+/A== dependencies: "@jsforce/jsforce-node" "^3.4.0" "@salesforce/kit" "^3.1.6" @@ -624,16 +624,16 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^12.1.11": - version "12.1.11" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.1.11.tgz#ad3c390c7df37241eb7c62fc342db7e83305a41b" - integrity sha512-dtd6WWfb5LKrJeWSwkPedOnIbvJwSum31PkMSu/foqXGGBQowXBhK7RXL5L3YxlOev4di2TmL5pVh9QLycYH9A== +"@salesforce/source-deploy-retrieve@^12.1.12": + version "12.1.12" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.1.12.tgz#1a8b1cc54daa16ecb8c5abbbbb67c3bd367d8a41" + integrity sha512-+Kbc62eB4epGBB6rr+EXzrSTmtBOXD1RNc5AIhnhnYSwL+WNIln5GOAmtZWVa/YOihjc1jTQF1/uHG4dKGCG9w== dependencies: "@salesforce/core" "^8.2.8" "@salesforce/kit" "^3.1.6" "@salesforce/ts-types" "^2.0.12" fast-levenshtein "^3.0.0" - fast-xml-parser "^4.3.6" + fast-xml-parser "^4.4.1" got "^11.8.6" graceful-fs "^4.2.11" ignore "^5.3.1" @@ -908,13 +908,13 @@ "@typescript-eslint/types" "6.21.0" "@typescript-eslint/visitor-keys" "6.21.0" -"@typescript-eslint/scope-manager@7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.17.0.tgz#e072d0f914662a7bfd6c058165e3c2b35ea26b9d" - integrity sha512-0P2jTTqyxWp9HiKLu/Vemr2Rg1Xb5B7uHItdVZ6iAenXmPo4SZ86yOPCJwMqpCyaMiEHTNqizHfsbmCFT1x9SA== +"@typescript-eslint/scope-manager@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-7.18.0.tgz#c928e7a9fc2c0b3ed92ab3112c614d6bd9951c83" + integrity sha512-jjhdIE/FPF2B7Z1uzc6i3oWKbGcHb87Qw7AWj6jmEqNOfDFbJWtjt/XfwCpvNkpGWlcJaog5vTR+VV8+w9JflA== dependencies: - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" "@typescript-eslint/type-utils@6.21.0": version "6.21.0" @@ -931,10 +931,10 @@ resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-6.21.0.tgz#205724c5123a8fef7ecd195075fa6e85bac3436d" integrity sha512-1kFmZ1rOm5epu9NZEZm1kckCDGj5UJEf7P1kliH4LKu/RkwpsfqqGmY2OOcUs18lSlQBKLDYBOGxRVtrMN5lpg== -"@typescript-eslint/types@7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.17.0.tgz#7ce8185bdf06bc3494e73d143dbf3293111b9cff" - integrity sha512-a29Ir0EbyKTKHnZWbNsrc/gqfIBqYPwj3F2M+jWE/9bqfEHg0AMtXzkbUkOG6QgEScxh2+Pz9OXe11jHDnHR7A== +"@typescript-eslint/types@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-7.18.0.tgz#b90a57ccdea71797ffffa0321e744f379ec838c9" + integrity sha512-iZqi+Ds1y4EDYUtlOOC+aUmxnE9xS/yCigkjA7XpTKV6nCBd3Hp/PRGGmdwnfkV2ThMyYldP1wRpm/id99spTQ== "@typescript-eslint/typescript-estree@6.21.0": version "6.21.0" @@ -950,13 +950,13 @@ semver "^7.5.4" ts-api-utils "^1.0.1" -"@typescript-eslint/typescript-estree@7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.17.0.tgz#dcab3fea4c07482329dd6107d3c6480e228e4130" - integrity sha512-72I3TGq93t2GoSBWI093wmKo0n6/b7O4j9o8U+f65TVD0FS6bI2180X5eGEr8MA8PhKMvYe9myZJquUT2JkCZw== +"@typescript-eslint/typescript-estree@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-7.18.0.tgz#b5868d486c51ce8f312309ba79bdb9f331b37931" + integrity sha512-aP1v/BSPnnyhMHts8cf1qQ6Q1IFwwRvAQGRvBFkWlo3/lH29OXA3Pts+c10nxRxIBrDnoMqzhgdwVe5f2D6OzA== dependencies: - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/visitor-keys" "7.17.0" + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/visitor-keys" "7.18.0" debug "^4.3.4" globby "^11.1.0" is-glob "^4.0.3" @@ -977,15 +977,15 @@ "@typescript-eslint/typescript-estree" "6.21.0" semver "^7.5.4" -"@typescript-eslint/utils@^7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.17.0.tgz#815cd85b9001845d41b699b0ce4f92d6dfb84902" - integrity sha512-r+JFlm5NdB+JXc7aWWZ3fKSm1gn0pkswEwIYsrGPdsT2GjsRATAKXiNtp3vgAAO1xZhX8alIOEQnNMl3kbTgJw== +"@typescript-eslint/utils@^7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/utils/-/utils-7.18.0.tgz#bca01cde77f95fc6a8d5b0dbcbfb3d6ca4be451f" + integrity sha512-kK0/rNa2j74XuHVcoCZxdFBMF+aq/vH83CXAOHieC+2Gis4mF8jJXT5eAfyD3K0sAxtPuwxaIOIOvhwzVDt/kw== dependencies: "@eslint-community/eslint-utils" "^4.4.0" - "@typescript-eslint/scope-manager" "7.17.0" - "@typescript-eslint/types" "7.17.0" - "@typescript-eslint/typescript-estree" "7.17.0" + "@typescript-eslint/scope-manager" "7.18.0" + "@typescript-eslint/types" "7.18.0" + "@typescript-eslint/typescript-estree" "7.18.0" "@typescript-eslint/visitor-keys@6.21.0": version "6.21.0" @@ -995,12 +995,12 @@ "@typescript-eslint/types" "6.21.0" eslint-visitor-keys "^3.4.1" -"@typescript-eslint/visitor-keys@7.17.0": - version "7.17.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.17.0.tgz#680465c734be30969e564b4647f38d6cdf49bfb0" - integrity sha512-RVGC9UhPOCsfCdI9pU++K4nD7to+jTcMIbXTSOcrLqUEW6gF2pU1UUbYJKc9cvcRSK1UDeMJ7pdMxf4bhMpV/A== +"@typescript-eslint/visitor-keys@7.18.0": + version "7.18.0" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-7.18.0.tgz#0564629b6124d67607378d0f0332a0495b25e7d7" + integrity sha512-cDF0/Gf81QpY3xYyJKDV14Zwdmid5+uuENhjH2EqFaF0ni+yAyq/LzMaIJdhNJXZI7uLzwIlA+V7oWoyn6Curg== dependencies: - "@typescript-eslint/types" "7.17.0" + "@typescript-eslint/types" "7.18.0" eslint-visitor-keys "^3.4.3" "@ungap/structured-clone@^1.2.0": @@ -1793,10 +1793,10 @@ dateformat@^4.6.3: resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-4.6.3.tgz#556fa6497e5217fedb78821424f8a1c22fa3f4b5" integrity sha512-2P0p0pFGzHS5EMnhdxQi7aJN+iMheud0UhG4dlE1DLAlvL8JHjJJTX/CSm4JXwV0Ka5nGk3zC5mcb5bUQUxxMA== -debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5: - version "4.3.5" - resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.5.tgz#e83444eceb9fedd4a1da56d671ae2446a01a6e1e" - integrity sha512-pt0bNEmneDIvdL1Xsd9oDQ/wrQRkXDT4AUWlNZNPKvW5x/jyO9VFXkJUP07vQ2upmw5PlaITaPKc31jK13V+jg== +debug@4, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@^4.3.4, debug@^4.3.5, debug@^4.3.6: + version "4.3.6" + resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.6.tgz#2ab2c38fbaffebf8aa95fdfe6d88438c7a13c52b" + integrity sha512-O/09Bd4Z1fBrU4VzkhFqVgpPzaGbw6Sm9FEkBT1A/YBXQFGuuSxa1dN2nxgxS34JmKXqYx8CZAwEVoJFImUXIg== dependencies: ms "2.1.2" @@ -2217,13 +2217,13 @@ eslint-plugin-jsdoc@^46.10.1: semver "^7.5.4" spdx-expression-parse "^4.0.0" -eslint-plugin-sf-plugin@^1.20.1: - version "1.20.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.1.tgz#bdde7cd6b62df1f707770273768a4fecdf901cfa" - integrity sha512-Mf4gC4I87h+coOpwh2uIRbhCzTGDGX7QskLGzst7fktzXkCwsIXMVic6NHPWSWIA6U8IU4g5MwMiZjuXqJTwdA== +eslint-plugin-sf-plugin@^1.20.3: + version "1.20.3" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.3.tgz#7c47b9a47d372ac86f71224273ac90a775be6a5b" + integrity sha512-nDdb/RuoiTbJpaneAEGaYqT1934+j9mdgDBhfADb9IuB/3UtSTdtgYTbrc2N9Fu7IhDkwV5JBx4lYLAQZIZbIA== dependencies: - "@salesforce/core" "^8.2.3" - "@typescript-eslint/utils" "^7.17.0" + "@salesforce/core" "^8.2.8" + "@typescript-eslint/utils" "^7.18.0" eslint-plugin-unicorn@^50.0.1: version "50.0.1" @@ -2440,7 +2440,7 @@ fast-uri@^3.0.1: resolved "https://registry.yarnpkg.com/fast-uri/-/fast-uri-3.0.1.tgz#cddd2eecfc83a71c1be2cc2ef2061331be8a7134" integrity sha512-MWipKbbYiYI0UC7cl8m/i/IWTqfC8YXsqjzybjddLsFjStroQzsHXkc73JutMvBiXmOvapk+axIl79ig5t55Bw== -fast-xml-parser@^4.3.6, fast-xml-parser@^4.4.1: +fast-xml-parser@^4.4.1: version "4.4.1" resolved "https://registry.yarnpkg.com/fast-xml-parser/-/fast-xml-parser-4.4.1.tgz#86dbf3f18edf8739326447bcaac31b4ae7f6514f" integrity sha512-xkjOecfnKGkSsOwtZ5Pz7Us/T6mrbPQrq0nh+aCO5V9nk5NLWmasAHumTKjiPJPWANe+kAZ84Jc8ooJkzZ88Sw== From 226f0051cfa90375dbfef5fd7b5cdd126b84c540 Mon Sep 17 00:00:00 2001 From: mshanemc Date: Thu, 15 Aug 2024 11:06:21 -0500 Subject: [PATCH 7/9] test: use prerel sdr --- package.json | 4 ++-- yarn.lock | 32 ++++++++++++++++---------------- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/package.json b/package.json index 6fa2465b..47b9f6de 100644 --- a/package.json +++ b/package.json @@ -51,8 +51,8 @@ "dependencies": { "@oclif/core": "^4.0.17", "@salesforce/core": "^8.3.0", - "@salesforce/kit": "^3.2.0", - "@salesforce/source-deploy-retrieve": "^12.1.12", + "@salesforce/kit": "^3.2.1", + "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1", "@salesforce/ts-types": "^2.0.12", "fast-xml-parser": "^4.4.1", "graceful-fs": "^4.2.11", diff --git a/yarn.lock b/yarn.lock index bf6e037a..143e3c52 100644 --- a/yarn.lock +++ b/yarn.lock @@ -546,10 +546,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0": - version "8.3.0" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.3.0.tgz#b61fb6c0c0dec5664ce12ba62ebe35136ae33878" - integrity sha512-HZchC42oGJ5RQsG9HpAb1bT7ohjB31ATDz46ryMvLngMmrfHnyzv2mlIi6UdYkJ/2meH2BJkibHi8paPrtF+/A== +"@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": + version "8.4.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" + integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== dependencies: "@jsforce/jsforce-node" "^3.4.0" "@salesforce/kit" "^3.1.6" @@ -607,12 +607,12 @@ typescript "^5.5.4" wireit "^0.14.5" -"@salesforce/kit@^3.1.6", "@salesforce/kit@^3.2.0": - version "3.2.0" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.2.0.tgz#49207c8a5faeb4504e43efb290df84dda137bb0c" - integrity sha512-j9wZr9Pv+kuclMU34z0Jyu0sB6/wEhv5H6l5fwl+cXD18xmruy/Gftfv64LwdUlOxIZDFRISDqfEZ+UfE3dB+A== +"@salesforce/kit@^3.1.6", "@salesforce/kit@^3.2.0", "@salesforce/kit@^3.2.1": + version "3.2.1" + resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.2.1.tgz#3de2c9ff52710a169fc887716d97c00d26065c56" + integrity sha512-LrZH2F06XPLUTMXC3av6A0VDAJykUqRtYB6tTjAKzwS1gCnp6BEn6VyjZNg0Fg/Kfp6OTrMxiIgbUFsNehEV7A== dependencies: - "@salesforce/ts-types" "^2.0.11" + "@salesforce/ts-types" "^2.0.12" "@salesforce/prettier-config@^0.0.3": version "0.0.3" @@ -624,13 +624,13 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^12.1.12": - version "12.1.12" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.1.12.tgz#1a8b1cc54daa16ecb8c5abbbbb67c3bd367d8a41" - integrity sha512-+Kbc62eB4epGBB6rr+EXzrSTmtBOXD1RNc5AIhnhnYSwL+WNIln5GOAmtZWVa/YOihjc1jTQF1/uHG4dKGCG9w== +"@salesforce/source-deploy-retrieve@^12.3.0-qa.1": + version "12.3.0-qa.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231" + integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg== dependencies: - "@salesforce/core" "^8.2.8" - "@salesforce/kit" "^3.1.6" + "@salesforce/core" "^8.4.0" + "@salesforce/kit" "^3.2.1" "@salesforce/ts-types" "^2.0.12" fast-levenshtein "^3.0.0" fast-xml-parser "^4.4.1" @@ -642,7 +642,7 @@ minimatch "^9.0.5" proxy-agent "^6.4.0" -"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.11", "@salesforce/ts-types@^2.0.12": +"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.12": version "2.0.12" resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.12.tgz#60420622812a7ec7e46d220667bc29b42dc247ff" integrity sha512-BIJyduJC18Kc8z+arUm5AZ9VkPRyw1KKAm+Tk+9LT99eOzhNilyfKzhZ4t+tG2lIGgnJpmytZfVDZ0e2kFul8g== From de690758803f2a0e4bef5f21481f6aa9f7ea9427 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Thu, 15 Aug 2024 16:07:04 +0000 Subject: [PATCH 8/9] chore(release): 7.1.6-qa.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 47b9f6de..d712e1a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/source-tracking", "description": "API for tracking local and remote Salesforce metadata changes", - "version": "7.1.5", + "version": "7.1.6-qa.0", "author": "Salesforce", "license": "BSD-3-Clause", "main": "lib/index.js", From 96b934cda76c9a6c5dad004bec2d9ec1003234cd Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Thu, 15 Aug 2024 13:40:56 -0600 Subject: [PATCH 9/9] chore: update versions --- package.json | 6 +++--- yarn.lock | 41 +++++++++++++++++++++++++++++++++-------- 2 files changed, 36 insertions(+), 11 deletions(-) diff --git a/package.json b/package.json index d712e1a9..3a342539 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/source-tracking", "description": "API for tracking local and remote Salesforce metadata changes", - "version": "7.1.6-qa.0", + "version": "7.1.5", "author": "Salesforce", "license": "BSD-3-Clause", "main": "lib/index.js", @@ -50,9 +50,9 @@ }, "dependencies": { "@oclif/core": "^4.0.17", - "@salesforce/core": "^8.3.0", + "@salesforce/core": "^8.4.0", "@salesforce/kit": "^3.2.1", - "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1", + "@salesforce/source-deploy-retrieve": "^12.4.0", "@salesforce/ts-types": "^2.0.12", "fast-xml-parser": "^4.4.1", "graceful-fs": "^4.2.11", diff --git a/yarn.lock b/yarn.lock index 143e3c52..cc471f2f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -546,7 +546,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0": +"@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0": version "8.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93" integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g== @@ -624,10 +624,10 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^12.3.0-qa.1": - version "12.3.0-qa.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231" - integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg== +"@salesforce/source-deploy-retrieve@^12.4.0": + version "12.4.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.4.0.tgz#7e5a72b1d7b559eaa7f6f333ee212380b6316542" + integrity sha512-gvTEjLPbNRt62GEKvejt/f1TtG6Zx8JPd/5BYjnXyEJu8BeOy5kL4zJm9GD3ZiTzBnPGHLzfVL09JjWfNBbo0A== dependencies: "@salesforce/core" "^8.4.0" "@salesforce/kit" "^3.2.1" @@ -5132,7 +5132,16 @@ srcset@^5.0.0: resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0": + version "4.2.3" + resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" + integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== + dependencies: + emoji-regex "^8.0.0" + is-fullwidth-code-point "^3.0.0" + strip-ansi "^6.0.1" + +string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5191,7 +5200,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1": + version "6.0.1" + resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" + integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== + dependencies: + ansi-regex "^5.0.1" + +strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -5691,7 +5707,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -5709,6 +5725,15 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" +wrap-ansi@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" + integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== + dependencies: + ansi-styles "^4.0.0" + string-width "^4.1.0" + strip-ansi "^6.0.0" + wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"