fix: use projectDir when getting API version (#1307)

* fix: use `projectDir` when getting API version Pass `this.projectDirectory` to `SfProject.resolve` when resolving the manifest API version from `sfdx-project`. * test: update snapshots * fix: bump sfdx-core * chore: dedupe lockfile
forcedotcom · May 10, 2024 · a79023a · a79023a
1 parent 156ae86
commit a79023a
Show file tree

Hide file tree

Showing 25 changed files with 438 additions and 1,534 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
diff --git a/src/collections/componentSet.ts b/src/collections/componentSet.ts
@@ -708,7 +708,7 @@ export class ComponentSet extends LazyCollection<MetadataComponent> {
 
     if (!version) {
       try {
-        const project = await SfProject.resolve();
+        const project = await SfProject.resolve(this.projectDirectory);
         const projectConfig = await project.resolveProjectConfig();
         version = projectConfig?.sourceApiVersion as string;
       } catch (e) {

diff --git a/test/snapshot/sampleProjects/bots/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/bots/__snapshots__/verify-md-files.expected/package.xml
@@ -21,5 +21,5 @@
         <members>TestSkill</members>
         <name>Skill</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>
diff --git a/...hot/sampleProjects/customLabels-simple/__snapshots__/verify-md-files.expected/package.xml b/...hot/sampleProjects/customLabels-simple/__snapshots__/verify-md-files.expected/package.xml
@@ -10,5 +10,5 @@
         <members>CustomLabels</members>
         <name>CustomLabels</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>
diff --git a/...pleProjects/customObjects-and-children/__snapshots__/verify-md-files.expected/package.xml b/...pleProjects/customObjects-and-children/__snapshots__/verify-md-files.expected/package.xml
@@ -50,5 +50,5 @@
         <members>Property__c.All</members>
         <name>ListView</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>
diff --git a/...ampleProjects/customTranslationProject/__snapshots__/verify-md-files.expected/package.xml b/...ampleProjects/customTranslationProject/__snapshots__/verify-md-files.expected/package.xml
@@ -24,5 +24,5 @@
         <members>es</members>
         <name>Translations</name>
     </types>
-    <version>60.0</version>
+    <version>51.0</version>
 </Package>
diff --git a/.../1-post-destructive-and-1-deployment.expected/testOutput/post1/destructiveChangesPost.xml b/.../1-post-destructive-and-1-deployment.expected/testOutput/post1/destructiveChangesPost.xml
@@ -4,5 +4,5 @@
         <members>RedClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...s/__snapshots__/1-post-destructive-and-1-deployment.expected/testOutput/post1/package.xml b/...s/__snapshots__/1-post-destructive-and-1-deployment.expected/testOutput/post1/package.xml
@@ -4,5 +4,5 @@
         <members>OneClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...t-destructive-and-no-deployment.expected/testOutput/post1-solo/destructiveChangesPost.xml b/...t-destructive-and-no-deployment.expected/testOutput/post1-solo/destructiveChangesPost.xml
@@ -4,5 +4,5 @@
         <members>RedClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...apshots__/1-post-destructive-and-no-deployment.expected/testOutput/post1-solo/package.xml b/...apshots__/1-post-destructive-and-no-deployment.expected/testOutput/post1-solo/package.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...s__/1-pre-destructive-and-1-deployment.expected/testOutput/pre1/destructiveChangesPre.xml b/...s__/1-pre-destructive-and-1-deployment.expected/testOutput/pre1/destructiveChangesPre.xml
@@ -4,5 +4,5 @@
         <members>RedClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...ets/__snapshots__/1-pre-destructive-and-1-deployment.expected/testOutput/pre1/package.xml b/...ets/__snapshots__/1-pre-destructive-and-1-deployment.expected/testOutput/pre1/package.xml
@@ -4,5 +4,5 @@
         <members>OneClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...2-post-destructive-and-2-deployments.expected/testOutput/post2/destructiveChangesPost.xml b/...2-post-destructive-and-2-deployments.expected/testOutput/post2/destructiveChangesPost.xml
@@ -5,5 +5,5 @@
         <members>RedClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/.../__snapshots__/2-post-destructive-and-2-deployments.expected/testOutput/post2/package.xml b/.../__snapshots__/2-post-destructive-and-2-deployments.expected/testOutput/post2/package.xml
@@ -5,5 +5,5 @@
         <members>TwoClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...__/2-pre-destructive-and-2-deployments.expected/testOutput/pre2/destructiveChangesPre.xml b/...__/2-pre-destructive-and-2-deployments.expected/testOutput/pre2/destructiveChangesPre.xml
@@ -5,5 +5,5 @@
         <members>RedClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...ts/__snapshots__/2-pre-destructive-and-2-deployments.expected/testOutput/pre2/package.xml b/...ts/__snapshots__/2-pre-destructive-and-2-deployments.expected/testOutput/pre2/package.xml
@@ -5,5 +5,5 @@
         <members>TwoClass</members>
         <name>ApexClass</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...sampleProjects/digitalExperienceBundle/__snapshots__/verify-md-files.expected/package.xml b/...sampleProjects/digitalExperienceBundle/__snapshots__/verify-md-files.expected/package.xml
@@ -81,5 +81,5 @@
         <members>Capricorn_Coffee_B</members>
         <name>Network</name>
     </types>
-    <version>60.0</version>
+    <version>57.0</version>
 </Package>
diff --git a/...hot/sampleProjects/legacySuffixSupport/__snapshots__/verify-md-files.expected/package.xml b/...hot/sampleProjects/legacySuffixSupport/__snapshots__/verify-md-files.expected/package.xml
@@ -14,5 +14,5 @@
         <members>LogEntryArchive__b.LogEntryArchiveIndex</members>
         <name>Index</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>
diff --git a/.../snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml b/.../snapshot/sampleProjects/nestedFolders/__snapshots__/verify-md-files.expected/package.xml
@@ -14,5 +14,5 @@
         <members>unfiled$public/Top_level_report_cZJ</members>
         <name>Report</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...hot/sampleProjects/preset-sharingRules/__snapshots__/verify-md-files.expected/package.xml b/...hot/sampleProjects/preset-sharingRules/__snapshots__/verify-md-files.expected/package.xml
@@ -20,5 +20,5 @@
         <members>Territory_1</members>
         <name>Territory</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/test/snapshot/sampleProjects/sharingRules/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/sharingRules/__snapshots__/verify-md-files.expected/package.xml
@@ -86,5 +86,5 @@
         <members>Territory_1</members>
         <name>Territory</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/...snapshot/sampleProjects/staticResource/__snapshots__/verify-md-files.expected/package.xml b/...snapshot/sampleProjects/staticResource/__snapshots__/verify-md-files.expected/package.xml
@@ -7,5 +7,5 @@
         <members>sample_data_properties</members>
         <name>StaticResource</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>
diff --git a/test/snapshot/sampleProjects/territory/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/territory/__snapshots__/verify-md-files.expected/package.xml
@@ -20,5 +20,5 @@
         <members>State</members>
         <name>Territory2Type</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/test/snapshot/sampleProjects/workflow/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/workflow/__snapshots__/verify-md-files.expected/package.xml
@@ -24,5 +24,5 @@
         <members>Account.task_1</members>
         <name>WorkflowTask</name>
     </types>
-    <version>60.0</version>
+    <version>52.0</version>
 </Package>
diff --git a/test/snapshot/sampleProjects/xmlComments/__snapshots__/verify-md-files.expected/package.xml b/test/snapshot/sampleProjects/xmlComments/__snapshots__/verify-md-files.expected/package.xml
@@ -41,5 +41,5 @@
         <members>Contact-en_US</members>
         <name>CustomObjectTranslation</name>
     </types>
-    <version>60.0</version>
+    <version>59.0</version>
 </Package>