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

package/lib/lbt/bundle/BundleWriter.js

@@ -11,6 +11,8 @@ const SPACES_OR_TABS_ONLY = /^[ \t]+$/;
  *
  * Most methods have been extracted from JSMergeWriter.
  *
+ * columnOffset and lineOffset are used for sourcemap merging as reference to where we are at a given point in time
+ *
  * @author Frank Weigel
  * @since 1.27.0
  * @private
@@ -18,6 +20,8 @@ const SPACES_OR_TABS_ONLY = /^[ \t]+$/;
 class BundleWriter {
 	constructor() {
 		this.buf = "";
+		this.lineOffset = 0;
+		this.columnOffset = 0;
 		this.segments = [];
 		this.currentSegment = null;
 		this.currentSourceIndex = 0;
@@ -28,6 +32,11 @@ class BundleWriter {
 		let writeBuf = "";
 		for ( let i = 0; i < str.length; i++ ) {
 			writeBuf += str[i];
+			if (str[i] != null && str[i].split) {
+				const strSplit = str[i].split(NL);
+				this.lineOffset += strSplit.length - 1;
+				this.columnOffset += strSplit[strSplit.length - 1].length;
+			}
 		}
 		if ( writeBuf.length >= 1 ) {
 			this.buf += writeBuf;
@@ -40,15 +49,23 @@ class BundleWriter {
 	writeln(...str) {
 		for ( let i = 0; i < str.length; i++ ) {
 			this.buf += str[i];
+			if (str[i] != null && str[i].split) {
+				const strSplit = str[i].split(NL);
+				this.lineOffset += strSplit.length - 1;
+			}
 		}
 		this.buf += NL;
 		this.endsWithNewLine = true;
+		this.lineOffset += 1;
+		this.columnOffset = 0;
 	}
 
 	ensureNewLine() {
 		if ( !this.endsWithNewLine ) {
 			this.buf += NL;
 			this.endsWithNewLine = true;
+			this.lineOffset += 1;
+			this.columnOffset = 0;
 		}
 	}
 

package/lib/lbt/resources/LocatorResource.js

@@ -1,12 +1,8 @@
 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());
+	constructor(pool, resource, moduleName) {
+		super(pool, moduleName, null, resource.getStatInfo());
 		this.resource = resource;
 	}
 
@@ -17,6 +13,10 @@ class LocatorResource extends Resource {
 	getProject() {
 		return this.resource._project;
 	}
+
+	getPath() {
+		return this.resource.getPath();
+	}
 }
 
 module.exports = LocatorResource;

package/lib/lbt/resources/LocatorResourcePool.js

@@ -2,12 +2,16 @@ const ResourcePool = require("./ResourcePool");
 const LocatorResource = require("./LocatorResource");
 
 class LocatorResourcePool extends ResourcePool {
-	prepare(resources) {
+	prepare(resources, moduleNameMapping) {
 		resources = resources.filter( (res) => !res.getStatInfo().isDirectory() );
 		return Promise.all(
-			resources.map(
-				(resource) => this.addResource( new LocatorResource(this, resource) )
-			).filter(Boolean)
+			resources.map((resource) => {
+				let moduleName = moduleNameMapping && moduleNameMapping[resource.getPath()];
+				if (!moduleName) {
+					moduleName = resource.getPath().slice("/resources/".length);
+				}
+				return this.addResource(new LocatorResource(this, resource, moduleName));
+			}).filter(Boolean)
 		);
 	}
 }

package/lib/lbt/utils/parseUtils.js

@@ -9,7 +9,7 @@ function parseJS(code, userOptions = {}) {
 	// allowed options and their defaults
 	const options = {
 		comment: false,
-		ecmaVersion: 2021,
+		ecmaVersion: 2021, // NOTE: Adopt JSModuleAnalyzer.js to allow new Syntax when upgrading to newer ECMA versions
 		range: false,
 		sourceType: "script",
 	};

package/lib/processors/bundlers/moduleBundler.js

@@ -90,6 +90,7 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  * @public
  * @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
  *   with an optimization marker
  * @property {boolean} [addTryCatchRestartWrapper=false] Whether to wrap bootable module bundles with
@@ -101,21 +102,35 @@ const log = require("@ui5/logger").getLogger("builder:processors:bundlers:module
  */
 
 /**
- * Legacy preload bundler.
+ * Result set
+ *
+ * @public
+ * @typedef {object} ModuleBundlerResult
+ * @property {module:@ui5/fs.Resource} bundle Bundle resource
+ * @property {module:@ui5/fs.Resource} sourceMap Source Map
+ * @memberof module:@ui5/builder.processors
+ */
+
+/**
+ * Legacy module bundler.
  *
  * @public
  * @alias module:@ui5/builder.processors.moduleBundler
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.Resource[]} parameters.resources Resources
  * @param {object} parameters.options Options
+ * @param {object} [parameters.options.moduleNameMapping]
+ 				Optional mapping of resource paths to module name in order to overwrite the default determination
  * @param {ModuleBundleDefinition} parameters.options.bundleDefinition Module bundle definition
  * @param {ModuleBundleOptions} [parameters.options.bundleOptions] Module bundle options
- * @returns {Promise<module:@ui5/fs.Resource[]>} Promise resolving with module bundle resources
+ * @returns {Promise<module:@ui5/builder.processors.ModuleBundlerResult[]>}
+ * Promise resolving with module bundle resources
  */
-module.exports = function({resources, options: {bundleDefinition, bundleOptions}}) {
+module.exports = function({resources, options: {bundleDefinition, bundleOptions, moduleNameMapping}}) {
 	// Apply defaults without modifying the passed object
 	bundleOptions = Object.assign({}, {
 		optimize: true,
+		sourceMap: true,
 		decorateBootstrapModule: false,
 		addTryCatchRestartWrapper: false,
 		usePredefineCalls: false,
@@ -134,7 +149,7 @@ module.exports = function({resources, options: {bundleDefinition, bundleOptions}
 		log.verbose(`bundleOptions: ${JSON.stringify(bundleOptions, null, 2)}`);
 	}
 
-	return pool.prepare( resources ).
+	return pool.prepare( resources, moduleNameMapping ).
 		then( () => builder.createBundle(bundleDefinition, bundleOptions) ).
 		then( (results) => {
 			let bundles;
@@ -146,13 +161,20 @@ module.exports = function({resources, options: {bundleDefinition, bundleOptions}
 
 			return Promise.all(bundles.map((bundleObj) => {
 				if ( bundleObj ) {
-					const {name, content} = bundleObj;
+					const {name, content, sourceMap} = bundleObj;
 					// console.log("creating bundle as '%s'", "/resources/" + name);
-					const resource = new EvoResource({
+					const res = {};
+					res.bundle = new EvoResource({
 						path: "/resources/" + name,
 						string: content
 					});
-					return resource;
+					if (sourceMap) {
+						res.sourceMap = new EvoResource({
+							path: "/resources/" + name + ".map",
+							string: sourceMap
+						});
+					}
+					return res;
 				}
 			}));
 		});

package/lib/processors/minifier.js

@@ -34,10 +34,13 @@ const debugFileRegex = /((?:\.view|\.fragment|\.controller|\.designtime|\.suppor
  * @alias module:@ui5/builder.processors.minifier
  * @param {object} parameters Parameters
  * @param {module:@ui5/fs.Resource[]} parameters.resources List of resources to be processed
+ * @param {object} [parameters.options] Options
+ * @param {boolean} [parameters.options.addSourceMappingUrl=true]
+ * 				Whether to add a sourceMappingURL reference to the end of the minified resource
  * @returns {Promise<module:@ui5/builder.processors.MinifierResult[]>}
  * 				Promise resolving with object of resource, dbgResource and sourceMap
  */
-module.exports = async function({resources}) {
+module.exports = async function({resources, options: {addSourceMappingUrl = true} = {}}) {
 	return Promise.all(resources.map(async (resource) => {
 		const dbgPath = resource.getPath().replace(debugFileRegex, "-dbg$1");
 		const dbgResource = await resource.clone();
@@ -46,6 +49,12 @@ module.exports = async function({resources}) {
 		const filename = path.posix.basename(resource.getPath());
 		const code = await resource.getString();
 		try {
+			const sourceMapOptions = {
+				filename
+			};
+			if (addSourceMappingUrl) {
+				sourceMapOptions.url = filename + ".map";
+			}
 			const dbgFilename = path.posix.basename(dbgPath);
 			const result = await terser.minify({
 				// Use debug-name since this will be referenced in the source map "sources"
@@ -63,10 +72,7 @@ module.exports = async function({resources}) {
 						"sap",
 					]
 				},
-				sourceMap: {
-					filename,
-					url: filename + ".map"
-				}
+				sourceMap: sourceMapOptions
 			});
 			resource.setString(result.code);
 			const sourceMapResource = new Resource({

package/lib/tasks/TaskUtil.js

@@ -108,6 +108,18 @@ class TaskUtil {
 		return this._projectBuildContext.isRootProject();
 	}
 
+	/**
+	 * Retrieves a build option defined by its <code>key</code.
+	 * If no option with the given <code>key</code> is stored, <code>undefined</code> is returned.
+	 *
+	 * @param {string} key The option key
+	 * @returns {any|undefined} The build option (or undefined)
+	 * @private
+	 */
+	getBuildOption(key) {
+		return this._projectBuildContext.getOption(key);
+	}
+
 	/**
 	 * Register a function that must be executed once the build is finished. This can be used to, for example,
 	 * clean up files temporarily created on the file system. If the callback returns a Promise, it will be waited for.

package/lib/tasks/bundlers/generateBundle.js

@@ -1,5 +1,5 @@
 const moduleBundler = require("../../processors/bundlers/moduleBundler");
-const ModuleName = require("../../lbt/utils/ModuleName");
+const createModuleNameMapping = require("./utils/createModuleNameMapping");
 const ReaderCollectionPrioritized = require("@ui5/fs").ReaderCollectionPrioritized;
 
 /**
@@ -21,12 +21,57 @@ module.exports = function({
 	workspace, dependencies, taskUtil, options: {projectName, bundleDefinition, bundleOptions}
 }) {
 	let combo = new ReaderCollectionPrioritized({
-		name: `libraryBundler - prioritize workspace over dependencies: ${projectName}`,
+		name: `generateBundle - prioritize workspace over dependencies: ${projectName}`,
 		readers: [workspace, dependencies]
 	});
 
+	const optimize = !bundleOptions || bundleOptions.optimize !== false;
 	if (taskUtil) {
-		const optimize = !bundleOptions || bundleOptions.optimize !== false;
+		/* Scenarios
+			1. Optimize bundle with minification already done
+				Workspace:
+					* /resources/my/lib/Control.js 				[ui5:HasDebugVariant]
+					* /resources/my/lib/Control.js.map 			[ui5:HasDebugVariant]
+					* /resources/my/lib/Control-dbg.js 			[ui5:IsDebugVariant]
+
+				Bundler input:
+					* /resources/my/lib/Control.js
+					* /resources/my/lib/Control.js.map
+
+				=> Filter out debug resources
+
+			2. Optimize bundle with no minification
+				* /resources/my/lib/Control.js
+
+				=> No action necessary
+
+			3. Debug-bundle with minification already done
+				Workspace:
+					* /resources/my/lib/Control.js 				[ui5:HasDebugVariant]
+					* /resources/my/lib/Control.js.map 			[ui5:HasDebugVariant]
+					* /resources/my/lib/Control-dbg.js 			[ui5:IsDebugVariant]
+
+				Bundler input:
+					* /resources/my/lib/Control-dbg.js
+					* moduleNameMapping: [{"/resources/my/lib/Control-dbg.js": "my/lib/Control.js"}]
+
+				=> Filter out minified-resources (tagged as "HasDebugVariant", incl. source maps) and rename debug-files
+
+			4. Debug-bundle with no minification
+				* /resources/my/lib/Control.js
+
+				=> No action necessary
+
+			5. Bundle with external input (optimize or not), e.g. TS-project
+				Workspace:
+					* /resources/my/lib/Control.ts
+					* /resources/my/lib/Control.js
+					* /resources/my/lib/Control.js.map
+
+				Bundler input:
+					* /resources/my/lib/Control.js
+					* /resources/my/lib/Control.js.map
+		*/
 
 		// Omit -dbg files for optimize bundles and vice versa
 		const filterTag = optimize ?
@@ -34,37 +79,32 @@ module.exports = function({
 		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: {
-				bundleDefinition,
-				bundleOptions
-			},
-			resources
-		}).then((bundles) => {
-			return Promise.all(bundles.map((bundle) => {
+	return combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}").then((resources) => {
+		const options = {bundleDefinition, bundleOptions};
+		if (!optimize && taskUtil) {
+			options.moduleNameMapping = createModuleNameMapping({resources, taskUtil});
+		}
+		return moduleBundler({options, resources}).then((bundles) => {
+			return Promise.all(bundles.map(({bundle, sourceMap} = {}) => {
+				if (!bundle) {
+					// Skip empty bundles
+					return;
+				}
 				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);
 			}));
 		});
 	});

package/lib/tasks/bundlers/generateComponentPreload.js

@@ -41,7 +41,7 @@ module.exports = function({
 	}
 
 	// TODO 3.0: Limit to workspace resources?
-	return combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library}")
+	return combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}")
 		.then(async (resources) => {
 			let allNamespaces = [];
 			if (paths) {
@@ -148,12 +148,19 @@ module.exports = function({
 				});
 			}));
 		})
-		.then((processedResources) => {
-			return Promise.all(processedResources.map((resource) => {
+		.then((results) => {
+			const bundles = Array.prototype.concat.apply([], results);
+			return Promise.all(bundles.map(({bundle, sourceMap}) => {
 				if (taskUtil) {
-					taskUtil.setTag(resource[0], taskUtil.STANDARD_TAGS.IsBundle);
+					taskUtil.setTag(bundle, taskUtil.STANDARD_TAGS.IsBundle);
+					// 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);
 				}
-				return workspace.write(resource[0]);
+				return Promise.all([
+					workspace.write(bundle),
+					workspace.write(sourceMap)
+				]);
 			}));
 		});
 };

package/lib/tasks/bundlers/generateFlexChangesBundle.js

@@ -1,5 +1,6 @@
 const log = require("@ui5/logger").getLogger("builder:tasks:bundlers:generateFlexChangesBundle");
 const flexChangesBundler = require("../../processors/bundlers/flexChangesBundler");
+const semver = require("semver");
 
 /**
  * Task to create changesBundle.json file containing all changes stored in the /changes folder for easier consumption
@@ -68,9 +69,9 @@ module.exports = async function({workspace, taskUtil, options: {namespace}}) {
 	const allResources = await workspace.byGlob(
 		`${pathPrefix}/changes/*.{change,variant,ctrl_variant,ctrl_variant_change,ctrl_variant_management_change}`);
 	if (allResources.length > 0) {
-		const version = await readManifestMinUI5Version();
+		const version = semver.coerce(await readManifestMinUI5Version());
 		let hasFlexBundleVersion = false;
-		if (parseFloat(version) >= 1.73) {
+		if (semver.compare(version, "1.73.0") >= 0) {
 			hasFlexBundleVersion = true;
 		}
 		const processedResources = await flexChangesBundler({

package/lib/tasks/bundlers/generateLibraryPreload.js

@@ -2,7 +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");
+const createModuleNameMapping = require("./utils/createModuleNameMapping");
 
 function getDefaultLibraryPreloadFilters(namespace, excludes) {
 	const filters = [
@@ -177,6 +177,8 @@ function createLibraryBundles(libraryNamespace, resources, excludes) {
 					ignoreMissingModules: true,
 					skipIfEmpty: true
 				}
+				// Note: Although the bundle uses optimize=false, there is
+				// no moduleNameMapping needed, as support files are excluded from minification.
 			},
 			resources
 		})
@@ -212,6 +214,10 @@ function getModuleBundlerOptions(config) {
 		moduleBundlerOptions.bundleDefinition.sections.unshift(providedSection);
 	}
 
+	if (config.moduleNameMapping) {
+		moduleBundlerOptions.moduleNameMapping = config.moduleNameMapping;
+	}
+
 	return moduleBundlerOptions;
 }
 
@@ -285,7 +291,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 		});
 	}
 
-	return combo.byGlob("/**/*.{js,json,xml,html,properties,library}").then(async (resources) => {
+	return combo.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();
@@ -305,6 +311,7 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					return resource.getPath() === "/resources/ui5loader.js";
 				});
 
+				let unoptimizedModuleNameMapping;
 				let unoptimizedResources = resources;
 				if (taskUtil) {
 					unoptimizedResources = await new ReaderCollectionPrioritized({
@@ -313,16 +320,12 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					}).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}");
+					}).byGlob("/**/*.{js,json,xml,html,properties,library,js.map}");
+
+					unoptimizedModuleNameMapping = createModuleNameMapping({
+						resources: unoptimizedResources,
+						taskUtil
+					});
 				}
 
 				let filters;
@@ -337,7 +340,10 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 						resources
 					}),
 					moduleBundler({
-						options: getModuleBundlerOptions({name: "sap-ui-core-dbg.js", filters, preload: false}),
+						options: getModuleBundlerOptions({
+							name: "sap-ui-core-dbg.js", filters, preload: false,
+							moduleNameMapping: unoptimizedModuleNameMapping
+						}),
 						resources: unoptimizedResources
 					}),
 					moduleBundler({
@@ -348,17 +354,27 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 					}),
 					moduleBundler({
 						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: unoptimizedResources
 					}),
 				]).then((results) => {
 					const bundles = Array.prototype.concat.apply([], results);
-					return Promise.all(bundles.map((bundle) => {
+					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);
+							}
 						}
-						return workspace.write(bundle);
+						const writes = [workspace.write(bundle)];
+						if (sourceMap) {
+							writes.push(workspace.write(sourceMap));
+						}
+						return Promise.all(writes);
 					}));
 				});
 			}
@@ -396,12 +412,22 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 						return createLibraryBundles(libraryNamespace, resources, excludes)
 							.then((results) => {
 								const bundles = Array.prototype.concat.apply([], results);
-								return Promise.all(bundles.map((bundle) => {
+								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 workspace.write(bundle);
+										return Promise.all(writes);
 									}
 								}));
 							});

package/lib/tasks/bundlers/generateStandaloneAppBundle.js

@@ -1,6 +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 = {
@@ -88,8 +89,7 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 			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 resources = await combo.byGlob("/resources/**/*.{js,json,xml,html,properties,library,js.map}");
 
 	const isEvo = resources.find((resource) => {
 		return resource.getPath() === "/resources/ui5loader.js";
@@ -101,6 +101,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,
@@ -114,7 +131,7 @@ module.exports = async function({workspace, dependencies, taskUtil, options: {pr
 			}
 		}),
 		moduleBundler({
-			resources,
+			resources: unoptimizedResources,
 			options: {
 				bundleDefinition: getBundleDefinition({
 					name: "sap-ui-custom-dbg.js",
@@ -123,16 +140,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);
 		}));
 	});
 };