From 1c2277a11e1a3a95114e4ca4f5867693d3a85997 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Fri, 26 Jan 2024 08:22:41 +0000 Subject: [PATCH 1/2] fix(deps): bump @salesforce/sf-plugins-core from 5.0.13 to 7.1.4 Bumps [@salesforce/sf-plugins-core](https://github.com/salesforcecli/sf-plugins-core) from 5.0.13 to 7.1.4. - [Release notes](https://github.com/salesforcecli/sf-plugins-core/releases) - [Changelog](https://github.com/salesforcecli/sf-plugins-core/blob/main/CHANGELOG.md) - [Commits](https://github.com/salesforcecli/sf-plugins-core/compare/5.0.13...7.1.4) --- updated-dependencies: - dependency-name: "@salesforce/sf-plugins-core" dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- package.json | 2 +- yarn.lock | 150 +++++++++++++++++++++++++++++++++++++-------------- 2 files changed, 111 insertions(+), 41 deletions(-) diff --git a/package.json b/package.json index 0a4e2eb1..b59b76be 100644 --- a/package.json +++ b/package.json @@ -9,7 +9,7 @@ "@jayree/changelog": "^1.1.9", "@listr2/prompt-adapter-enquirer": "^2.0.1", "@oclif/core": "^3.18.1", - "@salesforce/sf-plugins-core": "^5.0.13", + "@salesforce/sf-plugins-core": "^7.1.4", "@salesforce/source-deploy-retrieve": "^10.2.13", "@salesforce/ts-types": "^2.0.9", "cli-truncate": "^4.0.0", diff --git a/yarn.lock b/yarn.lock index b24c291a..080d4486 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1093,6 +1093,59 @@ resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-2.0.1.tgz#e5211452df060fa8522b55c7b3c0c4d1981cb044" integrity sha512-dvuCeX5fC9dXgJn9t+X5atfmgQAzUOWqS1254Gh0m6i8wKd10ebXkfNKiRK+1GWi/yTvvLDHpoxLr0xxxeslWw== +"@inquirer/confirm@^2.0.15": + version "2.0.15" + resolved "https://registry.yarnpkg.com/@inquirer/confirm/-/confirm-2.0.15.tgz#b5512ed190efd8c5b96e0969115756b48546ab36" + integrity sha512-hj8Q/z7sQXsF0DSpLQZVDhWYGN6KLM/gNjjqGkpKwBzljbQofGjn0ueHADy4HUY+OqDHmXuwk/bY+tZyIuuB0w== + dependencies: + "@inquirer/core" "^5.1.1" + "@inquirer/type" "^1.1.5" + chalk "^4.1.2" + +"@inquirer/core@^5.1.1": + version "5.1.1" + resolved "https://registry.yarnpkg.com/@inquirer/core/-/core-5.1.1.tgz#849d4846aea68371c133df6ec9059f5e5bd30d30" + integrity sha512-IuJyZQUg75+L5AmopgnzxYrgcU6PJKL0hoIs332G1Gv55CnmZrhG6BzNOeZ5sOsTi1YCGOopw4rYICv74ejMFg== + dependencies: + "@inquirer/type" "^1.1.5" + "@types/mute-stream" "^0.0.4" + "@types/node" "^20.9.0" + "@types/wrap-ansi" "^3.0.0" + ansi-escapes "^4.3.2" + chalk "^4.1.2" + cli-spinners "^2.9.1" + cli-width "^4.1.0" + figures "^3.2.0" + mute-stream "^1.0.0" + run-async "^3.0.0" + signal-exit "^4.1.0" + strip-ansi "^6.0.1" + wrap-ansi "^6.2.0" + +"@inquirer/input@^1.2.14": + version "1.2.14" + resolved "https://registry.yarnpkg.com/@inquirer/input/-/input-1.2.14.tgz#8951867618bb5cd16dd096e02404eec225a92207" + integrity sha512-tISLGpUKXixIQue7jypNEShrdzJoLvEvZOJ4QRsw5XTfrIYfoWFqAjMQLerGs9CzR86yAI89JR6snHmKwnNddw== + dependencies: + "@inquirer/core" "^5.1.1" + "@inquirer/type" "^1.1.5" + chalk "^4.1.2" + +"@inquirer/password@^1.1.14": + version "1.1.14" + resolved "https://registry.yarnpkg.com/@inquirer/password/-/password-1.1.14.tgz#c1fc139efe84a38986870a1bcf80718050f82bbf" + integrity sha512-vL2BFxfMo8EvuGuZYlryiyAB3XsgtbxOcFs4H9WI9szAS/VZCAwdVqs8rqEeaAf/GV/eZOghIOYxvD91IsRWSg== + dependencies: + "@inquirer/input" "^1.2.14" + "@inquirer/type" "^1.1.5" + ansi-escapes "^4.3.2" + chalk "^4.1.2" + +"@inquirer/type@^1.1.5": + version "1.1.5" + resolved "https://registry.yarnpkg.com/@inquirer/type/-/type-1.1.5.tgz#b8c171f755859c8159b10e41e1e3a88f0ca99d7f" + integrity sha512-wmwHvHozpPo4IZkkNtbYenem/0wnfI6hvOcGKmPEa0DwuaH5XUQzFqy6OpEpjEegZMhYIk8HDYITI16BPLtrRA== + "@isaacs/cliui@^8.0.2": version "8.0.2" resolved "https://registry.yarnpkg.com/@isaacs/cliui/-/cliui-8.0.2.tgz#b37667b7bc181c168782259bab42474fbf52b550" @@ -1360,7 +1413,7 @@ node-gyp "^8.2.0" read-package-json-fast "^2.0.1" -"@oclif/core@^3.15.1", "@oclif/core@^3.16.0", "@oclif/core@^3.18.1": +"@oclif/core@^3.16.0", "@oclif/core@^3.18.1": version "3.18.1" resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.18.1.tgz#a8c9ee3848ad663d5694bef6079116c70d32fc55" integrity sha512-l0LsjzGcqjbUEdeSBX6bdZieVmEv82Q0W3StiyaDMEnPZ9KLH28HrLpcZg6d50mCYW9CUZNzmRo6qrCHWrgLKw== @@ -1546,10 +1599,10 @@ resolved "https://registry.yarnpkg.com/@pkgr/core/-/core-0.1.0.tgz#7d8dacb7fdef0e4387caf7396cbd77f179867d06" integrity sha512-Zwq5OCzuwJC2jwqmpEQt7Ds1DTi6BWSwoGkbb1n9pO3hzb35BoJELx7c0T23iDkBGkh2e7tvOtjF3tr3OaQHDQ== -"@salesforce/core@^6.4.1", "@salesforce/core@^6.4.7": - version "6.4.7" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.4.7.tgz#f15538380aa5c75de697d3c95a2ddbdabae69dbb" - integrity sha512-gebjw2xC8Z0gqS3lYRQWz7J+PuGZtybotrnnaJbnzzxdfpBFIp6PjW4nt/235BQW9UWFTLaQh+AwkFgmMTTSkA== +"@salesforce/core@^6.4.7", "@salesforce/core@^6.5.0": + version "6.5.1" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.5.1.tgz#3d387a6f0b93485274ec046dde5cf1364a3a00b0" + integrity sha512-u/R82JGdbJCMY0EN3UY5hQUxn0gPN+ParNQIm9YPB9lDpBQv82nKeZJuH6j2LsaaF6ygY3bm79kftPxpdKbggQ== dependencies: "@salesforce/kit" "^3.0.15" "@salesforce/schemas" "^1.6.1" @@ -1625,18 +1678,18 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.6.1.tgz#7d1c071e1e509ca9d2d8a6e48ac7447dd67a534d" integrity sha512-eVy947ZMxCJReKJdgfddUIsBIbPTa/i8RwQGwxq4/ss38H5sLOAeSTaun9V7HpJ1hkpDznWKfgzYvjsst9K6ig== -"@salesforce/sf-plugins-core@^5.0.13": - version "5.0.13" - resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-5.0.13.tgz#f2941527d66ded5750a6646e146af047ab72acc9" - integrity sha512-b5R8krKeOIkW0hPxvfpm8T5tCSyWW7MDERnJwm/FXq4ueUJsC1/TCWSscyVKPSZ0VRcEFbzOWKJvpV/omB1D9w== +"@salesforce/sf-plugins-core@^7.1.4": + version "7.1.4" + resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-7.1.4.tgz#0aca0e243b9880269c3e2712ca14982eb8515f1e" + integrity sha512-aFV4FhUEz/oyn7JzsoutQp7SBs0Ac07m5uWYI+ngYlhJdd/AC/0IpMqd/BOIBmLzAqos+y6bKR6OqBEqQDaxlw== dependencies: - "@oclif/core" "^3.15.1" - "@salesforce/core" "^6.4.1" + "@inquirer/confirm" "^2.0.15" + "@inquirer/password" "^1.1.14" + "@oclif/core" "^3.18.1" + "@salesforce/core" "^6.5.0" "@salesforce/kit" "^3.0.15" "@salesforce/ts-types" "^2.0.9" - "@types/inquirer" "^8.2.3" - chalk "^4" - inquirer "^8.2.5" + chalk "^5.3.0" "@salesforce/source-deploy-retrieve@^10.2.13": version "10.2.13" @@ -2290,14 +2343,6 @@ resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812" integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ== -"@types/inquirer@^8.2.3": - version "8.2.10" - resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-8.2.10.tgz#9444dce2d764c35bc5bb4d742598aaa4acb6561b" - integrity sha512-IdD5NmHyVjWM8SHWo/kPBgtzXatwPkfwzyP3fN1jF2g9BWt5WO+8hL2F4o2GKIYsU40PpqeevuUWvkS/roXJkA== - dependencies: - "@types/through" "*" - rxjs "^7.2.0" - "@types/istanbul-lib-coverage@^2.0.1": version "2.0.4" resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.4.tgz#8467d4b3c087805d63580480890791277ce35c44" @@ -2359,6 +2404,13 @@ resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197" integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA== +"@types/mute-stream@^0.0.4": + version "0.0.4" + resolved "https://registry.yarnpkg.com/@types/mute-stream/-/mute-stream-0.0.4.tgz#77208e56a08767af6c5e1237be8888e2f255c478" + integrity sha512-CPM9nzrCPPJHQNA9keH9CVkVI+WR5kMa+7XEs5jcGQ0VoAGnLv242w8lIVgwAEfmE4oufJRaTc9PNLQl0ioAow== + dependencies: + "@types/node" "*" + "@types/node@*", "@types/node@^18": version "18.18.9" resolved "https://registry.yarnpkg.com/@types/node/-/node-18.18.9.tgz#5527ea1832db3bba8eb8023ce8497b7d3f299592" @@ -2376,6 +2428,13 @@ resolved "https://registry.yarnpkg.com/@types/node/-/node-15.14.9.tgz#bc43c990c3c9be7281868bbc7b8fdd6e2b57adfa" integrity sha512-qjd88DrCxupx/kJD5yQgZdcYKZKSIGBVDIBE1/LTGcNm3d2Np/jxojkdePDdfnBHJc5W7vSMpbJ1aB7p/Py69A== +"@types/node@^20.9.0": + version "20.11.7" + resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.7.tgz#cb49aedd758c978c30806d0c38b520ed2a3df6e0" + integrity sha512-GPmeN1C3XAyV5uybAf4cMLWT9fDWcmQhZVtMFu7OR32WjrqGG+Wnk2V1d0bmtUyE/Zy1QJ9BxyiTih9z8Oks8A== + dependencies: + undici-types "~5.26.4" + "@types/normalize-package-data@^2.4.0": version "2.4.1" resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301" @@ -2415,13 +2474,6 @@ resolved "https://registry.yarnpkg.com/@types/sinonjs__fake-timers/-/sinonjs__fake-timers-8.1.2.tgz#bf2e02a3dbd4aecaf95942ecd99b7402e03fad5e" integrity sha512-9GcLXF0/v3t80caGs5p2rRfkB+a8VBGLJZVih6CNFkx8IZ994wiKKLSRs9nuFwk1HevWs/1mnUmkApGrSGsShA== -"@types/through@*": - version "0.0.33" - resolved "https://registry.yarnpkg.com/@types/through/-/through-0.0.33.tgz#14ebf599320e1c7851e7d598149af183c6b9ea56" - integrity sha512-HsJ+z3QuETzP3cswwtzt2vEIiHBk/dCcHGhbmG5X3ecnwFD/lPrMpliGXxSCg03L9AhrdwA4Oz/qfspkDW+xGQ== - dependencies: - "@types/node" "*" - "@types/vinyl@^2.0.4": version "2.0.7" resolved "https://registry.yarnpkg.com/@types/vinyl/-/vinyl-2.0.7.tgz#9739a9a2afaf9af32761c54a0e82c735279f726c" @@ -2430,6 +2482,11 @@ "@types/expect" "^1.20.4" "@types/node" "*" +"@types/wrap-ansi@^3.0.0": + version "3.0.0" + resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-3.0.0.tgz#18b97a972f94f60a679fd5c796d96421b9abb9fd" + integrity sha512-ltIpx+kM7g/MLRZfkbL7EsCEjfzCcScLpkg37eXEtx5kmrAKBkTJwd1GIAjDSL8wTpM6Hzn5YO4pSb91BEwu1g== + "@types/wrap-ansi@^8.1.0": version "8.1.0" resolved "https://registry.yarnpkg.com/@types/wrap-ansi/-/wrap-ansi-8.1.0.tgz#0a90383f7df28c5e9d340aa58d53f2e4bc0ba2c2" @@ -3272,7 +3329,7 @@ chalk@^3.0.0: ansi-styles "^4.1.0" supports-color "^7.1.0" -chalk@^4, chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: +chalk@^4.0.0, chalk@^4.0.2, chalk@^4.1.0, chalk@^4.1.1, chalk@^4.1.2: version "4.1.2" resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01" integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA== @@ -3415,6 +3472,11 @@ cli-spinners@^2.5.0: resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.8.0.tgz#e97a3e2bd00e6d85aa0c13d7f9e3ce236f7787fc" integrity sha512-/eG5sJcvEIwxcdYM86k5tPwn0MUzkX5YY3eImTGpJOZgVe4SdTMY14vQpcxgBzJ0wXwAYrS8E+c3uHeK4JNyzQ== +cli-spinners@^2.9.1: + version "2.9.2" + resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.9.2.tgz#1773a8f4b9c4d6ac31563df53b3fc1d79462fe41" + integrity sha512-ywqV+5MmyL4E7ybXgKys4DugZbX0FC6LnwrhjuykIjnK9k8OQacQ7axGKnjDXWNhns0xot3bZI5h55H8yo9cJg== + cli-table3@^0.6.3: version "0.6.3" resolved "https://registry.yarnpkg.com/cli-table3/-/cli-table3-0.6.3.tgz#61ab765aac156b52f222954ffc607a6f01dbeeb2" @@ -3444,6 +3506,11 @@ cli-width@^3.0.0: resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6" integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw== +cli-width@^4.1.0: + version "4.1.0" + resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-4.1.0.tgz#42daac41d3c254ef38ad8ac037672130173691c5" + integrity sha512-ouuZd4/dm2Sw5Gmqy6bGyNNNe1qt9RpmxveLSO7KcgsTnU7RXfsw+/bukWGo1abgBiMAic068rclZsO4IWmmxQ== + cliui@^6.0.0: version "6.0.0" resolved "https://registry.yarnpkg.com/cliui/-/cliui-6.0.0.tgz#511d702c0c4e41ca156d7d0e96021f23e13225b1" @@ -4695,7 +4762,7 @@ faye@^1.4.0: tough-cookie "*" tunnel-agent "*" -figures@^3.0.0: +figures@^3.0.0, figures@^3.2.0: version "3.2.0" resolved "https://registry.yarnpkg.com/figures/-/figures-3.2.0.tgz#625c18bd293c604dc4a8ddb2febf0c88341746af" integrity sha512-yaduQFRKLXYOGgEn6AZau90j3ggSOyiqXU0F9JZfeXYhNa+Jk4X+s45A2zg5jns87GAFa34BBm2kXw4XpNcbdg== @@ -5499,7 +5566,7 @@ inquirer@^7.0.0: strip-ansi "^6.0.0" through "^2.3.6" -inquirer@^8.0.0, inquirer@^8.2.5: +inquirer@^8.0.0: version "8.2.5" resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.2.5.tgz#d8654a7542c35a9b9e069d27e2df4858784d54f8" integrity sha512-QAgPDQMEgrDssk1XiwwHoOGYF9BAbUcc1+j+FhEvaOt8/cKRqyLn0U5qA6F74fGhTMGxf92pOvPBeh29jQJDTQ== @@ -6884,6 +6951,11 @@ mute-stream@0.0.8: resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-0.0.8.tgz#1630c42b2251ff81e2a283de96a5497ea92e5e0d" integrity sha512-nnbWWOkoWyUsTjKrhgD0dcz22mdkSnpYqbEjIm2nhwhuxlSkpywJmBo8h0ZqJdkp73mb90SssHkN4rsRaBAfAA== +mute-stream@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/mute-stream/-/mute-stream-1.0.0.tgz#e31bd9fe62f0aed23520aa4324ea6671531e013e" + integrity sha512-avsJQhyd+680gKXyG/sQc0nXaC6rBkPOfyHYcFb9+hdkqQkR9bdnkJ0AMZhke0oesPqIO+mFFJ+IdBc7mst4IA== + nanoid@3.3.3: version "3.3.3" resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.3.3.tgz#fd8e8b7aa761fe807dba2d1b98fb7241bb724a25" @@ -8170,6 +8242,11 @@ run-async@^2.0.0, run-async@^2.4.0: resolved "https://registry.yarnpkg.com/run-async/-/run-async-2.4.1.tgz#8440eccf99ea3e70bd409d49aab88e10c189a455" integrity sha512-tvVnVv01b8c1RrA6Ep7JkStj85Guv/YrMcwqYQnwjsAS2cTmmPGBBjAjpCW7RrSodNSoE2/qg9O4bceNvUuDgQ== +run-async@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/run-async/-/run-async-3.0.0.tgz#42a432f6d76c689522058984384df28be379daad" + integrity sha512-540WwVDOMxA6dN6We19EcT9sc3hkXPw5mzRNGM3FkdN/vtE9NFvj5lFAPNwUDmJjXidm3v7TC1cTE7t17Ulm1Q== + run-parallel@^1.1.9: version "1.2.0" resolved "https://registry.yarnpkg.com/run-parallel/-/run-parallel-1.2.0.tgz#66d1368da7bdf921eb9d95bd1a9229e7f21a43ee" @@ -8184,13 +8261,6 @@ rxjs@^6.6.0: dependencies: tslib "^1.9.0" -rxjs@^7.2.0: - version "7.8.1" - resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.1.tgz#6f6f3d99ea8044291efd92e7c7fcf562c4057543" - integrity sha512-AA3TVj+0A2iuIoQkWEK/tqFjBq2j+6PO6Y0zJcvzLAFhEFIO3HL0vls9hWLncZbAAbK0mar7oZ4V079I/qPMxg== - dependencies: - tslib "^2.1.0" - rxjs@^7.5.5: version "7.8.0" resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.8.0.tgz#90a938862a82888ff4c7359811a595e14e1e09a4" @@ -8394,7 +8464,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2, signal-exit@^3.0.3, signal-exit@^3.0.7: resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.7.tgz#a9a1767f8af84155114eaabd73f99273c8f59ad9" integrity sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ== -signal-exit@^4.0.1: +signal-exit@^4.0.1, signal-exit@^4.1.0: version "4.1.0" resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-4.1.0.tgz#952188c1cbd546070e2dd20d0f41c0ae0530cb04" integrity sha512-bzyZ1e88w9O1iNJbKnOlvYTrWPDl46O1bG0D3XInv+9tkPrxrN8jUUTiFlDkkmKWgn1M6CfIA13SuGqOa9Korw== From b1defb533b8847a7fd6cc0697504d3a985158131 Mon Sep 17 00:00:00 2001 From: jayree Date: Thu, 1 Feb 2024 14:55:17 +0100 Subject: [PATCH 2/2] chore: fix --- lib/commands/jayree/org/get/settings.js | 2 +- lib/commands/jayree/org/get/settings.js.map | 2 +- src/commands/jayree/org/get/settings.ts | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/commands/jayree/org/get/settings.js b/lib/commands/jayree/org/get/settings.js index 8659aa98..bcb29701 100644 --- a/lib/commands/jayree/org/get/settings.js +++ b/lib/commands/jayree/org/get/settings.js @@ -166,7 +166,7 @@ $ sfdx jayree:org:settings -u MyTestOrg1 -w`, if (flags.writetoprojectscratchdeffile) { const deffilepath = // eslint-disable-next-line @typescript-eslint/await-thenable - flags.file ?? join(await this.project.getPath(), 'config', 'project-scratch-def.json'); + flags.file ?? join(this.project?.getPath(), 'config', 'project-scratch-def.json'); let deffile = {}; await fs .readFile(deffilepath, 'utf8') diff --git a/lib/commands/jayree/org/get/settings.js.map b/lib/commands/jayree/org/get/settings.js.map index 2b94c059..83bad23b 100644 --- a/lib/commands/jayree/org/get/settings.js.map +++ b/lib/commands/jayree/org/get/settings.js.map @@ -1 +1 @@ -{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/get/settings.ts"],"names":[],"mappings":"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"} \ No newline at end of file +{"version":3,"file":"settings.js","sourceRoot":"","sources":["../../../../../src/commands/jayree/org/get/settings.ts"],"names":[],"mappings":"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"} \ No newline at end of file diff --git a/src/commands/jayree/org/get/settings.ts b/src/commands/jayree/org/get/settings.ts index 27734f07..b94d4b53 100644 --- a/src/commands/jayree/org/get/settings.ts +++ b/src/commands/jayree/org/get/settings.ts @@ -215,7 +215,7 @@ $ sfdx jayree:org:settings -u MyTestOrg1 -w`, if (flags.writetoprojectscratchdeffile) { const deffilepath = // eslint-disable-next-line @typescript-eslint/await-thenable - flags.file ?? join(await this.project.getPath(), 'config', 'project-scratch-def.json'); + flags.file ?? join(this.project?.getPath() as string, 'config', 'project-scratch-def.json'); let deffile: JsonMap = {}; await fs