diff --git a/package.json b/package.json index 6874424d..f441f971 100644 --- a/package.json +++ b/package.json @@ -52,7 +52,7 @@ "@oclif/core": "^4.0.18", "@salesforce/core": "^8.4.0", "@salesforce/kit": "^3.2.1", - "@salesforce/source-deploy-retrieve": "^12.5.1", + "@salesforce/source-deploy-retrieve": "^12.6.0", "@salesforce/ts-types": "^2.0.12", "fast-xml-parser": "^4.4.1", "graceful-fs": "^4.2.11", diff --git a/src/shared/local/localShadowRepo.ts b/src/shared/local/localShadowRepo.ts index e0713dea..cb07ac34 100644 --- a/src/shared/local/localShadowRepo.ts +++ b/src/shared/local/localShadowRepo.ts @@ -8,7 +8,7 @@ import path from 'node:path'; import * as os from 'node:os'; import * as fs from 'graceful-fs'; -import { NamedPackageDir, Lifecycle, Logger, SfError } from '@salesforce/core'; +import { NamedPackageDir, Lifecycle, Logger, SfError, envVars } from '@salesforce/core'; import { env } from '@salesforce/kit'; // @ts-expect-error isogit has both ESM and CJS exports but node16 module/resolution identifies it as ESM import git from 'isomorphic-git'; @@ -52,9 +52,9 @@ type CommitRequest = { /** do not try to add more than this many files at a time through isogit. You'll hit EMFILE: too many open files even with graceful-fs */ -const MAX_FILE_ADD = env.getNumber( +const MAX_FILE_ADD = envVars.getNumber( 'SF_SOURCE_TRACKING_BATCH_SIZE', - env.getNumber('SFDX_SOURCE_TRACKING_BATCH_SIZE', IS_WINDOWS ? 8000 : 15_000) + envVars.getNumber('SF_SOURCE_TRACKING_BATCH_SIZE', IS_WINDOWS ? 8000 : 15_000) ); export class ShadowRepo { diff --git a/src/shared/remoteSourceTrackingService.ts b/src/shared/remoteSourceTrackingService.ts index 4334d8d3..438ee53a 100644 --- a/src/shared/remoteSourceTrackingService.ts +++ b/src/shared/remoteSourceTrackingService.ts @@ -9,8 +9,8 @@ import path from 'node:path'; import fs from 'node:fs'; import { EOL } from 'node:os'; import { retryDecorator, NotRetryableError } from 'ts-retry-promise'; -import { Logger, Org, Messages, Lifecycle, SfError, Connection, lockInit } from '@salesforce/core'; -import { env, Duration, parseJsonMap } from '@salesforce/kit'; +import { Logger, Org, Messages, Lifecycle, SfError, Connection, envVars, lockInit } from '@salesforce/core'; +import { Duration, parseJsonMap } from '@salesforce/kit'; import { isString } from '@salesforce/ts-types'; import { ChangeResult, @@ -40,7 +40,7 @@ const FILENAME = 'maxRevision.json'; */ const POLLING_DELAY_MS = 1000; const CONSECUTIVE_EMPTY_POLLING_RESULT_LIMIT = - (env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT') ?? 120) / Duration.milliseconds(POLLING_DELAY_MS).seconds; + (envVars.getNumber('SF_SOURCE_MEMBER_POLLING_TIMEOUT') ?? 120) / Duration.milliseconds(POLLING_DELAY_MS).seconds; /** Options for RemoteSourceTrackingService.getInstance */ export type RemoteSourceTrackingServiceOptions = { @@ -237,7 +237,7 @@ export class RemoteSourceTrackingService { * @param pollingTimeout maximum amount of time in seconds to poll for SourceMembers */ public async pollForSourceTracking(expectedMembers: RemoteSyncInput[]): Promise { - if (env.getBoolean('SFDX_DISABLE_SOURCE_MEMBER_POLLING', false)) { + if (envVars.getBoolean('SF_DISABLE_SOURCE_MEMBER_POLLING', false)) { this.logger.warn('Not polling for SourceMembers since SFDX_DISABLE_SOURCE_MEMBER_POLLING = true.'); return; } @@ -572,7 +572,7 @@ const readFileContents = async (filePath: string): Promise (memberCount: number): Duration => { - const overriddenTimeout = env.getNumber('SFDX_SOURCE_MEMBER_POLLING_TIMEOUT', 0); + const overriddenTimeout = envVars.getNumber('SF_SOURCE_MEMBER_POLLING_TIMEOUT', 0); if (overriddenTimeout > 0) { logger.debug(`Overriding SourceMember polling timeout to ${overriddenTimeout}`); return Duration.seconds(overriddenTimeout); diff --git a/yarn.lock b/yarn.lock index 26ea984a..b29fefda 100644 --- a/yarn.lock +++ b/yarn.lock @@ -624,10 +624,10 @@ resolved "https://registry.yarnpkg.com/@salesforce/schemas/-/schemas-1.9.0.tgz#ba477a112653a20b4edcf989c61c57bdff9aa3ca" integrity sha512-LiN37zG5ODT6z70sL1fxF7BQwtCX9JOWofSU8iliSNIM+WDEeinnoFtVqPInRSNt8I0RiJxIKCrqstsmQRBNvA== -"@salesforce/source-deploy-retrieve@^12.5.1": - version "12.5.1" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.5.1.tgz#55e915201b2c9320b9662b2c8500a191c8770ecf" - integrity sha512-jakBWFSIb8oZlUAf0QKHXaeFA/KuTQZwaKZVevdwaiuy43lJHzVVrSRfcNv/kjXxmg0oq5TAI8vUo2CC5Hq04A== +"@salesforce/source-deploy-retrieve@^12.6.0": + version "12.6.0" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.6.0.tgz#0d2961fb2befeac0431fe8f6a70f439bc049fcea" + integrity sha512-gowMwjG93a8Bd5N05o46Z46TSsHZMeZXV3rQwMP3LXDnIhvSx3vxHJMzk0KKMOatfQFF2t+YI/6MR+47KWSblw== dependencies: "@salesforce/core" "^8.4.0" "@salesforce/kit" "^3.2.1" @@ -637,6 +637,7 @@ got "^11.8.6" graceful-fs "^4.2.11" ignore "^5.3.2" + isbinaryfile "^5.0.2" jszip "^3.10.1" mime "2.6.0" minimatch "^9.0.5" @@ -3307,6 +3308,11 @@ isarray@~1.0.0: resolved "https://registry.yarnpkg.com/isarray/-/isarray-1.0.0.tgz#bb935d48582cba168c06834957a54a3e07124f11" integrity sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ== +isbinaryfile@^5.0.2: + version "5.0.2" + resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-5.0.2.tgz#fe6e4dfe2e34e947ffa240c113444876ba393ae0" + integrity sha512-GvcjojwonMjWbTkfMpnVHVqXW/wKMYDfEpY94/8zy8HFMOqb/VL6oeONq9v87q4ttVlaTLnGXnJD4B5B1OTGIg== + isexe@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/isexe/-/isexe-2.0.0.tgz#e8fbf374dc556ff8947a10dcb0572d633f2cfa10" @@ -5146,16 +5152,7 @@ srcset@^5.0.0: resolved "https://registry.yarnpkg.com/srcset/-/srcset-5.0.0.tgz#9df6c3961b5b44a02532ce6ae4544832609e2e3f" integrity sha512-SqEZaAEhe0A6ETEa9O1IhSPC7MdvehZtCnTR0AftXk3QhY2UNgb+NApFOUPZILXk/YTDfFxMTNJOBpzrJsEdIA== -"string-width-cjs@npm:string-width@^4.2.0": - version "4.2.3" - resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" - integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== - dependencies: - emoji-regex "^8.0.0" - is-fullwidth-code-point "^3.0.0" - strip-ansi "^6.0.1" - -string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: +"string-width-cjs@npm:string-width@^4.2.0", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010" integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g== @@ -5214,14 +5211,7 @@ string_decoder@~1.1.1: dependencies: safe-buffer "~5.1.0" -"strip-ansi-cjs@npm:strip-ansi@^6.0.1": - version "6.0.1" - resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" - integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== - dependencies: - ansi-regex "^5.0.1" - -strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: +"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1: version "6.0.1" resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9" integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A== @@ -5721,7 +5711,7 @@ workerpool@^6.5.1: resolved "https://registry.yarnpkg.com/workerpool/-/workerpool-6.5.1.tgz#060f73b39d0caf97c6db64da004cd01b4c099544" integrity sha512-Fs4dNYcsdpYSAfVxhnl1L5zTksjvOJxtC5hzMNl+1t9B8hTJTdKDyZ5ju7ztgPy+ft9tBFXoOlDNiOT9WUXZlA== -"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0": +"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== @@ -5739,15 +5729,6 @@ wrap-ansi@^6.2.0: string-width "^4.1.0" strip-ansi "^6.0.0" -wrap-ansi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43" - integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q== - dependencies: - ansi-styles "^4.0.0" - string-width "^4.1.0" - strip-ansi "^6.0.0" - wrap-ansi@^8.1.0: version "8.1.0" resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-8.1.0.tgz#56dc22368ee570face1b49819975d9b9a5ead214"