@modern-js/app-tools 2.7.1-alpha.0 → 2.8.0

package/CHANGELOG.md

@@ -1,5 +1,56 @@
 # @modern-js/app-tools
 
+## 2.8.0
+
+### Minor Changes
+
+- ab1e8065cb: feat: support router-plugin in Rspack bundler.
+  feat: 在 Rspack bundler 里支持 router-plugin
+
+### Patch Changes
+
+- a12b5b4ec8: fix: the adapterSSR builder plugin modifyChain Hooks is not async function
+  fix: adapterSSR builder 插件的 adapterSSR Hooks 不是异步函数
+- 1104a9f18b: feat: support start web service only
+  feat: 支持只启动 web 服务
+- 1f6ca2c7fb: fix: nested routes in ssg
+  fix: 修复嵌套路由在 SSG 中的问题
+- 2b6b1a014c: refactor: app-tools builder
+  refactor: 重构 app-tools builder
+- 250f794c40: fix: move the analyze webpackChain config to app-tools builder shared
+  fix: 将 anylyze 的 `webpackChain` 配置项移植进 app-tools builder shared
+- Updated dependencies [ea7bb41e30]
+- Updated dependencies [65c56f43b9]
+- Updated dependencies [0cf8540ffe]
+- Updated dependencies [bd369a89a4]
+- Updated dependencies [bc943c9b04]
+- Updated dependencies [40f5039b17]
+- Updated dependencies [1104a9f18b]
+- Updated dependencies [70d82e1408]
+- Updated dependencies [2c1151271d]
+- Updated dependencies [481461a61d]
+- Updated dependencies [1242f5d8d6]
+- Updated dependencies [1f6ca2c7fb]
+- Updated dependencies [457ee832b9]
+  - @modern-js/server@2.8.0
+  - @modern-js/builder-webpack-provider@2.8.0
+  - @modern-js/plugin-data-loader@2.8.0
+  - @modern-js/builder@2.8.0
+  - @modern-js/builder-shared@2.8.0
+  - @modern-js/builder-rspack-provider@2.8.0
+  - @modern-js/prod-server@2.8.0
+  - @modern-js/utils@2.8.0
+  - @modern-js/types@2.8.0
+  - @modern-js/builder-plugin-esbuild@2.8.0
+  - @modern-js/builder-plugin-node-polyfill@2.8.0
+  - @modern-js/core@2.8.0
+  - @modern-js/plugin-i18n@2.8.0
+  - @modern-js/plugin-lint@2.8.0
+  - @modern-js/new-action@2.8.0
+  - @modern-js/node-bundle-require@2.8.0
+  - @modern-js/upgrade@2.8.0
+  - @modern-js/plugin@2.8.0
+
 ## 2.7.0
 
 ### Minor Changes
@@ -167,8 +218,8 @@
 
 - e84d16b: feat: support catch-all routing
   feat: 支持通配路由
-- a914be8: feat: modern-js support rspack bundler
-  feat: modern-js 支持 rspack 构建工具
+- a914be8: feat: modern-js support Rspack bundler
+  feat: modern-js 支持 Rspack 构建工具
 
 ### Patch Changes
 

package/dist/cjs/analyze/generateCode.js

