@ui5/builder 3.0.0-alpha.6 → 3.0.0-alpha.7

package/CHANGELOG.md

@@ -2,7 +2,27 @@
 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.0.0-alpha.6...HEAD).
+A list of unreleased changes can be found [here](https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.7...HEAD).
+
+<a name="v3.0.0-alpha.7"></a>
+## [v3.0.0-alpha.7] - 2022-06-14
+### Breaking Changes
+- Remove build execution ([#740](https://github.com/SAP/ui5-builder/issues/740)) [`af2e956`](https://github.com/SAP/ui5-builder/commit/af2e956f6cba1275669160328e32df3fffa782d0)
+
+### Bug Fixes
+- Avoid redundant bundle creation ([#741](https://github.com/SAP/ui5-builder/issues/741)) [`13c8405`](https://github.com/SAP/ui5-builder/commit/13c840585946401d238936dfa38a6f70a73e9ed0)
+
+### Features
+- Enable modern preload bundles without dependencies ([#739](https://github.com/SAP/ui5-builder/issues/739)) [`97cfa6c`](https://github.com/SAP/ui5-builder/commit/97cfa6cd3eadff57bcc18816534c7751551ebdb8)
+
+### BREAKING CHANGE
+
+* builder.js has been removed. Use ui5-project builder instead
+* Tasks now rely on Project instances being available on Resources (see https://github.com/SAP/ui5-fs/pull/381)
+* TaskRepository#addTask has been removed. Custom tasks need to be added to the project graph instead
+* TaskUtil#get/set/clearTag now requires a Project instance to be provided. Path strings are no longer sufficient
+  and will cause an exception to be thrown
+
 
 <a name="v3.0.0-alpha.6"></a>
 ## [v3.0.0-alpha.6] - 2022-04-26
@@ -721,6 +741,7 @@ to load the custom bundle file instead.
 - Add ability to configure component preloads and custom bundles [`2241e5f`](https://github.com/SAP/ui5-builder/commit/2241e5ff98fd95f1f80cc74959655ae7a9c660e7)
 
 
+[v3.0.0-alpha.7]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.6...v3.0.0-alpha.7
 [v3.0.0-alpha.6]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.5...v3.0.0-alpha.6
 [v3.0.0-alpha.5]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.4...v3.0.0-alpha.5
 [v3.0.0-alpha.4]: https://github.com/SAP/ui5-builder/compare/v3.0.0-alpha.3...v3.0.0-alpha.4

package/index.js

@@ -3,10 +3,6 @@
  * @public
  */
 module.exports = {
-	/**
-	 * @type {import('./lib/builder/builder')}
-	 */
-	builder: "./lib/builder/builder",
 	/**
 	 * @public
 	 * @alias module:@ui5/builder.processors
@@ -160,41 +156,6 @@ module.exports = {
 		 * @type {import('./lib/tasks/TaskUtil')}
 		 */
 		TaskUtil: "./lib/tasks/TaskUtil"
-	},
-	/**
-	 * @private
-	 * @alias module:@ui5/builder.types
-	 * @namespace
-	 */
-	types: {
-		/**
-		 * @type {typeof import('./lib/types/AbstractBuilder')}
-		 */
-		AbstractBuilder: "./lib/types/AbstractBuilder",
-		/**
-		 * @type {typeof import('./lib/types/AbstractFormatter')}
-		 */
-		AbstractFormatter: "./lib/types/AbstractFormatter",
-		/**
-		 * @type {import('./lib/types/application/applicationType')}
-		 */
-		application: "./lib/types/application/applicationType",
-		/**
-		 * @type {import('./lib/types/library/libraryType')}
-		 */
-		library: "./lib/types/library/libraryType",
-		/**
-		 * @type {import('./lib/types/themeLibrary/themeLibraryType')}
-		 */
-		themeLibrary: "./lib/types/themeLibrary/themeLibraryType",
-		/**
-		 * @type {import('./lib/types/module/moduleType')}
-		 */
-		module: "./lib/types/module/moduleType",
-		/**
-		 * @type {import('./lib/types/typeRepository')}
-		 */
-		typeRepository: "./lib/types/typeRepository"
 	}
 };
 

package/lib/lbt/bundle/Builder.js

@@ -40,38 +40,6 @@ function isEmptyBundle(resolvedBundle) {
 	return resolvedBundle.sections.every((section) => section.modules.length === 0);
 }
 
-const UI5BundleFormat = {
-	beforePreloads(section) {
-		let str = `jQuery.sap.registerPreloadedModules({\n`;
-		if ( section.name ) {
-			str += `"name":"${section.name}",\n`;
-		}
-		str += `"version":"2.0",\n`;
-		str += `"modules":{\n`;
-		return str;
-	},
-
-	afterPreloads(section) {
-		return `}});\n`;
-	},
-
-	beforeBundleInfo() {
-		return `"unsupported"; /* 'bundleInfo' section mode not supported (requires ui5loader)\n`;
-	},
-
-	afterBundleInfo() {
-		return "*/\n";
-	},
-
-	requireSync(moduleName) {
-		return `sap.ui.requireSync("${ModuleName.toRequireJSName(moduleName)}");\n`;
-	},
-
-	shouldDecorate(resolvedModule) {
-		return resolvedModule.executes(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL);
-	}
-};
-
 const EVOBundleFormat = {
 	beforePreloads(section) {
 		return `sap.ui.require.preload({\n`;
@@ -115,7 +83,6 @@ class BundleBuilder {
 	}
 
 	async createBundle(module, options) {
-		await this._prepare();
 		if ( options.numberOfParts > 1 ) {
 			const bundleInfos = [];
 			const submodules = await this.splitter.run( module, options );
@@ -128,17 +95,6 @@ class BundleBuilder {
 		}
 	}
 
-	_prepare() {
-		return Promise.all([
-			// check whether the resource pool contains debug and optimized sources
-			this.pool.findResource( ModuleName.getDebugName(UI5ClientConstants.MODULE__JQUERY_SAP_GLOBAL) ).
-				then( () => this.optimizedSources = true, () => this.optimizedSources = false ),
-			// check whether EVO modules are available. If so, use EVO APIs, else use old UI5 APIs.
-			this.pool.findResource(UI5ClientConstants.EVO_MARKER_RESOURCE).
-				then( () => this.targetBundleFormat = EVOBundleFormat, () => this.targetBundleFormat = UI5BundleFormat )
-		]);
-	}
-
 	async _createBundle(module, options) {
 		const resolvedModule = await this.resolver.resolve(module);
 		if ( options.skipIfEmpty && isEmptyBundle(resolvedModule) ) {
@@ -153,11 +109,13 @@ class BundleBuilder {
 			this.options.sourceMap = true;
 		}
 
-		// when decorateBootstrapModule is set to false, we don't write the optimized flag
-		// and don't write the try catch wrapper
+		// 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.optimizedSources && !this.options.debugMode) || this.optimize) &&
-				this.targetBundleFormat.shouldDecorate(resolvedModule));
+				this.targetBundleFormat.shouldDecorate(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);
@@ -636,6 +594,18 @@ class BundleBuilder {
 
 		if (moduleSourceMap) {
 			moduleSourceMap = JSON.parse(moduleSourceMap);
+
+			// Check for index map, which is currently not supported
+			if (Array.isArray(moduleSourceMap.sections)) {
+				log.warn(
+					`Module ${moduleName} references an index source map which is currently not supported. ` +
+					`A transient source map will be created instead...`
+				);
+				moduleSourceMap = createTransientSourceMap({
+					moduleName: path.posix.basename(resourcePath),
+					moduleContent
+				});
+			}
 		} else {
 			log.verbose(`No source map available for module ${moduleName}. Creating transient source map...`);
 			moduleSourceMap = createTransientSourceMap({

package/lib/lbt/resources/LocatorResource.js

@@ -11,7 +11,7 @@ class LocatorResource extends Resource {
 	}
 
 	getProject() {
-		return this.resource._project;
+		return this.resource.getProject();
 	}
 
 	getPath() {

package/lib/lbt/utils/escapePropertiesFile.js

@@ -4,7 +4,7 @@ const nonAsciiEscaper = require("../../processors/nonAsciiEscaper");
  * Can be used to escape *.properties files.
  *
  * Input encoding is read from project configuration.
- * In case the resource belongs to no project (e.g. bundler is used standalone) the default is "ISO-8859-1".
+ * In case the resource belongs to no project (e.g. bundler is used standalone) the default is "UTF-8".
  *
  * @private
  * @param {Resource} resource the resource for which the content will be escaped
@@ -12,13 +12,10 @@ const nonAsciiEscaper = require("../../processors/nonAsciiEscaper");
  */
 module.exports = async function(resource) {
 	const project = resource.getProject();
-	let propertiesFileSourceEncoding = project &&
-			project.resources &&
-			project.resources.configuration &&
-			project.resources.configuration.propertiesFileSourceEncoding;
+	let propertiesFileSourceEncoding = project && project.getPropertiesFileSourceEncoding();
 
 	if (!propertiesFileSourceEncoding) {
-		if (project && ["0.1", "1.0", "1.1"].includes(project.specVersion)) {
+		if (project && ["0.1", "1.0", "1.1"].includes(project.getSpecVersion())) {
 			// default encoding to "ISO-8859-1" for old specVersions
 			propertiesFileSourceEncoding = "ISO-8859-1";
 		} else {

package/lib/processors/bundlers/moduleBundler.js

@@ -91,9 +91,9 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  * @typedef {object} ModuleBundleOptions
  * @property {boolean} [optimize=true] Whether the module bundle gets minified
  * @property {boolean} [sourceMap=true] Whether to generate a source map file for the bundle
- * @property {boolean} [decorateBootstrapModule=false] If set to 'false', the module won't be decorated
+ * @property {boolean} [decorateBootstrapModule=false] If set to 'false', bootable bundles won't be decorated
  *   with an optimization marker
- * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable module bundles with
+ * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable bundles with
  *   a try/catch to filter out "Restart" errors
  * @property {boolean} [usePredefineCalls=false] If set to 'true', sap.ui.predefine is used for UI5 modules
  * @property {number} [numberOfParts=1] The number of parts the module bundle should be splitted
@@ -148,7 +148,6 @@ module.exports = function({resources, options: {bundleDefinition, bundleOptions,
 		log.verbose(`bundleDefinition: ${JSON.stringify(bundleDefinition, null, 2)}`);
 		log.verbose(`bundleOptions: ${JSON.stringify(bundleOptions, null, 2)}`);
 	}
-
 	return pool.prepare( resources, moduleNameMapping ).
 		then( () => builder.createBundle(bundleDefinition, bundleOptions) ).
 		then( (results) => {

package/lib/processors/jsdoc/lib/transformApiJson.js

@@ -1386,13 +1386,16 @@ function transformer(sInputFile, sOutputFile, sLibraryFile, vDependencyAPIFiles,
 
 		},
 
+		formatUrlToLink: function(sTarget, sText, bSAPHosted){
+			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
+			<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
+			title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+		},
+
 		handleExternalUrl: function (sTarget, sText) {
 			// Check if the external domain is SAP hosted
 			let bSAPHosted = /^https?:\/\/([\w.]*\.)?(?:sap|hana\.ondemand|sapfioritrial)\.com/.test(sTarget);
-
-			return `<a target="_blank" rel="noopener noreferrer" href="${sTarget}">${sText}</a>
-<img src="./resources/sap/ui/documentation/sdk/images/${bSAPHosted ? 'link-sap' : 'link-external'}.png"
-title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapUISDKExternalLink"/>`;
+			return this.formatUrlToLink(sTarget, sText, bSAPHosted);
 		},
 
 		/**
@@ -1599,6 +1602,12 @@ title="Information published on ${bSAPHosted ? '' : 'non '}SAP site" class="sapU
 							return '<a target="_self" href="topic/' + aMatch[1] + '">' + sText + '</a>';
 						}
 
+						// demo:xxx Demo, open the demonstration page in a new window
+						aMatch = sTarget.match(/^demo:([a-zA-Z0-9\/.]*)$/);
+						if (aMatch) {
+							return this.formatUrlToLink("test-resources/" + aMatch[1], sText, true);
+						}
+
 						// sap.x.Xxx.prototype.xxx - In case of prototype we have a link to method
 						aMatch = sTarget.match(/([a-zA-Z0-9.$_]+?)\.prototype\.([a-zA-Z0-9.$_]+)$/);
 						if (aMatch) {

package/lib/processors/manifestCreator.js

@@ -157,7 +157,9 @@ class LibraryBundle {
 /*
  * Creates the library manifest.json file for a UILibrary.
  */
-async function createManifest(libraryResource, libBundle, descriptorVersion, _include3rdParty, omitMinVersions) {
+async function createManifest(
+	libraryResource, libBundle, descriptorVersion, _include3rdParty, omitMinVersions, getProjectVersion
+) {
 	// create a Library wrapper around the .library XML
 	const library = await Library.from(libraryResource);
 
@@ -223,13 +225,6 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 			return version && version !== "@version@" && version !== "${version}";
 		}
 
-		function getProjectVersion() {
-			const project = libraryResource._project;
-			if ( project ) {
-				return project.version;
-			}
-		}
-
 		function getLibraryTitle() {
 			if ( library.getTitle() ) {
 				return library.getTitle();
@@ -321,7 +316,7 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 			embeds: findEmbeddedComponents(),
 			i18n,
 			applicationVersion: {
-				version: isValid(library.getVersion()) ? library.getVersion() : getProjectVersion()
+				version: isValid(library.getVersion()) ? library.getVersion() : getProjectVersion(library.getName())
 			},
 			title: getLibraryTitle(),
 			description: library.getDocumentation(),
@@ -393,12 +388,7 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 
 	function createSapUI5() {
 		function getUI5Version() {
-			const dummy = new Dependency({
-				libraryName: [{
-					_: "sap.ui.core"
-				}]
-			});
-			return normalizeVersion(getVersion(dummy));
+			return normalizeVersion(getProjectVersion("sap.ui.core"));
 		}
 
 		function dependencies() {
@@ -410,7 +400,7 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 			if ( library.getDependencies() != null ) {
 				for (const dep of library.getDependencies()) {
 					dependencies.libs[dep.getLibraryName()] = {
-						minVersion: omitMinVersions ? "" : getVersion(dep),
+						minVersion: omitMinVersions ? "" : getProjectVersion(dep.getLibraryName()),
 						lazy: dep.isLazy() || undefined // suppress default (false)
 					};
 				}
@@ -619,33 +609,6 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 		return v.major + "." + v.minor;
 	}
 
-	function getVersion(dependency) {
-		const version = dependency.getVersion();
-		if ( version != null ) {
-			return version;
-		}
-
-		function hasName(entity) {
-			return entity.metadata && entity.metadata.name === dependency.getLibraryName();
-		}
-
-		const project = libraryResource._project;
-		if ( project ) {
-			if ( Array.isArray(project.dependencies) ) {
-				const lib = project.dependencies.find(hasName);
-				if ( lib ) {
-					return lib.version;
-				}
-			}
-			if ( hasName(project) ) {
-				return project.version;
-			}
-		}
-
-		throw new Error(
-			`Couldn't find version for library '${dependency.getLibraryName()}', project dependency missing?`);
-	}
-
 	return {
 		"_version": descriptorVersion.toString(),
 		"sap.app": createSapApp(),
@@ -657,7 +620,7 @@ async function createManifest(libraryResource, libBundle, descriptorVersion, _in
 	};
 }
 
-module.exports = function({libraryResource, resources, options}) {
+module.exports = function({libraryResource, resources, getProjectVersion, options}) {
 	// merge options with defaults
 	options = Object.assign({
 		descriptorVersion: APP_DESCRIPTOR_V22, // TODO 3.0: change this to type string instead of a semver object
@@ -677,7 +640,7 @@ module.exports = function({libraryResource, resources, options}) {
 	}
 
 	return createManifest(libraryResource, libBundle, options.descriptorVersion, options.include3rdParty,
-		options.omitMinVersions)
+		options.omitMinVersions, getProjectVersion)
 		.then((manifest) => {
 			return new EvoResource({
 				path: resourcePathPrefix + "manifest.json",

package/lib/tasks/TaskUtil.js

@@ -19,9 +19,15 @@ class TaskUtil {
 	 * @public
 	 * @typedef {object} module:@ui5/builder.tasks.TaskUtil~StandardBuildTags
 	 * @property {string} OmitFromBuildResult
-	 * 		Setting this tag to true for a resource will prevent it from being written to the build target
+	 * 		Setting this tag to true will prevent the resource from being written to the build target directory
 	 * @property {string} IsBundle
 	 * 		This tag identifies resources that contain (i.e. bundle) multiple other resources
+	 * @property {string} IsDebugVariant
+	 * 		This tag identifies resources that are a debug variant (typically named with a "-dbg" suffix)
+	 * 		of another resource. This tag is part of the build manifest.
+	 * @property {string} HasDebugVariant
+	 * 		This tag identifies resources for which a debug variant has been created.
+	 * 		This tag is part of the build manifest.
 	 */
 
 	/**
@@ -34,12 +40,22 @@ class TaskUtil {
 	 */
 	constructor({projectBuildContext}) {
 		this._projectBuildContext = projectBuildContext;
-
 		/**
 		 * @member {module:@ui5/builder.tasks.TaskUtil~StandardBuildTags}
 		 * @public
 		*/
-		this.STANDARD_TAGS = this._projectBuildContext.STANDARD_TAGS;
+		this.STANDARD_TAGS = Object.freeze({
+			// "Project" tags:
+			// Will be stored on project instance and are hence part of the build manifest
+			IsDebugVariant: "ui5:IsDebugVariant",
+			HasDebugVariant: "ui5:HasDebugVariant",
+
+			// "Build" tags:
+			// Will be stored on the project build context
+			// They are only available to the build tasks of a single project
+			OmitFromBuildResult: "ui5:OmitFromBuildResult",
+			IsBundle: "ui5:IsBundle"
+		});
 	}
 
 	/**
@@ -51,14 +67,20 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be stored for
+	 * @param {module:@ui5/fs.Resource} resource Resource-instance the tag should be stored for
 	 * @param {string} tag Name of the tag.
 	 * 		Currently only the [STANDARD_TAGS]{@link module:@ui5/builder.tasks.TaskUtil#STANDARD_TAGS} are allowed
 	 * @param {string|boolean|integer} [value=true] Tag value. Must be primitive
 	 * @public
 	 */
-	setTag(resourcePath, tag, value) {
-		return this._projectBuildContext.getResourceTagCollection().setTag(resourcePath, tag, value);
+	setTag(resource, tag, value) {
+		if (typeof resource === "string") {
+			throw new Error("Deprecated parameter: " +
+				"Since UI5 Tooling 3.0, #setTag requires a resource instance. Strings are no longer accepted");
+		}
+
+		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
+		return collection.setTag(resource, tag, value);
 	}
 
 	/**
@@ -68,14 +90,19 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be retrieved for
+	 * @param {module:@ui5/fs.Resource} resource Resource-instance the tag should be retrieved for
 	 * @param {string} tag Name of the tag
 	 * @returns {string|boolean|integer|undefined} Tag value for the given resource.
 	 * 										<code>undefined</code> if no value is available
 	 * @public
 	 */
-	getTag(resourcePath, tag) {
-		return this._projectBuildContext.getResourceTagCollection().getTag(resourcePath, tag);
+	getTag(resource, tag) {
+		if (typeof resource === "string") {
+			throw new Error("Deprecated parameter: " +
+				"Since UI5 Tooling 3.0, #getTag requires a resource instance. Strings are no longer accepted");
+		}
+		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
+		return collection.getTag(resource, tag);
 	}
 
 	/**
@@ -86,12 +113,17 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be cleared for
+	 * @param {module:@ui5/fs.Resource} resource Resource-instance the tag should be cleared for
 	 * @param {string} tag Tag
 	 * @public
 	 */
-	clearTag(resourcePath, tag) {
-		return this._projectBuildContext.getResourceTagCollection().clearTag(resourcePath, tag);
+	clearTag(resource, tag) {
+		if (typeof resource === "string") {
+			throw new Error("Deprecated parameter: " +
+				"Since UI5 Tooling 3.0, #clearTag requires a resource instance. Strings are no longer accepted");
+		}
+		const collection = this._projectBuildContext.getResourceTagCollection(resource, tag);
+		return collection.clearTag(resource, tag);
 	}
 
 	/**
@@ -136,6 +168,22 @@ class TaskUtil {
 		return this._projectBuildContext.registerCleanupTask(callback);
 	}
 
+	/**
+	 * Retrieve a single project from the dependency graph
+	 *
+	 * </br></br>
+	 * This method is only available to custom task extensions defining
+	 * <b>Specification Version 2.7 and above</b>.
+	 *
+	 * @param {string} projectName Name of the project to retrieve
+	 * @returns {module:@ui5/project.specifications.Project|undefined}
+	 *					project instance or undefined if the project is unknown to the graph
+	 * @public
+	 */
+	getProject(projectName) {
+		return this._projectBuildContext.getProject(projectName);
+	}
+
 	/**
 	 * Get an interface to an instance of this class that only provides those functions
 	 * that are supported by the given custom task extension specification version.
@@ -150,12 +198,10 @@ class TaskUtil {
 
 		const baseInterface = {
 			STANDARD_TAGS: this.STANDARD_TAGS,
-			setTag: this.setTag.bind(this),
-			clearTag: this.clearTag.bind(this),
-			getTag: this.getTag.bind(this),
-			isRootProject: this.isRootProject.bind(this),
-			registerCleanupTask: this.registerCleanupTask.bind(this)
 		};
+		bindFunctions(this, baseInterface, [
+			"setTag", "clearTag", "getTag", "isRootProject", "registerCleanupTask"
+		]);
 		switch (specVersion) {
 		case "2.2":
 		case "2.3":
@@ -163,10 +209,29 @@ class TaskUtil {
 		case "2.5":
 		case "2.6":
 			return baseInterface;
+		case "2.7":
+			baseInterface.getProject = (projectName) => {
+				const project = this.getProject(projectName);
+				const baseProjectInterface = {};
+				bindFunctions(project, baseProjectInterface, [
+					"getName", "getVersion", "getNamespace"
+				]);
+				switch (specVersion) {
+				case "2.7":
+					return baseProjectInterface;
+				}
+			};
+			return baseInterface;
 		default:
 			throw new Error(`TaskUtil: Unknown or unsupported Specification Version ${specVersion}`);
 		}
 	}
 }
 
+function bindFunctions(sourceObject, targetObject, funcNames) {
+	funcNames.forEach((funcName) => {
+		targetObject[funcName] = sourceObject[funcName].bind(sourceObject);
+	});
+}
+
 module.exports = TaskUtil;

package/lib/tasks/bundlers/generateComponentPreload.js

@@ -1,7 +1,6 @@
 const path = require("path");
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateComponentPreload");
-const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
 
 /**
@@ -11,7 +10,6 @@ const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
  * @alias module:@ui5/builder.tasks.generateComponentPreload
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
- * @param {module:@ui5/fs.AbstractReader} parameters.dependencies Reader or Collection to read dependency files
  * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
@@ -23,32 +21,28 @@ const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
  * inclusion overrides an earlier exclusion, and vice versa.
  * @param {string[]} [parameters.options.paths] Array of paths (or glob patterns) for component files
  * @param {string[]} [parameters.options.namespaces] Array of component namespaces
+ * @param {string[]} [parameters.options.skipBundles] Names of bundles that should not be created
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
 module.exports = function({
-	workspace, dependencies, taskUtil, options: {projectName, paths, namespaces, excludes = []}
+	workspace, taskUtil, options: {projectName, paths, namespaces, skipBundles = [], excludes = []}
 }) {
-	let combo = new ReaderCollectionPrioritized({
-		name: `generateComponentPreload - prioritize workspace over dependencies: ${projectName}`,
-		readers: [workspace, dependencies]
-	});
-
+	let nonDbgWorkspace = workspace;
 	if (taskUtil) {
-		combo = combo.filter(function(resource) {
+		nonDbgWorkspace = workspace.filter(function(resource) {
 			// Remove any debug variants
 			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
 		});
 	}
 
-	// TODO 3.0: Limit to workspace resources?
-	return combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}")
+	return nonDbgWorkspace.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}")
 		.then(async (resources) => {
 			let allNamespaces = [];
 			if (paths) {
 				allNamespaces = await Promise.all(paths.map(async (componentPath) => {
 					const globPath = "/resources/" + componentPath;
 					log.verbose(`Globbing for Components directories with configured path ${globPath}...`);
-					const components = await combo.byGlob(globPath); // TODO 3.0: Limit to workspace resources?
+					const components = await nonDbgWorkspace.byGlob(globPath);
 					return components.map((component) => {
 						const compDir = path.dirname(component.getPath()).replace(/^\/resources\//i, "");
 						log.verbose(`Found component namespace ${compDir}`);
@@ -72,6 +66,12 @@ module.exports = function({
 			const unusedFilterExcludes = new Set(allFilterExcludes);
 
 			const bundleDefinitions = allNamespaces.map((namespace) => {
+				const bundleName = `${namespace}/Component-preload.js`;
+				if (skipBundles.includes(bundleName)) {
+					log.verbose(`Skipping generation of bundle ${bundleName}`);
+					return null;
+				}
+
 				const filters = [
 					`${namespace}/`,
 					`${namespace}/**/manifest.json`,
@@ -101,7 +101,7 @@ module.exports = function({
 				});
 
 				return {
-					name: `${namespace}/Component-preload.js`,
+					name: bundleName,
 					defaultFileTypes: [
 						".js",
 						".control.xml",
@@ -134,7 +134,7 @@ module.exports = function({
 				});
 			}
 
-			return Promise.all(bundleDefinitions.map((bundleDefinition) => {
+			return Promise.all(bundleDefinitions.filter(Boolean).map((bundleDefinition) => {
 				log.verbose(`Generating ${bundleDefinition.name}...`);
 				return moduleBundler({
 					resources,