Merge pull request #2 from LaswitchTech/dev

Publishing v1.0.2
LaswitchTech · Jan 23, 2025 · 9da7189 · 9da7189
2 parents fac24b8 + 05881dc
commit 9da7189
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 13 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-1.0.1
+v1.0.2
diff --git a/composer.lock b/composer.lock
diff --git a/src/Router.php b/src/Router.php
@@ -271,6 +271,10 @@ protected function genHTAccess(){
             // Initialize .htaccess
             $htaccess = $errors;
 
+            // Add MIME type for .mjs files
+            $htaccess .= "AddType application/javascript .mjs" . PHP_EOL;
+            $htaccess .= PHP_EOL;
+
             // Apache Headers
             $htaccess .= "<IfModule mod_headers.c>" . PHP_EOL;
             $htaccess .= "  RequestHeader unset Proxy" . PHP_EOL;
@@ -295,6 +299,10 @@ protected function genHTAccess(){
             // Initialize .htaccess
             $htaccess = $errors;
 
+            // Add MIME type for .mjs files
+            $htaccess .= "AddType application/javascript .mjs" . PHP_EOL;
+            $htaccess .= PHP_EOL;
+
             // Apache Headers
             $htaccess .= "<IfModule mod_headers.c>" . PHP_EOL;
             $htaccess .= "  RequestHeader unset Proxy" . PHP_EOL;
@@ -900,15 +908,14 @@ protected function menu($location = 'sidebar', $parent = null) {
             if($parent){
                 if(!isset($param['parent']) || $param['parent'] !== $parent) continue;
             }
-            if($param['template'] !== $this->getTemplate()) continue;
             if(!isset($param['location'])) continue;
             if(is_string($param['location']) && $param['location'] !== $location) continue;
             if(is_array($param['location']) && !in_array($location,$param['location'])) continue;
             if(!$param['public'] && !$this->isAuthenticated()) continue;
             if(!$param['public'] && $param['permission'] && !$this->hasPermission("Route>" . $route, $param['level'])) continue;
 
             $parts = array_filter(explode('/', $route));
-            if(empty($parts)) continue;
+            if(empty($parts)) $parts = [""];
 
             $current = &$menu;
             $accumulated_route = "";
@@ -959,7 +966,12 @@ protected function js(){
         $js = $this->Configurator->get('js');
         foreach($js as $file){
             if(is_file($this->Configurator->root().'/webroot/'.trim($file,'/'))){
-                $html .= '<script src="/'.trim($file,'/').'"></script>' . PHP_EOL;
+                // Check if the file is a module by looking for the file extension
+                if(str_ends_with($file, '.mjs')){
+                    $html .= '<script type="module" src="/'.trim($file,'/').'"></script>' . PHP_EOL;
+                } else {
+                    $html .= '<script src="/'.trim($file,'/').'"></script>' . PHP_EOL;
+                }
             }
         }
         return $html;