@ui5/builder 2.11.1 → 3.0.0-alpha.1

package/lib/processors/resourceListCreator.js

@@ -66,17 +66,6 @@ const DEFAULT_SUPPORT_RESOURCES_FILTER = [
 	"**/*.support.js"
 ];
 
-/**
- * Hard coded debug bundle, to trigger separate analysis for this filename
- * because sap-ui-core.js and sap-ui-core-dbg.js have different includes
- *
- * @type {string[]}
- */
-const DEBUG_BUNDLES = [
-	"sap-ui-core-dbg.js",
-	"sap-ui-core-nojQuery-dbg.js"
-];
-
 /**
  * Creates and adds resources.json entry (itself) to the list.
  *
@@ -138,8 +127,7 @@ module.exports = async function({resources, dependencyResources = [], options})
 		debugResources: DEFAULT_DEBUG_RESOURCES_FILTER,
 		mergedResources: DEFAULT_BUNDLE_RESOURCES_FILTER,
 		designtimeResources: DEFAULT_DESIGNTIME_RESOURCES_FILTER,
-		supportResources: DEFAULT_SUPPORT_RESOURCES_FILTER,
-		debugBundles: DEBUG_BUNDLES
+		supportResources: DEFAULT_SUPPORT_RESOURCES_FILTER
 	}, options);
 
 	const pool = new LocatorResourcePool();
@@ -158,12 +146,10 @@ module.exports = async function({resources, dependencyResources = [], options})
 	}
 
 	await collector.determineResourceDetails({
-		pool,
 		debugResources: options.debugResources,
 		mergedResources: options.mergedResources,
 		designtimeResources: options.designtimeResources,
-		supportResources: options.supportResources,
-		debugBundles: options.debugBundles
+		supportResources: options.supportResources
 	});
 
 	// group resources by components and create ResourceInfoLists

package/lib/tasks/TaskUtil.js

@@ -20,6 +20,8 @@ class TaskUtil {
 	 * @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
+	 * @property {string} IsBundle
+	 * 		This tag identifies resources that contain (i.e. bundle) multiple other resources
 	 */
 
 	/**
@@ -49,14 +51,14 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {module:@ui5/fs.Resource} resource The resource the tag should be stored for
+	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or 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(resource, tag, value) {
-		return this._projectBuildContext.getResourceTagCollection().setTag(resource, tag, value);
+	setTag(resourcePath, tag, value) {
+		return this._projectBuildContext.getResourceTagCollection().setTag(resourcePath, tag, value);
 	}
 
 	/**
@@ -66,14 +68,14 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {module:@ui5/fs.Resource} resource The resource the tag should be retrieved for
+	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or 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(resource, tag) {
-		return this._projectBuildContext.getResourceTagCollection().getTag(resource, tag);
+	getTag(resourcePath, tag) {
+		return this._projectBuildContext.getResourceTagCollection().getTag(resourcePath, tag);
 	}
 
 	/**
@@ -84,12 +86,12 @@ class TaskUtil {
 	 * This method is only available to custom task extensions defining
 	 * <b>Specification Version 2.2 and above</b>.
 	 *
-	 * @param {module:@ui5/fs.Resource} resource The resource the tag should be cleared for
+	 * @param {string|module:@ui5/fs.Resource} resourcePath Path or resource-instance the tag should be cleared for
 	 * @param {string} tag Tag
 	 * @public
 	 */
