From cb501920ed84a014ced024b1b5c2f70875b09f5e Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Tue, 18 Jun 2024 18:47:50 +0000 Subject: [PATCH 1/2] chore: updates from devScripts --- package.json | 4 ++-- yarn.lock | 59 ++++++++++++++++++++++++++++++++-------------------- 2 files changed, 39 insertions(+), 24 deletions(-) diff --git a/package.json b/package.json index 1a868090..3455f60d 100644 --- a/package.json +++ b/package.json @@ -7,14 +7,14 @@ "dependencies": { "@oclif/core": "^4", "@salesforce/core": "^7.3.9", - "@salesforce/sf-plugins-core": "^10.0.1", + "@salesforce/sf-plugins-core": "^11.1.0", "fast-levenshtein": "^3.0.0" }, "devDependencies": { "@oclif/plugin-command-snapshot": "^5.2.0", "@oclif/test": "^4", "@salesforce/cli-plugins-testkit": "^5.3.11", - "@salesforce/dev-scripts": "^10.1.1", + "@salesforce/dev-scripts": "^10.2.0", "@salesforce/plugin-command-reference": "^3.1.2", "@salesforce/plugin-deploy-retrieve": "^3.9.2", "@salesforce/ts-sinon": "^1.4.17", diff --git a/yarn.lock b/yarn.lock index ad9d3845..3b97dd03 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1755,10 +1755,10 @@ strip-ansi "6.0.1" ts-retry-promise "^0.8.1" -"@salesforce/core@^7.3.10", "@salesforce/core@^7.3.12", "@salesforce/core@^7.3.9": - version "7.3.12" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-7.3.12.tgz#9138980db21566c467f35afe9192f33bf77f160c" - integrity sha512-a53KYv2xaJpmFlN4haI7ewaMpRqdRwaqbm11wLn0il6+LNR1/2zkRdqE3opdTW6aXNvVecNu0YQj5/u3Uz3oPw== +"@salesforce/core@^7.3.10", "@salesforce/core@^7.3.12", "@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" @@ -1784,10 +1784,10 @@ resolved "https://registry.yarnpkg.com/@salesforce/dev-config/-/dev-config-4.1.0.tgz#e529576466d074e7a5f1441236510fef123da01e" integrity sha512-2iDDepiIwjXHS5IVY7pwv8jMo4xWosJ7p/UTj+lllpB/gnJiYLhjJPE4Z3FCGFKyvfg5jGaimCd8Ca6bLGsCQA== -"@salesforce/dev-scripts@^10.1.1": - version "10.1.1" - resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-10.1.1.tgz#b603d875a3351a39429a9ed63132241c69cfe2ef" - integrity sha512-q909yA7IkPpQ/LCCHFHL5u34ktKryXoOjflsxsTtnzvseYiLFUCmIBZsef7Vn/hwgIOyhcyCWoSpe7F6i8V6PQ== +"@salesforce/dev-scripts@^10.2.0": + version "10.2.0" + resolved "https://registry.yarnpkg.com/@salesforce/dev-scripts/-/dev-scripts-10.2.0.tgz#85d7ab8b2b532d816c9a1c37a27281743c397bba" + integrity sha512-0Y423LwXRpJIc5fpoLSkY5zIZsQSqnhqIDkN2g93vJ28KKqwlJGdCf6qbQ6w404AbXoIhUM/xnMGY/+g6x+GEQ== dependencies: "@commitlint/cli" "^17.1.2" "@commitlint/config-conventional" "^17.8.1" @@ -1816,13 +1816,12 @@ typescript "^5.4.3" wireit "^0.14.4" -"@salesforce/kit@^3.1.0", "@salesforce/kit@^3.1.1", "@salesforce/kit@^3.1.2", "@salesforce/kit@^3.1.3": - version "3.1.4" - resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.1.4.tgz#e71b986440c1118f7df56ca71e387566dd1acbe0" - integrity sha512-R0hiOF3n/byNCTExaZgUAKSHr0JByvdQbB2c9+9stL35xBBlBhCzFO0elXM7q7P4TW73YtURbxaiWN2W8Mjr8g== +"@salesforce/kit@^3.1.0", "@salesforce/kit@^3.1.1", "@salesforce/kit@^3.1.2", "@salesforce/kit@^3.1.3", "@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.3" + "@salesforce/ts-types" "^2.0.10" "@salesforce/plugin-command-reference@^3.1.2": version "3.1.2" @@ -1882,7 +1881,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/sf-plugins-core@^10.0.0", "@salesforce/sf-plugins-core@^10.0.1": +"@salesforce/sf-plugins-core@^10.0.0": version "10.0.1" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-10.0.1.tgz#8df8e3b7a10f8ba75906c5d58eb3a7df32e42eb3" integrity sha512-FsbZKshTgyHYO1KNuEuNGhzLj5diuh7lMElNkT4xfmwGjciDEIBtZf/aMAdN9AYpIj/TkAvi7Xnxs1gMHPOGNQ== @@ -1900,6 +1899,24 @@ string-width "^7.1.0" terminal-link "^3.0.0" +"@salesforce/sf-plugins-core@^11.1.0": + version "11.1.0" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-11.1.0.tgz#8ddf8b622c5c470259077e7a46b1413319714a84" + integrity sha512-GZjLnz7Vdr9vqV6x9ApbSUrCykhOOaNjDiuIO4gFhjGe+ZFVmLSx/dgFw1Wtj/VN3vRXLef08qupbmCzWGSyFA== + dependencies: + "@inquirer/confirm" "^3.1.9" + "@inquirer/password" "^2.1.9" + "@oclif/core" "^4.0.3" + "@salesforce/core" "^7.4.1" + "@salesforce/kit" "^3.1.6" + "@salesforce/ts-types" "^2.0.9" + ansis "^3.2.0" + cli-progress "^3.12.0" + natural-orderby "^3.0.2" + slice-ansi "^7.1.0" + string-width "^7.1.0" + terminal-link "^3.0.0" + "@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" @@ -1942,12 +1959,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== "@sindresorhus/is@^4", "@sindresorhus/is@^4.0.0": version "4.6.0" @@ -8289,7 +8304,7 @@ tslib@^1.11.1: resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== -tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.1, tslib@^2.6.2, tslib@^2.6.3: +tslib@^2.0.1, tslib@^2.0.3, tslib@^2.3.1, tslib@^2.5.0, tslib@^2.6.1, tslib@^2.6.2: version "2.6.3" resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.6.3.tgz#0438f810ad7a9edcde7a241c3d80db693c8cbfe0" integrity sha512-xNvxJEOUiWPGhUuUdQgAJPKOOJfGnIyKySOc09XkKsgdUV/3E2zvwZYdejjmRgPCgcym1juLH3226yA7sEFJKQ== From 4d167ac4c762a6562bbfe95a90039d3435c5803e Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Tue, 18 Jun 2024 14:52:49 -0500 Subject: [PATCH 2/2] fix: update test expectations for new error codes --- test/commands/sfdx/alias/set.nut.ts | 4 +--- test/commands/sfdx/config/unset.nut.ts | 2 +- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/test/commands/sfdx/alias/set.nut.ts b/test/commands/sfdx/alias/set.nut.ts index 6d8ae0ec..87f5e06d 100644 --- a/test/commands/sfdx/alias/set.nut.ts +++ b/test/commands/sfdx/alias/set.nut.ts @@ -111,9 +111,7 @@ describe('alias:set NUTs', async () => { it('alias:set without varargs stdout', () => { const res: string = execCmd('alias:set ').shellOutput.stderr; - expect(res).to.include( - 'Error (1): You must provide one or more aliases to set. Use the --help flag to see examples.' - ); + expect(res).to.include('You must provide one or more aliases to set. Use the --help flag to see examples.'); }); }); }); diff --git a/test/commands/sfdx/config/unset.nut.ts b/test/commands/sfdx/config/unset.nut.ts index 29c591f7..ad3eaa4a 100644 --- a/test/commands/sfdx/config/unset.nut.ts +++ b/test/commands/sfdx/config/unset.nut.ts @@ -24,7 +24,7 @@ describe('config:unset NUTs', async () => { 'You must provide one or more configuration variables to unset. Run "sf config list" to see the configuration variables you\'ve previously set.', name: 'NoConfigKeysFoundError', status: 1, - code: 1, + code: 'NoConfigKeysFoundError', exitCode: 1, warnings: [], });