[FIX] bundle/Builder: Correct bundling of resources with empty source…

… map If a resource features an empty source map (which is not the same as having no source map), the bundle's source map generation needs to handle this differently from cases where mappings exist. It must not prefix the empty mapping with a string "AAAA," since the danglíng comma will result in a corrupt source map. However, it should still add the mapping for the first line/column "AAAA". Otherwise the source map of the preceding module in the bundle would be applied. Resolves the root cause of SAP/openui5#4035 DINC0139775
SAP · May 13, 2024 · 1228db7 · 1228db7
1 parent b7fd89c
commit 1228db7
Show file tree

Hide file tree

Showing 21 changed files with 67 additions and 5 deletions.
diff --git a/lib/lbt/bundle/Builder.js b/lib/lbt/bundle/Builder.js
@@ -353,7 +353,13 @@ class BundleBuilder {
 			// If first column of the first line is not already mapped, add a mapping for the same reason as above.
 			// This is typical for transpiled code, where there is a bunch of generated code at the beginning that
 			// can't be mapped to the original source
-			map.mappings = "AAAA," + map.mappings;
+			if (map.mappings) {
+				map.mappings = "AAAA," + map.mappings;
+			} else {
+				// If there are no existing mappings (e.g. if the file is empty or only comments),
+				// make sure to still define a single mapping
+				map.mappings = "AAAA";
+			}
 		}
 
 		map.sourceRoot = path.posix.relative(

diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/empty-dbg.js b/test/expected/build/application.a/dest-deps/resources/library/d/empty-dbg.js
@@ -0,0 +1,3 @@
+/*!
+ * Some fancy copyright
+ */
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/empty.js b/test/expected/build/application.a/dest-deps/resources/library/d/empty.js
diff --git a/test/expected/build/application.a/dest-deps/resources/library/d/empty.js.map b/test/expected/build/application.a/dest-deps/resources/library/d/empty.js.map
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/empty-dbg.js b/test/expected/build/application.a/dest-depself/resources/library/d/empty-dbg.js
@@ -0,0 +1,3 @@
+/*!
+ * Some fancy copyright
+ */
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/empty.js b/test/expected/build/application.a/dest-depself/resources/library/d/empty.js
diff --git a/test/expected/build/application.a/dest-depself/resources/library/d/empty.js.map b/test/expected/build/application.a/dest-depself/resources/library/d/empty.js.map
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/empty.js b/test/expected/build/library.d-minified/preload/resources/library/d/empty.js
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/empty.js.map b/test/expected/build/library.d-minified/preload/resources/library/d/empty.js.map
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js b/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js
diff --git a/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js.map b/test/expected/build/library.d-minified/preload/resources/library/d/library-preload.js.map
diff --git a/test/expected/build/library.d/dest/resources/library/d/empty-dbg.js b/test/expected/build/library.d/dest/resources/library/d/empty-dbg.js
@@ -0,0 +1,3 @@
+/*!
+ * Some fancy copyright
+ */
diff --git a/test/expected/build/library.d/dest/resources/library/d/empty.js b/test/expected/build/library.d/dest/resources/library/d/empty.js
diff --git a/test/expected/build/library.d/dest/resources/library/d/empty.js.map b/test/expected/build/library.d/dest/resources/library/d/empty.js.map
diff --git a/test/expected/build/library.d/preload/resources/library/d/empty.js b/test/expected/build/library.d/preload/resources/library/d/empty.js
@@ -0,0 +1,3 @@
+/*!
+ * ${copyright}
+ */
diff --git a/test/expected/build/library.d/preload/resources/library/d/library-preload.js b/test/expected/build/library.d/preload/resources/library/d/library-preload.js
diff --git a/test/expected/build/library.d/preload/resources/library/d/library-preload.js.map b/test/expected/build/library.d/preload/resources/library/d/library-preload.js.map
diff --git a/test/fixtures/library.d-minified/main/src/library/d/empty.js b/test/fixtures/library.d-minified/main/src/library/d/empty.js
diff --git a/test/fixtures/library.d-minified/main/src/library/d/empty.js.map b/test/fixtures/library.d-minified/main/src/library/d/empty.js.map
diff --git a/test/fixtures/library.d/main/src/library/d/empty.js b/test/fixtures/library.d/main/src/library/d/empty.js
@@ -0,0 +1,3 @@
+/*!
+ * ${copyright}
+ */
diff --git a/test/lib/tasks/bundlers/generateLibraryPreload.integration.js b/test/lib/tasks/bundlers/generateLibraryPreload.integration.js
@@ -52,7 +52,7 @@ test.serial("integration: build library.d with library preload", async (t) => {
 	assert.directoryDeepEqual(destPath, expectedPath);
 
 	// Check for all file contents
-	t.is(expectedFiles.length, 7, "7 files are expected");
+	t.is(expectedFiles.length, 8, "8 files are expected");
 	expectedFiles.forEach((expectedFile) => {
 		const relativeFile = path.relative(expectedPath, expectedFile);
 		const destFile = path.join(destPath, relativeFile);
@@ -105,7 +105,7 @@ test.serial("integration: build library.d-minified with library preload", async
 	assert.directoryDeepEqual(destPath, expectedPath);
 
 	// Check for all file contents
-	t.is(expectedFiles.length, 9, "9 files are expected");
+	t.is(expectedFiles.length, 11, "11 files are expected");
 	expectedFiles.forEach((expectedFile) => {
 		const relativeFile = path.relative(expectedPath, expectedFile);
 		const destFile = path.join(destPath, relativeFile);