@modern-js/app-tools 0.0.0-next-3ef832741 → 0.0.0-next-1678282721176

package/CHANGELOG.md

@@ -1,6 +1,6 @@
 # @modern-js/app-tools
 
-## 0.0.0-next-3ef832741
+## 0.0.0-next-1678282721176
 
 ### Minor Changes
 
@@ -15,6 +15,8 @@
   fix: 修复嵌套路由在 SSG 中的问题
 - 2b6b1a014: refactor: app-tools builder
   refactor: 重构 app-tools builder
+- 250f794c4: fix: move the analyze webpackChain config to app-tools builder shared
+  fix: 将 anylyze 的 `webpackChain` 配置项移植进 app-tools builder shared
 - Updated dependencies [ea7bb41e3]
 - Updated dependencies [0cf8540ff]
 - Updated dependencies [bd369a89a]
@@ -23,24 +25,24 @@
 - Updated dependencies [2c1151271]
 - Updated dependencies [1f6ca2c7f]
 - Updated dependencies [457ee832b]
-  - @modern-js/server@0.0.0-next-3ef832741
-  - @modern-js/plugin-data-loader@0.0.0-next-3ef832741
-  - @modern-js/builder@0.0.0-next-3ef832741
-  - @modern-js/builder-shared@0.0.0-next-3ef832741
-  - @modern-js/builder-rspack-provider@0.0.0-next-3ef832741
-  - @modern-js/prod-server@0.0.0-next-3ef832741
-  - @modern-js/utils@0.0.0-next-3ef832741
-  - @modern-js/builder-webpack-provider@0.0.0-next-3ef832741
-  - @modern-js/types@0.0.0-next-3ef832741
-  - @modern-js/builder-plugin-esbuild@0.0.0-next-3ef832741
-  - @modern-js/builder-plugin-node-polyfill@0.0.0-next-3ef832741
-  - @modern-js/core@0.0.0-next-3ef832741
-  - @modern-js/plugin-i18n@0.0.0-next-3ef832741
-  - @modern-js/plugin-lint@0.0.0-next-3ef832741
-  - @modern-js/new-action@0.0.0-next-3ef832741
-  - @modern-js/node-bundle-require@0.0.0-next-3ef832741
-  - @modern-js/upgrade@0.0.0-next-3ef832741
-  - @modern-js/plugin@0.0.0-next-3ef832741
+  - @modern-js/server@0.0.0-next-1678282721176
+  - @modern-js/plugin-data-loader@0.0.0-next-1678282721176
+  - @modern-js/builder@0.0.0-next-1678282721176
+  - @modern-js/builder-shared@0.0.0-next-1678282721176
+  - @modern-js/builder-rspack-provider@0.0.0-next-1678282721176
+  - @modern-js/prod-server@0.0.0-next-1678282721176
+  - @modern-js/utils@0.0.0-next-1678282721176
+  - @modern-js/builder-webpack-provider@0.0.0-next-1678282721176
+  - @modern-js/types@0.0.0-next-1678282721176
+  - @modern-js/builder-plugin-esbuild@0.0.0-next-1678282721176
+  - @modern-js/builder-plugin-node-polyfill@0.0.0-next-1678282721176
+  - @modern-js/core@0.0.0-next-1678282721176
+  - @modern-js/plugin-i18n@0.0.0-next-1678282721176
+  - @modern-js/plugin-lint@0.0.0-next-1678282721176
+  - @modern-js/new-action@0.0.0-next-1678282721176
+  - @modern-js/node-bundle-require@0.0.0-next-1678282721176
+  - @modern-js/upgrade@0.0.0-next-1678282721176
+  - @modern-js/plugin@0.0.0-next-1678282721176
 
 ## 2.7.0
 

package/dist/cjs/analyze/generateCode.js

@@ -175,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);

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,
@@ -319,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/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 }) => {
+      (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
         const builderConfig = api.getNormalizedConfig();
         applyRouterPlugin(chain, options);
+        applySSRLoaderEntry(chain, options, isServer);
         if (["node", "service-worker"].includes(target)) {
           applyFilterEntriesBySSRConfig({
             isProd,
@@ -134,6 +137,26 @@ function applyFilterEntriesBySSRConfig({
     }
   });
 }
+function applySSRLoaderEntry(chain, optinos, isServer) {
+  const { appContext } = optinos;
+  const { internalDirectory } = appContext;
+  const { entrypoints } = appContext;
+  entrypoints.forEach((entrypoint) => {
+    const { entryName } = entrypoint;
+    const serverLoadersFile = (0, import_utils2.getServerCombinedModueFile)(
+      internalDirectory,
+      entryName
+    );
+    if (isServer) {
+      import_utils.fs.access(serverLoadersFile, import_utils.fs.constants.F_OK, (err) => {
+        if (err) {
+          return;
+        }
+        chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+      });
+    }
+  });
+}
 // 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, 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;
@@ -356,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({
@@ -372,7 +386,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 10:
+                        case 12:
                             _ref1 = _state.sent(), importStatements = _ref1.imports;
                             return [
                                 4,
@@ -381,7 +395,7 @@ var generateCode = function() {
                                     plugins: []
                                 })
                             ];
-                        case 11:
+                        case 13:
                             plugins = _state.sent().plugins;
                             return [
                                 4,
@@ -394,7 +408,7 @@ var generateCode = function() {
                                     })
                                 })
                             ];
-                        case 12:
+                        case 14:
                             _ref2 = _state.sent(), renderFunction = _ref2.code;
                             return [
                                 4,
@@ -403,7 +417,7 @@ var generateCode = function() {
                                     exportStatement: "export default AppWrapper;"
                                 })
                             ];
