Moduletrace/bunext
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update HMR logic. Refresh on server props update.

Browse Source
This commit is contained in:
Benjamin Toby 2026-03-21 18:03:36 +01:00
parent a504046a36
commit 32056b5cb6
9 changed files with 58 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dist/functions/bundler/grab-client-hydration-script.js vendored
View File

@ -5,7 +5,7 @@ import AppNames from "../../utils/grab-app-names";
import grabConstants from "../../utils/grab-constants";
const { PAGES_DIR } = grabDirNames();
export default function grabClientHydrationScript({ page_local_path }) {
const { ClientRootElementIDName, ClientRootComponentWindowName } = grabConstants();
const { ClientRootElementIDName, ClientRootComponentWindowName, ClientWindowPagePropsName, } = grabConstants();
const root_component_path = path.join(PAGES_DIR, `${AppNames["RootPagesComponentName"]}.tsx`);
const does_root_exist = existsSync(root_component_path);
let txt = ``;
@ -14,7 +14,7 @@ export default function grabClientHydrationScript({ page_local_path }) {
txt += `import Root from "${root_component_path}";\n`;
}
txt += `import Page from "${page_local_path}";\n\n`;
txt += `const pageProps = window.__PAGE_PROPS__ || {};\n`;
txt += `const pageProps = window.${ClientWindowPagePropsName} || {};\n`;
if (does_root_exist) {
txt += `const component = <Root suppressHydrationWarning={true} {...pageProps}><Page {...pageProps} /></Root>\n`;
}
@ -29,7 +29,7 @@ export default function grabClientHydrationScript({ page_local_path }) {
txt += ` } });\n\n`;
txt += ` window.${ClientRootComponentWindowName} = root;\n`;
txt += ` window.__BUNEXT_RERENDER__ = (NewPage) => {\n`;
txt += ` const props = window.__PAGE_PROPS__ || {};\n`;
txt += ` const props = window.${ClientWindowPagePropsName} || {};\n`;
txt += ` root.render(<NewPage {...props} />);\n`;
txt += ` };\n`;
txt += `}\n`;

8
dist/functions/server/server-post-build-fn.js vendored
View File

@ -1,4 +1,5 @@
import _ from "lodash";
import grabPageComponent from "./web-pages/grab-page-component";
export default async function serverPostBuildFn({ artifacts }) {
if (!global.IS_FIRST_BUNDLE_READY) {
global.IS_FIRST_BUNDLE_READY = true;
@ -9,6 +10,10 @@ export default async function serverPostBuildFn({ artifacts }) {
for (let i = 0; i < global.HMR_CONTROLLERS.length; i++) {
const controller = global.HMR_CONTROLLERS[i];
const target_artifact = artifacts.find((a) => controller.target_map?.local_path == a.local_path);
const mock_req = new Request(controller.page_url);
const { serverRes } = await grabPageComponent({
req: mock_req,
});
const final_artifact = {
..._.omit(controller, ["controller"]),
target_map: target_artifact,
@ -16,6 +21,9 @@ export default async function serverPostBuildFn({ artifacts }) {
if (!target_artifact) {
delete final_artifact.target_map;
}
if (serverRes) {
final_artifact.page_props = serverRes;
}
try {
controller.controller.enqueue(`event: update\ndata: ${JSON.stringify(final_artifact)}\n\n`);
}

5
dist/functions/server/web-pages/grab-web-page-hydration-script.js vendored
View File

@ -1,5 +1,7 @@
import { AppData } from "../../../data/app-data";
import grabConstants from "../../../utils/grab-constants";
export default async function (params) {
const { ClientWindowPagePropsName } = grabConstants();
let script = "";
script += `console.log(\`Development Environment\`);\n\n`;
script += `const _ce = console.error.bind(console);\n`;
@ -28,6 +30,9 @@ export default async function (params) {
script += ` document.getElementById("__bunext_error_overlay")?.remove();\n`;
script += ` const data = JSON.parse(event.data);\n`;
// script += ` console.log("data", data);\n`;
script += ` if (data.page_props) {\n`;
script += ` window.${ClientWindowPagePropsName} = data.page_props\n`;
script += ` }\n`;
script += ` const oldCSSLink = document.querySelector('link[rel="stylesheet"]');\n`;
script += ` if (data.target_map.css_path) {\n`;
script += ` const newLink = document.createElement("link");\n`;

10
dist/types/index.d.ts vendored
View File

@ -210,6 +210,15 @@ export type BunextPageModuleServerReturn<T extends {
cacheExpiry?: number;
url?: BunextPageModuleServerReturnURLObject;
};
export type BunextPageProps<T extends {
[k: string]: any;
} = {
[k: string]: any;
}, Q extends {
[k: string]: any;
} = {
[k: string]: any;
}> = BunextPageModuleServerReturn<T, Q>;
export type BunextPageModuleServerReturnURLObject = URL & {};
export type BunextPageModuleServerRedirect = {
destination: string;
@ -254,6 +263,7 @@ export type GlobalHMRControllerObject = {
controller: ReadableStreamDefaultController<string>;
page_url: string;
target_map?: BundlerCTXMap;
page_props?: any;
};
export type BunextCacheFileMeta = {
date_created: number;

2
package.json
View File

@ -27,7 +27,7 @@
],
"scripts": {
"dev": "tsc --watch",
"git:push": "tsc --noEmit && tsc && git add . && git commit -m 'Update dependencies.' && git push",
"git:push": "tsc --noEmit && tsc && git add . && git commit -m 'Update HMR logic. Refresh on server props update.' && git push",
"compile": "bun build ./src/commands/index.ts --compile --outfile bin/bunext --minify",
"build": "tsc",
"test": "bun test --max-concurrency=1"

11
src/functions/bundler/grab-client-hydration-script.ts
View File

@ -11,8 +11,11 @@ type Params = {
};
export default function grabClientHydrationScript({ page_local_path }: Params) {
const { ClientRootElementIDName, ClientRootComponentWindowName } =
grabConstants();
const {
ClientRootElementIDName,
ClientRootComponentWindowName,
ClientWindowPagePropsName,
} = grabConstants();
const root_component_path = path.join(
PAGES_DIR,
@ -28,7 +31,7 @@ export default function grabClientHydrationScript({ page_local_path }: Params) {
txt += `import Root from "${root_component_path}";\n`;
}
txt += `import Page from "${page_local_path}";\n\n`;
txt += `const pageProps = window.__PAGE_PROPS__ || {};\n`;
txt += `const pageProps = window.${ClientWindowPagePropsName} || {};\n`;
if (does_root_exist) {
txt += `const component = <Root suppressHydrationWarning={true} {...pageProps}><Page {...pageProps} /></Root>\n`;
@ -45,7 +48,7 @@ export default function grabClientHydrationScript({ page_local_path }: Params) {
txt += ` window.${ClientRootComponentWindowName} = root;\n`;
txt += ` window.__BUNEXT_RERENDER__ = (NewPage) => {\n`;
txt += ` const props = window.__PAGE_PROPS__ || {};\n`;
txt += ` const props = window.${ClientWindowPagePropsName} || {};\n`;
txt += ` root.render(<NewPage {...props} />);\n`;
txt += ` };\n`;
txt += `}\n`;

11
src/functions/server/server-post-build-fn.ts
View File

@ -1,5 +1,6 @@
import _ from "lodash";
import type { BundlerCTXMap, GlobalHMRControllerObject } from "../../types";
import grabPageComponent from "./web-pages/grab-page-component";
type Params = {
artifacts: BundlerCTXMap[];
@ -21,6 +22,12 @@ export default async function serverPostBuildFn({ artifacts }: Params) {
(a) => controller.target_map?.local_path == a.local_path,
);
const mock_req = new Request(controller.page_url);
const { serverRes } = await grabPageComponent({
req: mock_req,
});
const final_artifact: Omit<GlobalHMRControllerObject, "controller"> = {
..._.omit(controller, ["controller"]),
target_map: target_artifact,
@ -30,6 +37,10 @@ export default async function serverPostBuildFn({ artifacts }: Params) {
delete final_artifact.target_map;
}
if (serverRes) {
final_artifact.page_props = serverRes;
}
try {
controller.controller.enqueue(
`event: update\ndata: ${JSON.stringify(final_artifact)}\n\n`,

7
src/functions/server/web-pages/grab-web-page-hydration-script.tsx
View File

@ -1,11 +1,14 @@
import type { BundlerCTXMap } from "../../../types";
import { AppData } from "../../../data/app-data";
import grabConstants from "../../../utils/grab-constants";
type Params = {
bundledMap?: BundlerCTXMap;
};
export default async function (params?: Params) {
const { ClientWindowPagePropsName } = grabConstants();
let script = "";
script += `console.log(\`Development Environment\`);\n\n`;
@ -38,6 +41,10 @@ export default async function (params?: Params) {
script += ` const data = JSON.parse(event.data);\n`;
// script += ` console.log("data", data);\n`;
script += ` if (data.page_props) {\n`;
script += ` window.${ClientWindowPagePropsName} = data.page_props\n`;
script += ` }\n`;
script += ` const oldCSSLink = document.querySelector('link[rel="stylesheet"]');\n`;
script += ` if (data.target_map.css_path) {\n`;

6
src/types/index.ts
View File

@ -229,6 +229,11 @@ export type BunextPageModuleServerReturn<
url?: BunextPageModuleServerReturnURLObject;
};
export type BunextPageProps<
T extends { [k: string]: any } = { [k: string]: any },
Q extends { [k: string]: any } = { [k: string]: any },
> = BunextPageModuleServerReturn<T, Q>;
export type BunextPageModuleServerReturnURLObject = URL & {};
export type BunextPageModuleServerRedirect = {
@ -280,6 +285,7 @@ export type GlobalHMRControllerObject = {
controller: ReadableStreamDefaultController<string>;
page_url: string;
target_map?: BundlerCTXMap;
page_props?: any;
};
export type BunextCacheFileMeta = {