@modern-js/render 3.0.0-alpha.1 → 3.0.0

package/dist/cjs/client/index.js

@@ -30,6 +30,7 @@ var client_exports = {};
 __export(client_exports, {
   ElementsContext: () => ElementsContext,
   RSCServerSlot: () => RSCServerSlot,
+  ResetRootContext: () => ResetRootContext,
   RscClientRoot: () => RscClientRoot,
   ServerElementsProvider: () => ServerElementsProvider,
   callServer: () => import_callServer.callServer,
@@ -46,10 +47,14 @@ 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("react-server-dom-webpack/client.browser");
+const ResetRootContext = /* @__PURE__ */ (0, import_react2.createContext)(void 0);
 function RscClientRoot({ rscPayload }) {
   const elements = import_react.default.use(rscPayload);
   const [root, setRoot] = (0, import_react2.useState)(elements);
-  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
+  return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(ResetRootContext.Provider, {
+    value: {
+      setRoot
+    },
     children: root
   });
 }
@@ -70,6 +75,7 @@ const RSCServerSlot = () => {
 0 && (module.exports = {
   ElementsContext,
   RSCServerSlot,
+  ResetRootContext,
   RscClientRoot,
   ServerElementsProvider,
   callServer,

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

@@ -21,6 +21,9 @@ __export(processRSCStream_exports, {
   processRSCStream: () => processRSCStream
 });
 module.exports = __toCommonJS(processRSCStream_exports);
+function escapeScript(script) {
+  return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
+}
 async function processRSCStream(rscStream, controller, encoder) {
   try {
     const reader = rscStream.getReader();
@@ -29,23 +32,25 @@ async function processRSCStream(rscStream, controller, encoder) {
     });
     while (true) {
       const { done, value } = await reader.read();
-      if (done)
-        break;
+      if (done) break;
       try {
         const chunk = JSON.stringify(decoder.decode(value, {
           stream: true
         }));
-        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${chunk})</script>`;
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${chunk})`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</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>`;
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
         controller.enqueue(encoder.encode(scriptTag));
       }
     }
     const remaining = decoder.decode();
     if (remaining.length) {
-      const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})</script>`;
+      const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})`;
+      const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
       controller.enqueue(encoder.encode(scriptTag));
     }
     controller.close();

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

@@ -40,7 +40,7 @@ const handleAction = async (req, options) => {
   if (serverReference) {
     const [filepath, name] = serverReference.split("#");
     const action = __webpack_require__(filepath)[name || "default"];
-    if (action.$$typeof !== Symbol.for("react.server.reference")) {
+    if (action.$$typeof !== /* @__PURE__ */ Symbol.for("react.server.reference")) {
       throw new Error("Invalid action");
     }
     const { clientManifest } = options;

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

@@ -33,7 +33,7 @@ __export(ssr_exports, {
 module.exports = __toCommonJS(ssr_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_server = require("react-dom/server.edge");
-var import_client = require("../../client");
+var import_client = require("../../client/index");
 function wrapStream(stream, originalStream) {
   const wrappedStream = Object.create(stream);
   for (const prop of Object.keys(originalStream)) {
@@ -50,7 +50,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("../rsc/index"))),
       Promise.resolve().then(() => __toESM(require("react-server-dom-webpack/client.edge"))),
       Promise.resolve().then(() => __toESM(require("../../rsc-html-stream/server")))
     ]);

package/dist/esm/client/callServer.js

@@ -1,45 +1,21 @@
-import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
-import { _ as _call_super } from "@swc/helpers/_/_call_super";
-import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 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 { _ as _create_class } from "@swc/helpers/_/_create_class";
-import { _ as _inherits } from "@swc/helpers/_/_inherits";
-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 "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";
-  _inherits(CallServerError2, Error1);
-  function CallServerError2(message, statusCode) {
-    var url = arguments.length > 2 && arguments[2] !== void 0 ? arguments[2] : "", details = arguments.length > 3 && arguments[3] !== void 0 ? arguments[3] : {};
-    _class_call_check(this, CallServerError2);
-    var _this;
-    var formattedMessage = "Call Server Action failed (".concat(statusCode, "): ").concat(message, "\nURL: ").concat(url);
-    _this = _call_super(this, CallServerError2, [
-      formattedMessage
-    ]), _class_private_field_init(_this, _statusCode, {
-      writable: true,
-      value: void 0
-    }), _class_private_field_init(_this, _url, {
-      writable: true,
-      value: void 0
-    }), _class_private_field_init(_this, _details, {
-      writable: true,
-      value: void 0
-    });
-    _this.name = "CallServerError";
-    _class_private_field_set(_this, _statusCode, statusCode);
-    _class_private_field_set(_this, _url, url);
-    _class_private_field_set(_this, _details, details);
-    return _this;
+class CallServerError extends Error {
+  get statusCode() {
+    return _class_private_field_get(this, _statusCode);
   }
-  var _proto = CallServerError2.prototype;
-  _proto.toJSON = function toJSON() {
+  get url() {
+    return _class_private_field_get(this, _url);
+  }
+  get details() {
+    return {
+      ..._class_private_field_get(this, _details)
+    };
+  }
+  toJSON() {
     return {
       name: this.name,
       message: this.message,
@@ -47,117 +23,61 @@ var CallServerError = /* @__PURE__ */ function(Error1) {
       url: _class_private_field_get(this, _url),
       details: _class_private_field_get(this, _details)
     };
-  };
-  _create_class(CallServerError2, [
-    {
-      key: "statusCode",
-      get: function get() {
-        return _class_private_field_get(this, _statusCode);
-      }
-    },
-    {
-      key: "url",
-      get: function get() {
-        return _class_private_field_get(this, _url);
-      }
-    },
-    {
-      key: "details",
-      get: function get() {
-        return _object_spread({}, _class_private_field_get(this, _details));
-      }
-    }
-  ]);
-  return CallServerError2;
-}(_wrap_native_super(Error));
-function requestCallServer(id, args) {
-  return _requestCallServer.apply(this, arguments);
-}
-function _requestCallServer() {
-  _requestCallServer = _async_to_generator(function(id, args) {
-    var entryName, url, response, _tmp, _tmp1, error;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          entryName = window.__MODERN_JS_ENTRY_NAME;
-          url = entryName === "main" ? "/" : "/".concat(entryName);
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            4,
-            ,
-            5
-          ]);
-          _tmp = [
-            url
-          ];
-          _tmp1 = {
-            method: "POST",
-            headers: {
-              Accept: "text/x-component",
-              "x-rsc-action": id
-            }
-          };
-          return [
-            4,
-            encodeReply(args)
-          ];
-        case 2:
-          return [
-            4,
-            fetch.apply(void 0, _tmp.concat([
-              (_tmp1.body = _state.sent(), _tmp1)
-            ]))
-          ];
-        case 3:
-          response = _state.sent();
-          if (!response.ok) {
-            throw new CallServerError(response.statusText, response.status, url, {
-              id,
-              args
-            });
-          }
-          return [
-            2,
-            response
-          ];
-        case 4:
-          error = _state.sent();
-          if (_instanceof(error, CallServerError)) {
-            throw error;
-          }
-          throw new CallServerError(_instanceof(error, Error) ? error.message : "Unknown error", 1, url, {
-            id,
-            args
-          });
-        case 5:
-          return [
-            2
-          ];
-      }
+  }
+  constructor(message, statusCode, url = "", details = {}) {
+    const formattedMessage = `Call Server Action failed (${statusCode}): ${message}
+URL: ${url}`;
+    super(formattedMessage), _class_private_field_init(this, _statusCode, {
+      writable: true,
+      value: void 0
+    }), _class_private_field_init(this, _url, {
+      writable: true,
+      value: void 0
+    }), _class_private_field_init(this, _details, {
+      writable: true,
+      value: void 0
     });
-  });
-  return _requestCallServer.apply(this, arguments);
-}
-function callServer(id, args) {
-  return _callServer.apply(this, arguments);
+    this.name = "CallServerError";
+    _class_private_field_set(this, _statusCode, statusCode);
+    _class_private_field_set(this, _url, url);
+    _class_private_field_set(this, _details, details);
+  }
 }
-function _callServer() {
-  _callServer = _async_to_generator(function(id, args) {
-    var response, res;
-    return _ts_generator(this, function(_state) {
-      response = requestCallServer(id, args);
-      res = createFromFetch(response, {
-        callServer
+async function requestCallServer(id, args) {
+  const entryName = window.__MODERN_JS_ENTRY_NAME;
+  const url = entryName === "main" ? "/" : `/${entryName}`;
+  try {
+    const response = await fetch(url, {
+      method: "POST",
+      headers: {
+        Accept: "text/x-component",
+        "x-rsc-action": id
+      },
+      body: await encodeReply(args)
+    });
+    if (!response.ok) {
+      throw new CallServerError(response.statusText, response.status, url, {
+        id,
+        args
       });
-      return [
-        2,
-        res
-      ];
+    }
+    return response;
+  } catch (error) {
+    if (error instanceof CallServerError) {
+      throw error;
+    }
+    throw new CallServerError(error instanceof Error ? error.message : "Unknown error", 1, url, {
+      id,
+      args
     });
+  }
+}
+async function callServer(id, args) {
+  const response = requestCallServer(id, args);
+  const res = createFromFetch(response, {
+    callServer
   });
-  return _callServer.apply(this, arguments);
+  return res;
 }
 export {
   callServer,

package/dist/esm/client/index.js

@@ -1,4 +1,3 @@
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from "react";
 import { createContext, useState } from "react";
@@ -6,17 +5,19 @@ import { createFromReadableStream, createServerReference } from "react-server-do
 import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
 import { createFromFetch } from "react-server-dom-webpack/client.browser";
-function RscClientRoot(param) {
-  var rscPayload = param.rscPayload;
-  var elements = React.use(rscPayload);
-  var _useState = _sliced_to_array(useState(elements), 2), root = _useState[0], setRoot = _useState[1];
-  return /* @__PURE__ */ _jsx(_Fragment, {
+const ResetRootContext = /* @__PURE__ */ createContext(void 0);
+function RscClientRoot({ rscPayload }) {
+  const elements = React.use(rscPayload);
+  const [root, setRoot] = useState(elements);
+  return /* @__PURE__ */ _jsx(ResetRootContext.Provider, {
+    value: {
+      setRoot
+    },
     children: root
   });
 }
-var ElementsContext = /* @__PURE__ */ createContext(null);
-var ServerElementsProvider = function(param) {
-  var elements = param.elements, children = param.children;
+const ElementsContext = /* @__PURE__ */ createContext(null);
+const ServerElementsProvider = ({ elements, children }) => {
   return /* @__PURE__ */ _jsx(_Fragment, {
     children: /* @__PURE__ */ _jsx(ElementsContext.Provider, {
       value: elements,
@@ -24,13 +25,14 @@ var ServerElementsProvider = function(param) {
     })
   });
 };
-var RSCServerSlot = function() {
-  var elements = React.use(ElementsContext);
+const RSCServerSlot = () => {
+  const elements = React.use(ElementsContext);
   return elements;
 };
 export {
   ElementsContext,
   RSCServerSlot,
+  ResetRootContext,
   RscClientRoot,
   ServerElementsProvider,
   callServer,

package/dist/esm/rsc-html-stream/client.js

@@ -1,11 +1,11 @@
-var encoder = new TextEncoder();
-var streamController;
-var rscStream = new ReadableStream({
-  start: function start(controller) {
+const encoder = new TextEncoder();
+let streamController;
+const rscStream = new ReadableStream({
+  start(controller) {
     if (typeof window === "undefined") {
       return;
     }
-    var handleChunk = function(chunk) {
+    const handleChunk = (chunk) => {
       if (typeof chunk === "string") {
         controller.enqueue(encoder.encode(chunk));
       } else {
@@ -14,14 +14,14 @@ var rscStream = new ReadableStream({
     };
     window.__FLIGHT_DATA = window.__FLIGHT_DATA || [];
     window.__FLIGHT_DATA.forEach(handleChunk);
-    window.__FLIGHT_DATA.push = function(chunk) {
+    window.__FLIGHT_DATA.push = (chunk) => {
       handleChunk(chunk);
     };
     streamController = controller;
   }
 });
 if (typeof document !== "undefined" && document.readyState === "loading") {
-  document.addEventListener("DOMContentLoaded", function() {
+  document.addEventListener("DOMContentLoaded", () => {
     streamController === null || streamController === void 0 ? void 0 : streamController.close();
   });
 } else {

package/dist/esm/rsc-html-stream/server.js

@@ -1,212 +1,70 @@
-import { _ as _async_iterator } from "@swc/helpers/_/_async_iterator";
-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";
-var encoder = new TextEncoder();
-var trailer = "</body></html>";
-function injectRSCPayload(rscStream, param) {
-  var _param_injectClosingTags = param.injectClosingTags, injectClosingTags = _param_injectClosingTags === void 0 ? true : _param_injectClosingTags;
-  var decoder = new TextDecoder();
-  var resolveFlightDataPromise;
-  var flightDataPromise = new Promise(function(resolve) {
-    return resolveFlightDataPromise = resolve;
-  });
-  var startedRSC = false;
-  var buffered = [];
-  var timeout = null;
+const encoder = new TextEncoder();
+const trailer = "</body></html>";
+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) {
-    var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-    try {
-      for (var _iterator = buffered[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-        var chunk = _step.value;
-        var buf = decoder.decode(chunk);
-        if (buf.endsWith(trailer)) {
-          buf = buf.slice(0, -trailer.length);
-        }
-        controller.enqueue(encoder.encode(buf));
-      }
-    } catch (err) {
-      _didIteratorError = true;
-      _iteratorError = err;
-    } finally {
-      try {
-        if (!_iteratorNormalCompletion && _iterator.return != null) {
-          _iterator.return();
-        }
-      } finally {
-        if (_didIteratorError) {
-          throw _iteratorError;
-        }
+    for (const chunk of buffered) {
+      let buf = decoder.decode(chunk);
+      if (buf.endsWith(trailer)) {
+        buf = buf.slice(0, -trailer.length);
       }
+      controller.enqueue(encoder.encode(buf));
     }
     buffered.length = 0;
     timeout = null;
   }
   return new TransformStream({
-    transform: function transform(chunk, controller) {
+    transform(chunk, controller) {
       buffered.push(chunk);
       if (timeout) {
         return;
       }
-      timeout = setTimeout(/* @__PURE__ */ _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-          flushBufferedChunks(controller);
-          if (!startedRSC) {
-            startedRSC = true;
-            writeRSCStream(rscStream, controller).catch(function(err) {
-              return controller.error(err);
-            }).then(function() {
-              return resolveFlightDataPromise();
-            });
-          }
-          return [
-            2
-          ];
-        });
-      }), 0);
+      timeout = setTimeout(async () => {
+        flushBufferedChunks(controller);
+        if (!startedRSC) {
+          startedRSC = true;
+          writeRSCStream(rscStream, controller).catch((err) => controller.error(err)).then(() => resolveFlightDataPromise());
+        }
+      }, 0);
     },
-    flush: function flush(controller) {
-      return _async_to_generator(function() {
-        return _ts_generator(this, function(_state) {
-          switch (_state.label) {
-            case 0:
-              return [
-                4,
-                flightDataPromise
-              ];
-            case 1:
-              _state.sent();
-              if (timeout) {
-                clearTimeout(timeout);
-                flushBufferedChunks(controller);
-              }
-              if (injectClosingTags) {
-                controller.enqueue(encoder.encode("</body></html>"));
-              }
-              return [
-                2
-              ];
-          }
-        });
-      })();
+    async flush(controller) {
+      await flightDataPromise;
+      if (timeout) {
+        clearTimeout(timeout);
+        flushBufferedChunks(controller);
+      }
+      if (injectClosingTags) {
+        controller.enqueue(encoder.encode("</body></html>"));
+      }
     }
   });
 }
-function writeRSCStream(rscStream, controller) {
-  return _writeRSCStream.apply(this, arguments);
-}
-function _writeRSCStream() {
-  _writeRSCStream = _async_to_generator(function(rscStream, controller) {
-    var decoder, _iteratorAbruptCompletion, _didIteratorError, _iteratorError, _iterator, _step, _value, chunk, _String, base64, err, remaining;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          decoder = new TextDecoder("utf-8", {
-            fatal: true
-          });
-          _iteratorAbruptCompletion = false, _didIteratorError = false;
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            6,
-            7,
-            12
-          ]);
-          _iterator = _async_iterator(rscStream);
-          _state.label = 2;
-        case 2:
-          return [
-            4,
-            _iterator.next()
-          ];
-        case 3:
-          if (!(_iteratorAbruptCompletion = !(_step = _state.sent()).done))
-            return [
-              3,
-              5
-            ];
-          _value = _step.value;
-          chunk = _value;
-          try {
-            writeChunk(JSON.stringify(decoder.decode(chunk, {
-              stream: true
-            })), controller);
-          } catch (err2) {
-            ;
-            base64 = JSON.stringify(btoa((_String = String).fromCodePoint.apply(_String, _to_consumable_array(chunk))));
-            writeChunk("Uint8Array.from(atob(".concat(base64, "), m => m.codePointAt(0))"), controller);
-          }
-          _state.label = 4;
-        case 4:
-          _iteratorAbruptCompletion = false;
-          return [
-            3,
-            2
-          ];
-        case 5:
-          return [
-            3,
-            12
-          ];
-        case 6:
-          err = _state.sent();
-          _didIteratorError = true;
-          _iteratorError = err;
-          return [
-            3,
-            12
-          ];
-        case 7:
-          _state.trys.push([
-            7,
-            ,
-            10,
-            11
-          ]);
-          if (!(_iteratorAbruptCompletion && _iterator.return != null))
-            return [
-              3,
-              9
-            ];
-          return [
-            4,
-            _iterator.return()
-          ];
-        case 8:
-          _state.sent();
-          _state.label = 9;
-        case 9:
-          return [
-            3,
-            11
-          ];
-        case 10:
-          if (_didIteratorError) {
-            throw _iteratorError;
-          }
-          return [
-            7
-          ];
-        case 11:
-          return [
-            7
-          ];
-        case 12:
-          remaining = decoder.decode();
-          if (remaining.length) {
-            writeChunk(JSON.stringify(remaining), controller);
-          }
-          return [
-            2
-          ];
-      }
-    });
+async function writeRSCStream(rscStream, controller) {
+  const decoder = new TextDecoder("utf-8", {
+    fatal: true
   });
-  return _writeRSCStream.apply(this, arguments);
+  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 remaining = decoder.decode();
+  if (remaining.length) {
+    writeChunk(JSON.stringify(remaining), controller);
+  }
 }
 function writeChunk(chunk, controller) {
-  controller.enqueue(encoder.encode("<script>".concat(escapeScript("(self.__FLIGHT_DATA||=[]).push(".concat(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");

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

@@ -1,85 +1,39 @@
-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 escapeScript(script) {
+  return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
 }
-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
-          ];
-      }
+async function processRSCStream(rscStream, controller, encoder) {
+  try {
+    const reader = rscStream.getReader();
+    const decoder = new TextDecoder("utf-8", {
+      fatal: true
     });
-  });
-  return _processRSCStream.apply(this, arguments);
+    while (true) {
+      const { done, value } = await reader.read();
+      if (done) break;
+      try {
+        const chunk = JSON.stringify(decoder.decode(value, {
+          stream: true
+        }));
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${chunk})`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      } catch (err) {
+        const base64 = JSON.stringify(btoa(String.fromCodePoint(...value)));
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
+        controller.enqueue(encoder.encode(scriptTag));
+      }
+    }
+    const remaining = decoder.decode();
+    if (remaining.length) {
+      const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})`;
+      const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
+      controller.enqueue(encoder.encode(scriptTag));
+    }
+    controller.close();
+  } catch (error) {
+    controller.error(error);
+  }
 }
 export {
   processRSCStream

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

@@ -1,99 +1,47 @@
-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 "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);
+const renderRsc = (options) => {
+  const readable = renderToReadableStream2(options.element, options.clientManifest);
   return readable;
 };
-var handleAction = function() {
-  var _ref = _async_to_generator(function(req, options) {
-    var serverReference, _serverReference_split, filepath, name, action, clientManifest, contentType, args, formData, text, result, stream, response;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          serverReference = req.headers.get("x-rsc-action");
-          if (!serverReference)
-            return [
-              3,
-              7
-            ];
-          _serverReference_split = _sliced_to_array(serverReference.split("#"), 2), filepath = _serverReference_split[0], name = _serverReference_split[1];
-          action = __webpack_require__(filepath)[name || "default"];
-          if (action.$$typeof !== Symbol.for("react.server.reference")) {
-            throw new Error("Invalid action");
-          }
-          clientManifest = options.clientManifest;
-          contentType = req.headers.get("content-type");
-          if (!(contentType === null || contentType === void 0 ? void 0 : contentType.includes("multipart/form-data")))
-            return [
-              3,
-              3
-            ];
-          return [
-            4,
-            req.formData()
-          ];
-        case 1:
-          formData = _state.sent();
-          return [
-            4,
-            decodeReply(formData)
-          ];
-        case 2:
-          args = _state.sent();
-          return [
-            3,
-            6
-          ];
-        case 3:
-          return [
-            4,
-            req.text()
-          ];
-        case 4:
-          text = _state.sent();
-          return [
-            4,
-            decodeReply(text)
-          ];
-        case 5:
-          args = _state.sent();
-          _state.label = 6;
-        case 6:
-          result = action.apply(null, args);
-          stream = renderRsc({
-            element: result,
-            clientManifest
-          });
-          response = new Response(stream, {
-            status: 200,
-            headers: {
-              "Content-Type": "text/html"
-            }
-          });
-          return [
-            2,
-            response
-          ];
-        case 7:
-          return [
-            2,
-            new Response("Cannot find server reference", {
-              status: 404
-            })
-          ];
+const handleAction = async (req, options) => {
+  const serverReference = req.headers.get("x-rsc-action");
+  if (serverReference) {
+    const [filepath, name] = serverReference.split("#");
+    const action = __webpack_require__(filepath)[name || "default"];
+    if (action.$$typeof !== /* @__PURE__ */ Symbol.for("react.server.reference")) {
+      throw new Error("Invalid action");
+    }
+    const { clientManifest } = options;
+    const contentType = req.headers.get("content-type");
+    let args;
+    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 result = action.apply(null, args);
+    const stream = renderRsc({
+      element: result,
+      clientManifest
+    });
+    const response = new Response(stream, {
+      status: 200,
+      headers: {
+        "Content-Type": "text/html"
       }
     });
+    return response;
+  }
+  return new Response("Cannot find server reference", {
+    status: 404
   });
-  return function handleAction2(req, options) {
-    return _ref.apply(this, arguments);
-  };
-}();
+};
 export {
   createFromReadableStream,
   handleAction,

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

@@ -1,112 +1,46 @@
-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 { jsx as _jsx } from "react/jsx-runtime";
 import { renderToReadableStream } from "react-dom/server.edge";
-import { ServerElementsProvider } from "../../client";
+import { ServerElementsProvider } from "../../client/index";
 function wrapStream(stream, originalStream) {
-  var wrappedStream = Object.create(stream);
-  var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
-  try {
-    for (var _iterator = Object.keys(originalStream)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true) {
-      var prop = _step.value;
-      if (!(prop in wrappedStream)) {
-        wrappedStream[prop] = originalStream[prop];
-      }
-    }
-  } catch (err) {
-    _didIteratorError = true;
-    _iteratorError = err;
-  } finally {
-    try {
-      if (!_iteratorNormalCompletion && _iterator.return != null) {
-        _iterator.return();
-      }
-    } finally {
-      if (_didIteratorError) {
-        throw _iteratorError;
-      }
+  const wrappedStream = Object.create(stream);
+  for (const prop of Object.keys(originalStream)) {
+    if (!(prop in wrappedStream)) {
+      wrappedStream[prop] = originalStream[prop];
     }
   }
   return wrappedStream;
 }
-var renderSSRStream = function() {
-  var _ref = _async_to_generator(function(children, options) {
-    var clientManifest, ssrManifest, rscRoot, _ref2, renderRsc, createFromReadableStream, injectRSCPayload, rscStream, _rscStream_tee, rscElementStream, rscPayloadStream, elements, htmlStream, error;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          clientManifest = options.clientManifest, ssrManifest = options.ssrManifest, rscRoot = options.rscRoot;
-          if (!clientManifest || !ssrManifest) {
-            return [
-              2,
-              renderToReadableStream(children, options)
-            ];
-          }
-          _state.label = 1;
-        case 1:
-          _state.trys.push([
-            1,
-            5,
-            ,
-            6
-          ]);
-          return [
-            4,
-            Promise.all([
-              import("../rsc"),
-              import("react-server-dom-webpack/client.edge"),
-              import("../../rsc-html-stream/server")
-            ])
-          ];
-        case 2:
-          _ref2 = _sliced_to_array.apply(void 0, [
-            _state.sent(),
-            3
-          ]), renderRsc = _ref2[0].renderRsc, createFromReadableStream = _ref2[1].createFromReadableStream, injectRSCPayload = _ref2[2].injectRSCPayload;
-          return [
-            4,
-            renderRsc({
-              element: rscRoot || children,
-              clientManifest
-            })
-          ];
-        case 3:
-          rscStream = _state.sent();
-          _rscStream_tee = _sliced_to_array(rscStream.tee(), 2), rscElementStream = _rscStream_tee[0], rscPayloadStream = _rscStream_tee[1];
-          elements = createFromReadableStream(rscElementStream, {
-            serverConsumerManifest: ssrManifest
-          });
-          return [
-            4,
-            renderToReadableStream(/* @__PURE__ */ _jsx(ServerElementsProvider, {
-              elements,
-              children
-            }), options)
-          ];
-        case 4:
-          htmlStream = _state.sent();
-          return [
-            2,
-            wrapStream(htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
-              injectClosingTags: false
-            })), htmlStream)
-          ];
-        case 5:
-          error = _state.sent();
-          console.error(error);
-          throw error;
-        case 6:
-          return [
-            2
-          ];
-      }
+const renderSSRStream = async (children, options) => {
+  const { clientManifest, ssrManifest, rscRoot } = options;
+  if (!clientManifest || !ssrManifest) {
+    return renderToReadableStream(children, options);
+  }
+  try {
+    const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
+      import("../rsc/index"),
+      import("react-server-dom-webpack/client.edge"),
+      import("../../rsc-html-stream/server")
+    ]);
+    const rscStream = await renderRsc({
+      element: rscRoot || children,
+      clientManifest
     });
-  });
-  return function renderSSRStream2(children, options) {
-    return _ref.apply(this, arguments);
-  };
-}();
+    const [rscElementStream, rscPayloadStream] = rscStream.tee();
+    const elements = createFromReadableStream(rscElementStream, {
+      serverConsumerManifest: ssrManifest
+    });
+    const htmlStream = await renderToReadableStream(/* @__PURE__ */ _jsx(ServerElementsProvider, {
+      elements,
+      children
+    }), options);
+    return wrapStream(htmlStream.pipeThrough(injectRSCPayload(rscPayloadStream, {
+      injectClosingTags: false
+    })), htmlStream);
+  } catch (error) {
+    console.error(error);
+    throw error;
+  }
+};
 export {
   renderSSRStream
 };

package/dist/esm-node/client/{index.js → index.mjs}

@@ -2,13 +2,17 @@ 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 { rscStream } from "../rsc-html-stream/client.mjs";
+import { callServer } from "./callServer.mjs";
 import { createFromFetch } from "react-server-dom-webpack/client.browser";
+const ResetRootContext = /* @__PURE__ */ createContext(void 0);
 function RscClientRoot({ rscPayload }) {
   const elements = React.use(rscPayload);
   const [root, setRoot] = useState(elements);
-  return /* @__PURE__ */ _jsx(_Fragment, {
+  return /* @__PURE__ */ _jsx(ResetRootContext.Provider, {
+    value: {
+      setRoot
+    },
     children: root
   });
 }
@@ -28,6 +32,7 @@ const RSCServerSlot = () => {
 export {
   ElementsContext,
   RSCServerSlot,
+  ResetRootContext,
   RscClientRoot,
   ServerElementsProvider,
   callServer,

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

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

package/dist/esm-node/server/rsc/{processRSCStream.js → processRSCStream.mjs}

@@ -1,3 +1,6 @@
+function escapeScript(script) {
+  return script.replace(/<!--/g, "<\\!--").replace(/<\/(script)/gi, "</\\$1");
+}
 async function processRSCStream(rscStream, controller, encoder) {
   try {
     const reader = rscStream.getReader();
@@ -6,23 +9,25 @@ async function processRSCStream(rscStream, controller, encoder) {
     });
     while (true) {
       const { done, value } = await reader.read();
-      if (done)
-        break;
+      if (done) break;
       try {
         const chunk = JSON.stringify(decoder.decode(value, {
           stream: true
         }));
-        const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${chunk})</script>`;
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${chunk})`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</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>`;
+        const scriptContent = `(self.__FLIGHT_DATA||=[]).push(Uint8Array.from(atob(${base64}), m => m.codePointAt(0)))`;
+        const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
         controller.enqueue(encoder.encode(scriptTag));
       }
     }
     const remaining = decoder.decode();
     if (remaining.length) {
-      const scriptTag = `<script>(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})</script>`;
+      const scriptContent = `(self.__FLIGHT_DATA||=[]).push(${JSON.stringify(remaining)})`;
+      const scriptTag = `<script>${escapeScript(scriptContent)}</script>`;
       controller.enqueue(encoder.encode(scriptTag));
     }
     controller.close();

