@ecopages/react 0.2.0-alpha.2 → 0.2.0-alpha.20

package/src/utils/hydration-scripts.js

@@ -9,6 +9,42 @@ function getHmrImportStatement(isMdx) {
 function getComponentType(isMdx) {
   return isMdx ? "MDX" : "React";
 }
+function getDevPageRootCleanupScript() {
+  return `window.__ECO_PAGES__ = window.__ECO_PAGES__ || {};
+window.__ECO_PAGES__.react = window.__ECO_PAGES__.react || {};
+window.__ECO_PAGES__.react.cleanupPageRoot = () => {
+  const activeRoot = window.__ECO_PAGES__.react?.pageRoot || root;
+  if (!activeRoot) {
+    window.__ECO_PAGES__.react.pageRoot = null;
+	    window.__ECO_PAGES__?.navigation?.releaseOwnership?.("react-router");
+    delete window.__ECO_PAGES__.page;
+    return;
+  }
+  window.__ECO_PAGES__.react.pageRoot = null;
+	  window.__ECO_PAGES__?.navigation?.releaseOwnership?.("react-router");
+  delete window.__ECO_PAGES__.page;
+  root = null;
+  activeRoot.unmount();
+};`;
+}
+function getProdPageRootCleanupScript() {
+  return 'window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.react=window.__ECO_PAGES__.react||{};window.__ECO_PAGES__.react.cleanupPageRoot=()=>{const a=window.__ECO_PAGES__.react?.pageRoot||root;if(!a){window.__ECO_PAGES__.react.pageRoot=null;window.__ECO_PAGES__?.navigation?.releaseOwnership?.("react-router");delete window.__ECO_PAGES__.page;return}window.__ECO_PAGES__.react.pageRoot=null;window.__ECO_PAGES__?.navigation?.releaseOwnership?.("react-router");delete window.__ECO_PAGES__.page;root=null;a.unmount()};';
+}
+function getDevRouterBootstrapRegistrationScript() {
+  return `const currentOwnerState = window.__ECO_PAGES__?.navigation?.getOwnerState?.();
+if (!(currentOwnerState?.owner === "react-router" && currentOwnerState.canHandleSpaNavigation)) {
+window.__ECO_PAGES__?.navigation?.register({
+  owner: "react-router",
+  cleanupBeforeHandoff: async () => {
+    window.__ECO_PAGES__?.react?.cleanupPageRoot?.();
+  }
+});
+window.__ECO_PAGES__?.navigation?.claimOwnership?.("react-router");
+}`;
+}
+function getProdRouterBootstrapRegistrationScript() {
+  return 'const o=window.__ECO_PAGES__?.navigation?.getOwnerState?.();if(!(o?.owner==="react-router"&&o.canHandleSpaNavigation)){window.__ECO_PAGES__?.navigation?.register({owner:"react-router",cleanupBeforeHandoff:async()=>{window.__ECO_PAGES__?.react?.cleanupPageRoot?.()}});window.__ECO_PAGES__?.navigation?.claimOwnership?.("react-router")}';
+}
 function createDevScriptWithRouter(options) {
   const { importPath, isMdx, router, reactImportPath, reactDomClientImportPath, routerImportPath } = options;
   const { components, getRouterProps } = router;
@@ -21,10 +57,13 @@ import { createElement } from "${reactImportPath}";
 import { ${components.router}, ${components.pageContent} } from "${routerImportPath}";
 ${getImportStatement(importPath, isMdx)}
 
-window.__ecopages_hmr_handlers__ = window.__ecopages_hmr_handlers__ || {};
-window.__ecopages_router_active__ = false;
-window.__ecopages_reload_current_page__ = null;
-let root = null;
+window.__ECO_PAGES__ = window.__ECO_PAGES__ || {};
+window.__ECO_PAGES__.hmrHandlers = window.__ECO_PAGES__.hmrHandlers || {};
+window.__ECO_PAGES__.react = window.__ECO_PAGES__.react || {};
+window.__ECO_PAGES__.react.pageRoot = window.__ECO_PAGES__.react.pageRoot || null;
+let root = window.__ECO_PAGES__.react.pageRoot;
+${getDevPageRootCleanupScript()}
+${getDevRouterBootstrapRegistrationScript()}
 
 const getPageData = () => {
   const el = document.getElementById("__ECO_PAGE_DATA__");
@@ -36,7 +75,7 @@ const getPageData = () => {
 
 const props = getPageData();
 
-window.__ECO_PAGE__ = {
+window.__ECO_PAGES__.page = {
   module: "${importPath}",
   props
 };
@@ -47,21 +86,30 @@ const createTree = (Component, props) => {
 };
 
 const mount = () => {
-  root = hydrateRoot(document, createTree(Page, props), {
-    onRecoverableError: (err) => console.warn("[ecopages] Hydration error:", err)
-  });
-  window.__ecopages_router_active__ = true;
-  window.__ecopages_hmr_handlers__["${importPath}"] = async (newUrl) => {
-    if (window.__ecopages_router_active__ && window.__ecopages_reload_current_page__) {
-      await window.__ecopages_reload_current_page__();
-      console.log("[ecopages] ${getComponentType(isMdx)} component updated via router");
-      return;
-    }
+  if (window.__ECO_PAGES__.react?.pageRoot) {
+    root = window.__ECO_PAGES__.react.pageRoot;
+    root.render(createTree(Page, props));
+  } else {
+    root = hydrateRoot(document.body, createTree(Page, props), {
+      onRecoverableError: (err) => console.warn("[ecopages] Hydration error:", err)
+    });
+    window.__ECO_PAGES__.react.pageRoot = root;
+  }
+  window.__ECO_PAGES__.hmrHandlers["${importPath}"] = async (newUrl) => {
     try {
       const newModule = await import(newUrl);
+      const nextProps = getPageData();
       ${getHmrImportStatement(isMdx)}
-      root.render(createTree(NewPage, props));
-      console.log("[ecopages] ${getComponentType(isMdx)} component updated");
+      window.__ECO_PAGES__.page = {
+        module: "${importPath}",
+        props: nextProps
+      };
+      root.render(createTree(NewPage, nextProps));
+      if (window.__ECO_PAGES__?.navigation?.getOwnerState().owner === "react-router") {
+        console.log("[ecopages] ${getComponentType(isMdx)} component updated via router");
+      } else {
+        console.log("[ecopages] ${getComponentType(isMdx)} component updated");
+      }
     } catch (e) {
       console.error("[ecopages] Failed to hot-reload ${getComponentType(isMdx)} component:", e);
     }
@@ -82,8 +130,12 @@ import { hydrateRoot } from "${reactDomClientImportPath}";
 import { createElement } from "${reactImportPath}";
 ${getImportStatement(importPath, isMdx)}
 
-window.__ecopages_hmr_handlers__ = window.__ecopages_hmr_handlers__ || {};
-let root = null;
+window.__ECO_PAGES__ = window.__ECO_PAGES__ || {};
+window.__ECO_PAGES__.hmrHandlers = window.__ECO_PAGES__.hmrHandlers || {};
+window.__ECO_PAGES__.react = window.__ECO_PAGES__.react || {};
+window.__ECO_PAGES__.react.pageRoot = window.__ECO_PAGES__.react.pageRoot || null;
+let root = window.__ECO_PAGES__.react.pageRoot;
+${getDevPageRootCleanupScript()}
 
 const getPageData = () => {
   const el = document.getElementById("__ECO_PAGE_DATA__");
@@ -95,7 +147,7 @@ const getPageData = () => {
 
 const props = getPageData();
 
-window.__ECO_PAGE__ = {
+window.__ECO_PAGES__.page = {
   module: "${importPath}",
   props
 };
@@ -103,14 +155,21 @@ window.__ECO_PAGE__ = {
 const createTree = (Component, props) => {
   const Layout = Component.config?.layout;
   const pageElement = createElement(Component, props);
-  return Layout ? createElement(Layout, null, pageElement) : pageElement;
+  const layoutProps = props?.locals ? { locals: props.locals } : null;
+  return Layout ? createElement(Layout, layoutProps, pageElement) : pageElement;
 };
 
 const mount = () => {
-  root = hydrateRoot(document, createTree(Page, props), {
-    onRecoverableError: (err) => console.warn("[ecopages] Hydration error:", err)
-  });
-  window.__ecopages_hmr_handlers__["${importPath}"] = async (newUrl) => {
+  if (window.__ECO_PAGES__.react?.pageRoot) {
+    root = window.__ECO_PAGES__.react.pageRoot;
+    root.render(createTree(Page, props));
+  } else {
+    root = hydrateRoot(document.body, createTree(Page, props), {
+      onRecoverableError: (err) => console.warn("[ecopages] Hydration error:", err)
+    });
+    window.__ECO_PAGES__.react.pageRoot = root;
+  }
+  window.__ECO_PAGES__.hmrHandlers["${importPath}"] = async (newUrl) => {
     try {
       const newModule = await import(newUrl);
       ${getHmrImportStatement(isMdx)}
@@ -136,16 +195,16 @@ function createProdScriptWithRouter(options) {
     throw new Error("routerImportPath is required when router adapter is configured");
   }
   if (isMdx) {
-    return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import{${components.router} as R,${components.pageContent} as PC}from"${routerImportPath}";import*as M from"${importPath}";const P=M.default;if(M.config)P.config=M.config;const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGE__={module:"${importPath}",props:pr};const ct=(C,p)=>ce(R,${getRouterProps("C", "p")},ce(PC));const m=()=>hr(document,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
+    return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import{${components.router} as R,${components.pageContent} as PC}from"${routerImportPath}";import*as M from"${importPath}";const P=M.default;if(M.config)P.config=M.config;window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.react=window.__ECO_PAGES__.react||{};window.__ECO_PAGES__.react.pageRoot=window.__ECO_PAGES__.react.pageRoot||null;let root=window.__ECO_PAGES__.react.pageRoot;${getProdPageRootCleanupScript()}${getProdRouterBootstrapRegistrationScript()}const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGES__.page={module:"${importPath}",props:pr};const ct=(C,p)=>ce(R,${getRouterProps("C", "p")},ce(PC));const m=()=>{if(window.__ECO_PAGES__.react?.pageRoot){root=window.__ECO_PAGES__.react.pageRoot;root.render(ct(P,pr));return}root=hr(document.body,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});window.__ECO_PAGES__.react.pageRoot=root};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
   }
-  return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import{${components.router} as R,${components.pageContent} as PC}from"${routerImportPath}";import P from"${importPath}";const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGE__={module:"${importPath}",props:pr};const ct=(C,p)=>ce(R,${getRouterProps("C", "p")},ce(PC));const m=()=>hr(document,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
+  return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import{${components.router} as R,${components.pageContent} as PC}from"${routerImportPath}";import P from"${importPath}";window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.react=window.__ECO_PAGES__.react||{};window.__ECO_PAGES__.react.pageRoot=window.__ECO_PAGES__.react.pageRoot||null;let root=window.__ECO_PAGES__.react.pageRoot;${getProdPageRootCleanupScript()}${getProdRouterBootstrapRegistrationScript()}const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGES__.page={module:"${importPath}",props:pr};const ct=(C,p)=>ce(R,${getRouterProps("C", "p")},ce(PC));const m=()=>{if(window.__ECO_PAGES__.react?.pageRoot){root=window.__ECO_PAGES__.react.pageRoot;root.render(ct(P,pr));return}root=hr(document.body,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});window.__ECO_PAGES__.react.pageRoot=root};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
 }
 function createProdScriptWithoutRouter(options) {
   const { importPath, isMdx, reactImportPath, reactDomClientImportPath } = options;
   if (isMdx) {
-    return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import*as M from"${importPath}";const P=M.default;if(M.config)P.config=M.config;const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGE__={module:"${importPath}",props:pr};const ct=(C,p)=>{const L=C.config?.layout;const pe=ce(C,p);return L?ce(L,null,pe):pe};const m=()=>hr(document,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
+    return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import*as M from"${importPath}";const P=M.default;if(M.config)P.config=M.config;window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.react=window.__ECO_PAGES__.react||{};window.__ECO_PAGES__.react.pageRoot=window.__ECO_PAGES__.react.pageRoot||null;let root=window.__ECO_PAGES__.react.pageRoot;${getProdPageRootCleanupScript()}const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGES__.page={module:"${importPath}",props:pr};const ct=(C,p)=>{const L=C.config?.layout;const pe=ce(C,p);const lp=p?.locals?{locals:p.locals}:null;return L?ce(L,lp,pe):pe};const m=()=>{if(window.__ECO_PAGES__.react?.pageRoot){root=window.__ECO_PAGES__.react.pageRoot;root.render(ct(P,pr));return}root=hr(document.body,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});window.__ECO_PAGES__.react.pageRoot=root};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
   }
-  return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import P from"${importPath}";const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGE__={module:"${importPath}",props:pr};const ct=(C,p)=>{const L=C.config?.layout;const pe=ce(C,p);return L?ce(L,null,pe):pe};const m=()=>hr(document,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
+  return `import{hydrateRoot as hr}from"${reactDomClientImportPath}";import{createElement as ce}from"${reactImportPath}";import P from"${importPath}";window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.react=window.__ECO_PAGES__.react||{};window.__ECO_PAGES__.react.pageRoot=window.__ECO_PAGES__.react.pageRoot||null;let root=window.__ECO_PAGES__.react.pageRoot;${getProdPageRootCleanupScript()}const gd=()=>{const e=document.getElementById("__ECO_PAGE_DATA__");if(e?.textContent){try{return JSON.parse(e.textContent)}catch{}}return{}};const pr=gd();window.__ECO_PAGES__.page={module:"${importPath}",props:pr};const ct=(C,p)=>{const L=C.config?.layout;const pe=ce(C,p);const lp=p?.locals?{locals:p.locals}:null;return L?ce(L,lp,pe):pe};const m=()=>{if(window.__ECO_PAGES__.react?.pageRoot){root=window.__ECO_PAGES__.react.pageRoot;root.render(ct(P,pr));return}root=hr(document.body,ct(P,pr),{onRecoverableError:(e)=>console.warn("[ecopages] Hydration error:",e)});window.__ECO_PAGES__.react.pageRoot=root};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m):m()`;
 }
 function createHydrationScript(options) {
   const { isDevelopment, router } = options;
@@ -156,10 +215,8 @@ function createHydrationScript(options) {
 }
 function createIslandHydrationScript(options) {
   const targetSelector = JSON.stringify(options.targetSelector);
-  const serializedProps = JSON.stringify(options.props ?? {});
   const componentRef = JSON.stringify(options.componentRef ?? "");
   const componentFile = JSON.stringify(options.componentFile ?? "");
-  const mountedAttribute = "data-eco-react-mounted";
   if (options.isDevelopment) {
     return `
 import { createRoot } from "${options.reactDomClientImportPath}";
@@ -195,18 +252,24 @@ const resolveComponent = () => {
 };
 
 const mount = () => {
-  const target = document.querySelector(${targetSelector});
+  const targets = document.querySelectorAll(${targetSelector});
   const Component = resolveComponent();
-  if (!target || !Component || target.hasAttribute("${mountedAttribute}")) {
+  if (!Component || targets.length === 0) {
     return;
   }
-  const props = ${serializedProps};
-  target.setAttribute("${mountedAttribute}", "true");
-  const root = createRoot(target);
-  root.render(createElement(Component, props));
+  targets.forEach((target) => {
+    if (!(target instanceof HTMLElement)) {
+      return;
+    }
+    const props = JSON.parse(atob(target.getAttribute("data-eco-props") || "e30="));
+    const container = document.createElement("eco-island");
+    container.style.display = "block";
+    target.replaceWith(container);
+    const root = createRoot(container);
+    root.render(createElement(Component, props));
+  });
 };
 
-document.addEventListener("eco:after-swap", mount);
 if (document.readyState === "loading") {
   document.addEventListener("DOMContentLoaded", mount, { once: true });
 } else {
@@ -214,7 +277,7 @@ if (document.readyState === "loading") {
 }
 `.trim();
   }
-  return `import{createRoot as cr}from"${options.reactDomClientImportPath}";import{createElement as ce}from"${options.reactImportPath}";import*as M from"${options.importPath}";const r=${componentRef};const f=${componentFile};const mv=Object.values(M);const c=mv.find((e)=>{if(typeof e!=="function")return false;const ec=e.config?.__eco;if(!ec)return false;if(r&&ec.id===r)return true;if(f&&ec.file===f)return true;return false;})??(typeof M.default==="function"?M.default:mv.find((e)=>typeof e==="function")??null);const m=()=>{const t=document.querySelector(${targetSelector});if(!t||!c||t.hasAttribute("${mountedAttribute}"))return;const p=${serializedProps};t.setAttribute("${mountedAttribute}","true");cr(t).render(ce(c,p))};document.addEventListener("eco:after-swap",m);document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m,{once:true}):m()`;
+  return `import{createRoot as cr}from"${options.reactDomClientImportPath}";import{createElement as ce}from"${options.reactImportPath}";import*as M from"${options.importPath}";const r=${componentRef};const f=${componentFile};const mv=Object.values(M);const c=mv.find((e)=>{if(typeof e!=="function")return false;const ec=e.config?.__eco;if(!ec)return false;if(r&&ec.id===r)return true;if(f&&ec.file===f)return true;return false;})??(typeof M.default==="function"?M.default:mv.find((e)=>typeof e==="function")??null);const m=()=>{const ts=document.querySelectorAll(${targetSelector});if(!c||ts.length===0)return;ts.forEach((t)=>{if(!(t instanceof HTMLElement))return;const p=JSON.parse(atob(t.getAttribute("data-eco-props")||"e30="));const ct=document.createElement("eco-island");ct.style.display="block";t.replaceWith(ct);cr(ct).render(ce(c,p))})};document.readyState==="loading"?document.addEventListener("DOMContentLoaded",m,{once:true}):m()`;
 }
 export {
   createHydrationScript,

package/src/utils/hydration-scripts.test.browser.d.ts

@@ -0,0 +1 @@
+export {};

package/src/utils/hydration-scripts.test.browser.js

@@ -0,0 +1,126 @@
+import { afterEach, describe, expect, it } from "vitest";
+import { createHydrationScript } from "./hydration-scripts.js";
+const routerAdapter = {
+  name: "eco-router",
+  bundle: {
+    importPath: "/assets/router.js",
+    outputName: "router",
+    externals: []
+  },
+  importMapKey: "@ecopages/react-router",
+  components: {
+    router: "EcoRouter",
+    pageContent: "PageContent"
+  },
+  getRouterProps: (page, props) => `{ page: ${page}, pageProps: ${props} }`
+};
+function createModuleUrl(source) {
+  return `data:text/javascript;base64,${btoa(source)}`;
+}
+async function importModule(moduleUrl) {
+  await import(
+    /* @vite-ignore */
+    moduleUrl
+  );
+}
+function createRuntimeModules() {
+  const reactImportPath = createModuleUrl("export const createElement = (...args) => ({ args });");
+  const reactDomClientImportPath = createModuleUrl(`
+export const hydrateRoot = (container, tree, options) => {
+  const runtime = window.__ECO_REACT_HYDRATION_TEST__;
+  runtime.hydrateCalls.push({
+    containerTag: container.tagName,
+    hasRecoverableErrorHandler: typeof options?.onRecoverableError === "function",
+    tree,
+  });
+
+  return {
+    render() {},
+    unmount() {
+      runtime.unmountCount += 1;
+    },
+  };
+};
+`);
+  const importPath = createModuleUrl("export default function Page() { return null; }");
+  const routerImportPath = createModuleUrl(`
+export function EcoRouter(props) {
+  return props;
+}
+
+export function PageContent() {
+  return null;
+}
+`);
+  return {
+    importPath,
+    reactImportPath,
+    reactDomClientImportPath,
+    routerImportPath
+  };
+}
+describe("createHydrationScript browser execution", () => {
+  afterEach(() => {
+    document.body.innerHTML = "";
+    const testWindow = window;
+    delete testWindow.__ECO_PAGES__;
+    delete testWindow.__ECO_REACT_HYDRATION_TEST__;
+  });
+  it("registers router ownership and cleanup when the browser hydration bootstrap runs", async () => {
+    const runtimeModules = createRuntimeModules();
+    const testWindow = window;
+    testWindow.__ECO_REACT_HYDRATION_TEST__ = {
+      hydrateCalls: [],
+      claimedOwners: [],
+      releasedOwners: [],
+      registrations: [],
+      unmountCount: 0
+    };
+    testWindow.__ECO_PAGES__ = {
+      navigation: {
+        getOwnerState: () => ({
+          owner: "html",
+          canHandleSpaNavigation: false
+        }),
+        register: (registration) => {
+          testWindow.__ECO_REACT_HYDRATION_TEST__?.registrations.push(registration);
+        },
+        claimOwnership: (owner) => {
+          testWindow.__ECO_REACT_HYDRATION_TEST__?.claimedOwners.push(owner);
+        },
+        releaseOwnership: (owner) => {
+          testWindow.__ECO_REACT_HYDRATION_TEST__?.releasedOwners.push(owner);
+        }
+      }
+    };
+    document.body.innerHTML = `<script id="__ECO_PAGE_DATA__" type="application/json">${JSON.stringify({
+      title: "Hello React",
+      locals: { theme: "dark" }
+    })}<\/script>`;
+    const script = createHydrationScript({
+      ...runtimeModules,
+      isDevelopment: true,
+      isMdx: false,
+      router: routerAdapter
+    });
+    await importModule(createModuleUrl(script));
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.hydrateCalls).toHaveLength(1);
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.hydrateCalls[0]?.containerTag).toBe("BODY");
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.hydrateCalls[0]?.hasRecoverableErrorHandler).toBe(true);
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.claimedOwners).toEqual(["react-router"]);
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.registrations).toHaveLength(1);
+    expect(typeof testWindow.__ECO_PAGES__?.react?.cleanupPageRoot).toBe("function");
+    expect(testWindow.__ECO_PAGES__?.page).toEqual({
+      module: runtimeModules.importPath,
+      props: {
+        title: "Hello React",
+        locals: { theme: "dark" }
+      }
+    });
+    await testWindow.__ECO_PAGES__?.react?.cleanupPageRoot?.();
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.unmountCount).toBe(1);
+    expect(testWindow.__ECO_REACT_HYDRATION_TEST__?.releasedOwners).toEqual(["react-router"]);
+    expect(testWindow.__ECO_PAGES__?.page).toBeUndefined();
+    expect(testWindow.__ECO_PAGES__?.react?.pageRoot).toBeNull();
+  });
+});

package/src/utils/reachability-analyzer.d.ts

@@ -42,6 +42,15 @@ export type ReachabilityResult = {
      */
     analyzed: boolean;
 };
+/**
+ * Optional export filter supplied by the client graph boundary when a local
+ * module is imported through a narrower named-export surface.
+ *
+ * `'*'` means the whole module namespace is considered reachable, while a
+ * `Set` restricts analysis to the named exports that are actually requested by
+ * downstream client-reachable modules.
+ */
+type ExplicitlyRequestedExports = Set<string> | '*';
 /**
  * Analyzes a module using Oxc AST and extracts a strict reachability graph
  * starting from client roots (`render`, `errorBoundary`, `loadingFallback` of `eco.page` or `eco.component`).
@@ -50,6 +59,8 @@ export type ReachabilityResult = {
  * @param filename - Absolute or relative path to the module file.
  * @param program - Optional pre-parsed Oxc program AST. When supplied, the
  *   internal `parseSync` call is skipped entirely (avoids double-parsing).
+ * @param explicitlyRequestedExports - Optional named export filter propagated
+ *   from a downstream importer when this module is only partially reachable.
  */
-export declare function analyzeReachability(source: string, filename: string, program?: ReturnType<typeof parseSync>['program']): ReachabilityResult;
+export declare function analyzeReachability(source: string, filename: string, program?: ReturnType<typeof parseSync>['program'], explicitlyRequestedExports?: ExplicitlyRequestedExports): ReachabilityResult;
 export {};

package/src/utils/reachability-analyzer.js

@@ -7,7 +7,7 @@ function parserLanguageForFile(filename) {
   if (extension === ".jsx") return "jsx";
   return "js";
 }
-function analyzeReachability(source, filename, program) {
+function analyzeReachability(source, filename, program, explicitlyRequestedExports) {
   let resolvedProgram;
   if (program) {
     resolvedProgram = program;
@@ -114,12 +114,86 @@ function analyzeReachability(source, filename, program) {
       potentialClientRoots.push(node);
     }
   }
+  function getExportedName(specifier) {
+    if (specifier?.exported?.type === "Identifier") return specifier.exported.name;
+    if (typeof specifier?.exported?.value === "string") return specifier.exported.value;
+    if (specifier?.local?.type === "Identifier") return specifier.local.name;
+    if (typeof specifier?.local?.value === "string") return specifier.local.value;
+    return void 0;
+  }
+  function getReexportedImportName(specifier) {
+    if (specifier?.local?.type === "Identifier") return specifier.local.name;
+    if (typeof specifier?.local?.value === "string") return specifier.local.value;
+    if (specifier?.imported?.type === "Identifier") return specifier.imported.name;
+    if (typeof specifier?.imported?.value === "string") return specifier.imported.value;
+    return getExportedName(specifier);
+  }
+  function getLocalExportName(specifier) {
+    if (specifier?.local?.type === "Identifier") return specifier.local.name;
+    if (typeof specifier?.local?.value === "string") return specifier.local.value;
+    return void 0;
+  }
+  function isExplicitlyRequestedExport(name) {
+    if (explicitlyRequestedExports === "*") return true;
+    return explicitlyRequestedExports?.has(name) ?? false;
+  }
   let isFallbackRoots = false;
   if (potentialClientRoots.length === 0) {
-    isFallbackRoots = true;
-    for (const node of resolvedProgram.body) {
-      if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportAllDeclaration") {
-        potentialClientRoots.push(node);
+    if (explicitlyRequestedExports) {
+      for (const node of resolvedProgram.body) {
+        if (node.type === "ExportNamedDeclaration") {
+          const exportNode = node;
+          if (exportNode.source && exportNode.specifiers?.length) {
+            const hasRequestedReexport = exportNode.specifiers.some((specifier) => {
+              const exportedName = getExportedName(specifier);
+              return exportedName ? isExplicitlyRequestedExport(exportedName) : false;
+            });
+            if (hasRequestedReexport) {
+              potentialClientRoots.push(node);
+            }
+            continue;
+          }
+          if (exportNode.declaration?.type === "FunctionDeclaration" || exportNode.declaration?.type === "ClassDeclaration") {
+            const declarationName = exportNode.declaration.id?.name;
+            if (declarationName && isExplicitlyRequestedExport(declarationName)) {
+              potentialClientRoots.push(node);
+            }
+            continue;
+          }
+          if (exportNode.declaration?.type === "VariableDeclaration") {
+            const hasRequestedDeclaration = exportNode.declaration.declarations.some(
+              (declaration) => declaration.id?.type === "Identifier" && isExplicitlyRequestedExport(declaration.id.name)
+            );
+            if (hasRequestedDeclaration) {
+              potentialClientRoots.push(node);
+            }
+            continue;
+          }
+          if (exportNode.specifiers?.length) {
+            const hasRequestedSpecifier = exportNode.specifiers.some((specifier) => {
+              const exportedName = getExportedName(specifier);
+              return exportedName ? isExplicitlyRequestedExport(exportedName) : false;
+            });
+            if (hasRequestedSpecifier) {
+              potentialClientRoots.push(node);
+            }
+          }
+        } else if (node.type === "ExportDefaultDeclaration") {
+          if (isExplicitlyRequestedExport("default")) {
+            potentialClientRoots.push(node);
+          }
+        } else if (node.type === "ExportAllDeclaration") {
+          if (explicitlyRequestedExports === "*") {
+            potentialClientRoots.push(node);
+          }
+        }
+      }
+    } else {
+      isFallbackRoots = true;
+      for (const node of resolvedProgram.body) {
+        if (node.type === "ExportNamedDeclaration" || node.type === "ExportDefaultDeclaration" || node.type === "ExportAllDeclaration") {
+          potentialClientRoots.push(node);
+        }
       }
     }
   }
@@ -167,6 +241,28 @@ function analyzeReachability(source, filename, program) {
       markImportReachable(node.source.value, "*");
       return;
     }
+    if (node.type === "ExportNamedDeclaration" && typeof node.source?.value === "string") {
+      for (const specifier of node.specifiers ?? []) {
+        const importedName = getReexportedImportName(specifier);
+        if (importedName) {
+          markImportReachable(node.source.value, importedName);
+        }
+      }
+      return;
+    }
+    if (node.type === "ExportNamedDeclaration" && !node.source && explicitlyRequestedExports && node.specifiers?.length) {
+      for (const specifier of node.specifiers) {
+        const exportedName = getExportedName(specifier);
+        if (!exportedName || !isExplicitlyRequestedExport(exportedName)) {
+          continue;
+        }
+        const localName = getLocalExportName(specifier);
+        if (localName && !currentScope.has(localName)) {
+          checkIdentifier(localName);
+        }
+      }
+      return;
+    }
     if (node.type === "Identifier" || node.type === "JSXIdentifier" && /^[A-Z]/.test(node.name)) {
       if (!currentScope.has(node.name)) {
         checkIdentifier(node.name);

package/src/utils/react-dom-runtime-interop-plugin.d.ts

@@ -0,0 +1,5 @@
+import type { EcoBuildPlugin } from '@ecopages/core/build/build-types';
+export declare function createReactDomRuntimeInteropPlugin(options?: {
+    name?: string;
+    reactSpecifier?: string;
+}): EcoBuildPlugin;

package/src/utils/react-dom-runtime-interop-plugin.js

@@ -0,0 +1,29 @@
+import fs from "node:fs";
+import path from "node:path";
+function createReactDomRuntimeInteropPlugin(options) {
+  const reactDomFileFilter = /[\\/]react-dom[\\/].*\.js$/;
+  const reactRequirePattern = /\brequire\((['"])react\1\)/g;
+  const reactSpecifier = options?.reactSpecifier ?? "react";
+  return {
+    name: options?.name ?? "react-dom-runtime-interop",
+    setup(build) {
+      build.onLoad({ filter: reactDomFileFilter }, (args) => {
+        const content = fs.readFileSync(args.path, "utf-8");
+        if (!reactRequirePattern.test(content)) {
+          return void 0;
+        }
+        reactRequirePattern.lastIndex = 0;
+        const rewritten = content.replace(reactRequirePattern, "__ecopages_react_runtime");
+        return {
+          contents: `import * as __ecopages_react_runtime from '${reactSpecifier}';
+${rewritten}`,
+          loader: "js",
+          resolveDir: path.dirname(args.path)
+        };
+      });
+    }
+  };
+}
+export {
+  createReactDomRuntimeInteropPlugin
+};

package/src/utils/react-mdx-loader-plugin.js

@@ -1,11 +1,18 @@
 import { readFileSync } from "node:fs";
 import path from "node:path";
 import { compile } from "@mdx-js/mdx";
-import { SourceMapGenerator } from "source-map";
+import sourceMap from "source-map";
 import { VFile } from "vfile";
+function resolveCompileFormat(filePath, compilerOptions) {
+  const configuredFormat = compilerOptions?.format;
+  if (configuredFormat && configuredFormat !== "detect") {
+    return configuredFormat;
+  }
+  return path.extname(filePath).toLowerCase() === ".md" ? "mdx" : configuredFormat;
+}
 function createReactMdxLoaderPlugin(compilerOptions) {
   const mdxExtensions = compilerOptions?.mdxExtensions ?? [".mdx"];
-  const mdExtensions = compilerOptions?.mdExtensions ?? [".md"];
+  const mdExtensions = compilerOptions?.mdExtensions ?? [];
   const allExtensions = [...mdxExtensions, ...mdExtensions];
   const escapedExts = allExtensions.map((ext) => ext.replace(".", "\\."));
   const filter = new RegExp(`(${escapedExts.join("|")})(\\?.*)?$`);
@@ -18,13 +25,14 @@ function createReactMdxLoaderPlugin(compilerOptions) {
         const file = new VFile({ path: filePath, value: source });
         const compiled = await compile(file, {
           ...compilerOptions,
-          SourceMapGenerator
+          format: resolveCompileFormat(filePath, compilerOptions),
+          SourceMapGenerator: sourceMap.SourceMapGenerator
         });
-        const sourceMap = compiled.map ? `
+        const inlineSourceMap = compiled.map ? `
 //# sourceMappingURL=data:application/json;base64,${Buffer.from(JSON.stringify(compiled.map)).toString("base64")}
 ` : "";
         return {
-          contents: `${String(compiled.value)}${sourceMap}`,
+          contents: `${String(compiled.value)}${inlineSourceMap}`,
           loader: compilerOptions?.jsx ? "jsx" : "js",
           resolveDir: path.dirname(args.path)
         };

package/src/utils/react-runtime-specifier-map.d.ts

@@ -0,0 +1,6 @@
+import type { ReactRouterAdapter } from '../router-adapter.js';
+import type { ReactRuntimeImports } from '../services/react-runtime-bundle.service.js';
+export declare const REACT_RUNTIME_SPECIFIERS: readonly ["react", "react-dom", "react/jsx-runtime", "react/jsx-dev-runtime", "react-dom/client"];
+export declare function buildReactRuntimeSpecifierMap(runtimeImports: ReactRuntimeImports, routerAdapter?: ReactRouterAdapter): Record<string, string>;
+export declare function getReactRuntimeExternalSpecifiers(): string[];
+export declare function getReactClientGraphAllowSpecifiers(runtimeSpecifiers: Iterable<string>, routerAdapter?: ReactRouterAdapter): string[];

package/src/utils/react-runtime-specifier-map.js

@@ -0,0 +1,37 @@
+const REACT_RUNTIME_SPECIFIERS = [
+  "react",
+  "react-dom",
+  "react/jsx-runtime",
+  "react/jsx-dev-runtime",
+  "react-dom/client"
+];
+function buildReactRuntimeSpecifierMap(runtimeImports, routerAdapter) {
+  const map = {
+    react: runtimeImports.react,
+    "react/jsx-runtime": runtimeImports.reactJsxRuntime,
+    "react/jsx-dev-runtime": runtimeImports.reactJsxDevRuntime,
+    "react-dom": runtimeImports.reactDom,
+    "react-dom/client": runtimeImports.reactDomClient
+  };
+  if (routerAdapter && runtimeImports.router) {
+    map[routerAdapter.importMapKey] = runtimeImports.router;
+  }
+  return map;
+}
+function getReactRuntimeExternalSpecifiers() {
+  return [...REACT_RUNTIME_SPECIFIERS];
+}
+function getReactClientGraphAllowSpecifiers(runtimeSpecifiers, routerAdapter) {
+  return [
+    "@ecopages/core",
+    ...REACT_RUNTIME_SPECIFIERS,
+    ...routerAdapter ? [routerAdapter.importMapKey] : [],
+    ...Array.from(runtimeSpecifiers)
+  ];
+}
+export {
+  REACT_RUNTIME_SPECIFIERS,
+  buildReactRuntimeSpecifierMap,
+  getReactClientGraphAllowSpecifiers,
+  getReactRuntimeExternalSpecifiers
+};