Update Hydration and HMR logic

src/functions/server/web-pages/generate-web-html.tsx

@@ -7,6 +7,18 @@ import grabWebPageHydrationScript from "./grab-web-page-hydration-script";
 import grabWebMetaHTML from "./grab-web-meta-html";
 import { log } from "../../../utils/log";
 import { AppData } from "../../../data/app-data";
+import { readFileSync } from "fs";
+import path from "path";
+
+let _reactVersion = "19";
+try {
+    _reactVersion = JSON.parse(
+        readFileSync(
+            path.join(process.cwd(), "node_modules/react/package.json"),
+            "utf-8",
+        ),
+    ).version;
+} catch {}
 
 export default async function genWebHTML({
     component,
@@ -54,6 +66,18 @@ export default async function genWebHTML({
     }</script>\n`;
 
     if (bundledMap?.path) {
+        const dev = isDevelopment();
+        const devSuffix = dev ? "?dev" : "";
+        const importMap = JSON.stringify({
+            imports: {
+                react: `https://esm.sh/react@${_reactVersion}${devSuffix}`,
+                "react-dom": `https://esm.sh/react-dom@${_reactVersion}${devSuffix}`,
+                "react-dom/client": `https://esm.sh/react-dom@${_reactVersion}/client${devSuffix}`,
+                "react/jsx-runtime": `https://esm.sh/react@${_reactVersion}/jsx-runtime${devSuffix}`,
+                "react/jsx-dev-runtime": `https://esm.sh/react@${_reactVersion}/jsx-dev-runtime${devSuffix}`,
+            },
+        });
+        html += `        <script type="importmap">${importMap}</script>\n`;
         html += `        <script src="/${bundledMap.path}" type="module" id="${AppData["BunextClientHydrationScriptID"]}" async></script>\n`;
     }
 

src/functions/server/web-pages/grab-page-component.tsx

@@ -62,7 +62,7 @@ export default async function grabPageComponent({
             throw new Error(errMsg);
         }
 
-        const bundledMap = global.BUNDLER_CTX_MAP[file_path];
+        const bundledMap = global.BUNDLER_CTX_MAP?.[file_path];
 
         if (!bundledMap?.path) {
             const errMsg = `No Bundled File Path for this request path!`;

src/functions/server/web-pages/grab-page-error-component.tsx

@@ -33,7 +33,7 @@ export default async function grabPageErrorComponent({
         const filePath = match?.filePath || presetComponent;
 
         const bundledMap = match?.filePath
-            ? global.BUNDLER_CTX_MAP[match.filePath]
+            ? global.BUNDLER_CTX_MAP?.[match.filePath]
             : ({} as BundlerCTXMap);
 
         const module: BunextPageModule = await import(filePath);