@ui5/builder 3.0.0-alpha.0 → 3.0.0-alpha.1

package/index.js

@@ -42,9 +42,9 @@ module.exports = {
 		 */
 		bootstrapHtmlTransformer: "./lib/processors/bootstrapHtmlTransformer",
 		/**
-		 * @type {import('./lib/processors/debugFileCreator')}
+		 * @type {import('./lib/processors/minifier')}
 		 */
-		debugFileCreator: "./lib/processors/debugFileCreator",
+		minifier: "./lib/processors/minifier",
 		/**
 		 * @type {import('./lib/processors/libraryLessGenerator')}
 		 */
@@ -53,10 +53,6 @@ module.exports = {
 		 * @type {import('./lib/processors/manifestCreator')}
 		 */
 		manifestCreator: "./lib/processors/manifestCreator",
-		/**
-		 * @type {import('./lib/processors/resourceCopier')}
-		 */
-		resourceCopier: "./lib/processors/resourceCopier",
 		/**
 		 * @type {import('./lib/processors/nonAsciiEscaper')}
 		 */
@@ -69,10 +65,6 @@ module.exports = {
 		 * @type {import('./lib/processors/themeBuilder')}
 		 */
 		themeBuilder: "./lib/processors/themeBuilder",
-		/**
-		 * @type {import('./lib/processors/uglifier')}
-		 */
-		uglifier: "./lib/processors/uglifier",
 		/**
 		 * @type {import('./lib/processors/versionInfoGenerator')}
 		 */
@@ -121,9 +113,9 @@ module.exports = {
 		 */
 		buildThemes: "./lib/tasks/buildThemes",
 		/**
-		 * @type {import('./lib/tasks/createDebugFiles')}
+		 * @type {import('./lib/tasks/minify')}
 		 */
-		createDebugFiles: "./lib/tasks/createDebugFiles",
+		minify: "./lib/tasks/minify",
 		/**
 		 * @type {import('./lib/tasks/jsdoc/executeJsdocSdkTransformation')}
 		 */
@@ -160,10 +152,6 @@ module.exports = {
 		 * @type {import('./lib/tasks/transformBootstrapHtml')}
 		 */
 		transformBootstrapHtml: "./lib/tasks/transformBootstrapHtml",
-		/**
-		 * @type {import('./lib/tasks/uglify')}
-		 */
-		uglify: "./lib/tasks/uglify",
 		/**
 		 * @type {import('./lib/tasks/taskRepository')}
 		 */

package/jsdoc.json

@@ -12,7 +12,6 @@
 		"./jsdoc-plugin"
 	],
 	"opts": {
-		"template": "node_modules/docdash/",
 		"encoding": "utf8",
 		"destination": "jsdocs/",
 		"recurse": true,

package/lib/builder/BuildContext.js

@@ -1,5 +1,13 @@
+const ResourceTagCollection = require("@ui5/fs").ResourceTagCollection;
 const ProjectBuildContext = require("./ProjectBuildContext");
 
+// Note: When adding standard tags, always update the public documentation in TaskUtil
+// (Type "module:@ui5/builder.tasks.TaskUtil~StandardBuildTags")
+const GLOBAL_TAGS = Object.freeze({
+	IsDebugVariant: "ui5:IsDebugVariant",
+	HasDebugVariant: "ui5:HasDebugVariant",
+});
+
 /**
  * Context of a build process
  *
@@ -13,6 +21,10 @@ class BuildContext {
 		}
 		this.rootProject = rootProject;
 		this.projectBuildContexts = [];
+
+		this._resourceTagCollection = new ResourceTagCollection({
+			allowedTags: Object.values(GLOBAL_TAGS)
+		});
 	}
 
 	getRootProject() {
@@ -22,6 +34,7 @@ class BuildContext {
 	createProjectContext({project, resources}) {
 		const projectBuildContext = new ProjectBuildContext({
 			buildContext: this,
+			globalTags: GLOBAL_TAGS,
 			project,
 			resources
 		});
@@ -34,6 +47,10 @@ class BuildContext {
 			return ctx.executeCleanupTasks();
 		}));
 	}
+
+	getResourceTagCollection() {
+		return this._resourceTagCollection;
+	}
 }
 
 module.exports = BuildContext;

package/lib/builder/ProjectBuildContext.js

@@ -2,10 +2,10 @@ const ResourceTagCollection = require("@ui5/fs").ResourceTagCollection;
 
 // Note: When adding standard tags, always update the public documentation in TaskUtil
 // (Type "module:@ui5/builder.tasks.TaskUtil~StandardBuildTags")
-const STANDARD_TAGS = Object.freeze({
+const STANDARD_TAGS = {
 	OmitFromBuildResult: "ui5:OmitFromBuildResult",
-	IsBundle: "ui5:IsBundle"
-});
+	IsBundle: "ui5:IsBundle",
+};
 
 /**
  * Build context of a single project. Always part of an overall
@@ -15,8 +15,8 @@ const STANDARD_TAGS = Object.freeze({
  * @memberof module:@ui5/builder.builder
  */
 class ProjectBuildContext {
-	constructor({buildContext, project, resources}) {
-		if (!buildContext || !project || !resources) {
+	constructor({buildContext, globalTags, project, resources}) {
+		if (!buildContext || !globalTags || !project || !resources) {
 			throw new Error(`One or more mandatory parameters are missing`);
 		}
 		this._buildContext = buildContext;
@@ -26,10 +26,12 @@ class ProjectBuildContext {
 			cleanup: []
 		};
 
-		this.STANDARD_TAGS = STANDARD_TAGS;
+		this.STANDARD_TAGS = Object.assign({}, STANDARD_TAGS, globalTags);
+		Object.freeze(this.STANDARD_TAGS);
 
 		this._resourceTagCollection = new ResourceTagCollection({
-			allowedTags: Object.values(this.STANDARD_TAGS)
+			allowedTags: Object.values(this.STANDARD_TAGS),
+			superCollection: this._buildContext.getResourceTagCollection()
 		});
 	}
 

package/lib/builder/builder.js

@@ -94,8 +94,7 @@ function composeTaskList({dev, selfContained, jsdoc, includedTasks, excludedTask
 		selectedTasks.generateComponentPreload = false;
 		selectedTasks.generateLibraryPreload = false;
 		selectedTasks.generateLibraryManifest = false;
-		selectedTasks.createDebugFiles = false;
-		selectedTasks.uglify = false;
+		selectedTasks.minify = false;
 		selectedTasks.generateFlexChangesBundle = false;
 		selectedTasks.generateManifestBundle = false;
 	}

package/lib/lbt/analyzer/JSModuleAnalyzer.js

@@ -64,6 +64,7 @@ const EnrichedVisitorKeys = (function() {
 		BreakStatement: [],
 		CallExpression: [], // special handling
 		CatchClause: ["param", "body"],
+		ChainExpression: [],
 		ClassBody: [],
 		ClassDeclaration: [],
 		ClassExpression: [],
@@ -125,8 +126,10 @@ const EnrichedVisitorKeys = (function() {
 		 * All properties in an object pattern are executed.
 		 */
 		ObjectPattern: [], // properties
+		// PrivateIdentifier: [], // will come with ES2022
 		Program: [],
 		Property: [],
+		// PropertyDefinition: [], // will come with ES2022
 		/*
 		 * argument of the rest element is always executed under the same condition as the rest element itself
 		 */
@@ -134,6 +137,7 @@ const EnrichedVisitorKeys = (function() {
 		ReturnStatement: [],
 		SequenceExpression: [],
 		SpreadElement: [], // the argument of the spread operator always needs to be evaluated - argument
+		// StaticBlock: [], // will come with ES2022
 		Super: [],
 		SwitchStatement: [],
 		SwitchCase: ["test", "consequent"], // test and consequent are executed only conditionally
@@ -174,6 +178,9 @@ const EnrichedVisitorKeys = (function() {
 		// Check if the visitor-key exists in the available Syntax because
 		// the list of visitor-keys does not match the available Syntax.
 		if (!Syntax[type]) {
+			// Deprecated / removed:
+			// ExperimentalRestProperty
+			// ExperimentalSpreadProperty
 			return;
 		}
 		// Ignore JSX visitor-keys because they aren't used.

package/lib/lbt/bundle/AutoSplitter.js

@@ -1,6 +1,5 @@
 "use strict";
 
-const terser = require("terser");
 const {pd} = require("pretty-data");
 
 const ModuleName = require("../utils/ModuleName");
@@ -8,7 +7,6 @@ const {SectionType} = require("./BundleDefinition");
 const escapePropertiesFile = require("../utils/escapePropertiesFile");
 const log = require("@ui5/logger").getLogger("lbt:bundle:AutoSplitter");
 
-const copyrightCommentsPattern = /copyright|\(c\)(?:[0-9]+|\s+[0-9A-za-z])|released under|license|\u00a9/i;
 const xmlHtmlPrePattern = /<(?:\w+:)?pre\b/;
 
 /**
@@ -112,6 +110,7 @@ class AutoSplitter {
 
 		resolvedModule.sections.forEach( (section) => {
 			let currentSection;
+			let sequence;
 			switch ( section.mode ) {
 			case SectionType.Provided:
 				// 'provided' sections are no longer needed in a fully resolved module
@@ -131,16 +130,20 @@ class AutoSplitter {
 				});
 				break;
 			case SectionType.Preload:
+				sequence = section.modules.slice();
+				// simple version: just sort alphabetically
+				sequence.sort();
+
 				// NODE_TODO: sort by copyright:
-				// sequence = section.modules.slice();
 				// jsBuilder.beforeWriteFunctionPreloadSection((List<ModuleName>) sequence);
+
 				currentSection = {
 					mode: SectionType.Preload,
 					filters: []
 				};
 				currentSection.name = section.name;
 				currentModule.sections.push( currentSection );
-				section.modules.forEach( (module) => {
+				sequence.forEach( (module) => {
 					const moduleSize = moduleSizes[module];
 					if ( part + 1 < numberOfParts && totalSize + moduleSize / 2 > partSize ) {
 						part++;
@@ -195,26 +198,9 @@ class AutoSplitter {
 			}
 
 			if ( /\.js$/.test(module) ) {
-				// console.log("determining compressed size for %s", module);
-				let fileContent = await resource.buffer();
-				if ( this.optimize ) {
-					// console.log("uglify %s start", module);
-					const result = await terser.minify({
-						[resource.name]: String(fileContent)
-					}, {
-						warnings: false, // TODO configure?
-						compress: false, // TODO configure?
-						output: {
-							comments: copyrightCommentsPattern,
-							wrap_func_args: false
-						}
-						// , outFileName: resource.name
-						// , outSourceMap: true
-					});
-					// console.log("uglify %s end", module);
-					fileContent = result.code;
-				}
-				// trace.debug("analyzed %s:%d%n", module, mw.getTargetLength());
+				// No optimize / minify step here as the input should be
+				// either already optimized or not, based on the bundle options
+				const fileContent = await resource.buffer();
 				return fileContent.length;
 			} else if ( /\.properties$/.test(module) ) {
 				/* NODE-TODO minimize *.properties

package/lib/lbt/bundle/Builder.js

@@ -3,7 +3,6 @@
 "use strict";
 
 const path = require("path");
-const terser = require("terser");
 const {pd} = require("pretty-data");
 const {parseJS, Syntax} = require("../utils/parseUtils");
 // const MOZ_SourceMap = require("source-map");
@@ -19,7 +18,6 @@ const {SectionType} = require("./BundleDefinition");
 const BundleWriter = require("./BundleWriter");
 const log = require("@ui5/logger").getLogger("lbt:bundle:Builder");
 
-const copyrightCommentsPattern = /copyright|\(c\)(?:[0-9]+|\s+[0-9A-za-z])|released under|license|\u00a9|^@ui5-bundle-raw-include |^@ui5-bundle /i;
 const xmlHtmlPrePattern = /<(?:\w+:)?pre\b/;
 
 const strReplacements = {
@@ -282,12 +280,9 @@ class BundleBuilder {
 	}
 
 	async writeRawModule(module, resource) {
-		let fileContent = await resource.buffer();
-		if ( /\.js$/.test(module) ) {
-			fileContent = await this.compressJS( fileContent, resource );
-		}
+		const fileContent = await resource.string();
 		this.outW.ensureNewLine();
-		this.outW.write( fileContent );
+		this.outW.write(fileContent);
 	}
 
 	async writePreloadFunction(section) {
@@ -331,28 +326,6 @@ class BundleBuilder {
 		// this.afterWriteFunctionPreloadSection();
 	}
 
-	async compressJS(fileContent, resource) {
-		if ( this.optimize ) {
-			const result = await terser.minify({
-				[resource.name]: String(fileContent)
-			}, {
-				compress: false, // TODO configure?
-				output: {
-					comments: copyrightCommentsPattern,
-					wrap_func_args: false
-				}
-				// , outFileName: resource.name
-				// , outSourceMap: true
-			});
-			// console.log(result.map);
-			// const map = new MOZ_SourceMap.SourceMapConsumer(result.map);
-			// map.eachMapping(function (m) { console.log(m); }); // console.log(map);
-			fileContent = result.code;
-			// throw new Error();
-		}
-		return fileContent;
-	}
-
 	beforeWriteFunctionPreloadSection(sequence) {
 		// simple version: just sort alphabetically
 		sequence.sort();
@@ -367,13 +340,12 @@ class BundleBuilder {
 				if ( /\.js$/.test(module) ) {
 					// console.log("Processing " + module);
 					const resource = await this.pool.findResourceWithInfo(module);
-					let code = await resource.buffer();
-					code = rewriteDefine(this.targetBundleFormat, code, module);
-					if ( code ) {
+					let moduleContent = await resource.string();
+					moduleContent = rewriteDefine(this.targetBundleFormat, moduleContent, module);
+					if ( moduleContent ) {
 						outW.startSegment(module);
 						outW.ensureNewLine();
-						const fileContent = await this.compressJS(code, resource);
-						outW.write( fileContent );
+						outW.write(moduleContent);
 						outW.ensureNewLine();
 						const compressedSize = outW.endSegment();
 						log.verbose("    %s (%d,%d)", module,
@@ -409,17 +381,17 @@ class BundleBuilder {
 		const outW = this.outW;
 
 		if ( /\.js$/.test(module) && (info == null || !info.requiresTopLevelScope) ) {
-			const compressedContent = await this.compressJS( await resource.buffer(), resource );
+			const moduleContent = await resource.string();
 			outW.write(`function(){`);
-			outW.write( compressedContent );
+			outW.write(moduleContent);
 			this.exportGlobalNames(info);
 			outW.ensureNewLine();
 			outW.write(`}`);
 		} else if ( /\.js$/.test(module) /* implicitly: && info != null && info.requiresTopLevelScope */ ) {
 			log.warn("**** warning: module %s requires top level scope" +
 					" and can only be embedded as a string (requires 'eval')", module);
-			const compressedContent = await this.compressJS( await resource.buffer(), resource );
-			outW.write( makeStringLiteral( compressedContent ) );
+			const moduleContent = await resource.buffer();
+			outW.write(makeStringLiteral(moduleContent));
 		} else if ( /\.html$/.test(module) ) {
 			const fileContent = await resource.buffer();
 			outW.write( makeStringLiteral( fileContent ) );
@@ -435,13 +407,13 @@ class BundleBuilder {
 			}
 			outW.write(makeStringLiteral(fileContent));
 		} else if ( /\.xml$/.test(module) ) {
-			let fileContent = await resource.buffer();
+			let fileContent = await resource.string();
 			if ( this.optimize ) {
 				// For XML we use the pretty data
 				// Do not minify if XML(View) contains an <*:pre> tag,
 				// because whitespace of HTML <pre> should be preserved (should only happen rarely)
-				if (!xmlHtmlPrePattern.test(fileContent.toString())) {
-					fileContent = pd.xmlmin(fileContent.toString(), false);
+				if (!xmlHtmlPrePattern.test(fileContent)) {
+					fileContent = pd.xmlmin(fileContent, false);
 				}
 			}
 			outW.write( makeStringLiteral( fileContent ) );

package/lib/lbt/resources/LocatorResource.js

@@ -1,11 +1,9 @@
 const Resource = require("./Resource");
 
-
 function extractName(path) {
 	return path.slice( "/resources/".length);
 }
 
-
 class LocatorResource extends Resource {
 	constructor(pool, resource) {
 		super(pool, extractName(resource.getPath()), null, resource.getStatInfo());

package/lib/lbt/resources/Resource.js

@@ -18,6 +18,13 @@ class Resource {
 	async buffer() {
 		return readFile(this.file);
 	}
+
+	/**
+	 * @returns {Promise<string>} String of the file content
+	 */
+	async string() {
+		return (await this.buffer()).toString();
+	}
 }
 
 module.exports = Resource;

package/lib/lbt/resources/ResourceCollector.js

@@ -193,17 +193,16 @@ class ResourceCollector {
 	}
 
 	async determineResourceDetails({
-		debugResources, mergedResources, designtimeResources, supportResources, debugBundles
+		debugResources, mergedResources, designtimeResources, supportResources
 	}) {
 		const baseNames = new Set();
 		const debugFilter = new ResourceFilterList(debugResources);
 		const mergeFilter = new ResourceFilterList(mergedResources);
 		const designtimeFilter = new ResourceFilterList(designtimeResources);
 		const supportFilter = new ResourceFilterList(supportResources);
-		const debugBundleFilter = new ResourceFilterList(debugBundles);
 
 		const promises = [];
-		const nonBundledDebugResources = [];
+		const debugResourcesInfo = [];
 
 		for (const [name, info] of this._resources.entries()) {
 			if ( debugFilter.matches(name) ) {
@@ -231,13 +230,14 @@ class ResourceCollector {
 			}
 
 			if ( /(?:\.js|\.view\.xml|\.control\.xml|\.fragment\.xml)$/.test(name) ) {
-				if ( (!info.isDebug || debugBundleFilter.matches(name)) ) {
-					// Only analyze non-debug files and special debug bundles (like sap-ui-core-dbg.js)
+				if ( !info.isDebug ) {
+					// Only analyze non-dbg files in first run
 					promises.push(
 						this.enrichWithDependencyInfo(info)
 					);
 				} else {
-					nonBundledDebugResources.push(info);
+					// Collect dbg files to be handled in a second step (see below)
+					debugResourcesInfo.push(info);
 				}
 			}
 
@@ -279,19 +279,37 @@ class ResourceCollector {
 
 		await Promise.all(promises);
 
-		for (let i = nonBundledDebugResources.length - 1; i >= 0; i--) {
-			const dbgInfo = nonBundledDebugResources[i];
+		const debugBundlePromises = [];
+
+		for (let i = debugResourcesInfo.length - 1; i >= 0; i--) {
+			const dbgInfo = debugResourcesInfo[i];
 			const nonDebugName = ResourceInfoList.getNonDebugName(dbgInfo.name);
 			const nonDbgInfo = this._resources.get(nonDebugName);
-			const newDbgInfo = new ResourceInfo(dbgInfo.name);
-
-			// First copy info of analysis from non-dbg file (included, required, condRequired, ...)
-			newDbgInfo.copyFrom(null, nonDbgInfo);
-			// Then copy over info from dbg file to properly set name, isDebug, etc.
-			newDbgInfo.copyFrom(null, dbgInfo);
 
-			this._resources.set(dbgInfo.name, newDbgInfo);
+			// FIXME: "merged" property is only calculated in ResourceInfo#copyFrom
+			// Therefore using the same logic here to compute it.
+			if (!nonDbgInfo || (nonDbgInfo.included != null && nonDbgInfo.included.size > 0)) {
+				// We need to analyze the dbg resource if there is no non-dbg variant or
+				// it is a bundle because we will (usually) have different content.
+				debugBundlePromises.push(
+					this.enrichWithDependencyInfo(dbgInfo)
+				);
+			} else {
+				// If the non-dbg resource is not a bundle, we can just copy over the info and skip
+				// analyzing the dbg variant as both should have the same info.
+
+				const newDbgInfo = new ResourceInfo(dbgInfo.name);
+
+				// First copy info of analysis from non-dbg file (included, required, condRequired, ...)
+				newDbgInfo.copyFrom(null, nonDbgInfo);
+				// Then copy over info from dbg file to properly set name, isDebug, etc.
+				newDbgInfo.copyFrom(null, dbgInfo);
+
+				this._resources.set(dbgInfo.name, newDbgInfo);
+			}
 		}
+
+		await Promise.all(debugBundlePromises);
 	}
 
 	createOrphanFilters() {

package/lib/lbt/utils/parseUtils.js

@@ -9,7 +9,7 @@ function parseJS(code, userOptions = {}) {
 	// allowed options and their defaults
 	const options = {
 		comment: false,
-		ecmaVersion: 2020,
+		ecmaVersion: 2021,
 		range: false,
 		sourceType: "script",
 	};

package/lib/processors/bundlers/moduleBundler.js

@@ -89,7 +89,7 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  *
  * @public
  * @typedef {object} ModuleBundleOptions
- * @property {boolean} [optimize=false] If set to 'true' the module bundle gets minified
+ * @property {boolean} [optimize=true] Whether the module bundle gets minified
  * @property {boolean} [decorateBootstrapModule=false] If set to 'false', the module won't be decorated
  *   with an optimization marker
  * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable module bundles with
@@ -109,15 +109,19 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  * @param {module:@ui5/fs.Resource[]} parameters.resources Resources
  * @param {object} parameters.options Options
  * @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<module:@ui5/fs.Resource[]>} Promise resolving with module bundle resources
  */
 module.exports = function({resources, options: {bundleDefinition, bundleOptions}}) {
-//	console.log("preloadBundler bundleDefinition:");
-//	console.log(JSON.stringify(options.bundleDefinition, null, 4));
-
-	// TODO 3.0: Fix defaulting behavior, align with JSDoc
-	bundleOptions = bundleOptions || {optimize: true};
+	// Apply defaults without modifying the passed object
+	bundleOptions = Object.assign({}, {
+		optimize: true,
+		decorateBootstrapModule: false,
+		addTryCatchRestartWrapper: false,
+		usePredefineCalls: false,
+		numberOfParts: 1,
+		ignoreMissingModules: false
+	}, bundleOptions);
 
 	const pool = new LocatorResourcePool({
 		ignoreMissingModules: bundleOptions.ignoreMissingModules

package/lib/processors/minifier.js

@@ -0,0 +1,84 @@
+const path = require("path");
+const terser = require("terser");
+const Resource = require("@ui5/fs").Resource;
+/**
+ * Preserve comments which contain:
+ * <ul>
+ *  <li>copyright notice</li>
+ *  <li>license terms</li>
+ *  <li>"@ui5-bundle"</li>
+ *  <li>"@ui5-bundle-raw-include"</li>
+ * </ul>
+ *
+ * @type {RegExp}
+ */
+const copyrightCommentsAndBundleCommentPattern = /copyright|\(c\)(?:[0-9]+|\s+[0-9A-za-z])|released under|license|\u00a9|^@ui5-bundle-raw-include |^@ui5-bundle /i;
+const debugFileRegex = /((?:\.view|\.fragment|\.controller|\.designtime|\.support)?\.js)$/;
+
+
+/**
+ * Result set
+ *
+ * @public
+ * @typedef {object} MinifierResult
+ * @property {module:@ui5/fs.Resource} resource Minified resource
+ * @property {module:@ui5/fs.Resource} dbgResource Debug (non-minified) variant
+ * @property {module:@ui5/fs.Resource} sourceMap Source Map
+ * @memberof module:@ui5/builder.processors
+ */
+
+/**
+ * Minifies the supplied resources.
+ *
+ * @public
+ * @alias module:@ui5/builder.processors.minifier
+ * @param {object} parameters Parameters
+ * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources to be processed
+ * @returns {Promise<module:@ui5/builder.processors.MinifierResult[]>}
+ * 				Promise resolving with object of resource, dbgResource and sourceMap
+ */
+module.exports = async function({resources}) {
+	return Promise.all(resources.map(async (resource) => {
+		const dbgPath = resource.getPath().replace(debugFileRegex, "-dbg$1");
+		const dbgResource = await resource.clone();
+		dbgResource.setPath(dbgPath);
+
+		const filename = path.posix.basename(resource.getPath());
+		const code = await resource.getString();
+		try {
+			const dbgFilename = path.posix.basename(dbgPath);
+			const result = await terser.minify({
+				// Use debug-name since this will be referenced in the source map "sources"
+				[dbgFilename]: code
+			}, {
+				output: {
+					comments: copyrightCommentsAndBundleCommentPattern,
+					wrap_func_args: false
+				},
+				compress: false,
+				mangle: {
+					reserved: [
+						"jQuery",
+						"jquery",
+						"sap",
+					]
+				},
+				sourceMap: {
+					filename,
+					url: filename + ".map"
+				}
+			});
+			resource.setString(result.code);
+			const sourceMapResource = new Resource({
+				path: resource.getPath() + ".map",
+				string: result.map
+			});
+			return {resource, dbgResource, sourceMapResource};
+		} catch (err) {
+			// Note: err.filename contains the debug-name
+			throw new Error(
+				`Minification failed with error: ${err.message} in file ${filename} ` +
+				`(line ${err.line}, col ${err.col}, pos ${err.pos})`);
+		}
+	}));
+};

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