Merge branch 'main' into mdonnalley/prompt-single-matches

package.json

@@ -1,7 +1,7 @@
 {
   "name": "@salesforce/cli",
   "description": "The Salesforce CLI",
-  "version": "2.11.7",
+  "version": "2.12.0",
   "author": "Salesforce",
   "bin": {
     "sf": "./bin/run",
@@ -136,7 +136,7 @@
     "@salesforce/plugin-apex": "2.3.15",
     "@salesforce/plugin-auth": "2.8.17",
     "@salesforce/plugin-data": "2.5.12",
-    "@salesforce/plugin-deploy-retrieve": "1.18.1",
+    "@salesforce/plugin-deploy-retrieve": "1.18.2",
     "@salesforce/plugin-info": "2.6.45",
     "@salesforce/plugin-limits": "2.3.35",
     "@salesforce/plugin-login": "1.2.31",
@@ -188,7 +188,7 @@
   "resolutions": {
     "@salesforce/schemas": "1.6.0",
     "@salesforce/templates": "59.0.1",
-    "@salesforce/source-deploy-retrieve": "9.7.17",
+    "@salesforce/source-deploy-retrieve": "9.7.18",
     "@salesforce/source-tracking": "4.2.14"
   },
   "repository": "salesforcecli/cli",

yarn.lock

@@ -1819,10 +1819,10 @@
     jsforce "^2.0.0-beta.27"
     tslib "^2"
 
-"@salesforce/[email protected].1":
-  version "1.18.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.18.1.tgz#bc9a91a5ff77cd81efc9c5cd478be48da17d1758"
-  integrity sha512-hnRWubS4Z91Hq7WICylaB6siDcOW8iQVAhuHWip5Glg83PmX+ERATeQyYmy6YfqJQx9JJ0Lhz1xEiEvPNJUssw==
+"@salesforce/[email protected].2":
+  version "1.18.2"
+  resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-1.18.2.tgz#6e5a2ca544c290278e17047e89b07eaf10e5b69e"
+  integrity sha512-uL5JHe+hmegb/aZhyxGyl/utno74fUDwsUy6WZGAutRpsv35+k57gvz5GkByCjaV1ROlSBy38YQkfWqYCdFSZA==
   dependencies:
     "@oclif/core" "^2.15.0"
     "@salesforce/apex-node" "^2.1.0"
@@ -2064,10 +2064,10 @@
     chalk "^4"
     inquirer "^8.2.5"
 
-"@salesforce/[email protected].17", "@salesforce/source-deploy-retrieve@^9.7.13", "@salesforce/source-deploy-retrieve@^9.7.15", "@salesforce/source-deploy-retrieve@^9.7.4":
-  version "9.7.17"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.17.tgz#a418e9b3fe60e7c67b4c5827a73c83be269ba377"
-  integrity sha512-lRCzPUYiSSvkSO2pbs/bDQIADXRZM5GZvz/gC12ZUWv3BfVnMUfZQ4VMlQOkPlUR5wPzMQqfjP4iy9Hfi+z23Q==
+"@salesforce/[email protected].18", "@salesforce/source-deploy-retrieve@^9.7.13", "@salesforce/source-deploy-retrieve@^9.7.15", "@salesforce/source-deploy-retrieve@^9.7.4":
+  version "9.7.18"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.7.18.tgz#38b1577eec7ae08c3ed627c7a38f59c87632b01d"
+  integrity sha512-kdnX8P/cjUwgKnDF60kXlvm4zwP2xXpFqEB3KniSrvuvbzXKrPbaa05cJvHVnTohAcYTNPHiM+LNkTgZuENNmA==
   dependencies:
     "@salesforce/core" "^5.2.10"
     "@salesforce/kit" "^3.0.11"
@@ -5628,9 +5628,9 @@ get-caller-file@^2.0.1, get-caller-file@^2.0.5:
   integrity sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==
 
 get-func-name@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.0.tgz#ead774abee72e20409433a066366023dd6887a41"
-  integrity sha512-Hm0ixYtaSZ/V7C8FJrtZIuBBI+iSgL+1Aq82zSu8VQNB4S3Gk8e7Qs3VwBDJAhmRZcFqkl3tQu36g/Foh5I5ig==
+  version "2.0.2"
+  resolved "https://registry.yarnpkg.com/get-func-name/-/get-func-name-2.0.2.tgz#0d7cf20cd13fda808669ffa88f4ffc7a3943fc41"
+  integrity sha512-8vXOvuE167CtIc3OyItco7N/dpRtBbYOsPsXCz7X/PMnlGjYjSGuZJgM1Y7mmew7BKf9BqvLX2tnOVy1BBUsxQ==
 
 get-intrinsic@^1.0.2, get-intrinsic@^1.1.1, get-intrinsic@^1.1.3, get-intrinsic@^1.2.0, get-intrinsic@^1.2.1:
   version "1.2.1"