From 6e282a435b630a1ad8df995a2b1f82c90e148e8a Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Tue, 19 Mar 2024 13:44:17 -0600
Subject: [PATCH 1/2] fix: bump sdr to 10.5.3

---
 package.json |  2 +-
 yarn.lock    | 19 +++++++++++++++++++
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 7f4e9235..c572b747 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,7 @@
     "@salesforce/kit": "^3.0.15",
     "@salesforce/plugin-info": "^3.0.28",
     "@salesforce/sf-plugins-core": "^7.1.15",
-    "@salesforce/source-deploy-retrieve": "^10.5.1",
+    "@salesforce/source-deploy-retrieve": "^10.5.3",
     "@salesforce/source-tracking": "^5.1.14",
     "@salesforce/ts-types": "^2.0.9",
     "chalk": "^5.3.0"
diff --git a/yarn.lock b/yarn.lock
index ac2e787e..913587e8 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2265,6 +2265,25 @@
     proxy-agent "^6.4.0"
     ts-retry-promise "^0.7.1"
 
+"@salesforce/source-deploy-retrieve@^10.5.3":
+  version "10.5.3"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.5.3.tgz#c994a5522ce187bfc59bbdb76edfb550453a8025"
+  integrity sha512-gw28Co2twQ6GSIF94DdWxx6htBLWKIsMhaKlydfymoAp3kZrFmALRPh8Dj8RDQWV8wrSmzWqDFX9iGoldHZDbg==
+  dependencies:
+    "@salesforce/core" "^6.7.0"
+    "@salesforce/kit" "^3.0.15"
+    "@salesforce/ts-types" "^2.0.9"
+    fast-levenshtein "^3.0.0"
+    fast-xml-parser "^4.3.5"
+    got "^11.8.6"
+    graceful-fs "^4.2.11"
+    ignore "^5.3.1"
+    jszip "^3.10.1"
+    mime "2.6.0"
+    minimatch "^5.1.6"
+    proxy-agent "^6.4.0"
+    ts-retry-promise "^0.7.1"
+
 "@salesforce/source-testkit@^2.1.103":
   version "2.1.103"
   resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.103.tgz#7b035514e7930ce05e0946d14cb4e9008cf5813c"

From 7192d61bef6ec8728664f25395e7eb863e235fa2 Mon Sep 17 00:00:00 2001
From: Steve Hetzel <shetzel@salesforce.com>
Date: Tue, 19 Mar 2024 15:21:45 -0600
Subject: [PATCH 2/2] fix: bump stl to 5.1.18

---
 package.json |  2 +-
 yarn.lock    | 51 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 51 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index c572b747..6565cd8c 100644
--- a/package.json
+++ b/package.json
@@ -12,7 +12,7 @@
     "@salesforce/plugin-info": "^3.0.28",
     "@salesforce/sf-plugins-core": "^7.1.15",
     "@salesforce/source-deploy-retrieve": "^10.5.3",
-    "@salesforce/source-tracking": "^5.1.14",
+    "@salesforce/source-tracking": "^5.1.18",
     "@salesforce/ts-types": "^2.0.9",
     "chalk": "^5.3.0"
   },
diff --git a/yarn.lock b/yarn.lock
index 913587e8..47a0d334 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1899,6 +1899,40 @@
     wordwrap "^1.0.0"
     wrap-ansi "^7.0.0"
 
+"@oclif/core@^3.25.2":
+  version "3.25.3"
+  resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.25.3.tgz#dac0e604c33267f879d3233cd4d0730146db4793"
+  integrity sha512-2TLZmqnDZos9h73KbrdKqvUQEXIPpUfEzgIfqdQRZwszfk1RtiHAb/7ihtnJICnRRVXlD4XLDmUlY4cFJ0ka4g==
+  dependencies:
+    "@types/cli-progress" "^3.11.5"
+    ansi-escapes "^4.3.2"
+    ansi-styles "^4.3.0"
+    cardinal "^2.1.1"
+    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"
+    globby "^11.1.0"
+    hyperlinker "^1.0.0"
+    indent-string "^4.0.0"
+    is-wsl "^2.2.0"
+    js-yaml "^3.14.1"
+    minimatch "^9.0.3"
+    natural-orderby "^2.0.3"
+    object-treeify "^1.1.33"
+    password-prompt "^1.1.3"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    supports-color "^8.1.1"
+    supports-hyperlinks "^2.2.0"
+    widest-line "^3.1.0"
+    wordwrap "^1.0.0"
+    wrap-ansi "^7.0.0"
+
 "@oclif/plugin-command-snapshot@^5.1.1":
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.1.1.tgz#13918a98686d7508ddca192154e2b33ae042706f"
@@ -2300,7 +2334,7 @@
     shelljs "^0.8.4"
     sinon "^10.0.0"
 
-"@salesforce/source-tracking@^5.0.0", "@salesforce/source-tracking@^5.1.14":
+"@salesforce/source-tracking@^5.0.0":
   version "5.1.14"
   resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.14.tgz#ae2c02d687099e68508e327545f3b123a71dced2"
   integrity sha512-wrxFM5Wz4GekH4R+eAd+h780K4qNIU7/77Frua5HDHvORcj07zGR8prJ2zG2/bbYwaclojexH9zHi0RHe2LMoA==
@@ -2315,6 +2349,21 @@
     isomorphic-git "1.23.0"
     ts-retry-promise "^0.8.0"
 
+"@salesforce/source-tracking@^5.1.18":
+  version "5.1.18"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.18.tgz#aea622c04ac199b2288b3a94c6b8e8f207c438f7"
+  integrity sha512-V8itdxwfP72Kq26psNdxi3JI3tQRdxzViKUQM5w33B6vahWJS3P3nBOzIFJGu+J9/SMDUHRpPYTwUL84yXdoyA==
+  dependencies:
+    "@oclif/core" "^3.25.2"
+    "@salesforce/core" "^6.7.1"
+    "@salesforce/kit" "^3.0.15"
+    "@salesforce/source-deploy-retrieve" "^10.5.3"
+    "@salesforce/ts-types" "^2.0.9"
+    fast-xml-parser "^4.2.5"
+    graceful-fs "^4.2.11"
+    isomorphic-git "1.23.0"
+    ts-retry-promise "^0.8.0"
+
 "@salesforce/ts-sinon@^1.4.19":
   version "1.4.19"
   resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.19.tgz#64157b6c8cf4a3c637867e2ddd90c2d058c334f7"