Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
105 commits
Select commit Hold shift + click to select a range
8a1ba14
feat: remove dependence on SDR registry.apiVersion
mshanemc Mar 21, 2022
706783e
fix: manifest create uses sourceApiVersion as fallback from flag
mshanemc Mar 23, 2022
09bb6ee
Merge branch 'main' into sm/remove-hardcoded-api-version
mshanemc Mar 24, 2022
1b9ac17
fix: use SDR 6.0
mshanemc Mar 24, 2022
75c7be8
refactor: sfdxError => sfError from SDR
mshanemc Mar 29, 2022
0c2fd82
test: disable lifecycle event tests (temporary)
mshanemc Mar 29, 2022
e68c4be
Merge remote-tracking branch 'origin/main' into sm/remove-hardcoded-a…
mshanemc May 6, 2022
35a1f04
test: nut updates for ebikes-lwc (utam)
mshanemc May 8, 2022
e06a56c
feat: adjust for new sf paths
mshanemc May 9, 2022
f221253
fix: mdapi deploy negative one
mshanemc May 16, 2022
c32620b
fix: ternary tweaks
iowillhoit May 16, 2022
ebd26a3
fix: -1 for mdapi:report, 0 for mdapi:deploy, -1 for retrieve
mshanemc May 16, 2022
6d874fc
refactor: consistent use of duration/freq for mdapi
mshanemc May 16, 2022
fcfb9dd
test: adjust for new parameter structure
mshanemc May 16, 2022
8a5d0ca
fix: remove ugly debug statement
mshanemc May 16, 2022
6aa2058
refactor: consistent use of pollStatus object param
mshanemc May 16, 2022
ecab1ab
fix: correct default for deploy:report
mshanemc May 16, 2022
0bd87a2
fix: allow -1 for retrieve report
mshanemc May 16, 2022
8f12b5f
refactor: report can be async
mshanemc May 17, 2022
8433f67
Merge branch 'sm/mdapi-deploy-negative-one' into sm/remove-hardcoded-…
mshanemc May 18, 2022
cae7ac4
Merge remote-tracking branch 'origin/main' into sm/remove-hardcoded-a…
mshanemc May 18, 2022
d58db20
refactor: common parking orbit changes for msg/error/table
mshanemc May 18, 2022
d8eddb8
refactor: SfProject
mshanemc May 18, 2022
17d7c21
test: updates for oclif and passing UT
mshanemc May 18, 2022
56dc1a7
refactor: message effects of sfdxError.create()
mshanemc May 18, 2022
afbfa18
fix: sfdxCommand leaves SfError
mshanemc May 19, 2022
2c693bf
test: expect sfError
mshanemc May 19, 2022
985f4de
test: all nuts are passing locally
mshanemc May 19, 2022
2e26ef9
feat: add code coverage and junt reports to deploy and deploy report
peternhale May 19, 2022
ea1acc7
chore: bump jsforce
mshanemc May 19, 2022
d48ebf4
Merge remote-tracking branch 'origin/main' into sm/parking-orbit
mshanemc May 19, 2022
62349f8
chore: ensure miss when looking for source files
peternhale May 20, 2022
6f21057
chore: apply review comments
peternhale May 20, 2022
6314a2e
chore: apply review changes requests
peternhale May 20, 2022
75585cd
chore: bump core
mshanemc May 21, 2022
40fee44
chore: bump sdr
mshanemc May 23, 2022
df71211
chore: redo snapshot
mshanemc May 23, 2022
61867f2
chore: parking orbit version of STL
mshanemc May 23, 2022
d83ce15
test: restore hooks tests
mshanemc May 23, 2022
4bbb9e0
chore: bump sdr
mshanemc May 24, 2022
db70cac
chore: merge pete's test coverage branch
mshanemc May 30, 2022
6594ef8
chore: dedupe yarn
mshanemc May 30, 2022
3d39b34
refactor: isolate deployCommand messages
mshanemc May 30, 2022
b83ebc0
test: mock globalinfo
mshanemc May 30, 2022
3704365
chore: snapshot for new coverage flags
mshanemc May 30, 2022
e16ce31
chore: bump oclif/core
mshanemc May 30, 2022
608f17b
chore: remove oclif/config
mshanemc May 30, 2022
76a5ea2
chore: ts-next is happier
mshanemc May 30, 2022
e2ca76d
test: more nuts manually to bin/dev
mshanemc May 31, 2022
5bb18de
test: sfError
mshanemc May 31, 2022
388711b
test: executable for --tracksource flag nut
mshanemc May 31, 2022
7186fe6
Merge branch 'main' into sm/parking-orbit
mshanemc May 31, 2022
061005d
chore: more renaming from coverage reporters
mshanemc May 31, 2022
50c3bda
chore: snapshot
mshanemc May 31, 2022
533d9a3
test: bin/dev for nested lwc
mshanemc May 31, 2022
7217192
chore: bump dev plugins to parking-orbit versions
mshanemc May 31, 2022
a162222
chore: bin/dev on source-testkit
mshanemc May 31, 2022
9b809f4
refactor: redundant executable
mshanemc May 31, 2022
9e9e37f
fix: default min line number to 1 when 100 pct coverage (#494)
peternhale May 31, 2022
8c88099
feat: tests use new testkit versions, defaulting to bin/dev
mshanemc May 31, 2022
2a6b7b4
refactor: type cleanup
mshanemc May 31, 2022
5a055fc
chore: more type fix
mshanemc May 31, 2022
14fe978
fix: test and nut for deploy coverage reports
mshanemc May 31, 2022
5dbb362
chore: bump source-testkit
mshanemc May 31, 2022
0b4bdd8
fix: code from main
mshanemc Jun 1, 2022
221c697
chore: bump core, let deps use their core version
mshanemc Jun 1, 2022
c5d7ff0
test: don't assign permsets that don't exist in repo
mshanemc Jun 1, 2022
b0050de
test: fix rest delpoyments for --validate after --checkonly
mshanemc Jun 1, 2022
ee6b8ef
chore: bump testkit for rm retries
mshanemc Jun 1, 2022
f1d2afa
test: make test match describe/it
mshanemc Jun 1, 2022
d85732e
ci: higher timeout
mshanemc Jun 1, 2022
ad7ae03
test: nuts more likely to catch the "silent ghost error"
mshanemc Jun 1, 2022
261c7d9
test: report non-json result
mshanemc Jun 2, 2022
5959883
chore: circle debug tracking (revert me)
mshanemc Jun 2, 2022
5e6f561
test: always clear globalinfo for cpTestkit
mshanemc Jun 2, 2022
25cd17b
chore: bump core for stateAggregator
mshanemc Jun 6, 2022
ed1f3a5
Revert "chore: circle debug tracking (revert me)"
mshanemc Jun 6, 2022
cac8d23
chore: bump testkits
mshanemc Jun 6, 2022
07cc845
ci: check keychain
mshanemc Jun 6, 2022
d7648b6
ci: revert environment
mshanemc Jun 6, 2022
25655df
ci: nuts with updated context plus async nuts
mshanemc Jun 6, 2022
59aaa4c
ci: bump testkits again
mshanemc Jun 6, 2022
d6c034a
ci: build with resolution to test branch
mshanemc Jun 7, 2022
5791c52
ci: v3 resolutions won't allow command-ref/snapshots
mshanemc Jun 7, 2022
5e656b3
ci: use core with crypto cache fix
mshanemc Jun 8, 2022
25b8636
chore: dependencies
mshanemc Jun 8, 2022
636ef91
test: make sure setup and prep commands are successful
mshanemc Jun 8, 2022
9f73ac8
chore: bump core for stateAggregator and crypto cache fix
mshanemc Jun 8, 2022
3a64568
feat: bump sdr for mdapi fault protection
mshanemc Jun 8, 2022
a327a29
ci: not the async nuts again
mshanemc Jun 8, 2022
8d968bd
fix: use CliUx from oclif/core
mshanemc Jun 8, 2022
d5940e1
ci: restore post-test script [ci-skip]
mshanemc Jun 8, 2022
6f0ef80
chore: remove cli-ux (use oclif/core)
mshanemc Jun 8, 2022
ab900db
ci: restore v4 release plugin
mshanemc Jun 13, 2022
49c3ecc
Merge remote-tracking branch 'origin/main' into sm/parking-orbit
mshanemc Jun 13, 2022
378afe9
style: remove -a from source:status examples
mshanemc Jun 14, 2022
072579d
feat: delete has stdout for "checkonly"
mshanemc Jun 14, 2022
81b80a2
feat: you must provide some retrieve target
mshanemc Jun 14, 2022
9002a95
fix: use correct table column in deploy errors
mshanemc Jun 14, 2022
18914c1
refactor: move check only messaging to prompt
mshanemc Jun 15, 2022
1e81726
feat: success messages for deploy
mshanemc Jun 15, 2022
dcbb020
style: messages end in periods
mshanemc Jun 15, 2022
14d817a
test: adjust ut for success log
mshanemc Jun 15, 2022
16f1b19
test: update nuts for ebikes changes
mshanemc Jun 15, 2022
dcccaa7
refactor: correct flag name
mshanemc Jun 15, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ workflows:
size: large
requires:
- release-management/test-package
no_output_timeout: 30m
matrix:
parameters:
os:
Expand All @@ -75,7 +76,7 @@ workflows:
- 'yarn test:nuts:commands:other'
- 'yarn test:nuts:delete'
- 'yarn test:nuts:deploy'
- 'yarn test:nuts:deploy:async'
# - 'yarn test:nuts:deploy:async'
- 'yarn test:nuts:deploy:rest'
- 'yarn test:nuts:manifest:create'
- 'yarn test:nuts:retrieve'
Expand Down
17 changes: 17 additions & 0 deletions bin/dev
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
#!/usr/bin/env node

const oclif = require('@oclif/core');

const path = require('path');
const project = path.join(__dirname, '..', 'tsconfig.json');

// In dev mode -> use ts-node and dev plugins
process.env.NODE_ENV = 'development';

require('ts-node').register({ project });

// In dev mode, always show stack traces
oclif.settings.debug = true;

// Start the CLI
oclif.run().then(oclif.flush).catch(oclif.Errors.handle);
4 changes: 4 additions & 0 deletions bin/dev.cmd
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
@@ -0,0 +1,3 @@
@echo off

node "%~dp0\dev" %*
4 changes: 2 additions & 2 deletions bin/run
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
#!/usr/bin/env node

require('@oclif/command').run()
.catch(require('@oclif/errors/handle'))
require('@oclif/core').run().then(require('@oclif/core/flush')).catch(require('@oclif/core/handle'));

119 changes: 119 additions & 0 deletions command-snapshot.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,95 @@
"flags": ["json", "loglevel"],
"alias": []
},
{
"command": "force:mdapi:beta:convert",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks like some duplicate entries in the snapshot.

"plugin": "@salesforce/plugin-source",
"flags": ["json", "loglevel", "manifest", "metadata", "metadatapath", "outputdir", "rootdir"],
"alias": ["force:mdapi:beta:convert"]
},
{
"command": "force:mdapi:beta:deploy",
"plugin": "@salesforce/plugin-source",
"flags": [
"apiversion",
"checkonly",
"concise",
"coverageformatters",
"deploydir",
"ignoreerrors",
"ignorewarnings",
"json",
"junit",
"loglevel",
"purgeondelete",
"resultsdir",
"runtests",
"singlepackage",
"soapdeploy",
"targetusername",
"testlevel",
"validateddeployrequestid",
"verbose",
"wait",
"zipfile"
],
"alias": ["force:mdapi:beta:deploy"]
},
{
"command": "force:mdapi:beta:deploy:report",
"plugin": "@salesforce/plugin-source",
"flags": [
"apiversion",
"concise",
"coverageformatters",
"jobid",
"json",
"junit",
"loglevel",
"resultsdir",
"targetusername",
"verbose",
"wait"
],
"alias": ["force:mdapi:beta:deploy:report"]
},
{
"command": "force:mdapi:beta:retrieve",
"plugin": "@salesforce/plugin-source",
"flags": [
"apiversion",
"json",
"loglevel",
"packagenames",
"retrievetargetdir",
"singlepackage",
"sourcedir",
"targetusername",
"unpackaged",
"unzip",
"verbose",
"wait",
"zipfilename"
],
"alias": ["force:mdapi:beta:retrieve"]
},
{
"command": "force:mdapi:beta:retrieve:report",
"plugin": "@salesforce/plugin-source",
"flags": [
"apiversion",
"jobid",
"json",
"loglevel",
"retrievetargetdir",
"targetusername",
"unzip",
"verbose",
"wait",
"zipfilename"
],
"alias": ["force:mdapi:beta:retrieve:report"]
},
{
"command": "force:mdapi:convert",
"plugin": "@salesforce/plugin-source",
Expand Down Expand Up @@ -112,6 +201,36 @@
],
"alias": ["force:mdapi:beta:retrieve:report"]
},
{
"command": "force:source:beta:pull",
"plugin": "@salesforce/plugin-source",
"flags": ["apiversion", "forceoverwrite", "json", "loglevel", "targetusername", "wait"],
"alias": ["force:source:beta:pull"]
},
{
"command": "force:source:beta:push",
"plugin": "@salesforce/plugin-source",
"flags": ["apiversion", "forceoverwrite", "ignorewarnings", "json", "loglevel", "quiet", "targetusername", "wait"],
"alias": ["force:source:beta:push"]
},
{
"command": "force:source:beta:status",
"plugin": "@salesforce/plugin-source",
"flags": ["apiversion", "concise", "json", "local", "loglevel", "remote", "targetusername"],
"alias": ["force:source:beta:status"]
},
{
"command": "force:source:beta:tracking:clear",
"plugin": "@salesforce/plugin-source",
"flags": ["apiversion", "json", "loglevel", "noprompt", "targetusername"],
"alias": ["force:source:beta:tracking:clear"]
},
{
"command": "force:source:beta:tracking:reset",
"plugin": "@salesforce/plugin-source",
"flags": ["apiversion", "json", "loglevel", "noprompt", "revision", "targetusername"],
"alias": ["force:source:beta:tracking:reset"]
},
{
"command": "force:source:convert",
"plugin": "@salesforce/plugin-source",
Expand Down
3 changes: 2 additions & 1 deletion messages/delete.json
Original file line number Diff line number Diff line change
Expand Up @@ -42,5 +42,6 @@
"localPrompt": "This operation will delete the following files on your computer and in your org: \n%s",
"remotePrompt": "This operation will delete the following metadata in your org: \n%s",
"deployPrompt": "This operation will deploy the following: \n%s",
"areYouSure": "\n\nAre you sure you want to proceed (y/n)?"
"areYouSure": "\n\nAre you sure you want to proceed (y/n)?",
"areYouSureCheckOnly": "\n\nAre you sure you want to proceed (this is only a check and won't actually delete anything) (y/n)?"
}
3 changes: 2 additions & 1 deletion messages/deploy.json
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,8 @@
]
},
"checkOnlySuccess": "Successfully validated the deployment. %s components deployed and %s tests run.\nUse the --verbose parameter to see detailed output.",
"MissingDeployId": "No deploy ID was provided or found in deploy history.",
"checkOnlySuccessVerbose": "Successfully validated the deployment.",
"deploySuccess": "Deploy Succeeded.",
"deployCanceled": "The deployment has been canceled by %s.",
"deployFailed": "Deploy failed.",
"asyncDeployQueued": "Deploy has been queued.",
Expand Down
4 changes: 3 additions & 1 deletion messages/deployCommand.json
Original file line number Diff line number Diff line change
@@ -1,3 +1,5 @@
{
"resultsDirMissing": "You must supply the --resultsdir parameter when choosing to produce code coverage or JUnit reports."
"resultsDirMissing": "You must supply the --resultsdir parameter when choosing to produce code coverage or JUnit reports.",
"MissingDeployId": "No deploy ID was provided or found in deploy history.",
"invalidDeployId": "The provided ID is invalid, deploy IDs must start with '0Af'."
}
4 changes: 2 additions & 2 deletions messages/md.cancel.json
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@
"waitLong": "Number of minutes to wait for the command to complete and display results to the terminal window. If the command continues to run after the wait period, the CLI returns control of the terminal window to you. The default is 33 minutes.",
"jobid": "job ID of the deployment you want to cancel; defaults to your most recent CLI deployment if not specified"
},

