dist/commands/dev/index.js

@@ -4,7 +4,6 @@ import grabDirNames from "../../utils/grab-dir-names";
 import writeErrorFile from "../../functions/write-error-file";
 let retries = 0;
 let timeout;
-const MAX_RETRIES = 5;
 export default function () {
     return new Command("dev")
         .description("Run development server")
@@ -14,8 +13,7 @@ export default function () {
 }
 async function dev() {
     clearTimeout(timeout);
-    if (retries >= MAX_RETRIES) {
+    if (retries == 1) {
-        console.error(`Dev server crashed ${MAX_RETRIES} times. Exiting.`);
         process.exit(1);
     }
     const dev_spawn_file = path.resolve(__dirname, "dev-spawn.ts");
@@ -34,7 +32,7 @@ async function dev() {
     retries++;
     timeout = setTimeout(() => {
         retries = 0;
-    }, 10000);
+    }, 5000);
     const exited = await dev_process.exited;
     if (exited) {
         return await dev();

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

@@ -21,29 +21,14 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                 build_starts++;
                 build_start = performance.now();
                 const does_error_file_exist = existsSync(BUNX_BUNDLER_ERROR_EXIT_FILE);
-                if (build_starts >= MAX_BUILD_STARTS &&
+                if (build_starts == MAX_BUILD_STARTS &&
                     !does_error_file_exist) {
                     await buildOnstartErrorHandler();
+                    process.exit(1);
                 }
             });
             build.onEnd((result) => {
                 if (result.errors.length > 0) {
-                    global.RECOMPILING = false;
-                    global.IS_SERVER_COMPONENT = false;
-                    build_starts = 0;
-                    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];
-                        try {
-                            controller?.controller?.enqueue(`event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`);
-                        }
-                        catch {
-                            global.HMR_CONTROLLERS.splice(i, 1);
-                        }
-                    }
                     return;
                 }
                 const artifacts = grabArtifactsFromBundledResults({
@@ -74,13 +59,8 @@ export default function esbuildCTXArtifactTracker({ entryToPage, post_build_fn,
                     fullRebuild();
                 }
                 else {
-                    try {
                     pagesSSRBundler();
                 }
-                    catch (error) {
-                        log.error(`SSR Bundler Error: ${error}`);
-                    }
-                }
                 // if (global.SSR_BUNDLER_CTX) {
                 //     global.SSR_BUNDLER_CTX.rebuild();
                 // } else {

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

@@ -22,9 +22,7 @@ export default function ssrCTXArtifactTracker({ entryToPage, post_build_fn, }) {
             });
             build.onEnd((result) => {
                 if (result.errors.length > 0) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = false;
+                    console.log("result.errors", result.errors);
-                    build_starts = 0;
-                    console.log("SSR Build errors:", result.errors);
                     return;
                 }
                 const artifacts = grabArtifactsFromBundledResults({

dist/functions/server/full-rebuild.js

@@ -23,8 +23,6 @@ export default async function fullRebuild(params) {
         });
     }
     catch (error) {
-        global.RECOMPILING = false;
-        global.IS_SERVER_COMPONENT = false;
         log.error(error);
     }
     if (global.PAGES_SRC_WATCHER) {

package.json

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

src/__tests__/e2e/e2e.test.ts

@@ -12,7 +12,6 @@ import {
 import { FileSystemRouter } from "bun";
 import { BuildContext } from "esbuild";
 import grabDirNames from "../../utils/grab-dir-names";
-import grabConstants from "../../utils/grab-constants";
 
 // Fixture lives under test/ so the framework's directory guard allows it
 const fixtureDir = path.resolve(__dirname, "../../../test/e2e-fixture");
@@ -59,11 +58,6 @@ describe("E2E Integration", () => {
         global.HMR_CONTROLLERS = [];
         global.BUNDLER_REBUILDS = 0;
         global.PAGE_FILES = [];
-        global.CONSTANTS = grabConstants();
-        global.SSR_BUNDLER_CTX_MAP = {};
-        global.BUNDLER_CTX_MAP = {};
-        global.REACT_DOM_MODULE_CACHE = new Map<string, any>();
-        global.REBUILD_RETRIES = 0;
 
         // Set up router pointing at the fixture's pages directory
         global.ROUTER = new Bun.FileSystemRouter({

src/__tests__/functions/server/bunext-req-handler.test.ts

@@ -1,4 +1,4 @@
-import { describe, expect, test, mock, afterAll, beforeEach } from "bun:test";
+import { describe, expect, test, mock, afterAll } from "bun:test";
 import bunextRequestHandler from "../../../../src/functions/server/bunext-req-handler";
 
 mock.module("../../../../src/utils/is-development", () => ({
@@ -34,21 +34,11 @@ mock.module("../../../../src/functions/server/web-pages/handle-web-pages", () =>
     default: async () => new Response("web-pages")
 }));
 
+/**
+ * Tests for the `bunext-req-handler` module.
+ * Ensures that requests are correctly routed to the proper subsystem.
+ */
 describe("bunext-req-handler", () => {
-    beforeEach(() => {
-        global.CONSTANTS = {
-            config: {
-                middleware: async ({ url }: any) => {
-                    if (url.pathname === "/blocked") {
-                        return new Response("Blocked by middleware", { status: 403 });
-                    }
-                    return undefined;
-                }
-            },
-            RouteIgnorePatterns: [],
-        } as any;
-    });
-
     afterAll(() => {
         mock.restore();
     });

src/__tests__/functions/server/grab-page-bundled-react-component.test.tsx

@@ -1,26 +1,24 @@
-import { afterAll, afterEach, describe, expect, test, mock } from "bun:test";
+import { afterAll, afterEach, describe, expect, test } from "bun:test";
+import fs from "fs";
 import path from "path";
 import { renderToString } from "react-dom/server";
-import React, { createContext, useContext } from "react";
 import grabPageBundledReactComponent from "../../../../src/functions/server/web-pages/grab-page-bundled-react-component";
 import grabDirNames from "../../../../src/utils/grab-dir-names";
 
-const { BUNX_TMP_DIR } = grabDirNames();
+const { BUNX_CWD_MODULE_CACHE_DIR, BUNX_TMP_DIR } = grabDirNames();
 
 describe("grabPageBundledReactComponent", () => {
-    const originalConfig = global.CONFIG;
     const fixtureDirs: string[] = [];
+    const originalConfig = global.CONFIG;
 
     global.CONFIG = { development: true } as any;
 
     afterEach(() => {
         for (const fixtureDir of fixtureDirs.splice(0)) {
-            const fs = require("fs");
             fs.rmSync(fixtureDir, { recursive: true, force: true });
         }
 
         global.CONFIG = { development: true } as any;
-        mock.restore();
     });
 
     afterAll(() => {
@@ -28,36 +26,50 @@ describe("grabPageBundledReactComponent", () => {
     });
 
     test("keeps __root context connected during SSR", async () => {
+        fs.mkdirSync(BUNX_CWD_MODULE_CACHE_DIR, { recursive: true });
+        fs.mkdirSync(BUNX_TMP_DIR, { recursive: true });
+
         const fixtureDir = path.join(BUNX_TMP_DIR, `ssr-context-${Date.now()}`);
         fixtureDirs.push(fixtureDir);
+        fs.mkdirSync(fixtureDir, { recursive: true });
+
         const rootFilePath = path.join(fixtureDir, "__root.tsx");
         const pageFilePath = path.join(fixtureDir, "page.tsx");
 
-        mock.module("../../../../src/functions/server/web-pages/grab-root-file-path", () => ({
+        fs.writeFileSync(
-            default: () => ({ root_file_path: rootFilePath })
+            rootFilePath,
-        }));
+            `import { createContext } from "react";
+export const AppContext = createContext("missing-context");
 
-        mock.module("../../../../src/functions/server/web-pages/grab-tsx-string-module", () => ({
+export default function Root({ children }: { children: React.ReactNode }) {
-            default: async () => {
+    return (
-                const AppContext = createContext("missing-context");
+        <AppContext.Provider value="server-context">
-                const Root = ({ children }: { children: React.ReactNode }) =>
+            {children}
-                    React.createElement(AppContext.Provider, { value: "server-context" }, children);
+        </AppContext.Provider>
-                const Page = () => {
+    );
-                    const value = useContext(AppContext);
-                    return React.createElement("div", null, value);
-                };
-                const Main = (props: any) =>
-                    React.createElement(Root, props, React.createElement(Page, props));
-                return { default: Main };
 }
-        }));
+`,
+        );
+
+        fs.writeFileSync(
+            pageFilePath,
+            `import { useContext } from "react";
+import { AppContext } from "./__root";
+
+export default function Page() {
+    const value = useContext(AppContext);
+
+    return <div>{value}</div>;
+}
+`,
+        );
 
         const result = await grabPageBundledReactComponent({
             file_path: pageFilePath,
+            root_file_path: rootFilePath,
         });
 
         expect(result?.component).toBeDefined();
-        const html = renderToString(React.createElement(result!.component));
+        expect(renderToString(result!.component)).toContain("server-context");
-        expect(html).toContain("server-context");
     });
 });

src/__tests__/functions/server/grab-page-component.test.tsx

@@ -8,18 +8,6 @@ mock.module("../../../../src/utils/log", () => ({
     },
 }));
 
-mock.module("../../../../src/utils/is-development", () => ({
-    default: () => false
-}));
-
-mock.module("../../../../src/functions/server/full-rebuild", () => ({
-    default: async () => {}
-}));
-
-mock.module("../../../../src/functions/server/server-post-build-fn", () => ({
-    default: async () => {}
-}));
-
 import { log } from "../../../../src/utils/log";
 import grabPageComponent from "../../../../src/functions/server/web-pages/grab-page-component";
 
@@ -41,7 +29,7 @@ describe("grabPageComponent", () => {
             req: new Request("http://localhost:3000/unknown-foo-bar123"),
         });
 
-        expect(res.serverRes?.response_options?.status).toBe(404);
+        expect(res.serverRes?.responseOptions?.status).toBe(404);
         expect(log.error).not.toHaveBeenCalled();
     });
 });

src/__tests__/functions/server/handle-routes.test.ts

@@ -29,7 +29,7 @@ mock.module("/test-path", () => ({
 
 mock.module("/large-path", () => ({
     default: async () => new Response("Large OK", { status: 200 }),
-    config: { max_request_body_mb: 1 }
+    config: { maxRequestBodyMB: 1 }
 }));
 
 /**

src/commands/dev/index.ts

@@ -6,7 +6,6 @@ import writeErrorFile from "../../functions/write-error-file";
 
 let retries = 0;
 let timeout: any;
-const MAX_RETRIES = 5;
 
 export default function () {
     return new Command("dev")
@@ -19,8 +18,7 @@ export default function () {
 async function dev() {
     clearTimeout(timeout);
 
-    if (retries >= MAX_RETRIES) {
+    if (retries == 1) {
-        console.error(`Dev server crashed ${MAX_RETRIES} times. Exiting.`);
         process.exit(1);
     }
 
@@ -44,7 +42,7 @@ async function dev() {
 
     timeout = setTimeout(() => {
         retries = 0;
-    }, 10000);
+    }, 5000);
 
     const exited = await dev_process.exited;
     if (exited) {

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

@@ -43,35 +43,16 @@ export default function esbuildCTXArtifactTracker({
                 );
 
                 if (
-                    build_starts >= MAX_BUILD_STARTS &&
+                    build_starts == MAX_BUILD_STARTS &&
                     !does_error_file_exist
                 ) {
                     await buildOnstartErrorHandler();
+                    process.exit(1);
                 }
             });
 
             build.onEnd((result) => {
                 if (result.errors.length > 0) {
-                    global.RECOMPILING = false;
-                    global.IS_SERVER_COMPONENT = false;
-                    build_starts = 0;
-
-                    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];
-                        try {
-                            controller?.controller?.enqueue(
-                                `event: update\ndata: ${JSON.stringify({ reload: true })}\n\n`,
-                            );
-                        } catch {
-                            global.HMR_CONTROLLERS.splice(i, 1);
-                        }
-                    }
-
                     return;
                 }
 
@@ -117,11 +98,7 @@ export default function esbuildCTXArtifactTracker({
                     cleanupLogsDirs();
                     fullRebuild();
                 } else {
-                    try {
                     pagesSSRBundler();
-                    } catch (error) {
-                        log.error(`SSR Bundler Error: ${error}`);
-                    }
                 }
 
                 // if (global.SSR_BUNDLER_CTX) {

src/functions/bundler/plugins/ssr-ctx-artifact-tracker.ts

@@ -40,9 +40,7 @@ export default function ssrCTXArtifactTracker({
 
             build.onEnd((result) => {
                 if (result.errors.length > 0) {
-                    global.SSR_BUNDLER_CTX_DISPOSED = false;
+                    console.log("result.errors", result.errors);
-                    build_starts = 0;
-                    console.log("SSR Build errors:", result.errors);
                     return;
                 }
 

src/functions/server/full-rebuild.ts

@@ -30,8 +30,6 @@ export default async function fullRebuild(params?: { msg?: string }) {
             },
         });
     } catch (error: any) {
-        global.RECOMPILING = false;
-        global.IS_SERVER_COMPONENT = false;
         log.error(error);
     }