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

Updates

Browse Source
This commit is contained in:
Benjamin Toby 2026-04-09 07:47:38 +01:00
parent ab6fc3be26
commit eb0721f94b
47 changed files with 826 additions and 136 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dist/commands/dev/index.js vendored
View File

@ -4,10 +4,7 @@ import { log } from "../../utils/log";
import bunextInit from "../../functions/bunext-init";
import grabDirNames from "../../utils/grab-dir-names";
import { rmSync } from "fs";
import allPagesBunBundler from "../../functions/bundler/all-pages-bun-bundler";
import allPagesESBuildContextBundler from "../../functions/bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "../../functions/server/server-post-build-fn";
const { HYDRATION_DST_DIR, BUNX_CWD_PAGES_REWRITE_DIR } = grabDirNames();
const { HYDRATION_DST_DIR, BUNX_CWD_PAGES_REWRITE_DIR, BUNX_CWD_MODULE_CACHE_DIR, } = grabDirNames();
export default function () {
return new Command("dev")
.description("Run development server")

1
dist/functions/bundler/all-pages-bun-bundler.js vendored
View File

@ -102,5 +102,6 @@ export default async function allPagesBunBundler(params) {
const elapsed = (performance.now() - buildStart).toFixed(0);
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
return artifacts;
}

1
dist/functions/bundler/all-pages-bundler.js vendored
View File

@ -137,5 +137,6 @@ export default async function allPagesBundler(params) {
const elapsed = (performance.now() - buildStart).toFixed(0);
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
build_starts = 0;
}

7
dist/functions/bundler/init-pages.d.ts vendored Normal file
View File

@ -0,0 +1,7 @@
type Params = {
log_time?: boolean;
debug?: boolean;
target_page_file?: string;
};
export default function initPages(params?: Params): Promise<void>;
export {};

48
dist/functions/bundler/init-pages.js vendored Normal file
View File

@ -0,0 +1,48 @@
import grabDirNames from "../../utils/grab-dir-names";
import isDevelopment from "../../utils/is-development";
import grabAllPages from "../../utils/grab-all-pages";
import { log } from "../../utils/log";
import grabPageBundledReactComponent from "../server/web-pages/grab-page-bundled-react-component";
import grabTsxStringModule from "../server/web-pages/grab-tsx-string-module";
const {} = grabDirNames();
export default async function initPages(params) {
const buildStart = performance.now();
const dev = isDevelopment();
const pages = grabAllPages({
exclude_api: true,
});
if (params?.log_time) {
log.build(`Compiling SSR for ${pages.length} pages ...`);
}
const tsx_map = [];
try {
for (let i = 0; i < pages.length; i++) {
const page = pages[i];
if (params?.target_page_file &&
page.local_path !== params.target_page_file) {
continue;
}
const { tsx } = (await grabPageBundledReactComponent({
file_path: page.local_path,
return_tsx_only: true,
})) || {};
if (!tsx) {
continue;
}
tsx_map.push({
tsx,
page_file_path: page.local_path,
});
// const component = await grabPageComponent({
// file_path: page.local_path,
// skip_server_res: true,
// });
}
await grabTsxStringModule({ tsx_map });
}
catch (error) { }
const elapsed = (performance.now() - buildStart).toFixed(0);
if (params?.log_time) {
log.success(`[SSR Compiled] in ${elapsed}ms`);
}
}

2
dist/functions/bundler/plugins/esbuild-ctx-artifact-tracker.js vendored
View File

@ -14,6 +14,7 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
const error_msg = `Build Failed. Please check all your components and imports.`;
log.error(error_msg);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
}
});
build.onEnd((result) => {
@ -49,6 +50,7 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
const elapsed = (performance.now() - buildStart).toFixed(0);
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
build_starts = 0;
});
},

5
dist/functions/bunext-init.d.ts vendored
View File

@ -10,6 +10,7 @@ declare global {
var CONFIG: BunextConfig;
var SERVER: Server<any> | undefined;
var RECOMPILING: boolean;
var IS_SERVER_COMPONENT: boolean;
var WATCHER_TIMEOUT: any;
var ROUTER: FileSystemRouter;
var HMR_CONTROLLERS: GlobalHMRControllerObject[];
@ -29,5 +30,9 @@ declare global {
imports: Record<string, string>;
};
var REACT_DOM_SERVER: any;
var REACT_DOM_MODULE_CACHE: Map<string, {
main: any;
css: string;
}>;
}
export default function bunextInit(): Promise<void>;

15
dist/functions/bunext-init.js vendored
View File

