From 46c36257ef613b97c6a9f3049d090c830d1e2021 Mon Sep 17 00:00:00 2001 From: Shane McLaughlin Date: Tue, 7 Nov 2023 12:45:16 -0600 Subject: [PATCH] refactor: reduce devDeps: devPlugins, shelljs, and jsforce * chore: updates from devScripts * chore: linter changes * feat: no shelljs * feat: remove jsforce dep * refactor: remove dev plugins * test: cli on permset via source-testkit * test: more cli/testkit updates --------- Co-authored-by: svc-cli-bot --- package.json | 15 +-- .../seeds/deploy.metadata.manifest.seed.ts | 2 +- .../seeds/deploy.metadata.metadata.seed.ts | 4 +- .../seeds/deploy.metadata.test-level.seed.ts | 2 +- yarn.lock | 119 +++++------------- 5 files changed, 42 insertions(+), 100 deletions(-) diff --git a/package.json b/package.json index 51a0e18d..2216582f 100644 --- a/package.json +++ b/package.json @@ -19,18 +19,14 @@ "@oclif/plugin-command-snapshot": "^4.0.12", "@salesforce/cli-plugins-testkit": "^5.0.2", "@salesforce/dev-scripts": "^6.0.3", - "@salesforce/plugin-command-reference": "^3.0.40", - "@salesforce/plugin-settings": "^1.4.37", - "@salesforce/plugin-source": "^2.10.30", - "@salesforce/plugin-templates": "^55.5.17", - "@salesforce/plugin-user": "^2.3.32", - "@salesforce/source-testkit": "^2.1.60", + "@salesforce/plugin-command-reference": "^3.0.46", + "@salesforce/plugin-source": "^2.10.46", + "@salesforce/source-testkit": "^2.1.62", "@salesforce/ts-sinon": "1.4.15", "@salesforce/ts-types": "^2.0.8", "@swc/core": "1.3.39", "cross-env": "^7.0.3", "eslint-plugin-sf-plugin": "^1.16.14", - "jsforce": "^2.0.0-beta.28", "oclif": "^3.16.0", "shx": "0.3.4", "ts-node": "^10.9.1", @@ -68,10 +64,7 @@ "@oclif/plugin-command-snapshot", "@oclif/plugin-help", "@salesforce/plugin-command-reference", - "@salesforce/plugin-settings", - "@salesforce/plugin-source", - "@salesforce/plugin-user", - "@salesforce/plugin-templates" + "@salesforce/plugin-source" ], "topics": { "project": { diff --git a/test/nuts/seeds/deploy.metadata.manifest.seed.ts b/test/nuts/seeds/deploy.metadata.manifest.seed.ts index 0bcbedf9..d3d1c828 100644 --- a/test/nuts/seeds/deploy.metadata.manifest.seed.ts +++ b/test/nuts/seeds/deploy.metadata.manifest.seed.ts @@ -26,7 +26,7 @@ context('deploy metadata --manifest NUTs [name: %REPO_NAME%]', () => { const args = testkit.packageNames.map((p) => `--source-dir ${p}`).join(' '); await testkit.deploy({ args }); if (REPO.gitUrl.includes('dreamhouse')) { - await testkit.assignPermissionSet({ args: '--permsetname dreamhouse' }); + await testkit.assignPermissionSet({ args: '--permsetname dreamhouse', cli: 'sf' }); } }); diff --git a/test/nuts/seeds/deploy.metadata.metadata.seed.ts b/test/nuts/seeds/deploy.metadata.metadata.seed.ts index 59ded489..13a7eea2 100644 --- a/test/nuts/seeds/deploy.metadata.metadata.seed.ts +++ b/test/nuts/seeds/deploy.metadata.metadata.seed.ts @@ -25,7 +25,7 @@ context('deploy metadata --metadata NUTs [name: %REPO_NAME%]', () => { const args = testkit.packageNames.map((p) => `--source-dir ${p}`).join(' '); await testkit.deploy({ args }); if (REPO.gitUrl.includes('dreamhouse')) { - await testkit.assignPermissionSet({ args: '--permsetname dreamhouse' }); + await testkit.assignPermissionSet({ args: '--permsetname dreamhouse', cli: 'sf' }); } }); @@ -56,7 +56,7 @@ context('deploy metadata --metadata NUTs [name: %REPO_NAME%]', () => { }); it('should not deploy metadata outside of a package directory', async () => { - await testkit.createApexClass({ args: '--outputdir NotAPackage --classname ShouldNotBeDeployed' }); + await testkit.createApexClass({ args: '--outputdir NotAPackage --classname ShouldNotBeDeployed', cli: 'sf' }); await testkit.deploy({ args: '--metadata ApexClass' }); // this is a glob, so no need for path.join await testkit.expect.filesToNotBeDeployed(['NotAPackage/**/*']); diff --git a/test/nuts/seeds/deploy.metadata.test-level.seed.ts b/test/nuts/seeds/deploy.metadata.test-level.seed.ts index 7ad1f564..5991839d 100644 --- a/test/nuts/seeds/deploy.metadata.test-level.seed.ts +++ b/test/nuts/seeds/deploy.metadata.test-level.seed.ts @@ -28,7 +28,7 @@ context('deploy metadata --test-level NUTs [name: %REPO_NAME%]', () => { const args = testkit.packageNames.map((p) => `--source-dir ${p}`).join(' '); await testkit.deploy({ args }); if (REPO.gitUrl.includes('dreamhouse')) { - await testkit.assignPermissionSet({ args: '--permsetname dreamhouse' }); + await testkit.assignPermissionSet({ args: '--permsetname dreamhouse', cli: 'sf' }); } }); diff --git a/yarn.lock b/yarn.lock index 92b05e92..44453a42 100644 --- a/yarn.lock +++ b/yarn.lock @@ -971,7 +971,7 @@ strip-ansi "6.0.1" ts-retry-promise "^0.7.1" -"@salesforce/core@^5.2.0", "@salesforce/core@^5.2.6", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.17", "@salesforce/core@^5.3.18": +"@salesforce/core@^5.2.0", "@salesforce/core@^5.3.1", "@salesforce/core@^5.3.10", "@salesforce/core@^5.3.14", "@salesforce/core@^5.3.17", "@salesforce/core@^5.3.18": version "5.3.18" resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-5.3.18.tgz#c0b7b59fbef7f0689e88968c614dd1ae2c420f02" integrity sha512-/Ag7elFngTT13PRblSPJPB2Q+xk3jR2SX8bYa83fcQljVF7ApGB5qtFpauXmUv8lgRnN+F01HNqM16iszAMP9w== @@ -1031,7 +1031,7 @@ typescript "^4.9.5" wireit "^0.14.1" -"@salesforce/kit@^3.0.13", "@salesforce/kit@^3.0.14", "@salesforce/kit@^3.0.15", "@salesforce/kit@^3.0.9": +"@salesforce/kit@^3.0.13", "@salesforce/kit@^3.0.14", "@salesforce/kit@^3.0.15": version "3.0.15" resolved "https://registry.yarnpkg.com/@salesforce/kit/-/kit-3.0.15.tgz#713df3f5767f874c70a2e731c7cb5ba677989559" integrity sha512-XkA8jsuLvVnyP460dAbU3pBFP2IkmmmsVxMQVifcKKbNWaIBbZBzAfj+vdaQfnvZyflLhsrFT3q2xkb0vHouPg== @@ -1039,71 +1039,35 @@ "@salesforce/ts-types" "^2.0.9" tslib "^2.6.2" -"@salesforce/plugin-command-reference@^3.0.40": - version "3.0.40" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.40.tgz#c83d8b2699280444250acc05e23bbc5a8001e6f4" - integrity sha512-T6ZFzLkJOXCuOoZqGZlnNHaRVniHiHEKyB7bcPgAkrDFbWjMAxEc3H3jE9b1FIktw3nK+CLJHtzdIrCSg+DHVQ== +"@salesforce/plugin-command-reference@^3.0.46": + version "3.0.46" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.46.tgz#8ade210de4c235fa8daa9b59272481bea61bcd54" + integrity sha512-tUe8pAarH/km7wbRDpKgWc3qCzh52q5FmJpnJbs7wwWnvM5X4MzdpZ/sF/8MT3cS6FkZy//ls796QIC0vvOYsA== dependencies: "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.3.1" - "@salesforce/kit" "^3.0.13" + "@salesforce/core" "^5.3.17" + "@salesforce/kit" "^3.0.15" "@salesforce/sf-plugins-core" "^3.1.28" - "@salesforce/ts-types" "^2.0.7" + "@salesforce/ts-types" "^2.0.9" chalk "^4" handlebars "^4.7.8" tslib "^2" -"@salesforce/plugin-settings@^1.4.37": - version "1.4.37" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-settings/-/plugin-settings-1.4.37.tgz#7097f3a94a479c25c661d71654f8f2fd005648a4" - integrity sha512-tj2M2Xrb9eK8UylcJHROKxXyVN8it5EDHsgcI4dqk74fNgA1l63jKQ190kilm3/TvjyoyqR5FWDbPmokVpAaBQ== +"@salesforce/plugin-source@^2.10.46": + version "2.10.46" + resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.10.46.tgz#6f3d28776e2bf642b4c54faa603769c3b9d40072" + integrity sha512-qo6HH32aJ6spXNAwEqIhla32fPB2tEZyII8rauPpSidetREnUMZztC7x3XOYEWlvMxm6PqXkOorN1MhPTgys1A== dependencies: "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.3.14" - "@salesforce/sf-plugins-core" "^3.1.25" - fast-levenshtein "^3.0.0" - tslib "^2" - -"@salesforce/plugin-source@^2.10.30": - version "2.10.30" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-source/-/plugin-source-2.10.30.tgz#c2ecbd108e595d9c3e80be6c1bd7a811d23bfabe" - integrity sha512-DG/C9zfhmDK5QbnjgkWY2NBnK5HC3iUZ2olqupM8uEkyX+ut53xNUlQRqa07U+9xB1ncaoweP/FIc95oyL0Deg== - dependencies: - "@oclif/core" "^2.11.8" "@salesforce/apex-node" "^2.1.0" - "@salesforce/core" "^5.2.0" - "@salesforce/kit" "^3.0.9" - "@salesforce/sf-plugins-core" "^3.1.14" - "@salesforce/source-deploy-retrieve" "^9.7.2" - "@salesforce/source-tracking" "^4.2.10" + "@salesforce/core" "^5.3.10" + "@salesforce/kit" "^3.0.14" + "@salesforce/sf-plugins-core" "^3.1.25" + "@salesforce/source-deploy-retrieve" "^9.7.28" + "@salesforce/source-tracking" "^4.2.17" chalk "^4.1.2" got "^11.8.6" - proxy-agent "^6.3.0" - tslib "^2" - -"@salesforce/plugin-templates@^55.5.17": - version "55.5.17" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-templates/-/plugin-templates-55.5.17.tgz#c290fb39611f2798433005f21a71b8144dcc2374" - integrity sha512-Jv44uswo3G9vm6gL5UvhLMnSXC/vPjVOWLQ3MWBxrh96T/7vrHny/4CXGT/BmPkVtbbvWyw1OVIuavyOzpbIHg== - dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.3.10" - "@salesforce/sf-plugins-core" "^3.1.23" - "@salesforce/templates" "^59.0.1" - tslib "^2" - yeoman-environment "^3.19.3" - yeoman-generator "^5.10.0" - -"@salesforce/plugin-user@^2.3.32": - version "2.3.32" - resolved "https://registry.yarnpkg.com/@salesforce/plugin-user/-/plugin-user-2.3.32.tgz#5087126b232cf7e07944cb8b53ebcf492683e58b" - integrity sha512-Msljq9lATskNYzVZsHrxBDzSLOiju9Khtbw7irlfdDrpCRV0K9aViyLDZC6HcV5rfWkeW4T8dSnvnqLNp6EMRg== - dependencies: - "@oclif/core" "^2.15.0" - "@salesforce/core" "^5.2.6" - "@salesforce/kit" "^3.0.9" - "@salesforce/sf-plugins-core" "^3.1.20" - "@salesforce/ts-types" "^2.0.7" + proxy-agent "^6.3.1" tslib "^2" "@salesforce/prettier-config@^0.0.3": @@ -1116,7 +1080,7 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d" integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig== -"@salesforce/sf-plugins-core@^3.1.14", "@salesforce/sf-plugins-core@^3.1.20", "@salesforce/sf-plugins-core@^3.1.22", "@salesforce/sf-plugins-core@^3.1.23", "@salesforce/sf-plugins-core@^3.1.25", "@salesforce/sf-plugins-core@^3.1.28": +"@salesforce/sf-plugins-core@^3.1.22", "@salesforce/sf-plugins-core@^3.1.25", "@salesforce/sf-plugins-core@^3.1.28": version "3.1.28" resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-3.1.28.tgz#7714c5b1ce26052bb5cbc524c5990bc52eb601cd" integrity sha512-Z1fVS/pqLCX/3ESrjvtzyuvDFwXu8qxjqs5Gana0J7RKkhDL0f7w+pz3DR1/YfQPeHK8rk9pFDOKB3tOnXf9Lw== @@ -1128,7 +1092,7 @@ chalk "^4" inquirer "^8.2.5" -"@salesforce/source-deploy-retrieve@^9.7.2", "@salesforce/source-deploy-retrieve@^9.7.24", "@salesforce/source-deploy-retrieve@^9.8.4": +"@salesforce/source-deploy-retrieve@^9.7.28", "@salesforce/source-deploy-retrieve@^9.8.3", "@salesforce/source-deploy-retrieve@^9.8.4": version "9.8.4" resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-9.8.4.tgz#e6d21d8f2e0b44fae242e31ef8b4f31991a07deb" integrity sha512-/g/WkUFCogCANnKkeHmQyXpAbIy+A2htEYliVaoxg3UccDqHCZd5Gmlk6Gwsd03YsLAt249bay5mAokD7y39sQ== @@ -1146,15 +1110,15 @@ minimatch "^5.1.6" proxy-agent "^6.3.1" -"@salesforce/source-testkit@^2.1.60": - version "2.1.60" - resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.60.tgz#1a41b5e2c4f94ee4fbfcd7d9ed0b2a0b08e6718e" - integrity sha512-nfzi6Xgaj08+abSbcRYxkiEpGn1pQPKZmncabiUxWddxKA/rZVefzZYaTnffBsH1s+PWuUUJstmDcGrCbz/tXw== +"@salesforce/source-testkit@^2.1.62": + version "2.1.62" + resolved "https://registry.yarnpkg.com/@salesforce/source-testkit/-/source-testkit-2.1.62.tgz#502e8a90c0359e886a1654beb0567861d4ad0173" + integrity sha512-c7Qd7hHOd+x3V0sFzOSgPbQFBrMX3uZNbxJ1HMIa/xrEalm2tkk+cdH0HiXgpoqDZQUvn80hdeDoOdOFNYUzsw== dependencies: "@salesforce/cli-plugins-testkit" "^4.4.8" "@salesforce/core" "^5.3.14" "@salesforce/kit" "^3.0.14" - "@salesforce/source-deploy-retrieve" "^9.7.24" + "@salesforce/source-deploy-retrieve" "^9.8.3" "@salesforce/ts-types" "^2.0.9" archiver "^5.3.2" chai-each "^0.0.1" @@ -1162,7 +1126,7 @@ shelljs "^0.8.4" sinon "^10.0.0" -"@salesforce/source-tracking@^4.2.10", "@salesforce/source-tracking@^4.3.0": +"@salesforce/source-tracking@^4.2.17", "@salesforce/source-tracking@^4.3.0": version "4.3.0" resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-4.3.0.tgz#dc281b260d28f831042475468aa0b0350d7328a7" integrity sha512-1ysyxU7lLi2pQNgEQbLpfSciLhsYrYwVu+VEq+tCXzm0TfmyscT1a1vcyykOzztpWMtKNQW/HdJEaAPBPd9FVg== @@ -1176,21 +1140,6 @@ isomorphic-git "1.23.0" ts-retry-promise "^0.7.0" -"@salesforce/templates@^59.0.1": - version "59.0.1" - resolved "https://registry.yarnpkg.com/@salesforce/templates/-/templates-59.0.1.tgz#19e15bb1297f7785beafeb7bf9ffe899973bcd60" - integrity sha512-atu1rMpQ0RJdY/EhAvGlk65gweSgTpaq+YoJA5aLc2VX7lBqcUJVWQPLK6cNYheuzl3b9voqTrpopHkM2vBOEw== - dependencies: - "@salesforce/core" "^5.2.0" - "@salesforce/kit" "^3.0.9" - got "^11.8.2" - mime-types "^2.1.27" - proxy-agent "^6.2.1" - tar "^6.1.13" - tslib "^1" - yeoman-environment "^3.9.1" - yeoman-generator "^5.6.1" - "@salesforce/ts-sinon@1.4.15": version "1.4.15" resolved "https://registry.yarnpkg.com/@salesforce/ts-sinon/-/ts-sinon-1.4.15.tgz#6214b73fc53fe0ee2583bbd87d4b4217e557279d" @@ -4127,7 +4076,7 @@ gopd@^1.0.1: dependencies: get-intrinsic "^1.1.3" -got@^11, got@^11.8.2, got@^11.8.6: +got@^11, got@^11.8.6: version "11.8.6" resolved "https://registry.yarnpkg.com/got/-/got-11.8.6.tgz#276e827ead8772eddbcfc97170590b841823233a" integrity sha512-6tfZ91bOr7bOXnK7PRDCGBLa1H4U080YHNaAQ2KsMGlLEzRbk44nsZF2E1IeRc3vtJHPVbKCYgdFbaGO2ljd8g== @@ -5540,7 +5489,7 @@ mime-db@1.52.0: resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.52.0.tgz#bbabcdc02859f4987301c856e3387ce5ec43bf70" integrity sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg== -mime-types@^2.1.12, mime-types@^2.1.27: +mime-types@^2.1.12: version "2.1.35" resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.35.tgz#381a871b62a734450660ae3deee44813f70d959a" integrity sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw== @@ -6787,7 +6736,7 @@ proper-lockfile@^4.1.2: retry "^0.12.0" signal-exit "^3.0.2" -proxy-agent@^6.2.1, proxy-agent@^6.3.0, proxy-agent@^6.3.1: +proxy-agent@^6.3.1: version "6.3.1" resolved "https://registry.yarnpkg.com/proxy-agent/-/proxy-agent-6.3.1.tgz#40e7b230552cf44fd23ffaf7c59024b692612687" integrity sha512-Rb5RVBy1iyqOtNl15Cw/llpeLH8bsb37gM1FUfKQ+Wck6xHlbAhWGUFiTRHtkjqGTA5pSHz6+0hrPW/oECihPQ== @@ -7785,7 +7734,7 @@ tar-stream@^2.2.0: inherits "^2.0.3" readable-stream "^3.1.1" -tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.13, tar@^6.1.2: +tar@^6.0.2, tar@^6.1.0, tar@^6.1.11, tar@^6.1.2: version "6.1.15" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.15.tgz#c9738b0b98845a3b344d334b8fa3041aaba53a69" integrity sha512-/zKt9UyngnxIT/EAGYuxaMYgOIJiP81ab9ZfkILq4oNLPFX50qyYmu7jRj9qeXoxmJHjGlbH0+cm2uy1WCs10A== @@ -7941,7 +7890,7 @@ tsconfig-paths@^3.14.2: minimist "^1.2.6" strip-bom "^3.0.0" -tslib@^1, tslib@^1.8.1, tslib@^1.9.0: +tslib@^1.8.1, tslib@^1.9.0: version "1.14.1" resolved "https://registry.yarnpkg.com/tslib/-/tslib-1.14.1.tgz#cf2d38bdc34a134bcaf1091c41f6619e2f672d00" integrity sha512-Xni35NKzjgMrwevysHTCArtLDpPvye8zV/0E4EyYn43P7/7qvQwPh9BGkHewbMulVntbigmcT7rdX3BNo9wRJg== @@ -8599,7 +8548,7 @@ yargs@^17.0.0, yargs@^17.3.1: y18n "^5.0.5" yargs-parser "^21.1.1" -yeoman-environment@^3.15.1, yeoman-environment@^3.19.3, yeoman-environment@^3.9.1: +yeoman-environment@^3.15.1: version "3.19.3" resolved "https://registry.yarnpkg.com/yeoman-environment/-/yeoman-environment-3.19.3.tgz#49c2339805fdf695fac42c88334a1daa94ee8b6c" integrity sha512-/+ODrTUHtlDPRH9qIC0JREH8+7nsRcjDl3Bxn2Xo/rvAaVvixH5275jHwg0C85g4QsF4P6M2ojfScPPAl+pLAg== @@ -8642,7 +8591,7 @@ yeoman-environment@^3.15.1, yeoman-environment@^3.19.3, yeoman-environment@^3.9. textextensions "^5.12.0" untildify "^4.0.0" -yeoman-generator@^5.10.0, yeoman-generator@^5.6.1, yeoman-generator@^5.8.0: +yeoman-generator@^5.8.0: version "5.10.0" resolved "https://registry.yarnpkg.com/yeoman-generator/-/yeoman-generator-5.10.0.tgz#0dde5be9d815b01f77a7e77ee6f9047edcbeca04" integrity sha512-iDUKykV7L4nDNzeYSedRmSeJ5eMYFucnKDi6KN1WNASXErgPepKqsQw55TgXPHnmpcyOh2Dd/LAZkyc+f0qaAw==