@modern-js/runtime 2.49.2 → 2.49.3

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

@@ -55,7 +55,16 @@ function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({
+  serverBase = [],
+  supportHtml5History = true,
+  basename = "",
+  // when the current child app has multiple entries, there is a problem,
+  // so we have added a new parameter, the parameter will replace basename and baseUrl after the major version.
+  originalBaseUrl = "",
+  routesConfig,
+  createRoutes
+}) => {
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
@@ -91,7 +100,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
           const getRouteApp = () => {
             const useCreateRouter = (props) => {
               var _window__SERVER_DATA;
-              const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              const baseUrl = originalBaseUrl || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
               const runtimeContext = (0, import_react.useContext)(import_core.RuntimeReactContext);

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

@@ -71,7 +71,7 @@ function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, createRoutes }) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -86,7 +86,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             });
           }
           const { request, mode: ssrMode, nonce } = context.ssrContext;
-          const baseUrl = request.baseUrl;
+          const baseUrl = originalBaseUrl || request.baseUrl;
           const _basename = baseUrl === "/" ? (0, import_utils.urlJoin)(baseUrl, basename) : baseUrl;
           const { reporter, serverTiming } = context.ssrContext;
           const requestContext = (0, import_node.createRequestContext)();

package/dist/cjs/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -54,23 +54,19 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
-function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+async function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
   const helmetData = import_react_helmet.default.renderStatic();
   const callbacks = [
-    (headTemplate2) => {
-      return helmetData ? (0, import_helmet.default)(headTemplate2, helmetData) : headTemplate2;
+    (headTemplate) => {
+      return helmetData ? (0, import_helmet.default)(headTemplate, helmetData) : headTemplate;
     },
     // @TODO: prefetch scripts of lazy component
     injectCss
   ];
-  const [headTemplate = ""] = beforeEntryTemplate.match(import_buildTemplate.HEAD_REG_EXP) || [];
-  if (!headTemplate.length) {
-    return "";
-  }
-  return (0, import_buildTemplate.buildTemplate)(headTemplate, callbacks);
-  async function injectCss(headTemplate2) {
+  return (0, import_buildTemplate.buildTemplate)(beforeAppTemplate, callbacks);
+  async function injectCss(template) {
     const css = await getCssChunks();
-    return (0, import_utils.safeReplace)(headTemplate2, import_constants.CHUNK_CSS_PLACEHOLDER, css);
+    return (0, import_utils.safeReplace)(template, import_constants.CHUNK_CSS_PLACEHOLDER, css);
     async function getCssChunks() {
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
@@ -88,7 +84,7 @@ function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
           const routeManifest2 = routeAssets[routeId];
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset));
+            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
             cssChunks.push(..._cssChunks);
           }
         }
@@ -108,10 +104,6 @@ function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
     }
   }
 }
-async function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
-  const headTemplate = await getHeadTemplate(beforeAppTemplate, context, pluginConfig);
-  return beforeAppTemplate.replace(import_buildTemplate.HEAD_REG_EXP, headTemplate);
-}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   buildShellBeforeTemplate

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

