Skip to content

fix: dedup jsforce #385

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
cristiand391 merged 1 commit into from
Oct 25, 2022
Merged

fix: dedup jsforce #385

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,12 +90,12 @@
},
"dependencies": {
"@oclif/core": "^1.13.10",
"@salesforce/command": "^5.2.4",
"@salesforce/core": "^3.30.3",
"@salesforce/command": "^5.2.16",
"@salesforce/core": "^3.31.17",
Copy link
Copy Markdown
Member Author

@cristiand391 cristiand391 Oct 25, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

old core was also specifying jsforce: "beta" so plugin-data was getting another jsforce version. Latest core
allows to dedup. ditto command.

https://github.com/forcedotcom/sfdx-core/blame/4b6f99b44b77989fc525460391b41da62deb62a8/package.json#L51

"@salesforce/ts-types": "^1.5.21",
"@types/fs-extra": "^9.0.13",
"chalk": "^4.1.0",
"jsforce": "beta",
"jsforce": "^2.0.0-beta.19",
"csv-parse": "^4.16.3",
"fs-extra": "^10.0.1",
"csv-stringify": "^6.0.5",
Expand Down Expand Up @@ -140,4 +140,4 @@
"ts-node": "^10.4.0",
"typescript": "^4.4.4"
}
}
}
2 changes: 1 addition & 1 deletion test/commands/force/data/soql/query/dataSoqlQueryCommand.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ describe('Execute a SOQL statement', function (): void {
'soql.txt',
])
.it('should throw an error when both query (inline/file query) flags are specified', (ctx) => {
expect(ctx.stderr).to.include('--soqlqueryfile= cannot also be provided when using --query=');
Copy link
Copy Markdown
Member Author

@cristiand391 cristiand391 Oct 25, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oclif/core change I think (bumped salesforce/command)

expect(ctx.stderr).to.include('--soqlqueryfile cannot also be provided when using --query');
});
});
describe('reporters produce the correct aggregate query', () => {
Expand Down
94 changes: 49 additions & 45 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -743,10 +743,10 @@
is-wsl "^2.1.1"
tslib "^2.3.1"

"@oclif/core@^1.0.8", "@oclif/core@^1.13.10", "@oclif/core@^1.2.1", "@oclif/core@^1.3.4", "@oclif/core@^1.3.6", "@oclif/core@^1.6.4", "@oclif/core@^1.7.0":
version "1.13.10"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.13.10.tgz#d2014cd75efcd8529d78f1eda5ddc2a4d07c860e"
integrity sha512-nwpjXwWscETdvO+/z94V1zd95vnzmCB6VRaobR4BdBllwWU6jHF/eCi1Ud2Tk9RSedChoLneZuDCkKnRCmxyng==
"@oclif/core@^1.0.8", "@oclif/core@^1.13.10", "@oclif/core@^1.19.1", "@oclif/core@^1.2.1", "@oclif/core@^1.3.4", "@oclif/core@^1.3.6", "@oclif/core@^1.6.4":
version "1.19.1"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-1.19.1.tgz#6dba92cfb7f1412e43068db3e9716215786f85a3"
integrity sha512-+LtMYQNzfLoYUcBTsWSFQ/4mqiA70XRU6tP+lDNmQQTrB5FHzDoBbyYvdjvMeS42izg78gjlN++rLUaAUCloNw==
dependencies:
"@oclif/linewrap" "^1.0.0"
"@oclif/screen" "^3.0.2"
Expand Down Expand Up @@ -907,13 +907,13 @@
resolved "https://registry.yarnpkg.com/@oclif/screen/-/screen-3.0.2.tgz#969054308fe98d130c02844a45cc792199b75670"
integrity sha512-S/SF/XYJeevwIgHFmVDAFRUvM3m+OjhvCAYMk78ZJQCYCQ5wS7j+LTt1ZEv2jpEEGg2tx/F6TYYWxddNAYHrFQ==

"@oclif/test@^2.1.0":
version "2.1.1"
resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.1.1.tgz#140ed05ece651cdf427306b5c878826e273a1722"
integrity sha512-vuBDXnXbnU073xNUqj+V4Fbrp+6Xhs1sgeWUIMj69SP9qC3pUBPfEPzIoK00ga6/WxZ+2qUgqCBAOPGz3nmTEg==
"@oclif/test@^2.2.4":
version "2.2.6"
resolved "https://registry.yarnpkg.com/@oclif/test/-/test-2.2.6.tgz#2c98bb1ecab3ddf6b01b51f8a3489c9105353d67"
integrity sha512-rf67rTBkEeulpomdeBYm0D+Q0e1uMqTPUNPhY2/G6guAJhmu3M+78HvSKpLdG7WqpbfQJ68D5Dh5HnauO+MY2g==
dependencies:
"@oclif/core" "^1.6.4"
fancy-test "^2.0.0"
"@oclif/core" "^1.19.1"
fancy-test "^2.0.5"

"@octokit/auth-token@^2.4.4":
version "2.5.0"
Expand Down Expand Up @@ -1042,17 +1042,16 @@
strip-ansi "6.0.1"
ts-retry-promise "^0.6.0"

"@salesforce/command@^5.1.3", "@salesforce/command@^5.2.4":
version "5.2.4"
resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-5.2.4.tgz#bd792e1be780e0ba5f30fa9ae74a8401e69520b5"
integrity sha512-ccqGQWpVbi8XjC4xqx6grUmlbEFN5e3UPYBO+GTwyTvbYTEwryIEWsbhWwdDtosjJFxbAy1Xyi84ZUlYeJ6jpA==
"@salesforce/command@^5.1.3", "@salesforce/command@^5.2.16":
version "5.2.16"
resolved "https://registry.yarnpkg.com/@salesforce/command/-/command-5.2.16.tgz#e9fd778403dfe29ff992d225f0105389e20152cd"
integrity sha512-rYC/URrIae8LjeuMlg+/PrxyWBEYgOTy2aHfTryiL4dEr9F28b2/xgSLh+5RGEblhPo52GXR33bFQU81pkq/BQ==
dependencies:
"@oclif/core" "^1.7.0"
"@oclif/plugin-help" "^5.1.11"
"@oclif/test" "^2.1.0"
"@salesforce/core" "^3.20.1"
"@salesforce/kit" "^1.5.34"
"@salesforce/ts-types" "^1.5.20"
"@oclif/core" "^1.19.1"
"@oclif/test" "^2.2.4"
"@salesforce/core" "^3.31.16"
"@salesforce/kit" "^1.6.1"
"@salesforce/ts-types" "^1.5.21"
chalk "^2.4.2"

"@salesforce/core@^2.24.0":
Expand All @@ -1079,15 +1078,15 @@
semver "^7.3.5"
ts-retry-promise "^0.6.0"

"@salesforce/core@^3.19.5", "@salesforce/core@^3.20.1", "@salesforce/core@^3.30.3":
version "3.30.3"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.30.3.tgz#068c85cd1c6e11e88e4e737dcb828e312006ca0d"
integrity sha512-djB9N5knl/Hkl/JUwvMw8r5MhFrr+Koaxevxd1nR4WN3kyRiKYXZqFrMtekWONNfD3B/5eXndNG3gpgxhXyF8A==
"@salesforce/core@^3.19.5", "@salesforce/core@^3.31.16", "@salesforce/core@^3.31.17":
version "3.31.17"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-3.31.17.tgz#83ab3c9c4730223943ceef4798aaa901fec7981e"
integrity sha512-rn3AYyePp3m1+IH+KVi+DWwMPcAPDYFiUxyJLh+Jr2hNj9i79eQBcUix6wunK3HaVz0N6Tm5FGIpjqfEVsU0cA==
dependencies:
"@salesforce/bunyan" "^2.0.0"
"@salesforce/kit" "^1.5.41"
"@salesforce/kit" "^1.7.0"
"@salesforce/schemas" "^1.1.0"
"@salesforce/ts-types" "^1.5.20"
"@salesforce/ts-types" "^1.5.21"
"@types/graceful-fs" "^4.1.5"
"@types/semver" "^7.3.9"
ajv "^8.11.0"
Expand All @@ -1098,9 +1097,9 @@
form-data "^4.0.0"
graceful-fs "^4.2.9"
js2xmlparser "^4.0.1"
jsforce beta
jsforce "^2.0.0-beta.19"
jsonwebtoken "8.5.1"
ts-retry-promise "^0.6.0"
ts-retry-promise "^0.7.0"

"@salesforce/dev-config@^3.0.0", "@salesforce/dev-config@^3.0.1":
version "3.1.0"
Expand Down Expand Up @@ -1147,12 +1146,12 @@
typedoc-plugin-missing-exports "0.23.0"
typescript "^4.1.3"

"@salesforce/kit@^1.5.13", "@salesforce/kit@^1.5.17", "@salesforce/kit@^1.5.34", "@salesforce/kit@^1.5.41":
version "1.5.45"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.5.45.tgz#200a85f75681f4567820cf206a04b3d44e43e0b0"
integrity sha512-e7iER8s/f8N52rSRZ7uJXSKnOTDTH9NHfGnmkFXPuz/1Waaeqso+CxqmqCh8aVe//frj11NGkazR0rJPuF/bfA==
"@salesforce/kit@^1.5.13", "@salesforce/kit@^1.5.17", "@salesforce/kit@^1.6.1", "@salesforce/kit@^1.7.0":
version "1.7.1"
resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-1.7.1.tgz#2337ae354409726f1822f1b03a3d7073e84cd249"
integrity sha512-XbLtEgMNBGZqtY/OldEru+LzASS3o37MZ6eNlSG19eAroGqFdlr4pzZUD/UaWSt6E0s0arj4IwAP5/hQLbrBZw==
dependencies:
"@salesforce/ts-types" "^1.5.20"
"@salesforce/ts-types" "^1.7.0"
shx "^0.3.3"
tslib "^2.2.0"

Expand Down Expand Up @@ -1187,10 +1186,10 @@
sinon "^5.1.1"
tslib "^2.2.0"

"@salesforce/ts-types@^1.5.17", "@salesforce/ts-types@^1.5.20", "@salesforce/ts-types@^1.5.21":
version "1.5.21"
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-1.5.21.tgz#e62784872f0e74bf4ae13381dc58aa4644ee2df3"
integrity sha512-qG8r8WOzqpFOHaH3EGU3IwGrY/pSv9NQp4B0wGxOuPDBbraXVvd3KhWVStxaLGKBkJClJ7/+t+iCSP82sEiGcg==
"@salesforce/ts-types@^1.5.17", "@salesforce/ts-types@^1.5.20", "@salesforce/ts-types@^1.5.21", "@salesforce/ts-types@^1.7.0":
version "1.7.0"
resolved "https://registry.yarnpkg.com/@salesforce/ts-types/-/ts-types-1.7.0.tgz#0ec743b324a0d39b13ac681132042742e9a43d0f"
integrity sha512-8bLGBZCk7T/tkfXP66r5Pkhn3CjfNQIOy6B0Z1rvam5RgqWtYYcubF7eSLSj7bop/q7tA8+R6bNJmjATX6hTqA==
dependencies:
tslib "^2.2.0"

Expand Down Expand Up @@ -3396,10 +3395,10 @@ extsprintf@^1.2.0:
resolved "https://registry.yarnpkg.com/extsprintf/-/extsprintf-1.4.1.tgz#8d172c064867f235c0c84a596806d279bf4bcc07"
integrity sha512-Wrk35e8ydCKDj/ArClo1VrPVmN8zph5V4AtHwIuHhvMXsKf73UT3BOD+azBIW+3wOJ4FhEH7zyaJCFvChjYvMA==

fancy-test@^2.0.0:
version "2.0.0"
resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.0.tgz#f1477ae4190820318816914aabe273c0a0dbd597"
integrity sha512-SFb2D/VX9SV+wNYXO1IIh1wyxUC1GS0mYCFJOWD1ia7MPj9yE2G8jaPkw4t/pg0Sj7/YJP56OzMY4nAuJSOugQ==
fancy-test@^2.0.5:
version "2.0.5"
resolved "https://registry.yarnpkg.com/fancy-test/-/fancy-test-2.0.5.tgz#eb39e10b77e476147aa4ed5a81e14e809b46aaae"
integrity sha512-ASPLNVkHSSIdRI/uLlK+XGhf1ul/MpRN9VE84ehXL+FOprQjXrDXX3wW1wqKvtcTTC+AW0E0RxdpJ5IEopjhQA==
dependencies:
"@types/chai" "*"
"@types/lodash" "*"
Expand Down Expand Up @@ -4763,10 +4762,10 @@ jsforce@^1.11.0:
request "^2.72.0"
xml2js "^0.4.16"

jsforce@beta:
version "2.0.0-beta.18"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.18.tgz#2791a2e6ec15d4d8b41f0782e23b833f5dbe5678"
integrity sha512-9IKv3M/U/FCdL6G8WlFqWiBTvLx1TRmGW+JhcSWHZb0YlMLHiGNVymvLyPsvRfO9sNP6VR3A5AIntqD+UsDKkQ==
jsforce@^2.0.0-beta.19:
version "2.0.0-beta.19"
resolved "https://registry.yarnpkg.com/jsforce/-/jsforce-2.0.0-beta.19.tgz#4a136b88d6a9f6668714c4ccbb0acd55e46ea493"
integrity sha512-WdF6hs7kukXNGvp/VRhu2DngldgiBBorsc2WA5us08oJGbEIPwn/itqYJWKJ+rfPXepz5JbkWQd48XHGjqmPpw==
dependencies:
"@babel/runtime" "^7.12.5"
"@babel/runtime-corejs3" "^7.12.5"
Expand Down Expand Up @@ -7460,6 +7459,11 @@ ts-retry-promise@^0.6.0:
resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.6.2.tgz#6925149cd5da40c536f704269232ab3966271d06"
integrity sha512-QFnm3RuFivgkQGKm8XX7F7sAMQEI7pzVkfSlcWMYH+MoIRy7BI3sE8135YPapP8Fra5KgAuOq2QFT969N14cAw==

ts-retry-promise@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/ts-retry-promise/-/ts-retry-promise-0.7.0.tgz#08f2dcbbf5d2981495841cb63389a268324e8147"
integrity sha512-x6yWZXC4BfXy4UyMweOFvbS1yJ/Y5biSz/mEPiILtJZLrqD3ZxIpzVOGGgifHHdaSe3WxzFRtsRbychI6zofOg==

tsconfig-paths@^3.14.1:
version "3.14.1"
resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.14.1.tgz#ba0734599e8ea36c862798e920bcf163277b137a"
Expand Down