@bleedingdev/modern-js-render 3.4.0-ultramodern.1 → 3.4.0-ultramodern.3

package/dist/esm/rsc.mjs

@@ -105,6 +105,31 @@ function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
         }
     });
 }
+const createRenderCSRWithRSC = (renderRsc)=>async (options)=>{
+        const entryCssFiles = __webpack_require__.rscM?.entryCssFiles;
+        const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
+        const rscPayloadStream = renderRsc({
+            element: options.rscRoot
+        });
+        const htmlStream = new ReadableStream({
+            start (controller) {
+                const encoder = new TextEncoder();
+                controller.enqueue(encoder.encode(options.html));
+                controller.close();
+            }
+        });
+        const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
+            injectClosingTags: false
+        })).pipeThrough(injectRSCPayload(rscPayloadStream, {
+            injectClosingTags: true
+        }));
+        return new Response(stream, {
+            status: 200,
+            headers: new Headers({
+                'content-type': 'text/html; charset=UTF-8'
+            })
+        });
+    };
 const createHandleAction = ({ decodeReply, loadServerAction, renderRsc })=>async (req)=>{
         try {
             const serverReference = req.headers.get('x-rsc-action');
@@ -163,30 +188,6 @@ const handleAction = createHandleAction({
     loadServerAction: server_node_loadServerAction,
     renderRsc: rsc_renderRsc
 });
-async function renderCSRWithRSC(options) {
-    const entryCssFiles = __webpack_require__.rscM?.entryCssFiles;
-    const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
-    const rscPayloadStream = rsc_renderRsc({
-        element: options.rscRoot
-    });
-    const htmlStream = new ReadableStream({
-        start (controller) {
-            const encoder = new TextEncoder();
-            controller.enqueue(encoder.encode(options.html));
-            controller.close();
-        }
-    });
-    const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
-        injectClosingTags: false
-    })).pipeThrough(injectRSCPayload(rscPayloadStream, {
-        injectClosingTags: true
-    }));
-    return new Response(stream, {
-        status: 200,
-        headers: new Headers({
-            'content-type': 'text/html; charset=UTF-8'
-        })
-    });
-}
+const renderCSRWithRSC = createRenderCSRWithRSC(rsc_renderRsc);
 export { createFromReadableStream } from "react-server-dom-rspack/client.node";
 export { handleAction, registerClientReference, registerServerReference, renderCSRWithRSC, renderToReadableStream, rsc_renderRsc as renderRsc };

package/dist/esm/rscWorker.mjs

@@ -1,5 +1,4 @@
-import { decodeReply as server_node_decodeReply, loadServerAction as server_node_loadServerAction, renderToReadableStream } from "react-server-dom-rspack/server.node";
-import { decodeReply as server_edge_decodeReply, loadServerAction as server_edge_loadServerAction, registerClientReference, registerServerReference, renderToReadableStream as server_edge_renderToReadableStream } from "react-server-dom-rspack/server.edge";
+import { decodeReply as server_edge_decodeReply, loadServerAction as server_edge_loadServerAction, registerClientReference, registerServerReference, renderToReadableStream } from "react-server-dom-rspack/server.edge";
 const server_encoder = new TextEncoder();
 const closingTagsPattern = /<\/body>\s*<\/html>\s*$/i;
 function injectRSCPayload(rscStream, { injectClosingTags = true }) {
@@ -106,6 +105,31 @@ function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
         }
     });
 }
+const createRenderCSRWithRSC = (renderRsc)=>async (options)=>{
+        const entryCssFiles = __webpack_require__.rscM?.entryCssFiles;
+        const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
+        const rscPayloadStream = renderRsc({
+            element: options.rscRoot
+        });
+        const htmlStream = new ReadableStream({
+            start (controller) {
+                const encoder = new TextEncoder();
+                controller.enqueue(encoder.encode(options.html));
+                controller.close();
+            }
+        });
+        const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
+            injectClosingTags: false
+        })).pipeThrough(injectRSCPayload(rscPayloadStream, {
+            injectClosingTags: true
+        }));
+        return new Response(stream, {
+            status: 200,
+            headers: new Headers({
+                'content-type': 'text/html; charset=UTF-8'
+            })
+        });
+    };
 const createHandleAction = ({ decodeReply, loadServerAction, renderRsc })=>async (req)=>{
         try {
             const serverReference = req.headers.get('x-rsc-action');
@@ -155,48 +179,15 @@ const createHandleAction = ({ decodeReply, loadServerAction, renderRsc })=>async
             });
         }
     };
