sfdx-hardis 6.0.4-beta202508121754.0 → 6.0.5-beta202508132214.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +9 -0
- package/lib/commands/hardis/cache/clear.js +2 -1
- package/lib/commands/hardis/cache/clear.js.map +1 -1
- package/lib/commands/hardis/config/get.js +1 -1
- package/lib/commands/hardis/config/get.js.map +1 -1
- package/lib/commands/hardis/doc/extract/permsetgroups.js +5 -5
- package/lib/commands/hardis/doc/extract/permsetgroups.js.map +1 -1
- package/lib/commands/hardis/doc/fieldusage.js +5 -5
- package/lib/commands/hardis/doc/fieldusage.js.map +1 -1
- package/lib/commands/hardis/doc/flow2markdown.js +2 -2
- package/lib/commands/hardis/doc/flow2markdown.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-cf.js +19 -19
- package/lib/commands/hardis/doc/mkdocs-to-cf.js.map +1 -1
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js +12 -12
- package/lib/commands/hardis/doc/mkdocs-to-salesforce.js.map +1 -1
- package/lib/commands/hardis/doc/override-prompts.js +14 -14
- package/lib/commands/hardis/doc/override-prompts.js.map +1 -1
- package/lib/commands/hardis/doc/plugin/generate.js +4 -4
- package/lib/commands/hardis/doc/plugin/generate.js.map +1 -1
- package/lib/commands/hardis/doc/project2markdown.d.ts +1 -0
- package/lib/commands/hardis/doc/project2markdown.js +52 -42
- package/lib/commands/hardis/doc/project2markdown.js.map +1 -1
- package/lib/commands/hardis/git/pull-requests/extract.js +1 -1
- package/lib/commands/hardis/git/pull-requests/extract.js.map +1 -1
- package/lib/commands/hardis/lint/access.js +7 -7
- package/lib/commands/hardis/lint/access.js.map +1 -1
- package/lib/commands/hardis/lint/metadatastatus.js +1 -1
- package/lib/commands/hardis/lint/metadatastatus.js.map +1 -1
- package/lib/commands/hardis/lint/missingattributes.js +1 -1
- package/lib/commands/hardis/lint/missingattributes.js.map +1 -1
- package/lib/commands/hardis/lint/unusedmetadatas.js +13 -13
- package/lib/commands/hardis/lint/unusedmetadatas.js.map +1 -1
- package/lib/commands/hardis/mdapi/deploy.js +3 -3
- package/lib/commands/hardis/mdapi/deploy.js.map +1 -1
- package/lib/commands/hardis/misc/custom-label-translations.js +18 -18
- package/lib/commands/hardis/misc/custom-label-translations.js.map +1 -1
- package/lib/commands/hardis/misc/purge-references.js +2 -2
- package/lib/commands/hardis/misc/purge-references.js.map +1 -1
- package/lib/commands/hardis/misc/servicenow-report.js +8 -8
- package/lib/commands/hardis/misc/servicenow-report.js.map +1 -1
- package/lib/commands/hardis/misc/toml2csv.js +16 -16
- package/lib/commands/hardis/misc/toml2csv.js.map +1 -1
- package/lib/commands/hardis/org/community/update.js +5 -5
- package/lib/commands/hardis/org/community/update.js.map +1 -1
- package/lib/commands/hardis/org/configure/data.js +5 -5
- package/lib/commands/hardis/org/configure/data.js.map +1 -1
- package/lib/commands/hardis/org/configure/files.js +1 -1
- package/lib/commands/hardis/org/configure/files.js.map +1 -1
- package/lib/commands/hardis/org/configure/monitoring.js +11 -11
- package/lib/commands/hardis/org/configure/monitoring.js.map +1 -1
- package/lib/commands/hardis/org/create.js +7 -7
- package/lib/commands/hardis/org/create.js.map +1 -1
- package/lib/commands/hardis/org/data/delete.js +1 -1
- package/lib/commands/hardis/org/data/delete.js.map +1 -1
- package/lib/commands/hardis/org/data/export.js +1 -1
- package/lib/commands/hardis/org/data/export.js.map +1 -1
- package/lib/commands/hardis/org/data/import.js +1 -1
- package/lib/commands/hardis/org/data/import.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/audittrail.js +14 -14
- package/lib/commands/hardis/org/diagnose/audittrail.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js +3 -3
- package/lib/commands/hardis/org/diagnose/instanceupgrade.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/legacyapi.js +17 -17
- package/lib/commands/hardis/org/diagnose/legacyapi.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/licenses.js +2 -2
- package/lib/commands/hardis/org/diagnose/licenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/releaseupdates.js +3 -3
- package/lib/commands/hardis/org/diagnose/releaseupdates.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js +7 -7
- package/lib/commands/hardis/org/diagnose/unused-apex-classes.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js +7 -7
- package/lib/commands/hardis/org/diagnose/unused-connected-apps.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js +10 -10
- package/lib/commands/hardis/org/diagnose/unusedlicenses.js.map +1 -1
- package/lib/commands/hardis/org/diagnose/unusedusers.js +3 -3
- package/lib/commands/hardis/org/diagnose/unusedusers.js.map +1 -1
- package/lib/commands/hardis/org/files/export.js +1 -1
- package/lib/commands/hardis/org/files/export.js.map +1 -1
- package/lib/commands/hardis/org/files/import.js +1 -1
- package/lib/commands/hardis/org/files/import.js.map +1 -1
- package/lib/commands/hardis/org/fix/listviewmine.js +1 -1
- package/lib/commands/hardis/org/fix/listviewmine.js.map +1 -1
- package/lib/commands/hardis/org/generate/packagexmlfull.js +3 -3
- package/lib/commands/hardis/org/generate/packagexmlfull.js.map +1 -1
- package/lib/commands/hardis/org/monitor/all.js +10 -10
- package/lib/commands/hardis/org/monitor/all.js.map +1 -1
- package/lib/commands/hardis/org/monitor/backup.js +22 -22
- package/lib/commands/hardis/org/monitor/backup.js.map +1 -1
- package/lib/commands/hardis/org/monitor/limits.js +4 -4
- package/lib/commands/hardis/org/monitor/limits.js.map +1 -1
- package/lib/commands/hardis/org/multi-org-query.js +8 -8
- package/lib/commands/hardis/org/multi-org-query.js.map +1 -1
- package/lib/commands/hardis/org/purge/apexlog.js +2 -2
- package/lib/commands/hardis/org/purge/apexlog.js.map +1 -1
- package/lib/commands/hardis/org/purge/flow.js +14 -14
- package/lib/commands/hardis/org/purge/flow.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/packageconfig.js +3 -3
- package/lib/commands/hardis/org/retrieve/packageconfig.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/analytics.js +3 -3
- package/lib/commands/hardis/org/retrieve/sources/analytics.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx.js +11 -11
- package/lib/commands/hardis/org/retrieve/sources/dx.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/dx2.js +2 -2
- package/lib/commands/hardis/org/retrieve/sources/dx2.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/metadata.js +16 -16
- package/lib/commands/hardis/org/retrieve/sources/metadata.js.map +1 -1
- package/lib/commands/hardis/org/retrieve/sources/retrofit.js +11 -11
- package/lib/commands/hardis/org/retrieve/sources/retrofit.js.map +1 -1
- package/lib/commands/hardis/org/select.js +2 -2
- package/lib/commands/hardis/org/select.js.map +1 -1
- package/lib/commands/hardis/org/test/apex.js +8 -8
- package/lib/commands/hardis/org/test/apex.js.map +1 -1
- package/lib/commands/hardis/org/user/activateinvalid.js +7 -7
- package/lib/commands/hardis/org/user/activateinvalid.js.map +1 -1
- package/lib/commands/hardis/org/user/freeze.js +10 -10
- package/lib/commands/hardis/org/user/freeze.js.map +1 -1
- package/lib/commands/hardis/org/user/unfreeze.js +10 -10
- package/lib/commands/hardis/org/user/unfreeze.js.map +1 -1
- package/lib/commands/hardis/package/create.js +1 -1
- package/lib/commands/hardis/package/create.js.map +1 -1
- package/lib/commands/hardis/package/install.js +1 -1
- package/lib/commands/hardis/package/install.js.map +1 -1
- package/lib/commands/hardis/package/mergexml.js +1 -1
- package/lib/commands/hardis/package/mergexml.js.map +1 -1
- package/lib/commands/hardis/package/version/create.js +2 -2
- package/lib/commands/hardis/package/version/create.js.map +1 -1
- package/lib/commands/hardis/package/version/promote.js +3 -3
- package/lib/commands/hardis/package/version/promote.js.map +1 -1
- package/lib/commands/hardis/project/audit/apiversion.js +8 -8
- package/lib/commands/hardis/project/audit/apiversion.js.map +1 -1
- package/lib/commands/hardis/project/audit/callincallout.js +2 -2
- package/lib/commands/hardis/project/audit/callincallout.js.map +1 -1
- package/lib/commands/hardis/project/audit/duplicatefiles.js +4 -4
- package/lib/commands/hardis/project/audit/duplicatefiles.js.map +1 -1
- package/lib/commands/hardis/project/audit/remotesites.js +2 -2
- package/lib/commands/hardis/project/audit/remotesites.js.map +1 -1
- package/lib/commands/hardis/project/clean/emptyitems.js +3 -3
- package/lib/commands/hardis/project/clean/emptyitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/filter-xml-content.js +14 -14
- package/lib/commands/hardis/project/clean/filter-xml-content.js.map +1 -1
- package/lib/commands/hardis/project/clean/flowpositions.js +3 -3
- package/lib/commands/hardis/project/clean/flowpositions.js.map +1 -1
- package/lib/commands/hardis/project/clean/hiddenitems.js +3 -3
- package/lib/commands/hardis/project/clean/hiddenitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/listviews.js +3 -3
- package/lib/commands/hardis/project/clean/listviews.js.map +1 -1
- package/lib/commands/hardis/project/clean/manageditems.js +2 -2
- package/lib/commands/hardis/project/clean/manageditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/minimizeprofiles.js +4 -4
- package/lib/commands/hardis/project/clean/minimizeprofiles.js.map +1 -1
- package/lib/commands/hardis/project/clean/orgmissingitems.js +5 -5
- package/lib/commands/hardis/project/clean/orgmissingitems.js.map +1 -1
- package/lib/commands/hardis/project/clean/references.js +8 -8
- package/lib/commands/hardis/project/clean/references.js.map +1 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js +1 -1
- package/lib/commands/hardis/project/clean/retrievefolders.js.map +1 -1
- package/lib/commands/hardis/project/clean/sensitive-metadatas.js +3 -3
- package/lib/commands/hardis/project/clean/sensitive-metadatas.js.map +1 -1
- package/lib/commands/hardis/project/clean/standarditems.js +5 -5
- package/lib/commands/hardis/project/clean/standarditems.js.map +1 -1
- package/lib/commands/hardis/project/clean/systemdebug.js +2 -2
- package/lib/commands/hardis/project/clean/systemdebug.js.map +1 -1
- package/lib/commands/hardis/project/clean/xml.js +5 -5
- package/lib/commands/hardis/project/clean/xml.js.map +1 -1
- package/lib/commands/hardis/project/configure/auth.js +3 -3
- package/lib/commands/hardis/project/configure/auth.js.map +1 -1
- package/lib/commands/hardis/project/convert/profilestopermsets.js +2 -2
- package/lib/commands/hardis/project/convert/profilestopermsets.js.map +1 -1
- package/lib/commands/hardis/project/create.js +4 -4
- package/lib/commands/hardis/project/create.js.map +1 -1
- package/lib/commands/hardis/project/deploy/notify.js +4 -4
- package/lib/commands/hardis/project/deploy/notify.js.map +1 -1
- package/lib/commands/hardis/project/deploy/smart.js +25 -25
- package/lib/commands/hardis/project/deploy/smart.js.map +1 -1
- package/lib/commands/hardis/project/deploy/sources/metadata.js +7 -7
- package/lib/commands/hardis/project/deploy/sources/metadata.js.map +1 -1
- package/lib/commands/hardis/project/fix/profiletabs.js +2 -2
- package/lib/commands/hardis/project/fix/profiletabs.js.map +1 -1
- package/lib/commands/hardis/project/fix/v53flexipages.js +4 -4
- package/lib/commands/hardis/project/fix/v53flexipages.js.map +1 -1
- package/lib/commands/hardis/project/generate/bypass.js +20 -20
- package/lib/commands/hardis/project/generate/bypass.js.map +1 -1
- package/lib/commands/hardis/project/generate/flow-git-diff.js +2 -2
- package/lib/commands/hardis/project/generate/flow-git-diff.js.map +1 -1
- package/lib/commands/hardis/project/generate/gitdelta.js +3 -3
- package/lib/commands/hardis/project/generate/gitdelta.js.map +1 -1
- package/lib/commands/hardis/project/lint.js +3 -3
- package/lib/commands/hardis/project/lint.js.map +1 -1
- package/lib/commands/hardis/project/metadata/findduplicates.js +7 -7
- package/lib/commands/hardis/project/metadata/findduplicates.js.map +1 -1
- package/lib/commands/hardis/scratch/create.js +14 -14
- package/lib/commands/hardis/scratch/create.js.map +1 -1
- package/lib/commands/hardis/scratch/delete.js +1 -1
- package/lib/commands/hardis/scratch/delete.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/create.js +3 -3
- package/lib/commands/hardis/scratch/pool/create.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/localauth.js +1 -1
- package/lib/commands/hardis/scratch/pool/localauth.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/refresh.js +13 -13
- package/lib/commands/hardis/scratch/pool/refresh.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/reset.js +4 -4
- package/lib/commands/hardis/scratch/pool/reset.js.map +1 -1
- package/lib/commands/hardis/scratch/pool/view.js +4 -4
- package/lib/commands/hardis/scratch/pool/view.js.map +1 -1
- package/lib/commands/hardis/scratch/pull.js +3 -2
- package/lib/commands/hardis/scratch/pull.js.map +1 -1
- package/lib/commands/hardis/source/deploy.js +3 -3
- package/lib/commands/hardis/source/deploy.js.map +1 -1
- package/lib/commands/hardis/source/push.js +3 -3
- package/lib/commands/hardis/source/push.js.map +1 -1
- package/lib/commands/hardis/source/retrieve.js +3 -3
- package/lib/commands/hardis/source/retrieve.js.map +1 -1
- package/lib/commands/hardis/work/new.js +16 -16
- package/lib/commands/hardis/work/new.js.map +1 -1
- package/lib/commands/hardis/work/refresh.js +12 -12
- package/lib/commands/hardis/work/refresh.js.map +1 -1
- package/lib/commands/hardis/work/resetselection.js +3 -3
- package/lib/commands/hardis/work/resetselection.js.map +1 -1
- package/lib/commands/hardis/work/save.js +35 -29
- package/lib/commands/hardis/work/save.js.map +1 -1
- package/lib/common/aiProvider/agentforceProvider.js +5 -5
- package/lib/common/aiProvider/agentforceProvider.js.map +1 -1
- package/lib/common/aiProvider/index.js +6 -6
- package/lib/common/aiProvider/index.js.map +1 -1
- package/lib/common/aiProvider/langchainProvider.js +7 -7
- package/lib/common/aiProvider/langchainProvider.js.map +1 -1
- package/lib/common/aiProvider/openaiProvider.js +5 -5
- package/lib/common/aiProvider/openaiProvider.js.map +1 -1
- package/lib/common/aiProvider/promptTemplates.js +4 -4
- package/lib/common/aiProvider/promptTemplates.js.map +1 -1
- package/lib/common/docBuilder/docBuilderPackageXml.js +3 -3
- package/lib/common/docBuilder/docBuilderPackageXml.js.map +1 -1
- package/lib/common/docBuilder/docBuilderRoles.js +2 -2
- package/lib/common/docBuilder/docBuilderRoles.js.map +1 -1
- package/lib/common/docBuilder/docBuilderRoot.js +4 -4
- package/lib/common/docBuilder/docBuilderRoot.js.map +1 -1
- package/lib/common/docBuilder/docUtils.js +7 -7
- package/lib/common/docBuilder/docUtils.js.map +1 -1
- package/lib/common/docBuilder/objectModelBuilder.js +1 -1
- package/lib/common/docBuilder/objectModelBuilder.js.map +1 -1
- package/lib/common/gitProvider/azureDevops.js +31 -31
- package/lib/common/gitProvider/azureDevops.js.map +1 -1
- package/lib/common/gitProvider/bitbucket.js +16 -16
- package/lib/common/gitProvider/bitbucket.js.map +1 -1
- package/lib/common/gitProvider/gitProviderRoot.js +10 -10
- package/lib/common/gitProvider/gitProviderRoot.js.map +1 -1
- package/lib/common/gitProvider/github.js +11 -11
- package/lib/common/gitProvider/github.js.map +1 -1
- package/lib/common/gitProvider/gitlab.js +6 -6
- package/lib/common/gitProvider/gitlab.js.map +1 -1
- package/lib/common/gitProvider/index.js +14 -14
- package/lib/common/gitProvider/index.js.map +1 -1
- package/lib/common/gitProvider/utilsMarkdown.js +2 -2
- package/lib/common/gitProvider/utilsMarkdown.js.map +1 -1
- package/lib/common/keyValueProviders/localtest.js +1 -1
- package/lib/common/keyValueProviders/localtest.js.map +1 -1
- package/lib/common/keyValueProviders/salesforce.js +4 -4
- package/lib/common/keyValueProviders/salesforce.js.map +1 -1
- package/lib/common/metadata-utils/index.js +18 -18
- package/lib/common/metadata-utils/index.js.map +1 -1
- package/lib/common/notifProvider/apiProvider.js +12 -12
- package/lib/common/notifProvider/apiProvider.js.map +1 -1
- package/lib/common/notifProvider/emailProvider.js +3 -3
- package/lib/common/notifProvider/emailProvider.js.map +1 -1
- package/lib/common/notifProvider/index.js +6 -6
- package/lib/common/notifProvider/index.js.map +1 -1
- package/lib/common/notifProvider/notifProviderRoot.js +1 -1
- package/lib/common/notifProvider/notifProviderRoot.js.map +1 -1
- package/lib/common/notifProvider/slackProvider.js +3 -3
- package/lib/common/notifProvider/slackProvider.js.map +1 -1
- package/lib/common/notifProvider/teamsProvider.js +2 -2
- package/lib/common/notifProvider/teamsProvider.js.map +1 -1
- package/lib/common/ticketProvider/azureBoardsProvider.js +8 -8
- package/lib/common/ticketProvider/azureBoardsProvider.js.map +1 -1
- package/lib/common/ticketProvider/index.js +1 -1
- package/lib/common/ticketProvider/index.js.map +1 -1
- package/lib/common/ticketProvider/jiraProvider.js +12 -12
- package/lib/common/ticketProvider/jiraProvider.js.map +1 -1
- package/lib/common/ticketProvider/ticketProviderRoot.js +2 -2
- package/lib/common/ticketProvider/ticketProviderRoot.js.map +1 -1
- package/lib/common/utils/apiUtils.js +37 -19
- package/lib/common/utils/apiUtils.js.map +1 -1
- package/lib/common/utils/authUtils.js +9 -9
- package/lib/common/utils/authUtils.js.map +1 -1
- package/lib/common/utils/classUtils.js +4 -4
- package/lib/common/utils/classUtils.js.map +1 -1
- package/lib/common/utils/dataUtils.js +8 -8
- package/lib/common/utils/dataUtils.js.map +1 -1
- package/lib/common/utils/deployTipJson.js +2 -2
- package/lib/common/utils/deployTipJson.js.map +1 -1
- package/lib/common/utils/deployTips.js +2 -2
- package/lib/common/utils/deployTips.js.map +1 -1
- package/lib/common/utils/deployUtils.js +89 -89
- package/lib/common/utils/deployUtils.js.map +1 -1
- package/lib/common/utils/emailUtils.js +3 -3
- package/lib/common/utils/emailUtils.js.map +1 -1
- package/lib/common/utils/filesUtils.d.ts +5 -1
- package/lib/common/utils/filesUtils.js +48 -48
- package/lib/common/utils/filesUtils.js.map +1 -1
- package/lib/common/utils/gitUtils.js +12 -12
- package/lib/common/utils/gitUtils.js.map +1 -1
- package/lib/common/utils/index.d.ts +2 -1
- package/lib/common/utils/index.js +60 -79
- package/lib/common/utils/index.js.map +1 -1
- package/lib/common/utils/markdownUtils.js +2 -2
- package/lib/common/utils/markdownUtils.js.map +1 -1
- package/lib/common/utils/mermaidUtils.js +19 -19
- package/lib/common/utils/mermaidUtils.js.map +1 -1
- package/lib/common/utils/orgConfigUtils.js +8 -8
- package/lib/common/utils/orgConfigUtils.js.map +1 -1
- package/lib/common/utils/orgUtils.js +21 -21
- package/lib/common/utils/orgUtils.js.map +1 -1
- package/lib/common/utils/poolUtils.js +13 -13
- package/lib/common/utils/poolUtils.js.map +1 -1
- package/lib/common/utils/profileUtils.js +1 -1
- package/lib/common/utils/profileUtils.js.map +1 -1
- package/lib/common/utils/projectUtils.js +9 -9
- package/lib/common/utils/projectUtils.js.map +1 -1
- package/lib/common/utils/prompts.js +62 -12
- package/lib/common/utils/prompts.js.map +1 -1
- package/lib/common/utils/workaroundUtils.js +2 -2
- package/lib/common/utils/workaroundUtils.js.map +1 -1
- package/lib/common/utils/wrapUtils.js +3 -3
- package/lib/common/utils/wrapUtils.js.map +1 -1
- package/lib/common/utils/xmlUtils.js +10 -10
- package/lib/common/utils/xmlUtils.js.map +1 -1
- package/lib/common/websocketClient.d.ts +1 -1
- package/lib/common/websocketClient.js +7 -6
- package/lib/common/websocketClient.js.map +1 -1
- package/lib/config/index.js +3 -3
- package/lib/config/index.js.map +1 -1
- package/lib/hooks/finally/notify.js +2 -2
- package/lib/hooks/finally/notify.js.map +1 -1
- package/lib/hooks/prerun/check-dependencies.js +7 -7
- package/lib/hooks/prerun/check-dependencies.js.map +1 -1
- package/oclif.manifest.json +543 -536
- package/package.json +1 -1
|
@@ -77,11 +77,11 @@ The command's technical implementation involves:
|
|
|
77
77
|
const config = await getConfig('project');
|
|
78
78
|
if (config.get('EXPERIMENTAL', '') !== 'true') {
|
|
79
79
|
const msg = 'This command is not stable enough to be used. Use EXPERIMENTAL=true to use it anyway';
|
|
80
|
-
uxLog(this, c.yellow(msg));
|
|
80
|
+
uxLog("warning", this, c.yellow(msg));
|
|
81
81
|
return { outputString: msg };
|
|
82
82
|
}
|
|
83
83
|
this.noPull = flags.nopull || false;
|
|
84
|
-
uxLog(this, c.cyan('This command will refresh your git branch and your org with the content of another git branch'));
|
|
84
|
+
uxLog("action", this, c.cyan('This command will refresh your git branch and your org with the content of another git branch'));
|
|
85
85
|
// Verify that the user saved his/her work before merging another branch
|
|
86
86
|
const savePromptRes = await prompts({
|
|
87
87
|
type: 'select',
|
|
@@ -129,30 +129,30 @@ The command's technical implementation involves:
|
|
|
129
129
|
return await this.runRefresh(localBranch, flags);
|
|
130
130
|
}
|
|
131
131
|
catch (e) {
|
|
132
|
-
uxLog(this, c.yellow('There has been a merge conflict or a technical error, please contact a Developer for help !'));
|
|
132
|
+
uxLog("warning", this, c.yellow('There has been a merge conflict or a technical error, please contact a Developer for help !'));
|
|
133
133
|
throw e;
|
|
134
134
|
}
|
|
135
135
|
}
|
|
136
136
|
async runRefresh(localBranch, flags) {
|
|
137
137
|
this.debugMode = flags.debug || false;
|
|
138
|
-
uxLog(this, c.cyan(`sfdx-hardis will refresh your local branch ${c.green(localBranch)} and your local scratch org ${c.green(flags['target-org'].getUsername())} with the latest state of ${c.green(this.mergeBranch)}`));
|
|
138
|
+
uxLog("action", this, c.cyan(`sfdx-hardis will refresh your local branch ${c.green(localBranch)} and your local scratch org ${c.green(flags['target-org'].getUsername())} with the latest state of ${c.green(this.mergeBranch)}`));
|
|
139
139
|
if (localBranch === this.mergeBranch) {
|
|
140
140
|
throw new SfError('[sfdx-hardis] You can not refresh from the same branch');
|
|
141
141
|
}
|
|
142
142
|
// Pull from scratch org
|
|
143
143
|
if (this.noPull) {
|
|
144
|
-
uxLog(this, c.cyan(`Skipped pull from scratch org`));
|
|
144
|
+
uxLog("action", this, c.cyan(`Skipped pull from scratch org`));
|
|
145
145
|
}
|
|
146
146
|
else {
|
|
147
|
-
uxLog(this, c.cyan(`Pulling sources from scratch org ${flags['target-org'].getUsername()}...`));
|
|
147
|
+
uxLog("action", this, c.cyan(`Pulling sources from scratch org ${flags['target-org'].getUsername()}...`));
|
|
148
148
|
await forceSourcePull(flags['target-org'].getUsername(), this.debugMode);
|
|
149
149
|
}
|
|
150
150
|
// Stash
|
|
151
|
-
uxLog(this, c.cyan(`Stashing your uncommitted updates in ${c.green(localBranch)} before merging ${c.green(this.mergeBranch)} into your local branch ${c.green(localBranch)}...`));
|
|
151
|
+
uxLog("action", this, c.cyan(`Stashing your uncommitted updates in ${c.green(localBranch)} before merging ${c.green(this.mergeBranch)} into your local branch ${c.green(localBranch)}...`));
|
|
152
152
|
const stashResult = await git({ output: true }).stash(['save', `[sfdx-hardis] Stash of ${localBranch}`]);
|
|
153
153
|
const stashed = stashResult.includes('Saved working directory');
|
|
154
154
|
// Pull most recent version of development branch
|
|
155
|
-
uxLog(this, c.cyan(`Pulling most recent version of remote branch ${c.green(this.mergeBranch)}...`));
|
|
155
|
+
uxLog("action", this, c.cyan(`Pulling most recent version of remote branch ${c.green(this.mergeBranch)}...`));
|
|
156
156
|
await git({ output: true }).fetch();
|
|
157
157
|
await git({ output: true }).checkout(this.mergeBranch || '');
|
|
158
158
|
const pullRes = await git({ output: true }).pull();
|
|
@@ -167,7 +167,7 @@ The command's technical implementation involves:
|
|
|
167
167
|
// Merge into current branch if necessary
|
|
168
168
|
if (pullRes.summary.changes > 0 || mergeRef !== localRef) {
|
|
169
169
|
// Create new commit from merge
|
|
170
|
-
uxLog(this, c.cyan(`Creating a merge commit of ${c.green(this.mergeBranch)} within ${c.green(localBranch)}...`));
|
|
170
|
+
uxLog("action", this, c.cyan(`Creating a merge commit of ${c.green(this.mergeBranch)} within ${c.green(localBranch)}...`));
|
|
171
171
|
let mergeSummary = await git({ output: true }).merge([this.mergeBranch || '']);
|
|
172
172
|
while (mergeSummary.failed) {
|
|
173
173
|
const mergeResult = await prompts({
|
|
@@ -185,18 +185,18 @@ The command's technical implementation involves:
|
|
|
185
185
|
],
|
|
186
186
|
});
|
|
187
187
|
if (mergeResult.value === false) {
|
|
188
|
-
uxLog(this, 'Refresh script stopped by user');
|
|
188
|
+
uxLog("other", this, 'Refresh script stopped by user');
|
|
189
189
|
process.exit(0);
|
|
190
190
|
}
|
|
191
191
|
mergeSummary = await git({ output: true }).merge(['--continue']);
|
|
192
192
|
}
|
|
193
193
|
}
|
|
194
194
|
else {
|
|
195
|
-
uxLog(this, c.cyan(`Local branch ${c.green(localBranch)} is already up to date with ${c.green(this.mergeBranch)}`));
|
|
195
|
+
uxLog("action", this, c.cyan(`Local branch ${c.green(localBranch)} is already up to date with ${c.green(this.mergeBranch)}`));
|
|
196
196
|
}
|
|
197
197
|
// Restoring stash
|
|
198
198
|
if (stashed) {
|
|
199
|
-
uxLog(this, c.cyan(`Restoring stash into your local branch ${c.green(localBranch)}...`));
|
|
199
|
+
uxLog("action", this, c.cyan(`Restoring stash into your local branch ${c.green(localBranch)}...`));
|
|
200
200
|
await git({ output: true }).stash(['pop']);
|
|
201
201
|
}
|
|
202
202
|
// Push new branch state to scratch org
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/refresh.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,eAAe,EAAE,eAAe,EAAE,MAAM,sCAAsC,CAAC;AACxF,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAErD,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,SAAc;IAC9C,MAAM,CAAC,KAAK,GAAG,2BAA2B,CAAC;IAE3C,MAAM,CAAC,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAmC7B,CAAC;IAEO,MAAM,CAAC,QAAQ,GAAG,CAAC,0BAA0B,CAAC,CAAC;IAEtD,yCAAyC;IAElC,MAAM,CAAC,KAAK,GAAQ;QACzB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC;YACpB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,wDAAwD;SACtE,CAAC;QACF,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,WAAW,EAAE,+DAA+D;SAC7E,CAAC;QACF,YAAY,EAAE,+BAA+B;KAC9C,CAAC,CAAC,uGAAuG;IACnG,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;IAE3B,SAAS,GAAG,KAAK,CAAC;IAClB,MAAM,GAAG,KAAK,CAAC;IACf,WAAW,GAAG,IAAI,CAAC;IAE7B,sBAAsB;IACf,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,SAAS,CAAC,SAAS,CAAC,CAAC;QAC1C,IAAI,MAAM,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,CAAC,KAAK,MAAM,EAAE,CAAC;YAC9C,MAAM,GAAG,GAAG,sFAAsF,CAAC;YACnG,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/refresh.ts"],"names":[],"mappings":"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"}
|
|
@@ -63,7 +63,7 @@ The command's technical implementation involves:
|
|
|
63
63
|
const targetBranch = await selectTargetBranch({
|
|
64
64
|
message: 'Please select the target branch of your current or future merge request',
|
|
65
65
|
});
|
|
66
|
-
uxLog(this, c.cyan(`This script will rebuild selection that you will want to merge into ${c.green(targetBranch)}`));
|
|
66
|
+
uxLog("action", this, c.cyan(`This script will rebuild selection that you will want to merge into ${c.green(targetBranch)}`));
|
|
67
67
|
const currentGitBranch = await getCurrentGitBranch();
|
|
68
68
|
if (currentGitBranch === targetBranch) {
|
|
69
69
|
throw new SfError(c.red('[sfdx-hardis] You can not revert commits of a protected branch !'));
|
|
@@ -93,8 +93,8 @@ The command's technical implementation involves:
|
|
|
93
93
|
await git({ output: true }).checkout(['--', 'manifest/package.xml']);
|
|
94
94
|
await git({ output: true }).checkout(['--', 'manifest/destructiveChanges.xml']);
|
|
95
95
|
await git({ output: true }).status();
|
|
96
|
-
uxLog(this, c.cyan('The following items are now available for selection'));
|
|
97
|
-
uxLog(this, c.cyan('Selection has been reset'));
|
|
96
|
+
uxLog("action", this, c.cyan('The following items are now available for selection'));
|
|
97
|
+
uxLog("action", this, c.cyan('Selection has been reset'));
|
|
98
98
|
// Return an object to be displayed with --json
|
|
99
99
|
return { outputString: 'Reset selection pocessed' };
|
|
100
100
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"AAAA,wBAAwB;AACxB,OAAO,EAAE,SAAS,EAAE,KAAK,EAAE,+BAA+B,EAAE,MAAM,6BAA6B,CAAC;AAChG,OAAO,EAAE,QAAQ,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAErD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,WAAW,EAAE,mBAAmB,EAAE,GAAG,EAAE,KAAK,EAAE,MAAM,gCAAgC,CAAC;AAC9F,OAAO,EAAE,kBAAkB,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kCAAkC,CAAC;AAE3D,QAAQ,CAAC,kCAAkC,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;AAC7D,MAAM,QAAQ,GAAG,QAAQ,CAAC,YAAY,CAAC,aAAa,EAAE,KAAK,CAAC,CAAC;AAE7D,MAAM,CAAC,OAAO,OAAO,gBAAiB,SAAQ,SAAc;IACnD,MAAM,CAAC,KAAK,GAAG,cAAc,CAAC;IAE9B,MAAM,CAAC,WAAW,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;CA2B7B,CAAC;IAEO,MAAM,CAAC,QAAQ,GAAG,CAAC,4BAA4B,CAAC,CAAC;IAExD,yCAAyC;IAElC,MAAM,CAAC,KAAK,GAAQ;QACzB,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC;YACnB,IAAI,EAAE,GAAG;YACT,OAAO,EAAE,KAAK;YACd,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC;YACtB,WAAW,EAAE,QAAQ,CAAC,UAAU,CAAC,WAAW,CAAC;SAC9C,CAAC;QACF,QAAQ,EAAE,KAAK,CAAC,OAAO,CAAC;YACtB,WAAW,EAAE,+DAA+D;SAC7E,CAAC;QACF,YAAY,EAAE,+BAA+B;KAC9C,CAAC,CAAC,uGAAuG;IACnG,MAAM,CAAC,eAAe,GAAG,IAAI,CAAC;IAE3B,SAAS,GAAG,KAAK,CAAC;IAE5B,sBAAsB;IAEf,KAAK,CAAC,GAAG;QACd,MAAM,EAAE,KAAK,EAAE,GAAG,MAAM,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,CAAC;QACrD,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC,KAAK,IAAI,KAAK,CAAC;QAEtC,MAAM,YAAY,GAAG,MAAM,kBAAkB,CAAC;YAC5C,OAAO,EAAE,yEAAyE;SACnF,CAAC,CAAC;QAEH,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,uEAAuE,CAAC,CAAC,KAAK,CAAC,YAAY,CAAC,EAAE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"resetselection.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/resetselection.ts"],"names":[],"mappings":"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"}
|
|
@@ -150,7 +150,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
150
150
|
});
|
|
151
151
|
}
|
|
152
152
|
// User log info
|
|
153
|
-
uxLog(this, c.cyan(`This command will help to prepare the ${GitProvider.getMergeRequestName(this.gitUrl)} from your branch ${c.green(localBranch)} to major branch ${c.green(this.targetBranch)}`));
|
|
153
|
+
uxLog("action", this, c.cyan(`This command will help to prepare the ${GitProvider.getMergeRequestName(this.gitUrl)} from your branch ${c.green(localBranch)} to major branch ${c.green(this.targetBranch)}`));
|
|
154
154
|
// Make sure git is clean before starting operations
|
|
155
155
|
await this.cleanGitStatus();
|
|
156
156
|
// Make sure commit is ready before starting operations
|
|
@@ -168,22 +168,26 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
168
168
|
await this.manageCommitPush(gitStatusWithConfig, gitStatusAfterDeployPlan);
|
|
169
169
|
const mergeRequestUrl = GitProvider.getMergeRequestCreateUrl(this.gitUrl, this.targetBranch || '', this.currentBranch);
|
|
170
170
|
// Merge request
|
|
171
|
-
uxLog(this, c.cyan(`If your work is ${c.bold('completed')}, you can create a ${c.bold(GitProvider.getMergeRequestName(this.gitUrl))}, otherwise you can push new commits on ${c.green(this.currentBranch)} branch.`));
|
|
171
|
+
uxLog("action", this, c.cyan(`If your work is ${c.bold('completed')}, you can create a ${c.bold(GitProvider.getMergeRequestName(this.gitUrl))}, otherwise you can push new commits on ${c.green(this.currentBranch)} branch.`));
|
|
172
172
|
let summaryMsg = c.grey("");
|
|
173
173
|
if (mergeRequestUrl) {
|
|
174
|
-
|
|
175
|
-
|
|
174
|
+
if (WebSocketClient.isAliveWithLwcUI()) {
|
|
175
|
+
WebSocketClient.sendReportFileMessage(mergeRequestUrl, `Create ${GitProvider.getMergeRequestName(this.gitUrl)}`, 'actionUrl');
|
|
176
|
+
}
|
|
177
|
+
else {
|
|
178
|
+
summaryMsg += c.grey(`- New ${GitProvider.getMergeRequestName(this.gitUrl)} URL: ${c.green(mergeRequestUrl)}\n`);
|
|
179
|
+
}
|
|
176
180
|
}
|
|
177
181
|
const mergeRequestDoc = `${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-publish-task/#create-merge-request`;
|
|
178
182
|
summaryMsg += c.grey(`- Repository: ${c.green(this.gitUrl.replace('.git', ''))}\n`);
|
|
179
183
|
summaryMsg += c.grey(`- Source branch: ${c.green(this.currentBranch)}\n`);
|
|
180
184
|
summaryMsg += c.grey(`- Target branch: ${c.green(this.targetBranch)}`);
|
|
181
|
-
uxLog(this, summaryMsg);
|
|
182
|
-
uxLog(this, `${c.yellow(`When your ${GitProvider.getMergeRequestName(this.gitUrl)} will have been merged:`)}
|
|
185
|
+
uxLog("log", this, summaryMsg);
|
|
186
|
+
uxLog("warning", this, `${c.yellow(`When your ${GitProvider.getMergeRequestName(this.gitUrl)} will have been merged:`)}
|
|
183
187
|
- ${c.yellow('DO NOT REUSE THE SAME BRANCH')}
|
|
184
188
|
- Use New User Story menu (sf hardis:work:new), even if you work in the same sandbox or scratch org :)`);
|
|
185
189
|
if (!WebSocketClient.isAliveWithLwcUI()) {
|
|
186
|
-
uxLog(this, c.grey(`${GitProvider.getMergeRequestName(this.gitUrl)} documentation is available here -> ${c.bold(mergeRequestDoc)}`));
|
|
190
|
+
uxLog("log", this, c.grey(`${GitProvider.getMergeRequestName(this.gitUrl)} documentation is available here -> ${c.bold(mergeRequestDoc)}`));
|
|
187
191
|
}
|
|
188
192
|
WebSocketClient.sendReportFileMessage(mergeRequestDoc, `View ${GitProvider.getMergeRequestName(this.gitUrl)} documentation`, 'docUrl');
|
|
189
193
|
// Return an object to be displayed with --json
|
|
@@ -193,7 +197,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
193
197
|
async cleanGitStatus() {
|
|
194
198
|
// Skip git stuff if requested
|
|
195
199
|
if (this.noGit) {
|
|
196
|
-
uxLog(this, c.cyan(`[Expert mode] Skipped git reset`));
|
|
200
|
+
uxLog("action", this, c.cyan(`[Expert mode] Skipped git reset`));
|
|
197
201
|
return;
|
|
198
202
|
}
|
|
199
203
|
let gitStatusInit = await git().status();
|
|
@@ -211,7 +215,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
211
215
|
// Manage project deploy start from scratch org
|
|
212
216
|
if (this.noPull || this.auto) {
|
|
213
217
|
// Skip pull
|
|
214
|
-
uxLog(this, c.cyan(`Skipped sf project:retrieve:start from scratch org`));
|
|
218
|
+
uxLog("action", this, c.cyan(`Skipped sf project:retrieve:start from scratch org`));
|
|
215
219
|
return;
|
|
216
220
|
}
|
|
217
221
|
// Request user if commit is ready
|
|
@@ -241,15 +245,17 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
241
245
|
});
|
|
242
246
|
if (commitReadyRes.value === 'pleasePull') {
|
|
243
247
|
// Process sf project retrieve start
|
|
244
|
-
uxLog(this, c.cyan(`Pulling sources from scratch org ${flags['target-org'].getUsername()}...`));
|
|
248
|
+
uxLog("action", this, c.cyan(`Pulling sources from scratch org ${flags['target-org'].getUsername()}...`));
|
|
245
249
|
await forceSourcePull(flags['target-org'].getUsername(), this.debugMode);
|
|
246
|
-
uxLog(this, c.cyan(`Sources has been pulled from ${flags['target-org'].getUsername()}, now you can stage and commit your updates !`));
|
|
250
|
+
uxLog("action", this, c.cyan(`Sources has been pulled from ${flags['target-org'].getUsername()}, now you can stage and commit your updates !`));
|
|
251
|
+
WebSocketClient.sendReportFileMessage("workbench.view.scm", "Commit your retrieved files", "actionCommand");
|
|
252
|
+
WebSocketClient.sendReportFileMessage(`${CONSTANTS.DOC_URL_ROOT}/salesforce-ci-cd-publish-task/#commit-your-updates`, "Retrieve and Commit documentation", 'docUrl');
|
|
247
253
|
return { outputString: 'Pull performed' };
|
|
248
254
|
}
|
|
249
255
|
else if (commitReadyRes.value === 'help') {
|
|
250
256
|
// Show pull commit stage help
|
|
251
257
|
const commitHelpUrl = `${CONSTANTS.DOC_URL_ROOT}/hardis/scratch/pull/`;
|
|
252
|
-
uxLog(this, c.cyan(`Opening help at ${commitHelpUrl} ...`));
|
|
258
|
+
uxLog("action", this, c.cyan(`Opening help at ${commitHelpUrl} ...`));
|
|
253
259
|
await open(commitHelpUrl, { wait: true });
|
|
254
260
|
return { outputString: 'Help displayed at ' };
|
|
255
261
|
}
|
|
@@ -277,13 +283,13 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
277
283
|
}
|
|
278
284
|
}
|
|
279
285
|
async upgradePackageXmlFilesWithDelta() {
|
|
280
|
-
uxLog(this, c.cyan('Updating manifest/package.xml and manifest/destructiveChanges.xml using sfdx-git-delta...'));
|
|
286
|
+
uxLog("action", this, c.cyan('Updating manifest/package.xml and manifest/destructiveChanges.xml using sfdx-git-delta...'));
|
|
281
287
|
// Retrieving info about current branch latest commit and master branch latest commit
|
|
282
288
|
const gitDeltaScope = await getGitDeltaScope(this.currentBranch, this.targetBranch || '');
|
|
283
289
|
// Build package.xml delta between most recent commit and developpement
|
|
284
290
|
const localPackageXml = path.join('manifest', 'package.xml');
|
|
285
291
|
const toCommitMessage = gitDeltaScope.toCommit ? gitDeltaScope.toCommit.message : '';
|
|
286
|
-
uxLog(this, c.grey(`Calculating package.xml diff from [${c.green(this.targetBranch)}] to [${c.green(this.currentBranch)} - ${c.green(toCommitMessage)}]`));
|
|
292
|
+
uxLog("log", this, c.grey(`Calculating package.xml diff from [${c.green(this.targetBranch)}] to [${c.green(this.currentBranch)} - ${c.green(toCommitMessage)}]`));
|
|
287
293
|
const tmpDir = await createTempDir();
|
|
288
294
|
const packageXmlResult = await callSfdxGitDelta(gitDeltaScope.fromCommit, gitDeltaScope.toCommit ? gitDeltaScope.toCommit.hash : gitDeltaScope.fromCommit, tmpDir);
|
|
289
295
|
if (packageXmlResult.status === 0) {
|
|
@@ -300,7 +306,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
300
306
|
}
|
|
301
307
|
const diffDestructivePackageXml = path.join(tmpDir, 'destructiveChanges', 'destructiveChanges.xml');
|
|
302
308
|
const destructivePackageXmlDiffStr = await fs.readFile(diffDestructivePackageXml, 'utf8');
|
|
303
|
-
uxLog(this, c.grey(c.bold(`Delta destructiveChanges.xml diff to be merged within ${c.green(localDestructiveChangesXml)}:\n`)) +
|
|
309
|
+
uxLog("log", this, c.grey(c.bold(`Delta destructiveChanges.xml diff to be merged within ${c.green(localDestructiveChangesXml)}:\n`)) +
|
|
304
310
|
c.red(destructivePackageXmlDiffStr));
|
|
305
311
|
await appendPackageXmlFilesContent([localDestructiveChangesXml, diffDestructivePackageXml], localDestructiveChangesXml);
|
|
306
312
|
if ((await gitHasLocalUpdates()) && !this.noGit) {
|
|
@@ -309,7 +315,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
309
315
|
// Upgrade local package.xml
|
|
310
316
|
const diffPackageXml = path.join(tmpDir, 'package', 'package.xml');
|
|
311
317
|
const packageXmlDiffStr = await fs.readFile(diffPackageXml, 'utf8');
|
|
312
|
-
uxLog(this, c.grey(c.bold(`Delta package.xml diff to be merged within ${c.green(localPackageXml)}:\n`)) +
|
|
318
|
+
uxLog("log", this, c.grey(c.bold(`Delta package.xml diff to be merged within ${c.green(localPackageXml)}:\n`)) +
|
|
313
319
|
c.green(packageXmlDiffStr));
|
|
314
320
|
await appendPackageXmlFilesContent([localPackageXml, diffPackageXml], localPackageXml);
|
|
315
321
|
await removePackageXmlFilesContent(localPackageXml, localDestructiveChangesXml, {
|
|
@@ -320,18 +326,18 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
320
326
|
}
|
|
321
327
|
}
|
|
322
328
|
else {
|
|
323
|
-
uxLog(this, `[error] ${c.grey(JSON.stringify(packageXmlResult))}`);
|
|
324
|
-
uxLog(this, c.red(`Unable to build git diff.${c.yellow(c.bold('Please update package.xml and destructiveChanges.xml manually'))}`));
|
|
329
|
+
uxLog("log", this, `[error] ${c.grey(JSON.stringify(packageXmlResult))}`);
|
|
330
|
+
uxLog("error", this, c.red(`Unable to build git diff.${c.yellow(c.bold('Please update package.xml and destructiveChanges.xml manually'))}`));
|
|
325
331
|
}
|
|
326
332
|
// Commit updates
|
|
327
333
|
let gitStatusWithConfig = await git().status();
|
|
328
334
|
if (gitStatusWithConfig.staged.length > 0 && !this.noGit) {
|
|
329
|
-
uxLog(this, c.grey(`Committing updated files in local git branch ${c.green(this.currentBranch)}...`));
|
|
335
|
+
uxLog("log", this, c.grey(`Committing updated files in local git branch ${c.green(this.currentBranch)}...`));
|
|
330
336
|
try {
|
|
331
337
|
await git({ output: true }).commit('[sfdx-hardis] Update package content');
|
|
332
338
|
}
|
|
333
339
|
catch (e) {
|
|
334
|
-
uxLog(this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
340
|
+
uxLog("warning", this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
335
341
|
gitStatusWithConfig = await git().status();
|
|
336
342
|
}
|
|
337
343
|
}
|
|
@@ -342,32 +348,32 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
342
348
|
const config = await getConfig('branch');
|
|
343
349
|
if (!this.noClean) {
|
|
344
350
|
const gitStatusFilesBeforeClean = (await git().status()).files.map((file) => file.path);
|
|
345
|
-
uxLog(this, JSON.stringify(gitStatusFilesBeforeClean, null, 2));
|
|
351
|
+
uxLog("other", this, JSON.stringify(gitStatusFilesBeforeClean, null, 2));
|
|
346
352
|
// References cleaning
|
|
347
353
|
await CleanReferences.run(['--type', 'all']);
|
|
348
354
|
if (globalThis?.displayProfilesWarning === true) {
|
|
349
|
-
uxLog(this, c.yellow(c.bold('Please make sure the attributes removed from Profiles are defined on Permission Sets :)')));
|
|
355
|
+
uxLog("warning", this, c.yellow(c.bold('Please make sure the attributes removed from Profiles are defined on Permission Sets :)')));
|
|
350
356
|
}
|
|
351
357
|
// Xml cleaning
|
|
352
358
|
if (config.cleanXmlPatterns && config.cleanXmlPatterns.length > 0) {
|
|
353
|
-
uxLog(this, c.cyan('Cleaning sfdx project using patterns and xpaths defined in cleanXmlPatterns...'));
|
|
359
|
+
uxLog("action", this, c.cyan('Cleaning sfdx project using patterns and xpaths defined in cleanXmlPatterns...'));
|
|
354
360
|
await CleanXml.run([]);
|
|
355
361
|
}
|
|
356
362
|
// Manage git after cleaning
|
|
357
363
|
const gitStatusAfterClean = await git().status();
|
|
358
|
-
uxLog(this, JSON.stringify(gitStatusAfterClean, null, 2));
|
|
364
|
+
uxLog("other", this, JSON.stringify(gitStatusAfterClean, null, 2));
|
|
359
365
|
const cleanedFiles = gitStatusAfterClean.files
|
|
360
366
|
.filter((file) => !gitStatusFilesBeforeClean.includes(file.path))
|
|
361
367
|
.map((file) => normalizeFileStatusPath(file.path, config));
|
|
362
368
|
if (cleanedFiles.length > 0) {
|
|
363
|
-
uxLog(this, c.grey(`Cleaned the following list of files:\n${cleanedFiles.join('\n')}`));
|
|
369
|
+
uxLog("log", this, c.grey(`Cleaned the following list of files:\n${cleanedFiles.join('\n')}`));
|
|
364
370
|
if (!this.noGit) {
|
|
365
371
|
try {
|
|
366
372
|
await git().add(cleanedFiles);
|
|
367
373
|
await git({ output: true }).commit('[sfdx-hardis] Clean sfdx project');
|
|
368
374
|
}
|
|
369
375
|
catch (e) {
|
|
370
|
-
uxLog(this, c.yellow(`There may be an issue while adding cleaned files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
376
|
+
uxLog("warning", this, c.yellow(`There may be an issue while adding cleaned files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
371
377
|
}
|
|
372
378
|
}
|
|
373
379
|
}
|
|
@@ -470,7 +476,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
470
476
|
await git({ output: true }).commit('[sfdx-hardis] Update deployment plan');
|
|
471
477
|
}
|
|
472
478
|
catch (e) {
|
|
473
|
-
uxLog(this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
479
|
+
uxLog("warning", this, c.yellow(`There may be an issue while committing files but it can be ok to ignore it\n${c.grey(e.message)}`));
|
|
474
480
|
gitStatusAfterDeployPlan = await git().status();
|
|
475
481
|
}
|
|
476
482
|
}
|
|
@@ -492,7 +498,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
492
498
|
description: 'Choose whether to push your commits to the remote git repository',
|
|
493
499
|
});
|
|
494
500
|
if (pushResponse.push === true) {
|
|
495
|
-
uxLog(this, c.cyan(`Pushing new commit(s) in remote git branch ${c.green(`origin/${this.currentBranch}`)}...`));
|
|
501
|
+
uxLog("action", this, c.cyan(`Pushing new commit(s) in remote git branch ${c.green(`origin/${this.currentBranch}`)}...`));
|
|
496
502
|
const configUSer = await getConfig('user');
|
|
497
503
|
let pushResult;
|
|
498
504
|
if (configUSer.canForcePush === true) {
|
|
@@ -525,7 +531,7 @@ The command's technical implementation involves a series of orchestrated steps:
|
|
|
525
531
|
}
|
|
526
532
|
updateMergeRequestInfo(mergeRequestStored, mergeRequestInfo) {
|
|
527
533
|
if (this.debugMode) {
|
|
528
|
-
uxLog(this, c.grey(JSON.stringify(mergeRequestInfo, null, 2)));
|
|
534
|
+
uxLog("log", this, c.grey(JSON.stringify(mergeRequestInfo, null, 2)));
|
|
529
535
|
}
|
|
530
536
|
if (mergeRequestInfo?.remoteMessages?.id) {
|
|
531
537
|
mergeRequestStored.id = mergeRequestInfo.remoteMessages.id;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/save.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"save.js","sourceRoot":"","sources":["../../../../src/commands/hardis/work/save.ts"],"names":[],"mappings":"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"}
|
|
@@ -14,14 +14,14 @@ export class AgentforceProvider extends AiProviderRoot {
|
|
|
14
14
|
async promptAi(promptText, template) {
|
|
15
15
|
if (!this.checkMaxAiCallsNumber()) {
|
|
16
16
|
const maxCalls = this.getAiMaxCallsNumber();
|
|
17
|
-
uxLog(this, c.yellow(`[Agentforce] Already performed maximum ${maxCalls} calls. Increase it by defining AI_MAXIMUM_CALL_NUMBER env variable`));
|
|
17
|
+
uxLog("warning", this, c.yellow(`[Agentforce] Already performed maximum ${maxCalls} calls. Increase it by defining AI_MAXIMUM_CALL_NUMBER env variable`));
|
|
18
18
|
return null;
|
|
19
19
|
}
|
|
20
20
|
if (process.env?.DEBUG_PROMPTS === "true") {
|
|
21
|
-
uxLog(this, c.grey(`[Agentforce] Requesting the following prompt${template ? (' using template ' + template) : ''}:\n${promptText}`));
|
|
21
|
+
uxLog("log", this, c.grey(`[Agentforce] Requesting the following prompt${template ? (' using template ' + template) : ''}:\n${promptText}`));
|
|
22
22
|
}
|
|
23
23
|
else {
|
|
24
|
-
uxLog(this, c.grey(`[Agentforce] Requesting prompt${template ? (' using template ' + template) : ''} (define DEBUG_PROMPTS=true to see details)`));
|
|
24
|
+
uxLog("log", this, c.grey(`[Agentforce] Requesting prompt${template ? (' using template ' + template) : ''} (define DEBUG_PROMPTS=true to see details)`));
|
|
25
25
|
}
|
|
26
26
|
this.incrementAiCallsNumber();
|
|
27
27
|
const genericPromptTemplate = process.env.GENERIC_AGENTFORCE_PROMPT_TEMPLATE || "SfdxHardisGenericPrompt";
|
|
@@ -47,10 +47,10 @@ export class AgentforceProvider extends AiProviderRoot {
|
|
|
47
47
|
};
|
|
48
48
|
const agentforceResponse = await this.conn.requestPost(promptUrl, payload);
|
|
49
49
|
if (process.env?.DEBUG_PROMPTS === "true") {
|
|
50
|
-
uxLog(this, c.grey("[Agentforce] Received prompt response\n" + JSON.stringify(agentforceResponse, null, 2)));
|
|
50
|
+
uxLog("log", this, c.grey("[Agentforce] Received prompt response\n" + JSON.stringify(agentforceResponse, null, 2)));
|
|
51
51
|
}
|
|
52
52
|
else {
|
|
53
|
-
uxLog(this, c.grey("[Agentforce] Received prompt response"));
|
|
53
|
+
uxLog("log", this, c.grey("[Agentforce] Received prompt response"));
|
|
54
54
|
}
|
|
55
55
|
const aiResponse = {
|
|
56
56
|
success: false,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"agentforceProvider.js","sourceRoot":"","sources":["../../../src/common/aiProvider/agentforceProvider.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,CAAC,MAAM,OAAO,CAAC;AACtB,OAAO,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAG1C,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AAErC,MAAM,OAAO,kBAAmB,SAAQ,cAAc;IAC1C,IAAI,CAAa;IAE3B;QACE,KAAK,EAAE,CAAC;QACR,IAAI,CAAC,IAAI,GAAG,UAAU,CAAC,oBAAoB,IAAI,UAAU,CAAC,WAAW,CAAC;IACxE,CAAC;IAEM,QAAQ;QACb,OAAO,sBAAsB,CAAC;IAChC,CAAC;IAEM,KAAK,CAAC,QAAQ,CAAC,UAAkB,EAAE,QAAwB;QAChE,IAAI,CAAC,IAAI,CAAC,qBAAqB,EAAE,EAAE,CAAC;YAClC,MAAM,QAAQ,GAAG,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAC5C,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,0CAA0C,QAAQ,qEAAqE,CAAC,CAAC,CAAC;
|
|
1
|
+
{"version":3,"file":"agentforceProvider.js","sourceRoot":"","sources":["../../../src/common/aiProvider/agentforceProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -12,7 +12,7 @@ let IS_AI_AVAILABLE = null;
|
|
|
12
12
|
export class AiProvider {
|
|
13
13
|
static isAiAvailable() {
|
|
14
14
|
if (process.env?.DISABLE_AI === "true") {
|
|
15
|
-
uxLog(this, c.yellow("[AI Provider] AI calls have been disabled using env var DISABLE_AI=true"));
|
|
15
|
+
uxLog("warning", this, c.yellow("[AI Provider] AI calls have been disabled using env var DISABLE_AI=true"));
|
|
16
16
|
return false;
|
|
17
17
|
}
|
|
18
18
|
return this.getInstance() != null;
|
|
@@ -64,7 +64,7 @@ export class AiProvider {
|
|
|
64
64
|
globalThis.currentAiStartTime = globalThis.currentAiStartTime || Date.now();
|
|
65
65
|
const elapsedMinutes = (Date.now() - globalThis.currentAiStartTime) / 60000; // Convert milliseconds to minutes
|
|
66
66
|
if (elapsedMinutes >= aiMaxTimeoutMinutes) {
|
|
67
|
-
uxLog(this, c.yellow(`AI calls reached maximum time allowed of ${aiMaxTimeoutMinutes} minutes. You can either:
|
|
67
|
+
uxLog("warning", this, c.yellow(`AI calls reached maximum time allowed of ${aiMaxTimeoutMinutes} minutes. You can either:
|
|
68
68
|
- Run command locally then commit + push
|
|
69
69
|
- Increase using variable \`AI_MAX_TIMEOUT_MINUTES\` in your CI config (ex: AI_MAX_TIMEOUT_MINUTES=120) after making sure than your CI job timeout can handle it :)`));
|
|
70
70
|
return { success: false, model: "none", forcedTimeout: true };
|
|
@@ -81,17 +81,17 @@ export class AiProvider {
|
|
|
81
81
|
catch (e) {
|
|
82
82
|
if (e.message.includes("on tokens per min (TPM)")) {
|
|
83
83
|
try {
|
|
84
|
-
uxLog(this, c.yellow(`Error while calling AI provider: ${e.message}`));
|
|
85
|
-
uxLog(this, c.yellow(`Trying again in 60 seconds...`));
|
|
84
|
+
uxLog("warning", this, c.yellow(`Error while calling AI provider: ${e.message}`));
|
|
85
|
+
uxLog("warning", this, c.yellow(`Trying again in 60 seconds...`));
|
|
86
86
|
await new Promise((resolve) => setTimeout(resolve, 60000));
|
|
87
87
|
return await aiInstance.promptAi(prompt, template);
|
|
88
88
|
}
|
|
89
89
|
catch (e2) {
|
|
90
|
-
uxLog(this, c.red(`Error while calling AI provider: ${e2.message}`));
|
|
90
|
+
uxLog("error", this, c.red(`Error while calling AI provider: ${e2.message}`));
|
|
91
91
|
return null;
|
|
92
92
|
}
|
|
93
93
|
}
|
|
94
|
-
uxLog(this, c.red(`Error while calling AI provider: ${e.message}`));
|
|
94
|
+
uxLog("error", this, c.red(`Error while calling AI provider: ${e.message}`));
|
|
95
95
|
return null;
|
|
96
96
|
}
|
|
97
97
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/aiProvider/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,YAAY,CAAC;AACrC,OAAO,CAAC,MAAM,OAAO,CAAC;AAEtB,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,uBAAuB,EAAkB,MAAM,sBAAsB,CAAC;AAC/E,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAC7D,OAAO,EAAE,iBAAiB,EAAE,MAAM,wBAAwB,CAAC;AAC3D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AAEpE,IAAI,eAAe,GAAmB,IAAI,CAAC;AAE3C,MAAM,OAAgB,UAAU;IAC9B,MAAM,CAAC,aAAa;QAClB,IAAI,OAAO,CAAC,GAAG,EAAE,UAAU,KAAK,MAAM,EAAE,CAAC;YACvC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,yEAAyE,CAAC,CAAC,CAAA;
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/aiProvider/index.ts"],"names":[],"mappings":"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"}
|