@ecopages/react 0.2.0-alpha.5 → 0.2.0-alpha.51

package/src/services/react-page-payload.service.js

@@ -0,0 +1,67 @@
+import { LocalsAccessError } from "@ecopages/core/errors";
+class ReactPagePayloadService {
+  /**
+   * Creates the canonical page-props payload used by router hydration.
+   *
+   * React pages embedded in a non-React HTML shell still need to expose the same
+   * page-data contract as fully React-owned documents so navigation and hydration
+   * can read one shared document payload consistently.
+   */
+  buildRouterPageDataScript(pageProps) {
+    const safeJson = JSON.stringify(pageProps || {}).replace(/</g, "\\u003c");
+    return `<script id="__ECO_PAGE_DATA__" type="application/json">${safeJson}<\/script>`;
+  }
+  /**
+   * Builds the serialized page-props payload embedded into the final HTML.
+   *
+   * The document payload is intentionally narrower than the full server render
+   * input: only routing data, public page props, and explicitly allowed locals are
+   * exposed to the browser.
+   */
+  buildSerializedPageProps(options) {
+    return {
+      ...options.pageProps,
+      params: options.params,
+      query: options.query,
+      ...options.safeLocals && { locals: options.safeLocals }
+    };
+  }
+  /**
+   * Safely extracts the declared subset of locals for client-side hydration.
+   *
+   * On dynamic pages with `cache: 'dynamic'`, middleware populates `locals` with
+   * request-scoped data (e.g., session). Only keys explicitly declared via
+   * `Page.requires` are serialized to the client so sensitive request-only data
+   * is not leaked into hydration payloads by default.
+   *
+   * On static pages, `locals` is a Proxy that throws `LocalsAccessError` on access
+   * to prevent accidental use. This method safely detects that case and returns
+   * `undefined` instead of throwing.
+   */
+  getSerializableLocals(locals, requiredLocals) {
+    try {
+      if (!locals) {
+        return void 0;
+      }
+      const requiredKeys = requiredLocals ? Array.isArray(requiredLocals) ? requiredLocals : [requiredLocals] : [];
+      if (requiredKeys.length === 0) {
+        return void 0;
+      }
+      const serializedLocals = Object.fromEntries(
+        requiredKeys.filter((key) => Object.prototype.hasOwnProperty.call(locals, key)).map((key) => [key, locals[key]])
+      );
+      if (Object.keys(serializedLocals).length > 0) {
+        return serializedLocals;
+      }
+      return void 0;
+    } catch (error) {
+      if (error instanceof LocalsAccessError) {
+        return void 0;
+      }
+      throw error;
+    }
+  }
+}
+export {
+  ReactPagePayloadService
+};

package/src/services/react-runtime-bundle.service.d.ts

@@ -2,37 +2,44 @@
  * Runtime bundle service for React integration.
  *
  * Owns creation of the browser runtime assets for React and React DOM,
- * including temporary entry generation, specifier mapping, and React DOM
- * interop rewriting.
+ * including shared runtime entry generation and specifier mapping.
  *
  * @module
  */
-import type { EcoBuildPlugin } from '@ecopages/core/build/build-types';
+import type { EcoBuildPlugin } from '@ecopages/core/plugins/integration-plugin';
 import { type AssetDefinition } from '@ecopages/core/services/asset-processing-service';
 import type { ReactRouterAdapter } from '../router-adapter.js';
+import { type BrowserRuntimeManifest } from '@ecopages/core/build/browser-runtime-manifest';
 export type ReactRuntimeImports = {
     react: string;
     reactDomClient: string;
     reactJsxRuntime: string;
     reactJsxDevRuntime: string;
     reactDom: string;
+    useSyncExternalStoreWithSelector: string;
     router?: string;
 };
 export interface ReactRuntimeBundleServiceConfig {
     routerAdapter?: ReactRouterAdapter;
+    rootDir?: string;
 }
