ics-builder 4.4.2 → 4.4.3

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "ics-builder",
-	"version": "4.4.2",
+	"version": "4.4.3",
 	"description": "",
 	"main": "./src/index.js",
 	"preferGlobal": true,
@@ -39,6 +39,7 @@
 	"dependencies": {
 		"autoprefixer": "^9.5.1",
 		"bundle-loader": "^0.5.6",
+		"chokidar": "^4.0.1",
 		"copy-webpack-plugin": "^5.0.3",
 		"css-loader": "^2.1.1",
 		"file-loader": "^3.0.1",

package/src/builder/ui/webpackUiBuilder.js

@@ -12,6 +12,17 @@ var __extends = (this && this.__extends) || (function () {
         d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
     };
 })();
+var __assign = (this && this.__assign) || function () {
+    __assign = Object.assign || function(t) {
+        for (var s, i = 1, n = arguments.length; i < n; i++) {
+            s = arguments[i];
+            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
+                t[p] = s[p];
+        }
+        return t;
+    };
+    return __assign.apply(this, arguments);
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -120,6 +131,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
         this.config.packages
             .filter(function (p) { return !p.isLegacy; })
             .forEach(function (p) {
+            utils_1.Logger.info("Building package " + p.name);
             var outputModulesPath = path.join(_this.config.paths.build, "ui", "modules");
             packageStructureManager_1.packageStructureManager
                 .getModuleSourcePaths(p, "ui", _this.config)
@@ -130,6 +142,9 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                     return;
                 utils_1.Utils.exec("npm run build", { cwd: sourcePath });
                 var moduleFile = path.join(sourcePath, "dist/module.js");
+                if (!fs.existsSync(moduleFile)) {
+                    moduleFile = path.join(sourcePath, "dist/index.js");
+                }
                 var outputModuleFile = path.join(outputModulesPath, p.name, p.isSingleModule ? "index.js" : path.join(moduleName, "index.js"));
                 utils_1.Utils.copyFile(moduleFile, outputModuleFile);
             });
@@ -172,6 +187,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
         this.config.packages.forEach(function (pkg) {
             if (!pkg.isLegacy)
                 return;
+            utils_1.Logger.info("Adding package " + pkg.name + " to webpack config");
             resolvePlugins.push.apply(resolvePlugins, glob
                 .sync(path.join(_this.config.paths.source, pkg.name, "{!(node_modules),}/tsconfig.json"))
                 .map(function (tsconfig) { return new tsconfig_paths_webpack_plugin_1.TsconfigPathsPlugin({ configFile: tsconfig }); }));
@@ -220,6 +236,17 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                 fileName: "[name].js" + (this.isProd() ? "?[hash:8]" : ""),
                 filesToConcat: libs
             }));
