@modern-js/runtime 2.69.4 → 2.69.6

package/dist/cjs/core/server/stream/shared.js

@@ -26,6 +26,7 @@ __export(shared_exports, {
 module.exports = __toCommonJS(shared_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_time = require("@modern-js/runtime-utils/time");
+var import_common = require("../../../common");
 var import_wrapper = require("../../react/wrapper");
 var import_tracer = require("../tracer");
 var import_utils = require("../utils");
@@ -61,15 +62,18 @@ function createRenderStreaming(createReadableStreamPromise) {
     const { onError, onTiming } = options;
     const { htmlTemplate, entryName } = resource;
     const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
-    const RSCServerRoot = ({ children }) => {
-      return /* @__PURE__ */ (0, import_jsx_runtime.jsx)(import_jsx_runtime.Fragment, {
-        children
+    const StreamServerRootWrapper = ({ children }) => {
+      return /* @__PURE__ */ (0, import_jsx_runtime.jsxs)(import_jsx_runtime.Fragment, {
+        children: [
+          children,
+          import_common.JSX_SHELL_STREAM_END_MARK
+        ]
       });
     };
     let rootElement = (0, import_wrapper.wrapRuntimeContextProvider)(serverRoot, Object.assign(runtimeContext, {
       ssr: true
     }));
-    rootElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(RSCServerRoot, {
+    rootElement = /* @__PURE__ */ (0, import_jsx_runtime.jsx)(StreamServerRootWrapper, {
       children: rootElement
     });
     const stream = await createReadableStreamFromElement(request, rootElement, {

package/dist/cjs/router/runtime/plugin.node.js

@@ -41,7 +41,6 @@ var import_router2 = require("@modern-js/runtime-utils/router");
 var import_time = require("@modern-js/runtime-utils/time");
 var import_constants = require("@modern-js/utils/universal/constants");
 var import_react = require("react");
-var import_common = require("../../common");
 var import_core = require("../../core");
 var import_context = require("../../core/context");
 var import_serverPayload = require("../../core/context/serverPayload/index.server");
@@ -179,8 +178,7 @@ const routerPlugin = (userConfig = {}) => {
                     nonce,
                     context: routerContext,
                     useJsonScript
-                  }),
-                  mode === "stream" && import_common.JSX_SHELL_STREAM_END_MARK
+                  })
                 ]
               });
               return App ? /* @__PURE__ */ (0, import_jsx_runtime.jsx)(App, {

package/dist/cjs/rsc/server.js

@@ -3,10 +3,6 @@ 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))
@@ -18,45 +14,9 @@ var __copyProps = (to, from, except, desc) => {
 var __reExport = (target, mod, secondTarget) => (__copyProps(target, mod, "default"), secondTarget && __copyProps(secondTarget, mod, "default"));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var server_exports = {};
-__export(server_exports, {
-  processRSCStream: () => processRSCStream
-});
 module.exports = __toCommonJS(server_exports);
 __reExport(server_exports, require("@modern-js/render/rsc"), module.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,
   ...require("@modern-js/render/rsc")
 });

package/dist/esm/core/server/stream/shared.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { time } from "@modern-js/runtime-utils/time";
+import { JSX_SHELL_STREAM_END_MARK } from "../../../common";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
 import { getSSRConfigByEntry } from "../utils";
@@ -32,7 +33,7 @@ function getReadableStreamFromString(content) {
 function createRenderStreaming(createReadableStreamPromise) {
   return function() {
     var _ref = _async_to_generator(function(request, serverRoot, options) {
-      var createReadableStreamFromElement, end, runtimeContext, config, resource, onError, onTiming, htmlTemplate, entryName, ssrConfig, RSCServerRoot, rootElement, stream;
+      var createReadableStreamFromElement, end, runtimeContext, config, resource, onError, onTiming, htmlTemplate, entryName, ssrConfig, StreamServerRootWrapper, rootElement, stream;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -47,16 +48,19 @@ function createRenderStreaming(createReadableStreamPromise) {
             onError = options.onError, onTiming = options.onTiming;
             htmlTemplate = resource.htmlTemplate, entryName = resource.entryName;
             ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
-            RSCServerRoot = function(param) {
+            StreamServerRootWrapper = function(param) {
               var children = param.children;
-              return /* @__PURE__ */ _jsx(_Fragment, {
-                children
+              return /* @__PURE__ */ _jsxs(_Fragment, {
+                children: [
+                  children,
+                  JSX_SHELL_STREAM_END_MARK
+                ]
               });
             };
             rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
               ssr: true
             }));
-            rootElement = /* @__PURE__ */ _jsx(RSCServerRoot, {
+            rootElement = /* @__PURE__ */ _jsx(StreamServerRootWrapper, {
               children: rootElement
             });
             return [

package/dist/esm/router/runtime/plugin.node.js

@@ -11,7 +11,6 @@ import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { useContext } from "react";
-import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { setServerPayload } from "../../core/context/serverPayload/index.server";
@@ -206,8 +205,7 @@ var routerPlugin = function() {
                     nonce,
                     context: routerContext,
                     useJsonScript
-                  }),
-                  mode === "stream" && JSX_SHELL_STREAM_END_MARK
+                  })
                 ]
               });
               return App ? /* @__PURE__ */ _jsx(App, {

package/dist/esm/rsc/server.js

@@ -1,87 +1 @@
-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";
 export * from "@modern-js/render/rsc";
-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-node/core/server/stream/shared.js

@@ -1,5 +1,6 @@
-import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { time } from "@modern-js/runtime-utils/time";
+import { JSX_SHELL_STREAM_END_MARK } from "../../../common";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
 import { getSSRConfigByEntry } from "../utils";
@@ -35,15 +36,18 @@ function createRenderStreaming(createReadableStreamPromise) {
     const { onError, onTiming } = options;
     const { htmlTemplate, entryName } = resource;
     const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
-    const RSCServerRoot = ({ children }) => {
-      return /* @__PURE__ */ _jsx(_Fragment, {
-        children
+    const StreamServerRootWrapper = ({ children }) => {
+      return /* @__PURE__ */ _jsxs(_Fragment, {
+        children: [
+          children,
+          JSX_SHELL_STREAM_END_MARK
+        ]
       });
     };
     let rootElement = wrapRuntimeContextProvider(serverRoot, Object.assign(runtimeContext, {
       ssr: true
     }));
-    rootElement = /* @__PURE__ */ _jsx(RSCServerRoot, {
+    rootElement = /* @__PURE__ */ _jsx(StreamServerRootWrapper, {
       children: rootElement
     });
     const stream = await createReadableStreamFromElement(request, rootElement, {

package/dist/esm-node/router/runtime/plugin.node.js

@@ -7,7 +7,6 @@ import { createRoutesFromElements } from "@modern-js/runtime-utils/router";
 import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { useContext } from "react";
-import { JSX_SHELL_STREAM_END_MARK } from "../../common";
 import { RuntimeReactContext } from "../../core";
 import { getGlobalEnableRsc, getGlobalLayoutApp, getGlobalRoutes } from "../../core/context";
 import { setServerPayload } from "../../core/context/serverPayload/index.server";
@@ -145,8 +144,7 @@ const routerPlugin = (userConfig = {}) => {
                     nonce,
                     context: routerContext,
                     useJsonScript
-                  }),
-                  mode === "stream" && JSX_SHELL_STREAM_END_MARK
+                  })
                 ]
               });
               return App ? /* @__PURE__ */ _jsx(App, {

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

@@ -1,36 +1 @@
 export * from "@modern-js/render/rsc";
-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/types/rsc/server.d.ts

@@ -1,2 +1 @@
 export * from '@modern-js/render/rsc';
-export declare function processRSCStream(rscStream: ReadableStream, controller: ReadableStreamDefaultController<Uint8Array>, encoder: TextEncoder): Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.4",
+  "version": "2.69.6",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -219,13 +219,13 @@
     "react-is": "^18",
     "react-side-effect": "^2.1.2",
     "styled-components": "^5.3.1",
-    "@modern-js/plugin": "2.69.4",
-    "@modern-js/plugin-data-loader": "2.69.4",
-    "@modern-js/plugin-v2": "2.69.4",
-    "@modern-js/render": "2.69.4",
-    "@modern-js/types": "2.69.4",
-    "@modern-js/runtime-utils": "2.69.4",
-    "@modern-js/utils": "2.69.4"
+    "@modern-js/plugin": "2.69.6",
+    "@modern-js/plugin-data-loader": "2.69.6",
+    "@modern-js/plugin-v2": "2.69.6",
+    "@modern-js/render": "2.69.6",
+    "@modern-js/runtime-utils": "2.69.6",
+    "@modern-js/types": "2.69.6",
+    "@modern-js/utils": "2.69.6"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -233,7 +233,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.6.14",
+    "@rsbuild/core": "1.6.15",
     "@testing-library/react": "^13.4.0",
     "@types/cookie": "0.6.0",
     "@types/invariant": "^2.2.30",
@@ -249,10 +249,10 @@
     "ts-node": "^10.9.1",
     "typescript": "^5",
     "webpack": "^5.103.0",
-    "@modern-js/app-tools": "2.69.4",
     "@scripts/build": "2.66.0",
+    "@modern-js/app-tools": "2.69.6",
     "@scripts/jest-config": "2.66.0",
-    "@modern-js/core": "2.69.4"
+    "@modern-js/core": "2.69.6"
   },
   "sideEffects": false,
   "publishConfig": {