@ecopages/react 0.2.0-alpha.1 → 0.2.0-alpha.10

package/src/react.plugin.js

@@ -15,15 +15,21 @@ class ReactPlugin extends IntegrationPlugin {
   mdxLoaderPlugin;
   runtimeBundleService;
   hmrPageMetadataCache = new ReactHmrPageMetadataCache();
+  runtimeDependenciesInitialized = false;
   /**
    * Indicates whether React explicit graph mode is enabled for renderer/HMR behavior.
    */
   explicitGraphEnabled;
   constructor(options) {
-    const extensions = [".tsx"];
+    const { extensions: _ignoredExtensions, ...restOptions } = options ?? {};
+    const extensions = [...options?.extensions ?? [".tsx"]];
     const mdxExtensions = options?.mdx?.extensions ?? [".mdx"];
     if (options?.mdx?.enabled) {
-      extensions.push(...mdxExtensions);
+      for (const extension of mdxExtensions) {
+        if (!extensions.includes(extension)) {
+          extensions.push(extension);
+        }
+      }
     } else if (options?.mdx?.extensions?.length) {
       appLogger.warn(
         "MDX extensions provided but MDX is disabled. MDX files will not be processed. Set mdx.enabled to true to enable MDX support."
@@ -32,7 +38,7 @@ class ReactPlugin extends IntegrationPlugin {
     super({
       name: PLUGIN_NAME,
       extensions,
-      ...options
+      ...restOptions
     });
     this.mdxEnabled = options?.mdx?.enabled ?? false;
     this.mdxExtensions = mdxExtensions;
@@ -59,7 +65,13 @@ class ReactPlugin extends IntegrationPlugin {
     ReactRenderer.mdxExtensions = this.mdxExtensions;
     ReactRenderer.explicitGraphEnabled = this.explicitGraphEnabled;
     ReactRenderer.hmrPageMetadataCache = this.hmrPageMetadataCache;
+  }
+  ensureRuntimeDependencies() {
+    if (this.runtimeDependenciesInitialized) {
+      return;
+    }
     this.integrationDependencies.unshift(...this.runtimeBundleService.getDependencies());
+    this.runtimeDependenciesInitialized = true;
   }
   get plugins() {
     if (this.mdxLoaderPlugin) {
@@ -67,11 +79,32 @@ class ReactPlugin extends IntegrationPlugin {
     }
     return [];
   }
-  async setup() {
-    if (this.mdxEnabled && this.mdxCompilerOptions) {
-      const { createReactMdxLoaderPlugin } = await import("./utils/react-mdx-loader-plugin.js");
-      this.mdxLoaderPlugin = createReactMdxLoaderPlugin(this.mdxCompilerOptions);
+  /**
+   * Ensures the optional React MDX loader exists before either config-time
+   * manifest sealing or runtime setup needs it.
+   */
+  async ensureMdxLoaderPlugin() {
+    if (!this.mdxEnabled || !this.mdxCompilerOptions || this.mdxLoaderPlugin) {
+      return;
     }
+    const { createReactMdxLoaderPlugin } = await import("./utils/react-mdx-loader-plugin.js");
+    this.mdxLoaderPlugin = createReactMdxLoaderPlugin(this.mdxCompilerOptions);
+  }
+  /**
+   * Prepares React's build-facing loader contributions before config build seals
+   * the app manifest.
+   */
+  async prepareBuildContributions() {
+    this.ensureRuntimeDependencies();
+    await this.ensureMdxLoaderPlugin();
+  }
+  /**
+   * Performs runtime-only React setup after build contributions are already
+   * materialized.
+   */
+  async setup() {
+    this.ensureRuntimeDependencies();
+    await this.ensureMdxLoaderPlugin();
     await super.setup();
   }
   /**
@@ -92,15 +125,13 @@ class ReactPlugin extends IntegrationPlugin {
       context,
       this.hmrPageMetadataCache,
       this.mdxCompilerOptions,
+      this.extensions,
+      this.appConfig.templatesExt,
       this.explicitGraphEnabled
     );
   }
-  /**
-   * Override to register React-specific specifier mappings for HMR.
-   */
-  setHmrManager(hmrManager) {
-    super.setHmrManager(hmrManager);
-    hmrManager.registerSpecifierMap(this.runtimeBundleService.getSpecifierMap());
+  getRuntimeSpecifierMap() {
+    return this.runtimeBundleService.getSpecifierMap();
   }
   /**
    * Declares React's boundary deferral rule for cross-integration rendering.

package/src/router-adapter.d.ts

@@ -46,13 +46,13 @@ export interface ReactRouterAdapter {
         outputName: string;
         /**
          * Packages to externalize when bundling.
-         * These should be available via import map.
+         * These should be available through the runtime bare-specifier map.
          * @example ['react', 'react-dom', 'react/jsx-runtime']
          */
         externals: string[];
     };
     /**
-     * Bare specifier for the import map entry.
+     * Bare specifier for the runtime mapping entry.
      * This is what the hydration script will import from.
      * @example '@ecopages/react-router'
      */

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

@@ -21,8 +21,8 @@ export interface ReactBundleServiceConfig {
  * Manages esbuild bundle configuration and plugin creation for React page/component builds.
  */
 export declare class ReactBundleService {
-    private readonly config;
     private readonly runtimeBundleService;
+    private readonly config;
     constructor(config: ReactBundleServiceConfig);
     /**
      * Returns resolved runtime import paths for the React runtime.
@@ -41,28 +41,5 @@ export declare class ReactBundleService {
      * Creates the esbuild plugin that rewrites bare React specifiers
      * to their runtime asset URLs.
      */
-    createRuntimeAliasPlugin(runtimeImports: ReactRuntimeImports): {
-        name: string;
-        setup(build: {
-            onResolve: (options: {
-                filter: RegExp;
-                namespace?: string;
-            }, callback: (args: {
-                path: string;
-                importer: string;
-                namespace: string;
-            }) => {
-                path?: string;
-                namespace?: string;
-                external?: boolean;
-            } | undefined) => void;
-        }): void;
-    };
-    /**
-     * Creates the esbuild plugin that shims `use-sync-external-store/shim`
-     * to re-export from React's built-in `useSyncExternalStore`.
-     * This is needed because some packages use `use-sync-external-store/shim`
-     * but React 18+ has built-in `useSyncExternalStore`.
-     */
-    private createSyncExternalStorePlugin;
+    createRuntimeAliasPlugin(runtimeSpecifierMap: Record<string, string>): import("packages/core/src/build/build-types.ts").EcoBuildPlugin | null;
 }

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

@@ -1,13 +1,21 @@
 import { createClientGraphBoundaryPlugin } from "../utils/client-graph-boundary-plugin.js";
+import {
+  buildReactRuntimeSpecifierMap,
+  getReactClientGraphAllowSpecifiers,
+  getReactRuntimeExternalSpecifiers
+} from "../utils/react-runtime-specifier-map.js";
+import { createUseSyncExternalStoreShimPlugin } from "../utils/use-sync-external-store-shim-plugin.js";
+import { createRuntimeSpecifierAliasPlugin } from "@ecopages/core/build/runtime-specifier-alias-plugin";
 import { ReactRuntimeBundleService } from "./react-runtime-bundle.service.js";
 class ReactBundleService {
+  runtimeBundleService;
+  config;
   constructor(config) {
     this.config = config;
     this.runtimeBundleService = new ReactRuntimeBundleService({
       routerAdapter: config.routerAdapter
     });
   }
-  runtimeBundleService;
   /**
    * Returns resolved runtime import paths for the React runtime.
    */
@@ -24,8 +32,9 @@ class ReactBundleService {
    */
   async createBundleOptions(componentName, isMdx, declaredModules) {
     const runtimeImports = this.getRuntimeImports();
+    const runtimeSpecifierMap = buildReactRuntimeSpecifierMap(runtimeImports, this.config.routerAdapter);
     const options = {
-      external: ["react", "react-dom", "react/jsx-runtime", "react/jsx-dev-runtime", "react-dom/client"],
+      external: getReactRuntimeExternalSpecifiers(),
       mainFields: ["module", "browser", "main"],
       naming: `${componentName}.[ext]`,
       ...import.meta.env?.NODE_ENV === "production" && {
@@ -37,24 +46,19 @@ class ReactBundleService {
     const graphBoundaryPlugin = createClientGraphBoundaryPlugin({
       absWorkingDir: this.config.rootDir,
       declaredModules,
-      alwaysAllowSpecifiers: [
-        "@ecopages/core",
-        "react",
-        "react-dom",
-        "react/jsx-runtime",
-        "react/jsx-dev-runtime",
-        "react-dom/client",
-        ...this.config.routerAdapter ? [this.config.routerAdapter.importMapKey] : []
-      ]
+      alwaysAllowSpecifiers: getReactClientGraphAllowSpecifiers([], this.config.routerAdapter)
+    });
+    const runtimeAliasPlugin = this.createRuntimeAliasPlugin(runtimeSpecifierMap);
+    const useSyncExternalStoreShimPlugin = createUseSyncExternalStoreShimPlugin({
+      name: "react-renderer-use-sync-external-store-shim",
+      namespace: "ecopages-react-renderer-shim"
     });
-    const runtimeAliasPlugin = this.createRuntimeAliasPlugin(runtimeImports);
-    const useSyncExternalStoreShimPlugin = this.createSyncExternalStorePlugin();
     if (isMdx && this.config.mdxCompilerOptions) {
       const { createReactMdxLoaderPlugin } = await import("../utils/react-mdx-loader-plugin.js");
       const mdxPlugin = createReactMdxLoaderPlugin(this.config.mdxCompilerOptions);
-      options.plugins = [runtimeAliasPlugin, mdxPlugin, useSyncExternalStoreShimPlugin, graphBoundaryPlugin];
+      options.plugins = [graphBoundaryPlugin, runtimeAliasPlugin, mdxPlugin, useSyncExternalStoreShimPlugin];
     } else {
-      options.plugins = [runtimeAliasPlugin, useSyncExternalStoreShimPlugin, graphBoundaryPlugin];
+      options.plugins = [graphBoundaryPlugin, runtimeAliasPlugin, useSyncExternalStoreShimPlugin];
     }
     return options;
   }
@@ -62,82 +66,8 @@ class ReactBundleService {
    * Creates the esbuild plugin that rewrites bare React specifiers
    * to their runtime asset URLs.
    */
-  createRuntimeAliasPlugin(runtimeImports) {
-    const aliases = /* @__PURE__ */ new Map([
-      ["react", runtimeImports.react],
-      ["react-dom/client", runtimeImports.reactDomClient],
-      ["react/jsx-runtime", runtimeImports.reactJsxRuntime],
-      ["react/jsx-dev-runtime", runtimeImports.reactJsxDevRuntime],
-      ["react-dom", runtimeImports.reactDom]
-    ]);
-    if (this.config.routerAdapter && runtimeImports.router) {
-      aliases.set(this.config.routerAdapter.importMapKey, runtimeImports.router);
-    }
-    const escapeRegExp = (value) => value.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
-    const pattern = new RegExp(
-      `^(${Array.from(aliases.keys()).map((key) => escapeRegExp(key)).join("|")})$`
-    );
-    return {
-      name: "react-runtime-import-alias",
-      setup(build) {
-        build.onResolve({ filter: pattern }, (args) => {
-          const mappedPath = aliases.get(args.path);
-          if (!mappedPath) {
-            return void 0;
-          }
-          return {
-            path: mappedPath,
-            external: true
-          };
-        });
-      }
-    };
-  }
-  /**
-   * Creates the esbuild plugin that shims `use-sync-external-store/shim`
-   * to re-export from React's built-in `useSyncExternalStore`.
-   * This is needed because some packages use `use-sync-external-store/shim`
-   * but React 18+ has built-in `useSyncExternalStore`.
-   */
-  createSyncExternalStorePlugin() {
-    return {
-      name: "react-renderer-use-sync-external-store-shim",
-      setup(build) {
-        build.onResolve({ filter: /^use-sync-external-store\/shim(?:\/index\.js)?$/ }, () => ({
-          path: "use-sync-external-store/shim",
-          namespace: "ecopages-react-renderer-shim"
-        }));
-        build.onLoad(
-          { filter: /^use-sync-external-store\/shim$/, namespace: "ecopages-react-renderer-shim" },
-          () => ({
-            contents: "export { useSyncExternalStore } from 'react';",
-            loader: "js"
-          })
-        );
-        build.onLoad({ filter: /[\\/]use-sync-external-store[\\/]shim[\\/]index\.js$/ }, () => ({
-          contents: "export { useSyncExternalStore } from 'react';",
-          loader: "js"
-        }));
-        build.onLoad(
-          {
-            filter: /[\\/]use-sync-external-store[\\/]cjs[\\/]use-sync-external-store-shim\.development\.js$/
-          },
-          () => ({
-            contents: "export { useSyncExternalStore } from 'react';",
-            loader: "js"
-          })
-        );
-        build.onLoad(
-          {
-            filter: /[\\/]use-sync-external-store[\\/]cjs[\\/]use-sync-external-store-shim\.production\.js$/
-          },
-          () => ({
-            contents: "export { useSyncExternalStore } from 'react';",
-            loader: "js"
-          })
-        );
-      }
-    };
+  createRuntimeAliasPlugin(runtimeSpecifierMap) {
+    return createRuntimeSpecifierAliasPlugin(runtimeSpecifierMap, { name: "react-runtime-import-alias" });
   }
 }
 export {

package/src/services/react-hydration-asset.service.js

@@ -4,10 +4,10 @@ import { RESOLVED_ASSETS_DIR } from "@ecopages/core/constants";
 import {
   AssetFactory
 } from "@ecopages/core/services/asset-processing-service";
-import { createHydrationScript } from "../utils/hydration-scripts.js";
-import { createIslandHydrationScript } from "../utils/hydration-scripts.js";
+import { createHydrationScript, createIslandHydrationScript } from "../utils/hydration-scripts.js";
 import { collectDeclaredModulesInConfig } from "../utils/declared-modules.js";
 class ReactHydrationAssetService {
+  config;
   constructor(config) {
     this.config = config;
   }
@@ -59,7 +59,7 @@ class ReactHydrationAssetService {
       dependencies.push(
         AssetFactory.createContentScript({
           position: "head",
-          content: `window.__ECO_PAGE__={module:"${importPath}",props:${JSON.stringify(props)}};`,
+          content: `window.__ECO_PAGES__=window.__ECO_PAGES__||{};window.__ECO_PAGES__.page={module:"${importPath}",props:${JSON.stringify(props)}};`,
           name: `${componentName}-props`,
           bundle: false,
           attributes: {

package/src/services/react-page-module.service.d.ts

@@ -7,6 +7,7 @@
  * @module
  */
 import type { EcoComponentConfig, EcoPageFile } from '@ecopages/core';
+import type { BuildExecutor } from '@ecopages/core/build/build-adapter';
 import type { CompileOptions } from '@mdx-js/mdx';
 /**
  * Configuration for the ReactPageModuleService.
@@ -14,6 +15,8 @@ import type { CompileOptions } from '@mdx-js/mdx';
 export interface ReactPageModuleServiceConfig {
     rootDir: string;
     distDir: string;
+    workDir: string;
+    buildExecutor: BuildExecutor;
     layoutsDir?: string;
     componentsDir?: string;
     mdxCompilerOptions?: CompileOptions;

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

@@ -1,10 +1,11 @@
 import path from "node:path";
 import { pathToFileURL } from "node:url";
 import { rapidhash } from "@ecopages/core/hash";
-import { defaultBuildAdapter } from "@ecopages/core/build/build-adapter";
+import { build } from "@ecopages/core/build/build-adapter";
 import { fileSystem } from "@ecopages/file-system";
 import { collectDeclaredModulesInConfig } from "../utils/declared-modules.js";
 class ReactPageModuleService {
+  config;
   constructor(config) {
     this.config = config;
   }
@@ -31,24 +32,27 @@ class ReactPageModuleService {
         development: process?.env?.NODE_ENV === "development"
       }
     );
-    const outdir = path.join(this.config.distDir, ".server-modules-react-mdx");
+    const outdir = path.join(this.config.workDir, ".server-modules-react-mdx");
     const fileBaseName = path.basename(filePath, path.extname(filePath));
     const fileHash = fileSystem.hash(filePath);
     const cacheBuster = process?.env?.NODE_ENV === "development" ? `-${Date.now()}` : "";
     const outputFileName = `${fileBaseName}-${fileHash}${cacheBuster}.js`;
-    const buildResult = await defaultBuildAdapter.build({
-      entrypoints: [filePath],
-      root: this.config.rootDir,
-      outdir,
-      target: "node",
-      format: "esm",
-      sourcemap: "none",
-      splitting: false,
-      minify: false,
-      treeshaking: false,
-      naming: outputFileName,
-      plugins: [mdxPlugin]
-    });
+    const buildResult = await build(
+      {
+        entrypoints: [filePath],
+        root: this.config.rootDir,
+        outdir,
+        target: "node",
+        format: "esm",
+        sourcemap: "none",
+        splitting: false,
+        minify: false,
+        treeshaking: false,
+        naming: outputFileName,
+        plugins: [mdxPlugin]
+      },
+      this.config.buildExecutor
+    );
     if (!buildResult.success) {
       const details = buildResult.logs.map((log) => log.message).join(" | ");
       throw new Error(`Failed to compile MDX page module: ${details}`);
@@ -91,7 +95,7 @@ class ReactPageModuleService {
         if (fileSystem.exists(resolvedDependency)) {
           return {
             ...config,
-            __eco: buildEcoMeta(resolvedDependency)
+            __eco: buildEcoMeta(path.join(candidateDir, path.basename(pagePath)))
           };
         }
       }

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

@@ -2,8 +2,7 @@
  * 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
  */
@@ -21,18 +20,19 @@ export type ReactRuntimeImports = {
 export interface ReactRuntimeBundleServiceConfig {
     routerAdapter?: ReactRouterAdapter;
 }
+type RuntimeMode = 'development' | 'production';
 export declare class ReactRuntimeBundleService {
     private readonly config;
     constructor(config: ReactRuntimeBundleServiceConfig);
-    getRuntimeImports(): ReactRuntimeImports;
-    getSpecifierMap(): Record<string, string>;
+    private get isDevelopment();
+    private getCurrentRuntimeMode;
+    private createRuntimeDefines;
+    private getReactVendorFileName;
+    private getReactDomVendorFileName;
+    private getRouterVendorFileName;
+    getRuntimeImports(mode?: RuntimeMode): ReactRuntimeImports;
+    getSpecifierMap(mode?: RuntimeMode): Record<string, string>;
     getDependencies(): AssetDefinition[];
-    createRuntimeAliasPlugin(): EcoBuildPlugin;
-    private buildImportMapSourceUrl;
-    private createRuntimeSpecifierAliasPlugin;
-    private createReactDomRuntimeInteropPlugin;
-    private getRuntimeArtifactsDir;
-    private createRuntimeEntry;
-    private getModuleExportNames;
-    private isValidExportName;
+    createRuntimeAliasPlugin(mode?: RuntimeMode): EcoBuildPlugin;
 }
+export {};