-const rsc_renderRsc = (options)=>{
-    const readable = renderToReadableStream(options.element);
-    return readable;
-};
-createHandleAction({
-    decodeReply: server_node_decodeReply,
-    loadServerAction: server_node_loadServerAction,
-    renderRsc: rsc_renderRsc
-});
-async function renderCSRWithRSC(options) {
-    const entryCssFiles = __webpack_require__.rscM?.entryCssFiles;
-    const cssFiles = entryCssFiles ? Object.values(entryCssFiles).flat() : [];
-    const rscPayloadStream = rsc_renderRsc({
-        element: options.rscRoot
-    });
-    const htmlStream = new ReadableStream({
-        start (controller) {
-            const encoder = new TextEncoder();
-            controller.enqueue(encoder.encode(options.html));
-            controller.close();
-        }
-    });
-    const stream = htmlStream.pipeThrough(injectCSS(cssFiles, {
-        injectClosingTags: false
-    })).pipeThrough(injectRSCPayload(rscPayloadStream, {
-        injectClosingTags: true
-    }));
-    return new Response(stream, {
-        status: 200,
-        headers: new Headers({
-            'content-type': 'text/html; charset=UTF-8'
-        })
-    });
-}
 const rsc_worker_renderRsc = (options)=>{
-    const readable = server_edge_renderToReadableStream(options.element);
+    const readable = renderToReadableStream(options.element);
     return readable;
 };
-const rsc_worker_handleAction = createHandleAction({
+const renderCSRWithRSC = createRenderCSRWithRSC(rsc_worker_renderRsc);
+const handleAction = createHandleAction({
     decodeReply: server_edge_decodeReply,
     loadServerAction: server_edge_loadServerAction,
     renderRsc: rsc_worker_renderRsc
 });
 export { createFromReadableStream } from "react-server-dom-rspack/client.edge";
-export { registerClientReference, registerServerReference, renderCSRWithRSC, rsc_worker_handleAction as handleAction, rsc_worker_renderRsc as renderRsc, server_edge_renderToReadableStream as renderToReadableStream };
+export { handleAction, registerClientReference, registerServerReference, renderCSRWithRSC, renderToReadableStream, rsc_worker_renderRsc as renderRsc };

package/dist/types/rsc.worker.d.ts

@@ -1,2 +1 @@
-export * from './server/rsc/csr';
 export * from './server/rsc/rsc.worker';

package/dist/types/server/rsc/csr.d.ts

@@ -1,5 +1,4 @@
-import type { ReactElement } from 'react';
-export declare function renderCSRWithRSC(options: {
+export declare const renderCSRWithRSC: (options: {
     html: string;
-    rscRoot: ReactElement;
-}): Promise<Response>;
+    rscRoot: import("react").ReactElement;
+}) => Promise<Response>;

package/dist/types/server/rsc/csr.shared.d.ts

@@ -0,0 +1,9 @@
+import type { ReactElement } from 'react';
+type RenderRsc = (options: {
+    element: ReactElement;
+}) => ReadableStream;
+export declare const createRenderCSRWithRSC: (renderRsc: RenderRsc) => (options: {
+    html: string;
+    rscRoot: ReactElement;
+}) => Promise<Response>;
+export {};

package/dist/types/server/rsc/rsc.worker.d.ts

@@ -5,4 +5,8 @@ type RenderRscOptions = {
     element: React.ReactElement;
 };
 export declare const renderRsc: (options: RenderRscOptions) => ReadableStream<Uint8Array<ArrayBufferLike>>;
+export declare const renderCSRWithRSC: (options: {
+    html: string;
+    rscRoot: import("react").ReactElement;
+}) => Promise<Response>;
 export declare const handleAction: (req: Request) => Promise<Response>;

package/package.json

@@ -17,15 +17,15 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.4.0-ultramodern.1",
+  "version": "3.4.0-ultramodern.3",
   "files": [
     "dist",
     "hook.d.ts"
   ],
   "dependencies": {
     "@swc/helpers": "^0.5.23",
-    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.1",
-    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.1"
+    "@modern-js/utils": "npm:@bleedingdev/modern-js-utils@3.4.0-ultramodern.3",
+    "@modern-js/types": "npm:@bleedingdev/modern-js-types@3.4.0-ultramodern.3"
   },
   "devDependencies": {
     "@rslib/core": "0.23.0",
@@ -36,9 +36,9 @@
     "react-dom": "^19.2.7",
     "react-server-dom-rspack": "0.0.2",
     "typescript": "^6.0.3",
-    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.1",
-    "@scripts/rstest-config": "2.66.0",
-    "@scripts/build": "2.66.0"
+    "@modern-js/server-core": "npm:@bleedingdev/modern-js-server-core@3.4.0-ultramodern.3",
+    "@scripts/build": "2.66.0",
+    "@scripts/rstest-config": "2.66.0"
   },
   "peerDependencies": {
     "react": "^19.2.7",