solidstep 0.3.1 → 0.3.3

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "solidstep",
-    "version": "0.3.1",
+    "version": "0.3.3",
     "description": "Next Step SolidJS Framework for building web applications.",
     "type": "module",
     "author": "HamzaKV <hamzakv333@gmail.com>",

package/server.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"AAkfA,QAAA,MAAM,OAAO,2FAmXX,CAAC;AAEH,eAAe,OAAO,CAAC"}
+{"version":3,"file":"server.d.ts","sourceRoot":"","sources":["../server.ts"],"names":[],"mappings":"AAkfA,QAAA,MAAM,OAAO,2FA0XX,CAAC;AAEH,eAAe,OAAO,CAAC"}

package/server.js

@@ -343,6 +343,7 @@ const render = async ({ toRender, entry, routeParams, searchParams, req, pageOpt
     };
 };
 let routeManifest = null;
+let clientManifest = null;
 const hydrationScript = ({ nonce, }) => {
     const script = generateHydrationScript();
     return nonce
@@ -365,7 +366,6 @@ const onStart = async () => {
     }
 };
 onStart();
-const clientManifest = getManifest('client');
 const handler = eventHandler(async (event) => {
     const req = toWebRequest(event);
     try {
@@ -375,6 +375,9 @@ const handler = eventHandler(async (event) => {
         if (!routeManifest) {
             routeManifest = await createRouteManifest();
         }
+        if (!clientManifest) {
+            clientManifest = getManifest('client');
+        }
         const cspNonce = event.locals?.cspNonce;
         const urlObj = new URL(req.url);
         const pathnamePart = urlObj.pathname;
@@ -632,6 +635,7 @@ const handler = eventHandler(async (event) => {
                         return '';
                     })
                         .join('\n');
+                    push(`<template id="__page_html__">${html}</template>`);
                     push(`
                         <script ${cspNonce ? `nonce="${cspNonce}"` : ''}>
                         const head = document.querySelector('head');
@@ -642,7 +646,9 @@ const handler = eventHandler(async (event) => {
                         });
                         document.querySelector('script[data-hydration="loading"]')?.remove();
                         const loading = document.querySelector('body');
-                        loading.innerHTML = \`${html}\`;
+                        const template = document.getElementById('__page_html__');
+                        loading.innerHTML = template.innerHTML;
+                        template.remove();
                         </script> 
                     `);
                     push(manifestHtml);