@modern-js/render 2.69.4 → 2.69.6

package/dist/cjs/client/callServer.js

@@ -25,7 +25,7 @@ module.exports = __toCommonJS(callServer_exports);
 var import_class_private_field_get = require("@swc/helpers/_/_class_private_field_get");
 var import_class_private_field_init = require("@swc/helpers/_/_class_private_field_init");
 var import_class_private_field_set = require("@swc/helpers/_/_class_private_field_set");
-var import_client = require("@modern-js/utils/react-server-dom-webpack/client.browser");
+var import_client = require("react-server-dom-webpack/client.browser");
 var _statusCode = /* @__PURE__ */ new WeakMap(), _url = /* @__PURE__ */ new WeakMap(), _details = /* @__PURE__ */ new WeakMap();
 class CallServerError extends Error {
   get statusCode() {

package/dist/cjs/client/index.js

@@ -40,12 +40,12 @@ __export(client_exports, {
 });
 module.exports = __toCommonJS(client_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
-var import_client = require("@modern-js/utils/react-server-dom-webpack/client.browser");
 var import_react = __toESM(require("react"));
 var import_react2 = require("react");
+var import_client = require("react-server-dom-webpack/client.browser");
 var import_client2 = require("../rsc-html-stream/client");
 var import_callServer = require("./callServer");
-var import_client3 = require("@modern-js/utils/react-server-dom-webpack/client.browser");
+var import_client3 = require("react-server-dom-webpack/client.browser");
 function RscClientRoot({ rscPayload }) {
   const elements = import_react.default.use(rscPayload);
   const [root, setRoot] = (0, import_react2.useState)(elements);
@@ -54,16 +54,12 @@ function RscClientRoot({ rscPayload }) {
   });
 }
 const ElementsContext = /* @__PURE__ */ (0, import_react2.createContext)(null);
-const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
 const ServerElementsProvider = ({ elements, children }) => {
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
-    children: [
-      /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ElementsContext.Provider, {
-        value: elements,
-        children
-      }),
-      JSX_SHELL_STREAM_END_MARK
-    ]
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+    children: /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ElementsContext.Provider, {
+      value: elements,
+      children
+    })
   });
 };
 const RSCServerSlot = () => {

package/dist/cjs/server/rsc/index.js

@@ -16,7 +16,9 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var rsc_exports = {};
 module.exports = __toCommonJS(rsc_exports);
 __reExport(rsc_exports, require("./rsc"), module.exports);
+__reExport(rsc_exports, require("./processRSCStream"), module.exports);
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  ...require("./rsc")
+  ...require("./rsc"),
+  ...require("./processRSCStream")
 });

package/dist/cjs/server/rsc/processRSCStream.js

