[INTERNAL] change comment and change read manifest

lib/processors/bundlers/flexChangesBundler.js

@@ -63,7 +63,7 @@ module.exports = function({resources, options}) {
 		});
 
 		if (!options.hasFlexBundleVersion && (compVariants.length != 0 || variants.length != 0 || variantChanges.length != 0 || variantDependentControlChanges.length != 0 || variantManagementChanges.length != 0)) {
-			throw new Error("There is some control variant changes in the changes folder. This only works with a minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher");
+			throw new Error("There are some control variant changes in the changes folder. This only works with a minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher");
 		}
 		// create changes-bundle.json
 		if (!options.hasFlexBundleVersion) {

lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -7,7 +7,7 @@ const flexChangesBundler = require("../../processors/bundlers/flexChangesBundler
  * If a change bundle is created, "sap.ui.fl" is added as a dependency to the manifest.json if not already present -
  * if the dependency is already listed but lazy-loaded, lazy loading is disabled.
  * If minUI5Version >= 1.73 flexibility-bundle.json will be create.
- * If there a control variants and minUI5Version < 1.73 build will break and throw an error.
+ * If there are control variants and minUI5Version < 1.73 build will break and throw an error.
  *
  * @public
  * @alias module:@ui5/builder.tasks.generateFlexChangesBundle
@@ -24,8 +24,6 @@ module.exports = function({workspace, options}) {
 	if (options && options.namespace) {
 		pathPrefix = `/resources/${options.namespace}`;
 	}
-	let manifestResource = {};
-	let manifestContent = {};
 
 	function updateJson(data) {
 		// ensure the existence of the libs section in the dependencies
@@ -46,45 +44,43 @@ module.exports = function({workspace, options}) {
 	}
 
 	async function updateFLdependency() {
+		const manifestResource = await workspace.byPath(`${pathPrefix}/manifest.json`);
+		const manifestContent = JSON.parse(await manifestResource.getString());
+
 		updateJson(manifestContent);
 		manifestResource.setString(JSON.stringify(manifestContent, null, "\t"));
 
 		await workspace.write(manifestResource);
 	}
 
 	async function readManifestMinUI5Version() {
-		return workspace.byPath(`${pathPrefix}/manifest.json`).then((manifestResourceResult) => {
-			manifestResource = manifestResourceResult;
-			if (manifestResource) {
-				return manifestResource.getBuffer().then((buffer) => {
-					return JSON.parse(buffer.toString());
-				});
-			}
-			return {};
-		}).then((manifestContentResult) => {
-			manifestContent = Object.assign({}, manifestContentResult);
-			manifestContentResult["sap.ui5"] = manifestContentResult["sap.ui5"] || {};
-			manifestContentResult["sap.ui5"].dependencies = manifestContentResult["sap.ui5"].dependencies || {};
-			return manifestContentResult["sap.ui5"].dependencies.minUI5Version = manifestContentResult["sap.ui5"].dependencies.minUI5Version || "";
-		});
+		const manifestResource = await workspace.byPath(`${pathPrefix}/manifest.json`);
+		const manifestContent = JSON.parse(await manifestResource.getString());
+
+		manifestContent["sap.ui5"] = manifestContent["sap.ui5"] || {};
+		manifestContent["sap.ui5"].dependencies = manifestContent["sap.ui5"].dependencies || {};
+		return manifestContent["sap.ui5"].dependencies.minUI5Version = manifestContent["sap.ui5"].dependencies.minUI5Version || "";
 	}
 
 	log.verbose("Collecting flexibility changes");
 	return workspace.byGlob(`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`)
 		.then((allResources) => {
-			return readManifestMinUI5Version().then((version) => {
-				let hasFlexBundleVersion = false;
-				if (parseFloat(version) >= 1.73) {
-					hasFlexBundleVersion = true;
-				}
-				return flexChangesBundler({
-					resources: allResources,
-					options: {
-						pathPrefix,
-						hasFlexBundleVersion
+			if (allResources.length > 0) {
+				return readManifestMinUI5Version().then((version) => {
+					let hasFlexBundleVersion = false;
+					if (parseFloat(version) >= 1.73) {
+						hasFlexBundleVersion = true;
 					}
+					return flexChangesBundler({
+						resources: allResources,
+						options: {
+							pathPrefix,
+							hasFlexBundleVersion
+						}
+					});
 				});
-			});
+			}
+			return [];
 		})
 		.then((processedResources) => {
 			return Promise.all(processedResources.map((resource) => {

test/expected/build/application.i/dest/manifest.json

@@ -19,8 +19,7 @@
 				"sap.ui.core": {},
 				"sap.m": {},
 				"sap.ui.fl": {}
-			},
-			"minUI5Version": "1.72.0"
+			}
 		}
 	}
 }

test/fixtures/application.i/webapp/manifest.json

@@ -16,8 +16,7 @@
 				"sap.ui.layout": {},
 				"sap.ui.core": {},
 				"sap.m": {}
-			},
-			"minUI5Version": "1.72.0"
+			}
         }
     }
 }

test/lib/processors/bundlers/flexChangesBundler.js

@@ -489,5 +489,5 @@ test("flexChangesBundler has ctrl_variant and hasFlexBundleVersion = false", asy
 	};
 
 	const error = await t.throwsAsync(flexChangesBundler({resources, options}), Error);
-	t.deepEqual(error.message, "There is some control variant changes in the changes folder. This only works with a minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher", "Correct exception thrown");
+	t.deepEqual(error.message, "There are some control variant changes in the changes folder. This only works with a minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher", "Correct exception thrown");
 });