From a19b797dda14b2ee0fad480a5d86b532270247b1 Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Wed, 10 Apr 2024 15:30:29 +0000 Subject: [PATCH 1/2] chore: updates from devScripts --- package.json | 12 ++-- yarn.lock | 188 ++++++++++++++++++++++++++++++++++++++++++++------- 2 files changed, 170 insertions(+), 30 deletions(-) diff --git a/package.json b/package.json index deddcf66..4fb175bc 100644 --- a/package.json +++ b/package.json @@ -5,21 +5,21 @@ "author": "Salesforce", "bugs": "https://github.com/forcedotcom/cli/issues", "dependencies": { - "@oclif/core": "^3.26.0", - "@salesforce/core": "^6.7.3", - "@salesforce/sf-plugins-core": "^8.0.2", + "@oclif/core": "^3.26.2", + "@salesforce/core": "^7.0.1", + "@salesforce/sf-plugins-core": "^9.0.0", "fast-levenshtein": "^3.0.0" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.1.4", "@oclif/test": "^3.2.8", - "@salesforce/cli-plugins-testkit": "^5.1.13", - "@salesforce/dev-scripts": "^8.5.0", + "@salesforce/cli-plugins-testkit": "^5.2.0", + "@salesforce/dev-scripts": "^9.0.0", "@salesforce/plugin-command-reference": "^3.0.75", "@salesforce/plugin-deploy-retrieve": "^3.5.3", "@salesforce/ts-sinon": "^1.4.17", "@types/fast-levenshtein": "^0.0.4", - "eslint-plugin-sf-plugin": "^1.17.5", + "eslint-plugin-sf-plugin": "^1.18.0", "oclif": "^4.7.6", "ts-node": "^10.9.2", "typescript": "^5.4.4" diff --git a/yarn.lock b/yarn.lock index 0c79facc..1cff2405 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1256,6 +1256,26 @@ "@jridgewell/resolve-uri" "^3.1.0" "@jridgewell/sourcemap-codec" "^1.4.14" +"@jsforce/jsforce-node@^3.1.0": + version "3.1.0" + resolved "https://registry.yarnpkg.com/@jsforce/jsforce-node/-/jsforce-node-3.1.0.tgz#7f1b4ba60c0c84b870af8e43d713907b10ed8152" + integrity sha512-xsn6Qj36YyhG7uCL9DOswZhqN/OVIpXm5s8AWD7V9hSJfp5ReebEsjT7a52ztEMmkUAYjWvZC5alBJr7jJCJig== + dependencies: + "@sindresorhus/is" "^4" + "@types/node" "^18.15.3" + abort-controller "^3.0.0" + base64url "^3.0.1" + csv-parse "^5.5.2" + csv-stringify "^6.4.4" + faye "^1.4.0" + form-data "^4.0.0" + fs-extra "^8.1.0" + https-proxy-agent "^5.0.0" + multistream "^3.1.0" + node-fetch "^2.6.1" + strip-ansi "^6.0.0" + xml2js "^0.6.2" + "@nodelib/fs.scandir@2.1.5": version "2.1.5" resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5" @@ -1277,7 +1297,7 @@ "@nodelib/fs.scandir" "2.1.5" fastq "^1.6.0" -"@oclif/core@3.26.0", "@oclif/core@^3.15.1", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0", "@oclif/core@^3.26.0": +"@oclif/core@3.26.0": version "3.26.0" resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.0.tgz#959d5e9f13f4ad6a4e98235ad125189df9ee4279" integrity sha512-TpMdfD4tfA2tVVbd4l0PrP02o5KoUXYmudBbTC7CeguDo/GLoprw4uL8cMsaVA26+cbcy7WYtOEydQiHVtJixA== @@ -1311,6 +1331,40 @@ wordwrap "^1.0.0" wrap-ansi "^7.0.0" +"@oclif/core@^3.15.1", "@oclif/core@^3.21.0", "@oclif/core@^3.23.0", "@oclif/core@^3.26.0", "@oclif/core@^3.26.2": + version "3.26.2" + resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.26.2.tgz#92a92516e1309e5b1241c1b4932ab1d2546e294a" + integrity sha512-Gpn21jKjcOx0TecI1wLJrY/65jtgJx5f1GzTc81oKvEpKes1b3Li2SMZygRaWRpcQ3wjN0d7lTPi8WwLsmTBjA== + dependencies: + "@types/cli-progress" "^3.11.5" + ansi-escapes "^4.3.2" + ansi-styles "^4.3.0" + cardinal "^2.1.1" + chalk "^4.1.2" + clean-stack "^3.0.1" + cli-progress "^3.12.0" + color "^4.2.3" + debug "^4.3.4" + ejs "^3.1.9" + get-package-type "^0.1.0" + globby "^11.1.0" + hyperlinker "^1.0.0" + indent-string "^4.0.0" + is-wsl "^2.2.0" + js-yaml "^3.14.1" + minimatch "^9.0.4" + natural-orderby "^2.0.3" + object-treeify "^1.1.33" + password-prompt "^1.1.3" + slice-ansi "^4.0.0" + string-width "^4.2.3" + strip-ansi "^6.0.1" + supports-color "^8.1.1" + supports-hyperlinks "^2.2.0" + widest-line "^3.1.0" + wordwrap "^1.0.0" + wrap-ansi "^7.0.0" + "@oclif/plugin-command-snapshot@^5.1.4": version "5.1.4" resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.1.4.tgz#fc550f0ba66f41620734fb675e12070f943f4b2a" @@ -1383,12 +1437,12 @@ istanbul-reports "^3.1.6" jsforce "^2.0.0-beta.29" -"@salesforce/cli-plugins-testkit@^5.1.13": - version "5.1.13" - resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.1.13.tgz#4d4f93afe01546a1588d1aa466420099b02b1526" - integrity sha512-JWSUi9X1kKAi22FkHUveXSZ0yxhuXwdq9Ze8dHfhnHXNDwOPEPL5xkPMhSWvD1ARncFs7PPt4T2pmRAV65HbWg== +"@salesforce/cli-plugins-testkit@^5.2.0": + version "5.2.0" + resolved "https://registry.yarnpkg.com/@salesforce/cli-plugins-testkit/-/cli-plugins-testkit-5.2.0.tgz#dd664a9a51eac42f9959e0cfa1d3349256446291" + integrity sha512-b0lHGBycDBmeGcDx0j9SfxlNyCg3WhflNeX1PBitMTxgZ5O9UMiSFvLbqgGeTB8Eoq4JgNgou6RRrNoZHFnqcw== dependencies: - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.0" "@salesforce/kit" "^3.1.0" "@salesforce/ts-types" "^2.0.9" "@types/shelljs" "^0.8.15" @@ -1422,15 +1476,38 @@ semver "^7.6.0" ts-retry-promise "^0.7.1" +"@salesforce/core@^7.0.0", "@salesforce/core@^7.0.1": + version "7.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.1.0.tgz#60195ab0ad452b27594a0bca6852f1820915ff7f" + integrity sha512-TfGBjH7tJIgnrKxbbRvh4ujn60gPjqcr2xZBHMffjZVtfvXPoT07kd0TILyDWLFslYMJQFq3KA0GwL51g01WNQ== + dependencies: + "@jsforce/jsforce-node" "^3.1.0" + "@salesforce/kit" "^3.1.0" + "@salesforce/schemas" "^1.7.0" + "@salesforce/ts-types" "^2.0.9" + ajv "^8.12.0" + change-case "^4.1.2" + faye "^1.4.0" + form-data "^4.0.0" + js2xmlparser "^4.0.1" + jsonwebtoken "9.0.2" + jszip "3.10.1" + pino "^8.19.0" + pino-abstract-transport "^1.1.0" + pino-pretty "^10.3.1" + proper-lockfile "^4.1.2" + semver "^7.6.0" + ts-retry-promise "^0.7.1" + "@salesforce/dev-config@^4.1.0": version "4.1.0" resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^8.5.0": - version "8.5.0" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-8.5.0.tgz#b0b44ca595450328c6186968528d9c0ef06cd27e" - integrity sha512-vR+CB5VoQrNAqNTcu5GZ/l4I4Rxd5HkIj/qTxEzP1EYnIlgjrbcsQgaunSnTrttIEy/BD8epd6UWAT8yAItufg== +"@salesforce/dev-scripts@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-9.0.0.tgz#ab38c014ebc8baa92fccbb5cff9b8432e0f991d1" + integrity sha512-B89ipgncuhHLqLlr+LGSi7HN+eHPa3aw5B6PXQWqQj73QAkGN+E6EowwA50y7GkXeNx7GntbNRtQHvwMcnIorw== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.8.1" @@ -1550,6 +1627,19 @@ "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0" +"@salesforce/sf-plugins-core@^9.0.0": + version "9.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-9.0.0.tgz#8ac6e45fa985ef35ad7f47a09d96f2b2f6d70710" + integrity sha512-Eo1mfq68uVIEFgAE7oSlsfJT3YyShQAHRCiLqKivEcxu/3xOHPU212u2nT9igA81Me/6NZmBSvm6vLdN+L/9og== + dependencies: + "@inquirer/confirm" "^2.0.17" + "@inquirer/password" "^1.1.16" + "@oclif/core" "^3.26.0" + "@salesforce/core" "^7.0.0" + "@salesforce/kit" "^3.1.0" + "@salesforce/ts-types" "^2.0.9" + chalk "^5.3.0" + "@salesforce/source-deploy-retrieve@^10.7.0": version "10.7.1" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.7.1.tgz#0c26b2e952b1618d3c31759e8eb006839369672c" @@ -1600,7 +1690,7 @@ dependencies: tslib "^2.6.2" -"@sindresorhus/is@^4.0.0": +"@sindresorhus/is@^4", "@sindresorhus/is@^4.0.0": version "4.6.0" resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-4.6.0.tgz#3c7c9c46e678feefe7a2e5bb609d3dbd665ffb3f" integrity sha512-t09vSN3MdfsyCHoFcTRCH/iUtG7OJ0CsjzB8cjAmKc/va/kIgeDI/TxsigdncE/4be734m0cvIYwNaV4i2XqAw== @@ -2343,10 +2433,10 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-12.20.55.tgz#c329cbd434c42164f846b909bd6f85b5537f6240" integrity sha512-J8xLz7q2OFulZ2cyGTLE1TbbZcjpno7FaN6zdJNrgAdrJ+DZzh/uFR6YrTb4C+nXakvud8Q4+rbhoIWlYQbUFQ== -"@types/node@^18.19.28": - version "18.19.29" - resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.29.tgz#e7e9d796c1e195be7e7daf82b4abc50d017fb9db" - integrity sha512-5pAX7ggTmWZdhUrhRWLPf+5oM7F80bcKVCBbr0zwEkTNzTJL2CWQjznpFgHYy6GrzkYi2Yjy7DHKoynFxqPV8g== +"@types/node@^18.15.3", "@types/node@^18.19.28": + version "18.19.31" + resolved "https://registry.yarnpkg.com/@types/node/-/node-18.19.31.tgz#b7d4a00f7cb826b60a543cebdbda5d189aaecdcd" + integrity sha512-ArgCD39YpyyrtFKIqMDvjz79jto5fcI/SVUs2HwB+f0dAzq68yqOdyaSivLiLugSziTpNXLQrVb7RZFmdZzbhA== dependencies: undici-types "~5.26.4" @@ -3409,11 +3499,21 @@ csv-parse@^4.8.2: resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-4.16.3.tgz#7ca624d517212ebc520a36873c3478fa66efbaf7" integrity sha512-cO1I/zmz4w2dcKHVvpCr7JVRu8/FymG5OEpmvsZYlccYolPBLoVGKUHgNoc4ZGkFeFlWGEDmMyBM+TTqRdW/wg== +csv-parse@^5.5.2: + version "5.5.5" + resolved "https://registry.yarnpkg.com/csv-parse/-/csv-parse-5.5.5.tgz#68a271a9092877b830541805e14c8a80e6a22517" + integrity sha512-erCk7tyU3yLWAhk6wvKxnyPtftuy/6Ak622gOO7BCJ05+TYffnPCJF905wmOQm+BpkX54OdAl8pveJwUdpnCXQ== + csv-stringify@^5.3.4: version "5.6.5" resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-5.6.5.tgz#c6d74badda4b49a79bf4e72f91cce1e33b94de00" integrity sha512-PjiQ659aQ+fUTQqSrd1XEDnOr52jh30RBurfzkscaE2tPaFsDH5wOAHJiw8XAHphRknCwMUE9KRayc4K/NbO8A== +csv-stringify@^6.4.4: + version "6.4.6" + resolved "https://registry.yarnpkg.com/csv-stringify/-/csv-stringify-6.4.6.tgz#9ccf87cb8b017c96673a9fa061768c8ba83e8b98" + integrity sha512-h2V2XZ3uOTLilF5dPIptgUfN/o2ia/80Ie0Lly18LAnw5s8Eb7kt8rfxSUy24AztJZas9f6DPZpVlzDUtFt/ag== + dargs@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/dargs/-/dargs-7.0.0.tgz#04015c41de0bcb69ec84050f3d9be0caf8d6d5cc" @@ -3899,12 +3999,12 @@ eslint-plugin-jsdoc@^46.10.1: semver "^7.5.4" spdx-expression-parse "^4.0.0" -eslint-plugin-sf-plugin@^1.17.5: - version "1.17.5" - resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.17.5.tgz#3ce0e7033eaf50675c962e7d2def3bb2cad15018" - integrity sha512-TQlUNOwop8aGeIOY+Vtj3OV0EGN7ps2YpV9LEvgGpw7Eeg5ocULQqR6WPwuRpeRn+XUNl7AC5NVDdhveA1fEEQ== +eslint-plugin-sf-plugin@^1.18.0: + version "1.18.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-sf-plugin/-/eslint-plugin-sf-plugin-1.18.0.tgz#c6eca90e7738e9a114d8257588220c63a2a3e0e3" + integrity sha512-5Q4yI6Hr07v/lTaivs8A8re2FUXDEGyzzHzBk2cWi4c6iMxUYf/vaZKO6ZSSsc4eCcP11JY3RkDBQn6P33x58g== dependencies: - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.0" "@typescript-eslint/utils" "^6.17.0" eslint-plugin-unicorn@^50.0.1: @@ -5901,7 +6001,7 @@ minimatch@5.0.1: dependencies: brace-expansion "^2.0.1" -minimatch@9.0.3, minimatch@^9.0.1, minimatch@^9.0.3: +minimatch@9.0.3: version "9.0.3" resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.3.tgz#a6e00c3de44c3a542bfaae70abfc22420a6da825" integrity sha512-RHiac9mvaRw0x3AYRgDC1CxAP7HTcNrrECeA8YYJeWnpo+2Q5CegtZjaotWTWxDG3UeGA1coE05iH1mPjT/2mg== @@ -5922,6 +6022,13 @@ minimatch@^5.0.1, minimatch@^5.1.6: dependencies: brace-expansion "^2.0.1" +minimatch@^9.0.1, minimatch@^9.0.3, minimatch@^9.0.4: + version "9.0.4" + resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-9.0.4.tgz#8e49c731d1749cbec05050ee5145147b32496a51" + integrity sha512-KqWh+VchfxcMNRAJjj2tnsSJdNbHsVgnkBhTNrW7AjVo6OvLtxw8zfT9oLw1JSohlFzJ8jCoTgaoXvJ+kHt6fw== + dependencies: + brace-expansion "^2.0.1" + minimist-options@4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/minimist-options/-/minimist-options-4.1.0.tgz#c0655713c53a8a2ebd77ffa247d342c40f010619" @@ -7433,7 +7540,16 @@ stdout-stderr@^0.1.9: debug "^4.1.1" strip-ansi "^6.0.0" -"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: +"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.0.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== @@ -7492,7 +7608,14 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.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": + 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: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -8044,7 +8167,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@^7.0.0: +"wrap-ansi-cjs@npm: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== @@ -8062,6 +8185,15 @@ wrap-ansi@^6.0.1, 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" @@ -8094,6 +8226,14 @@ xml2js@^0.5.0: sax ">=0.6.0" xmlbuilder "~11.0.0" +xml2js@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/xml2js/-/xml2js-0.6.2.tgz#dd0b630083aa09c161e25a4d0901e2b2a929b499" + integrity sha512-T4rieHaC1EXcES0Kxxj4JWgaUQHDk+qwHcYOCFHfiwKz7tOVPLq7Hjq9dM1WCMhylqMEfP7hMcOIChvotiZegA== + dependencies: + sax ">=0.6.0" + xmlbuilder "~11.0.0" + xmlbuilder@~11.0.0: version "11.0.1" resolved "https://registry.yarnpkg.com/xmlbuilder/-/xmlbuilder-11.0.1.tgz#be9bae1c8a046e76b31127726347d0ad7002beb3" From 5669b92654ce44fc23c661ceb761bf22de2a951b Mon Sep 17 00:00:00 2001 From: mshanemc Date: Wed, 10 Apr 2024 13:01:53 -0500 Subject: [PATCH 2/2] test: top-level core7 imports --- package.json | 2 +- src/hooks/init/load_config_meta.ts | 4 +- test/commands/alias/list.test.ts | 2 +- test/commands/alias/unset.test.ts | 2 +- test/commands/config/list.test.ts | 2 +- yarn.lock | 73 ++++++++++-------------------- 6 files changed, 30 insertions(+), 55 deletions(-) diff --git a/package.json b/package.json index 4fb175bc..dd72c881 100644 --- a/package.json +++ b/package.json @@ -16,7 +16,7 @@ "@salesforce/cli-plugins-testkit": "^5.2.0", "@salesforce/dev-scripts": "^9.0.0", "@salesforce/plugin-command-reference": "^3.0.75", - "@salesforce/plugin-deploy-retrieve": "^3.5.3", + "@salesforce/plugin-deploy-retrieve": "^3.6.0", "@salesforce/ts-sinon": "^1.4.17", "@types/fast-levenshtein": "^0.0.4", "eslint-plugin-sf-plugin": "^1.18.0", diff --git a/src/hooks/init/load_config_meta.ts b/src/hooks/init/load_config_meta.ts index 71e1550d..fb228b3a 100644 --- a/src/hooks/init/load_config_meta.ts +++ b/src/hooks/init/load_config_meta.ts @@ -6,7 +6,7 @@ */ import type { Hook } from '@oclif/core'; -import type { ConfigPropertyMeta } from '@salesforce/core'; +import type { ConfigPropertyMeta } from '@salesforce/core/config'; import { ModuleLoader } from '@oclif/core'; const OCLIF_META_PJSON_KEY = 'configMeta'; @@ -33,7 +33,7 @@ const hook: Hook<'init'> = async ({ config, context }): Promise => { .filter((d): d is ConfigPropertyMeta => !!d); if (flattenedConfigMetas.length) { - const { Config } = await import('@salesforce/core/lib/config/config.js'); + const { Config } = await import('@salesforce/core/config'); Config.addAllowedProperties(flattenedConfigMetas); } return Promise.resolve(); diff --git a/test/commands/alias/list.test.ts b/test/commands/alias/list.test.ts index a36be604..e03bd057 100644 --- a/test/commands/alias/list.test.ts +++ b/test/commands/alias/list.test.ts @@ -5,7 +5,7 @@ * For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause */ import { expect, test } from '@oclif/test'; -import { TestContext } from '@salesforce/core/lib/testSetup.js'; +import { TestContext } from '@salesforce/core/testSetup'; describe('alias list', () => { const $$ = new TestContext(); diff --git a/test/commands/alias/unset.test.ts b/test/commands/alias/unset.test.ts index 145b9e22..cbec185a 100644 --- a/test/commands/alias/unset.test.ts +++ b/test/commands/alias/unset.test.ts @@ -6,7 +6,7 @@ */ import { expect, test } from '@oclif/test'; -import { TestContext } from '@salesforce/core/lib/testSetup.js'; +import { TestContext } from '@salesforce/core/testSetup'; describe('alias unset', () => { const $$ = new TestContext(); diff --git a/test/commands/config/list.test.ts b/test/commands/config/list.test.ts index 52d88e86..0b87f490 100644 --- a/test/commands/config/list.test.ts +++ b/test/commands/config/list.test.ts @@ -10,7 +10,7 @@ import { ConfigAggregator, OrgConfigProperties } from '@salesforce/core'; import { stubMethod } from '@salesforce/ts-sinon'; import { SinonSandbox } from 'sinon'; import sinon from 'sinon'; -import { SfConfigProperties } from '@salesforce/core/lib/config/config.js'; +import { SfConfigProperties } from '@salesforce/core/config'; describe('config:list', () => { let sandbox: SinonSandbox; diff --git a/yarn.lock b/yarn.lock index 1cff2405..7753434d 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1558,19 +1558,19 @@ handlebars "^4.7.8" tslib "^2" -"@salesforce/plugin-deploy-retrieve@^3.5.3": - version "3.5.3" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-3.5.3.tgz#2dca559e474e05cde7692dbb88bcfdf8add4bcfe" - integrity sha512-eA1E48/bKhLYZEjFK1JqmPmbXAdkPA5LS3CV8gh9ibfQmSVjLqU90nbJAes0O2tbdwpRg7HHb0MSmh7lc9c26g== +"@salesforce/plugin-deploy-retrieve@^3.6.0": + version "3.6.0" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-deploy-retrieve/-/plugin-deploy-retrieve-3.6.0.tgz#12e8520e611878321d08d4a3aa9a81f275ff5fb6" + integrity sha512-65rKUUQaixrJMJ9hAa084eIXfIY+4y4sg1u2IG/Em0OIHvVxA4trHBWAJg3T7mgKFBsXm3q4UzyPShmvQR+0Eg== dependencies: - "@oclif/core" "^3.26.0" + "@oclif/core" "^3.26.2" "@salesforce/apex-node" "^4.0.2" - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.1" "@salesforce/kit" "^3.1.0" "@salesforce/plugin-info" "^3.1.0" - "@salesforce/sf-plugins-core" "^8.0.2" - "@salesforce/source-deploy-retrieve" "^10.7.0" - "@salesforce/source-tracking" "^5.2.1" + "@salesforce/sf-plugins-core" "^9.0.0" + "@salesforce/source-deploy-retrieve" "^11.0.0" + "@salesforce/source-tracking" "^6.0.0" "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0" @@ -1614,7 +1614,7 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/sf-plugins-core@^8.0.2", "@salesforce/sf-plugins-core@^8.0.3": +"@salesforce/sf-plugins-core@^8.0.3": version "8.0.3" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.3.tgz#df8840419031b8d3ec2db171246757a9bfb38655" integrity sha512-RJIi0lbpOg6ZflRDCTi/8E3QBhOHfvA5F3xlvThuQo9Yw2SvOjti+s/+Z2RCpvWdy4aaleeGqqgn7AwDi/ISDQ== @@ -1640,12 +1640,12 @@ "@salesforce/ts-types" "^2.0.9" chalk "^5.3.0" -"@salesforce/source-deploy-retrieve@^10.7.0": - version "10.7.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.7.1.tgz#0c26b2e952b1618d3c31759e8eb006839369672c" - integrity sha512-9SvFv2Xu3ALBCXSmTv4GDoAufA4GCJbg/WmfGq3rhfCwC7i/vN+ZMiHQEXoRk4kkFsmw7U62Mq8xDM1cZwvZ7w== +"@salesforce/source-deploy-retrieve@^11.0.0": + version "11.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-11.0.0.tgz#13752319de7604e01710994e3f44bad353c5d1e8" + integrity sha512-hPgmpke2FGVtxsf51CdMpRdqIDQff2sGoqCwq79WncXRw3FPkTR3/SoaURSNxn++erFDSmODlYz0FZpthQ28xw== dependencies: - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.0" "@salesforce/kit" "^3.1.0" "@salesforce/ts-types" "^2.0.9" fast-levenshtein "^3.0.0" @@ -1659,15 +1659,15 @@ proxy-agent "^6.4.0" ts-retry-promise "^0.7.1" -"@salesforce/source-tracking@^5.2.1": - version "5.2.2" - resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.2.2.tgz#519e595e8c1357caf126ceb83b98625a28bed936" - integrity sha512-47G833qYatviGypYUu3g0+lU4ol4oyoE2PIhNeTXgzutB1dPxdiQ/qzNO3VJOWGbJI4YaWpu0T1pEpyjARV3xA== +"@salesforce/source-tracking@^6.0.0": + version "6.0.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-6.0.0.tgz#21c3e89f09cada73e32e510c12bd5b8fabb97167" + integrity sha512-jBs/R4B4EL27qSaS3464lrf/GQdViXkKlRwl5yCISAZmfMinTYwxlU6ibt/f+ryRBu/S4XxoiqSY6hVJdGgzUA== dependencies: "@oclif/core" "^3.26.0" - "@salesforce/core" "^6.7.3" + "@salesforce/core" "^7.0.0" "@salesforce/kit" "^3.1.0" - "@salesforce/source-deploy-retrieve" "^10.7.0" + "@salesforce/source-deploy-retrieve" "^11.0.0" "@salesforce/ts-types" "^2.0.9" fast-xml-parser "^4.3.6" graceful-fs "^4.2.11" @@ -7540,16 +7540,7 @@ stdout-stderr@^0.1.9: debug "^4.1.1" strip-ansi "^6.0.0" -"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.0.0, 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.0.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== @@ -7608,14 +7599,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== @@ -8167,7 +8151,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== @@ -8185,15 +8169,6 @@ wrap-ansi@^6.0.1, 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"