Fix module watcher errors
This commit is contained in:
@@ -32,7 +32,11 @@ export default async function grabPageBundledReactComponent({
|
||||
|
||||
const Main = mod.default as FC;
|
||||
|
||||
return { component: Main };
|
||||
return {
|
||||
component: Main,
|
||||
page_module: mod.__bunext_page,
|
||||
root_module: mod.__bunext_root,
|
||||
};
|
||||
}
|
||||
|
||||
const { root_file_path } = grabRootFilePath();
|
||||
@@ -60,6 +64,8 @@ export default async function grabPageBundledReactComponent({
|
||||
return {
|
||||
component: Main,
|
||||
tsx,
|
||||
page_module: mod.__bunext_page,
|
||||
root_module: mod.__bunext_root,
|
||||
};
|
||||
} catch (error: any) {
|
||||
log.error(
|
||||
|
||||
@@ -56,18 +56,11 @@ export default async function grabPageModules({
|
||||
);
|
||||
}
|
||||
|
||||
const { root_file_path } = grabRootFilePath();
|
||||
const root_module: BunextRootModule | undefined = root_file_path
|
||||
? await import(`${root_file_path}?t=${now}`)
|
||||
: undefined;
|
||||
|
||||
const module: BunextPageModule = await import(`${file_path}?t=${now}`);
|
||||
|
||||
if (debug) {
|
||||
log.info(`module:`, module);
|
||||
}
|
||||
|
||||
const { component } =
|
||||
const {
|
||||
component,
|
||||
page_module,
|
||||
root_module: bundled_root_module,
|
||||
} =
|
||||
(await grabPageBundledReactComponent({
|
||||
file_path,
|
||||
})) || {};
|
||||
@@ -76,6 +69,23 @@ export default async function grabPageModules({
|
||||
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: BunextRootModule | undefined = !root_file_path
|
||||
? undefined
|
||||
: bundled_root_module || (await import(`${root_file_path}?t=${now}`));
|
||||
|
||||
const module: BunextPageModule =
|
||||
page_module || (await import(`${file_path}?t=${now}`));
|
||||
|
||||
if (debug) {
|
||||
log.info(`module:`, module);
|
||||
}
|
||||
|
||||
if (debug) {
|
||||
log.info(`component:`, component);
|
||||
}
|
||||
|
||||
@@ -27,6 +27,13 @@ export default function grabPageReactComponentString({
|
||||
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: any) {
|
||||
log.error(`grabPageReactComponentString Error: ${error.message}`);
|
||||
|
||||
Reference in New Issue
Block a user