Skip to content

Commit

Permalink
fix: remove ts-types wrapper (#785)
Browse files Browse the repository at this point in the history
* fix: remove ts-types wrapper

* chore: dep bumps
  • Loading branch information
mshanemc authored Dec 15, 2023
1 parent 7946320 commit 9f8d610
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 58 deletions.
8 changes: 4 additions & 4 deletions package.json
Original file line number Diff line number Diff line change
Expand Up @@ -7,16 +7,16 @@
"dependencies": {
"@oclif/core": "^3.14.1",
"@salesforce/core": "^6.4.0",
"@salesforce/sf-plugins-core": "^5.0.3",
"change-case": "^4.1.2",
"@salesforce/sf-plugins-core": "^5.0.10",
"change-case": "^5.3.0",
"open": "^9.1.0"
},
"devDependencies": {
"@oclif/plugin-command-snapshot": "^5.0.2",
"@oclif/plugin-command-snapshot": "^5.0.4",
"@oclif/test": "^3.1.3",
"@salesforce/cli-plugins-testkit": "^5.1.1",
"@salesforce/dev-scripts": "^8.1.2",
"@salesforce/plugin-command-reference": "^3.0.48",
"@salesforce/plugin-command-reference": "^3.0.54",
"eslint-plugin-sf-plugin": "^1.16.15",
"oclif": "^4.0.4",
"shx": "0.3.4",
Expand Down
3 changes: 1 addition & 2 deletions src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
* For full license text, see LICENSE.txt file in the repo root or https://opensource.org/licenses/BSD-3-Clause
*/

import { isArray } from '@salesforce/ts-types';
import { capitalCase } from 'change-case';
import { JsonObject } from '@salesforce/sf-plugins-core';

export function toValue(val: JsonObject[keyof JsonObject]): string | boolean | number {
if (!val && val !== false) return '';
if (isArray(val)) return val.join(', ');
if (Array.isArray(val)) return val.join(', ');
return val;
}

Expand Down
91 changes: 39 additions & 52 deletions yarn.lock
Original file line number Diff line number Diff line change
Expand Up @@ -737,7 +737,7 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.11.0", "@oclif/core@^3.12.0", "@oclif/core@^3.14.1", "@oclif/core@^3.3.1":
"@oclif/core@^3.0.4", "@oclif/core@^3.10.8", "@oclif/core@^3.12.0", "@oclif/core@^3.14.1", "@oclif/core@^3.3.1":
version "3.14.1"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.14.1.tgz#634fc96124068e47b720d62f3b278d818a07495e"
integrity sha512-HLFL2s45DFdqYI2CFjVS/CIQ4cQ4yZqH0XqO9nnwcRWYboz2rEW/vLmidjIYGDjh6xA/k5psiAL3O1KEjqSHuQ==
Expand Down Expand Up @@ -770,20 +770,20 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/plugin-command-snapshot@^5.0.2":
version "5.0.2"
resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.0.2.tgz#41e88d245e1ffb1822b4cb127df39f61672cf2b1"
integrity sha512-4Aun0P/K9uVC5JLmG968OJhDT5HMiOs4mmw7A2cWmf1Paw8zp4xZ40PvYOOKN86gaKukKFDTQ1sDuLBzqNhZow==
"@oclif/plugin-command-snapshot@^5.0.4":
version "5.0.4"
resolved "https://registry.yarnpkg.com/@oclif/plugin-command-snapshot/-/plugin-command-snapshot-5.0.4.tgz#d80cf80cdf8e6a21cddbea607c5a39c96d577b87"
integrity sha512-dsogNsY/k9D9aoceEWZhGklHBCIsJQpVAKwRKSQkrzhvesi/qB4reEfcuWGy1FtJihTVEVSGLdGBIz2Wu1XApA==
dependencies:
"@oclif/core" "^3.10.8"
"@types/lodash.difference" "^4.5.8"
"@types/lodash.difference" "^4.5.9"
chalk "^5.3.0"
just-diff "^5.2.0"
lodash.difference "^4.5.0"
lodash.get "^4.4.2"
lodash.sortby "^4.7.0"
semver "^7.5.4"
ts-json-schema-generator "^1.4.0"
ts-json-schema-generator "^1.5.0"

"@oclif/plugin-help@^5.2.14":
version "5.2.14"
Expand Down Expand Up @@ -966,10 +966,10 @@
semver "^7.5.4"
ts-retry-promise "^0.7.1"

"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.4.0":
version "6.4.0"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.4.0.tgz#09e856194c8dad5bd0d86e271e84c3c47304f508"
integrity sha512-zbUuOll6RnaOyO6vHGjaO6mv2SBimu2JzInubBrbx+bgw5KFVT0y+OrN0gEhBPS94VoC9/N6ZRKve+vQ82zmmA==
"@salesforce/core@^6.2.2", "@salesforce/core@^6.4.0":
version "6.4.1"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.4.1.tgz#27edd083b62ee96d6270b60da6dfb959bff1a0a5"
integrity sha512-Bn/Pox5JLeVBg35zgSmtNU+f9wdOaa7a/hmCIvQibci1dpKtLGUmSpdHibWR6zHag8ZoRkueea7zuqEjYzECyA==
dependencies:
"@salesforce/kit" "^3.0.15"
"@salesforce/schemas" "^1.6.1"
Expand Down Expand Up @@ -1035,15 +1035,15 @@
"@salesforce/ts-types" "^2.0.9"
tslib "^2.6.2"

"@salesforce/plugin-command-reference@^3.0.48":
version "3.0.48"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.48.tgz#ca24930520e40266864dbe7ba51529ec446b35fc"
integrity sha512-eC8ZagVwBFJVxuls0bfomdtLhGbh6YxKbQKTWAVVvBDEEUvSxcpoeGhYHKRfYJU+4Wwa7GdwK86LTmAy/PD0KQ==
"@salesforce/plugin-command-reference@^3.0.54":
version "3.0.54"
resolved "https://registry.yarnpkg.com/@salesforce/plugin-command-reference/-/plugin-command-reference-3.0.54.tgz#55718d05e4d6192056c7de0811c7209bdf75d9db"
integrity sha512-qTdkyVVn2g6KCnkrULfdo3fzGij3mN/H/UvqnNBwsE74dJdUBUKcFqWZCHxFbNLnItu6VFz4QaSmrtJQb3Td2w==
dependencies:
"@oclif/core" "^3.12.0"
"@salesforce/core" "^5.3.20"
"@oclif/core" "^3.14.1"
"@salesforce/core" "^6.4.0"
"@salesforce/kit" "^3.0.15"
"@salesforce/sf-plugins-core" "^4"
"@salesforce/sf-plugins-core" "^5.0.8"
"@salesforce/ts-types" "^2.0.9"
chalk "^4"
handlebars "^4.7.8"
Expand All @@ -1059,26 +1059,13 @@
resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d"
integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig==

"@salesforce/sf-plugins-core@^4":
version "4.1.3"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-4.1.3.tgz#06fa96fec1903fe945def9303eb8c43058625a3d"
integrity sha512-cia0FRknxeQU0IK5gOxlP2KGxqc5zxwSmHLKJsd5+sUFWpn3Hnun/3rDO94UXIDjuGKV7HK08hQNBKkSLeYaRA==
dependencies:
"@oclif/core" "^3.11.0"
"@salesforce/core" "^6.1.0"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.9"
"@types/inquirer" "^8.2.3"
chalk "^4"
inquirer "^8.2.5"

"@salesforce/sf-plugins-core@^5.0.3":
version "5.0.3"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.3.tgz#a771dc887c0a13ac23a5b1c16a6965791914f3aa"
integrity sha512-D+RCUzrYIWpJakNfxtHXJd6LZr6bK4gA4e7jLPR1G1FmDFss13PT7hOdFRxmAqTPbcp1jf65vwYZzu5nbqzmvQ==
"@salesforce/sf-plugins-core@^5.0.10", "@salesforce/sf-plugins-core@^5.0.8":
version "5.0.10"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.10.tgz#f13cc406100f9aba3a9d5ddea361854068fc7e7d"
integrity sha512-fp0f6Lbf7HDdglvU4pWmwnWt9HlgMOIdkQ0LeT7M0zbuu6tOMwGKcC6ewkXQ9lQvcSAUrtvvvpf9t4PzkN8o+w==
dependencies:
"@oclif/core" "^3.11.0"
"@salesforce/core" "^6.1.3"
"@oclif/core" "^3.14.1"
"@salesforce/core" "^6.2.2"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.9"
"@types/inquirer" "^8.2.3"
Expand Down Expand Up @@ -1262,10 +1249,10 @@
dependencies:
"@types/node" "*"

"@types/lodash.difference@^4.5.8":
version "4.5.8"
resolved "https://registry.yarnpkg.com/@types/lodash.difference/-/lodash.difference-4.5.8.tgz#25acd0acfd3472c61b9d5629b014c21b921905fe"
integrity sha512-oamKsq2RK81RuwvG32/E8wRu/ldOz5XH04zeIyFDcJyGeebg17h0WOtyrkhDmINhr/2Noz6geO2AYfnQDxtapQ==
"@types/lodash.difference@^4.5.9":
version "4.5.9"
resolved "https://registry.yarnpkg.com/@types/lodash.difference/-/lodash.difference-4.5.9.tgz#69e82a68557779abac489585f43159997cab874c"
integrity sha512-MNlajcjtwzLpXk+cw38UkBvEXJNEPhULgS8A4EHwtUwT7f7yFH/SFKD0iw5Rfilwh60yJIgFo0vsMr7xsa5+aw==
dependencies:
"@types/lodash" "*"

Expand Down Expand Up @@ -2210,6 +2197,11 @@ change-case@^4, change-case@^4.1.2:
snake-case "^3.0.4"
tslib "^2.0.3"

change-case@^5.3.0:
version "5.3.0"
resolved "https://registry.yarnpkg.com/change-case/-/change-case-5.3.0.tgz#b2fc5a8bea0cf8b4856a5a9aaf79abd8ea5309f6"
integrity sha512-Eykca0fGS/xYlx2fG5NqnGSnsWauhSGiSXYhB1kO6E909GUfo8S54u4UZNS7lMJmgZumZ2SUpWaoLgAcfQRICg==

chardet@^0.7.0:
version "0.7.0"
resolved "https://registry.yarnpkg.com/chardet/-/chardet-0.7.0.tgz#90094849f0937f2eedc2425d0d28a9e5f0cbad9e"
Expand Down Expand Up @@ -7354,18 +7346,18 @@ ts-api-utils@^1.0.1:
resolved "https://registry.yarnpkg.com/ts-api-utils/-/ts-api-utils-1.0.3.tgz#f12c1c781d04427313dbac808f453f050e54a331"
integrity sha512-wNMeqtMz5NtwpT/UZGY5alT+VoKdSsOOP/kqHFcUW1P/VRhH2wJ48+DN2WwUliNbQ976ETwDL0Ifd2VVvgonvg==

ts-json-schema-generator@^1.4.0:
version "1.4.0"
resolved "https://registry.yarnpkg.com/ts-json-schema-generator/-/ts-json-schema-generator-1.4.0.tgz#f341b36792c372d3d09245414a4f3a6efa2697f8"
integrity sha512-wm8vyihmGgYpxrqRshmYkWGNwEk+sf3xV2rUgxv8Ryeh7bSpMO7pZQOht+2rS002eDkFTxR7EwRPXVzrS0WJTg==
ts-json-schema-generator@^1.5.0:
version "1.5.0"
resolved "https://registry.yarnpkg.com/ts-json-schema-generator/-/ts-json-schema-generator-1.5.0.tgz#9f5cea606c27ebcf13060157542ac1d3b225430f"
integrity sha512-RkiaJ6YxGc5EWVPfyHxszTmpGxX8HC2XBvcFlAl1zcvpOG4tjjh+eXioStXJQYTvr9MoK8zCOWzAUlko3K0DiA==
dependencies:
"@types/json-schema" "^7.0.12"
commander "^11.0.0"
glob "^8.0.3"
json5 "^2.2.3"
normalize-path "^3.0.0"
safe-stable-stringify "^2.4.3"
typescript "~5.2.2"
typescript "~5.3.2"

ts-node@^10.8.1, ts-node@^10.9.1, ts-node@^10.9.2:
version "10.9.2"
Expand Down Expand Up @@ -7533,16 +7525,11 @@ typescript@^4.6.4, typescript@^4.9.5:
resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.9.5.tgz#095979f9bcc0d09da324d58d03ce8f8374cbe65a"
integrity sha512-1FXk9E2Hm+QzZQ7z+McJiHL4NW1F2EzMu9Nq9i3zAaGqibafqYwCVU6WyWAuyQRRzOlxou8xZSyXLEN8oKj24g==

typescript@^5.3.3:
typescript@^5.3.3, typescript@~5.3.2:
version "5.3.3"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.3.3.tgz#b3ce6ba258e72e6305ba66f5c9b452aaee3ffe37"
integrity sha512-pXWcraxM0uxAS+tN0AG/BF2TyqmHO014Z070UsJ+pFvYuRSq8KH8DmWpnbXe0pEPDHXZV3FcAbJkijJ5oNEnWw==

typescript@~5.2.2:
version "5.2.2"
resolved "https://registry.yarnpkg.com/typescript/-/typescript-5.2.2.tgz#5ebb5e5a5b75f085f22bc3f8460fba308310fa78"
integrity sha512-mI4WrpHsbCIcwT9cF4FZvr80QUeKvsUsUvKDoR+X/7XHQH98xYD8YHZg7ANtz2GtZt/CBq2QJ0thkGJMHfqc1w==

uglify-js@^3.1.4:
version "3.16.0"
resolved "https://registry.npmjs.org/uglify-js/-/uglify-js-3.16.0.tgz#b778ba0831ca102c1d8ecbdec2d2bdfcc7353190"
Expand Down

0 comments on commit 9f8d610

Please sign in to comment.