WIP: Fix defaultFileTypes

SAP · Feb 8, 2021 · 759a4ae · 759a4ae
1 parent 17561bb
commit 759a4ae
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 6 deletions.
diff --git a/lib/lbt/bundle/AutoSplitter.js b/lib/lbt/bundle/AutoSplitter.js
@@ -47,7 +47,7 @@ class AutoSplitter {
 		this.optimize = !!options.optimize;
 
 		// ---- resolve module definition
-		const resolvedModule = await this.resolver.resolve(moduleDef, options);
+		const resolvedModule = await this.resolver.resolve(moduleDef);
 		// ---- calculate overall size of merged module
 
 		if ( moduleDef.configuration ) {

diff --git a/lib/lbt/bundle/Builder.js b/lib/lbt/bundle/Builder.js
@@ -133,7 +133,7 @@ class BundleBuilder {
 	}
 
 	async _createBundle(module, options) {
-		const resolvedModule = await this.resolver.resolve(module, options);
+		const resolvedModule = await this.resolver.resolve(module);
 		if ( options.skipIfEmpty && isEmptyBundle(resolvedModule) ) {
 			log.verbose("  skipping empty bundle " + module.name);
 			return undefined;

diff --git a/lib/lbt/bundle/Resolver.js b/lib/lbt/bundle/Resolver.js
@@ -13,6 +13,10 @@ const log = require("@ui5/logger").getLogger("lbt:bundle:Resolver");
 
 let dependencyTracker;
 
+const DEFAULT_FILE_TYPES = [
+	// TODO
+];
+
 /**
  * Resolve a bundle definition.
  *
@@ -32,13 +36,11 @@ class BundleResolver {
 
 	/**
 	 * @param {ModuleDefinition} bundle Bundle definition to resolve
-	 * @param {object} [options] Options
-	 * @param {string[]} [options.defaultFileTypes]
 	 			List of default file types to which a prefix pattern shall be expanded.
 	 * @returns {Promise<ResolvedBundleDefinition>}
 	 */
-	resolve(bundle, options) {
-		const fileTypes = (options && options.defaultFileTypes) || undefined;
+	resolve(bundle) {
+		const fileTypes = bundle.defaultFileTypes || DEFAULT_FILE_TYPES;
 		let visitedResources = Object.create(null);
 		let selectedResources = Object.create(null);
 		let selectedResourcesSequence = [];