@ -8,6 +8,7 @@ import watcherEsbuildCTX from "./server/watcher-esbuild-ctx";
import allPagesESBuildContextBundler from "./bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "./server/server-post-build-fn";
import reactModulesBundler from "./bundler/react-modules-bundler";
import initPages from "./bundler/init-pages";
const dirNames = grabDirNames();
const { PAGES_DIR } = dirNames;
export default async function bunextInit() {
@ -18,10 +19,10 @@ export default async function bunextInit() {
global.SKIPPED_BROWSER_MODULES = new Set();
global.DIR_NAMES = dirNames;
global.REACT_IMPORTS_MAP = { imports: {} };
await init();
// await bunReactModulesBundler();
await reactModulesBundler();
global.REACT_DOM_MODULE_CACHE = new Map();
log.banner();
await init();
await reactModulesBundler();
const router = new Bun.FileSystemRouter({
style: "nextjs",
dir: PAGES_DIR,
@ -29,13 +30,21 @@ export default async function bunextInit() {
global.ROUTER = router;
const is_dev = isDevelopment();
if (is_dev) {
log.build(`Building Modules ...`);
await allPagesESBuildContextBundler({
post_build_fn: serverPostBuildFn,
});
initPages({
log_time: true,
});
watcherEsbuildCTX();
}
else {
log.build(`Building Modules ...`);
await allPagesESBuildContextBundler();
initPages({
log_time: true,
});
cron();
}
}

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

@ -1,5 +1,6 @@
import _ from "lodash";
import grabPageComponent from "./web-pages/grab-page-component";
import initPages from "../bundler/init-pages";
export default async function serverPostBuildFn() {
// if (!global.IS_FIRST_BUNDLE_READY) {
// global.IS_FIRST_BUNDLE_READY = true;
@ -14,10 +15,12 @@ export default async function serverPostBuildFn() {
}
const target_artifact = global.BUNDLER_CTX_MAP[controller.target_map.local_path];
const mock_req = new Request(controller.page_url);
const { serverRes } = await grabPageComponent({
const { serverRes } = global.IS_SERVER_COMPONENT
? await grabPageComponent({
req: mock_req,
return_server_res_only: true,
});
})
: {};
const final_artifact = {
..._.omit(controller, ["controller"]),
target_map: target_artifact,
@ -42,5 +45,9 @@ export default async function serverPostBuildFn() {
catch {
global.HMR_CONTROLLERS.splice(i, 1);
}
global.REACT_DOM_MODULE_CACHE.delete(target_artifact.local_path);
initPages({
target_page_file: target_artifact.local_path,
});
}
}

6
dist/functions/server/watcher-esbuild-ctx.js vendored
View File

@ -4,6 +4,7 @@ import grabDirNames from "../../utils/grab-dir-names";
import { log } from "../../utils/log";
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "./server-post-build-fn";
import initPages from "../bundler/init-pages";
const { ROOT_DIR } = grabDirNames();
export default async function watcherEsbuildCTX() {
const pages_src_watcher = watch(ROOT_DIR, {
@ -43,6 +44,9 @@ export default async function watcherEsbuildCTX() {
if (global.RECOMPILING)
return;
global.RECOMPILING = true;
if (filename.match(/.*\.server\.tsx?/)) {
global.IS_SERVER_COMPONENT = true;
}
await global.BUNDLER_CTX?.rebuild();
if (filename.match(/(404|500)\.tsx?/)) {
for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
@ -102,10 +106,12 @@ async function fullRebuild(params) {
global.PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
initPages();
}
function reloadWatcher() {
if (global.PAGES_SRC_WATCHER) {
global.PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
initPages();
}

1
dist/functions/server/watcher.js vendored
View File

@ -72,6 +72,7 @@ async function fullRebuild(params) {
}
finally {
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
}
if (global.PAGES_SRC_WATCHER) {
global.PAGES_SRC_WATCHER.close();

2
dist/functions/server/web-pages/generate-web-html.d.ts vendored
View File

@ -1,2 +1,2 @@
import type { LivePageDistGenParams } from "../../../types";
export default function genWebHTML({ component, pageProps, bundledMap, module, routeParams, debug, root_module, }: LivePageDistGenParams): Promise<string>;
export default function genWebHTML({ component: Main, pageProps, bundledMap, module, routeParams, debug, root_module, }: LivePageDistGenParams): Promise<string>;

9
dist/functions/server/web-pages/generate-web-html.js vendored
View File

@ -9,12 +9,15 @@ import { AppData } from "../../../data/app-data";
import _ from "lodash";
import grabDirNames from "../../../utils/grab-dir-names";
const { ROOT_DIR } = grabDirNames();
export default async function genWebHTML({ component, pageProps, bundledMap, module, routeParams, debug, root_module, }) {
export default async function genWebHTML({ component: Main, pageProps, bundledMap, module, routeParams, debug, root_module, }) {
const { ClientRootElementIDName, ClientWindowPagePropsName } = grabContants();
const { renderToReadableStream } = await import(`${ROOT_DIR}/node_modules/react-dom/server.js`);
const is_dev = isDevelopment();
if (debug) {
log.info("component", component);
log.info("component", Main);
}
if (!Main) {
throw new Error(`Main Component not found!`);
}
const serializedProps = (EJSON.stringify(pageProps || {}) || "{}").replace(/<\//g, "<\\/");
const page_hydration_script = await grabWebPageHydrationScript();
@ -46,7 +49,7 @@ export default async function genWebHTML({ component, pageProps, bundledMap, mod
__html: JSON.stringify(global.REACT_IMPORTS_MAP),
}, defer: true, "data-bunext-head": true }), _jsx("script", { src: `/${bundledMap.path}`, type: "module", id: AppData["BunextClientHydrationScriptID"], defer: true, "data-bunext-head": true })] })) : null, is_dev ? (_jsx("script", { defer: true, dangerouslySetInnerHTML: {
__html: page_hydration_script,
}, "data-bunext-head": true })) : null] }), _jsx("body", { children: _jsx("div", { id: ClientRootElementIDName, suppressHydrationWarning: !dev, children: component }) })] }));
}, "data-bunext-head": true })) : null] }), _jsx("body", { children: _jsx("div", { id: ClientRootElementIDName, suppressHydrationWarning: !dev, children: _jsx(Main, { ...pageProps }) }) })] }));
let html = `<!DOCTYPE html>\n`;
// const stream = await renderToReadableStream(final_component, {
// onError(error: any) {

5
dist/functions/server/web-pages/grab-page-bundled-react-component.d.ts vendored
View File

@ -1,8 +1,7 @@
import type { GrabPageReactBundledComponentRes } from "../../../types";
type Params = {
file_path: string;
root_file_path?: string;
server_res?: any;
return_tsx_only?: boolean;
};
export default function grabPageBundledReactComponent({ file_path, root_file_path, server_res, }: Params): Promise<GrabPageReactBundledComponentRes | undefined>;
export default function grabPageBundledReactComponent({ file_path, return_tsx_only, }: Params): Promise<GrabPageReactBundledComponentRes | undefined>;
export {};

18
dist/functions/server/web-pages/grab-page-bundled-react-component.js vendored
View File

