Bugfix: Refactor SSR bundler. Fix stale cache SSR modules.

dist/functions/bundler/grab-artifacts-from-bundled-result.d.ts

@@ -5,6 +5,7 @@ type Params = {
     entryToPage: Map<string, PageFiles & {
         tsx: string;
     }>;
+    virtual_match?: string;
 };
-export default function grabArtifactsFromBundledResults({ result, entryToPage, }: Params): BundlerCTXMap[] | undefined;
+export default function grabArtifactsFromBundledResults({ result, entryToPage, virtual_match, }: Params): BundlerCTXMap[] | undefined;
 export {};

dist/functions/bundler/grab-artifacts-from-bundled-result.js

@@ -3,19 +3,18 @@ import * as esbuild from "esbuild";
 import grabDirNames from "../../utils/grab-dir-names";
 import { log } from "../../utils/log";
 const { ROOT_DIR } = grabDirNames();
-export default function grabArtifactsFromBundledResults({ result, entryToPage, }) {
+export default function grabArtifactsFromBundledResults({ result, entryToPage, virtual_match = "hydration-virtual", }) {
     if (result.errors.length > 0)
         return;
+    const virtual_regex = new RegExp(`^${virtual_match}:`);
     const artifacts = Object.entries(result.metafile.outputs)
         .filter(([, meta]) => meta.entryPoint)
         .map(([outputPath, meta]) => {
-        const entrypoint = meta.entryPoint?.match(/^hydration-virtual:/)
-            ? meta.entryPoint?.replace(/^hydration-virtual:/, "")
+        const entrypoint = meta.entryPoint?.match(virtual_regex)
+            ? meta.entryPoint?.replace(virtual_regex, "")
             : meta.entryPoint
                 ? path.join(ROOT_DIR, meta.entryPoint)
                 : "";
-        // const entrypoint = path.join(ROOT_DIR, meta.entryPoint || "");
-        // console.log("entrypoint", entrypoint);
         const target_page = entryToPage.get(entrypoint);
         if (!target_page || !meta.entryPoint) {
             return undefined;

dist/functions/bundler/pages-ssr-context-bundler.d.ts

@@ -0,0 +1,7 @@
+type Params = {
+    post_build_fn?: (params: {
+        artifacts: any[];
+    }) => Promise<void> | void;
+};
+export default function pagesSSRContextBundler(params?: Params): Promise<void>;
+export {};

dist/functions/bundler/pages-ssr-context-bundler.js

@@ -0,0 +1,63 @@
+import * as esbuild from "esbuild";
+import grabAllPages from "../../utils/grab-all-pages";
+import grabDirNames from "../../utils/grab-dir-names";
+import isDevelopment from "../../utils/is-development";
+import tailwindEsbuildPlugin from "../server/web-pages/tailwind-esbuild-plugin";
+import grabPageReactComponentString from "../server/web-pages/grab-page-react-component-string";
+import grabRootFilePath from "../server/web-pages/grab-root-file-path";
+import ssrVirtualFilesPlugin from "./plugins/ssr-virtual-files-plugin";
+import ssrCTXArtifactTracker from "./plugins/ssr-ctx-artifact-tracker";
+const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
+export default async function pagesSSRContextBundler(params) {
+    const pages = grabAllPages({ exclude_api: true });
+    const dev = isDevelopment();
+    if (global.SSR_BUNDLER_CTX) {
+        await global.SSR_BUNDLER_CTX.dispose();
+        global.SSR_BUNDLER_CTX = undefined;
+    }
+    const entryToPage = new Map();
+    const { root_file_path } = grabRootFilePath();
+    for (const page of pages) {
+        const tsx = grabPageReactComponentString({
+            file_path: page.local_path,
+            root_file_path,
+        });
+        if (!tsx)
+            continue;
+        entryToPage.set(page.local_path, { ...page, tsx });
+    }
+    const entryPoints = [...entryToPage.keys()].map((e) => `ssr-virtual:${e}`);
+    global.SSR_BUNDLER_CTX = await esbuild.context({
+        entryPoints,
+        outdir: BUNX_CWD_MODULE_CACHE_DIR,
+        bundle: true,
+        minify: !dev,
+        format: "esm",
+        target: "es2020",
+        platform: "node",
+        define: {
+            "process.env.NODE_ENV": JSON.stringify(dev ? "development" : "production"),
+        },
+        entryNames: "[dir]/[hash]",
+        metafile: true,
+        plugins: [
+            tailwindEsbuildPlugin,
+            ssrVirtualFilesPlugin({
+                entryToPage,
+            }),
+            ssrCTXArtifactTracker({
+                entryToPage,
+                post_build_fn: params?.post_build_fn,
+            }),
+        ],
+        jsx: "automatic",
+        external: [
+            "react",
+            "react-dom",
+            "react/jsx-runtime",
+            "react/jsx-dev-runtime",
+        ],
+        logLevel: "silent",
+    });
+    await global.SSR_BUNDLER_CTX.rebuild();
+}

dist/functions/bundler/plugins/esbuild-ctx-artifact-tracker.js

@@ -1,6 +1,7 @@
 import {} from "esbuild";
 import { log } from "../../../utils/log";
 import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-result";
+import pagesSSRContextBundler from "../pages-ssr-context-bundler";
 let buildStart = 0;
 let build_starts = 0;
 const MAX_BUILD_STARTS = 2;
@@ -17,6 +18,8 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                     global.BUNDLER_CTX_DISPOSED = true;
                     global.RECOMPILING = false;
                     global.IS_SERVER_COMPONENT = false;
+                    await global.SSR_BUNDLER_CTX?.dispose();
+                    global.SSR_BUNDLER_CTX = undefined;
                     await global.BUNDLER_CTX?.dispose();
                     global.BUNDLER_CTX = undefined;
                 }
@@ -60,16 +63,18 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                         }
                     }
                     post_build_fn?.({ artifacts });
-                    // writeFileSync(
-                    //     HYDRATION_DST_DIR_MAP_JSON_FILE,
-                    //     JSON.stringify(artifacts, null, 4),
-                    // );
                 }
                 const elapsed = (performance.now() - buildStart).toFixed(0);
                 log.success(`[Built] in ${elapsed}ms`);
                 global.RECOMPILING = false;
                 global.IS_SERVER_COMPONENT = false;
                 build_starts = 0;
+                if (global.SSR_BUNDLER_CTX) {
+                    global.SSR_BUNDLER_CTX.rebuild();
+                }
+                else {
+                    pagesSSRContextBundler();
+                }
             });
         },
     };

