[INTERNAL] generateLibraryPreload: Also apply default filters to experimental library-preload

Author: RandomByte

lib/tasks/bundlers/generateLibraryPreload.js

@@ -33,6 +33,32 @@ function getDefaultLibraryPreloadFilters(namespace, excludes) {
 	return filters;
 }
 
+function getExperimentalDefaultLibraryPreloadFilters(namespace, excludes) {
+	const filters = [
+		`${namespace}/library.js`,
+		`!${namespace}/**/*-preload.js`, // exclude all bundles
+		`!${namespace}/designtime/`,
+		`!${namespace}/**/*.designtime.js`,
+		`!${namespace}/**/*.support.js`
+	];
+
+	if (Array.isArray(excludes)) {
+		const allFilterExcludes = negateFilters(excludes);
+		// Add configured excludes at the end of filter list
+		allFilterExcludes.forEach((filterExclude) => {
+			// Allow all excludes (!) and limit re-includes (+) to the library namespace
+			if (filterExclude.startsWith("!") || filterExclude.startsWith(`+${namespace}/`)) {
+				filters.push(filterExclude);
+			} else {
+				log.warn(`Configured preload exclude contains invalid re-include: !${filterExclude.substr(1)}. ` +
+				`Re-includes must start with the library's namespace ${namespace}`);
+			}
+		});
+	}
+
+	return filters;
+}
+
 function getBundleDefinition(namespace, excludes) {
 	// Note: This configuration is only used when no bundle definition in ui5.yaml exists (see "skipBundles" parameter)
 
@@ -110,9 +136,7 @@ function getBundleDefinition(namespace, excludes) {
 function getBundleInfoPreloadDefinition(namespace, excludes, coreVersion) {
 	const sections = [{
 		mode: "preload",
-		filters: [
-			`${namespace}/library.js`,
-		],
+		filters: getExperimentalDefaultLibraryPreloadFilters(namespace, excludes),
 		resolve: true
 	},
 	{
@@ -160,9 +184,7 @@ function getContentBundleDefinition(namespace, excludes) {
 		name: `${namespace}/library-content.js`,
 		sections: [{
 			mode: "provided",
-			filters: [
-				`${namespace}/library.js`,
-			],
+			filters: getExperimentalDefaultLibraryPreloadFilters(namespace, excludes),
 			resolve: true
 		}, {
 			mode: "preload",
@@ -501,7 +523,8 @@ export default async function({workspace, taskUtil, options: {skipBundles = [],
 						} else {
 							log.info(
 								`Using experimental bundling with bundle info preload ` +
-								`for library ${libraryNamespace} in project ${projectName}.`);
+								`for library ${libraryNamespace} in project ${projectName}`);
+							log.info(`Detected sap.ui.core version is ${coreVersion || "unknown"}`);
 							// Experimental bundling with bundle info preload
 							results = await Promise.all([
 								execModuleBundlerIfNeeded({