"examples": [
"Deploy a directory of files to the org",
" $ sfdx force:mdapi:deploy -d <directory>",
Expand All @@ -16,5 +15,6 @@
" $ sfdx force:mdapi:deploy:cancel -i <jobid>",
"Check the status of the cancel job",
" $ sfdx force:mdapi:deploy:report"
]
],
"CancelFailed": "The cancel command failed due to: %s"
}
1 change: 0 additions & 1 deletion messages/report.json
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
" $ sfdx force:source:deploy -d <directory>",
"Now cancel this deployment and wait two minutes",
" $ sfdx force:source:deploy:cancel -w 2",

"If you have multiple deployments in progress and want to cancel a specific one, specify the job ID",
" $ sfdx force:source:deploy:cancel -i <jobid>",
"Check the status of the cancel job",
Expand Down
1 change: 1 addition & 0 deletions messages/retrieve.json
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@
"columnNumberColumn": "COLUMN NUMBER",
"lineNumberColumn": "LINE NUMBER",
"errorColumn": "PROBLEM",
"nothingToRetrieve": "Specify a source path, manifest, metadata, or package names to retrieve.",
"wantsToRetrieveCustomFields": "Because you're retrieving one or more CustomFields, we're also retrieving the CustomObject to which it's associated.",
"retrieveWontDelete": "You currently have files deleted in your org. The retrieve command will NOT delete them from your local project"
}
4 changes: 2 additions & 2 deletions messages/status.json
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@
"examples": [
"$ sfdx force:source:status -l",
"$ sfdx force:source:status -r",
"$ sfdx force:source:status -a",
"$ sfdx force:source:status -a -u me@example.com --json"
"$ sfdx force:source:status",
"$ sfdx force:source:status -u me@example.com --json"
],
"flags": {
"all": "list all the changes that have been made",
Expand Down
43 changes: 21 additions & 22 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,41 +1,40 @@
{
"name": "@salesforce/plugin-source",
"description": "Commands to interact with source formatted metadata",
"version": "1.10.2",
"version": "2.0.0",
"author": "Salesforce",
"main": "lib/index.js",
"bugs": "https://github.com/forcedotcom/cli/issues",
"dependencies": {
"@oclif/config": "^1.18.3",
"@oclif/core": "^1.9.0",
"@oclif/plugin-help": "^3.3.1",
"@salesforce/apex-node": "^0.13.0",
"@salesforce/command": "^4.2.2",
"@salesforce/core": "^2.35.0",
"@salesforce/source-deploy-retrieve": "^5.12.14",
"@salesforce/source-tracking": "^1.4.2",
"@salesforce/command": "^5.1.2",
"@salesforce/core": "^3.20.1",
"@salesforce/kit": "^1.5.41",
"@salesforce/source-deploy-retrieve": "^6.0.3",
"@salesforce/source-tracking": "^2.0.0",
"chalk": "^4.1.2",
"cli-ux": "^5.6.3",
"got": "^11.8.3",
"jsforce": "2.0.0-beta.10",
"open": "^8.4.0",
"proxy-agent": "^5.0.0",
"proxy-from-env": "^1.1.0",
"tslib": "^2"
},
"devDependencies": {
"@oclif/dev-cli": "^1",
"@oclif/plugin-command-snapshot": "^3.1.2",
"@salesforce/cli-plugins-testkit": "^1.5.28",
"@salesforce/cli-plugins-testkit": "^2.2.0",
"@salesforce/dev-config": "^3.0.1",
"@salesforce/dev-scripts": "^2.0.0",
"@salesforce/plugin-command-reference": "^1.3.18",
"@salesforce/plugin-config": "^1.3.30",
"@salesforce/plugin-user": "^1.7.1",
"@salesforce/plugin-config": "^2.3.2",
"@salesforce/plugin-user": "^2.0.2",
"@salesforce/prettier-config": "^0.0.2",
"@salesforce/source-testkit": "^0.0.16",
"@salesforce/source-testkit": "^1.2.0",
"@salesforce/ts-sinon": "1.3.21",
"@types/archiver": "^5.1.1",
"@types/debug": "^4.1.7",
"@types/jsforce": "^1.9.39",
"@types/proxy-from-env": "^1.0.1",
"@types/shelljs": "^0.8.11",
"@typescript-eslint/eslint-plugin": "^4.33.0",
Expand All @@ -57,9 +56,9 @@
"eslint-plugin-prettier": "^4.0.0",
"fast-glob": "^3.2.7",
"husky": "^7.0.4",
"lint-staged": "^12.3.2",
"mocha": "^9.1.3",
"nyc": "^15.1.0",
"oclif": "^3.0.1",
"prettier": "^2.5.1",
"pretty-quick": "^3.1.3",
"salesforcedx-templates": "^49.8.0",
Expand Down Expand Up @@ -151,8 +150,8 @@
"prepare": "sf-install",
"pretest": "sf-compile-test",
"test": "sf-test",
"test:command-reference": "./bin/run commandreference:generate --erroronwarnings",
"test:deprecation-policy": "./bin/run snapshot:compare",
"test:command-reference": "./bin/dev commandreference:generate --erroronwarnings",
"test:deprecation-policy": "./bin/dev snapshot:compare",
"test:nuts": "ts-node ./test/nuts/generateNuts.ts && nyc mocha \"**/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
"test:nuts:commands:other": "mocha \"test/nuts/open.nut.ts\" \"test/nuts/ignored_list.nut.ts\" --slow 4500 --timeout 600000 --retries 0 --parallel",
"test:nuts:convert": "cross-env PLUGIN_SOURCE_SEED_FILTER=convert ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
Expand All @@ -166,25 +165,25 @@
"test:nuts:deploy:rest": "mocha \"test/nuts/REST/*.nut.ts\" --slow 3000 --timeout 600000 --retries 0 --parallel",
"test:nuts:deploy:sourcepath": "cross-env PLUGIN_SOURCE_SEED_FILTER=deploy.sourcepath ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
"test:nuts:deploy:testlevel": "cross-env PLUGIN_SOURCE_SEED_FILTER=deploy.testlevel ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
"test:nuts:folders": "mocha \"test/nuts/folderTypes.nut.ts\" --slow 4500 --timeout 600000",
"test:nuts:manifest:create": "mocha \"test/nuts/create.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
"test:nuts:mdapi": "mocha \"test/nuts/mdapi.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:nestedLwc": "mocha \"test/nuts/nestedLwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:retrieve": "cross-env PLUGIN_SOURCE_SEED_FILTER=retrieve ts-node ./test/nuts/generateNuts.ts && mocha \"test/nuts/generated/*.nut.ts\" --slow 4500 --timeout 600000 --parallel --retries 0",
"test:nuts:specialTypes": "mocha \"test/nuts/territory2.nut.ts\" \"test/nuts/folderTypes.nut.ts\" \"test/nuts/translation.nut.ts\" \"test/nuts/nestedLwc.nut.ts\" --slow 4500 --timeout 600000 --retries 0 --parallel",
"test:nuts:territory2": "mocha \"test/nuts/territory2.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
"test:nuts:specialTypes:folders": "mocha \"test/nuts/folderTypes.nut.ts\" --slow 4500 --timeout 600000",
"test:nuts:specialTypes:nestedLwc": "mocha \"test/nuts/nestedLwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:specialTypes:territory2": "mocha \"test/nuts/territory2.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
"test:nuts:specialTypes:translations": "mocha \"test/nuts/translation.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
"test:nuts:tracking": "mocha \"test/nuts/trackingCommands/*.nut.ts\" --slow 3000 --timeout 600000 --parallel --retries 0",
"test:nuts:tracking:basics": "mocha \"test/nuts/trackingCommands/basics.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:conflicts": "mocha \"test/nuts/trackingCommands/conflicts.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:flag": "mocha \"test/nuts/trackingCommands/deployRetrieveDelete.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:forceignore": "mocha \"test/nuts/trackingCommands/forceIgnore.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:lwc": "mocha \"test/nuts/trackingCommands/lwc.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:mpd": "mocha \"test/nuts/trackingCommands/mpd*\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:mpd": "mocha \"test/nuts/trackingCommands/mpd*\" --slow 3000 --timeout 600000 --retries 0 -parallel",
"test:nuts:tracking:remote": "mocha \"test/nuts/trackingCommands/remoteChanges.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:tracking:resetClear": "mocha \"test/nuts/trackingCommands/resetClear.nut.ts\" --slow 3000 --timeout 600000 --retries 0",
"test:nuts:translations": "mocha \"test/nuts/translation.nut.ts\" --slow 4500 --timeout 600000 --retries 0",
"test:watch": "mocha --watch \"./test/**/*.test.ts\"",
"version": "oclif-dev readme"
"version": "oclif readme"
},
"publishConfig": {
"access": "public"
Expand Down
6 changes: 3 additions & 3 deletions src/commands/force.ts
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@

import { SfdxCommand } from '@salesforce/command';
import got from 'got';
import { Help } from '@oclif/plugin-help';
import { Help } from '@oclif/core';
import * as ProxyAgent from 'proxy-agent';
import { getProxyForUrl } from 'proxy-from-env';
import { ConfigAggregator } from '@salesforce/core';
Expand Down Expand Up @@ -80,10 +80,10 @@ export class ForceCommand extends SfdxCommand {
}

// overrides the help so that it shows the help for the `force` topic and not "help" for this command
protected _help(): never {
protected _help(): void {
const help = new Help(this.config);
// We need to include force in the args for topics to be shown
help.showHelp(process.argv.slice(2));
void help.showHelp(process.argv.slice(2));
return this.exit(0);
}
}
8 changes: 4 additions & 4 deletions src/commands/force/mdapi/deploy.ts
Original file line number Diff line number Diff line change
Expand Up @@ -173,10 +173,10 @@ export class Deploy extends DeployCommand {

protected formatResult(): MdDeployResult | DeployCommandAsyncResult {
this.resultsDir = this.resolveOutputDir(
this.flags.coverageformatters,
this.flags.junit,
this.flags.resultsdir,
this.deployResult?.response.id,
this.getFlag<string[]>('coverageformatters', undefined),
this.getFlag<boolean>('junit'),
this.getFlag<string>('resultsdir'),
this.deployResult?.response?.id,
true
);

Expand Down
Loading