+        // Настройка React для MDT
+        var resolveAlias = {};
+        if (this.config.packages.length) {
+            if (this.config.packages.length > 1) {
+                console.warn("\n\t\t\t\t\t\u0412\u043D\u0438\u043C\u0430\u043D\u0438\u0435: \u043E\u0431\u043D\u0430\u0440\u0443\u0436\u0435\u043D\u043E \u043D\u0435\u0441\u043A\u043E\u043B\u044C\u043A\u043E \u043F\u0430\u043A\u0435\u0442\u043E\u0432 \u0432 \u043A\u043E\u043D\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u0438.\n\t\t\t\t\t\n\t\t\t\t\t\u0414\u043B\u044F \u043A\u043E\u0440\u0440\u0435\u043A\u0442\u043D\u043E\u0439 \u0440\u0430\u0431\u043E\u0442\u044B React \u043D\u0435\u043E\u0431\u0445\u043E\u0434\u0438\u043C\u043E:\n\t\t\t\t\t1. \u0423\u0431\u0435\u0434\u0438\u0442\u044C\u0441\u044F, \u0447\u0442\u043E \u0432 \u043F\u0435\u0440\u0432\u043E\u043C \u043F\u0430\u043A\u0435\u0442\u0435 \u043E\u043F\u0440\u0435\u0434\u0435\u043B\u0435\u043D\u044B \u0437\u0430\u0432\u0438\u0441\u0438\u043C\u043E\u0441\u0442\u0438 react \u0438 react-dom\n\t\t\t\t\t2. \u042D\u0442\u0438 \u0432\u0435\u0440\u0441\u0438\u0438 React \u0431\u0443\u0434\u0443\u0442 \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u044B \u0434\u043B\u044F \u0432\u0441\u0435\u0445 \u043E\u0441\u0442\u0430\u043B\u044C\u043D\u044B\u0445 \u043F\u0430\u043A\u0435\u0442\u043E\u0432\n\t\t\t\t\t\n\t\t\t\t\t\u0412\u0430\u0436\u043D\u043E: \u0438\u0441\u043F\u043E\u043B\u044C\u0437\u043E\u0432\u0430\u043D\u0438\u0435 \u0440\u0430\u0437\u043D\u044B\u0445 \u0432\u0435\u0440\u0441\u0438\u0439 React \u0432 \u043E\u0434\u043D\u043E\u043C \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u0438 \u043C\u043E\u0436\u0435\u0442 \u043F\u0440\u0438\u0432\u0435\u0441\u0442\u0438 \u043A \u0441\u0435\u0440\u044C\u0435\u0437\u043D\u044B\u043C \u043E\u0448\u0438\u0431\u043A\u0430\u043C.\n\t\t\t\t\t");
+            }
+            var pack = this.config.packages[0];
+            var basePath = path.join(this.config.paths.source, pack.name);
+            resolveAlias["react"] = path.resolve(basePath, "ui", "./node_modules/react");
+            resolveAlias["react-dom"] = path.resolve(basePath, "ui", "./node_modules/react-dom");
+        }
         return {
             context: path.join(this.config.paths.source, "mdt/ui"),
             mode: this.isProd() ? "production" : "development",
@@ -234,9 +261,7 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                 modules: ["node_modules"],
                 extensions: [".ts", ".tsx", ".js", ".less", ".css", ".md", ".json"],
                 plugins: resolvePlugins,
-                alias: {
-                    mithril: "node_modules/mithril"
-                }
+                alias: __assign({ mithril: "node_modules/mithril" }, resolveAlias)
             },
             plugins: plugins,
             optimization: {
@@ -279,6 +304,17 @@ var WebpackUiBuilder = /** @class */ (function (_super) {
                                 outputPath: "./_res/fonts"
                             }
                         }
+                    },
+                    {
+                        test: /\.css$/,
+                        use: ["style-loader", "css-loader"],
+                        include: function (path) {
+                            // Стили для monaco-editor обрабатываются отдельно в самой библиотеке
+                            if (path.includes("monaco-editor")) {
+                                return false;
+                            }
+                            return true;
+                        }
                     }
                 ]
             }

package/src/builder/uiDependency/dependencyBuilder.js

@@ -28,6 +28,7 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
         this.config.packages.forEach(function (pkg) {
             if (pkg.isLegacy) {
                 var sourcePath = Path.join(_this.config.paths.source, pkg.name, "ui");
+                utils_1.Logger.info("Loading ui dependencies for package " + pkg.name);
                 _this.runNpmInstall(sourcePath);
                 return;
             }
@@ -35,6 +36,7 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
                 .getModuleSourcePaths(pkg, "ui", _this.config)
                 .forEach(function (_a) {
                 var moduleName = _a.moduleName, sourcePath = _a.sourcePath;
+                utils_1.Logger.info("Loading ui dependencies for module " + pkg.name + "." + moduleName);
                 _this.runNpmInstall(sourcePath);
             });
         });

package/src/services/configManager.js

