Skip to content
This repository was archived by the owner on Mar 18, 2024. It is now read-only.

Commit e1b48d7

Browse files
author
sfopsbot
committed
fix(validate): fix incorrect override of diff packages in source mode
1 parent 2cab0e8 commit e1b48d7

File tree

2 files changed

+22
-25
lines changed

2 files changed

+22
-25
lines changed

packages/sfpowerscripts-cli/package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"name": "@dxatscale/sfpowerscripts",
33
"description": "DX@Scale Toolkit",
4-
"version": "25.6.0",
4+
"version": "25.6.1",
55
"license": "MIT",
66
"author": "dxatscale",
77
"release": "January 24",

packages/sfpowerscripts-cli/src/impl/validate/ValidateImpl.ts

+21-24
Original file line numberDiff line numberDiff line change
@@ -477,30 +477,27 @@ export default class ValidateImpl implements PostDeployHook, PreDeployHook {
477477

478478

479479
function computePackageOverrides(props: ValidateProps): { [key: string]: PackageType } {
480-
let overridedPackages: { [key: string]: PackageType } = {};
481-
const allPackages = ProjectConfig.getAllPackages(null);
482-
const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
483-
for (const pkg of allPackages) {
484-
485-
if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
486-
if (
487-
props.validationMode ===
488-
ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
489-
props.validationMode ===
490-
ValidationMode.FAST_FEEDBACK
491-
) {
492-
overridedPackages[pkg] = PackageType.Diff
493-
}
494-
else {
495-
if (!props.disableSourcePackageOverride) {
496-
if (ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Data || ProjectConfig.getPackageType(projectConfig, pkg) != PackageType.Diff)
497-
overridedPackages[pkg] = PackageType.Source
498-
}
499-
}
500-
}
501-
}
502-
return overridedPackages;
503-
}
480+
let overridedPackages: { [key: string]: PackageType } = {};
481+
const allPackages = ProjectConfig.getAllPackages(null);
482+
const projectConfig = ProjectConfig.getSFDXProjectConfig(null);
483+
for (const pkg of allPackages) {
484+
if (ProjectConfig.getPackageType(projectConfig, pkg) !== PackageType.Data) {
485+
if (
486+
props.validationMode === ValidationMode.FASTFEEDBACK_LIMITED_BY_RELEASE_CONFIG ||
487+
props.validationMode === ValidationMode.FAST_FEEDBACK
488+
) {
489+
overridedPackages[pkg] = PackageType.Diff;
490+
} else {
491+
if (!props.disableSourcePackageOverride) {
492+
if (ProjectConfig.getPackageType(projectConfig, pkg) == PackageType.Unlocked) {
493+
overridedPackages[pkg] = PackageType.Source;
494+
}
495+
}
496+
}
497+
}
498+
}
499+
return overridedPackages;
500+
}
504501

505502
function fetchPackagesAsPerReleaseConfig(
506503
logger: Logger,

0 commit comments

Comments
 (0)