Changelog:

- Update: changes way assets are loaded for modern vite configuration

Author: Blair2004

app/Services/CoreService.php

@@ -414,44 +414,58 @@ public function moduleViteAssets( string $fileName, $moduleId ): string
             );
         }
 
-        $manifestPath = rtrim( $module['path'], DIRECTORY_SEPARATOR ) . DIRECTORY_SEPARATOR . 'Public' . DIRECTORY_SEPARATOR . 'build' . DIRECTORY_SEPARATOR . 'manifest.json';
+        $ds     =   DIRECTORY_SEPARATOR;
 
-        if ( ! file_exists( $manifestPath ) ) {
-            throw new NotFoundException(
-                sprintf(
-                    __( 'The manifest.json can\'t be located inside the module %s on the path: %s' ),
-                    $module[ 'name' ],
-                    $manifestPath
-                )
-            );
-        }
+        $possiblePaths  =   [
+            rtrim( $module['path'], $ds ) . $ds . 'Public' . $ds . 'build' . $ds . '.vite' . $ds . 'manifest.json',
+            rtrim( $module['path'], $ds ) . $ds . 'Public' . $ds . 'build' . $ds . 'manifest.json'
+        ];
+
+        $assets = collect( [] );
+        $errors =   [];
+
+        foreach( $possiblePaths as $manifestPath ) {
+            if ( ! file_exists( $manifestPath ) ) {
+                $errors[]   =   $manifestPath;
+                continue;
+            }
+    
+            $manifestArray = json_decode( file_get_contents( $manifestPath ), true );
+    
+            if ( ! isset( $manifestArray[ $fileName ] ) ) {
+                throw new NotFoundException(
+                    sprintf(
+                        __( 'the requested file "%s" can\'t be located inside the manifest.json for the module %s.' ),
+                        $fileName,
+                        $module[ 'name' ]
+                    )
+                );
+            }
+    
+            /**
+             * checks if a css file is declared as well
+             */
+            $jsUrl = asset( 'modules/' . strtolower( $moduleId ) . '/build/' . $manifestArray[ $fileName ][ 'file' ] ) ?? null;
 
-        $manifestArray = json_decode( file_get_contents( $manifestPath ), true );
+            if ( ! empty( $manifestArray[ $fileName ][ 'css' ] ) ) {
+                $assets = collect( $manifestArray[ $fileName ][ 'css' ] )->map( function ( $url ) use ( $moduleId ) {
+                    return '<link rel="stylesheet" href="' . asset( 'modules/' . strtolower( $moduleId ) . '/build/' . $url ) . '"/>';
+                } );
+            }
+    
+            $assets->prepend( '<script type="module" src="' . $jsUrl . '"></script>' );
+        }
 
-        if ( ! isset( $manifestArray[ $fileName ] ) ) {
+        if ( count( $errors ) === count( $possiblePaths ) ) {
             throw new NotFoundException(
                 sprintf(
-                    __( 'the requested file "%s" can\'t be located inside the manifest.json for the module %s.' ),
-                    $fileName,
-                    $module[ 'name' ]
+                    __( 'The manifest file for the module %s wasn\'t found on all possible directories: %s.' ),
+                    $module[ 'name' ],
+                    collect( $errors )->join( ', ' ),
                 )
             );
         }
 
-        /**
-         * checks if a css file is declared as well
-         */
-        $jsUrl = asset( 'modules/' . strtolower( $moduleId ) . '/build/' . $manifestArray[ $fileName ][ 'file' ] ) ?? null;
-        $assets = collect( [] );
-
-        if ( ! empty( $manifestArray[ $fileName ][ 'css' ] ) ) {
-            $assets = collect( $manifestArray[ $fileName ][ 'css' ] )->map( function ( $url ) use ( $moduleId ) {
-                return '<link rel="stylesheet" href="' . asset( 'modules/' . strtolower( $moduleId ) . '/build/' . $url ) . '"/>';
-            } );
-        }
-
-        $assets->prepend( '<script type="module" src="' . $jsUrl . '"></script>' );
-
-        return $assets->join( '' );
+        return $assets->flatten()->join( '' );
     }
 }

config/nexopos.php

@@ -9,7 +9,7 @@
      * This is the core version of NexoPOS. This is used to displays on the
      * dashboard and to ensure a compatibility with the modules.
      */
-    'version' => '5.2.0',
+    'version' => '5.2.1',
 
     /**
      * --------------------------------------------------------------------