[INTERNAL] generateLibraryPreload: Apply resource transformation for …

…unoptimized sap.ui.core bundles

Only applicable to sap.ui.core versions <1.97.0. Same logic as for
custom bundles in the generateBundle task.

lib/tasks/bundlers/generateLibraryPreload.js

@@ -2,6 +2,7 @@ const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateLib
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
 const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
+const ModuleName = require("../../lbt/utils/ModuleName");
 
 function getDefaultLibraryPreloadFilters(namespace, excludes) {
 	const filters = [
@@ -284,7 +285,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 		});
 	}
 
-	return combo.byGlob("/**/*.{js,json,xml,html,properties,library}").then((resources) => {
+	return combo.byGlob("/**/*.{js,json,xml,html,properties,library}").then(async (resources) => {
 		// Find all libraries and create a library-preload.js bundle
 
 		let p = Promise.resolve();
@@ -303,6 +304,24 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 				const isEvo = resources.find((resource) => {
 					return resource.getPath() === "/resources/ui5loader.js";
 				});
+
+				const unoptimizedResources = await new ReaderCollectionPrioritized({
+					name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
+					readers: [workspace, dependencies]
+				}).filter(function(resource) {
+					// Remove any non-debug variants
+					return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+				}).transformer(async function(resourcePath, getClonedResource) {
+					if (taskUtil.getTag(resourcePath, taskUtil.STANDARD_TAGS.IsDebugVariant)) {
+						const resource = await getClonedResource();
+						const nonDbgPath = ModuleName.getNonDebugName(resource.getPath());
+						if (!nonDbgPath) {
+							throw new Error(`Failed to resolve non-debug name for ${resource.getPath()}`);
+						}
+						resource.setPath(nonDbgPath);
+					}
+				}).byGlob("/**/*.{js,json,xml,html,properties,library}");
+
 				let filters;
 				if (isEvo) {
 					filters = ["ui5loader-autoconfig.js"];
@@ -316,7 +335,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					}),
 					moduleBundler({
 						options: getModuleBundlerOptions({name: "sap-ui-core-dbg.js", filters, preload: false}),
-						resources
+						resources: unoptimizedResources
 					}),
 					moduleBundler({
 						options: getModuleBundlerOptions({
@@ -328,7 +347,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 						options: getModuleBundlerOptions({
 							name: "sap-ui-core-nojQuery-dbg.js", filters, preload: false, provided: true
 						}),
-						resources
+						resources: unoptimizedResources
 					}),
 				]).then((results) => {
 					const bundles = Array.prototype.concat.apply([], results);