@ui5/builder 2.11.5 → 3.0.0-alpha.10

package/lib/tasks/bundlers/generateLibraryPreload.js

@@ -1,13 +1,13 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateLibraryPreload");
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
-const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
+const createModuleNameMapping = require("./utils/createModuleNameMapping");
 
 function getDefaultLibraryPreloadFilters(namespace, excludes) {
 	const filters = [
 		`${namespace}/`,
 		`${namespace}/**/manifest.json`,
-		`!${namespace}/*-preload.js`, // exclude all bundles
+		`!${namespace}/**/*-preload.js`, // exclude all bundles
 		`!${namespace}/designtime/`,
 		`!${namespace}/**/*.designtime.js`,
 		`!${namespace}/**/*.support.js`
@@ -142,46 +142,6 @@ function getSupportFilesBundleDefinition(namespace) {
 	};
 }
 
-function createLibraryBundles(libraryNamespace, resources, excludes) {
-	return Promise.all([
-		moduleBundler({
-			options: {
-				bundleDefinition: getBundleDefinition(libraryNamespace, excludes),
-				bundleOptions: {
-					optimize: true,
-					usePredefineCalls: true,
-					ignoreMissingModules: true
-				}
-			},
-			resources
-		}),
-		moduleBundler({
-			options: {
-				bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace),
-				bundleOptions: {
-					optimize: true,
-					usePredefineCalls: true,
-					ignoreMissingModules: true,
-					skipIfEmpty: true
-				}
-			},
-			resources
-		}),
-		moduleBundler({
-			options: {
-				bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace),
-				bundleOptions: {
-					optimize: false,
-					usePredefineCalls: true,
-					ignoreMissingModules: true,
-					skipIfEmpty: true
-				}
-			},
-			resources
-		})
-	]);
-}
-
 function getModuleBundlerOptions(config) {
 	const moduleBundlerOptions = {};
 
@@ -211,6 +171,10 @@ function getModuleBundlerOptions(config) {
 		moduleBundlerOptions.bundleDefinition.sections.unshift(providedSection);
 	}
 
+	if (config.moduleNameMapping) {
+		moduleBundlerOptions.moduleNameMapping = config.moduleNameMapping;
+	}
+
 	return moduleBundlerOptions;
 }
 