package/dist/esm-node/server/rsc/{rsc.js → rsc.mjs}

@@ -12,7 +12,7 @@ const handleAction = async (req, options) => {
   if (serverReference) {
     const [filepath, name] = serverReference.split("#");
     const action = __webpack_require__(filepath)[name || "default"];
-    if (action.$$typeof !== Symbol.for("react.server.reference")) {
+    if (action.$$typeof !== /* @__PURE__ */ Symbol.for("react.server.reference")) {
       throw new Error("Invalid action");
     }
     const { clientManifest } = options;

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

@@ -0,0 +1 @@
+export * from "./ssr.mjs";

package/dist/esm-node/server/ssr/{ssr.js → ssr.mjs}

@@ -1,6 +1,6 @@
 import { jsx as _jsx } from "react/jsx-runtime";
 import { renderToReadableStream } from "react-dom/server.edge";
-import { ServerElementsProvider } from "../../client";
+import { ServerElementsProvider } from "../../client/index.mjs";
 function wrapStream(stream, originalStream) {
   const wrappedStream = Object.create(stream);
   for (const prop of Object.keys(originalStream)) {
@@ -17,9 +17,9 @@ const renderSSRStream = async (children, options) => {
   }
   try {
     const [{ renderRsc }, { createFromReadableStream }, { injectRSCPayload }] = await Promise.all([
-      import("../rsc"),
+      import("../rsc/index.mjs"),
       import("react-server-dom-webpack/client.edge"),
-      import("../../rsc-html-stream/server")
+      import("../../rsc-html-stream/server.mjs")
     ]);
     const rscStream = await renderRsc({
       element: rscRoot || children,

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

@@ -10,6 +10,9 @@ declare global {
         __MODERN_JS_ENTRY_NAME?: string;
     }
 }
+export declare const ResetRootContext: React.Context<{
+    setRoot: (root: React.ReactNode) => void;
+} | undefined>;
 export declare function RscClientRoot({ rscPayload, }: {
     rscPayload: Promise<React.ReactNode>;
 }): React.JSX.Element;

package/package.json

@@ -15,27 +15,28 @@
     "modern",
     "modern.js"
   ],
-  "version": "3.0.0-alpha.1",
+  "version": "3.0.0",
   "files": [
     "dist",
     "hook.d.ts"
   ],
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "@modern-js/utils": "3.0.0-alpha.1",
-    "@modern-js/types": "3.0.0-alpha.1"
+    "@modern-js/types": "3.0.0",
+    "@modern-js/utils": "3.0.0"
   },
   "devDependencies": {
-    "@rslib/core": "0.19.1",
-    "@types/react": "^19.2.7",
+    "@rslib/core": "0.19.4",
+    "@types/react": "^19.2.10",
     "@types/react-dom": "^19.2.3",
-    "react": "^19.2.3",
-    "react-dom": "^19.2.3",
+    "react": "^19.2.4",
+    "react-dom": "^19.2.4",
     "react-server-dom-webpack": "^19.2.3",
     "typescript": "^5",
-    "@modern-js/rslib": "2.68.10",
-    "@modern-js/server-core": "3.0.0-alpha.1",
-    "@scripts/rstest-config": "2.66.0"
+    "@modern-js/server-core": "3.0.0",
+    "@scripts/build": "2.66.0",
+    "@scripts/rstest-config": "2.66.0",
+    "@modern-js/rslib": "2.68.10"
   },
   "peerDependencies": {
     "react": ">=17.0.2",
@@ -45,17 +46,14 @@
   "exports": {
     "./ssr": {
       "types": "./dist/types/server/ssr/index.d.ts",
-      "jsnext:source": "./src/server/ssr/index.ts",
       "default": "./dist/esm/server/ssr/index.js"
     },
     "./rsc": {
       "types": "./dist/types/server/rsc/index.d.ts",
-      "jsnext:source": "./src/server/rsc/index.ts",
       "default": "./dist/esm/server/rsc/index.js"
     },
     "./client": {
       "types": "./dist/types/client/index.d.ts",
-      "jsnext:source": "./src/client/index.tsx",
       "default": "./dist/esm/client/index.js"
     }
   },

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

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

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

@@ -1 +0,0 @@
-export * from "./ssr";