ics-builder 4.2.1 → 4.2.4

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.2.1",
+	"version": "4.2.4",
 	"description": "",
 	"main": "./src/app.js",
 	"preferGlobal": true,

package/src/builder/api/net5Builder.js

@@ -47,16 +47,20 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
     };
     Net5ApiBuilder.prototype._build = function () {
         var _this = this;
-        var _a;
-        var coreModule = this.modules.find(function (m) { return m.IsCoreModule; });
+        var _a, _b;
+        if (this.modules.length == 0) {
+            utils_1.Logger.warn("Api layer not found, skipping.");
+            return;
+        }
+        var coreModule = (_a = this.modules.find(function (m) { return m.IsCoreModule; })) !== null && _a !== void 0 ? _a : this.modules[0];
         var slnName = "Mdt";
         var slnDir = path.dirname(coreModule.Project);
-        var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
+        var configuration = ((_b = this.config.api) === null || _b === void 0 ? void 0 : _b.configuration) || "Debug";
         var tempSlnPath = path.join(slnDir, slnName + ".sln");
         try {
             dotnetUtils_1.DotnetUtils.createTempSln(slnDir, slnName);
-            for (var _i = 0, _b = this.modules; _i < _b.length; _i++) {
-                var m = _b[_i];
+            for (var _i = 0, _c = this.modules; _i < _c.length; _i++) {
+                var m = _c[_i];
                 var csproj = new csprojFile_1.CsprojFile(m.Project);
                 csproj.setPublishPath(m.OutputPath);
                 csproj.save(m.Project);

package/src/builder/ui/customUiBuilder.js

@@ -37,10 +37,15 @@ var CustomUiBuilder = /** @class */ (function (_super) {
         });
     };
     CustomUiBuilder.prototype.prepareEnvArgs = function () {
+        var _this = this;
         var env = this.config.ui.env || {};
         return Object.keys(env).map(function (k) {
             var v = env[k];
-            return "--env." + k + "=" + (v instanceof Array ? v.toString() : v);
+            var splitters = {
+                space: " ",
+                dot: "."
+            };
+            return "--env" + (splitters[_this.config.ui.envSplitter] || ".") + k + "=" + (v instanceof Array ? v.toString() : v);
         });
     };
     CustomUiBuilder.prototype.prepareCmd = function (cmd, args) {

package/src/services/source/loaders/gitScmProvider.js

@@ -6,8 +6,8 @@ var GitScmProvider = /** @class */ (function () {
     function GitScmProvider(options) {
         this.options = options;
     }
-    GitScmProvider.prototype.exec = function (cmd, targetDir) {
-        return utils_1.Utils.exec("git " + cmd, { silent: true, cwd: targetDir || "" });
+    GitScmProvider.prototype.exec = function (cmd, targetDir, skipError) {
+        return utils_1.Utils.exec("git " + cmd, { silent: true, cwd: targetDir || "", skipError: skipError });
     };
     GitScmProvider.prototype.clone = function (config) {
         utils_1.Logger.info("Cloning repository " + config.package.name + " in " + config.paths.source + ", please wait...");
@@ -19,8 +19,11 @@ var GitScmProvider = /** @class */ (function () {
     };
     GitScmProvider.prototype.update = function (config, version) {
         var update = this.exec("checkout " + version.branch + " --force", config.paths.source);
-        if (!version.isTag)
-            this.exec("merge", config.paths.source);
+        if (!version.isTag) {
+            var result = this.exec("merge", config.paths.source, true);
+            if (result.code !== 0)
+                throw result.stderr || result.stdout;
+        }
         utils_1.Logger.info(config.package.name + " updated to " + version.branch + " (rev. " + version.revision + ")");
         return update;
     };

package/src/services/source/sourceManager.js

@@ -29,16 +29,39 @@ var SourceManager = /** @class */ (function () {
         var scmProvider = sourceType === "git" ? new gitScmProvider_1.GitScmProvider(scmOptions) : new hgScmProvider_1.HgScmProvider(scmOptions);
         var version;
         if (!skipLoad) {
-            utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))
-                ? scmProvider.pull(sourceConfig)
-                : scmProvider.clone(sourceConfig);
-            version = scmProvider.getVersion(sourceConfig);
-            scmProvider.update(sourceConfig, version);
+            try {
+                utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))
+                    ? scmProvider.pull(sourceConfig)
+                    : scmProvider.clone(sourceConfig);
+                version = this.update(scmProvider, sourceConfig, true);
+            }
+            catch (e) {
+                if (e.includes("Merge conflict")) {
+                    utils_1.Logger.warn("Merge conflict, retrying");
+                    utils_1.Utils.prepareDir(sourceConfig.paths.source);
+                    scmProvider.clone(sourceConfig);
+                    version = this.update(scmProvider, sourceConfig, false);
+                }
+                else
+                    throw e;
+            }
         }
         else
             version = scmProvider.getVersion(sourceConfig);
         return version;
     };
+    SourceManager.prototype.update = function (scmProvider, sourceConfig, throwError) {
+        try {
+            var version = scmProvider.getVersion(sourceConfig);
+            scmProvider.update(sourceConfig, version);
+            return version;
+        }
+        catch (e) {
+            if (throwError)
+                throw e;
+            utils_1.Logger.error(e);
+        }
+    };
     return SourceManager;
 }());
 exports.SourceManager = SourceManager;