Fix browser import for Meilisearch frontend client

composer.json

@@ -1,5 +1,5 @@
 {
-  "name": "mummert/contao-meilisearch-bundle",
+  "name": "mummert-media/contao-meilisearch-bundle",
   "description": "Contao Meilisearch integration bundle",
   "type": "contao-bundle",
   "license": "MIT",
@@ -12,10 +12,10 @@
   },
   "autoload": {
     "psr-4": {
-      "Mummert\\ContaoMeilisearchBundle\\": "src/"
+      "MummertMedia\\ContaoMeilisearchBundle\\": "src/"
     }
   },
   "extra": {
-    "contao-manager-plugin": "Mummert\\ContaoMeilisearchBundle\\ContaoManager\\Plugin"
+    "contao-manager-plugin": "MummertMedia\\ContaoMeilisearchBundle\\ContaoManager\\Plugin"
   }
 }

src/Command/MeilisearchFilesCleanupCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Command;
+namespace MummertMedia\ContaoMeilisearchBundle\Command;
 
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Doctrine\DBAL\Connection;

src/Command/MeilisearchFilesParseCommand.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Command;
+namespace MummertMedia\ContaoMeilisearchBundle\Command;
 
 use Contao\CoreBundle\Framework\ContaoFramework;
 use Contao\Database;

src/Command/MeilisearchIndexCommand.php

@@ -1,8 +1,8 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Command;
+namespace MummertMedia\ContaoMeilisearchBundle\Command;
 
-use Mummert\ContaoMeilisearchBundle\Service\MeilisearchIndexService;
+use MummertMedia\ContaoMeilisearchBundle\Service\MeilisearchIndexService;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;

src/ContaoManager/Plugin.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\ContaoManager;
+namespace MummertMedia\ContaoMeilisearchBundle\ContaoManager;
 
 use Contao\CalendarBundle\ContaoCalendarBundle;
 use Contao\CoreBundle\ContaoCoreBundle;
@@ -8,7 +8,7 @@ use Contao\ManagerPlugin\Bundle\BundlePluginInterface;
 use Contao\ManagerPlugin\Bundle\Config\BundleConfig;
 use Contao\ManagerPlugin\Bundle\Parser\ParserInterface;
 use Contao\NewsBundle\ContaoNewsBundle;
