ics-builder 4.1.82 → 4.1.86

package/package.json

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

package/src/builder/api/dotnetApiBuilder.js

@@ -123,13 +123,8 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
                 if (/(\.svc)$/.test(fileName))
                     utils_1.Utils.copyFile(path.join(moduleDir, fileName), path.join(targetDir, fileName));
             });
-            var moduleConfigFile = path.join(moduleDir, "app.config");
-            if (utils_1.Utils.ensurePath(moduleConfigFile)) {
-                var baseDir = path.basename(moduleDir);
-                if (baseDir.endsWith("api"))
-                    baseDir = path.basename(path.dirname(moduleDir));
-                utils_1.Utils.copyFile(moduleConfigFile, path.join(targetDir, moduleName + ".app.config"));
-            }
+            var moduleConfigFileName = "app.config";
+            this.copyModuleConfig(moduleDir, targetDir, moduleConfigFileName, moduleName + "." + moduleConfigFileName);
             utils_1.Utils.deleteFiles(targetDir, ["packages.config", "web.config.template"]);
             utils_1.Logger.info(moduleName.replace("._core", "") + ": " + info.join(", "));
         }

package/src/builder/api/net5Builder.js

@@ -16,10 +16,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Net5ApiBuilder = void 0;
 var path = require("path");
 var shell = require("shelljs");
-var fs = require("fs");
 var baseBuilder_1 = require("../baseBuilder");
 var utils_1 = require("../../utils");
-var just_task_1 = require("just-task");
 var dotnetUtils_1 = require("../../dotnetUtils");
 var packageStructureManager_1 = require("../../services/packageStructure/packageStructureManager");
 var Net5ApiBuilder = /** @class */ (function (_super) {
@@ -28,13 +26,12 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         var _this = _super.call(this, config) || this;
         _this.modules = new Array();
         _this.allProjects = [];
+        _this.configFile = "appsettings.json";
         _this.buildApiFolder = path.join(_this.config.paths.build, "api");
         shell.config.silent = true;
         return _this;
-        // this.slnFilePath = path.join(this.config.paths.source);
     }
     Net5ApiBuilder.prototype.run = function () {
-        // DotnetUtils.createTempSln(this.slnFilePath, this.slnName);
         var _this = this;
         var _a;
         this.config.packages.forEach(function (pkg) {
@@ -44,35 +41,20 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         this.allProjects.forEach(function (p) {
             _this.clearCache(path.dirname(p));
         });
-        // let projectFilesString = "";
-        // this.modulesProjectFiles.forEach(pf => {
-        // 	projectFilesString += `"${pf}" `;
-        // });
-        // projectFilesString = projectFilesString.trim();
-        // Utils.exec(`dotnet sln "${path.join(this.slnFilePath, this.slnName)}.sln" add ${projectFilesString}`);
         var configuration = ((_a = this.config.api) === null || _a === void 0 ? void 0 : _a.configuration) || "Debug";
         this.modules.forEach(function (m) {
             dotnetUtils_1.DotnetUtils.restoreNugetPackages(m.Project);
-            var isCoreModule = m.Module.name == "_core" && !_this.config.packages.find(function (p) { return p.name == m.Package; }).isSingleModule;
+            var isCoreModule = m.Module.name == "_core" && m.Package == "mdt";
             var outputPath = isCoreModule ? _this.buildApiFolder : path.join(_this.buildApiFolder, "modules", utils_1.Utils.getFileName(m.Project));
             utils_1.Utils.exec("dotnet publish " + m.Project + " --no-restore -c " + configuration + " -o " + outputPath + " -nologo -v q", {
                 silent: false,
                 skipLog: true
             });
+            if (!isCoreModule) {
+                var projectDir = path.dirname(m.Project);
+                _this.copyModuleConfig(projectDir, outputPath, _this.configFile);
+            }
         });
-        // this.patchMainAppSettingsJson();
-    };
-    Net5ApiBuilder.prototype.patchMainAppSettingsJson = function () {
-        var _a;
-        var appsettingsJsonPath = path.join(this.buildApiFolder, "appsettings.json");
-        utils_1.Logger.info("Start patching " + appsettingsJsonPath);
-        var appSettingsJsonObject = JSON.parse(fs.readFileSync(appsettingsJsonPath, { encoding: "utf-8" }).replace(/^\uFEFF/, ""));
-        if (!((_a = appSettingsJsonObject === null || appSettingsJsonObject === void 0 ? void 0 : appSettingsJsonObject.Mdt) === null || _a === void 0 ? void 0 : _a.Modules)) {
-            just_task_1.logger.error("appsettings.json does not have modules section");
-            return;
-        }
-        // (<ModuleAppSettings[]>appSettingsJsonObject.Mdt.Modules).push(...this.modulesAppSettings);
-        // fs.writeFileSync(appsettingsJsonPath, JSON.stringify(appSettingsJsonObject, null, "\t"));
     };
     Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
         var _this = this;
@@ -86,7 +68,6 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
         var _a;
         var projectFile = new Array();
         var moduleConfig = this.parsePackageInfoLegacy(path.join(modulePath, "module.yml"));
-        var appsettings = new Array();
         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);
             if (!utils_1.Utils.ensurePath(csprojPath)) {
@@ -95,11 +76,6 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
             }
             this.modules.push({ Module: md, Package: pkg, Project: csprojPath });
             projectFile.push(csprojPath);
-            // shell.ls(modulePath + "/*/appsettings.json").forEach(sh => {
-            // 	if (typeof sh === "string") {
-            // 		appsettings.push(sh);
-            // 	}
-            // });			
         }
         else {
             var files_1 = shell.ls(path.join(modulePath, "*.sln"));
@@ -115,34 +91,16 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
                 utils_1.Logger.warn("Module " + md.name + " does not have .csproj file and will be skipped");
                 return;
             }
-            // shell.ls(path.join(modulePath, "appsettings.json")).forEach(sh => {
-            // 	if (typeof sh === "string") {
-            // 		appsettings.push(sh);
-            // 	}
-            // });
         }
         var files = shell.ls(path.join(modulePath, "*.csproj"), path.join(modulePath, "*", "*.csproj"));
         files.forEach(function (f) {
             _this.allProjects.push(f);
         });
