From 482b8a011d9f0e3fc24d0485be7caf1509195c82 Mon Sep 17 00:00:00 2001
From: Frank Weigel <frank.weigel@sap.com>
Date: Wed, 10 May 2023 07:17:16 +0200
Subject: [PATCH] [FIX] lbt/Resolver: ensure stable module order in generated
 bundleInfo

When a section of type 'bundleInfo' is generated as part of a bundle,
the order of the modules in each bundle info is not relevant, but should
be stable across different runs.

So far, the order of modules was dependent on the module iteration order
of the resource pool and could be random due to I/O timing.
---
 lib/lbt/bundle/Resolver.js     |  4 +++-
 test/lib/lbt/bundle/Builder.js | 28 ++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 7 deletions(-)

diff --git a/lib/lbt/bundle/Resolver.js b/lib/lbt/bundle/Resolver.js
index 759aa6354..fd5ecf927 100644
--- a/lib/lbt/bundle/Resolver.js
+++ b/lib/lbt/bundle/Resolver.js
@@ -295,7 +295,9 @@ class BundleResolver {
 								return modules;
 							});
 						}
-
+						if ( section.mode === SectionType.BundleInfo ) {
+							modules.sort();
+						}
 						log.silly(`      Resolved modules: ${modules}`);
 						return modules;
 					}).then( function(modules) {
diff --git a/test/lib/lbt/bundle/Builder.js b/test/lib/lbt/bundle/Builder.js
index f617146a1..b0e1e751d 100644
--- a/test/lib/lbt/bundle/Builder.js
+++ b/test/lib/lbt/bundle/Builder.js
@@ -711,12 +711,28 @@ test.serial("integration: createBundle with bundleInfo", async (t) => {
 		buffer: async () => "function Two(){return 2;}"
 	});
 	pool.addResource({
-		name: "c.js",
-		getPath: () => "c.js",
+		name: "c2.js",
+		getPath: () => "c2.js",
 		string: function() {
 			return this.buffer();
 		},
-		buffer: async () => "function Three(){return 3;}"
+		buffer: async () => "function Three(){return 3.2;}"
+	});
+	pool.addResource({
+		name: "c1.js",
+		getPath: () => "c1.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.1;}"
+	});
+	pool.addResource({
+		name: "c3.js",
+		getPath: () => "c3.js",
+		string: function() {
+			return this.buffer();
+		},
+		buffer: async () => "function Three(){return 3.3;}"
 	});
 	pool.addResource({
 		name: "ui5loader.js",
@@ -762,7 +778,7 @@ test.serial("integration: createBundle with bundleInfo", async (t) => {
 		}, {
 			mode: "bundleInfo",
 			name: "my-other-custom-bundle.js", // with .js
-			filters: ["c.js"]
+			filters: ["c1.js", "c2.js", "c3.js"]
 		}]
 	};
 
@@ -780,7 +796,7 @@ this.One=One;
 sap.ui.requireSync("ui5loader");
 sap.ui.loader.config({bundlesUI5:{
 "my-custom-bundle":['b.js'],
-"my-other-custom-bundle.js":['c.js']
+"my-other-custom-bundle.js":['c1.js','c2.js','c3.js']
 }});
 ${SOURCE_MAPPING_URL}=library-preload.js.map
 `;
@@ -790,7 +806,7 @@ ${SOURCE_MAPPING_URL}=library-preload.js.map
 		" require part from ui5loader.js");
 	t.is(oResult.bundleInfo.name, "library-preload.js", "bundle info name is correct");
 	t.deepEqual(oResult.bundleInfo.size, expectedContent.length, "bundle info size is correct");
-	t.deepEqual(oResult.bundleInfo.subModules, ["a.js", "b.js", "c.js"],
+	t.deepEqual(oResult.bundleInfo.subModules, ["a.js", "b.js", "c1.js", "c2.js", "c3.js"],
 		"bundle info subModules are correct");
 
 	t.is(warnLogStub.callCount, 1);