[INTERNAL] Bundle generators: Adapt to latest ReaderFilter changes

See SAP/ui5-fs#331
SAP · Dec 2, 2021 · be2833f · be2833f
1 parent 1a5cf5e
commit be2833f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 22 deletions.
diff --git a/lib/tasks/bundlers/generateBundle.js b/lib/tasks/bundlers/generateBundle.js
@@ -25,14 +25,11 @@ module.exports = function({
 	});
 
 	if (taskUtil) {
-		combo = combo.filter({
-			resourceTagCollection: taskUtil.getResourceTagCollection(),
-			matchMode: "none",
-			filters: [{
-				tag: bundleOptions.optimize ? // Omit -dbg files for optimize bundles and vice versa
-					taskUtil.STANDARD_TAGS.IsDebugVariant : taskUtil.STANDARD_TAGS.HasDebugVariant,
-				value: true
-			}]
+		// Omit -dbg files for optimize bundles and vice versa
+		const filterTag = bundleOptions.optimize ?
+			taskUtil.STANDARD_TAGS.IsDebugVariant : taskUtil.STANDARD_TAGS.HasDebugVariant;
+		combo = combo.filter(function(resource) {
+			return !taskUtil.getTag(resource, filterTag);
 		});
 	}
 

diff --git a/lib/tasks/bundlers/generateComponentPreload.js b/lib/tasks/bundlers/generateComponentPreload.js
@@ -34,13 +34,9 @@ module.exports = function({
 	});
 
 	if (taskUtil) {
-		combo = combo.filter({
-			resourceTagCollection: taskUtil.getResourceTagCollection(),
-			matchMode: "none",
-			filters: [{
-				tag: taskUtil.STANDARD_TAGS.IsDebugVariant,
-				value: true,
-			}]
+		combo = combo.filter(function(resource) {
+			// Remove any debug variants
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
 		});
 	}
 

diff --git a/lib/tasks/bundlers/generateLibraryPreload.js b/lib/tasks/bundlers/generateLibraryPreload.js
@@ -278,13 +278,9 @@ module.exports = function({workspace, dependencies, taskUtil, options: {projectN
 	});
 
 	if (taskUtil) {
-		combo = combo.filter({
-			resourceTagCollection: taskUtil.getResourceTagCollection(),
-			matchMode: "none",
-			filters: [{
-				tag: taskUtil.STANDARD_TAGS.IsDebugVariant,
-				value: true
-			}]
+		combo = combo.filter(function(resource) {
+			// Remove any debug variants
+			return !taskUtil.getTag(resource, taskUtil.STANDARD_TAGS.IsDebugVariant);
 		});
 	}