-                        case 13:
+                        case 15:
                             exportStatement = _state.sent().exportStatement;
                             code = templates.index({
                                 mountId: mountId,
@@ -415,7 +429,7 @@ var generateCode = function() {
                             entrypoint.entry = entryFile;
                             if (!config.source.enableAsyncEntry) return [
                                 3,
-                                15
+                                17
                             ];
                             return [
                                 4,
@@ -424,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();

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");
@@ -462,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/shared/builderPlugins/adapterSSR.js

@@ -1,5 +1,7 @@
 import { mergeBuilderConfig } from "@modern-js/builder-shared";
+import { fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
+import { getServerCombinedModueFile } from "../../../analyze/utils";
 import { isHtmlEnabled } from "./adapterHtml";
 var builderPluginAdapterSSR = function(options) {
     return {
@@ -17,9 +19,10 @@ var builderPluginAdapterSSR = function(options) {
                 return config;
             });
             api.modifyBundlerChain(function(chain, param) {
-                var target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin;
+                var target = param.target, CHAIN_ID = param.CHAIN_ID, isProd = param.isProd, HtmlBundlerPlugin = param.HtmlPlugin, isServer = param.isServer;
                 var builderConfig = api.getNormalizedConfig();
                 applyRouterPlugin(chain, options);
+                applySSRLoaderEntry(chain, options, isServer);
                 if ([
                     "node",
                     "service-worker"
@@ -128,4 +131,21 @@ function applyFilterEntriesBySSRConfig(param) {
         }
     });
 }
+function applySSRLoaderEntry(chain, optinos, isServer) {
+    var appContext = optinos.appContext;
+    var internalDirectory = appContext.internalDirectory;
+    var entrypoints = appContext.entrypoints;
+    entrypoints.forEach(function(entrypoint) {
+        var entryName = entrypoint.entryName;
+        var serverLoadersFile = getServerCombinedModueFile(internalDirectory, entryName);
+        if (isServer) {
+            fs.access(serverLoadersFile, fs.constants.F_OK, function(err) {
+                if (err) {
+                    return;
+                }
+                chain.entry("".concat(entryName, "-server-loaders")).add(serverLoadersFile);
+            });
+        }
+    });
+}
 export { builderPluginAdapterSSR };

package/dist/esm-node/analyze/generateCode.js

@@ -14,7 +14,11 @@ import {
   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";
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
@@ -153,6 +157,19 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           await fs.ensureFile(routesServerFile);
           await fs.writeFile(routesServerFile, code3);
         }
+        const serverLoaderCombined = templates.ssrLoaderCombinedModule(
+          entrypoints,
+          entrypoint,
+          config2,
+          appContext
+        );
+        if (serverLoaderCombined) {
+          const serverLoaderFile = getServerCombinedModueFile(
+            internalDirectory,
+            entryName
+          );
+          await fs.outputFile(serverLoaderFile, serverLoaderCombined);
+        }
         fs.outputFileSync(
           path.resolve(
             internalDirectory,

package/dist/esm-node/analyze/index.js

@@ -3,27 +3,19 @@ import {
   createDebugger,
   findExists,
   fs,
-  getEntryOptions,
   isApiOnly,
   minimist,
   getCommand,
-  isDevCommand,
-  isSSGEntry
+  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,
@@ -177,42 +169,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 = getEntryOptions(
-                  entryName,
-                  resolvedConfig.server.ssr,
-                  resolvedConfig.server.ssrByEntries,
-                  packageName
-                );
-                const useSSG = isSSGEntry(
-                  resolvedConfig,
-                  entryName,
-                  entrypoints
-                );
-                if (entrypoint.nestedRoutesEntry && (ssr || useSSG) && name === "server") {
-                  const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
-                  const serverLoadersFile = getServerLoadersFile(
-                    internalDirectory,
-                    entryName
-                  );
-                  const combinedModule = createVirtualModule(
-                    `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`
-                  );
-                  chain.entry(`${entryName}-server-loaders`).add(combinedModule);
-                }
-              });
-            }
-          }
-        };
-      },
       resolvedConfig({ resolved }) {
         const appContext = api.useAppContext();
         const config = initialNormalizedConfig(resolved, appContext, bundler);

package/dist/esm-node/analyze/templates.js

@@ -1,6 +1,7 @@
 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";
 const index = ({
   mountId,
   imports,
@@ -283,10 +284,32 @@ const fileSystemRoutes = async ({
     ${routeComponentsCode}
   `;
 };
+function ssrLoaderCombinedModule(entrypoints, entrypoint, config, appContext) {
+  const { entryName } = entrypoint;
+  const { packageName, internalDirectory } = appContext;
+  const ssr = getEntryOptions(
+    entryName,
+    config.server.ssr,
+    config.server.ssrByEntries,
+    packageName
+  );
+  const ssg = isSSGEntry(config, entryName, entrypoints);
+  if (entrypoint.nestedRoutesEntry && (ssr || ssg)) {
+    const serverLoaderRuntime = require.resolve("@modern-js/plugin-data-loader/runtime");
+    const serverLoadersFile = getServerLoadersFile(
+      internalDirectory,
+      entryName
+    );
+    const combinedModule = `export * from "${serverLoaderRuntime}"; export * from "${serverLoadersFile}"`;
+    return combinedModule;
+  }
+  return null;
+}
 export {
   fileSystemRoutes,
   html,
   index,
   renderFunction,
-  routesForServer
+  routesForServer,
+  ssrLoaderCombinedModule
 };

package/dist/esm-node/analyze/utils.js

@@ -110,8 +110,12 @@ const hasLoader = async (filename) => {
 const getServerLoadersFile = (internalDirectory, entryName) => {
   return path.join(internalDirectory, entryName, "route-server-loaders.js");
 };
+const getServerCombinedModueFile = (internalDirectory, entryName) => {
+  return path.join(internalDirectory, entryName, "server-loader-combined.js");
+};
 export {
   getDefaultImports,
+  getServerCombinedModueFile,
   getServerLoadersFile,
   hasLoader,
   isPageComponentFile,

package/dist/esm-node/builder/shared/builderPlugins/adapterSSR.js

@@ -1,7 +1,9 @@
 import {
   mergeBuilderConfig
 } from "@modern-js/builder-shared";
+import { fs } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
+import { getServerCombinedModueFile } from "../../../analyze/utils";
 import { isHtmlEnabled } from "./adapterHtml";
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
@@ -18,9 +20,10 @@ const builderPluginAdapterSSR = (options) => ({
       return config;
     });
     api.modifyBundlerChain(
-      (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin }) => {
+      (chain, { target, CHAIN_ID, isProd, HtmlPlugin: HtmlBundlerPlugin, isServer }) => {
         const builderConfig = api.getNormalizedConfig();
         applyRouterPlugin(chain, options);
+        applySSRLoaderEntry(chain, options, isServer);
         if (["node", "service-worker"].includes(target)) {
           applyFilterEntriesBySSRConfig({
             isProd,
@@ -114,6 +117,26 @@ function applyFilterEntriesBySSRConfig({
     }
   });
 }
+function applySSRLoaderEntry(chain, optinos, isServer) {
+  const { appContext } = optinos;
+  const { internalDirectory } = appContext;
+  const { entrypoints } = appContext;
+  entrypoints.forEach((entrypoint) => {
+    const { entryName } = entrypoint;
+    const serverLoadersFile = getServerCombinedModueFile(
+      internalDirectory,
+      entryName
+    );
+    if (isServer) {
+      fs.access(serverLoadersFile, fs.constants.F_OK, (err) => {
+        if (err) {
+          return;
+        }
+        chain.entry(`${entryName}-server-loaders`).add(serverLoadersFile);
+      });
+    }
+  });
+}
 export {
   builderPluginAdapterSSR
 };

package/dist/types/analyze/templates.d.ts

@@ -1,5 +1,5 @@
 import type { Entrypoint, NestedRoute, PageRoute, RouteLegacy, SSRMode } from '@modern-js/types';
-import type { RuntimePlugin } from '../types';
+import type { AppNormalizedConfig, IAppContext, RuntimePlugin } from '../types';
 export declare const index: ({
   mountId,
   imports,
@@ -42,4 +42,5 @@ export declare const fileSystemRoutes: ({
   nestedRoutesEntry?: string | undefined;
   entryName: string;
   internalDirectory: string;
-}) => Promise<string>;
+}) => Promise<string>;
+export declare function ssrLoaderCombinedModule(entrypoints: Entrypoint[], entrypoint: Entrypoint, config: AppNormalizedConfig<'shared'>, appContext: IAppContext): string | null;

package/dist/types/analyze/utils.d.ts

@@ -24,4 +24,5 @@ export declare const parseModule: ({
   filename: string;
 }) => Promise<readonly [imports: readonly import("es-module-lexer").ImportSpecifier[], exports: readonly import("es-module-lexer").ExportSpecifier[], facade: boolean]>;
 export declare const hasLoader: (filename: string) => Promise<boolean>;
-export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerLoadersFile: (internalDirectory: string, entryName: string) => string;
+export declare const getServerCombinedModueFile: (internalDirectory: string, entryName: string) => string;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "0.0.0-next-3ef832741",
+  "version": "0.0.0-next-1678282721176",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -64,23 +64,23 @@
     "@babel/types": "^7.18.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.15.7",
-    "@modern-js/builder": "0.0.0-next-3ef832741",
-    "@modern-js/builder-plugin-esbuild": "0.0.0-next-3ef832741",
-    "@modern-js/builder-plugin-node-polyfill": "0.0.0-next-3ef832741",
-    "@modern-js/builder-webpack-provider": "0.0.0-next-3ef832741",
-    "@modern-js/builder-shared": "0.0.0-next-3ef832741",
-    "@modern-js/core": "0.0.0-next-3ef832741",
-    "@modern-js/new-action": "0.0.0-next-3ef832741",
-    "@modern-js/node-bundle-require": "0.0.0-next-3ef832741",
-    "@modern-js/plugin": "0.0.0-next-3ef832741",
-    "@modern-js/plugin-i18n": "0.0.0-next-3ef832741",
-    "@modern-js/plugin-data-loader": "0.0.0-next-3ef832741",
-    "@modern-js/plugin-lint": "0.0.0-next-3ef832741",
-    "@modern-js/prod-server": "0.0.0-next-3ef832741",
-    "@modern-js/server": "0.0.0-next-3ef832741",
-    "@modern-js/types": "0.0.0-next-3ef832741",
-    "@modern-js/upgrade": "0.0.0-next-3ef832741",
-    "@modern-js/utils": "0.0.0-next-3ef832741"
+    "@modern-js/builder": "0.0.0-next-1678282721176",
+    "@modern-js/builder-plugin-esbuild": "0.0.0-next-1678282721176",
+    "@modern-js/builder-plugin-node-polyfill": "0.0.0-next-1678282721176",
+    "@modern-js/builder-shared": "0.0.0-next-1678282721176",
+    "@modern-js/builder-webpack-provider": "0.0.0-next-1678282721176",
+    "@modern-js/core": "0.0.0-next-1678282721176",
+    "@modern-js/new-action": "0.0.0-next-1678282721176",
+    "@modern-js/node-bundle-require": "0.0.0-next-1678282721176",
+    "@modern-js/plugin": "0.0.0-next-1678282721176",
+    "@modern-js/plugin-i18n": "0.0.0-next-1678282721176",
+    "@modern-js/plugin-data-loader": "0.0.0-next-1678282721176",
+    "@modern-js/plugin-lint": "0.0.0-next-1678282721176",
+    "@modern-js/prod-server": "0.0.0-next-1678282721176",
+    "@modern-js/server": "0.0.0-next-1678282721176",
+    "@modern-js/types": "0.0.0-next-1678282721176",
+    "@modern-js/upgrade": "0.0.0-next-1678282721176",
+    "@modern-js/utils": "0.0.0-next-1678282721176"
   },
   "devDependencies": {
     "@types/babel__traverse": "^7.14.2",
@@ -89,14 +89,14 @@
     "jest": "^27",
     "typescript": "^4",
     "webpack": "^5.75.0",
-    "@modern-js/builder-plugin-swc": "0.0.0-next-3ef832741",
-    "@modern-js/builder-rspack-provider": "0.0.0-next-3ef832741",
-    "@modern-js/server-core": "0.0.0-next-3ef832741",
-    "@scripts/build": "0.0.0-next-3ef832741",
-    "@scripts/jest-config": "0.0.0-next-3ef832741"
+    "@modern-js/builder-plugin-swc": "0.0.0-next-1678282721176",
+    "@modern-js/builder-rspack-provider": "0.0.0-next-1678282721176",
+    "@modern-js/server-core": "0.0.0-next-1678282721176",
+    "@scripts/build": "0.0.0-next-1678282721176",
+    "@scripts/jest-config": "0.0.0-next-1678282721176"
   },
   "peerDependencies": {
-    "@modern-js/builder-rspack-provider": "0.0.0-next-3ef832741"
+    "@modern-js/builder-rspack-provider": "0.0.0-next-1678282721176"
   },
   "peerDependenciesMeta": {
     "@modern-js/builder-rspack-provider": {