@@ -259,25 +223,36 @@ function getSapUiCoreBunDef(name, filters, preload) {
  * @alias module:@ui5/builder.tasks.generateLibraryPreload
  * @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 {module:@ui5/project.build.helpers.TaskUtil} [parameters.taskUtil] TaskUtil
+ * @param {object} parameters.options Options
+ * @param {string} parameters.options.projectName Project name
+ * @param {string[]} [parameters.options.skipBundles] Names of bundles that should not be created
  * @param {string[]} [parameters.options.excludes=[]] List of modules declared as glob patterns (resource name patterns)
  * that should be excluded from the library-preload.js bundle.
  * A pattern ending with a slash '/' will, similarly to the use of a single '*' or double '**' asterisk,
  * denote an arbitrary number of characters or folder names.
  * Re-includes should be marked with a leading exclamation mark '!'. The order of filters is relevant; a later
  * inclusion overrides an earlier exclusion, and vice versa.
- * @param {object} parameters.options Options
- * @param {string} parameters.options.projectName Project name
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, dependencies, taskUtil, options: {projectName, excludes = []}}) {
-	const combo = new ReaderCollectionPrioritized({
-		name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
-		readers: [workspace, dependencies]
-	});
+module.exports = function({workspace, taskUtil, options: {skipBundles = [], excludes = [], projectName}}) {
+	let nonDbgWorkspace = workspace;
+	if (taskUtil) {
+		nonDbgWorkspace = workspace.filter(function(resource) {
+			// Remove any debug variants
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
+		});
+	}
 
-	return combo.byGlob("/**/*.{js,json,xml,html,properties,library}").then((resources) => {
+	const execModuleBundlerIfNeeded = ({options, resources}) => {
+		if (skipBundles.includes(options.bundleDefinition.name)) {
+			log.verbose(`Skipping generation of bundle ${options.bundleDefinition.name}`);
+			return null;
+		}
+		return moduleBundler({options, resources});
+	};
+
+	return nonDbgWorkspace.byGlob("/**/*.{js,json,xml,html,properties,library,js.map}").then(async (resources) => {
 		// Find all libraries and create a library-preload.js bundle
 
 		let p = Promise.resolve();
@@ -285,17 +260,30 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 		// Create core bundles for older versions (<1.97.0) which don't define bundle configuration in the ui5.yaml
 		// See: https://github.com/SAP/openui5/commit/ff127fd2d009162ea43ad312dec99d759ebc23a0
 		if (projectName === "sap.ui.core") {
-			const coreProject = resources[0]._project;
-			const coreSpecVersion = coreProject && coreProject.specVersion;
 			// Instead of checking the sap.ui.core library version, the specVersion is checked against all versions
 			// that have been defined for sap.ui.core before the bundle configuration has been introduced.
 			// This is mainly to have an easier check without version parsing or using semver.
 			// If no project/specVersion is available, the bundles should also be created to not break potential
 			// existing use cases without a properly formed/formatted project tree.
-			if (!coreSpecVersion || ["0.1", "1.1", "2.0"].includes(coreSpecVersion)) {
+			if (!taskUtil || ["0.1", "1.1", "2.0"].includes(taskUtil.getProject().getSpecVersion())) {
 				const isEvo = resources.find((resource) => {
 					return resource.getPath() === "/resources/ui5loader.js";
 				});
+
+				let unoptimizedModuleNameMapping;
+				let unoptimizedResources = resources;
+				if (taskUtil) {
+					unoptimizedResources = await workspace.filter(function(resource) {
+						// Remove any non-debug variants
+						return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+					}).byGlob("/**/*.{js,json,xml,html,properties,library,js.map}");
+
+					unoptimizedModuleNameMapping = createModuleNameMapping({
+						resources: unoptimizedResources,
+						taskUtil
+					});
+				}
+
 				let filters;
 				if (isEvo) {
 					filters = ["ui5loader-autoconfig.js"];
@@ -303,33 +291,46 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					filters = ["jquery.sap.global.js"];
 				}
 				p = Promise.all([
-					moduleBundler({
+					execModuleBundlerIfNeeded({
 						options: getModuleBundlerOptions({name: "sap-ui-core.js", filters, preload: true}),
 						resources
 					}),
-					moduleBundler({
-						options: getModuleBundlerOptions({name: "sap-ui-core-dbg.js", filters, preload: false}),
-						resources
+					execModuleBundlerIfNeeded({
+						options: getModuleBundlerOptions({
+							name: "sap-ui-core-dbg.js", filters, preload: false,
+							moduleNameMapping: unoptimizedModuleNameMapping
+						}),
+						resources: unoptimizedResources
 					}),
-					moduleBundler({
+					execModuleBundlerIfNeeded({
 						options: getModuleBundlerOptions({
 							name: "sap-ui-core-nojQuery.js", filters, preload: true, provided: true
 						}),
 						resources
 					}),
-					moduleBundler({
+					execModuleBundlerIfNeeded({
 						options: getModuleBundlerOptions({
-							name: "sap-ui-core-nojQuery-dbg.js", filters, preload: false, provided: true
+							name: "sap-ui-core-nojQuery-dbg.js", filters, preload: false, provided: true,
+							moduleNameMapping: unoptimizedModuleNameMapping
 						}),
-						resources
+						resources: unoptimizedResources
 					}),
 				]).then((results) => {
-					const bundles = Array.prototype.concat.apply([], results);
-					return Promise.all(bundles.map((bundle) => {
+					const bundles = Array.prototype.concat.apply([], results).filter(Boolean);
+					return Promise.all(bundles.map(({bundle, sourceMap}) => {
 						if (taskUtil) {
 							taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
+							if (sourceMap) {
+								// Clear tag that might have been set by the minify task, in cases where
+								// the bundle name is identical to a source file
+								taskUtil.clearTag(sourceMap, taskUtil.STANDARD_TAGS.OmitFromBuildResult);
+							}
+						}
+						const writes = [workspace.write(bundle)];
+						if (sourceMap) {
+							writes.push(workspace.write(sourceMap));
 						}
-						return workspace.write(bundle);
+						return Promise.all(writes);
 					}));
 				});
 			}
@@ -342,7 +343,8 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 				} else {
 					// Fallback to "library.js" as library indicator
 					log.verbose(
-						`Could not find a ".library" file for project ${projectName}, falling back to "library.js".`);
+						`Could not find a ".library" file for project ${projectName}, ` +
+						`falling back to "library.js".`);
 					return workspace.byGlob("/resources/**/library.js");
 				}
 			}).then((libraryIndicatorResources) => {
@@ -354,7 +356,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					return;
 				}
 
-				return Promise.all(libraryIndicatorResources.map((libraryIndicatorResource) => {
+				return Promise.all(libraryIndicatorResources.map(async (libraryIndicatorResource) => {
 					// Determine library namespace from library indicator file path
 					// ending with either ".library" or "library.js" (see fallback logic above)
 					// e.g. /resources/sap/foo/.library => sap/foo
@@ -364,18 +366,64 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					const libraryNamespaceMatch = libraryIndicatorPath.match(libraryNamespacePattern);
 					if (libraryNamespaceMatch && libraryNamespaceMatch[1]) {
 						const libraryNamespace = libraryNamespaceMatch[1];
-						return createLibraryBundles(libraryNamespace, resources, excludes)
-							.then((results) => {
-								const bundles = Array.prototype.concat.apply([], results);
-								return Promise.all(bundles.map((bundle) => {
-									if (bundle) {
-										if (taskUtil) {
-											taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
-										}
-										return workspace.write(bundle);
+						const results = await Promise.all([
+							execModuleBundlerIfNeeded({
+								options: {
+									bundleDefinition: getBundleDefinition(libraryNamespace, excludes),
+									bundleOptions: {
+										optimize: true,
+										usePredefineCalls: true,
+										ignoreMissingModules: true
+									}
+								},
+								resources
+							}),
+							execModuleBundlerIfNeeded({
+								options: {
+									bundleDefinition: getDesigntimeBundleDefinition(libraryNamespace),
+									bundleOptions: {
+										optimize: true,
+										usePredefineCalls: true,
+										ignoreMissingModules: true,
+										skipIfEmpty: true
+									}
+								},
+								resources
+							}),
+							execModuleBundlerIfNeeded({
+								options: {
+									bundleDefinition: getSupportFilesBundleDefinition(libraryNamespace),
+									bundleOptions: {
+										optimize: false,
+										usePredefineCalls: true,
+										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) {
+								if (taskUtil) {
+									taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
+									if (sourceMap) {
+										// Clear tag that might have been set by the minify task, in cases where
+										// the bundle name is identical to a source file
+										taskUtil.clearTag(sourceMap,
+											taskUtil.STANDARD_TAGS.OmitFromBuildResult);
 									}
-								}));
-							});
+								}
+								const writes = [workspace.write(bundle)];
+								if (sourceMap) {
+									writes.push(workspace.write(sourceMap));
+								}
+								return Promise.all(writes);
+							}
+						}));
 					} else {
 						log.verbose(
 							`Could not determine library namespace from file "${libraryIndicatorPath}" ` +

package/lib/tasks/bundlers/generateManifestBundle.js

@@ -4,14 +4,7 @@ const DESCRIPTOR = "manifest.json";
 const PROPERTIES_EXT = ".properties";
 const BUNDLE_NAME = "manifest-bundle.zip";
 
-/**
- *
- * @public
- * @typedef {object} ManifestBundlerOptions
- * @property {string} projectName Project Name
- * @property {string} namespace Namespace
- */
-
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task for manifestBundler.
  *
@@ -19,11 +12,16 @@ const BUNDLE_NAME = "manifest-bundle.zip";
  * @alias module:@ui5/builder.tasks.generateManifestBundle
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
- * @param {ManifestBundlerOptions} parameters.options Options
+ * @param {object} parameters.options Options
+ * @param {string} parameters.options.projectName Project name
+ * @param {string} parameters.options.projectNamespace Project namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
 module.exports = async function({workspace, options = {}}) {
-	const {projectName, namespace} = options;
+	const {projectName} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	if (!projectName || !namespace) {
 		throw new Error("[generateManifestBundle]: One or more mandatory options not provided");
 	}

package/lib/tasks/bundlers/generateStandaloneAppBundle.js

@@ -1,5 +1,7 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateStandaloneAppBundle");
+const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
+const createModuleNameMapping = require("./utils/createModuleNameMapping");
 
 function getBundleDefinition(config) {
 	const bundleDefinition = {
@@ -56,6 +58,7 @@ function getBundleDefinition(config) {
 	return bundleDefinition;
 }
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task for bundling standalone applications.
  *
@@ -64,25 +67,34 @@ function getBundleDefinition(config) {
  * @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 {module:@ui5/project.build.helpers.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
- * @param {string} [parameters.options.namespace] Project namespace
+ * @param {string} [parameters.options.projectNamespace] Project namespace
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, dependencies, taskUtil, options: {projectName, namespace}}) {
+module.exports = async function({workspace, dependencies, taskUtil, options}) {
+	const {projectName} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	if (!namespace) {
 		log.warn(`Namespace of project ${projectName} is not known. Self contained bundling is currently ` +
 			`unable to generate complete bundles for such projects.`);
 	}
 
-	// If an application does not have a namespace, its resources are located at the root. Otherwise in /resources
-	// For dependencies, we do not want to search in their test-resources
-	const results = await Promise.all([
-		workspace.byGlob("/**/*.{js,json,xml,html,properties,library}"),
-		dependencies.byGlob("/resources/**/*.{js,json,xml,html,properties,library}")
-	]);
-	const resources = Array.prototype.concat.apply([], results);
+	let combo = new ReaderCollectionPrioritized({
+		name: `generateStandaloneAppBundle - prioritize workspace over dependencies: ${projectName}`,
+		readers: [workspace, dependencies]
+	});
+
+	if (taskUtil) {
+		// Omit -dbg files
+		combo = combo.filter(function(resource) {
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
+		});
+	}
+	const resources = await combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
 
 	const isEvo = resources.find((resource) => {
 		return resource.getPath() === "/resources/ui5loader.js";
@@ -94,6 +106,23 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 		filters = ["jquery.sap.global.js"];
 	}
 
+	let unoptimizedModuleNameMapping;
+	let unoptimizedResources = resources;
+	if (taskUtil) {
+		unoptimizedResources = await new ReaderCollectionPrioritized({
+			name: `generateStandaloneAppBundle - prioritize workspace over dependencies: ${projectName}`,
+			readers: [workspace, dependencies]
+		}).filter(function(resource) {
+			// Remove any non-debug variants
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+		}).byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
+
+		unoptimizedModuleNameMapping = createModuleNameMapping({
+			resources: unoptimizedResources,
+			taskUtil
+		});
+	}
+
 	await Promise.all([
 		moduleBundler({
 			resources,
@@ -107,7 +136,7 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 			}
 		}),
 		moduleBundler({
-			resources,
+			resources: unoptimizedResources,
 			options: {
 				bundleDefinition: getBundleDefinition({
 					name: "sap-ui-custom-dbg.js",
@@ -116,16 +145,26 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 				}),
 				bundleOptions: {
 					optimize: false
-				}
+				},
+				moduleNameMapping: unoptimizedModuleNameMapping
 			}
 		})
 	]).then((results) => {
 		const bundles = Array.prototype.concat.apply([], results);
-		return Promise.all(bundles.map((resource) => {
+		return Promise.all(bundles.map(({bundle, sourceMap}) => {
 			if (taskUtil) {
-				taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.IsBundle);
+				taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
+				if (sourceMap) {
+					// Clear tag that might have been set by the minify task, in cases where
+					// the bundle name is identical to a source file
+					taskUtil.clearTag(sourceMap, taskUtil.STANDARD_TAGS.OmitFromBuildResult);
+				}
+			}
+			const writes = [workspace.write(bundle)];
+			if (sourceMap) {
+				writes.push(workspace.write(sourceMap));
 			}
-			return workspace.write(resource);
+			return Promise.all(writes);
 		}));
 	});
 };

package/lib/tasks/bundlers/utils/createModuleNameMapping.js

@@ -0,0 +1,31 @@
+const ModuleName = require("../../../lbt/utils/ModuleName");
+
+/**
+ * For "unoptimized" bundles, the non-debug files have already been filtered out above.
+ * Now we need to create a mapping from the debug-variant resource path to the respective module
+ * name, which is basically the non-debug resource path, minus the "/resources/"" prefix.
+ * This mapping overwrites internal logic of the LocatorResourcePool which would otherwise determine
+ * the module name from the resource path, which would contain "-dbg" in this case. That would be
+ * incorrect since debug-variants should still keep the original module name.
+ *
+ * @private
+ * @param {object} parameters Parameters
+ * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources
+ * @param {module:@ui5/project.build.helpers.TaskUtil|object} parameters.taskUtil TaskUtil
+ * @returns {object} Module name mapping
+ */
+module.exports = function({resources, taskUtil}) {
+	const moduleNameMapping = {};
+	for (let i = resources.length - 1; i >= 0; i--) {
+		const resource = resources[i];
+		if (taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant)) {
+			const resourcePath = resource.getPath();
+			const nonDbgPath = ModuleName.getNonDebugName(resourcePath);
+			if (!nonDbgPath) {
+				throw new Error(`Failed to resolve non-debug name for ${resourcePath}`);
+			}
+			moduleNameMapping[resourcePath] = nonDbgPath.slice("/resources/".length);
+		}
+	}
+	return moduleNameMapping;
+};

package/lib/tasks/generateCachebusterInfo.js

@@ -28,6 +28,7 @@ function getSigner(type) {
 	}
 }
 
+/* eslint "jsdoc/check-param-names": ["error", {"disableExtraPropertyReporting":true}] */
 /**
  * Task to generate the application cachebuster info file.
  *
@@ -35,13 +36,16 @@ function getSigner(type) {
  * @alias module:@ui5/builder.tasks.generateCachebusterInfo
  * @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 {object} parameters.options Options
- * @param {string} parameters.options.namespace Namespace of the application
+ * @param {string} parameters.options.projectNamespace Namespace of the application
  * @param {string} [parameters.options.signatureType='time'] Type of signature to be used ('time' or 'hash')
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, dependencies, options: {namespace, signatureType}}) {
+module.exports = function({workspace, options}) {
+	const {signatureType} = options;
+	// Backward compatibility: "namespace" option got renamed to "projectNamespace"
+	const namespace = options.projectNamespace || options.namespace;
+
 	const basePath = `/resources/${namespace}/`;
 	return workspace.byGlob(`/resources/${namespace}/**/*`)
 		.then(async (resources) => {

package/lib/tasks/generateLibraryManifest.js

@@ -2,7 +2,6 @@
 
 const log = require("@ui5/logger").getLogger("builder:tasks:generateLibraryManifest");
 const manifestCreator = require("../processors/manifestCreator");
-const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 
 
 /**
@@ -12,23 +11,19 @@ const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritiz
  * @alias module:@ui5/builder.tasks.generateLibraryManifest
  * @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/project.build.helpers.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = function({workspace, dependencies, options: {projectName}}) {
-	const combo = new ReaderCollectionPrioritized({
-		name: `libraryManifestGenerator - prioritize workspace over dependencies: ${projectName}`,
-		readers: [workspace, dependencies]
-	});
+module.exports = function({workspace, taskUtil, options: {projectName}}) {
 	// Note:
 	// *.library files are needed to identify libraries
 	// *.json files are needed to avoid overwriting them
 	// *.js files are needed to identify nested components
 	// *.less, *.css, *.theming and *.theme files are needed to identify supported themes
 	// *.properties to identify existence of i18n bundles (e.g. messagebundle.properties)
-	return combo.byGlob("/**/*.{js,json,library,less,css,theming,theme,properties}").then((resources) => {
+	return workspace.byGlob("/resources/**/*.{js,json,library,less,css,theming,theme,properties}").then((resources) => {
 		// Find all libraries and create a manifest.json file
 		return workspace.byGlob("/resources/**/.library").then((libraryIndicatorResources) => {
 			if (libraryIndicatorResources.length < 1) {
@@ -51,6 +46,9 @@ module.exports = function({workspace, dependencies, options: {projectName}}) {
 						libraryResource: libraryIndicatorResource,
 						namespace: libraryNamespace,
 						resources,
+						getProjectVersion: (projectName) => {
+							return taskUtil?.getProject(projectName)?.getVersion();
+						},
 						options: {
 						}
 					}).then((manifest) => {

package/lib/tasks/generateResourcesJson.js

@@ -43,7 +43,7 @@ function getCreatorOptions(projectName) {
  *
  * <p>
  * The detailed structure can be found in the documentation:
- * {@link https://openui5.hana.ondemand.com/#topic/adcbcf8b50924556ab3f321fcd9353ea}
+ * {@link https://sdk.openui5.org/topic/adcbcf8b50924556ab3f321fcd9353ea}
  * </p>
  *
  * <p>
@@ -96,19 +96,25 @@ function getCreatorOptions(projectName) {
  * @alias module:@ui5/builder.tasks.generateResourcesJson
  * @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/fs.AbstractReader} parameters.dependencies Reader or Collection to read dependency files
+ * @param {module:@ui5/project.build.helpers.TaskUtil|object} [parameters.taskUtil] TaskUtil
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
  * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
  */
-module.exports = async function({workspace, dependencies, options: {projectName}}) {
-	const resources = await workspace.byGlob(["/resources/**/*"].concat(DEFAULT_EXCLUDES));
+module.exports = async function({workspace, dependencies, taskUtil, options: {projectName}}) {
+	let resources = await workspace.byGlob(["/resources/**/*"].concat(DEFAULT_EXCLUDES));
+	let dependencyResources =
+			await dependencies.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
 
-	// TODO 3.0: Make dependencies parameter mandatory
-	let dependencyResources;
-	if (dependencies) {
-		dependencyResources =
-			await dependencies.byGlob("/resources/**/*.{js,json,xml,html,properties,library}");
+	if (taskUtil) {
+		// Filter out resources that will be omitted from the build results
+		resources = resources.filter((resource) => {
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult);
+		});
+		dependencyResources = dependencyResources.filter((resource) => {
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.OmitFromBuildResult);
+		});
 	}
 
 	const resourceLists = await resourceListCreator({