From b0045ed6b3662525d595f82a105904d2a52a5a84 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Tue, 5 Dec 2023 17:06:51 -0700 Subject: [PATCH 1/5] fix: add concise flag to retrieve preview --- command-snapshot.json | 2 +- messages/retrieve.metadata.preview.md | 4 ++++ src/commands/project/retrieve/preview.ts | 7 ++++++- src/utils/previewOutput.ts | 6 ++++-- test/nuts/tracking/forceIgnore.nut.ts | 9 +++++++++ 5 files changed, 24 insertions(+), 4 deletions(-) diff --git a/command-snapshot.json b/command-snapshot.json index 8175ffac..11775805 100644 --- a/command-snapshot.json +++ b/command-snapshot.json @@ -234,7 +234,7 @@ { "command": "project:retrieve:preview", "plugin": "@salesforce/plugin-deploy-retrieve", - "flags": ["ignore-conflicts", "json", "target-org"], + "flags": ["ignore-conflicts", "json", "target-org", "concise"], "alias": ["retrieve:metadata:preview"], "flagChars": ["c", "o"], "flagAliases": [] diff --git a/messages/retrieve.metadata.preview.md b/messages/retrieve.metadata.preview.md index bc456ceb..92c676d4 100644 --- a/messages/retrieve.metadata.preview.md +++ b/messages/retrieve.metadata.preview.md @@ -40,6 +40,10 @@ This flag applies only to orgs that allow source tracking. It has no effect on o Omit ignored files. +# flags.concise.description + +Show only the changes that will be retrieved; omits files that are forceignored. + # flags.api-version.summary Target API version for the deploy. diff --git a/src/commands/project/retrieve/preview.ts b/src/commands/project/retrieve/preview.ts index 4b67866f..b5976d55 100644 --- a/src/commands/project/retrieve/preview.ts +++ b/src/commands/project/retrieve/preview.ts @@ -36,6 +36,11 @@ export default class RetrieveMetadataPreview extends SfCommand { summary: messages.getMessage('flags.target-org.summary'), required: true, }), + concise: Flags.boolean({ + summary: messages.getMessage('flags.concise.summary'), + description: messages.getMessage('flags.concise.description'), + default: false, + }), }; public async run(): Promise { @@ -65,7 +70,7 @@ export default class RetrieveMetadataPreview extends SfCommand { }); if (!this.jsonEnabled()) { - printTables(output, 'retrieve'); + printTables(output, 'retrieve', flags.concise); } return output; } diff --git a/src/utils/previewOutput.ts b/src/utils/previewOutput.ts index 32c2dc52..d9e726f3 100644 --- a/src/utils/previewOutput.ts +++ b/src/utils/previewOutput.ts @@ -251,7 +251,7 @@ export const printIgnoredTable = (files: PreviewFile[], baseOperation: BaseOpera } }; -export const printTables = (result: PreviewResult, baseOperation: BaseOperation): void => { +export const printTables = (result: PreviewResult, baseOperation: BaseOperation, concise = false): void => { printConflictsTable(result.conflicts); printDeleteTable(result.toDelete); if (baseOperation === 'deploy') { @@ -260,7 +260,9 @@ export const printTables = (result: PreviewResult, baseOperation: BaseOperation) printRetrieveTable(result.toRetrieve); } - printIgnoredTable(result.ignored, baseOperation); + if (!concise) { + printIgnoredTable(result.ignored, baseOperation); + } }; export const getConflictFiles = async (stl?: SourceTracking, ignore = false): Promise> => diff --git a/test/nuts/tracking/forceIgnore.nut.ts b/test/nuts/tracking/forceIgnore.nut.ts index 464a408c..70005222 100644 --- a/test/nuts/tracking/forceIgnore.nut.ts +++ b/test/nuts/tracking/forceIgnore.nut.ts @@ -192,5 +192,14 @@ describe('forceignore changes', () => { }).jsonOutput?.result; expect(pullOutput?.files.length).to.equal(0); }); + + it('will not display ignored files with --concise', () => { + // gets file into source tracking + const output = execCmd('project:retrieve:preview --concise', { + ensureExitCode: 0, + }).shellOutput.stdout; + expect(output).to.not.include("These files won't retrieve because they're ignored by your .forceignore file."); + expect(output).to.not.include('ApexClass CreatedClass'); + }); }); }); From d7f47c5bd55a88733bed7b560c6b7630b7a6d614 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Thu, 7 Dec 2023 10:13:52 -0700 Subject: [PATCH 2/5] Update retrieve.metadata.preview.md --- messages/retrieve.metadata.preview.md | 4 ---- 1 file changed, 4 deletions(-) diff --git a/messages/retrieve.metadata.preview.md b/messages/retrieve.metadata.preview.md index 92c676d4..d98d3087 100644 --- a/messages/retrieve.metadata.preview.md +++ b/messages/retrieve.metadata.preview.md @@ -38,10 +38,6 @@ This flag applies only to orgs that allow source tracking. It has no effect on o # flags.concise.summary -Omit ignored files. - -# flags.concise.description - Show only the changes that will be retrieved; omits files that are forceignored. # flags.api-version.summary From a9dfb8045ef73857d954a994ff2cf6b0175c34e3 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Thu, 7 Dec 2023 10:14:23 -0700 Subject: [PATCH 3/5] Update preview.ts --- src/commands/project/retrieve/preview.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/commands/project/retrieve/preview.ts b/src/commands/project/retrieve/preview.ts index b5976d55..5665f621 100644 --- a/src/commands/project/retrieve/preview.ts +++ b/src/commands/project/retrieve/preview.ts @@ -38,7 +38,6 @@ export default class RetrieveMetadataPreview extends SfCommand { }), concise: Flags.boolean({ summary: messages.getMessage('flags.concise.summary'), - description: messages.getMessage('flags.concise.description'), default: false, }), }; From 9cde7e05981e8017178220b4e39375d0ef0badc7 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Thu, 7 Dec 2023 14:02:55 -0700 Subject: [PATCH 4/5] chore: bump some deps --- package.json | 14 ++--- yarn.lock | 143 ++++++++++++++++++++++++++++++++++++++++++--------- 2 files changed, 125 insertions(+), 32 deletions(-) diff --git a/package.json b/package.json index 4664155d..19a5a311 100644 --- a/package.json +++ b/package.json @@ -6,21 +6,21 @@ "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { "@oclif/core": "^3.12.0", - "@salesforce/apex-node": "^2.1.2", - "@salesforce/core": "^6.2.0", + "@salesforce/apex-node": "^2.1.4", + "@salesforce/core": "^6.3.0", "@salesforce/kit": "^3.0.15", - "@salesforce/sf-plugins-core": "^5.0.5", - "@salesforce/source-deploy-retrieve": "^10.1.0", - "@salesforce/source-tracking": "^5.1.0", + "@salesforce/sf-plugins-core": "^5.0.7", + "@salesforce/source-deploy-retrieve": "^10.2.0", + "@salesforce/source-tracking": "^5.1.2", "chalk": "^5.3.0" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.0.3", - "@salesforce/cli-plugins-testkit": "^5.0.4", + "@salesforce/cli-plugins-testkit": "^5.1.0", "@salesforce/dev-scripts": "^8.0.0", "@salesforce/plugin-command-reference": "^3.0.48", "@salesforce/plugin-source": "^2.11.4", - "@salesforce/source-testkit": "^2.1.65", + "@salesforce/source-testkit": "^2.1.69", "@salesforce/ts-sinon": "^1.4.19", "@salesforce/ts-types": "^2.0.9", "cross-env": "^7.0.3", diff --git a/yarn.lock b/yarn.lock index 69981232..6fbf527d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -974,14 +974,29 @@ istanbul-lib-report "^3.0.1" istanbul-reports "^3.1.6" -"@salesforce/cli-plugins-testkit@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.0.4.tgz#523c459f43822d7b24bff5117aeda7f77ed5e26c" - integrity sha512-8pquViVBCd5sF6nBXgLgwymEBE6pSAS376R9qq7rxuV+PSFCC5bnzQaKm2ugY+s5vXKNcV6WcmBHNCQnGv+M7Q== +"@salesforce/apex-node@^2.1.4": + version "2.1.4" + resolved "https://registry.yarnpkg.com/@salesforce/apex-node/-/apex-node-2.1.4.tgz#cd6afc3fce0b19dab16d593aba9343f055196a79" + integrity sha512-HVcPLnIa7GTa+f/lRuz8cloJP7oBgNmruvA+D1g6kMVHhaV+Wq4axVbCWvycIyb8OLP9RkoVrmWZiuUQMtgfXQ== dependencies: - "@salesforce/core" "^5.3.20" + "@salesforce/core" "^5.3.18" "@salesforce/kit" "^3.0.15" - "@salesforce/ts-types" "^2.0.6" + "@types/istanbul-reports" "^3.0.4" + faye "1.4.0" + glob "^10.3.10" + istanbul-lib-coverage "^3.2.2" + istanbul-lib-report "^3.0.1" + istanbul-reports "^3.1.6" + jsforce "^2.0.0-beta.28" + +"@salesforce/cli-plugins-testkit@^5.0.5", "@salesforce/cli-plugins-testkit@^5.1.0": + version "5.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.1.0.tgz#8d9caa22ea9e99879629206892afb26bcd540cef" + integrity sha512-P5tYlNqE87lX9Yp2aAsK75PICoAbmrSK3LEqiIVbtn75PN3OKiD1JEEX2ZDu+HWtO4/nxPtO4JFvX5j00EZGBA== + dependencies: + "@salesforce/core" "^6.2.2" + "@salesforce/kit" "^3.0.15" + "@salesforce/ts-types" "^2.0.9" "@types/shelljs" "^0.8.15" debug "^4.3.1" jszip "^3.10.1" @@ -989,7 +1004,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.3.17", "@salesforce/core@^5.3.18", "@salesforce/core@^5.3.20": +"@salesforce/core@^5.3.18", "@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== @@ -1013,7 +1028,7 @@ semver "^7.5.4" ts-retry-promise "^0.7.1" -"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.0", "@salesforce/core@^6.2.2": +"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.0", "@salesforce/core@^6.2.2", "@salesforce/core@^6.3.0": version "6.3.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.3.0.tgz#94613dcdcf70e8061bbdc4aa9f0f0ad605ebb51e" integrity sha512-PLPDWRXbLi+ECNER6NHLTK/Ed9tMndmyVbBTE0/vyErXtCCPF6aSNyUmvFT1NrIZRrYA9p/QRHOtYUO7kPG4zg== @@ -1135,7 +1150,7 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^5.0.1", "@salesforce/sf-plugins-core@^5.0.5": +"@salesforce/sf-plugins-core@^5.0.1": version "5.0.5" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.5.tgz#9ab91099fb3e5f8be86c5572d755adcc5913dd25" integrity sha512-IlxDYH8ihznGwPclKyo/teKo4eutuIIzA3hq2d9AuFlGH4N6e7rN3IgTfhp7yV/K7RA70Ub/+dl7etIAO7FmMQ== @@ -1148,7 +1163,20 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/source-deploy-retrieve@^10.0.0", "@salesforce/source-deploy-retrieve@^10.0.2", "@salesforce/source-deploy-retrieve@^10.1.0": +"@salesforce/sf-plugins-core@^5.0.7": + version "5.0.7" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.7.tgz#7014df537ce8a9052f395f7cc48907920334d7ce" + integrity sha512-blyjmtbe0KKyoMRCOlxVrtv3G5L/AaIDFohpXTy5322qv2aLELI83fe5DNp1oTtIK/m83CwM3EnZCF3Xc7Lj4Q== + dependencies: + "@oclif/core" "^3.12.0" + "@salesforce/core" "^6.2.2" + "@salesforce/kit" "^3.0.15" + "@salesforce/ts-types" "^2.0.9" + "@types/inquirer" "^8.2.3" + chalk "^4" + inquirer "^8.2.5" + +"@salesforce/source-deploy-retrieve@^10.0.0", "@salesforce/source-deploy-retrieve@^10.0.2": version "10.1.0" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.1.0.tgz#12dcc9096e14b11809f22594499d82649de6f8c5" integrity sha512-oa9LCWlijwL0Lm5TKeDSOxY5lSAHsp92BfywdXtlMddUjHVQuVWYQHCiiiOiGDzv23iCnmWe455/AVS9stxbSQ== @@ -1166,33 +1194,33 @@ minimatch "^5.1.6" proxy-agent "^6.3.1" -"@salesforce/source-deploy-retrieve@^9.8.6": - version "9.8.6" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.8.6.tgz#3b9240bc776a44bc740e59acbd86da3072f3efdc" - integrity sha512-avsfR/hB54ZdSOI3bYdUqRPQbjExKEwAZfsIbs6N1vtidPrc1TSHvloCZhY0Clou+vLgjabIHEHVyQJUln0FKA== +"@salesforce/source-deploy-retrieve@^10.0.3", "@salesforce/source-deploy-retrieve@^10.2.0": + version "10.2.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.2.0.tgz#073b6791eb8c3c7158bd97357eecfd6ca5a51cb2" + integrity sha512-0AkuQ8e0EBkh0OlDMqaYk1goAIw/Ge2W7PnkzB4FscgQmL7zupSVC+sb04YAO508NKPDZ5d8sZSId62hjq8DQg== dependencies: - "@salesforce/core" "^5.3.17" + "@salesforce/core" "^6.2.2" "@salesforce/kit" "^3.0.15" "@salesforce/ts-types" "^2.0.9" fast-levenshtein "^3.0.0" fast-xml-parser "^4.3.2" got "^11.8.6" graceful-fs "^4.2.11" - ignore "^5.2.4" + ignore "^5.3.0" jszip "^3.10.1" mime "2.6.0" minimatch "^5.1.6" proxy-agent "^6.3.1" -"@salesforce/source-testkit@^2.1.65": - version "2.1.65" - resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.65.tgz#4cec6ab2921431791cff4185ad2ee2b9de99776a" - integrity sha512-9UljnUaebMzLpBb92ilQsaewsoxtncJduxwwCCbi52VejE47BauLNGBOM2B3kF8pw81bNrV94qZwqOlHUG6xsQ== +"@salesforce/source-testkit@^2.1.69": + version "2.1.69" + resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.69.tgz#711aac277862ac8dd9eefc45714c1c56d522cc6b" + integrity sha512-qOa2onuf2AThln+Ra6Ia0v5UqLEpwU55Ar+ZGwzdY5N0oKVM6SY5XeRzj+ObK9iOr4AvRESKIyka8hZSBetPOg== dependencies: - "@salesforce/cli-plugins-testkit" "^5.0.4" - "@salesforce/core" "^5.3.20" + "@salesforce/cli-plugins-testkit" "^5.0.5" + "@salesforce/core" "^6.2.2" "@salesforce/kit" "^3.0.15" - "@salesforce/source-deploy-retrieve" "^9.8.6" + "@salesforce/source-deploy-retrieve" "^10.0.3" "@salesforce/ts-types" "^2.0.9" archiver "^5.3.2" chai-each "^0.0.1" @@ -1200,7 +1228,7 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^5.0.0", "@salesforce/source-tracking@^5.1.0": +"@salesforce/source-tracking@^5.0.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.0.tgz#c0d6336f0002a8c4abeae4ff3392de4adc169fd3" integrity sha512-FTuDwLjERm1OR/xTy4a5oHThGOQvI0Rqs4ZqClQFUdgUKREcbxvO3UivSekgXA3az6nuSeNRmaTZGTC5gPjtKA== @@ -1215,6 +1243,21 @@ isomorphic-git "1.23.0" ts-retry-promise "^0.7.0" +"@salesforce/source-tracking@^5.1.2": + version "5.1.2" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.2.tgz#1c2594807fea0748a8b4cb665cc26cc91a29b529" + integrity sha512-rAeKDKEG2+v0jEjNNSNrz8mqLyTGEdN3+zmb/oWEJII4DctGcMbHqkIzt/16tO6w612uOindJtjTXu6SpePtAg== + dependencies: + "@oclif/core" "^3.10.8" + "@salesforce/core" "^6.2.2" + "@salesforce/kit" "^3.0.15" + "@salesforce/source-deploy-retrieve" "^10.0.3" + "@salesforce/ts-types" "^2.0.9" + fast-xml-parser "^4.2.5" + graceful-fs "^4.2.11" + isomorphic-git "1.23.0" + ts-retry-promise "^0.7.0" + "@salesforce/ts-sinon@^1.4.19": version "1.4.19" resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.19.tgz#64157b6c8cf4a3c637867e2ddd90c2d058c334f7" @@ -1224,7 +1267,7 @@ sinon "^5.1.1" tslib "^2.6.1" -"@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.9": +"@salesforce/ts-types@^2.0.9": version "2.0.9" resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.9.tgz#66bff7b41720065d6b01631b6f6a3ccca02857c5" integrity sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA== @@ -1461,6 +1504,13 @@ dependencies: "@types/istanbul-lib-report" "*" +"@types/istanbul-reports@^3.0.4": + version "3.0.4" + resolved "https://registry.yarnpkg.com/@types/istanbul-reports/-/istanbul-reports-3.0.4.tgz#0f03e3d2f670fbdac586e34b433783070cc16f54" + integrity sha512-pk2B1NWalF9toCRu6gjBzR69syFjP4Od8WRAX+0mmf9lAjCRicLOWc+ZrxZHx/0XRjotgkF9t6iaMJ+aXcOdZQ== + dependencies: + "@types/istanbul-lib-report" "*" + "@types/json-schema@^7.0.12", "@types/json-schema@^7.0.9": version "7.0.14" resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.14.tgz#74a97a5573980802f32c8e47b663530ab3b6b7d1" @@ -4042,6 +4092,17 @@ glob@^10.2.2: minipass "^5.0.0 || ^6.0.2" path-scurry "^1.7.0" +glob@^10.3.10: + version "10.3.10" + resolved "https://registry.yarnpkg.com/glob/-/glob-10.3.10.tgz#0351ebb809fd187fe421ab96af83d3a70715df4b" + integrity sha512-fa46+tv1Ak0UPK1TOy/pZrIybNNt4HCv7SDzwyfiOZkvZLEbjsZkJBPtDHVshZjbecAoAGSC20MjLDG/qr679g== + dependencies: + foreground-child "^3.1.0" + jackspeak "^2.3.5" + minimatch "^9.0.1" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry "^1.10.1" + glob@^7.0.0, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: version "7.2.3" resolved "https://registry.yarnpkg.com/glob/-/glob-7.2.3.tgz#b8df0fb802bbfa8e89bd1d938b4e16578ed44f2b" @@ -4824,6 +4885,11 @@ istanbul-lib-coverage@^3.0.0, istanbul-lib-coverage@^3.2.0: resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.0.tgz#189e7909d0a39fa5a3dfad5b03f71947770191d3" integrity sha512-eOeJ5BHCmHYvQK7xt9GkdHuzuCGS1Y6g9Gvnx3Ym33fz/HpLRYxiS0wHNr+m/MBC8B647Xt608vCDEvhl9c6Mw== +istanbul-lib-coverage@^3.2.2: + version "3.2.2" + resolved "https://registry.yarnpkg.com/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz#2d166c4b0644d43a39f04bf6c2edd1e585f31756" + integrity sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg== + istanbul-lib-hook@^3.0.0: version "3.0.0" resolved "https://registry.yarnpkg.com/istanbul-lib-hook/-/istanbul-lib-hook-3.0.0.tgz#8f84c9434888cc6b1d0a9d7092a76d239ebf0cc6" @@ -4888,6 +4954,15 @@ jackspeak@^2.0.3: optionalDependencies: "@pkgjs/parseargs" "^0.11.0" +jackspeak@^2.3.5: + version "2.3.6" + resolved "https://registry.yarnpkg.com/jackspeak/-/jackspeak-2.3.6.tgz#647ecc472238aee4b06ac0e461acc21a8c505ca8" + integrity sha512-N3yCS/NegsOBokc8GAdM8UcmfsKiSS8cipheD/nivzr700H+nsMOxJjQnvwOcRYVuFkdH0wGUvW2WbXGmrZGbQ== + dependencies: + "@isaacs/cliui" "^8.0.2" + optionalDependencies: + "@pkgjs/parseargs" "^0.11.0" + jake@^10.8.5: version "10.8.7" resolved "https://registry.yarnpkg.com/jake/-/jake-10.8.7.tgz#63a32821177940c33f356e0ba44ff9d34e1c7d8f" @@ -5383,6 +5458,11 @@ lru-cache@^9.1.1: resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-9.1.2.tgz#255fdbc14b75589d6d0e73644ca167a8db506835" integrity sha512-ERJq3FOzJTxBbFjZ7iDs+NiK4VI9Wz+RdrrAB8dio1oV+YvdPzUEE4QNiT2VD51DkIbCYRUUzCRkssXCHqSnKQ== +"lru-cache@^9.1.1 || ^10.0.0": + version "10.1.0" + resolved "https://registry.yarnpkg.com/lru-cache/-/lru-cache-10.1.0.tgz#2098d41c2dc56500e6c88584aa656c84de7d0484" + integrity sha512-/1clY/ui8CzjKFyjdvwPWJUYKiFVXG2I2cY0ssG7h4+hwk+XOIX7ZSG9Q7TW8TW3Kp3BUSqgFWBLgL4PJ+Blag== + lunr@^2.3.9: version "2.3.9" resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1" @@ -5727,6 +5807,11 @@ minipass@^5.0.0: resolved "https://registry.yarnpkg.com/minipass/-/minipass-6.0.2.tgz#542844b6c4ce95b202c0995b0a471f1229de4c81" integrity sha512-MzWSV5nYVT7mVyWCwn2o7JH13w2TBRmmSqSRCKzTw+lmft9X4z+3wjvs06Tzijo5z4W/kahUCDpRXTF+ZrmF/w== +"minipass@^5.0.0 || ^6.0.2 || ^7.0.0": + version "7.0.4" + resolved "https://registry.yarnpkg.com/minipass/-/minipass-7.0.4.tgz#dbce03740f50a4786ba994c1fb908844d27b038c" + integrity sha512-jYofLM5Dam9279rdkWzqHozUo4ybjdZmCsDHePy5V/PbBcVMiSZR97gmAy45aqi8CK1lG2ECd356FU86avfwUQ== + minizlib@^2.0.0, minizlib@^2.1.1, minizlib@^2.1.2: version "2.1.2" resolved "https://registry.yarnpkg.com/minizlib/-/minizlib-2.1.2.tgz#e90d3466ba209b932451508a11ce3d3632145931" @@ -6596,6 +6681,14 @@ path-parse@^1.0.7: resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735" integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw== +path-scurry@^1.10.1: + version "1.10.1" + resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.10.1.tgz#9ba6bf5aa8500fe9fd67df4f0d9483b2b0bfc698" + integrity sha512-MkhCqzzBEpPvxxQ71Md0b1Kk51W01lrYvlMzSUaIzNsODdd7mqhiimSZlr+VegAz5Z6Vzt9Xg2ttE//XBhH3EQ== + dependencies: + lru-cache "^9.1.1 || ^10.0.0" + minipass "^5.0.0 || ^6.0.2 || ^7.0.0" + path-scurry@^1.7.0: version "1.9.2" resolved "https://registry.yarnpkg.com/path-scurry/-/path-scurry-1.9.2.tgz#90f9d296ac5e37e608028e28a447b11d385b3f63" From 98f586275979482ac407b60fd6a9748fc02199d8 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Fri, 8 Dec 2023 09:49:46 -0700 Subject: [PATCH 5/5] chore: try this combination of deps --- package.json | 4 ++-- yarn.lock | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/package.json b/package.json index 19a5a311..86efcc97 100644 --- a/package.json +++ b/package.json @@ -7,9 +7,9 @@ "dependencies": { "@oclif/core": "^3.12.0", "@salesforce/apex-node": "^2.1.4", - "@salesforce/core": "^6.3.0", + "@salesforce/core": "^6.2.2", "@salesforce/kit": "^3.0.15", - "@salesforce/sf-plugins-core": "^5.0.7", + "@salesforce/sf-plugins-core": "^5.0.5", "@salesforce/source-deploy-retrieve": "^10.2.0", "@salesforce/source-tracking": "^5.1.2", "chalk": "^5.3.0" diff --git a/yarn.lock b/yarn.lock index 6fbf527d..f805c1e7 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1028,7 +1028,7 @@ semver "^7.5.4" ts-retry-promise "^0.7.1" -"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.0", "@salesforce/core@^6.2.2", "@salesforce/core@^6.3.0": +"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.0", "@salesforce/core@^6.2.2": version "6.3.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.3.0.tgz#94613dcdcf70e8061bbdc4aa9f0f0ad605ebb51e" integrity sha512-PLPDWRXbLi+ECNER6NHLTK/Ed9tMndmyVbBTE0/vyErXtCCPF6aSNyUmvFT1NrIZRrYA9p/QRHOtYUO7kPG4zg== @@ -1163,7 +1163,7 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^5.0.7": +"@salesforce/sf-plugins-core@^5.0.5": version "5.0.7" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.7.tgz#7014df537ce8a9052f395f7cc48907920334d7ce" integrity sha512-blyjmtbe0KKyoMRCOlxVrtv3G5L/AaIDFohpXTy5322qv2aLELI83fe5DNp1oTtIK/m83CwM3EnZCF3Xc7Lj4Q==