@salesforce/packaging 1.4.12 → 1.4.13

package/lib/package/packageVersionCreate.js

@@ -330,17 +330,16 @@ class PackageVersionCreate {
         if (this.options.codecoverage) {
             hasUnpackagedMetadata = await this.metadataResolver.resolveMetadata(unpackagedMetadataPath, unpackagedMetadataFolder, 'unpackagedMDDirectoryDoesNotExist', sourceApiVersion);
         }
-        // if we're using unpackaged metadata, don't package the profiles located there
-        if (hasUnpackagedMetadata) {
-            typesArr = this.options.profileApi.filterAndGenerateProfilesForManifest(typesArr, [unpackagedMetadataPath]);
-        }
-        else {
-            typesArr = this.options.profileApi.filterAndGenerateProfilesForManifest(typesArr);
-        }
+        // don't package the profiles from any unpackagedMetadata dir in the project
+        const profileExcludeDirs = this.project
+            .getPackageDirectories()
+            .filter((packageDir) => packageDir.unpackagedMetadata?.path)
+            .map((packageDir) => packageDir.unpackagedMetadata.path);
+        typesArr = this.options.profileApi.filterAndGenerateProfilesForManifest(typesArr, profileExcludeDirs);
         // Next generate profiles and retrieve any profiles that were excluded because they had no matching nodes.
         const excludedProfiles = this.options.profileApi.generateProfiles(packageVersProfileFolder, {
             Package: typesArr,
-        }, [hasUnpackagedMetadata ? unpackagedMetadataPath : null]);
+        }, profileExcludeDirs);
         if (excludedProfiles.length > 0) {
             const profileIdx = typesArr.findIndex((e) => e.name[0] === 'Profile');
             typesArr[profileIdx].members = typesArr[profileIdx].members.filter((e) => !excludedProfiles.includes(e));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/packaging",
-  "version": "1.4.12",
+  "version": "1.4.13",
   "description": "Packaging library for the Salesforce packaging platform",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",