From abd6fd44063b7f702a82e29a247679ff63c7e8d6 Mon Sep 17 00:00:00 2001
From: Yanu Widodo <10122431+ynwd@users.noreply.github.com>
Date: Tue, 31 Oct 2023 06:48:45 +0700
Subject: [PATCH 1/2] update #initHtml

---
 http/render.tsx | 31 ++++---------------------------
 1 file changed, 4 insertions(+), 27 deletions(-)

diff --git a/http/render.tsx b/http/render.tsx
index 2e64edf28..d5b2093f7 100644
--- a/http/render.tsx
+++ b/http/render.tsx
@@ -104,7 +104,7 @@ export class Render {
 
     const plaintext = JSON.stringify(this.#options.props);
     const encryptedData = await encryptData(importedKey, plaintext);
-    return `${env}window.__INITIAL_DATA__ = "${encryptedData}";`;
+    return `<script>${env}window.__INITIAL_DATA__ = "${encryptedData}";</script>`;
   };
 
   #initHtml = async (element: Component, html?: any) => {
@@ -199,6 +199,9 @@ export class Render {
           >
             {el}
           </div>
+          <div
+            dangerouslySetInnerHTML={{ __html: await this.#createInitScript() }}
+          />
           {this.#options.html?.body?.script &&
             this.#options.html?.body?.script.map((s) => (
               <script
@@ -244,7 +247,6 @@ es.onmessage = function(e) {
     compID = `${fc.name}${this.#reqUrl}`;
     if (cached && this.#nest[compID]) return this.#nest[compID];
 
-    this.#injectInitScript();
     await this.#handleComponent(fc, this.#options.hydrate);
     const html = await this.#initHtml(e, this.#options.html);
     return this.#nest[compID] = html;
@@ -270,31 +272,6 @@ es.onmessage = function(e) {
     }
   };
 
-  #injectInitScript = () => {
-    if (!this.#options.html) return;
-    const initPath = `${this.#staticPath}/init.js`;
-    this.#server.push(
-      "GET",
-      initPath,
-      async (req: Request) => {
-        const ref = checkReferer(req);
-        if (ref) return ref;
-
-        return new Response(await this.#createInitScript(this.#options.props), {
-          headers: {
-            "Content-Type": "application/javascript",
-          },
-        });
-      },
-    );
-
-    if (this.#options.html?.body?.script) {
-      this.#options.html?.body.script?.push({
-        src: initPath,
-      });
-    }
-  };
-
   #handleDevelopment = () => {
     if (!this.#development) return;
     const refreshPath = `${this.#staticPath}/refresh.js`;

From abb1e12e3e4a711d27cf22c8131d52ad3bce778a Mon Sep 17 00:00:00 2001
From: Yanu Widodo <10122431+ynwd@users.noreply.github.com>
Date: Tue, 31 Oct 2023 07:10:27 +0700
Subject: [PATCH 2/2] update #initHtml: add this.#options.props

---
 http/render.tsx | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/http/render.tsx b/http/render.tsx
index d5b2093f7..02d3bb678 100644
--- a/http/render.tsx
+++ b/http/render.tsx
@@ -199,9 +199,13 @@ export class Render {
           >
             {el}
           </div>
-          <div
-            dangerouslySetInnerHTML={{ __html: await this.#createInitScript() }}
-          />
+          {this.#options.props && (
+            <div
+              dangerouslySetInnerHTML={{
+                __html: await this.#createInitScript(),
+              }}
+            />
+          )}
           {this.#options.html?.body?.script &&
             this.#options.html?.body?.script.map((s) => (
               <script