@ecopages/ecopages-jsx 0.2.0-rc.10 → 0.2.0-rc.11

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ecopages/ecopages-jsx",
-  "version": "0.2.0-rc.10",
+  "version": "0.2.0-rc.11",
   "description": "JSX integration plugin for Ecopages",
   "keywords": [
     "ecopages",
@@ -34,12 +34,12 @@
     "directory": "packages/integrations/ecopages-jsx"
   },
   "dependencies": {
-    "@ecopages/mdx": "0.2.0-rc.10",
+    "@ecopages/mdx": "0.2.0-rc.11",
     "@mdx-js/mdx": "^3.1.1",
     "vfile": "^6.0.3"
   },
   "peerDependencies": {
-    "@ecopages/core": "0.2.0-rc.10",
+    "@ecopages/core": "0.2.0-rc.11",
     "@ecopages/jsx": "^0.3.0-rc.9",
     "@ecopages/radiant": "^0.3.0-rc.9"
   }

package/src/ecopages-jsx-mdx.d.ts

@@ -19,6 +19,5 @@ export interface CreateEcopagesJsxMdxLoaderPluginOptions {
     projectRoot: string;
 }
 export declare const createMdxLoaderPlugin: (options: CreateEcopagesJsxMdxLoaderPluginOptions) => EcoBuildPlugin;
-export declare const registerBunMdxPlugin: (options: CreateEcopagesJsxMdxLoaderPluginOptions) => Promise<void>;
 export declare const isMdxFile: (filePath: string, extensions: string[]) => boolean;
 export declare const normalizeMdxPageModule: (file: string, module: EcopagesJsxMdxPageModule) => EcopagesJsxMdxPageModule;

package/src/ecopages-jsx-mdx.js

@@ -18,18 +18,6 @@ export const createMdxLoaderPlugin = (options) => createMdxLoaderPluginCore({
     loader: 'js',
     projectRoot: options.projectRoot,
 });
-export const registerBunMdxPlugin = async (options) => {
-    if (typeof Bun === 'undefined') {
-        return;
-    }
-    const plugin = createMdxLoaderPlugin(options);
-    Bun.plugin({
-        name: plugin.name,
-        setup(build) {
-            return plugin.setup(build);
-        },
-    });
-};
 export const isMdxFile = (filePath, extensions) => {
     return extensions.some((ext) => filePath.endsWith(ext));
 };

package/src/ecopages-jsx-render-session.d.ts

@@ -1,8 +1,7 @@
 import type { EcoComponent } from '@ecopages/core';
