@ui5/builder 4.0.13 → 4.1.1

package/CHANGELOG.md

@@ -2,7 +2,16 @@
 All notable changes to this project will be documented in this file.  
 This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
-A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.0.13...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.1.1...HEAD).
+
+<a name="v4.1.1"></a>
+## [v4.1.1] - 2025-10-30
+
+<a name="v4.1.0"></a>
+## [v4.1.0] - 2025-10-23
+### Features
+- Enhance generateFlexChangeBundle task to add new 'flexBundle' property to the manifest.json ([#1164](https://github.com/SAP/ui5-builder/issues/1164)) [`a48e474`](https://github.com/SAP/ui5-builder/commit/a48e474b1bfb9f2f11da44e908341af370711309)
+
 
 <a name="v4.0.13"></a>
 ## [v4.0.13] - 2025-10-07
@@ -992,6 +1001,8 @@ to load the custom bundle file instead.
 
 ### Features
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
+[v4.1.1]: https://github.com/SAP/ui5-builder/compare/v4.1.0...v4.1.1
+[v4.1.0]: https://github.com/SAP/ui5-builder/compare/v4.0.13...v4.1.0
 [v4.0.13]: https://github.com/SAP/ui5-builder/compare/v4.0.11...v4.0.13
 [v4.0.11]: https://github.com/SAP/ui5-builder/compare/v4.0.10...v4.0.11
 [v4.0.10]: https://github.com/SAP/ui5-builder/compare/v4.0.9...v4.0.10

package/CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing to the UI5 CLI
 
-See CONTRIBUTING.md in the [UI5/cli](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md) repository.
+See CONTRIBUTING.md in the [UI5/cli](https://github.com/UI5/cli/blob/v4/CONTRIBUTING.md) repository.

package/README.md

@@ -24,10 +24,10 @@ UI5 Builder documentation can be found here: [ui5.github.io/cli](https://ui5.git
 The UI5 Builder API Reference can be found here: [`@ui5/builder`](https://ui5.github.io/cli/v4/api/)
 
 ## Contributing
-Please check our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md).
+Please check our [Contribution Guidelines](https://github.com/UI5/cli/blob/v4/CONTRIBUTING.md).
 
 ## Support
-Please follow our [Contribution Guidelines](https://github.com/UI5/cli/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
+Please follow our [Contribution Guidelines](https://github.com/UI5/cli/blob/v4/CONTRIBUTING.md#report-an-issue) on how to report an issue.
 
 Please report issues in the main [UI5 CLI](https://github.com/UI5/cli) repository.
 

package/lib/lbt/bundle/Resolver.js

@@ -56,6 +56,7 @@ class BundleResolver {
 		 * in the resource pool.
 		 */
 		const missingModules = Object.create(null);
+		const ignoreMissingModules = pool.getIgnoreMissingModules();
 		/**
 		 * Names of modules that are included in non-decomposable bundles.
 		 * If they occur in the missingModules, then this is not an error.
@@ -123,7 +124,7 @@ class BundleResolver {
 					done = pool.findResourceWithInfo(resourceName)
 						.catch( (err) => {
 							// if the caller provided an error message, log it
-							if ( msg ) {
+							if ( msg && !ignoreMissingModules ) {
 								missingModules[resourceName] ??= [];
 								missingModules[resourceName].push(msg);
 							}

package/lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -14,7 +14,7 @@ import semver from "semver";
  * at runtime.
  * If a change bundle is created, "sap.ui.fl" is added as a dependency to the manifest.json if not already present -
  * if the dependency is already listed but lazy-loaded, lazy loading is disabled.
- * If minUI5Version >= 1.73 flexibility-bundle.json will be create.
+ * If minUI5Version >= 1.73 flexibility-bundle.json is created.
  * If there are control variants and minUI5Version < 1.73 build will break and throw an error.
  *
  * @public
@@ -38,29 +38,34 @@ export default async function({workspace, taskUtil, options = {}}) {
 		pathPrefix = `/resources/${namespace}`;
 	}
 
-	function updateJson(data) {
-		// ensure the existence of the libs section in the dependencies
+	function updateJson(data, bBundleCreated) {
 		data["sap.ui5"] = data["sap.ui5"] || {};
-		data["sap.ui5"].dependencies = data["sap.ui5"].dependencies || {};
-		const mLibs = data["sap.ui5"].dependencies.libs = data["sap.ui5"].dependencies.libs || {};
-
-		if (mLibs["sap.ui.fl"]) {
-			log.verbose("sap.ui.fl found in manifest.json");
-			if (mLibs["sap.ui.fl"].lazy) {
-				log.verbose("sap.ui.fl 'lazy' attribute found in manifest.json, setting it to false...");
-				mLibs["sap.ui.fl"].lazy = false;
+		// explicit set the flag to inform the runtime if a bundle is present before the preload can be interpreted
+		data["sap.ui5"].flexBundle = bBundleCreated;
+
+		if (bBundleCreated) {
+			// ensure the existence of the libs section in the dependencies
+			data["sap.ui5"].dependencies = data["sap.ui5"].dependencies || {};
+			const mLibs = data["sap.ui5"].dependencies.libs = data["sap.ui5"].dependencies.libs || {};
+
+			if (mLibs["sap.ui.fl"]) {
+				log.verbose("sap.ui.fl found in manifest.json");
+				if (mLibs["sap.ui.fl"].lazy) {
+					log.verbose("sap.ui.fl 'lazy' attribute found in manifest.json, setting it to false...");
+					mLibs["sap.ui.fl"].lazy = false;
+				}
+			} else {
+				log.verbose("sap.ui.fl not found in manifest.json, inserting it...");
+				mLibs["sap.ui.fl"] = {};
 			}
-		} else {
-			log.verbose("sap.ui.fl not found in manifest.json, inserting it...");
-			mLibs["sap.ui.fl"] = {};
 		}
 	}
 
-	async function updateFLdependency() {
+	async function updateManifestWithFlDependencyAndFlexBundleFlag(bBundleCreated) {
 		const manifestResource = await workspace.byPath(`${pathPrefix}/manifest.json`);
 		const manifestContent = JSON.parse(await manifestResource.getString());
 
-		updateJson(manifestContent);
+		updateJson(manifestContent, bBundleCreated);
 		manifestResource.setString(JSON.stringify(manifestContent, null, "\t"));
 
 		await workspace.write(manifestResource);
@@ -83,6 +88,9 @@ export default async function({workspace, taskUtil, options = {}}) {
 	log.verbose("Collecting flexibility changes");
 	const allResources = await workspace.byGlob(
 		`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`);
+
+	let bBundleCreated = false;
+
 	if (allResources.length > 0) {
 		const versionArray = await readManifestMinUI5Version();
 		const versions = versionArray.map((version) => semver.coerce(version));
@@ -109,9 +117,7 @@ export default async function({workspace, taskUtil, options = {}}) {
 			return workspace.write(resource);
 		}));
 		// Add the sap.ui.fl dependency if a bundle has been created
-		if (processedResources.length > 0) {
-			await updateFLdependency();
-		}
+		bBundleCreated = processedResources.length > 0;
 
 		// Do not write bundled source files to build result
 		if (taskUtil) {
@@ -120,4 +126,7 @@ export default async function({workspace, taskUtil, options = {}}) {
 			});
 		}
 	}
+
+	// Always append the flexBundle flag to the manifest.json, even if no bundle was created
+	await updateManifestWithFlDependencyAndFlexBundleFlag(bBundleCreated);
 }

package/lib/tasks/bundlers/generateLibraryPreload.js

@@ -1,3 +1,4 @@
+import semver from "semver";
 import {getLogger} from "@ui5/logger";
 const log = getLogger("builder:tasks:bundlers:generateLibraryPreload");
 import moduleBundler from "../../processors/bundlers/moduleBundler.js";
@@ -32,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)
 
@@ -106,6 +133,69 @@ function getBundleDefinition(namespace, excludes) {
 	};
 }
 
+function getBundleInfoPreloadDefinition(namespace, excludes, coreVersion) {
+	const sections = [{
+		mode: "preload",
+		filters: getExperimentalDefaultLibraryPreloadFilters(namespace, excludes),
+		resolve: true
+	},
+	{
+		mode: "bundleInfo",
+		name: `${namespace}/library-content.js`,
+		filters: getDefaultLibraryPreloadFilters(namespace, excludes),
+		resolve: false,
+		resolveConditional: false,
+		renderer: true
+	}];
+
+	if (coreVersion) {
+		const parsedVersion = semver.parse(coreVersion);
+		let targetUi5CoreVersionMajor = parsedVersion.major;
+
+		// legacy-free versions include changes of the upcoming major version
+		// so we should treat them the same as the next major version
+		if (
+			parsedVersion.prerelease.includes("legacy-free") ||
+			parsedVersion.prerelease.includes("legacy-free-SNAPSHOT") // Maven snapshot version
+		) {
+			targetUi5CoreVersionMajor += 1;
+		}
+		if (parsedVersion) {
+			if (targetUi5CoreVersionMajor >= 2) {
+				// Do not include manifest.json in UI5 2.x and higher to allow for loading it upfront for all libraries
+				sections.unshift({
+					mode: "provided",
+					filters: [
+						`${namespace}/manifest.json`,
+					]
+				});
+			}
+		}
+	}
+
+	return {
+		name: `${namespace}/library-preload.js`,
+		sections,
+	};
+}
+
+function getContentBundleDefinition(namespace, excludes) {
+	return {
+		name: `${namespace}/library-content.js`,
+		sections: [{
+			mode: "provided",
+			filters: getExperimentalDefaultLibraryPreloadFilters(namespace, excludes),
+			resolve: true
+		}, {
+			mode: "preload",
+			filters: getDefaultLibraryPreloadFilters(namespace, excludes),
+			resolve: false,
+			resolveConditional: false,
+			renderer: true
+		}]
+	};
+}
+
 function getDesigntimeBundleDefinition(namespace) {
 	return {
 		name: `${namespace}/designtime/library-preload.designtime.js`,
@@ -258,6 +348,7 @@ export default async function({workspace, taskUtil, options: {skipBundles = [],
 	}
 	const coreVersion = taskUtil?.getProject("sap.ui.core")?.getVersion();
 	const allowStringBundling = taskUtil?.getProject().getSpecVersion().lt("4.0");
+	const createBundleInfoPreload = !!process.env.UI5_CLI_EXPERIMENTAL_BUNDLE_INFO_PRELOAD;
 	const execModuleBundlerIfNeeded = ({options, resources}) => {
 		if (skipBundles.includes(options.bundleDefinition.name)) {
 			log.verbose(`Skipping generation of bundle ${options.bundleDefinition.name}`);
@@ -390,42 +481,99 @@ export default async function({workspace, taskUtil, options: {skipBundles = [],
 					const libraryNamespaceMatch = libraryIndicatorPath.match(libraryNamespacePattern);
 					if (libraryNamespaceMatch && libraryNamespaceMatch[1]) {
 						const libraryNamespace = libraryNamespaceMatch[1];
-						const results = await Promise.all([
-							execModuleBundlerIfNeeded({
-								options: {
-									bundleDefinition: getBundleDefinition(libraryNamespace, excludes),
-									bundleOptions: {
-										optimize: true,
-										ignoreMissingModules: true
-									}
-								},
-								resources
-							}),
-							execModuleBundlerIfNeeded({
-								options: {
-									bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace),
-									bundleOptions: {
-										optimize: true,
-										ignoreMissingModules: true,
-										skipIfEmpty: true
-									}
-								},
-								resources
-							}),
-							execModuleBundlerIfNeeded({
-								options: {
-									bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace),
-									bundleOptions: {
-										optimize: false,
-										ignoreMissingModules: true,
-										skipIfEmpty: true
-									}
-									// Note: Although the bundle uses optimize=false, there is
-									// no moduleNameMapping needed, as support files are excluded from minification.
-								},
-								resources
-							})
-						]);
+						let results;
+						if (!createBundleInfoPreload) {
+							// Regular bundling
+							results = await Promise.all([
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getBundleDefinition(libraryNamespace, excludes),
+										bundleOptions: {
+											optimize: true,
+											ignoreMissingModules: true
+										}
+									},
+									resources
+								}),
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace),
+										bundleOptions: {
+											optimize: true,
+											ignoreMissingModules: true,
+											skipIfEmpty: true
+										}
+									},
+									resources
+								}),
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace),
+										bundleOptions: {
+											optimize: false,
+											ignoreMissingModules: true,
+											skipIfEmpty: true
+										}
+										// Note: Although the bundle uses optimize=false, there is
+										// no moduleNameMapping needed, as support files are excluded from minification.
+									},
+									resources
+								})
+							]);
+						} else {
+							log.info(
+								`Using experimental bundling with bundle info preload ` +
+								`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({
+									options: {
+										bundleDefinition:
+											getBundleInfoPreloadDefinition(libraryNamespace, excludes, coreVersion),
+										bundleOptions: {
+											optimize: true,
+											ignoreMissingModules: true
+										}
+									},
+									resources
+								}),
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getContentBundleDefinition(libraryNamespace, excludes),
+										bundleOptions: {
+											optimize: true,
+											ignoreMissingModules: true
+										}
+									},
+									resources
+								}),
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace),
+										bundleOptions: {
+											optimize: true,
+											ignoreMissingModules: true,
+											skipIfEmpty: true
+										}
+									},
+									resources
+								}),
+								execModuleBundlerIfNeeded({
+									options: {
+										bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace),
+										bundleOptions: {
+											optimize: false,
+											ignoreMissingModules: true,
+											skipIfEmpty: true
+										}
+										// Note: Although the bundle uses optimize=false, there is
+										// no moduleNameMapping needed, as support files are excluded from minification.
+									},
+									resources
+								})
+							]);
+						}
 						const bundles = Array.prototype.concat.apply([], results).filter(Boolean);
 						return Promise.all(bundles.map(({bundle, sourceMap} = {}) => {
 							if (bundle) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "4.0.13",
+	"version": "4.1.1",
 	"description": "UI5 CLI - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -129,10 +129,10 @@
 		"escope": "^4.0.0",
 		"espree": "^10.4.0",
 		"graceful-fs": "^4.2.11",
-		"jsdoc": "^4.0.4",
+		"jsdoc": "^4.0.5",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
-		"semver": "^7.7.2",
+		"semver": "^7.7.3",
 		"terser": "^5.44.0",
 		"workerpool": "^9.3.4",
 		"xml2js": "^0.6.2"
@@ -141,13 +141,13 @@
 		"@eslint/js": "^9.14.0",
 		"@istanbuljs/esm-loader-hook": "^0.3.0",
 		"@jridgewell/trace-mapping": "^0.3.31",
-		"@ui5/project": "^4.0.6",
+		"@ui5/project": "^4.0.8",
 		"ava": "^6.4.1",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^7.0.3",
 		"depcheck": "^1.4.7",
 		"docdash": "^2.0.2",
-		"eslint": "^9.37.0",
+		"eslint": "^9.38.0",
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^15.1.0",
 		"eslint-plugin-jsdoc": "^52.0.4",