dist/functions/bundler/plugins/ssr-ctx-artifact-tracker.d.ts

@@ -0,0 +1,12 @@
+import { type Plugin } from "esbuild";
+import type { PageFiles } from "../../../types";
+type Params = {
+    entryToPage: Map<string, PageFiles & {
+        tsx: string;
+    }>;
+    post_build_fn?: (params: {
+        artifacts: any[];
+    }) => Promise<void> | void;
+};
+export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }: Params): Plugin;
+export {};

dist/functions/bundler/plugins/ssr-ctx-artifact-tracker.js

@@ -0,0 +1,43 @@
+import {} from "esbuild";
+import { log } from "../../../utils/log";
+import grabArtifactsFromBundledResults from "../grab-artifacts-from-bundled-result";
+let buildStart = 0;
+let build_starts = 0;
+const MAX_BUILD_STARTS = 2;
+export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
+    const artifactTracker = {
+        name: "ssr-artifact-tracker",
+        setup(build) {
+            build.onStart(async () => {
+                build_starts++;
+                buildStart = performance.now();
+                if (build_starts == MAX_BUILD_STARTS) {
+                    // const error_msg = `SSR Build Failed. Please check all your components and imports.`;
+                    // log.error(error_msg);
+                }
+            });
+            build.onEnd((result) => {
+                if (result.errors.length > 0) {
+                    return;
+                }
+                const artifacts = grabArtifactsFromBundledResults({
+                    result,
+                    entryToPage,
+                    virtual_match: `ssr-virtual`,
+                });
+                if (artifacts?.[0] && artifacts.length > 0) {
+                    for (let i = 0; i < artifacts.length; i++) {
+                        const artifact = artifacts[i];
+                        if (artifact?.local_path &&
+                            global.SSR_BUNDLER_CTX_MAP) {
+                            global.SSR_BUNDLER_CTX_MAP[artifact.local_path] =
+                                artifact;
+                        }
+                    }
+                    post_build_fn?.({ artifacts });
+                }
+            });
+        },
+    };
+    return artifactTracker;
+}

dist/functions/bundler/plugins/ssr-virtual-files-plugin.d.ts

@@ -0,0 +1,9 @@
+import type { Plugin } from "esbuild";
+import type { PageFiles } from "../../../types";
+type Params = {
+    entryToPage: Map<string, PageFiles & {
+        tsx: string;
+    }>;
+};
+export default function ssrVirtualFilesPlugin({ entryToPage }: Params): Plugin;
+export {};

dist/functions/bundler/plugins/ssr-virtual-files-plugin.js

@@ -0,0 +1,28 @@
+import path from "path";
+import { log } from "../../../utils/log";
+export default function ssrVirtualFilesPlugin({ entryToPage }) {
+    const virtualPlugin = {
+        name: "ssr-virtual-hydration",
+        setup(build) {
+            build.onResolve({ filter: /^ssr-virtual:/ }, (args) => {
+                const final_path = args.path.replace(/ssr-virtual:/, "");
+                return {
+                    path: final_path,
+                    namespace: "ssr-virtual",
+                };
+            });
+            build.onLoad({ filter: /.*/, namespace: "ssr-virtual" }, (args) => {
+                const target = entryToPage.get(args.path);
+                if (!target?.tsx)
+                    return null;
+                const contents = target.tsx;
+                return {
+                    contents: contents || "",
+                    loader: "tsx",
+                    resolveDir: path.dirname(target.local_path),
+                };
+            });
+        },
+    };
+    return virtualPlugin;
+}