+type RuntimeMode = 'development' | 'production';
 export declare class ReactRuntimeBundleService {
     private readonly config;
     constructor(config: ReactRuntimeBundleServiceConfig);
-    getRuntimeImports(): ReactRuntimeImports;
-    getSpecifierMap(): Record<string, string>;
+    setRootDir(rootDir: string | undefined): void;
+    private get isDevelopment();
+    private getCurrentRuntimeMode;
+    private createRuntimeDefines;
+    private getReactVendorFileName;
+    private getReactDomVendorFileName;
+    private getRouterVendorFileName;
+    private getUseSyncExternalStoreWithSelectorVendorFileName;
+    private createReactVendorImportRewritePlugin;
+    getRuntimeImports(mode?: RuntimeMode): ReactRuntimeImports;
+    getRuntimeAliasMap(mode?: RuntimeMode): Record<string, string>;
+    getRuntimeManifest(mode?: RuntimeMode): BrowserRuntimeManifest;
     getDependencies(): AssetDefinition[];
-    createRuntimeAliasPlugin(): EcoBuildPlugin;
-    private buildImportMapSourceUrl;
-    private createRuntimeSpecifierAliasPlugin;
-    private createReactDomRuntimeInteropPlugin;
-    private getRuntimeArtifactsDir;
-    private createRuntimeEntry;
-    private getModuleExportNames;
-    private isValidExportName;
+    createRuntimeAliasPlugin(mode?: RuntimeMode): EcoBuildPlugin;
 }
+export {};

package/src/services/react-runtime-bundle.service.js

