@modern-js/runtime 2.48.6 → 2.49.0

package/dist/cjs/core/compatible.js

@@ -228,8 +228,9 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         const redirectUrl = result.headers.get("Location") || "/";
         const { ssrContext } = context;
         if (ssrContext) {
-          ssrContext.res.statusCode = status;
-          ssrContext.res.setHeader("Location", redirectUrl);
+          var _ssrContext_res;
+          ssrContext.res && (ssrContext.res.statusCode = status);
+          (_ssrContext_res = ssrContext.res) === null || _ssrContext_res === void 0 ? void 0 : _ssrContext_res.setHeader("Location", redirectUrl);
           ssrContext.redirection = ssrContext.redirection || {};
           ssrContext.redirection.status = status;
           ssrContext.redirection.url = redirectUrl;

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

@@ -44,9 +44,7 @@ var import_time = require("@modern-js/runtime-utils/time");
 var import_constants = require("@modern-js/utils/universal/constants");
 var import_core = require("../../core");
 var import_utils = require("./utils");
-var import_fetch = require("./fetch");
 var import_hooks = require("./hooks");
-(0, import_fetch.installGlobals)();
 function createFetchRequest(req) {
   const origin = `${req.protocol}://${req.host}`;
   const url = new URL(req.originalUrl || req.url, origin);
@@ -112,7 +110,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             requestContext
           });
           const cost = end();
-          reporter.reportTiming(import_constants.LOADER_REPORTER_NAME, cost);
+          reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(import_constants.LOADER_REPORTER_NAME, cost);
           serverTiming.addServeTiming(import_constants.LOADER_REPORTER_NAME, cost);
           if (routerContext instanceof Response) {
             return routerContext;

package/dist/cjs/ssr/serverRender/renderToStream/index.js

@@ -49,7 +49,7 @@ const render = ({ App, context, config }) => {
       })
     });
     const { tracker } = ssrContext;