dist/functions/bunext-init.d.ts

@@ -19,6 +19,9 @@ declare global {
     var BUNDLER_CTX_MAP: {
         [k: string]: BundlerCTXMap;
     } | undefined;
+    var SSR_BUNDLER_CTX_MAP: {
+        [k: string]: BundlerCTXMap;
+    } | undefined;
     var BUNDLER_REBUILDS: 0;
     var PAGES_SRC_WATCHER: FSWatcher | undefined;
     var CURRENT_VERSION: string | undefined;
@@ -26,6 +29,7 @@ declare global {
     var ROOT_FILE_UPDATED: boolean;
     var SKIPPED_BROWSER_MODULES: Set<string>;
     var BUNDLER_CTX: BuildContext | undefined;
+    var SSR_BUNDLER_CTX: BuildContext | undefined;
     var DIR_NAMES: ReturnType<typeof grabDirNames>;
     var REACT_IMPORTS_MAP: {
         imports: Record<string, string>;

dist/functions/bunext-init.js

@@ -8,12 +8,12 @@ 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() {
     global.HMR_CONTROLLERS = [];
     global.BUNDLER_CTX_MAP = {};
+    global.SSR_BUNDLER_CTX_MAP = {};
     global.BUNDLER_REBUILDS = 0;
     global.PAGE_FILES = [];
     global.SKIPPED_BROWSER_MODULES = new Set();
@@ -34,17 +34,17 @@ export default async function bunextInit() {
         await allPagesESBuildContextBundler({
             post_build_fn: serverPostBuildFn,
         });
-        initPages({
-            log_time: true,
-        });
+        // initPages({
+        //     log_time: true,
+        // });
         watcherEsbuildCTX();
     }
     else {
         log.build(`Building Modules ...`);
         await allPagesESBuildContextBundler();
-        initPages({
-            log_time: true,
-        });
+        // initPages({
+        //     log_time: true,
+        // });
         cron();
     }
 }

dist/functions/server/rebuild-bundler.js

@@ -5,8 +5,6 @@ import cleanupArtifacts from "./cleanup-artifacts";
 export default async function rebuildBundler(params) {
     try {
         global.ROUTER.reload();
-        // await global.BUNDLER_CTX?.dispose();
-        // global.BUNDLER_CTX = undefined;
         const new_artifacts = await allPagesBunBundler({
             page_file_paths: params?.target_file_paths,
         });

dist/functions/server/server-post-build-fn.js

@@ -1,10 +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;
-    // }
     if (!global.HMR_CONTROLLERS?.[0] || !global.BUNDLER_CTX_MAP) {
         return;
     }
@@ -45,9 +41,5 @@ 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,
-        });
     }
 }

dist/functions/server/watcher-esbuild-ctx.js

@@ -4,7 +4,6 @@ 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, {
@@ -101,6 +100,9 @@ async function fullRebuild(params) {
         await global.BUNDLER_CTX?.dispose();
         global.BUNDLER_CTX = undefined;
         global.BUNDLER_CTX_MAP = {};
+        await global.SSR_BUNDLER_CTX?.dispose();
+        global.SSR_BUNDLER_CTX = undefined;
+        global.SSR_BUNDLER_CTX_MAP = {};
         allPagesESBuildContextBundler({
             post_build_fn: serverPostBuildFn,
         });
@@ -112,12 +114,10 @@ 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();
 }

dist/functions/server/web-pages/grab-page-bundled-react-component.js

@@ -2,8 +2,16 @@ import grabPageReactComponentString from "./grab-page-react-component-string";
 import grabTsxStringModule from "./grab-tsx-string-module";
 import { log } from "../../../utils/log";
 import grabRootFilePath from "./grab-root-file-path";
+import path from "path";
+import grabDirNames from "../../../utils/grab-dir-names";
+const { ROOT_DIR } = grabDirNames();
 export default async function grabPageBundledReactComponent({ file_path, return_tsx_only, }) {
     try {
+        if (global.SSR_BUNDLER_CTX_MAP?.[file_path]) {
+            const mod = await import(path.join(ROOT_DIR, global.SSR_BUNDLER_CTX_MAP[file_path].path));
+            const Main = mod.default;
+            return { component: Main };
+        }
         const { root_file_path } = grabRootFilePath();
         let tsx = grabPageReactComponentString({
             file_path,

dist/functions/server/web-pages/grab-page-react-component-string.js

@@ -1,19 +1,12 @@
-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, }) {
     try {
         let tsx = ``;
-        // 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({...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`;