@dxatscale/sfpowerscripts.core - npm Package Compare versions

Comparing version 3.0.14 to 3.0.15

lib/parallelBuilder/BuildImpl.d.ts

@@ -24,3 +24,2 @@ import PackageMetadata from "../PackageMetadata";
     private generatedPackages;
-    private orgDependentPackages;
     private packageInfo;
@@ -42,7 +41,4 @@ private recursiveAll;
     private createSourcePackage;
-    private getOrgDependentPackages;
-    private getUnlockedPacakges;
-    private getPackageInfo;
     private createDataPackage;
     private getFormattedTime;
 }

lib/parallelBuilder/BuildImpl.js

@@ -54,6 +54,3 @@ "use strict";
 const rimraf = __importStar(require("rimraf"));
-const SourcePackageGenerator_1 = __importDefault(require("../generators/SourcePackageGenerator"));
-const PackageVersionListImpl_1 = __importDefault(require("../sfdxwrappers/PackageVersionListImpl"));
 const fs = require("fs-extra");
-let path = require("path");
 const PRIORITY_UNLOCKED_PKG_WITH_DEPENDENCY = 1;
@@ -83,3 +80,2 @@ const PRIORITY_UNLOCKED_PKG_WITHOUT_DEPENDENCY = 3;
         this.packageCreationPromises = new Array();
-        this.orgDependentPackages = [];
     }
@@ -100,6 +96,9 @@ exec() {
                 }