-	clearTag(resource, tag) {
-		return this._projectBuildContext.getResourceTagCollection().clearTag(resource, tag);
+	clearTag(resourcePath, tag) {
+		return this._projectBuildContext.getResourceTagCollection().clearTag(resourcePath, tag);
 	}
 
 	/**

package/lib/tasks/buildThemes.js

@@ -54,8 +54,12 @@ module.exports = async function({
 		*/
 	let availableLibraries;
 	if (pAvailableLibraries) {
-		availableLibraries = (await pAvailableLibraries).map((resource) => {
-			return resource.getPath().replace(/[^/]*\.library/i, "");
+		availableLibraries = [];
+		(await pAvailableLibraries).forEach((resource) => {
+			const library = path.dirname(resource.getPath());
+			if (!availableLibraries.includes(library)) {
+				availableLibraries.push(library);
+			}
 		});
 	}
 	let availableThemes;

package/lib/tasks/bundlers/generateBundle.js

@@ -1,4 +1,5 @@
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
+const ModuleName = require("../../lbt/utils/ModuleName");
 const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 
 /**
@@ -13,17 +14,44 @@ const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritiz
  * @param {object} parameters.options Options
  * @param {string} parameters.options.projectName Project name
  * @param {ModuleBundleDefinition} parameters.options.bundleDefinition Module bundle definition
- * @param {ModuleBundleOptions} parameters.options.bundleOptions Module bundle options
+ * @param {ModuleBundleOptions} [parameters.options.bundleOptions] Module bundle options
  * @returns {Promise} Promise resolving with <code>undefined</code> once data has been written
  */
 module.exports = function({
 	workspace, dependencies, taskUtil, options: {projectName, bundleDefinition, bundleOptions}
 }) {
-	const combo = new ReaderCollectionPrioritized({
+	let combo = new ReaderCollectionPrioritized({
 		name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
 		readers: [workspace, dependencies]
 	});
 
+	if (taskUtil) {
+		const optimize = !bundleOptions || bundleOptions.optimize !== false;
+
+		// Omit -dbg files for optimize bundles and vice versa
+		const filterTag = optimize ?
+			taskUtil.STANDARD_TAGS.IsDebugVariant : taskUtil.STANDARD_TAGS.HasDebugVariant;
+		combo = combo.filter(function(resource) {
+			return !taskUtil.getTag(resource, filterTag);
+		});
+
+		if (!optimize) {
+			// For "unoptimized" bundles, the non-debug files have already been filtered out
+			// Now rename the debug variants to the same name so that they appear like the original
+			// resource to the bundler
+			combo = combo.transformer(async function(resourcePath, getResource) {
+				if (taskUtil.getTag(resourcePath, taskUtil.STANDARD_TAGS.IsDebugVariant)) {
+					const resource = await getResource();
+					const nonDbgPath = ModuleName.getNonDebugName(resource.getPath());
+					if (!nonDbgPath) {
+						throw new Error(`Failed to resolve non-debug name for ${resource.getPath()}`);
+					}
+					resource.setPath(nonDbgPath);
+				}
+			});
+		}
+	}
+
 	return combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library}").then((resources) => {
 		return moduleBundler({
 			options: {

package/lib/tasks/bundlers/generateComponentPreload.js

@@ -28,11 +28,18 @@ const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
 module.exports = function({
 	workspace, dependencies, taskUtil, options: {projectName, paths, namespaces, excludes = []}
 }) {
-	const combo = new ReaderCollectionPrioritized({
+	let combo = new ReaderCollectionPrioritized({
 		name: `generateComponentPreload - prioritize workspace over dependencies: ${projectName}`,
 		readers: [workspace, dependencies]
 	});
 
+	if (taskUtil) {
+		combo = combo.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}")
 		.then(async (resources) => {

package/lib/tasks/bundlers/generateLibraryPreload.js

@@ -2,6 +2,7 @@ const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateLib
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
 const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const {negateFilters} = require("../../lbt/resources/ResourceFilterList");
+const ModuleName = require("../../lbt/utils/ModuleName");
 
 function getDefaultLibraryPreloadFilters(namespace, excludes) {
 	const filters = [
@@ -272,67 +273,95 @@ function getSapUiCoreBunDef(name, filters, preload) {
  * @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({
+	let combo = new ReaderCollectionPrioritized({
 		name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
 		readers: [workspace, dependencies]
 	});
 
-	return combo.byGlob("/**/*.{js,json,xml,html,properties,library}").then((resources) => {
+	if (taskUtil) {
+		combo = combo.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(async (resources) => {
 		// Find all libraries and create a library-preload.js bundle
 
-		let p;
+		let p = Promise.resolve();
 
-		// Create sap-ui-core.js
-		// TODO: move to config of actual core project
+		// 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") {
-			// Filter out sap-ui-core.js from further uglification/replacement processors
-			//	to prevent them from overwriting it
-			resources = resources.filter((resource) => {
-				return resource.getPath() !== "/resources/sap-ui-core.js";
-			});
+			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)) {
+				const isEvo = resources.find((resource) => {
+					return resource.getPath() === "/resources/ui5loader.js";
+				});
 
-			const isEvo = resources.find((resource) => {
-				return resource.getPath() === "/resources/ui5loader.js";
-			});
-			let filters;
-			if (isEvo) {
-				filters = ["ui5loader-autoconfig.js"];
-			} else {
-				filters = ["jquery.sap.global.js"];
-			}
+				let unoptimizedResources = resources;
+				if (taskUtil) {
+					unoptimizedResources = await new ReaderCollectionPrioritized({
+						name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
+						readers: [workspace, dependencies]
+					}).filter(function(resource) {
+						// Remove any non-debug variants
+						return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+					}).transformer(async function(resourcePath, getResource) {
+						if (taskUtil.getTag(resourcePath, taskUtil.STANDARD_TAGS.IsDebugVariant)) {
+							const resource = await getResource();
+							const nonDbgPath = ModuleName.getNonDebugName(resource.getPath());
+							if (!nonDbgPath) {
+								throw new Error(`Failed to resolve non-debug name for ${resource.getPath()}`);
+							}
+							resource.setPath(nonDbgPath);
+						}
+					}).byGlob("/**/*.{js,json,xml,html,properties,library}");
+				}
 
-			p = Promise.all([
-				moduleBundler({
-					options: getModuleBundlerOptions({name: "sap-ui-core.js", filters, preload: true}),
-					resources
-				}),
-				moduleBundler({
-					options: getModuleBundlerOptions({name: "sap-ui-core-dbg.js", filters, preload: false}),
-					resources
-				}),
-				moduleBundler({
-					options: getModuleBundlerOptions({
-						name: "sap-ui-core-nojQuery.js", filters, preload: true, provided: true
+				let filters;
+				if (isEvo) {
+					filters = ["ui5loader-autoconfig.js"];
+				} else {
+					filters = ["jquery.sap.global.js"];
+				}
+				p = Promise.all([
+					moduleBundler({
+						options: getModuleBundlerOptions({name: "sap-ui-core.js", filters, preload: true}),
+						resources
 					}),
-					resources
-				}),
-				moduleBundler({
-					options: getModuleBundlerOptions({
-						name: "sap-ui-core-nojQuery-dbg.js", filters, preload: false, provided: true
+					moduleBundler({
+						options: getModuleBundlerOptions({name: "sap-ui-core-dbg.js", filters, preload: false}),
+						resources: unoptimizedResources
 					}),
-					resources
-				}),
-			]).then((results) => {
-				const bundles = Array.prototype.concat.apply([], results);
-				return Promise.all(bundles.map((bundle) => {
-					if (taskUtil) {
-						taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
-					}
-					return workspace.write(bundle);
-				}));
-			});
-		} else {
-			p = Promise.resolve();
+					moduleBundler({
+						options: getModuleBundlerOptions({
+							name: "sap-ui-core-nojQuery.js", filters, preload: true, provided: true
+						}),
+						resources
+					}),
+					moduleBundler({
+						options: getModuleBundlerOptions({
+							name: "sap-ui-core-nojQuery-dbg.js", filters, preload: false, provided: true
+						}),
+						resources: unoptimizedResources
+					}),
+				]).then((results) => {
+					const bundles = Array.prototype.concat.apply([], results);
+					return Promise.all(bundles.map((bundle) => {
+						if (taskUtil) {
+							taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
+						}
+						return workspace.write(bundle);
+					}));
+				});
+			}
 		}
 
 		return p.then(() => {

package/lib/tasks/bundlers/generateStandaloneAppBundle.js

@@ -1,4 +1,5 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateStandaloneAppBundle");
+const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
 
 function getBundleDefinition(config) {
@@ -76,12 +77,18 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 			`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}")
-	]);
+	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 results = await combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library}");
 	const resources = Array.prototype.concat.apply([], results);
 
 	const isEvo = resources.find((resource) => {

package/lib/tasks/generateResourcesJson.js

@@ -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/builder.tasks.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));
-
-	// TODO 3.0: Make dependencies parameter mandatory
-	let dependencyResources;
-	if (dependencies) {
-		dependencyResources =
+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}");
+
+	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({

package/lib/tasks/minify.js

@@ -0,0 +1,31 @@
+const minifier = require("../processors/minifier");
+
+/**
+ * Task to minify resources.
+ *
+ * @public
+ * @alias module:@ui5/builder.tasks.minify
+ * @param {object} parameters Parameters
+ * @param {module:@ui5/fs.DuplexCollection} parameters.workspace DuplexCollection to read and write files
+ * @param {module:@ui5/builder.tasks.TaskUtil|object} [parameters.taskUtil] TaskUtil
+ * @param {object} parameters.options Options
+ * @param {string} parameters.options.pattern Pattern to locate the files to be processed
+ * @returns {Promise<undefined>} Promise resolving with <code>undefined</code> once data has been written
+ */
+module.exports = async function({workspace, taskUtil, options: {pattern}}) {
+	const resources = await workspace.byGlob(pattern);
+	const processedResources = await minifier({resources});
+
+	return Promise.all(processedResources.map(async ({resource, dbgResource, sourceMapResource}) => {
+		if (taskUtil) {
+			taskUtil.setTag(resource, taskUtil.STANDARD_TAGS.HasDebugVariant);
+			taskUtil.setTag(dbgResource, taskUtil.STANDARD_TAGS.IsDebugVariant);
+			taskUtil.setTag(sourceMapResource, taskUtil.STANDARD_TAGS.OmitFromBuildResult);
+		}
+		return Promise.all([
+			workspace.write(resource),
+			workspace.write(dbgResource),
+			workspace.write(sourceMapResource)
+		]);
+	}));
+};

package/lib/tasks/replaceVersion.js

@@ -18,7 +18,7 @@ module.exports = function({workspace, options: {pattern, version}}) {
 			return stringReplacer({
 				resources: allResources,
 				options: {
-					pattern: "${version}",
+					pattern: /\$\{(?:project\.)?version\}/g,
 					replacement: version
 				}
 			});

package/lib/tasks/taskRepository.js

@@ -2,12 +2,11 @@ const taskInfos = {
 	replaceCopyright: {path: "./replaceCopyright"},
 	replaceVersion: {path: "./replaceVersion"},
 	replaceBuildtime: {path: "./replaceBuildtime"},
-	createDebugFiles: {path: "./createDebugFiles"},
 	escapeNonAsciiCharacters: {path: "./escapeNonAsciiCharacters"},
 	executeJsdocSdkTransformation: {path: "./jsdoc/executeJsdocSdkTransformation"},
 	generateApiIndex: {path: "./jsdoc/generateApiIndex"},
 	generateJsdoc: {path: "./jsdoc/generateJsdoc"},
-	uglify: {path: "./uglify"},
+	minify: {path: "./minify"},
 	buildThemes: {path: "./buildThemes"},
 	transformBootstrapHtml: {path: "./transformBootstrapHtml"},
 	generateLibraryManifest: {path: "./generateLibraryManifest"},
@@ -27,6 +26,11 @@ function getTask(taskName) {
 	const taskInfo = taskInfos[taskName];
 
 	if (!taskInfo) {
+		if (["createDebugFiles", "uglify"].includes(taskName)) {
+			throw new Error(
+				`Standard task ${taskName} has been removed in UI5 Tooling 3.0. ` +
+				`Please see the migration guide at https://sap.github.io/ui5-tooling/updates/migrate-v3/`);
+		}
 		throw new Error(`taskRepository: Unknown Task ${taskName}`);
 	}
 	try {

package/lib/types/application/ApplicationBuilder.js

@@ -67,6 +67,27 @@ class ApplicationBuilder extends AbstractBuilder {
 			});
 		}
 
+		// Support rules should not be minified to have readable code in the Support Assistant
+		const minificationPattern = ["/**/*.js", "!**/*.support.js"];
+		if (["2.6"].includes(project.specVersion)) {
+			const minificationExcludes = project.builder && project.builder.minification &&
+				project.builder.minification.excludes;
+			if (minificationExcludes) {
+				// TODO 3.0: namespaces should become mandatory, see existing check above
+				const patternPrefix = project.metadata.namespace ? "/resources/" : "/";
+				this.enhancePatternWithExcludes(minificationPattern, minificationExcludes, patternPrefix);
+			}
+		}
+		this.addTask("minify", async () => {
+			return getTask("minify").task({
+				workspace: resourceCollections.workspace,
+				taskUtil,
+				options: {
+					pattern: minificationPattern
+				}
+			});
+		});
+
 		const componentPreload = project.builder && project.builder.componentPreload;
 		if (componentPreload && (componentPreload.namespaces || componentPreload.paths)) {
 			this.addTask("generateComponentPreload", async () => {
@@ -138,37 +159,6 @@ class ApplicationBuilder extends AbstractBuilder {
 			});
 		}
 
-		const minificationPattern = ["/**/*.js"];
-		if (["2.6"].includes(project.specVersion)) {
-			const minificationExcludes = project.builder && project.builder.minification &&
-				project.builder.minification.excludes;
-			if (minificationExcludes) {
-				// TODO 3.0: namespaces should become mandatory, see existing check above
-				const patternPrefix = project.metadata.namespace ? "/resources/" : "/";
-				this.enhancePatternWithExcludes(minificationPattern, minificationExcludes, patternPrefix);
-			}
-		}
-		this.addTask("createDebugFiles", async () => {
-			const createDebugFiles = getTask("createDebugFiles").task;
-			return createDebugFiles({
-				workspace: resourceCollections.workspace,
-				options: {
-					pattern: minificationPattern
-				}
-			});
-		});
-
-		this.addTask("uglify", async () => {
-			const uglify = getTask("uglify").task;
-			return uglify({
-				workspace: resourceCollections.workspace,
-				taskUtil,
-				options: {
-					pattern: minificationPattern
-				}
-			});
-		});
-
 		this.addTask("generateVersionInfo", async () => {
 			return getTask("generateVersionInfo").task({
 				workspace: resourceCollections.workspace,
@@ -209,6 +199,7 @@ class ApplicationBuilder extends AbstractBuilder {
 			return getTask("generateResourcesJson").task({
 				workspace: resourceCollections.workspace,
 				dependencies: resourceCollections.dependencies,
+				taskUtil,
 				options: {
 					projectName: project.metadata.name
 				}

package/lib/types/library/LibraryBuilder.js

@@ -89,6 +89,26 @@ class LibraryBuilder extends AbstractBuilder {
 			});
 		}
 
+		// Support rules should not be minified to have readable code in the Support Assistant
+		const minificationPattern = ["/resources/**/*.js", "!**/*.support.js"];
+		if (["2.6"].includes(project.specVersion)) {
+			const minificationExcludes = project.builder && project.builder.minification &&
+				project.builder.minification.excludes;
+			if (minificationExcludes) {
+				this.enhancePatternWithExcludes(minificationPattern, minificationExcludes, "/resources/");
+			}
+		}
+
+		this.addTask("minify", async () => {
+			return getTask("minify").task({
+				workspace: resourceCollections.workspace,
+				taskUtil,
+				options: {
+					pattern: minificationPattern
+				}
+			});
+		});
+
 		const componentPreload = project.builder && project.builder.componentPreload;
 		if (componentPreload) {
 			this.addTask("generateComponentPreload", async () => {
@@ -176,7 +196,7 @@ class LibraryBuilder extends AbstractBuilder {
 				dependencies: resourceCollections.dependencies,
 				options: {
 					projectName: project.metadata.name,
-					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/*.library" : undefined,
+					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/(*.library|library.js)" : undefined,
 					themesPattern: !taskUtil.isRootProject() ? "/resources/sap/ui/core/themes/*" : undefined,
 					inputPattern
 				}
@@ -195,37 +215,11 @@ class LibraryBuilder extends AbstractBuilder {
 			});
 		});
 
-		const minificationPattern = ["/resources/**/*.js"];
-		if (["2.6"].includes(project.specVersion)) {
-			const minificationExcludes = project.builder && project.builder.minification &&
-				project.builder.minification.excludes;
-			if (minificationExcludes) {
-				this.enhancePatternWithExcludes(minificationPattern, minificationExcludes, "/resources/");
-			}
-		}
-		this.addTask("createDebugFiles", async () => {
-			return getTask("createDebugFiles").task({
-				workspace: resourceCollections.workspace,
-				options: {
-					pattern: minificationPattern
-				}
-			});
-		});
-
-		this.addTask("uglify", async () => {
-			return getTask("uglify").task({
-				workspace: resourceCollections.workspace,
-				taskUtil,
-				options: {
-					pattern: minificationPattern
-				}
-			});
-		});
-
 		this.addTask("generateResourcesJson", () => {
 			return getTask("generateResourcesJson").task({
 				workspace: resourceCollections.workspace,
 				dependencies: resourceCollections.dependencies,
+				taskUtil,
 				options: {
 					projectName: project.metadata.name
 				}

package/lib/types/themeLibrary/ThemeLibraryBuilder.js

@@ -29,7 +29,7 @@ class ThemeLibraryBuilder extends AbstractBuilder {
 				dependencies: resourceCollections.dependencies,
 				options: {
 					projectName: project.metadata.name,
-					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/*.library" : undefined,
+					librariesPattern: !taskUtil.isRootProject() ? "/resources/**/(*.library|library.js)" : undefined,
 					themesPattern: !taskUtil.isRootProject() ? "/resources/sap/ui/core/themes/*" : undefined,
 					inputPattern: "/resources/**/themes/*/library.source.less"
 				}
@@ -51,6 +51,7 @@ class ThemeLibraryBuilder extends AbstractBuilder {
 			return getTask("generateResourcesJson").task({
 				workspace: resourceCollections.workspace,
 				dependencies: resourceCollections.dependencies,
+				taskUtil,
 				options: {
 					projectName: project.metadata.name
 				}