Major Bugfix. Fix server component client compatibility

dist/functions/server/start-server.d.ts

@@ -1 +1 @@
-export default function startServer(): Promise<import("bun").Server>;
+export default function startServer(): Promise<Bun.Server<undefined>>;

dist/functions/server/watcher.js

@@ -3,6 +3,7 @@ import path from "path";
 import grabDirNames from "../../utils/grab-dir-names";
 import rebuildBundler from "./rebuild-bundler";
 import { log } from "../../utils/log";
+import rewritePagesModule from "../../utils/rewrite-pages-module";
 const { ROOT_DIR } = grabDirNames();
 export default async function watcher() {
     await Bun.sleep(1000);
@@ -36,6 +37,7 @@ export default async function watcher() {
                 if (global.RECOMPILING)
                     return;
                 global.RECOMPILING = true;
+                await rewritePagesModule({ page_url: full_file_path });
                 await global.BUNDLER_CTX.rebuild();
             }
             return;

dist/functions/server/web-pages/grab-page-bundled-react-component.js

@@ -1,25 +1,16 @@
 import { jsx as _jsx } from "react/jsx-runtime";
-import EJSON from "../../../utils/ejson";
+import grabPageReactComponentString from "./grab-page-react-component-string";
 import grabTsxStringModule from "./grab-tsx-string-module";
 export default async function grabPageBundledReactComponent({ file_path, root_file, server_res, }) {
     try {
-        let tsx = ``;
-        const server_res_json = JSON.stringify(EJSON.stringify(server_res || {}) ?? "{}");
-        if (root_file) {
-            tsx += `import Root from "${root_file}"\n`;
+        let tsx = grabPageReactComponentString({
+            file_path,
+            root_file,
+            server_res,
+        });
+        if (!tsx) {
+            return undefined;
         }
-        tsx += `import Page from "${file_path}"\n`;
-        tsx += `export default function Main() {\n\n`;
-        tsx += `const props = JSON.parse(${server_res_json})\n\n`;
-        tsx += `    return (\n`;
-        if (root_file) {
-            tsx += `        <Root suppressHydrationWarning={true} {...props}><Page {...props} /></Root>\n`;
-        }
-        else {
-            tsx += `        <Page suppressHydrationWarning={true} {...props} />\n`;
-        }
-        tsx += `    )\n`;
-        tsx += `}\n`;
         const mod = await grabTsxStringModule({ tsx, file_path });
         const Main = mod.default;
         const component = _jsx(Main, {});

dist/functions/server/web-pages/grab-page-react-component-string.d.ts

@@ -0,0 +1,7 @@
+type Params = {
+    file_path: string;
+    root_file?: string;
+    server_res?: any;
+};
+export default function grabPageReactComponentString({ file_path, root_file, server_res, }: Params): string | undefined;
+export {};

dist/functions/server/web-pages/grab-page-react-component-string.js

@@ -0,0 +1,28 @@
+import EJSON from "../../../utils/ejson";
+import pagePathTransform from "../../../utils/page-path-transform";
+export default function grabPageReactComponentString({ file_path, root_file, server_res, }) {
+    try {
+        const target_path = pagePathTransform({ page_path: file_path });
+        let tsx = ``;
+        const server_res_json = JSON.stringify(EJSON.stringify(server_res || {}) ?? "{}");
+        if (root_file) {
+            tsx += `import Root from "${root_file}"\n`;
+        }
+        tsx += `import Page from "${target_path}"\n`;
+        tsx += `export default function Main() {\n\n`;
+        tsx += `const props = JSON.parse(${server_res_json})\n\n`;
+        tsx += `    return (\n`;
+        if (root_file) {
+            tsx += `        <Root suppressHydrationWarning={true} {...props}><Page {...props} /></Root>\n`;
+        }
+        else {
+            tsx += `        <Page suppressHydrationWarning={true} {...props} />\n`;
+        }
+        tsx += `    )\n`;
+        tsx += `}\n`;
+        return tsx;
+    }
+    catch (error) {
+        return undefined;
+    }
+}