@@ -23,7 +23,7 @@ function modifyRoutes(modifyFunction) {
   }
 }
 var routerPlugin = function(param) {
-  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+  var _param_serverBase = param.serverBase, serverBase = _param_serverBase === void 0 ? [] : _param_serverBase, _param_supportHtml5History = param.supportHtml5History, supportHtml5History = _param_supportHtml5History === void 0 ? true : _param_supportHtml5History, _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, _param_originalBaseUrl = param.originalBaseUrl, originalBaseUrl = _param_originalBaseUrl === void 0 ? "" : _param_originalBaseUrl, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
   var select = function(pathname) {
     return serverBase.find(function(baseUrl) {
       return pathname.search(baseUrl) === 0;
@@ -65,7 +65,7 @@ var routerPlugin = function(param) {
           var getRouteApp = function() {
             var useCreateRouter = function(props) {
               var _window__SERVER_DATA;
-              var baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              var baseUrl = originalBaseUrl || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               var _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               var hydrationData = window._ROUTER_DATA;
               var runtimeContext = useContext(RuntimeReactContext);

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

@@ -77,7 +77,7 @@ function createFetchHeaders(requestHeaders) {
   return headers;
 }
 var routerPlugin = function(param) {
-  var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
+  var _param_basename = param.basename, basename = _param_basename === void 0 ? "" : _param_basename, _param_originalBaseUrl = param.originalBaseUrl, originalBaseUrl = _param_originalBaseUrl === void 0 ? "" : _param_originalBaseUrl, routesConfig = param.routesConfig, createRoutes = param.createRoutes;
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -101,7 +101,7 @@ var routerPlugin = function(param) {
                     ];
                   }
                   _context_ssrContext = context.ssrContext, request = _context_ssrContext.request, ssrMode = _context_ssrContext.mode, nonce = _context_ssrContext.nonce;
-                  baseUrl = request.baseUrl;
+                  baseUrl = originalBaseUrl || request.baseUrl;
                   _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
                   _context_ssrContext1 = context.ssrContext, reporter = _context_ssrContext1.reporter, serverTiming = _context_ssrContext1.serverTiming;
                   requestContext = createRequestContext();

package/dist/esm/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -1,6 +1,5 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
-import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import ReactHelmet from "react-helmet";
@@ -8,7 +7,7 @@ import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants";
 import { checkIsNode, safeReplace } from "../utils";
-import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
+import { buildTemplate } from "./buildTemplate.share";
 var readAsset = function() {
   var _ref = _async_to_generator(function(chunk) {
     var fs, path, filepath;
@@ -50,145 +49,129 @@ var checkIsInline = function(chunk, enableInline) {
     return false;
   }
 };
-function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
-  var helmetData = ReactHelmet.renderStatic();
-  var callbacks = [
-    function(headTemplate2) {
-      return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
-    },
-    // @TODO: prefetch scripts of lazy component
-    injectCss
-  ];
-  var _ref = _sliced_to_array(beforeEntryTemplate.match(HEAD_REG_EXP) || [], 1), tmp = _ref[0], headTemplate = tmp === void 0 ? "" : tmp;
-  if (!headTemplate.length) {
-    return "";
-  }
-  return buildTemplate(headTemplate, callbacks);
-  function injectCss(headTemplate2) {
-    return _injectCss.apply(this, arguments);
-  }
-  function _injectCss() {
-    _injectCss = _async_to_generator(function(headTemplate2) {
-      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;
-          return _ts_generator(this, function(_state) {
-            switch (_state.label) {
-              case 0:
-                routeManifest = context.routeManifest, routerContext = context.routerContext, routes = context.routes;
-                if (!routeManifest || !routerContext || !routes) {
-                  return [
-                    2,
-                    ""
-                  ];
-                }
-                routeAssets = routeManifest.routeAssets;
-                cssChunks = [];
-                matches = matchRoutes(routes, routerContext.location, routerContext.basename);
-                matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
-                  if (!index) {
-                    return;
+function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
+  return _buildShellBeforeTemplate.apply(this, arguments);
+}
+function _buildShellBeforeTemplate() {
+  _buildShellBeforeTemplate = _async_to_generator(function(beforeAppTemplate, context, pluginConfig) {
+    var helmetData, callbacks;
+    function injectCss(template) {
+      return _injectCss.apply(this, arguments);
+    }
+    function _injectCss() {
+      _injectCss = _async_to_generator(function(template) {
+        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;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  routeManifest = context.routeManifest, routerContext = context.routerContext, routes = context.routes;
+                  if (!routeManifest || !routerContext || !routes) {
+                    return [
+                      2,
+                      ""
+                    ];
                   }
-                  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")) && !headTemplate2.includes(asset);
-                      });
-                      (_cssChunks = cssChunks).push.apply(_cssChunks, _to_consumable_array(_cssChunks1));
+                  routeAssets = routeManifest.routeAssets;
+                  cssChunks = [];
+                  matches = matchRoutes(routes, routerContext.location, routerContext.basename);
+                  matches === null || matches === void 0 ? void 0 : matches.forEach(function(match, index) {
+                    if (!index) {
+                      return;
                     }
-                  }
-                });
-                enableInlineStyles = pluginConfig.enableInlineStyles;
-                return [
-                  4,
-                  Promise.all(cssChunks.map(function() {
-                    var _ref2 = _async_to_generator(function(chunk) {
-                      var link;
-                      return _ts_generator(this, function(_state2) {
-                        link = '<link href="'.concat(chunk, '" rel="stylesheet" />');
-                        if (checkIsNode() && checkIsInline(chunk, enableInlineStyles)) {
-                          return [
-                            2,
-                            readAsset(chunk).then(function(content) {
-                              return "<style>".concat(content, "</style>");
-                            }).catch(function(_) {
-                              return link;
-                            })
-                          ];
-                        } else {
+                    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));
+                      }
+                    }
+                  });
+                  enableInlineStyles = pluginConfig.enableInlineStyles;
+                  return [
+                    4,
+                    Promise.all(cssChunks.map(function() {
+                      var _ref = _async_to_generator(function(chunk) {
+                        var link;
+                        return _ts_generator(this, function(_state2) {
+                          link = '<link href="'.concat(chunk, '" rel="stylesheet" />');
+                          if (checkIsNode() && checkIsInline(chunk, enableInlineStyles)) {
+                            return [
+                              2,
+                              readAsset(chunk).then(function(content) {
+                                return "<style>".concat(content, "</style>");
+                              }).catch(function(_) {
+                                return link;
+                              })
+                            ];
+                          } else {
+                            return [
+                              2,
+                              link
+                            ];
+                          }
                           return [
-                            2,
-                            link
+                            2
                           ];
-                        }
-                        return [
-                          2
-                        ];
+                        });
                       });
-                    });
-                    return function(chunk) {
-                      return _ref2.apply(this, arguments);
-                    };
-                  }()))
-                ];
-              case 1:
-                styles = _state.sent();
-                return [
-                  2,
-                  "".concat(styles.join(""))
-                ];
-            }
+                      return function(chunk) {
+                        return _ref.apply(this, arguments);
+                      };
+                    }()))
+                  ];
+                case 1:
+                  styles = _state.sent();
+                  return [
+                    2,
+                    "".concat(styles.join(""))
+                  ];
+              }
+            });
           });
-        });
-        return _getCssChunks.apply(this, arguments);
-      }
-      return _ts_generator(this, function(_state) {
-        switch (_state.label) {
-          case 0:
-            return [
-              4,
-              getCssChunks()
-            ];
-          case 1:
-            css = _state.sent();
-            return [
-              2,
-              safeReplace(headTemplate2, CHUNK_CSS_PLACEHOLDER, css)
-            ];
+          return _getCssChunks.apply(this, arguments);
         }
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              return [
+                4,
+                getCssChunks()
+              ];
+            case 1:
+              css = _state.sent();
+              return [
+                2,
+                safeReplace(template, CHUNK_CSS_PLACEHOLDER, css)
+              ];
+          }
+        });
       });
-    });
-    return _injectCss.apply(this, arguments);
-  }
-}
-function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
-  return _buildShellBeforeTemplate.apply(this, arguments);
-}
-function _buildShellBeforeTemplate() {
-  _buildShellBeforeTemplate = _async_to_generator(function(beforeAppTemplate, context, pluginConfig) {
-    var headTemplate;
+      return _injectCss.apply(this, arguments);
+    }
     return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          return [
-            4,
-            getHeadTemplate(beforeAppTemplate, context, pluginConfig)
-          ];
-        case 1:
-          headTemplate = _state.sent();
-          return [
-            2,
-            beforeAppTemplate.replace(HEAD_REG_EXP, headTemplate)
-          ];
-      }
+      helmetData = ReactHelmet.renderStatic();
+      callbacks = [
+        function(headTemplate) {
+          return helmetData ? helmetReplace(headTemplate, helmetData) : headTemplate;
+        },
+        // @TODO: prefetch scripts of lazy component
+        injectCss
+      ];
+      return [
+        2,
+        buildTemplate(beforeAppTemplate, callbacks)
+      ];
     });
   });
   return _buildShellBeforeTemplate.apply(this, arguments);

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

