ics-builder 4.2.6 → 4.2.9
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/package.json
CHANGED
|
@@ -16,6 +16,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
16
16
|
exports.CustomUiBuilder = void 0;
|
|
17
17
|
var path = require("path");
|
|
18
18
|
var utils_1 = require("../../utils");
|
|
19
|
+
var yaml = require("yamljs");
|
|
19
20
|
var baseBuilder_1 = require("../baseBuilder");
|
|
20
21
|
var CustomUiBuilder = /** @class */ (function (_super) {
|
|
21
22
|
__extends(CustomUiBuilder, _super);
|
|
@@ -27,7 +28,8 @@ var CustomUiBuilder = /** @class */ (function (_super) {
|
|
|
27
28
|
this.config.packages.forEach(function (pkg) {
|
|
28
29
|
var _a, _b, _c, _d;
|
|
29
30
|
var packageDir = path.join(_this.config.paths.source, pkg.name);
|
|
30
|
-
var
|
|
31
|
+
var packageYamlPath = path.join(packageDir, "package.yml");
|
|
32
|
+
var pkgInfo = utils_1.Utils.ensurePath(packageYamlPath) ? yaml.load(packageYamlPath) : {};
|
|
31
33
|
var buildDir = path.join(packageDir, (((_b = (_a = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _a === void 0 ? void 0 : _a.ui) === null || _b === void 0 ? void 0 : _b.path) || "").replace(pkg.name, ""));
|
|
32
34
|
var cmd = ((_d = (_c = pkgInfo === null || pkgInfo === void 0 ? void 0 : pkgInfo.builder) === null || _c === void 0 ? void 0 : _c.ui) === null || _d === void 0 ? void 0 : _d.cmd) || "";
|
|
33
35
|
var envArgs = _this.prepareEnvArgs();
|
|
@@ -90,7 +90,7 @@ var CommandManager = /** @class */ (function () {
|
|
|
90
90
|
}
|
|
91
91
|
return;
|
|
92
92
|
}
|
|
93
|
-
utils_1.Logger.warn("No executable commands
|
|
93
|
+
utils_1.Logger.warn("No executable commands received");
|
|
94
94
|
};
|
|
95
95
|
CommandManager.prototype.runBuilder = function (args) {
|
|
96
96
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -37,11 +37,11 @@ var PackageStructureManager = /** @class */ (function () {
|
|
|
37
37
|
pkg.isSingleModule = true;
|
|
38
38
|
return;
|
|
39
39
|
}
|
|
40
|
-
var
|
|
41
|
-
if (
|
|
40
|
+
var moduleFolders = fs.readdirSync(packageDir).filter(function (d) { return !d.startsWith(".") && fs.statSync(Path.join(packageDir, d)).isDirectory(); });
|
|
41
|
+
if (moduleFolders.length == 0)
|
|
42
42
|
return;
|
|
43
|
-
var
|
|
44
|
-
if (!moduleConfigFiles.some(function (f) { return utils_1.Utils.ensurePath(Path.join(
|
|
43
|
+
var modulePaths = moduleFolders.map(function (f) { return Path.join(packageDir, f); });
|
|
44
|
+
if (!moduleConfigFiles.some(function (f) { return modulePaths.some(function (mp) { return utils_1.Utils.ensurePath(Path.join(mp, f)); }); }))
|
|
45
45
|
pkg.isLegacy = true;
|
|
46
46
|
return;
|
|
47
47
|
};
|
package/src/utils.js
CHANGED
|
@@ -40,7 +40,7 @@ var Utils = /** @class */ (function () {
|
|
|
40
40
|
if (result.code !== 0 && !skipError) {
|
|
41
41
|
if (options === null || options === void 0 ? void 0 : options.onProcessExit)
|
|
42
42
|
options.onProcessExit();
|
|
43
|
-
Logger.error(result.stderr || result.stdout);
|
|
43
|
+
Logger.error(result.stderr || result.stdout || "Command execution ended with code " + result.code);
|
|
44
44
|
}
|
|
45
45
|
return result;
|
|
46
46
|
}
|