Persist Request accorss hydration refreshes

src/functions/bundler/plugins/esbuild-ctx-artifact-tracker.ts

@@ -5,6 +5,7 @@ import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-resu
 import pagesSSRContextBundler from "../pages-ssr-context-bundler";
 import buildOnstartErrorHandler from "../build-on-start-error-handler";
 import apiRoutesContextBundler from "../api-routes-context-bundler";
+import _ from "lodash";
 
 let build_start = 0;
 let build_starts = 0;
@@ -50,7 +51,10 @@ export default function esbuildCTXArtifactTracker({
                         const artifact = artifacts[i];
                         if (artifact?.local_path && global.BUNDLER_CTX_MAP) {
                             global.BUNDLER_CTX_MAP[artifact.local_path] =
-                                artifact;
+                                _.merge(
+                                    global.BUNDLER_CTX_MAP[artifact.local_path],
+                                    artifact,
+                                );
                         }
                     }
 

src/functions/bunext-init.ts

@@ -31,9 +31,9 @@ declare global {
     var ROUTER: FileSystemRouter;
     var HMR_CONTROLLERS: GlobalHMRControllerObject[];
     var LAST_BUILD_TIME: number;
-    var BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
-    var SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
-    var API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap } | undefined;
+    var BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
+    var SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
+    var API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
     var BUNDLER_REBUILDS: 0;
     var PAGES_SRC_WATCHER: FSWatcher | undefined;
     var CURRENT_VERSION: string | undefined;

src/functions/server/full-rebuild.ts

@@ -17,11 +17,9 @@ export default async function fullRebuild(params?: { msg?: string }) {
 
         await global.BUNDLER_CTX?.dispose();
         global.BUNDLER_CTX = undefined;
-        global.BUNDLER_CTX_MAP = {};
 
         await global.SSR_BUNDLER_CTX?.dispose();
         global.SSR_BUNDLER_CTX = undefined;
-        global.SSR_BUNDLER_CTX_MAP = {};
 
         allPagesESBuildContextBundler({
             post_build_fn: serverPostBuildFn,

src/functions/server/server-post-build-fn.ts

@@ -24,12 +24,15 @@ export default async function serverPostBuildFn() {
         const target_artifact =
             global.BUNDLER_CTX_MAP[controller.target_map.local_path];
 
-        const mock_req = new Request(controller.page_url);
+        const mock_req = target_artifact.req
+            ? target_artifact.req.clone()
+            : new Request(controller.page_url);
 
         const { serverRes } = global.IS_SERVER_COMPONENT
             ? await grabPageComponent({
                   req: mock_req,
                   return_server_res_only: true,
+                  is_hydration: true,
               })
             : {};
 

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

@@ -23,6 +23,7 @@ type Params = {
     retry?: boolean;
     return_server_res_only?: boolean;
     skip_server_res?: boolean;
+    is_hydration?: boolean;
 };
 
 export default async function grabPageComponent(
@@ -34,6 +35,7 @@ export default async function grabPageComponent(
         debug,
         return_server_res_only,
         skip_server_res,
+        is_hydration,
     } = params;
 
     const url = req?.url ? new URL(req.url) : undefined;
@@ -72,7 +74,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) {
             console.log(global.BUNDLER_CTX_MAP);
@@ -81,6 +83,10 @@ export default async function grabPageComponent(
             throw new Error(errMsg);
         }
 
+        if (req && !is_hydration) {
+            global.BUNDLER_CTX_MAP[file_path].req = req;
+        }
+
         if (debug) {
             log.info(`bundledMap:`, bundledMap);
         }

src/types/index.ts

@@ -310,6 +310,7 @@ export type BundlerCTXMap = {
     url_path: string;
     file_name: string;
     css_path?: string;
+    req?: Request;
 };
 
 export type GlobalHMRControllerObject = {