@ui5/builder 4.1.5 → 4.2.0

package/CHANGELOG.md

@@ -2,10 +2,30 @@
 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.1.5...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.2.0...HEAD).
+
+<a name="v4.2.0"></a>
+## [v4.2.0] - 2026-06-15
+### Bug Fixes
+- **lbt/bundle/Resolver:** Ensure deterministic ordering of raw modules [`88953bc`](https://github.com/SAP/ui5-builder/commit/88953bc3fe727af0d9e2c540081f81bacc461939)
+
+### Dependency Updates
+- Bump workerpool from 9.3.4 to 10.0.2 ([#1216](https://github.com/SAP/ui5-builder/issues/1216)) [`e19bb00`](https://github.com/SAP/ui5-builder/commit/e19bb005536ee2c5facfc3f44a31c93712651dd6)
+
+### Features
+- **flexChangesBundler:** Add annotation changes in the flexibility-bundle [`880a091`](https://github.com/SAP/ui5-builder/commit/880a0917a7edd65c509b93f8ceb5c8810a5490ad)
+
+
+<a name="v4.1.6"></a>
+## [v4.1.6] - 2026-04-20
+### Bug Fixes
+- **Bundler:** Also detect import.meta as ESM indicator [`58013d5`](https://github.com/SAP/ui5-builder/commit/58013d5a75e3fbf245b0042fb0b81f4e729a7a55)
+- **Bundler:** Skip ESM modules during bundling and log errors [`d28f63a`](https://github.com/SAP/ui5-builder/commit/d28f63a6ace823d9fcfac23312c09e66be6fb7d4)
+- **Bundler:** Reduce noise from ESM parse errors [`bd574bb`](https://github.com/SAP/ui5-builder/commit/bd574bb231cc4e5f1af0b12c12c3365dee5eb80d)
+
 
 <a name="v4.1.5"></a>
-## [v4.1.5] - 2026-03-23
+## [v4.1.5] - 2026-03-25
 
 <a name="v4.1.4"></a>
 ## [v4.1.4] - 2026-02-16
@@ -1019,6 +1039,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.2.0]: https://github.com/SAP/ui5-builder/compare/v4.1.6...v4.2.0
+[v4.1.6]: https://github.com/SAP/ui5-builder/compare/v4.1.5...v4.1.6
 [v4.1.5]: https://github.com/SAP/ui5-builder/compare/v4.1.4...v4.1.5
 [v4.1.4]: https://github.com/SAP/ui5-builder/compare/v4.1.3...v4.1.4
 [v4.1.3]: https://github.com/SAP/ui5-builder/compare/v4.1.2...v4.1.3

package/README.md

@@ -14,7 +14,7 @@
 > Part of the [UI5 CLI](https://github.com/UI5/cli)
 
 [![REUSE status](https://api.reuse.software/badge/github.com/SAP/ui5-builder)](https://api.reuse.software/info/github.com/SAP/ui5-builder)
-[![Build Status](https://dev.azure.com/sap/opensource/_apis/build/status/SAP.ui5-builder?branchName=v4)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=26&branchName=v4)
+[![Build Status](https://github.com/SAP/ui5-builder/actions/workflows/github-ci.yml/badge.svg)](https://github.com/SAP/ui5-builder/actions/workflows/github-ci.yml)
 [![npm Package Version](https://badge.fury.io/js/%40ui5%2Fbuilder.svg)](https://www.npmjs.com/package/@ui5/builder)
 [![Coverage Status](https://coveralls.io/repos/github/SAP/ui5-builder/badge.svg)](https://coveralls.io/github/SAP/ui5-builder)
 

package/lib/lbt/bundle/Builder.js

@@ -597,10 +597,11 @@ class BundleBuilder {
 		}
 	}
 
-	writeRequires(section) {
+	async writeRequires(section) {
 		if (section.modules.length === 0) {
 			return;
 		}
+
 		this.outW.ensureNewLine();
 		if (section.async === false) {
 			section.modules.forEach( (module) => {
@@ -767,7 +768,7 @@ async function rewriteDefine({moduleName, moduleContent, moduleSourceMap}) {
 	} catch (e) {
 		log.error(`Error while parsing ${moduleName}: ${e.message}`);
 		log.verbose(e.stack);
-		return {};
+		return null;
 	}
 
 	if ( ast.type === Syntax.Program &&

package/lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -67,6 +67,7 @@ class ResolvedBundleDefinition {
 						return pool.getModuleInfo(submodule).then(
 							(subinfo) => {
 								if (!bundleInfo.subModules.includes(subinfo.name) &&
+									subinfo.format !== ModuleInfo.Format.ESM &&
 									(!subinfo.requiresTopLevelScope ||
 										(subinfo.requiresTopLevelScope && allowStringBundling))) {
 									bundleInfo.addSubModule(subinfo);

package/lib/lbt/bundle/Resolver.js

@@ -4,6 +4,7 @@
 
 import topologicalSort from "../graph/topologicalSort.js";
 import {getRendererName} from "../UI5ClientConstants.js";
+import ModuleInfo from "../resources/ModuleInfo.js";
 import ResourceFilterList from "../resources/ResourceFilterList.js";
 import {SectionType} from "./BundleDefinition.js";
 import ResolvedBundleDefinition from "./ResolvedBundleDefinition.js";
@@ -135,6 +136,16 @@ class BundleResolver {
 							const dependencyInfo = resource && resource.info;
 							let promises = [];
 
+							// Skip ESM modules — they can't be bundled
+							if (resource?.info?.format === ModuleInfo.Format.ESM) {
+								log.error(
+									`Module ${resourceName} is an ECMAScript Module (ESM), ` +
+									`which is not supported for bundling. ` +
+									`The module will be skipped.`
+								);
+								return;
+							}
+
 							if ( isBundle && !decomposable ) {
 								resource.info.subModules.forEach(
 									(included) => {
@@ -318,6 +329,15 @@ class BundleResolver {
 				return collectModulesForSection(section).
 					then( (modules) => {
 						if ( section.mode == SectionType.Raw && section.sort !== false ) {
+							// Sort modules by their filter definition order to ensure
+							// deterministic input for the topological sort.
+							// Topological sort preserves input order for tie-breaking,
+							// so this ensures modules at the same dependency level
+							// appear in the order defined by the section filters.
+							const filterOrder = new ResourceFilterList(section.filters, fileTypes);
+							modules.sort((a, b) => {
+								return filterOrder.matchIndex(a) - filterOrder.matchIndex(b);
+							});
 							// sort the modules in topological order
 							return topologicalSort(pool, modules).then( (modules) => {
 								log.silly(`      Resolved modules (sorted): ${modules}`);

package/lib/lbt/resources/ModuleInfo.js

@@ -25,7 +25,8 @@ const CONDITIONAL = 2;
 const Format = {
 	UI5_LEGACY: "ui5-declare",
 	UI5_DEFINE: "ui5-define",
-	AMD: "amd"
+	AMD: "amd",
+	ESM: "esm"
 };
 
 /**

package/lib/lbt/resources/ResourceFilterList.js

@@ -124,6 +124,16 @@ export default class ResourceFilterList {
 		);
 	}
 
+	matchIndex(candidate) {
+		for (let i = 0; i < this.matchers.length; i++) {
+			const matcher = this.matchers[i];
+			if (matcher.include && matcher.calcMatch(candidate, false)) {
+				return i;
+			}
+		}
+		return this.matchers.length;
+	}
+
 	toString() {
 		return this.matchers.map((matcher) => matcher.pattern).join(",");
 	}

package/lib/lbt/resources/ResourcePool.js

@@ -62,8 +62,12 @@ async function determineDependencyInfo(resource, rawInfo, pool) {
 		try {
 			ast = parseJS(code, {comment: true});
 		} catch (err) {
-			log.error(`Failed to parse ${resource.name}: ${err.message}`);
+			log.verbose(`Failed to parse ${resource.name}: ${err.message}`);
 			log.verbose(err.stack);
+			if (err.message.includes("'import' and 'export' may appear only with 'sourceType: module'") ||
+				err.message.includes("Cannot use 'import.meta' outside a module")) {
+				info.format = ModuleInfo.Format.ESM;
+			}
 		}
 		if (ast) {
 			try {
@@ -243,4 +247,3 @@ class ResourcePool {
 }
 
 export default ResourcePool;
-

package/lib/processors/bundlers/flexChangesBundler.js

@@ -18,8 +18,8 @@ import {createResource} from "@ui5/fs/resourceFactory";
  * @param {@ui5/fs/Resource[]} parameters.resources List of resources to be processed
  * @param {object} parameters.options Options
  * @param {string} parameters.options.pathPrefix Prefix for bundle path
- * @param {string} parameters.options.hasFlexBundleVersion true if minUI5Version >= 1.73 than
- *															create flexibility-bundle.json
+ * @param {string} parameters.options.hasFlexBundleVersion true if minUI5Version >= 1.73
+ *															and create flexibility-bundle.json
  * @param {object} [parameters.existingFlexBundle={}] Object with existing flexibility-bundle.json
  * 															to merge with new changes
  * @returns {Promise<@ui5/fs/Resource[]>} Promise resolving with flex changes bundle resources
@@ -45,6 +45,7 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion},
 		const variants = [];
 		const variantChanges = [];
 		const variantManagementChanges = [];
+		const annotationChanges = [];
 
 		changesContent.forEach(function(content) {
 			if (content.layer === "VENDOR") {
@@ -74,14 +75,23 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion},
 			case "ctrl_variant_management_change":
 				variantManagementChanges.push(content);
 				break;
+			case "annotation_change":
+				annotationChanges.push(content);
+				break;
 			}
 		});
 
-		if (!hasFlexBundleVersion && (compVariants.length != 0 || variants.length != 0 || variantChanges.length != 0 ||
-				variantDependentControlChanges.length != 0 || variantManagementChanges.length != 0)) {
+		if (!hasFlexBundleVersion && (
+			compVariants.length != 0 ||
+			variants.length != 0 ||
+			variantChanges.length != 0 ||
+			variantDependentControlChanges.length != 0 ||
+			variantManagementChanges.length != 0 ||
+			annotationChanges.length != 0
+		)) {
 			throw new Error(
-				"There are some control variant changes in the changes folder. This only works with a " +
-				"minUI5Version 1.73.0. Please update the minUI5Version in the manifest.json to 1.73.0 or higher");
+				"There are some files in the changes folder supported only with a UI5 version 1.73 and above. " +
+				"Please update the minUI5Version in the manifest.json to 1.73 or higher");
 		}
 		// create changes-bundle.json
 		if (!hasFlexBundleVersion) {
@@ -89,6 +99,7 @@ export default function({resources, options: {pathPrefix, hasFlexBundleVersion},
 		} else {
 			bundleName = "flexibility-bundle.json";
 			let newChangeFormat = {
+				annotationChanges,
 				changes,
 				compVariants,
 				variants,

package/lib/processors/bundlers/moduleBundler.js

@@ -45,12 +45,18 @@ const log = getLogger("builder:processors:bundlers:moduleBundler");
  *		the module itself.
  *		This requires the ui5loader to be available at build time and UI5 version 1.74.0 or higher at runtime.
  *	</li>
+ *	<li>
+ *		<code>depCache</code>: A 'depCache' section is transformed into a `sap.ui.loader.config` call that maps
+ *		module names to their respective dependencies (including declarative views/fragments).
+ *		This requires the ui5loader to be available at build time.
+ *	</li>
  * </ul>
  * </p>
  *
  * @public
  * @typedef {object} ModuleBundleDefinitionSection
- * @property {string} mode The embedding mode. Either 'provided', 'raw', 'preload', 'require' or 'bundleInfo'
+ * @property {string} mode The embedding mode. Either 'provided', 'raw', 'preload', 'require', 'bundleInfo'
+ *		or 'depCache'
  * @property {string[]} filters List of modules declared as glob patterns (resource name patterns) that should be
  *		in- or excluded.
  * 		A pattern ending with a slash '/' will, similarly to the use of a single '*' or double '**' asterisk,

package/lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -95,7 +95,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}`);
+		pathPrefix + "/changes/*.{annotation_change,change,variant,ctrl_variant," +
+			"ctrl_variant_change,ctrl_variant_management_change}"
+	);
 
 	let bBundleCreated = false;
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@ui5/builder",
-	"version": "4.1.5",
+	"version": "4.2.0",
 	"description": "UI5 CLI - Builder",
 	"author": {
 		"name": "SAP SE",
@@ -34,15 +34,12 @@
 	},
 	"scripts": {
 		"test": "npm run lint && npm run jsdoc-generate && npm run coverage",
-		"test-azure": "npm run coverage-xunit",
 		"lint": "eslint ./",
 		"unit": "rimraf test/tmp && ava",
 		"unit-verbose": "rimraf test/tmp && cross-env UI5_LOG_LVL=verbose ava --verbose --serial",
 		"unit-watch": "rimraf test/tmp && ava --watch",
-		"unit-xunit": "rimraf test/tmp && ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\" --tap --timeout=1m | tap-xunit --dontUseCommentsAsTestNames=true > test-results.xml",
 		"unit-inspect": "cross-env UI5_LOG_LVL=verbose ava debug --break",
 		"coverage": "rimraf test/tmp && nyc ava --node-arguments=\"--experimental-loader=@istanbuljs/esm-loader-hook\"",
-		"coverage-xunit": "nyc --reporter=text --reporter=text-summary --reporter=cobertura npm run unit-xunit",
 		"jsdoc": "npm run jsdoc-generate && open-cli jsdocs/index.html",
 		"jsdoc-generate": "jsdoc -c ./jsdoc.json -t $(npm ls docdash --parseable | head -1) ./lib/ || (echo 'Error during JSDoc generation! Check log.' && exit 1)",
 		"jsdoc-watch": "npm run jsdoc && chokidar \"./lib/**/*.js\" -c \"npm run jsdoc-generate\"",
@@ -50,7 +47,8 @@
 		"version": "git-chglog --sort semver --next-tag v$npm_package_version -o CHANGELOG.md v4.0.0.. && git add CHANGELOG.md",
 		"prepublishOnly": "git push --follow-tags",
 		"release-note": "git-chglog --sort semver -c .chglog/release-config.yml v$npm_package_version",
-		"knip": "knip --config knip.config.js"
+		"knip": "knip --config knip.config.js",
+		"check-engine": "check-engine-light ."
 	},
 	"files": [
 		"CHANGELOG.md",
@@ -123,7 +121,7 @@
 	},
 	"dependencies": {
 		"@jridgewell/sourcemap-codec": "^1.5.5",
-		"@ui5/fs": "^4.0.5",
+		"@ui5/fs": "^4.0.6",
 		"@ui5/logger": "^4.0.2",
 		"cheerio": "1.0.0",
 		"escape-unicode": "^0.3.0",
@@ -133,17 +131,18 @@
 		"jsdoc": "^4.0.5",
 		"less-openui5": "^0.11.6",
 		"pretty-data": "^0.40.0",
-		"semver": "^7.7.4",
-		"terser": "^5.46.1",
-		"workerpool": "^9.3.4",
+		"semver": "^7.8.4",
+		"terser": "^5.48.0",
+		"workerpool": "^10.0.2",
 		"xml2js": "^0.6.2"
 	},
 	"devDependencies": {
 		"@eslint/js": "^9.14.0",
 		"@istanbuljs/esm-loader-hook": "^0.3.0",
 		"@jridgewell/trace-mapping": "^0.3.31",
-		"@ui5/project": "^4.0.14",
+		"@ui5/project": "^4.0.16",
 		"ava": "^6.4.1",
+		"check-engine-light": "0.4.0",
 		"chokidar-cli": "^3.0.0",
 		"cross-env": "^10.1.0",
 		"docdash": "^2.0.2",
@@ -151,14 +150,13 @@
 		"eslint-config-google": "^0.14.0",
 		"eslint-plugin-ava": "^15.1.0",
 		"eslint-plugin-jsdoc": "61.5.0",
-		"esmock": "^2.7.3",
+		"esmock": "^2.7.6",
 		"globals": "^16.5.0",
 		"knip": "^5.88.1",
 		"line-column": "^1.0.2",
 		"nyc": "^17.1.0",
 		"open-cli": "^8.0.0",
 		"rimraf": "^6.1.3",
-		"sinon": "^21.0.3",
-		"tap-xunit": "^2.4.1"
+		"sinon": "^21.1.2"
 	}
 }