veryfront 0.0.86 → 0.0.88

package/esm/src/cli/index/command-router.js

@@ -170,47 +170,62 @@ export async function routeCommand(args) {
                 break;
             case "preview":
             case "serve": {
-                showLogo();
-                const { runtime } = await import("../../platform/adapters/detect.js");
-                const adapter = await runtime.get();
-                const { startUniversalServer } = await import("../../server/production-server.js");
-                const projectDir = cwd();
+                const mode = (args.mode || args.m || "renderer");
                 const port = args.port ?? DEFAULT_DEV_SERVER_PORT;
                 const bindAddress = String(args.hostname || args.host || "0.0.0.0");
-                const debug = Boolean(args.debug);
-                const shutdownController = new AbortController();
-                const server = await startUniversalServer({
-                    projectDir,
-                    port,
-                    bindAddress,
-                    debug,
-                    adapter,
-                    signal: shutdownController.signal,
-                });
-                await server.ready;
-                let shuttingDown = false;
-                const shutdown = async (signal) => {
-                    if (shuttingDown)
-                        return;
-                    shuttingDown = true;
-                    cliLogger.info(`Received ${signal}, shutting down production server...`);
-                    try {
-                        shutdownController.abort();
-                        await server.stop();
-                    }
-                    catch (error) {
-                        cliLogger.warn("Error while shutting down production server:", error);
-                    }
-                    finally {
-                        exitProcess(0);
-                    }
-                };
-                registerTerminationSignals((signal) => {
-                    void shutdown(signal);
-                });
-                await new Promise(() => {
-                    /* never resolve */
-                });
+                if (mode === "proxy") {
+                    // Proxy-only mode: run OAuth token proxy
+                    showLogo();
+                    cliLogger.info(`Starting proxy server on ${bindAddress}:${port}`);
+                    // Set environment variables for proxy
+                    const { setEnv } = await import("../../platform/compat/process.js");
+                    setEnv("PORT", String(port));
+                    setEnv("HOST", bindAddress);
+                    // Import and run proxy main
+                    await import("../../../proxy/main.js");
+                }
+                else if (mode === "renderer" || mode === "combined") {
+                    // Renderer mode: run SSR production server
+                    showLogo();
+                    const { runtime } = await import("../../platform/adapters/detect.js");
+                    const adapter = await runtime.get();
+                    const { startUniversalServer } = await import("../../server/production-server.js");
+                    const projectDir = cwd();
+                    const debug = Boolean(args.debug);
+                    const shutdownController = new AbortController();
+                    const server = await startUniversalServer({
+                        projectDir,
+                        port,
+                        bindAddress,
+                        debug,
+                        adapter,
+                        signal: shutdownController.signal,
+                    });
+                    await server.ready;
+                    let shuttingDown = false;
+                    const shutdown = async (signal) => {
+                        if (shuttingDown)
+                            return;
+                        shuttingDown = true;
+                        cliLogger.info(`Received ${signal}, shutting down production server...`);
+                        try {
+                            shutdownController.abort();
+                            await server.stop();
+                        }
+                        catch (error) {
+                            cliLogger.warn("Error while shutting down production server:", error);
+                        }
+                        finally {
+                            exitProcess(0);
+                        }
+                    };
+                    registerTerminationSignals((signal) => {
+                        void shutdown(signal);
+                    });
+                    await new Promise(() => {
+                        /* never resolve */
+                    });
+                }
                 break;
             }
             case "doctor":

package/esm/src/cli/index/types.d.ts

@@ -16,6 +16,7 @@ export interface BuildCommandArgs {
 export interface GenerateCommandArgs {
     _: (string | number)[];
 }
+export type ServerMode = "combined" | "proxy" | "renderer";
 export interface ParsedArgs {
     _: (string | number)[];
     port?: number;
@@ -39,6 +40,9 @@ export interface ParsedArgs {
     j?: boolean;
     with?: string[];
     w?: string[];
+    /** Server mode: combined (default), proxy, or renderer */
+    mode?: ServerMode;
+    m?: ServerMode;
     [key: string]: unknown;
 }
 //# sourceMappingURL=types.d.ts.map

package/esm/src/cli/index/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/cli/index/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IACb,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/src/cli/index/types.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,gBAAgB;IAC/B,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACvB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,OAAO,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAC;IAC5B,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,MAAM,CAAC,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,mBAAmB;IAClC,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;CACxB;AAED,MAAM,MAAM,UAAU,GAAG,UAAU,GAAG,OAAO,GAAG,UAAU,CAAC;AAE3D,MAAM,WAAW,UAAU;IACzB,CAAC,EAAE,CAAC,MAAM,GAAG,MAAM,CAAC,EAAE,CAAC;IACvB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,UAAU,CAAC,EAAE,OAAO,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,CAAC;IAChB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,MAAM,CAAC,EAAE,OAAO,CAAC;IACjB,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,QAAQ,CAAC,EAAE,MAAM,CAAC;IAClB,CAAC,CAAC,EAAE,MAAM,CAAC;IACX,IAAI,CAAC,EAAE,OAAO,CAAC;IACf,CAAC,CAAC,EAAE,OAAO,CAAC;IACZ,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC;IAChB,CAAC,CAAC,EAAE,MAAM,EAAE,CAAC;IACb,0DAA0D;IAC1D,IAAI,CAAC,EAAE,UAAU,CAAC;IAClB,CAAC,CAAC,EAAE,UAAU,CAAC;IACf,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB"}

package/esm/src/cli/mcp/advanced-tools.d.ts

@@ -303,13 +303,13 @@ declare const createProjectInput: z.ZodObject<{
 }, "strip", z.ZodTypeAny, {
     name: string;
     template: "app" | "docs" | "ai" | "blog" | "minimal";
-    integrations?: string[] | undefined;
     directory?: string | undefined;
+    integrations?: string[] | undefined;
 }, {
     name: string;
     template?: "app" | "docs" | "ai" | "blog" | "minimal" | undefined;
-    integrations?: string[] | undefined;
     directory?: string | undefined;
+    integrations?: string[] | undefined;
 }>;
 type CreateProjectInput = z.infer<typeof createProjectInput>;
 interface CreateProjectResult {

package/esm/src/config/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/src/config/loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAenE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqSlD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,SAAS,CACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC,CAsE1B;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAI9E"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../src/src/config/loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAGlD,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAgBnE,YAAY,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqSlD;;GAEG;AACH,MAAM,WAAW,gBAAgB;IAC/B;;;;OAIG;IACH,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;AAED,wBAAgB,SAAS,CACvB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,gBAAgB,GACzB,OAAO,CAAC,eAAe,CAAC,CAsE1B;AAED,wBAAgB,gBAAgB,IAAI,IAAI,CAGvC;AAED;;;;;;;GAOG;AACH,wBAAgB,mBAAmB,CAAC,UAAU,EAAE,MAAM,GAAG,eAAe,GAAG,IAAI,CAI9E"}

package/esm/src/config/loader.js

@@ -6,7 +6,8 @@ import { isBun } from "../platform/compat/runtime.js";
 import { serverLogger } from "../utils/logger/logger.js";
 import { getReactImportMap, REACT_DEFAULT_VERSION } from "../utils/constants/cdn.js";
 import { DEFAULT_CACHE_DIR } from "../utils/constants/server.js";
-import { setReactVersion } from "../transforms/esm/package-registry.js";
+// React version is now passed per-request via TransformOptions.reactVersion
+// No longer using global singleton: import { setReactVersion } from "#veryfront/transforms/esm/package-registry.ts";
 import { buildConfigCacheKey } from "../cache/keys.js";
 import { DEFAULT_PORT } from "./defaults.js";
 import { createFileSystem } from "../platform/compat/fs.js";
@@ -174,10 +175,10 @@ function validateAndCacheConfig(userConfig, cacheKey) {
     validateCorsConfig(userConfig);
     validateConfigShape(userConfig);
     const merged = mergeConfigs(userConfig);
-    // Apply React version from config (sets global default for transforms)
+    // React version is now passed per-request via TransformOptions.reactVersion
+    // Config stores it at merged.react.version, accessed wherever needed
     if (merged.react?.version) {
-        setReactVersion(merged.react.version);
-        serverLogger.debug("[CONFIG] React version set from config", { version: merged.react.version });
+        serverLogger.debug("[CONFIG] React version from config", { version: merged.react.version });
     }
     configCacheByProject.set(cacheKey, { revision: cacheRevision, config: merged });
     return merged;

package/esm/src/html/utils.js

@@ -62,8 +62,8 @@ const PLATFORM_UTILITIES = {
 const CDN_URL_TEMPLATES = {
     "esm.sh": {
         react: (v) => `https://esm.sh/react@${v}?target=es2022`,
-        reactDom: (v) => `https://esm.sh/react-dom@${v}?target=es2022`,
-        reactDomClient: (v) => `https://esm.sh/react-dom@${v}/client?target=es2022`,
+        reactDom: (v) => `https://esm.sh/react-dom@${v}?external=react&target=es2022`,
+        reactDomClient: (v) => `https://esm.sh/react-dom@${v}/client?external=react&target=es2022`,
         jsxRuntime: (v) => `https://esm.sh/react@${v}/jsx-runtime?target=es2022`,
         jsxDevRuntime: (v) => `https://esm.sh/react@${v}/jsx-dev-runtime?target=es2022`,
         veryfrontAgentReact: (v) => `https://esm.sh/veryfront@${v}/agent/react?external=react,react-dom&target=es2022`,

package/esm/src/modules/component-registry/registry.d.ts

@@ -1,5 +1,5 @@
 import type { RuntimeAdapter } from "../../platform/adapters/base.js";
-import type * as React from "react";
+import type * as React from "../../../deps/esm.sh/react@19.1.1.js";
 export interface ComponentExports {
     default?: unknown;
     [key: string]: unknown;

package/esm/src/modules/component-registry/registry.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/component-registry/registry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAGpC,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/F,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,CAAC;AAEF,qBAAa,iBAAiB;IAOhB,OAAO,CAAC,OAAO;IAN3B,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,aAAa,CAAW;IAChC,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,WAAW,CAAS;gBAER,OAAO,EAAE,wBAAwB;IAUrD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAcX,iBAAiB;YAsBjB,aAAa;IAmC3B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA4B1D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI5C,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC;IAIpC;;OAEG;IACH,SAAS,IAAI,eAAe,GAAG,SAAS;IAIxC;;OAEG;IACH,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAWlE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAUrD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,KAAK,IAAI,IAAI;IAMb,iBAAiB,IAAI,MAAM,EAAE;IAIvB,cAAc,IAAI,OAAO,CAC7B,KAAK,CAAC;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CACH;CA8BF"}
+{"version":3,"file":"registry.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/component-registry/registry.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACtE,OAAO,KAAK,KAAK,KAAK,MAAM,sCAAsC,CAAC;AAGnE,MAAM,WAAW,gBAAgB;IAC/B,OAAO,CAAC,EAAE,OAAO,CAAC;IAClB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC;CACxB;AAED,MAAM,WAAW,aAAa;IAC5B,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,QAAQ,EAAE,OAAO,CAAC;IAClB,OAAO,CAAC,EAAE,gBAAgB,CAAC;CAC5B;AAED,MAAM,WAAW,wBAAwB;IACvC,UAAU,EAAE,MAAM,CAAC;IACnB,aAAa,CAAC,EAAE,MAAM,EAAE,CAAC;IACzB,OAAO,EAAE,cAAc,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,gBAAgB,CAAC,EAAE,MAAM,CAAC;CAC3B;AAED,MAAM,MAAM,eAAe,GAAG;IAC5B,aAAa,EAAE,CAAC,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,KAAK,OAAO,CAAC,OAAO,CAAC,CAAC;IAC/F,UAAU,EAAE,MAAM,IAAI,CAAC;CACxB,CAAC;AAEF,qBAAa,iBAAiB;IAOhB,OAAO,CAAC,OAAO;IAN3B,OAAO,CAAC,UAAU,CAAoC;IACtD,OAAO,CAAC,aAAa,CAAW;IAChC,OAAO,CAAC,kBAAkB,CAA8B;IACxD,OAAO,CAAC,OAAO,CAAiB;IAChC,OAAO,CAAC,WAAW,CAAS;gBAER,OAAO,EAAE,wBAAwB;IAUrD,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;YAcX,iBAAiB;YAsBjB,aAAa;IAmC3B,aAAa,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,GAAG,IAAI,CAAC;IA4B1D,OAAO,IAAI,OAAO,CAAC,IAAI,CAAC;IAUxB,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,aAAa,GAAG,SAAS;IAI5C,MAAM,IAAI,GAAG,CAAC,MAAM,EAAE,aAAa,CAAC;IAIpC;;OAEG;IACH,SAAS,IAAI,eAAe,GAAG,SAAS;IAIxC;;OAEG;IACH,kBAAkB,IAAI,MAAM,CAAC,MAAM,EAAE,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;IAWlE,GAAG,CAAC,IAAI,EAAE,MAAM,GAAG,OAAO;IAI1B,GAAG,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,OAAO,CAAC,aAAa,CAAC,GAAG,IAAI;IAUrD,MAAM,CAAC,IAAI,EAAE,MAAM,GAAG,IAAI;IAI1B,KAAK,IAAI,IAAI;IAMb,iBAAiB,IAAI,MAAM,EAAE;IAIvB,cAAc,IAAI,OAAO,CAC7B,KAAK,CAAC;QACJ,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,EAAE,MAAM,CAAC;QACb,IAAI,CAAC,EAAE,MAAM,CAAC;QACd,YAAY,CAAC,EAAE,MAAM,CAAC;QACtB,IAAI,EAAE,MAAM,CAAC;KACd,CAAC,CACH;CA8BF"}

package/esm/src/modules/import-map/default-import-map.d.ts

@@ -1,17 +1,7 @@
 import type { ImportMapConfig } from "./types.js";
-/**
- * Get React import map for SSR in Deno.
- * Uses npm: specifiers which Deno handles natively with automatic deduplication.
- * See: https://deno.com/blog/not-using-npm-specifiers-doing-it-wrong
- *
- * This replaces the previous shared-*.ts approach which required manual re-exports.
- */
-export declare function getDenoReactImportMap(): Record<string, string>;
 /**
  * Get the default import map for SSR transforms.
- *
- * For Deno SSR: Uses npm: specifiers with automatic deduplication.
- * For other runtimes: Uses esm.sh URLs with external=react.
+ * Uses esm.sh URLs consistently (NO npm: specifiers per plan requirements).
  */
 export declare function getDefaultImportMap(): ImportMapConfig;
 //# sourceMappingURL=default-import-map.d.ts.map

package/esm/src/modules/import-map/default-import-map.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"default-import-map.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/default-import-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA8ClD;;;;;;GAMG;AACH,wBAAgB,qBAAqB,IAAI,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,CAE9D;AAED;;;;;GAKG;AACH,wBAAgB,mBAAmB,IAAI,eAAe,CAYrD"}
+{"version":3,"file":"default-import-map.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/default-import-map.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA0ClD;;;GAGG;AACH,wBAAgB,mBAAmB,IAAI,eAAe,CAOrD"}

package/esm/src/modules/import-map/default-import-map.js

@@ -1,6 +1,5 @@
 import * as dntShim from "../../../_dnt.shims.js";
-import { isDeno } from "../../platform/compat/runtime.js";
-import { getDenoNpmReactMap, getReactImportMap, } from "../../transforms/esm/package-registry.js";
+import { getReactImportMap } from "../../transforms/esm/package-registry.js";
 function ensureTrailingSlash(path) {
     return path.endsWith("/") ? path : `${path}/`;
 }
@@ -34,30 +33,14 @@ function getVeryfrontSsrImportMap() {
         "veryfront/react/fonts": fonts,
     };
 }
-/**
- * Get React import map for SSR in Deno.
- * Uses npm: specifiers which Deno handles natively with automatic deduplication.
- * See: https://deno.com/blog/not-using-npm-specifiers-doing-it-wrong
- *
- * This replaces the previous shared-*.ts approach which required manual re-exports.
- */
-export function getDenoReactImportMap() {
-    return getDenoNpmReactMap();
-}
 /**
  * Get the default import map for SSR transforms.
- *
- * For Deno SSR: Uses npm: specifiers with automatic deduplication.
- * For other runtimes: Uses esm.sh URLs with external=react.
+ * Uses esm.sh URLs consistently (NO npm: specifiers per plan requirements).
  */
 export function getDefaultImportMap() {
-    const reactMap = isDeno ? getDenoReactImportMap() : getReactImportMap();
+    const reactMap = getReactImportMap();
     const veryfrontMap = getVeryfrontSsrImportMap();
-    // For Deno SSR, add scopes so that esm.sh modules with external=react
-    // resolve their bare `react` imports to npm: specifiers.
-    const scopes = isDeno ? { "https://esm.sh/": getDenoReactImportMap() } : undefined;
     return {
         imports: { ...veryfrontMap, ...reactMap },
-        scopes,
     };
 }

package/esm/src/modules/import-map/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqElD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,eAAe,CAAC,CA+C1B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/loader.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAEtE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AAqDlD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,OAAO,CAAC,EAAE,cAAc,GACvB,OAAO,CAAC,eAAe,CAAC,CA+C1B"}

package/esm/src/modules/import-map/loader.js

@@ -1,14 +1,15 @@
 import { rendererLogger as logger } from "../../utils/index.js";
 import { dirname, join } from "../../platform/compat/path/index.js";
 import { getConfig } from "../../config/index.js";
-import { getDefaultImportMap, getDenoReactImportMap } from "./default-import-map.js";
+import { getDefaultImportMap } from "./default-import-map.js";
 import { mergeImportMaps } from "./merger.js";
 import { withSpan } from "../../observability/tracing/otlp-setup.js";
-import { isDeno } from "../../platform/compat/runtime.js";
+import { getReactImportMap } from "../../transforms/esm/package-registry.js";
 function normalizeImportMapForRuntime(importMap) {
     const normalizeValue = (value) => {
         if (!value.startsWith("npm:"))
             return value;
+        // Convert npm: specifiers to esm.sh URLs (should not happen with new code)
         const spec = value.slice(4);
         const [base, query] = spec.split("?");
         const url = `https://esm.sh/${base}`;
@@ -17,35 +18,19 @@ function normalizeImportMapForRuntime(importMap) {
     let imports = importMap.imports
         ? Object.fromEntries(Object.entries(importMap.imports).map(([k, v]) => [k, normalizeValue(v)]))
         : undefined;
-    let scopes = importMap.scopes
+    const scopes = importMap.scopes
         ? Object.fromEntries(Object.entries(importMap.scopes).map(([scope, mappings]) => [
             scope,
             Object.fromEntries(Object.entries(mappings).map(([k, v]) => [k, normalizeValue(v)])),
         ]))
         : undefined;
-    // CRITICAL: For Deno SSR, always use shared-*.ts files for React.
-    // Project configs may have esm.sh URLs which would create multiple React instances.
     // Override React mappings AFTER all other processing to ensure single instance.
-    // Also remove any "react/" prefix match since we have explicit mappings.
-    if (isDeno && imports) {
-        const reactMap = getDenoReactImportMap();
-        // Remove any esm.sh "react/" prefix mapping that would break subpath resolution
+    // Remove any "react/" prefix match since we have explicit mappings.
+    if (imports) {
+        const reactMap = getReactImportMap();
         delete imports["react/"];
         imports = { ...imports, ...reactMap };
     }
-    // For Deno SSR, ensure esm.sh scope has React mappings to shared-*.ts files.
-    // This is critical because esm.sh modules with external=react have bare `react`
-    // imports that need to resolve to our shared React instance.
-    if (isDeno) {
-        const reactMap = getDenoReactImportMap();
-        const esmShScope = scopes?.["https://esm.sh/"] ?? {};
-        // Remove any "react/" prefix match from scope as well
-        delete esmShScope["react/"];
-        scopes = {
-            ...scopes,
-            "https://esm.sh/": { ...esmShScope, ...reactMap },
-        };
-    }
     return { imports, scopes };
 }
 function mergeWithDefault(importMap) {

package/esm/src/modules/import-map/resolver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA8ClD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,eAAe,EAC1B,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAkDR"}
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/import-map/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,YAAY,CAAC;AA8ClD,wBAAgB,aAAa,CAC3B,SAAS,EAAE,MAAM,EACjB,SAAS,EAAE,eAAe,EAC1B,KAAK,CAAC,EAAE,MAAM,GACb,MAAM,CAuDR"}

package/esm/src/modules/import-map/resolver.js

@@ -46,21 +46,25 @@ export function resolveImport(specifier, importMap, scope) {
     if (isEsmShUrl(specifier)) {
         const esmShPackage = extractEsmShPackage(specifier);
         if (esmShPackage) {
+            const subpath = extractEsmShSubpath(specifier);
+            // Always check for explicit subpath mapping first (e.g., "react/jsx-runtime")
+            // This takes priority over appending subpath to base package mapping
+            if (subpath) {
+                const fullKey = esmShPackage + subpath; // e.g., "react/jsx-runtime"
+                const subpathMapping = scopedImports?.[fullKey] ?? importMap.imports?.[fullKey];
+                if (subpathMapping)
+                    return subpathMapping;
+            }
             const mapping = scopedImports?.[esmShPackage] ?? importMap.imports?.[esmShPackage];
             if (mapping) {
-                const subpath = extractEsmShSubpath(specifier);
                 if (!subpath)
                     return mapping;
-                // If mapping target is a file path (not HTTP URL or npm: specifier), look for explicit subpath mapping
-                // e.g., "react" → local file but "react/jsx-runtime" → different local file
-                // npm: specifiers are URL-like and should have subpaths appended
+                // If mapping target is a file path (not HTTP URL or npm: specifier),
+                // fall back to base mapping since explicit subpath wasn't found above
                 const isFilePath = !mapping.startsWith("http://") && !mapping.startsWith("https://") &&
                     !mapping.startsWith("npm:");
                 if (isFilePath) {
-                    const fullKey = esmShPackage + subpath; // e.g., "react/jsx-runtime"
-                    const subpathMapping = scopedImports?.[fullKey] ?? importMap.imports?.[fullKey];
-                    // Use explicit subpath mapping if available, otherwise fall back to base mapping
-                    return subpathMapping ?? mapping;
+                    return mapping;
                 }
                 return mapping + subpath;
             }

package/esm/src/modules/react-loader/component-loader.d.ts

@@ -1,4 +1,4 @@
-import type * as React from "react";
+import type * as React from "../../../deps/esm.sh/react@19.1.1.js";
 import type { RuntimeAdapter } from "../../platform/adapters/base.js";
 import type { LoadComponentOptions } from "./types.js";
 export declare function loadComponentFromSource(source: string, filePath: string, projectDir: string, adapter: RuntimeAdapter, options?: LoadComponentOptions): Promise<React.ComponentType<Record<string, unknown>>>;

package/esm/src/modules/react-loader/component-loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AACpC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMvD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CAwDvD"}
+{"version":3,"file":"component-loader.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/component-loader.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,KAAK,KAAK,MAAM,sCAAsC,CAAC;AACnE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AAKtE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,YAAY,CAAC;AAMvD,wBAAgB,uBAAuB,CACrC,MAAM,EAAE,MAAM,EACd,QAAQ,EAAE,MAAM,EAChB,UAAU,EAAE,MAAM,EAClB,OAAO,EAAE,cAAc,EACvB,OAAO,CAAC,EAAE,oBAAoB,GAC7B,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,CA0DvD"}

package/esm/src/modules/react-loader/component-loader.js

@@ -19,6 +19,7 @@ export function loadComponentFromSource(source, filePath, projectDir, adapter, o
                 adapter,
                 dev,
                 contentSourceId: options?.contentSourceId,
+                reactVersion: options?.reactVersion,
             });
             return loader.loadModule(filePath, source);
         }
@@ -28,6 +29,7 @@ export function loadComponentFromSource(source, filePath, projectDir, adapter, o
             moduleServerUrl: options?.moduleServerUrl ?? "/_vf_modules",
             vendorBundleHash: options?.vendorBundleHash,
             ssr: false,
+            reactVersion: options?.reactVersion,
         };
         const transformedCode = await transformToESM(source, filePath, projectDir, adapter, transformOpts);
         const tmpDir = await getProjectTmpDir(projectId);

package/esm/src/modules/react-loader/extract-component.d.ts

@@ -1,3 +1,3 @@
-import type * as React from "react";
+import type * as React from "../../../deps/esm.sh/react@19.1.1.js";
 export declare function extractComponent(mod: unknown, filePath: string): React.ComponentType<Record<string, unknown>>;
 //# sourceMappingURL=extract-component.d.ts.map

package/esm/src/modules/react-loader/extract-component.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"extract-component.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/extract-component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAGpC,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgB9C"}
+{"version":3,"file":"extract-component.d.ts","sourceRoot":"","sources":["../../../../src/src/modules/react-loader/extract-component.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,KAAK,MAAM,sCAAsC,CAAC;AAGnE,wBAAgB,gBAAgB,CAC9B,GAAG,EAAE,OAAO,EACZ,QAAQ,EAAE,MAAM,GACf,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAgB9C"}

package/esm/src/modules/react-loader/ssr-module-loader/loader.d.ts

@@ -1,4 +1,4 @@
-import type * as React from "react";
+import type * as React from "../../../../deps/esm.sh/react@19.1.1.js";
 import type { SSRModuleLoaderOptions } from "./types.js";
 /**
  * SSR Module Loader with Redis Support.
@@ -53,14 +53,9 @@ export declare class SSRModuleLoader {
      */
     private toJsExtension;
     private ensureDependenciesExist;
-    /**
-     * Fast sync hash for small strings (project IDs, etc.)
-     * Use hashContentAsync for large file content.
-     */
-    private hashCode;
     /**
      * Async hash for large content using Web Crypto API.
-     * Doesn't block event loop for large files.
+     * Falls back to sync hash for small files.
      */
     private hashContentAsync;
     private getTempPath;

package/esm/src/modules/react-loader/ssr-module-loader/loader.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/loader.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,KAAK,KAAK,MAAM,OAAO,CAAC;AAsCpC,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAgC3E;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,mBAAmB,CAAuB;gBAE9B,OAAO,EAAE,sBAAsB;IAEnD;;OAEG;IACH,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAsGxD,OAAO,CAAC,mBAAmB;IAiC3B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,WAAW;IAanB,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,kBAAkB;IAK1B;;OAEG;YACW,2BAA2B;IAkGzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;IA6RzC;;;OAGG;YACW,mBAAmB;IA2CjC,OAAO,CAAC,yBAAyB;IAYjC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,2BAA2B;IAiBnC,OAAO,CAAC,2BAA2B;IAWnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,aAAa;YAIP,uBAAuB;IAyCrC;;;OAGG;IACH,OAAO,CAAC,QAAQ;IAUhB;;;OAGG;YACW,gBAAgB;YAgBhB,WAAW;YAeX,YAAY;CAiC3B"}
+{"version":3,"file":"loader.d.ts","sourceRoot":"","sources":["../../../../../src/src/modules/react-loader/ssr-module-loader/loader.ts"],"names":[],"mappings":"AAWA,OAAO,KAAK,KAAK,KAAK,MAAM,yCAAyC,CAAC;AAuCtE,OAAO,KAAK,EAAoB,sBAAsB,EAAE,MAAM,YAAY,CAAC;AAiC3E;;;;;GAKG;AACH,qBAAa,eAAe;IAId,OAAO,CAAC,OAAO;IAH3B,OAAO,CAAC,EAAE,CAAsB;IAChC,OAAO,CAAC,mBAAmB,CAAuB;gBAE9B,OAAO,EAAE,sBAAsB;IAEnD;;OAEG;IACH,UAAU,CACR,QAAQ,EAAE,MAAM,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,KAAK,CAAC,aAAa,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;IAsGxD,OAAO,CAAC,mBAAmB;IAiC3B,OAAO,CAAC,wBAAwB;IAwBhC,OAAO,CAAC,WAAW;IAenB,OAAO,CAAC,yBAAyB;IAuBjC,OAAO,CAAC,kBAAkB;IAK1B;;OAEG;YACW,2BAA2B;IAmGzC,OAAO,CAAC,yBAAyB;YAiBnB,2BAA2B;IA0TzC;;;OAGG;YACW,mBAAmB;IA2CjC,OAAO,CAAC,yBAAyB;IAYjC;;;OAGG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,mBAAmB;IAuB3B,OAAO,CAAC,wBAAwB;IAehC,OAAO,CAAC,2BAA2B;IAiBnC,OAAO,CAAC,2BAA2B;IAWnC;;OAEG;IACH,OAAO,CAAC,mBAAmB;IA4B3B;;OAEG;IACH,OAAO,CAAC,aAAa;YAIP,uBAAuB;IAyCrC;;;OAGG;YACW,gBAAgB;YAgBhB,WAAW;YAeX,YAAY;CA4B3B"}

package/esm/src/modules/react-loader/ssr-module-loader/loader.js

@@ -6,15 +6,15 @@
  * @module module-system/react-loader/ssr-module-loader/loader
  */
 import * as dntShim from "../../../../_dnt.shims.js";
-import { isAbsolute, join } from "../../../platform/compat/path/index.js";
-import { cwd } from "../../../platform/compat/process.js";
+import { join } from "../../../platform/compat/path/index.js";
 import { transformToESM } from "../../../transforms/esm/index.js";
 import { TRANSFORM_CACHE_VERSION } from "../../../transforms/esm/package-registry.js";
-import { buildSSRModuleCacheKey, buildSSRModuleProjectKey } from "../../../cache/keys.js";
+import { buildSSRModuleCacheKey } from "../../../cache/keys.js";
 import { parseLocalImports, } from "../../../transforms/esm/import-parser.js";
 import { createFileSystem } from "../../../platform/compat/fs.js";
 import { createError, toError } from "../../../errors/veryfront-error.js";
 import { rendererLogger as logger } from "../../../utils/index.js";
+import { hashCodeHex } from "../../../utils/hash-utils.js";
 import { getApiBaseUrlEnv } from "../../../config/env.js";
 import { injectContext, withSpan } from "../../../observability/tracing/otlp-setup.js";
 import { SpanNames } from "../../../observability/tracing/span-names.js";
@@ -22,7 +22,8 @@ import { extractComponent } from "../extract-component.js";
 import { CIRCUIT_BREAKER_RESET_MS, CIRCUIT_BREAKER_THRESHOLD, IN_PROGRESS_WAIT_TIMEOUT_MS, MAX_CONCURRENT_TRANSFORMS, MAX_TRANSFORM_DEPTH, TRANSFORM_ACQUIRE_TIMEOUT_MS, TRANSFORM_BATCH_SIZE, } from "./constants.js";
 import { withTimeoutThrow } from "../../../rendering/utils/stream-utils.js";
 import { failedComponents, getFromRedis, globalCrossProjectCache, globalInProgress, globalModuleCache, globalTmpDirs, isSSRDistributedCacheEnabled, setInRedis, transformSemaphore, } from "./cache/index.js";
-import { getCacheBaseDir, getHttpBundleCacheDir } from "../../../utils/cache-dir.js";
+import { getHttpBundleCacheDir, getMdxEsmCacheDir } from "../../../utils/cache-dir.js";
+import { lookupMdxEsmCache } from "../../../transforms/mdx/esm-module-loader/cache/index.js";
 import { ensureHttpBundlesExist } from "../../../transforms/esm/http-cache.js";
 import { LRUCache } from "../../../utils/lru-wrapper.js";
 /** Pattern to match HTTP bundle file:// paths in transformed code */
@@ -190,7 +191,9 @@ export class SSRModuleLoader {
         if (!this.options.contentSourceId) {
             throw new Error(`Missing contentSourceId for SSR module cache (project: ${this.options.projectId}, file: ${filePath})`);
         }
-        return buildSSRModuleCacheKey(TRANSFORM_CACHE_VERSION, this.options.projectId, `${this.options.contentSourceId}:${filePath}`);
+        // Include reactVersion in cache key to ensure different versions don't share cached modules
+        const reactVersion = this.options.reactVersion ?? "default";
+        return buildSSRModuleCacheKey(TRANSFORM_CACHE_VERSION, this.options.projectId, `${this.options.contentSourceId}:${reactVersion}:${filePath}`);
     }
     isProductionContentSource() {
         const sourceId = this.options.contentSourceId;
@@ -259,6 +262,7 @@ export class SSRModuleLoader {
                     dev: this.options.dev,
                     ssr: true,
                     apiBaseUrl: this.options.apiBaseUrl,
+                    reactVersion: this.options.reactVersion,
                 };
                 const filePathWithExt = syntheticFilePath.endsWith(ext)
                     ? syntheticFilePath
@@ -397,6 +401,25 @@ export class SSRModuleLoader {
                 // Fall through to re-transform, which will create HTTP bundles locally
             }
         }
+        // Check MDX-ESM cache to share modules with MDX loader and avoid duplicate React contexts
+        if (this.options.projectId && this.options.contentSourceId) {
+            const baseCacheDir = getMdxEsmCacheDir();
+            const projectKey = hashCodeHex(this.options.projectId);
+            const sourceKey = hashCodeHex(this.options.contentSourceId);
+            const mdxCacheDir = join(baseCacheDir, projectKey, sourceKey);
+            const mdxCachedPath = await lookupMdxEsmCache(filePath, mdxCacheDir, this.options.projectDir, contentHash);
+            if (mdxCachedPath) {
+                const entry = { tempPath: mdxCachedPath, contentHash };
+                globalModuleCache.set(contentCacheKey, entry);
+                globalModuleCache.set(filePathCacheKey, entry);
+                logger.debug("[SSR-MODULE-LOADER] Reusing MDX-ESM cache", {
+                    file: filePath.slice(-40),
+                    cachedPath: mdxCachedPath.slice(-60),
+                });
+                await this.ensureDependenciesExist(code, filePath, depth);
+                return;
+            }
+        }
         const existingTransform = globalInProgress.get(inProgressKey);
         if (existingTransform) {
             try {
@@ -459,6 +482,7 @@ export class SSRModuleLoader {
                     dev: this.options.dev,
                     ssr: true,
                     apiBaseUrl: this.options.apiBaseUrl,
+                    reactVersion: this.options.reactVersion,
                 };
                 let transformed = await withSpan(SpanNames.SSR_TRANSFORM_SINGLE, () => transformToESM(code, filePath, this.options.projectDir, this.options.adapter, transformOpts), { "ssr.file": filePath.split("/").pop() || filePath });
                 for (const [specifier, tempPath] of crossProjectPaths.entries()) {
@@ -683,26 +707,13 @@ export class SSRModuleLoader {
             }));
         }
     }
-    /**
-     * Fast sync hash for small strings (project IDs, etc.)
-     * Use hashContentAsync for large file content.
-     */
-    hashCode(str) {
-        let hash = 0;
-        for (let i = 0; i < str.length; i++) {
-            const char = str.charCodeAt(i);
-            hash = (hash << 5) - hash + char;
-            hash = hash & hash;
-        }
-        return Math.abs(hash).toString(16);
-    }
     /**
      * Async hash for large content using Web Crypto API.
-     * Doesn't block event loop for large files.
+     * Falls back to sync hash for small files.
      */
     async hashContentAsync(content) {
         if (content.length < 10000)
-            return this.hashCode(content);
+            return hashCodeHex(content);
         try {
             const data = new TextEncoder().encode(content);
             const hashBuffer = await dntShim.crypto.subtle.digest("SHA-256", data);
@@ -713,7 +724,7 @@ export class SSRModuleLoader {
                 .join("");
         }
         catch {
-            return this.hashCode(content);
+            return hashCodeHex(content);
         }
     }
     async getTempPath(filePath, contentHash) {
@@ -729,26 +740,23 @@ export class SSRModuleLoader {
         return join(tmpDir, jsPath);
     }
     async ensureTmpDir() {
-        let projectDir = this.options.projectDir;
         const { projectId, contentSourceId } = this.options;
         if (!projectId) {
-            throw new Error(`Missing projectId for SSR temp directory (projectDir: ${projectDir})`);
+            throw new Error(`Missing projectId for SSR temp directory (projectDir: ${this.options.projectDir})`);
         }
         if (!contentSourceId) {
             throw new Error(`Missing contentSourceId for SSR temp directory (project: ${projectId})`);
         }
-        if (!projectDir.startsWith("/")) {
-            projectDir = join(cwd(), projectDir);
-        }
-        const cacheBaseDir = getCacheBaseDir();
-        const baseDir = isAbsolute(cacheBaseDir) ? cacheBaseDir : join(cwd(), cacheBaseDir);
-        const cacheKey = `${baseDir}|${buildSSRModuleProjectKey(projectDir, projectId)}|${contentSourceId}`;
+        // Use the same cache directory as MDX-ESM loader to share module instances.
+        // This prevents issues like React context being created twice in separate files.
+        const baseCacheDir = getMdxEsmCacheDir();
+        const projectKey = hashCodeHex(projectId);
+        const sourceKey = hashCodeHex(contentSourceId);
+        const cacheKey = `${baseCacheDir}|${projectKey}|${sourceKey}`;
         const existingDir = globalTmpDirs.get(cacheKey);
         if (existingDir)
             return existingDir;
-        const projectKey = this.hashCode(projectId);
-        const sourceKey = this.hashCode(contentSourceId);
-        const tmpDir = join(baseDir, "veryfront-ssr", projectKey, sourceKey);
+        const tmpDir = join(baseCacheDir, projectKey, sourceKey);
         await this.fs.mkdir(tmpDir, { recursive: true });
         globalTmpDirs.set(cacheKey, tmpDir);
         return tmpDir;

package/esm/src/modules/react-loader/ssr-module-loader/types.d.ts

@@ -14,6 +14,8 @@ export interface SSRModuleLoaderOptions {
     apiBaseUrl?: string;
     /** Content source ID for cache isolation (branch name or release ID) */
     contentSourceId?: string;
+    /** React version for transforms (defaults to DEFAULT_REACT_VERSION) */
+    reactVersion?: string;
 }
 export interface ModuleCacheEntry {
     tempPath: string;