ics-builder 4.2.8 → 4.4.0

package/package.json

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

package/src/builder/ui/webpackUiBuilder.js

@@ -87,6 +87,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
             this.buildModules();
             return;
         }
+        this.executePreBuildTask();
         var webpackStylesConfig = this.getWebpackStylesConfig();
         var webpackConfig = this.getWebpackConfig();
         return new Promise(function (resolve, reject) { return __awaiter(_this, void 0, void 0, function () {
@@ -134,6 +135,20 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
             });
         });
     };
+    WebpackUiBuilder.prototype.executePreBuildTask = function () {
+        var _this = this;
+        this.config.packages.forEach(function (pkg) {
+            var _a;
+            var uiDirectory = path.join(_this.config.paths.source, pkg.name, "ui");
+            var packageJsonPath = path.join(uiDirectory, "package.json");
+            if (!utils_1.Utils.ensurePath(packageJsonPath))
+                return;
+            var packageJsonContent = require(packageJsonPath);
+            var preBuildTask = (_a = packageJsonContent === null || packageJsonContent === void 0 ? void 0 : packageJsonContent.scripts) === null || _a === void 0 ? void 0 : _a.preBuild;
+            if (preBuildTask)
+                utils_1.Utils.exec(preBuildTask, { cwd: uiDirectory });
+        });
+    };
     WebpackUiBuilder.prototype.saveUiSettings = function () {
         var settings = {
             builder: this.config.version || "4.1",
@@ -256,9 +271,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                     },
                     {
                         test: /\.(woff(2)?|ttf|eot)(\?v=\d+\.\d+\.\d+)?$/,
-                        exclude: [
-                            /monaco-editor/gi
-                        ],
+                        exclude: [/monaco-editor/gi],
                         use: {
                             loader: "file-loader",
                             options: {

package/src/builder/uiDependency/dependencyBuilder.js

@@ -31,7 +31,9 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
                 _this.runNpmInstall(sourcePath);
                 return;
             }
-            packageStructureManager_1.packageStructureManager.getModuleSourcePaths(pkg, "ui", _this.config).forEach(function (_a) {
+            packageStructureManager_1.packageStructureManager
+                .getModuleSourcePaths(pkg, "ui", _this.config)
+                .forEach(function (_a) {
                 var moduleName = _a.moduleName, sourcePath = _a.sourcePath;
                 _this.runNpmInstall(sourcePath);
             });
@@ -45,11 +47,7 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
         }
         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";
+        utils_1.Utils.exec("npm " + (hasPackageLockPath ? "ci" : "install") + " --force", { silent: true, cwd: cwd });
     };
     return UIDependencyBuilder;
 }(baseBuilder_1.BaseBuilder));

package/src/services/commandManager.js

@@ -61,7 +61,6 @@ 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"));

package/src/services/packageStructure/packageStructureManager.js

@@ -37,11 +37,11 @@ var PackageStructureManager = /** @class */ (function () {
             pkg.isSingleModule = true;
             return;
         }
-        var moduleFolder = fs.readdirSync(packageDir).find(function (d) { return fs.statSync(Path.join(packageDir, d)).isDirectory(); });
-        if (!moduleFolder)
+        var moduleFolders = fs.readdirSync(packageDir).filter(function (d) { return !d.startsWith(".") && fs.statSync(Path.join(packageDir, d)).isDirectory(); });
+        if (moduleFolders.length == 0)
             return;
-        var modulePath = Path.join(packageDir, moduleFolder);
-        if (!moduleConfigFiles.some(function (f) { return utils_1.Utils.ensurePath(Path.join(modulePath, f)); }))
+        var modulePaths = moduleFolders.map(function (f) { return Path.join(packageDir, f); });
+        if (!moduleConfigFiles.some(function (f) { return modulePaths.some(function (mp) { return utils_1.Utils.ensurePath(Path.join(mp, f)); }); }))
             pkg.isLegacy = true;
         return;
     };