From 965dfaa1da58e82b7737cb04a72e110d31fe16e7 Mon Sep 17 00:00:00 2001
From: nobody <info@localcdn.org>
Date: Mon, 9 Nov 2020 19:42:09 +0100
Subject: [PATCH] Improved: Bundles detection

---
 core/request-analyzer.js    |  2 +-
 modules/internal/targets.js | 17 +++++++++--------
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/core/request-analyzer.js b/core/request-analyzer.js
index 898563eb..cde587ee 100644
--- a/core/request-analyzer.js
+++ b/core/request-analyzer.js
@@ -155,7 +155,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
             }
 
             // Get bundle name
-            let bundle = targets.determineBundle(channelPath);
+            let bundle = targets.determineBundle(targetPath);
             if (bundle !== '') {
                 filename = channelPath.split('/').pop();
                 targetPath = ( RegExp('.*\.css$').test(filename) ) ? targetPath + filename : targetPath + filename + 'm';
diff --git a/modules/internal/targets.js b/modules/internal/targets.js
index 6c4cf0c7..f5eb5610 100644
--- a/modules/internal/targets.js
+++ b/modules/internal/targets.js
@@ -24,20 +24,21 @@ var targets = {};
  * Public Methods
  */
 
-targets.determineBundle = function (path = '') {
-    if (path.includes('findify')) {
+targets.determineBundle = function (path) {
+    path = path.replace('resources', '');
+    if (path.startsWith('/findify')) {
         return 'Findify';
-    } else if (path.includes('bootstrap-datepicker')) {
+    } else if (path.startsWith('/bootstrap-datepicker')) {
         return 'Bootstrap Datepicker';
-    } else if (path.includes('/jquery.lazy/')) {
+    } else if (path.startsWith('/jquery.lazy/')) {
         return 'jQuery Lazy';
-    } else if (path.includes('/waypoints/')) {
+    } else if (path.startsWith('/waypoints/')) {
         return 'Waypoints';
-    } else if (path.includes('/highlight.js/')) {
+    } else if (path.startsWith('/highlight.js/')) {
         return 'highlight.js';
-    } else if (path.includes('/element-ui/')) {
+    } else if (path.startsWith('/element-ui/')) {
         return 'ElementUI';
-    } else if (path.includes('/select2/')) {
+    } else if (path.startsWith('/select2/')) {
         return 'Select2';
     } else {
         return '';