@modern-js/runtime 2.69.7 → 2.70.1

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

@@ -33,7 +33,6 @@ __export(createReadableStream_exports, {
 module.exports = __toCommonJS(createReadableStream_exports);
 var import_stream = require("stream");
 var import_node = require("@modern-js/runtime-utils/node");
-var import_isbot = __toESM(require("isbot"));
 var import_styled_components = require("styled-components");
 var import_common = require("../../../common");
 var import_constants = require("../../constants");
@@ -47,8 +46,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
   let shellChunkStatus = import_shared.ShellChunkStatus.START;
   let renderLevel = import_constants.RenderLevel.SERVER_RENDER;
   const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
-  const isbot = (0, import_isbot.default)(request.headers.get("user-agent"));
-  const onReady = isbot || forceStream2String ? "onAllReady" : "onShellReady";
+  const { onReady } = (0, import_shared.resolveStreamingMode)(request, forceStream2String);
   const sheet = new import_styled_components.ServerStyleSheet();
   const chunkVec = [];
   const root = sheet.collectStyles(rootElement);

package/dist/cjs/core/server/stream/createReadableStream.worker.js

@@ -1,9 +1,7 @@
 "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)
@@ -17,14 +15,6 @@ 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 createReadableStream_worker_exports = {};
 __export(createReadableStream_worker_exports, {
@@ -33,7 +23,6 @@ __export(createReadableStream_worker_exports, {
 module.exports = __toCommonJS(createReadableStream_worker_exports);
 var import_ssr = require("@modern-js/render/ssr");
 var import_node = require("@modern-js/runtime-utils/node");
-var import_isbot = __toESM(require("isbot"));
 var import_common = require("../../../common");
 var import_constants = require("../../constants");
 var import_deferredScript = require("./deferredScript");
@@ -52,7 +41,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
     entryName
   });
   try {
-    var _options_onShellReady;
+    var _options_onShellReady, _process_env;
     const readableOriginal = await (0, import_ssr.renderSSRStream)(rootElement, {
       request,
       clientManifest: options.rscClientManifest,
@@ -69,8 +58,9 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
       var _options_onAllReady;
       options === null || options === void 0 ? void 0 : (_options_onAllReady = options.onAllReady) === null || _options_onAllReady === void 0 ? void 0 : _options_onAllReady.call(options);
     });
-    const isbot = (0, import_isbot.default)(request.headers.get("user-agent"));
-    if (isbot) {
+    const forceStreamToString = Boolean(typeof process !== "undefined" && ((_process_env = process.env) === null || _process_env === void 0 ? void 0 : _process_env.MODERN_JS_STREAM_TO_STRING));
+    const { waitForAllReady } = (0, import_shared.resolveStreamingMode)(request, forceStreamToString);
+    if (waitForAllReady) {
       await readableOriginal.allReady;
     }
     const reader = readableOriginal.getReader();

package/dist/cjs/core/server/stream/shared.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,17 +17,27 @@ 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 shared_exports = {};
 __export(shared_exports, {
   ShellChunkStatus: () => ShellChunkStatus,
   createRenderStreaming: () => createRenderStreaming,
   encodeForWebStream: () => encodeForWebStream,
-  getReadableStreamFromString: () => getReadableStreamFromString
+  getReadableStreamFromString: () => getReadableStreamFromString,
+  resolveStreamingMode: () => resolveStreamingMode
 });
 module.exports = __toCommonJS(shared_exports);
 var import_jsx_runtime = require("react/jsx-runtime");
 var import_time = require("@modern-js/runtime-utils/time");
+var import_isbot = __toESM(require("isbot"));
 var import_common = require("../../../common");
 var import_wrapper = require("../../react/wrapper");
 var import_tracer = require("../tracer");
@@ -35,6 +47,43 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
   ShellChunkStatus2[ShellChunkStatus2["FINISH"] = 1] = "FINISH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
+const SHOULD_STREAM_ALL_HEADER = "x-should-stream-all";
+function parseShouldStreamAllFlag(value) {
+  if (!value) {
+    return void 0;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "false") {
+    return false;
+  }
+  return true;
+}
+function resolveStreamingMode(request, forceStreamToString) {
+  const shouldStreamAll = parseShouldStreamAllFlag(request.headers.get(SHOULD_STREAM_ALL_HEADER));
+  const isBot = (0, import_isbot.default)(request.headers.get("user-agent"));
+  if (shouldStreamAll) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (forceStreamToString) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (isBot) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  return {
+    onReady: "onShellReady",
+    waitForAllReady: false
+  };
+}
 let encoder;
 function encodeForWebStream(thing) {
   if (!encoder) {
@@ -109,5 +158,6 @@ function createRenderStreaming(createReadableStreamPromise) {
   ShellChunkStatus,
   createRenderStreaming,
   encodeForWebStream,
-  getReadableStreamFromString
+  getReadableStreamFromString,
+  resolveStreamingMode
 });

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

@@ -4,17 +4,16 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { PassThrough, Transform } from "stream";
 import { createReadableStreamFromReadable, storage } from "@modern-js/runtime-utils/node";
-import checkIsBot from "isbot";
 import { ServerStyleSheet } from "styled-components";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { getMonitors } from "../../context/monitors";
 import { enqueueFromEntries } from "./deferredScript";
-import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
+import { ShellChunkStatus, getReadableStreamFromString, resolveStreamingMode } from "./shared";
 import { getTemplates } from "./template";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
-    var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, entryName, shellChunkStatus, renderLevel, forceStream2String, isbot, onReady, sheet, chunkVec, root;
+    var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, entryName, shellChunkStatus, renderLevel, forceStream2String, onReady, sheet, chunkVec, root;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -28,8 +27,7 @@ var createReadableStreamFromElement = function() {
           shellChunkStatus = ShellChunkStatus.START;
           renderLevel = RenderLevel.SERVER_RENDER;
           forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
-          isbot = checkIsBot(request.headers.get("user-agent"));
-          onReady = isbot || forceStream2String ? "onAllReady" : "onShellReady";
+          onReady = resolveStreamingMode(request, forceStream2String).onReady;
           sheet = new ServerStyleSheet();
           chunkVec = [];
           root = sheet.collectStyles(rootElement);

package/dist/esm/core/server/stream/createReadableStream.worker.js

@@ -3,15 +3,14 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { renderSSRStream } from "@modern-js/render/ssr";
 import { storage } from "@modern-js/runtime-utils/node";
-import checkIsBot from "isbot";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { enqueueFromEntries } from "./deferredScript";
-import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } from "./shared";
+import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode } from "./shared";
 import { getTemplates } from "./template";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
-    var shellChunkStatus, chunkVec, htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscRoot, _ref2, shellBefore, shellAfter, _options_onShellReady, readableOriginal, isbot, reader, stream, e, fallbackHtml, stream1;
+    var shellChunkStatus, chunkVec, htmlTemplate, runtimeContext, config, ssrConfig, entryName, rscRoot, _ref2, shellBefore, shellAfter, _options_onShellReady, _process_env, readableOriginal, forceStreamToString, waitForAllReady, reader, stream, e, fallbackHtml, stream1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -60,8 +59,9 @@ var createReadableStreamFromElement = function() {
             var _options_onAllReady;
             options === null || options === void 0 ? void 0 : (_options_onAllReady = options.onAllReady) === null || _options_onAllReady === void 0 ? void 0 : _options_onAllReady.call(options);
           });
-          isbot = checkIsBot(request.headers.get("user-agent"));
-          if (!isbot)
+          forceStreamToString = Boolean(typeof process !== "undefined" && ((_process_env = process.env) === null || _process_env === void 0 ? void 0 : _process_env.MODERN_JS_STREAM_TO_STRING));
+          waitForAllReady = resolveStreamingMode(request, forceStreamToString).waitForAllReady;
+          if (!waitForAllReady)
             return [
               3,
               5

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

@@ -2,6 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { time } from "@modern-js/runtime-utils/time";
+import checkIsBot from "isbot";
 import { JSX_SHELL_STREAM_END_MARK } from "../../../common";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
@@ -11,6 +12,43 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
   ShellChunkStatus2[ShellChunkStatus2["FINISH"] = 1] = "FINISH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
+var SHOULD_STREAM_ALL_HEADER = "x-should-stream-all";
+function parseShouldStreamAllFlag(value) {
+  if (!value) {
+    return void 0;
+  }
+  var normalized = value.trim().toLowerCase();
+  if (normalized === "false") {
+    return false;
+  }
+  return true;
+}
+function resolveStreamingMode(request, forceStreamToString) {
+  var shouldStreamAll = parseShouldStreamAllFlag(request.headers.get(SHOULD_STREAM_ALL_HEADER));
+  var isBot = checkIsBot(request.headers.get("user-agent"));
+  if (shouldStreamAll) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (forceStreamToString) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (isBot) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  return {
+    onReady: "onShellReady",
+    waitForAllReady: false
+  };
+}
 var encoder;
 function encodeForWebStream(thing) {
   if (!encoder) {
@@ -109,5 +147,6 @@ export {
   ShellChunkStatus,
   createRenderStreaming,
   encodeForWebStream,
-  getReadableStreamFromString
+  getReadableStreamFromString,
+  resolveStreamingMode
 };

package/dist/esm-node/core/server/stream/createReadableStream.js

@@ -1,12 +1,11 @@
 import { PassThrough, Transform } from "stream";
 import { createReadableStreamFromReadable, storage } from "@modern-js/runtime-utils/node";
-import checkIsBot from "isbot";
 import { ServerStyleSheet } from "styled-components";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { getMonitors } from "../../context/monitors";
 import { enqueueFromEntries } from "./deferredScript";
-import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
+import { ShellChunkStatus, getReadableStreamFromString, resolveStreamingMode } from "./shared";
 import { getTemplates } from "./template";
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   const { renderToPipeableStream } = await import("react-dom/server");
@@ -14,8 +13,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
   let shellChunkStatus = ShellChunkStatus.START;
   let renderLevel = RenderLevel.SERVER_RENDER;
   const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
-  const isbot = checkIsBot(request.headers.get("user-agent"));
-  const onReady = isbot || forceStream2String ? "onAllReady" : "onShellReady";
+  const { onReady } = resolveStreamingMode(request, forceStream2String);
   const sheet = new ServerStyleSheet();
   const chunkVec = [];
   const root = sheet.collectStyles(rootElement);

package/dist/esm-node/core/server/stream/createReadableStream.worker.js

@@ -1,10 +1,9 @@
 import { renderSSRStream } from "@modern-js/render/ssr";
 import { storage } from "@modern-js/runtime-utils/node";
-import checkIsBot from "isbot";
 import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { enqueueFromEntries } from "./deferredScript";
-import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } from "./shared";
+import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString, resolveStreamingMode } from "./shared";
 import { getTemplates } from "./template";
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   let shellChunkStatus = ShellChunkStatus.START;
@@ -19,7 +18,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
     entryName
   });
   try {
-    var _options_onShellReady;
+    var _options_onShellReady, _process_env;
     const readableOriginal = await renderSSRStream(rootElement, {
       request,
       clientManifest: options.rscClientManifest,
@@ -36,8 +35,9 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
       var _options_onAllReady;
       options === null || options === void 0 ? void 0 : (_options_onAllReady = options.onAllReady) === null || _options_onAllReady === void 0 ? void 0 : _options_onAllReady.call(options);
     });
-    const isbot = checkIsBot(request.headers.get("user-agent"));
-    if (isbot) {
+    const forceStreamToString = Boolean(typeof process !== "undefined" && ((_process_env = process.env) === null || _process_env === void 0 ? void 0 : _process_env.MODERN_JS_STREAM_TO_STRING));
+    const { waitForAllReady } = resolveStreamingMode(request, forceStreamToString);
+    if (waitForAllReady) {
       await readableOriginal.allReady;
     }
     const reader = readableOriginal.getReader();

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

@@ -1,5 +1,6 @@
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 import { time } from "@modern-js/runtime-utils/time";
+import checkIsBot from "isbot";
 import { JSX_SHELL_STREAM_END_MARK } from "../../../common";
 import { wrapRuntimeContextProvider } from "../../react/wrapper";
 import { SSRErrors, SSRTimings } from "../tracer";
@@ -9,6 +10,43 @@ var ShellChunkStatus;
   ShellChunkStatus2[ShellChunkStatus2["START"] = 0] = "START";
   ShellChunkStatus2[ShellChunkStatus2["FINISH"] = 1] = "FINISH";
 })(ShellChunkStatus || (ShellChunkStatus = {}));
+const SHOULD_STREAM_ALL_HEADER = "x-should-stream-all";
+function parseShouldStreamAllFlag(value) {
+  if (!value) {
+    return void 0;
+  }
+  const normalized = value.trim().toLowerCase();
+  if (normalized === "false") {
+    return false;
+  }
+  return true;
+}
+function resolveStreamingMode(request, forceStreamToString) {
+  const shouldStreamAll = parseShouldStreamAllFlag(request.headers.get(SHOULD_STREAM_ALL_HEADER));
+  const isBot = checkIsBot(request.headers.get("user-agent"));
+  if (shouldStreamAll) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (forceStreamToString) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  if (isBot) {
+    return {
+      onReady: "onAllReady",
+      waitForAllReady: true
+    };
+  }
+  return {
+    onReady: "onShellReady",
+    waitForAllReady: false
+  };
+}
 let encoder;
 function encodeForWebStream(thing) {
   if (!encoder) {
@@ -82,5 +120,6 @@ export {
   ShellChunkStatus,
   createRenderStreaming,
   encodeForWebStream,
-  getReadableStreamFromString
+  getReadableStreamFromString,
+  resolveStreamingMode
 };

package/dist/types/core/server/stream/shared.d.ts

@@ -24,6 +24,10 @@ export declare enum ShellChunkStatus {
     START = 0,
     FINISH = 1
 }
+export declare function resolveStreamingMode(request: Request, forceStreamToString: boolean): {
+    onReady: 'onAllReady' | 'onShellReady';
+    waitForAllReady: boolean;
+};
 export declare function encodeForWebStream(thing: unknown): unknown;
 export declare function getReadableStreamFromString(content: string): ReadableStream;
 export declare function createRenderStreaming(createReadableStreamPromise: Promise<CreateReadableStreamFromElement>): RenderStreaming;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.69.7",
+  "version": "2.70.1",
   "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-data-loader": "2.69.7",
-    "@modern-js/plugin": "2.69.7",
-    "@modern-js/runtime-utils": "2.69.7",
-    "@modern-js/render": "2.69.7",
-    "@modern-js/plugin-v2": "2.69.7",
-    "@modern-js/types": "2.69.7",
-    "@modern-js/utils": "2.69.7"
+    "@modern-js/plugin": "2.70.1",
+    "@modern-js/plugin-v2": "2.70.1",
+    "@modern-js/plugin-data-loader": "2.70.1",
+    "@modern-js/render": "2.70.1",
+    "@modern-js/runtime-utils": "2.70.1",
+    "@modern-js/types": "2.70.1",
+    "@modern-js/utils": "2.70.1"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -233,7 +233,7 @@
   },
   "devDependencies": {
     "@remix-run/web-fetch": "^4.1.3",
-    "@rsbuild/core": "1.7.1",
+    "@rsbuild/core": "1.7.2",
     "@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.7",
+    "@modern-js/app-tools": "2.70.1",
     "@scripts/build": "2.66.0",
-    "@scripts/jest-config": "2.66.0",
-    "@modern-js/core": "2.69.7"
+    "@modern-js/core": "2.70.1",
+    "@scripts/jest-config": "2.66.0"
   },
   "sideEffects": false,
   "publishConfig": {