From ba6f058bb0db2d5aa7bf3c6005be2b3b187d458b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 18 Nov 2023 01:28:36 +0000 Subject: [PATCH 1/6] chore(dev-deps): bump @salesforce/plugin-source from 2.11.3 to 2.11.4 Bumps [@salesforce/plugin-source](https://github.com/salesforcecli/plugin-source) from 2.11.3 to 2.11.4. - [Release notes](https://github.com/salesforcecli/plugin-source/releases) - [Changelog](https://github.com/salesforcecli/plugin-source/blob/main/CHANGELOG.md) - [Commits](https://github.com/salesforcecli/plugin-source/compare/2.11.3...2.11.4) --- updated-dependencies: - dependency-name: "@salesforce/plugin-source" dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 41 +++++++++++++---------------------------- 2 files changed, 14 insertions(+), 29 deletions(-) diff --git a/package.json b/package.json index f1a95d55..3484a791 100644 --- a/package.json +++ b/package.json @@ -19,7 +19,7 @@ "@salesforce/cli-plugins-testkit": "^5.0.4", "@salesforce/dev-scripts": "^7.1.0", "@salesforce/plugin-command-reference": "^3.0.46", - "@salesforce/plugin-source": "^2.11.3", + "@salesforce/plugin-source": "^2.11.4", "@salesforce/source-testkit": "^2.1.65", "@salesforce/ts-sinon": "^1.4.19", "@salesforce/ts-types": "^2.0.9", diff --git a/yarn.lock b/yarn.lock index 58ddde49..96a3857d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -960,7 +960,7 @@ resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33" integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg== -"@salesforce/apex-node@^2.1.0", "@salesforce/apex-node@^2.1.2": +"@salesforce/apex-node@^2.1.2": version "2.1.2" resolved "https://registry.yarnpkg.com/@salesforce/apex-node/-/apex-node-2.1.2.tgz#f42935b9be6ad7d28b5810ea36a88124789e6f5f" integrity sha512-4ShpuymejVotaK4BYa9h33jc3zj0J9xPV7IIKfTscBTfFHspgPEPaDghTODC+DZMn6TJ1M2nNzRfeHmlF7J2kA== @@ -1094,18 +1094,18 @@ handlebars "^4.7.8" tslib "^2" -"@salesforce/plugin-source@^2.11.3": - version "2.11.3" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.11.3.tgz#2f559a9588cee5514bb74d1159df215313cf11d4" - integrity sha512-44F5W0/1laIJtbmwv/oYh7+8+pL51EXX1uy/UlxQxF4+pv1z0gGLNjbyQW/Iw6a2nt/4WLcCxHIG9h9+p4b2gA== +"@salesforce/plugin-source@^2.11.4": + version "2.11.4" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.11.4.tgz#03d8b7fd9787f09ae210d657d2b91fc433be3f90" + integrity sha512-geW1y4tAtw0XCUZ4nB4ysIAXPcAHsxKIoAU4f14ygYzIr2N65Vx9jUcY/HgFWHwn1OLHvQRDGaKR7jiMCNesTA== dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/apex-node" "^2.1.0" - "@salesforce/core" "^5.3.20" + "@oclif/core" "^3.11.0" + "@salesforce/apex-node" "^2.1.2" + "@salesforce/core" "^6.1.3" "@salesforce/kit" "^3.0.15" - "@salesforce/sf-plugins-core" "^3.1.25" - "@salesforce/source-deploy-retrieve" "^9.8.5" - "@salesforce/source-tracking" "^4.4.0" + "@salesforce/sf-plugins-core" "^5.0.1" + "@salesforce/source-deploy-retrieve" "^10.0.0" + "@salesforce/source-tracking" "^5.0.0" chalk "^4.1.2" got "^11.8.6" proxy-agent "^6.3.1" @@ -1121,7 +1121,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d" integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig== -"@salesforce/sf-plugins-core@^3.1.25", "@salesforce/sf-plugins-core@^3.1.28": +"@salesforce/sf-plugins-core@^3.1.28": version "3.1.28" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.28.tgz#7714c5b1ce26052bb5cbc524c5990bc52eb601cd" integrity sha512-Z1fVS/pqLCX/3ESrjvtzyuvDFwXu8qxjqs5Gana0J7RKkhDL0f7w+pz3DR1/YfQPeHK8rk9pFDOKB3tOnXf9Lw== @@ -1164,7 +1164,7 @@ minimatch "^5.1.6" proxy-agent "^6.3.1" -"@salesforce/source-deploy-retrieve@^9.8.5", "@salesforce/source-deploy-retrieve@^9.8.6": +"@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== @@ -1198,21 +1198,6 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^4.4.0": - version "4.4.3" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.4.3.tgz#3e83f5afd3935650e358410122cf1611f859d1b3" - integrity sha512-98XA3NKDmIauloX8PUQZ/fjDm/Llm8fW7Ro4U+VwF8zLFi4LQX3+hZPNlY1LesT08YfWmcLMtgek4ycDIrPeyQ== - dependencies: - "@oclif/core" "^3.10.8" - "@salesforce/core" "^5.3.20" - "@salesforce/kit" "^3.0.15" - "@salesforce/source-deploy-retrieve" "^9.8.5" - "@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/source-tracking@^5.0.0": version "5.0.0" resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.0.0.tgz#54fa3adfc48fb476daac9167125425a5ae9e3986" From 5f2a173830f9fe0f6aa247db6718206fb5cbd905 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Sun, 19 Nov 2023 06:52:59 +0000 Subject: [PATCH 2/6] chore: updates from devScripts --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 3484a791..a55c3a5d 100644 --- a/package.json +++ b/package.json @@ -17,7 +17,7 @@ "devDependencies": { "@oclif/plugin-command-snapshot": "^5.0.2", "@salesforce/cli-plugins-testkit": "^5.0.4", - "@salesforce/dev-scripts": "^7.1.0", + "@salesforce/dev-scripts": "^7.1.1", "@salesforce/plugin-command-reference": "^3.0.46", "@salesforce/plugin-source": "^2.11.4", "@salesforce/source-testkit": "^2.1.65", diff --git a/yarn.lock b/yarn.lock index 96a3857d..c003dc37 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1041,10 +1041,10 @@ resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^7.1.0": - version "7.1.0" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-7.1.0.tgz#123708d4f494d8b95464b90c28993141986e84bc" - integrity sha512-79x6QgENORLyCrr9b4MO2pPq8N7d9ILj83vOtAp5NLreAfjZN/c5TEEHuIZKZ3UaO+hkwbtzv3Qs6CyNxiasWA== +"@salesforce/dev-scripts@^7.1.1": + version "7.1.1" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-7.1.1.tgz#549b58fb7e8c2410ce594c46f780a0907618f19f" + integrity sha512-6SL+QDOMZCnmU4Lu2ZCjqsMRcHw96mnjUOPE7b2HcfmfPo2a/hAYUtv8v7UsZ/+3UPbSf+XsLJfUsF15QIUWrg== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.1.0" From 7b4abbd2a86a40aea3399dece26633d121e8f19a Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Mon, 20 Nov 2023 09:39:18 -0700 Subject: [PATCH 3/6] fix: also display errors from componentFailures (#816) * fix: also display errors from componentFailures * refactor: use set for perf reasons --------- Co-authored-by: mshanemc --- src/formatters/deployResultFormatter.ts | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/src/formatters/deployResultFormatter.ts b/src/formatters/deployResultFormatter.ts index ef2e1c3e..c52f7601 100644 --- a/src/formatters/deployResultFormatter.ts +++ b/src/formatters/deployResultFormatter.ts @@ -270,6 +270,22 @@ export class DeployResultFormatter extends TestResultsFormatter implements Forma if (this.result.response.status === RequestStatus.Succeeded) return; const failures = this.relativeFiles.filter(isSdrFailure); + const deployMessages = ensureArray(this.result.response.details?.componentFailures); + if (deployMessages.length > failures.length) { + const failureKeySet = new Set(failures.map((f) => makeKey(f.type, f.fullName))); + // if there's additional failures in the API response, find the failure and add it to the output + deployMessages + .filter((m) => !m.componentType || !failureKeySet.has(makeKey(m.componentType, m.fullName))) + .map((deployMessage) => { + failures.push({ + fullName: deployMessage.fullName, + type: deployMessage.componentType ?? 'UNKNOWN', + state: ComponentStatus.Failed, + error: deployMessage.problem ?? 'UNKNOWN', + problemType: deployMessage.problemType ?? 'Error', + }); + }); + } if (!failures.length) return; const columns = { @@ -309,3 +325,5 @@ export class DeployResultFormatter extends TestResultsFormatter implements Forma ux.table(getFileResponseSuccessProps(deletions), columns, options); } } + +const makeKey = (type: string, name: string): string => `${type}#${name}`; From b3f8d601cdd138f1722aa71e6912933c0b1c34c9 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Mon, 20 Nov 2023 16:40:16 +0000 Subject: [PATCH 4/6] chore(release): 2.1.3 [skip ci] --- CHANGELOG.md | 6 ++++++ README.md | 34 +++++++++++++++++----------------- package.json | 2 +- 3 files changed, 24 insertions(+), 18 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index d046fa5e..6af3ca6e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [2.1.3](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/2.1.2...2.1.3) (2023-11-20) + +### Bug Fixes + +- also display errors from componentFailures ([#816](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/816)) ([7b4abbd](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/7b4abbd2a86a40aea3399dece26633d121e8f19a)) + ## [2.1.2](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/2.1.1...2.1.2) (2023-11-17) ### Bug Fixes diff --git a/README.md b/README.md index 25b26475..6bf679f2 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ FLAG DESCRIPTIONS If you specify this parameter, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/convert/mdapi.ts)_ +_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/convert/mdapi.ts)_ ## `sf project convert source` @@ -153,7 +153,7 @@ USAGE | -m ] FLAGS - -d, --output-dir= [default: metadataPackage_1700254237624] Output directory to store the Metadata + -d, --output-dir= [default: metadataPackage_1700498412279] Output directory to store the Metadata API–formatted files in. -m, --metadata=... Metadata component names to convert. -n, --package-name= Name of the package to associate with the metadata-formatted files. @@ -213,7 +213,7 @@ FLAG DESCRIPTIONS Override the api version used for api requests made by this command ``` -_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/convert/source.ts)_ +_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/convert/source.ts)_ ## `sf project delete source` @@ -351,7 +351,7 @@ FLAG DESCRIPTIONS - Separate the test names with spaces: --tests Test1 Test2 "Test With Space" ``` -_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/delete/source.ts)_ +_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/delete/source.ts)_ ## `sf project delete tracking` @@ -386,7 +386,7 @@ EXAMPLES $ sf project delete tracking --target-org my-scratch ``` -_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/delete/tracking.ts)_ +_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/delete/tracking.ts)_ ## `sf project deploy cancel` @@ -456,7 +456,7 @@ FLAG DESCRIPTIONS project deploy report". ``` -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/cancel.ts)_ +_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/cancel.ts)_ ## `sf project deploy preview` @@ -539,7 +539,7 @@ FLAG DESCRIPTIONS All child components are included. If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/preview.ts)_ +_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/preview.ts)_ ## `sf project deploy quick` @@ -623,7 +623,7 @@ FLAG DESCRIPTIONS deploy report". ``` -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/quick.ts)_ +_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/quick.ts)_ ## `sf project deploy report` @@ -718,7 +718,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/report.ts)_ +_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/report.ts)_ ## `sf project deploy resume` @@ -802,7 +802,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/resume.ts)_ +_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/resume.ts)_ ## `sf project deploy start` @@ -1014,7 +1014,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/start.ts)_ +_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/start.ts)_ ## `sf project deploy validate` @@ -1176,7 +1176,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/deploy/validate.ts)_ +_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/deploy/validate.ts)_ ## `sf project generate manifest` @@ -1251,7 +1251,7 @@ EXAMPLES $ sf project generate manifest --from-org test@myorg.com --include-packages unlocked ``` -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/generate/manifest.ts)_ +_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/generate/manifest.ts)_ ## `sf project list ignored` @@ -1292,7 +1292,7 @@ EXAMPLES $ sf project list ignored --source-dir package.xml ``` -_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/list/ignored.ts)_ +_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/list/ignored.ts)_ ## `sf project reset tracking` @@ -1339,7 +1339,7 @@ EXAMPLES $ sf project reset tracking --revision 30 ``` -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/reset/tracking.ts)_ +_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/reset/tracking.ts)_ ## `sf project retrieve preview` @@ -1394,7 +1394,7 @@ FLAG DESCRIPTIONS Overrides your default org. ``` -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/retrieve/preview.ts)_ +_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/retrieve/preview.ts)_ ## `sf project retrieve start` @@ -1540,6 +1540,6 @@ FLAG DESCRIPTIONS If you specify this parameter, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.2/src/commands/project/retrieve/start.ts)_ +_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/2.1.3/src/commands/project/retrieve/start.ts)_ diff --git a/package.json b/package.json index a55c3a5d..a6b5ec15 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/plugin-deploy-retrieve", "description": "deploy and retrieve commands for sf", - "version": "2.1.2", + "version": "2.1.3", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { From 6a8428afb4b78b09cc398636fa2555efda014af5 Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Tue, 21 Nov 2023 16:12:54 -0600 Subject: [PATCH 5/6] refactor: handle missing data in conflicts fn * chore: bump deps * refactor: handle missing data in conflicts fn --- package.json | 12 ++-- src/utils/conflicts.ts | 5 +- yarn.lock | 128 +++++++++++++++++++++++++---------------- 3 files changed, 89 insertions(+), 56 deletions(-) diff --git a/package.json b/package.json index a6b5ec15..507288db 100644 --- a/package.json +++ b/package.json @@ -5,20 +5,20 @@ "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^3.11.0", + "@oclif/core": "^3.12.0", "@salesforce/apex-node": "^2.1.2", - "@salesforce/core": "^6.1.3", + "@salesforce/core": "^6.2.0", "@salesforce/kit": "^3.0.15", - "@salesforce/sf-plugins-core": "^5.0.1", - "@salesforce/source-deploy-retrieve": "^10.0.0", - "@salesforce/source-tracking": "^5.0.0", + "@salesforce/sf-plugins-core": "^5.0.3", + "@salesforce/source-deploy-retrieve": "^10.0.2", + "@salesforce/source-tracking": "^5.0.1", "chalk": "^5.3.0" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.0.2", "@salesforce/cli-plugins-testkit": "^5.0.4", "@salesforce/dev-scripts": "^7.1.1", - "@salesforce/plugin-command-reference": "^3.0.46", + "@salesforce/plugin-command-reference": "^3.0.47", "@salesforce/plugin-source": "^2.11.4", "@salesforce/source-testkit": "^2.1.65", "@salesforce/ts-sinon": "^1.4.19", diff --git a/src/utils/conflicts.ts b/src/utils/conflicts.ts index 65516529..f85a419c 100644 --- a/src/utils/conflicts.ts +++ b/src/utils/conflicts.ts @@ -8,9 +8,12 @@ import { ux } from '@oclif/core'; import { ConflictResponse } from '@salesforce/source-tracking'; -export const writeConflictTable = (conflicts: ConflictResponse[]): void => { +export const writeConflictTable = (conflicts?: ConflictResponse[]): void => { // Interfaces cannot be casted to Record so we have to cast to unknown first // See https://github.com/microsoft/TypeScript/issues/15300 + if (!conflicts || conflicts.length === 0) { + return; + } ux.table( conflicts.map((c) => ({ state: c.state, fullName: c.fullName, type: c.type, filePath: c.filePath })), { diff --git a/yarn.lock b/yarn.lock index c003dc37..7d12e3ed 100644 --- a/yarn.lock +++ b/yarn.lock @@ -780,10 +780,10 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" -"@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.11.0", "@oclif/core@^3.3.1": - version "3.11.0" - resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.11.0.tgz#dadfac39238af3b717e33b910dde1f1f0fd2105e" - integrity sha512-9A2LhDQATf1vrRqPoO0gGuBrey0jt3kDafC+eazxTNWV2EvlEpgY2587iyrxPK/fL2xg7f+0mtxYaSHdO2k8eg== +"@oclif/core@^3.0.0", "@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.11.0", "@oclif/core@^3.12.0", "@oclif/core@^3.3.1": + version "3.12.0" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.12.0.tgz#4b38b1b5dab2f7585f89c3927a8a157b258b4bd6" + integrity sha512-mT1Vpd1E20IJ7P6GDYOivylPdTHq/xVgFjeCDjitFW86UAklFM8BEFyFB7KpsTvpmjRbCoda3yU10lSI1224lw== dependencies: ansi-escapes "^4.3.2" ansi-styles "^4.3.0" @@ -791,6 +791,7 @@ chalk "^4.1.2" clean-stack "^3.0.1" cli-progress "^3.12.0" + color "^4.2.3" debug "^4.3.4" ejs "^3.1.9" get-package-type "^0.1.0" @@ -988,7 +989,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.3.1", "@salesforce/core@^5.3.17", "@salesforce/core@^5.3.18", "@salesforce/core@^5.3.20": +"@salesforce/core@^5.3.17", "@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== @@ -1012,10 +1013,10 @@ semver "^7.5.4" ts-retry-promise "^0.7.1" -"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3": - version "6.1.3" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.1.3.tgz#32e71846cad033e0d2b369ecf0fafb4f76d63ad7" - integrity sha512-M7EQ4+LSXU4ZqD4R5ttY4RqSaYNaNBGDG0KC51IdDfpGtL4kJXeQHdr5HfMfgyCyYNM9LqqfBS7zQTBY1rf+Yg== +"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.2.0": + version "6.2.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.2.0.tgz#9bac72c0b48c733cf1d32d19f9775c34d895f207" + integrity sha512-HuggjBCLA18yXYHChnsrPDGbM+fAPx+9NeS7Dkx3/o1VhJ2hok5BUkvdaeoAVex/0Oc2J+KcvX/gqrjY51iOhQ== dependencies: "@salesforce/kit" "^3.0.15" "@salesforce/schemas" "^1.6.1" @@ -1029,7 +1030,7 @@ jsforce "^2.0.0-beta.28" jsonwebtoken "9.0.2" jszip "3.10.1" - pino "^8.16.1" + pino "^8.16.2" pino-abstract-transport "^1.1.0" pino-pretty "^10.2.3" proper-lockfile "^4.1.2" @@ -1072,7 +1073,7 @@ typescript "^4.9.5" wireit "^0.14.1" -"@salesforce/kit@^3.0.13", "@salesforce/kit@^3.0.15": +"@salesforce/kit@^3.0.15": version "3.0.15" resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.15.tgz#713df3f5767f874c70a2e731c7cb5ba677989559" integrity sha512-XkA8jsuLvVnyP460dAbU3pBFP2IkmmmsVxMQVifcKKbNWaIBbZBzAfj+vdaQfnvZyflLhsrFT3q2xkb0vHouPg== @@ -1080,15 +1081,15 @@ "@salesforce/ts-types" "^2.0.9" tslib "^2.6.2" -"@salesforce/plugin-command-reference@^3.0.46": - version "3.0.46" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.46.tgz#8ade210de4c235fa8daa9b59272481bea61bcd54" - integrity sha512-tUe8pAarH/km7wbRDpKgWc3qCzh52q5FmJpnJbs7wwWnvM5X4MzdpZ/sF/8MT3cS6FkZy//ls796QIC0vvOYsA== +"@salesforce/plugin-command-reference@^3.0.47": + version "3.0.47" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.47.tgz#477c3384402ef08458f4259b100447e136384e85" + integrity sha512-A3syaw8bf8Bovne6WDiYOcOeLFKTqf1T+MXlxXPwDkDM0X5squkwVvE6wun7S54Q3n4gCSlCPiAMbJfpF8wwaw== dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.3.17" + "@oclif/core" "^3.0.0" + "@salesforce/core" "^5.3.20" "@salesforce/kit" "^3.0.15" - "@salesforce/sf-plugins-core" "^3.1.28" + "@salesforce/sf-plugins-core" "^4" "@salesforce/ts-types" "^2.0.9" chalk "^4" handlebars "^4.7.8" @@ -1121,44 +1122,45 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d" integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig== -"@salesforce/sf-plugins-core@^3.1.28": - version "3.1.28" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.28.tgz#7714c5b1ce26052bb5cbc524c5990bc52eb601cd" - integrity sha512-Z1fVS/pqLCX/3ESrjvtzyuvDFwXu8qxjqs5Gana0J7RKkhDL0f7w+pz3DR1/YfQPeHK8rk9pFDOKB3tOnXf9Lw== +"@salesforce/sf-plugins-core@^4": + version "4.1.3" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-4.1.3.tgz#06fa96fec1903fe945def9303eb8c43058625a3d" + integrity sha512-cia0FRknxeQU0IK5gOxlP2KGxqc5zxwSmHLKJsd5+sUFWpn3Hnun/3rDO94UXIDjuGKV7HK08hQNBKkSLeYaRA== dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.3.1" - "@salesforce/kit" "^3.0.13" - "@salesforce/ts-types" "^2.0.7" + "@oclif/core" "^3.11.0" + "@salesforce/core" "^6.1.0" + "@salesforce/kit" "^3.0.15" + "@salesforce/ts-types" "^2.0.9" + "@types/inquirer" "^8.2.3" chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^5.0.1": - version "5.0.1" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.1.tgz#16b085eda99e28f2607957954d6ac957a8d0a0eb" - integrity sha512-gKUhAP9DDUlB4bjr0a6bsWiM16hn/n1cW8BglhYHAow8UJ0OQBxx+dfvAO0ftXmfzg82IZdMViiDmQXt0Z+e6A== +"@salesforce/sf-plugins-core@^5.0.1", "@salesforce/sf-plugins-core@^5.0.3": + version "5.0.3" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.3.tgz#a771dc887c0a13ac23a5b1c16a6965791914f3aa" + integrity sha512-D+RCUzrYIWpJakNfxtHXJd6LZr6bK4gA4e7jLPR1G1FmDFss13PT7hOdFRxmAqTPbcp1jf65vwYZzu5nbqzmvQ== dependencies: "@oclif/core" "^3.11.0" - "@salesforce/core" "^6.1.0" + "@salesforce/core" "^6.1.3" "@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": - version "10.0.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.0.0.tgz#572642bb3bfb1d7421afb201d7dc7de0a43271d9" - integrity sha512-6d9F1jTkD4fXYd5i+xowTey//Vns3ZlOhNNNqkQv7UlfZA8ttoxY5aYQAsAv8A/q/IcMx3UoeIKJZxUE2zNgPQ== +"@salesforce/source-deploy-retrieve@^10.0.0", "@salesforce/source-deploy-retrieve@^10.0.2": + version "10.0.2" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.0.2.tgz#bfa522145eaad6a9ec601a2f5f004bee266736ae" + integrity sha512-Lj9QXoRBZANW4PNZpGwRA5CDztnczwrJyETcDADRFVzQG/HmCJKlRMVEKck+rs4ZB2PE891raNR2v5zo6vtvvg== dependencies: - "@salesforce/core" "^6.1.0" + "@salesforce/core" "^6.1.3" "@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" @@ -1198,13 +1200,13 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^5.0.0": - version "5.0.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.0.0.tgz#54fa3adfc48fb476daac9167125425a5ae9e3986" - integrity sha512-v1AOBJvKC2nVbgzwtbJCWNV3SiQ1cV62pw5yrjKXTPKZJbyj71kK1tvQO3iyf4SVZvbI+bV44JwQStQgEp1xDg== +"@salesforce/source-tracking@^5.0.0", "@salesforce/source-tracking@^5.0.1": + version "5.0.1" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.0.1.tgz#3b54b2ed8eee9c7bc8506ca9b1c0e88f961b435a" + integrity sha512-9ckOvid03/J5Lvq83aW7GIlLm9HtJ9NMLwalppDMvSd4T/lyWe8y4bxh4LKbqTC7fhzHMxet8yYTpzub0t+DPA== dependencies: "@oclif/core" "^3.10.8" - "@salesforce/core" "^6.1.0" + "@salesforce/core" "^6.1.3" "@salesforce/kit" "^3.0.15" "@salesforce/source-deploy-retrieve" "^10.0.0" "@salesforce/ts-types" "^2.0.9" @@ -1222,7 +1224,7 @@ sinon "^5.1.1" tslib "^2.6.1" -"@salesforce/ts-types@^2.0.6", "@salesforce/ts-types@^2.0.7", "@salesforce/ts-types@^2.0.9": +"@salesforce/ts-types@^2.0.6", "@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== @@ -2676,16 +2678,32 @@ color-name@1.1.3: resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25" integrity sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw== -color-name@~1.1.4: +color-name@^1.0.0, color-name@~1.1.4: version "1.1.4" resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2" integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA== +color-string@^1.9.0: + version "1.9.1" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.9.1.tgz#4467f9146f036f855b764dfb5bf8582bf342c7a4" + integrity sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg== + dependencies: + color-name "^1.0.0" + simple-swizzle "^0.2.2" + color-support@^1.1.2, color-support@^1.1.3: version "1.1.3" resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2" integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg== +color@^4.2.3: + version "4.2.3" + resolved "https://registry.yarnpkg.com/color/-/color-4.2.3.tgz#d781ecb5e57224ee43ea9627560107c0e0c6463a" + integrity sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A== + dependencies: + color-convert "^2.0.1" + color-string "^1.9.0" + colorette@^2.0.7: version "2.0.20" resolved "https://registry.yarnpkg.com/colorette/-/colorette-2.0.20.tgz#9eb793e6833067f7235902fcd3b09917a000a95a" @@ -4389,10 +4407,10 @@ ignore-walk@^6.0.0: dependencies: minimatch "^9.0.0" -ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4: - version "5.2.4" - resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.2.4.tgz#a291c0c6178ff1b960befe47fcdec301674a6324" - integrity sha512-MAb38BcSbH0eHNBxn7ql2NH/kX33OkB3lZ1BNdh7ENeRChHTYsTvWrMubiIAMNS2llXEEgZ1MUOBtXChP3kaFQ== +ignore@^5.1.4, ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0: + version "5.3.0" + resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.0.tgz#67418ae40d34d6999c95ff56016759c718c82f78" + integrity sha512-g7dmpshy+gD7mh88OC9NwSGTKoc3kyLAZQRU1mt53Aw/vnvfXnbC+F/7F7QoYVKbV+KNvJx8wArewKy1vXMtlg== immediate@~3.0.5: version "3.0.6" @@ -4526,6 +4544,11 @@ is-arrayish@^0.2.1: resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d" integrity sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg== +is-arrayish@^0.3.1: + version "0.3.2" + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== + is-bigint@^1.0.1: version "1.0.4" resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.4.tgz#08147a1875bc2b32005d41ccd8291dffc6691df3" @@ -6651,7 +6674,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.1: +pino@^8.16.0, 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== @@ -7396,6 +7419,13 @@ simple-get@^4.0.1: once "^1.3.1" simple-concat "^1.0.0" +simple-swizzle@^0.2.2: + version "0.2.2" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + integrity sha512-JA//kQgZtbuY83m+xT+tXJkmJncGMTFT+C+g2h2R9uxkYIrE2yy9sgmcLhCnw57/WSD+Eh3J97FPEDFnbXnDUg== + dependencies: + is-arrayish "^0.3.1" + sinon@10.0.0: version "10.0.0" resolved "https://registry.yarnpkg.com/sinon/-/sinon-10.0.0.tgz#52279f97e35646ff73d23207d0307977c9b81430" From f29e3a7debb82b03e4f284833cfa36598dcb5fb7 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 25 Nov 2023 01:46:26 +0000 Subject: [PATCH 6/6] chore(dev-deps): bump oclif from 4.0.3 to 4.0.4 Bumps [oclif](https://github.com/oclif/oclif) from 4.0.3 to 4.0.4. - [Release notes](https://github.com/oclif/oclif/releases) - [Changelog](https://github.com/oclif/oclif/blob/main/CHANGELOG.md) - [Commits](https://github.com/oclif/oclif/compare/4.0.3...4.0.4) --- updated-dependencies: - dependency-name: oclif dependency-type: direct:development update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/package.json b/package.json index 507288db..37c432a7 100644 --- a/package.json +++ b/package.json @@ -25,7 +25,7 @@ "@salesforce/ts-types": "^2.0.9", "cross-env": "^7.0.3", "eslint-plugin-sf-plugin": "^1.16.15", - "oclif": "^4.0.3", + "oclif": "^4.0.4", "shx": "0.3.4", "ts-node": "^10.9.1", "typescript": "^5.2.2" diff --git a/yarn.lock b/yarn.lock index 7d12e3ed..5cabd369 100644 --- a/yarn.lock +++ b/yarn.lock @@ -6255,10 +6255,10 @@ object.values@^1.1.7: define-properties "^1.2.0" es-abstract "^1.22.1" -oclif@^4.0.3: - version "4.0.3" - resolved "https://registry.yarnpkg.com/oclif/-/oclif-4.0.3.tgz#2ff8fab10c29b2cd0bbf8e9c87640a64151b65ff" - integrity sha512-Bq7t1bJvAKYwW3DKQIzok3jkXv7yUIMneoSec1qUr9wfSqzRTZQB0UUDovwlT/L+3TBMVoRyw1WeX+YDvfRJNA== +oclif@^4.0.4: + version "4.0.4" + resolved "https://registry.yarnpkg.com/oclif/-/oclif-4.0.4.tgz#ee05d5339fa1aad8fb6a303e53f4618feba86a5e" + integrity sha512-2rebdu1Ow9/TRolMI7s1IsJmKH7RpwlBzIKZFtE8eFiDmGenX6GEsWaxSEtgMXmzCSSQ1DbCRDv0hwcwVGIJuA== dependencies: "@oclif/core" "^3.0.4" "@oclif/plugin-help" "^5.2.14"