chore: qa-able branch

Author: mshanemc

package.json

@@ -11,11 +11,14 @@
     "@salesforce/kit": "^3.2.1",
     "@salesforce/plugin-info": "^3.3.24",
     "@salesforce/sf-plugins-core": "^11.3.2",
-    "@salesforce/source-deploy-retrieve": "^12.2.1",
+    "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1",
     "@salesforce/source-tracking": "^7.1.5",
     "@salesforce/ts-types": "^2.0.12",
     "ansis": "^3.3.2"
   },
+  "resolutions": {
+    "@salesforce/source-deploy-retrieve": "^12.3.0-qa.1"
+  },
   "devDependencies": {
     "@oclif/plugin-command-snapshot": "^5.2.10",
     "@salesforce/cli-plugins-testkit": "^5.3.23",

src/commands/project/convert/source-behavior.ts

@@ -9,7 +9,7 @@ import { rm, readFile, writeFile } from 'node:fs/promises';
 import { join } from 'node:path';
 import { existsSync } from 'node:fs';
 import { SfCommand, Flags } from '@salesforce/sf-plugins-core';
-import { Messages, SfProject } from '@salesforce/core';
+import { Messages } from '@salesforce/core';
 import {
   getValidatedProjectJson,
   TMP_DIR,
@@ -82,8 +82,6 @@ export default class ConvertSourceBehavior extends SfCommand<SourceBehaviorResul
     // delete the “original” files that no longer work because of project update
     await Promise.all(flags['dry-run'] ? [] : filesToDelete.map((f) => rm(f)));
 
-    SfProject.clearInstances(); // break the singleton so SDR will re-read to get the new preset
-
     const createdFiles = await convertBackToSource({
       packageDirsWithPreset: packageDirsWithDecomposable,
       projectDir: this.project!.getPath(),

src/utils/convertBehavior.ts

@@ -15,6 +15,7 @@ import {
   ConvertResult,
   MetadataConverter,
   MetadataRegistry,
+  RegistryAccess,
   SourceComponent,
   presetMap,
 } from '@salesforce/source-deploy-retrieve';
@@ -142,7 +143,8 @@ const convertToSource = async ({
 }): Promise<ConvertResult[]> => {
   // mdapi=>source convert the target dir back to the project
   // it's a new converter because the project has changed and it should reload the project's registry.
-  const converter = new MetadataConverter();
+  SfProject.clearInstances(); // break the singleton so SDR will re-read to get the new preset
+  const converter = new MetadataConverter(new RegistryAccess(undefined, projectDir));
   return Promise.all(
     packageDirsWithPreset.map(async (pd) =>
       converter.convert(

yarn.lock

@@ -1589,7 +1589,7 @@
     strip-ansi "6.0.1"
     ts-retry-promise "^0.8.1"
 
-"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.3.0", "@salesforce/core@^8.4.0":
+"@salesforce/core@^8.0.3", "@salesforce/core@^8.1.1", "@salesforce/core@^8.2.3", "@salesforce/core@^8.2.7", "@salesforce/core@^8.2.8", "@salesforce/core@^8.4.0":
   version "8.4.0"
   resolved "https://registry.yarnpkg.com/@salesforce/core/-/core-8.4.0.tgz#d2ddfe07994c42b1e917e581e9cf47ad27b97a93"
   integrity sha512-P+n0+Sp+v6voLTShW2E5sdF7gCUxEXJjNcc9Jtto0ZMyQesmQJ6WGpWmAuRoi+BVYc8OPSlEffndaYDAo/u73g==
@@ -1717,13 +1717,13 @@
     string-width "^7.2.0"
     terminal-link "^3.0.0"
 
-"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.2.1":
-  version "12.2.1"
-  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.2.1.tgz#532219fc25f9cea7b7c74c0927e32984275112f5"
-  integrity sha512-Ke8hO0mCezy3RZ+rQfMzNfmzu5FEpONRM24NY/BYn9f/jZCGX1lnsiWt9j+332CfthZkCK8H5DqWtG/KZJEXcg==
+"@salesforce/source-deploy-retrieve@^12.1.11", "@salesforce/source-deploy-retrieve@^12.1.5", "@salesforce/source-deploy-retrieve@^12.3.0-qa.1":
+  version "12.3.0-qa.1"
+  resolved "https://registry.yarnpkg.com/@salesforce/source-deploy-retrieve/-/source-deploy-retrieve-12.3.0-qa.1.tgz#af2d75b80ce190c93707c4b8e60f2a116549c231"
+  integrity sha512-JTRcIVt01aod9IqtwTCzG07A1XH06pA92wKwnuTklU9tCA3q9kz/YTh/VsPLpDOUbyzP3XImXUM0e+KXLN4ojg==
   dependencies:
-    "@salesforce/core" "^8.3.0"
-    "@salesforce/kit" "^3.1.6"
+    "@salesforce/core" "^8.4.0"
+    "@salesforce/kit" "^3.2.1"
     "@salesforce/ts-types" "^2.0.12"
     fast-levenshtein "^3.0.0"
     fast-xml-parser "^4.4.1"