@modern-js/render 2.68.0 → 2.68.1

package/dist/cjs/client/index.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,9 +17,18 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var client_exports = {};
 __export(client_exports, {
+  ElementsContext: () => ElementsContext,
   RSCServerSlot: () => RSCServerSlot,
   RscClientRoot: () => RscClientRoot,
   ServerElementsProvider: () => ServerElementsProvider,
@@ -30,18 +41,19 @@ __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 = require("react");
-var import_client2 = require("rsc-html-stream/client");
+var import_react = __toESM(require("react"));
+var import_react2 = require("react");
+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");
-function RscClientRoot({ data }) {
-  const elements = (0, import_react.use)(data);
-  const [root, setRoot] = (0, import_react.useState)(elements);
+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, {
     children: root
   });
 }
-const ElementsContext = /* @__PURE__ */ (0, import_react.createContext)(null);
+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, {
@@ -55,11 +67,12 @@ const ServerElementsProvider = ({ elements, children }) => {
   });
 };
 const RSCServerSlot = () => {
-  const elements = (0, import_react.use)(ElementsContext);
+  const elements = import_react.default.use(ElementsContext);
   return elements;
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
+  ElementsContext,
   RSCServerSlot,
   RscClientRoot,
   ServerElementsProvider,

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

@@ -0,0 +1,56 @@
+"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 client_exports = {};
+__export(client_exports, {
+  rscStream: () => rscStream
+});
+module.exports = __toCommonJS(client_exports);
+const encoder = new TextEncoder();
+let streamController;
+const rscStream = new ReadableStream({
+  start(controller) {
+    if (typeof window === "undefined") {
+      return;
+    }
+    const handleChunk = (chunk) => {
+      if (typeof chunk === "string") {
+        controller.enqueue(encoder.encode(chunk));
+      } else {
+        controller.enqueue(chunk);
+      }
+    };
+    window.__FLIGHT_DATA = window.__FLIGHT_DATA || [];
+    window.__FLIGHT_DATA.forEach(handleChunk);
+    window.__FLIGHT_DATA.push = (chunk) => {
+      handleChunk(chunk);
+    };
+    streamController = controller;
+  }
+});
+if (typeof document !== "undefined" && document.readyState === "loading") {
+  document.addEventListener("DOMContentLoaded", () => {
+    streamController === null || streamController === void 0 ? void 0 : streamController.close();
+  });
+} else {
+  streamController === null || streamController === void 0 ? void 0 : streamController.close();
+}
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  rscStream
+});

package/dist/esm/client/index.js

@@ -1,13 +1,14 @@
 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 { createContext, use, useState } from "react";
-import { rscStream } from "rsc-html-stream/client";
+import React from "react";
+import { createContext, useState } from "react";
+import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
 import { createFromFetch } from "@modern-js/utils/react-server-dom-webpack/client.browser";
 function RscClientRoot(param) {
-  var data = param.data;
-  var elements = use(data);
+  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, {
     children: root
@@ -28,10 +29,11 @@ var ServerElementsProvider = function(param) {
   });
 };
 var RSCServerSlot = function() {
-  var elements = use(ElementsContext);
+  var elements = React.use(ElementsContext);
   return elements;
 };
 export {
+  ElementsContext,
   RSCServerSlot,
   RscClientRoot,
   ServerElementsProvider,

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

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

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

@@ -1,11 +1,12 @@
 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 { createContext, use, useState } from "react";
-import { rscStream } from "rsc-html-stream/client";
+import React from "react";
+import { createContext, useState } from "react";
+import { rscStream } from "../rsc-html-stream/client";
 import { callServer } from "./callServer";
 import { createFromFetch } from "@modern-js/utils/react-server-dom-webpack/client.browser";
-function RscClientRoot({ data }) {
-  const elements = use(data);
+function RscClientRoot({ rscPayload }) {
+  const elements = React.use(rscPayload);
   const [root, setRoot] = useState(elements);
   return /* @__PURE__ */ _jsx(_Fragment, {
     children: root
@@ -25,10 +26,11 @@ const ServerElementsProvider = ({ elements, children }) => {
   });
 };
 const RSCServerSlot = () => {
-  const elements = use(ElementsContext);
+  const elements = React.use(ElementsContext);
   return elements;
 };
 export {
+  ElementsContext,
   RSCServerSlot,
   RscClientRoot,
   ServerElementsProvider,

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

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

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

@@ -1,6 +1,7 @@
 import { createFromReadableStream, createServerReference } from '@modern-js/utils/react-server-dom-webpack/client.browser';
+import React from 'react';
 import { type ReactNode } from 'react';
-export { rscStream } from 'rsc-html-stream/client';
+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';
@@ -9,13 +10,13 @@ declare global {
         __MODERN_JS_ENTRY_NAME?: string;
     }
 }
-interface RootProps {
-    data: Promise<React.ReactNode>;
-}
-export declare function RscClientRoot({ data }: RootProps): import("react").JSX.Element;
+export declare function RscClientRoot({ rscPayload, }: {
+    rscPayload: Promise<React.ReactNode>;
+}): React.JSX.Element;
 type Elements = Promise<ReactNode[]>;
+export declare const ElementsContext: React.Context<Elements | null>;
 export declare const ServerElementsProvider: ({ elements, children, }: {
     elements: Elements;
     children: ReactNode;
-}) => import("react").JSX.Element;
+}) => React.JSX.Element;
 export declare const RSCServerSlot: () => Elements | null;

package/dist/types/rsc-html-stream/client.d.ts

@@ -0,0 +1,5 @@
+/**
+ * forked and modified from https://github.com/devongovett/rsc-html-stream/blob/main/client.js
+ * license at https://github.com/devongovett/rsc-html-stream/blob/main/LICENSE
+ */
+export declare const rscStream: ReadableStream<Uint8Array>;

package/package.json

@@ -15,16 +15,15 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.68.0",
+  "version": "2.68.1",
   "files": [
     "dist",
     "hook.d.ts"
   ],
   "dependencies": {
     "@swc/helpers": "^0.5.17",
-    "rsc-html-stream": "0.0.5",
-    "@modern-js/types": "2.68.0",
-    "@modern-js/utils": "2.68.0"
+    "@modern-js/types": "2.68.1",
+    "@modern-js/utils": "2.68.1"
   },
   "devDependencies": {
     "@types/jest": "^29",
@@ -34,7 +33,7 @@
     "react": "^18.3.1",
     "react-dom": "^18.3.1",
     "typescript": "^5",
-    "@modern-js/server-core": "2.68.0"
+    "@modern-js/server-core": "2.68.1"
   },
   "peerDependencies": {
     "react": ">=17.0.0",