@@ -17,7 +17,7 @@ var ConfigManager = /** @class */ (function () {
             config = yaml.load(configPath);
         // if (!config.paths) Logger.error(`paths section is required in build config.`);
         // if (!config.package) Logger.error("'package' section is required in build config");
-        config.modules = config.modules || [];
+        config.modules = Array.from(new Set(config.modules).values()) || [];
         config.ui = config.ui || { theme: "mdt.coffee", themes: ["mdt.coffee"], port: 9002, checkTypes: false };
         if (["boolean", "undefined"].includes(typeof config.ui.checkTypes)) {
             config.ui.checkTypes = !!config.ui.checkTypes;

package/src/services/packageManager.js

@@ -44,23 +44,23 @@ var PackageManager = /** @class */ (function () {
         else {
             var packagesNames = Object.keys(using).map(function (packageName) { return packageName; });
             packagesNames.forEach(function (packageName) {
-                if (packageName === _this.config.package.name)
-                    utils_1.Logger.error("Circular dependency. Package config " + packageInfoPath + " has circular reference to main package \"" + _this.config.package.name + "\".");
-                if (_this.packages.has(packageName)) {
-                    utils_1.Logger.warn("Package " + packageName + " with version " + _this.packages.get(packageName).version + " already added to build packages list. Version " + using[packageName] + " from " + packageInfoPath + " is skipped.");
-                    return;
-                }
                 var pkg = { name: packageName, version: using[packageName] };
                 var gitRepositoryNameRegexResult = /([^\/\\:]*)\.git\/?$/.exec(packageName);
                 if (gitRepositoryNameRegexResult) {
                     pkg.name = gitRepositoryNameRegexResult[1];
                     pkg.url = packageName;
                 }
+                if (pkg.name === _this.config.package.name)
+                    utils_1.Logger.error("Circular dependency. Package config " + packageInfoPath + " has circular reference to main package \"" + _this.config.package.name + "\".");
+                if (_this.packages.has(pkg.name)) {
+                    utils_1.Logger.warn("Package " + pkg.name + " with version " + _this.packages.get(pkg.name).version + " already added to build packages list. Version " + using[packageName] + " from " + packageInfoPath + " is skipped.");
+                    return;
+                }
                 _this.sourceManager.loadSource(pkg, skipload);
                 pkg.packageInfo = _this.getPackageInfo(pkg.name);
                 var pkgDependencies = _this.getPackageDependencies(pkg, skipload);
                 packageStructureManager_1.packageStructureManager.writePackageStructureInfo(pkg, _this.config);
-                _this.packages.set(packageName, _this.preparePackageModules(pkg, pkgDependencies));
+                _this.packages.set(pkg.name, _this.preparePackageModules(pkg, pkgDependencies));
             });
         }
     };

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

@@ -47,8 +47,12 @@ var GitScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
-    GitScmProvider.prototype.cleanPackageLock = function (config) {
-        return this.exec("clean -fdx '*/package-lock.json'", config.paths.source);
+    GitScmProvider.prototype.clean = function (config) {
+        this.exec("clean -fdx '*/package-lock.json'", config.paths.source);
+        this.exec("clean -fdx 'api/*/bin/*'", config.paths.source);
+        this.exec("clean -fdx '*/api/*/bin/*'", config.paths.source);
+        this.exec("clean -fdx 'api/*/obj/*'", config.paths.source);
+        this.exec("clean -fdx '*/api/*/obj/*'", config.paths.source);
     };
     GitScmProvider.prototype._getGitUrl = function (config) {
         var _a;

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

@@ -44,8 +44,7 @@ var HgScmProvider = /** @class */ (function () {
             utils_1.Logger.error("Cannot find version " + config.package.version + " of module " + config.package.name);
         return version;
     };
-    HgScmProvider.prototype.cleanPackageLock = function (config) {
-        return null;
+    HgScmProvider.prototype.clean = function (config) {
     };
     return HgScmProvider;
 }());

package/src/services/source/sourceManager.js

@@ -31,7 +31,7 @@ var SourceManager = /** @class */ (function () {
         if (!skipLoad) {
             try {
                 if (utils_1.Utils.ensurePath(path.join(sourceConfig.paths.source, "." + sourceType.toLowerCase()))) {
-                    scmProvider.cleanPackageLock(sourceConfig);
+                    scmProvider.clean(sourceConfig);
                     scmProvider.pull(sourceConfig);
                 }
                 else {