-use Mummert\ContaoMeilisearchBundle\ContaoMeilisearchBundle;
+use MummertMedia\ContaoMeilisearchBundle\ContaoMeilisearchBundle;
 
 class Plugin implements BundlePluginInterface
 {

src/ContaoMeilisearchBundle.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle;
+namespace MummertMedia\ContaoMeilisearchBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 

src/Controller/FrontendModule/MeilisearchSearchController.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Controller\FrontendModule;
+namespace MummertMedia\ContaoMeilisearchBundle\Controller\FrontendModule;
 
 use Contao\Config;
 use Contao\CoreBundle\Controller\FrontendModule\AbstractFrontendModuleController;

src/DependencyInjection/ContaoMeilisearchExtension.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\DependencyInjection;
+namespace MummertMedia\ContaoMeilisearchBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;

src/EventListener/IndexPageListener.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\EventListener;
+namespace MummertMedia\ContaoMeilisearchBundle\EventListener;
 
 use Contao\Config;
 use Contao\System;
-use Mummert\ContaoMeilisearchBundle\Service\MeilisearchFileHelper;
+use MummertMedia\ContaoMeilisearchBundle\Service\MeilisearchFileHelper;
 
 class IndexPageListener
 {

src/EventListener/MeilisearchPageMarkerListener.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\EventListener;
+namespace MummertMedia\ContaoMeilisearchBundle\EventListener;
 
 use Contao\CalendarEventsModel;
 use Contao\Config;

src/Resources/config/services.yaml

@@ -2,24 +2,24 @@ services:
   # Alias MUSS vorhanden sein (richtig platziert)
   Psr\Container\ContainerInterface: '@service_container'
 
-  Mummert\ContaoMeilisearchBundle\:
+  MummertMedia\ContaoMeilisearchBundle\:
     resource: '../../{Command,EventListener,Service}'
     autowire: true
     autoconfigure: true
 
-  Mummert\ContaoMeilisearchBundle\EventListener\MeilisearchPageMarkerListener:
+  MummertMedia\ContaoMeilisearchBundle\EventListener\MeilisearchPageMarkerListener:
     autowire: true
     autoconfigure: false
     tags:
       - { name: contao.hook, hook: outputFrontendTemplate, method: onOutputFrontendTemplate }
 
-  Mummert\ContaoMeilisearchBundle\EventListener\IndexPageListener:
+  MummertMedia\ContaoMeilisearchBundle\EventListener\IndexPageListener:
     autowire: true
     autoconfigure: false
     tags:
       - { name: contao.hook, hook: indexPage, method: onIndexPage }
 
-  Mummert\ContaoMeilisearchBundle\Controller\FrontendModule\MeilisearchSearchController:
+  MummertMedia\ContaoMeilisearchBundle\Controller\FrontendModule\MeilisearchSearchController:
     autowire: true
     autoconfigure: false
     tags:

src/Resources/contao/config/config.php

@@ -1,6 +1,6 @@
 <?php
 
-use Mummert\ContaoMeilisearchBundle\EventListener\MeilisearchPageMarkerListener;
+use MummertMedia\ContaoMeilisearchBundle\EventListener\MeilisearchPageMarkerListener;
 
 
 $GLOBALS['TL_HOOKS']['outputFrontendTemplate'][] = [

src/Resources/contao/templates/frontend_module/mod_meilisearch_search.html.twig

@@ -60,45 +60,16 @@ Contao 5 – Frontend Module Template
     </div>
 </div>
 
+<script type="module">
+<script src="https://cdn.jsdelivr.net/npm/meilisearch@0.39.0/dist/bundles/meilisearch.umd.min.js"></script>
 <script>
-    (function () {
+    document.addEventListener('DOMContentLoaded', () => {
-        const CDN_URLS = [
-            'https://cdn.jsdelivr.net/npm/meilisearch@0.39.0/dist/bundles/meilisearch.umd.min.js',
-            'https://unpkg.com/meilisearch@0.39.0/dist/bundles/meilisearch.umd.min.js'
-        ];
 
-        function loadClient(urls, onDone) {
+        if (typeof MeiliSearch === 'undefined') {
-            if (typeof MeiliSearch !== 'undefined') {
+            console.error('[Meilisearch] Browser client konnte nicht geladen werden');
-                onDone(true, null);
             return;
         }
 
-            if (!urls.length) {
-                onDone(false, 'Alle CDN-Quellen fehlgeschlagen (mögliche CSP-Blockierung von script-src).');
-                return;
-            }
-
-            const url = urls.shift();
-            const script = document.createElement('script');
-            script.src = url;
-            script.async = true;
-            script.crossOrigin = 'anonymous';
-
-            script.onload = () => {
-                if (typeof MeiliSearch !== 'undefined') {
-                    onDone(true, null);
-                } else {
-                    loadClient(urls, onDone);
-                }
-            };
-
-            script.onerror = () => loadClient(urls, onDone);
-
-            document.head.appendChild(script);
-        }
-
-        function initSearch() {
-
         const wrapper  = document.querySelector('.meilisearch-search');
         if (!wrapper) return;
 
@@ -255,19 +226,7 @@ Contao 5 – Frontend Module Template
                 results.appendChild(node);
             }
         }
-        }
-
-        document.addEventListener('DOMContentLoaded', () => {
-            loadClient([...CDN_URLS], (ok, reason) => {
-                if (!ok) {
-                    console.error('[Meilisearch] Browser client konnte nicht geladen werden. ' + reason);
-                    return;
-                }
-
-                initSearch();
     });
-        });
-    })();
 </script>
 {% endblock %}
 <!-- indexer::continue -->

src/Service/MeilisearchFileHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Service;
+namespace MummertMedia\ContaoMeilisearchBundle\Service;
 
 use Contao\FilesModel;
 use Contao\StringUtil;

src/Service/MeilisearchImageHelper.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Service;
+namespace MummertMedia\ContaoMeilisearchBundle\Service;
 
 use Contao\Config;
 use Contao\CoreBundle\Framework\ContaoFramework;

src/Service/MeilisearchIndexService.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Mummert\ContaoMeilisearchBundle\Service;
+namespace MummertMedia\ContaoMeilisearchBundle\Service;
 
 use Contao\Config;
 use Contao\CoreBundle\Framework\ContaoFramework;