Update dev server

2026-08-14 13:12:35 +01:00 · 2026-08-14 12:59:20 +01:00 · 2026-08-14 09:58:12 +01:00 · 2026-08-14 09:57:22 +01:00 · 2026-08-14 09:55:57 +01:00 · 2026-08-14 06:49:12 +01:00
93 changed files with 1321 additions and 996 deletions
@@ -742,6 +742,9 @@ const config: BunextConfig = {
    globalVars: {
        MY_API_URL: "https://api.example.com",
    },
+    public_envs: {
+        BUNEXT_PUBLIC_APP_NAME: "My App",
+    },
    development: false, // forced by the CLI; set manually if needed
 };

@@ -755,6 +758,7 @@ export default config;
 | `distDir`            | `string`                                                                          | `.bunext`        | Internal artifact directory                                                                       |
 | `assetsPrefix`       | `string`                                                                          | `_bunext/static` | URL prefix for static assets                                                                      |
 | `globalVars`         | `{ [k: string]: any }`                                                            | —                | Variables injected globally at build time                                                         |
+| `public_envs`        | `Record<string, string>`                                                          | —                | Public env vars exposed to the client via `window.process.env` (see [Environment Variables](#environment-variables)) |
 | `development`        | `boolean`                                                                         | —                | Overridden to `true` by `bunext dev` automatically                                                |
 | `defaultCacheExpiry` | `number`                                                                          | `3600`           | Global page cache expiry in seconds                                                               |
 | `middleware`         | `(params: BunextConfigMiddlewareParams) => Response \| undefined \| Promise<...>` | —                | Global middleware — see [Middleware](#middleware)                                                 |
@@ -910,8 +914,34 @@ bun run server.ts
 ## Environment Variables

 | Variable           | Description                                                                                      |
-| -------- | ------------------------------------------------------- |
+| ------------------ | ------------------------------------------------------------------------------------------------ |
 | `PORT`             | Override the server port (takes precedence over config)                                          |
+| `BUNEXT_PUBLIC_*`  | Any env var prefixed with `BUNEXT_PUBLIC_` is exposed to the client via `window.process.env`     |
+
+### Public Environment Variables
+
+Variables prefixed with `BUNEXT_PUBLIC_` are automatically injected into every page as `window.process.env`. You can also define public envs in config via `public_envs` (config values override env vars of the same name):
+
+```bash
+# .env
+BUNEXT_PUBLIC_API_URL=https://api.example.com
+```
+
+```ts
+// bunext.config.ts
+const config: BunextConfig = {
+    public_envs: {
+        BUNEXT_PUBLIC_APP_NAME: "My App",
+    },
+};
+```
+
+```tsx
+// Client component — available after hydration
+const apiUrl = window.process.env.BUNEXT_PUBLIC_API_URL;
+```
+
+`window.process.env` always includes `NODE_ENV` (`"development"` or `"production"`).

 ---

@@ -13,7 +13,7 @@ export default function () {
            rmSync(BUNX_CWD_PAGES_REWRITE_DIR, { recursive: true });
        }
        catch (error) { }
-        global.SKIPPED_BROWSER_MODULES = new Set();
+        global.BUNEXT_SKIPPED_BROWSER_MODULES = new Set();
        await bunextInit({ build_only: true });
        log.success("Modules Built Successfully!");
        process.exit();
@@ -4,11 +4,22 @@ import bunextInit from "../../functions/bunext-init";
 import grabDirNames from "../../utils/grab-dir-names";
 import { rmSync } from "fs";
 const { HYDRATION_DST_DIR, BUNX_CWD_PAGES_REWRITE_DIR } = grabDirNames();
+process.on("uncaughtException", (error) => {
+    log.error(`Uncaught exception: ${error}`);
+});
+process.on("unhandledRejection", (reason) => {
+    log.error(`Unhandled rejection: ${reason}`);
+});
 log.info("Running development server ...");
 try {
    rmSync(HYDRATION_DST_DIR, { recursive: true });
    rmSync(BUNX_CWD_PAGES_REWRITE_DIR, { recursive: true });
 }
 catch (error) { }
+try {
    await bunextInit();
    await startServer();
+}
+catch (error) {
+    log.error(`Failed to start development server: ${error}`);
+}
@@ -13,7 +13,7 @@ export default async function allPagesESBuildContextBundler(params) {
    try {
        const did_process_exit_because_of_bundler_error = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
        const pages = grabAllPages({ exclude_api: true });
-        global.PAGE_FILES = pages;
+        global.BUNEXT_PAGE_FILES = pages;
        const dev = isDevelopment();
        const entryToPage = new Map();
        for (const page of pages) {
@@ -28,7 +28,7 @@ export default async function allPagesESBuildContextBundler(params) {
            entryToPage.set(entryFile, { ...page, tsx });
        }
        const entryPoints = [...entryToPage.keys()].map((e) => `hydration-virtual:${e}`);
-        global.BUNDLER_CTX = await esbuild.context({
+        global.BUNEXT_BUNDLER_CTX = await esbuild.context({
            entryPoints,
            outdir: HYDRATION_DST_DIR,
            bundle: true,
@@ -62,13 +62,13 @@ export default async function allPagesESBuildContextBundler(params) {
                "react-dom/client",
                "react/jsx-runtime",
                "react/jsx-dev-runtime",
-                ...(global.CONFIG.page_compiler_excludes || []),
+                ...(global.BUNEXT_CONFIG.page_compiler_excludes || []),
            ],
            logLevel: did_process_exit_because_of_bundler_error
                ? "silent"
                : undefined,
        });
-        await global.BUNDLER_CTX.rebuild();
+        await global.BUNEXT_BUNDLER_CTX.rebuild();
    }
    catch (error) {
        console.log(`ESBUILD Error =>`, error);
@@ -1,18 +1,18 @@
 export default async function buildOnstartErrorHandler(params) {
    // const error_msg = `Build Failed. Please check all your components and imports.`;
    // log.error(error_msg);
-    if (global.BUNDLER_CTX_DISPOSED) {
+    if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
        return;
    }
-    console.log(`Killing Bundler ...`);
-    console.log(`global.BUNDLER_CTX_DISPOSED`, global.BUNDLER_CTX_DISPOSED);
-    global.BUNDLER_CTX_DISPOSED = true;
-    global.RECOMPILING = false;
-    global.IS_SERVER_COMPONENT = false;
+    // console.log(`Killing Bundler ...`);
+    // console.log(`global.BUNEXT_BUNDLER_CTX_DISPOSED`, global.BUNEXT_BUNDLER_CTX_DISPOSED);
+    global.BUNEXT_BUNDLER_CTX_DISPOSED = true;
+    global.BUNEXT_RECOMPILING = false;
+    global.BUNEXT_IS_SERVER_COMPONENT = false;
    await Promise.all([
-        global.SSR_BUNDLER_CTX?.dispose(),
-        global.BUNDLER_CTX?.dispose(),
+        global.BUNEXT_SSR_BUNDLER_CTX?.dispose(),
+        global.BUNEXT_BUNDLER_CTX?.dispose(),
    ]);
-    global.SSR_BUNDLER_CTX = undefined;
-    global.BUNDLER_CTX = undefined;
+    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
+    global.BUNEXT_BUNDLER_CTX = undefined;
 }
@@ -62,7 +62,7 @@ export default async function bunReactModulesBundler() {
    });
    rmSync(tmpDir, { force: true, recursive: true });
    const PUBLIC_ROOT = BUNEXT_VENDOR_DIR.replace(BUNX_CWD_DIR, "/.bunext");
-    global.REACT_IMPORTS_MAP = {
+    global.BUNEXT_REACT_IMPORTS_MAP = {
        imports: {
            react: `${PUBLIC_ROOT}/react.js`,
            "react-dom": `${PUBLIC_ROOT}/react-dom.js`,
@@ -16,7 +16,7 @@ export default async function pagesSSRBundler(params) {
        include_server: true,
    });
    const dev = isDevelopment();
-    const config = global.CONFIG;
+    const config = global.BUNEXT_CONFIG;
    try {
        writeFileSync(path.join(BUNX_TMP_DIR, "ssr-pages.json"), JSON.stringify(pages, null, 4));
    }
@@ -48,6 +48,7 @@ export default async function pagesSSRBundler(params) {
        writeFileSync(path.join(BUNX_TMP_DIR, "ssr-entrypoints.json"), JSON.stringify(entryPoints, null, 4));
    }
    catch (error) { }
+    try {
        await esbuild.build({
            entryPoints,
            outdir: BUNX_CWD_MODULE_CACHE_DIR,
@@ -78,11 +79,16 @@ export default async function pagesSSRBundler(params) {
                "react/jsx-runtime",
                "react/jsx-dev-runtime",
                "bun:*",
+                "bun",
                "sqlite-vec",
                "better-sqlite3",
                ...(config.ssr_compiler_excludes || []),
            ],
            splitting: true,
-        // logLevel: "silent",
        });
    }
+    catch (error) {
+        global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+        log.error(`SSR Bundler Error: ${error}`);
+    }
+}
@@ -11,9 +11,9 @@ const { BUNX_CWD_MODULE_CACHE_DIR } = grabDirNames();
 export default async function pagesSSRContextBundler(params) {
    const pages = grabAllPages();
    const dev = isDevelopment();
-    if (global.SSR_BUNDLER_CTX) {
-        await global.SSR_BUNDLER_CTX.dispose();
-        global.SSR_BUNDLER_CTX = undefined;
+    if (global.BUNEXT_SSR_BUNDLER_CTX) {
+        await global.BUNEXT_SSR_BUNDLER_CTX.dispose();
+        global.BUNEXT_SSR_BUNDLER_CTX = undefined;
    }
    const entryToPage = new Map();
    const { root_file_path } = grabRootFilePath();
@@ -32,7 +32,7 @@ export default async function pagesSSRContextBundler(params) {
        entryToPage.set(page.local_path, { ...page, tsx });
    }
    const entryPoints = [...entryToPage.keys()].map((e) => `ssr-virtual:${e}`);
-    global.SSR_BUNDLER_CTX = await esbuild.context({
+    global.BUNEXT_SSR_BUNDLER_CTX = await esbuild.context({
        entryPoints,
        outdir: BUNX_CWD_MODULE_CACHE_DIR,
        bundle: true,
@@ -65,5 +65,5 @@ export default async function pagesSSRContextBundler(params) {
        ],
        // logLevel: "silent",
    });
-    await global.SSR_BUNDLER_CTX.rebuild();
+    await global.BUNEXT_SSR_BUNDLER_CTX.rebuild();
 }
@@ -5,7 +5,7 @@ const BunSkipNonBrowserPlugin = {
        const skipFilter = /^(bun:|node:|fs$|path$|os$|crypto$|net$|events$|util$|tls$|url$|process$)/;
        // const skipped_modules = new Set<string>();
        build.onResolve({ filter: skipFilter }, (args) => {
-            global.SKIPPED_BROWSER_MODULES.add(args.path);
+            global.BUNEXT_SKIPPED_BROWSER_MODULES.add(args.path);
            return {
                path: args.path,
                namespace: "skipped",
@@ -13,8 +13,8 @@ const BunSkipNonBrowserPlugin = {
            };
        });
        // build.onEnd(() => {
-        //     log.warn(`global.SKIPPED_BROWSER_MODULES`, [
-        //         ...global.SKIPPED_BROWSER_MODULES,
+        //     log.warn(`global.BUNEXT_SKIPPED_BROWSER_MODULES`, [
+        //         ...global.BUNEXT_SKIPPED_BROWSER_MODULES,
        //     ]);
        // });
        // build.onResolve({ filter: /^[^./]/ }, (args) => {
@@ -17,29 +17,29 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
        name: "artifact-tracker",
        setup(build) {
            build.onStart(async () => {
-                global.MAIN_CTX_BUILD_STARTS++;
+                global.BUNEXT_MAIN_CTX_BUILD_STARTS++;
                build_start = performance.now();
                const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
-                if (global.MAIN_CTX_BUILD_STARTS >= MAX_BUILD_STARTS &&
+                if (global.BUNEXT_MAIN_CTX_BUILD_STARTS >= MAX_BUILD_STARTS &&
                    !does_error_file_exist) {
                    await buildOnstartErrorHandler();
                }
            });
            build.onEnd(async (result) => {
                if (result.errors.length > 0) {
-                    global.RECOMPILING = false;
-                    global.IS_SERVER_COMPONENT = false;
+                    global.BUNEXT_RECOMPILING = false;
+                    global.BUNEXT_IS_SERVER_COMPONENT = false;
                    log.error(`Build errors:`);
                    for (const err of result.errors) {
                        log.error(`  ${err.text}${err.location ? ` (${err.location.file}:${err.location.line}:${err.location.column})` : ""}`);
                    }
-                    for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
-                        const controller = global.HMR_CONTROLLERS[i];
+                    for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
+                        const controller = global.BUNEXT_HMR_CONTROLLERS[i];
                        try {
                            controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
                        }
                        catch {
-                            global.HMR_CONTROLLERS.splice(i, 1);
+                            global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
                        }
                    }
                    return;
@@ -51,20 +51,19 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                if (artifacts?.[0] && artifacts.length > 0) {
                    for (let i = 0; i < artifacts.length; i++) {
                        const artifact = artifacts[i];
-                        if (artifact?.local_path && global.BUNDLER_CTX_MAP) {
-                            global.BUNDLER_CTX_MAP[artifact.local_path] =
-                                _.merge(global.BUNDLER_CTX_MAP[artifact.local_path], artifact);
+                        if (artifact?.local_path &&
+                            global.BUNEXT_BUNDLER_CTX_MAP) {
+                            global.BUNEXT_BUNDLER_CTX_MAP[artifact.local_path] =
+                                _.merge(global.BUNEXT_BUNDLER_CTX_MAP[artifact.local_path], artifact);
                        }
                    }
-                    post_build_fn?.({ artifacts });
                }
                const elapsed = (performance.now() - build_start).toFixed(0);
                log.success(`[Built] in ${elapsed}ms`);
-                global.RECOMPILING = false;
-                global.IS_SERVER_COMPONENT = false;
-                global.MAIN_CTX_BUILD_STARTS = 0;
-                global.BUNDLER_CTX_DISPOSED = false;
+                global.BUNEXT_MAIN_CTX_BUILD_STARTS = 0;
+                global.BUNEXT_BUNDLER_CTX_DISPOSED = false;
                const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
+                // SSR must finish before HMR so server props are fresh
                if (build_only) {
                    try {
                        await pagesSSRBundler();
@@ -82,17 +81,22 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                }
                else {
                    try {
-                        pagesSSRBundler();
+                        await pagesSSRBundler();
                    }
                    catch (error) {
                        log.error(`SSR Bundler Error: ${error}`);
                    }
+                    if (artifacts?.[0] && artifacts.length > 0) {
+                        try {
+                            await post_build_fn?.({ artifacts });
                        }
-                // if (global.SSR_BUNDLER_CTX) {
-                //     global.SSR_BUNDLER_CTX.rebuild();
-                // } else {
-                //     pagesSSRContextBundler();
-                // }
+                        catch (error) {
+                            log.error(`Post-build Error: ${error}`);
+                        }
+                    }
+                }
+                global.BUNEXT_RECOMPILING = false;
+                global.BUNEXT_IS_SERVER_COMPONENT = false;
            });
        },
    };
@@ -15,17 +15,23 @@ export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
                build_starts++;
                build_start = performance.now();
                if (build_starts == MAX_BUILD_STARTS) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = true;
-                    await global.SSR_BUNDLER_CTX?.dispose();
-                    global.SSR_BUNDLER_CTX = undefined;
+                    global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+                    await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+                    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
                }
            });
            build.onEnd(async (result) => {
                if (result.errors.length > 0) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = true;
-                    await global.SSR_BUNDLER_CTX?.dispose();
+                    global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+                    try {
+                        await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+                    }
+                    catch { }
+                    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
                    build_starts = 0;
-                    console.log("SSR Build errors:", result.errors);
+                    for (const err of result.errors) {
+                        console.error(`SSR Build error: ${err.text}${err.location ? ` (${err.location.file}:${err.location.line}:${err.location.column})` : ""}`);
+                    }
                    return;
                }
                const artifacts = grabArtifactsFromBundledResults({
@@ -37,9 +43,8 @@ export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
                    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;
+                            global.BUNEXT_SSR_BUNDLER_CTX_MAP) {
+                            global.BUNEXT_SSR_BUNDLER_CTX_MAP[artifact.local_path] = artifact;
                        }
                    }
                    // post_build_fn?.({ artifacts });
@@ -49,10 +54,10 @@ export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
                    // log.success(`SSR [Built] in ${elapsed}ms`);
                }
                try {
-                    writeFileSync(path.join(BUNX_TMP_DIR, "ctx-map.json"), JSON.stringify(global.SSR_BUNDLER_CTX_MAP, null, 4));
+                    writeFileSync(path.join(BUNX_TMP_DIR, "ctx-map.json"), JSON.stringify(global.BUNEXT_SSR_BUNDLER_CTX_MAP, null, 4));
                }
                catch (error) { }
-                global.SSR_BUNDLER_CTX_DISPOSED = false;
+                global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = false;
            });
        },
    };
@@ -65,7 +65,7 @@ export default async function reactModulesBundler() {
    });
    rmSync(tmpDir, { force: true, recursive: true });
    const PUBLIC_ROOT = BUNEXT_VENDOR_DIR.replace(BUNX_CWD_DIR, "/.bunext");
-    global.REACT_IMPORTS_MAP = {
+    global.BUNEXT_REACT_IMPORTS_MAP = {
        imports: {
            react: `${PUBLIC_ROOT}/react.js`,
            "react-dom": `${PUBLIC_ROOT}/react-dom.js`,
@@ -8,8 +8,8 @@ export default async function recordArtifacts({ artifacts, page_file_paths, }) {
            artifacts_map[artifact.local_path] = artifact;
        }
    }
-    if (global.BUNDLER_CTX_MAP) {
-        global.BUNDLER_CTX_MAP = _.merge(global.BUNDLER_CTX_MAP, artifacts_map);
+    if (global.BUNEXT_BUNDLER_CTX_MAP) {
+        global.BUNEXT_BUNDLER_CTX_MAP = _.merge(global.BUNEXT_BUNDLER_CTX_MAP, artifacts_map);
    }
    // await Bun.write(
    //     HYDRATION_DST_DIR_MAP_JSON_FILE,
@@ -8,44 +8,44 @@ import type { FSWatcher } from "fs";
 * # Declare Global Variables
 */
 declare global {
-    var CONFIG: BunextConfig;
-    var SERVER: Server<any> | undefined;
-    var RECOMPILING: boolean;
-    var BUILDING_SSR: boolean;
-    var IS_SERVER_COMPONENT: boolean;
-    var WATCHER_TIMEOUT: any;
-    var ROUTER: FileSystemRouter;
-    var HMR_CONTROLLERS: GlobalHMRControllerObject[];
-    var LAST_BUILD_TIME: number;
-    var BUNDLER_CTX_MAP: {
+    var BUNEXT_CONFIG: BunextConfig;
+    var BUNEXT_SERVER: Server<any> | undefined;
+    var BUNEXT_RECOMPILING: boolean;
+    var BUNEXT_BUILDING_SSR: boolean;
+    var BUNEXT_IS_SERVER_COMPONENT: boolean;
+    var BUNEXT_WATCHER_TIMEOUT: any;
+    var BUNEXT_ROUTER: FileSystemRouter;
+    var BUNEXT_HMR_CONTROLLERS: GlobalHMRControllerObject[];
+    var BUNEXT_LAST_BUILD_TIME: number;
+    var BUNEXT_BUNDLER_CTX_MAP: {
        [k: string]: BundlerCTXMap;
    };
-    var SSR_BUNDLER_CTX_MAP: {
+    var BUNEXT_SSR_BUNDLER_CTX_MAP: {
        [k: string]: BundlerCTXMap;
    };
-    var BUNDLER_REBUILDS: 0;
-    var PAGES_SRC_WATCHER: FSWatcher | undefined;
-    var CURRENT_VERSION: string | undefined;
-    var PAGE_FILES: PageFiles[];
-    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: DirNames;
-    var REACT_IMPORTS_MAP: {
+    var BUNEXT_BUNDLER_REBUILDS: 0;
+    var BUNEXT_PAGES_SRC_WATCHER: FSWatcher | undefined;
+    var BUNEXT_CURRENT_VERSION: string | undefined;
+    var BUNEXT_PAGE_FILES: PageFiles[];
+    var BUNEXT_ROOT_FILE_UPDATED: boolean;
+    var BUNEXT_SKIPPED_BROWSER_MODULES: Set<string>;
+    var BUNEXT_BUNDLER_CTX: BuildContext | undefined;
+    var BUNEXT_SSR_BUNDLER_CTX: BuildContext | undefined;
+    var BUNEXT_DIR_NAMES: DirNames;
+    var BUNEXT_REACT_IMPORTS_MAP: {
        imports: Record<string, string>;
    };
-    var REACT_DOM_SERVER: any;
-    var REACT_DOM_MODULE_CACHE: Map<string, {
+    var BUNEXT_REACT_DOM_SERVER: any;
+    var BUNEXT_REACT_DOM_MODULE_CACHE: Map<string, {
        main: any;
        css: string;
    }>;
-    var BUNDLER_CTX_DISPOSED: boolean | undefined;
-    var SSR_BUNDLER_CTX_DISPOSED: boolean | undefined;
-    var REBUILD_RETRIES: number;
-    var IS_404_PAGE: boolean;
-    var CONSTANTS: ReturnType<typeof grabConstants>;
-    var MAIN_CTX_BUILD_STARTS: number;
+    var BUNEXT_BUNDLER_CTX_DISPOSED: boolean | undefined;
+    var BUNEXT_SSR_BUNDLER_CTX_DISPOSED: boolean | undefined;
+    var BUNEXT_REBUILD_RETRIES: number;
+    var BUNEXT_IS_404_PAGE: boolean;
+    var BUNEXT_CONSTANTS: ReturnType<typeof grabConstants>;
+    var BUNEXT_MAIN_CTX_BUILD_STARTS: number;
 }
 type Params = {
    build_only?: boolean;
@@ -11,27 +11,27 @@ import watcherEsbuildCTX from "./server/watcher-esbuild-ctx";
 const dirNames = grabDirNames();
 const { PAGES_DIR } = dirNames;
 export default async function bunextInit(params) {
-    global.HMR_CONTROLLERS = [];
-    global.BUNDLER_CTX_MAP = {};
-    global.SSR_BUNDLER_CTX_MAP = {};
-    // global.API_ROUTES_BUNDLER_CTX_MAP = {};
-    global.BUNDLER_REBUILDS = 0;
-    global.REBUILD_RETRIES = 0;
-    global.PAGE_FILES = [];
-    global.SKIPPED_BROWSER_MODULES = new Set();
-    global.DIR_NAMES = dirNames;
-    global.REACT_IMPORTS_MAP = { imports: {} };
-    global.REACT_DOM_MODULE_CACHE = new Map();
-    global.MAIN_CTX_BUILD_STARTS = 0;
+    global.BUNEXT_HMR_CONTROLLERS = [];
+    global.BUNEXT_BUNDLER_CTX_MAP = {};
+    global.BUNEXT_SSR_BUNDLER_CTX_MAP = {};
+    // global.BUNEXT_API_ROUTES_BUNDLER_CTX_MAP = {};
+    global.BUNEXT_BUNDLER_REBUILDS = 0;
+    global.BUNEXT_REBUILD_RETRIES = 0;
+    global.BUNEXT_PAGE_FILES = [];
+    global.BUNEXT_SKIPPED_BROWSER_MODULES = new Set();
+    global.BUNEXT_DIR_NAMES = dirNames;
+    global.BUNEXT_REACT_IMPORTS_MAP = { imports: {} };
+    global.BUNEXT_REACT_DOM_MODULE_CACHE = new Map();
+    global.BUNEXT_MAIN_CTX_BUILD_STARTS = 0;
    await init();
    log.banner();
-    global.CONSTANTS = grabConstants();
+    global.BUNEXT_CONSTANTS = grabConstants();
    await reactModulesBundler();
    const router = new Bun.FileSystemRouter({
        style: "nextjs",
        dir: PAGES_DIR,
    });
-    global.ROUTER = router;
+    global.BUNEXT_ROUTER = router;
    const is_dev = isDevelopment();
    if (params?.build_only) {
        log.build(`Building Modules ...`);
@@ -40,8 +40,8 @@ export default async function bunextInit(params) {
    else if (is_dev) {
        log.build(`Building Modules ...`);
        await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
            },
        });
        watcherEsbuildCTX();
@@ -9,7 +9,7 @@ export default async function trimCacheKey({ key, }) {
        const { cache_name, cache_meta_name } = grabCacheNames({
            key,
        });
-        const config = global.CONFIG;
+        const config = global.BUNEXT_CONFIG;
        const default_expiry_time_seconds = config.default_cache_expiry ||
            AppData["DefaultCacheExpiryTimeSeconds"];
        const default_expiry_time_milliseconds = default_expiry_time_seconds * 1000;
@@ -24,7 +24,7 @@ export default async function () {
    try {
        const package_json = await Bun.file(path.resolve(__dirname, "../../package.json")).json();
        const current_version = package_json.version;
-        global.CURRENT_VERSION = current_version;
+        global.BUNEXT_CURRENT_VERSION = current_version;
    }
    catch (error) { }
    const keys = Object.keys(dirNames);
@@ -45,7 +45,7 @@ export default async function () {
        }
    }
    const config = (await grabConfig()) || {};
-    global.CONFIG = {
+    global.BUNEXT_CONFIG = {
        ...config,
        development: is_dev,
    };
@@ -19,8 +19,8 @@ export default async function bunextRequestHandler({ req: initial_req, server, }
            return Response.json({ success: false, msg: `Invalid Path` });
        }
        let response = undefined;
-        if (global.CONSTANTS.config?.middleware) {
-            const middleware_res = await global.CONSTANTS.config.middleware({
+        if (global.BUNEXT_CONSTANTS.config?.middleware) {
+            const middleware_res = await global.BUNEXT_CONSTANTS.config.middleware({
                req: initial_req,
                url,
            });
@@ -1,17 +1,17 @@
 import chokidar from "chokidar";
 import path from "path";
-import { existsSync, statSync } from "fs";
+import { existsSync } from "fs";
 import grabDirNames from "../../utils/grab-dir-names";
 import fullRebuild from "./full-rebuild";
 import { AppData } from "../../data/app-data";
 import checkExcludedPatterns from "../../utils/check-excluded-patterns";
 import pagesSSRBundler from "../bundler/pages-ssr-bundler";
+import { log } from "../../utils/log";
 const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
 export default async function chokadirWatcherEsbuildCTX() {
-    // Define ignored patterns directly in Chokidar for better performance
    const watcher = chokidar.watch(ROOT_DIR, {
        ignored: [
-            /(^|[\/\\])\../, // ignore dotfiles
+            /(^|[\/\\])\../,
            /node_modules/,
            /public/,
            /\.bunext/,
@@ -25,19 +25,24 @@ export default async function chokadirWatcherEsbuildCTX() {
        depth: 99,
    });
    const handleEvent = async (event, filePath) => {
+        let owns_recompile = false;
+        try {
            const filename = path.relative(ROOT_DIR, filePath);
            if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
                await fullRebuild();
                return;
            }
-        if (global.BUNDLER_CTX_DISPOSED) {
+            if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
                await fullRebuild({ msg: `Restarting Bundler ...` });
            }
-        if (global.SSR_BUNDLER_CTX_DISPOSED) {
-            pagesSSRBundler();
+            if (global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED) {
+                await pagesSSRBundler().catch((error) => {
+                    log.error(`SSR Bundler Error: ${error}`);
+                });
            }
            if (filename.match(/\/styles$/) || filename === "styles") {
-            global.RECOMPILING = true;
+                owns_recompile = true;
+                global.BUNEXT_RECOMPILING = true;
                await Bun.sleep(1000);
                await fullRebuild({
                    msg: `Detected new \`styles\` directory. Rebuilding ...`,
@@ -53,39 +58,43 @@ export default async function chokadirWatcherEsbuildCTX() {
            const target_files_match = /\.(tsx?|jsx?|css)$/;
            if (event === "change") {
                if (filename.match(target_files_match)) {
-                if (global.RECOMPILING)
+                    if (global.BUNEXT_RECOMPILING)
                        return;
-                global.RECOMPILING = true;
+                    owns_recompile = true;
+                    global.BUNEXT_RECOMPILING = true;
                    if (filename.match(/.*\.server\.tsx?/)) {
-                    global.IS_SERVER_COMPONENT = true;
+                        global.BUNEXT_IS_SERVER_COMPONENT = true;
                    }
-                if (global.BUNDLER_CTX) {
-                    await global.BUNDLER_CTX.rebuild();
+                    if (global.BUNEXT_BUNDLER_CTX) {
+                        await global.BUNEXT_BUNDLER_CTX.rebuild();
                    }
-                // HMR for error pages
                    if (filename.match(/(404|500)\.tsx?/)) {
-                    global.HMR_CONTROLLERS.forEach((controller) => {
+                        for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
+                            const controller = global.BUNEXT_HMR_CONTROLLERS[i];
+                            try {
                                controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
-                    });
+                            }
+                            catch {
+                                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+                            }
+                        }
                    }
                }
                return;
            }
-        // Handle Structural Changes (Add/Delete)
            if (["add", "unlink", "addDir", "unlinkDir"].includes(event)) {
-            const is_file_of_interest = !!filename.match(target_files_match) || event.includes("Dir");
+                const is_file_of_interest = !!filename.match(target_files_match) ||
+                    event.includes("Dir");
                if (!is_file_of_interest)
                    return;
-            // Validation logic
                if (!filename.match(/^src\/pages\/|\.css$/) ||
                    checkExcludedPatterns({ path: filename }) ||
                    filename.includes(" ")) {
-                // With chokidar, you rarely need to "reload" the whole watcher.
-                // But we keep the logic for consistency.
                    return reloadWatcher();
                }
-            if (global.RECOMPILING)
+                if (global.BUNEXT_RECOMPILING)
                    return;
+                owns_recompile = true;
                const action = event.startsWith("add") ? "created" : "deleted";
                const type = filename.match(/\.css$/)
                    ? "Stylesheet"
@@ -98,6 +107,16 @@ export default async function chokadirWatcherEsbuildCTX() {
                    msg: `${type} ${action}: ${filename}. Rebuilding ...`,
                });
            }
+        }
+        catch (error) {
+            log.error(`Watcher rebuild failed: ${error}`);
+        }
+        finally {
+            if (owns_recompile) {
+                global.BUNEXT_RECOMPILING = false;
+                global.BUNEXT_IS_SERVER_COMPONENT = false;
+            }
+        }
    };
    watcher
        .on("add", (path) => handleEvent("add", path))
@@ -105,11 +124,10 @@ export default async function chokadirWatcherEsbuildCTX() {
        .on("unlink", (path) => handleEvent("unlink", path))
        .on("addDir", (path) => handleEvent("addDir", path))
        .on("unlinkDir", (path) => handleEvent("unlinkDir", path));
-    // global.PAGES_SRC_WATCHER = watcher;
 }
 function reloadWatcher() {
-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        chokadirWatcherEsbuildCTX();
    }
 }
@@ -5,32 +5,33 @@ import watcherEsbuildCTX from "./watcher-esbuild-ctx";
 export default async function fullRebuild(params) {
    try {
        const { msg } = params || {};
-        global.RECOMPILING = true;
+        global.BUNEXT_RECOMPILING = true;
        if (msg) {
            log.watch(msg);
        }
-        global.ROUTER.reload();
+        global.BUNEXT_ROUTER.reload();
        try {
-            await global.BUNDLER_CTX?.dispose();
-            global.BUNDLER_CTX = undefined;
-            await global.SSR_BUNDLER_CTX?.dispose();
-            global.SSR_BUNDLER_CTX = undefined;
+            await global.BUNEXT_BUNDLER_CTX?.dispose();
+            global.BUNEXT_BUNDLER_CTX = undefined;
+            await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+            global.BUNEXT_SSR_BUNDLER_CTX = undefined;
        }
        catch (error) { }
-        // await pagesSSRBundler();
        await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
            },
        });
    }
    catch (error) {
-        global.RECOMPILING = false;
-        global.IS_SERVER_COMPONENT = false;
        log.error(error);
    }
-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    finally {
+        global.BUNEXT_RECOMPILING = false;
+        global.BUNEXT_IS_SERVER_COMPONENT = false;
+    }
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        watcherEsbuildCTX();
    }
 }
@@ -1,11 +1,12 @@
 function removeController(controller) {
-    const idx = global.HMR_CONTROLLERS.findIndex((c) => c.controller == controller);
+    const idx = global.BUNEXT_HMR_CONTROLLERS.findIndex((c) => c.controller == controller);
    if (typeof idx == "number" && idx >= 0) {
-        global.HMR_CONTROLLERS.splice(idx, 1);
+        global.BUNEXT_HMR_CONTROLLERS.splice(idx, 1);
    }
 }
 export default async function ({ req }) {
    const referer = req.headers.get("referer");
+    const page_cookie = req.headers.get("cookie");
    if (!referer) {
        return new Response("Missing Referer Header", { status: 400 });
    }
@@ -16,19 +17,20 @@ export default async function ({ req }) {
    catch {
        return new Response("Invalid Referer Header", { status: 400 });
    }
-    const match = global.ROUTER.match(referer_url.pathname);
+    const match = global.BUNEXT_ROUTER.match(referer_url.pathname);
    const target_map = match?.filePath
-        ? global.BUNDLER_CTX_MAP?.[match.filePath]
+        ? global.BUNEXT_BUNDLER_CTX_MAP?.[match.filePath]
        : undefined;
    let controller;
    let heartbeat;
    const stream = new ReadableStream({
        start(c) {
            controller = c;
-            global.HMR_CONTROLLERS.push({
+            global.BUNEXT_HMR_CONTROLLERS.push({
                controller: c,
                page_url: referer_url.href,
                target_map,
+                page_cookie,
            });
            heartbeat = setInterval(() => {
                try {
@@ -30,8 +30,8 @@ export default async function ({ req }) {
    });
    let module;
    const now = Date.now();
-    if (is_dev && global.SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
-        const target_import = path.join(ROOT_DIR, global.SSR_BUNDLER_CTX_MAP[match.filePath].path);
+    if (is_dev && global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
+        const target_import = path.join(ROOT_DIR, global.BUNEXT_SSR_BUNDLER_CTX_MAP[match.filePath].path);
        module = await import(`${target_import}?t=${now}`);
    }
    else {
@@ -1,49 +1,53 @@
 import _ from "lodash";
 import grabPageComponent from "./web-pages/grab-page-component";
 export default async function serverPostBuildFn(params) {
-    if (!global.HMR_CONTROLLERS?.[0] || !global.BUNDLER_CTX_MAP) {
+    if (!global.BUNEXT_HMR_CONTROLLERS?.[0] || !global.BUNEXT_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];
+    for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
+        const controller = global.BUNEXT_HMR_CONTROLLERS[i];
        if (!controller) {
            continue;
        }
        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) {
+            try {
                controller.controller.enqueue(reload_enqueue);
+            }
+            catch {
+                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+            }
            continue;
        }
-        const target_artifact = global.BUNDLER_CTX_MAP[controller.target_map.local_path];
-        if (!target_artifact.local_path) {
+        const target_artifact = global.BUNEXT_BUNDLER_CTX_MAP[controller.target_map.local_path];
+        if (!target_artifact?.local_path) {
+            try {
                controller.controller.enqueue(reload_enqueue);
+            }
+            catch {
+                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+            }
            continue;
        }
        const mock_req = target_artifact.req_url
-            ? new Request(target_artifact.req_url)
+            ? new Request(target_artifact.req_url, {})
            : new Request(controller.page_url);
-        const page_component = global.IS_SERVER_COMPONENT
-            ? await grabPageComponent({
+        if (controller.page_cookie) {
+            mock_req.headers.set("cookie", controller.page_cookie);
+        }
+        const page_component = await grabPageComponent({
            req: mock_req,
            return_server_res_only: true,
            is_hydration: true,
-            })
-            : {};
+        });
        if (page_component instanceof Response) {
            continue;
        }
-        const { serverRes } = page_component;
+        const { serverRes } = page_component || {};
        const final_artifact = {
            ..._.omit(controller, ["controller"]),
            target_map: target_artifact,
@@ -51,22 +55,21 @@ export default async function serverPostBuildFn(params) {
        if (!target_artifact) {
            delete final_artifact.target_map;
        }
-        if (serverRes) {
-            final_artifact.page_props = serverRes;
-        }
+        // Always replace so prior error props cannot linger
+        final_artifact.page_props = serverRes || {};
        try {
            let final_data = {};
-            if (global.ROOT_FILE_UPDATED) {
+            if (global.BUNEXT_ROOT_FILE_UPDATED) {
                final_data = reload_payload;
            }
            else {
                final_data = final_artifact;
            }
            controller.controller.enqueue(`event: update\ndata: ${JSON.stringify(final_data)}\n\n`);
-            global.ROOT_FILE_UPDATED = false;
+            global.BUNEXT_ROOT_FILE_UPDATED = false;
        }
        catch {
-            global.HMR_CONTROLLERS.splice(i, 1);
+            global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
        }
    }
 }
@@ -1,10 +1,21 @@
 import _ from "lodash";
 import { log } from "../../utils/log";
 import serverParamsGen from "./server-params-gen";
+import isDevelopment from "../../utils/is-development";
+import watcherEsbuildCTX from "./watcher-esbuild-ctx";
 export default async function startServer() {
    const serverParams = await serverParamsGen();
    const server = Bun.serve(serverParams);
-    global.SERVER = server;
+    const is_dev = isDevelopment();
+    global.BUNEXT_SERVER = server;
    log.server(`http://${server.hostname}:${server.port}`);
+    if (is_dev) {
+        setInterval(() => {
+            if (global.BUNEXT_PAGES_SRC_WATCHER) {
+                global.BUNEXT_PAGES_SRC_WATCHER.close();
+                watcherEsbuildCTX();
+            }
+        }, 5000);
+    }
    return server;
 }
@@ -1,18 +1,39 @@
-import { watch, existsSync, statSync } from "fs";
+import { watch, existsSync, statSync, glob } from "fs";
 import path from "path";
 import grabDirNames from "../../utils/grab-dir-names";
 import fullRebuild from "./full-rebuild";
 import { AppData } from "../../data/app-data";
 import checkExcludedPatterns from "../../utils/check-excluded-patterns";
 import pagesSSRBundler from "../bundler/pages-ssr-bundler";
+import { log } from "../../utils/log";
 const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
 export default async function watcherEsbuildCTX() {
    const pages_src_watcher = watch(ROOT_DIR, {
        recursive: true,
        persistent: true,
    }, async (event, filename) => {
+        let owns_recompile = false;
+        try {
            if (!filename)
                return;
+            const full_file_path = path.join(ROOT_DIR, filename);
+            if (global.BUNEXT_CONFIG.exclude_watch_patterns) {
+                for (let i = 0; i < global.BUNEXT_CONFIG.exclude_watch_patterns.length; i++) {
+                    const watch_pattern = global.BUNEXT_CONFIG.exclude_watch_patterns[i];
+                    if (watch_pattern instanceof RegExp) {
+                        const is_path_excluded = watch_pattern.test(filename);
+                        if (is_path_excluded) {
+                            return;
+                        }
+                    }
+                    else {
+                        const excluded_path = path.resolve(ROOT_DIR, watch_pattern);
+                        if (excluded_path == full_file_path) {
+                            return;
+                        }
+                    }
+                }
+            }
            if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
                await fullRebuild();
                return;
@@ -20,23 +41,25 @@ export default async function watcherEsbuildCTX() {
            if (filename.match(/^\.\w+/)) {
                return;
            }
-        if (global.BUNDLER_CTX_DISPOSED) {
+            if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
                await fullRebuild({ msg: `Restarting Bundler ...` });
                return;
            }
-        if (global.SSR_BUNDLER_CTX_DISPOSED) {
-            pagesSSRBundler();
+            if (global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED) {
+                await pagesSSRBundler().catch((error) => {
+                    log.error(`SSR Bundler Error: ${error}`);
+                });
            }
            if (filename.endsWith(AppData["BunextTmpFileExt"])) {
                return;
            }
-        const full_file_path = path.join(ROOT_DIR, filename);
            const does_file_exist = existsSync(full_file_path);
            const file_stat = does_file_exist
                ? statSync(full_file_path)
                : undefined;
            if (full_file_path.match(/\/styles$/)) {
-            global.RECOMPILING = true;
+                owns_recompile = true;
+                global.BUNEXT_RECOMPILING = true;
                await Bun.sleep(1000);
                await fullRebuild({
                    msg: `Detected new \`styles\` directory. Rebuilding ...`,
@@ -53,23 +76,28 @@ export default async function watcherEsbuildCTX() {
                return;
            }
            const target_files_match = /\.(tsx?|jsx?|css)$/;
-        // const rebuild_skip_paths = /\/pages\/api\//;
            if (event !== "rename") {
                if (filename.match(target_files_match)) {
-                if (global.RECOMPILING)
+                    if (global.BUNEXT_RECOMPILING)
                        return;
-                global.RECOMPILING = true;
+                    owns_recompile = true;
+                    global.BUNEXT_RECOMPILING = true;
                    if (filename.match(/.*\.server\.tsx?/)) {
-                    global.IS_SERVER_COMPONENT = true;
+                        global.BUNEXT_IS_SERVER_COMPONENT = true;
                    }
-                if (global.BUNDLER_CTX) {
-                    await global.BUNDLER_CTX.rebuild();
+                    if (global.BUNEXT_BUNDLER_CTX) {
+                        await global.BUNEXT_BUNDLER_CTX.rebuild();
                    }
                    if (filename.match(/(404|500)\.tsx?/)) {
-                    for (let i = global.HMR_CONTROLLERS.length - 1; i >= 0; i--) {
-                        const controller = global.HMR_CONTROLLERS[i];
+                        for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
+                            const controller = global.BUNEXT_HMR_CONTROLLERS[i];
+                            try {
                                controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
                            }
+                            catch {
+                                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+                            }
+                        }
                    }
                }
                return;
@@ -85,8 +113,9 @@ export default async function watcherEsbuildCTX() {
                return reloadWatcher();
            if (filename.match(/ /))
                return reloadWatcher();
-        if (global.RECOMPILING)
+            if (global.BUNEXT_RECOMPILING)
                return;
+            owns_recompile = true;
            const action = does_file_exist ? "created" : "deleted";
            const type = filename.match(/\.css$/)
                ? "Sylesheet"
@@ -98,12 +127,22 @@ export default async function watcherEsbuildCTX() {
            await fullRebuild({
                msg: `${type} ${action}: ${filename}. Rebuilding ...`,
            });
+        }
+        catch (error) {
+            log.error(`Watcher rebuild failed: ${error}`);
+        }
+        finally {
+            if (owns_recompile) {
+                global.BUNEXT_RECOMPILING = false;
+                global.BUNEXT_IS_SERVER_COMPONENT = false;
+            }
+        }
    });
-    global.PAGES_SRC_WATCHER = pages_src_watcher;
+    global.BUNEXT_PAGES_SRC_WATCHER = pages_src_watcher;
 }
 function reloadWatcher() {
-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        watcherEsbuildCTX();
    }
 }
@@ -43,16 +43,18 @@ export default async function genWebHTML({ component: Main, pageProps, bundledMa
    const RootHead = root_module?.Head;
    const dev = isDevelopment();
    const final_meta = _.merge(root_meta, page_meta);
-    // const public_envs = Object.keys(process.env).filter((e) =>
-    //     e.startsWith(`NEXT_PUBLIC_`),
-    // );
+    const public_envs = Object.fromEntries(Object.entries(process.env).filter(([k]) => k.startsWith("BUNEXT_PUBLIC_")));
    const client_process = {
-        env: {},
+        env: {
+            NODE_ENV: dev ? "development" : "production",
+            ...public_envs,
+            ...global.BUNEXT_CONFIG.public_envs,
+        },
    };
    let final_component = (_jsxs("html", { ...html_props, children: [_jsxs("head", { children: [_jsx("meta", { charSet: "utf-8", "data-bunext-head": true }), _jsx("meta", { name: "viewport", content: "width=device-width, initial-scale=1.0", "data-bunext-head": true }), final_meta ? grabWebMetaHTML({ meta: final_meta }) : null, bundledMap?.css_path ? (_jsx("link", { rel: "stylesheet", href: `/${bundledMap.css_path}`, "data-bunext-head": true })) : null, _jsx("script", { dangerouslySetInnerHTML: {
                            __html: `window.${ClientWindowPagePropsName} = ${serializedProps};\nwindow.process = ${JSON.stringify(client_process)}`,
                        }, "data-bunext-head": true }), RootHead ? (_jsx(RootHead, { serverRes: pageProps, ctx: routeParams })) : null, Head ? _jsx(Head, { serverRes: pageProps, ctx: routeParams }) : null, bundledMap?.path ? (_jsxs(_Fragment, { children: [_jsx("script", { type: "importmap", dangerouslySetInnerHTML: {
-                                    __html: JSON.stringify(global.REACT_IMPORTS_MAP),
+                                    __html: JSON.stringify(global.BUNEXT_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: _jsx(Main, { ...pageProps }) }) })] }));
@@ -24,7 +24,7 @@ export default async function grabFilePathModule({ file_path, out_file, }) {
        jsx: "automatic",
        outfile: target_cache_file_path,
    });
-    Loader.registry.delete(target_cache_file_path);
+    // Loader.registry.delete(target_cache_file_path);
    const module = await import(`${target_cache_file_path}?t=${Date.now()}`);
    return module;
 }
@@ -7,8 +7,10 @@ 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));
+        if (global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[file_path]) {
+            const abs = path.join(ROOT_DIR, global.BUNEXT_SSR_BUNDLER_CTX_MAP[file_path].path);
+            // Loader.registry.delete(abs);
+            const mod = await import(`${abs}?t=${Date.now()}`);
            const Main = mod.default;
            return { component: Main };
        }
@@ -12,10 +12,13 @@ export default async function grabPageCombinedServerRes({ file_path, debug, url,
    const { server_file_path: root_server_file_path } = root_file_path
        ? grabPageServerPath({ file_path: root_file_path })
        : {};
-    const root_server_ctx_map = global.SSR_BUNDLER_CTX_MAP[root_server_file_path || ""];
+    const root_server_ctx_map = global.BUNEXT_SSR_BUNDLER_CTX_MAP[root_server_file_path || ""];
    const final_root_server_path = root_server_ctx_map?.local_path
        ? path.join(ROOT_DIR, root_server_ctx_map.path)
        : root_server_file_path;
+    if (final_root_server_path) {
+        // Loader.registry.delete(final_root_server_path);
+    }
    const root_server_module = final_root_server_path
        ? await import(`${final_root_server_path}?t=${now}`)
        : undefined;
@@ -30,10 +33,13 @@ export default async function grabPageCombinedServerRes({ file_path, debug, url,
        log.info(`rootServerRes:`, rootServerRes);
    }
    const { server_file_path } = grabPageServerPath({ file_path });
-    const page_server_ctx = global.SSR_BUNDLER_CTX_MAP[server_file_path || ""];
+    const page_server_ctx = global.BUNEXT_SSR_BUNDLER_CTX_MAP[server_file_path || ""];
    const final_page_server_path = page_server_ctx?.local_path
        ? path.join(ROOT_DIR, page_server_ctx.path)
        : server_file_path;
+    if (final_page_server_path) {
+        // Loader.registry.delete(final_page_server_path);
+    }
    const server_module = final_page_server_path
        ? await import(`${final_page_server_path}?t=${now}`)
        : undefined;
@@ -9,6 +9,7 @@ import serverPostBuildFn from "../server-post-build-fn";
 import isDevelopment from "../../../utils/is-development";
 import { existsSync } from "fs";
 import grabDirNames from "../../../utils/grab-dir-names";
+import watcherEsbuildCTX from "../watcher-esbuild-ctx";
 const { BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();
 class NotFoundError extends Error {
    status = 404;
@@ -20,7 +21,7 @@ class NotFoundError extends Error {
 export default async function grabPageComponent(params) {
    const { req, file_path: passed_file_path, debug, return_server_res_only, skip_server_res, is_hydration, } = params;
    const url = req?.url ? new URL(req.url) : undefined;
-    const router = global.ROUTER;
+    const router = global.BUNEXT_ROUTER;
    const is_dev = isDevelopment();
    const forwarded_proto = req?.headers.get("x-forwarded-proto");
    if (url && forwarded_proto) {
@@ -50,7 +51,7 @@ export default async function grabPageComponent(params) {
            // log.error(errMsg);
            throw new Error(errMsg);
        }
-        let bundledMap = global.BUNDLER_CTX_MAP[file_path];
+        let bundledMap = global.BUNEXT_BUNDLER_CTX_MAP[file_path];
        if (!bundledMap?.path) {
            if (does_error_file_exist) {
                throw new Error(`Application Error. Please Check your components. ${match?.filePath} likely exists but has no exported module.`);
@@ -61,7 +62,8 @@ export default async function grabPageComponent(params) {
                await fullRebuild({
                    msg: `Retrying Bundle map for file \`${file_path}\``,
                });
-                bundledMap = global.BUNDLER_CTX_MAP[file_path];
+                await Bun.sleep(1000);
+                bundledMap = global.BUNEXT_BUNDLER_CTX_MAP[file_path];
                if (bundledMap?.path)
                    break;
            }
@@ -72,7 +74,7 @@ export default async function grabPageComponent(params) {
            }
        }
        if (req && !is_hydration) {
-            global.BUNDLER_CTX_MAP[file_path].req_url = req.url;
+            global.BUNEXT_BUNDLER_CTX_MAP[file_path].req_url = req.url;
        }
        if (debug) {
            log.info(`bundledMap:`, bundledMap);
@@ -114,8 +116,9 @@ export default async function grabPageComponent(params) {
            error?.name === "NotFoundError" ||
            error?.status === 404;
        if (!params.retry && is_dev) {
-            while (global.REBUILD_RETRIES < 2) {
-                global.REBUILD_RETRIES = global.REBUILD_RETRIES + 1;
+            while (global.BUNEXT_REBUILD_RETRIES < 2) {
+                global.BUNEXT_REBUILD_RETRIES =
+                    global.BUNEXT_REBUILD_RETRIES + 1;
                await fullRebuild();
                await Bun.sleep(200);
                const component_retried = await grabPageComponent({
@@ -124,19 +127,22 @@ export default async function grabPageComponent(params) {
                });
                if (component_retried instanceof Response ||
                    component_retried.success) {
-                    global.REBUILD_RETRIES = 0;
+                    global.BUNEXT_REBUILD_RETRIES = 0;
                    await serverPostBuildFn();
                    return component_retried;
                }
            }
-            global.REBUILD_RETRIES = 0;
+            global.BUNEXT_REBUILD_RETRIES = 0;
        }
        if (is404) {
-            global.IS_404_PAGE = true;
+            global.BUNEXT_IS_404_PAGE = true;
        }
        else {
            log.error(`Error Grabbing Page Component: ${error.message}`);
            log.error(`Page: ${passed_file_path || url?.pathname}`);
+            if (is_dev) {
+                fullRebuild();
+            }
        }
        return await grabPageErrorComponent({
            error,
@@ -2,8 +2,11 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import grabDirNames from "../../../utils/grab-dir-names";
 import grabPageModules from "./grab-page-modules";
 import _ from "lodash";
+import fullRebuild from "../full-rebuild";
+import isDevelopment from "../../../utils/is-development";
 export default async function grabPageErrorComponent({ error, routeParams, is404, url, }) {
-    const router = global.ROUTER;
+    const router = global.BUNEXT_ROUTER;
+    const is_dev = isDevelopment();
    const { BUNX_ROOT_500_PRESET_COMPONENT, BUNX_ROOT_404_PRESET_COMPONENT } = grabDirNames();
    const errorRoute = is404 ? "/404" : "/500";
    const presetComponent = is404
@@ -30,7 +33,7 @@ export default async function grabPageErrorComponent({ error, routeParams, is404
            };
        }
        const file_path = match.filePath;
-        const bundledMap = global.BUNDLER_CTX_MAP?.[file_path];
+        const bundledMap = global.BUNEXT_BUNDLER_CTX_MAP?.[file_path];
        const page_component = await grabPageModules({
            file_path: file_path,
            query: match?.query,
@@ -51,6 +54,9 @@ export default async function grabPageErrorComponent({ error, routeParams, is404
        };
    }
    catch {
+        if (is_dev) {
+            fullRebuild();
+        }
        const DefaultNotFound = () => (_jsxs("div", { style: {
                width: "100vw",
                height: "100vh",
@@ -28,7 +28,7 @@ export default async function grabPageServerRes({ url, query, routeParams, serve
            const serverData = await server_function({
                ...routeParams,
                query: { ...routeParams.query, ...query },
-                props: init_props,
+                props: init_props || undefined,
            });
            return _.merge(default_props, serverData);
        }
@@ -108,11 +108,12 @@ 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;
+    if (global.BUNEXT_REACT_DOM_MODULE_CACHE.has(page_file_path)) {
+        return global.BUNEXT_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, {
+    global.BUNEXT_REACT_DOM_MODULE_CACHE.set(page_file_path, {
        main: mod,
        css: mod_css_path,
    });
@@ -66,6 +66,16 @@ export type BunextConfig = {
     * bundler for the browser. Eg. `react/jsx-dev-runtime`
     */
    page_compiler_excludes?: string[];
+    /**
+     * Patterns to exclude from the watcher. Eg. `./src/server.ts`
+     * or `\*.test.ts\`. It should either be a file path (relative or
+     * absolute), or a RegEx pattern.
+     */
+    exclude_watch_patterns?: (string | RegExp)[];
+    /**
+     * Public environment variables to be passed to the client
+     */
+    public_envs?: Record<string, string>;
 };
 export type BunextConfigMiddlewareParams = {
    req: Request;
@@ -203,7 +213,7 @@ export type BunextPageServerFn<T extends {
 } = {
    [k: string]: any;
 }> = (ctx: Omit<BunxRouteParams, "body"> & {
-    props?: any;
+    props?: T;
 }) => Promise<BunextPageModuleServerReturn<T>>;
 export type BunextRouteConfig = {
    /**
@@ -314,6 +324,7 @@ export type GlobalHMRControllerObject = {
    target_map?: BundlerCTXMap;
    page_props?: any;
    page_reloaded?: boolean;
+    page_cookie?: string | null;
 };
 export type BunextCacheFileMeta = {
    date_created: number;
@@ -1,6 +1,6 @@
 export default function ({ path }) {
-    for (let i = 0; i < global.CONSTANTS.RouteIgnorePatterns.length; i++) {
-        const regex = global.CONSTANTS.RouteIgnorePatterns[i];
+    for (let i = 0; i < global.BUNEXT_CONSTANTS.RouteIgnorePatterns.length; i++) {
+        const regex = global.BUNEXT_CONSTANTS.RouteIgnorePatterns[i];
        if (path.match(regex))
            return true;
    }
@@ -6,8 +6,8 @@ export default function grabAppPort() {
        if (process.env.PORT) {
            return numberfy(process.env.PORT);
        }
-        if (global.CONFIG.port) {
-            return global.CONFIG.port;
+        if (global.BUNEXT_CONFIG.port) {
+            return global.BUNEXT_CONFIG.port;
        }
        return numberfy(defaultPort);
    }
@@ -1,7 +1,7 @@
 import AppNames from "./grab-app-names";
 export default function grabAssetsPrefix() {
-    if (global.CONFIG.assets_prefix) {
-        return global.CONFIG.assets_prefix;
+    if (global.BUNEXT_CONFIG.assets_prefix) {
+        return global.BUNEXT_CONFIG.assets_prefix;
    }
    const { defaultAssetPrefix } = AppNames;
    return defaultAssetPrefix;
@@ -1,5 +1,5 @@
 export default function grabConstants() {
-    const config = global.CONFIG;
+    const config = global.BUNEXT_CONFIG;
    const MB_IN_BYTES = 1024 * 1024;
    const ClientWindowPagePropsName = "__PAGE_PROPS__";
    const ClientRootElementIDName = "__bunext";
@@ -1,7 +1,7 @@
 import path from "path";
 export default function grabDirNames() {
-    if (global.DIR_NAMES)
-        return global.DIR_NAMES;
+    if (global.BUNEXT_DIR_NAMES)
+        return global.BUNEXT_DIR_NAMES;
    const ROOT_DIR = process.cwd();
    const SRC_DIR = path.join(ROOT_DIR, "src");
    const PAGES_DIR = path.join(SRC_DIR, "pages");
@@ -1,7 +1,7 @@
 import grabAppPort from "./grab-app-port";
 export default function grabOrigin() {
-    if (global.CONFIG.origin) {
-        return global.CONFIG.origin;
+    if (global.BUNEXT_CONFIG.origin) {
+        return global.BUNEXT_CONFIG.origin;
    }
    const port = grabAppPort();
    return `http://localhost:${port}`;
@@ -16,7 +16,7 @@ export default async function grabRouteParams({ req, query: passed_query, }) {
        url,
        query: _.merge(query, passed_query),
        body,
-        server: global.SERVER,
+        server: global.BUNEXT_SERVER,
    };
    return routeParams;
 }
@@ -1,6 +1,6 @@
 export default function grabRouter() {
    // if (process.env.NODE_ENV !== "production") {
-    //     global.ROUTER.reload();
+    //     global.BUNEXT_ROUTER.reload();
    // }
-    return global.ROUTER;
+    return global.BUNEXT_ROUTER;
 }
@@ -2,5 +2,5 @@ export default function isDevelopment() {
    if (process.env.NODE_ENV === "production") {
        return false;
    }
-    return Boolean(global.CONFIG?.development);
+    return true;
 }
@@ -21,5 +21,5 @@ export const log = {
    build: (msg) => console.log(`${prefix.build}  ${chalk.magenta(msg)}`),
    watch: (msg) => console.log(`${prefix.watch}  ${chalk.blue(msg)}`),
    server: (url) => console.log(`${prefix.success}  ${chalk.white("Server running on")} ${chalk.cyan.underline(url)}`),
-    banner: () => console.log(`\n  ${chalk.cyan.bold(AppNames.name)} ${chalk.gray(`v${global.CURRENT_VERSION || AppNames["version"]}`)}\n`),
+    banner: () => console.log(`\n  ${chalk.cyan.bold(AppNames.name)} ${chalk.gray(`v${global.BUNEXT_CURRENT_VERSION || AppNames["version"]}`)}\n`),
 };
@@ -5,5 +5,5 @@ export default function refreshRouter() {
        style: "nextjs",
        dir: PAGES_DIR,
    });
-    global.ROUTER = router;
+    global.BUNEXT_ROUTER = router;
 }
@@ -1 +0,0 @@
-export default function registerDevPlugin(): void;
@@ -1,69 +0,0 @@
-import { resolve, dirname, extname } from "path";
-import { existsSync } from "fs";
-const SOURCE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js"];
-function getLoader(filePath) {
-    const ext = extname(filePath).slice(1);
-    return SOURCE_EXTENSIONS.map((e) => e.slice(1)).includes(ext) ? ext : "js";
-}
-function tryResolveSync(absPath) {
-    if (existsSync(absPath))
-        return absPath;
-    for (const ext of SOURCE_EXTENSIONS) {
-        const p = absPath + ext;
-        if (existsSync(p))
-            return p;
-    }
-    for (const ext of SOURCE_EXTENSIONS) {
-        const p = resolve(absPath, "index" + ext);
-        if (existsSync(p))
-            return p;
-    }
-    return null;
-}
-export default function registerDevPlugin() {
-    Bun.plugin({
-        name: "bunext-dev-hmr",
-        setup(build) {
-            // Intercept absolute-path imports that already carry ?t= (our dynamic imports)
-            build.onResolve({ filter: /\?t=\d+$/ }, (args) => {
-                if (args.path.includes("node_modules"))
-                    return undefined;
-                const cleanPath = args.path.replace(/\?t=\d+$/, "");
-                const resolved = tryResolveSync(cleanPath);
-                if (!resolved)
-                    return undefined;
-                if (!SOURCE_EXTENSIONS.some((e) => resolved.endsWith(e)))
-                    return undefined;
-                return {
-                    path: `${resolved}?t=${global.LAST_BUILD_TIME ?? 0}`,
-                    namespace: "bunext-dev",
-                };
-            });
-            // Intercept relative imports from within bunext-dev modules
-            build.onResolve({ filter: /^\./ }, (args) => {
-                if (!/\?t=\d+/.test(args.importer))
-                    return undefined;
-                // Strip "namespace:" prefix (e.g. "bunext-dev:") Bun prepends to importer
-                const cleanImporter = args.importer
-                    .replace(/^[^/]+:(?=\/)/, "")
-                    .replace(/\?t=\d+$/, "");
-                const base = resolve(dirname(cleanImporter), args.path);
-                const resolved = tryResolveSync(base);
-                if (!resolved)
-                    return undefined;
-                if (!SOURCE_EXTENSIONS.some((e) => resolved.endsWith(e)))
-                    return undefined;
-                return {
-                    path: `${resolved}?t=${global.LAST_BUILD_TIME ?? 0}`,
-                    namespace: "bunext-dev",
-                };
-            });
-            // Load files in the bunext-dev namespace from disk (async is fine in onLoad)
-            build.onLoad({ filter: /.*/, namespace: "bunext-dev" }, async (args) => {
-                const realPath = args.path.replace(/\?t=\d+$/, "");
-                const source = await Bun.file(realPath).text();
-                return { contents: source, loader: getLoader(realPath) };
-            });
-        },
-    });
-}
@@ -1,6 +1,6 @@
 {
    "name": "@moduletrace/bunext",
-    "version": "1.0.96",
+    "version": "1.1.7",
    "main": "dist/index.js",
    "module": "index.ts",
    "dependencies": {
@@ -0,0 +1,131 @@
+import { describe, expect, test, beforeEach, afterEach, mock } from "bun:test";
+
+const grabPageComponent = mock(async () => ({
+    serverRes: { props: { ok: true } },
+}));
+
+mock.module(
+    "../../../functions/server/web-pages/grab-page-component",
+    () => ({
+        default: grabPageComponent,
+    }),
+);
+
+const { default: serverPostBuildFn } = await import(
+    "../../../functions/server/server-post-build-fn"
+);
+
+function makeController(page_url: string, target_map?: { local_path: string }) {
+    const enqueued: string[] = [];
+    return {
+        controller: {
+            enqueue: (chunk: string) => {
+                enqueued.push(chunk);
+            },
+        } as any,
+        page_url,
+        target_map: target_map as any,
+        enqueued,
+    };
+}
+
+describe("server-post-build-fn", () => {
+    beforeEach(() => {
+        grabPageComponent.mockClear();
+        global.ROUTER = {
+            match: (path: string) => {
+                if (path === "/about") return { filePath: "/pages/about.tsx" };
+                if (path === "/404") return { filePath: "/pages/404.tsx" };
+                if (path === "/new-page")
+                    return { filePath: "/pages/new-page.tsx" };
+                return null;
+            },
+        } as any;
+        global.BUNDLER_CTX_MAP = {
+            "/pages/about.tsx": {
+                local_path: "/pages/about.tsx",
+                path: "pages/about.js",
+            } as any,
+            "/pages/404.tsx": {
+                local_path: "/pages/404.tsx",
+                path: "pages/404.js",
+            } as any,
+            "/pages/new-page.tsx": {
+                local_path: "/pages/new-page.tsx",
+                path: "pages/new-page.js",
+            } as any,
+        };
+        global.HMR_CONTROLLERS = [];
+        global.ROOT_FILE_UPDATED = false;
+    });
+
+    afterEach(() => {
+        global.ROUTER = undefined as any;
+        global.BUNDLER_CTX_MAP = undefined as any;
+        global.HMR_CONTROLLERS = [];
+    });
+
+    test("soft-updates a normal page controller", async () => {
+        const c = makeController("http://localhost/about", {
+            local_path: "/pages/about.tsx",
+        });
+        global.HMR_CONTROLLERS = [c as any];
+
+        await serverPostBuildFn();
+
+        expect(c.enqueued.length).toBe(1);
+        expect(c.enqueued[0]).toContain("event: update");
+        expect(c.enqueued[0]).not.toContain('"reload":true');
+        expect(c.enqueued[0]).toContain("/pages/about.tsx");
+    });
+
+    test("soft-updates unmatched URL via custom 404 artifact", async () => {
+        const c = makeController("http://localhost/missing", {
+            local_path: "/pages/404.tsx",
+        });
+        global.HMR_CONTROLLERS = [c as any];
+
+        await serverPostBuildFn();
+
+        expect(c.enqueued.length).toBe(1);
+        expect(c.enqueued[0]).not.toContain('"reload":true');
+        expect(c.enqueued[0]).toContain("/pages/404.tsx");
+        expect(grabPageComponent).toHaveBeenCalled();
+    });
+
+    test("full-reloads when a previously unmatched route now exists", async () => {
+        const c = makeController("http://localhost/new-page", {
+            local_path: "/pages/404.tsx",
+        });
+        global.HMR_CONTROLLERS = [c as any];
+
+        await serverPostBuildFn();
+
+        expect(c.enqueued.length).toBe(1);
+        expect(c.enqueued[0]).toContain('"reload":true');
+        expect(c.target_map?.local_path).toBe("/pages/new-page.tsx");
+    });
+
+    test("full-reloads unmatched tab with no prior map when route appears", async () => {
+        const c = makeController("http://localhost/new-page");
+        global.HMR_CONTROLLERS = [c as any];
+
+        await serverPostBuildFn();
+
+        expect(c.enqueued.length).toBe(1);
+        expect(c.enqueued[0]).toContain('"reload":true');
+    });
+
+    test("full-reloads preset 404 tabs with no custom 404 page", async () => {
+        global.ROUTER = {
+            match: () => null,
+        } as any;
+        const c = makeController("http://localhost/missing");
+        global.HMR_CONTROLLERS = [c as any];
+
+        await serverPostBuildFn();
+
+        expect(c.enqueued.length).toBe(1);
+        expect(c.enqueued[0]).toContain('"reload":true');
+    });
+});
@@ -15,7 +15,7 @@ export default function () {
                rmSync(BUNX_CWD_PAGES_REWRITE_DIR, { recursive: true });
            } catch (error) {}

-            global.SKIPPED_BROWSER_MODULES = new Set<string>();
+            global.BUNEXT_SKIPPED_BROWSER_MODULES = new Set<string>();

            await bunextInit({ build_only: true });

@@ -6,6 +6,14 @@ import { rmSync } from "fs";

 const { HYDRATION_DST_DIR, BUNX_CWD_PAGES_REWRITE_DIR } = grabDirNames();

+process.on("uncaughtException", (error) => {
+    log.error(`Uncaught exception: ${error}`);
+});
+
+process.on("unhandledRejection", (reason) => {
+    log.error(`Unhandled rejection: ${reason}`);
+});
+
 log.info("Running development server ...");

 try {
@@ -13,6 +21,9 @@ try {
    rmSync(BUNX_CWD_PAGES_REWRITE_DIR, { recursive: true });
 } catch (error) {}

+try {
    await bunextInit();
-
    await startServer();
+} catch (error) {
+    log.error(`Failed to start development server: ${error}`);
+}
@@ -32,7 +32,7 @@ export default async function allPagesESBuildContextBundler(params?: Params) {

        const pages = grabAllPages({ exclude_api: true });

-        global.PAGE_FILES = pages;
+        global.BUNEXT_PAGE_FILES = pages;

        const dev = isDevelopment();

@@ -60,7 +60,7 @@ export default async function allPagesESBuildContextBundler(params?: Params) {
            (e) => `hydration-virtual:${e}`,
        );

-        global.BUNDLER_CTX = await esbuild.context({
+        global.BUNEXT_BUNDLER_CTX = await esbuild.context({
            entryPoints,
            outdir: HYDRATION_DST_DIR,
            bundle: true,
@@ -96,14 +96,14 @@ export default async function allPagesESBuildContextBundler(params?: Params) {
                "react-dom/client",
                "react/jsx-runtime",
                "react/jsx-dev-runtime",
-                ...(global.CONFIG.page_compiler_excludes || []),
+                ...(global.BUNEXT_CONFIG.page_compiler_excludes || []),
            ],
            logLevel: did_process_exit_because_of_bundler_error
                ? "silent"
                : undefined,
        });

-        await global.BUNDLER_CTX.rebuild();
+        await global.BUNEXT_BUNDLER_CTX.rebuild();
    } catch (error) {
        console.log(`ESBUILD Error =>`, error);
    }
@@ -4,23 +4,23 @@ export default async function buildOnstartErrorHandler(params?: Params) {
    // const error_msg = `Build Failed. Please check all your components and imports.`;
    // log.error(error_msg);

-    if (global.BUNDLER_CTX_DISPOSED) {
+    if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
        return;
    }

-    console.log(`Killing Bundler ...`);
-    console.log(`global.BUNDLER_CTX_DISPOSED`, global.BUNDLER_CTX_DISPOSED);
+    // console.log(`Killing Bundler ...`);
+    // console.log(`global.BUNEXT_BUNDLER_CTX_DISPOSED`, global.BUNEXT_BUNDLER_CTX_DISPOSED);

-    global.BUNDLER_CTX_DISPOSED = true;
+    global.BUNEXT_BUNDLER_CTX_DISPOSED = true;

-    global.RECOMPILING = false;
-    global.IS_SERVER_COMPONENT = false;
+    global.BUNEXT_RECOMPILING = false;
+    global.BUNEXT_IS_SERVER_COMPONENT = false;

    await Promise.all([
-        global.SSR_BUNDLER_CTX?.dispose(),
-        global.BUNDLER_CTX?.dispose(),
+        global.BUNEXT_SSR_BUNDLER_CTX?.dispose(),
+        global.BUNEXT_BUNDLER_CTX?.dispose(),
    ]);

-    global.SSR_BUNDLER_CTX = undefined;
-    global.BUNDLER_CTX = undefined;
+    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
+    global.BUNEXT_BUNDLER_CTX = undefined;
 }
@@ -74,7 +74,7 @@ export default async function bunReactModulesBundler() {

    const PUBLIC_ROOT = BUNEXT_VENDOR_DIR.replace(BUNX_CWD_DIR, "/.bunext");

-    global.REACT_IMPORTS_MAP = {
+    global.BUNEXT_REACT_IMPORTS_MAP = {
        imports: {
            react: `${PUBLIC_ROOT}/react.js`,
            "react-dom": `${PUBLIC_ROOT}/react-dom.js`,
@@ -23,7 +23,7 @@ export default async function pagesSSRBundler(params?: Params) {
        include_server: true,
    });
    const dev = isDevelopment();
-    const config = global.CONFIG;
+    const config = global.BUNEXT_CONFIG;

    try {
        writeFileSync(
@@ -75,6 +75,7 @@ export default async function pagesSSRBundler(params?: Params) {
        );
    } catch (error) {}

+    try {
        await esbuild.build({
            entryPoints,
            outdir: BUNX_CWD_MODULE_CACHE_DIR,
@@ -107,11 +108,15 @@ export default async function pagesSSRBundler(params?: Params) {
                "react/jsx-runtime",
                "react/jsx-dev-runtime",
                "bun:*",
+                "bun",
                "sqlite-vec",
                "better-sqlite3",
                ...(config.ssr_compiler_excludes || []),
            ],
            splitting: true,
-        // logLevel: "silent",
        });
+    } catch (error) {
+        global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+        log.error(`SSR Bundler Error: ${error}`);
+    }
 }
@@ -19,9 +19,9 @@ export default async function pagesSSRContextBundler(params?: Params) {
    const pages = grabAllPages();
    const dev = isDevelopment();

-    if (global.SSR_BUNDLER_CTX) {
-        await global.SSR_BUNDLER_CTX.dispose();
-        global.SSR_BUNDLER_CTX = undefined;
+    if (global.BUNEXT_SSR_BUNDLER_CTX) {
+        await global.BUNEXT_SSR_BUNDLER_CTX.dispose();
+        global.BUNEXT_SSR_BUNDLER_CTX = undefined;
    }

    const entryToPage = new Map<string, PageFiles & { tsx: string }>();
@@ -46,7 +46,7 @@ export default async function pagesSSRContextBundler(params?: Params) {

    const entryPoints = [...entryToPage.keys()].map((e) => `ssr-virtual:${e}`);

-    global.SSR_BUNDLER_CTX = await esbuild.context({
+    global.BUNEXT_SSR_BUNDLER_CTX = await esbuild.context({
        entryPoints,
        outdir: BUNX_CWD_MODULE_CACHE_DIR,
        bundle: true,
@@ -82,5 +82,5 @@ export default async function pagesSSRContextBundler(params?: Params) {
        // logLevel: "silent",
    });

-    await global.SSR_BUNDLER_CTX.rebuild();
+    await global.BUNEXT_SSR_BUNDLER_CTX.rebuild();
 }
@@ -9,7 +9,7 @@ const BunSkipNonBrowserPlugin: Bun.BunPlugin = {
        // const skipped_modules = new Set<string>();

        build.onResolve({ filter: skipFilter }, (args) => {
-            global.SKIPPED_BROWSER_MODULES.add(args.path);
+            global.BUNEXT_SKIPPED_BROWSER_MODULES.add(args.path);
            return {
                path: args.path,
                namespace: "skipped",
@@ -18,8 +18,8 @@ const BunSkipNonBrowserPlugin: Bun.BunPlugin = {
        });

        // build.onEnd(() => {
-        //     log.warn(`global.SKIPPED_BROWSER_MODULES`, [
-        //         ...global.SKIPPED_BROWSER_MODULES,
+        //     log.warn(`global.BUNEXT_SKIPPED_BROWSER_MODULES`, [
+        //         ...global.BUNEXT_SKIPPED_BROWSER_MODULES,
        //     ]);
        // });

@@ -36,7 +36,7 @@ export default function esbuildCTXArtifactTracker({
        name: "artifact-tracker",
        setup(build) {
            build.onStart(async () => {
-                global.MAIN_CTX_BUILD_STARTS++;
+                global.BUNEXT_MAIN_CTX_BUILD_STARTS++;
                build_start = performance.now();

                const does_error_file_exist = existsSync(
@@ -44,7 +44,7 @@ export default function esbuildCTXArtifactTracker({
                );

                if (
-                    global.MAIN_CTX_BUILD_STARTS >= MAX_BUILD_STARTS &&
+                    global.BUNEXT_MAIN_CTX_BUILD_STARTS >= MAX_BUILD_STARTS &&
                    !does_error_file_exist
                ) {
                    await buildOnstartErrorHandler();
@@ -53,8 +53,8 @@ export default function esbuildCTXArtifactTracker({

            build.onEnd(async (result) => {
                if (result.errors.length > 0) {
-                    global.RECOMPILING = false;
-                    global.IS_SERVER_COMPONENT = false;
+                    global.BUNEXT_RECOMPILING = false;
+                    global.BUNEXT_IS_SERVER_COMPONENT = false;

                    log.error(`Build errors:`);
                    for (const err of result.errors) {
@@ -64,17 +64,17 @@ export default function esbuildCTXArtifactTracker({
                    }

                    for (
-                        let i = global.HMR_CONTROLLERS.length - 1;
+                        let i = global.BUNEXT_HMR_CONTROLLERS.length - 1;
                        i >= 0;
                        i--
                    ) {
-                        const controller = global.HMR_CONTROLLERS[i];
+                        const controller = global.BUNEXT_HMR_CONTROLLERS[i];
                        try {
                            controller?.controller?.enqueue(
                                `event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
                            );
                        } catch {
-                            global.HMR_CONTROLLERS.splice(i, 1);
+                            global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
                        }
                    }

@@ -89,31 +89,32 @@ export default function esbuildCTXArtifactTracker({
                if (artifacts?.[0] && artifacts.length > 0) {
                    for (let i = 0; i < artifacts.length; i++) {
                        const artifact = artifacts[i];
-                        if (artifact?.local_path && global.BUNDLER_CTX_MAP) {
-                            global.BUNDLER_CTX_MAP[artifact.local_path] =
+                        if (
+                            artifact?.local_path &&
+                            global.BUNEXT_BUNDLER_CTX_MAP
+                        ) {
+                            global.BUNEXT_BUNDLER_CTX_MAP[artifact.local_path] =
                                _.merge(
-                                    global.BUNDLER_CTX_MAP[artifact.local_path],
+                                    global.BUNEXT_BUNDLER_CTX_MAP[
+                                        artifact.local_path
+                                    ],
                                    artifact,
                                );
                        }
                    }
-
-                    post_build_fn?.({ artifacts });
                }

                const elapsed = (performance.now() - build_start).toFixed(0);
                log.success(`[Built] in ${elapsed}ms`);

-                global.RECOMPILING = false;
-                global.IS_SERVER_COMPONENT = false;
-
-                global.MAIN_CTX_BUILD_STARTS = 0;
-                global.BUNDLER_CTX_DISPOSED = false;
+                global.BUNEXT_MAIN_CTX_BUILD_STARTS = 0;
+                global.BUNEXT_BUNDLER_CTX_DISPOSED = false;

                const does_error_file_exist = existsSync(
                    BUNX_BUNDLER_ERROR_EXIT_FILE,
                );

+                // SSR must finish before HMR so server props are fresh
                if (build_only) {
                    try {
                        await pagesSSRBundler();
@@ -131,17 +132,22 @@ export default function esbuildCTXArtifactTracker({
                    await fullRebuild();
                } else {
                    try {
-                        pagesSSRBundler();
+                        await pagesSSRBundler();
                    } catch (error) {
                        log.error(`SSR Bundler Error: ${error}`);
                    }
+
+                    if (artifacts?.[0] && artifacts.length > 0) {
+                        try {
+                            await post_build_fn?.({ artifacts });
+                        } catch (error) {
+                            log.error(`Post-build Error: ${error}`);
+                        }
+                    }
                }

-                // if (global.SSR_BUNDLER_CTX) {
-                //     global.SSR_BUNDLER_CTX.rebuild();
-                // } else {
-                //     pagesSSRContextBundler();
-                // }
+                global.BUNEXT_RECOMPILING = false;
+                global.BUNEXT_IS_SERVER_COMPONENT = false;
            });
        },
    };
@@ -32,18 +32,25 @@ export default function ssrCTXArtifactTracker({
                build_starts++;
                build_start = performance.now();
                if (build_starts == MAX_BUILD_STARTS) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = true;
-                    await global.SSR_BUNDLER_CTX?.dispose();
-                    global.SSR_BUNDLER_CTX = undefined;
+                    global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+                    await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+                    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
                }
            });

            build.onEnd(async (result) => {
                if (result.errors.length > 0) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = true;
-                    await global.SSR_BUNDLER_CTX?.dispose();
+                    global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = true;
+                    try {
+                        await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+                    } catch {}
+                    global.BUNEXT_SSR_BUNDLER_CTX = undefined;
                    build_starts = 0;
-                    console.log("SSR Build errors:", result.errors);
+                    for (const err of result.errors) {
+                        console.error(
+                            `SSR Build error: ${err.text}${err.location ? ` (${err.location.file}:${err.location.line}:${err.location.column})` : ""}`,
+                        );
+                    }
                    return;
                }

@@ -58,10 +65,11 @@ export default function ssrCTXArtifactTracker({
                        const artifact = artifacts[i];
                        if (
                            artifact?.local_path &&
-                            global.SSR_BUNDLER_CTX_MAP
+                            global.BUNEXT_SSR_BUNDLER_CTX_MAP
                        ) {
-                            global.SSR_BUNDLER_CTX_MAP[artifact.local_path] =
-                                artifact;
+                            global.BUNEXT_SSR_BUNDLER_CTX_MAP[
+                                artifact.local_path
+                            ] = artifact;
                        }
                    }

@@ -76,11 +84,15 @@ export default function ssrCTXArtifactTracker({
                try {
                    writeFileSync(
                        path.join(BUNX_TMP_DIR, "ctx-map.json"),
-                        JSON.stringify(global.SSR_BUNDLER_CTX_MAP, null, 4),
+                        JSON.stringify(
+                            global.BUNEXT_SSR_BUNDLER_CTX_MAP,
+                            null,
+                            4,
+                        ),
                    );
                } catch (error) {}

-                global.SSR_BUNDLER_CTX_DISPOSED = false;
+                global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED = false;
            });
        },
    };
@@ -77,7 +77,7 @@ export default async function reactModulesBundler() {

    const PUBLIC_ROOT = BUNEXT_VENDOR_DIR.replace(BUNX_CWD_DIR, "/.bunext");

-    global.REACT_IMPORTS_MAP = {
+    global.BUNEXT_REACT_IMPORTS_MAP = {
        imports: {
            react: `${PUBLIC_ROOT}/react.js`,
            "react-dom": `${PUBLIC_ROOT}/react-dom.js`,
@@ -21,8 +21,11 @@ export default async function recordArtifacts({
        }
    }

-    if (global.BUNDLER_CTX_MAP) {
-        global.BUNDLER_CTX_MAP = _.merge(global.BUNDLER_CTX_MAP, artifacts_map);
+    if (global.BUNEXT_BUNDLER_CTX_MAP) {
+        global.BUNEXT_BUNDLER_CTX_MAP = _.merge(
+            global.BUNEXT_BUNDLER_CTX_MAP,
+            artifacts_map,
+        );
    }

    // await Bun.write(
@@ -22,37 +22,37 @@ import type { FSWatcher } from "fs";
 * # Declare Global Variables
 */
 declare global {
-    var CONFIG: BunextConfig;
-    var SERVER: Server<any> | undefined;
-    var RECOMPILING: boolean;
-    var BUILDING_SSR: boolean;
-    var IS_SERVER_COMPONENT: boolean;
-    var WATCHER_TIMEOUT: any;
-    var ROUTER: FileSystemRouter;
-    var HMR_CONTROLLERS: GlobalHMRControllerObject[];
-    var LAST_BUILD_TIME: number;
-    var BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
-    var SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
-    // var API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
-    var BUNDLER_REBUILDS: 0;
-    var PAGES_SRC_WATCHER: FSWatcher | undefined;
-    var CURRENT_VERSION: string | undefined;
-    var PAGE_FILES: PageFiles[];
-    var ROOT_FILE_UPDATED: boolean;
-    var SKIPPED_BROWSER_MODULES: Set<string>;
-    var BUNDLER_CTX: BuildContext | undefined;
-    var SSR_BUNDLER_CTX: BuildContext | undefined;
-    // var API_ROUTES_BUNDLER_CTX: BuildContext | undefined;
-    var DIR_NAMES: DirNames;
-    var REACT_IMPORTS_MAP: { imports: Record<string, string> };
-    var REACT_DOM_SERVER: any;
-    var REACT_DOM_MODULE_CACHE: Map<string, { main: any; css: string }>;
-    var BUNDLER_CTX_DISPOSED: boolean | undefined;
-    var SSR_BUNDLER_CTX_DISPOSED: boolean | undefined;
-    var REBUILD_RETRIES: number;
-    var IS_404_PAGE: boolean;
-    var CONSTANTS: ReturnType<typeof grabConstants>;
-    var MAIN_CTX_BUILD_STARTS: number;
+    var BUNEXT_CONFIG: BunextConfig;
+    var BUNEXT_SERVER: Server<any> | undefined;
+    var BUNEXT_RECOMPILING: boolean;
+    var BUNEXT_BUILDING_SSR: boolean;
+    var BUNEXT_IS_SERVER_COMPONENT: boolean;
+    var BUNEXT_WATCHER_TIMEOUT: any;
+    var BUNEXT_ROUTER: FileSystemRouter;
+    var BUNEXT_HMR_CONTROLLERS: GlobalHMRControllerObject[];
+    var BUNEXT_LAST_BUILD_TIME: number;
+    var BUNEXT_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
+    var BUNEXT_SSR_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
+    // var BUNEXT_API_ROUTES_BUNDLER_CTX_MAP: { [k: string]: BundlerCTXMap };
+    var BUNEXT_BUNDLER_REBUILDS: 0;
+    var BUNEXT_PAGES_SRC_WATCHER: FSWatcher | undefined;
+    var BUNEXT_CURRENT_VERSION: string | undefined;
+    var BUNEXT_PAGE_FILES: PageFiles[];
+    var BUNEXT_ROOT_FILE_UPDATED: boolean;
+    var BUNEXT_SKIPPED_BROWSER_MODULES: Set<string>;
+    var BUNEXT_BUNDLER_CTX: BuildContext | undefined;
+    var BUNEXT_SSR_BUNDLER_CTX: BuildContext | undefined;
+    // var BUNEXT_API_ROUTES_BUNDLER_CTX: BuildContext | undefined;
+    var BUNEXT_DIR_NAMES: DirNames;
+    var BUNEXT_REACT_IMPORTS_MAP: { imports: Record<string, string> };
+    var BUNEXT_REACT_DOM_SERVER: any;
+    var BUNEXT_REACT_DOM_MODULE_CACHE: Map<string, { main: any; css: string }>;
+    var BUNEXT_BUNDLER_CTX_DISPOSED: boolean | undefined;
+    var BUNEXT_SSR_BUNDLER_CTX_DISPOSED: boolean | undefined;
+    var BUNEXT_REBUILD_RETRIES: number;
+    var BUNEXT_IS_404_PAGE: boolean;
+    var BUNEXT_CONSTANTS: ReturnType<typeof grabConstants>;
+    var BUNEXT_MAIN_CTX_BUILD_STARTS: number;
 }

 const dirNames = grabDirNames();
@@ -63,23 +63,23 @@ type Params = {
 };

 export default async function bunextInit(params?: Params) {
-    global.HMR_CONTROLLERS = [];
-    global.BUNDLER_CTX_MAP = {};
-    global.SSR_BUNDLER_CTX_MAP = {};
-    // global.API_ROUTES_BUNDLER_CTX_MAP = {};
-    global.BUNDLER_REBUILDS = 0;
-    global.REBUILD_RETRIES = 0;
-    global.PAGE_FILES = [];
-    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>();
-    global.MAIN_CTX_BUILD_STARTS = 0;
+    global.BUNEXT_HMR_CONTROLLERS = [];
+    global.BUNEXT_BUNDLER_CTX_MAP = {};
+    global.BUNEXT_SSR_BUNDLER_CTX_MAP = {};
+    // global.BUNEXT_API_ROUTES_BUNDLER_CTX_MAP = {};
+    global.BUNEXT_BUNDLER_REBUILDS = 0;
+    global.BUNEXT_REBUILD_RETRIES = 0;
+    global.BUNEXT_PAGE_FILES = [];
+    global.BUNEXT_SKIPPED_BROWSER_MODULES = new Set<string>();
+    global.BUNEXT_DIR_NAMES = dirNames;
+    global.BUNEXT_REACT_IMPORTS_MAP = { imports: {} };
+    global.BUNEXT_REACT_DOM_MODULE_CACHE = new Map<string, any>();
+    global.BUNEXT_MAIN_CTX_BUILD_STARTS = 0;

    await init();
    log.banner();

-    global.CONSTANTS = grabConstants();
+    global.BUNEXT_CONSTANTS = grabConstants();

    await reactModulesBundler();

@@ -88,7 +88,7 @@ export default async function bunextInit(params?: Params) {
        dir: PAGES_DIR,
    });

-    global.ROUTER = router;
+    global.BUNEXT_ROUTER = router;

    const is_dev = isDevelopment();

@@ -98,8 +98,8 @@ export default async function bunextInit(params?: Params) {
    } else if (is_dev) {
        log.build(`Building Modules ...`);
        await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
            },
        });
        watcherEsbuildCTX();
@@ -18,7 +18,7 @@ export default async function trimCacheKey({
            key,
        });

-        const config = global.CONFIG;
+        const config = global.BUNEXT_CONFIG;

        const default_expiry_time_seconds =
            config.default_cache_expiry ||
@@ -35,7 +35,7 @@ export default async function () {

        const current_version = package_json.version;

-        global.CURRENT_VERSION = current_version;
+        global.BUNEXT_CURRENT_VERSION = current_version;
    } catch (error) {}

    const keys = Object.keys(dirNames) as (keyof ReturnType<
@@ -65,7 +65,7 @@ export default async function () {

    const config: BunextConfig = (await grabConfig()) || {};

-    global.CONFIG = {
+    global.BUNEXT_CONFIG = {
        ...config,
        development: is_dev,
    };
@@ -33,8 +33,9 @@ export default async function bunextRequestHandler({

        let response: Response | undefined = undefined;

-        if (global.CONSTANTS.config?.middleware) {
-            const middleware_res = await global.CONSTANTS.config.middleware({
+        if (global.BUNEXT_CONSTANTS.config?.middleware) {
+            const middleware_res =
+                await global.BUNEXT_CONSTANTS.config.middleware({
                    req: initial_req,
                    url,
                });
@@ -1,19 +1,19 @@
 import chokidar from "chokidar";
 import path from "path";
-import { existsSync, statSync } from "fs";
+import { existsSync } from "fs";
 import grabDirNames from "../../utils/grab-dir-names";
 import fullRebuild from "./full-rebuild";
 import { AppData } from "../../data/app-data";
 import checkExcludedPatterns from "../../utils/check-excluded-patterns";
 import pagesSSRBundler from "../bundler/pages-ssr-bundler";
+import { log } from "../../utils/log";

 const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();

 export default async function chokadirWatcherEsbuildCTX() {
-    // Define ignored patterns directly in Chokidar for better performance
    const watcher = chokidar.watch(ROOT_DIR, {
        ignored: [
-            /(^|[\/\\])\../, // ignore dotfiles
+            /(^|[\/\\])\../,
            /node_modules/,
            /public/,
            /\.bunext/,
@@ -31,6 +31,9 @@ export default async function chokadirWatcherEsbuildCTX() {
        event: "add" | "change" | "unlink" | "addDir" | "unlinkDir",
        filePath: string,
    ) => {
+        let owns_recompile = false;
+
+        try {
            const filename = path.relative(ROOT_DIR, filePath);

            if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
@@ -38,16 +41,19 @@ export default async function chokadirWatcherEsbuildCTX() {
                return;
            }

-        if (global.BUNDLER_CTX_DISPOSED) {
+            if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
                await fullRebuild({ msg: `Restarting Bundler ...` });
            }

-        if (global.SSR_BUNDLER_CTX_DISPOSED) {
-            pagesSSRBundler();
+            if (global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED) {
+                await pagesSSRBundler().catch((error) => {
+                    log.error(`SSR Bundler Error: ${error}`);
+                });
            }

            if (filename.match(/\/styles$/) || filename === "styles") {
-            global.RECOMPILING = true;
+                owns_recompile = true;
+                global.BUNEXT_RECOMPILING = true;
                await Bun.sleep(1000);
                await fullRebuild({
                    msg: `Detected new \`styles\` directory. Rebuilding ...`,
@@ -66,49 +72,56 @@ export default async function chokadirWatcherEsbuildCTX() {

            if (event === "change") {
                if (filename.match(target_files_match)) {
-                if (global.RECOMPILING) return;
-                global.RECOMPILING = true;
+                    if (global.BUNEXT_RECOMPILING) return;
+                    owns_recompile = true;
+                    global.BUNEXT_RECOMPILING = true;

                    if (filename.match(/.*\.server\.tsx?/)) {
-                    global.IS_SERVER_COMPONENT = true;
+                        global.BUNEXT_IS_SERVER_COMPONENT = true;
                    }

-                if (global.BUNDLER_CTX) {
-                    await global.BUNDLER_CTX.rebuild();
+                    if (global.BUNEXT_BUNDLER_CTX) {
+                        await global.BUNEXT_BUNDLER_CTX.rebuild();
                    }

-                // HMR for error pages
                    if (filename.match(/(404|500)\.tsx?/)) {
-                    global.HMR_CONTROLLERS.forEach((controller) => {
+                        for (
+                            let i = global.BUNEXT_HMR_CONTROLLERS.length - 1;
+                            i >= 0;
+                            i--
+                        ) {
+                            const controller = global.BUNEXT_HMR_CONTROLLERS[i];
+                            try {
                                controller?.controller?.enqueue(
                                    `event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
                                );
-                    });
+                            } catch {
+                                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+                            }
+                        }
                    }
                }
                return;
            }

-        // Handle Structural Changes (Add/Delete)
            if (["add", "unlink", "addDir", "unlinkDir"].includes(event)) {
                const is_file_of_interest =
-                !!filename.match(target_files_match) || event.includes("Dir");
+                    !!filename.match(target_files_match) ||
+                    event.includes("Dir");

                if (!is_file_of_interest) return;

-            // Validation logic
                if (
                    !filename.match(/^src\/pages\/|\.css$/) ||
                    checkExcludedPatterns({ path: filename }) ||
                    filename.includes(" ")
                ) {
-                // With chokidar, you rarely need to "reload" the whole watcher.
-                // But we keep the logic for consistency.
                    return reloadWatcher();
                }

-            if (global.RECOMPILING) return;
+                if (global.BUNEXT_RECOMPILING) return;

+                owns_recompile = true;
                const action = event.startsWith("add") ? "created" : "deleted";
                const type = filename.match(/\.css$/)
                    ? "Stylesheet"
@@ -122,6 +135,14 @@ export default async function chokadirWatcherEsbuildCTX() {
                    msg: `${type} ${action}: ${filename}. Rebuilding ...`,
                });
            }
+        } catch (error) {
+            log.error(`Watcher rebuild failed: ${error}`);
+        } finally {
+            if (owns_recompile) {
+                global.BUNEXT_RECOMPILING = false;
+                global.BUNEXT_IS_SERVER_COMPONENT = false;
+            }
+        }
    };

    watcher
@@ -130,13 +151,11 @@ export default async function chokadirWatcherEsbuildCTX() {
        .on("unlink", (path) => handleEvent("unlink", path))
        .on("addDir", (path) => handleEvent("addDir", path))
        .on("unlinkDir", (path) => handleEvent("unlinkDir", path));
-
-    // global.PAGES_SRC_WATCHER = watcher;
 }

 function reloadWatcher() {
-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        chokadirWatcherEsbuildCTX();
    }
 }
@@ -7,37 +7,36 @@ export default async function fullRebuild(params?: { msg?: string }) {
    try {
        const { msg } = params || {};

-        global.RECOMPILING = true;
+        global.BUNEXT_RECOMPILING = true;

        if (msg) {
            log.watch(msg);
        }

-        global.ROUTER.reload();
+        global.BUNEXT_ROUTER.reload();

        try {
-            await global.BUNDLER_CTX?.dispose();
-            global.BUNDLER_CTX = undefined;
+            await global.BUNEXT_BUNDLER_CTX?.dispose();
+            global.BUNEXT_BUNDLER_CTX = undefined;

-            await global.SSR_BUNDLER_CTX?.dispose();
-            global.SSR_BUNDLER_CTX = undefined;
+            await global.BUNEXT_SSR_BUNDLER_CTX?.dispose();
+            global.BUNEXT_SSR_BUNDLER_CTX = undefined;
        } catch (error) {}

-        // await pagesSSRBundler();
-
        await allPagesESBuildContextBundler({
-            post_build_fn: () => {
-                serverPostBuildFn();
+            post_build_fn: async () => {
+                await serverPostBuildFn();
            },
        });
    } catch (error: any) {
-        global.RECOMPILING = false;
-        global.IS_SERVER_COMPONENT = false;
        log.error(error);
+    } finally {
+        global.BUNEXT_RECOMPILING = false;
+        global.BUNEXT_IS_SERVER_COMPONENT = false;
    }

-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        watcherEsbuildCTX();
    }
 }
@@ -3,16 +3,18 @@ type Params = {
 };

 function removeController(controller: ReadableStreamDefaultController<string>) {
-    const idx = global.HMR_CONTROLLERS.findIndex(
+    const idx = global.BUNEXT_HMR_CONTROLLERS.findIndex(
        (c) => c.controller == controller,
    );
    if (typeof idx == "number" && idx >= 0) {
-        global.HMR_CONTROLLERS.splice(idx, 1);
+        global.BUNEXT_HMR_CONTROLLERS.splice(idx, 1);
    }
 }

 export default async function ({ req }: Params): Promise<Response> {
    const referer = req.headers.get("referer");
+    const page_cookie = req.headers.get("cookie");
+
    if (!referer) {
        return new Response("Missing Referer Header", { status: 400 });
    }
@@ -24,10 +26,10 @@ export default async function ({ req }: Params): Promise<Response> {
        return new Response("Invalid Referer Header", { status: 400 });
    }

-    const match = global.ROUTER.match(referer_url.pathname);
+    const match = global.BUNEXT_ROUTER.match(referer_url.pathname);

    const target_map = match?.filePath
-        ? global.BUNDLER_CTX_MAP?.[match.filePath]
+        ? global.BUNEXT_BUNDLER_CTX_MAP?.[match.filePath]
        : undefined;

    let controller: ReadableStreamDefaultController<string>;
@@ -35,10 +37,11 @@ export default async function ({ req }: Params): Promise<Response> {
    const stream = new ReadableStream<string>({
        start(c) {
            controller = c;
-            global.HMR_CONTROLLERS.push({
+            global.BUNEXT_HMR_CONTROLLERS.push({
                controller: c,
                page_url: referer_url.href,
                target_map,
+                page_cookie,
            });
            heartbeat = setInterval(() => {
                try {
@@ -52,10 +52,10 @@ export default async function ({ req }: Params): Promise<Response> {
    let module: any;
    const now = Date.now();

-    if (is_dev && global.SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
+    if (is_dev && global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[match.filePath]?.path) {
        const target_import = path.join(
            ROOT_DIR,
-            global.SSR_BUNDLER_CTX_MAP[match.filePath].path,
+            global.BUNEXT_SSR_BUNDLER_CTX_MAP[match.filePath].path,
        );

        module = await import(`${target_import}?t=${now}`);
@@ -108,9 +108,7 @@ export default async function ({ req }: Params): Promise<Response> {
            );
        }

-        routeParams.body = JSON.parse(
-            new TextDecoder().decode(body) || "{}",
-        );
+        routeParams.body = JSON.parse(new TextDecoder().decode(body) || "{}");
    }

    const target_module = (module["default"] ||
@@ -7,61 +7,64 @@ type Params = {
 };

 export default async function serverPostBuildFn(params?: Params) {
-    if (!global.HMR_CONTROLLERS?.[0] || !global.BUNDLER_CTX_MAP) {
+    if (!global.BUNEXT_HMR_CONTROLLERS?.[0] || !global.BUNEXT_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];
+    for (let i = global.BUNEXT_HMR_CONTROLLERS.length - 1; i >= 0; i--) {
+        const controller = global.BUNEXT_HMR_CONTROLLERS[i];

        if (!controller) {
            continue;
        }

        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) {
+            try {
                controller.controller.enqueue(reload_enqueue);
+            } catch {
+                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+            }
            continue;
        }

        const target_artifact =
-            global.BUNDLER_CTX_MAP[controller.target_map.local_path];
+            global.BUNEXT_BUNDLER_CTX_MAP[controller.target_map.local_path];

-        if (!target_artifact.local_path) {
+        if (!target_artifact?.local_path) {
+            try {
                controller.controller.enqueue(reload_enqueue);
+            } catch {
+                global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+            }
            continue;
        }

        const mock_req = target_artifact.req_url
-            ? new Request(target_artifact.req_url)
+            ? new Request(target_artifact.req_url, {})
            : new Request(controller.page_url);

-        const page_component = global.IS_SERVER_COMPONENT
-            ? await grabPageComponent({
+        if (controller.page_cookie) {
+            mock_req.headers.set("cookie", controller.page_cookie);
+        }
+
+        const page_component = await grabPageComponent({
            req: mock_req,
            return_server_res_only: true,
            is_hydration: true,
-              })
-            : {};
+        });

        if (page_component instanceof Response) {
            continue;
        }

-        const { serverRes } = page_component;
+        const { serverRes } = page_component || {};

        const final_artifact: Omit<GlobalHMRControllerObject, "controller"> = {
            ..._.omit(controller, ["controller"]),
@@ -72,14 +75,13 @@ export default async function serverPostBuildFn(params?: Params) {
            delete final_artifact.target_map;
        }

-        if (serverRes) {
-            final_artifact.page_props = serverRes;
-        }
+        // Always replace so prior error props cannot linger
+        final_artifact.page_props = serverRes || {};

        try {
            let final_data: { [k: string]: any } = {};

-            if (global.ROOT_FILE_UPDATED) {
+            if (global.BUNEXT_ROOT_FILE_UPDATED) {
                final_data = reload_payload;
            } else {
                final_data = final_artifact;
@@ -89,9 +91,9 @@ export default async function serverPostBuildFn(params?: Params) {
                `event: update\ndata: ${JSON.stringify(final_data)}\n\n`,
            );

-            global.ROOT_FILE_UPDATED = false;
+            global.BUNEXT_ROOT_FILE_UPDATED = false;
        } catch {
-            global.HMR_CONTROLLERS.splice(i, 1);
+            global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
        }
    }
 }
@@ -1,15 +1,27 @@
 import _ from "lodash";
 import { log } from "../../utils/log";
 import serverParamsGen from "./server-params-gen";
+import isDevelopment from "../../utils/is-development";
+import watcherEsbuildCTX from "./watcher-esbuild-ctx";

 export default async function startServer() {
    const serverParams = await serverParamsGen();

    const server = Bun.serve(serverParams);
+    const is_dev = isDevelopment();

-    global.SERVER = server;
+    global.BUNEXT_SERVER = server;

    log.server(`http://${server.hostname}:${server.port}`);

+    if (is_dev) {
+        setInterval(() => {
+            if (global.BUNEXT_PAGES_SRC_WATCHER) {
+                global.BUNEXT_PAGES_SRC_WATCHER.close();
+                watcherEsbuildCTX();
+            }
+        }, 5000);
+    }
+
    return server;
 }
@@ -1,10 +1,11 @@
-import { watch, existsSync, statSync } from "fs";
+import { watch, existsSync, statSync, glob } from "fs";
 import path from "path";
 import grabDirNames from "../../utils/grab-dir-names";
 import fullRebuild from "./full-rebuild";
 import { AppData } from "../../data/app-data";
 import checkExcludedPatterns from "../../utils/check-excluded-patterns";
 import pagesSSRBundler from "../bundler/pages-ssr-bundler";
+import { log } from "../../utils/log";

 const { ROOT_DIR, BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();

@@ -16,7 +17,39 @@ export default async function watcherEsbuildCTX() {
            persistent: true,
        },
        async (event, filename) => {
+            let owns_recompile = false;
+
+            try {
                if (!filename) return;
+                const full_file_path = path.join(ROOT_DIR, filename);
+
+                if (global.BUNEXT_CONFIG.exclude_watch_patterns) {
+                    for (
+                        let i = 0;
+                        i < global.BUNEXT_CONFIG.exclude_watch_patterns.length;
+                        i++
+                    ) {
+                        const watch_pattern =
+                            global.BUNEXT_CONFIG.exclude_watch_patterns[i];
+
+                        if (watch_pattern instanceof RegExp) {
+                            const is_path_excluded =
+                                watch_pattern.test(filename);
+                            if (is_path_excluded) {
+                                return;
+                            }
+                        } else {
+                            const excluded_path = path.resolve(
+                                ROOT_DIR,
+                                watch_pattern,
+                            );
+
+                            if (excluded_path == full_file_path) {
+                                return;
+                            }
+                        }
+                    }
+                }

                if (existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE)) {
                    await fullRebuild();
@@ -27,27 +60,29 @@ export default async function watcherEsbuildCTX() {
                    return;
                }

-            if (global.BUNDLER_CTX_DISPOSED) {
+                if (global.BUNEXT_BUNDLER_CTX_DISPOSED) {
                    await fullRebuild({ msg: `Restarting Bundler ...` });
                    return;
                }

-            if (global.SSR_BUNDLER_CTX_DISPOSED) {
-                pagesSSRBundler();
+                if (global.BUNEXT_SSR_BUNDLER_CTX_DISPOSED) {
+                    await pagesSSRBundler().catch((error) => {
+                        log.error(`SSR Bundler Error: ${error}`);
+                    });
                }

                if (filename.endsWith(AppData["BunextTmpFileExt"])) {
                    return;
                }

-            const full_file_path = path.join(ROOT_DIR, filename);
                const does_file_exist = existsSync(full_file_path);
                const file_stat = does_file_exist
                    ? statSync(full_file_path)
                    : undefined;

                if (full_file_path.match(/\/styles$/)) {
-                global.RECOMPILING = true;
+                    owns_recompile = true;
+                    global.BUNEXT_RECOMPILING = true;
                    await Bun.sleep(1000);
                    await fullRebuild({
                        msg: `Detected new \`styles\` directory. Rebuilding ...`,
@@ -68,31 +103,37 @@ export default async function watcherEsbuildCTX() {
                }

                const target_files_match = /\.(tsx?|jsx?|css)$/;
-            // const rebuild_skip_paths = /\/pages\/api\//;

                if (event !== "rename") {
                    if (filename.match(target_files_match)) {
-                    if (global.RECOMPILING) return;
-                    global.RECOMPILING = true;
+                        if (global.BUNEXT_RECOMPILING) return;
+                        owns_recompile = true;
+                        global.BUNEXT_RECOMPILING = true;

                        if (filename.match(/.*\.server\.tsx?/)) {
-                        global.IS_SERVER_COMPONENT = true;
+                            global.BUNEXT_IS_SERVER_COMPONENT = true;
                        }

-                    if (global.BUNDLER_CTX) {
-                        await global.BUNDLER_CTX.rebuild();
+                        if (global.BUNEXT_BUNDLER_CTX) {
+                            await global.BUNEXT_BUNDLER_CTX.rebuild();
                        }

                        if (filename.match(/(404|500)\.tsx?/)) {
                            for (
-                            let i = global.HMR_CONTROLLERS.length - 1;
+                                let i =
+                                    global.BUNEXT_HMR_CONTROLLERS.length - 1;
                                i >= 0;
                                i--
                            ) {
-                            const controller = global.HMR_CONTROLLERS[i];
+                                const controller =
+                                    global.BUNEXT_HMR_CONTROLLERS[i];
+                                try {
                                    controller?.controller?.enqueue(
                                        `event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
                                    );
+                                } catch {
+                                    global.BUNEXT_HMR_CONTROLLERS.splice(i, 1);
+                                }
                            }
                        }
                    }
@@ -107,13 +148,15 @@ export default async function watcherEsbuildCTX() {
                    return;
                }

-            if (!filename.match(/^src\/pages\/|\.css$/)) return reloadWatcher();
+                if (!filename.match(/^src\/pages\/|\.css$/))
+                    return reloadWatcher();
                if (checkExcludedPatterns({ path: filename }))
                    return reloadWatcher();
                if (filename.match(/ /)) return reloadWatcher();

-            if (global.RECOMPILING) return;
+                if (global.BUNEXT_RECOMPILING) return;

+                owns_recompile = true;
                const action = does_file_exist ? "created" : "deleted";
                const type = filename.match(/\.css$/)
                    ? "Sylesheet"
@@ -126,15 +169,23 @@ export default async function watcherEsbuildCTX() {
                await fullRebuild({
                    msg: `${type} ${action}: ${filename}. Rebuilding ...`,
                });
+            } catch (error) {
+                log.error(`Watcher rebuild failed: ${error}`);
+            } finally {
+                if (owns_recompile) {
+                    global.BUNEXT_RECOMPILING = false;
+                    global.BUNEXT_IS_SERVER_COMPONENT = false;
+                }
+            }
        },
    );

-    global.PAGES_SRC_WATCHER = pages_src_watcher;
+    global.BUNEXT_PAGES_SRC_WATCHER = pages_src_watcher;
 }

 function reloadWatcher() {
-    if (global.PAGES_SRC_WATCHER) {
-        global.PAGES_SRC_WATCHER.close();
+    if (global.BUNEXT_PAGES_SRC_WATCHER) {
+        global.BUNEXT_PAGES_SRC_WATCHER.close();
        watcherEsbuildCTX();
    }
 }
@@ -70,12 +70,18 @@ export default async function genWebHTML({

    const final_meta = _.merge(root_meta, page_meta);

-    // const public_envs = Object.keys(process.env).filter((e) =>
-    //     e.startsWith(`NEXT_PUBLIC_`),
-    // );
+    const public_envs = Object.fromEntries(
+        Object.entries(process.env).filter(([k]) =>
+            k.startsWith("BUNEXT_PUBLIC_"),
+        ),
+    );

    const client_process = {
-        env: {},
+        env: {
+            NODE_ENV: dev ? "development" : "production",
+            ...public_envs,
+            ...global.BUNEXT_CONFIG.public_envs,
+        },
    };

    let final_component = (
@@ -116,7 +122,7 @@ export default async function genWebHTML({
                            type="importmap"
                            dangerouslySetInnerHTML={{
                                __html: JSON.stringify(
-                                    global.REACT_IMPORTS_MAP,
+                                    global.BUNEXT_REACT_IMPORTS_MAP,
                                ),
                            }}
                            defer
@@ -38,7 +38,7 @@ export default async function grabFilePathModule<T extends any = any>({
        outfile: target_cache_file_path,
    });

-    Loader.registry.delete(target_cache_file_path);
+    // Loader.registry.delete(target_cache_file_path);
    const module = await import(`${target_cache_file_path}?t=${Date.now()}`);

    return module as T;
@@ -19,10 +19,13 @@ export default async function grabPageBundledReactComponent({
    return_tsx_only,
 }: Params): Promise<GrabPageReactBundledComponentRes | undefined> {
    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)
+        if (global.BUNEXT_SSR_BUNDLER_CTX_MAP?.[file_path]) {
+            const abs = path.join(
+                ROOT_DIR,
+                global.BUNEXT_SSR_BUNDLER_CTX_MAP[file_path].path,
            );
+            // Loader.registry.delete(abs);
+            const mod = await import(`${abs}?t=${Date.now()}`);

            const Main = mod.default as FC;

@@ -35,11 +35,14 @@ export default async function grabPageCombinedServerRes({
        ? grabPageServerPath({ file_path: root_file_path })
        : {};
    const root_server_ctx_map =
-        global.SSR_BUNDLER_CTX_MAP[root_server_file_path || ""];
+        global.BUNEXT_SSR_BUNDLER_CTX_MAP[root_server_file_path || ""];
    const final_root_server_path = root_server_ctx_map?.local_path
        ? path.join(ROOT_DIR, root_server_ctx_map.path)
        : root_server_file_path;

+    if (final_root_server_path) {
+        // Loader.registry.delete(final_root_server_path);
+    }
    const root_server_module: BunextPageServerModule = final_root_server_path
        ? await import(`${final_root_server_path}?t=${now}`)
        : undefined;
@@ -60,11 +63,15 @@ export default async function grabPageCombinedServerRes({
    }

    const { server_file_path } = grabPageServerPath({ file_path });
-    const page_server_ctx = global.SSR_BUNDLER_CTX_MAP[server_file_path || ""];
+    const page_server_ctx =
+        global.BUNEXT_SSR_BUNDLER_CTX_MAP[server_file_path || ""];
    const final_page_server_path = page_server_ctx?.local_path
        ? path.join(ROOT_DIR, page_server_ctx.path)
        : server_file_path;

+    if (final_page_server_path) {
+        // Loader.registry.delete(final_page_server_path);
+    }
    const server_module: BunextPageServerModule = final_page_server_path
        ? await import(`${final_page_server_path}?t=${now}`)
        : undefined;
@@ -10,6 +10,7 @@ import serverPostBuildFn from "../server-post-build-fn";
 import isDevelopment from "../../../utils/is-development";
 import { existsSync } from "fs";
 import grabDirNames from "../../../utils/grab-dir-names";
+import watcherEsbuildCTX from "../watcher-esbuild-ctx";

 const { BUNX_BUNDLER_ERROR_EXIT_FILE } = grabDirNames();

@@ -45,7 +46,7 @@ export default async function grabPageComponent(
    } = params;

    const url = req?.url ? new URL(req.url) : undefined;
-    const router = global.ROUTER;
+    const router = global.BUNEXT_ROUTER;
    const is_dev = isDevelopment();

    const forwarded_proto = req?.headers.get("x-forwarded-proto");
@@ -89,7 +90,7 @@ export default async function grabPageComponent(
            throw new Error(errMsg);
        }

-        let bundledMap = global.BUNDLER_CTX_MAP[file_path];
+        let bundledMap = global.BUNEXT_BUNDLER_CTX_MAP[file_path];

        if (!bundledMap?.path) {
            if (does_error_file_exist) {
@@ -105,7 +106,8 @@ export default async function grabPageComponent(
                await fullRebuild({
                    msg: `Retrying Bundle map for file \`${file_path}\``,
                });
-                bundledMap = global.BUNDLER_CTX_MAP[file_path];
+                await Bun.sleep(1000);
+                bundledMap = global.BUNEXT_BUNDLER_CTX_MAP[file_path];
                if (bundledMap?.path) break;
            }

@@ -117,7 +119,7 @@ export default async function grabPageComponent(
        }

        if (req && !is_hydration) {
-            global.BUNDLER_CTX_MAP[file_path].req_url = req.url;
+            global.BUNEXT_BUNDLER_CTX_MAP[file_path].req_url = req.url;
        }

        if (debug) {
@@ -167,8 +169,9 @@ export default async function grabPageComponent(
            error?.status === 404;

        if (!params.retry && is_dev) {
-            while (global.REBUILD_RETRIES < 2) {
-                global.REBUILD_RETRIES = global.REBUILD_RETRIES + 1;
+            while (global.BUNEXT_REBUILD_RETRIES < 2) {
+                global.BUNEXT_REBUILD_RETRIES =
+                    global.BUNEXT_REBUILD_RETRIES + 1;

                await fullRebuild();
                await Bun.sleep(200);
@@ -181,20 +184,24 @@ export default async function grabPageComponent(
                    component_retried instanceof Response ||
                    component_retried.success
                ) {
-                    global.REBUILD_RETRIES = 0;
+                    global.BUNEXT_REBUILD_RETRIES = 0;
                    await serverPostBuildFn();
                    return component_retried;
                }
            }

-            global.REBUILD_RETRIES = 0;
+            global.BUNEXT_REBUILD_RETRIES = 0;
        }

        if (is404) {
-            global.IS_404_PAGE = true;
+            global.BUNEXT_IS_404_PAGE = true;
        } else {
            log.error(`Error Grabbing Page Component: ${error.message}`);
            log.error(`Page: ${passed_file_path || url?.pathname}`);
+
+            if (is_dev) {
+                fullRebuild();
+            }
        }

        return await grabPageErrorComponent({
@@ -7,6 +7,8 @@ import type {
 } from "../../../types";
 import grabPageModules from "./grab-page-modules";
 import _ from "lodash";
+import fullRebuild from "../full-rebuild";
+import isDevelopment from "../../../utils/is-development";

 type Params = {
    error?: any;
@@ -21,7 +23,8 @@ export default async function grabPageErrorComponent({
    is404,
    url,
 }: Params): Promise<GrabPageComponentRes | Response> {
-    const router = global.ROUTER;
+    const router = global.BUNEXT_ROUTER;
+    const is_dev = isDevelopment();

    const { BUNX_ROOT_500_PRESET_COMPONENT, BUNX_ROOT_404_PRESET_COMPONENT } =
        grabDirNames();
@@ -59,7 +62,7 @@ export default async function grabPageErrorComponent({

        const file_path = match.filePath;

-        const bundledMap = global.BUNDLER_CTX_MAP?.[file_path];
+        const bundledMap = global.BUNEXT_BUNDLER_CTX_MAP?.[file_path];

        const page_component = await grabPageModules({
            file_path: file_path,
@@ -83,6 +86,10 @@ export default async function grabPageErrorComponent({
            root_module,
        };
    } catch {
+        if (is_dev) {
+            fullRebuild();
+        }
+
        const DefaultNotFound: FC = () => (
            <div
                style={{
@@ -52,7 +52,7 @@ export default async function grabPageServerRes({
            const serverData = await server_function({
                ...routeParams,
                query: { ...routeParams.query, ...query },
-                props: init_props,
+                props: init_props || undefined,
            });

            return _.merge(default_props, serverData);
@@ -148,13 +148,14 @@ async function loadEntry<T>(page_file_path: string): Promise<T> {
    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;
+    if (global.BUNEXT_REACT_DOM_MODULE_CACHE.has(page_file_path)) {
+        return global.BUNEXT_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, {
+    global.BUNEXT_REACT_DOM_MODULE_CACHE.set(page_file_path, {
        main: mod,
        css: mod_css_path,
    });
@@ -83,6 +83,16 @@ export type BunextConfig = {
     * bundler for the browser. Eg. `react/jsx-dev-runtime`
     */
    page_compiler_excludes?: string[];
+    /**
+     * Patterns to exclude from the watcher. Eg. `./src/server.ts`
+     * or `\*.test.ts\`. It should either be a file path (relative or
+     * absolute), or a RegEx pattern.
+     */
+    exclude_watch_patterns?: (string | RegExp)[];
+    /**
+     * Public environment variables to be passed to the client
+     */
+    public_envs?: Record<string, string>;
 };

 export type BunextConfigMiddlewareParams = {
@@ -236,7 +246,7 @@ export type BunextPageServerFn<
    T extends { [k: string]: any } = { [k: string]: any },
 > = (
    ctx: Omit<BunxRouteParams, "body"> & {
-        props?: any;
+        props?: T;
    },
 ) => Promise<BunextPageModuleServerReturn<T>>;

@@ -353,6 +363,7 @@ export type GlobalHMRControllerObject = {
    target_map?: BundlerCTXMap;
    page_props?: any;
    page_reloaded?: boolean;
+    page_cookie?: string | null;
 };

 export type BunextCacheFileMeta = {
@@ -3,8 +3,12 @@ type Params = {
 };

 export default function ({ path }: Params): boolean {
-    for (let i = 0; i < global.CONSTANTS.RouteIgnorePatterns.length; i++) {
-        const regex = global.CONSTANTS.RouteIgnorePatterns[i];
+    for (
+        let i = 0;
+        i < global.BUNEXT_CONSTANTS.RouteIgnorePatterns.length;
+        i++
+    ) {
+        const regex = global.BUNEXT_CONSTANTS.RouteIgnorePatterns[i];
        if (path.match(regex)) return true;
    }

@@ -9,8 +9,8 @@ export default function grabAppPort() {
            return numberfy(process.env.PORT);
        }

-        if (global.CONFIG.port) {
-            return global.CONFIG.port;
+        if (global.BUNEXT_CONFIG.port) {
+            return global.BUNEXT_CONFIG.port;
        }

        return numberfy(defaultPort);
@@ -1,8 +1,8 @@
 import AppNames from "./grab-app-names";

 export default function grabAssetsPrefix() {
-    if (global.CONFIG.assets_prefix) {
-        return global.CONFIG.assets_prefix;
+    if (global.BUNEXT_CONFIG.assets_prefix) {
+        return global.BUNEXT_CONFIG.assets_prefix;
    }

    const { defaultAssetPrefix } = AppNames;
@@ -1,5 +1,5 @@
 export default function grabConstants() {
-    const config = global.CONFIG;
+    const config = global.BUNEXT_CONFIG;
    const MB_IN_BYTES = 1024 * 1024;

    const ClientWindowPagePropsName = "__PAGE_PROPS__";
@@ -31,7 +31,7 @@ export type DirNames = {
 };

 export default function grabDirNames(): DirNames {
-    if (global.DIR_NAMES) return global.DIR_NAMES;
+    if (global.BUNEXT_DIR_NAMES) return global.BUNEXT_DIR_NAMES;

    const ROOT_DIR = process.cwd();
    const SRC_DIR = path.join(ROOT_DIR, "src");
@@ -1,8 +1,8 @@
 import grabAppPort from "./grab-app-port";

 export default function grabOrigin() {
-    if (global.CONFIG.origin) {
-        return global.CONFIG.origin;
+    if (global.BUNEXT_CONFIG.origin) {
+        return global.BUNEXT_CONFIG.origin;
    }

    const port = grabAppPort();
@@ -28,7 +28,7 @@ export default async function grabRouteParams({
        url,
        query: _.merge(query, passed_query),
        body,
-        server: global.SERVER,
+        server: global.BUNEXT_SERVER,
    };

    return routeParams;
@@ -1,7 +1,7 @@
 export default function grabRouter() {
    // if (process.env.NODE_ENV !== "production") {
-    //     global.ROUTER.reload();
+    //     global.BUNEXT_ROUTER.reload();
    // }

-    return global.ROUTER;
+    return global.BUNEXT_ROUTER;
 }
@@ -3,5 +3,5 @@ export default function isDevelopment() {
        return false;
    }

-    return Boolean(global.CONFIG?.development);
+    return true;
 }
@@ -31,6 +31,6 @@ export const log = {
        ),
    banner: () =>
        console.log(
-            `\n  ${chalk.cyan.bold(AppNames.name)} ${chalk.gray(`v${global.CURRENT_VERSION || AppNames["version"]}`)}\n`,
+            `\n  ${chalk.cyan.bold(AppNames.name)} ${chalk.gray(`v${global.BUNEXT_CURRENT_VERSION || AppNames["version"]}`)}\n`,
        ),
 };
@@ -8,5 +8,5 @@ export default function refreshRouter() {
        dir: PAGES_DIR,
    });

-    global.ROUTER = router;
+    global.BUNEXT_ROUTER = router;
 }
@@ -1,68 +0,0 @@
-import { resolve, dirname, extname } from "path";
-import { existsSync } from "fs";
-
-const SOURCE_EXTENSIONS = [".tsx", ".ts", ".jsx", ".js"];
-
-function getLoader(filePath: string) {
-    const ext = extname(filePath).slice(1) as any;
-    return SOURCE_EXTENSIONS.map((e) => e.slice(1)).includes(ext) ? ext : "js";
-}
-
-function tryResolveSync(absPath: string): string | null {
-    if (existsSync(absPath)) return absPath;
-    for (const ext of SOURCE_EXTENSIONS) {
-        const p = absPath + ext;
-        if (existsSync(p)) return p;
-    }
-    for (const ext of SOURCE_EXTENSIONS) {
-        const p = resolve(absPath, "index" + ext);
-        if (existsSync(p)) return p;
-    }
-    return null;
-}
-
-export default function registerDevPlugin() {
-    Bun.plugin({
-        name: "bunext-dev-hmr",
-        setup(build) {
-            // Intercept absolute-path imports that already carry ?t= (our dynamic imports)
-            build.onResolve({ filter: /\?t=\d+$/ }, (args) => {
-                if (args.path.includes("node_modules")) return undefined;
-                const cleanPath = args.path.replace(/\?t=\d+$/, "");
-                const resolved = tryResolveSync(cleanPath);
-                if (!resolved) return undefined;
-                if (!SOURCE_EXTENSIONS.some((e) => resolved.endsWith(e)))
-                    return undefined;
-                return {
-                    path: `${resolved}?t=${global.LAST_BUILD_TIME ?? 0}`,
-                    namespace: "bunext-dev",
-                };
-            });
-
-            // Intercept relative imports from within bunext-dev modules
-            build.onResolve({ filter: /^\./ }, (args) => {
-                if (!/\?t=\d+/.test(args.importer)) return undefined;
-                // Strip "namespace:" prefix (e.g. "bunext-dev:") Bun prepends to importer
-                const cleanImporter = args.importer
-                    .replace(/^[^/]+:(?=\/)/, "")
-                    .replace(/\?t=\d+$/, "");
-                const base = resolve(dirname(cleanImporter), args.path);
-                const resolved = tryResolveSync(base);
-                if (!resolved) return undefined;
-                if (!SOURCE_EXTENSIONS.some((e) => resolved.endsWith(e)))
-                    return undefined;
-                return {
-                    path: `${resolved}?t=${global.LAST_BUILD_TIME ?? 0}`,
-                    namespace: "bunext-dev",
-                };
-            });
-
-            // Load files in the bunext-dev namespace from disk (async is fine in onLoad)
-            build.onLoad({ filter: /.*/, namespace: "bunext-dev" }, async (args) => {
-                const realPath = args.path.replace(/\?t=\d+$/, "");
-                const source = await Bun.file(realPath).text();
-                return { contents: source, loader: getLoader(realPath) };
-            });
-        },
-    });
-}
Author	SHA1	Message	Date
tben	1bf1b651db	Update dev server	2026-08-14 13:12:35 +01:00
tben	247a64c873	Update dev server	2026-08-14 12:59:20 +01:00
tben	f590deb11b	Update dev server	2026-08-14 09:58:12 +01:00
tben	3426c7b53b	Update dev server	2026-08-14 09:57:22 +01:00
tben	afd1af1827	Update dev server	2026-08-14 09:55:57 +01:00
tben	22d3dedab2	Update page server types	2026-08-14 06:49:12 +01:00
tben	8d12329f01	Add perpetual watcher reload in dev	2026-08-13 05:39:14 +01:00
tben	78e86b3999	Rename global variables	2026-08-03 12:01:40 +01:00
tben	87948340b0	Add public envs	2026-08-03 08:42:33 +01:00
tben	86ea86e7bd	Updates	2026-08-01 05:25:47 +01:00
tben	596b9de047	Add request cookie to HMR reload pipeline	2026-07-31 07:21:52 +01:00
tben	9da1e16318	Bugfix: Fix dev function	2026-07-30 14:50:54 +01:00
tben	823c5bb1ca	Remove bun imports from esbuild bundler	2026-07-30 11:52:08 +01:00
tben	88ead3b3d6	Remove all Loader.registry.delete lines	2026-07-29 14:05:12 +01:00
tben	45509deff8	Dev Server Refresh Bugfix. Loop happens after a file route is refactored to a folder route with index.ts	2026-07-29 13:55:23 +01:00
tben	a19863b3e9	Updates	2026-07-20 20:54:59 +01:00
tben	a9cd51d71c	Bugfix: update stale HMR after fixed errors	2026-07-20 20:54:39 +01:00
tben	e3a0f5fbeb	Error handling bugfix in dev server	2026-07-20 20:41:30 +01:00
				`@@ -1 +0,0 @@`
				`export default function registerDevPlugin(): void;`