ics-builder 4.1.93 → 4.1.97

package/package.json

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

package/src/builder/api/net5Builder.js

@@ -28,6 +28,7 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         var _this = _super.call(this, config) || this;
         _this.modules = new Array();
         _this.allProjects = [];
+        _this.emptyModulesWithConfig = new Map();
         _this.configFile = "appsettings.json";
         _this.buildApiFolder = path.join(_this.config.paths.build, "api");
         shell.config.silent = true;
@@ -56,7 +57,6 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
             dotnetUtils_1.DotnetUtils.createTempSln(slnDir, slnName);
             for (var _i = 0, _b = this.modules; _i < _b.length; _i++) {
                 var m = _b[_i];
-                utils_1.Utils.copyFile(m.Project, m.TempProject);
                 var csproj = new csprojFile_1.CsprojFile(m.Project);
                 csproj.setPublishPath(m.OutputPath);
                 csproj.save(m.Project);
@@ -72,13 +72,12 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 var projectDir = path.dirname(m.Project);
                 _this.copyModuleConfig(projectDir, m.OutputPath, _this.configFile);
             });
+            this.emptyModulesWithConfig.forEach(function (val, key) {
+                _this.copyModuleConfig(val, path.join(_this.buildApiFolder, "modules", key), _this.configFile);
+            });
         }
         finally {
             utils_1.Utils.deleteFile(tempSlnPath);
-            this.modules.forEach(function (m) {
-                utils_1.Utils.copyFile(m.TempProject, m.Project);
-                utils_1.Utils.deleteFile(m.TempProject);
-            });
         }
     };
     Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
@@ -88,10 +87,8 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
             _this.writeModulesProjects(pkg.name, pkg.modules.find(function (m) { return m.name == moduleName; }), sourcePath);
         });
     };