@@ -1,205 +1,172 @@
-import fs from "node:fs";
-import path from "node:path";
-import { createRequire } from "node:module";
-import { AssetFactory } from "@ecopages/core/services/asset-processing-service";
+import {
+  createBrowserRuntimeImportRewritePlugin,
+  DEFAULT_BROWSER_RUNTIME_IMPORT_REWRITE_PLUGIN_NAME
+} from "@ecopages/core/build/browser-runtime-import-rewrite-plugin";
+import { createRuntimeSpecifierAliasPlugin } from "@ecopages/core/build/runtime-specifier-alias-plugin";
+import {
+  buildBrowserRuntimeAssetUrl,
+  createBrowserRuntimeModuleAsset,
+  createBrowserRuntimeScriptAsset
+} from "@ecopages/core/services/asset-processing-service";
+import { createReactDomRuntimeInteropPlugin } from "../utils/react-dom-runtime-interop-plugin.js";
+import { buildReactRuntimeAliasMap, buildReactRuntimeManifest } from "../utils/react-runtime-alias-map.js";
+import {
+  createBrowserRuntimeManifest
+} from "@ecopages/core/build/browser-runtime-manifest";
 class ReactRuntimeBundleService {
+  config;
   constructor(config) {
     this.config = config;
   }
-  getRuntimeImports() {
+  setRootDir(rootDir) {
+    this.config.rootDir = rootDir;
+  }
+  get isDevelopment() {
+    return process.env.NODE_ENV === "development";
+  }
+  getCurrentRuntimeMode() {
+    return this.isDevelopment ? "development" : "production";
+  }
+  createRuntimeDefines(mode) {
+    const nodeEnv = JSON.stringify(mode);
+    return {
+      "process.env.NODE_ENV": nodeEnv,
+      "import.meta.env.NODE_ENV": nodeEnv
+    };
+  }
+  getReactVendorFileName(mode) {
+    return mode === "development" ? "react.development.js" : "react.js";
+  }
+  getReactDomVendorFileName(mode) {
+    return mode === "development" ? "react-dom.development.js" : "react-dom.js";
+  }
+  getRouterVendorFileName(mode) {
+    if (!this.config.routerAdapter) {
+      return "";
+    }
+    return mode === "development" ? `${this.config.routerAdapter.bundle.outputName}.development.js` : `${this.config.routerAdapter.bundle.outputName}.js`;
+  }
+  getUseSyncExternalStoreWithSelectorVendorFileName(mode) {
+    return mode === "development" ? "use-sync-external-store-with-selector.development.js" : "use-sync-external-store-with-selector.js";
+  }
+  createReactVendorImportRewritePlugin(mode) {
+    return createBrowserRuntimeImportRewritePlugin({
+      name: `react-plugin-vendor-runtime-import-rewrite-${mode}`,
+      manifest: createBrowserRuntimeManifest([
+        {
+          specifier: "react",
+          owner: "@ecopages/react",
+          importPath: "react",
+          publicPath: buildBrowserRuntimeAssetUrl(this.getReactVendorFileName(mode))
+        }
+      ])
+    });
+  }
+  getRuntimeImports(mode = this.getCurrentRuntimeMode()) {
+    const reactVendorFileName = this.getReactVendorFileName(mode);
+    const reactDomVendorFileName = this.getReactDomVendorFileName(mode);
     const runtimeImports = {
-      react: this.buildImportMapSourceUrl("react.js"),
-      reactDomClient: this.buildImportMapSourceUrl("react-dom.js"),
-      reactJsxRuntime: this.buildImportMapSourceUrl("react.js"),
-      reactJsxDevRuntime: this.buildImportMapSourceUrl("react.js"),
-      reactDom: this.buildImportMapSourceUrl("react-dom.js")
+      react: buildBrowserRuntimeAssetUrl(reactVendorFileName),
+      reactDomClient: buildBrowserRuntimeAssetUrl(reactDomVendorFileName),
+      reactJsxRuntime: buildBrowserRuntimeAssetUrl(reactVendorFileName),
+      reactJsxDevRuntime: buildBrowserRuntimeAssetUrl(reactVendorFileName),
+      reactDom: buildBrowserRuntimeAssetUrl(reactDomVendorFileName),
+      useSyncExternalStoreWithSelector: buildBrowserRuntimeAssetUrl(
+        this.getUseSyncExternalStoreWithSelectorVendorFileName(mode)
+      )
     };
     if (this.config.routerAdapter) {
-      runtimeImports.router = this.buildImportMapSourceUrl(`${this.config.routerAdapter.bundle.outputName}.js`);
+      runtimeImports.router = buildBrowserRuntimeAssetUrl(this.getRouterVendorFileName(mode));
     }
     return runtimeImports;
   }
-  getSpecifierMap() {
-    const runtimeImports = this.getRuntimeImports();
-    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 (this.config.routerAdapter && runtimeImports.router) {
-      map[this.config.routerAdapter.importMapKey] = runtimeImports.router;
-    }
-    return map;
+  getRuntimeAliasMap(mode = this.getCurrentRuntimeMode()) {
+    return buildReactRuntimeAliasMap(this.getRuntimeImports(mode));
+  }
+  getRuntimeManifest(mode = this.getCurrentRuntimeMode()) {
+    return buildReactRuntimeManifest(this.getRuntimeImports(mode));
   }
   getDependencies() {
-    const runtimeAttrs = { type: "module", defer: "" };
-    const runtimeImports = this.getRuntimeImports();
-    const reactRuntimeAliasPlugin = this.createRuntimeSpecifierAliasPlugin({
-      react: runtimeImports.react
-    });
-    const reactDomRuntimeInteropPlugin = this.createReactDomRuntimeInteropPlugin();
-    const reactEntry = this.createRuntimeEntry(
-      [
-        { specifier: "react", defaultExport: true },
-        { specifier: "react/jsx-runtime" },
-        { specifier: "react/jsx-dev-runtime" }
-      ],
-      "react-entry.mjs"
-    );
-    const reactDomEntry = this.createRuntimeEntry(
-      [{ specifier: "react-dom", defaultExport: true }, { specifier: "react-dom/client" }],
-      "react-dom-entry.mjs"
-    );
-    const dependencies = [
-      AssetFactory.createNodeModuleScript({
-        position: "head",
-        importPath: reactEntry,
-        name: "react",
-        excludeFromHtml: true,
-        bundleOptions: { naming: "react.js" },
-        attributes: runtimeAttrs
-      }),
-      AssetFactory.createNodeModuleScript({
-        position: "head",
-        importPath: reactDomEntry,
-        name: "react-dom",
-        excludeFromHtml: true,
-        bundleOptions: {
-          naming: "react-dom.js",
-          plugins: [reactRuntimeAliasPlugin, reactDomRuntimeInteropPlugin]
+    const dependencies = [];
+    for (const mode of ["production", "development"]) {
+      const reactVendorImportRewritePlugin = this.createReactVendorImportRewritePlugin(mode);
+      const reactDomRuntimeInteropPlugin = createReactDomRuntimeInteropPlugin({
+        reactSpecifier: buildBrowserRuntimeAssetUrl(this.getReactVendorFileName(mode))
+      });
+      const reactRuntimeAliasPlugin = createRuntimeSpecifierAliasPlugin(
+        {
+          react: buildBrowserRuntimeAssetUrl(this.getReactVendorFileName(mode))
         },
-        attributes: runtimeAttrs
-      })
-    ];
-    if (this.config.routerAdapter) {
-      const runtimeAliasPlugin = this.createRuntimeAliasPlugin();
-      const mappedSpecifiers = new Set(Object.keys(this.getSpecifierMap()));
-      const unresolvedExternals = this.config.routerAdapter.bundle.externals.filter(
-        (external) => !mappedSpecifiers.has(external)
+        { name: `react-plugin-runtime-specifier-alias-${mode}` }
+      );
+      const reactDomBundlePlugins = [reactRuntimeAliasPlugin, reactDomRuntimeInteropPlugin].filter(
+        (plugin) => plugin !== null
       );
+      const runtimeAliasPlugin = this.createRuntimeAliasPlugin(mode);
+      const mappedSpecifiers = new Set(Object.keys(this.getRuntimeAliasMap(mode)));
       dependencies.push(
-        AssetFactory.createNodeModuleScript({
-          position: "head",
-          importPath: this.config.routerAdapter.bundle.importPath,
-          name: this.config.routerAdapter.bundle.outputName,
-          excludeFromHtml: true,
+        createBrowserRuntimeModuleAsset({
+          modules: [
+            { specifier: "react", defaultExport: true },
+            { specifier: "react/jsx-runtime" },
+            { specifier: "react/jsx-dev-runtime" }
+          ],
+          name: "react",
+          fileName: this.getReactVendorFileName(mode),
+          cacheDirName: `ecopages-react-runtime-${mode}`,
+          rootDir: this.config.rootDir,
           bundleOptions: {
-            naming: `${this.config.routerAdapter.bundle.outputName}.js`,
-            external: unresolvedExternals,
-            plugins: [runtimeAliasPlugin]
-          },
-          attributes: runtimeAttrs
-        })
-      );
-    }
-    return dependencies;
-  }
-  createRuntimeAliasPlugin() {
-    const specifierMap = this.getSpecifierMap();
-    const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const filter = new RegExp(
-      `^(${Object.keys(specifierMap).map((key) => escapeRegExp(key)).join("|")})$`
-    );
-    return {
-      name: "react-plugin-runtime-alias",
-      setup(build) {
-        build.onResolve({ filter }, (args) => {
-          const mappedPath = specifierMap[args.path];
-          if (!mappedPath) {
-            return void 0;
+            define: this.createRuntimeDefines(mode),
+            excludeAppBuildPlugins: [DEFAULT_BROWSER_RUNTIME_IMPORT_REWRITE_PLUGIN_NAME]
           }
-          return {
-            path: mappedPath,
-            external: true
-          };
-        });
-      }
-    };
-  }
-  buildImportMapSourceUrl(fileName) {
-    return `/${AssetFactory.RESOLVED_ASSETS_VENDORS_DIR}/${fileName}`;
-  }
-  createRuntimeSpecifierAliasPlugin(specifierMap, external = true) {
-    const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const filter = new RegExp(
-      `^(${Object.keys(specifierMap).map((key) => escapeRegExp(key)).join("|")})$`
-    );
-    return {
-      name: "react-plugin-runtime-specifier-alias",
-      setup(build) {
-        build.onResolve({ filter }, (args) => {
-          const mappedPath = specifierMap[args.path];
-          if (!mappedPath) {
-            return void 0;
+        }),
+        createBrowserRuntimeModuleAsset({
+          modules: [{ specifier: "react-dom", defaultExport: true }, { specifier: "react-dom/client" }],
+          name: "react-dom",
+          fileName: this.getReactDomVendorFileName(mode),
+          cacheDirName: `ecopages-react-runtime-${mode}`,
+          rootDir: this.config.rootDir,
+          bundleOptions: {
+            define: this.createRuntimeDefines(mode),
+            excludeAppBuildPlugins: [DEFAULT_BROWSER_RUNTIME_IMPORT_REWRITE_PLUGIN_NAME],
+            plugins: reactDomBundlePlugins
           }
-          return {
-            path: mappedPath,
-            external
-          };
-        });
-      }
-    };
-  }
-  createReactDomRuntimeInteropPlugin() {
-    const reactDomFileFilter = /[\\/]react-dom[\\/].*\.js$/;
-    const reactRequirePattern = /\brequire\((['"])react\1\)/g;
-    return {
-      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;
+        }),
+        createBrowserRuntimeScriptAsset({
+          importPath: "@ecopages/react/runtime/use-sync-external-store-with-selector",
+          name: "use-sync-external-store-with-selector",
+          fileName: this.getUseSyncExternalStoreWithSelectorVendorFileName(mode),
+          bundleOptions: {
+            define: this.createRuntimeDefines(mode),
+            excludeAppBuildPlugins: [DEFAULT_BROWSER_RUNTIME_IMPORT_REWRITE_PLUGIN_NAME],
+            plugins: [reactVendorImportRewritePlugin]
           }
-          reactRequirePattern.lastIndex = 0;
-          const rewritten = content.replace(reactRequirePattern, "__ecopages_react_runtime");
-          return {
-            contents: `import * as __ecopages_react_runtime from 'react';
-${rewritten}`,
-            loader: "js",
-            resolveDir: path.dirname(args.path)
-          };
-        });
-      }
-    };
-  }
-  getRuntimeArtifactsDir() {
-    const tmpDir = path.join(process.cwd(), "node_modules", ".cache", "ecopages-react-runtime");
-    fs.mkdirSync(tmpDir, { recursive: true });
-    return tmpDir;
-  }
-  createRuntimeEntry(modules, fileName) {
-    const tmpDir = this.getRuntimeArtifactsDir();
-    const requireFromRoot = createRequire(path.join(process.cwd(), "package.json"));
-    const seenExports = /* @__PURE__ */ new Set();
-    const statements = [];
-    for (const module of modules) {
-      if (module.defaultExport) {
-        statements.push(`import __ecopages_default_export__ from '${module.specifier}';`);
-        statements.push("export default __ecopages_default_export__;");
-      }
-      const exportNames = this.getModuleExportNames(module.specifier, requireFromRoot).filter(
-        (name) => !seenExports.has(name)
+        })
       );
-      if (exportNames.length > 0) {
-        statements.push(`export { ${exportNames.join(", ")} } from '${module.specifier}';`);
-        for (const exportName of exportNames) {
-          seenExports.add(exportName);
-        }
+      if (this.config.routerAdapter) {
+        const unresolvedExternals = this.config.routerAdapter.bundle.externals.filter(
+          (external) => !mappedSpecifiers.has(external)
+        );
+        dependencies.push(
+          createBrowserRuntimeScriptAsset({
+            importPath: this.config.routerAdapter.bundle.importPath,
+            name: this.config.routerAdapter.bundle.outputName,
+            fileName: this.getRouterVendorFileName(mode),
+            bundleOptions: {
+              define: this.createRuntimeDefines(mode),
+              external: unresolvedExternals,
+              plugins: [runtimeAliasPlugin]
+            }
+          })
+        );
       }
     }
-    const filePath = path.join(tmpDir, fileName);
-    fs.writeFileSync(filePath, statements.join("\n"), "utf-8");
-    return filePath;
-  }
-  getModuleExportNames(specifier, requireFromRoot) {
-    const moduleExports = requireFromRoot(specifier);
-    return Object.keys(moduleExports).filter((name) => name !== "__esModule" && name !== "default").filter((name) => this.isValidExportName(name)).sort();
+    return dependencies;
   }
-  isValidExportName(name) {
-    return /^[$A-Z_a-z][$\w]*$/.test(name);
+  createRuntimeAliasPlugin(mode = this.getCurrentRuntimeMode()) {
+    return createRuntimeSpecifierAliasPlugin(this.getRuntimeAliasMap(mode), {
+      name: `react-plugin-runtime-alias-${mode}`
+    });
   }
 }
 export {

package/src/utils/client-graph-boundary-plugin.d.ts

@@ -14,7 +14,7 @@
  * Additionally, this plugin provides a build-time transform that statically resolves and
  * inlines `fs.readFileSync(path.resolve(...))` calls to prevent server/client data mismatches.
  */
-import type { EcoBuildPlugin } from '@ecopages/core/build/build-types';
+import type { EcoBuildPlugin } from '@ecopages/core/plugins/integration-plugin';
 /**
  * Configuration options for the Client Graph Boundary esbuild plugin.
  *

package/src/utils/client-graph-boundary-plugin.js

@@ -1,8 +1,16 @@
 import { existsSync, readFileSync } from "node:fs";
 import { dirname, extname, resolve } from "node:path";
 import { parseSync } from "oxc-parser";
-import { analyzeReachability } from "./reachability-analyzer";
+import { analyzeReachability } from "./reachability-analyzer.js";
 const SOURCE_FILE_FILTER = /\.(tsx?|jsx?)$/;
+const SERVER_ONLY_ECO_PAGE_OPTION_KEYS = /* @__PURE__ */ new Set([
+  "cache",
+  "middleware",
+  "requires",
+  "metadata",
+  "staticProps",
+  "staticPaths"
+]);
 function isBareSpecifier(specifier) {
   if (specifier.startsWith(".")) return false;
   if (specifier.startsWith("/")) return false;
@@ -86,6 +94,62 @@ function parserLanguageForFile(filename) {
   if (extension === ".jsx") return "jsx";
   return "js";
 }
+function getObjectPropertyKeyName(node) {
+  if (!node) return void 0;
+  if (node.type === "Identifier") return node.name;
+  if (node.type === "StringLiteral" || node.type === "Literal") {
+    return typeof node.value === "string" ? node.value : void 0;
+  }
+  return void 0;
+}
+function stripServerOnlyEcoPageOptions(source, program) {
+  const edits = [];
+  function walk(node) {
+    if (!node || typeof node !== "object") return;
+    if (Array.isArray(node)) {
+      for (const child of node) walk(child);
+      return;
+    }
+    if (node.type === "CallExpression" && node.callee?.type === "MemberExpression" && node.callee.object?.type === "Identifier" && node.callee.object.name === "eco" && node.callee.property?.type === "Identifier" && node.callee.property.name === "page" && node.arguments?.[0]?.type === "ObjectExpression") {
+      const objectExpression = node.arguments[0];
+      const keptProperties = [];
+      let removedProperty = false;
+      for (const property of objectExpression.properties ?? []) {
+        if (property?.type === "Property") {
+          const keyName = getObjectPropertyKeyName(property.key);
+          if (keyName && SERVER_ONLY_ECO_PAGE_OPTION_KEYS.has(keyName)) {
+            removedProperty = true;
+            continue;
+          }
+        }
+        keptProperties.push(source.slice(property.start, property.end));
+      }
+      if (removedProperty) {
+        const replacement = keptProperties.length > 0 ? `{ ${keptProperties.join(", ")} }` : "{}";
+        edits.push({
+          start: objectExpression.start,
+          end: objectExpression.end,
+          replacement
+        });
+      }
+    }
+    for (const key in node) {
+      if (key !== "type" && key !== "start" && key !== "end") {
+        walk(node[key]);
+      }
+    }
+  }
+  walk(program);
+  if (edits.length === 0) {
+    return { transformed: source, modified: false };
+  }
+  edits.sort((a, b) => b.start - a.start);
+  let transformed = source;
+  for (const edit of edits) {
+    transformed = transformed.slice(0, edit.start) + edit.replacement + transformed.slice(edit.end);
+  }
+  return { transformed, modified: true };
+}
 function normalizeRequestedExportsKey(pathname) {
   let normalized = pathname.replace(/\\/g, "/");
   normalized = normalized.replace(/\.(tsx?|jsx?)$/i, "");
@@ -341,13 +405,26 @@ function transformModuleImports(source, filename, globallyAllowed, requestedExpo
   }
   walkImports(program);
   if (edits.length === 0) {
-    return { transformed: source, modified: false };
+    return stripServerOnlyEcoPageOptions(source, program);
   }
   edits.sort((a, b) => b.start - a.start);
   let transformed = source;
   for (const edit of edits) {
     transformed = transformed.slice(0, edit.start) + edit.replacement + transformed.slice(edit.end);
   }
+  let reparsedResult;
+  try {
+    reparsedResult = parseSync(filename, transformed, {
+      sourceType: "module",
+      lang: parserLanguageForFile(filename)
+    });
+  } catch {
+    return { transformed, modified: true };
+  }
+  const strippedPageOptions = stripServerOnlyEcoPageOptions(transformed, reparsedResult.program);
+  if (strippedPageOptions.modified) {
+    return strippedPageOptions;
+  }
   return { transformed, modified: true };
 }
 function createClientGraphBoundaryPlugin(options) {
@@ -407,7 +484,7 @@ function createClientGraphBoundaryPlugin(options) {
         }
         if (!modified) return void 0;
         const ext = extname(args.path).slice(1);
-        return { contents: transformed, loader: ext };
+        return { contents: transformed, loader: ext, resolveDir: dirname(args.path) };
       });
     }
   };

package/src/utils/component-config-traversal.d.ts

@@ -0,0 +1,36 @@
+import type { EcoComponent, EcoComponentConfig } from '@ecopages/core';
+/**
+ * Walks a component config tree once, including nested layout configs and
+ * dependency component configs.
+ *
+ * The shared React integration code performs several different analyses over the
+ * same config graph. Centralizing the traversal keeps cycle handling and graph
+ * shape assumptions in one place instead of repeating them in the renderer and
+ * services.
+ */
+export declare function walkConfigTree(config: EcoComponentConfig | undefined, visitor: (config: EcoComponentConfig) => void, visited?: Set<EcoComponentConfig>): void;
+/**
+ * Walks a forest of root component configs using one shared visited set.
+ *
+ * This is useful when a page contributes multiple config roots, such as a page
+ * config plus a resolved layout config, and duplicate nested nodes should still
+ * be processed only once.
+ */
+export declare function walkConfigForest(configs: Iterable<EcoComponentConfig | undefined>, visitor: (config: EcoComponentConfig) => void): void;
+/**
+ * Collects values from a config tree while preserving the shared traversal and
+ * cycle protection behavior used across the React integration.
+ */
+export declare function collectFromConfigTree<T>(config: EcoComponentConfig | undefined, collector: (config: EcoComponentConfig) => T[]): T[];
+/**
+ * Collects values from multiple config roots with one shared visited set.
+ */
+export declare function collectFromConfigForest<T>(configs: Iterable<EcoComponentConfig | undefined>, collector: (config: EcoComponentConfig) => T[]): T[];
+/**
+ * Returns true when any node in the config tree matches the predicate.
+ */
+export declare function someInConfigTree(config: EcoComponentConfig | undefined, predicate: (config: EcoComponentConfig) => boolean): boolean;
+/**
+ * Reads config roots from partial components while tolerating undefined config.
+ */
+export declare function getComponentConfigs(components: Partial<EcoComponent>[]): Array<EcoComponentConfig | undefined>;