From ce95d7dccaa09fdcd053e0b5cbd555680c221af8 Mon Sep 17 00:00:00 2001
From: Manas Agarwal <manas.agarwal@salesforce.com>
Date: Mon, 21 Nov 2022 20:47:40 +0530
Subject: [PATCH] Code Delivery 1.16.1

* Disable Extensive Logging & Repetitions on Git Based Deploy (#523)
* Fixes local compilation #525 (#532)
---
 lib/datapacktypes/vlocitycard.js |  5 +++--
 lib/utilityservice.js            | 16 +++++++++++-----
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/lib/datapacktypes/vlocitycard.js b/lib/datapacktypes/vlocitycard.js
index b3defda5..387875f3 100644
--- a/lib/datapacktypes/vlocitycard.js
+++ b/lib/datapacktypes/vlocitycard.js
@@ -216,10 +216,11 @@ VlocityCard.prototype.onDeployFinish = async function(jobInfo) {
 VlocityCard.prototype.compileFlexCardsLwc = async function (flexCardID,jobInfo,flexCardsCompiler) {
     VlocityUtils.report('Compiling Flexcard with  FlexCard ID: ',flexCardID); 
     try { 
-        let tempSfdxFolder = path.join(jobInfo.tempFolder, 'tempDeployLWC', 'salesforce_sfdx/lwc');
+        const isInsidePackage = !(this.vlocity.PackageVersion === 'DeveloperOrg');
+        const tempSfdxFolder = path.join(jobInfo.tempFolder, 'tempDeployLWC', 'salesforce_sfdx/lwc');
           
         const fCCompiler = new flexCardsCompiler(this.vlocity.namespace, this.vlocity.jsForceConnection,
-                                                 this.vlocity.jsForceConnection.instanceUrl, false);  
+                                                 this.vlocity.jsForceConnection.instanceUrl, isInsidePackage);  
         await fCCompiler.compileMetadataWithId(flexCardID, tempSfdxFolder);
         jobInfo.deployGeneratedLwc = true; 
     }
diff --git a/lib/utilityservice.js b/lib/utilityservice.js
index 47a0e66b..3d14c60a 100644
--- a/lib/utilityservice.js
+++ b/lib/utilityservice.js
@@ -665,10 +665,10 @@ UtilityService.prototype.getGitDiffsFromOrgToLocal = async function(jobInfo) {
 
         if (hashKey) {
             if (jobInfo.overrideOrgCommit){
-                VlocityUtils.success('Override Git Hash', hashKey);
+                VlocityUtils.verbose('Override Git Hash', hashKey);
             }
             else{
-               VlocityUtils.success('Git Hash', hashKey);
+               VlocityUtils.verbose('Git Hash', hashKey);
            }
 
             if (jobInfo.expansionPath) {
@@ -677,7 +677,9 @@ UtilityService.prototype.getGitDiffsFromOrgToLocal = async function(jobInfo) {
                 var gitChanges = childProcess.execSync(`cd ${jobInfo.projectPath}/../ && git diff --stat ${hashKey} --raw --no-renames -- ${jobInfo.projectPath}`, { encoding: 'utf8',  maxBuffer: 1024*1024*20  });
             }
 
-            VlocityUtils.success('Git Differences', gitChanges);
+            if (!jobInfo.isRetry) {
+                VlocityUtils.verbose('Git Differences', gitChanges);
+            }
 
             var allPotentialFiles = [];
             var deletedParentFiles = [];
@@ -689,7 +691,9 @@ UtilityService.prototype.getGitDiffsFromOrgToLocal = async function(jobInfo) {
 
             var gitNewFiles = childProcess.execSync(`cd ${jobInfo.projectPath} && git ls-files --others --exclude-standard`, { encoding: 'utf8' });
 
-            VlocityUtils.verbose('New Files', gitNewFiles);
+            if (!jobInfo.isRetry) {
+                VlocityUtils.verbose('New Files', gitNewFiles);
+            }
 
             if (gitNewFiles) {
                 for (var newfile of gitNewFiles.split('\n')) {
@@ -728,7 +732,9 @@ UtilityService.prototype.getGitDiffsFromOrgToLocal = async function(jobInfo) {
                 }
             }
 
-            VlocityUtils.success('Git Check', `Found Changes for ${changedDataPacks.length} DataPacks`, changedDataPacks);
+            if (!jobInfo.isRetry) {
+                VlocityUtils.verbose('Git Check', `Found Changes for ${changedDataPacks.length} DataPacks`, changedDataPacks);
+            }
             
             return changedDataPacks;
         } else {