-    Net5ApiBuilder.prototype.writeModulesProjects = function (pkg, md, modulePath) {
-        var _this = this;
+    Net5ApiBuilder.prototype.writeModulesProjects = function (packageName, module, modulePath) {
         var _a;
-        var projectFile = new Array();
         var moduleConfig = this.parsePackageInfoLegacy(path.join(modulePath, "module.yml"));
         if ((_a = moduleConfig === null || moduleConfig === void 0 ? void 0 : moduleConfig.api) === null || _a === void 0 ? void 0 : _a.project) {
             var csprojPath = path.join(modulePath, moduleConfig.api.project);
@@ -99,24 +96,31 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 utils_1.Logger.error(csprojPath + " does not exist");
                 return;
             }
-            this.modules.push(new ApiModuleInfo(pkg, md, csprojPath, this.buildApiFolder));
-            projectFile.push(csprojPath);
+            this.modules.push(new ApiModuleInfo(packageName, module, csprojPath, this.buildApiFolder));
         }
         else {
-            var files_1 = shell.ls(path.join(modulePath, "*.sln"));
-            if (files_1.length) {
-                this.modules.push(new ApiModuleInfo(pkg, md, files_1[0], this.buildApiFolder));
-                return;
-            }
-            files_1 = shell.ls(path.join(modulePath, "*.csproj"));
-            if (files_1.length) {
-                this.modules.push(new ApiModuleInfo(pkg, md, files_1[0], this.buildApiFolder));
+            var files = shell.ls(path.join(modulePath, "*.sln"));
+            if (files.length) {
+                this.modules.push(new ApiModuleInfo(packageName, module, files[0], this.buildApiFolder));
             }
             else {
-                utils_1.Logger.warn("Module " + md.name + " does not have .csproj file and will be skipped");
-                return;
+                files = shell.ls(path.join(modulePath, "*.csproj"));
+                if (files.length) {
+                    this.modules.push(new ApiModuleInfo(packageName, module, files[0], this.buildApiFolder));
+                }
+                else {
+                    utils_1.Logger.warn("Module " + module.name + " does not have .csproj file and will be skipped");
+                    var configFile = path.join(modulePath, this.configFile);
+                    if (utils_1.Utils.ensurePath(configFile))
+                        this.emptyModulesWithConfig.set(packageName + "." + module.name, modulePath);
+                    return;
+                }
             }
         }
+        this.addProjectFiles(modulePath);
+    };
+    Net5ApiBuilder.prototype.addProjectFiles = function (modulePath) {
+        var _this = this;
         var files = shell.ls(path.join(modulePath, "*.csproj"), path.join(modulePath, "*", "*.csproj"));
         files.forEach(function (f) {
             _this.allProjects.push(f);
@@ -134,8 +138,6 @@ var ApiModuleInfo = /** @class */ (function () {
         this.Package = pkg;
         this.Module = module;
         this.Project = project;
-        var dir = path.dirname(project);
-        this.TempProject = path.join(dir, utils_1.Utils.getFileName(project) + "_temp.csproj");
         this.IsCoreModule = module.name == "_core" && pkg == "mdt";
         this.OutputPath = this.IsCoreModule
             ? buildApiFolder

package/src/builder/uiDependency/dependencyBuilder.js

@@ -43,7 +43,13 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
             utils_1.Logger.warn("File package.json not found!");
             return;
         }
-        utils_1.Utils.exec("npm install", { silent: true, cwd: cwd });
+        var packageLockPath = Path.join(cwd, "package-lock.json");
+        var hasPackageLockPath = utils_1.Utils.ensurePath(packageLockPath);
+        utils_1.Utils.exec("npm " + (hasPackageLockPath && this.isCi() ? "ci" : "install"), { silent: true, cwd: cwd });
+    };
+    UIDependencyBuilder.prototype.isCi = function () {
+        var _a;
+        return ((_a = this.config.options.uiInstall) === null || _a === void 0 ? void 0 : _a.mode) === "ci";
     };
     return UIDependencyBuilder;
 }(baseBuilder_1.BaseBuilder));

package/src/services/buildManager.js

@@ -79,36 +79,17 @@ var BuildManager = /** @class */ (function () {
             if (utils_1.Utils.ensurePath(packageInfoPath)) {
                 var packageInfo = yaml.load(packageInfoPath);
                 packageInfo = packageInfo || {};
-                // old version of package.yml -> use first builder for this layer in this.builders
-                if (packageInfo.api) {
-                    var builderType = _this.getDefaultBuilder(layer);
-                    _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
-                    return;
-                    // new version of package.yml
-                }
-                else if (packageInfo.builder) {
+                var newVersionOfPackageYaml = !packageInfo.api;
+                if (newVersionOfPackageYaml && packageInfo.builder && packageInfo.builder[layer]) {
                     var layerInfo = packageInfo.builder[layer];
-                    if (!layerInfo) {
-                        var builderType = _this.getDefaultBuilder(layer);
-                        _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
-                        return;
-                    }
-                    else if (layerInfo) {
-                        layerInfo.path = layerInfo.path || layer;
-                        var builderType = layerInfo.type || _this.getDefaultBuilder(layer);
-                        _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
-                        return;
-                    }
-                }
-                else {
-                    var builderType = _this.getDefaultBuilder(layer);
-                    _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
+                    layerInfo.path = layerInfo.path || layer;
+                    var builderType_1 = layerInfo.type || _this.getDefaultBuilder(layer);
+                    _this.updateLayerBuilder(layer, builderType_1, layerBuilders, pkg);
+                    return;
                 }
             }
-            else {
-                var builderType = _this.getDefaultBuilder(layer);
-                _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
-            }
+            var builderType = _this.getDefaultBuilder(layer);
+            _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
         });
         if (!buildOptions)
             buildOptions = {};

package/src/services/commandManager.js

@@ -60,6 +60,7 @@ var CommandManager = /** @class */ (function () {
         index_1.task("webpack-build", function () { return _this.runBuilder(_this.builderManager.buildUi({ ui: { mode: "prod" } })); });
         index_1.task("webpack-build:dev", function () { return _this.runBuilder(_this.builderManager.buildUi({ ui: { mode: "dev" } })); });
         index_1.task("install-ui", function () { return _this.runBuilder(_this.builderManager.buildUIdependency()); });
+        index_1.task("install-ui:ci", function () { return _this.runBuilder(_this.builderManager.buildUIdependency({ uiInstall: { mode: "ci" } })); });
         index_1.task("build-ui", index_1.series("generate-schema", "webpack-build"));
         index_1.task("install-build-ui", index_1.series("install-ui", "build-ui"));
         index_1.task("build-ui:dev", index_1.series("generate-schema", "webpack-build:dev"));