Sfoglia il codice sorgente

Fix issue with use_bundled_gui flag

KernelDeimos 1 anno fa
parent
commit
4ecc7372f9
1 ha cambiato i file con 7 aggiunte e 5 eliminazioni
  1. 7 5
      packages/backend/src/temp/puter_page_loader.js

+ 7 - 5
packages/backend/src/temp/puter_page_loader.js

@@ -56,6 +56,8 @@ const generate_puter_page_html = ({
         ? '/src' : '/dist' ;
     // const asset_dir = '/dist';
 
+    const bundled = env != 'dev' || use_bundled_gui;
+
     return `<!DOCTYPE html>
 <html lang="en">
 
@@ -105,7 +107,7 @@ const generate_puter_page_html = ({
 
     <!-- Files from JSON (may be empty) -->
     ${
-        ((env == 'dev' && manifest?.css_paths)
+        ((!bundled && manifest?.css_paths)
             ? manifest.css_paths.map(path => `<link rel="stylesheet" href="${path}">\n`)
             : []).join('')
     }
@@ -120,7 +122,7 @@ const generate_puter_page_html = ({
             : ''
     }
     ${
-        ((env == 'dev' && manifest?.lib_paths)
+        ((!bundled && manifest?.lib_paths)
             ? manifest.lib_paths.map(path => `<script type="text/javascript" src="${path}"></script>\n`)
             : []).join('')
     }
@@ -129,7 +131,7 @@ const generate_puter_page_html = ({
     window.icons = {};
 
     ${(() => {
-        if ( !(env == 'dev' && manifest) ) return '';
+        if ( !(!bundled && manifest) ) return '';
         const html = [];
         fs_.readdirSync(path_.join(gui_path, 'src/icons')).forEach(file => {
             // skip dotfiles
@@ -150,12 +152,12 @@ const generate_puter_page_html = ({
     </script>
 
     ${
-        ((env == 'dev' && manifest?.js_paths)
+        ((!bundled && manifest?.js_paths)
             ? manifest.js_paths.map(path => `<script type="module" src="${path}"></script>\n`)
             : []).join('')
     }
     <!-- Load the GUI script -->
-    <script ${ env == 'dev' ? ' type="module"' : ''} src="${(env == 'dev' && manifest?.index) || '/dist/gui.js'}"></script>
+    <script ${ !bundled ? ' type="module"' : ''} src="${(!bundled && manifest?.index) || '/dist/gui.js'}"></script>
     <!-- Initialize GUI when document is loaded -->
     <script>
     window.addEventListener('load', function() {