ics-builder 4.1.92 → 4.1.96

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.
Files changed (6) hide show
  1. package/package.json +1 -1
  2. package/src/builder/api/csprojFile.js +4 -1
  3. package/src/builder/api/net5Builder.js +0 -6
  4. package/src/builder/uiDependency/dependencyBuilder.js +7 -1
  5. package/src/services/buildManager.js +8 -27
  6. package/src/services/commandManager.js +1 -0
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "ics-builder",
3
- "version": "4.1.92",
3
+ "version": "4.1.96",
4
4
  "description": "",
5
5
  "main": "./src/app.js",
6
6
  "preferGlobal": true,
package/src/builder/api/csprojFile.js CHANGED
@@ -27,7 +27,10 @@ var CsprojFile = /** @class */ (function (_super) {
27
27
  this._xmlObj.Project = {};
28
28
  if (!this._xmlObj.Project.PropertyGroup)
29
29
  this._xmlObj.Project.PropertyGroup = {};
30
- this._xmlObj.Project.PropertyGroup.PublishDir = publishPath;
30
+ var propertyGroup = Array.isArray(this._xmlObj.Project.PropertyGroup)
31
+ ? this._xmlObj.Project.PropertyGroup[0]
32
+ : this._xmlObj.Project.PropertyGroup;
33
+ propertyGroup.PublishDir = publishPath;
31
34
  };
32
35
  return CsprojFile;
33
36
  }(xmlFile_1.XmlFile));
package/src/builder/api/net5Builder.js CHANGED
@@ -56,7 +56,6 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
56
56
  dotnetUtils_1.DotnetUtils.createTempSln(slnDir, slnName);
57
57
  for (var _i = 0, _b = this.modules; _i < _b.length; _i++) {
58
58
  var m = _b[_i];
59
- utils_1.Utils.copyFile(m.Project, m.TempProject);
60
59
  var csproj = new csprojFile_1.CsprojFile(m.Project);
61
60
  csproj.setPublishPath(m.OutputPath);
62
61
  csproj.save(m.Project);
@@ -75,10 +74,6 @@ var Net5ApiBuilder = /** @class */ (function (_super) {
75
74
  }
76
75
  finally {
77
76
  utils_1.Utils.deleteFile(tempSlnPath);
78
- this.modules.forEach(function (m) {
79
- utils_1.Utils.copyFile(m.TempProject, m.Project);
80
- utils_1.Utils.deleteFile(m.TempProject);
81
- });
82
77
  }
83
78
  };
84
79
  Net5ApiBuilder.prototype.collectModuleInfo = function (pkg) {
@@ -135,7 +130,6 @@ var ApiModuleInfo = /** @class */ (function () {
135
130
  this.Module = module;
136
131
  this.Project = project;
137
132
  var dir = path.dirname(project);
138
- this.TempProject = path.join(dir, utils_1.Utils.getFileName(project) + "_temp.csproj");
139
133
  this.IsCoreModule = module.name == "_core" && pkg == "mdt";
140
134
  this.OutputPath = this.IsCoreModule
141
135
  ? buildApiFolder
package/src/builder/uiDependency/dependencyBuilder.js CHANGED
@@ -43,7 +43,13 @@ var UIDependencyBuilder = /** @class */ (function (_super) {
43
43
  utils_1.Logger.warn("File package.json not found!");
44
44
  return;
45
45
  }
46
- utils_1.Utils.exec("npm install", { silent: true, cwd: cwd });
46
+ var packageLockPath = Path.join(cwd, "package-lock.json");
47
+ var hasPackageLockPath = utils_1.Utils.ensurePath(packageLockPath);
48
+ utils_1.Utils.exec("npm " + (hasPackageLockPath && this.isCi() ? "ci" : "install"), { silent: true, cwd: cwd });
49
+ };
50
+ UIDependencyBuilder.prototype.isCi = function () {
51
+ var _a;
52
+ return ((_a = this.config.options.uiInstall) === null || _a === void 0 ? void 0 : _a.mode) === "ci";
47
53
  };
48
54
  return UIDependencyBuilder;
49
55
  }(baseBuilder_1.BaseBuilder));
package/src/services/buildManager.js CHANGED
@@ -79,36 +79,17 @@ var BuildManager = /** @class */ (function () {
79
79
  if (utils_1.Utils.ensurePath(packageInfoPath)) {
80
80
  var packageInfo = yaml.load(packageInfoPath);
81
81
  packageInfo = packageInfo || {};
82
- // old version of package.yml -> use first builder for this layer in this.builders
83
- if (packageInfo.api) {
84
- var builderType = _this.getDefaultBuilder(layer);
85
- _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
86
- return;
87
- // new version of package.yml
88
- }
89
- else if (packageInfo.builder) {
82
+ var newVersionOfPackageYaml = !packageInfo.api;
83
+ if (newVersionOfPackageYaml && packageInfo.builder && packageInfo.builder[layer]) {
90
84
  var layerInfo = packageInfo.builder[layer];
91
- if (!layerInfo) {
92
- var builderType = _this.getDefaultBuilder(layer);
93
- _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
94
- return;
95
- }
96
- else if (layerInfo) {
97
- layerInfo.path = layerInfo.path || layer;
98
- var builderType = layerInfo.type || _this.getDefaultBuilder(layer);
99
- _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
100
- return;
101
- }
102
- }
103
- else {
104
- var builderType = _this.getDefaultBuilder(layer);
105
- _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
85
+ layerInfo.path = layerInfo.path || layer;
86
+ var builderType_1 = layerInfo.type || _this.getDefaultBuilder(layer);
87
+ _this.updateLayerBuilder(layer, builderType_1, layerBuilders, pkg);
88
+ return;
106
89
  }
107
90
  }
108
- else {
109
- var builderType = _this.getDefaultBuilder(layer);
110
- _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
111
- }
91
+ var builderType = _this.getDefaultBuilder(layer);
92
+ _this.updateLayerBuilder(layer, builderType, layerBuilders, pkg);
112
93
  });
113
94
  if (!buildOptions)
114
95
  buildOptions = {};
package/src/services/commandManager.js CHANGED
@@ -60,6 +60,7 @@ var CommandManager = /** @class */ (function () {
60
60
  index_1.task("webpack-build", function () { return _this.runBuilder(_this.builderManager.buildUi({ ui: { mode: "prod" } })); });
61
61
  index_1.task("webpack-build:dev", function () { return _this.runBuilder(_this.builderManager.buildUi({ ui: { mode: "dev" } })); });
62
62
  index_1.task("install-ui", function () { return _this.runBuilder(_this.builderManager.buildUIdependency()); });
63
+ index_1.task("install-ui:ci", function () { return _this.runBuilder(_this.builderManager.buildUIdependency({ uiInstall: { mode: "ci" } })); });
63
64
  index_1.task("build-ui", index_1.series("generate-schema", "webpack-build"));
64
65
  index_1.task("install-build-ui", index_1.series("install-ui", "build-ui"));
65
66
  index_1.task("build-ui:dev", index_1.series("generate-schema", "webpack-build:dev"));