@modern-js/render 3.10.4 → 3.11.1

package/dist/esm-node/rsc-html-stream/server.mjs

@@ -1,131 +1,108 @@
+import "node:module";
 const encoder = new TextEncoder();
 const closingTagsPattern = /<\/body>\s*<\/html>\s*$/i;
 function injectRSCPayload(rscStream, { injectClosingTags = true }) {
-  const decoder = new TextDecoder();
-  let resolveFlightDataPromise;
-  const flightDataPromise = new Promise((resolve) => resolveFlightDataPromise = resolve);
-  let startedRSC = false;
-  const buffered = [];
-  let timeout = null;
-  function flushBufferedChunks(controller) {
-    for (const chunk of buffered) {
-      let buf = decoder.decode(chunk);
-      if (closingTagsPattern.test(buf)) {
-        buf = buf.replace(closingTagsPattern, "");
-      }
-      controller.enqueue(encoder.encode(buf));
-    }
-    buffered.length = 0;
-    timeout = null;
-  }
-  return new TransformStream({
-    transform(chunk, controller) {
-      buffered.push(chunk);
-      if (timeout) {
-        return;
-      }
-      timeout = setTimeout(async () => {
-        flushBufferedChunks(controller);
-        if (!startedRSC) {
-          startedRSC = true;
-          writeRSCStream(rscStream, controller).catch((err) => controller.error(err)).then(() => resolveFlightDataPromise());
+    const decoder = new TextDecoder();
+    let resolveFlightDataPromise;
+    const flightDataPromise = new Promise((resolve)=>resolveFlightDataPromise = resolve);
+    let startedRSC = false;
+    const buffered = [];
+    let timeout = null;
+    function flushBufferedChunks(controller) {
+        for (const chunk of buffered){
+            let buf = decoder.decode(chunk);
+            if (closingTagsPattern.test(buf)) buf = buf.replace(closingTagsPattern, '');
+            controller.enqueue(encoder.encode(buf));
         }
-      }, 0);
-    },
-    async flush(controller) {
-      await flightDataPromise;
-      if (timeout) {
-        clearTimeout(timeout);
-        flushBufferedChunks(controller);
-      }
-      if (injectClosingTags) {
-        controller.enqueue(encoder.encode("</body></html>"));
-      }
+        buffered.length = 0;
+        timeout = null;
     }
-  });
+    return new TransformStream({
+        transform (chunk, controller) {
+            buffered.push(chunk);
+            if (timeout) return;
+            timeout = setTimeout(async ()=>{
+                flushBufferedChunks(controller);
+                if (!startedRSC) {
+                    startedRSC = true;
+                    writeRSCStream(rscStream, controller).catch((err)=>controller.error(err)).then(()=>resolveFlightDataPromise());
+                }
+            }, 0);
+        },
+        async flush (controller) {
+            await flightDataPromise;
+            if (timeout) {
+                clearTimeout(timeout);
+                flushBufferedChunks(controller);
+            }
+            if (injectClosingTags) controller.enqueue(encoder.encode('</body></html>'));
+        }
+    });
 }
 async function writeRSCStream(rscStream, controller) {
-  const decoder = new TextDecoder("utf-8", {
-    fatal: true
-  });
-  for await (const chunk of rscStream) {
-    try {
-      writeChunk(JSON.stringify(decoder.decode(chunk, {
-        stream: true
-      })), controller);
+    const decoder = new TextDecoder('utf-8', {
+        fatal: true
+    });
+    for await (const chunk of rscStream)try {
+        writeChunk(JSON.stringify(decoder.decode(chunk, {
+            stream: true
+        })), controller);
     } catch (err) {
-      const base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
-      writeChunk(`Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, controller);
+        const base64 = JSON.stringify(btoa(String.fromCodePoint(...chunk)));
+        writeChunk(`Uint8Array.from(atob(${base64}), m => m.codePointAt(0))`, controller);
     }
-  }
-  const remaining = decoder.decode();
-  if (remaining.length) {
-    writeChunk(JSON.stringify(remaining), controller);
-  }
+    const remaining = decoder.decode();
+    if (remaining.length) writeChunk(JSON.stringify(remaining), controller);
 }
 function writeChunk(chunk, controller) {
-  controller.enqueue(encoder.encode(`<script>${escapeScript(`(self.__FLIGHT_DATA||=[]).push(${chunk})`)}</script>`));
+    controller.enqueue(encoder.encode(`<script>${escapeScript(`(self.__FLIGHT_DATA||=[]).push(${chunk})`)}</script>`));
 }
 function escapeScript(script) {
-  return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
+    return script.replace(/<!--/g, '<\\!--').replace(/<\/(script)/gi, '</\\$1');
 }
 function injectCSS(cssFiles, { injectClosingTags = true } = {}) {
-  if (cssFiles.length === 0) {
-    return new TransformStream({
-      transform(chunk, controller) {
-        controller.enqueue(chunk);
-      },
-      flush(controller) {
-        if (injectClosingTags) {
-          controller.enqueue(encoder.encode("</body></html>"));
+    if (0 === cssFiles.length) return new TransformStream({
+        transform (chunk, controller) {
+            controller.enqueue(chunk);
+        },
+        flush (controller) {
+            if (injectClosingTags) controller.enqueue(encoder.encode('</body></html>'));
         }
-      }
     });
-  }
-  const decoder = new TextDecoder();
-  const headTrailer = "</head>";
-  const bodyTrailer = "</body>";
-  const buffered = [];
-  let timeout = null;
-  let cssInjected = false;
-  const cssLinks = cssFiles.map((css) => `<link href="${css}" rel="stylesheet" />`).join("");
-  function flushBufferedChunks(controller) {
-    for (const chunk of buffered) {
-      let buf = decoder.decode(chunk);
-      if (!cssInjected && buf.includes(headTrailer)) {
-        buf = buf.replace(headTrailer, `${cssLinks}${headTrailer}`);
-        cssInjected = true;
-      }
-      controller.enqueue(encoder.encode(buf));
-    }
-    buffered.length = 0;
-    timeout = null;
-  }
-  return new TransformStream({
-    transform(chunk, controller) {
-      buffered.push(chunk);
-      if (timeout) {
-        return;
-      }
-      timeout = setTimeout(() => {
-        flushBufferedChunks(controller);
-      }, 0);
-    },
-    async flush(controller) {
-      if (timeout) {
-        clearTimeout(timeout);
-        flushBufferedChunks(controller);
-      }
-      if (!cssInjected) {
-        controller.enqueue(encoder.encode(cssLinks));
-      }
-      if (injectClosingTags) {
-        controller.enqueue(encoder.encode("</body></html>"));
-      }
+    const decoder = new TextDecoder();
+    const headTrailer = '</head>';
+    const buffered = [];
+    let timeout = null;
+    let cssInjected = false;
+    const cssLinks = cssFiles.map((css)=>`<link href="${css}" rel="stylesheet" />`).join('');
+    function flushBufferedChunks(controller) {
+        for (const chunk of buffered){
+            let buf = decoder.decode(chunk);
+            if (!cssInjected && buf.includes(headTrailer)) {
+                buf = buf.replace(headTrailer, `${cssLinks}${headTrailer}`);
+                cssInjected = true;
+            }
+            controller.enqueue(encoder.encode(buf));
+        }
+        buffered.length = 0;
+        timeout = null;
     }
-  });
+    return new TransformStream({
+        transform (chunk, controller) {
+            buffered.push(chunk);
+            if (timeout) return;
+            timeout = setTimeout(()=>{
+                flushBufferedChunks(controller);
+            }, 0);
+        },
+        async flush (controller) {
+            if (timeout) {
+                clearTimeout(timeout);
+                flushBufferedChunks(controller);
+            }
+            if (!cssInjected) controller.enqueue(encoder.encode(cssLinks));
+            if (injectClosingTags) controller.enqueue(encoder.encode('</body></html>'));
+        }
+    });
 }
-export {
-  injectCSS,
-  injectRSCPayload
-};
+export { injectCSS, injectRSCPayload };

package/dist/esm-node/server/rsc/csr.mjs

@@ -1,30 +1,29 @@
+import "node:module";
 import { injectCSS, injectRSCPayload } from "../../rsc-html-stream/server.mjs";
 import { renderRsc } from "./rsc.mjs";
 async function renderCSRWithRSC(options) {
-  const entryCssFiles = __rspack_rsc_manifest__ === null || __rspack_rsc_manifest__ === void 0 ? void 0 : __rspack_rsc_manifest__.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 entryCssFiles = __rspack_rsc_manifest__?.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'
+        })
+    });
 }
-export {
-  renderCSRWithRSC
-};
+export { renderCSRWithRSC };

package/dist/esm-node/server/rsc/index.mjs

@@ -1,2 +1,3 @@
+import "node:module";
 export * from "./rsc.mjs";
 export * from "./csr.mjs";

package/dist/esm-node/server/rsc/rsc.mjs

@@ -1,69 +1,57 @@
-import { renderToReadableStream } from "react-server-dom-rspack/server.node";
-import { loadServerAction, renderToReadableStream as renderToReadableStream2 } from "react-server-dom-rspack/server.node";
-import { decodeReply } from "react-server-dom-rspack/server.node";
-import { createFromReadableStream } from "react-server-dom-rspack/client.node";
-import { registerClientReference, registerServerReference } from "react-server-dom-rspack/server.node";
-const renderRsc = (options) => {
-  const readable = renderToReadableStream2(options.element);
-  return readable;
+import "node:module";
+import { decodeReply, loadServerAction, registerClientReference, registerServerReference, renderToReadableStream } from "react-server-dom-rspack/server.node";
+const renderRsc = (options)=>{
+    const readable = renderToReadableStream(options.element);
+    return readable;
 };
-const handleAction = async (req) => {
-  try {
-    const serverReference = req.headers.get("x-rsc-action");
-    if (!serverReference) {
-      return new Response("Cannot find server reference", {
-        status: 404
-      });
-    }
-    const action = loadServerAction(serverReference);
-    if (typeof action !== "function") {
-      console.error("[RSC] Invalid action: server reference is not a function, serverReference:", serverReference);
-      return new Response("Invalid action", {
-        status: 400
-      });
-    }
-    const contentType = req.headers.get("content-type");
-    let args;
+const handleAction = async (req)=>{
     try {
-      if (contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")) {
-        const formData = await req.formData();
-        args = await decodeReply(formData);
-      } else {
-        const text = await req.text();
-        args = await decodeReply(text);
-      }
+        const serverReference = req.headers.get('x-rsc-action');
+        if (!serverReference) return new Response('Cannot find server reference', {
+            status: 404
+        });
+        const action = loadServerAction(serverReference);
+        if ('function' != typeof action) {
+            console.error('[RSC] Invalid action: server reference is not a function, serverReference:', serverReference);
+            return new Response('Invalid action', {
+                status: 400
+            });
+        }
+        const contentType = req.headers.get('content-type');
+        let args;
+        try {
+            if (contentType?.includes('multipart/form-data')) {
+                const formData = await req.formData();
+                args = await decodeReply(formData);
+            } else {
+                const text = await req.text();
+                args = await decodeReply(text);
+            }
+        } catch (error) {
+            console.error('[RSC] Failed to decode request arguments, error:', error instanceof Error ? error.message : String(error), 'contentType:', contentType || 'unknown');
+            return new Response('Failed to decode request arguments', {
+                status: 400
+            });
+        }
+        const result = await Promise.resolve(action.apply(null, args));
+        const stream = renderRsc({
+            element: result
+        });
+        const response = new Response(stream, {
+            status: 200,
+            headers: {
+                'Content-Type': 'text/html'
+            }
+        });
+        return response;
     } catch (error) {
-      console.error("[RSC] Failed to decode request arguments, error:", error instanceof Error ? error.message : String(error), "contentType:", contentType || "unknown");
-      return new Response("Failed to decode request arguments", {
-        status: 400
-      });
+        const errorMessage = error instanceof Error ? error.message : String(error);
+        const errorStack = error instanceof Error ? error.stack : void 0;
+        console.error('[RSC] Error handling server action, error:', errorMessage, errorStack ? `\n${errorStack}` : '');
+        return new Response('Internal server error', {
+            status: 500
+        });
     }
-    const result = await Promise.resolve(action.apply(null, args));
-    const stream = renderRsc({
-      element: result
-    });
-    const response = new Response(stream, {
-      status: 200,
-      headers: {
-        "Content-Type": "text/html"
-      }
-    });
-    return response;
-  } catch (error) {
-    const errorMessage = error instanceof Error ? error.message : String(error);
-    const errorStack = error instanceof Error ? error.stack : void 0;
-    console.error("[RSC] Error handling server action, error:", errorMessage, errorStack ? `
-${errorStack}` : "");
-    return new Response("Internal server error", {
-      status: 500
-    });
-  }
-};
-export {
-  createFromReadableStream,
-  handleAction,
-  registerClientReference,
-  registerServerReference,
-  renderRsc,
-  renderToReadableStream
 };
+export { createFromReadableStream } from "react-server-dom-rspack/client.node";
+export { handleAction, registerClientReference, registerServerReference, renderRsc, renderToReadableStream };

package/dist/esm-node/server/ssr/index.mjs

@@ -1 +1,2 @@
+import "node:module";
 export * from "./ssr.mjs";

package/dist/esm-node/server/ssr/ssr.mjs

@@ -1,76 +1,64 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
+import "node:module";
+import { Fragment, jsx, jsxs } from "react/jsx-runtime";
 import { SSR_HYDRATION_ID_PREFIX } from "@modern-js/utils/universal/constants";
 import { renderToReadableStream } from "react-dom/server.edge";
 import { ServerElementsProvider } from "../../client/index.mjs";
 function CSSLinks({ cssFiles }) {
-  if (cssFiles.length === 0) {
-    return null;
-  }
-  return /* @__PURE__ */ _jsx(_Fragment, {
-    children: cssFiles.map((css) => /* @__PURE__ */ _jsx("link", {
-      href: css,
-      rel: "stylesheet"
-    }, css))
-  });
+    if (0 === cssFiles.length) return null;
+    return /*#__PURE__*/ jsx(Fragment, {
+        children: cssFiles.map((css)=>/*#__PURE__*/ jsx("link", {
+                href: css,
+                rel: "stylesheet"
+            }, css))
+    });
 }
 function wrapStream(stream, originalStream) {
-  const wrappedStream = Object.create(stream);
-  for (const prop of Object.keys(originalStream)) {
-    if (!(prop in wrappedStream)) {
-      wrappedStream[prop] = originalStream[prop];
-    }
-  }
-  return wrappedStream;
+    const wrappedStream = Object.create(stream);
+    for (const prop of Object.keys(originalStream))if (!(prop in wrappedStream)) wrappedStream[prop] = originalStream[prop];
+    return wrappedStream;
 }
-const renderSSRStream = async (children, options) => {
-  var __rspack_rsc_manifest__1, __rspack_rsc_manifest__2, __rspack_rsc_manifest__3;
-  const { rscRoot, routes } = options;
-  const clientManifest = (__rspack_rsc_manifest__1 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__1 === void 0 ? void 0 : __rspack_rsc_manifest__1.clientManifest;
-  const serverConsumerModuleMap = (__rspack_rsc_manifest__2 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__2 === void 0 ? void 0 : __rspack_rsc_manifest__2.serverConsumerModuleMap;
-  const entryCssFiles = (__rspack_rsc_manifest__3 = __rspack_rsc_manifest__) === null || __rspack_rsc_manifest__3 === void 0 ? void 0 : __rspack_rsc_manifest__3.entryCssFiles;
-  const hasRoutes = Boolean(routes && routes.length > 0);
-  if (!clientManifest || !serverConsumerModuleMap) {
-    return renderToReadableStream(children, {
-      ...options,
-      identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-  }
-  try {
-    const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
-      import("../rsc/index.mjs"),
-      import("react-server-dom-rspack/client.edge"),
-      import("../../rsc-html-stream/server.mjs")
-    ]);
-    const rscStream = await renderRsc({
-      element: rscRoot || children
+const renderSSRStream = async (children, options)=>{
+    const { rscRoot, routes } = options;
+    const clientManifest = __rspack_rsc_manifest__?.clientManifest;
+    const serverConsumerModuleMap = __rspack_rsc_manifest__?.serverConsumerModuleMap;
+    const entryCssFiles = __rspack_rsc_manifest__?.entryCssFiles;
+    const hasRoutes = Boolean(routes && routes.length > 0);
+    if (!clientManifest || !serverConsumerModuleMap) return renderToReadableStream(children, {
+        ...options,
+        identifierPrefix: SSR_HYDRATION_ID_PREFIX
     });
-    const [rscElementStream, rscPayloadStream] = rscStream.tee();
-    const elements = createFromReadableStream(rscElementStream);
-    let cssFiles = [];
-    if (!hasRoutes && entryCssFiles) {
-      cssFiles = Object.values(entryCssFiles).flat();
+    try {
+        const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
+            import("../rsc/index.mjs"),
+            import("react-server-dom-rspack/client.edge"),
+            import("../../rsc-html-stream/server.mjs")
+        ]);
+        const rscStream = await renderRsc({
+            element: rscRoot || children
+        });
+        const [rscElementStream, rscPayloadStream] = rscStream.tee();
+        const elements = createFromReadableStream(rscElementStream);
+        let cssFiles = [];
+        if (!hasRoutes && entryCssFiles) cssFiles = Object.values(entryCssFiles).flat();
+        const htmlStream = await renderToReadableStream(/*#__PURE__*/ jsxs(ServerElementsProvider, {
+            elements: elements,
+            children: [
+                /*#__PURE__*/ jsx(CSSLinks, {
+                    cssFiles: cssFiles
+                }),
+                children
+            ]
+        }), {
+            ...options,
+            identifierPrefix: SSR_HYDRATION_ID_PREFIX
+        });
+        const stream = htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
+            injectClosingTags: true
+        }));
+        return wrapStream(stream, htmlStream);
+    } catch (error) {
+        console.error(error);
+        throw error;
     }
-    const htmlStream = await renderToReadableStream(/* @__PURE__ */ _jsxs(ServerElementsProvider, {
-      elements,
-      children: [
-        /* @__PURE__ */ _jsx(CSSLinks, {
-          cssFiles
-        }),
-        children
-      ]
-    }), {
-      ...options,
-      identifierPrefix: SSR_HYDRATION_ID_PREFIX
-    });
-    const stream = htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
-      injectClosingTags: true
-    }));
-    return wrapStream(stream, htmlStream);
-  } catch (error) {
-    console.error(error);
-    throw error;
-  }
-};
-export {
-  renderSSRStream
 };
+export { renderSSRStream };

package/dist/types/client/index.d.ts

@@ -1,9 +1,9 @@
 import React from 'react';
 import { type ReactNode } from 'react';
 import { createFromReadableStream, createServerReference, setServerCallback } from 'react-server-dom-rspack/client.browser';
-export { rscStream } from '../rsc-html-stream/client';
+export { rscStream } from '../rsc-html-stream/client.js';
 export { createFromReadableStream, createServerReference };
-export { callServer } from './callServer';
+export { callServer } from './callServer.js';
 export { createFromFetch } from 'react-server-dom-rspack/client.browser';
 declare global {
     interface Window {

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

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

package/dist/types/server/ssr/index.d.ts

@@ -1 +1 @@
-export * from './ssr';
+export * from './ssr.js';

package/package.json

@@ -15,28 +15,26 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.10.4",
+  "version": "3.11.1",
   "files": [
     "dist",
     "hook.d.ts"
   ],
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@modern-js/types": "3.10.4",
-    "@modern-js/utils": "3.10.4"
+    "@modern-js/types": "3.11.1",
+    "@modern-js/utils": "3.11.1"
   },
   "devDependencies": {
-    "@rslib/core": "1.0.4",
     "@types/react": "^19.3.0",
     "@types/react-dom": "^19.3.0",
     "react": "^19.3.1",
     "react-dom": "^19.3.1",
     "react-server-dom-rspack": "0.1.0",
     "typescript": "^5",
-    "@modern-js/rslib": "3.10.4",
-    "@modern-js/server-core": "3.10.4",
-    "@scripts/build": "2.66.0",
-    "@scripts/rstest-config": "2.66.3"
+    "@modern-js/rslib": "3.11.1",
+    "@modern-js/server-core": "3.11.1",
+    "@scripts/rstest-config": "2.66.5"
   },
   "peerDependencies": {
     "react": ">=18.3.1",
@@ -76,8 +74,9 @@
     "access": "public"
   },
   "scripts": {
-    "dev": "modern-lib build --watch",
-    "build": "modern-lib build",
-    "test": "rstest --passWithNoTests"
+    "dev": "rs lib --watch",
+    "build": "rs lib",
+    "test": "rstest --passWithNoTests",
+    "test:build": "pnpm run build && node --test tests/build.test.mjs"
   }
 }