-    const pipe = (0, import_renderToPipe.default)(rootElement, context, config, {
+    const stream = (0, import_renderToPipe.default)(rootElement, context, config, {
       onShellReady() {
         const cost = end();
         tracker.trackTiming(import_tracker.SSRTimings.RENDER_SHELL, cost);
@@ -65,7 +65,7 @@ const render = ({ App, context, config }) => {
         tracker.trackError(import_tracker.SSRErrors.RENDER_STREAM, error);
       }
     });
-    return pipe;
+    return stream;
   });
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.js

@@ -36,58 +36,57 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
   const onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   const { ssrContext } = context;
   const chunkVec = [];
-  const forUserPipe = (stream) => {
-    return new Promise((resolve) => {
-      let renderToPipeableStream;
-      try {
-        ({ renderToPipeableStream } = require("react-dom/server"));
-      } catch (e) {
-      }
-      const { pipe } = renderToPipeableStream(rootElement, {
-        ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
-        [onReady]() {
-          (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
-            var _options_onShellReady;
-            options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
-            const injectableTransform = new import_stream.Transform({
-              transform(chunk, _encoding, callback) {
-                try {
-                  if (shellChunkStatus !== 1) {
-                    chunkVec.push(chunk.toString());
-                    let concatedChunk = chunkVec.join("");
-                    if (concatedChunk.endsWith(import_common.ESCAPED_SHELL_STREAM_END_MARK)) {
-                      concatedChunk = concatedChunk.replace(import_common.ESCAPED_SHELL_STREAM_END_MARK, "");
-                      shellChunkStatus = 1;
-                      this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
-                    }
-                  } else {
-                    this.push(chunk);
-                  }
-                  callback();
-                } catch (e) {
-                  if (e instanceof Error) {
-                    callback(e);
-                  } else {
-                    callback(new Error("Received unkown error when streaming"));
+  const forUserPipe = new Promise((resolve) => {
+    let renderToPipeableStream;
+    try {
+      ({ renderToPipeableStream } = require("react-dom/server"));
+    } catch (e) {
+    }
+    const { pipe } = renderToPipeableStream(rootElement, {
+      ...options,
+      nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+      [onReady]() {
+        (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
+          var _options_onShellReady;
+          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+          const injectableTransform = new import_stream.Transform({
+            transform(chunk, _encoding, callback) {
+              try {
+                if (shellChunkStatus !== 1) {
+                  chunkVec.push(chunk.toString());
+                  let concatedChunk = chunkVec.join("");
+                  if (concatedChunk.endsWith(import_common.ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(import_common.ESCAPED_SHELL_STREAM_END_MARK, "");
+                    shellChunkStatus = 1;
+                    this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
                   }
+                } else {
+                  this.push(chunk);
+                }
+                callback();
+              } catch (e) {
+                if (e instanceof Error) {
+                  callback(e);
+                } else {
+                  callback(new Error("Received unkown error when streaming"));
                 }
               }
-            });
-            resolve(pipe(injectableTransform).pipe(stream));
+            }
           });
-        },
-        onShellError(error) {
-          (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
-            var _options_onShellError;
-            const fallbackHtml = `${shellBefore}${shellAfter}`;
-            resolve(fallbackHtml);
-            options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
-          });
-        }
-      });
+          pipe(injectableTransform);
+          resolve(injectableTransform);
+        });
+      },
+      onShellError(error) {
+        (0, import_template.getTemplates)(context, import_types.RenderLevel.CLIENT_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
+          var _options_onShellError;
+          const fallbackHtml = `${shellBefore}${shellAfter}`;
+          resolve(fallbackHtml);
+          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+        });
+      }
     });
-  };
+  });
   return forUserPipe;
 }
 var renderToPipe_default = renderToPipe;

package/dist/cjs/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -42,7 +42,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
     }
     const { shellAfter, shellBefore } = await (0, import_template.getTemplates)(context, import_types.RenderLevel.SERVER_RENDER, pluginConfig);
     try {
-      var _context_ssrContext;
+      var _options_onShellReady, _context_ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
@@ -51,6 +51,11 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
+      options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+      readableOriginal.allReady.then(() => {
+        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);
+      });
       if ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) {
         await readableOriginal.allReady;
       }

package/dist/cjs/ssr/serverRender/tracker.js

@@ -78,21 +78,29 @@ const timings = {
     logger: "App run useLoader cost = %d ms"
   }
 };
-function createSSRTracker({ reporter, serverTiming, logger }) {
+function getHeadersWithoutCookie(headers) {
+  const _headers = {
+    ...headers,
+    cookie: void 0
+  };
+  delete _headers.cookie;
+  return _headers;
+}
+function createSSRTracker({ reporter, serverTiming, logger, request }) {
   const tracker = {
     get sessionId() {
-      return reporter.sessionId;
+      return reporter === null || reporter === void 0 ? void 0 : reporter.sessionId;
     },
     trackError(key, e) {
       const { reporter: reporterContent, logger: loggerContent } = errors[key];
-      reporterContent && reporter.reportError(`SSR Error - ${reporterContent}`, e);
-      loggerContent && logger.error(loggerContent, e);
+      reporterContent && (reporter === null || reporter === void 0 ? void 0 : reporter.reportError(`SSR Error - ${reporterContent}`, e));
+      loggerContent && logger.error(`SSR Error - ${loggerContent}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, request.pathname, getHeadersWithoutCookie(request.headers));
     },
     trackTiming(key, cost) {
       const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName } = timings[key];
-      reporterName && reporter.reportTiming(reporterName, cost);
+      reporterName && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(reporterName, cost));
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      loggerName && logger.debug(loggerName, cost);
+      loggerName && logger.debug(`SSR Debug - ${loggerName}, req.url = %s`, cost, request.pathname);
     }
   };
   return tracker;

package/dist/esm/core/compatible.js

@@ -229,8 +229,9 @@ var bootstrap = function() {
               var redirectUrl = result.headers.get("Location") || "/";
               var ssrContext = context.ssrContext;
               if (ssrContext) {
-                ssrContext.res.statusCode = status;
-                ssrContext.res.setHeader("Location", redirectUrl);
+                var _ssrContext_res;
+                ssrContext.res && (ssrContext.res.statusCode = status);
+                (_ssrContext_res = ssrContext.res) === null || _ssrContext_res === void 0 ? void 0 : _ssrContext_res.setHeader("Location", redirectUrl);
                 ssrContext.redirection = ssrContext.redirection || {};
                 ssrContext.redirection.status = status;
                 ssrContext.redirection.url = redirectUrl;

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

@@ -15,9 +15,7 @@ import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
-import { installGlobals } from "./fetch";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
-installGlobals();
 function createFetchRequest(req) {
   var origin = "".concat(req.protocol, "://").concat(req.host);
   var url = new URL(req.originalUrl || req.url, origin);
@@ -132,7 +130,7 @@ var routerPlugin = function(param) {
                 case 1:
                   routerContext = _state.sent();
                   cost = end();
-                  reporter.reportTiming(LOADER_REPORTER_NAME, cost);
+                  reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(LOADER_REPORTER_NAME, cost);
                   serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);
                   if (_instanceof(routerContext, Response)) {
                     return [

package/dist/esm/ssr/serverRender/renderToStream/index.js

@@ -12,7 +12,7 @@ var render = function(param) {
     throw new Error('The "ssrContext" must not be undefined, but received undefined');
   }
   return run(ssrContext.request.headers, /* @__PURE__ */ _async_to_generator(function() {
-    var end, rootElement, tracker, pipe;
+    var end, rootElement, tracker, stream;
     return _ts_generator(this, function(_state) {
       end = time();
       rootElement = createElement(App, {
@@ -21,7 +21,7 @@ var render = function(param) {
         })
       });
       tracker = ssrContext.tracker;
-      pipe = renderToPipe(rootElement, context, config, {
+      stream = renderToPipe(rootElement, context, config, {
         onShellReady: function onShellReady() {
           var cost = end();
           tracker.trackTiming(SSRTimings.RENDER_SHELL, cost);
@@ -39,7 +39,7 @@ var render = function(param) {
       });
       return [
         2,
-        pipe
+        stream
       ];
     });
   }));

package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.js

@@ -17,58 +17,57 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
   var onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   var ssrContext = context.ssrContext;
   var chunkVec = [];
-  var forUserPipe = function(stream) {
-    return new Promise(function(resolve) {
-      var renderToPipeableStream;
-      try {
-        renderToPipeableStream = require("react-dom/server").renderToPipeableStream;
-      } catch (e) {
-      }
-      var _obj;
-      var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), (_obj = {
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce
-      }, _define_property(_obj, onReady, function() {
-        getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(function(param) {
-          var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-          var _options_onShellReady;
-          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
-          var injectableTransform = new Transform({
-            transform: function transform(chunk, _encoding, callback) {
-              try {
-                if (shellChunkStatus !== 1) {
-                  chunkVec.push(chunk.toString());
-                  var concatedChunk = chunkVec.join("");
-                  if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
-                    concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                    shellChunkStatus = 1;
-                    this.push("".concat(shellBefore).concat(concatedChunk).concat(shellAfter));
-                  }
-                } else {
-                  this.push(chunk);
-                }
-                callback();
-              } catch (e) {
-                if (_instanceof(e, Error)) {
-                  callback(e);
-                } else {
-                  callback(new Error("Received unkown error when streaming"));
+  var forUserPipe = new Promise(function(resolve) {
+    var renderToPipeableStream;
+    try {
+      renderToPipeableStream = require("react-dom/server").renderToPipeableStream;
+    } catch (e) {
+    }
+    var _obj;
+    var pipe = renderToPipeableStream(rootElement, _object_spread_props(_object_spread({}, options), (_obj = {
+      nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce
+    }, _define_property(_obj, onReady, function() {
+      getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(function(param) {
+        var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+        var _options_onShellReady;
+        options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+        var injectableTransform = new Transform({
+          transform: function transform(chunk, _encoding, callback) {
+            try {
+              if (shellChunkStatus !== 1) {
+                chunkVec.push(chunk.toString());
+                var concatedChunk = chunkVec.join("");
+                if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                  concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
+                  shellChunkStatus = 1;
+                  this.push("".concat(shellBefore).concat(concatedChunk).concat(shellAfter));
                 }
+              } else {
+                this.push(chunk);
+              }
+              callback();
+            } catch (e) {
+              if (_instanceof(e, Error)) {
+                callback(e);
+              } else {
+                callback(new Error("Received unkown error when streaming"));
               }
             }
-          });
-          resolve(pipe(injectableTransform).pipe(stream));
-        });
-      }), _define_property(_obj, "onShellError", function onShellError(error) {
-        getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(function(param) {
-          var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-          var _options_onShellError;
-          var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
-          resolve(fallbackHtml);
-          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+          }
         });
-      }), _obj))).pipe;
-    });
-  };
+        pipe(injectableTransform);
+        resolve(injectableTransform);
+      });
+    }), _define_property(_obj, "onShellError", function onShellError(error) {
+      getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(function(param) {
+        var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+        var _options_onShellError;
+        var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
+        resolve(fallbackHtml);
+        options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+      });
+    }), _obj))).pipe;
+  });
   return forUserPipe;
 }
 var renderToPipe_default = renderToPipe;

package/dist/esm/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -17,7 +17,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
   var ssrContext = context.ssrContext;
   var forUserPipe = function() {
     var _ref = _async_to_generator(function() {
-      var renderToReadableStream, _ref2, shellAfter, shellBefore, _context_ssrContext, readableOriginal, reader, injectableStream, err, _ref1, shellAfter1, shellBefore1, fallbackHtml;
+      var renderToReadableStream, _ref2, shellAfter, shellBefore, _options_onShellReady, _context_ssrContext, readableOriginal, reader, injectableStream, err, _ref1, shellAfter1, shellBefore1, fallbackHtml;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -51,6 +51,11 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
             ];
           case 3:
             readableOriginal = _state.sent();
+            options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+            readableOriginal.allReady.then(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);
+            });
             if (!((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider))
               return [
                 3,

package/dist/esm/ssr/serverRender/tracker.js

@@ -1,4 +1,7 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 var SSRTimings;
 (function(SSRTimings2) {
   SSRTimings2[SSRTimings2["PRERENDER"] = 0] = "PRERENDER";
@@ -45,22 +48,29 @@ var timings = (_obj1 = {}, _define_property(_obj1, 0, {
   serverTiming: "use-loader",
   logger: "App run useLoader cost = %d ms"
 }), _obj1);
+function getHeadersWithoutCookie(headers) {
+  var _headers = _object_spread_props(_object_spread({}, headers), {
+    cookie: void 0
+  });
+  delete _headers.cookie;
+  return _headers;
+}
 function createSSRTracker(param) {
-  var reporter = param.reporter, serverTiming = param.serverTiming, logger = param.logger;
+  var reporter = param.reporter, serverTiming = param.serverTiming, logger = param.logger, request = param.request;
   var tracker = {
     get sessionId() {
-      return reporter.sessionId;
+      return reporter === null || reporter === void 0 ? void 0 : reporter.sessionId;
     },
     trackError: function trackError(key, e) {
       var _errors_key = errors[key], reporterContent = _errors_key.reporter, loggerContent = _errors_key.logger;
-      reporterContent && reporter.reportError("SSR Error - ".concat(reporterContent), e);
-      loggerContent && logger.error(loggerContent, e);
+      reporterContent && (reporter === null || reporter === void 0 ? void 0 : reporter.reportError("SSR Error - ".concat(reporterContent), e));
+      loggerContent && logger.error("SSR Error - ".concat(loggerContent, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, request.pathname, getHeadersWithoutCookie(request.headers));
     },
     trackTiming: function trackTiming(key, cost) {
       var _timings_key = timings[key], reporterName = _timings_key.reporter, serverTimingName = _timings_key.serverTiming, loggerName = _timings_key.logger;
-      reporterName && reporter.reportTiming(reporterName, cost);
+      reporterName && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(reporterName, cost));
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      loggerName && logger.debug(loggerName, cost);
+      loggerName && logger.debug("SSR Debug - ".concat(loggerName, ", req.url = %s"), cost, request.pathname);
     }
   };
   return tracker;

package/dist/esm-node/core/compatible.js

@@ -193,8 +193,9 @@ const bootstrap = async (BootApp, id, root, ReactDOM) => {
         const redirectUrl = result.headers.get("Location") || "/";
         const { ssrContext } = context;
         if (ssrContext) {
-          ssrContext.res.statusCode = status;
-          ssrContext.res.setHeader("Location", redirectUrl);
+          var _ssrContext_res;
+          ssrContext.res && (ssrContext.res.statusCode = status);
+          (_ssrContext_res = ssrContext.res) === null || _ssrContext_res === void 0 ? void 0 : _ssrContext_res.setHeader("Location", redirectUrl);
           ssrContext.redirection = ssrContext.redirection || {};
           ssrContext.redirection.status = status;
           ssrContext.redirection.url = redirectUrl;

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

@@ -9,9 +9,7 @@ import { time } from "@modern-js/runtime-utils/time";
 import { LOADER_REPORTER_NAME } from "@modern-js/utils/universal/constants";
 import { RuntimeReactContext } from "../../core";
 import { renderRoutes, urlJoin } from "./utils";
-import { installGlobals } from "./fetch";
 import { modifyRoutes as modifyRoutesHook } from "./hooks";
-installGlobals();
 function createFetchRequest(req) {
   const origin = `${req.protocol}://${req.host}`;
   const url = new URL(req.originalUrl || req.url, origin);
@@ -77,7 +75,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             requestContext
           });
           const cost = end();
-          reporter.reportTiming(LOADER_REPORTER_NAME, cost);
+          reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(LOADER_REPORTER_NAME, cost);
           serverTiming.addServeTiming(LOADER_REPORTER_NAME, cost);
           if (routerContext instanceof Response) {
             return routerContext;

package/dist/esm-node/ssr/serverRender/renderToStream/index.js

@@ -16,7 +16,7 @@ const render = ({ App, context, config }) => {
       })
     });
     const { tracker } = ssrContext;
-    const pipe = renderToPipe(rootElement, context, config, {
+    const stream = renderToPipe(rootElement, context, config, {
       onShellReady() {
         const cost = end();
         tracker.trackTiming(SSRTimings.RENDER_SHELL, cost);
@@ -32,7 +32,7 @@ const render = ({ App, context, config }) => {
         tracker.trackError(SSRErrors.RENDER_STREAM, error);
       }
     });
-    return pipe;
+    return stream;
   });
 };
 export {

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.js

@@ -13,58 +13,57 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
   const onReady = ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) ? "onAllReady" : "onShellReady";
   const { ssrContext } = context;
   const chunkVec = [];
-  const forUserPipe = (stream) => {
-    return new Promise((resolve) => {
-      let renderToPipeableStream;
-      try {
-        ({ renderToPipeableStream } = require("react-dom/server"));
-      } catch (e) {
-      }
-      const { pipe } = renderToPipeableStream(rootElement, {
-        ...options,
-        nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
-        [onReady]() {
-          getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
-            var _options_onShellReady;
-            options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
-            const injectableTransform = new Transform({
-              transform(chunk, _encoding, callback) {
-                try {
-                  if (shellChunkStatus !== 1) {
-                    chunkVec.push(chunk.toString());
-                    let concatedChunk = chunkVec.join("");
-                    if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
-                      concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                      shellChunkStatus = 1;
-                      this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
-                    }
-                  } else {
-                    this.push(chunk);
-                  }
-                  callback();
-                } catch (e) {
-                  if (e instanceof Error) {
-                    callback(e);
-                  } else {
-                    callback(new Error("Received unkown error when streaming"));
+  const forUserPipe = new Promise((resolve) => {
+    let renderToPipeableStream;
+    try {
+      ({ renderToPipeableStream } = require("react-dom/server"));
+    } catch (e) {
+    }
+    const { pipe } = renderToPipeableStream(rootElement, {
+      ...options,
+      nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
+      [onReady]() {
+        getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
+          var _options_onShellReady;
+          options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+          const injectableTransform = new Transform({
+            transform(chunk, _encoding, callback) {
+              try {
+                if (shellChunkStatus !== 1) {
+                  chunkVec.push(chunk.toString());
+                  let concatedChunk = chunkVec.join("");
+                  if (concatedChunk.endsWith(ESCAPED_SHELL_STREAM_END_MARK)) {
+                    concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
+                    shellChunkStatus = 1;
+                    this.push(`${shellBefore}${concatedChunk}${shellAfter}`);
                   }
+                } else {
+                  this.push(chunk);
+                }
+                callback();
+              } catch (e) {
+                if (e instanceof Error) {
+                  callback(e);
+                } else {
+                  callback(new Error("Received unkown error when streaming"));
                 }
               }
-            });
-            resolve(pipe(injectableTransform).pipe(stream));
+            }
           });
-        },
-        onShellError(error) {
-          getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
-            var _options_onShellError;
-            const fallbackHtml = `${shellBefore}${shellAfter}`;
-            resolve(fallbackHtml);
-            options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
-          });
-        }
-      });
+          pipe(injectableTransform);
+          resolve(injectableTransform);
+        });
+      },
+      onShellError(error) {
+        getTemplates(context, RenderLevel.CLIENT_RENDER, pluginConfig).then(({ shellAfter, shellBefore }) => {
+          var _options_onShellError;
+          const fallbackHtml = `${shellBefore}${shellAfter}`;
+          resolve(fallbackHtml);
+          options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+        });
+      }
     });
-  };
+  });
   return forUserPipe;
 }
 var renderToPipe_default = renderToPipe;

package/dist/esm-node/ssr/serverRender/renderToStream/renderToPipe.worker.js

@@ -19,7 +19,7 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
     }
     const { shellAfter, shellBefore } = await getTemplates(context, RenderLevel.SERVER_RENDER, pluginConfig);
     try {
-      var _context_ssrContext;
+      var _options_onShellReady, _context_ssrContext;
       const readableOriginal = await renderToReadableStream(rootElement, {
         ...options,
         nonce: ssrContext === null || ssrContext === void 0 ? void 0 : ssrContext.nonce,
@@ -28,6 +28,11 @@ function renderToPipe(rootElement, context, pluginConfig, options) {
           options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
         }
       });
+      options === null || options === void 0 ? void 0 : (_options_onShellReady = options.onShellReady) === null || _options_onShellReady === void 0 ? void 0 : _options_onShellReady.call(options);
+      readableOriginal.allReady.then(() => {
+        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);
+      });
       if ((_context_ssrContext = context.ssrContext) === null || _context_ssrContext === void 0 ? void 0 : _context_ssrContext.isSpider) {
         await readableOriginal.allReady;
       }