@@ -19,7 +19,16 @@ function modifyRoutes(modifyFunction) {
     console.error("It is not allowed to modify routes config after create router.");
   }
 }
-const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({
+  serverBase = [],
+  supportHtml5History = true,
+  basename = "",
+  // when the current child app has multiple entries, there is a problem,
+  // so we have added a new parameter, the parameter will replace basename and baseUrl after the major version.
+  originalBaseUrl = "",
+  routesConfig,
+  createRoutes
+}) => {
   const select = (pathname) => serverBase.find((baseUrl) => pathname.search(baseUrl) === 0) || "/";
   let routes = [];
   finalRouteConfig = routesConfig;
@@ -55,7 +64,7 @@ const routerPlugin = ({ serverBase = [], supportHtml5History = true, basename =
           const getRouteApp = () => {
             const useCreateRouter = (props) => {
               var _window__SERVER_DATA;
-              const baseUrl = ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
+              const baseUrl = originalBaseUrl || ((_window__SERVER_DATA = window._SERVER_DATA) === null || _window__SERVER_DATA === void 0 ? void 0 : _window__SERVER_DATA.router.baseUrl) || select(location.pathname);
               const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
               let hydrationData = window._ROUTER_DATA;
               const runtimeContext = useContext(RuntimeReactContext);

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

@@ -36,7 +36,7 @@ function createFetchHeaders(requestHeaders) {
   }
   return headers;
 }
-const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
+const routerPlugin = ({ basename = "", originalBaseUrl = "", routesConfig, createRoutes }) => {
   return {
     name: "@modern-js/plugin-router",
     registerHook: {
@@ -51,7 +51,7 @@ const routerPlugin = ({ basename = "", routesConfig, createRoutes }) => {
             });
           }
           const { request, mode: ssrMode, nonce } = context.ssrContext;
-          const baseUrl = request.baseUrl;
+          const baseUrl = originalBaseUrl || request.baseUrl;
           const _basename = baseUrl === "/" ? urlJoin(baseUrl, basename) : baseUrl;
           const { reporter, serverTiming } = context.ssrContext;
           const requestContext = createRequestContext();

package/dist/esm-node/ssr/serverRender/renderToStream/bulidTemplate.before.js

@@ -3,7 +3,7 @@ import { matchRoutes } from "@modern-js/runtime-utils/router";
 import helmetReplace from "../helmet";
 import { CHUNK_CSS_PLACEHOLDER } from "../constants";
 import { checkIsNode, safeReplace } from "../utils";
-import { HEAD_REG_EXP, buildTemplate } from "./buildTemplate.share";
+import { buildTemplate } from "./buildTemplate.share";
 const readAsset = async (chunk) => {
   const fs = await import("fs/promises");
   const path = await import("path");
@@ -21,23 +21,19 @@ const checkIsInline = (chunk, enableInline) => {
     return false;
   }
 };
-function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
+async function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
   const helmetData = ReactHelmet.renderStatic();
   const callbacks = [
-    (headTemplate2) => {
-      return helmetData ? helmetReplace(headTemplate2, helmetData) : headTemplate2;
+    (headTemplate) => {
+      return helmetData ? helmetReplace(headTemplate, helmetData) : headTemplate;
     },
     // @TODO: prefetch scripts of lazy component
     injectCss
   ];
-  const [headTemplate = ""] = beforeEntryTemplate.match(HEAD_REG_EXP) || [];
-  if (!headTemplate.length) {
-    return "";
-  }
-  return buildTemplate(headTemplate, callbacks);
-  async function injectCss(headTemplate2) {
+  return buildTemplate(beforeAppTemplate, callbacks);
+  async function injectCss(template) {
     const css = await getCssChunks();
-    return safeReplace(headTemplate2, CHUNK_CSS_PLACEHOLDER, css);
+    return safeReplace(template, CHUNK_CSS_PLACEHOLDER, css);
     async function getCssChunks() {
       const { routeManifest, routerContext, routes } = context;
       if (!routeManifest || !routerContext || !routes) {
@@ -55,7 +51,7 @@ function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
           const routeManifest2 = routeAssets[routeId];
           if (routeManifest2) {
             const { referenceCssAssets = [] } = routeManifest2;
-            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !headTemplate2.includes(asset));
+            const _cssChunks = referenceCssAssets.filter((asset) => (asset === null || asset === void 0 ? void 0 : asset.endsWith(".css")) && !template.includes(asset));
             cssChunks.push(..._cssChunks);
           }
         }
@@ -75,10 +71,6 @@ function getHeadTemplate(beforeEntryTemplate, context, pluginConfig) {
     }
   }
 }
-async function buildShellBeforeTemplate(beforeAppTemplate, context, pluginConfig) {
-  const headTemplate = await getHeadTemplate(beforeAppTemplate, context, pluginConfig);
-  return beforeAppTemplate.replace(HEAD_REG_EXP, headTemplate);
-}
 export {
   buildShellBeforeTemplate
 };

package/dist/types/document/Html.d.ts

@@ -1,4 +1,4 @@
-/// <reference types="react" />
+import React from 'react';
 export declare function Html(props: {
     children: any[];
-}): JSX.Element;
+} & React.HtmlHTMLAttributes<HTMLHtmlElement>): JSX.Element;

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

@@ -3,4 +3,4 @@ import type { RouterConfig, Routes } from './types';
 export declare let finalRouteConfig: RouterConfig['routesConfig'];
 export declare let beforeCreateRouter: boolean;
 export declare function modifyRoutes(modifyFunction: (routes: Routes) => Routes): void;
-export declare const routerPlugin: ({ serverBase, supportHtml5History, basename, routesConfig, createRoutes, }: RouterConfig) => Plugin;
+export declare const routerPlugin: ({ serverBase, supportHtml5History, basename, originalBaseUrl, routesConfig, createRoutes, }: RouterConfig) => Plugin;

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

@@ -2,5 +2,5 @@ import type { Plugin } from '../../core';
 import { SSRServerContext } from '../../ssr/serverRender/types';
 import type { RouterConfig } from './types';
 export declare function createFetchHeaders(requestHeaders: SSRServerContext['request']['headers']): Headers;
-export declare const routerPlugin: ({ basename, routesConfig, createRoutes, }: RouterConfig) => Plugin;
+export declare const routerPlugin: ({ basename, originalBaseUrl, routesConfig, createRoutes, }: RouterConfig) => Plugin;
 export declare const modifyRoutes: () => void;

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

@@ -37,6 +37,7 @@ export type RouterConfig = {
     oldVersion?: boolean;
     serverBase?: string[];
     supportHtml5History?: boolean;
+    originalBaseUrl?: string;
     basename?: string;
     createRoutes?: () => RouteObject[];
 };

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.49.2",
+  "version": "2.49.3",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -170,10 +170,10 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.49.2",
-    "@modern-js/types": "2.49.2",
-    "@modern-js/utils": "2.49.2",
-    "@modern-js/runtime-utils": "2.49.2"
+    "@modern-js/plugin": "2.49.3",
+    "@modern-js/utils": "2.49.3",
+    "@modern-js/types": "2.49.3",
+    "@modern-js/runtime-utils": "2.49.3"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -194,11 +194,11 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.91.0",
-    "@modern-js/core": "2.49.2",
-    "@modern-js/app-tools": "2.49.2",
-    "@scripts/build": "2.49.2",
-    "@modern-js/server-core": "2.49.2",
-    "@scripts/jest-config": "2.49.2"
+    "@modern-js/app-tools": "2.49.3",
+    "@modern-js/core": "2.49.3",
+    "@scripts/build": "2.49.3",
+    "@modern-js/server-core": "2.49.3",
+    "@scripts/jest-config": "2.49.3"
   },
   "sideEffects": false,
   "publishConfig": {