ics-builder 4.1.95 → 4.1.99

package/package.json

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

package/src/builder/api/dotnetApiBuilder.js

@@ -87,10 +87,8 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
             var configuration = (this.config.api && this.config.api.configuration) || "debug";
             moduleDir = path.dirname(projectFile);
             var projectBinDir_1 = path.join(moduleDir, "bin");
-            var projectObjDir = path.join(moduleDir, "obj");
             var webAppPath = path.join(moduleDir, "global.asax");
-            utils_1.Utils.clearFolder(projectBinDir_1);
-            utils_1.Utils.clearFolder(projectObjDir);
+            this.clearCache(moduleDir);
             if (utils_1.Utils.ensurePath(webAppPath)) {
                 utils_1.Utils.copyFile(path.join(moduleDir, "web.config.template"), path.join(moduleDir, "web.config"));
             }
@@ -136,6 +134,10 @@ var DotnetApiBuilder = /** @class */ (function (_super) {
             skipLog: true
         });
     };
+    DotnetApiBuilder.prototype.clearCache = function (folderPath) {
+        utils_1.Utils.deleteAllFoldersRecursively(folderPath, "bin");
+        utils_1.Utils.deleteAllFoldersRecursively(folderPath, "obj");
+    };
     return DotnetApiBuilder;
 }(baseBuilder_1.BaseBuilder));
 exports.DotnetApiBuilder = DotnetApiBuilder;

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,32 +96,39 @@ 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);
         });
     };
     Net5ApiBuilder.prototype.clearCache = function (folderPath) {
-        utils_1.Utils.clearFolder(path.join(folderPath, "bin"));
-        utils_1.Utils.clearFolder(path.join(folderPath, "obj"));
+        utils_1.Utils.deleteAllFoldersRecursively(folderPath, "bin");
+        utils_1.Utils.deleteAllFoldersRecursively(folderPath, "obj");
     };
     return Net5ApiBuilder;
 }(baseBuilder_1.BaseBuilder));
@@ -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/ui/webpackUiBuilder.js

@@ -61,7 +61,6 @@ var autoprefixer = require("autoprefixer");
 var webpack = require("webpack");
 var WebpackDevServer = require("webpack-dev-server");
 var path = require("path");
-var shell = require("shelljs");
 var glob = require("glob");
 var yaml = require("yamljs");
 var fs = require("fs");
@@ -72,7 +71,6 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
     __extends(WebpackUiBuilder, _super);
     function WebpackUiBuilder(config) {
         var _this = _super.call(this, config) || this;
-        _this.nodeModulesPaths = new Array();
         _this.isLegacy = false;
         return _this;
     }
@@ -126,6 +124,9 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                 .getModuleSourcePaths(p, "ui", _this.config)
                 .forEach(function (_a) {
                 var moduleName = _a.moduleName, sourcePath = _a.sourcePath;
+                var packagePath = path.join(sourcePath, "package.json");
+                if (!utils_1.Utils.ensurePath(packagePath))
+                    return;
                 utils_1.Utils.exec("npm run build", { cwd: sourcePath });
                 var moduleFile = path.join(sourcePath, "dist/module.js");
                 var outputModuleFile = path.join(outputModulesPath, p.name, p.isSingleModule ? "index.js" : path.join(moduleName, "index.js"));
@@ -353,36 +354,6 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
             }
         };
     };
-    WebpackUiBuilder.prototype.checkNpm = function (dir) {
-        var _this = this;
-        var packageJsons = glob.sync(dir).filter(function (x) { return x; });
-        if (packageJsons.length) {
-            packageJsons.forEach(function (pkg) {
-                utils_1.Logger.info("Found package.json at path " + path.dirname(pkg) + ", install dependecies...");
-                var nodeModulesPath = path.join(path.dirname(pkg), "node_modules");
-                _this.nodeModulesPaths.push(nodeModulesPath);
-            });
-            if (this.nodeModulesPaths.every(function (dir) {
-                return utils_1.Utils.ensurePath(dir);
-            }))
-                return true;
-            this.nodeModulesPaths
-                .filter(function (dir) {
-                return !utils_1.Utils.ensurePath(dir);
-            })
-                .forEach(function (dir) {
-                utils_1.Utils.exec("npm install --no-save", { cwd: path.dirname(dir), silent: true });
-            });
-            return true;
-        }
-        return false;
-    };
-    WebpackUiBuilder.prototype.removeNodeModules = function (paths) {
-        utils_1.Logger.info("Removing " + paths.join("\n"));
-        paths.forEach(function (p) {
-            shell.rm("-rf", p);
-        });
-    };
     WebpackUiBuilder.prototype.importThemes = function (modules, theme) {
         var themesDir = "_core/themes";
         return ("@import '" + path.join(themesDir, "_base/vars.less") + "';\n").concat("@import '" + path.join(themesDir, theme + "/vars.less") + "';\n", modules.map(function (module) { return "@import '" + module + "';"; }).join("\n") + "\n", "@import '" + path.join(themesDir, "_base/theme.less") + "';\n", "@import '" + path.join(themesDir, theme + "/theme.less") + "';\n");

package/src/utils.js

@@ -188,6 +188,20 @@ var Utils = /** @class */ (function () {
         }
         return res;
     };
+    Utils.deleteAllFoldersRecursively = function (cwd, folderName) {
+        var _this = this;
+        var files = fs.readdirSync(cwd, { withFileTypes: true });
+        files.forEach(function (f) {
+            if (!f.isDirectory())
+                return;
+            var dirFullPath = path.join(cwd, f.name);
+            if (f.name == folderName) {
+                Utils.clearFolder(dirFullPath);
+                return;
+            }
+            _this.deleteAllFoldersRecursively(dirFullPath, folderName);
+        });
+    };
     Utils.getFileName = function (path) {
         var _a, _b;
         return (_b = (_a = path.match(/([^\\/]+?)(\.[^.\\/]+)?$/)) === null || _a === void 0 ? void 0 : _a[1]) !== null && _b !== void 0 ? _b : "";