@@ -99,7 +99,6 @@ const generateCode = async (appContext, config, entrypoints, api) => {
   const getRoutes = isV5 ? import_getClientRoutes.getClientRoutesLegacy : import_getClientRoutes.getClientRoutes;
   await Promise.all(entrypoints.map(generateEntryCode));
   async function generateEntryCode(entrypoint) {
-    var _a;
     const { entryName, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
       if (fileSystemRoutes) {
@@ -162,8 +161,7 @@ const generateCode = async (appContext, config, entrypoints, api) => {
             ssrMode: useSSG ? "string" : mode,
             nestedRoutesEntry: entrypoint.nestedRoutesEntry,
             entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRoutesChunks: (_a = config2 == null ? void 0 : config2.output) == null ? void 0 : _a.splitRoutesChunks
+            internalDirectory
           })
         });
         if (entrypoint.nestedRoutesEntry && (0, import_utils.isUseSSRBundle)(config2)) {
@@ -177,6 +175,19 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           await import_utils.fs.ensureFile(routesServerFile);
           await import_utils.fs.writeFile(routesServerFile, code3);
         }
+        const serverLoaderCombined = templates.ssrLoaderCombinedModule(
+          entrypoints,
+          entrypoint,
+          config2,
+          appContext
+        );
+        if (serverLoaderCombined) {
+          const serverLoaderFile = (0, import_utils2.getServerCombinedModueFile)(
+            internalDirectory,
+            entryName
+          );
+          await import_utils.fs.outputFile(serverLoaderFile, serverLoaderCombined);
+        }
         import_utils.fs.outputFileSync(
           import_path.default.resolve(
             internalDirectory,

package/dist/cjs/analyze/index.js

@@ -33,7 +33,6 @@ module.exports = __toCommonJS(analyze_exports);
 var path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_lodash = require("@modern-js/utils/lodash");
-var import_builder_shared = require("@modern-js/builder-shared");
 var import_printInstructions = require("../utils/printInstructions");
 var import_routes = require("../utils/routes");
 var import_config = require("../utils/config");
@@ -190,42 +189,6 @@ var analyze_default = ({
       watchFiles() {
         return pagesDir;
       },
-      config() {
-        return {
-          tools: {
-            webpackChain: (chain, { name }) => {
-              const appContext = api.useAppContext();
-              const resolvedConfig = api.useResolvedConfigContext();
-              const { entrypoints, internalDirectory, packageName } = appContext;
-              entrypoints.forEach((entrypoint) => {
-                const { entryName } = entrypoint;
-                const ssr = (0, import_utils.getEntryOptions)(
-                  entryName,
-                  resolvedConfig.server.ssr,
-                  resolvedConfig.server.ssrByEntries,
-                  packageName
-                );
-                const useSSG = (0, import_utils.isSSGEntry)(
-                  resolvedConfig,
-                  entryName,
-                  entrypoints
-                );
-                if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
-                  const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
-                  const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
-                    internalDirectory,
-                    entryName
-                  );
-                  const combinedModule = (0, import_builder_shared.createVirtualModule)(
-                    `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`
-                  );
-                  chain.entry(`${entryName}-server-loaders`).add(combinedModule);
-                }
-              });
-            }
-          }
-        };
-      },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
         const config = (0, import_config2.initialNormalizedConfig)(resolved, appContext, bundler);
@@ -284,14 +247,6 @@ var analyze_default = ({
           imports
         };
       },
-      validateSchema() {
-        return {
-          target: "output.splitRoutesChunks",
-          schema: {
-            type: "boolean"
-          }
-        };
-      },
       async fileChange(e) {
         const appContext = api.useAppContext();
         const { appDirectory } = appContext;

package/dist/cjs/analyze/templates.js

@@ -31,12 +31,14 @@ __export(templates_exports, {
   html: () => html,
   index: () => index,
   renderFunction: () => renderFunction,
-  routesForServer: () => routesForServer
+  routesForServer: () => routesForServer,
+  ssrLoaderCombinedModule: () => ssrLoaderCombinedModule
 });
 module.exports = __toCommonJS(templates_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
 var import_constants = require("./constants");
+var import_utils2 = require("./utils");
 const index = ({
   mountId,
   imports,
@@ -180,14 +182,12 @@ const fileSystemRoutes = async ({
   ssrMode,
   nestedRoutesEntry,
   entryName,
-  internalDirectory,
-  splitRoutesChunks = true
+  internalDirectory
 }) => {
   const loadings = [];
   const errors = [];
   const loaders = [];
   const loadersMap = {};
-  const webpackMode = splitRoutesChunks ? "lazy" : "eager";
   const loadersMapFile = import_path.default.join(
     internalDirectory,
     entryName,
@@ -246,15 +246,15 @@ const fileSystemRoutes = async ({
           rootLayoutCode = `import RootLayout from '${route._component}'`;
           component = `RootLayout`;
         } else if (ssrMode === "string") {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ /* webpackMode: "${webpackMode}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `loadable(${lazyImport})`;
         } else {
-          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */ /* webpackMode: "${webpackMode}" */  '${route._component}')`;
+          lazyImport = `() => import(/* webpackChunkName: "${route.id}" */  '${route._component}')`;
           component = `lazy(${lazyImport})`;
         }
       }
     } else if (route._component) {
-      lazyImport = `() => import( /* webpackMode: "${webpackMode}" */ '${route._component}')`;
+      lazyImport = `() => import('${route._component}')`;
       component = `loadable(${lazyImport})`;
     }
     const finalRoute = {
@@ -321,11 +321,33 @@ const fileSystemRoutes = async ({
     ${routeComponentsCode}
   `;
 };
+function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
+  const { entryName } = entrypoint;
+  const { packageName, internalDirectory } = appContext;
+  const ssr = (0, import_utils.getEntryOptions)(
+    entryName,
+    config.server.ssr,
+    config.server.ssrByEntries,
+    packageName
+  );
+  const ssg = (0, import_utils.isSSGEntry)(config, entryName, entrypoints);
+  if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
+    const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
+    const serverLoadersFile = (0, import_utils2.getServerLoadersFile)(
+      internalDirectory,
+      entryName
+    );
+    const combinedModule = `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`;
+    return combinedModule;
+  }
+  return null;
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   fileSystemRoutes,
   html,
   index,
   renderFunction,
-  routesForServer
+  routesForServer,
+  ssrLoaderCombinedModule
 });

package/dist/cjs/analyze/utils.js

@@ -28,6 +28,7 @@ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: tru
 var utils_exports = {};
 __export(utils_exports, {
   getDefaultImports: () => getDefaultImports,
+  getServerCombinedModueFile: () => getServerCombinedModueFile,
   getServerLoadersFile: () => getServerLoadersFile,
   hasLoader: () => hasLoader,
   isPageComponentFile: () => isPageComponentFile,
@@ -144,9 +145,13 @@ const hasLoader = async (filename) => {
 const getServerLoadersFile = (internalDirectory, entryName) => {
   return import_path.default.join(internalDirectory, entryName, "route-server-loaders.js");
 };
+const getServerCombinedModueFile = (internalDirectory, entryName) => {
+  return import_path.default.join(internalDirectory, entryName, "server-loader-combined.js");
+};
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   getDefaultImports,
+  getServerCombinedModueFile,
   getServerLoadersFile,
   hasLoader,
   isPageComponentFile,

package/dist/cjs/builder/index.js

@@ -37,7 +37,7 @@ async function createBuilderGenerator(bundler) {
       return createRspackBuilderForModern;
     } catch (_) {
       throw new Error(
-        "Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
+        "Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed"
       );
     }
   }

package/dist/cjs/builder/shared/builderPlugins/adapterSSR.js

@@ -21,7 +21,9 @@ __export(adapterSSR_exports, {
 });
 module.exports = __toCommonJS(adapterSSR_exports);
 var import_builder_shared = require("@modern-js/builder-shared");
+var import_utils = require("@modern-js/utils");
 var import_bundlerPlugins = require("../bundlerPlugins");
+var import_utils2 = require("../../../analyze/utils");
 var import_adapterHtml = require("./adapterHtml");
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
@@ -38,9 +40,10 @@ const builderPluginAdapterSSR = (options) => ({
       return config;
     });
     api.modifyBundlerChain(
-      (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin }) => {
+      async (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
         const builderConfig = api.getNormalizedConfig();
         applyRouterPlugin(chain, options);
+        await applySSRLoaderEntry(chain, options, isServer);
         if (["node", "service-worker"].includes(target)) {
           applyFilterEntriesBySSRConfig({
             isProd,
@@ -134,6 +137,27 @@ function applyFilterEntriesBySSRConfig({
     }
   });
 }
+async function applySSRLoaderEntry(chain, optinos, isServer) {
+  const { appContext } = optinos;
+  const { internalDirectory } = appContext;
+  const { entrypoints } = appContext;
+  await Promise.all(
+    entrypoints.map(async (entrypoint) => {
+      const { entryName } = entrypoint;
+      const serverLoadersFile = (0, import_utils2.getServerCombinedModueFile)(
+        internalDirectory,
+        entryName
+      );
+      if (isServer) {
+        try {
+          await import_utils.fs.access(serverLoadersFile, import_utils.fs.constants.F_OK);
+          chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+        } catch (err) {
+        }
+      }
+    })
+  );
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   builderPluginAdapterSSR

package/dist/esm/analyze/generateCode.js

@@ -152,7 +152,7 @@ import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger } f
 import * as templates from "./templates";
 import { getClientRoutes, getClientRoutesLegacy } from "./getClientRoutes";
 import { FILE_SYSTEM_ROUTES_FILE_NAME, ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
-import { getDefaultImports, getServerLoadersFile } from "./utils";
+import { getDefaultImports, getServerLoadersFile, getServerCombinedModueFile } from "./utils";
 import { walk } from "./nestedRoutes";
 var createImportSpecifier = function(specifiers) {
     var defaults = "";
@@ -245,18 +245,18 @@ var generateCode = function() {
         }
         function _generateEntryCode() {
             _generateEntryCode = _asyncToGenerator(function(entrypoint) {
-                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, _config2_output, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
+                var entryName, isAutoMount, customBootstrap, fileSystemRoutes, initialRoutes, nestedRoute, routes, config2, ssr, useSSG, mode, hasPageRoute, _ref, code2, _, _tmp, routesServerFile, code3, serverLoaderCombined, serverLoaderFile, _ref1, importStatements, plugins, _ref2, renderFunction, exportStatement, code, entryFile, _ref3, asyncEntryCode, bootstrapFile;
                 return __generator(this, function(_state) {
                     switch(_state.label){
                         case 0:
                             entryName = entrypoint.entryName, isAutoMount = entrypoint.isAutoMount, customBootstrap = entrypoint.customBootstrap, fileSystemRoutes = entrypoint.fileSystemRoutes;
                             if (!isAutoMount) return [
                                 3,
-                                16
+                                18
                             ];
                             if (!fileSystemRoutes) return [
                                 3,
-                                9
+                                11
                             ];
                             initialRoutes = [];
                             nestedRoute = null;
@@ -322,8 +322,7 @@ var generateCode = function() {
                                     ssrMode: useSSG ? "string" : mode,
                                     nestedRoutesEntry: entrypoint.nestedRoutesEntry,
                                     entryName: entrypoint.entryName,
-                                    internalDirectory: internalDirectory,
-                                    splitRoutesChunks: config2 === null || config2 === void 0 ? void 0 : (_config2_output = config2.output) === null || _config2_output === void 0 ? void 0 : _config2_output.splitRoutesChunks
+                                    internalDirectory: internalDirectory
                                 })
                             ];
                         case 4:
@@ -357,9 +356,23 @@ var generateCode = function() {
                             _state.sent();
                             _state.label = 8;
                         case 8:
-                            fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
-                            _state.label = 9;
+                            serverLoaderCombined = templates.ssrLoaderCombinedModule(entrypoints, entrypoint, config2, appContext);
+                            if (!serverLoaderCombined) return [
+                                3,
+                                10
+                            ];
+                            serverLoaderFile = getServerCombinedModueFile(internalDirectory, entryName);
+                            return [
+                                4,
+                                fs.outputFile(serverLoaderFile, serverLoaderCombined)
+                            ];
                         case 9:
+                            _state.sent();
+                            _state.label = 10;
+                        case 10:
+                            fs.outputFileSync(path.resolve(internalDirectory, "./".concat(entryName, "/").concat(FILE_SYSTEM_ROUTES_FILE_NAME)), code2, "utf8");
+                            _state.label = 11;
+                        case 11:
                             return [
                                 4,
                                 hookRunners.modifyEntryImports({
@@ -373,7 +386,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 10:
+                        case 12:
                             _ref1 = _state.sent(), importStatements = _ref1.imports;
                             return [
                                 4,
@@ -382,7 +395,7 @@ var generateCode = function() {
                                     plugins: []
                                 })
                             ];
-                        case 11:
+                        case 13:
                             plugins = _state.sent().plugins;
                             return [
                                 4,
@@ -395,7 +408,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 12:
+                        case 14:
                             _ref2 = _state.sent(), renderFunction = _ref2.code;
                             return [
                                 4,
@@ -404,7 +417,7 @@ var generateCode = function() {
                                     exportStatement: "export default AppWrapper;"
                                 })
                             ];
-                        case 13:
+                        case 15:
                             exportStatement = _state.sent().exportStatement;
                             code = templates.index({
                                 mountId: mountId,
@@ -416,7 +429,7 @@ var generateCode = function() {
                             entrypoint.entry = entryFile;
                             if (!config.source.enableAsyncEntry) return [
                                 3,
-                                15
+                                17
                             ];
                             return [
                                 4,
@@ -425,19 +438,19 @@ var generateCode = function() {
                                     code: "import('./".concat(ENTRY_BOOTSTRAP_FILE_NAME, "');")
                                 })
                             ];
-                        case 14:
+                        case 16:
                             _ref3 = _state.sent(), asyncEntryCode = _ref3.code;
                             fs.outputFileSync(entryFile, asyncEntryCode, "utf8");
                             bootstrapFile = path.resolve(internalDirectory, "./".concat(entryName, "/").concat(ENTRY_BOOTSTRAP_FILE_NAME));
                             fs.outputFileSync(bootstrapFile, code, "utf8");
                             return [
                                 3,
-                                16
+                                18
                             ];
-                        case 15:
+                        case 17:
                             fs.outputFileSync(entryFile, code, "utf8");
-                            _state.label = 16;
-                        case 16:
+                            _state.label = 18;
+                        case 18:
                             return [
                                 2
                             ];

package/dist/esm/analyze/index.js

@@ -221,16 +221,15 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import * as path from "path";
-import { createDebugger, findExists, fs, getEntryOptions, isApiOnly, minimist, getCommand, isDevCommand, isSSGEntry } from "@modern-js/utils";
+import { createDebugger, findExists, fs, isApiOnly, minimist, getCommand, isDevCommand } from "@modern-js/utils";
 import { cloneDeep } from "@modern-js/utils/lodash";
-import { createVirtualModule } from "@modern-js/builder-shared";
 import { printInstructions } from "../utils/printInstructions";
 import { generateRoutes } from "../utils/routes";
 import { emitResolvedConfig } from "../utils/config";
 import { getSelectedEntries } from "../utils/getSelectedEntries";
 import { initialNormalizedConfig } from "../config";
 import { createBuilderGenerator } from "../builder";
-import { getServerLoadersFile, isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
+import { isPageComponentFile, parseModule, replaceWithAlias } from "./utils";
 import { APP_CONFIG_NAME, APP_INIT_EXPORTED, APP_INIT_IMPORTED } from "./constants";
 var debug = createDebugger("plugin-analyze");
 var analyze_default = function(param) {
@@ -543,29 +542,6 @@ var analyze_default = function(param) {
                 watchFiles: function watchFiles() {
                     return pagesDir;
                 },
-                config: function config() {
-                    return {
-                        tools: {
-                            webpackChain: function(chain, param) {
-                                var name = param.name;
-                                var appContext = api.useAppContext();
-                                var resolvedConfig = api.useResolvedConfigContext();
-                                var entrypoints = appContext.entrypoints, internalDirectory = appContext.internalDirectory, packageName = appContext.packageName;
-                                entrypoints.forEach(function(entrypoint) {
-                                    var entryName = entrypoint.entryName;
-                                    var ssr = getEntryOptions(entryName, resolvedConfig.server.ssr, resolvedConfig.server.ssrByEntries, packageName);
-                                    var useSSG = isSSGEntry(resolvedConfig, entryName, entrypoints);
-                                    if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
-                                        var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
-                                        var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
-                                        var combinedModule = createVirtualModule('export * from "'.concat(serverLoaderRuntime, '"; export * from "').concat(serverLoadersFile, '"'));
-                                        chain.entry("".concat(entryName, "-server-loaders")).add(combinedModule);
-                                    }
-                                });
-                            }
-                        }
-                    };
-                },
                 resolvedConfig: function resolvedConfig(param) {
                     var resolved = param.resolved;
                     var appContext = api.useAppContext();
@@ -662,14 +638,6 @@ var analyze_default = function(param) {
                         });
                     })();
                 },
-                validateSchema: function validateSchema() {
-                    return {
-                        target: "output.splitRoutesChunks",
-                        schema: {
-                            type: "boolean"
-                        }
-                    };
-                },
                 fileChange: function fileChange(e) {
                     return _asyncToGenerator(function() {
                         var appContext, appDirectory, filename, eventType, isPageFile, absoluteFilePath, isRouteComponent, resolvedConfig, generateCode, entrypoints;

package/dist/esm/analyze/templates.js

@@ -221,8 +221,9 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs, slash } from "@modern-js/utils";
+import { fs, getEntryOptions, isSSGEntry, slash } from "@modern-js/utils";
 import { APP_CONFIG_NAME, TEMP_LOADERS_DIR } from "./constants";
+import { getServerLoadersFile } from "./utils";
 var index = function(param) {
     var mountId = param.mountId, imports = param.imports, renderFunction2 = param.renderFunction, exportStatement = param.exportStatement;
     return "\nconst IS_BROWSER = typeof window !== 'undefined' && window.name !== 'nodejs';\nconst IS_REACT18 = process.env.IS_REACT18 === 'true';\nconst MOUNT_ID = '".concat(mountId, "';\n\n").concat(imports, "\n\nlet AppWrapper = null;\n\nlet root = null;\n\nfunction render() {\n  ").concat(renderFunction2, "\n}\n\nAppWrapper = render();\n\n").concat(exportStatement, ";\n");
@@ -297,16 +298,15 @@ var routesForServer = function(param) {
 };
 var fileSystemRoutes = function() {
     var _ref = _asyncToGenerator(function(param) {
-        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, _param_splitRoutesChunks, splitRoutesChunks, loadings, errors, loaders, loadersMap, webpackMode, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
+        var routes, ssrMode, nestedRoutesEntry, entryName, internalDirectory, loadings, errors, loaders, loadersMap, loadersMapFile, importLazyCode, rootLayoutCode, getDataLoaderPath, traverseRouteTree, routeComponentsCode, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, route, newRoute, component, finalRoute, importLoadingCode, importErrorComponentsCode, importLoadersCode, _iteratorNormalCompletion1, _didIteratorError1, _iteratorError1, _iterator1, _step1, _step_value, key, loaderInfo;
         return __generator(this, function(_state) {
             switch(_state.label){
                 case 0:
-                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory, _param_splitRoutesChunks = param.splitRoutesChunks, splitRoutesChunks = _param_splitRoutesChunks === void 0 ? true : _param_splitRoutesChunks;
+                    routes = param.routes, ssrMode = param.ssrMode, nestedRoutesEntry = param.nestedRoutesEntry, entryName = param.entryName, internalDirectory = param.internalDirectory;
                     loadings = [];
                     errors = [];
                     loaders = [];
                     loadersMap = {};
-                    webpackMode = splitRoutesChunks ? "lazy" : "eager";
                     loadersMapFile = path.join(internalDirectory, entryName, TEMP_LOADERS_DIR, "map.json");
                     importLazyCode = '\n    import { lazy } from "react";\n    import loadable, { lazy as loadableLazy } from "@modern-js/runtime/loadable"\n  ';
                     rootLayoutCode = "";
@@ -355,15 +355,15 @@ var fileSystemRoutes = function() {
                                     rootLayoutCode = "import RootLayout from '".concat(route._component, "'");
                                     component = "RootLayout";
                                 } else if (ssrMode === "string") {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, '" */ /* webpackMode: "').concat(webpackMode, "\" */  '").concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "loadable(".concat(lazyImport, ")");
                                 } else {
-                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, '" */ /* webpackMode: "').concat(webpackMode, "\" */  '").concat(route._component, "')");
+                                    lazyImport = '() => import(/* webpackChunkName: "'.concat(route.id, "\" */  '").concat(route._component, "')");
                                     component = "lazy(".concat(lazyImport, ")");
                                 }
                             }
                         } else if (route._component) {
-                            lazyImport = '() => import( /* webpackMode: "'.concat(webpackMode, "\" */ '").concat(route._component, "')");
+                            lazyImport = "() => import('".concat(route._component, "')");
                             component = "loadable(".concat(lazyImport, ")");
                         }
                         var finalRoute = _objectSpreadProps(_objectSpread({}, route), {
@@ -463,4 +463,17 @@ var fileSystemRoutes = function() {
         return _ref.apply(this, arguments);
     };
 }();
-export { fileSystemRoutes, html, index, renderFunction, routesForServer };
+function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
+    var entryName = entrypoint.entryName;
+    var packageName = appContext.packageName, internalDirectory = appContext.internalDirectory;
+    var ssr = getEntryOptions(entryName, config.server.ssr, config.server.ssrByEntries, packageName);
+    var ssg = isSSGEntry(config, entryName, entrypoints);
+    if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
+        var serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
+        var serverLoadersFile = getServerLoadersFile(internalDirectory, entryName);
+        var combinedModule = 'export * from "'.concat(serverLoaderRuntime, '"; export * from "').concat(serverLoadersFile, '"');
+        return combinedModule;
+    }
+    return null;
+}
+export { fileSystemRoutes, html, index, renderFunction, routesForServer, ssrLoaderCombinedModule };

package/dist/esm/analyze/utils.js

@@ -371,4 +371,7 @@ var hasLoader = function() {
 var getServerLoadersFile = function(internalDirectory, entryName) {
     return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };
-export { getDefaultImports, getServerLoadersFile, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };
+var getServerCombinedModueFile = function(internalDirectory, entryName) {
+    return path.join(internalDirectory, entryName, "server-loader-combined.js");
+};
+export { getDefaultImports, getServerCombinedModueFile, getServerLoadersFile, hasLoader, isPageComponentFile, parseModule, replaceWithAlias, walkDirectory };

package/dist/esm/builder/index.js

@@ -155,7 +155,7 @@ function _createBuilderGenerator() {
                     ];
                 case 3:
                     _ = _state.sent();
-                    throw new Error("Failed to use rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
+                    throw new Error("Failed to use Rspack, please check if you have `@modern-js/builder-rspack-provider` installed");
                 case 4:
                     return [
                         4,