npm - @ecopages/core - Versions diffs - 0.2.0-beta.7 → 0.2.0-beta.8 - Mend

@ecopages/core 0.2.0-beta.7 → 0.2.0-beta.8

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (102) hide show

package/src/route-renderer/orchestration/integration-renderer.js CHANGED Viewed

@@ -10,15 +10,12 @@ import { OwnershipValidationService } from "./ownership-validation.service.js";
 import {
   RouteRenderOrchestrator
 } from "./route-render-orchestrator.js";
-import { normalizeUnresolvedMarkerArtifactHtml } from "./render-output.utils.js";
+import { normalizeUnresolvedMarkerArtifactHtml, isMarkupNodeLike } from "./render-output.utils.js";
 import {
   ForeignSubtreeExecutionService
 } from "./foreign-subtree-execution.service.js";
 import {} from "./queued-foreign-subtree-resolution.service.js";
 import { buildProcessedAssetDedupeKey } from "./processed-asset-dedupe.js";
-function isMarkupNodeLike(value) {
-  return typeof value === "object" && value !== null && "nodeType" in value && typeof value.nodeType === "number" && "outerHTML" in value && typeof value.outerHTML === "string";
-}
 class IntegrationRenderer {
   appConfig;
   assetProcessingService;
@@ -31,7 +28,22 @@ class IntegrationRenderer {
   pageModuleLoaderService;
   routeRenderOrchestrator;
   foreignSubtreeExecutionService = new ForeignSubtreeExecutionService();
+  /**
+   * Serializes route and view renders that mutate `htmlTransformer` state.
+   *
+   * Integration renderers are cached per integration, so concurrent static builds
+   * and overlapping SSR requests must not share one transformer page package.
+   */
+  renderExclusiveChain = Promise.resolve();
   DOC_TYPE = "<!DOCTYPE html>";
+  runRenderExclusive(operation) {
+    const run = this.renderExclusiveChain.then(operation, operation);
+    this.renderExclusiveChain = run.then(
+      () => void 0,
+      () => void 0
+    );
+    return run;
+  }
   /**
    * Loads one route module through the owning renderer's import path.
    *
@@ -397,7 +409,7 @@ class IntegrationRenderer {
    * @returns Structured component render result for orchestration paths.
    */
   async renderStringComponentWithSerializedChildren(input, component) {
-    const serializedChildren = input.children === void 0 ? void 0 : typeof input.children === "string" ? input.children : isMarkupNodeLike(input.children) ? input.children.outerHTML : void 0;
+    const serializedChildren = input.children === void 0 ? void 0 : typeof input.children === "string" ? input.children : isMarkupNodeLike(input.children) && typeof input.children.outerHTML === "string" ? input.children.outerHTML : void 0;
     if (input.children !== void 0 && serializedChildren === void 0) {
       const componentFile = input.component.config?.__eco?.file ?? "unknown component";
       const childTag = Object.prototype.toString.call(input.children);
@@ -533,7 +545,7 @@ class IntegrationRenderer {
    * @returns The imported module.
    */
   async importPageFile(file, options) {
-    const bypassCache = options?.bypassCache ?? (typeof Bun !== "undefined" && process.env.NODE_ENV === "development");
+    const bypassCache = options?.bypassCache ?? false;
     const pageModule = this.usesIntegrationPageImporter(file) ? await this.importIntegrationPageFile(file, {
       bypassCache,
       cacheScope: options?.cacheScope
@@ -633,7 +645,7 @@ class IntegrationRenderer {
       resolveRoutePageComponentRender: (input) => this.resolveRoutePageComponentRender(input),
       renderRouteBody: (renderOptions) => this.renderRouteBody(renderOptions),
       getRouteHtmlFinalization: (renderOptions) => this.getRouteHtmlFinalization(renderOptions),
-      transformRouteResponse: (response, htmlContributions) => this.transformRouteResponse(response, htmlContributions)
+      transformRouteResponse: (response, htmlContributions, pagePackage) => this.transformRouteResponse(response, htmlContributions, pagePackage)
     };
   }
   async resolveRouteRenderInputs(routeOptions) {
@@ -706,8 +718,13 @@ class IntegrationRenderer {
       }
     };
   }
-  async transformRouteResponse(response, htmlContributions) {
-    const transformedResponse = await this.htmlTransformer.transform(response, htmlContributions);
+  async transformRouteResponse(response, htmlContributions, pagePackage) {
+    const resolvedPagePackage = this.htmlTransformer.getPagePackage() ?? pagePackage;
+    const transformedResponse = await this.htmlTransformer.transform(
+      response,
+      htmlContributions,
+      resolvedPagePackage
+    );
     return transformedResponse.body ?? await transformedResponse.text();
   }
   /**
@@ -752,9 +769,12 @@ class IntegrationRenderer {
    * @returns Rendered route body plus effective cache strategy.
    */
   async execute(options) {
-    const adapter = this.createRouteRenderOrchestratorAdapter();
-    const renderOptions = await this.prepareRenderOptions(options, adapter);
-    return this.routeRenderOrchestrator.executePrepared(renderOptions, adapter);
+    return this.runRenderExclusive(async () => {
+      this.htmlTransformer.setProcessedDependencies([]);
+      const adapter = this.createRouteRenderOrchestratorAdapter();
+      const renderOptions = await this.prepareRenderOptions(options, adapter);
+      return this.routeRenderOrchestrator.executePrepared(renderOptions, adapter);
+    });
   }
   /**
    * Finalizes already-resolved HTML for explicit renderer-owned paths.

package/src/route-renderer/orchestration/render-output.utils.d.ts CHANGED Viewed

@@ -21,6 +21,8 @@ type MarkupNodeLikeShape = {
  * @typeParam T Expected resolved type of the thenable.
  */
 export declare function isThenable<T>(value: unknown): value is PromiseLike<T>;
+/** Returns whether a value looks like a DOM-like markup node from SSR integrations. */
+export declare function isMarkupNodeLike(value: unknown): value is MarkupNodeLikeShape;
 /**
  * Injects `data-eco-trigger` into the first real HTML element opening tag of
  * a component's rendered output string.

package/src/route-renderer/orchestration/render-output.utils.js CHANGED Viewed

@@ -82,6 +82,9 @@ function isTemplateContentShape(value) {
 function isMarkupNodeLikeShape(value) {
   return typeof value === "object" && value !== null && typeof value.nodeType === "number";
 }
+function isMarkupNodeLike(value) {
+  return isMarkupNodeLikeShape(value);
+}
 function injectTriggerAttributeIntoString(content, triggerId) {
   const str = content;
   let i = 0;
@@ -165,6 +168,7 @@ export {
   addTriggerAttribute,
   decodeHtmlEntities,
   inspectUnresolvedMarkerArtifactHtml,
+  isMarkupNodeLike,
   isThenable,
   normalizeUnresolvedMarkerArtifactHtml,
   wrapWithScriptsInjector

package/src/route-renderer/orchestration/route-render-orchestrator.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
-import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphContribution, PageBrowserGraphResult, PageMetadataProps, RouteRendererBody, RouteRendererOptions, RouteRenderResult } from '../../types/public-types.js';
+import type { ComponentRenderResult, EcoComponent, EcoPageComponent, EcoPageFile, HtmlTemplateProps, IntegrationRendererRenderOptions, PageBrowserGraphContribution, PageBrowserGraphResult, PageMetadataProps, PagePackageResult, RouteRendererBody, RouteRendererOptions, RouteRenderResult } from '../../types/public-types.js';
 import { type AssetProcessingService, type ProcessedAsset } from '../../services/assets/asset-processing-service/index.js';
 import type { HtmlDocumentContribution } from '../../services/html/html-transformer.service.js';
 import { OwnershipValidationService } from './ownership-validation.service.js';
@@ -64,7 +64,7 @@ export interface RouteRenderOrchestratorAdapter<C> {
     /**
      * Runs SSR-policy response transformation and returns the body value exposed to callers.
      */
-    transformRouteResponse(response: Response, htmlContributions?: HtmlDocumentContribution[]): Promise<RouteRendererBody>;
+    transformRouteResponse(response: Response, htmlContributions?: HtmlDocumentContribution[], pagePackage?: PagePackageResult): Promise<RouteRendererBody>;
 }
 /**
  * Captured route-render output in both replayable body and string HTML forms.

package/src/route-renderer/orchestration/route-render-orchestrator.js CHANGED Viewed

@@ -205,21 +205,20 @@ class RouteRenderOrchestrator {
       return result.assetsByRoute;
     }
     const cacheKey = input.integrationName;
-    const cached = this.groupedPageBrowserGraphCache.get(cacheKey);
-    if (cached) {
-      return await cached;
-    }
-    const pendingGroupedAssets = this.buildGroupedPageBrowserAssets(input, currentContribution).then((result) => {
-      if (result.hasCollectionFailures) {
+    let pending = this.groupedPageBrowserGraphCache.get(cacheKey);
+    if (!pending) {
+      pending = this.buildGroupedPageBrowserAssets(input, currentContribution).then((result) => {
+        if (result.hasCollectionFailures) {
+          this.groupedPageBrowserGraphCache.delete(cacheKey);
+        }
+        return result.assetsByRoute;
+      }).catch((error) => {
         this.groupedPageBrowserGraphCache.delete(cacheKey);
-      }
-      return result.assetsByRoute;
-    }).catch((error) => {
-      this.groupedPageBrowserGraphCache.delete(cacheKey);
-      throw error;
-    });
-    this.groupedPageBrowserGraphCache.set(cacheKey, pendingGroupedAssets);
-    return await pendingGroupedAssets;
+        throw error;
+      });
+      this.groupedPageBrowserGraphCache.set(cacheKey, pending);
+    }
+    return await pending;
   }
   /**
    * Builds the shared grouped page-browser asset map for one integration.
@@ -362,7 +361,8 @@ class RouteRenderOrchestrator {
             "Content-Type": "text/html"
           }
         }),
-        htmlFinalization.htmlContributions
+        htmlFinalization.htmlContributions,
+        renderOptions.pagePackage
       );
       return {
         body: body2,
@@ -376,7 +376,8 @@ class RouteRenderOrchestrator {
           "Content-Type": "text/html"
         }
       }),
-      htmlFinalization.htmlContributions
+      htmlFinalization.htmlContributions,
+      renderOptions.pagePackage
     );
     return {
       body,

package/src/router/client/navigation-coordinator.js CHANGED Viewed

@@ -198,6 +198,16 @@ function createEcoNavigationRuntime() {
       await runtime.cleanupOwner(owner);
     }
   };
+  if (typeof window !== "undefined") {
+    window.addEventListener("pageshow", (event) => {
+      if (event.persisted) {
+        runtime.cancelCurrentNavigationTransaction();
+      }
+    });
+    window.addEventListener("pagehide", () => {
+      runtime.cancelCurrentNavigationTransaction();
+    });
+  }
   return runtime;
 }
 function getEcoNavigationRuntime(windowObject = window) {

package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.d.ts CHANGED Viewed

@@ -45,6 +45,7 @@ export declare function createBrowserRuntimeModuleAsset(options: {
     fileName: string;
     cacheDirName?: string;
     rootDir?: string;
+    workDir?: string;
     bundleOptions?: {
         define?: Record<string, string>;
         minify?: boolean;

package/src/services/assets/asset-processing-service/browser-runtime-asset.factory.js CHANGED Viewed

@@ -31,6 +31,7 @@ function createBrowserRuntimeModuleAsset(options) {
     modules: options.modules,
     fileName: `${options.name}-entry.mjs`,
     rootDir: options.rootDir,
+    workDir: options.workDir,
     cacheDirName: options.cacheDirName
   });
   return createBrowserRuntimeScriptAsset({

package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.d.ts CHANGED Viewed

@@ -9,12 +9,14 @@ export type BrowserRuntimeEntryModuleConfig = {
  * @remarks
  * Integrations use this helper when they need a browser runtime asset composed
  * from multiple bare specifiers but do not want to own temporary file assembly
- * logic themselves. The generated file lives under a cache directory inside the
- * consuming app root so repeated runs can reuse the same location.
+ * logic themselves. The generated file lives under the app work directory so
+ * repeated runs can reuse the same location without placing sources inside
+ * `node_modules`, which can cause bundlers to externalize bare imports.
  */
 export declare function createBrowserRuntimeEntryModule(options: {
     modules: BrowserRuntimeEntryModuleConfig[];
     fileName: string;
     rootDir?: string;
+    workDir?: string;
     cacheDirName?: string;
 }): string;

package/src/services/assets/asset-processing-service/browser-runtime-entry.factory.js CHANGED Viewed

@@ -1,37 +1,57 @@
 import fs from "node:fs";
 import path from "node:path";
 import { createRequire } from "node:module";
+import { DEFAULT_ECOPAGES_WORK_DIR } from "../../../config/constants.js";
 function createBrowserRuntimeEntryModule(options) {
+  if (options.modules.some((module) => !module.specifier.startsWith("node:")) && !options.rootDir) {
+    throw new Error("createBrowserRuntimeEntryModule requires rootDir to resolve package specifiers");
+  }
   const rootDir = options.rootDir ?? process.cwd();
+  const workDir = options.workDir ?? path.join(rootDir, DEFAULT_ECOPAGES_WORK_DIR);
   const artifactsDir = path.join(
-    rootDir,
-    "node_modules",
-    ".cache",
+    workDir,
+    ".browser-runtime-entries",
     options.cacheDirName ?? "ecopages-browser-runtime"
   );
   fs.mkdirSync(artifactsDir, { recursive: true });
   const requireFromRoot = createRequire(path.join(rootDir, "package.json"));
   const seenExports = /* @__PURE__ */ new Set();
   const statements = [];
+  const filePath = path.join(artifactsDir, options.fileName);
+  const entryDir = path.dirname(filePath);
   for (const module of options.modules) {
+    const importSpecifier = resolveEntryImportSpecifier(module.specifier, requireFromRoot, entryDir);
     if (module.defaultExport) {
-      statements.push(`import __ecopages_default_export__ from '${module.specifier}';`);
+      statements.push(`import __ecopages_default_export__ from '${importSpecifier}';`);
       statements.push("export default __ecopages_default_export__;");
     }
     const exportNames = getModuleExportNames(module.specifier, requireFromRoot).filter(
       (name) => !seenExports.has(name)
     );
     if (exportNames.length > 0) {
-      statements.push(`export { ${exportNames.join(", ")} } from '${module.specifier}';`);
+      statements.push(`export { ${exportNames.join(", ")} } from '${importSpecifier}';`);
       for (const exportName of exportNames) {
         seenExports.add(exportName);
       }
     }
   }
-  const filePath = path.join(artifactsDir, options.fileName);
-  fs.writeFileSync(filePath, statements.join("\n"), "utf-8");
+  const content = statements.join("\n");
+  if (!fs.existsSync(filePath) || fs.readFileSync(filePath, "utf-8") !== content) {
+    fs.writeFileSync(filePath, content, "utf-8");
+  }
   return filePath;
 }
+function resolveEntryImportSpecifier(specifier, requireFromRoot, entryDir) {
+  if (specifier.startsWith("node:") || specifier.startsWith("file:")) {
+    return specifier;
+  }
+  const resolvedPath = requireFromRoot.resolve(specifier);
+  let relativePath = path.relative(entryDir, resolvedPath).replace(/\\/g, "/");
+  if (!relativePath.startsWith(".")) {
+    relativePath = `./${relativePath}`;
+  }
+  return relativePath;
+}
 function getModuleExportNames(specifier, requireFromRoot) {
   const moduleExports = requireFromRoot(specifier);
   return Object.keys(moduleExports).filter((name) => name !== "__esModule" && name !== "default").filter((name) => /^[$A-Z_a-z][$\w]*$/.test(name)).sort();

package/src/services/assets/asset-processing-service/processors/script/node-module-script.processor.js CHANGED Viewed

@@ -8,19 +8,33 @@ class NodeModuleScriptProcessor extends BaseScriptProcessor {
     const modulePath = this.resolveModulePath(dep.importPath, this.appConfig.rootDir);
     const moduleName = path.basename(modulePath);
     const filename = dep.name ?? `nm-${moduleName}`;
+    const shouldBundle = this.shouldBundle(dep);
     const configHash = this.generateHash(
-      JSON.stringify({ inline: dep.inline, minify: !dep.inline && this.isProduction, opts: dep.bundleOptions })
+      JSON.stringify({
+        bundle: shouldBundle,
+        inline: dep.inline,
+        minify: shouldBundle && !dep.inline && this.isProduction,
+        opts: dep.bundleOptions
+      })
     );
     const cachekey = `${this.buildCacheKey(filename, this.generateHash(modulePath), dep)}:${configHash}`;
     return this.getOrProcess(cachekey, async () => {
-      if (dep.inline) {
+      if (dep.inline || !shouldBundle) {
         const content = fileSystem.readFileAsBuffer(modulePath).toString();
+        const filepath = dep.inline ? void 0 : path.join(this.getAssetsDir(), "vendors", filename);
+        if (filepath) {
+          fileSystem.ensureDir(path.dirname(filepath));
+          if (!fileSystem.exists(filepath) || fileSystem.readFileAsBuffer(filepath).toString() !== content) {
+            fileSystem.copyFile(modulePath, filepath);
+          }
+        }
         return {
+          filepath,
           content,
           kind: dep.kind,
           position: dep.position,
           attributes: dep.attributes,
-          inline: true,
+          inline: dep.inline,
           excludeFromHtml: dep.excludeFromHtml,
           packageRole: dep.packageRole,
           bundledSourceFilepaths: dep.bundledSourceFilepaths

package/src/services/assets/browser-bundle.service.d.ts CHANGED Viewed

@@ -16,6 +16,7 @@ export type BrowserBundleOptions = {
     externalPackages?: boolean;
     external?: string[];
     plugins?: EcoBuildPlugin[];
+    executor?: 'build' | 'hmr';
     [key: string]: unknown;
     profile: BuildTranspileProfile;
     excludeAppBuildPlugins?: string[];

package/src/services/assets/browser-bundle.service.js CHANGED Viewed

@@ -1,4 +1,9 @@
-import { getAppBrowserBuildPlugins, getAppBuildExecutor, getAppTranspileOptions } from "../../build/build-adapter.js";
+import {
+  getAppBrowserBuildPlugins,
+  getAppBuildExecutor,
+  getAppHmrBuildExecutor,
+  getAppTranspileOptions
+} from "../../build/build-adapter.js";
 import { mergeEcoBuildPlugins } from "../../build/build-manifest.js";
 class BrowserBundleService {
   appConfig;
@@ -17,7 +22,7 @@ class BrowserBundleService {
    * site.
    */
   async bundle(options) {
-    const { profile, excludeAppBuildPlugins, plugins, ...rawBuildOptions } = options;
+    const { profile, excludeAppBuildPlugins, plugins, executor = "hmr", ...rawBuildOptions } = options;
     const appBrowserPlugins = getAppBrowserBuildPlugins(this.appConfig);
     const filteredAppBrowserPlugins = excludeAppBuildPlugins && excludeAppBuildPlugins.length > 0 ? appBrowserPlugins.filter((plugin) => !excludeAppBuildPlugins.includes(plugin.name)) : appBrowserPlugins;
     const request = {
@@ -26,7 +31,8 @@ class BrowserBundleService {
       ...getAppTranspileOptions(this.appConfig, profile),
       plugins: mergeEcoBuildPlugins(plugins, filteredAppBrowserPlugins)
     };
-    return await getAppBuildExecutor(this.appConfig).build(request);
+    const buildExecutor = executor === "build" ? getAppBuildExecutor(this.appConfig) : getAppHmrBuildExecutor(this.appConfig);
+    return await buildExecutor.build(request);
   }
   async bundleGroupedEntries(entries, options) {
     const request = {

package/src/services/html/html-transformer.service.d.ts CHANGED Viewed

@@ -83,7 +83,7 @@ export declare class HtmlTransformerService {
      * string-based fallback remains in place for runtimes that cannot provide one
      * of those rewriter implementations.
      */
-    transform(res: Response, contributions?: HtmlDocumentContribution[]): Promise<Response>;
+    transform(res: Response, contributions?: HtmlDocumentContribution[], pagePackage?: PagePackageResult): Promise<Response>;
     /**
      * Splits processed assets into head and body injection groups.
      */

package/src/services/html/html-transformer.service.js CHANGED Viewed

@@ -188,8 +188,8 @@ class HtmlTransformerService {
    * string-based fallback remains in place for runtimes that cannot provide one
    * of those rewriter implementations.
    */
-  async transform(res, contributions = []) {
-    const { head, body } = this.groupDependenciesByPosition();
+  async transform(res, contributions = [], pagePackage) {
+    const { head, body } = this.groupDependenciesByPosition(pagePackage);
     const { headPrepend, headAppend, bodyPrepend, bodyAppend } = this.groupContributionsByPlacement(contributions);
     const htmlRewriter = await this.htmlRewriterProvider.createHtmlRewriter();
     if (htmlRewriter) {
@@ -239,8 +239,8 @@ class HtmlTransformerService {
   /**
    * Splits processed assets into head and body injection groups.
    */
-  groupDependenciesByPosition() {
-    const dependencies = this.pagePackage ? this.resolvePagePackageHtmlDependencies(this.pagePackage) : this.processedDependencies;
+  groupDependenciesByPosition(pagePackageOverride) {
+    const dependencies = pagePackageOverride ? this.resolvePagePackageHtmlDependencies(pagePackageOverride) : this.pagePackage ? this.resolvePagePackageHtmlDependencies(this.pagePackage) : this.processedDependencies;
     return dependencies.reduce(
       (acc, dep) => {
         if (dep.kind === "script") {

package/src/services/invalidation/development-invalidation.service.d.ts CHANGED Viewed

@@ -1,5 +1,5 @@
 import type { EcoPagesAppConfig } from '../../types/internal-types.js';
-export type DevelopmentInvalidationCategory = 'public-asset' | 'additional-watch' | 'include-source' | 'route-source' | 'processor-owned-asset' | 'server-source' | 'other';
+export type DevelopmentInvalidationCategory = 'public-asset' | 'additional-watch' | 'include-source' | 'explicit-server-view' | 'route-source' | 'processor-owned-asset' | 'server-source' | 'other';
 /**
  * Framework-owned invalidation plan for one changed file.
  *
@@ -62,6 +62,15 @@ export declare class DevelopmentInvalidationService {
      * Returns whether the file is an include/template source file.
      */
     isIncludeSourceFile(filePath: string): boolean;
+    /**
+     * Returns whether the file is an explicit server-rendered view module.
+     *
+     * @remarks
+     * These modules are typically registered through `renderServerModule` in
+     * `app.ts` rather than the filesystem router. They need a full browser reload
+     * because their HTML is produced on the server, not through client HMR entrypoints.
+     */
+    isExplicitServerViewFile(filePath: string): boolean;
     /**
      * Returns whether the file is a server-executed source module outside the
      * special route/include buckets.

package/src/services/invalidation/development-invalidation.service.js CHANGED Viewed

@@ -60,6 +60,16 @@ class DevelopmentInvalidationService {
         processorHandledAsset: false
       };
     }
+    if (this.isExplicitServerViewFile(filePath)) {
+      return {
+        category: "explicit-server-view",
+        invalidateServerModules: true,
+        refreshRoutes: false,
+        reloadBrowser: true,
+        delegateToHmr: false,
+        processorHandledAsset: false
+      };
+    }
     if (this.isRouteSourceFile(filePath)) {
       return {
         category: "route-source",
@@ -148,6 +158,25 @@ class DevelopmentInvalidationService {
     }
     return /\.(?:[cm]?ts|[jt]sx?|mdx)$/u.test(resolvedPath);
   }
+  /**
+   * Returns whether the file is an explicit server-rendered view module.
+   *
+   * @remarks
+   * These modules are typically registered through `renderServerModule` in
+   * `app.ts` rather than the filesystem router. They need a full browser reload
+   * because their HTML is produced on the server, not through client HMR entrypoints.
+   */
+  isExplicitServerViewFile(filePath) {
+    const resolvedPath = path.resolve(filePath);
+    const viewsDir = path.join(this.appConfig.absolutePaths.srcDir, "views");
+    if (resolvedPath !== viewsDir && !resolvedPath.startsWith(`${viewsDir}${path.sep}`)) {
+      return false;
+    }
+    if (this.appConfig.templatesExt.some((extension) => resolvedPath.endsWith(extension))) {
+      return true;
+    }
+    return /\.(?:[cm]?ts|[jt]sx?|mdx)$/u.test(resolvedPath);
+  }
   /**
    * Returns whether the file is a server-executed source module outside the
    * special route/include buckets.

package/src/services/module-loading/README.md ADDED Viewed

@@ -0,0 +1,49 @@
+# Module Loading
+Server-side source loading for framework-owned page modules, includes, and related templates.
+## Import stack
+```
+Call site (route scan, renderer, SSG, API)
+  └─ AppModuleLoader.importModule()          app-server-module-transpiler.service.ts
+       ├─ merges server build plugins + JSX ownership plugins
+       ├─ resolves route-module BuildExecutor
+       └─ PageModuleImportService.importModule()
+            ├─ dev + host loader → host runtime (Node only, when configured)
+            ├─ production disk cache → route-module build cache
+            ├─ unified pages graph → prebuilt chunk import
+            └─ Rolldown per-page build → dynamic import of transpiled output
+```
+`ServerModuleTranspiler` is a thin wrapper that injects `rootDir`, optional default plugins, and invalidation version into the same `PageModuleImportService` path. App code should prefer `getAppModuleLoader(appConfig)` or `getAppServerModuleTranspiler(appConfig)`.
+## Host vs app ownership
+| Path                    | When                                                                                         |
+| ----------------------- | -------------------------------------------------------------------------------------------- |
+| Host loader             | `appConfig.runtime.hostModuleLoader` set (Vite host) and file supports direct source loading |
+| Ecopages build pipeline | Framework-owned template files under `pages/`, `includes/`, etc.                             |
+`shouldAppUseHostModuleLoader()` encodes the directory + extension rules. Bun always uses the build pipeline today.
+## Caching layers
+1. **In-memory promise cache** (`PageModuleImportService.importCache`) — keyed by file path, resolved `outdir`, JSX/plugin inputs, file hash, and invalidation version. Cleared by `invalidateDevelopmentGraph()`.
+2. **Disk transpile cache** (`.eco/.server-modules/.build-cache.json`) — production only; see route-module build cache slice.
+3. **Unified graph manifest** — production static export fast path; see build layer docs.
+## Files
+| File                                      | Role                                                      |
+| ----------------------------------------- | --------------------------------------------------------- |
+| `page-module-import.service.ts`           | Core import/cache/build orchestration                     |
+| `app-module-loader.service.ts`            | App-facing loader interface                               |
+| `app-server-module-transpiler.service.ts` | Factory for app-scoped loader + transpiler                |
+| `server-module-transpiler.service.ts`     | Injectable transpiler boundary for tests and bootstrap    |
+| `host-module-loader-registry.ts`          | Process-global host loader fallback for embedded runtimes |
+| `source-module-support.ts`                | Extension allowlist for host direct loading               |
+## Development invalidation
+`DevelopmentInvalidationService.invalidateServerModules()` bumps the app-owned invalidation version and calls `appModuleLoader.invalidateDevelopmentGraph()`, which clears the in-memory import cache and increments the per-service invalidation counter used in cache keys and dev `?update=` query params.

package/src/services/module-loading/app-server-module-transpiler.service.js CHANGED Viewed

@@ -1,5 +1,5 @@
-import { getAppBuildExecutor, getAppServerBuildPlugins } from "../../build/build-adapter.js";
-import { createForeignJsxOverridePlugin } from "../../plugins/foreign-jsx-override-plugin.js";
+import { getAppRouteModuleBuildExecutor, getAppServerBuildPlugins } from "../../build/build-adapter.js";
+import { getJsxOwnershipPlugins } from "../../build/jsx-ownership-plugins.js";
 import path from "node:path";
 import { DevelopmentInvalidationService } from "../invalidation/development-invalidation.service.js";
 import {} from "./app-module-loader.service.js";
@@ -37,22 +37,9 @@ function setAppHostModuleLoader(appConfig, hostModuleLoader) {
     hostModuleLoader
   };
 }
-function getJsxOwnershipPlugins(appConfig) {
-  const jsxExtensions = (appConfig.integrations ?? []).filter((integration) => integration.jsxImportSource).flatMap(
-    (integration) => integration.extensions.filter((extension) => extension.endsWith(".tsx") || extension.endsWith(".jsx")).map((extension) => ({ integration, extension }))
-  ).sort((left, right) => right.extension.length - left.extension.length);
-  return jsxExtensions.map(
-    ({ integration, extension }) => createForeignJsxOverridePlugin({
-      hostJsxImportSource: integration.jsxImportSource,
-      foreignExtensions: [extension],
-      excludeExtensions: jsxExtensions.filter((candidate) => candidate.extension.length > extension.length).filter((candidate) => candidate.extension.endsWith(extension)).map((candidate) => candidate.extension),
-      name: `ecopages-jsx-ownership-${integration.name}-${extension.replace(/[^a-zA-Z0-9]+/g, "-")}`
-    })
-  );
-}
 function createAppModuleLoader(appConfig) {
   const invalidationService = new DevelopmentInvalidationService(appConfig);
-  const pageModuleImportService = new PageModuleImportService({
+  const pageModuleImportService = new PageModuleImportService(appConfig, {
     canLoadSourceModuleFromHost: (filePath) => shouldAppUseHostModuleLoader(appConfig, filePath),
     getHostModuleLoader: () => getAppHostModuleLoader(appConfig)
   });
@@ -69,7 +56,7 @@ function createAppModuleLoader(appConfig) {
       return await pageModuleImportService.importModule({
         ...options,
         ...mergedPlugins.length > 0 ? { plugins: mergedPlugins } : {},
-        buildExecutor: options.buildExecutor ?? getAppBuildExecutor(appConfig),
+        buildExecutor: options.buildExecutor ?? getAppRouteModuleBuildExecutor(appConfig),
         invalidationVersion
       });
     },

package/src/services/module-loading/page-module-import.service.d.ts CHANGED Viewed

@@ -1,5 +1,6 @@
 import { build, type BuildExecutor, type BuildResult } from '../../build/build-adapter.js';
 import type { EcoBuildPlugin } from '../../build/build-types.js';
+import type { EcoPagesAppConfig } from '../../types/internal-types.js';
 import type { SourceModuleLoaderFactory } from './module-loading-types.js';
 interface PageModuleImportBaseOptions {
     filePath: string;
@@ -59,10 +60,11 @@ export interface PageModuleImportDependencies {
  * transpilation settings, and error semantics across the different callers.
  */
 export declare class PageModuleImportService {
+    private readonly appConfig?;
     private readonly dependencies;
     private readonly importCache;
     private developmentInvalidationVersion;
-    constructor(dependencies?: Partial<PageModuleImportDependencies>);
+    constructor(appConfig?: EcoPagesAppConfig, dependencies?: Partial<PageModuleImportDependencies>);
     /**
      * Clears the shared import cache used by framework-owned page-module loads.
      */
@@ -91,5 +93,6 @@ export declare class PageModuleImportService {
      */
     importModule<T = unknown>(options: PageModuleBuildImportOptions): Promise<T>;
     private loadModule;
+    private getRouteModuleBuildCache;
 }
 export {};