@modern-js/runtime 2.56.0 → 2.56.2

package/dist/cjs/cli/code.js

@@ -75,11 +75,15 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       });
       const indexFile = import_path.default.resolve(internalDirectory, `./${entryName}/${import_constants.ENTRY_POINT_FILE_NAME}`);
       import_utils.fs.outputFileSync(indexFile, indexCode, "utf8");
+      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");
+        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");
+        }
       }
-      const ssrMode = getSSRMode(entryName, config);
       if (ssrMode) {
         const indexServerCode = serverTemplate.serverIndex({
           entry,

package/dist/cjs/cli/constants.js

@@ -24,6 +24,7 @@ __export(constants_exports, {
   ENTRY_POINT_REGISTER_FILE_NAME: () => ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME: () => ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME: () => ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME: () => ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME: () => INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME: () => SERVER_ENTRY_POINT_FILE_NAME
 });
@@ -33,6 +34,7 @@ const ENTRY_POINT_FILE_NAME = "index.jsx";
 const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 const INDEX_FILE_NAME = "index";
 const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -44,6 +46,7 @@ const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 });

package/dist/cjs/core/browser/hydrate.js

@@ -40,7 +40,7 @@ var import_constants = require("../constants");
 var import_withCallback = require("./withCallback");
 const isReact18 = () => process.env.IS_REACT18 === "true";
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   const hydrateContext = {
     ...context,
     get routes() {
@@ -50,8 +50,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   };
   const { ssrContext } = hydrateContext;
   const currentPathname = (0, import_url.normalizePathname)(window.location.pathname);
-  const initialPathname = (0, import_url.normalizePathname)(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  const initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && (0, import_url.normalizePathname)(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
     console.error(errorMsg);
     window.location.reload();

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

@@ -32,7 +32,6 @@ __export(createReadableStream_exports, {
 });
 module.exports = __toCommonJS(createReadableStream_exports);
 var import_stream = require("stream");
-var import_server = require("react-dom/server");
 var import_node = require("@modern-js/runtime-utils/node");
 var import_styled_components = require("styled-components");
 var import_isbot = __toESM(require("isbot"));
@@ -40,7 +39,8 @@ var import_common = require("../../../common");
 var import_constants = require("../../constants");
 var import_template = require("./template");
 var import_shared = require("./shared");
-const createReadableStreamFromElement = (request, rootElement, options) => {
+const createReadableStreamFromElement = async (request, rootElement, options) => {
+  const { renderToPipeableStream } = await Promise.resolve().then(() => __toESM(require("react-dom/server")));
   const { runtimeContext, htmlTemplate, config, ssrConfig } = options;
   let shellChunkStatus = import_shared.ShellChunkStatus.START;
   let renderLevel = import_constants.RenderLevel.SERVER_RENDER;
@@ -51,7 +51,7 @@ const createReadableStreamFromElement = (request, rootElement, options) => {
   const chunkVec = [];
   const root = forceStream2String ? sheet.collectStyles(rootElement) : rootElement;
   return new Promise((resolve) => {
-    const { pipe } = (0, import_server.renderToPipeableStream)(root, {
+    const { pipe } = renderToPipeableStream(root, {
       nonce: config.nonce,
       [onReady]() {
         var _options_onReady;

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

@@ -144,7 +144,7 @@ class LoadableCollector {
         return link;
       }
     }));
-    chunkSet.jsChunk += css.filter((css2) => Boolean(css2)).join("");
+    chunkSet.cssChunk += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

package/dist/cjs/router/cli/code/templates.js

@@ -360,7 +360,17 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(internalDirectory, entryName);
     const combinedModule = `export * from "${(0, import_utils.slash)(serverLoaderRuntime)}"; export * from "${(0, import_utils.slash)(serverLoadersFile)}"`;
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return `export default Promise.all([import("${(0, import_utils.slash)(serverLoaderRuntime)}"),import("${(0, import_utils.slash)(serverLoadersFile)}")]).then(res=>{
+      return res.reduce((sum,cur)=>{
+        return {
+          ...sum,
+          ...cur
+        }
+     },{})
+    })`;
   }
   return null;
 }

package/dist/esm/cli/code.js

@@ -2,7 +2,7 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
+import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
 function getSSRMode() {
@@ -35,7 +35,7 @@ var generateCode = function() {
             4,
             Promise.all(entrypoints.map(function() {
               var _ref2 = _async_to_generator(function(entrypoint) {
-                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, indexCode, indexFile, bootstrapFile, ssrMode, indexServerCode, indexServerFile, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, contextFile;
+                var entryName, isAutoMount, entry, customEntry, customBootstrap, customServerEntry, _ref3, runtimePlugins, indexCode, indexFile, ssrMode, bootstrapFile, bootstrapServerFile, indexServerCode, indexServerFile, registerCode, registerFile, registerRuntimeCode, registerRuntimeFile, contextCode, contextFile;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -62,11 +62,15 @@ var generateCode = function() {
                         });
                         indexFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_POINT_FILE_NAME));
                         fs.outputFileSync(indexFile, indexCode, "utf8");
+                        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");
+                          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");
+                          }
                         }
-                        ssrMode = getSSRMode(entryName, config);
                         if (ssrMode) {
                           indexServerCode = serverTemplate.serverIndex({
                             entry,

package/dist/esm/cli/constants.js

@@ -3,6 +3,7 @@ var ENTRY_POINT_FILE_NAME = "index.jsx";
 var SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 var INDEX_FILE_NAME = "index";
 var ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+var ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 var ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 var ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 var ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -13,6 +14,7 @@ export {
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 };

package/dist/esm/core/browser/hydrate.js

@@ -10,7 +10,7 @@ var isReact18 = function() {
   return process.env.IS_REACT18 === "true";
 };
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   var hydrateContext = _object_spread_props(_object_spread({}, context), {
     get routes() {
       return context.routes;
@@ -19,8 +19,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   });
   var ssrContext = hydrateContext.ssrContext;
   var currentPathname = normalizePathname(window.location.pathname);
-  var initialPathname = normalizePathname(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  var initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && normalizePathname(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     var errorMsg = "The initial URL ".concat(initialPathname, " and the URL ").concat(currentPathname, " to be hydrated do not match, reload.");
     console.error(errorMsg);
     window.location.reload();

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

@@ -1,7 +1,8 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { Transform } from "stream";
-import { renderToPipeableStream } from "react-dom/server";
 import { createReadableStreamFromReadable } from "@modern-js/runtime-utils/node";
 import { ServerStyleSheet } from "styled-components";
 import checkIsBot from "isbot";
@@ -9,84 +10,104 @@ import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
-var createReadableStreamFromElement = function(request, rootElement, options) {
-  var runtimeContext = options.runtimeContext, htmlTemplate = options.htmlTemplate, config = options.config, ssrConfig = options.ssrConfig;
-  var shellChunkStatus = ShellChunkStatus.START;
-  var renderLevel = RenderLevel.SERVER_RENDER;
-  var forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
-  var isbot = checkIsBot(request.headers.get("user-agent"));
-  var onReady = isbot || forceStream2String ? "onAllReady" : "onShellReady";
-  var sheet = new ServerStyleSheet();
-  var chunkVec = [];
-  var root = forceStream2String ? sheet.collectStyles(rootElement) : rootElement;
-  return new Promise(function(resolve) {
-    var _obj;
-    var pipe = renderToPipeableStream(root, (_obj = {
-      nonce: config.nonce
-    }, _define_property(_obj, onReady, function() {
-      var _options_onReady;
-      var styledComponentsStyleTags = forceStream2String ? sheet.getStyleTags() : "";
-      (_options_onReady = options[onReady]) === null || _options_onReady === void 0 ? void 0 : _options_onReady.call(options);
-      getTemplates(htmlTemplate, {
-        request,
-        ssrConfig,
-        renderLevel,
-        runtimeContext,
-        config,
-        styledComponentsStyleTags
-      }).then(function(param) {
-        var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-        var body = new Transform({
-          transform: function transform(chunk, _encoding, callback) {
-            try {
-              if (shellChunkStatus !== ShellChunkStatus.FINISH) {
-                chunkVec.push(chunk.toString());
-                var concatedChunk = chunkVec.join("");
-                if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
-                  concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
-                  shellChunkStatus = ShellChunkStatus.FINISH;
-                  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 stream = createReadableStreamFromReadable(body);
-        resolve(stream);
-        pipe(body);
-      });
-    }), _define_property(_obj, "onShellError", function onShellError(error) {
-      renderLevel = RenderLevel.CLIENT_RENDER;
-      getTemplates(htmlTemplate, {
-        request,
-        ssrConfig,
-        renderLevel,
-        runtimeContext,
-        config
-      }).then(function(param) {
-        var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
-        var _options_onShellError;
-        var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
-        var readableStream = getReadableStreamFromString(fallbackHtml);
-        resolve(readableStream);
-        options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
-      });
-    }), _define_property(_obj, "onError", function onError(error) {
-      var _options_onError;
-      renderLevel = RenderLevel.CLIENT_RENDER;
-      options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
-    }), _obj)).pipe;
+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;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          return [
+            4,
+            import("react-dom/server")
+          ];
+        case 1:
+          renderToPipeableStream = _state.sent().renderToPipeableStream;
+          runtimeContext = options.runtimeContext, htmlTemplate = options.htmlTemplate, config = options.config, ssrConfig = options.ssrConfig;
+          shellChunkStatus = ShellChunkStatus.START;
+          renderLevel = RenderLevel.SERVER_RENDER;
+          forceStream2String = Boolean(process.env.MODERN_JS_STREAM_TO_STRING);
+          isbot = checkIsBot(request.headers.get("user-agent"));
+          onReady = isbot || forceStream2String ? "onAllReady" : "onShellReady";
+          sheet = new ServerStyleSheet();
+          chunkVec = [];
+          root = forceStream2String ? sheet.collectStyles(rootElement) : rootElement;
+          return [
+            2,
+            new Promise(function(resolve) {
+              var _obj;
+              var pipe = renderToPipeableStream(root, (_obj = {
+                nonce: config.nonce
+              }, _define_property(_obj, onReady, function() {
+                var _options_onReady;
+                var styledComponentsStyleTags = forceStream2String ? sheet.getStyleTags() : "";
+                (_options_onReady = options[onReady]) === null || _options_onReady === void 0 ? void 0 : _options_onReady.call(options);
+                getTemplates(htmlTemplate, {
+                  request,
+                  ssrConfig,
+                  renderLevel,
+                  runtimeContext,
+                  config,
+                  styledComponentsStyleTags
+                }).then(function(param) {
+                  var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+                  var body = new Transform({
+                    transform: function transform(chunk, _encoding, callback) {
+                      try {
+                        if (shellChunkStatus !== ShellChunkStatus.FINISH) {
+                          chunkVec.push(chunk.toString());
+                          var concatedChunk = chunkVec.join("");
+                          if (concatedChunk.includes(ESCAPED_SHELL_STREAM_END_MARK)) {
+                            concatedChunk = concatedChunk.replace(ESCAPED_SHELL_STREAM_END_MARK, "");
+                            shellChunkStatus = ShellChunkStatus.FINISH;
+                            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 stream = createReadableStreamFromReadable(body);
+                  resolve(stream);
+                  pipe(body);
+                });
+              }), _define_property(_obj, "onShellError", function onShellError(error) {
+                renderLevel = RenderLevel.CLIENT_RENDER;
+                getTemplates(htmlTemplate, {
+                  request,
+                  ssrConfig,
+                  renderLevel,
+                  runtimeContext,
+                  config
+                }).then(function(param) {
+                  var shellAfter = param.shellAfter, shellBefore = param.shellBefore;
+                  var _options_onShellError;
+                  var fallbackHtml = "".concat(shellBefore).concat(shellAfter);
+                  var readableStream = getReadableStreamFromString(fallbackHtml);
+                  resolve(readableStream);
+                  options === null || options === void 0 ? void 0 : (_options_onShellError = options.onShellError) === null || _options_onShellError === void 0 ? void 0 : _options_onShellError.call(options, error);
+                });
+              }), _define_property(_obj, "onError", function onError(error) {
+                var _options_onError;
+                renderLevel = RenderLevel.CLIENT_RENDER;
+                options === null || options === void 0 ? void 0 : (_options_onError = options.onError) === null || _options_onError === void 0 ? void 0 : _options_onError.call(options, error);
+              }), _obj)).pipe;
+            })
+          ];
+      }
+    });
   });
-};
+  return function createReadableStreamFromElement2(request, rootElement, options) {
+    return _ref.apply(this, arguments);
+  };
+}();
 export {
   createReadableStreamFromElement
 };

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

@@ -243,7 +243,7 @@ var LoadableCollector = /* @__PURE__ */ function() {
             ];
           case 1:
             css = _state.sent();
-            chunkSet.jsChunk += css.filter(function(css2) {
+            chunkSet.cssChunk += css.filter(function(css2) {
               return Boolean(css2);
             }).join("");
             return [

package/dist/esm/router/cli/code/templates.js

@@ -406,7 +406,10 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
     var combinedModule = 'export * from "'.concat(slash(serverLoaderRuntime), '"; export * from "').concat(slash(serverLoadersFile), '"');
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return 'export default Promise.all([import("'.concat(slash(serverLoaderRuntime), '"),import("').concat(slash(serverLoadersFile), '")]).then(res=>{\n      return res.reduce((sum,cur)=>{\n        return {\n          ...sum,\n          ...cur\n        }\n     },{})\n    })');
   }
   return null;
 }

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

@@ -1,6 +1,6 @@
 import path from "path";
 import { MAIN_ENTRY_NAME, fs } from "@modern-js/utils";
-import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME } from "./constants";
+import { INDEX_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_POINT_REGISTER_FILE_NAME, ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME, ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME, SERVER_ENTRY_POINT_FILE_NAME, ENTRY_SERVER_BOOTSTRAP_FILE_NAME } from "./constants";
 import * as template from "./template";
 import * as serverTemplate from "./template.server";
 function getSSRMode(entry = MAIN_ENTRY_NAME, config) {
@@ -42,11 +42,15 @@ const generateCode = async (entrypoints, appContext, config, onCollectRuntimePlu
       });
       const indexFile = path.resolve(internalDirectory, `./${entryName}/${ENTRY_POINT_FILE_NAME}`);
       fs.outputFileSync(indexFile, indexCode, "utf8");
+      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");
+        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");
+        }
       }
-      const ssrMode = getSSRMode(entryName, config);
       if (ssrMode) {
         const indexServerCode = serverTemplate.serverIndex({
           entry,

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

@@ -3,6 +3,7 @@ const ENTRY_POINT_FILE_NAME = "index.jsx";
 const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 const INDEX_FILE_NAME = "index";
 const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";
@@ -13,6 +14,7 @@ export {
   ENTRY_POINT_REGISTER_FILE_NAME,
   ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME,
   ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME,
+  ENTRY_SERVER_BOOTSTRAP_FILE_NAME,
   INDEX_FILE_NAME,
   SERVER_ENTRY_POINT_FILE_NAME
 };

package/dist/esm-node/core/browser/hydrate.js

@@ -6,7 +6,7 @@ import { RenderLevel } from "../constants";
 import { WithCallback } from "./withCallback";
 const isReact18 = () => process.env.IS_REACT18 === "true";
 function hydrateRoot(App, context, ModernRender, ModernHydrate) {
-  var _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
+  var _ssrContext_request, _window__SSR_DATA, _window, _window__SSR_DATA1, _window1;
   const hydrateContext = {
     ...context,
     get routes() {
@@ -16,8 +16,8 @@ function hydrateRoot(App, context, ModernRender, ModernHydrate) {
   };
   const { ssrContext } = hydrateContext;
   const currentPathname = normalizePathname(window.location.pathname);
-  const initialPathname = normalizePathname(ssrContext.request.pathname);
-  if (initialPathname !== currentPathname && context.router) {
+  const initialPathname = (ssrContext === null || ssrContext === void 0 ? void 0 : (_ssrContext_request = ssrContext.request) === null || _ssrContext_request === void 0 ? void 0 : _ssrContext_request.pathname) && normalizePathname(ssrContext.request.pathname);
+  if (initialPathname && initialPathname !== currentPathname && context.router) {
     const errorMsg = `The initial URL ${initialPathname} and the URL ${currentPathname} to be hydrated do not match, reload.`;
     console.error(errorMsg);
     window.location.reload();

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

@@ -1,5 +1,4 @@
 import { Transform } from "stream";
-import { renderToPipeableStream } from "react-dom/server";
 import { createReadableStreamFromReadable } from "@modern-js/runtime-utils/node";
 import { ServerStyleSheet } from "styled-components";
 import checkIsBot from "isbot";
@@ -7,7 +6,8 @@ import { ESCAPED_SHELL_STREAM_END_MARK } from "../../../common";
 import { RenderLevel } from "../../constants";
 import { getTemplates } from "./template";
 import { ShellChunkStatus, getReadableStreamFromString } from "./shared";
-const createReadableStreamFromElement = (request, rootElement, options) => {
+const createReadableStreamFromElement = async (request, rootElement, options) => {
+  const { renderToPipeableStream } = await import("react-dom/server");
   const { runtimeContext, htmlTemplate, config, ssrConfig } = options;
   let shellChunkStatus = ShellChunkStatus.START;
   let renderLevel = RenderLevel.SERVER_RENDER;

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

@@ -111,7 +111,7 @@ class LoadableCollector {
         return link;
       }
     }));
-    chunkSet.jsChunk += css.filter((css2) => Boolean(css2)).join("");
+    chunkSet.cssChunk += css.filter((css2) => Boolean(css2)).join("");
   }
   generateAttributes(extraAtr = {}) {
     const { config } = this.options;

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

@@ -324,7 +324,17 @@ function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
     const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
     const serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
     const combinedModule = `export * from "${slash(serverLoaderRuntime)}"; export * from "${slash(serverLoadersFile)}"`;
-    return combinedModule;
+    if (!config.source.enableAsyncEntry) {
+      return combinedModule;
+    }
+    return `export default Promise.all([import("${slash(serverLoaderRuntime)}"),import("${slash(serverLoadersFile)}")]).then(res=>{
+      return res.reduce((sum,cur)=>{
+        return {
+          ...sum,
+          ...cur
+        }
+     },{})
+    })`;
   }
   return null;
 }

package/dist/types/cli/constants.d.ts

@@ -3,6 +3,7 @@ export declare const ENTRY_POINT_FILE_NAME = "index.jsx";
 export declare const SERVER_ENTRY_POINT_FILE_NAME = "index.server.jsx";
 export declare const INDEX_FILE_NAME = "index";
 export declare const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+export declare const ENTRY_SERVER_BOOTSTRAP_FILE_NAME = "bootstrap.server.jsx";
 export declare const ENTRY_POINT_RUNTIME_REGISTER_FILE_NAME = "runtime-register.js";
 export declare const ENTRY_POINT_RUNTIME_GLOBAL_CONTEXT_FILE_NAME = "runtime-global-context.js";
 export declare const ENTRY_POINT_REGISTER_FILE_NAME = "register.js";

package/dist/types/exports/server.d.ts

@@ -1,5 +1,5 @@
 import { AfterMatchContext, AfterRenderContext, MiddlewareContext, NextFunction } from '@modern-js/types';
-export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, } from '@modern-js/types';
+export type { Container, CacheControl, CacheOptionProvider, CacheOption, UnstableMiddlewareContext, UnstableMiddleware, UnstableNext, MonitorEvent, Monitors, CoreMonitor, LogEvent, LogLevel, TimingEvent, } from '@modern-js/types';
 export declare const hook: (attacher: ({ addMiddleware, afterMatch, afterRender, }: {
     addMiddleware: (mid: Middleware) => void;
     afterRender: (hook: AfterRenderHook) => void;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.56.0",
+  "version": "2.56.2",
   "engines": {
     "node": ">=14.17.6"
   },
@@ -182,7 +182,6 @@
     "@loadable/babel-plugin": "5.15.3",
     "@loadable/component": "5.15.3",
     "@loadable/server": "5.15.3",
-    "@loadable/webpack-plugin": "5.15.2",
     "@modern-js-reduck/plugin-auto-actions": "^1.1.10",
     "@modern-js-reduck/plugin-devtools": "^1.1.10",
     "@modern-js-reduck/plugin-effects": "^1.1.10",
@@ -200,11 +199,11 @@
     "react-side-effect": "^2.1.1",
     "styled-components": "^5.3.1",
     "@swc/helpers": "0.5.3",
-    "@modern-js/plugin": "2.56.0",
-    "@modern-js/types": "2.56.0",
-    "@modern-js/utils": "2.56.0",
-    "@modern-js/runtime-utils": "2.56.0",
-    "@modern-js/plugin-data-loader": "2.56.0"
+    "@modern-js/plugin": "2.56.2",
+    "@modern-js/utils": "2.56.2",
+    "@modern-js/runtime-utils": "2.56.2",
+    "@modern-js/types": "2.56.2",
+    "@modern-js/plugin-data-loader": "2.56.2"
   },
   "peerDependencies": {
     "react": ">=17",
@@ -227,10 +226,10 @@
     "ts-jest": "^29.1.0",
     "typescript": "^5",
     "webpack": "^5.93.0",
-    "@modern-js/app-tools": "2.56.0",
-    "@modern-js/core": "2.56.0",
-    "@scripts/build": "2.56.0",
-    "@scripts/jest-config": "2.56.0"
+    "@modern-js/app-tools": "2.56.2",
+    "@modern-js/core": "2.56.2",
+    "@scripts/jest-config": "2.56.2",
+    "@scripts/build": "2.56.2"
   },
   "sideEffects": false,
   "publishConfig": {