-import type { ProcessedAsset } from '@ecopages/core/services/asset-processing-service';
 export declare const ECOPAGES_JSX_SSR_RENDER_STATE_KEY: unique symbol;
 /**
- * Tracks JSX SSR asset-collection state for one active render flow.
+ * Tracks JSX SSR HMR-ownership state for one active render flow.
  *
  * @remarks
  * The renderer still mirrors this state into `@ecopages/jsx/server` so nested
@@ -12,24 +11,19 @@ export declare const ECOPAGES_JSX_SSR_RENDER_STATE_KEY: unique symbol;
  * JSX server helpers.
  */
 export declare class EcopagesJsxRenderSession {
-    private readonly dedupeProcessedAssets;
-    constructor(dedupeProcessedAssets: (assets: ProcessedAsset[]) => ProcessedAsset[]);
     /**
      * Runs one render inside the active session scope.
      *
      * @remarks
      * When a render is already active, the current session state is reused and
      * mirrored back into the JSX SSR scope so nested `renderToString()` calls see
-     * the same asset frame stack. When no session exists yet, a new state is
+     * the same HMR-ownership set. When no session exists yet, a new state is
      * created and published through both the internal async-local store and the
      * JSX SSR scope bridge. HMR ownership accumulated during the outer scope is
      * published once when that scope completes.
      */
     withActiveScope<T>(render: () => T | Promise<T>): Promise<T>;
-    beginCollectedAssetFrame(): ProcessedAsset[];
-    endCollectedAssetFrame(frame: ProcessedAsset[]): ProcessedAsset[];
     mergeHmrOwnership(components: ReadonlyArray<EcoComponent | undefined>): void;
-    recordCollectedAssets(collectedAssets: ProcessedAsset[]): ProcessedAsset[];
     /**
      * Resolves the current render-session state from the local async scope first.
      *

package/src/ecopages-jsx-render-session.js

@@ -26,7 +26,7 @@ async function runWithCommittedHmrOwnership(state, render) {
     }
 }
 /**
- * Tracks JSX SSR asset-collection state for one active render flow.
+ * Tracks JSX SSR HMR-ownership state for one active render flow.
  *
  * @remarks
  * The renderer still mirrors this state into `@ecopages/jsx/server` so nested
@@ -36,17 +36,13 @@ async function runWithCommittedHmrOwnership(state, render) {
  * JSX server helpers.
  */
 export class EcopagesJsxRenderSession {
-    dedupeProcessedAssets;
-    constructor(dedupeProcessedAssets) {
-        this.dedupeProcessedAssets = dedupeProcessedAssets;
-    }
     /**
      * Runs one render inside the active session scope.
      *
      * @remarks
      * When a render is already active, the current session state is reused and
      * mirrored back into the JSX SSR scope so nested `renderToString()` calls see
-     * the same asset frame stack. When no session exists yet, a new state is
+     * the same HMR-ownership set. When no session exists yet, a new state is
      * created and published through both the internal async-local store and the
      * JSX SSR scope bridge. HMR ownership accumulated during the outer scope is
      * published once when that scope completes.
@@ -62,36 +58,13 @@ export class EcopagesJsxRenderSession {
             return await runWithCommittedHmrOwnership(jsxScopeState, () => renderStateStorage.run(jsxScopeState, () => render()));
         }
         const state = {
-            collectedAssetFrames: [],
             pendingHmrFileOwners: new Set(),
         };
         return await runWithCommittedHmrOwnership(state, () => renderStateStorage.run(state, () => withActiveSsrScopeValue(ECOPAGES_JSX_SSR_RENDER_STATE_KEY, state, render)));
     }
-    beginCollectedAssetFrame() {
-        const state = this.getState();
-        const frame = [];
-        state.collectedAssetFrames.push(frame);
-        return frame;
-    }
-    endCollectedAssetFrame(frame) {
-        const activeFrame = this.getState().collectedAssetFrames.pop();
-        if (!activeFrame || activeFrame !== frame) {
-            return this.dedupeProcessedAssets(frame);
-        }
-        return this.dedupeProcessedAssets(activeFrame);
-    }
     mergeHmrOwnership(components) {
         mergeEjsxHmrOwnership(ensurePendingHmrFileOwners(this.getState()), components);
     }
-    recordCollectedAssets(collectedAssets) {
-        const dedupedAssets = this.dedupeProcessedAssets(collectedAssets);
-        const state = this.getState();
-        const activeFrame = state.collectedAssetFrames[state.collectedAssetFrames.length - 1];
-        if (activeFrame) {
-            activeFrame.push(...dedupedAssets);
-        }
-        return dedupedAssets;
-    }
     /**
      * Resolves the current render-session state from the local async scope first.
      *

package/src/ecopages-jsx-renderer.d.ts

@@ -34,7 +34,7 @@ export declare class EcopagesJsxRenderer extends IntegrationRenderer<JsxRenderab
     private isJsxSerializableForeignChild;
     /**
      * Re-renders queued JSX children inside the owning renderer so nested custom
-     * elements and queued foreign subtrees contribute assets to the same frame.
+     * elements and queued foreign subtrees resolve here rather than as opaque markup.
      */
     private renderQueuedForeignSubtreeChildren;
     protected createForeignChildRuntime(options: {

package/src/ecopages-jsx-renderer.js

@@ -75,25 +75,22 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
     }
     /**
      * Re-renders queued JSX children inside the owning renderer so nested custom
-     * elements and queued foreign subtrees contribute assets to the same frame.
+     * elements and queued foreign subtrees resolve here rather than as opaque markup.
      */
     async renderQueuedForeignSubtreeChildren(children, queuedResolutionsByToken, resolveToken) {
         if (children === undefined) {
             return { assets: [] };
         }
-        let assets = [];
         let html;
         if (typeof children === 'string') {
             html = children;
         }
         else {
-            const renderedChildren = await this.renderJsx(children);
-            html = renderedChildren.html;
-            assets = renderedChildren.assets;
+            html = await this.renderJsx(children);
         }
         html = await this.foreignSubtreeExecutionService.resolveQueuedTokens(html, queuedResolutionsByToken, resolveToken);
         return {
-            assets,
+            assets: [],
             html,
         };
     }
@@ -124,7 +121,7 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
             runtimeOrigin,
         });
         this.mdxExtensions = jsxConfig?.mdxExtensions ?? ['.mdx'];
-        this.renderSession = new EcopagesJsxRenderSession((assets) => this.htmlTransformer.dedupeProcessedAssets(assets));
+        this.renderSession = new EcopagesJsxRenderSession();
         const radiantSsrEnabled = jsxConfig?.radiantSsrEnabled ?? false;
         this.radiantSsrPolicy = jsxConfig?.radiantSsrPolicy ?? new EcopagesJsxRadiantSsrPolicy(radiantSsrEnabled);
         const preferSourceImports = typeof Bun !== 'undefined';
@@ -209,7 +206,6 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
         return await this.withPreparedRadiantRuntime(async () => {
             await this.ssrScriptPreloader.preloadSsrScripts([input.component]);
             return await this.renderSession.withActiveScope(async () => {
-                const assetFrame = this.renderSession.beginCollectedAssetFrame();
                 try {
                     if (typeof input.component !== 'function') {
                         throw new TypeError('JSX renderer expected a callable component.');
@@ -224,10 +220,10 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
                                 : input.children,
                         };
                     const content = await this.withCustomElementRenderHook(() => component(componentProps));
-                    const rendered = await this.renderJsx(content);
+                    const html = await this.renderJsx(content);
                     const queuedForeignSubtreeResolution = await this.foreignSubtreeExecutionService.resolveQueuedHtml({
                         currentIntegrationName: this.name,
-                        html: rendered.html,
+                        html,
                         runtimeContext: this.foreignSubtreeExecutionService.getQueuedRuntimeContext(input, getForeignSubtreeResolutionContextKey(this.name)),
                         queueLabel: 'Ecopages JSX',
                         getOwningRenderer: (integrationName, rendererCache) => resolveOwningIntegrationRenderer({
@@ -247,7 +243,6 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
                         ? await this.processComponentDependencies([input.component])
                         : [];
                     const assets = this.htmlTransformer.dedupeProcessedAssets([
-                        ...this.renderSession.endCollectedAssetFrame(assetFrame),
                         ...queuedForeignSubtreeResolution.assets,
                         ...componentAssets,
                     ]);
@@ -261,7 +256,6 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
                     });
                 }
                 catch (error) {
-                    this.renderSession.endCollectedAssetFrame(assetFrame);
                     throw this.createRenderError('Error rendering component', error);
                 }
             });
@@ -293,13 +287,7 @@ export class EcopagesJsxRenderer extends IntegrationRenderer {
         });
     }
     async renderJsx(value) {
-        const collectedAssets = [];
-        const html = await this.withCustomElementRenderHook(() => renderToString(value));
-        const dedupedAssets = this.renderSession.recordCollectedAssets(collectedAssets);
-        return {
-            assets: dedupedAssets,
-            html,
-        };
+        return await this.withCustomElementRenderHook(() => renderToString(value));
     }
     async withCustomElementRenderHook(render) {
         return await this.radiantSsrPolicy.withRuntime(() => withServerCustomElementRenderHook(this.createIntrinsicCustomElementRenderHook(), render));

package/src/ecopages-jsx.plugin.d.ts

@@ -39,17 +39,14 @@ export declare class EcopagesJsxPlugin extends IntegrationPlugin<JsxRenderable>
      */
     getHmrStrategy(): HmrStrategy | undefined;
     /**
-     * Registers MDX tooling and completes the base integration setup.
+     * Ensures the MDX loader exists, then completes the base integration setup.
+     *
+     * @remarks
+     * Bun registers `integration.plugins` after `setup()` returns. Calling
+     * `Bun.plugin` here would install the same MDX loader twice.
      */
     setup(): Promise<void>;
     private ensureMdxLoaderPlugin;
-    /**
-     * Registers Bun's MDX loader at runtime setup time.
-     *
-     * Build-time contribution collection may run where Bun is absent, so
-     * this hook stays isolated from manifest preparation.
-     */
-    private registerMdxBunPlugin;
 }
 /**
  * Creates the JSX integration plugin with resolved defaults.

package/src/ecopages-jsx.plugin.js

@@ -2,7 +2,7 @@ import { IntegrationPlugin, } from '@ecopages/core/plugins/integration-plugin';
 import { AssetFactory } from '@ecopages/core/services/asset-processing-service';
 import { ECOPAGES_JSX_PLUGIN_NAME } from './ecopages-jsx.constants.js';
 import { RADIANT_INSTALL_HYDRATOR_FILEPATH } from './resolve-radiant-install-hydrator.js';
-import { appendMdxExtensions, createMdxLoaderPlugin, registerBunMdxPlugin, resolveMdxCompilerOptions, } from './ecopages-jsx-mdx.js';
+import { appendMdxExtensions, createMdxLoaderPlugin, resolveMdxCompilerOptions, } from './ecopages-jsx-mdx.js';
 import { EcopagesJsxRenderer } from './ecopages-jsx-renderer.js';
 import { EcopagesJsxHmrStrategy } from './ecopages-jsx-hmr-strategy.js';
 import { EcopagesJsxDevTransformContributor } from './dev-transform/ecopages-jsx-dev-transform-contributor.js';
@@ -137,13 +137,14 @@ export class EcopagesJsxPlugin extends IntegrationPlugin {
         });
     }
     /**
-     * Registers MDX tooling and completes the base integration setup.
+     * Ensures the MDX loader exists, then completes the base integration setup.
+     *
+     * @remarks
+     * Bun registers `integration.plugins` after `setup()` returns. Calling
+     * `Bun.plugin` here would install the same MDX loader twice.
      */
     async setup() {
         this.ensureMdxLoaderPlugin();
-        if (typeof Bun !== 'undefined' && this.mdxEnabled && this.mdxCompilerOptions) {
-            await this.registerMdxBunPlugin();
-        }
         await super.setup();
     }
     ensureMdxLoaderPlugin() {
@@ -159,25 +160,6 @@ export class EcopagesJsxPlugin extends IntegrationPlugin {
             projectRoot: this.appConfig.rootDir,
         });
     }
-    /**
-     * Registers Bun's MDX loader at runtime setup time.
-     *
-     * Build-time contribution collection may run where Bun is absent, so
-     * this hook stays isolated from manifest preparation.
-     */
-    async registerMdxBunPlugin() {
-        if (typeof Bun === 'undefined' || !this.mdxCompilerOptions) {
-            return;
-        }
-        if (!this.appConfig) {
-            throw new Error('[EcopagesJsxPlugin] Cannot register Bun MDX plugin: appConfig is not set');
-        }
-        await registerBunMdxPlugin({
-            compilerOptions: this.mdxCompilerOptions,
-            extensions: this.mdxExtensions,
-            projectRoot: this.appConfig.rootDir,
-        });
-    }
 }
 /**
  * Creates the JSX integration plugin with resolved defaults.

package/src/page-owned-content-script-grouping.js

@@ -1,4 +1,4 @@
-import { rapidhash } from '@ecopages/core/utils/hash';
+import { rapidhash } from '@ecopages/core/hash';
 import { ECOPAGES_JSX_PLUGIN_NAME } from './ecopages-jsx.constants.js';
 /** Shared grouped-build id prefix for page-owned content scripts. */
 const PAGE_OWNED_CONTENT_SCRIPT_BUNDLE_PREFIX = 'ecopages';