From 95eef1c6855ca96649dcb06e77580459b8bd10ef Mon Sep 17 00:00:00 2001 From: Willie Ruemmele Date: Mon, 17 Jun 2024 15:11:35 -0600 Subject: [PATCH 1/3] docs: update error message to provide alternative scenario --- messages/subscriber_package_version.md | 2 +- test/package/subscriberPackageVersion.test.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/messages/subscriber_package_version.md b/messages/subscriber_package_version.md index 45dc6e536..c95663ac0 100644 --- a/messages/subscriber_package_version.md +++ b/messages/subscriber_package_version.md @@ -1,6 +1,6 @@ # errorInvalidIdNoRecordFound -The subscriber package version %s is invalid, no subscriber package version record found. +The subscriber package version %s is either invalid or not yet available on your instance of salesforce.com. First double-check the ID to ensure it's correct. If it is, check back after a while and retry the package install. # errorInvalidAliasOrId diff --git a/test/package/subscriberPackageVersion.test.ts b/test/package/subscriberPackageVersion.test.ts index 192223862..1a7ae5908 100644 --- a/test/package/subscriberPackageVersion.test.ts +++ b/test/package/subscriberPackageVersion.test.ts @@ -156,7 +156,7 @@ describe('subscriberPackageVersion', () => { } catch (e) { const error = e as Error; expect(error.message).to.match( - /The subscriber package version 04txxxxxxxxxxxxxxy is invalid, no subscriber package version record found/, + /The subscriber package version 04txxxxxxxxxxxxxxy is either invalid or not yet available on your instance of salesforce.com. {2}First double-check the ID to ensure it's correct. {2}If it is, check back after a while and retry the package install./, error.message ); expect(queryStub.called).to.be.true; From e988f0543a38ee8ced82b76dca924c3e0ab0480f Mon Sep 17 00:00:00 2001 From: Cristian Dominguez <6853656+cristiand391@users.noreply.github.com> Date: Wed, 19 Jun 2024 19:40:27 -0300 Subject: [PATCH 2/3] test: fix UT (#602) * test: fix UT * chore: bump sfdx-core * chore: dedupe sfdx-core --- package.json | 4 +- test/package/subscriberPackageVersion.test.ts | 2 +- yarn.lock | 72 ++++++------------- 3 files changed, 25 insertions(+), 53 deletions(-) diff --git a/package.json b/package.json index 5029b5bb5..a09f48579 100644 --- a/package.json +++ b/package.json @@ -42,10 +42,10 @@ ], "dependencies": { "@jsforce/jsforce-node": "^3.2.0", - "@salesforce/core": "^7.4.0", + "@salesforce/core": "^7.4.1", "@salesforce/kit": "^3.1.2", "@salesforce/schemas": "^1.9.0", - "@salesforce/source-deploy-retrieve": "^11.6.5", + "@salesforce/source-deploy-retrieve": "^11.6.9", "@salesforce/ts-types": "^2.0.9", "@salesforce/types": "^1.1.0", "fast-xml-parser": "^4.4.0", diff --git a/test/package/subscriberPackageVersion.test.ts b/test/package/subscriberPackageVersion.test.ts index 1a7ae5908..60ba436e6 100644 --- a/test/package/subscriberPackageVersion.test.ts +++ b/test/package/subscriberPackageVersion.test.ts @@ -156,7 +156,7 @@ describe('subscriberPackageVersion', () => { } catch (e) { const error = e as Error; expect(error.message).to.match( - /The subscriber package version 04txxxxxxxxxxxxxxy is either invalid or not yet available on your instance of salesforce.com. {2}First double-check the ID to ensure it's correct. {2}If it is, check back after a while and retry the package install./, + /The subscriber package version 04txxxxxxxxxxxxxxy is either invalid or not yet available on your instance of salesforce.com. First double-check the ID to ensure it's correct. If it is, check back after a while and retry the package install./, error.message ); expect(queryStub.called).to.be.true; diff --git a/yarn.lock b/yarn.lock index 6bff61f02..1da27cb87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -562,10 +562,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^7.3.9", "@salesforce/core@^7.4.0": - version "7.4.0" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.4.0.tgz#11c45a5f432e032bf242aaace1a175779e3e096f" - integrity sha512-wn3fJnpG8h493qKR52Il3xgRbXg4zwbV34wonf/mTZP3n5rJeC/7S69249CGN155Os6Lds5rEUo3pGJFwgCBdQ== +"@salesforce/core@^7.3.9", "@salesforce/core@^7.4.1": + version "7.4.1" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.4.1.tgz#7c37623f6a89c199bf12cd6dc28d89bc950914ef" + integrity sha512-ccYs7uL4GYjdOcc44trfRnaz69kG0jU0aoT0qjPkIel8oVOyEoXaoDCG0A+2diqmicDp5uWK0pNs+tdWNj2mcQ== dependencies: "@jsforce/jsforce-node" "^3.2.0" "@salesforce/kit" "^3.1.2" @@ -623,13 +623,12 @@ typescript "^5.4.3" wireit "^0.14.4" -"@salesforce/kit@^3.1.1", "@salesforce/kit@^3.1.2": - version "3.1.2" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.1.2.tgz#270741c54c70969df19ef17f8979b4ef1fa664b2" - integrity sha512-si+ddvZDgx9q5czxAANuK5xhz3pv+KGspQy1wyia/7HDPKadA0QZkLTzUnO1Ju4Mux32CNHEb2y9lw9jj+eVTA== +"@salesforce/kit@^3.1.2", "@salesforce/kit@^3.1.6": + version "3.1.6" + resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.1.6.tgz#aefb39c0e0f325e11f80551ff92cf6979dd74070" + integrity sha512-zAYPmCSAvdonDOnL5AzuVRVv0sRMlQd6gi12HDE1964VqSjt5pzlLU90thh3Qq4A1Wxbdu0FbHYx9BvZ4fWPvQ== dependencies: - "@salesforce/ts-types" "^2.0.9" - tslib "^2.6.2" + "@salesforce/ts-types" "^2.0.10" "@salesforce/prettier-config@^0.0.3": version "0.0.3" @@ -641,13 +640,13 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^11.6.5": - version "11.6.5" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.6.5.tgz#5a35edc42b9f0fc32384ce2515cecea6ccf3c459" - integrity sha512-JwYhLOLAkyIBsZXMt9OnDUqI8BJRu6sr5cs6EXfOD4rpIrEqpNN3+m9Gnkoe3onmTBUg4AuxFTuBT8SaBorw2g== +"@salesforce/source-deploy-retrieve@^11.6.9": + version "11.6.9" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.6.9.tgz#2545c42ad71df3969db4db55d9bc8f096a0c6321" + integrity sha512-oHRnVMDwuzlrzqKiH5YMTvMS/YrRv0cd1UqC9qEZUu6PcpskEdDmRsO93kex1J1H+zXol/JrxgZYrB7GASn0Rg== dependencies: - "@salesforce/core" "^7.3.9" - "@salesforce/kit" "^3.1.1" + "@salesforce/core" "^7.4.1" + "@salesforce/kit" "^3.1.6" "@salesforce/ts-types" "^2.0.9" fast-levenshtein "^3.0.0" fast-xml-parser "^4.3.6" @@ -668,12 +667,10 @@ sinon "^5.1.1" tslib "^2.6.1" -"@salesforce/ts-types@^2.0.9": - version "2.0.9" - resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.9.tgz#66bff7b41720065d6b01631b6f6a3ccca02857c5" - integrity sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA== - dependencies: - tslib "^2.6.2" +"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.9": + version "2.0.10" + resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.10.tgz#f2107a52b60be6c3fe712f4d40aafad48c6bebe0" + integrity sha512-ulGQ1oUGXrmSUi6NGbxZZ7ykSDv439x+WYZpkMgFLC8Dx0TxJXfUAJYeZh7eKO5xI/ob3iyvN+RBcBkp4KFN1w== "@salesforce/types@^1.1.0": version "1.1.0" @@ -5075,16 +5072,7 @@ srcset@^5.0.0: resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5143,14 +5131,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -5618,7 +5599,7 @@ workerpool@6.2.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.2.1.tgz#46fc150c17d826b86a008e5a4508656777e9c343" integrity sha512-ILEIE97kDZvF9Wb9f6h5aXK4swSlKGUcOEGiIYb2OOu/IrDU9iwj0fD//SsA6E5ibwJxpEvhullJY4Sl4GcpAw== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -5636,15 +5617,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214" From aa8702f3197882b07f6d4b2c0de975a8456c2c25 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Wed, 19 Jun 2024 19:50:13 -0300 Subject: [PATCH 3/3] fix: yarn autofix merge conflict --- yarn.lock | 21 --------------------- 1 file changed, 21 deletions(-) diff --git a/yarn.lock b/yarn.lock index f2975ea3f..d13ca6f87 100644 --- a/yarn.lock +++ b/yarn.lock @@ -562,17 +562,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -<<<<<<< HEAD -"@salesforce/core@^7.3.9", "@salesforce/core@^7.4.1": - version "7.4.1" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.4.1.tgz#7c37623f6a89c199bf12cd6dc28d89bc950914ef" - integrity sha512-ccYs7uL4GYjdOcc44trfRnaz69kG0jU0aoT0qjPkIel8oVOyEoXaoDCG0A+2diqmicDp5uWK0pNs+tdWNj2mcQ== -======= "@salesforce/core@^7.3.9": version "7.4.0" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.4.0.tgz#11c45a5f432e032bf242aaace1a175779e3e096f" integrity sha512-wn3fJnpG8h493qKR52Il3xgRbXg4zwbV34wonf/mTZP3n5rJeC/7S69249CGN155Os6Lds5rEUo3pGJFwgCBdQ== ->>>>>>> main dependencies: "@jsforce/jsforce-node" "^3.2.0" "@salesforce/kit" "^3.1.2" @@ -661,13 +654,6 @@ dependencies: "@salesforce/ts-types" "^2.0.10" -"@salesforce/kit@^3.1.6": - version "3.1.6" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.1.6.tgz#aefb39c0e0f325e11f80551ff92cf6979dd74070" - integrity sha512-zAYPmCSAvdonDOnL5AzuVRVv0sRMlQd6gi12HDE1964VqSjt5pzlLU90thh3Qq4A1Wxbdu0FbHYx9BvZ4fWPvQ== - dependencies: - "@salesforce/ts-types" "^2.0.10" - "@salesforce/prettier-config@^0.0.3": version "0.0.3" resolved "https://registry.yarnpkg.com/@salesforce/prettier-config/-/prettier-config-0.0.3.tgz#ba648d4886bb38adabe073dbea0b3a91b3753bb0" @@ -705,12 +691,6 @@ sinon "^5.1.1" tslib "^2.6.1" -<<<<<<< HEAD -"@salesforce/ts-types@^2.0.10", "@salesforce/ts-types@^2.0.9": - version "2.0.10" - resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.10.tgz#f2107a52b60be6c3fe712f4d40aafad48c6bebe0" - integrity sha512-ulGQ1oUGXrmSUi6NGbxZZ7ykSDv439x+WYZpkMgFLC8Dx0TxJXfUAJYeZh7eKO5xI/ob3iyvN+RBcBkp4KFN1w== -======= "@salesforce/ts-types@^2.0.10": version "2.0.10" resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-2.0.10.tgz#f2107a52b60be6c3fe712f4d40aafad48c6bebe0" @@ -722,7 +702,6 @@ integrity sha512-boUD9jw5vQpTCPCCmK/NFTWjSuuW+lsaxOynkyNXLW+zxOc4GDjhtKc4j0vWZJQvolpafbyS8ZLFHZJvs12gYA== dependencies: tslib "^2.6.2" ->>>>>>> main "@salesforce/types@^1.1.0": version "1.1.0"