-        // if (appsettings.length > 0) {
-        // 	this.readAppSettingsAndPush(appsettings);
-        // }
     };
     Net5ApiBuilder.prototype.clearCache = function (folderPath) {
         utils_1.Utils.clearFolder(path.join(folderPath, "bin"));
         utils_1.Utils.clearFolder(path.join(folderPath, "obj"));
     };
-    Net5ApiBuilder.prototype.readAppSettingsAndPush = function (appSettingsPath) {
-        appSettingsPath.forEach(function (appSet) {
-            if (utils_1.Utils.ensurePath(appSet)) {
-                var appSettingsJson = JSON.parse(fs.readFileSync(appSet, { encoding: "utf-8" }).replace(/^\uFEFF/, ""));
-                // if (appSettingsJson?.Mdt?.Modules) {
-                // 	this.modulesAppSettings.push(...(<ModuleAppSettings[]>appSettingsJson.Mdt.Modules));
-                // }
-            }
-        });
-    };
     return Net5ApiBuilder;
 }(baseBuilder_1.BaseBuilder));
 exports.Net5ApiBuilder = Net5ApiBuilder;

package/src/builder/baseBuilder.js

@@ -38,6 +38,12 @@ var BaseBuilder = /** @class */ (function () {
                 utils_1.Logger.info("Tests successfully passed. Coverage report: \n" + stdout);
         }
     };
+    BaseBuilder.prototype.copyModuleConfig = function (sourceDir, targetDir, configFileName, newConfigFileName) {
+        var moduleConfigFile = path.join(sourceDir, configFileName);
+        if (utils_1.Utils.ensurePath(moduleConfigFile)) {
+            utils_1.Utils.copyFile(moduleConfigFile, path.join(targetDir, newConfigFileName !== null && newConfigFileName !== void 0 ? newConfigFileName : configFileName));
+        }
+    };
     return BaseBuilder;
 }());
 exports.BaseBuilder = BaseBuilder;

package/src/builder/data/dataBuilder.js

@@ -33,6 +33,7 @@ var DataBuilder = /** @class */ (function (_super) {
                 var moduleName = _a.moduleName, sourcePath = _a.sourcePath;
                 var moduleDestinationDir = path.join(targetDir, pkg.name.concat(".", moduleName));
                 utils_1.Utils.copyAllFilesByPattern(sourcePath, moduleDestinationDir, "*.{yaml,yml}");
+                utils_1.Utils.copyAllFolders(sourcePath, moduleDestinationDir);
             });
         });
         utils_1.Utils.removeEmptyFolders(targetDir);

package/src/builder/ui/webpackUiBuilder.js

@@ -325,6 +325,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                                 options: {
                                     modifyVars: { "@fa-css-prefix": "icon" },
                                     relativeUrls: this.isLegacy ? false : true,
+                                    javascriptEnabled: true,
                                     plugins: [
                                         {
                                             install: function (lessObj, pluginManager) {

package/src/utils.js

@@ -65,6 +65,12 @@ var Utils = /** @class */ (function () {
             _this.copyFile(path.join(sourcePath, file), path.join(destinationPath, file));
         });
     };
+    Utils.copyAllFolders = function (sourcePath, destinationPath) {
+        var _this = this;
+        glob.sync("**/", { cwd: sourcePath }).forEach(function (folder) {
+            _this.copyFolder(path.join(sourcePath, folder), path.join(destinationPath, folder));
+        });
+    };
     Utils.copyFile = function (from, to) {
         if (Utils.ensurePath(from)) {
             Utils.ensureFolder(path.dirname(to));