From 4606ace3240440f59db3aedeec85b3765c38a07d Mon Sep 17 00:00:00 2001 From: Willie Ruemmele Date: Thu, 1 Oct 2026 12:28:30 -0600 Subject: [PATCH 1/2] fix: label deploy zip count as entries (files + folders) to match SDR count --- src/utils/deployStages.ts | 2 +- test/nuts/deploy/verbose.nut.ts | 10 ++++++---- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/utils/deployStages.ts b/src/utils/deployStages.ts index 5f4abaeb..f0eb88a0 100644 --- a/src/utils/deployStages.ts +++ b/src/utils/deployStages.ts @@ -133,7 +133,7 @@ export class DeployStages { type: 'static-key-value', }, { - label: 'Files', + label: 'Entries', get: (data): string | undefined => data?.deployFileCount && data?.verbose ? `${data.deployFileCount} of 10,000 limit` : undefined, type: 'static-key-value', diff --git a/test/nuts/deploy/verbose.nut.ts b/test/nuts/deploy/verbose.nut.ts index 779189af..031e6564 100644 --- a/test/nuts/deploy/verbose.nut.ts +++ b/test/nuts/deploy/verbose.nut.ts @@ -43,7 +43,8 @@ describe('Deploy --verbose', () => { ).jsonOutput; expect(cmdJson?.result.zipSize).to.be.within(1775, 1795); - expect(cmdJson?.result.zipFileCount).to.equal(5); + // 5 files + 1 folder entry (classes/) + expect(cmdJson?.result.zipFileCount).to.equal(6); }); it('should have zip file size and file count in the output', () => { @@ -55,7 +56,7 @@ describe('Deploy --verbose', () => { ).shellOutput; expect(shellOutput.stdout).to.contain('Size: ').and.contain('KB of ~39 MB limit'); - expect(shellOutput.stdout).to.contain('Files: 5 of 10,000 limit'); + expect(shellOutput.stdout).to.contain('Entries: 6 of 10,000 limit'); }); it('should have zip file size and file count returned with --json --async', () => { @@ -67,7 +68,8 @@ describe('Deploy --verbose', () => { ).jsonOutput; expect(cmdJson?.result.zipSize).to.be.within(1775, 1795); - expect(cmdJson?.result.zipFileCount).to.equal(5); + // 5 files + 1 folder entry (classes/) + expect(cmdJson?.result.zipFileCount).to.equal(6); }); it('should have zip file size and file count in the output with --async', () => { @@ -79,7 +81,7 @@ describe('Deploy --verbose', () => { ).shellOutput; expect(shellOutput.stdout).to.contain('Size: ').and.contain('KB of ~39 MB limit'); - expect(shellOutput.stdout).to.contain('Files: 5 of 10,000 limit'); + expect(shellOutput.stdout).to.contain('Entries: 6 of 10,000 limit'); }); it('should have test successes in the output', () => { From 42aa4997a97bec4882c479ea18a6b1d86f57666c Mon Sep 17 00:00:00 2001 From: Willie Ruemmele Date: Thu, 1 Oct 2026 14:50:03 -0600 Subject: [PATCH 2/2] chore: bump SDR --- package.json | 2 +- yarn.lock | 18 +++++++++--------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/package.json b/package.json index c788e0f5..121773ae 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,7 @@ "@salesforce/kit": "^4.0.0", "@salesforce/plugin-info": "^4.0.10", "@salesforce/sf-plugins-core": "^13.0.4", - "@salesforce/source-deploy-retrieve": "^13.3.1", + "@salesforce/source-deploy-retrieve": "^13.4.3", "@salesforce/source-tracking": "^8.1.1", "@salesforce/ts-types": "^3.2.0", "ansis": "^3.17.0", diff --git a/yarn.lock b/yarn.lock index ea19cee3..9f4f7434 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1332,10 +1332,10 @@ ts-retry-promise "^0.8.1" zod "^4.1.12" -"@salesforce/core@^9.1.10", "@salesforce/core@^9.1.11", "@salesforce/core@^9.1.4", "@salesforce/core@^9.1.7": - version "9.2.2" - resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-9.2.2.tgz#e20561e763fef210c8a9f585a2fea84f7606e63e" - integrity sha512-7D4VqZuCzYbbrW5Yr4ECbVb3+fUa//YG7UMmWGBy3IwI/f65U5NuZ6ZTBOYuC0AM2/LXF97j2jASf5WubQVERg== +"@salesforce/core@^9.1.10", "@salesforce/core@^9.1.4", "@salesforce/core@^9.1.7", "@salesforce/core@^9.2.2": + version "9.3.0" + resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-9.3.0.tgz#6fd952edcf2cee5fcd97d9807a46f2626b6ed842" + integrity sha512-ouDf96KpZHdm81LUKVbPMFBKvyPpmW8+37nhSsYBUL1PSQ+98PJTUxzcuQekglgYBuqiaoETBclz75NYJfdEOw== dependencies: "@jsforce/jsforce-node" "^3.10.24" "@salesforce/kit" "^4.0.0" @@ -1507,12 +1507,12 @@ proxy-agent "^6.5.0" yaml "^2.9.0" -"@salesforce/source-deploy-retrieve@^13.2.0", "@salesforce/source-deploy-retrieve@^13.3.1": - version "13.4.0" - resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-13.4.0.tgz#d63375263ecb01aebc66b62bd1cbead202492f6b" - integrity sha512-6qSxudnqiiz5FgvSm1CjVHf/We+x6gV5uzhFH3fDRlF1xqCWUaLsuAxfRmwmxG9Q8ESqEdUnLgXLV3aZQbHYkw== +"@salesforce/source-deploy-retrieve@^13.2.0", "@salesforce/source-deploy-retrieve@^13.4.3": + version "13.4.3" + resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-13.4.3.tgz#5fb0517f42d37d96a2ce7097cd7afaf5046093dd" + integrity sha512-Oj6tqoJDjV1QySUNPVWpg9eqAySP360z24DP4+bbxvvHqU+QEm08Z1/3eowRXSlwB4mUaJJBbraHTkSCycRRaw== dependencies: - "@salesforce/core" "^9.1.11" + "@salesforce/core" "^9.2.2" "@salesforce/kit" "^4.0.0" "@salesforce/ts-types" "^3.2.0" "@salesforce/types" "^1.6.0"