@modern-js/runtime 2.58.0 → 2.58.1

package/dist/cjs/cli/code.js

@@ -78,7 +78,7 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       const ssrMode = getSSRMode(entryName, config);
       if (enableAsyncEntry) {
         const bootstrapFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_BOOTSTRAP_FILE_NAME}`);
-        import_utils.fs.outputFileSync(bootstrapFile, `import('./${import_constants.INDEX_FILE_NAME}');`, "utf8");
+        import_utils.fs.outputFileSync(bootstrapFile, `import(/* webpackChunkName: "async-${entryName}" */ './${import_constants.INDEX_FILE_NAME}');`, "utf8");
         const bootstrapServerFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_SERVER_BOOTSTRAP_FILE_NAME}`);
         if (ssrMode) {
           import_utils.fs.outputFileSync(bootstrapServerFile, `export const requestHandler = import('./${import_constants.SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, "utf8");

package/dist/cjs/cli/template.js

@@ -69,7 +69,10 @@ const getImportRuntimeConfigCode = (srcDirectory, internalSrcAlias, runtimeConfi
   }
   return `let runtimeConfig;`;
 };
-const getRegisterRuntimePluginCode = (entryName, name, config) => `plugins.push(${name}Plugin(mergeConfig(${JSON.stringify(config)}, (runtimeConfig || {})['${name}'], ((runtimeConfig || {})['${name}ByEntries'] || {})['${entryName}'], (getGlobalAppConfig() || {})['${name}'])));`;
+const getRegisterRuntimePluginCode = (entryName, name, config) => {
+  const configName = name === "garfish" ? "masterApp" : name;
+  return `plugins.push(${name}Plugin(mergeConfig(${JSON.stringify(config)}, (runtimeConfig || {})['${configName}'], ((runtimeConfig || {})['${configName}ByEntries'] || {})['${entryName}'], (getGlobalAppConfig() || {})['${configName}'])));`;
+};
 const runtimeRegister = ({ entryName, srcDirectory, internalSrcAlias, metaName, runtimeConfigFile, runtimePlugins }) => `import { registerPlugin, mergeConfig } from '@${metaName}/runtime/plugin';
 import { getGlobalAppConfig, getGlobalLayoutApp } from '@${metaName}/runtime/context';
 ${getImportRuntimeConfigCode(srcDirectory, internalSrcAlias, runtimeConfigFile)}

package/dist/cjs/core/server/requestHandler.js

@@ -33,12 +33,15 @@ function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
   const { entryName, route } = resource;
-  const cookie = request.headers.get("cookie");
+  const { headers } = request;
+  const cookie = headers.get("cookie") || "";
   const cookieMap = (0, import_request.parseCookie)(request);
   const pathname = (0, import_request.getPathname)(request);
   const query = (0, import_request.parseQuery)(request);
   const headersData = (0, import_request.parseHeaders)(request);
   const url = new URL(request.url);
+  const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
+  const protocal = `${headers.get("X-Forwarded-Proto") || url.protocol || "http"}:`;
   const ssrConfig = (0, import_utils.getSSRConfigByEntry)(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = (0, import_utils.getSSRMode)(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -50,15 +53,16 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
+      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
       baseUrl: route.urlPath,
-      userAgent: request.headers.get("user-agent"),
+      userAgent: headers.get("user-agent"),
       cookie,
       cookieMap,
       pathname,
       query,
       params,
       headers: headersData,
-      host: url.host,
+      host,
       raw: request
     },
     response: {

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

@@ -26,7 +26,7 @@ var import_utils = require("../utils");
 var import_constants = require("../constants");
 var import_shared = require("../shared");
 function buildShellAfterTemplate(afterAppTemplate, options) {
-  const { request, config, ssrConfig, runtimeContext, renderLevel } = options;
+  const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [
     createReplaceSSRData({
       request,
@@ -34,8 +34,25 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       nonce: config.nonce,
       runtimeContext,
       renderLevel
-    })
+    }),
+    (template) => injectJs(template, entryName, config.nonce)
   ];
+  async function injectJs(template, entryName2, nonce) {
+    const { routeManifest } = runtimeContext;
+    const { routeAssets } = routeManifest;
+    const asyncEntry = routeAssets[`async-${entryName2}`];
+    if (asyncEntry) {
+      var _assets_filter;
+      const { assets } = asyncEntry;
+      const jsChunkStr = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((asset) => {
+        return `<script src=${asset} nonce="${nonce}"></script>`;
+      }).join(" ");
+      if (jsChunkStr) {
+        return (0, import_utils.safeReplace)(template, "<!--<?- chunksMap.js ?>-->", jsChunkStr);
+      }
+    }
+    return template;
+  }
   return (0, import_shared.buildHtml)(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
@@ -59,7 +76,7 @@ function createReplaceSSRData(options) {
         params: request.params,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       }
     },

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

@@ -55,15 +55,15 @@ const checkIsInline = (chunk, enableInline) => {
   }
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
-  const { config, runtimeContext, styledComponentsStyleTags } = options;
+  const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
   const helmetData = import_react_helmet.default.renderStatic();
   const callbacks = [
     (0, import_helmet.createReplaceHelemt)(helmetData),
     // @TODO: prefetch scripts of lazy component
-    (template) => injectCss(template, styledComponentsStyleTags)
+    (template) => injectCss(template, entryName, styledComponentsStyleTags)
   ];
   return (0, import_shared.buildHtml)(beforeAppTemplate, callbacks);
-  async function injectCss(template, styledComponentsStyleTags2) {
+  async function injectCss(template, entryName2, styledComponentsStyleTags2) {
     let css = await getCssChunks();
     if (styledComponentsStyleTags2) {
       css += styledComponentsStyleTags2;
@@ -75,22 +75,29 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
         return "";
       }
       const { routeAssets } = routeManifest;
-      const cssChunks = [];
       const matches = (0, import_router.matchRoutes)(routes, routerContext.location, routerContext.basename);
-      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
+      const matchedRouteManifests = matches === null || matches === void 0 ? void 0 : matches.map((match, index) => {
         if (!index) {
           return;
         }
         const routeId = match.route.id;
         if (routeId) {
           const routeManifest2 = routeAssets[routeId];
-          if (routeManifest2) {
-            const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
-            cssChunks.push(..._cssChunks);
-          }
+          return routeManifest2;
         }
-      });
+      }).filter(Boolean);
+      const asyncEntry = routeAssets[`async-${entryName2}`];
+      if (asyncEntry) {
+        matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.push(asyncEntry);
+      }
+      const cssChunks = matchedRouteManifests ? matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.reduce((chunks, routeManifest2) => {
+        const { referenceCssAssets = [] } = routeManifest2;
+        const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
+        return [
+          ...chunks,
+          ..._cssChunks
+        ];
+      }, []) : [];
       const { enableInlineStyles } = config;
       const styles = await Promise.all(cssChunks.map(async (chunk) => {
         const link = `<link href="${chunk}" rel="stylesheet" />`;

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

@@ -41,7 +41,7 @@ var import_template = require("./template");
 var import_shared = require("./shared");
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   const { renderToPipeableStream } = await Promise.resolve().then(() => __toESM(require("react-dom/server")));
-  const { runtimeContext, htmlTemplate, config, ssrConfig } = options;
+  const { runtimeContext, htmlTemplate, config, ssrConfig, entryName } = options;
   let shellChunkStatus = import_shared.ShellChunkStatus.START;
   let renderLevel = import_constants.RenderLevel.SERVER_RENDER;
   const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
@@ -63,6 +63,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
           renderLevel,
           runtimeContext,
           config,
+          entryName,
           styledComponentsStyleTags
         }).then(({ shellAfter, shellBefore }) => {
           const body = new import_stream.Transform({
@@ -101,6 +102,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
           ssrConfig,
           renderLevel,
           runtimeContext,
+          entryName,
           config
         }).then(({ shellAfter, shellBefore }) => {
           var _options_onShellError;

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

@@ -40,13 +40,14 @@ var import_template = require("./template");
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   let shellChunkStatus = import_shared.ShellChunkStatus.START;
   const chunkVec = [];
-  const { htmlTemplate, runtimeContext, config, ssrConfig } = options;
+  const { htmlTemplate, runtimeContext, config, ssrConfig, entryName } = options;
   const { shellBefore, shellAfter } = await (0, import_template.getTemplates)(htmlTemplate, {
     renderLevel: import_constants.RenderLevel.SERVER_RENDER,
     runtimeContext,
     ssrConfig,
     request,
-    config
+    config,
+    entryName
   });
   try {
     var _options_onShellReady;

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

@@ -72,6 +72,7 @@ function createRenderStreaming(createReadableStreamFromElement) {
         htmlTemplate,
         runtimeContext,
         ssrConfig,
+        entryName,
         onShellReady() {
           const cost = end();
           onTiming(import_tracer.SSRTimings.RENDER_SHELL, cost);

package/dist/cjs/core/server/string/ssrData.js

@@ -66,7 +66,7 @@ function getSSRData() {
         query: request.query,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       },
       reporter: {

package/dist/esm/cli/code.js

@@ -65,7 +65,7 @@ var generateCode = function() {
                         ssrMode = getSSRMode(entryName, config);
                         if (enableAsyncEntry) {
                           bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
-                          fs.outputFileSync(bootstrapFile, "import('./".concat(INDEX_FILE_NAME, "');"), "utf8");
+                          fs.outputFileSync(bootstrapFile, 'import(/* webpackChunkName: "async-'.concat(entryName, `" */ './`).concat(INDEX_FILE_NAME, "');"), "utf8");
                           bootstrapServerFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_SERVER_BOOTSTRAP_FILE_NAME));
                           if (ssrMode) {
                             fs.outputFileSync(bootstrapServerFile, "export const requestHandler = import('./".concat(SERVER_ENTRY_POINT_FILE_NAME, "').then((m) => m.requestHandler)"), "utf8");

package/dist/esm/cli/template.js

@@ -32,7 +32,8 @@ var getImportRuntimeConfigCode = function(srcDirectory, internalSrcAlias, runtim
   return "let runtimeConfig;";
 };
 var getRegisterRuntimePluginCode = function(entryName, name, config) {
-  return "plugins.push(".concat(name, "Plugin(mergeConfig(").concat(JSON.stringify(config), ", (runtimeConfig || {})['").concat(name, "'], ((runtimeConfig || {})['").concat(name, "ByEntries'] || {})['").concat(entryName, "'], (getGlobalAppConfig() || {})['").concat(name, "'])));");
+  var configName = name === "garfish" ? "masterApp" : name;
+  return "plugins.push(".concat(name, "Plugin(mergeConfig(").concat(JSON.stringify(config), ", (runtimeConfig || {})['").concat(configName, "'], ((runtimeConfig || {})['").concat(configName, "ByEntries'] || {})['").concat(entryName, "'], (getGlobalAppConfig() || {})['").concat(configName, "'])));");
 };
 var runtimeRegister = function(param) {
   var entryName = param.entryName, srcDirectory = param.srcDirectory, internalSrcAlias = param.internalSrcAlias, metaName = param.metaName, runtimeConfigFile = param.runtimeConfigFile, runtimePlugins = param.runtimePlugins;

package/dist/esm/core/server/requestHandler.js

@@ -16,12 +16,15 @@ function createSSRContext(request, options) {
   var config = options.config, loaderContext = options.loaderContext, onError = options.onError, onTiming = options.onTiming, locals = options.locals, resource = options.resource, params = options.params, responseProxy = options.responseProxy, logger = options.logger, metrics = options.metrics, reporter = options.reporter;
   var nonce = config.nonce;
   var entryName = resource.entryName, route = resource.route;
-  var cookie = request.headers.get("cookie");
+  var headers = request.headers;
+  var cookie = headers.get("cookie") || "";
   var cookieMap = parseCookie(request);
   var pathname = getPathname(request);
   var query = parseQuery(request);
   var headersData = parseHeaders(request);
   var url = new URL(request.url);
+  var host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
+  var protocal = "".concat(headers.get("X-Forwarded-Proto") || url.protocol || "http", ":");
   var ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   var ssrMode = getSSRMode(ssrConfig);
   var loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -33,15 +36,16 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
+      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
       baseUrl: route.urlPath,
-      userAgent: request.headers.get("user-agent"),
+      userAgent: headers.get("user-agent"),
       cookie,
       cookieMap,
       pathname,
       query,
       params,
       headers: headersData,
-      host: url.host,
+      host,
       raw: request
     },
     response: {

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

@@ -1,10 +1,12 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { serializeJson } from "@modern-js/runtime-utils/node";
 import { attributesToString, safeReplace } from "../utils";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildHtml } from "../shared";
 function buildShellAfterTemplate(afterAppTemplate, options) {
-  var request = options.request, config = options.config, ssrConfig = options.ssrConfig, runtimeContext = options.runtimeContext, renderLevel = options.renderLevel;
+  var request = options.request, config = options.config, ssrConfig = options.ssrConfig, runtimeContext = options.runtimeContext, renderLevel = options.renderLevel, entryName = options.entryName;
   var callbacks = [
     createReplaceSSRData({
       request,
@@ -12,8 +14,44 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       nonce: config.nonce,
       runtimeContext,
       renderLevel
-    })
+    }),
+    function(template) {
+      return injectJs(template, entryName, config.nonce);
+    }
   ];
+  function injectJs(template, entryName2, nonce) {
+    return _injectJs.apply(this, arguments);
+  }
+  function _injectJs() {
+    _injectJs = _async_to_generator(function(template, entryName2, nonce) {
+      var routeManifest, routeAssets, asyncEntry, _assets_filter, assets, jsChunkStr;
+      return _ts_generator(this, function(_state) {
+        routeManifest = runtimeContext.routeManifest;
+        routeAssets = routeManifest.routeAssets;
+        asyncEntry = routeAssets["async-".concat(entryName2)];
+        if (asyncEntry) {
+          ;
+          assets = asyncEntry.assets;
+          jsChunkStr = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter(function(asset) {
+            return asset.endsWith(".js");
+          })) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map(function(asset) {
+            return "<script src=".concat(asset, ' nonce="').concat(nonce, '"></script>');
+          }).join(" ");
+          if (jsChunkStr) {
+            return [
+              2,
+              safeReplace(template, "<!--<?- chunksMap.js ?>-->", jsChunkStr)
+            ];
+          }
+        }
+        return [
+          2,
+          template
+        ];
+      });
+    });
+    return _injectJs.apply(this, arguments);
+  }
   return buildHtml(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
@@ -40,7 +78,7 @@ function createReplaceSSRData(options) {
         params: request.params,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       }
     },

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

@@ -54,19 +54,19 @@ function buildShellBeforeTemplate(beforeAppTemplate, options) {
 }
 function _buildShellBeforeTemplate() {
   _buildShellBeforeTemplate = _async_to_generator(function(beforeAppTemplate, options) {
-    var config, runtimeContext, styledComponentsStyleTags, helmetData, callbacks;
-    function injectCss(template, styledComponentsStyleTags2) {
+    var config, runtimeContext, styledComponentsStyleTags, entryName, helmetData, callbacks;
+    function injectCss(template, entryName2, styledComponentsStyleTags2) {
       return _injectCss.apply(this, arguments);
     }
     function _injectCss() {
-      _injectCss = _async_to_generator(function(template, styledComponentsStyleTags2) {
+      _injectCss = _async_to_generator(function(template, entryName2, styledComponentsStyleTags2) {
         var css;
         function getCssChunks() {
           return _getCssChunks.apply(this, arguments);
         }
         function _getCssChunks() {
           _getCssChunks = _async_to_generator(function() {
-            var routeManifest, routerContext, routes, routeAssets, cssChunks, matches, enableInlineStyles, styles;
+            var routeManifest, routerContext, routes, routeAssets, matches, matchedRouteManifests, asyncEntry, cssChunks, enableInlineStyles, styles;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
@@ -78,25 +78,28 @@ function _buildShellBeforeTemplate() {
                     ];
                   }
                   routeAssets = routeManifest.routeAssets;
-                  cssChunks = [];
                   matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-                  matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
+                  matchedRouteManifests = matches === null || matches === void 0 ? void 0 : matches.map(function(match, index) {
                     if (!index) {
                       return;
                     }
                     var routeId = match.route.id;
                     if (routeId) {
                       var routeManifest2 = routeAssets[routeId];
-                      if (routeManifest2) {
-                        var _cssChunks;
-                        var _routeManifest_referenceCssAssets = routeManifest2.referenceCssAssets, referenceCssAssets = _routeManifest_referenceCssAssets === void 0 ? [] : _routeManifest_referenceCssAssets;
-                        var _cssChunks1 = referenceCssAssets.filter(function(asset) {
-                          return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset);
-                        });
-                        (_cssChunks = cssChunks).push.apply(_cssChunks, _to_consumable_array(_cssChunks1));
-                      }
+                      return routeManifest2;
                     }
-                  });
+                  }).filter(Boolean);
+                  asyncEntry = routeAssets["async-".concat(entryName2)];
+                  if (asyncEntry) {
+                    matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.push(asyncEntry);
+                  }
+                  cssChunks = matchedRouteManifests ? matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.reduce(function(chunks, routeManifest2) {
+                    var _routeManifest_referenceCssAssets = routeManifest2.referenceCssAssets, referenceCssAssets = _routeManifest_referenceCssAssets === void 0 ? [] : _routeManifest_referenceCssAssets;
+                    var _cssChunks = referenceCssAssets.filter(function(asset) {
+                      return (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset);
+                    });
+                    return _to_consumable_array(chunks).concat(_to_consumable_array(_cssChunks));
+                  }, []) : [];
                   enableInlineStyles = config.enableInlineStyles;
                   return [
                     4,
@@ -163,13 +166,13 @@ function _buildShellBeforeTemplate() {
       return _injectCss.apply(this, arguments);
     }
     return _ts_generator(this, function(_state) {
-      config = options.config, runtimeContext = options.runtimeContext, styledComponentsStyleTags = options.styledComponentsStyleTags;
+      config = options.config, runtimeContext = options.runtimeContext, styledComponentsStyleTags = options.styledComponentsStyleTags, entryName = options.entryName;
       helmetData = ReactHelmet.renderStatic();
       callbacks = [
         createReplaceHelemt(helmetData),
         // @TODO: prefetch scripts of lazy component
         function(template) {
-          return injectCss(template, styledComponentsStyleTags);
+          return injectCss(template, entryName, styledComponentsStyleTags);
         }
       ];
       return [

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

@@ -12,7 +12,7 @@ import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
-    var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, shellChunkStatus, renderLevel, forceStream2String, isbot, onReady, sheet, chunkVec, root;
+    var renderToPipeableStream, runtimeContext, htmlTemplate, config, ssrConfig, entryName, shellChunkStatus, renderLevel, forceStream2String, isbot, onReady, sheet, chunkVec, root;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -22,7 +22,7 @@ var createReadableStreamFromElement = function() {
           ];
         case 1:
           renderToPipeableStream = _state.sent().renderToPipeableStream;
-          runtimeContext = options.runtimeContext, htmlTemplate = options.htmlTemplate, config = options.config, ssrConfig = options.ssrConfig;
+          runtimeContext = options.runtimeContext, htmlTemplate = options.htmlTemplate, config = options.config, ssrConfig = options.ssrConfig, entryName = options.entryName;
           shellChunkStatus = ShellChunkStatus.START;
           renderLevel = RenderLevel.SERVER_RENDER;
           forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
@@ -47,6 +47,7 @@ var createReadableStreamFromElement = function() {
                   renderLevel,
                   runtimeContext,
                   config,
+                  entryName,
                   styledComponentsStyleTags
                 }).then(function(param) {
                   var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
@@ -85,6 +86,7 @@ var createReadableStreamFromElement = function() {
                   ssrConfig,
                   renderLevel,
                   runtimeContext,
+                  entryName,
                   config
                 }).then(function(param) {
                   var shellAfter = param.shellAfter, shellBefore = param.shellBefore;

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

@@ -8,13 +8,13 @@ import { ShellChunkStatus, encodeForWebStream, getReadableStreamFromString } fro
 import { getTemplates } from "./template";
 var createReadableStreamFromElement = function() {
   var _ref = _async_to_generator(function(request, rootElement, options) {
-    var shellChunkStatus, chunkVec, htmlTemplate, runtimeContext, config, ssrConfig, _ref2, shellBefore, shellAfter, _options_onShellReady, readableOriginal, isbot, reader, stream, e, fallbackHtml, stream1;
+    var shellChunkStatus, chunkVec, htmlTemplate, runtimeContext, config, ssrConfig, entryName, _ref2, shellBefore, shellAfter, _options_onShellReady, readableOriginal, isbot, reader, stream, e, fallbackHtml, stream1;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           shellChunkStatus = ShellChunkStatus.START;
           chunkVec = [];
-          htmlTemplate = options.htmlTemplate, runtimeContext = options.runtimeContext, config = options.config, ssrConfig = options.ssrConfig;
+          htmlTemplate = options.htmlTemplate, runtimeContext = options.runtimeContext, config = options.config, ssrConfig = options.ssrConfig, entryName = options.entryName;
           return [
             4,
             getTemplates(htmlTemplate, {
@@ -22,7 +22,8 @@ var createReadableStreamFromElement = function() {
               runtimeContext,
               ssrConfig,
               request,
-              config
+              config,
+              entryName
             })
           ];
         case 1:

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

@@ -59,6 +59,7 @@ function createRenderStreaming(createReadableStreamFromElement) {
                       htmlTemplate,
                       runtimeContext,
                       ssrConfig,
+                      entryName,
                       onShellReady: function onShellReady() {
                         var cost = end();
                         onTiming(SSRTimings.RENDER_SHELL, cost);

package/dist/esm/core/server/string/ssrData.js

@@ -52,7 +52,7 @@ function getSSRData() {
         query: request.query,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       },
       reporter: {

package/dist/esm-node/cli/code.js

@@ -45,7 +45,7 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       const ssrMode = getSSRMode(entryName, config);
       if (enableAsyncEntry) {
         const bootstrapFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_BOOTSTRAP_FILE_NAME}`);
-        fs.outputFileSync(bootstrapFile, `import('./${INDEX_FILE_NAME}');`, "utf8");
+        fs.outputFileSync(bootstrapFile, `import(/* webpackChunkName: "async-${entryName}" */ './${INDEX_FILE_NAME}');`, "utf8");
         const bootstrapServerFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_SERVER_BOOTSTRAP_FILE_NAME}`);
         if (ssrMode) {
           fs.outputFileSync(bootstrapServerFile, `export const requestHandler = import('./${SERVER_ENTRY_POINT_FILE_NAME}').then((m) => m.requestHandler)`, "utf8");

package/dist/esm-node/cli/template.js

@@ -33,7 +33,10 @@ const getImportRuntimeConfigCode = (srcDirectory, internalSrcAlias, runtimeConfi
   }
   return `let runtimeConfig;`;
 };
-const getRegisterRuntimePluginCode = (entryName, name, config) => `plugins.push(${name}Plugin(mergeConfig(${JSON.stringify(config)}, (runtimeConfig || {})['${name}'], ((runtimeConfig || {})['${name}ByEntries'] || {})['${entryName}'], (getGlobalAppConfig() || {})['${name}'])));`;
+const getRegisterRuntimePluginCode = (entryName, name, config) => {
+  const configName = name === "garfish" ? "masterApp" : name;
+  return `plugins.push(${name}Plugin(mergeConfig(${JSON.stringify(config)}, (runtimeConfig || {})['${configName}'], ((runtimeConfig || {})['${configName}ByEntries'] || {})['${entryName}'], (getGlobalAppConfig() || {})['${configName}'])));`;
+};
 const runtimeRegister = ({ entryName, srcDirectory, internalSrcAlias, metaName, runtimeConfigFile, runtimePlugins }) => `import { registerPlugin, mergeConfig } from '@${metaName}/runtime/plugin';
 import { getGlobalAppConfig, getGlobalLayoutApp } from '@${metaName}/runtime/context';
 ${getImportRuntimeConfigCode(srcDirectory, internalSrcAlias, runtimeConfigFile)}

package/dist/esm-node/core/server/requestHandler.js

@@ -10,12 +10,15 @@ function createSSRContext(request, options) {
   const { config, loaderContext, onError, onTiming, locals, resource, params, responseProxy, logger, metrics, reporter } = options;
   const { nonce } = config;
   const { entryName, route } = resource;
-  const cookie = request.headers.get("cookie");
+  const { headers } = request;
+  const cookie = headers.get("cookie") || "";
   const cookieMap = parseCookie(request);
   const pathname = getPathname(request);
   const query = parseQuery(request);
   const headersData = parseHeaders(request);
   const url = new URL(request.url);
+  const host = headers.get("X-Forwarded-Host") || headers.get("host") || url.host;
+  const protocal = `${headers.get("X-Forwarded-Proto") || url.protocol || "http"}:`;
   const ssrConfig = getSSRConfigByEntry(entryName, config.ssr, config.ssrByEntries);
   const ssrMode = getSSRMode(ssrConfig);
   const loaderFailureMode = typeof ssrConfig === "object" ? ssrConfig.loaderFailureMode : void 0;
@@ -27,15 +30,16 @@ function createSSRContext(request, options) {
     logger,
     metrics,
     request: {
+      url: request.url.replace(url.host, host).replace(url.protocol, protocal),
       baseUrl: route.urlPath,
-      userAgent: request.headers.get("user-agent"),
+      userAgent: headers.get("user-agent"),
       cookie,
       cookieMap,
       pathname,
       query,
       params,
       headers: headersData,
-      host: url.host,
+      host,
       raw: request
     },
     response: {

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

@@ -3,7 +3,7 @@ import { attributesToString, safeReplace } from "../utils";
 import { SSR_DATA_PLACEHOLDER } from "../constants";
 import { buildHtml } from "../shared";
 function buildShellAfterTemplate(afterAppTemplate, options) {
-  const { request, config, ssrConfig, runtimeContext, renderLevel } = options;
+  const { request, config, ssrConfig, runtimeContext, renderLevel, entryName } = options;
   const callbacks = [
     createReplaceSSRData({
       request,
@@ -11,8 +11,25 @@ function buildShellAfterTemplate(afterAppTemplate, options) {
       nonce: config.nonce,
       runtimeContext,
       renderLevel
-    })
+    }),
+    (template) => injectJs(template, entryName, config.nonce)
   ];
+  async function injectJs(template, entryName2, nonce) {
+    const { routeManifest } = runtimeContext;
+    const { routeAssets } = routeManifest;
+    const asyncEntry = routeAssets[`async-${entryName2}`];
+    if (asyncEntry) {
+      var _assets_filter;
+      const { assets } = asyncEntry;
+      const jsChunkStr = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((asset) => {
+        return `<script src=${asset} nonce="${nonce}"></script>`;
+      }).join(" ");
+      if (jsChunkStr) {
+        return safeReplace(template, "<!--<?- chunksMap.js ?>-->", jsChunkStr);
+      }
+    }
+    return template;
+  }
   return buildHtml(afterAppTemplate, callbacks);
 }
 function createReplaceSSRData(options) {
@@ -36,7 +53,7 @@ function createReplaceSSRData(options) {
         params: request.params,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       }
     },

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

@@ -22,15 +22,15 @@ const checkIsInline = (chunk, enableInline) => {
   }
 };
 async function buildShellBeforeTemplate(beforeAppTemplate, options) {
-  const { config, runtimeContext, styledComponentsStyleTags } = options;
+  const { config, runtimeContext, styledComponentsStyleTags, entryName } = options;
   const helmetData = ReactHelmet.renderStatic();
   const callbacks = [
     createReplaceHelemt(helmetData),
     // @TODO: prefetch scripts of lazy component
-    (template) => injectCss(template, styledComponentsStyleTags)
+    (template) => injectCss(template, entryName, styledComponentsStyleTags)
   ];
   return buildHtml(beforeAppTemplate, callbacks);
-  async function injectCss(template, styledComponentsStyleTags2) {
+  async function injectCss(template, entryName2, styledComponentsStyleTags2) {
     let css = await getCssChunks();
     if (styledComponentsStyleTags2) {
       css += styledComponentsStyleTags2;
@@ -42,22 +42,29 @@ async function buildShellBeforeTemplate(beforeAppTemplate, options) {
         return "";
       }
       const { routeAssets } = routeManifest;
-      const cssChunks = [];
       const matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-      matches === null || matches === void 0 ? void 0 : matches.forEach((match, index) => {
+      const matchedRouteManifests = matches === null || matches === void 0 ? void 0 : matches.map((match, index) => {
         if (!index) {
           return;
         }
         const routeId = match.route.id;
         if (routeId) {
           const routeManifest2 = routeAssets[routeId];
-          if (routeManifest2) {
-            const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
-            cssChunks.push(..._cssChunks);
-          }
+          return routeManifest2;
         }
-      });
+      }).filter(Boolean);
+      const asyncEntry = routeAssets[`async-${entryName2}`];
+      if (asyncEntry) {
+        matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.push(asyncEntry);
+      }
+      const cssChunks = matchedRouteManifests ? matchedRouteManifests === null || matchedRouteManifests === void 0 ? void 0 : matchedRouteManifests.reduce((chunks, routeManifest2) => {
+        const { referenceCssAssets = [] } = routeManifest2;
+        const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
+        return [
+          ...chunks,
+          ..._cssChunks
+        ];
+      }, []) : [];
       const { enableInlineStyles } = config;
       const styles = await Promise.all(cssChunks.map(async (chunk) => {
         const link = `<link href="${chunk}" rel="stylesheet" />`;

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

@@ -8,7 +8,7 @@ import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   const { renderToPipeableStream } = await import("react-dom/server");
-  const { runtimeContext, htmlTemplate, config, ssrConfig } = options;
+  const { runtimeContext, htmlTemplate, config, ssrConfig, entryName } = options;
   let shellChunkStatus = ShellChunkStatus.START;
   let renderLevel = RenderLevel.SERVER_RENDER;
   const forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
@@ -30,6 +30,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
           renderLevel,
           runtimeContext,
           config,
+          entryName,
           styledComponentsStyleTags
         }).then(({ shellAfter, shellBefore }) => {
           const body = new Transform({
@@ -68,6 +69,7 @@ const createReadableStreamFromElement = async (request, rootElement, options) =>
           ssrConfig,
           renderLevel,
           runtimeContext,
+          entryName,
           config
         }).then(({ shellAfter, shellBefore }) => {
           var _options_onShellError;

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

@@ -7,13 +7,14 @@ import { getTemplates } from "./template";
 const createReadableStreamFromElement = async (request, rootElement, options) => {
   let shellChunkStatus = ShellChunkStatus.START;
   const chunkVec = [];
-  const { htmlTemplate, runtimeContext, config, ssrConfig } = options;
+  const { htmlTemplate, runtimeContext, config, ssrConfig, entryName } = options;
   const { shellBefore, shellAfter } = await getTemplates(htmlTemplate, {
     renderLevel: RenderLevel.SERVER_RENDER,
     runtimeContext,
     ssrConfig,
     request,
-    config
+    config,
+    entryName
   });
   try {
     var _options_onShellReady;

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

@@ -46,6 +46,7 @@ function createRenderStreaming(createReadableStreamFromElement) {
         htmlTemplate,
         runtimeContext,
         ssrConfig,
+        entryName,
         onShellReady() {
           const cost = end();
           onTiming(SSRTimings.RENDER_SHELL, cost);

package/dist/esm-node/core/server/string/ssrData.js

@@ -43,7 +43,7 @@ function getSSRData() {
         query: request.query,
         pathname: request.pathname,
         host: request.host,
-        url: request.raw.url,
+        url: request.url,
         headers
       },
       reporter: {

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

@@ -7,6 +7,7 @@ export type BuildShellAfterTemplateOptions = {
     renderLevel: RenderLevel;
     ssrConfig: SSRConfig;
     request: Request;
+    entryName: string;
     config: HandleRequestConfig;
 };
 export declare function buildShellAfterTemplate(afterAppTemplate: string, options: BuildShellAfterTemplateOptions): Promise<string>;

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

@@ -2,6 +2,7 @@ import { RuntimeContext } from '../../context';
 import { HandleRequestConfig } from '../requestHandler';
 export interface BuildShellBeforeTemplateOptions {
     runtimeContext: RuntimeContext;
+    entryName: string;
     config: HandleRequestConfig;
     styledComponentsStyleTags?: string;
 }

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

@@ -7,6 +7,7 @@ export type CreateReadableStreamFromElementOptions = {
     config: HandleRequestConfig;
     ssrConfig: SSRConfig;
     htmlTemplate: string;
+    entryName: string;
     onShellReady?: () => void;
     onShellError?: (error: unknown) => void;
     onAllReady?: () => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.58.0",
+  "version": "2.58.1",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -177,8 +177,6 @@
   "dependencies": {
     "@babel/core": "^7.24.7",
     "@babel/types": "^7.24.7",
-    "cookie": "0.5.0",
-    "isbot": "3.7.1",
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
     "@loadable/server": "5.15.3",
@@ -188,35 +186,37 @@
     "@modern-js-reduck/plugin-immutable": "^1.1.10",
     "@modern-js-reduck/react": "^1.1.10",
     "@modern-js-reduck/store": "^1.1.10",
+    "@swc/helpers": "0.5.3",
     "@types/loadable__component": "^5.13.4",
     "@types/react-helmet": "^6.1.2",
     "@types/styled-components": "^5.1.14",
-    "esbuild": "0.17.19",
+    "cookie": "0.5.0",
     "es-module-lexer": "^1.1.0",
+    "esbuild": "0.17.19",
     "invariant": "^2.2.4",
+    "isbot": "3.7.1",
     "react-helmet": "^6.1.0",
     "react-is": "^18",
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
-    "@swc/helpers": "0.5.3",
-    "@modern-js/types": "2.58.0",
-    "@modern-js/plugin": "2.58.0",
-    "@modern-js/utils": "2.58.0",
-    "@modern-js/plugin-data-loader": "2.58.0",
-    "@modern-js/runtime-utils": "2.58.0"
+    "@modern-js/plugin": "2.58.1",
+    "@modern-js/runtime-utils": "2.58.1",
+    "@modern-js/plugin-data-loader": "2.58.1",
+    "@modern-js/types": "2.58.1",
+    "@modern-js/utils": "2.58.1"
   },
   "peerDependencies": {
     "react": ">=17",
     "react-dom": ">=17"
   },
   "devDependencies": {
-    "@rsbuild/core": "1.0.1-beta.9",
-    "@types/cookie": "0.5.1",
     "@remix-run/web-fetch": "^4.1.3",
+    "@rsbuild/core": "1.0.1-beta.13",
     "@testing-library/react": "^13.4.0",
+    "@types/cookie": "0.5.1",
     "@types/invariant": "^2.2.30",
-    "@types/loadable__server": "5.12.11",
     "@types/jest": "^29",
+    "@types/loadable__server": "5.12.11",
     "@types/loadable__webpack-plugin": "^5.7.3",
     "@types/node": "^14",
     "@types/react-side-effect": "^1.1.1",
@@ -226,10 +226,10 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/app-tools": "2.58.0",
-    "@modern-js/core": "2.58.0",
-    "@scripts/jest-config": "2.58.0",
-    "@scripts/build": "2.58.0"
+    "@modern-js/app-tools": "2.58.1",
+    "@modern-js/core": "2.58.1",
+    "@scripts/build": "2.58.1",
+    "@scripts/jest-config": "2.58.1"
   },
   "sideEffects": false,
   "publishConfig": {