package/dist/esm-node/ssr/serverRender/tracker.js

@@ -53,21 +53,29 @@ const timings = {
     logger: "App run useLoader cost = %d ms"
   }
 };
-function createSSRTracker({ reporter, serverTiming, logger }) {
+function getHeadersWithoutCookie(headers) {
+  const _headers = {
+    ...headers,
+    cookie: void 0
+  };
+  delete _headers.cookie;
+  return _headers;
+}
+function createSSRTracker({ reporter, serverTiming, logger, request }) {
   const tracker = {
     get sessionId() {
-      return reporter.sessionId;
+      return reporter === null || reporter === void 0 ? void 0 : reporter.sessionId;
     },
     trackError(key, e) {
       const { reporter: reporterContent, logger: loggerContent } = errors[key];
-      reporterContent && reporter.reportError(`SSR Error - ${reporterContent}`, e);
-      loggerContent && logger.error(loggerContent, e);
+      reporterContent && (reporter === null || reporter === void 0 ? void 0 : reporter.reportError(`SSR Error - ${reporterContent}`, e));
+      loggerContent && logger.error(`SSR Error - ${loggerContent}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, request.pathname, getHeadersWithoutCookie(request.headers));
     },
     trackTiming(key, cost) {
       const { reporter: reporterName, serverTiming: serverTimingName, logger: loggerName } = timings[key];
-      reporterName && reporter.reportTiming(reporterName, cost);
+      reporterName && (reporter === null || reporter === void 0 ? void 0 : reporter.reportTiming(reporterName, cost));
       serverTimingName && serverTiming.addServeTiming(serverTimingName, cost);
-      loggerName && logger.debug(loggerName, cost);
+      loggerName && logger.debug(`SSR Debug - ${loggerName}, req.url = %s`, cost, request.pathname);
     }
   };
   return tracker;

package/dist/types/ssr/serverRender/renderToStream/index.d.ts

@@ -1,3 +1,3 @@
 /// <reference types="node" />
 import { ServerRenderOptions } from '../types';
-export declare const render: ({ App, context, config }: ServerRenderOptions) => Promise<import("./renderToPipe").Pipe<import("stream").Writable>>;
+export declare const render: ({ App, context, config }: ServerRenderOptions) => Promise<string | import("stream").Readable>;

package/dist/types/ssr/serverRender/renderToStream/renderToPipe.d.ts

@@ -1,8 +1,7 @@
-/// <reference types="node" />
 /// <reference types="react" />
-import { Writable } from 'stream';
+/// <reference types="node" />
+import { Readable } from 'stream';
 import type { RenderToPipeableStreamOptions } from 'react-dom/server';
 import { RuntimeContext, SSRPluginConfig } from '../types';
-export type Pipe<T extends Writable> = (output: T) => Promise<T | string>;
-declare function renderToPipe(rootElement: React.ReactElement, context: RuntimeContext, pluginConfig: SSRPluginConfig, options?: RenderToPipeableStreamOptions): Pipe<Writable>;
+declare function renderToPipe(rootElement: React.ReactElement, context: RuntimeContext, pluginConfig: SSRPluginConfig, options?: RenderToPipeableStreamOptions): Promise<string | Readable>;
 export default renderToPipe;

package/dist/types/ssr/serverRender/renderToStream/renderToPipe.worker.d.ts

@@ -4,5 +4,9 @@ import type { Writable } from 'stream';
 import type { RenderToReadableStreamOptions } from 'react-dom/server';
 import { RuntimeContext, SSRPluginConfig } from '../types';
 export type Pipe<T extends Writable> = (output: T) => Promise<T | string>;
-declare function renderToPipe(rootElement: React.ReactElement, context: RuntimeContext, pluginConfig: SSRPluginConfig, options?: RenderToReadableStreamOptions): Promise<string | ReadableStream<any>>;
+declare function renderToPipe(rootElement: React.ReactElement, context: RuntimeContext, pluginConfig: SSRPluginConfig, options?: RenderToReadableStreamOptions & {
+    onShellReady?: () => void;
+    onAllReady?: () => void;
+    onShellError?: (e: unknown) => void;
+}): Promise<string | ReadableStream<any>>;
 export default renderToPipe;

package/dist/types/ssr/serverRender/tracker.d.ts

@@ -13,7 +13,7 @@ export declare enum SSRErrors {
     RENDER_STREAM = 3,
     RENDER_SHELL = 4
 }
-export declare function createSSRTracker({ reporter, serverTiming, logger, }: BaseSSRServerContext): {
+export declare function createSSRTracker({ reporter, serverTiming, logger, request, }: BaseSSRServerContext): {
     readonly sessionId: string | undefined;
     trackError(key: SSRErrors, e: Error): void;
     trackTiming(key: SSRTimings, cost: number): void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.6",
+  "version": "2.49.0",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -159,7 +159,6 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.10",
     "@modern-js-reduck/react": "^1.1.10",
     "@modern-js-reduck/store": "^1.1.10",
-    "@remix-run/node": "^1.12.0",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
@@ -171,10 +170,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/types": "2.48.6",
-    "@modern-js/plugin": "2.48.6",
-    "@modern-js/utils": "2.48.6",
-    "@modern-js/runtime-utils": "2.48.6"
+    "@modern-js/plugin": "2.49.0",
+    "@modern-js/types": "2.49.0",
+    "@modern-js/utils": "2.49.0",
+    "@modern-js/runtime-utils": "2.49.0"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -195,11 +194,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.91.0",
-    "@modern-js/app-tools": "2.48.6",
-    "@modern-js/core": "2.48.6",
-    "@modern-js/server-core": "2.48.6",
-    "@scripts/jest-config": "2.48.6",
-    "@scripts/build": "2.48.6"
+    "@modern-js/app-tools": "2.49.0",
+    "@modern-js/core": "2.49.0",
+    "@modern-js/server-core": "2.49.0",
+    "@scripts/build": "2.49.0",
+    "@scripts/jest-config": "2.49.0"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/router/runtime/fetch.js

@@ -1,29 +0,0 @@
-"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 fetch_exports = {};
-__export(fetch_exports, {
-  installGlobals: () => installGlobals
-});
-module.exports = __toCommonJS(fetch_exports);
-function installGlobals() {
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  installGlobals
-});

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

@@ -1,28 +0,0 @@
-"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 fetch_node_exports = {};
-__export(fetch_node_exports, {
-  installGlobals: () => import_node.installGlobals
-});
-module.exports = __toCommonJS(fetch_node_exports);
-var import_node = require("@remix-run/node");
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  installGlobals
-});

package/dist/cjs/router/runtime/fetch.worker.js

@@ -1,29 +0,0 @@
-"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 fetch_worker_exports = {};
-__export(fetch_worker_exports, {
-  installGlobals: () => installGlobals
-});
-module.exports = __toCommonJS(fetch_worker_exports);
-function installGlobals() {
-}
-// Annotate the CommonJS export names for ESM import in node:
-0 && (module.exports = {
-  installGlobals
-});

package/dist/esm/router/runtime/fetch.js

@@ -1,5 +0,0 @@
-function installGlobals() {
-}
-export {
-  installGlobals
-};

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

@@ -1,4 +0,0 @@
-import { installGlobals } from "@remix-run/node";
-export {
-  installGlobals
-};

package/dist/esm/router/runtime/fetch.worker.js

@@ -1,5 +0,0 @@
-function installGlobals() {
-}
-export {
-  installGlobals
-};

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

@@ -1,5 +0,0 @@
-function installGlobals() {
-}
-export {
-  installGlobals
-};

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

@@ -1,4 +0,0 @@
-import { installGlobals } from "@remix-run/node";
-export {
-  installGlobals
-};

package/dist/esm-node/router/runtime/fetch.worker.js

@@ -1,5 +0,0 @@
-function installGlobals() {
-}
-export {
-  installGlobals
-};

package/dist/types/router/runtime/fetch.d.ts

@@ -1,2 +0,0 @@
-declare function installGlobals(): void;
-export { installGlobals };

package/dist/types/router/runtime/fetch.node.d.ts

@@ -1,2 +0,0 @@
-import { installGlobals } from '@remix-run/node';
-export { installGlobals };

package/dist/types/router/runtime/fetch.worker.d.ts

@@ -1,2 +0,0 @@
-declare function installGlobals(): void;
-export { installGlobals };