@ -1,23 +1,27 @@
import { jsx as _jsx } from "react/jsx-runtime";
import grabPageReactComponentString from "./grab-page-react-component-string";
import grabTsxStringModule from "./grab-tsx-string-module";
import { log } from "../../../utils/log";
export default async function grabPageBundledReactComponent({ file_path, root_file_path, server_res, }) {
import grabRootFilePath from "./grab-root-file-path";
export default async function grabPageBundledReactComponent({ file_path, return_tsx_only, }) {
try {
const { root_file_path } = grabRootFilePath();
let tsx = grabPageReactComponentString({
file_path,
root_file_path,
server_res,
});
if (!tsx) {
return undefined;
}
const mod = await grabTsxStringModule({ tsx });
if (return_tsx_only) {
return { tsx };
}
const mod = await grabTsxStringModule({
tsx,
page_file_path: file_path,
});
const Main = mod.default;
const component = _jsx(Main, {});
return {
component,
server_res,
component: Main,
tsx,
};
}

3
dist/functions/server/web-pages/grab-page-component.d.ts vendored
View File

@ -4,6 +4,7 @@ type Params = {
file_path?: string;
debug?: boolean;
return_server_res_only?: boolean;
skip_server_res?: boolean;
};
export default function grabPageComponent({ req, file_path: passed_file_path, debug, return_server_res_only, }: Params): Promise<GrabPageComponentRes>;
export default function grabPageComponent({ req, file_path: passed_file_path, debug, return_server_res_only, skip_server_res, }: Params): Promise<GrabPageComponentRes>;
export {};

4
dist/functions/server/web-pages/grab-page-component.js vendored
View File

@ -11,7 +11,7 @@ class NotFoundError extends Error {
this.name = "NotFoundError";
}
}
export default async function grabPageComponent({ req, file_path: passed_file_path, debug, return_server_res_only, }) {
export default async function grabPageComponent({ req, file_path: passed_file_path, debug, return_server_res_only, skip_server_res, }) {
const url = req?.url ? new URL(req.url) : undefined;
const router = global.ROUTER;
let routeParams = undefined;
@ -63,6 +63,7 @@ export default async function grabPageComponent({ req, file_path: passed_file_pa
query: match?.query,
routeParams,
url,
skip_server_res,
});
return {
component,
@ -79,6 +80,7 @@ export default async function grabPageComponent({ req, file_path: passed_file_pa
error?.status === 404;
if (!is404) {
log.error(`Error Grabbing Page Component: ${error.message}`);
log.error(`Page: ${passed_file_path || url?.pathname}`);
}
return await grabPageErrorComponent({
error,

6
dist/functions/server/web-pages/grab-page-error-component.js vendored
View File

@ -19,7 +19,9 @@ export default async function grabPageErrorComponent({ error, routeParams, is404
if (!match?.filePath) {
const default_module = await import(presetComponent);
const Component = default_module.default;
const default_jsx = (_jsx(Component, { children: _jsx("span", { children: error.message }) }));
const default_jsx = () => {
return _jsx(Component, { children: _jsx("span", { children: error.message }) });
};
return {
component: default_jsx,
module: default_module,
@ -54,7 +56,7 @@ export default async function grabPageErrorComponent({ error, routeParams, is404
flexDirection: "column",
}, children: [_jsx("h1", { children: is404 ? "404 Not Found" : "500 Internal Server Error" }), _jsx("span", { children: error.message })] }));
return {
component: _jsx(DefaultNotFound, {}),
component: DefaultNotFound,
routeParams,
module: { default: DefaultNotFound },
serverRes: default_server_res,

7
dist/functions/server/web-pages/grab-page-modules.d.ts vendored
View File

@ -5,10 +5,11 @@ type Params = {
url?: URL;
query?: any;
routeParams?: BunxRouteParams;
skip_server_res?: boolean;
};
export default function grabPageModules({ file_path, debug, url, query, routeParams, }: Params): Promise<{
component: import("react").JSX.Element;
serverRes: import("../../../types").BunextPageModuleServerReturn;
export default function grabPageModules({ file_path, debug, url, query, routeParams, skip_server_res, }: Params): Promise<{
component: import("react").FC;
serverRes: import("../../../types").BunextPageModuleServerReturn | undefined;
module: BunextPageModule;
root_module: BunextPageModule | undefined;
}>;

8
dist/functions/server/web-pages/grab-page-modules.js vendored
View File

@ -3,7 +3,7 @@ import _ from "lodash";
import { log } from "../../../utils/log";
import grabRootFilePath from "./grab-root-file-path";
import grabPageCombinedServerRes from "./grab-page-combined-server-res";
export default async function grabPageModules({ file_path, debug, url, query, routeParams, }) {
export default async function grabPageModules({ file_path, debug, url, query, routeParams, skip_server_res, }) {
const now = Date.now();
const { root_file_path } = grabRootFilePath();
const root_module = root_file_path
@ -13,7 +13,9 @@ export default async function grabPageModules({ file_path, debug, url, query, ro
if (debug) {
log.info(`module:`, module);
}
const { serverRes } = await grabPageCombinedServerRes({
const { serverRes } = skip_server_res
? {}
: await grabPageCombinedServerRes({
file_path,
debug,
query,
@ -22,8 +24,6 @@ export default async function grabPageModules({ file_path, debug, url, query, ro
});
const { component } = (await grabPageBundledReactComponent({
file_path,
root_file_path,
server_res: serverRes,
})) || {};
if (!component) {
throw new Error(`Couldn't grab page component`);

3
dist/functions/server/web-pages/grab-page-react-component-string.d.ts vendored
View File

@ -1,7 +1,6 @@
type Params = {
file_path: string;
root_file_path?: string;
server_res?: any;
};
export default function grabPageReactComponentString({ file_path, root_file_path, server_res, }: Params): string | undefined;
export default function grabPageReactComponentString({ file_path, root_file_path, }: Params): string | undefined;
export {};

12
dist/functions/server/web-pages/grab-page-react-component-string.js vendored
View File

@ -1,15 +1,19 @@
import EJSON from "../../../utils/ejson";
import { log } from "../../../utils/log";
export default function grabPageReactComponentString({ file_path, root_file_path, server_res, }) {
export default function grabPageReactComponentString({ file_path, root_file_path,
// server_res,
}) {
try {
let tsx = ``;
const server_res_json = JSON.stringify(EJSON.stringify(server_res || {}) ?? "{}");
// const server_res_json = JSON.stringify(
// EJSON.stringify(server_res || {}) ?? "{}",
// );
if (root_file_path) {
tsx += `import Root from "${root_file_path}"\n`;
}
tsx += `import Page from "${file_path}"\n`;
tsx += `export default function Main() {\n\n`;
tsx += `const props = JSON.parse(${server_res_json})\n\n`;
tsx += `export default function Main({...props}) {\n\n`;
// tsx += `const props = JSON.parse(${server_res_json})\n\n`;
tsx += ` return (\n`;
if (root_file_path) {
tsx += ` <Root {...props}><Page {...props} /></Root>\n`;

5
dist/functions/server/web-pages/grab-tsx-string-module-deprecated.d.ts vendored Normal file
View File

@ -0,0 +1,5 @@
type Params = {
tsx: string;
};
export default function grabTsxStringModule<T>({ tsx, }: Params): Promise<T>;
export {};

73
dist/functions/server/web-pages/grab-tsx-string-module-deprecated.js vendored Normal file
View File

@ -0,0 +1,73 @@
import isDevelopment from "../../../utils/is-development";
import * as esbuild from "esbuild";
export default async function grabTsxStringModule({ tsx, }) {
const dev = isDevelopment();
const now = Date.now();
const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
const result = await esbuild.transform(final_tsx, {
loader: "tsx",
format: "esm",
jsx: "automatic",
minify: !dev,
});
const blob = new Blob([result.code], { type: "text/javascript" });
const url = URL.createObjectURL(blob);
const mod = await import(url);
URL.revokeObjectURL(url);
return mod;
}
// export default async function grabTsxStringModule<T extends any = any>({
// tsx,
// }: Params): Promise<T> {
// const dev = isDevelopment();
// const now = Date.now();
// const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
// const target_cache_file_path = path.join(
// BUNX_CWD_MODULE_CACHE_DIR,
// `server-render-${now}.js`,
// );
// await esbuild.build({
// stdin: {
// contents: dev ? tsx + `\n// v_${now}` : tsx,
// resolveDir: process.cwd(),
// loader: "tsx",
// },
// bundle: true,
// format: "esm",
// target: "es2020",
// platform: "node",
// external: [
// "react",
// "react-dom",
// "react/jsx-runtime",
// "react/jsx-dev-runtime",
// ],
// minify: !dev,
// define: {
// "process.env.NODE_ENV": JSON.stringify(
// dev ? "development" : "production",
// ),
// },
// jsx: "automatic",
// outfile: target_cache_file_path,
// plugins: [tailwindEsbuildPlugin],
// });
// Loader.registry.delete(target_cache_file_path);
// const mod = await import(`${target_cache_file_path}?t=${now}`);
// return mod as T;
// }
// if (!dev) {
// const now = Date.now();
// const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
// const result = await esbuild.transform(final_tsx, {
// loader: "tsx",
// format: "esm",
// jsx: "automatic",
// minify: !dev,
// });
// const blob = new Blob([result.code], { type: "text/javascript" });
// const url = URL.createObjectURL(blob);
// const mod = await import(url);
// URL.revokeObjectURL(url);
// return mod as T;
// }

7
dist/functions/server/web-pages/grab-tsx-string-module.d.ts vendored
View File

@ -1,5 +1,4 @@
type Params = {
tsx: string;
};
export default function grabTsxStringModule<T extends any = any>({ tsx, }: Params): Promise<T>;
import type { GrabTSXModuleBatchParams, GrabTSXModuleSingleParams } from "../../../types";
type Params = GrabTSXModuleSingleParams | GrabTSXModuleBatchParams;
export default function grabTsxStringModule<T>(params: Params): Promise<T | T[]>;
export {};

139
dist/functions/server/web-pages/grab-tsx-string-module.js vendored
View File

@ -3,17 +3,60 @@ import * as esbuild from "esbuild";
import grabDirNames from "../../../utils/grab-dir-names";
import path from "path";
import tailwindEsbuildPlugin from "./tailwind-esbuild-plugin";
export default async function grabTsxStringModule({ tsx, }) {
import { existsSync, unlinkSync } from "fs";
import { log } from "../../../utils/log";
const { PAGES_DIR, BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
function toModPath(page_file_path) {
return path.join(BUNX_CWD_MODULE_CACHE_DIR, page_file_path.replace(PAGES_DIR, "").replace(/\.(t|j)sx?$/, ".js"));
}
function isBatch(params) {
return "tsx_map" in params;
}
async function buildEntries({ entries, clean_cache }) {
const dev = isDevelopment();
const now = Date.now();
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
const target_cache_file_path = path.join(BUNX_CWD_MODULE_CACHE_DIR, `server-render-${now}.js`);
await esbuild.build({
stdin: {
contents: dev ? tsx + `\n// v_${now}` : tsx,
const toBuild = [];
for (const entry of entries) {
const mod_file_path = toModPath(entry.page_file_path);
if (!global.REACT_DOM_MODULE_CACHE.has(entry.page_file_path) &&
!(await Bun.file(mod_file_path).exists())) {
toBuild.push({
tsx: entry.tsx,
mod_file_path,
});
}
else {
try {
if (clean_cache && existsSync(mod_file_path)) {
unlinkSync(mod_file_path);
}
}
catch (error) { }
}
}
if (toBuild.length === 0)
return;
const virtualEntries = {};
for (const { tsx, mod_file_path } of toBuild) {
virtualEntries[mod_file_path] = tsx;
}
const virtualPlugin = {
name: "virtual-tsx-entries",
setup(build) {
const entryPaths = new Set(Object.keys(virtualEntries));
build.onResolve({ filter: /.*/ }, (args) => {
if (entryPaths.has(args.path)) {
return { path: args.path, namespace: "virtual" };
}
});
build.onLoad({ filter: /.*/, namespace: "virtual" }, (args) => ({
contents: virtualEntries[args.path],
resolveDir: process.cwd(),
loader: "tsx",
}));
},
};
await esbuild.build({
entryPoints: Object.keys(virtualEntries),
bundle: true,
format: "esm",
target: "es2020",
@ -29,10 +72,84 @@ export default async function grabTsxStringModule({ tsx, }) {
"process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
},
jsx: "automatic",
outfile: target_cache_file_path,
plugins: [tailwindEsbuildPlugin],
outdir: BUNX_CWD_MODULE_CACHE_DIR,
plugins: [virtualPlugin, tailwindEsbuildPlugin],
});
}
async function loadEntry(page_file_path) {
const now = Date.now();
const mod_file_path = toModPath(page_file_path);
const mod_css_path = mod_file_path.replace(/\.js$/, ".css");
if (global.REACT_DOM_MODULE_CACHE.has(page_file_path)) {
return global.REACT_DOM_MODULE_CACHE.get(page_file_path)?.main;
}
const mod = await import(`${mod_file_path}?t=${now}`);
global.REACT_DOM_MODULE_CACHE.set(page_file_path, {
main: mod,
css: mod_css_path,
});
Loader.registry.delete(target_cache_file_path);
const mod = await import(`${target_cache_file_path}?t=${now}`);
return mod;
}
export default async function grabTsxStringModule(params) {
if (isBatch(params)) {
await buildEntries({ entries: params.tsx_map });
return Promise.all(params.tsx_map.map((entry) => loadEntry(entry.page_file_path)));
}
await buildEntries({ entries: [params], clean_cache: true });
return loadEntry(params.page_file_path);
}
// export default async function grabTsxStringModule<T extends any = any>({
// tsx,
// }: Params): Promise<T> {
// const dev = isDevelopment();
// const now = Date.now();
// const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
// const target_cache_file_path = path.join(
// BUNX_CWD_MODULE_CACHE_DIR,
// `server-render-${now}.js`,
// );
// await esbuild.build({
// stdin: {
// contents: dev ? tsx + `\n// v_${now}` : tsx,
// resolveDir: process.cwd(),
// loader: "tsx",
// },
// bundle: true,
// format: "esm",
// target: "es2020",
// platform: "node",
// external: [
// "react",
// "react-dom",
// "react/jsx-runtime",
// "react/jsx-dev-runtime",
// ],
// minify: !dev,
// define: {
// "process.env.NODE_ENV": JSON.stringify(
// dev ? "development" : "production",
// ),
// },
// jsx: "automatic",
// outfile: target_cache_file_path,
// plugins: [tailwindEsbuildPlugin],
// });
// Loader.registry.delete(target_cache_file_path);
// const mod = await import(`${target_cache_file_path}?t=${now}`);
// return mod as T;
// }
// if (!dev) {
// const now = Date.now();
// const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
// const result = await esbuild.transform(final_tsx, {
// loader: "tsx",
// format: "esm",
// jsx: "automatic",
// minify: !dev,
// });
// const blob = new Blob([result.code], { type: "text/javascript" });
// const url = URL.createObjectURL(blob);
// const mod = await import(url);
// URL.revokeObjectURL(url);
// return mod as T;
// }

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

@ -1,5 +1,5 @@
import type { MatchedRoute, Server, WebSocketHandler } from "bun";
import type { DetailedHTMLProps, FC, HtmlHTMLAttributes, JSX, PropsWithChildren, ReactNode } from "react";
import type { DetailedHTMLProps, FC, HtmlHTMLAttributes, PropsWithChildren } from "react";
export type ServerProps = {
params: Record<string, string>;
searchParams: Record<string, string>;
@ -128,7 +128,7 @@ export type PageDistGenParams = {
page_file: string;
};
export type LivePageDistGenParams = {
component: ReactNode;
component?: FC;
pageProps?: any;
module?: BunextPageModule;
root_module?: BunextRootModule;
@ -247,7 +247,7 @@ export type BunextPageModuleMetadata = {
description?: string;
};
export type GrabPageComponentRes = {
component?: JSX.Element;
component?: FC;
serverRes?: BunextPageModuleServerReturn;
routeParams?: BunxRouteParams;
bundledMap?: BundlerCTXMap;
@ -257,7 +257,7 @@ export type GrabPageComponentRes = {
};
export type BunextRootModule = BunextPageModule;
export type GrabPageReactBundledComponentRes = {
component: JSX.Element;
component?: FC;
server_res?: BunextPageModuleServerReturn;
tsx?: string;
};
@ -288,3 +288,14 @@ export type BunextCacheFileMeta = {
expiry_seconds?: number;
};
export type BunextRootComponentProps = PropsWithChildren & BunextPageProps;
export type GrabTSXModuleSingleParams = {
tsx: string;
page_file_path: string;
};
export type GrabTSXModuleBatchParams = {
tsx_map: GrabTSXModuleBatchMap[];
};
export type GrabTSXModuleBatchMap = {
tsx: string;
page_file_path: string;
};

2
package.json
View File

@ -1,6 +1,6 @@
{
"name": "@moduletrace/bunext",
"version": "1.0.58",
"version": "1.0.60",
"main": "dist/index.js",
"module": "index.ts",
"dependencies": {

9
src/commands/dev/index.ts
View File

@ -4,11 +4,12 @@ import { log } from "../../utils/log";
import bunextInit from "../../functions/bunext-init";
import grabDirNames from "../../utils/grab-dir-names";
import { rmSync } from "fs";
import allPagesBunBundler from "../../functions/bundler/all-pages-bun-bundler";
import allPagesESBuildContextBundler from "../../functions/bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "../../functions/server/server-post-build-fn";
const { HYDRATION_DST_DIR, BUNX_CWD_PAGES_REWRITE_DIR } = grabDirNames();
const {
HYDRATION_DST_DIR,
BUNX_CWD_PAGES_REWRITE_DIR,
BUNX_CWD_MODULE_CACHE_DIR,
} = grabDirNames();
export default function () {
return new Command("dev")

1
src/functions/bundler/all-pages-bun-bundler.ts
View File

@ -129,6 +129,7 @@ export default async function allPagesBunBundler(params?: Params) {
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
return artifacts;
}

1
src/functions/bundler/all-pages-bundler.ts
View File

@ -177,6 +177,7 @@ export default async function allPagesBundler(params?: Params) {
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
build_starts = 0;
}

70
src/functions/bundler/init-pages.ts Normal file
View File

@ -0,0 +1,70 @@
import grabDirNames from "../../utils/grab-dir-names";
import isDevelopment from "../../utils/is-development";
import grabAllPages from "../../utils/grab-all-pages";
import { log } from "../../utils/log";
import type { GrabTSXModuleBatchMap } from "../../types";
import grabPageBundledReactComponent from "../server/web-pages/grab-page-bundled-react-component";
import grabTsxStringModule from "../server/web-pages/grab-tsx-string-module";
const {} = grabDirNames();
type Params = {
log_time?: boolean;
debug?: boolean;
target_page_file?: string;
};
export default async function initPages(params?: Params) {
const buildStart = performance.now();
const dev = isDevelopment();
const pages = grabAllPages({
exclude_api: true,
});
if (params?.log_time) {
log.build(`Compiling SSR for ${pages.length} pages ...`);
}
const tsx_map: GrabTSXModuleBatchMap[] = [];
try {
for (let i = 0; i < pages.length; i++) {
const page = pages[i];
if (
params?.target_page_file &&
page.local_path !== params.target_page_file
) {
continue;
}
const { tsx } =
(await grabPageBundledReactComponent({
file_path: page.local_path,
return_tsx_only: true,
})) || {};
if (!tsx) {
continue;
}
tsx_map.push({
tsx,
page_file_path: page.local_path,
});
// const component = await grabPageComponent({
// file_path: page.local_path,
// skip_server_res: true,
// });
}
await grabTsxStringModule({ tsx_map });
} catch (error) {}
const elapsed = (performance.now() - buildStart).toFixed(0);
if (params?.log_time) {
log.success(`[SSR Compiled] in ${elapsed}ms`);
}
}

2
src/functions/bundler/plugins/esbuild-ctx-artifact-tracker.ts
View File

@ -32,6 +32,7 @@ export default function esbuildCTXArtifactTracker({
const error_msg = `Build Failed. Please check all your components and imports.`;
log.error(error_msg);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
}
});
@ -75,6 +76,7 @@ export default function esbuildCTXArtifactTracker({
log.success(`[Built] in ${elapsed}ms`);
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
build_starts = 0;
});

16
src/functions/bunext-init.ts
View File

@ -16,6 +16,7 @@ import watcherEsbuildCTX from "./server/watcher-esbuild-ctx";
import allPagesESBuildContextBundler from "./bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "./server/server-post-build-fn";
import reactModulesBundler from "./bundler/react-modules-bundler";
import initPages from "./bundler/init-pages";
/**
* # Declare Global Variables
@ -24,6 +25,7 @@ declare global {
var CONFIG: BunextConfig;
var SERVER: Server<any> | undefined;
var RECOMPILING: boolean;
var IS_SERVER_COMPONENT: boolean;
var WATCHER_TIMEOUT: any;
var ROUTER: FileSystemRouter;
var HMR_CONTROLLERS: GlobalHMRControllerObject[];
@ -39,6 +41,7 @@ declare global {
var DIR_NAMES: ReturnType<typeof grabDirNames>;
var REACT_IMPORTS_MAP: { imports: Record<string, string> };
var REACT_DOM_SERVER: any;
var REACT_DOM_MODULE_CACHE: Map<string, { main: any; css: string }>;
}
const dirNames = grabDirNames();
@ -52,11 +55,12 @@ export default async function bunextInit() {
global.SKIPPED_BROWSER_MODULES = new Set<string>();
global.DIR_NAMES = dirNames;
global.REACT_IMPORTS_MAP = { imports: {} };
global.REACT_DOM_MODULE_CACHE = new Map<string, any>();
log.banner();
await init();
// await bunReactModulesBundler();
await reactModulesBundler();
log.banner();
const router = new Bun.FileSystemRouter({
style: "nextjs",
@ -68,12 +72,20 @@ export default async function bunextInit() {
const is_dev = isDevelopment();
if (is_dev) {
log.build(`Building Modules ...`);
await allPagesESBuildContextBundler({
post_build_fn: serverPostBuildFn,
});
initPages({
log_time: true,
});
watcherEsbuildCTX();
} else {
log.build(`Building Modules ...`);
await allPagesESBuildContextBundler();
initPages({
log_time: true,
});
cron();
}
}

1
src/functions/init.ts
View File

@ -13,6 +13,7 @@ export default async function () {
recursive: true,
force: true,
});
rmSync(dirNames.BUNX_CWD_MODULE_CACHE_DIR, {
recursive: true,
force: true,

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

@ -1,6 +1,7 @@
import _ from "lodash";
import type { GlobalHMRControllerObject } from "../../types";
import grabPageComponent from "./web-pages/grab-page-component";
import initPages from "../bundler/init-pages";
export default async function serverPostBuildFn() {
// if (!global.IS_FIRST_BUNDLE_READY) {
@ -23,10 +24,12 @@ export default async function serverPostBuildFn() {
const mock_req = new Request(controller.page_url);
const { serverRes } = await grabPageComponent({
const { serverRes } = global.IS_SERVER_COMPONENT
? await grabPageComponent({
req: mock_req,
return_server_res_only: true,
});
})
: {};
const final_artifact: Omit<GlobalHMRControllerObject, "controller"> = {
..._.omit(controller, ["controller"]),
@ -58,5 +61,11 @@ export default async function serverPostBuildFn() {
} catch {
global.HMR_CONTROLLERS.splice(i, 1);
}
global.REACT_DOM_MODULE_CACHE.delete(target_artifact.local_path);
initPages({
target_page_file: target_artifact.local_path,
});
}
}

9
src/functions/server/watcher-esbuild-ctx.ts
View File

@ -4,6 +4,7 @@ import grabDirNames from "../../utils/grab-dir-names";
import { log } from "../../utils/log";
import allPagesESBuildContextBundler from "../bundler/all-pages-esbuild-context-bundler";
import serverPostBuildFn from "./server-post-build-fn";
import initPages from "../bundler/init-pages";
const { ROOT_DIR } = grabDirNames();
@ -55,6 +56,10 @@ export default async function watcherEsbuildCTX() {
if (global.RECOMPILING) return;
global.RECOMPILING = true;
if (filename.match(/.*\.server\.tsx?/)) {
global.IS_SERVER_COMPONENT = true;
}
await global.BUNDLER_CTX?.rebuild();
if (filename.match(/(404|500)\.tsx?/)) {
@ -133,6 +138,8 @@ async function fullRebuild(params?: { msg?: string }) {
global.PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
initPages();
}
function reloadWatcher() {
@ -140,4 +147,6 @@ function reloadWatcher() {
global.PAGES_SRC_WATCHER.close();
watcherEsbuildCTX();
}
initPages();
}

1
src/functions/server/watcher.ts
View File

@ -94,6 +94,7 @@ async function fullRebuild(params?: { msg?: string }) {
log.error(error);
} finally {
global.RECOMPILING = false;
global.IS_SERVER_COMPONENT = false;
}
if (global.PAGES_SRC_WATCHER) {

10
src/functions/server/web-pages/generate-web-html.tsx
View File

@ -12,7 +12,7 @@ import grabDirNames from "../../../utils/grab-dir-names";
const { ROOT_DIR } = grabDirNames();
export default async function genWebHTML({
component,
component: Main,
pageProps,
bundledMap,
module,
@ -30,7 +30,11 @@ export default async function genWebHTML({
const is_dev = isDevelopment();
if (debug) {
log.info("component", component);
log.info("component", Main);
}
if (!Main) {
throw new Error(`Main Component not found!`);
}
const serializedProps = (EJSON.stringify(pageProps || {}) || "{}").replace(
@ -135,7 +139,7 @@ export default async function genWebHTML({
id={ClientRootElementIDName}
suppressHydrationWarning={!dev}
>
{component}
<Main {...pageProps} />
</div>
</body>
</html>

27
src/functions/server/web-pages/grab-page-bundled-react-component.tsx
View File

@ -2,36 +2,43 @@ import type { GrabPageReactBundledComponentRes } from "../../../types";
import grabPageReactComponentString from "./grab-page-react-component-string";
import grabTsxStringModule from "./grab-tsx-string-module";
import { log } from "../../../utils/log";
import type { FC } from "react";
import grabRootFilePath from "./grab-root-file-path";
type Params = {
file_path: string;
root_file_path?: string;
server_res?: any;
return_tsx_only?: boolean;
};
export default async function grabPageBundledReactComponent({
file_path,
root_file_path,
server_res,
return_tsx_only,
}: Params): Promise<GrabPageReactBundledComponentRes | undefined> {
try {
const { root_file_path } = grabRootFilePath();
let tsx = grabPageReactComponentString({
file_path,
root_file_path,
server_res,
});
if (!tsx) {
return undefined;
}
const mod = await grabTsxStringModule({ tsx });
const Main = mod.default;
const component = <Main />;
if (return_tsx_only) {
return { tsx };
}
const mod: any = await grabTsxStringModule({
tsx,
page_file_path: file_path,
});
const Main = mod.default as FC;
return {
component,
server_res,
component: Main,
tsx,
};
} catch (error: any) {

4
src/functions/server/web-pages/grab-page-component.tsx
View File

@ -20,6 +20,7 @@ type Params = {
file_path?: string;
debug?: boolean;
return_server_res_only?: boolean;
skip_server_res?: boolean;
};
export default async function grabPageComponent({
@ -27,6 +28,7 @@ export default async function grabPageComponent({
file_path: passed_file_path,
debug,
return_server_res_only,
skip_server_res,
}: Params): Promise<GrabPageComponentRes> {
const url = req?.url ? new URL(req.url) : undefined;
const router = global.ROUTER;
@ -96,6 +98,7 @@ export default async function grabPageComponent({
query: match?.query,
routeParams,
url,
skip_server_res,
});
return {
@ -114,6 +117,7 @@ export default async function grabPageComponent({
if (!is404) {
log.error(`Error Grabbing Page Component: ${error.message}`);
log.error(`Page: ${passed_file_path || url?.pathname}`);
}
return await grabPageErrorComponent({

8
src/functions/server/web-pages/grab-page-error-component.tsx
View File

@ -45,9 +45,9 @@ export default async function grabPageErrorComponent({
presetComponent
);
const Component = default_module.default as FC<any>;
const default_jsx = (
<Component>{<span>{error.message}</span>}</Component>
);
const default_jsx: FC = () => {
return <Component>{<span>{error.message}</span>}</Component>;
};
return {
component: default_jsx,
@ -95,7 +95,7 @@ export default async function grabPageErrorComponent({
);
return {
component: <DefaultNotFound />,
component: DefaultNotFound,
routeParams,
module: { default: DefaultNotFound },
serverRes: default_server_res,

8
src/functions/server/web-pages/grab-page-modules.tsx
View File

@ -15,6 +15,7 @@ type Params = {
url?: URL;
query?: any;
routeParams?: BunxRouteParams;
skip_server_res?: boolean;
};
export default async function grabPageModules({
@ -23,6 +24,7 @@ export default async function grabPageModules({
url,
query,
routeParams,
skip_server_res,
}: Params) {
const now = Date.now();
@ -37,7 +39,9 @@ export default async function grabPageModules({
log.info(`module:`, module);
}
const { serverRes } = await grabPageCombinedServerRes({
const { serverRes } = skip_server_res
? {}
: await grabPageCombinedServerRes({
file_path,
debug,
query,
@ -48,8 +52,6 @@ export default async function grabPageModules({
const { component } =
(await grabPageBundledReactComponent({
file_path,
root_file_path,
server_res: serverRes,
})) || {};
if (!component) {

14
src/functions/server/web-pages/grab-page-react-component-string.tsx
View File

@ -4,28 +4,28 @@ import { log } from "../../../utils/log";
type Params = {
file_path: string;
root_file_path?: string;
server_res?: any;
// server_res?: any;
};
export default function grabPageReactComponentString({
file_path,
root_file_path,
server_res,
// server_res,
}: Params): string | undefined {
try {
let tsx = ``;
const server_res_json = JSON.stringify(
EJSON.stringify(server_res || {}) ?? "{}",
);
// const server_res_json = JSON.stringify(
// EJSON.stringify(server_res || {}) ?? "{}",
// );
if (root_file_path) {
tsx += `import Root from "${root_file_path}"\n`;
}
tsx += `import Page from "${file_path}"\n`;
tsx += `export default function Main() {\n\n`;
tsx += `const props = JSON.parse(${server_res_json})\n\n`;
tsx += `export default function Main({...props}) {\n\n`;
// tsx += `const props = JSON.parse(${server_res_json})\n\n`;
tsx += ` return (\n`;
if (root_file_path) {
tsx += ` <Root {...props}><Page {...props} /></Root>\n`;

96
src/functions/server/web-pages/grab-tsx-string-module-deprecated.tsx Normal file
View File

@ -0,0 +1,96 @@
import isDevelopment from "../../../utils/is-development";
import * as esbuild from "esbuild";
type Params = {
tsx: string;
};
export default async function grabTsxStringModule<T>({
tsx,
}: Params): Promise<T> {
const dev = isDevelopment();
const now = Date.now();
const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
const result = await esbuild.transform(final_tsx, {
loader: "tsx",
format: "esm",
jsx: "automatic",
minify: !dev,
});
const blob = new Blob([result.code], { type: "text/javascript" });
const url = URL.createObjectURL(blob);
const mod = await import(url);
URL.revokeObjectURL(url);
return mod as T;
}
// export default async function grabTsxStringModule<T extends any = any>({
// tsx,
// }: Params): Promise<T> {
// const dev = isDevelopment();
// const now = Date.now();
// const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
// const target_cache_file_path = path.join(
// BUNX_CWD_MODULE_CACHE_DIR,
// `server-render-${now}.js`,
// );
// await esbuild.build({
// stdin: {
// contents: dev ? tsx + `\n// v_${now}` : tsx,
// resolveDir: process.cwd(),
// loader: "tsx",
// },
// bundle: true,
// format: "esm",
// target: "es2020",
// platform: "node",
// external: [
// "react",
// "react-dom",
// "react/jsx-runtime",
// "react/jsx-dev-runtime",
// ],
// minify: !dev,
// define: {
// "process.env.NODE_ENV": JSON.stringify(
// dev ? "development" : "production",
// ),
// },
// jsx: "automatic",
// outfile: target_cache_file_path,
// plugins: [tailwindEsbuildPlugin],
// });
// Loader.registry.delete(target_cache_file_path);
// const mod = await import(`${target_cache_file_path}?t=${now}`);
// return mod as T;
// }
// if (!dev) {
// const now = Date.now();
// const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
// const result = await esbuild.transform(final_tsx, {
// loader: "tsx",
// format: "esm",
// jsx: "automatic",
// minify: !dev,
// });
// const blob = new Blob([result.code], { type: "text/javascript" });
// const url = URL.createObjectURL(blob);
// const mod = await import(url);
// URL.revokeObjectURL(url);
// return mod as T;
// }

188
src/functions/server/web-pages/grab-tsx-string-module.tsx
View File

@ -3,28 +3,86 @@ import * as esbuild from "esbuild";
import grabDirNames from "../../../utils/grab-dir-names";
import path from "path";
import tailwindEsbuildPlugin from "./tailwind-esbuild-plugin";
import type {
GrabTSXModuleBatchParams,
GrabTSXModuleSingleParams,
} from "../../../types";
import { existsSync, unlinkSync } from "fs";
import { log } from "../../../utils/log";
type Params = {
tsx: string;
const { PAGES_DIR, BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
type Params = GrabTSXModuleSingleParams | GrabTSXModuleBatchParams;
function toModPath(page_file_path: string) {
return path.join(
BUNX_CWD_MODULE_CACHE_DIR,
page_file_path.replace(PAGES_DIR, "").replace(/\.(t|j)sx?$/, ".js"),
);
}
function isBatch(params: Params): params is GrabTSXModuleBatchParams {
return "tsx_map" in params;
}
type BuildEntriesParams = {
entries: { tsx: string; page_file_path: string }[];
clean_cache?: boolean;
};
export default async function grabTsxStringModule<T extends any = any>({
tsx,
}: Params): Promise<T> {
async function buildEntries({ entries, clean_cache }: BuildEntriesParams) {
const dev = isDevelopment();
const now = Date.now();
const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
const target_cache_file_path = path.join(
BUNX_CWD_MODULE_CACHE_DIR,
`server-render-${now}.js`,
);
await esbuild.build({
stdin: {
contents: dev ? tsx + `\n// v_${now}` : tsx,
const toBuild: { tsx: string; mod_file_path: string }[] = [];
for (const entry of entries) {
const mod_file_path = toModPath(entry.page_file_path);
if (
!global.REACT_DOM_MODULE_CACHE.has(entry.page_file_path) &&
!(await Bun.file(mod_file_path).exists())
) {
toBuild.push({
tsx: entry.tsx,
mod_file_path,
});
} else {
try {
if (clean_cache && existsSync(mod_file_path)) {
unlinkSync(mod_file_path);
}
} catch (error) {}
}
}
if (toBuild.length === 0) return;
const virtualEntries: Record<string, string> = {};
for (const { tsx, mod_file_path } of toBuild) {
virtualEntries[mod_file_path] = tsx;
}
const virtualPlugin: esbuild.Plugin = {
name: "virtual-tsx-entries",
setup(build) {
const entryPaths = new Set(Object.keys(virtualEntries));
build.onResolve({ filter: /.*/ }, (args) => {
if (entryPaths.has(args.path)) {
return { path: args.path, namespace: "virtual" };
}
});
build.onLoad({ filter: /.*/, namespace: "virtual" }, (args) => ({
contents: virtualEntries[args.path],
resolveDir: process.cwd(),
loader: "tsx",
}));
},
};
await esbuild.build({
entryPoints: Object.keys(virtualEntries),
bundle: true,
format: "esm",
target: "es2020",
@ -42,12 +100,106 @@ export default async function grabTsxStringModule<T extends any = any>({
),
},
jsx: "automatic",
outfile: target_cache_file_path,
plugins: [tailwindEsbuildPlugin],
outdir: BUNX_CWD_MODULE_CACHE_DIR,
plugins: [virtualPlugin, tailwindEsbuildPlugin],
});
}
Loader.registry.delete(target_cache_file_path);
const mod = await import(`${target_cache_file_path}?t=${now}`);
async function loadEntry<T>(page_file_path: string): Promise<T> {
const now = Date.now();
const mod_file_path = toModPath(page_file_path);
const mod_css_path = mod_file_path.replace(/\.js$/, ".css");
if (global.REACT_DOM_MODULE_CACHE.has(page_file_path)) {
return global.REACT_DOM_MODULE_CACHE.get(page_file_path)?.main as T;
}
const mod = await import(`${mod_file_path}?t=${now}`);
global.REACT_DOM_MODULE_CACHE.set(page_file_path, {
main: mod,
css: mod_css_path,
});
return mod as T;
}
export default async function grabTsxStringModule<T>(
params: Params,
): Promise<T | T[]> {
if (isBatch(params)) {
await buildEntries({ entries: params.tsx_map });
return Promise.all(
params.tsx_map.map((entry) => loadEntry<T>(entry.page_file_path)),
);
}
await buildEntries({ entries: [params], clean_cache: true });
return loadEntry<T>(params.page_file_path);
}
// export default async function grabTsxStringModule<T extends any = any>({
// tsx,
// }: Params): Promise<T> {
// const dev = isDevelopment();
// const now = Date.now();
// const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
// const target_cache_file_path = path.join(
// BUNX_CWD_MODULE_CACHE_DIR,
// `server-render-${now}.js`,
// );
// await esbuild.build({
// stdin: {
// contents: dev ? tsx + `\n// v_${now}` : tsx,
// resolveDir: process.cwd(),
// loader: "tsx",
// },
// bundle: true,
// format: "esm",
// target: "es2020",
// platform: "node",
// external: [
// "react",
// "react-dom",
// "react/jsx-runtime",
// "react/jsx-dev-runtime",
// ],
// minify: !dev,
// define: {
// "process.env.NODE_ENV": JSON.stringify(
// dev ? "development" : "production",
// ),
// },
// jsx: "automatic",
// outfile: target_cache_file_path,
// plugins: [tailwindEsbuildPlugin],
// });
// Loader.registry.delete(target_cache_file_path);
// const mod = await import(`${target_cache_file_path}?t=${now}`);
// return mod as T;
// }
// if (!dev) {
// const now = Date.now();
// const final_tsx = dev ? tsx + `\n// v_${now}` : tsx;
// const result = await esbuild.transform(final_tsx, {
// loader: "tsx",
// format: "esm",
// jsx: "automatic",
// minify: !dev,
// });
// const blob = new Blob([result.code], { type: "text/javascript" });
// const url = URL.createObjectURL(blob);
// const mod = await import(url);
// URL.revokeObjectURL(url);
// return mod as T;
// }

20
src/types/index.ts
View File

@ -151,7 +151,7 @@ export type PageDistGenParams = {
};
export type LivePageDistGenParams = {
component: ReactNode;
component?: FC;
pageProps?: any;
module?: BunextPageModule;
root_module?: BunextRootModule;
@ -282,7 +282,7 @@ export type BunextPageModuleMetadata = {
};
export type GrabPageComponentRes = {
component?: JSX.Element;
component?: FC;
serverRes?: BunextPageModuleServerReturn;
routeParams?: BunxRouteParams;
bundledMap?: BundlerCTXMap;
@ -294,7 +294,7 @@ export type GrabPageComponentRes = {
export type BunextRootModule = BunextPageModule;
export type GrabPageReactBundledComponentRes = {
component: JSX.Element;
component?: FC;
server_res?: BunextPageModuleServerReturn;
tsx?: string;
};
@ -330,3 +330,17 @@ export type BunextCacheFileMeta = {
};
export type BunextRootComponentProps = PropsWithChildren & BunextPageProps;
export type GrabTSXModuleSingleParams = {
tsx: string;
page_file_path: string;
};
export type GrabTSXModuleBatchParams = {
tsx_map: GrabTSXModuleBatchMap[];
};
export type GrabTSXModuleBatchMap = {
tsx: string;
page_file_path: string;
};