From 9a6bd20b9f999d28e83f6738822b0023a1538447 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Tue, 22 Jul 2025 18:32:02 -0300 Subject: [PATCH 01/10] chore: retrieve logging --- package.json | 2 +- yarn.lock | 158 ++++++++++----------------------------------------- 2 files changed, 32 insertions(+), 128 deletions(-) diff --git a/package.json b/package.json index 2e3ad0e5..168400b3 100644 --- a/package.json +++ b/package.json @@ -13,7 +13,7 @@ "@salesforce/kit": "^3.2.3", "@salesforce/plugin-info": "^3.4.67", "@salesforce/sf-plugins-core": "^12.2.2", - "@salesforce/source-deploy-retrieve": "^12.21.1", + "@salesforce/source-deploy-retrieve": "12.21.7-dev.0", "@salesforce/source-tracking": "^7.4.1", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.17.0", diff --git a/yarn.lock b/yarn.lock index 8739ba0b..0ed0cd2d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1873,7 +1873,28 @@ cli-progress "^3.12.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.0", "@salesforce/source-deploy-retrieve@^12.21.1": +"@salesforce/source-deploy-retrieve@12.21.7-dev.0": + version "12.21.7-dev.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.7-dev.0.tgz#d139624d697387bd635d38055e0c38b897745246" + integrity sha512-IpuyZO6lkz3fWuWFkefaFnOPHBOxYIze0AoHlwbuq2VchFQqyts64X6EwvDya+Rc1KRQ9dkWOZg55IxnMBT3mw== + dependencies: + "@salesforce/core" "^8.18.1" + "@salesforce/kit" "^3.2.3" + "@salesforce/ts-types" "^2.0.12" + "@salesforce/types" "^1.3.0" + fast-levenshtein "^3.0.0" + fast-xml-parser "^4.5.3" + got "^11.8.6" + graceful-fs "^4.2.11" + ignore "^5.3.2" + isbinaryfile "^5.0.2" + jszip "^3.10.1" + mime "2.6.0" + minimatch "^9.0.5" + proxy-agent "^6.4.0" + yaml "^2.7.1" + +"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.0": version "12.21.1" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.1.tgz#081ea10b86b1af3c222d9dea3ac3774bdb477954" integrity sha512-VC6sAaLH04z1znJh7f8ftlUTDEzzUFzpaau8kIVjZW7Iq4xSnRORmxlh941C2KSTPRR454ZbnxuWC5czcn5Bcg== @@ -2140,22 +2161,7 @@ "@smithy/util-middleware" "^4.0.4" tslib "^2.6.2" -"@smithy/core@^3.6.0": - version "3.6.0" - resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.6.0.tgz#be02f2a4a56ba83d37298454a0bddc89cbad510b" - integrity sha512-Pgvfb+TQ4wUNLyHzvgCP4aYZMh16y7GcfF59oirRHcgGgkH1e/s9C0nv/v3WP+Quymyr5je71HeFQCwh+44XLg== - dependencies: - "@smithy/middleware-serde" "^4.0.8" - "@smithy/protocol-http" "^5.1.2" - "@smithy/types" "^4.3.1" - "@smithy/util-base64" "^4.0.0" - "@smithy/util-body-length-browser" "^4.0.0" - "@smithy/util-middleware" "^4.0.4" - "@smithy/util-stream" "^4.2.2" - "@smithy/util-utf8" "^4.0.0" - tslib "^2.6.2" - -"@smithy/core@^3.7.0", "@smithy/core@^3.7.1": +"@smithy/core@^3.6.0", "@smithy/core@^3.7.0", "@smithy/core@^3.7.1": version "3.7.1" resolved "https://registry.yarnpkg.com/@smithy/core/-/core-3.7.1.tgz#7f47fc1ec93f20b686d007a7d667a02de8b86219" integrity sha512-ExRCsHnXFtBPnM7MkfKBPcBBdHw1h/QS/cbNw4ho95qnyNHvnpmGbR39MIAv9KggTr5qSPxRSEL+hRXlyGyGQw== @@ -2226,18 +2232,7 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@smithy/fetch-http-handler@^5.0.4": - version "5.0.4" - resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.0.4.tgz#c68601b4676787e049b5d464d5f4b825dbb44013" - integrity sha512-AMtBR5pHppYMVD7z7G+OlHHAcgAN7v0kVKEpHuTO4Gb199Gowh0taYi9oDStFeUhetkeP55JLSVlTW1n9rFtUw== - dependencies: - "@smithy/protocol-http" "^5.1.2" - "@smithy/querystring-builder" "^4.0.4" - "@smithy/types" "^4.3.1" - "@smithy/util-base64" "^4.0.0" - tslib "^2.6.2" - -"@smithy/fetch-http-handler@^5.1.0": +"@smithy/fetch-http-handler@^5.0.4", "@smithy/fetch-http-handler@^5.1.0": version "5.1.0" resolved "https://registry.yarnpkg.com/@smithy/fetch-http-handler/-/fetch-http-handler-5.1.0.tgz#387abd9ec6c8ff0af33b268c0f6ccb289c1b1563" integrity sha512-mADw7MS0bYe2OGKkHYMaqarOXuDwRbO6ArD91XhHcl2ynjGCFF+hvqf0LyQcYxkA1zaWjefSkU7Ne9mqgApSgQ== @@ -2317,21 +2312,7 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@smithy/middleware-endpoint@^4.1.13": - version "4.1.13" - resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.13.tgz#7d5b5f8f61600270bd8c59aabf311c99b9127aba" - integrity sha512-xg3EHV/Q5ZdAO5b0UiIMj3RIOCobuS40pBBODguUDVdko6YK6QIzCVRrHTogVuEKglBWqWenRnZ71iZnLL3ZAQ== - dependencies: - "@smithy/core" "^3.6.0" - "@smithy/middleware-serde" "^4.0.8" - "@smithy/node-config-provider" "^4.1.3" - "@smithy/shared-ini-file-loader" "^4.0.4" - "@smithy/types" "^4.3.1" - "@smithy/url-parser" "^4.0.4" - "@smithy/util-middleware" "^4.0.4" - tslib "^2.6.2" - -"@smithy/middleware-endpoint@^4.1.15", "@smithy/middleware-endpoint@^4.1.16": +"@smithy/middleware-endpoint@^4.1.13", "@smithy/middleware-endpoint@^4.1.15", "@smithy/middleware-endpoint@^4.1.16": version "4.1.16" resolved "https://registry.yarnpkg.com/@smithy/middleware-endpoint/-/middleware-endpoint-4.1.16.tgz#d0fea3683659289974a87afb089e5f38575f96c0" integrity sha512-plpa50PIGLqzMR2ANKAw2yOW5YKS626KYKqae3atwucbz4Ve4uQ9K9BEZxDLIFmCu7hKLcrq2zmj4a+PfmUV5w== @@ -2345,22 +2326,7 @@ "@smithy/util-middleware" "^4.0.4" tslib "^2.6.2" -"@smithy/middleware-retry@^4.1.14": - version "4.1.14" - resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.14.tgz#53ce619463a1ce4b95025aaafdf51369ef893196" - integrity sha512-eoXaLlDGpKvdmvt+YBfRXE7HmIEtFF+DJCbTPwuLunP0YUnrydl+C4tS+vEM0+nyxXrX3PSUFqC+lP1+EHB1Tw== - dependencies: - "@smithy/node-config-provider" "^4.1.3" - "@smithy/protocol-http" "^5.1.2" - "@smithy/service-error-classification" "^4.0.6" - "@smithy/smithy-client" "^4.4.5" - "@smithy/types" "^4.3.1" - "@smithy/util-middleware" "^4.0.4" - "@smithy/util-retry" "^4.0.6" - tslib "^2.6.2" - uuid "^9.0.1" - -"@smithy/middleware-retry@^4.1.16": +"@smithy/middleware-retry@^4.1.14", "@smithy/middleware-retry@^4.1.16": version "4.1.17" resolved "https://registry.yarnpkg.com/@smithy/middleware-retry/-/middleware-retry-4.1.17.tgz#5a7aa2547918422e3a8747520900c2fd26a43328" integrity sha512-gsCimeG6BApj0SBecwa1Be+Z+JOJe46iy3B3m3A8jKJHf7eIihP76Is4LwLrbJ1ygoS7Vg73lfqzejmLOrazUA== @@ -2402,18 +2368,7 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@smithy/node-http-handler@^4.0.6": - version "4.0.6" - resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.0.6.tgz#a022da499ba3af4b6b4c815104fde973c0eccc40" - integrity sha512-NqbmSz7AW2rvw4kXhKGrYTiJVDHnMsFnX4i+/FzcZAfbOBauPYs2ekuECkSbtqaxETLLTu9Rl/ex6+I2BKErPA== - dependencies: - "@smithy/abort-controller" "^4.0.4" - "@smithy/protocol-http" "^5.1.2" - "@smithy/querystring-builder" "^4.0.4" - "@smithy/types" "^4.3.1" - tslib "^2.6.2" - -"@smithy/node-http-handler@^4.1.0": +"@smithy/node-http-handler@^4.0.6", "@smithy/node-http-handler@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@smithy/node-http-handler/-/node-http-handler-4.1.0.tgz#6b528cd0da0c35755b34afba207b7db972b0eb92" integrity sha512-vqfSiHz2v8b3TTTrdXi03vNz1KLYYS3bhHCDv36FYDqxT7jvTll1mMnCrkD+gOvgwybuunh/2VmvOMqwBegxEg== @@ -2486,20 +2441,7 @@ "@smithy/util-utf8" "^4.0.0" tslib "^2.6.2" -"@smithy/smithy-client@^4.4.5": - version "4.4.5" - resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.5.tgz#1c736618f3c4910880cc6862a5826348c1b70d5d" - integrity sha512-+lynZjGuUFJaMdDYSTMnP/uPBBXXukVfrJlP+1U/Dp5SFTEI++w6NMga8DjOENxecOF71V9Z2DllaVDYRnGlkg== - dependencies: - "@smithy/core" "^3.6.0" - "@smithy/middleware-endpoint" "^4.1.13" - "@smithy/middleware-stack" "^4.0.4" - "@smithy/protocol-http" "^5.1.2" - "@smithy/types" "^4.3.1" - "@smithy/util-stream" "^4.2.2" - tslib "^2.6.2" - -"@smithy/smithy-client@^4.4.7", "@smithy/smithy-client@^4.4.8": +"@smithy/smithy-client@^4.4.5", "@smithy/smithy-client@^4.4.7", "@smithy/smithy-client@^4.4.8": version "4.4.8" resolved "https://registry.yarnpkg.com/@smithy/smithy-client/-/smithy-client-4.4.8.tgz#91b562a4f60db92c2533a720a091e98557117ab6" integrity sha512-pcW691/lx7V54gE+dDGC26nxz8nrvnvRSCJaIYD6XLPpOInEZeKdV/SpSux+wqeQ4Ine7LJQu8uxMvobTIBK0w== @@ -2574,18 +2516,7 @@ dependencies: tslib "^2.6.2" -"@smithy/util-defaults-mode-browser@^4.0.21": - version "4.0.21" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.21.tgz#47895e42d64060d2a7f803a443fd160d0a329d83" - integrity sha512-wM0jhTytgXu3wzJoIqpbBAG5U6BwiubZ6QKzSbP7/VbmF1v96xlAbX2Am/mz0Zep0NLvLh84JT0tuZnk3wmYQA== - dependencies: - "@smithy/property-provider" "^4.0.4" - "@smithy/smithy-client" "^4.4.5" - "@smithy/types" "^4.3.1" - bowser "^2.11.0" - tslib "^2.6.2" - -"@smithy/util-defaults-mode-browser@^4.0.23": +"@smithy/util-defaults-mode-browser@^4.0.21", "@smithy/util-defaults-mode-browser@^4.0.23": version "4.0.24" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-browser/-/util-defaults-mode-browser-4.0.24.tgz#36e2ebd191cffa4799c2474d1d4e793264067fa9" integrity sha512-UkQNgaQ+bidw1MgdgPO1z1k95W/v8Ej/5o/T/Is8PiVUYPspl/ZxV6WO/8DrzZQu5ULnmpB9CDdMSRwgRc21AA== @@ -2596,20 +2527,7 @@ bowser "^2.11.0" tslib "^2.6.2" -"@smithy/util-defaults-mode-node@^4.0.21": - version "4.0.21" - resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.21.tgz#4682143fbfb0a4c6e08a6151f13af97018e6950e" - integrity sha512-/F34zkoU0GzpUgLJydHY8Rxu9lBn8xQC/s/0M0U9lLBkYbA1htaAFjWYJzpzsbXPuri5D1H8gjp2jBum05qBrA== - dependencies: - "@smithy/config-resolver" "^4.1.4" - "@smithy/credential-provider-imds" "^4.0.6" - "@smithy/node-config-provider" "^4.1.3" - "@smithy/property-provider" "^4.0.4" - "@smithy/smithy-client" "^4.4.5" - "@smithy/types" "^4.3.1" - tslib "^2.6.2" - -"@smithy/util-defaults-mode-node@^4.0.23": +"@smithy/util-defaults-mode-node@^4.0.21", "@smithy/util-defaults-mode-node@^4.0.23": version "4.0.24" resolved "https://registry.yarnpkg.com/@smithy/util-defaults-mode-node/-/util-defaults-mode-node-4.0.24.tgz#3b9382bbffcc5c211e582ea6164c630ad994816f" integrity sha512-phvGi/15Z4MpuQibTLOYIumvLdXb+XIJu8TA55voGgboln85jytA3wiD7CkUE8SNcWqkkb+uptZKPiuFouX/7g== @@ -2655,21 +2573,7 @@ "@smithy/types" "^4.3.1" tslib "^2.6.2" -"@smithy/util-stream@^4.2.2": - version "4.2.2" - resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.2.tgz#beeb1edf690db9b7d7983f46ca4fb66e22253608" - integrity sha512-aI+GLi7MJoVxg24/3J1ipwLoYzgkB4kUfogZfnslcYlynj3xsQ0e7vk4TnTro9hhsS5PvX1mwmkRqqHQjwcU7w== - dependencies: - "@smithy/fetch-http-handler" "^5.0.4" - "@smithy/node-http-handler" "^4.0.6" - "@smithy/types" "^4.3.1" - "@smithy/util-base64" "^4.0.0" - "@smithy/util-buffer-from" "^4.0.0" - "@smithy/util-hex-encoding" "^4.0.0" - "@smithy/util-utf8" "^4.0.0" - tslib "^2.6.2" - -"@smithy/util-stream@^4.2.3": +"@smithy/util-stream@^4.2.2", "@smithy/util-stream@^4.2.3": version "4.2.3" resolved "https://registry.yarnpkg.com/@smithy/util-stream/-/util-stream-4.2.3.tgz#7980fb94dbee96301b0b2610de8ae1700c7daab1" integrity sha512-cQn412DWHHFNKrQfbHY8vSFI3nTROY1aIKji9N0tpp8gUABRilr7wdf8fqBbSlXresobM+tQFNk6I+0LXK/YZg== From f261781ff0e18b81c0ea624879b932ea50fa69b4 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Tue, 22 Jul 2025 18:36:28 -0300 Subject: [PATCH 02/10] chore: retrieve logging --- package.json | 5 ++++- yarn.lock | 25 ++----------------------- 2 files changed, 6 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 168400b3..f3fd7b08 100644 --- a/package.json +++ b/package.json @@ -4,6 +4,9 @@ "version": "3.22.33", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", + "resolutions": { + "@salesforce/source-deploy-retrieve": "^12.21.7-dev.0" + }, "dependencies": { "@inquirer/prompts": "^7.5.3", "@oclif/core": "^4.3.0", @@ -13,7 +16,7 @@ "@salesforce/kit": "^3.2.3", "@salesforce/plugin-info": "^3.4.67", "@salesforce/sf-plugins-core": "^12.2.2", - "@salesforce/source-deploy-retrieve": "12.21.7-dev.0", + "@salesforce/source-deploy-retrieve": "^12.21.7-dev.0", "@salesforce/source-tracking": "^7.4.1", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.17.0", diff --git a/yarn.lock b/yarn.lock index 0ed0cd2d..6ab1b279 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1729,7 +1729,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.12.0", "@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.17.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0": +"@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.17.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0": version "8.18.1" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.1.tgz#4a790f9479339f45e42799d9ef7a1428d49b6ba1" integrity sha512-RkG9Ye5TdsIQz4KLUHvDpVjbrTeeRmw5KUJIHRyMGAOjKB8wr2jvgXyZm7GD0epIW5ILsyKQQWWOa1uqsfVycA== @@ -1873,7 +1873,7 @@ cli-progress "^3.12.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@12.21.7-dev.0": +"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.0", "@salesforce/source-deploy-retrieve@^12.21.7-dev.0": version "12.21.7-dev.0" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.7-dev.0.tgz#d139624d697387bd635d38055e0c38b897745246" integrity sha512-IpuyZO6lkz3fWuWFkefaFnOPHBOxYIze0AoHlwbuq2VchFQqyts64X6EwvDya+Rc1KRQ9dkWOZg55IxnMBT3mw== @@ -1894,27 +1894,6 @@ proxy-agent "^6.4.0" yaml "^2.7.1" -"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.0": - version "12.21.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.1.tgz#081ea10b86b1af3c222d9dea3ac3774bdb477954" - integrity sha512-VC6sAaLH04z1znJh7f8ftlUTDEzzUFzpaau8kIVjZW7Iq4xSnRORmxlh941C2KSTPRR454ZbnxuWC5czcn5Bcg== - dependencies: - "@salesforce/core" "^8.12.0" - "@salesforce/kit" "^3.2.3" - "@salesforce/ts-types" "^2.0.12" - "@salesforce/types" "^1.3.0" - fast-levenshtein "^3.0.0" - fast-xml-parser "^4.5.3" - got "^11.8.6" - graceful-fs "^4.2.11" - ignore "^5.3.2" - isbinaryfile "^5.0.2" - jszip "^3.10.1" - mime "2.6.0" - minimatch "^9.0.5" - proxy-agent "^6.4.0" - yaml "^2.7.1" - "@salesforce/source-testkit@^2.2.129": version "2.2.137" resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.2.137.tgz#e272a0eb4cee4a7ecd2b69a4dd9284450ad7c042" From 63e0d839a3d799653894e7bf07e99354c9f90226 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Tue, 22 Jul 2025 18:38:15 -0300 Subject: [PATCH 03/10] chore: update schemas --- schemas/project-delete-source.json | 11 ++++++++++- schemas/project-deploy-cancel.json | 23 ++++++++++++++++------- schemas/project-deploy-quick.json | 23 ++++++++++++++++------- schemas/project-deploy-report.json | 23 ++++++++++++++++------- schemas/project-deploy-resume.json | 23 ++++++++++++++++------- schemas/project-deploy-start.json | 23 ++++++++++++++++------- schemas/project-deploy-validate.json | 23 ++++++++++++++++------- schemas/project-retrieve-start.json | 11 ++++++++++- 8 files changed, 116 insertions(+), 44 deletions(-) diff --git a/schemas/project-delete-source.json b/schemas/project-delete-source.json index 27f5d15d..ce77760e 100644 --- a/schemas/project-delete-source.json +++ b/schemas/project-delete-source.json @@ -156,7 +156,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", diff --git a/schemas/project-deploy-cancel.json b/schemas/project-deploy-cancel.json index d8159593..54b922c1 100644 --- a/schemas/project-deploy-cancel.json +++ b/schemas/project-deploy-cancel.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -106,9 +109,6 @@ }, "stateDetail": { "type": "string" - }, - "deployUrl": { - "type": "string" } }, "required": [ @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -577,9 +589,6 @@ "stateDetail": { "type": "string" }, - "deployUrl": { - "type": "string" - }, "id": { "type": "string" }, diff --git a/schemas/project-deploy-quick.json b/schemas/project-deploy-quick.json index 2afa13d2..54b922c1 100644 --- a/schemas/project-deploy-quick.json +++ b/schemas/project-deploy-quick.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -106,9 +109,6 @@ }, "stateDetail": { "type": "string" - }, - "deployUrl": { - "type": "string" } }, "required": [ @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -583,9 +595,6 @@ "success": { "type": "boolean" }, - "deployUrl": { - "type": "string" - }, "done": { "type": "boolean" } diff --git a/schemas/project-deploy-report.json b/schemas/project-deploy-report.json index d8159593..54b922c1 100644 --- a/schemas/project-deploy-report.json +++ b/schemas/project-deploy-report.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -106,9 +109,6 @@ }, "stateDetail": { "type": "string" - }, - "deployUrl": { - "type": "string" } }, "required": [ @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -577,9 +589,6 @@ "stateDetail": { "type": "string" }, - "deployUrl": { - "type": "string" - }, "id": { "type": "string" }, diff --git a/schemas/project-deploy-resume.json b/schemas/project-deploy-resume.json index d73352a5..54b922c1 100644 --- a/schemas/project-deploy-resume.json +++ b/schemas/project-deploy-resume.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -106,9 +109,6 @@ }, "stateDetail": { "type": "string" - }, - "deployUrl": { - "type": "string" } }, "required": [ @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -585,9 +597,6 @@ }, "done": { "type": "boolean" - }, - "deployUrl": { - "type": "string" } }, "required": ["files", "status"] diff --git a/schemas/project-deploy-start.json b/schemas/project-deploy-start.json index d8159593..54b922c1 100644 --- a/schemas/project-deploy-start.json +++ b/schemas/project-deploy-start.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -106,9 +109,6 @@ }, "stateDetail": { "type": "string" - }, - "deployUrl": { - "type": "string" } }, "required": [ @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -577,9 +589,6 @@ "stateDetail": { "type": "string" }, - "deployUrl": { - "type": "string" - }, "id": { "type": "string" }, diff --git a/schemas/project-deploy-validate.json b/schemas/project-deploy-validate.json index f84e81ff..54b922c1 100644 --- a/schemas/project-deploy-validate.json +++ b/schemas/project-deploy-validate.json @@ -29,6 +29,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "id": { "type": "string" }, @@ -71,9 +74,6 @@ "errorStatusCode": { "type": "string" }, - "deployUrl": { - "type": "string" - }, "ignoreWarnings": { "type": "boolean" }, @@ -204,7 +204,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "DeployDetails": { "type": "object", @@ -511,6 +520,9 @@ "zipFileCount": { "type": "number" }, + "deployUrl": { + "type": "string" + }, "canceledBy": { "type": "string" }, @@ -577,9 +589,6 @@ "stateDetail": { "type": "string" }, - "deployUrl": { - "type": "string" - }, "id": { "type": "string" }, diff --git a/schemas/project-retrieve-start.json b/schemas/project-retrieve-start.json index b5fd8ba0..8bd3c61c 100644 --- a/schemas/project-retrieve-start.json +++ b/schemas/project-retrieve-start.json @@ -192,7 +192,16 @@ }, "RequestStatus": { "type": "string", - "enum": ["Pending", "InProgress", "Succeeded", "SucceededPartial", "Failed", "Canceling", "Canceled"] + "enum": [ + "Pending", + "InProgress", + "Succeeded", + "SucceededPartial", + "Failed", + "Canceling", + "Canceled", + "Finalizing" + ] }, "RetrieveMessage": { "type": "object", From f29a6370a5d8e6d9b00cd8fcc0bdacf16d3ea524 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Tue, 22 Jul 2025 21:40:17 +0000 Subject: [PATCH 04/10] chore(release): 3.22.34-dev.0 [skip ci] --- README.md | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index a1c9f1fe..0bf863c8 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/mdapi.ts)_ +_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/mdapi.ts)_ ## `sf project convert source` @@ -214,7 +214,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/3.22.33/src/commands/project/convert/source.ts)_ +_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source.ts)_ ## `sf project convert source-behavior` @@ -273,7 +273,7 @@ EXAMPLES $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir ``` -_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source-behavior.ts)_ +_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source-behavior.ts)_ ## `sf project delete source` @@ -413,7 +413,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/3.22.33/src/commands/project/delete/source.ts)_ +_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/source.ts)_ ## `sf project delete tracking` @@ -450,7 +450,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/3.22.33/src/commands/project/delete/tracking.ts)_ +_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/tracking.ts)_ ## `sf project deploy cancel` @@ -522,7 +522,7 @@ FLAG DESCRIPTIONS project deploy report". ``` -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/cancel.ts)_ +_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/cancel.ts)_ ## `sf project deploy preview` @@ -605,7 +605,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/3.22.33/src/commands/project/deploy/preview.ts)_ +_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/preview.ts)_ ## `sf project deploy quick` @@ -689,7 +689,7 @@ FLAG DESCRIPTIONS deploy report". ``` -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/quick.ts)_ +_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/quick.ts)_ ## `sf project deploy report` @@ -781,7 +781,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/3.22.33/src/commands/project/deploy/report.ts)_ +_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/report.ts)_ ## `sf project deploy resume` @@ -866,7 +866,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/3.22.33/src/commands/project/deploy/resume.ts)_ +_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/resume.ts)_ ## `sf project deploy start` @@ -1102,7 +1102,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/3.22.33/src/commands/project/deploy/start.ts)_ +_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/start.ts)_ ## `sf project deploy validate` @@ -1275,7 +1275,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/3.22.33/src/commands/project/deploy/validate.ts)_ +_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/validate.ts)_ ## `sf project generate manifest` @@ -1371,7 +1371,7 @@ EXAMPLES $ sf project generate manifest --from-org test@myorg.com --excluded-metadata StandardValueSet ``` -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/generate/manifest.ts)_ +_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/generate/manifest.ts)_ ## `sf project list ignored` @@ -1413,7 +1413,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/3.22.33/src/commands/project/list/ignored.ts)_ +_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/list/ignored.ts)_ ## `sf project reset tracking` @@ -1462,7 +1462,7 @@ EXAMPLES $ sf project reset tracking --revision 30 ``` -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/reset/tracking.ts)_ +_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/reset/tracking.ts)_ ## `sf project retrieve preview` @@ -1516,7 +1516,7 @@ FLAG DESCRIPTIONS production orgs. ``` -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/preview.ts)_ +_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/preview.ts)_ ## `sf project retrieve start` @@ -1689,6 +1689,6 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/start.ts)_ +_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/start.ts)_ diff --git a/package.json b/package.json index f3fd7b08..456608a9 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/plugin-deploy-retrieve", "description": "deploy and retrieve commands for sf", - "version": "3.22.33", + "version": "3.22.34-dev.0", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "resolutions": { From ad3d5a4d77ed9b394431b5fe0dff64cb093261d9 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Mon, 28 Jul 2025 16:51:45 -0300 Subject: [PATCH 05/10] feat: add `--poll-interval` flag for retrieve --- command-snapshot.json | 1 + messages/retrieve.start.md | 4 ++++ src/commands/project/retrieve/start.ts | 9 ++++++++- 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/command-snapshot.json b/command-snapshot.json index 7e29bd18..da29752c 100644 --- a/command-snapshot.json +++ b/command-snapshot.json @@ -291,6 +291,7 @@ "metadata", "output-dir", "package-name", + "poll-interval", "single-package", "source-dir", "target-metadata-dir", diff --git a/messages/retrieve.start.md b/messages/retrieve.start.md index 4ab517f1..ea2b704e 100644 --- a/messages/retrieve.start.md +++ b/messages/retrieve.start.md @@ -149,6 +149,10 @@ Extract all files from the retrieved zip file. File name to use for the retrieved zip file. +# flags.poll-interval.summary + +Number of seconds to wait between status checks. + # error.Conflicts There are changes in your local files that conflict with the org changes you're trying to retrieve. diff --git a/src/commands/project/retrieve/start.ts b/src/commands/project/retrieve/start.ts index f7913477..84dc82a7 100644 --- a/src/commands/project/retrieve/start.ts +++ b/src/commands/project/retrieve/start.ts @@ -152,6 +152,13 @@ export default class RetrieveMetadata extends SfCommand { exclusive: ['ignore-conflicts'], helpGroup: mdapiFlagGroup, }), + 'poll-interval': Flags.duration({ + min: Duration.milliseconds(500).seconds, + required: false, + helpValue: '', + unit: 'seconds', + summary: messages.getMessage('flags.poll-interval.summary'), + }), }; public static configurationVariablesSection = toHelpSection( @@ -266,7 +273,7 @@ export default class RetrieveMetadata extends SfCommand { throw error; }); - this.retrieveResult = await retrieve.pollStatus(500, flags.wait.seconds); + this.retrieveResult = await retrieve.pollStatus(flags['poll-interval']?.milliseconds ?? 500, flags.wait.seconds); } this.ms.stop(); From 00cb92925e9edcd06ac3898abd89ccbb7ded7f46 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Mon, 28 Jul 2025 16:59:45 -0300 Subject: [PATCH 06/10] fix: top-level jsforce for testing --- package.json | 1 + yarn.lock | 12 ++++++------ 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/package.json b/package.json index 9621ad88..c561584a 100644 --- a/package.json +++ b/package.json @@ -9,6 +9,7 @@ }, "dependencies": { "@inquirer/prompts": "^7.5.3", + "@jsforce/jsforce-node": "^3.9.5", "@oclif/core": "^4.3.0", "@oclif/multi-stage-output": "^0.8.19", "@salesforce/apex-node": "^8.1.31", diff --git a/yarn.lock b/yarn.lock index 2ab7e523..04046446 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1534,17 +1534,17 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsforce/jsforce-node@^3.9.1": - version "3.9.1" - resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.1.tgz#503bcee3b511b2768abb090b8c8af508c2412244" - integrity sha512-tHG9Wozb9tQMiOyKz4MgcSK0XEDdER+dUm42o7qUaokwqC+IPmjgptx0PNTO75U1nqgW6yX6M5Qq1thhj7KMCA== +"@jsforce/jsforce-node@^3.9.1", "@jsforce/jsforce-node@^3.9.5": + version "3.9.5" + resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.5.tgz#0ab30a36c87724619c515190317750e627358e03" + integrity sha512-JjUdwFwRSzTJ/qb3Q1tTyEHI96vrm1Q/qB1+4qRA+wDw2lt9sZVQPWDcIA4Ughsd4LSLqmRLXZgc24tpOmETSA== dependencies: "@sindresorhus/is" "^4" base64url "^3.0.1" csv-parse "^5.5.2" csv-stringify "^6.4.4" faye "^1.4.0" - form-data "^4.0.0" + form-data "^4.0.4" https-proxy-agent "^5.0.0" multistream "^3.1.0" node-fetch "^2.6.1" @@ -4927,7 +4927,7 @@ form-data-encoder@^2.1.2: resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5" integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw== -form-data@^4.0.0: +form-data@^4.0.0, form-data@^4.0.4: version "4.0.4" resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4" integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow== From ecf0d7e852b1f56e6e7096b4dfcace30e20ff351 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Mon, 28 Jul 2025 20:04:35 +0000 Subject: [PATCH 07/10] chore(release): 3.22.34-dev.1 [skip ci] --- README.md | 156 +++++++-------------------------------------------- package.json | 2 +- 2 files changed, 20 insertions(+), 138 deletions(-) diff --git a/README.md b/README.md index 768e8e60..aa2bd54a 100644 --- a/README.md +++ b/README.md @@ -141,14 +141,7 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -<<<<<<< HEAD -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/mdapi.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/mdapi.ts)_ -======= -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/mdapi.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/mdapi.ts)_ ## `sf project convert source` @@ -221,14 +214,7 @@ FLAG DESCRIPTIONS Override the api version used for api requests made by this command ``` -<<<<<<< HEAD -_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source.ts)_ -======= -_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/source.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/source.ts)_ ## `sf project convert source-behavior` @@ -287,14 +273,7 @@ EXAMPLES $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir ``` -<<<<<<< HEAD -_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/convert/source-behavior.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/convert/source-behavior.ts)_ -======= -_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/convert/source-behavior.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/source-behavior.ts)_ ## `sf project delete source` @@ -434,14 +413,7 @@ FLAG DESCRIPTIONS - Separate the test names with spaces: --tests Test1 Test2 "Test With Space" ``` -<<<<<<< HEAD -_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/source.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/source.ts)_ -======= -_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/source.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/delete/source.ts)_ ## `sf project delete tracking` @@ -478,14 +450,7 @@ EXAMPLES $ sf project delete tracking --target-org my-scratch ``` -<<<<<<< HEAD -_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/delete/tracking.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/delete/tracking.ts)_ -======= -_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/delete/tracking.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/delete/tracking.ts)_ ## `sf project deploy cancel` @@ -557,14 +522,7 @@ FLAG DESCRIPTIONS project deploy report". ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/cancel.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/cancel.ts)_ -======= -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/cancel.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/cancel.ts)_ ## `sf project deploy preview` @@ -647,14 +605,7 @@ FLAG DESCRIPTIONS All child components are included. If you specify this flag, don’t specify --metadata or --source-dir. ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/preview.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/preview.ts)_ -======= -_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/preview.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/preview.ts)_ ## `sf project deploy quick` @@ -738,14 +689,7 @@ FLAG DESCRIPTIONS deploy report". ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/quick.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/quick.ts)_ -======= -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/quick.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/quick.ts)_ ## `sf project deploy report` @@ -837,14 +781,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/report.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/report.ts)_ -======= -_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/report.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/report.ts)_ ## `sf project deploy resume` @@ -929,14 +866,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/resume.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/resume.ts)_ -======= -_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/resume.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/resume.ts)_ ## `sf project deploy start` @@ -1172,14 +1102,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/start.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/start.ts)_ -======= -_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/start.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/start.ts)_ ## `sf project deploy validate` @@ -1352,14 +1275,7 @@ FLAG DESCRIPTIONS --coverage-formatters lcov --coverage-formatters clover ``` -<<<<<<< HEAD -_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/deploy/validate.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/deploy/validate.ts)_ -======= -_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/deploy/validate.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/validate.ts)_ ## `sf project generate manifest` @@ -1455,14 +1371,7 @@ EXAMPLES $ sf project generate manifest --from-org test@myorg.com --excluded-metadata StandardValueSet ``` -<<<<<<< HEAD -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/generate/manifest.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/generate/manifest.ts)_ -======= -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/generate/manifest.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/generate/manifest.ts)_ ## `sf project list ignored` @@ -1504,14 +1413,7 @@ EXAMPLES $ sf project list ignored --source-dir package.xml ``` -<<<<<<< HEAD -_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/list/ignored.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/list/ignored.ts)_ -======= -_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/list/ignored.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/list/ignored.ts)_ ## `sf project reset tracking` @@ -1560,14 +1462,7 @@ EXAMPLES $ sf project reset tracking --revision 30 ``` -<<<<<<< HEAD -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/reset/tracking.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/reset/tracking.ts)_ -======= -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/reset/tracking.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/reset/tracking.ts)_ ## `sf project retrieve preview` @@ -1621,14 +1516,7 @@ FLAG DESCRIPTIONS production orgs. ``` -<<<<<<< HEAD -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/preview.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/preview.ts)_ -======= -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/preview.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/preview.ts)_ ## `sf project retrieve start` @@ -1638,7 +1526,7 @@ Retrieve metadata from an org to your local project. USAGE $ sf project retrieve start -o [--json] [--flags-dir ] [-a ] [-c] [-x | -m ... | -d ...] [-r | -n ... | ] [--single-package -t ] [-w ] [-z ] [--zip-file-name - ] + ] [--poll-interval ] FLAGS -a, --api-version= Target API version for the retrieve. @@ -1655,6 +1543,7 @@ FLAGS -w, --wait= [default: 33 minutes] Number of minutes to wait for the command to complete and display results to the terminal window. -x, --manifest= File path for the manifest (package.xml) that specifies the components to retrieve. + --poll-interval= Number of seconds to wait between status checks. METADATA API FORMAT FLAGS -t, --target-metadata-dir= Directory that will contain the retrieved metadata format files or ZIP. @@ -1801,13 +1690,6 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -<<<<<<< HEAD -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.34-dev.0/src/commands/project/retrieve/start.ts)_ -||||||| 2eb4732 -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.33/src/commands/project/retrieve/start.ts)_ -======= -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.35/src/commands/project/retrieve/start.ts)_ - -> > > > > > > origin/main +_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/start.ts)_ diff --git a/package.json b/package.json index c561584a..bdf2eb4f 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/plugin-deploy-retrieve", "description": "deploy and retrieve commands for sf", - "version": "3.22.34-dev.0", + "version": "3.22.34-dev.1", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "resolutions": { From 12362ef8fe4fd400d23452118e15e0155bb03053 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Mon, 4 Aug 2025 11:56:17 -0300 Subject: [PATCH 08/10] chore: bump deps --- package.json | 12 ++---- yarn.lock | 118 +++++++++++++++++++++++++-------------------------- 2 files changed, 61 insertions(+), 69 deletions(-) diff --git a/package.json b/package.json index 94a4edfa..602c1ba4 100644 --- a/package.json +++ b/package.json @@ -4,21 +4,17 @@ "version": "3.22.37", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", - "resolutions": { - "@salesforce/source-deploy-retrieve": "^12.21.7-dev.0" - }, "dependencies": { "@inquirer/prompts": "^7.5.3", - "@jsforce/jsforce-node": "^3.9.5", "@oclif/core": "^4.3.0", "@oclif/multi-stage-output": "^0.8.19", "@salesforce/apex-node": "^8.1.31", - "@salesforce/core": "^8.18.1", + "@salesforce/core": "^8.18.7", "@salesforce/kit": "^3.2.3", - "@salesforce/plugin-info": "^3.4.67", + "@salesforce/plugin-info": "^3.4.77", "@salesforce/sf-plugins-core": "^12.2.2", - "@salesforce/source-deploy-retrieve": "^12.22.0", - "@salesforce/source-tracking": "^7.4.1", + "@salesforce/source-deploy-retrieve": "^12.22.3-dev.0", + "@salesforce/source-tracking": "^7.4.10-dev.0", "@salesforce/ts-types": "^2.0.12", "ansis": "^3.17.0", "terminal-link": "^3.0.0" diff --git a/yarn.lock b/yarn.lock index a6fe8ab8..cf199693 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1534,7 +1534,7 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" -"@jsforce/jsforce-node@^3.10.0": +"@jsforce/jsforce-node@^3.10.0", "@jsforce/jsforce-node@^3.9.4": version "3.10.0" resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.10.0.tgz#1bf75e9d322434f99fc38a3b60738205051144c5" integrity sha512-hNExEqzvJ/ixnsfZlrYh/FqEOYfn4vKmeBMqIdrEjeYciIsSaOeggghFl+1w0m2u7TNGr1+8jPUBvki3nebPSw== @@ -1550,38 +1550,6 @@ node-fetch "^2.6.1" xml2js "^0.6.2" -"@jsforce/jsforce-node@^3.9.1": - version "3.9.1" - resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.1.tgz#503bcee3b511b2768abb090b8c8af508c2412244" - integrity sha512-tHG9Wozb9tQMiOyKz4MgcSK0XEDdER+dUm42o7qUaokwqC+IPmjgptx0PNTO75U1nqgW6yX6M5Qq1thhj7KMCA== - dependencies: - "@sindresorhus/is" "^4" - base64url "^3.0.1" - csv-parse "^5.5.2" - csv-stringify "^6.4.4" - faye "^1.4.0" - form-data "^4.0.0" - https-proxy-agent "^5.0.0" - multistream "^3.1.0" - node-fetch "^2.6.1" - xml2js "^0.6.2" - -"@jsforce/jsforce-node@^3.9.5": - version "3.9.5" - resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.5.tgz#0ab30a36c87724619c515190317750e627358e03" - integrity sha512-JjUdwFwRSzTJ/qb3Q1tTyEHI96vrm1Q/qB1+4qRA+wDw2lt9sZVQPWDcIA4Ughsd4LSLqmRLXZgc24tpOmETSA== - dependencies: - "@sindresorhus/is" "^4" - base64url "^3.0.1" - csv-parse "^5.5.2" - csv-stringify "^6.4.4" - faye "^1.4.0" - form-data "^4.0.4" - https-proxy-agent "^5.0.0" - multistream "^3.1.0" - node-fetch "^2.6.1" - xml2js "^0.6.2" - "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1761,14 +1729,14 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.17.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.18.5", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0": - version "8.18.6" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.6.tgz#c6f406be4fa127fe29e65aa59120f60135e92bd0" - integrity sha512-FogwH8DlwJ7cWsTGgQgr+ny1PJMLrwYtPdwR11ACkVjn9u1Qqn/RxYvzMrimbNZuiZJs6qrLNaye8tau+g3Y4Q== +"@salesforce/core@^8.14.0", "@salesforce/core@^8.15.0", "@salesforce/core@^8.17.0", "@salesforce/core@^8.18.1", "@salesforce/core@^8.18.5", "@salesforce/core@^8.18.7", "@salesforce/core@^8.5.1", "@salesforce/core@^8.8.0": + version "8.18.7" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.7.tgz#1eb16b69b3a2120f5e39917a9e78d0c32eaa0943" + integrity sha512-TP0AwS52+4ijIqVkNrKesVtK/osGsW7KvHrUiPcARI73ZKnW5z/CCpGdDH8nwGHSxj9rYlWC//g3EkTZJkparw== dependencies: "@jsforce/jsforce-node" "^3.10.0" "@salesforce/kit" "^3.2.2" - "@salesforce/schemas" "^1.9.0" + "@salesforce/schemas" "^1.9.1" "@salesforce/ts-types" "^2.0.10" ajv "^8.17.1" change-case "^4.1.2" @@ -1843,21 +1811,21 @@ debug "^4.4.1" handlebars "^4.7.8" -"@salesforce/plugin-info@^3.4.67": - version "3.4.72" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-3.4.72.tgz#49a7fc5824ac299f075dc056c5e7e40428db691a" - integrity sha512-cg0UlJpArywslqriFuIhcghiFdpWtHld65pYQzrFXDFqrLeiS+CYDeOdjcFtp+F6nKElmm07q7LxKYDeO2CzLQ== +"@salesforce/plugin-info@^3.4.77": + version "3.4.77" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-info/-/plugin-info-3.4.77.tgz#3f51a575c52524e8bdc4cdab869d26fcb0ebd832" + integrity sha512-4EgAoYCkA6/q/WOAdcE19HV2TrRYc2lPTaCyBgqxaCWuzvinboYkevxjOPY3XU27mCSbYZSrZr6mZacyM/5wWw== dependencies: "@inquirer/input" "^2.3.0" - "@jsforce/jsforce-node" "^3.9.1" + "@jsforce/jsforce-node" "^3.9.4" "@oclif/core" "^4" - "@salesforce/core" "^8.15.0" + "@salesforce/core" "^8.18.7" "@salesforce/kit" "^3.2.3" "@salesforce/sf-plugins-core" "^12" got "^13.0.0" marked "^4.3.0" marked-terminal "^4.2.0" - open "^10.1.2" + open "^10.2.0" proxy-agent "^6.5.0" semver "^7.7.2" @@ -1866,7 +1834,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.3.tgz#ba648d4886bb38adabe073dbea0b3a91b3753bb0" integrity sha512-hYOhoPTCSYMDYn+U1rlEk16PoBeAJPkrdg4/UtAzupM1mRRJOwEPMG1d7U8DxJFKuXW3DMEYWr2MwAIBDaHmFg== -"@salesforce/schemas@^1.9.0": +"@salesforce/schemas@^1.9.0", "@salesforce/schemas@^1.9.1": version "1.9.1" resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.1.tgz#ea843c732068c4ac2dadbe1d22b44e714cfe661d" integrity sha512-9I8kZBYT7HFXsbz2ukkSyZDRPjSsfRyx3pKGCsjWe2av8wuNm6tYUnmuXzMH5JoVSu3MvtOeIlwp5fFURdsNjg== @@ -1905,10 +1873,10 @@ cli-progress "^3.12.0" terminal-link "^3.0.0" -"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.7-dev.0", "@salesforce/source-deploy-retrieve@^12.22.0": - version "12.21.7-dev.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.7-dev.0.tgz#d139624d697387bd635d38055e0c38b897745246" - integrity sha512-IpuyZO6lkz3fWuWFkefaFnOPHBOxYIze0AoHlwbuq2VchFQqyts64X6EwvDya+Rc1KRQ9dkWOZg55IxnMBT3mw== +"@salesforce/source-deploy-retrieve@^12.22.0": + version "12.22.2" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.22.2.tgz#cd6f1952b50ce42c966c06284b433993d9fb2cac" + integrity sha512-lORUqJ/2oEVM0ZQqreZQPiVgaeXDmKMg+flLyhEag4JKes07wAOWOdzOOS/HMB9QGgGdbCW4KMFKN99O+a2gHA== dependencies: "@salesforce/core" "^8.18.1" "@salesforce/kit" "^3.2.3" @@ -1926,6 +1894,27 @@ proxy-agent "^6.4.0" yaml "^2.7.1" +"@salesforce/source-deploy-retrieve@^12.22.3-dev.0": + version "12.22.3-dev.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.22.3-dev.0.tgz#d99f540f021d688059e6cb9574bee88981b71e3e" + integrity sha512-MmNiaCsbd20DtvV8m76yRlGZQBQwxLNMq6w+Jd5qNFBl+j+RbBGXy6TaBbNajyfO59YY5eNZKKvEaaTS7BKKPQ== + dependencies: + "@salesforce/core" "^8.18.7" + "@salesforce/kit" "^3.2.3" + "@salesforce/ts-types" "^2.0.12" + "@salesforce/types" "^1.3.0" + fast-levenshtein "^3.0.0" + fast-xml-parser "^4.5.3" + got "^11.8.6" + graceful-fs "^4.2.11" + ignore "^5.3.2" + isbinaryfile "^5.0.2" + jszip "^3.10.1" + mime "2.6.0" + minimatch "^9.0.5" + proxy-agent "^6.4.0" + yaml "^2.7.1" + "@salesforce/source-testkit@^2.2.143": version "2.2.143" resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.2.143.tgz#def2b8247ca0d861446f7d4de526d8df371d7629" @@ -1942,15 +1931,15 @@ shelljs "^0.10.0" sinon "^10.0.0" -"@salesforce/source-tracking@^7.4.1": - version "7.4.7" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.4.7.tgz#daa44ad1eeaf9f4dff36069c47c536062ab0eeb3" - integrity sha512-ysv7loc8Qboi5jroKYeYFrXCuRFJT0k+g3lpefT8NfQwZNm8GyoUlKOw2AlfeE3gIorHUq3N7oWxjX8xUDDa4g== +"@salesforce/source-tracking@^7.4.10-dev.0": + version "7.4.10-dev.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.4.10-dev.0.tgz#a7f76b33e7dbeda277a93b5194c55398d623c02b" + integrity sha512-2BymexdVC06zv/wKruVbvuiGvKTJnb8XR/TzrthNsCyYJ6BQsnMbQOzoh63/S/T+FRLMf5kV99A/D+0glt5Cag== dependencies: "@oclif/core" "^4.4.0" - "@salesforce/core" "^8.15.0" + "@salesforce/core" "^8.18.7" "@salesforce/kit" "^3.2.3" - "@salesforce/source-deploy-retrieve" "^12.20.1" + "@salesforce/source-deploy-retrieve" "^12.22.3-dev.0" "@salesforce/ts-types" "^2.0.12" fast-xml-parser "^4.5.3" graceful-fs "^4.2.11" @@ -7170,15 +7159,15 @@ oniguruma-to-es@^2.2.0: regex "^5.1.1" regex-recursion "^5.1.1" -open@^10.1.2: - version "10.1.2" - resolved "https://registry.yarnpkg.com/open/-/open-10.1.2.tgz#d5df40984755c9a9c3c93df8156a12467e882925" - integrity sha512-cxN6aIDPz6rm8hbebcP7vrQNhvRcveZoJU72Y7vskh4oIm+BZwBECnx5nTmrlres1Qapvx27Qo1Auukpf8PKXw== +open@^10.2.0: + version "10.2.0" + resolved "https://registry.yarnpkg.com/open/-/open-10.2.0.tgz#b9d855be007620e80b6fb05fac98141fe62db73c" + integrity sha512-YgBpdJHPyQ2UE5x+hlSXcnejzAvD0b22U2OuAP+8OnlJT+PjWPxtgmGqKKc+RgTM63U9gN0YzrYc71R2WT/hTA== dependencies: default-browser "^5.2.1" define-lazy-prop "^3.0.0" is-inside-container "^1.0.0" - is-wsl "^3.1.0" + wsl-utils "^0.1.0" optionator@^0.8.1: version "0.8.3" @@ -9330,6 +9319,13 @@ ws@^8.15.0: resolved "https://registry.yarnpkg.com/ws/-/ws-8.18.3.tgz#b56b88abffde62791c639170400c93dcb0c95472" integrity sha512-PEIGCY5tSlUt50cqyMXfCzX+oOPqN0vuGqWzbcJ2xvnkzkq46oOpz7dQaTDBdfICb4N14+GARUDw2XV2N4tvzg== +wsl-utils@^0.1.0: + version "0.1.0" + resolved "https://registry.yarnpkg.com/wsl-utils/-/wsl-utils-0.1.0.tgz#8783d4df671d4d50365be2ee4c71917a0557baab" + integrity sha512-h3Fbisa2nKGPxCpm89Hk33lBLsnaGBvctQopaBSOW/uIs6FTe1ATyAnKFJrzVs9vpGdsTe73WF3V4lIsk4Gacw== + dependencies: + is-wsl "^3.1.0" + xml2js@^0.6.2: version "0.6.2" resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" From 095f1b42b4a7cd112c4e47d58929f8762b1418ec Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Mon, 4 Aug 2025 12:07:52 -0300 Subject: [PATCH 09/10] chore: update schemas --- schemas/project-delete-source.json | 3 ++- schemas/project-deploy-cancel.json | 3 ++- schemas/project-deploy-quick.json | 3 ++- schemas/project-deploy-report.json | 3 ++- schemas/project-deploy-resume.json | 3 ++- schemas/project-deploy-start.json | 3 ++- schemas/project-deploy-validate.json | 3 ++- schemas/project-retrieve-start.json | 3 ++- 8 files changed, 16 insertions(+), 8 deletions(-) diff --git a/schemas/project-delete-source.json b/schemas/project-delete-source.json index ce77760e..48dc2a31 100644 --- a/schemas/project-delete-source.json +++ b/schemas/project-delete-source.json @@ -164,7 +164,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-cancel.json b/schemas/project-deploy-cancel.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-cancel.json +++ b/schemas/project-deploy-cancel.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-quick.json b/schemas/project-deploy-quick.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-quick.json +++ b/schemas/project-deploy-quick.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-report.json b/schemas/project-deploy-report.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-report.json +++ b/schemas/project-deploy-report.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-resume.json b/schemas/project-deploy-resume.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-resume.json +++ b/schemas/project-deploy-resume.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-start.json b/schemas/project-deploy-start.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-start.json +++ b/schemas/project-deploy-start.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-deploy-validate.json b/schemas/project-deploy-validate.json index 54b922c1..58e21739 100644 --- a/schemas/project-deploy-validate.json +++ b/schemas/project-deploy-validate.json @@ -212,7 +212,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "DeployDetails": { diff --git a/schemas/project-retrieve-start.json b/schemas/project-retrieve-start.json index 8bd3c61c..5087245d 100644 --- a/schemas/project-retrieve-start.json +++ b/schemas/project-retrieve-start.json @@ -200,7 +200,8 @@ "Failed", "Canceling", "Canceled", - "Finalizing" + "Finalizing", + "FinalizingFailed" ] }, "RetrieveMessage": { From 9cfb5cc37c53cda9d1f63e95179cab49e4809716 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Mon, 4 Aug 2025 15:09:13 +0000 Subject: [PATCH 10/10] chore(release): 3.22.38-dev.0 [skip ci] --- README.md | 34 +++++++++++++++++----------------- package.json | 2 +- 2 files changed, 18 insertions(+), 18 deletions(-) diff --git a/README.md b/README.md index ab596b71..1e897e71 100644 --- a/README.md +++ b/README.md @@ -141,7 +141,7 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.37/src/commands/project/convert/mdapi.ts)_ +_See code: [src/commands/project/convert/mdapi.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/convert/mdapi.ts)_ ## `sf project convert source` @@ -214,7 +214,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/3.22.36-dev.0/src/commands/project/convert/source.ts)_ +_See code: [src/commands/project/convert/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/convert/source.ts)_ ## `sf project convert source-behavior` @@ -273,7 +273,7 @@ EXAMPLES $ sf project convert source-behavior --behavior decomposePermissionSetBeta --dry-run --preserve-temp-dir ``` -_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/convert/source-behavior.ts)_ +_See code: [src/commands/project/convert/source-behavior.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/convert/source-behavior.ts)_ ## `sf project delete source` @@ -413,7 +413,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/3.22.36-dev.0/src/commands/project/delete/source.ts)_ +_See code: [src/commands/project/delete/source.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/delete/source.ts)_ ## `sf project delete tracking` @@ -450,7 +450,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/3.22.36-dev.0/src/commands/project/delete/tracking.ts)_ +_See code: [src/commands/project/delete/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/delete/tracking.ts)_ ## `sf project deploy cancel` @@ -522,7 +522,7 @@ FLAG DESCRIPTIONS project deploy report". ``` -_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/cancel.ts)_ +_See code: [src/commands/project/deploy/cancel.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/cancel.ts)_ ## `sf project deploy preview` @@ -605,7 +605,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/3.22.36-dev.0/src/commands/project/deploy/preview.ts)_ +_See code: [src/commands/project/deploy/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/preview.ts)_ ## `sf project deploy quick` @@ -689,7 +689,7 @@ FLAG DESCRIPTIONS deploy report". ``` -_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/deploy/quick.ts)_ +_See code: [src/commands/project/deploy/quick.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/quick.ts)_ ## `sf project deploy report` @@ -781,7 +781,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/3.22.36-dev.0/src/commands/project/deploy/report.ts)_ +_See code: [src/commands/project/deploy/report.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/report.ts)_ ## `sf project deploy resume` @@ -866,7 +866,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/3.22.36-dev.0/src/commands/project/deploy/resume.ts)_ +_See code: [src/commands/project/deploy/resume.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/resume.ts)_ ## `sf project deploy start` @@ -1102,7 +1102,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/3.22.36-dev.0/src/commands/project/deploy/start.ts)_ +_See code: [src/commands/project/deploy/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/start.ts)_ ## `sf project deploy validate` @@ -1275,7 +1275,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/3.22.36-dev.0/src/commands/project/deploy/validate.ts)_ +_See code: [src/commands/project/deploy/validate.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/deploy/validate.ts)_ ## `sf project generate manifest` @@ -1371,7 +1371,7 @@ EXAMPLES $ sf project generate manifest --from-org test@myorg.com --excluded-metadata StandardValueSet ``` -_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/generate/manifest.ts)_ +_See code: [src/commands/project/generate/manifest.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/generate/manifest.ts)_ ## `sf project list ignored` @@ -1413,7 +1413,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/3.22.36-dev.0/src/commands/project/list/ignored.ts)_ +_See code: [src/commands/project/list/ignored.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/list/ignored.ts)_ ## `sf project reset tracking` @@ -1462,7 +1462,7 @@ EXAMPLES $ sf project reset tracking --revision 30 ``` -_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/reset/tracking.ts)_ +_See code: [src/commands/project/reset/tracking.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/reset/tracking.ts)_ ## `sf project retrieve preview` @@ -1516,7 +1516,7 @@ FLAG DESCRIPTIONS production orgs. ``` -_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/preview.ts)_ +_See code: [src/commands/project/retrieve/preview.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/retrieve/preview.ts)_ ## `sf project retrieve start` @@ -1690,6 +1690,6 @@ FLAG DESCRIPTIONS If you specify this flag, don’t specify --metadata or --source-dir. ``` -_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.36-dev.0/src/commands/project/retrieve/start.ts)_ +_See code: [src/commands/project/retrieve/start.ts](https://github.com/salesforcecli/plugin-deploy-retrieve/blob/3.22.38-dev.0/src/commands/project/retrieve/start.ts)_ diff --git a/package.json b/package.json index 602c1ba4..4d74ade6 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "@salesforce/plugin-deploy-retrieve", "description": "deploy and retrieve commands for sf", - "version": "3.22.37", + "version": "3.22.38-dev.0", "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": {