Merge branch 'forcedotcom:main' into main

Author: force2b

.github/PULL_REQUEST_TEMPLATE.md

@@ -11,3 +11,16 @@
 ### Functionality After
 
 <insert gif and/or summary>
+
+### Metadata Registry: Successful Deploy and Retrieve (required if applicable)
+
+<!-- Attach a screenshot or paste CLI output logs showing a successful deploy and retrieve.
+    For manual testing instructions, see: https://github.com/forcedotcom/source-deploy-retrieve/blob/main/contributing/metadata.md#manual-testing -->
+
+**Deploy output:**
+
+<paste CLI output and/or screenshot>
+
+**Retrieve output:**
+
+<paste CLI output and/or screenshot>

CHANGELOG.md

@@ -1,3 +1,34 @@
+## [12.35.4](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.35.3...12.35.4) (2026-05-07)
+
+
+
+## [12.35.3](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.35.2...12.35.3) (2026-05-07)
+
+
+### Bug Fixes
+
+* **deps:** bump basic-ftp from 5.3.0 to 5.3.1 ([#1762](https://github.com/forcedotcom/source-deploy-retrieve/issues/1762)) ([19ace28](https://github.com/forcedotcom/source-deploy-retrieve/commit/19ace2893e94aef3086bdb2bc98ce90d1be1325d))
+
+
+
+## [12.35.2](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.35.1...12.35.2) (2026-05-07)
+
+
+### Bug Fixes
+
+* **deps:** bump ip-address from 10.1.0 to 10.2.0 ([#1761](https://github.com/forcedotcom/source-deploy-retrieve/issues/1761)) ([972082f](https://github.com/forcedotcom/source-deploy-retrieve/commit/972082ff7d4bc57d7d7771d3714f8f1f51c0bc07))
+
+
+
+## [12.35.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.35.0...12.35.1) (2026-05-03)
+
+
+### Bug Fixes
+
+* **deps:** bump @salesforce/core from 8.28.4 to 8.29.0 ([#1759](https://github.com/forcedotcom/source-deploy-retrieve/issues/1759)) ([438fc87](https://github.com/forcedotcom/source-deploy-retrieve/commit/438fc875c07d5cf200b21ea80e7941be814ee4c3))
+
+
+
 # [12.35.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.34.5...12.35.0) (2026-04-28)
 
 

METADATA_SUPPORT.md

@@ -840,7 +840,6 @@ v67 introduces the following new types.  Here's their current level of support
 |TelemetryActnDefStepAttr|✅||
 |TelemetryDefinition|✅||
 |TelemetryDefinitionVersion|✅||
-|UnifiedSalesIntelligenceEngagementInsightsSettings|✅||
 
 ## Additional Types
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "12.35.0",
+  "version": "12.35.4",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -25,7 +25,7 @@
     "node": ">=18.0.0"
   },
   "dependencies": {
-    "@salesforce/core": "^8.28.4",
+    "@salesforce/core": "^8.29.0",
     "@salesforce/kit": "^3.2.4",
     "@salesforce/ts-types": "^2.0.12",
     "@salesforce/types": "^1.6.0",
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@jsforce/jsforce-node": "^3.10.14",
-    "@salesforce/cli-plugins-testkit": "^5.3.53",
+    "@salesforce/cli-plugins-testkit": "^5.3.55",
     "@salesforce/dev-scripts": "^11.0.4",
     "@types/deep-equal-in-any-order": "^1.0.1",
     "@types/fast-levenshtein": "^0.0.4",

yarn.lock

@@ -690,12 +690,12 @@
   resolved "https://registry.yarnpkg.com/@pkgjs/parseargs/-/parseargs-0.11.0.tgz#a77ea742fab25775145434eb1d2328cf5013ac33"
   integrity sha512-+1VkjdD0QBLPodGrJUeqarH8VAIvQODIbwh9XpP5Syisf7YoQgsJKPNFoqqLQlu+VQ/tVSshMR6loPMn8U+dPg==
 
-"@salesforce/cli-plugins-testkit@^5.3.53":
-  version "5.3.53"
-  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.53.tgz#acb60f5f50cf7f3211eaf7c70c3dff726b5e1571"
-  integrity sha512-tOMbLXZLrHLvK/qtmTNaTsDW1RC6/vpvXCbodejtMdyiDUf0rY3oROeboFA6VCy5iu71aumetLm1EBlvcyh7hw==
+"@salesforce/cli-plugins-testkit@^5.3.55":
+  version "5.3.55"
+  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.55.tgz#9230cb131950c60334b250940826ad20fe029023"
+  integrity sha512-NzV5WWHJDoybEtHVeTOQt/P/VizWsYwhiyAMU98NG+xAdQVBYyTx/2NhRTgnatxqHyNkYKwPMIJJQ9FLvHpU1A==
   dependencies:
-    "@salesforce/core" "^8.28.3"
+    "@salesforce/core" "^8.29.0"
     "@salesforce/kit" "^3.2.6"
     "@salesforce/ts-types" "^2.0.11"
     "@types/shelljs" "^0.10.0"
@@ -706,10 +706,10 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.1"
 
-"@salesforce/core@^8.23.1", "@salesforce/core@^8.28.3", "@salesforce/core@^8.28.4":
-  version "8.28.4"
-  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.28.4.tgz#98920d62c2b2a7fa025af38c74bdf6687d91b0a8"
-  integrity sha512-XQ0BBSetdW9cu36pu8ig5ZBX3oAbDSSH4djHkSU3iAzjLdTygEPIBVtKNeyj1++GmCy0rRiLr/yqoFYr21+GuQ==
+"@salesforce/core@^8.23.1", "@salesforce/core@^8.29.0":
+  version "8.29.0"
+  resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.29.0.tgz#d75d1afe06962e10c466bdf670fa8512bd683882"
+  integrity sha512-q6xDNLPbbZW1n4X4YK1iM8jZvwvJRiwbJxdeF5iHuETxmMka16FoCVi+WziK/Rh5EP0yW08FYyiynwPlgz5RBw==
   dependencies:
     "@jsforce/jsforce-node" "^3.10.13"
     "@salesforce/kit" "^3.2.4"
@@ -1440,9 +1440,9 @@ base64url@^3.0.1:
   integrity sha512-ir1UPr3dkwexU7FdV8qBBbNDRUhMmIekYMFZfi+C/sLNnRESKPl23nB9b2pltqfOQNnGzsDdId90AEtG5tCx4A==
 
 basic-ftp@^5.0.2:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.3.0.tgz#88f057d1ba8442643c505c4c83bbaa4442b15cfd"
-  integrity sha512-5K9eNNn7ywHPsYnFwjKgYH8Hf8B5emh7JKcPaVjjrMJFQQwGpwowEnZNEtHs7DfR7hCZsmaK3VA4HUK0YarT+w==
+  version "5.3.1"
+  resolved "https://registry.yarnpkg.com/basic-ftp/-/basic-ftp-5.3.1.tgz#3148ee9af43c0522514a4f973fecb1d3cbb6d71e"
+  integrity sha512-bopVNp6ugyA150DDuZfPFdt1KZ5a94ZDiwX4hMgZDzF+GttD80lEy8kj98kbyhLXnPvhtIo93mdnLIjpCAeeOw==
 
 binary-extensions@^2.0.0:
   version "2.2.0"
@@ -3317,9 +3317,9 @@ interpret@^1.0.0:
   integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
 
 ip-address@^10.0.1:
-  version "10.1.0"
-  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.1.0.tgz#d8dcffb34d0e02eb241427444a6e23f5b0595aa4"
-  integrity sha512-XXADHxXmvT9+CRxhXg56LJovE+bmWnEWB78LB83VZTprKTmaC5QfruXocxzTZ2Kl0DNwKuBdlIhjL8LeY8Sf8Q==
+  version "10.2.0"
+  resolved "https://registry.yarnpkg.com/ip-address/-/ip-address-10.2.0.tgz#805fc178b20c518bd4c8548b24fe30892d7f3206"
+  integrity sha512-/+S6j4E9AHvW9SWMSEY9Xfy66O5PWvVEJ08O0y5JGyEKQpojb0K0GKpz/v5HJ/G0vi3D2sjGK78119oXZeE0qA==
 
 is-array-buffer@^3.0.1, is-array-buffer@^3.0.2:
   version "3.0.2"