@@ -0,0 +1,59 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var processRSCStream_exports = {};
+__export(processRSCStream_exports, {
+  processRSCStream: () => processRSCStream
+});
+module.exports = __toCommonJS(processRSCStream_exports);
+async function processRSCStream(rscStream, controller, encoder) {
+  try {
+    const reader = rscStream.getReader();
+    const decoder = new TextDecoder("utf-8", {
+      fatal: true
+    });
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      try {
+        const chunk = JSON.stringify(decoder.decode(value, {
+          stream: true
+        }));
+        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${chunk})</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      } catch (err) {
+        const base64 = JSON.stringify(btoa(String.fromCodePoint(...value)));
+        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      }
+    }
+    const remaining = decoder.decode();
+    if (remaining.length) {
+      const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})</script>`;
+      controller.enqueue(encoder.encode(scriptTag));
+    }
+    controller.close();
+  } catch (error) {
+    controller.error(error);
+  }
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  processRSCStream
+});

package/dist/cjs/server/rsc/rsc.js

@@ -26,11 +26,11 @@ __export(rsc_exports, {
   renderToReadableStream: () => import_server.renderToReadableStream
 });
 module.exports = __toCommonJS(rsc_exports);
-var import_server = require("@modern-js/utils/react-server-dom-webpack/server.edge");
-var import_server2 = require("@modern-js/utils/react-server-dom-webpack/server.edge");
-var import_server3 = require("@modern-js/utils/react-server-dom-webpack/server.edge");
-var import_client = require("@modern-js/utils/react-server-dom-webpack/client.edge");
-var import_server4 = require("@modern-js/utils/react-server-dom-webpack/server");
+var import_server = require("react-server-dom-webpack/server.edge");
+var import_server2 = require("react-server-dom-webpack/server.edge");
+var import_server3 = require("react-server-dom-webpack/server.edge");
+var import_client = require("react-server-dom-webpack/client.edge");
+var import_server4 = require("react-server-dom-webpack/server");
 const renderRsc = (options) => {
   const readable = (0, import_server2.renderToReadableStream)(options.element, options.clientManifest);
   return readable;

package/dist/cjs/server/ssr/ssr.js

@@ -51,7 +51,7 @@ const renderSSRStream = async (children, options) => {
   try {
     const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
       Promise.resolve().then(() => __toESM(require("../rsc"))),
-      Promise.resolve().then(() => __toESM(require("@modern-js/utils/react-server-dom-webpack/client.edge"))),
+      Promise.resolve().then(() => __toESM(require("react-server-dom-webpack/client.edge"))),
       Promise.resolve().then(() => __toESM(require("../../rsc-html-stream/server")))
     ]);
     const rscStream = await renderRsc({

package/dist/esm/client/callServer.js

@@ -10,7 +10,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _wrap_native_super } from "@swc/helpers/_/_wrap_native_super";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createFromFetch, encodeReply } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { createFromFetch, encodeReply } from "react-server-dom-webpack/client.browser";
 var _statusCode = /* @__PURE__ */ new WeakMap(), _url = /* @__PURE__ */ new WeakMap(), _details = /* @__PURE__ */ new WeakMap();
 var CallServerError = /* @__PURE__ */ function(Error1) {
   "use strict";

package/dist/esm/client/index.js

@@ -1,11 +1,11 @@
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { createFromReadableStream, createServerReference } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from "react";
 import { createContext, useState } from "react";
+import { createFromReadableStream, createServerReference } from "react-server-dom-webpack/client.browser";
 import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
-import { createFromFetch } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { createFromFetch } from "react-server-dom-webpack/client.browser";
 function RscClientRoot(param) {
   var rscPayload = param.rscPayload;
   var elements = React.use(rscPayload);
@@ -15,17 +15,13 @@ function RscClientRoot(param) {
   });
 }
 var ElementsContext = /* @__PURE__ */ createContext(null);
-var JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
 var ServerElementsProvider = function(param) {
   var elements = param.elements, children = param.children;
-  return /* @__PURE__ */ _jsxs(_Fragment, {
-    children: [
-      /* @__PURE__ */ _jsx(ElementsContext.Provider, {
-        value: elements,
-        children
-      }),
-      JSX_SHELL_STREAM_END_MARK
-    ]
+  return /* @__PURE__ */ _jsx(_Fragment, {
+    children: /* @__PURE__ */ _jsx(ElementsContext.Provider, {
+      value: elements,
+      children
+    })
   });
 };
 var RSCServerSlot = function() {

package/dist/esm/server/rsc/index.js

@@ -1 +1,2 @@
 export * from "./rsc";
+export * from "./processRSCStream";

package/dist/esm/server/rsc/processRSCStream.js

@@ -0,0 +1,86 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+function processRSCStream(rscStream, controller, encoder) {
+  return _processRSCStream.apply(this, arguments);
+}
+function _processRSCStream() {
+  _processRSCStream = _async_to_generator(function(rscStream, controller, encoder) {
+    var reader, decoder, _ref, done, value, chunk, scriptTag, _String, base64, scriptTag1, remaining, scriptTag2, error;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          _state.trys.push([
+            0,
+            4,
+            ,
+            5
+          ]);
+          reader = rscStream.getReader();
+          decoder = new TextDecoder("utf-8", {
+            fatal: true
+          });
+          _state.label = 1;
+        case 1:
+          if (false)
+            return [
+              3,
+              3
+            ];
+          return [
+            4,
+            reader.read()
+          ];
+        case 2:
+          _ref = _state.sent(), done = _ref.done, value = _ref.value;
+          if (done)
+            return [
+              3,
+              3
+            ];
+          try {
+            chunk = JSON.stringify(decoder.decode(value, {
+              stream: true
+            }));
+            scriptTag = "<script>(self.__FLIGHT_DATA||=[]).push(".concat(chunk, ")</script>");
+            controller.enqueue(encoder.encode(scriptTag));
+          } catch (err) {
+            ;
+            base64 = JSON.stringify(btoa((_String = String).fromCodePoint.apply(_String, _to_consumable_array(value))));
+            scriptTag1 = "<script>(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(".concat(base64, "), m => m.codePointAt(0)))</script>");
+            controller.enqueue(encoder.encode(scriptTag1));
+          }
+          return [
+            3,
+            1
+          ];
+        case 3:
+          remaining = decoder.decode();
+          if (remaining.length) {
+            scriptTag2 = "<script>(self.__FLIGHT_DATA||=[]).push(".concat(JSON.stringify(remaining), ")</script>");
+            controller.enqueue(encoder.encode(scriptTag2));
+          }
+          controller.close();
+          return [
+            3,
+            5
+          ];
+        case 4:
+          error = _state.sent();
+          controller.error(error);
+          return [
+            3,
+            5
+          ];
+        case 5:
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return _processRSCStream.apply(this, arguments);
+}
+export {
+  processRSCStream
+};

package/dist/esm/server/rsc/rsc.js

@@ -1,11 +1,11 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { renderToReadableStream } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { renderToReadableStream as renderToReadableStream2 } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { decodeReply } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { createFromReadableStream } from "@modern-js/utils/react-server-dom-webpack/client.edge";
-import { registerClientReference, registerServerReference } from "@modern-js/utils/react-server-dom-webpack/server";
+import { renderToReadableStream } from "react-server-dom-webpack/server.edge";
+import { renderToReadableStream as renderToReadableStream2 } from "react-server-dom-webpack/server.edge";
+import { decodeReply } from "react-server-dom-webpack/server.edge";
+import { createFromReadableStream } from "react-server-dom-webpack/client.edge";
+import { registerClientReference, registerServerReference } from "react-server-dom-webpack/server";
 var renderRsc = function(options) {
   var readable = renderToReadableStream2(options.element, options.clientManifest);
   return readable;

package/dist/esm/server/ssr/ssr.js

@@ -55,7 +55,7 @@ var renderSSRStream = function() {
             4,
             Promise.all([
               import("../rsc"),
-              import("@modern-js/utils/react-server-dom-webpack/client.edge"),
+              import("react-server-dom-webpack/client.edge"),
               import("../../rsc-html-stream/server")
             ])
           ];

package/dist/esm-node/client/callServer.js

@@ -1,7 +1,7 @@
 import { _ as _class_private_field_get } from "@swc/helpers/_/_class_private_field_get";
 import { _ as _class_private_field_init } from "@swc/helpers/_/_class_private_field_init";
 import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_field_set";
-import { createFromFetch, encodeReply } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { createFromFetch, encodeReply } from "react-server-dom-webpack/client.browser";
 var _statusCode = /* @__PURE__ */ new WeakMap(), _url = /* @__PURE__ */ new WeakMap(), _details = /* @__PURE__ */ new WeakMap();
 class CallServerError extends Error {
   get statusCode() {

package/dist/esm-node/client/index.js

@@ -1,10 +1,10 @@
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
-import { createFromReadableStream, createServerReference } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from "react";
 import { createContext, useState } from "react";
+import { createFromReadableStream, createServerReference } from "react-server-dom-webpack/client.browser";
 import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
-import { createFromFetch } from "@modern-js/utils/react-server-dom-webpack/client.browser";
+import { createFromFetch } from "react-server-dom-webpack/client.browser";
 function RscClientRoot({ rscPayload }) {
   const elements = React.use(rscPayload);
   const [root, setRoot] = useState(elements);
@@ -13,16 +13,12 @@ function RscClientRoot({ rscPayload }) {
   });
 }
 const ElementsContext = /* @__PURE__ */ createContext(null);
-const JSX_SHELL_STREAM_END_MARK = "<!--<?- SHELL_STREAM_END ?>-->";
 const ServerElementsProvider = ({ elements, children }) => {
-  return /* @__PURE__ */ _jsxs(_Fragment, {
-    children: [
-      /* @__PURE__ */ _jsx(ElementsContext.Provider, {
-        value: elements,
-        children
-      }),
-      JSX_SHELL_STREAM_END_MARK
-    ]
+  return /* @__PURE__ */ _jsx(_Fragment, {
+    children: /* @__PURE__ */ _jsx(ElementsContext.Provider, {
+      value: elements,
+      children
+    })
   });
 };
 const RSCServerSlot = () => {

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

@@ -1 +1,2 @@
 export * from "./rsc";
+export * from "./processRSCStream";

package/dist/esm-node/server/rsc/processRSCStream.js

@@ -0,0 +1,35 @@
+async function processRSCStream(rscStream, controller, encoder) {
+  try {
+    const reader = rscStream.getReader();
+    const decoder = new TextDecoder("utf-8", {
+      fatal: true
+    });
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done)
+        break;
+      try {
+        const chunk = JSON.stringify(decoder.decode(value, {
+          stream: true
+        }));
+        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${chunk})</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      } catch (err) {
+        const base64 = JSON.stringify(btoa(String.fromCodePoint(...value)));
+        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      }
+    }
+    const remaining = decoder.decode();
+    if (remaining.length) {
+      const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})</script>`;
+      controller.enqueue(encoder.encode(scriptTag));
+    }
+    controller.close();
+  } catch (error) {
+    controller.error(error);
+  }
+}
+export {
+  processRSCStream
+};

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

