Skip to content

Commit

Permalink
feat: support for flags-dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@mshanemc
mshanemc committed Mar 22, 2024
1 parent 4142706 commit f5634c2
Show file tree
Hide file tree
Showing 4 changed files with 77 additions and 92 deletions.
56 changes: 47 additions & 9 deletions command-snapshot.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,17 @@
"command": "project:convert:mdapi",
"flagAliases": ["apiversion", "metadatapath", "outputdir", "rootdir"],
"flagChars": ["d", "m", "p", "r", "x"],
"flags": ["api-version", "json", "loglevel", "manifest", "metadata", "metadata-dir", "output-dir", "root-dir"],
"flags": [
"api-version",
"flags-dir",
"json",
"loglevel",
"manifest",
"metadata",
"metadata-dir",
"output-dir",
"root-dir"
],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
Expand All @@ -14,6 +24,7 @@
"flagChars": ["d", "m", "n", "p", "r", "x"],
"flags": [
"api-version",
"flags-dir",
"json",
"loglevel",
"manifest",
Expand Down Expand Up @@ -43,6 +54,7 @@
"flags": [
"api-version",
"check-only",
"flags-dir",
"force-overwrite",
"json",
"loglevel",
Expand All @@ -63,39 +75,60 @@
"command": "project:delete:tracking",
"flagAliases": ["apiversion", "noprompt", "targetusername", "u"],
"flagChars": ["o", "p"],
"flags": ["api-version", "json", "loglevel", "no-prompt", "target-org"],
"flags": ["api-version", "flags-dir", "json", "loglevel", "no-prompt", "target-org"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["deploy:metadata:cancel"],
"command": "project:deploy:cancel",
"flagAliases": [],
"flagChars": ["i", "r", "w"],
"flags": ["async", "job-id", "json", "use-most-recent", "wait"],
"flags": ["async", "flags-dir", "job-id", "json", "use-most-recent", "wait"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["deploy:metadata:preview"],
"command": "project:deploy:preview",
"flagAliases": [],
"flagChars": ["c", "d", "m", "o", "x"],
"flags": ["ignore-conflicts", "json", "manifest", "metadata", "source-dir", "target-org", "concise"],
"flags": ["concise", "flags-dir", "ignore-conflicts", "json", "manifest", "metadata", "source-dir", "target-org"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["deploy:metadata:quick"],
"command": "project:deploy:quick",
"flagAliases": [],
"flagChars": ["a", "i", "o", "r", "w"],
"flags": ["api-version", "async", "concise", "job-id", "json", "target-org", "use-most-recent", "verbose", "wait"],
"flags": [
"api-version",
"async",
"concise",
"flags-dir",
"job-id",
"json",
"target-org",
"use-most-recent",
"verbose",
"wait"
],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["deploy:metadata:report"],
"command": "project:deploy:report",
"flagAliases": [],
"flagChars": ["i", "o", "r", "w"],
"flags": ["coverage-formatters", "job-id", "json", "junit", "results-dir", "target-org", "use-most-recent", "wait"],
"flags": [
"coverage-formatters",
"flags-dir",
"job-id",
"json",
"junit",
"results-dir",
"target-org",
"use-most-recent",
"wait"
],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
Expand All @@ -106,6 +139,7 @@
"flags": [
"concise",
"coverage-formatters",
"flags-dir",
"job-id",
"json",
"junit",
Expand All @@ -127,6 +161,7 @@
"concise",
"coverage-formatters",
"dry-run",
"flags-dir",
"ignore-conflicts",
"ignore-errors",
"ignore-warnings",
Expand Down Expand Up @@ -159,6 +194,7 @@
"async",
"concise",
"coverage-formatters",
"flags-dir",
"ignore-warnings",
"json",
"junit",
Expand Down Expand Up @@ -195,6 +231,7 @@
"flagChars": ["c", "d", "m", "n", "p", "t"],
"flags": [
"api-version",
"flags-dir",
"from-org",
"include-packages",
"json",
Expand All @@ -212,23 +249,23 @@
"command": "project:list:ignored",
"flagAliases": ["sourcepath"],
"flagChars": ["p"],
"flags": ["json", "source-dir"],
"flags": ["flags-dir", "json", "source-dir"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["force:source:tracking:reset"],
"command": "project:reset:tracking",
"flagAliases": ["apiversion", "noprompt", "targetusername", "u"],
"flagChars": ["o", "p", "r"],
"flags": ["api-version", "json", "loglevel", "no-prompt", "revision", "target-org"],
"flags": ["api-version", "flags-dir", "json", "loglevel", "no-prompt", "revision", "target-org"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
"alias": ["retrieve:metadata:preview"],
"command": "project:retrieve:preview",
"flagAliases": [],
"flagChars": ["c", "o"],
"flags": ["concise", "ignore-conflicts", "json", "target-org"],
"flags": ["concise", "flags-dir", "ignore-conflicts", "json", "target-org"],
"plugin": "@salesforce/plugin-deploy-retrieve"
},
{
Expand All @@ -238,6 +275,7 @@
"flagChars": ["a", "c", "d", "m", "n", "o", "r", "t", "w", "x", "z"],
"flags": [
"api-version",
"flags-dir",
"ignore-conflicts",
"json",
"manifest",
Expand Down
8 changes: 4 additions & 4 deletions package.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@
"author": "Salesforce",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/core": "^3.23.0",
"@oclif/core": "^3.26.0",
"@salesforce/apex-node": "^3.1.0",
"@salesforce/core": "^6.7.1",
"@salesforce/core": "^6.7.3",
"@salesforce/kit": "^3.0.15",
"@salesforce/plugin-info": "^3.0.28",
"@salesforce/sf-plugins-core": "^7.1.15",
"@salesforce/source-deploy-retrieve": "^10.5.3",
"@salesforce/sf-plugins-core": "^8.0.0",
"@salesforce/source-deploy-retrieve": "^10.5.5",
"@salesforce/source-tracking": "^5.1.18",
"@salesforce/ts-types": "^2.0.9",
"chalk": "^5.3.0"
Expand Down
4 changes: 3 additions & 1 deletion test/commands/delete/source.test.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,9 @@ describe('project delete source', () => {
const defaultPackagePath = 'defaultPackagePath';
const confirm = true;

const oclifConfigStub = fromStub(stubInterface<Config>($$.SANDBOX));
const oclifConfigStub = fromStub(
stubInterface<Config>($$.SANDBOX, { runHook: async () => ({ failures: [], successes: [] }) })
);

// Stubs
let buildComponentSetStub: sinon.SinonStub;
Expand Down
101 changes: 23 additions & 78 deletions yarn.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1865,44 +1865,10 @@
wordwrap "^1.0.0"
wrap-ansi "^7.0.0"

"@oclif/core@^3.11.0", "@oclif/core@^3.15.1", "@oclif/core@^3.18.1", "@oclif/core@^3.18.2", "@oclif/core@^3.19.1", "@oclif/core@^3.19.2", "@oclif/core@^3.20.0", "@oclif/core@^3.23.0":
version "3.23.0"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.23.0.tgz#d0ccc5f99c376e4bcfce04e8e94efae8417a53f8"
integrity sha512-giQ/8Ft8yXWg4IyPVtynPb7ihoQsa3A/1Q53UIJIhh+8k+EedE3lJ01yn6sq6Ha35IGqsG1WhkeHzlJIuldEaw==
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.3"
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/core@^3.25.2":
version "3.25.3"
resolved "https://registry.yarnpkg.com/@oclif/core/-/core-3.25.3.tgz#dac0e604c33267f879d3233cd4d0730146db4793"
integrity sha512-2TLZmqnDZos9h73KbrdKqvUQEXIPpUfEzgIfqdQRZwszfk1RtiHAb/7ihtnJICnRRVXlD4XLDmUlY4cFJ0ka4g==
"@oclif/core@^3.11.0", "@oclif/core@^3.15.1", "@oclif/core@^3.18.1", "@oclif/core@^3.18.2", "@oclif/core@^3.19.1", "@oclif/core@^3.19.2", "@oclif/core@^3.20.0", "@oclif/core@^3.23.0", "@oclif/core@^3.25.2", "@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==
dependencies:
"@types/cli-progress" "^3.11.5"
ansi-escapes "^4.3.2"
Expand Down Expand Up @@ -2127,10 +2093,10 @@
strip-ansi "6.0.1"
ts-retry-promise "^0.8.0"

"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.4.1", "@salesforce/core@^6.5.1", "@salesforce/core@^6.5.2", "@salesforce/core@^6.5.3", "@salesforce/core@^6.6.0", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1":
version "6.7.1"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.1.tgz#4dcfb62bc3d488462ea6e9438ff092cf202c1696"
integrity sha512-SxscNdH2l+K5LmqH9XrosX+fjhPkMLN3hsG50sWQi7DbaI1Z0FGAKVOmVe6fZZsUsVNThKvZ+159IwwtxHWY6w==
"@salesforce/core@^6.1.0", "@salesforce/core@^6.1.3", "@salesforce/core@^6.4.1", "@salesforce/core@^6.5.1", "@salesforce/core@^6.5.2", "@salesforce/core@^6.5.3", "@salesforce/core@^6.6.0", "@salesforce/core@^6.7.0", "@salesforce/core@^6.7.1", "@salesforce/core@^6.7.3":
version "6.7.3"
resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-6.7.3.tgz#5d8f30c40ac3cebb898c8e845fe9a067bc729268"
integrity sha512-uU+PuZZGXxByhvnXLH1V3eY5P1caw401dIZ/QvhzYxoP/alPLk7dpChnZNJYH5Rw3dc/AhSPw+eg0cvUyjhP1Q==
dependencies:
"@salesforce/kit" "^3.0.15"
"@salesforce/schemas" "^1.6.1"
Expand Down Expand Up @@ -2267,7 +2233,7 @@
chalk "^4"
inquirer "^8.2.5"

"@salesforce/sf-plugins-core@^7.1.11", "@salesforce/sf-plugins-core@^7.1.15":
"@salesforce/sf-plugins-core@^7.1.11":
version "7.1.15"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-7.1.15.tgz#4d6033d56d78cf6046abfce96c119a8a60ee7c07"
integrity sha512-dQSSIHEpeFIadkWqZE24068m01vy31hVJdGWYvgscTnNrR30jIC5fXRevYvGG0l+8vVEJkCYYnJFQabUjSw3Eg==
Expand All @@ -2280,29 +2246,23 @@
"@salesforce/ts-types" "^2.0.9"
chalk "^5.3.0"

"@salesforce/source-deploy-retrieve@^10.0.0", "@salesforce/source-deploy-retrieve@^10.5.1":
version "10.5.1"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.5.1.tgz#4afa68b715d269764f995a79b224b4f848f670ff"
integrity sha512-4xeVhKzi0wpzlwKj06hAL3EjJaRuMyx7xZsTr8T0/GFaEfsML14aUV3imMd0V3DcZRJ2oo+a9UrUYy5KnP76Kw==
"@salesforce/sf-plugins-core@^8.0.0":
version "8.0.0"
resolved "https://registry.yarnpkg.com/@salesforce/sf-plugins-core/-/sf-plugins-core-8.0.0.tgz#00bea58d60075f6bf22679bad01a0debe5768dd9"
integrity sha512-S1ZAIn2aIi0qR7NBGVTmL8V1I62lDTEGWRlljNrdxx8qEFnz0Gt6LTdz0330FtVUIvJNPzvsAPOyjWjvlxDeow==
dependencies:
"@salesforce/core" "^6.7.0"
"@inquirer/confirm" "^2.0.17"
"@inquirer/password" "^1.1.16"
"@oclif/core" "^3.23.0"
"@salesforce/core" "^6.6.0"
"@salesforce/kit" "^3.0.15"
"@salesforce/ts-types" "^2.0.9"
fast-levenshtein "^3.0.0"
fast-xml-parser "^4.3.5"
got "^11.8.6"
graceful-fs "^4.2.11"
ignore "^5.3.1"
jszip "^3.10.1"
mime "2.6.0"
minimatch "^5.1.6"
proxy-agent "^6.4.0"
ts-retry-promise "^0.7.1"
chalk "^5.3.0"

"@salesforce/source-deploy-retrieve@^10.5.3":
version "10.5.3"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.5.3.tgz#c994a5522ce187bfc59bbdb76edfb550453a8025"
integrity sha512-gw28Co2twQ6GSIF94DdWxx6htBLWKIsMhaKlydfymoAp3kZrFmALRPh8Dj8RDQWV8wrSmzWqDFX9iGoldHZDbg==
"@salesforce/source-deploy-retrieve@^10.0.0", "@salesforce/source-deploy-retrieve@^10.5.1", "@salesforce/source-deploy-retrieve@^10.5.3", "@salesforce/source-deploy-retrieve@^10.5.5":
version "10.5.5"
resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-10.5.5.tgz#c2680de777e4b392a5f02631ca1cd385cad72c93"
integrity sha512-o+c/qD9QojXIPMOuteUSdrbx/GI9HS0jFv49NcVrZX1Rzm/ZUk5JHkLzJtiUVQOEnBg4VVnFh2rBarPh0x6dWg==
dependencies:
"@salesforce/core" "^6.7.0"
"@salesforce/kit" "^3.0.15"
Expand Down Expand Up @@ -2334,22 +2294,7 @@
shelljs "^0.8.4"
sinon "^10.0.0"

"@salesforce/source-tracking@^5.0.0":
version "5.1.14"
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.14.tgz#ae2c02d687099e68508e327545f3b123a71dced2"
integrity sha512-wrxFM5Wz4GekH4R+eAd+h780K4qNIU7/77Frua5HDHvORcj07zGR8prJ2zG2/bbYwaclojexH9zHi0RHe2LMoA==
dependencies:
"@oclif/core" "^3.23.0"
"@salesforce/core" "^6.7.0"
"@salesforce/kit" "^3.0.15"
"@salesforce/source-deploy-retrieve" "^10.5.1"
"@salesforce/ts-types" "^2.0.9"
fast-xml-parser "^4.2.5"
graceful-fs "^4.2.11"
isomorphic-git "1.23.0"
ts-retry-promise "^0.8.0"

"@salesforce/source-tracking@^5.1.18":
"@salesforce/source-tracking@^5.0.0", "@salesforce/source-tracking@^5.1.18":
version "5.1.18"
resolved "https://registry.yarnpkg.com/@salesforce/source-tracking/-/source-tracking-5.1.18.tgz#aea622c04ac199b2288b3a94c6b8e8f207c438f7"
integrity sha512-V8itdxwfP72Kq26psNdxi3JI3tQRdxzViKUQM5w33B6vahWJS3P3nBOzIFJGu+J9/SMDUHRpPYTwUL84yXdoyA==
Expand Down

0 comments on commit f5634c2

Please sign in to comment.