From e9bff6be88da830634c7c8adaccd00e26bfe2323 Mon Sep 17 00:00:00 2001 From: Cristian Dominguez Date: Fri, 30 Aug 2024 17:10:52 -0300 Subject: [PATCH 1/3] fix(env): support more `SF_` source-tracking vars --- messages/envVars.md | 4 ++++ src/config/envVars.ts | 10 ++++++++++ 2 files changed, 14 insertions(+) diff --git a/messages/envVars.md b/messages/envVars.md index f46ea1c39..d87b0fd5c 100644 --- a/messages/envVars.md +++ b/messages/envVars.md @@ -66,6 +66,10 @@ Set to true to disable the auto-update feature of Salesforce CLI. Default value Set to true to disable polling of your org’s SourceMember object when you run the force:source:push|pull commands. Default value is false. +# sfdxSourceTrackingBatchSize + +Set to the number of seconds you want the `project deploy start` command to keep polling the SourceMember object before it times out. + # sfdxDisableTelemetry Set to true to disable Salesforce CLI from collecting usage information, user environment information, and crash reports. Default value is false. Overrides the disableTelemetry configration variable. diff --git a/src/config/envVars.ts b/src/config/envVars.ts index 56c2c1cae..7101c9e19 100644 --- a/src/config/envVars.ts +++ b/src/config/envVars.ts @@ -31,6 +31,7 @@ export enum EnvironmentVariable { 'SFDX_DISABLE_AUTOUPDATE' = 'SFDX_DISABLE_AUTOUPDATE', 'SFDX_AUTOUPDATE_DISABLE' = 'SFDX_AUTOUPDATE_DISABLE', 'SFDX_DISABLE_SOURCE_MEMBER_POLLING' = 'SFDX_DISABLE_SOURCE_MEMBER_POLLING', + 'SFDX_SOURCE_TRACKING_BATCH_SIZE' = 'SFDX_SOURCE_TRACKING_BATCH_SIZE', 'SFDX_DISABLE_TELEMETRY' = 'SFDX_DISABLE_TELEMETRY', 'SFDX_DNS_TIMEOUT' = 'SFDX_DNS_TIMEOUT', 'SFDX_DOMAIN_RETRY' = 'SFDX_DOMAIN_RETRY', @@ -82,6 +83,7 @@ export enum EnvironmentVariable { 'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE' = 'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_CREATE', 'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE' = 'SF_PROJECT_AUTOUPDATE_DISABLE_FOR_PACKAGE_VERSION_CREATE', 'SF_SOURCE_MEMBER_POLLING_TIMEOUT' = 'SF_SOURCE_MEMBER_POLLING_TIMEOUT', + 'SF_SOURCE_TRACKING_BATCH_SIZE' = 'SF_SOURCE_TRACKING_BATCH_SIZE', 'SF_USE_GENERIC_UNIX_KEYCHAIN' = 'SF_USE_GENERIC_UNIX_KEYCHAIN', 'SF_USE_PROGRESS_BAR' = 'SF_USE_PROGRESS_BAR', 'SF_LAZY_LOAD_MODULES' = 'SF_LAZY_LOAD_MODULES', @@ -170,6 +172,10 @@ export const SUPPORTED_ENV_VARS: EnvType = { description: getMessage(EnvironmentVariable.SFDX_DISABLE_SOURCE_MEMBER_POLLING), synonymOf: EnvironmentVariable.SF_DISABLE_SOURCE_MEMBER_POLLING, }, + [EnvironmentVariable.SFDX_SOURCE_TRACKING_BATCH_SIZE]: { + description: getMessage(EnvironmentVariable.SFDX_SOURCE_TRACKING_BATCH_SIZE), + synonymOf: EnvironmentVariable.SF_SOURCE_TRACKING_BATCH_SIZE, + }, [EnvironmentVariable.SFDX_DISABLE_TELEMETRY]: { description: getMessage(EnvironmentVariable.SFDX_DISABLE_TELEMETRY), synonymOf: EnvironmentVariable.SF_DISABLE_TELEMETRY, @@ -310,6 +316,10 @@ export const SUPPORTED_ENV_VARS: EnvType = { description: getMessage(EnvironmentVariable.SF_DISABLE_SOURCE_MEMBER_POLLING), synonymOf: null, }, + [EnvironmentVariable.SF_SOURCE_TRACKING_BATCH_SIZE]: { + description: getMessage(EnvironmentVariable.SFDX_SOURCE_TRACKING_BATCH_SIZE), + synonymOf: null, + }, [EnvironmentVariable.SF_DISABLE_TELEMETRY]: { description: getMessage(EnvironmentVariable.SF_DISABLE_TELEMETRY), synonymOf: null, From 8cae2e482cba844476fddfad448838d120caf18b Mon Sep 17 00:00:00 2001 From: svc-cli-bot Date: Fri, 30 Aug 2024 20:14:20 +0000 Subject: [PATCH 2/3] chore(release): 8.5.2-dev.0 [skip ci] --- package.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/package.json b/package.json index 837b700da..9d64aaf36 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/core", - "version": "8.5.1", + "version": "8.5.2-dev.0", "description": "Core libraries to interact with SFDX projects, orgs, and APIs.", "main": "lib/index", "types": "lib/index.d.ts", From ab2995758aecc1e5723c8dcc8e75abee6916fed8 Mon Sep 17 00:00:00 2001 From: Steve Hetzel Date: Tue, 3 Sep 2024 18:52:26 -0600 Subject: [PATCH 3/3] fix: correct message --- messages/envVars.md | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/messages/envVars.md b/messages/envVars.md index d87b0fd5c..7e076ec1c 100644 --- a/messages/envVars.md +++ b/messages/envVars.md @@ -68,7 +68,7 @@ Set to true to disable polling of your org’s SourceMember object when you run # sfdxSourceTrackingBatchSize -Set to the number of seconds you want the `project deploy start` command to keep polling the SourceMember object before it times out. +Number of source-tracked file updates to batch after a deploy or retrieve. The default value is 8,000 (Windows) or 15,000 (Linux/macOS). # sfdxDisableTelemetry diff --git a/package.json b/package.json index 9d64aaf36..b715b6744 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "@salesforce/core", - "version": "8.5.2-dev.0", + "version": "8.5.3", "description": "Core libraries to interact with SFDX projects, orgs, and APIs.", "main": "lib/index", "types": "lib/index.d.ts",