Skip to content

Commit 75ddfc6

Browse files
committed
Merge branch 'sm/convert-source-behavior-confirmation' of https://github.com/salesforcecli/plugin-deploy-retrieve into sm/convert-source-behavior-confirmation
2 parents eed10b1 + 45614e4 commit 75ddfc6

File tree

2 files changed

+41
-19
lines changed

2 files changed

+41
-19
lines changed

package.json

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,11 @@
1111
"@salesforce/kit": "^3.2.1",
1212
"@salesforce/plugin-info": "^3.3.24",
1313
"@salesforce/sf-plugins-core": "^11.3.2",
14-
"@salesforce/source-deploy-retrieve": "^12.3.0-qa.1",
15-
"@salesforce/source-tracking": "^7.1.6-qa.0",
14+
"@salesforce/source-deploy-retrieve": "^12.4.0",
15+
"@salesforce/source-tracking": "^7.1.6",
1616
"@salesforce/ts-types": "^2.0.12",
1717
"ansis": "^3.3.2"
1818
},
19-
"resolutions": {
20-
"@salesforce/source-deploy-retrieve": "^12.3.0-qa.1"
21-
},
2219
"devDependencies": {
2320
"@oclif/plugin-command-snapshot": "^5.2.10",
2421
"@salesforce/cli-plugins-testkit": "^5.3.23",

yarn.lock

Lines changed: 39 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1589,7 +1589,7 @@
15891589
strip-ansi "6.0.1"
15901590
ts-retry-promise "^0.8.1"
15911591

1592-
"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0":
1592+
"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0":
15931593
version "8.4.0"
15941594
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93"
15951595
integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g==
@@ -1717,10 +1717,10 @@
17171717
string-width "^7.2.0"
17181718
terminal-link "^3.0.0"
17191719

1720-
"@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1":
1721-
version "12.3.0-qa.1"
1722-
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231"
1723-
integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg==
1720+
"@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.4.0":
1721+
version "12.4.0"
1722+
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.4.0.tgz#7e5a72b1d7b559eaa7f6f333ee212380b6316542"
1723+
integrity sha512-gvTEjLPbNRt62GEKvejt/f1TtG6Zx8JPd/5BYjnXyEJu8BeOy5kL4zJm9GD3ZiTzBnPGHLzfVL09JjWfNBbo0A==
17241724
dependencies:
17251725
"@salesforce/core" "^8.4.0"
17261726
"@salesforce/kit" "^3.2.1"
@@ -1751,15 +1751,15 @@
17511751
shelljs "^0.8.4"
17521752
sinon "^10.0.0"
17531753

1754-
"@salesforce/source-tracking@^7.1.6-qa.0":
1755-
version "7.1.6-qa.0"
1756-
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6-qa.0.tgz#8590d3f3dfd94576d2e30f5d7f7c52229db98afa"
1757-
integrity sha512-BFLuaHYl3u/Fl1rzmw2ZlgPt1JF4U7T/Pd+DeH9kQ7dlIIf9cchN9ZgvAZFVVk4hYp0NLBBFz2pNElF0W+lRVw==
1754+
"@salesforce/source-tracking@^7.1.6":
1755+
version "7.1.6"
1756+
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-7.1.6.tgz#88fd5defd48521af4531ec4b1e13f699178cbf0f"
1757+
integrity sha512-WGGl95p0h5Ai26Fqg7C9DjYZCXJXjGQ4ZWnMyiBPZy1ZiBAIbz0nlvGX1t2+4n3aBNSuZ5dNv0b/c3MCegsEnw==
17581758
dependencies:
17591759
"@oclif/core" "^4.0.17"
1760-
"@salesforce/core" "^8.3.0"
1760+
"@salesforce/core" "^8.4.0"
17611761
"@salesforce/kit" "^3.2.1"
1762-
"@salesforce/source-deploy-retrieve" "^12.3.0-qa.1"
1762+
"@salesforce/source-deploy-retrieve" "^12.4.0"
17631763
"@salesforce/ts-types" "^2.0.12"
17641764
fast-xml-parser "^4.4.1"
17651765
graceful-fs "^4.2.11"
@@ -7520,7 +7520,16 @@ [email protected]:
75207520
dependencies:
75217521
escodegen "^1.8.1"
75227522

7523-
"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
7523+
"string-width-cjs@npm:string-width@^4.2.0":
7524+
version "4.2.3"
7525+
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
7526+
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
7527+
dependencies:
7528+
emoji-regex "^8.0.0"
7529+
is-fullwidth-code-point "^3.0.0"
7530+
strip-ansi "^6.0.1"
7531+
7532+
string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3:
75247533
version "4.2.3"
75257534
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
75267535
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
@@ -7589,7 +7598,14 @@ string_decoder@~1.1.1:
75897598
dependencies:
75907599
safe-buffer "~5.1.0"
75917600

7592-
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", [email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
7601+
"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
7602+
version "6.0.1"
7603+
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
7604+
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
7605+
dependencies:
7606+
ansi-regex "^5.0.1"
7607+
7608+
[email protected], strip-ansi@^6.0.0, strip-ansi@^6.0.1:
75937609
version "6.0.1"
75947610
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
75957611
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
@@ -8166,7 +8182,7 @@ workerpool@^6.5.1:
81668182
resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544"
81678183
integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA==
81688184

8169-
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0:
8185+
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
81708186
version "7.0.0"
81718187
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
81728188
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
@@ -8184,6 +8200,15 @@ wrap-ansi@^6.2.0:
81848200
string-width "^4.1.0"
81858201
strip-ansi "^6.0.0"
81868202

8203+
wrap-ansi@^7.0.0:
8204+
version "7.0.0"
8205+
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
8206+
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
8207+
dependencies:
8208+
ansi-styles "^4.0.0"
8209+
string-width "^4.1.0"
8210+
strip-ansi "^6.0.0"
8211+
81878212
wrap-ansi@^8.1.0:
81888213
version "8.1.0"
81898214
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"

0 commit comments

Comments
 (0)