+                this.projectConfig = ManifestHelpers_1.default.getSFDXPackageManifest(this.project_directory);
+                this.childs = DependencyHelper_1.default.getChildsOfAllPackages(this.project_directory, this.packagesToBeBuilt);
                 try {
                     for (var _b = __asyncValues(this.packagesToBeBuilt), _c; _c = yield _b.next(), !_c.done;) {
                         const pkg = _c.value;
-                        let diffImpl = new PackageDiffImpl_1.default(pkg, this.project_directory, this.config_file_path, override);
+                        let { priority, type } = this.getPriorityandTypeOfAPackage(this.projectConfig, this.childs, pkg);
+                        let diffImpl = new PackageDiffImpl_1.default(pkg, this.project_directory, (type == "Data" || type == "Source") ? null : this.config_file_path, override);
                         let isToBeBuilt = yield diffImpl.exec();
@@ -122,9 +121,9 @@ if (isToBeBuilt) {
             console.log("Packages scheduled to be built", this.packagesToBeBuilt);
-            console.log("Fetching Unlocked Package Info..");
-            this.orgDependentPackages = yield this.getOrgDependentPackages();
-            this.unlockedPackages = yield this.getUnlockedPacakges();
-            this.childs = DependencyHelper_1.default.getChildsOfAllPackages(this.project_directory, this.packagesToBeBuilt);
+            if (this.packagesToBeBuilt.length == 0)
+                return {
+                    generatedPackages: this.generatedPackages,
+                    failedPackages: this.failedPackages,
+                };
             this.parents = DependencyHelper_1.default.getParentsOfAllPackages(this.project_directory, this.packagesToBeBuilt);
             this.parentsToBeFulfilled = DependencyHelper_1.default.getParentsToBeFullFilled(this.parents, this.packagesToBeBuilt);
-            this.projectConfig = ManifestHelpers_1.default.getSFDXPackageManifest(this.project_directory);
             let sortedBatch = new BatchingTopoSort_1.default().sort(this.childs);
@@ -134,3 +133,3 @@ //Do First Level Package First
             for (const pkg of sortedBatch[0]) {
-                let { priority, type } = this.getPriorityandTypeOfAPackage(pkg);
+                let { priority, type } = this.getPriorityandTypeOfAPackage(this.projectConfig, this.childs, pkg);
                 let packagePromise = this.limiter
@@ -211,3 +210,3 @@ .schedule({ id: pkg, priority: priority }, () => this.createPackage(type, pkg, this.config_file_path, this.devhub_alias, this.wait_time, this.isSkipValidation, this.isValidateMode))
             if (((_a = this.parentsToBeFulfilled[pkg]) === null || _a === void 0 ? void 0 : _a.length) == 0) {
-                let { priority, type } = this.getPriorityandTypeOfAPackage(pkg);
+                let { priority, type } = this.getPriorityandTypeOfAPackage(this.projectConfig, this.childs, pkg);
                 let packagePromise = this.limiter
@@ -234,7 +233,7 @@ .schedule({ id: pkg, priority: priority }, () => this.createPackage(type, pkg, this.config_file_path, this.devhub_alias, this.wait_time, this.isSkipValidation, this.isValidateMode))
     }
-    getPriorityandTypeOfAPackage(pkg) {
+    getPriorityandTypeOfAPackage(projectConfig, childs, pkg) {
         let priority = 0;
-        let type = ManifestHelpers_1.default.getPackageType(this.projectConfig, pkg);
+        let type = ManifestHelpers_1.default.getPackageType(projectConfig, pkg);
         if (type === "Unlocked") {
-            if (this.childs[pkg] > 0)
+            if (childs[pkg] > 0)
                 priority = PRIORITY_UNLOCKED_PKG_WITH_DEPENDENCY;
@@ -316,5 +315,3 @@ else
         };
-        //Create a working directory
-        let projectDirectory = SourcePackageGenerator_1.default.generateSourcePackageArtifact(null, sfdx_package, ManifestHelpers_1.default.getPackageDescriptorFromConfig(sfdx_package, this.projectConfig)["path"], null, config_file_path);
-        let createUnlockedPackageImpl = new CreateUnlockedPackageImpl_1.default(sfdx_package, null, path.join("config", "project-scratch-def.json"), true, null, projectDirectory, devhub_alias, wait_time, !isSkipValidation, isSkipValidation, packageMetadata, this.orgDependentPackages.includes(sfdx_package));
+        let createUnlockedPackageImpl = new CreateUnlockedPackageImpl_1.default(sfdx_package, null, this.config_file_path, true, null, this.project_directory, devhub_alias, wait_time, !isSkipValidation, isSkipValidation, packageMetadata);
         let result = createUnlockedPackageImpl.exec();
@@ -341,32 +338,2 @@ return result;
     }
-    getOrgDependentPackages() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let orgDependentPackages = [];
-            let packageInfo = yield this.getPackageInfo();
-            packageInfo.forEach((pkg) => {
-                if (pkg.IsOrgDependent === "Yes")
-                    orgDependentPackages.push(pkg.Name);
-            });
-            return orgDependentPackages;
-        });
-    }
-    getUnlockedPacakges() {
-        return __awaiter(this, void 0, void 0, function* () {
-            let unlockedPackages = [];
-            let packageInfo = yield this.getPackageInfo();
-            packageInfo.forEach((pkg) => {
-                if (pkg.IsOrgDependent === "No")
-                    unlockedPackages.push(pkg.Name);
-            });
-            return unlockedPackages;
-        });
-    }
-    getPackageInfo() {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.packageInfo == null) {
-                this.packageInfo = yield new PackageVersionListImpl_1.default(this.project_directory, this.devhub_alias).exec();
-            }
-            return this.packageInfo;
-        });
-    }
     createDataPackage(sfdx_package, commit_id, repository_url) {
@@ -397,2 +364,2 @@ let incrementedVersionNumber;
 exports.default = BuildImpl;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BuildImpl.js","sourceRoot":"","sources":["../../src/parallelBuilder/BuildImpl.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,0EAAkD;AAElD,0EAAkD;AAClD,4DAAoC;AACpC,iFAAyD;AACzD,qCAA+B;AAC/B,0GAAkF;AAClF,kFAA0D;AAC1D,sGAA8E;AAC9E,kGAA0E;AAC1E,sHAA8F;AAC9F,mEAA2C;AAC3C,2BAAyB;AACzB,+CAAiC;AACjC,kGAA0E;AAC1E,oGAA4E;AAC5E,MAAM,EAAE,GAAG,OAAO,CAAC,UAAU,CAAC,CAAC;AAC/B,IAAI,IAAI,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC;AAE3B,MAAM,qCAAqC,GAAG,CAAC,CAAC;AAChD,MAAM,wCAAwC,GAAG,CAAC,CAAC;AACnD,MAAM,mBAAmB,GAAG,CAAC,CAAC;AAC9B,MAAM,iBAAiB,GAAG,CAAC,CAAC;AAC5B,MAAqB,SAAS;IAqB5B,YACU,gBAAwB,EACxB,iBAAyB,EACzB,YAAoB,EACpB,OAAe,EACf,SAAiB,EACjB,gBAAyB,EACzB,kBAA2B,EAC3B,WAAmB,EACnB,aAAqB,EACrB,cAAsB;QATtB,qBAAgB,GAAhB,gBAAgB,CAAQ;QACxB,sBAAiB,GAAjB,iBAAiB,CAAQ;QACzB,iBAAY,GAAZ,YAAY,CAAQ;QACpB,YAAO,GAAP,OAAO,CAAQ;QACf,cAAS,GAAT,SAAS,CAAQ;QACjB,qBAAgB,GAAhB,gBAAgB,CAAS;QACzB,uBAAkB,GAAlB,kBAAkB,CAAS;QAC3B,gBAAW,GAAX,WAAW,CAAQ;QACnB,kBAAa,GAAb,aAAa,CAAQ;QACrB,mBAAc,GAAd,cAAc,CAAQ;QAhBxB,iBAAY,GAAG,CAAC,CAAC,EAAE,EAAE,CAC3B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CACxB,CAAC,CAAC,MAAM,IAAI,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC,CAAC,CAChD,CAAC;QAeF,IAAI,CAAC,OAAO,GAAG,IAAI,oBAAU,CAAC;YAC5B,aAAa,EAAE,IAAI,CAAC,aAAa;SAClC,CAAC,CAAC;QAEH,IAAI,CAAC,aAAa,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,cAAc,GAAG,EAAE,CAAC;QACzB,IAAI,CAAC,iBAAiB,GAAG,EAAE,CAAC;QAC5B,IAAI,CAAC,uBAAuB,GAAG,IAAI,KAAK,EAAE,CAAC;QAC3C,IAAI,CAAC,oBAAoB,GAAG,EAAE,CAAC;IACjC,CAAC;IAEY,IAAI;;;YAIf,IAAI,CAAC,iBAAiB,GAAG,yBAAe,CAAC,cAAc,CACrD,IAAI,CAAC,iBAAiB,CACvB,CAAC;YAEF,MAAM,CAAC,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAE/B,OAAO,CAAC,GAAG,CAAC,mCAAmC,CAAC,CAAC;YACjD,mBAAS,CAAC,aAAa,GAAG,IAAI,CAAC;YAE/B,gBAAgB;YAChB,IAAI,IAAI,CAAC,kBAAkB,EAAE;gBAC3B,IAAI,gBAAgB,GAAG,EAAE,CAAC;gBAE1B,IAAI,QAAiB,CAAC;gBACtB,IAAI,IAAI,CAAC,cAAc,EAAE;oBACvB,QAAQ,GAAG,IAAI,CAAC;iBACjB;;oBAED,KAAwB,IAAA,KAAA,cAAA,IAAI,CAAC,iBAAiB,CAAA,IAAA;wBAAnC,MAAM,GAAG,WAAA,CAAA;wBAClB,IAAI,QAAQ,GAAoB,IAAI,yBAAe,CACjD,GAAG,EACH,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,gBAAgB,EACrB,QAAQ,CACT,CAAC;wBACF,IAAI,WAAW,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAC;wBACxC,IAAI,WAAW,EAAE;4BACf,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;yBAC5B;qBACF;;;;;;;;;gBACD,IAAI,CAAC,iBAAiB,GAAG,gBAAgB,CAAC;aAC3C;YAED,qCAAqC;YACrC,OAAO,CAAC,GAAG,CAAC,gCAAgC,EAAE,IAAI,CAAC,iBAAiB,CAAC,CAAC;YAEtE,OAAO,CAAC,GAAG,CAAC,kCAAkC,CAAC,CAAC;YAChD,IAAI,CAAC,oBAAoB,GAAG,MAAM,IAAI,CAAC,uBAAuB,EAAE,CAAC;YACjE,IAAI,CAAC,gBAAgB,GAAG,MAAM,IAAI,CAAC,mBAAmB,EAAE,CAAC;YAEzD,IAAI,CAAC,MAAM,GAAG,0BAAgB,CAAC,sBAAsB,CACnD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,CACvB,CAAC;YACF,IAAI,CAAC,OAAO,GAAG,0BAAgB,CAAC,uBAAuB,CACrD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,iBAAiB,CACvB,CAAC;YAEF,IAAI,CAAC,oBAAoB,GAAG,0BAAgB,CAAC,wBAAwB,CACnE,IAAI,CAAC,OAAO,EACZ,IAAI,CAAC,iBAAiB,CACvB,CAAC;YAEF,IAAI,CAAC,aAAa,GAAG,yBAAe,CAAC,sBAAsB,CACzD,IAAI,CAAC,iBAAiB,CACvB,CAAC;YACF,IAAI,WAAW,GAAG,IAAI,0BAAgB,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;YAE3D,8BAA8B;YAC9B,IAAI,cAAc,GAAG,EAAE,CAAC;YACxB,KAAK,MAAM,GAAG,IAAI,WAAW,CAAC,CAAC,CAAC,EAAE;gBAChC,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;gBAChE,IAAI,cAAc,GAA6B,IAAI,CAAC,OAAO;qBACxD,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAC9C,IAAI,CAAC,aAAa,CAChB,IAAI,EACJ,GAAG,EACH,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,CACpB,CACF;qBACA,IAAI,CACH,CAAC,eAAgC,EAAE,EAAE;oBACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBAC7C,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;gBAC3C,CAAC,EACD,CAAC,MAAW,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CACtD,CAAC;gBAEJ,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACnD;YAED,gDAAgD;YAChD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;gBAC5D,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;YACtC,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,eAAe,GAAG,KAAK,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;YAElD,IAAI,CAAC,iBAAiB,EAAE,CAAC;YAEzB,oEAAoE;YACpE,MAAM,IAAI,CAAC,YAAY,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;YAEtD,OAAO;gBACL,iBAAiB,EAAE,IAAI,CAAC,iBAAiB;gBACzC,cAAc,EAAE,IAAI,CAAC,cAAc;aACpC,CAAC;;KACH;IAEO,iBAAiB;QACvB,OAAO,CAAC,GAAG,CACT,GAAG,QAAG,iCAAiC,IAAI,CAAC,eAAe,CAAC,MAAM,IAAI,EACtE,GAAG,IAAI,CAAC,eAAe,EAAE,CAC1B,CAAC;QACF,OAAO,CAAC,GAAG,CACT,yCAAyC,IAAI,CAAC,iBAAiB,CAAC,MAAM,IAAI,EAC1E,GAAG,IAAI,CAAC,iBAAiB,EAAE,CAC5B,CAAC;IACJ,CAAC;IAEO,kBAAkB,CAAC,MAAW,EAAE,GAAW;QACjD,OAAO,CAAC,GAAG,CAAC,GAAG,QAAG,2CAA2C,CAAC,CAAC;QAC/D,OAAO,CAAC,GAAG,CAAC,+BAA+B,GAAG,EAAE,CAAC,CAAC;QAClD,IAAI;YACF,IAAI,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,wBAAwB,GAAG,EAAE,EAAE,MAAM,CAAC,CAAC;YAClE,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;SACnB;QAAC,OAAO,CAAC,EAAE;YACV,OAAO,CAAC,GAAG,CAAC,kCAAkC,GAAG,EAAE,CAAC,CAAC;SACtD;QAED,8CAA8C;QAC9C,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC5D,IAAI,EAAE,IAAI,GAAG;gBAAE,OAAO,KAAK,CAAC;;gBACvB,OAAO,IAAI,CAAC;QACnB,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,EAAE;YAC9D,IAAI,GAAG,IAAI,QAAQ;gBAAE,OAAO,KAAK,CAAC;;gBAC7B,OAAO,IAAI,CAAC;QACnB,CAAC,CAAC,CAAC;QAEH,8BAA8B;QAC9B,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,EAAE;YAC7D,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE;gBAClC,IAAI,CAAC,cAAc,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC;gBAC3C,OAAO,KAAK,CAAC;aACd;QACH,CAAC,CAAC,CAAC;QACH,OAAO,CAAC,GAAG,CAAC,GAAG,QAAG,yBAAyB,GAAG,aAAa,CAAC,CAAC;QAC7D,OAAO,CAAC,GAAG,CAAC,GAAG,QAAG,2CAA2C,CAAC,CAAC;IACjE,CAAC;IAEO,kBAAkB,CAAC,eAAgC;QACzD,IAAI,CAAC,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,YAAY,CAAC,CAAC;QACtD,IAAI,CAAC,mBAAmB,CAAC,eAAe,CAAC,CAAC;QAE1C,oEAAoE;QACpE,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YACrC,MAAM,mBAAmB,SAAG,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,0CAAE,MAAM,CAChE,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,eAAe,CAAC,YAAY,CACxD,CAAC;YACF,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,GAAG,mBAAmB,CAAC;QACvD,CAAC,CAAC,CAAC;QAEH,qEAAqE;QACrE,IAAI,cAAc,GAAG,EAAE,CAAC;QACxB,IAAI,CAAC,iBAAiB,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;;YACrC,IAAI,OAAA,IAAI,CAAC,oBAAoB,CAAC,GAAG,CAAC,0CAAE,MAAM,KAAI,CAAC,EAAE;gBAC/C,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,IAAI,CAAC,4BAA4B,CAAC,GAAG,CAAC,CAAC;gBAChE,IAAI,cAAc,GAA6B,IAAI,CAAC,OAAO;qBACxD,QAAQ,CAAC,EAAE,EAAE,EAAE,GAAG,EAAE,QAAQ,EAAE,QAAQ,EAAE,EAAE,GAAG,EAAE,CAC9C,IAAI,CAAC,aAAa,CAChB,IAAI,EACJ,GAAG,EACH,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,YAAY,EACjB,IAAI,CAAC,SAAS,EACd,IAAI,CAAC,gBAAgB,EACrB,IAAI,CAAC,cAAc,CACpB,CACF;qBACA,IAAI,CACH,CAAC,eAAgC,EAAE,EAAE;oBACnC,IAAI,CAAC,iBAAiB,CAAC,IAAI,CAAC,eAAe,CAAC,CAAC;oBAC7C,IAAI,CAAC,kBAAkB,CAAC,eAAe,CAAC,CAAC;gBAC3C,CAAC,EACD,CAAC,MAAW,EAAE,EAAE,CAAC,IAAI,CAAC,kBAAkB,CAAC,MAAM,EAAE,GAAG,CAAC,CACtD,CAAC;gBACJ,cAAc,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBACzB,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC/B,IAAI,CAAC,uBAAuB,CAAC,IAAI,CAAC,cAAc,CAAC,CAAC;aACnD;QACH,CAAC,CAAC,CAAC;QAEH,IAAI,cAAc,CAAC,MAAM,GAAG,CAAC,EAAE;YAC7B,OAAO,CAAC,GAAG,CACT,GAAG,QAAG,uCAAuC,cAAc,CAAC,MAAM,IAAI,EACtE,GAAG,cAAc,EAAE,CACpB,CAAC;SACH;QACD,gDAAgD;QAChD,IAAI,CAAC,iBAAiB,GAAG,IAAI,CAAC,iBAAiB,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE;YAC5D,OAAO,CAAC,cAAc,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC;QACtC,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,eAAe,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAChD,CAAC,QAAQ,EAAE,EAAE,CAAC,QAAQ,KAAK,eAAe,CAAC,YAAY,CACxD,CAAC;QAEF,IAAI,CAAC,iBAAiB,EAAE,CAAC;IAC3B,CAAC;IAEO,4BAA4B,CAAC,GAAW;QAC9C,IAAI,QAAQ,GAAG,CAAC,CAAC;QACjB,IAAI,IAAI,GAAG,yBAAe,CAAC,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,GAAG,CAAC,CAAC;QACnE,IAAI,IAAI,KAAK,UAAU,EAAE;YACvB,IAAI,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC;gBACtB,QAAQ,GAAG,qCAAqC,CAAC;;gBAC9C,QAAQ,GAAG,wCAAwC,CAAC;SAC1D;aAAM,IAAI,IAAI,KAAK,QAAQ,EAAE;YAC5B,QAAQ,GAAG,mBAAmB,CAAC;SAChC;aAAM,IAAI,IAAI,KAAK,MAAM,EAAE;YAC1B,QAAQ,GAAG,iBAAiB,CAAC;SAC9B;aAAM;YACL,MAAM,IAAI,KAAK,CAAC,wBAAwB,IAAI,EAAE,CAAC,CAAC;SACjD;QAED,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IAC5B,CAAC;IAEO,mBAAmB,CAAC,eAAgC;QAC1D,OAAO,CAAC,GAAG,CACT,GAAG,QAAG,GACJ,eAAe,CAAC,YAClB,uBAAuB,IAAI,CAAC,gBAAgB,CAC1C,eAAe,CAAC,gBAAgB,CAAC,aAAa,CAC/C,EAAE,CACJ,CAAC;QACF,OAAO,CAAC,GAAG,CAAC,uBAAuB,CAAC,CAAC;QACrC,OAAO,CAAC,GAAG,CACT,oCAAoC,EACpC,eAAe,CAAC,sBAAsB,CACvC,CAAC;QACF,IAAI,eAAe,CAAC,YAAY,IAAI,UAAU,EAAE;YAC9C,OAAO,CAAC,GAAG,CACT,qCAAqC,EACrC,eAAe,CAAC,kBAAkB,CACnC,CAAC;YACF,OAAO,CAAC,GAAG,CACT,qCAAqC,EACrC,eAAe,CAAC,aAAa,CAC9B,CAAC;YACF,OAAO,CAAC,GAAG,CACT,qCAAqC,EACrC,eAAe,CAAC,yBAAyB,CAC1C,CAAC;SACH;aAAM,IAAI,eAAe,CAAC,YAAY,IAAI,QAAQ,EAAE;YACnD,OAAO,CAAC,GAAG,CACT,kCAAkC,EAClC,eAAe,CAAC,WAAW,CAC5B,CAAC;YACF,OAAO,CAAC,GAAG,CACT,kCAAkC,EAClC,eAAe,CAAC,eAAe,CAChC,CAAC;SACH;IACH,CAAC;IAEO,aAAa,CACnB,WAAmB,EACnB,YAAoB,EACpB,gBAAwB,EACxB,YAAoB,EACpB,SAAiB,EACjB,gBAAyB,EACzB,cAAuB;QAEvB,IAAI,cAAsB,CAAC;QAC3B,IAAI,IAAI,CAAC,OAAO,IAAI,IAAI,EAAE;YACxB,cAAc,GAAG,cAAI,CAAC,oCAAoC,EAAE;gBAC1D,MAAM,EAAE,IAAI;aACb,CAAC,CAAC;YACH,uCAAuC;YACvC,cAAc,GAAG,cAAc,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;SACrE;;YAAM,cAAc,GAAG,IAAI,CAAC,OAAO,CAAC;QAErC,IAAI,SAAS,GAAG,cAAI,CAAC,iCAAiC,EAAE;YACtD,MAAM,EAAE,IAAI;SACb,CAAC,CAAC;QAEH,OAAO,CAAC,GAAG,CAAC,mCAAmC,YAAY,EAAE,CAAC,CAAC;QAE/D,IAAI,MAAM,CAAC;QACX,IAAI,CAAC,cAAc,EAAE;YACnB,IAAI,WAAW,KAAK,UAAU,EAAE;gBAC9B,MAAM,GAAG,IAAI,CAAC,qBAAqB,CACjC,YAAY,EACZ,SAAS,EACT,cAAc,EACd,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,gBAAgB,CACjB,CAAC;aACH;iBAAM,IAAI,WAAW,KAAK,QAAQ,EAAE;gBACnC,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAC/B,YAAY,EACZ,SAAS,EACT,cAAc,CACf,CAAC;aACH;iBAAM,IAAI,WAAW,IAAI,MAAM,EAAE;gBAChC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAC7B,YAAY,EACZ,SAAS,EACT,cAAc,CACf,CAAC;aACH;iBAAM;gBACL,MAAM,IAAI,KAAK,CAAC,wBAAwB,WAAW,EAAE,CAAC,CAAC;aACxD;SACF;aAAM;YACL,IAAI,WAAW,KAAK,QAAQ,IAAI,WAAW,IAAI,UAAU,EAAE;gBACzD,MAAM,GAAG,IAAI,CAAC,mBAAmB,CAC/B,YAAY,EACZ,SAAS,EACT,cAAc,CACf,CAAC;aACH;iBAAM,IAAI,WAAW,IAAI,MAAM,EAAE;gBAChC,MAAM,GAAG,IAAI,CAAC,iBAAiB,CAC7B,YAAY,EACZ,SAAS,EACT,cAAc,CACf,CAAC;aACH;SACF;QAED,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,qBAAqB,CAC3B,YAAoB,EACpB,SAAiB,EACjB,cAAsB,EACtB,gBAAwB,EACxB,YAAoB,EACpB,SAAiB,EACjB,gBAAyB;QAEzB,IAAI,eAAe,GAAoB;YACrC,YAAY,EAAE,YAAY;YAC1B,YAAY,EAAE,UAAU;YACxB,aAAa,EAAE,SAAS;YACxB,cAAc,EAAE,cAAc;SAC/B,CAAC;QAEF,4BAA4B;QAC5B,IAAI,gBAAgB,GAAG,gCAAsB,CAAC,6BAA6B,CACzE,IAAI,EACJ,YAAY,EACZ,yBAAe,CAAC,8BAA8B,CAC5C,YAAY,EACZ,IAAI,CAAC,aAAa,CACnB,CAAC,MAAM,CAAC,EACT,IAAI,EACJ,gBAAgB,CACjB,CAAC;QAEF,IAAI,yBAAyB,GAA8B,IAAI,mCAAyB,CACtF,YAAY,EACZ,IAAI,EACJ,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,0BAA0B,CAAC,EAC/C,IAAI,EACJ,IAAI,EACJ,gBAAgB,EAChB,YAAY,EACZ,SAAS,EACT,CAAC,gBAAgB,EACjB,gBAAgB,EAChB,eAAe,EACf,IAAI,CAAC,oBAAoB,CAAC,QAAQ,CAAC,YAAY,CAAC,CACjD,CAAC;QAEF,IAAI,MAAM,GAAG,yBAAyB,CAAC,IAAI,EAAE,CAAC;QAC9C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,mBAAmB,CACzB,YAAoB,EACpB,SAAiB,EACjB,cAAsB;QAEtB,IAAI,wBAAwB,CAAC;QAC7B,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,oBAAoB,GAAG,IAAI,yCAA+B,CAC5D,IAAI,CAAC,iBAAiB,EACtB,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAC5B,CAAC;YACF,wBAAwB,GAAG,oBAAoB,CAAC,IAAI,EAAE,CAAC;SACxD;QAED,IAAI,eAAe,GAAoB;YACrC,YAAY,EAAE,YAAY;YAC1B,aAAa,EAAE,SAAS;YACxB,sBAAsB,EAAE,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa;YAC/D,cAAc,EAAE,cAAc;YAC9B,YAAY,EAAE,QAAQ;YACtB,aAAa,EAAE,IAAI;SACpB,CAAC;QAEF,IAAI,uBAAuB,GAAG,IAAI,iCAAuB,CACvD,IAAI,CAAC,iBAAiB,EACtB,YAAY,EACZ,IAAI,EACJ,eAAe,CAChB,CAAC;QACF,IAAI,MAAM,GAAG,uBAAuB,CAAC,IAAI,EAAE,CAAC;QAE5C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEa,uBAAuB;;YACnC,IAAI,oBAAoB,GAAG,EAAE,CAAC;YAC9B,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC9C,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,CAAC,cAAc,KAAK,KAAK;oBAAE,oBAAoB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACxE,CAAC,CAAC,CAAC;YAEH,OAAO,oBAAoB,CAAC;QAC9B,CAAC;KAAA;IAEa,mBAAmB;;YAC/B,IAAI,gBAAgB,GAAG,EAAE,CAAC;YAC1B,IAAI,WAAW,GAAG,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC;YAC9C,WAAW,CAAC,OAAO,CAAC,CAAC,GAAG,EAAE,EAAE;gBAC1B,IAAI,GAAG,CAAC,cAAc,KAAK,IAAI;oBAAE,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;YACnE,CAAC,CAAC,CAAC;YAEH,OAAO,gBAAgB,CAAC;QAC1B,CAAC;KAAA;IAEa,cAAc;;YAC1B,IAAI,IAAI,CAAC,WAAW,IAAI,IAAI,EAAE;gBAC5B,IAAI,CAAC,WAAW,GAAG,MAAM,IAAI,gCAAsB,CACjD,IAAI,CAAC,iBAAiB,EACtB,IAAI,CAAC,YAAY,CAClB,CAAC,IAAI,EAAE,CAAC;aACV;YACD,OAAO,IAAI,CAAC,WAAW,CAAC;QAC1B,CAAC;KAAA;IAEO,iBAAiB,CACvB,YAAoB,EACpB,SAAiB,EACjB,cAAsB;QAEtB,IAAI,wBAAwB,CAAC;QAC7B,IAAI,IAAI,CAAC,WAAW,EAAE;YACpB,IAAI,oBAAoB,GAAG,IAAI,yCAA+B,CAC5D,IAAI,CAAC,iBAAiB,EACtB,YAAY,EACZ,aAAa,EACb,IAAI,EACJ,IAAI,CAAC,WAAW,CAAC,QAAQ,EAAE,CAC5B,CAAC;YACF,wBAAwB,GAAG,oBAAoB,CAAC,IAAI,EAAE,CAAC;SACxD;QAED,IAAI,eAAe,GAAoB;YACrC,YAAY,EAAE,YAAY;YAC1B,aAAa,EAAE,SAAS;YACxB,sBAAsB,EAAE,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,aAAa;YAC/D,cAAc,EAAE,cAAc;YAC9B,YAAY,EAAE,MAAM;SACrB,CAAC;QAEF,IAAI,qBAAqB,GAAG,IAAI,+BAAqB,CACnD,IAAI,CAAC,iBAAiB,EACtB,YAAY,EACZ,eAAe,CAChB,CAAC;QACF,IAAI,MAAM,GAAG,qBAAqB,CAAC,IAAI,EAAE,CAAC;QAE1C,OAAO,MAAM,CAAC;IAChB,CAAC;IAEO,gBAAgB,CAAC,YAAoB;QAC3C,IAAI,IAAI,GAAG,IAAI,IAAI,CAAC,CAAC,CAAC,CAAC;QACvB,IAAI,CAAC,UAAU,CAAC,YAAY,GAAG,IAAI,CAAC,CAAC,CAAC,iCAAiC;QACvE,IAAI,UAAU,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC,MAAM,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC;QAClD,OAAO,UAAU,CAAC;IACpB,CAAC;CACF;AAxhBD,4BAwhBC"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"BuildImpl.js","sourceRoot":"","sources":["../../src/parallelBuilder/BuildImpl.ts"],"names":[],"mappings":"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"}

lib/sfdxwrappers/CreateUnlockedPackageImpl.d.ts

@@ -14,7 +14,9 @@ import PackageMetadata from "../PackageMetadata";
     private packageArtifactMetadata;
-    private isOrgDependentPackage?;
     private packageLogger;
-    constructor(sfdx_package: string, version_number: string, config_file_path: string, installationkeybypass: boolean, installationkey: string, project_directory: string, devhub_alias: string, wait_time: string, isCoverageEnabled: boolean, isSkipValidation: boolean, packageArtifactMetadata: PackageMetadata, isOrgDependentPackage?: boolean);
+    private static packageTypeInfos;
+    private isOrgDependentPackage;
+    constructor(sfdx_package: string, version_number: string, config_file_path: string, installationkeybypass: boolean, installationkey: string, project_directory: string, devhub_alias: string, wait_time: string, isCoverageEnabled: boolean, isSkipValidation: boolean, packageArtifactMetadata: PackageMetadata);
     exec(): Promise<PackageMetadata>;
     private getPackageInfo;
+    private getPackageTypeInfos;
     private resolvePackageDependencies;
@@ -21,0 +23,0 @@ private buildExecCommand;

lib/sfdxwrappers/CreateUnlockedPackageImpl.js

@@ -25,4 +25,6 @@ "use strict";
 const Delay_1 = require("../utils/Delay");
+const PackageVersionListImpl_1 = __importDefault(require("./PackageVersionListImpl"));
+const path = require("path");
 class CreateUnlockedPackageImpl {
-    constructor(sfdx_package, version_number, config_file_path, installationkeybypass, installationkey, project_directory, devhub_alias, wait_time, isCoverageEnabled, isSkipValidation, packageArtifactMetadata, isOrgDependentPackage) {
+    constructor(sfdx_package, version_number, config_file_path, installationkeybypass, installationkey, project_directory, devhub_alias, wait_time, isCoverageEnabled, isSkipValidation, packageArtifactMetadata) {
         this.sfdx_package = sfdx_package;
@@ -39,3 +41,3 @@ this.version_number = version_number;
         this.packageArtifactMetadata = packageArtifactMetadata;
-        this.isOrgDependentPackage = isOrgDependentPackage;
+        this.isOrgDependentPackage = false;
         fs.outputFileSync(`.sfpowerscripts/logs/${sfdx_package}`, `sfpowerscripts--log${os_1.EOL}`);
@@ -48,11 +50,43 @@ this.packageLogger = `.sfpowerscripts/logs/${sfdx_package}`;
             let startTime = Date.now();
-            let packageDescriptor = ManifestHelpers_1.default.getSFDXPackageDescriptor(this.project_directory, this.sfdx_package);
+            let projectManifest = ManifestHelpers_1.default.getSFDXPackageManifest(this.project_directory);
+            //Create a working directory
+            let workingDirectory = SourcePackageGenerator_1.default.generateSourcePackageArtifact(this.project_directory, this.sfdx_package, ManifestHelpers_1.default.getPackageDescriptorFromConfig(this.sfdx_package, projectManifest)["path"], null, this.config_file_path);
+            //Get the one in working directory
+            this.config_file_path = path.join("config", "project-scratch-def.json");
+            //Get the revised package Descriptor
+            let packageDescriptor = ManifestHelpers_1.default.getSFDXPackageDescriptor(workingDirectory, this.sfdx_package);
             let packageDirectory = packageDescriptor["path"];
             SFPLogger_1.default.log("Package Directory", packageDirectory, this.packageLogger);
+            //Get Type of Package
+            SFPLogger_1.default.log("Fetching Package Type Info from DevHub");
+            yield this.getPackageTypeInfos();
+            let packageTypeInfo = CreateUnlockedPackageImpl.packageTypeInfos.find((pkg) => pkg.Name == this.sfdx_package);
+            if (packageTypeInfo.IsOrgDependent === "Yes")
+                this.isOrgDependentPackage = true;
             //Resolve the package dependencies
-            this.resolvePackageDependencies(packageDescriptor);
-            //Redo the fetch of the descriptor as the above command would have redone the dependencies
-            packageDescriptor = ManifestHelpers_1.default.getSFDXPackageDescriptor(this.project_directory, this.sfdx_package);
+            if (this.isOrgDependentPackage) {
+                // Store original dependencies to artifact
+                this.packageArtifactMetadata.dependencies = packageDescriptor["dependencies"];
+                //Remove dependencies of org dependent packages
+                let projectManifestFromWorkingDirectory = ManifestHelpers_1.default.getSFDXPackageManifest(workingDirectory);
+                let packageDescriptorInWorkingDirectory = ManifestHelpers_1.default.getPackageDescriptorFromConfig(this.sfdx_package, projectManifestFromWorkingDirectory);
+                //Cleanup sfpowerscripts constructs
+                delete packageDescriptorInWorkingDirectory["dependencies"];
+                delete packageDescriptorInWorkingDirectory["type"];
+                delete packageDescriptorInWorkingDirectory["preDeploymentSteps"];
+                delete packageDescriptorInWorkingDirectory["postDeploymentSteps"];
+                fs.writeJsonSync(path.join(workingDirectory, "sfdx-project.json"), projectManifestFromWorkingDirectory);
+            }
+            else if (!this.isOrgDependentPackage && !this.isSkipValidation) {
+                this.resolvePackageDependencies(packageDescriptor, workingDirectory);
+                //Redo the fetch of the descriptor as the above command would have redone the dependencies
+                packageDescriptor = ManifestHelpers_1.default.getSFDXPackageDescriptor(workingDirectory, this.sfdx_package);
+                //Store the resolved dependencies
+                this.packageArtifactMetadata.dependencies = packageDescriptor["dependencies"];
+            }
+            else {
+                this.packageArtifactMetadata.dependencies = packageDescriptor["dependencies"];
+            }
             //Convert to MDAPI to get PayLoad
-            let mdapiPackage = yield MDAPIPackageGenerator_1.default.getMDAPIPackageFromSourceDirectory(this.project_directory, packageDirectory);
+            let mdapiPackage = yield MDAPIPackageGenerator_1.default.getMDAPIPackageFromSourceDirectory(workingDirectory, packageDirectory);
             this.packageArtifactMetadata.payload = mdapiPackage.manifest;
@@ -63,7 +97,7 @@ let command = this.buildExecCommand();
             let child = child_process.exec(command, {
-                cwd: this.project_directory,
-                encoding: "utf8"
+                cwd: workingDirectory,
+                encoding: "utf8",
             }, (error, stdout, stderr) => {
                 if (error) {
-                    child.stderr.on("data", data => {
+                    child.stderr.on("data", (data) => {
                         SFPLogger_1.default.log(data.toString(), null, this.packageLogger);
@@ -83,4 +117,2 @@ });
             let mdapiPackageArtifactDir = SourcePackageGenerator_1.default.generateSourcePackageArtifact(this.project_directory, this.sfdx_package, ManifestHelpers_1.default.getSFDXPackageDescriptor(this.project_directory, this.sfdx_package)["path"], null);
-            this.packageArtifactMetadata.dependencies =
-                packageDescriptor["dependencies"];
             this.packageArtifactMetadata.sourceDir = mdapiPackageArtifactDir;
@@ -119,3 +151,3 @@ //Add Timestamps
                     SFPLogger_1.default.log("Unable to fetch package version info", null, this.packageLogger);
-                    console.log('Retrying...');
+                    console.log("Retrying...");
                     yield Delay_1.delay(2000);
@@ -127,12 +159,13 @@ continue;
     }
-    resolvePackageDependencies(packageDescriptor) {
+    getPackageTypeInfos() {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (CreateUnlockedPackageImpl.packageTypeInfos == null) {
+                CreateUnlockedPackageImpl.packageTypeInfos = yield new PackageVersionListImpl_1.default(this.project_directory, this.devhub_alias).exec();
+            }
+            return CreateUnlockedPackageImpl.packageTypeInfos;
+        });
+    }
+    resolvePackageDependencies(packageDescriptor, workingDirectory) {
         SFPLogger_1.default.log("Resolving project dependencies", null, this.packageLogger);
-        let resolveResult;
-        if (this.isSkipValidation) {
-            let resolveResult;
-            resolveResult = child_process.execSync(`sfdx sfpowerkit:package:dependencies:list -p ${packageDescriptor["path"]} -v ${this.devhub_alias} -w`, { cwd: this.project_directory, encoding: "utf8" });
-        }
-        else {
-            resolveResult = child_process.execSync(`sfdx sfpowerkit:package:dependencies:list -p ${packageDescriptor["path"]} -v ${this.devhub_alias} -w --usedependencyvalidatedpackages`, { cwd: this.project_directory, encoding: "utf8" });
-        }
+        let resolveResult = child_process.execSync(`sfdx sfpowerkit:package:dependencies:list -p ${packageDescriptor["path"]} -v ${this.devhub_alias} -w --usedependencyvalidatedpackages`, { cwd: workingDirectory, encoding: "utf8" });
         SFPLogger_1.default.log("Resolved Depenendecies", resolveResult, this.packageLogger);
@@ -164,2 +197,2 @@ }
 exports.default = CreateUnlockedPackageImpl;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiQ3JlYXRlVW5sb2NrZWRQYWNrYWdlSW1wbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZmR4d3JhcHBlcnMvQ3JlYXRlVW5sb2NrZWRQYWNrYWdlSW1wbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUFnRDtBQUNoRCwrQkFBeUM7QUFDekMsNENBQXlDO0FBRXpDLGtHQUEwRTtBQUMxRSxrRkFBMEQ7QUFDMUQsZ0dBQXdFO0FBQ3hFLG1FQUEyQztBQUMzQyxNQUFNLEVBQUUsR0FBRyxPQUFPLENBQUMsVUFBVSxDQUFDLENBQUM7QUFDL0IsMkJBQXlCO0FBQ3pCLDBDQUF1QztBQUV2QyxNQUFxQix5QkFBeUI7SUFHNUMsWUFDVSxZQUFvQixFQUNwQixjQUFzQixFQUN0QixnQkFBd0IsRUFDeEIscUJBQThCLEVBQzlCLGVBQXVCLEVBQ3ZCLGlCQUF5QixFQUN6QixZQUFvQixFQUNwQixTQUFpQixFQUNqQixpQkFBMEIsRUFDMUIsZ0JBQXlCLEVBQ3pCLHVCQUF3QyxFQUN4QyxxQkFBOEI7UUFYOUIsaUJBQVksR0FBWixZQUFZLENBQVE7UUFDcEIsbUJBQWMsR0FBZCxjQUFjLENBQVE7UUFDdEIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFRO1FBQ3hCLDBCQUFxQixHQUFyQixxQkFBcUIsQ0FBUztRQUM5QixvQkFBZSxHQUFmLGVBQWUsQ0FBUTtRQUN2QixzQkFBaUIsR0FBakIsaUJBQWlCLENBQVE7UUFDekIsaUJBQVksR0FBWixZQUFZLENBQVE7UUFDcEIsY0FBUyxHQUFULFNBQVMsQ0FBUTtRQUNqQixzQkFBaUIsR0FBakIsaUJBQWlCLENBQVM7UUFDMUIscUJBQWdCLEdBQWhCLGdCQUFnQixDQUFTO1FBQ3pCLDRCQUF1QixHQUF2Qix1QkFBdUIsQ0FBaUI7UUFDeEMsMEJBQXFCLEdBQXJCLHFCQUFxQixDQUFTO1FBRXRDLEVBQUUsQ0FBQyxjQUFjLENBQ2Ysd0JBQXdCLFlBQVksRUFB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
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"CreateUnlockedPackageImpl.js","sourceRoot":"","sources":["../../src/sfdxwrappers/CreateUnlockedPackageImpl.ts"],"names":[],"mappings":"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"}

lib/sfdxwrappers/PackageVersionListImpl.js

@@ -34,3 +34,2 @@ "use strict";
                 output += data;
-                SFPLogger_1.default.log(data.toString());
             });
@@ -53,2 +52,2 @@ yield OnExit_1.onExit(child);
 exports.default = PackageVersionListImpl;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25MaXN0SW1wbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZmR4d3JhcHBlcnMvUGFja2FnZVZlcnNpb25MaXN0SW1wbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUFnRDtBQUNoRCxtRUFBMkM7QUFDM0MsNENBQXlDO0FBRXpDLE1BQXFCLHNCQUFzQjtJQUN6QyxZQUE0QixpQkFBd0IsRUFBUyxZQUFvQjtRQUFyRCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQU87UUFBUyxpQkFBWSxHQUFaLFlBQVksQ0FBUTtJQUFHLENBQUM7SUFFeEUsSUFBSTs7WUFFZixJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUN0QyxtQkFBUyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBQyxPQUFPLENBQUMsQ0FBQztZQUMzQyxJQUFJLEtBQUssR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDbEgsSUFBSSxLQUFLO29CQUFFLE1BQU0sS0FBSyxDQUFDO1lBQ3pCLENBQUMsQ0FBQyxDQUFDO1lBRUgsSUFBSSxNQUFNLEdBQUMsRUFBRSxDQUFDO1lBQ2QsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxFQUFFO2dCQUM3QixNQUFNLElBQUUsSUFBSSxDQUFDO2dCQUNiLG1CQUFTLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxRQUFRLEVBQUUsQ0FBQyxDQUFDO1lBQ2pDLENBQUMsQ0FBQyxDQUFDO1lBRUgsTUFBTSxlQUFNLENBQUMsS0FBSyxDQUFDLENBQUM7WUFFcEIsSUFBSSxNQUFNLEdBQUksSUFBSSxDQUFDLEtBQUssQ0FBQyxNQUFNLENBQUMsQ0FBQztZQUNqQyxJQUFHLE1BQU0sQ0FBQyxNQUFNLElBQUUsQ0FBQyxFQUNuQjtnQkFDQSxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUM7YUFDcEI7aUJBRUQ7Z0JBQ0UsTUFBTSxJQUFJLEtBQUssQ0FBQyw4QkFBOEIsQ0FBQyxDQUFDO2FBQ2pEO1FBR0gsQ0FBQztLQUFBO0lBRVEsZ0JBQWdCO1FBQ3ZCLElBQUksT0FBTyxHQUFHLGtDQUFrQyxJQUFJLENBQUMsWUFBWSxTQUFTLENBQUM7UUFFM0UsT0FBTyxPQUFPLENBQUM7SUFDakIsQ0FBQztDQUNGO0FBckNELHlDQXFDQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUGFja2FnZVZlcnNpb25MaXN0SW1wbC5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uL3NyYy9zZmR4d3JhcHBlcnMvUGFja2FnZVZlcnNpb25MaXN0SW1wbC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7OztBQUFBLCtDQUFnRDtBQUNoRCxtRUFBMkM7QUFDM0MsNENBQXlDO0FBRXpDLE1BQXFCLHNCQUFzQjtJQUN6QyxZQUE0QixpQkFBd0IsRUFBUyxZQUFvQjtRQUFyRCxzQkFBaUIsR0FBakIsaUJBQWlCLENBQU87UUFBUyxpQkFBWSxHQUFaLFlBQVksQ0FBUTtJQUFHLENBQUM7SUFFeEUsSUFBSTs7WUFFZixJQUFJLE9BQU8sR0FBRyxJQUFJLENBQUMsZ0JBQWdCLEVBQUUsQ0FBQztZQUN0QyxtQkFBUyxDQUFDLEdBQUcsQ0FBQyxtQkFBbUIsRUFBQyxPQUFPLENBQUMsQ0FBQztZQUMzQyxJQUFJLEtBQUssR0FBRyxhQUFhLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxFQUFFLEdBQUcsRUFBRSxJQUFJLENBQUMsaUJBQWlCLEVBQUUsUUFBUSxFQUFFLE1BQU0sRUFBRSxFQUFDLENBQUMsS0FBSyxFQUFFLE1BQU0sRUFBRSxNQUFNLEVBQUUsRUFBRTtnQkFDbEgsSUFBSSxLQUFLO29CQUFFLE1BQU0sS0FBSyxDQUFDO1lBQ3pCLENBQUMsQ0FBQyxDQUFDO1lBRUgsSUFBSSxNQUFNLEdBQUMsRUFBRSxDQUFDO1lBQ2QsS0FBSyxDQUFDLE1BQU0sQ0FBQyxFQUFFLENBQUMsTUFBTSxFQUFFLElBQUksQ0FBQyxFQUFFO2dCQUM3QixNQUFNLElBQUUsSUFBSSxDQUFDO1lBQ2YsQ0FBQyxDQUFDLENBQUM7WUFFSCxNQUFNLGVBQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQztZQUVwQixJQUFJLE1BQU0sR0FBSSxJQUFJLENBQUMsS0FBSyxDQUFDLE1BQU0sQ0FBQyxDQUFDO1lBQ2pDLElBQUcsTUFBTSxDQUFDLE1BQU0sSUFBRSxDQUFDLEVBQ25CO2dCQUNBLE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQzthQUNwQjtpQkFFRDtnQkFDRSxNQUFNLElBQUksS0FBSyxDQUFDLDhCQUE4QixDQUFDLENBQUM7YUFDakQ7UUFHSCxDQUFDO0tBQUE7SUFFUSxnQkFBZ0I7UUFDdkIsSUFBSSxPQUFPLEdBQUcsa0NBQWtDLElBQUksQ0FBQyxZQUFZLFNBQVMsQ0FBQztRQUUzRSxPQUFPLE9BQU8sQ0FBQztJQUNqQixDQUFDO0NBQ0Y7QUFwQ0QseUNBb0NDIn0=

package.json

 {
   "name": "@dxatscale/sfpowerscripts.core",
-  "version": "3.0.14",
+  "version": "3.0.15",
   "description": "Core Module used by sfpowerscripts",
@@ -48,3 +48,3 @@ "main": "lib/index",
   "homepage": "https://github.com/Accenture/sfpowerscripts#readme",
-  "gitHead": "6835bf5d4f3778957a42272eea3d1aa7a083276b"
+  "gitHead": "990e436f0b2417b892b694ed58b61e18f82aea92"
 }

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

344011

increased by0.41%

Worsened metrics

Lines of code

4073

decreased by-0.1%

No dependency changes