Bugfix: update stale HMR after fixed errors

dist/functions/bundler/plugins/esbuild-ctx-artifact-tracker.js

@@ -56,20 +56,13 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                                 _.merge(global.BUNDLER_CTX_MAP[artifact.local_path], artifact);
                         }
                     }
-                    try {
-                        await post_build_fn?.({ artifacts });
-                    }
-                    catch (error) {
-                        log.error(`Post-build Error: ${error}`);
-                    }
                 }
                 const elapsed = (performance.now() - build_start).toFixed(0);
                 log.success(`[Built] in ${elapsed}ms`);
-                global.RECOMPILING = false;
-                global.IS_SERVER_COMPONENT = false;
                 global.MAIN_CTX_BUILD_STARTS = 0;
                 global.BUNDLER_CTX_DISPOSED = false;
                 const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
+                // SSR must finish before HMR so server props are fresh
                 if (build_only) {
                     try {
                         await pagesSSRBundler();
@@ -92,12 +85,17 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                     catch (error) {
                         log.error(`SSR Bundler Error: ${error}`);
                     }
+                    if (artifacts?.[0] && artifacts.length > 0) {
+                        try {
+                            await post_build_fn?.({ artifacts });
+                        }
+                        catch (error) {
+                            log.error(`Post-build Error: ${error}`);
+                        }
+                    }
                 }
-                // if (global.SSR_BUNDLER_CTX) {
-                //     global.SSR_BUNDLER_CTX.rebuild();
-                // } else {
-                //     pagesSSRContextBundler();
-                // }
+                global.RECOMPILING = false;
+                global.IS_SERVER_COMPONENT = false;
             });
         },
     };

dist/functions/bunext-init.js

@@ -40,8 +40,8 @@ export default async function bunextInit(params) {
     else if (is_dev) {
         log.build(`Building Modules ...`);
         await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
             },
         });
         watcherEsbuildCTX();

dist/functions/server/full-rebuild.js

@@ -18,8 +18,8 @@ export default async function fullRebuild(params) {
         }
         catch (error) { }
         await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
             },
         });
     }

dist/functions/server/server-post-build-fn.js

@@ -43,17 +43,16 @@ export default async function serverPostBuildFn(params) {
         const mock_req = target_artifact.req_url
             ? new Request(target_artifact.req_url)
             : new Request(controller.page_url);
-        const page_component = global.IS_SERVER_COMPONENT
-            ? await grabPageComponent({
-                req: mock_req,
-                return_server_res_only: true,
-                is_hydration: true,
-            })
-            : {};
+        // Always re-run server fns so fixed errors clear on the first HMR
+        const page_component = await grabPageComponent({
+            req: mock_req,
+            return_server_res_only: true,
+            is_hydration: true,
+        });
         if (page_component instanceof Response) {
             continue;
         }
-        const { serverRes } = page_component;
+        const { serverRes } = page_component || {};
         const final_artifact = {
             ..._.omit(controller, ["controller"]),
             target_map: target_artifact,
@@ -61,9 +60,8 @@ export default async function serverPostBuildFn(params) {
         if (!target_artifact) {
             delete final_artifact.target_map;
         }
-        if (serverRes) {
-            final_artifact.page_props = serverRes;
-        }
+        // Always replace so prior error props cannot linger
+        final_artifact.page_props = serverRes || {};
         try {
             let final_data = {};
             if (global.ROOT_FILE_UPDATED) {

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

@@ -8,7 +8,9 @@ const { ROOT_DIR } = grabDirNames();
 export default async function grabPageBundledReactComponent({ file_path, return_tsx_only, }) {
     try {
         if (global.SSR_BUNDLER_CTX_MAP?.[file_path]) {
-            const mod = await import(path.join(ROOT_DIR, global.SSR_BUNDLER_CTX_MAP[file_path].path));
+            const abs = path.join(ROOT_DIR, global.SSR_BUNDLER_CTX_MAP[file_path].path);
+            Loader.registry.delete(abs);
+            const mod = await import(`${abs}?t=${Date.now()}`);
             const Main = mod.default;
             return { component: Main };
         }

dist/functions/server/web-pages/grab-page-combined-server-res.js

@@ -16,6 +16,9 @@ export default async function grabPageCombinedServerRes({ file_path, debug, url,
     const final_root_server_path = root_server_ctx_map?.local_path
         ? path.join(ROOT_DIR, root_server_ctx_map.path)
         : root_server_file_path;
+    if (final_root_server_path) {
+        Loader.registry.delete(final_root_server_path);
+    }
     const root_server_module = final_root_server_path
         ? await import(`${final_root_server_path}?t=${now}`)
         : undefined;
@@ -34,6 +37,9 @@ export default async function grabPageCombinedServerRes({ file_path, debug, url,
     const final_page_server_path = page_server_ctx?.local_path
         ? path.join(ROOT_DIR, page_server_ctx.path)
         : server_file_path;
+    if (final_page_server_path) {
+        Loader.registry.delete(final_page_server_path);
+    }
     const server_module = final_page_server_path
         ? await import(`${final_page_server_path}?t=${now}`)
         : undefined;