chore: merge main, resolve conflicts

CHANGELOG.md

@@ -1,3 +1,9 @@
+## [12.4.1](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.4.0...12.4.1) (2024-08-18)
+
+### Bug Fixes
+
+- **deps:** bump ignore from 5.3.1 to 5.3.2 ([#1402](https://github.com/forcedotcom/source-deploy-retrieve/issues/1402)) ([e83f3bb](https://github.com/forcedotcom/source-deploy-retrieve/commit/e83f3bb821315abaa9876f8b7ef8f4056be2385c))
+
 # [12.4.0](https://github.com/forcedotcom/source-deploy-retrieve/compare/12.2.1...12.4.0) (2024-08-15)
 
 ### Features

METADATA_SUPPORT.md

@@ -4,7 +4,7 @@ This list compares metadata types found in Salesforce v61 with the [metadata reg
 
 This repository is used by both the Salesforce CLIs and Salesforce's VSCode Extensions.
 
-Currently, there are 597/608 supported metadata types.
+Currently, there are 598/611 supported metadata types.
 For status on any existing gaps, please search or file an issue in the [Salesforce CLI issues only repo](https://github.com/forcedotcom/cli/issues).
 To contribute a new metadata type, please see the [Contributing Metadata Types to the Registry](./contributing/metadata.md)
 
@@ -148,7 +148,7 @@ To contribute a new metadata type, please see the [Contributing Metadata Types t
 | CustomApplication                      | ✅      |                                                  |
 | CustomApplicationComponent             | ✅      |                                                  |
 | CustomFeedFilter                       | ✅      |                                                  |
-| CustomField                            | ❌      | Not supported, but support could be added        |
+| CustomField                            | ✅      |                                                  |
 | CustomHelpMenuSection                  | ✅      |                                                  |
 | CustomIndex                            | ✅      |                                                  |
 | CustomLabels                           | ✅      |                                                  |
@@ -167,6 +167,7 @@ To contribute a new metadata type, please see the [Contributing Metadata Types t
 | DashboardFolder                        | ✅      |                                                  |
 | DataCalcInsightTemplate                | ✅      |                                                  |
 | DataCategoryGroup                      | ✅      |                                                  |
+| DataConnectionParamTmpl                | ❌      | Not supported, but support could be added        |
 | DataConnectorIngestApi                 | ✅      |                                                  |
 | DataConnectorS3                        | ✅      |                                                  |
 | DataDotComSettings                     | ✅      |                                                  |
@@ -393,6 +394,8 @@ To contribute a new metadata type, please see the [Contributing Metadata Types t
 | MilestoneType                          | ✅      |                                                  |
 | MktCalcInsightObjectDef                | ✅      |                                                  |
 | MktDataConnection                      | ✅      |                                                  |
+| MktDataConnectionCred                  | ❌      | Not supported, but support could be added        |
+| MktDataConnectionParam                 | ❌      | Not supported, but support could be added        |
 | MktDataConnectionSrcParam              | ✅      |                                                  |
 | MktDataTranObject                      | ✅      |                                                  |
 | MlDomain                               | ✅      |                                                  |
@@ -665,7 +668,6 @@ v62 introduces the following new types. Here's their current level of support
 - CustomDataType
 - CustomExperience
 - CustomLabel
-- Custod
 - CustomFieldTranslation
 - DataPipeline
 - DynamicTrigger

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/source-deploy-retrieve",
-  "version": "12.4.0",
+  "version": "12.4.1",
   "description": "JavaScript library to run Salesforce metadata deploys and retrieves",
   "main": "lib/src/index.js",
   "author": "Salesforce",
@@ -32,23 +32,23 @@
     "fast-xml-parser": "^4.4.1",
     "got": "^11.8.6",
     "graceful-fs": "^4.2.11",
-    "ignore": "^5.3.1",
+    "ignore": "^5.3.2",
     "jszip": "^3.10.1",
     "mime": "2.6.0",
     "minimatch": "^9.0.5",
     "proxy-agent": "^6.4.0"
   },
   "devDependencies": {
     "@jsforce/jsforce-node": "^3.4.1",
-    "@salesforce/cli-plugins-testkit": "^5.3.25",
+    "@salesforce/cli-plugins-testkit": "^5.3.26",
     "@salesforce/dev-scripts": "^10.2.9",
     "@types/deep-equal-in-any-order": "^1.0.1",
     "@types/fast-levenshtein": "^0.0.4",
     "@types/graceful-fs": "^4.1.9",
     "@types/mime": "2.0.3",
     "@types/minimatch": "^5.1.2",
     "deep-equal-in-any-order": "^1.1.19",
-    "eslint-plugin-sf-plugin": "^1.20.4",
+    "eslint-plugin-sf-plugin": "^1.20.5",
     "mocha-junit-reporter": "^1.23.3",
     "mocha-snap": "^5.0.0",
     "ts-node": "^10.9.2",

yarn.lock

@@ -507,12 +507,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.25":
-  version "5.3.25"
-  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.25.tgz#a3e081d1e8bce8660d602fdf04851986c89f18a1"
-  integrity sha512-wwFnd7EuEVxc7IRCvOtJO65iEbjYWrIHUdkxf7bZkgrS9ZfjFNDyua/XthT+gWpVfIZiHxEjqYBdHzMNWZQkbg==
+"@salesforce/cli-plugins-testkit@^5.3.26":
+  version "5.3.26"
+  resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.3.26.tgz#11f4946b24749a7f32125688ed43ae9dbc248e60"
+  integrity sha512-5+Cx0Gbx5v+uvB6TQr+gHIRULOCUhzLtlBRh2UZQoWlUihlOvTYIOXqWQP50qm92KlV0iv3LJ25zJQDFnvAIzQ==
   dependencies:
-    "@salesforce/core" "^8.3.0"
+    "@salesforce/core" "^8.4.0"
     "@salesforce/kit" "^3.2.1"
     "@salesforce/ts-types" "^2.0.11"
     "@types/shelljs" "^0.8.15"
@@ -523,7 +523,7 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.1"
 
-"@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0":
+"@salesforce/core@^8.4.0":
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93"
   integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g==
@@ -2171,12 +2171,12 @@ eslint-plugin-jsdoc@^46.10.1:
     semver "^7.5.4"
     spdx-expression-parse "^4.0.0"
 
-eslint-plugin-sf-plugin@^1.20.4:
-  version "1.20.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.4.tgz#9d99f76cd316939222231f74bb65fc76ddd7fee4"
-  integrity sha512-lpuF4XGVenrQotd0cUZhgZ4rLDubytWPJBzmMCIovZdqyGYzgD68MGofDSLFzmbhKfa2fX1Pndljru6/GjVyGQ==
+eslint-plugin-sf-plugin@^1.20.5:
+  version "1.20.5"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.20.5.tgz#167657e6dd319e5e5bcc8a733668fff8e7a8089a"
+  integrity sha512-V8Y18rFPvVEIhWnXyQrgmdNKGFYRmDPY32lTN2vu0FCY9RkIF9ARDUAmGc5Zpz3J/faDNRtVQVra5dAJyqrMTA==
   dependencies:
-    "@salesforce/core" "^8.3.0"
+    "@salesforce/core" "^8.4.0"
     "@typescript-eslint/utils" "^7.18.0"
 
 eslint-plugin-unicorn@^50.0.1:
@@ -2957,10 +2957,10 @@ ieee754@^1.2.1:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0, ignore@^5.3.1:
-  version "5.3.1"
-  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.1.tgz#5073e554cd42c5b33b394375f538b8593e34d4ef"
-  integrity sha512-5Fytz/IraMjqpwfd34ke28PTVMjZjJG2MPn5t7OE4eUCUNf8BAa7b5WUS9/Qvr6mwOQS7Mk6vdsMno5he+T8Xw==
+ignore@^5.2.0, ignore@^5.2.4, ignore@^5.3.0, ignore@^5.3.2:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.3.2.tgz#3cd40e729f3643fd87cb04e50bf0eb722bc596f5"
+  integrity sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==
 
 immediate@~3.0.5:
   version "3.0.6"