@ui5/builder 3.5.1 → 4.0.0

package/CHANGELOG.md

@@ -2,16 +2,51 @@
 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/v3.5.1...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v4.0.0...HEAD).
+
+<a name="v4.0.0"></a>
+## [v4.0.0] - 2024-07-23
+### Breaking Changes
+- Drop node v21 support [`7b27171`](https://github.com/SAP/ui5-builder/commit/7b2717166686aeef8d19b1f3134ef4f39de25a80)
+- Discontinue bundling of JavaScript modules as string [`7691b08`](https://github.com/SAP/ui5-builder/commit/7691b08c4cd8abc7fe3922ec913f80dca372ba4f)
+- Task API arguments rename ([#995](https://github.com/SAP/ui5-builder/issues/995)) [`d1f87e0`](https://github.com/SAP/ui5-builder/commit/d1f87e0cb8b65005b034ff00b7e0d66f4a5d279e)
+- Require Node.js 20.11.x/>=21.2.0 and npm >=10 [`b76ff75`](https://github.com/SAP/ui5-builder/commit/b76ff7588d65c5b5ff8fb9861a3562680e8c2e74)
+- **Bundling:** Enforce usage of sap.ui.predefine instead function wrappers ([#1021](https://github.com/SAP/ui5-builder/issues/1021)) [`4bda728`](https://github.com/SAP/ui5-builder/commit/4bda7289383e8645556c68976a05db0ab5698a2b)
+
+### Dependency Updates
+- Bump rimraf from 5.0.8 to 6.0.1 [`2b4f309`](https://github.com/SAP/ui5-builder/commit/2b4f3094107bfa7ace18091731fe2f048b233754)
+- Bump terser from 5.29.1 to 5.29.2 ([#1000](https://github.com/SAP/ui5-builder/issues/1000)) [`2b6da9e`](https://github.com/SAP/ui5-builder/commit/2b6da9ed131ab21c18fdbd9a7c7328dee83bd41c)
+- Bump espree from 9.6.1 to 10.0.1 [`08eb716`](https://github.com/SAP/ui5-builder/commit/08eb7165d638ccf3b078eeb3feed763765821f53)
+- Bump terser from 5.27.1 to 5.27.2 ([#991](https://github.com/SAP/ui5-builder/issues/991)) [`204145d`](https://github.com/SAP/ui5-builder/commit/204145d8db2a0f76d134206b33fbef3bf1edabbf)
+- Bump workerpool from 6.5.1 to 9.1.0 [`b78a70c`](https://github.com/SAP/ui5-builder/commit/b78a70cf1adec6b78d78593898942f0c7c47edca)
+
+### Features
+- Apply default values to bunde definitions for standard tasks ([#1033](https://github.com/SAP/ui5-builder/issues/1033)) [`4178e1a`](https://github.com/SAP/ui5-builder/commit/4178e1a0315ad16b7774183a18e326f8c52f5f44)
+- **Bundle 'require' section with async flag for specVersion:** 4.0 ([#1042](https://github.com/SAP/ui5-builder/issues/1042)) [`dfa67fe`](https://github.com/SAP/ui5-builder/commit/dfa67feb91b7de0d61c2713eafa639f001484d9b)
+- **bundle/Builder:** Support async require sections and conditional core boot [`e421e2f`](https://github.com/SAP/ui5-builder/commit/e421e2ff7e604d9035b86d666ebaf75d29212332)
+- **manifest.json:** Auto-fill supportedLocales [`b085634`](https://github.com/SAP/ui5-builder/commit/b085634555193acc669ed37e8e4b817b9798698b)
+
+### BREAKING CHANGE
+
+Created bundles use sap.ui.predefine instead function wrappers. For
+projects this is a compatible change. Only the produced bundle content
+changes.
+
+Task API `namespace` option got renamed to `projectNamespace`
+
+JIRA: CPOUI5FOUNDATION-802
+Relates to: https://github.com/SAP/ui5-tooling/issues/701
+
+Support for older Node.js and npm releases has been dropped.
+Only Node.js 20.11.x and >=21.2.0 as well as npm v10 or higher are supported.
 
 <a name="v3.5.1"></a>
 ## [v3.5.1] - 2024-07-22
 ### Bug Fixes
 - **generateThemeDesignerResources:** Allow core .theming in sources ([#1062](https://github.com/SAP/ui5-builder/issues/1062)) [`dda3011`](https://github.com/SAP/ui5-builder/commit/dda30114461314e81da43bd739e709186744f592)
 
-
 <a name="v3.5.0"></a>
-## [v3.5.0] - 2024-06-24
+## [v3.5.0] - 2024-06-21
 ### Features
 - ES2023 Support [`097049d`](https://github.com/SAP/ui5-builder/commit/097049daeec5c54c2d5e858b12e0c54c826ff663)
 
@@ -884,6 +919,7 @@ 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.0.0]: https://github.com/SAP/ui5-builder/compare/v3.3.0...v4.0.0
 [v3.5.1]: https://github.com/SAP/ui5-builder/compare/v3.5.0...v3.5.1
 [v3.5.0]: https://github.com/SAP/ui5-builder/compare/v3.4.1...v3.5.0
 [v3.4.1]: https://github.com/SAP/ui5-builder/compare/v3.4.0...v3.4.1

package/CONTRIBUTING.md

@@ -1,3 +1,3 @@
 # Contributing to the UI5 Tooling
 
-See CONTRIBUTING.md in the [SAP/ui5-tooling](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md) repository.
+See CONTRIBUTING.md in the [SAP/ui5-tooling](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md) repository.

package/README.md

@@ -1,24 +1,24 @@
-![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-tooling/v3/docs/images/UI5_logo_wide.png)
+![UI5 icon](https://raw.githubusercontent.com/SAP/ui5-tooling/main/docs/images/UI5_logo_wide.png)
 
 # ui5-builder
 > Modules for building UI5 projects  
 > Part of the [UI5 Tooling](https://github.com/SAP/ui5-tooling)
 
 [![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=v3)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=26&branchName=v3)
+[![Build Status](https://dev.azure.com/sap/opensource/_apis/build/status/SAP.ui5-builder?branchName=main)](https://dev.azure.com/sap/opensource/_build/latest?definitionId=26&branchName=main)
 [![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)
 
 ## Documentation
-UI5 Builder documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v3/pages/Builder/)
+UI5 Builder documentation can be found here: [sap.github.io/ui5-tooling](https://sap.github.io/ui5-tooling/v4/pages/Builder/)
 
-The UI5 Builder API Reference can be found here: [`@ui5/builder`](https://sap.github.io/ui5-tooling/v3/api/)
+The UI5 Builder API Reference can be found here: [`@ui5/builder`](https://sap.github.io/ui5-tooling/v4/api/)
 
 ## Contributing
-Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md).
+Please check our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md).
 
 ## Support
-Please follow our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/v3/CONTRIBUTING.md#report-an-issue) on how to report an issue.
+Please follow our [Contribution Guidelines](https://github.com/SAP/ui5-tooling/blob/main/CONTRIBUTING.md#report-an-issue) on how to report an issue.
 
 Please report issues in the main [UI5 Tooling](https://github.com/SAP/ui5-tooling) repository.
 

package/jsdoc.json

@@ -4,7 +4,12 @@
 	},
 	"source": {
 		"include": ["README.md"],
-		"exclude": ["lib/lbt/utils/JSTokenizer.js"],
+		"exclude": [
+			"lib/lbt/utils/JSTokenizer.js",
+			"lib/processors/jsdoc/lib/ui5/plugin.js",
+			"lib/processors/jsdoc/lib/ui5/template/publish.js",
+			"lib/processors/jsdoc/lib/ui5/template/utils/versionUtil.js"
+		],
 		"includePattern": ".+\\.js$",
 		"excludePattern": "(node_modules(\\\\|/))"
 	},
@@ -28,7 +33,7 @@
 	"openGraph": {
 		"title": "UI5 Tooling - API Reference",
 		"type": "website",
-		"image": "https://sap.github.io/ui5-tooling/v3/images/UI5_logo_wide.png",
+		"image": "https://sap.github.io/ui5-tooling/v4/images/UI5_logo_wide.png",
 		"site_name": "UI5 Tooling - API Reference",
 		"url": "https://sap.github.io/ui5-tooling/"
 	},

package/lib/lbt/bundle/Builder.js

@@ -16,6 +16,7 @@ import BundleSplitter from "./AutoSplitter.js";
 import {SectionType} from "./BundleDefinition.js";
 import BundleWriter from "./BundleWriter.js";
 import {getLogger} from "@ui5/logger";
+import semver from "semver";
 const log = getLogger("lbt:bundle:Builder");
 
 const sourceMappingUrlPattern = /\/\/# sourceMappingURL=(\S+)\s*$/;
@@ -35,7 +36,6 @@ function makeStringLiteral(str) {
 		return strReplacements[char];
 	}) + "'";
 }
-
 function removeHashbang(str) {
 	return str.replace(/^#!(.*)/, "");
 }
@@ -44,54 +44,69 @@ function isEmptyBundle(resolvedBundle) {
 	return resolvedBundle.sections.every((section) => section.modules.length === 0);
 }
 
-const EVOBundleFormat = {
-	beforePreloads(section) {
-		return `sap.ui.require.preload({\n`;
-	},
+class BundleBuilder {
+	constructor(pool, targetUi5CoreVersion, allowStringBundling) {
+		this.pool = pool;
+		this.resolver = new BundleResolver(pool);
+		this.splitter = new BundleSplitter(pool, this.resolver);
+		this.targetUi5CoreVersion = targetUi5CoreVersion;
+		this.targetUi5CoreVersionMajor = undefined;
+		this.allowStringBundling = allowStringBundling;
+	}
+
+	getUi5MajorVersion() {
+		if (this.targetUi5CoreVersionMajor !== undefined) {
+			return this.targetUi5CoreVersionMajor;
+		}
+
+		if (this.targetUi5CoreVersion && semver.valid(this.targetUi5CoreVersion)) {
+			this.targetUi5CoreVersionMajor = semver.major(this.targetUi5CoreVersion);
+		} else {
+			// Assume legacy version if unable to determine the version
+			this.targetUi5CoreVersionMajor = null;
+		}
+		return this.targetUi5CoreVersionMajor;
+	}
 
-	afterPreloads(section) {
+	generateAfterPreloads(section) {
 		let str = `}`;
 		if ( section.name ) {
 			str += `,"${section.name}"`;
 		}
 		str += `);\n`;
 		return str;
-	},
+	}
 
-	beforeBundleInfo() {
-		return "sap.ui.loader.config({bundlesUI5:{\n";
-	},
+	generateRequire(modules) {
+		const requireCallback = this.determineRequireCallback(modules) ?? "";
+		return `sap.ui.require([${
+			modules.map(($) => `"${toRequireJSName($)}"`).join(",\n")
+		}]${requireCallback});\n`;
+	}
 
-	afterBundleInfo() {
-		return "}});\n";
-	},
+	determineRequireCallback(modules) {
+		if (this.getUi5MajorVersion() >= 2) {
+			// Starting with UI5 2.0.0, method Core.boot does not exist anymore
+			return;
+		}
+		const coreModuleIndex = modules.indexOf(MODULE__SAP_UI_CORE_CORE);
+		if (coreModuleIndex === -1) {
+			return;
+		}
+		return `, (${
+			modules.map((m, i) => i === coreModuleIndex ? `Core` : `_m${i}`)
+		}) => Core.boot?.()`;
+	}
 
-	requireSync(moduleName) {
+	generateRequireSync(moduleName) {
 		return `sap.ui.requireSync("${toRequireJSName(moduleName)}");\n`;
-	},
+	}
 
-	shouldDecorate(resolvedModule) {
+	executesLoaderOrCore(resolvedModule) {
 		return resolvedModule.executes(MODULE__UI5LOADER) ||
 			resolvedModule.executes(MODULE__UI5LOADER_AUTOCONFIG) ||
 			resolvedModule.executes(MODULE__JQUERY_SAP_GLOBAL) ||
 			resolvedModule.executes(MODULE__SAP_UI_CORE_CORE);
-	},
-
-	beforeDepCache(outW) {
-		outW.writeln(`sap.ui.loader.config({depCacheUI5:{`);
-	},
-
-	afterDepCache(outW) {
-		outW.writeln(`}});`);
-	}
-};
-
-class BundleBuilder {
-	constructor(pool) {
-		this.pool = pool;
-		this.resolver = new BundleResolver(pool);
-		this.splitter = new BundleSplitter(pool, this.resolver);
-		this.targetBundleFormat = null;
 	}
 
 	async createBundle(module, options) {
@@ -121,13 +136,10 @@ class BundleBuilder {
 			this.options.sourceMap = true;
 		}
 
-		// Since UI5 Tooling 3.0: Always use modern API
-		this.targetBundleFormat = EVOBundleFormat;
-
 		// when decorateBootstrapModule is false,
 		// we don't write the optimized flag and don't write the try catch wrapper
 		this.shouldDecorate = this.options.decorateBootstrapModule &&
-				this.targetBundleFormat.shouldDecorate(resolvedModule);
+				this.executesLoaderOrCore(resolvedModule);
 		// TODO is the following condition ok or should the availability of jquery.sap.global.js be configurable?
 		this.jqglobalAvailable = !resolvedModule.containsGlobal;
 		this.openModule(resolvedModule.name);
@@ -161,7 +173,7 @@ class BundleBuilder {
 
 		this.closeModule(resolvedModule);
 
-		const bundleInfo = await resolvedModule.createModuleInfo(this.pool);
+		const bundleInfo = await resolvedModule.createModuleInfo(this.pool, this.allowStringBundling);
 		bundleInfo.size = this.outW.length;
 
 		return {
@@ -199,11 +211,14 @@ class BundleBuilder {
 	}
 
 	closeModule(resolvedModule) {
-		if ( resolvedModule.containsCore ) {
+		if ( resolvedModule.containsCoreSync ) {
+			if ( this.getUi5MajorVersion() >= 2 ) {
+				throw new Error("Requiring sap/ui/core/Core synchronously is not supported as of UI5 Version 2");
+			}
 			this.outW.ensureNewLine(); // for clarity and to avoid issues with single line comments
 			this.writeWithSourceMap(
 				`// as this module contains the Core, we ensure that the Core has been booted\n` +
-				`sap.ui.getCore().boot && sap.ui.getCore().boot();`);
+				`sap.ui.getCore?.().boot?.();`);
 		}
 		if ( this.shouldDecorate && this.options.addTryCatchRestartWrapper ) {
 			this.outW.ensureNewLine(); // for clarity and to avoid issues with single line comments
@@ -217,7 +232,7 @@ class BundleBuilder {
 		}
 	}
 
-	addSection(section) {
+	async addSection(section) {
 		this.ensureRawDeclarations();
 
 		switch (section.mode) {
@@ -225,15 +240,15 @@ class BundleBuilder {
 			// do nothing
 			return undefined; // nothing to wait for
 		case SectionType.Raw:
-			return this.writeRaw(section);
+			return await this.writeRaw(section);
 		case SectionType.Preload:
-			return this.writePreloadFunction(section);
+			return await this.writePreloadFunction(section);
 		case SectionType.BundleInfo:
-			return this.writeBundleInfos([section]);
+			return await this.writeBundleInfos([section]);
 		case SectionType.Require:
-			return this.writeRequires(section);
+			return await this.writeRequires(section);
 		case SectionType.DepCache:
-			return this.writeDepCache(section);
+			return await this.writeDepCache(section);
 		default:
 			throw new Error("unknown section mode " + section.mode);
 		}
@@ -308,7 +323,7 @@ class BundleBuilder {
 
 		await this.rewriteAMDModules(sequence);
 		if ( sequence.length > 0 ) {
-			this.writeWithSourceMap(this.targetBundleFormat.beforePreloads(section));
+			this.writeWithSourceMap(`sap.ui.require.preload({\n`);
 			let i = 0;
 			for ( const module of sequence ) {
 				const resource = await this.pool.findResourceWithInfo(module);
@@ -316,7 +331,6 @@ class BundleBuilder {
 					if ( i>0 ) {
 						outW.writeln(",");
 					}
-					// this.beforeWritePreloadModule(module, resource.info, resource);
 					outW.write(`\t"${module.toString()}":`);
 					outW.startSegment(module);
 					await this.writePreloadModule(module, resource.info, resource);
@@ -331,10 +345,8 @@ class BundleBuilder {
 			if ( i > 0 ) {
 				outW.writeln();
 			}
-			outW.write(this.targetBundleFormat.afterPreloads(section));
+			outW.write(this.generateAfterPreloads(section));
 		}
-
-		// this.afterWriteFunctionPreloadSection();
 	}
 
 	beforeWriteFunctionPreloadSection(sequence) {
@@ -380,59 +392,56 @@ class BundleBuilder {
 	}
 
 	async rewriteAMDModules(sequence) {
-		if ( this.options.usePredefineCalls ) {
-			const outW = this.outW;
-
-			const remaining = [];
-			for ( const moduleName of sequence ) {
-				if ( /\.js$/.test(moduleName) ) {
-					// console.log("Processing " + moduleName);
-					const resource = await this.pool.findResourceWithInfo(moduleName);
-					let moduleContent = (await resource.buffer()).toString();
-					moduleContent = removeHashbang(moduleContent);
-					let moduleSourceMap;
-					if (this.options.sourceMap) {
-						({moduleContent, moduleSourceMap} =
-							await this.getSourceMapForModule({
-								moduleName,
-								moduleContent,
-								resourcePath: resource.getPath()
-							}));
-					}
+		const outW = this.outW;
 
-					const rewriteRes = await rewriteDefine({
-						moduleName, moduleContent, moduleSourceMap
-					});
-					if (rewriteRes) {
-						const {moduleContent, moduleSourceMap} = rewriteRes;
-						outW.startSegment(moduleName);
-						outW.ensureNewLine();
-						if (moduleSourceMap) {
-							this.addSourceMap(moduleName, moduleSourceMap);
-						}
-						outW.write(moduleContent);
-						outW.ensureNewLine();
-						const compressedSize = outW.endSegment();
-						log.verbose(
-							`    ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`);
-					} else {
-						// keep unprocessed modules
-						remaining.push(moduleName);
+		const remaining = [];
+		for ( const moduleName of sequence ) {
+			if ( /\.js$/.test(moduleName) ) {
+				const resource = await this.pool.findResourceWithInfo(moduleName);
+
+				if (resource.info?.requiresTopLevelScope && !this.allowStringBundling) {
+					this.logStringBundlingError(moduleName);
+					continue;
+				}
+
+				let moduleContent = (await resource.buffer()).toString();
+				moduleContent = removeHashbang(moduleContent);
+				let moduleSourceMap;
+				if (this.options.sourceMap) {
+					({moduleContent, moduleSourceMap} =
+						await this.getSourceMapForModule({
+							moduleName,
+							moduleContent,
+							resourcePath: resource.getPath()
+						}));
+				}
+
+				const rewriteRes = await rewriteDefine({
+					moduleName, moduleContent, moduleSourceMap
+				});
+				if (rewriteRes) {
+					const {moduleContent, moduleSourceMap} = rewriteRes;
+					outW.startSegment(moduleName);
+					outW.ensureNewLine();
+					if (moduleSourceMap) {
+						this.addSourceMap(moduleName, moduleSourceMap);
 					}
+					outW.write(moduleContent);
+					outW.ensureNewLine();
+					const compressedSize = outW.endSegment();
+					log.verbose(
+						`    ${moduleName} (${resource.info != null ? resource.info.size : -1},${compressedSize})`);
 				} else {
 					// keep unprocessed modules
 					remaining.push(moduleName);
 				}
+			} else {
+				// keep unprocessed modules
+				remaining.push(moduleName);
 			}
-
-			Array.prototype.splice.apply(sequence, [0, sequence.length].concat(remaining));
 		}
-	}
 
-	afterWriteFunctionPreloadSection() {
-	}
-
-	beforeWritePreloadModule(module, info, resource) {
+		Array.prototype.splice.apply(sequence, [0, sequence.length].concat(remaining));
 	}
 
 	/**
@@ -474,8 +483,8 @@ class BundleBuilder {
 			if (this.options.sourceMap) {
 				// We are actually not interested in the source map this module might contain,
 				// but we should make sure to remove any "sourceMappingURL" from the module content before
-				// writing it to the bundle. Otherwise browser dev-tools might create unnecessary (and likely incorrect)
-				// requests for any referenced .map files
+				// writing it to the bundle. Otherwise browser dev-tools might create unnecessary
+				// (and likely incorrect) requests for any referenced .map files
 				({moduleContent} =
 					await this.getSourceMapForModule({
 						moduleName,
@@ -538,15 +547,43 @@ class BundleBuilder {
 		});
 	}
 
-	writeBundleInfos(sections) {
+	logStringBundlingError(moduleName) {
+		log.error(
+			"Module " + moduleName + " requires top level scope and can only be embedded as a string " +
+			"(requires 'eval'), which is not supported with specVersion 4.0 and higher. " +
+			"For more information, see the UI5 Tooling documentation " +
+			"https://sap.github.io/ui5-tooling/stable/pages/Builder/#javascript-files-requiring-top-level-scope");
+	}
+
+	async checkForStringBundling(moduleName) {
+		if (!this.allowStringBundling && /\.js$/.test(moduleName)) {
+			const resource = await this.pool.findResourceWithInfo(moduleName);
+			if (resource.info?.requiresTopLevelScope) {
+				this.logStringBundlingError(moduleName);
+				return null;
+			}
+		}
+		return moduleName;
+	}
+
+	async writeBundleInfos(sections) {
 		this.outW.ensureNewLine();
 
 		let bundleInfoStr = "";
 		if ( sections.length > 0 ) {
-			bundleInfoStr = this.targetBundleFormat.beforeBundleInfo();
-			sections.forEach((section, idx) => {
-				if ( idx > 0 ) {
+			bundleInfoStr = "sap.ui.loader.config({bundlesUI5:{\n";
+			let initial = true;
+			for (let idx = 0; idx < sections.length; idx++) {
+				const section = sections[idx];
+
+				// Remove modules requiring string bundling
+				let modules = await Promise.all(section.modules.map(this.checkForStringBundling.bind(this)));
+				modules = modules.filter(($) => $) || [];
+
+				if (!initial) {
 					bundleInfoStr += ",\n";
+				} else {
+					initial = false;
 				}
 
 				if (!section.name) {
@@ -557,20 +594,26 @@ class BundleBuilder {
 						`The info might not work as expected. ` +
 						`The name must match the bundle filename (incl. extension such as '.js')`);
 				}
-				bundleInfoStr += `"${section.name}":[${section.modules.map(makeStringLiteral).join(",")}]`;
-			});
-			bundleInfoStr += "\n";
-			bundleInfoStr += this.targetBundleFormat.afterBundleInfo();
+				bundleInfoStr += `"${section.name}":[${modules.map(makeStringLiteral).join(",")}]`;
+			}
+			bundleInfoStr += "\n}});\n";
 
 			this.writeWithSourceMap(bundleInfoStr);
 		}
 	}
 
 	writeRequires(section) {
+		if (section.modules.length === 0) {
+			return;
+		}
 		this.outW.ensureNewLine();
-		section.modules.forEach( (module) => {
-			this.writeWithSourceMap(this.targetBundleFormat.requireSync(module));
-		});
+		if (section.async === false) {
+			section.modules.forEach( (module) => {
+				this.writeWithSourceMap(this.generateRequireSync(module));
+			});
+		} else {
+			this.writeWithSourceMap(this.generateRequire(section.modules));
+		}
 	}
 
 	// When AutoSplit is enabled for depCache, we need to ensure that modules
@@ -579,7 +622,6 @@ class BundleBuilder {
 	// module in the next file. This will also duplicate its dependency definition if we do not filter.
 	#depCacheSet = new Set();
 	async writeDepCache(section) {
-		const outW = this.outW;
 		let hasDepCache = false;
 
 		const sequence = section.modules.slice().sort();
@@ -607,11 +649,11 @@ class BundleBuilder {
 					if (deps.length > 0) {
 						if (!hasDepCache) {
 							hasDepCache = true;
-							outW.ensureNewLine();
-							this.targetBundleFormat.beforeDepCache(outW, section);
+							this.outW.ensureNewLine();
+							this.outW.writeln(`sap.ui.loader.config({depCacheUI5:{`);
 						}
 
-						outW.writeln(
+						this.outW.writeln(
 							`"${module}": [${deps.map((dep) => `"${dep}"`).join(",")}],`
 						);
 					} else {
@@ -621,7 +663,7 @@ class BundleBuilder {
 			}
 
 			if (hasDepCache) {
-				this.targetBundleFormat.afterDepCache(outW, section);
+				this.outW.writeln(`}});`);
 			}
 		}
 	}

package/lib/lbt/bundle/ResolvedBundleDefinition.js

@@ -13,10 +13,11 @@ class ResolvedBundleDefinition {
 		);
 	}
 
-	get containsCore() {
+	get containsCoreSync() {
 		return this.sections.some(
 			(section) =>
-				(section.mode === SectionType.Raw || section.mode === SectionType.Require) &&
+				(section.mode === SectionType.Raw ||
+					(section.mode === SectionType.Require && section.async === false)) &&
 				section.modules.some((module) => module === MODULE__SAP_UI_CORE_CORE)
 		);
 	}
@@ -37,7 +38,7 @@ class ResolvedBundleDefinition {
 		);
 	}
 
-	createModuleInfo(pool) {
+	createModuleInfo(pool, allowStringBundling) {
 		const bundleInfo = new ModuleInfo();
 		bundleInfo.name = this.name;
 
@@ -65,7 +66,9 @@ class ResolvedBundleDefinition {
 					modules.map( (submodule) => {
 						return pool.getModuleInfo(submodule).then(
 							(subinfo) => {
-								if (!bundleInfo.subModules.includes(subinfo.name)) {
+								if (!bundleInfo.subModules.includes(subinfo.name) &&
+									(!subinfo.requiresTopLevelScope ||
+										(subinfo.requiresTopLevelScope && allowStringBundling))) {
 									bundleInfo.addSubModule(subinfo);
 								}
 							}
@@ -77,19 +80,6 @@ class ResolvedBundleDefinition {
 
 		return promise.then( () => bundleInfo );
 	}
-
-/*
-		public JSModuleDefinition getDefinition() {
-			return moduleDefinition;
-		}
-
-		public Configuration getConfiguration() {
-			return moduleDefinition.getConfiguration();
-		}
-
-
-	}
-	*/
 }
 
 class ResolvedSection {
@@ -109,6 +99,10 @@ class ResolvedSection {
 	get declareRawModules() {
 		return this.sectionDefinition.declareRawModules;
 	}
+
+	get async() {
+		return this.sectionDefinition.async;
+	}
 }
 
 export default ResolvedBundleDefinition;