[FIX] generateFlexChangesBundle: Fix minUI5Version check for UI5 v1.1…

…00.0+ (#706)
SAP · Feb 21, 2022 · fb1217a · fb1217a
1 parent 170c90b
commit fb1217a
Show file tree

Hide file tree

Showing 10 changed files with 13 additions and 10 deletions.
diff --git a/lib/tasks/bundlers/generateFlexChangesBundle.js b/lib/tasks/bundlers/generateFlexChangesBundle.js
@@ -1,5 +1,6 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateFlexChangesBundle");
 const flexChangesBundler = require("../../processors/bundlers/flexChangesBundler");
+const semver = require("semver");
 
 /**
  * Task to create changesBundle.json file containing all changes stored in the /changes folder for easier consumption
@@ -68,9 +69,9 @@ module.exports = async function({workspace, taskUtil, options: {namespace}}) {
 	const allResources = await workspace.byGlob(
 		`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`);
 	if (allResources.length > 0) {
-		const version = await readManifestMinUI5Version();
+		const version = semver.coerce(await readManifestMinUI5Version());
 		let hasFlexBundleVersion = false;
-		if (parseFloat(version) >= 1.73) {
+		if (semver.compare(version, "1.73.0") >= 0) {
 			hasFlexBundleVersion = true;
 		}
 		const processedResources = await flexChangesBundler({

diff --git a/test/expected/build/application.i/dest/Component-preload.js b/test/expected/build/application.i/dest/Component-preload.js
diff --git a/test/expected/build/application.i/dest/manifest.json b/test/expected/build/application.i/dest/manifest.json
@@ -14,6 +14,7 @@
 	},
 	"sap.ui5": {
 		"dependencies": {
+			"minUI5Version": "1.72",
 			"libs": {
 				"sap.ui.layout": {},
 				"sap.ui.core": {},

diff --git a/test/expected/build/application.j/dest-resources-json/Component-preload.js b/test/expected/build/application.j/dest-resources-json/Component-preload.js
diff --git a/test/expected/build/application.j/dest-resources-json/manifest.json b/test/expected/build/application.j/dest-resources-json/manifest.json
@@ -14,7 +14,7 @@
 	},
 	"sap.ui5": {
 		"dependencies": {
-			"minUI5Version": "1.73.2",
+			"minUI5Version": "1.100.2",
 			"libs": {
 				"sap.ui.layout": {},
 				"sap.ui.core": {},

diff --git a/test/expected/build/application.j/dest-resources-json/resources.json b/test/expected/build/application.j/dest-resources-json/resources.json
@@ -4,7 +4,7 @@
 		{
 			"name": "Component-preload.js",
 			"module": "application/j/Component-preload.js",
-			"size": 3682,
+			"size": 3683,
 			"merged": true,
 			"required": [
 				"sap/m/library.js",
@@ -87,7 +87,7 @@
 		{
 			"name": "manifest.json",
 			"module": "application/j/manifest.json",
-			"size": 423
+			"size": 424
 		},
 		{
 			"name": "resources.json",

diff --git a/test/expected/build/application.j/dest/Component-preload.js b/test/expected/build/application.j/dest/Component-preload.js
diff --git a/test/expected/build/application.j/dest/manifest.json b/test/expected/build/application.j/dest/manifest.json
@@ -14,7 +14,7 @@
 	},
 	"sap.ui5": {
 		"dependencies": {
-			"minUI5Version": "1.73.2",
+			"minUI5Version": "1.100.2",
 			"libs": {
 				"sap.ui.layout": {},
 				"sap.ui.core": {},

diff --git a/test/fixtures/application.i/webapp/manifest.json b/test/fixtures/application.i/webapp/manifest.json
@@ -12,6 +12,7 @@
     },
 	"sap.ui5": {
 		"dependencies": {
+			"minUI5Version": "1.72",
 			"libs": {
 				"sap.ui.layout": {},
 				"sap.ui.core": {},

diff --git a/test/fixtures/application.j/webapp/manifest.json b/test/fixtures/application.j/webapp/manifest.json
@@ -12,7 +12,7 @@
 	},
 	"sap.ui5": {
 		"dependencies": {
-			"minUI5Version": "1.73.2",
+			"minUI5Version": "1.100.2",
 			"libs": {
 				"sap.ui.layout": {},
 				"sap.ui.core": {},