@@ -1,8 +1,8 @@
-import { renderToReadableStream } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { renderToReadableStream as renderToReadableStream2 } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { decodeReply } from "@modern-js/utils/react-server-dom-webpack/server.edge";
-import { createFromReadableStream } from "@modern-js/utils/react-server-dom-webpack/client.edge";
-import { registerClientReference, registerServerReference } from "@modern-js/utils/react-server-dom-webpack/server";
+import { renderToReadableStream } from "react-server-dom-webpack/server.edge";
+import { renderToReadableStream as renderToReadableStream2 } from "react-server-dom-webpack/server.edge";
+import { decodeReply } from "react-server-dom-webpack/server.edge";
+import { createFromReadableStream } from "react-server-dom-webpack/client.edge";
+import { registerClientReference, registerServerReference } from "react-server-dom-webpack/server";
 const renderRsc = (options) => {
   const readable = renderToReadableStream2(options.element, options.clientManifest);
   return readable;

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

@@ -18,7 +18,7 @@ const renderSSRStream = async (children, options) => {
   try {
     const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
       import("../rsc"),
-      import("@modern-js/utils/react-server-dom-webpack/client.edge"),
+      import("react-server-dom-webpack/client.edge"),
       import("../../rsc-html-stream/server")
     ]);
     const rscStream = await renderRsc({

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

@@ -1,3 +1,3 @@
-import type { ReactServerValue } from '@modern-js/utils/react-server-dom-webpack';
+import type { ReactServerValue } from 'react-server-dom-webpack';
 export declare function requestCallServer(id: string, args: ReactServerValue): Promise<Response>;
 export declare function callServer(id: string, args: ReactServerValue): Promise<any>;

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

@@ -1,10 +1,10 @@
-import { createFromReadableStream, createServerReference } from '@modern-js/utils/react-server-dom-webpack/client.browser';
 import React from 'react';
 import { type ReactNode } from 'react';
+import { createFromReadableStream, createServerReference } from 'react-server-dom-webpack/client.browser';
 export { rscStream } from '../rsc-html-stream/client';
 export { createFromReadableStream, createServerReference };
 export { callServer } from './callServer';
-export { createFromFetch } from '@modern-js/utils/react-server-dom-webpack/client.browser';
+export { createFromFetch } from 'react-server-dom-webpack/client.browser';
 declare global {
     interface Window {
         __MODERN_JS_ENTRY_NAME?: string;

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

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

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

@@ -0,0 +1 @@
+export declare function processRSCStream(rscStream: ReadableStream, controller: ReadableStreamDefaultController<Uint8Array>, encoder: TextEncoder): Promise<void>;

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

@@ -1,7 +1,7 @@
-export { renderToReadableStream } from '@modern-js/utils/react-server-dom-webpack/server.edge';
+export { renderToReadableStream } from 'react-server-dom-webpack/server.edge';
 import type { ClientManifest } from '@modern-js/types/server';
-export { createFromReadableStream } from '@modern-js/utils/react-server-dom-webpack/client.edge';
-export { registerClientReference, registerServerReference, } from '@modern-js/utils/react-server-dom-webpack/server';
+export { createFromReadableStream } from 'react-server-dom-webpack/client.edge';
+export { registerClientReference, registerServerReference, } from 'react-server-dom-webpack/server';
 type RenderRscOptions = {
     element: React.ReactElement;
     clientManifest: ClientManifest;

package/package.json

@@ -15,15 +15,15 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.4",
+  "version": "2.69.6",
   "files": [
     "dist",
     "hook.d.ts"
   ],
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@modern-js/types": "2.69.4",
-    "@modern-js/utils": "2.69.4"
+    "@modern-js/types": "2.69.6",
+    "@modern-js/utils": "2.69.6"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -33,11 +33,12 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5",
-    "@modern-js/server-core": "2.69.4"
+    "@modern-js/server-core": "2.69.6"
   },
   "peerDependencies": {
     "react": ">=17.0.0",
-    "react-dom": ">=17.0.0"
+    "react-dom": ">=17.0.0",
+    "react-server-dom-webpack": "^19.0.3"
   },
   "exports": {
     "./ssr": {