Skip to content

Commit 6ed06a1

Browse files
committed
Merge remote-tracking branch 'origin/main' into cd/logging
2 parents ecf0d7e + 938b5b3 commit 6ed06a1

5 files changed

Lines changed: 67 additions & 19 deletions

File tree

CHANGELOG.md

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
## [3.22.37](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.36...3.22.37) (2025-07-30)
2+
3+
### Bug Fixes
4+
5+
- add new deploy status ([9c364cf](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/9c364cf675dfcbb11243b968567f3a52a98e57a3))
6+
7+
## [3.22.36](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.35...3.22.36) (2025-07-29)
8+
9+
### Bug Fixes
10+
11+
- bump SDR ([#1415](https://github.com/salesforcecli/plugin-deploy-retrieve/issues/1415)) ([65ed901](https://github.com/salesforcecli/plugin-deploy-retrieve/commit/65ed901038ef0bb51959be84f5ac8cbeaa2f9435))
12+
113
## [3.22.35](https://github.com/salesforcecli/plugin-deploy-retrieve/compare/3.22.34...3.22.35) (2025-07-26)
214

315
### Bug Fixes

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -141,7 +141,7 @@ FLAG DESCRIPTIONS
141141
If you specify this flag, don’t specify --metadata or --source-dir.
142142
```
143143

144-
_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)_
144+
_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)_
145145

146146
## `sf project convert source`
147147

messages/metadata.transfer.md

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,3 +29,7 @@ Canceling
2929
# Finalizing
3030

3131
Finalizing
32+
33+
# FinalizingFailed
34+
35+
Finalizing Failed

package.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@salesforce/plugin-deploy-retrieve",
33
"description": "deploy and retrieve commands for sf",
4-
"version": "3.22.34-dev.1",
4+
"version": "3.22.37",
55
"author": "Salesforce",
66
"bugs": "https://github.com/forcedotcom/cli/issues",
77
"resolutions": {
@@ -17,7 +17,7 @@
1717
"@salesforce/kit": "^3.2.3",
1818
"@salesforce/plugin-info": "^3.4.67",
1919
"@salesforce/sf-plugins-core": "^12.2.2",
20-
"@salesforce/source-deploy-retrieve": "^12.21.7-dev.0",
20+
"@salesforce/source-deploy-retrieve": "^12.22.0",
2121
"@salesforce/source-tracking": "^7.4.1",
2222
"@salesforce/ts-types": "^2.0.12",
2323
"ansis": "^3.17.0",
@@ -29,7 +29,7 @@
2929
"@salesforce/dev-scripts": "^11.0.2",
3030
"@salesforce/plugin-command-reference": "^3.1.60",
3131
"@salesforce/schemas": "^1.9.0",
32-
"@salesforce/source-testkit": "^2.2.129",
32+
"@salesforce/source-testkit": "^2.2.143",
3333
"@salesforce/ts-sinon": "^1.4.30",
3434
"cross-env": "^7.0.3",
3535
"eslint-plugin-sf-plugin": "^1.20.25",

yarn.lock

Lines changed: 47 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1534,7 +1534,39 @@
15341534
"@jridgewell/resolve-uri" "^3.1.0"
15351535
"@jridgewell/sourcemap-codec" "^1.4.14"
15361536

1537-
"@jsforce/jsforce-node@^3.9.1", "@jsforce/jsforce-node@^3.9.5":
1537+
"@jsforce/jsforce-node@^3.10.0":
1538+
version "3.10.0"
1539+
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.10.0.tgz#1bf75e9d322434f99fc38a3b60738205051144c5"
1540+
integrity sha512-hNExEqzvJ/ixnsfZlrYh/FqEOYfn4vKmeBMqIdrEjeYciIsSaOeggghFl+1w0m2u7TNGr1+8jPUBvki3nebPSw==
1541+
dependencies:
1542+
"@sindresorhus/is" "^4"
1543+
base64url "^3.0.1"
1544+
csv-parse "^5.5.2"
1545+
csv-stringify "^6.4.4"
1546+
faye "^1.4.0"
1547+
form-data "^4.0.4"
1548+
https-proxy-agent "^5.0.0"
1549+
multistream "^3.1.0"
1550+
node-fetch "^2.6.1"
1551+
xml2js "^0.6.2"
1552+
1553+
"@jsforce/jsforce-node@^3.9.1":
1554+
version "3.9.1"
1555+
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.1.tgz#503bcee3b511b2768abb090b8c8af508c2412244"
1556+
integrity sha512-tHG9Wozb9tQMiOyKz4MgcSK0XEDdER+dUm42o7qUaokwqC+IPmjgptx0PNTO75U1nqgW6yX6M5Qq1thhj7KMCA==
1557+
dependencies:
1558+
"@sindresorhus/is" "^4"
1559+
base64url "^3.0.1"
1560+
csv-parse "^5.5.2"
1561+
csv-stringify "^6.4.4"
1562+
faye "^1.4.0"
1563+
form-data "^4.0.0"
1564+
https-proxy-agent "^5.0.0"
1565+
multistream "^3.1.0"
1566+
node-fetch "^2.6.1"
1567+
xml2js "^0.6.2"
1568+
1569+
"@jsforce/jsforce-node@^3.9.5":
15381570
version "3.9.5"
15391571
resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.9.5.tgz#0ab30a36c87724619c515190317750e627358e03"
15401572
integrity sha512-JjUdwFwRSzTJ/qb3Q1tTyEHI96vrm1Q/qB1+4qRA+wDw2lt9sZVQPWDcIA4Ughsd4LSLqmRLXZgc24tpOmETSA==
@@ -1729,20 +1761,20 @@
17291761
strip-ansi "6.0.1"
17301762
ts-retry-promise "^0.8.1"
17311763

1732-
"@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":
1733-
version "8.18.1"
1734-
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.1.tgz#4a790f9479339f45e42799d9ef7a1428d49b6ba1"
1735-
integrity sha512-RkG9Ye5TdsIQz4KLUHvDpVjbrTeeRmw5KUJIHRyMGAOjKB8wr2jvgXyZm7GD0epIW5ILsyKQQWWOa1uqsfVycA==
1764+
"@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":
1765+
version "8.18.6"
1766+
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.18.6.tgz#c6f406be4fa127fe29e65aa59120f60135e92bd0"
1767+
integrity sha512-FogwH8DlwJ7cWsTGgQgr+ny1PJMLrwYtPdwR11ACkVjn9u1Qqn/RxYvzMrimbNZuiZJs6qrLNaye8tau+g3Y4Q==
17361768
dependencies:
1737-
"@jsforce/jsforce-node" "^3.9.1"
1769+
"@jsforce/jsforce-node" "^3.10.0"
17381770
"@salesforce/kit" "^3.2.2"
17391771
"@salesforce/schemas" "^1.9.0"
17401772
"@salesforce/ts-types" "^2.0.10"
17411773
ajv "^8.17.1"
17421774
change-case "^4.1.2"
17431775
fast-levenshtein "^3.0.0"
17441776
faye "^1.4.0"
1745-
form-data "^4.0.0"
1777+
form-data "^4.0.4"
17461778
js2xmlparser "^4.0.1"
17471779
jsonwebtoken "9.0.2"
17481780
jszip "3.10.1"
@@ -1873,7 +1905,7 @@
18731905
cli-progress "^3.12.0"
18741906
terminal-link "^3.0.0"
18751907

1876-
"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.0", "@salesforce/source-deploy-retrieve@^12.21.7-dev.0":
1908+
"@salesforce/source-deploy-retrieve@^12.20.1", "@salesforce/source-deploy-retrieve@^12.21.7-dev.0", "@salesforce/source-deploy-retrieve@^12.22.0":
18771909
version "12.21.7-dev.0"
18781910
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.21.7-dev.0.tgz#d139624d697387bd635d38055e0c38b897745246"
18791911
integrity sha512-IpuyZO6lkz3fWuWFkefaFnOPHBOxYIze0AoHlwbuq2VchFQqyts64X6EwvDya+Rc1KRQ9dkWOZg55IxnMBT3mw==
@@ -1894,15 +1926,15 @@
18941926
proxy-agent "^6.4.0"
18951927
yaml "^2.7.1"
18961928

1897-
"@salesforce/source-testkit@^2.2.129":
1898-
version "2.2.137"
1899-
resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.2.137.tgz#e272a0eb4cee4a7ecd2b69a4dd9284450ad7c042"
1900-
integrity sha512-xVONOr/itdbznIJTlXkxh2Mh7MmWjRm4Ak10k3bmCkm7Ad0KTR/SbHywJU3/j/d/1Ho1HY/UyAI8QO843CEpLg==
1929+
"@salesforce/source-testkit@^2.2.143":
1930+
version "2.2.143"
1931+
resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.2.143.tgz#def2b8247ca0d861446f7d4de526d8df371d7629"
1932+
integrity sha512-7nkL58Gb4FkCh2Ctsj7MF/Rt2Lt80ZslDpbOja0jHuaAL4zLPxmkRJlGRJiEnR8utlQJ/LsSPZIx9ELrsxPjTw==
19011933
dependencies:
19021934
"@salesforce/cli-plugins-testkit" "^5.3.39"
1903-
"@salesforce/core" "^8.17.0"
1935+
"@salesforce/core" "^8.18.5"
19041936
"@salesforce/kit" "^3.2.3"
1905-
"@salesforce/source-deploy-retrieve" "^12.21.0"
1937+
"@salesforce/source-deploy-retrieve" "^12.22.0"
19061938
"@salesforce/ts-types" "^2.0.12"
19071939
chai "^4.5.0"
19081940
debug "^4.4.1"
@@ -4927,7 +4959,7 @@ form-data-encoder@^2.1.2:
49274959
resolved "https://registry.yarnpkg.com/form-data-encoder/-/form-data-encoder-2.1.4.tgz#261ea35d2a70d48d30ec7a9603130fa5515e9cd5"
49284960
integrity sha512-yDYSgNMraqvnxiEXO4hi88+YZxaHC6QKzb5N84iRCTDeRO7ZALpir/lVmf/uXUhnwUr2O4HU8s/n6x+yNjQkHw==
49294961

4930-
form-data@^4.0.0, form-data@^4.0.4:
4962+
form-data@^4.0.4:
49314963
version "4.0.4"
49324964
resolved "https://registry.yarnpkg.com/form-data/-/form-data-4.0.4.tgz#784cdcce0669a9d68e94d11ac4eea98088edd2c4"
49334965
integrity sha512-KrGhL9Q4zjj0kiUt5OO4Mr/A/jlI2jDYs5eHBpYHPcBEVSiipAvn2Ko2HnPe20rmcuuvMHNdZFp+4IlGTMF0Ow==

0 commit comments

Comments
 (0)