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

Refactor SSR strategy. Redirect before bundling any page component. Additional bugfixes for dev environment

Browse Source
This commit is contained in:
tben
2026-04-12 16:20:16 +01:00
parent 84d490b189
commit f0aae8a8fa
27 changed files with 210 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/functions/bundler/all-pages-esbuild-context-bundler.ts
+4 -2
View File
@@ -4,7 +4,7 @@ import grabDirNames from "../../utils/grab-dir-names";
import isDevelopment from "../../utils/is-development";
import tailwindEsbuildPlugin from "../server/web-pages/tailwind-esbuild-plugin";
import grabClientHydrationScript from "./grab-client-hydration-script";
import type { PageFiles } from "../../types";
import type { BundlerCTXMap, PageFiles } from "../../types";
import path from "path";
import virtualFilesPlugin from "./plugins/virtual-files-plugin";
import esbuildCTXArtifactTracker from "./plugins/esbuild-ctx-artifact-tracker";
@@ -12,7 +12,9 @@ import esbuildCTXArtifactTracker from "./plugins/esbuild-ctx-artifact-tracker";
const { HYDRATION_DST_DIR, BUNX_HYDRATION_SRC_DIR } = grabDirNames();
type Params = {
post_build_fn?: (params: { artifacts: any[] }) => Promise<void> | void;
post_build_fn?: (params: {
artifacts: BundlerCTXMap[];
}) => Promise<void> | void;
};
export default async function allPagesESBuildContextBundler(params?: Params) {
src/functions/bundler/build-on-start-error-handler.ts
-2
View File
@@ -1,5 +1,3 @@
import { log } from "../../utils/log";
type Params = {};
export default async function buildOnstartErrorHandler(params?: Params) {
src/functions/bunext-init.ts
+3 -1
View File
@@ -89,7 +89,9 @@ export default async function bunextInit() {
if (is_dev) {
log.build(`Building Modules ...`);
await allPagesESBuildContextBundler({
post_build_fn: serverPostBuildFn,
post_build_fn: () => {
serverPostBuildFn();
},
});
watcherEsbuildCTX();
} else {
src/functions/server/full-rebuild.ts
+3 -1
View File
@@ -22,7 +22,9 @@ export default async function fullRebuild(params?: { msg?: string }) {
global.SSR_BUNDLER_CTX = undefined;
allPagesESBuildContextBundler({
post_build_fn: serverPostBuildFn,
post_build_fn: () => {
serverPostBuildFn();
},
});
} catch (error: any) {
log.error(error);
src/functions/server/server-post-build-fn.ts
+35 -8
View File
@@ -2,33 +2,54 @@ import _ from "lodash";
import type { GlobalHMRControllerObject } from "../../types";
import grabPageComponent from "./web-pages/grab-page-component";
export default async function serverPostBuildFn() {
type Params = {
reload_all_controllers?: boolean;
};
export default async function serverPostBuildFn(params?: Params) {
if (!global.HMR_CONTROLLERS?.[0] || !global.BUNDLER_CTX_MAP) {
return;
}
const reload_payload = { reload: true };
const reload_enqueue = `event: update\ndata: ${JSON.stringify(reload_payload)}\n\n`;
for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
const controller = global.HMR_CONTROLLERS[i];
if (!controller?.target_map?.local_path) {
if (!controller) {
continue;
}
if (global.IS_404_PAGE) {
controller.controller.enqueue(
`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
);
if (!controller.target_map?.local_path) {
// if (global.IS_404_PAGE) {
// controller.controller.enqueue(reload_enqueue);
// }
// if (!global.HMR_CONTROLLERS[i].page_reloaded) {
// controller.controller.enqueue(reload_enqueue);
// global.HMR_CONTROLLERS[i].page_reloaded = true;
// }
continue;
}
if (params?.reload_all_controllers) {
controller.controller.enqueue(reload_enqueue);
continue;
}
const target_artifact =
global.BUNDLER_CTX_MAP[controller.target_map.local_path];
if (!target_artifact.local_path) {
controller.controller.enqueue(reload_enqueue);
continue;
}
const mock_req = target_artifact.req
? target_artifact.req.clone()
: new Request(controller.page_url);
const { serverRes } = global.IS_SERVER_COMPONENT
const page_component = global.IS_SERVER_COMPONENT
? await grabPageComponent({
req: mock_req,
return_server_res_only: true,
@@ -36,6 +57,12 @@ export default async function serverPostBuildFn() {
})
: {};
if (page_component instanceof Response) {
continue;
}
const { serverRes } = page_component;
const final_artifact: Omit<GlobalHMRControllerObject, "controller"> = {
..._.omit(controller, ["controller"]),
target_map: target_artifact,
@@ -53,7 +80,7 @@ export default async function serverPostBuildFn() {
let final_data: { [k: string]: any } = {};
if (global.ROOT_FILE_UPDATED) {
final_data = { reload: true };
final_data = reload_payload;
} else {
final_data = final_artifact;
}
src/functions/server/watcher-esbuild-ctx.ts
+6 -4
View File
@@ -21,6 +21,11 @@ export default async function watcherEsbuildCTX() {
return;
}
if (global.BUNDLER_CTX_DISPOSED) {
await fullRebuild({ msg: `Restarting Bundler ...` });
global.BUNDLER_CTX_DISPOSED = false;
}
if (filename.endsWith(AppData["BunextTmpFileExt"])) {
return;
}
@@ -64,15 +69,12 @@ export default async function watcherEsbuildCTX() {
global.IS_SERVER_COMPONENT = true;
}
if (global.BUNDLER_CTX && !global.BUNDLER_CTX_DISPOSED) {
if (global.BUNDLER_CTX) {
try {
await global.BUNDLER_CTX.rebuild();
} catch (error) {
console.log(`ESBUILD Rebuild Error =>`, error);
}
} else {
await fullRebuild({ msg: `Restarting Bundler ...` });
global.BUNDLER_CTX_DISPOSED = false;
}
if (filename.match(/(404|500)\.tsx?/)) {
src/functions/server/web-pages/grab-page-component.tsx
+20 -13
View File
@@ -6,6 +6,7 @@ import { log } from "../../../utils/log";
import grabPageModules from "./grab-page-modules";
import grabPageCombinedServerRes from "./grab-page-combined-server-res";
import fullRebuild from "../full-rebuild";
import serverPostBuildFn from "../server-post-build-fn";
class NotFoundError extends Error {
status = 404;
@@ -28,7 +29,7 @@ type Params = {
export default async function grabPageComponent(
params: Params,
): Promise<GrabPageComponentRes> {
): Promise<GrabPageComponentRes | Response> {
const {
req,
file_path: passed_file_path,
@@ -77,7 +78,6 @@ export default async function grabPageComponent(
const bundledMap = global.BUNDLER_CTX_MAP[file_path];
if (!bundledMap?.path) {
console.log(global.BUNDLER_CTX_MAP);
const errMsg = `No Bundled File Path for this request path!`;
log.error(errMsg);
throw new Error(errMsg);
@@ -103,17 +103,20 @@ export default async function grabPageComponent(
return { serverRes };
}
const { component, module, serverRes, root_module } =
await grabPageModules({
file_path,
debug,
query: match?.query,
routeParams,
url,
skip_server_res,
});
const page_modules = await grabPageModules({
file_path,
debug,
query: match?.query,
routeParams,
url,
skip_server_res,
});
global.IS_404_PAGE = false;
if (page_modules instanceof Response) {
return page_modules;
}
const { component, module, serverRes, root_module } = page_modules;
return {
component,
@@ -141,8 +144,12 @@ export default async function grabPageComponent(
retry: true,
});
if (component_retried.success) {
if (
component_retried instanceof Response ||
component_retried.success
) {
global.REBUILD_RETRIES = 0;
await serverPostBuildFn();
return component_retried;
}
}
src/functions/server/web-pages/grab-page-error-component.tsx
+13 -8
View File
@@ -20,7 +20,7 @@ export default async function grabPageErrorComponent({
routeParams,
is404,
url,
}: Params): Promise<GrabPageComponentRes> {
}: Params): Promise<GrabPageComponentRes | Response> {
const router = global.ROUTER;
const { BUNX_ROOT_500_PRESET_COMPONENT, BUNX_ROOT_404_PRESET_COMPONENT } =
@@ -61,13 +61,18 @@ export default async function grabPageErrorComponent({
const bundledMap = global.BUNDLER_CTX_MAP?.[file_path];
const { component, module, serverRes, root_module } =
await grabPageModules({
file_path: file_path,
query: match?.query,
routeParams,
url,
});
const page_component = await grabPageModules({
file_path: file_path,
query: match?.query,
routeParams,
url,
});
if (page_component instanceof Response) {
return page_component;
}
const { component, module, serverRes, root_module } = page_component;
return {
component,
src/functions/server/web-pages/grab-page-modules.tsx
+29 -11
View File
@@ -1,5 +1,6 @@
import type {
BunextPageModule,
BunextPageModuleServerReturn,
BunextRootModule,
BunxRouteParams,
} from "../../../types";
@@ -8,6 +9,7 @@ import _ from "lodash";
import { log } from "../../../utils/log";
import grabRootFilePath from "./grab-root-file-path";
import grabPageCombinedServerRes from "./grab-page-combined-server-res";
import type { FC } from "react";
type Params = {
file_path: string;
@@ -18,6 +20,13 @@ type Params = {
skip_server_res?: boolean;
};
type Return = {
component: FC;
serverRes: BunextPageModuleServerReturn | undefined;
module: BunextPageModule;
root_module: BunextPageModule | undefined;
};
export default async function grabPageModules({
file_path,
debug,
@@ -25,9 +34,28 @@ export default async function grabPageModules({
query,
routeParams,
skip_server_res,
}: Params) {
}: Params): Promise<Return | Response> {
const now = Date.now();
const { serverRes } = skip_server_res
? {}
: await grabPageCombinedServerRes({
file_path,
debug,
query,
routeParams,
url,
});
if (serverRes?.redirect?.destination) {
return Response.redirect(
serverRes.redirect.destination,
serverRes.redirect.permanent
? 301
: serverRes.redirect.status_code || 302,
);
}
const { root_file_path } = grabRootFilePath();
const root_module: BunextRootModule | undefined = root_file_path
? await import(`${root_file_path}?t=${now}`)
@@ -39,16 +67,6 @@ export default async function grabPageModules({
log.info(`module:`, module);
}
const { serverRes } = skip_server_res
? {}
: await grabPageCombinedServerRes({
file_path,
debug,
query,
routeParams,
url,
});
const { component } =
(await grabPageBundledReactComponent({
file_path,
src/functions/server/web-pages/handle-web-pages.tsx
+8
View File
@@ -35,6 +35,10 @@ export default async function handleWebPages({
req,
});
if (componentRes instanceof Response) {
return componentRes;
}
return await generateWebPageResponseFromComponentReturn({
...componentRes,
});
@@ -45,6 +49,10 @@ export default async function handleWebPages({
error,
});
if (componentRes instanceof Response) {
return componentRes;
}
return await generateWebPageResponseFromComponentReturn(componentRes);
}
}
src/types/index.ts
+1
View File
@@ -324,6 +324,7 @@ export type GlobalHMRControllerObject = {
page_url: string;
target_map?: BundlerCTXMap;
page_props?: any;
page_reloaded?: boolean;
};
export type BunextCacheFileMeta = {