Fix module watcher errors

2026-10-14 12:30:41 +01:00
parent eefb2ea5d2
commit 3025b1681d
9 changed files with 76 additions and 24 deletions
@@ -14,7 +14,11 @@ export default async function grabPageBundledReactComponent({ file_path, return_
            // Loader.registry.delete(abs);
            const mod = await import(`${abs}?t=${Date.now()}`);
            const Main = mod.default;
-            return { component: Main };
+            return {
+                component: Main,
+                page_module: mod.__bunext_page,
+                root_module: mod.__bunext_root,
+            };
        }
        const { root_file_path } = grabRootFilePath();
        let tsx = grabPageReactComponentString({
@@ -35,6 +39,8 @@ export default async function grabPageBundledReactComponent({ file_path, return_
        return {
            component: Main,
            tsx,
+            page_module: mod.__bunext_page,
+            root_module: mod.__bunext_root,
        };
    }
    catch (error) {
@@ -19,20 +19,25 @@ export default async function grabPageModules({ file_path, debug, url, query, ro
            ? 301
            : serverRes.redirect.status_code || 302);
    }
-    const { root_file_path } = grabRootFilePath();
-    const root_module = root_file_path
-        ? await import(`${root_file_path}?t=${now}`)
-        : undefined;
-    const module = await import(`${file_path}?t=${now}`);
-    if (debug) {
-        log.info(`module:`, module);
-    }
-    const { component } = (await grabPageBundledReactComponent({
+    const { component, page_module, root_module: bundled_root_module, } = (await grabPageBundledReactComponent({
        file_path,
    })) || {};
    if (!component) {
        throw new Error(`Couldn't grab page component`);
    }
+    // Prefer the page/root exports re-exported by the SSR bundle. Importing
+    // the raw source with Bun's loader only cache-busts the page file itself:
+    // its transitive imports stay in Bun's module registry, so a component
+    // that failed to resolve once (e.g. imported before it was created)
+    // keeps failing until the server restarts.
+    const { root_file_path } = grabRootFilePath();
+    const root_module = !root_file_path
+        ? undefined
+        : bundled_root_module || (await import(`${root_file_path}?t=${now}`));
+    const module = page_module || (await import(`${file_path}?t=${now}`));
+    if (debug) {
+        log.info(`module:`, module);
+    }
    if (debug) {
        log.info(`component:`, component);
    }
@@ -16,6 +16,12 @@ export default function grabPageReactComponentString({ file_path, root_file_path
        }
        tsx += `    )\n`;
        tsx += `}\n`;
+        // Expose the page/root's own exports (meta, Head, config, ...) through
+        // the bundle so the server never has to import the raw source files.
+        tsx += `export * as __bunext_page from "${file_path}"\n`;
+        if (root_file_path) {
+            tsx += `export * as __bunext_root from "${root_file_path}"\n`;
+        }
        return tsx;
    }
    catch (error) {