@modern-js/app-tools 2.53.1-alpha.4 → 2.54.1-alpha.0

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

@@ -3,7 +3,7 @@ import { isHtmlDisabled } from "@rsbuild/shared";
 import { mergeRsbuildConfig } from "@rsbuild/core";
 import { fs, isUseSSRBundle } from "@modern-js/utils";
 import { HtmlAsyncChunkPlugin, RouterPlugin } from "../bundlerPlugins";
-import { getServerCombinedModueFile } from "../../../analyze/utils";
+import { getServerCombinedModueFile } from "../../../plugins/analyze/utils";
 const builderPluginAdapterSSR = (options) => ({
   name: "builder-plugin-adapter-modern-ssr",
   setup(api) {
@@ -124,7 +124,7 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
   }
   const { ssr, ssrByEntries } = serverConfig || {};
   entryNames.forEach((name) => {
-    if (!ssgEntries.includes(name) && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
+    if (!ssgEntries.includes(name) && !name.includes("server-loaders") && (ssr && (ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]) === false || !ssr && !(ssrByEntries === null || ssrByEntries === void 0 ? void 0 : ssrByEntries[name]))) {
       chain.entryPoints.delete(name);
     }
   });

package/dist/esm-node/commands/build.js

@@ -1,5 +1,6 @@
 import { ResolvedConfigContext } from "@modern-js/core";
 import { logger } from "@modern-js/utils";
+import { loadServerPlugins } from "../utils/loadPlugins";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { registerCompiler } from "../utils/register";
@@ -11,6 +12,7 @@ const build = async (api, options) => {
   let resolvedConfig = api.useResolvedConfigContext();
   const appContext = api.useAppContext();
   const hookRunners = api.useHookRunners();
+  await loadServerPlugins(api, appContext.appDirectory);
   await registerCompiler(appContext.appDirectory, appContext.distDirectory, resolvedConfig === null || resolvedConfig === void 0 ? void 0 : (_resolvedConfig_source = resolvedConfig.source) === null || _resolvedConfig_source === void 0 ? void 0 : _resolvedConfig_source.alias);
   const { apiOnly } = appContext;
   if (apiOnly) {

package/dist/esm-node/commands/deploy.js

@@ -1,7 +1,7 @@
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+import { getServerPlugins } from "../utils/loadPlugins";
 const deploy = async (api, options) => {
   const hookRunners = api.useHookRunners();
-  await getServerInternalPlugins(api);
+  await getServerPlugins(api);
   await hookRunners.beforeDeploy(options);
   await hookRunners.deploy(options);
   await hookRunners.afterDeploy(options);

package/dist/esm-node/commands/dev.js

@@ -1,13 +1,14 @@
+import path from "node:path";
 import { ResolvedConfigContext } from "@modern-js/core";
-import { DEFAULT_DEV_HOST } from "@modern-js/utils";
+import { DEFAULT_DEV_HOST, SERVER_DIR, getMeta } from "@modern-js/utils";
 import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-server";
+import { applyPlugins } from "@modern-js/prod-server";
+import { loadServerPlugins } from "../utils/loadPlugins";
 import { registerCompiler } from "../utils/register";
 import { printInstructions } from "../utils/printInstructions";
 import { setServer } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 const dev = async (api, options, devServerOptions = {}) => {
   var _normalizedConfig_source, _normalizedConfig_tools;
   if (options.analyze) {
@@ -29,12 +30,14 @@ const dev = async (api, options, devServerOptions = {}) => {
     configFile: serverConfigFile,
     watch: true
   });
+  const meta = getMeta(metaName);
+  const serverConfigPath = path.resolve(appDirectory, SERVER_DIR, `${meta}.server`);
   await hookRunners.beforeDev();
   if (!appContext.builder && !apiOnly) {
     throw new Error("Expect the Builder to have been initialized, But the appContext.builder received `undefined`");
   }
   await generateRoutes(appContext);
-  const serverInternalPlugins = await getServerInternalPlugins(api);
+  const pluginInstances = await loadServerPlugins(api, appDirectory);
   const serverOptions = {
     metaName,
     dev: {
@@ -49,16 +52,17 @@ const dev = async (api, options, devServerOptions = {}) => {
       lambdaDirectory: appContext.lambdaDirectory,
       sharedDirectory: appContext.sharedDirectory
     },
+    serverConfigPath,
     routes: serverRoutes,
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: serverInternalPlugins,
+    plugins: pluginInstances,
     ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;
-    const app = await createDevServer(serverOptions, initProdMiddlewares);
+    const app = await createDevServer(serverOptions, applyPlugins);
     const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
     app.listen({
       port,
@@ -69,7 +73,7 @@ const dev = async (api, options, devServerOptions = {}) => {
   } else {
     const { server } = await appContext.builder.startDevServer({
       serverOptions,
-      initProdMiddlewares
+      applyPlugins
     });
     setServer(server);
   }

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

@@ -1,3 +1,92 @@
-export * from "./dev";
-export * from "./build";
-export * from "./serve";
+import { newAction, upgradeAction } from "@modern-js/utils";
+import { castArray } from "@rsbuild/shared";
+import { i18n, localeKeys } from "../locale";
+const devCommand = async (program, api) => {
+  const runner = api.useHookRunners();
+  const devToolMetas = await runner.registerDev();
+  const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
+    const { dev } = await import("./dev");
+    await dev(api, options);
+  });
+  for (const meta of devToolMetas) {
+    if (!meta.subCommands) {
+      continue;
+    }
+    for (const subCmd of meta.subCommands) {
+      devProgram.command(subCmd).action(async (options = {}) => {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = await import("@modern-js/utils");
+        await runner.beforeDevTask(meta);
+        await meta.action(options, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      });
+    }
+  }
+};
+const buildCommand = async (program, api) => {
+  const runner = api.useHookRunners();
+  const platformBuilders = await runner.registerBuildPlatform();
+  const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
+    const { build } = await import("./build");
+    await build(api, options);
+  });
+  for (const platformBuilder of platformBuilders) {
+    const platforms = castArray(platformBuilder.platform);
+    for (const platform of platforms) {
+      buildProgram.command(platform).action(async () => {
+        const { appDirectory } = api.useAppContext();
+        const { isTypescript } = await import("@modern-js/utils");
+        await runner.beforeBuildPlatform(platformBuilders);
+        await platformBuilder.build(platform, {
+          isTsProject: isTypescript(appDirectory)
+        });
+      });
+    }
+  }
+};
+const serverCommand = (program, api) => {
+  program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
+    const { start } = await import("./serve");
+    await start(api);
+  });
+};
+const deployCommand = (program, api) => {
+  program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options) => {
+    if (!options.skipBuild) {
+      const { build } = await import("./build");
+      await build(api);
+    }
+    const { deploy } = await import("./deploy");
+    await deploy(api, options);
+    process.exit(0);
+  });
+};
+const newCommand = (program, locale) => {
+  program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options) => {
+    await newAction({
+      ...options,
+      locale: options.lang || locale
+    }, "mwa");
+  });
+};
+const inspectCommand = (program, api) => {
+  program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options) => {
+    const { inspect } = await import("./inspect");
+    inspect(api, options);
+  });
+};
+const upgradeCommand = (program) => {
+  program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
+    await upgradeAction();
+  });
+};
+export {
+  buildCommand,
+  deployCommand,
+  devCommand,
+  inspectCommand,
+  newCommand,
+  serverCommand,
+  upgradeCommand
+};

package/dist/esm-node/commands/serve.js

@@ -1,20 +1,23 @@
-import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
+import path from "path";
+import { logger, isApiOnly, getTargetDir, getMeta, SERVER_DIR } from "@modern-js/utils";
 import { createProdServer } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
+import { loadServerPlugins } from "../utils/loadPlugins";
 const start = async (api) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.useAppContext();
   const userConfig = api.useResolvedConfigContext();
   const hookRunners = api.useHookRunners();
-  const { distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes } = appContext;
+  const { distDirectory, appDirectory, port, metaName, serverRoutes, serverConfigFile } = appContext;
   logger.info(`Starting production server...`);
   const apiOnly = await isApiOnly(appContext.appDirectory, userConfig === null || userConfig === void 0 ? void 0 : (_userConfig_source = userConfig.source) === null || _userConfig_source === void 0 ? void 0 : _userConfig_source.entriesDir, appContext.apiDirectory);
   let runMode;
   if (apiOnly) {
     runMode = "apiOnly";
   }
-  const serverInternalPlugins = await getServerInternalPlugins(api);
+  const meta = getMeta(metaName);
+  const serverConfigPath = path.resolve(distDirectory, SERVER_DIR, `${meta}.server`);
+  const pluginInstances = await loadServerPlugins(api, appDirectory);
   const app = await createProdServer({
     metaName,
     pwd: distDirectory,
@@ -27,14 +30,15 @@ const start = async (api) => {
       }
     },
     routes: serverRoutes,
+    plugins: pluginInstances,
+    serverConfigFile,
+    serverConfigPath,
     appContext: {
       appDirectory,
       sharedDirectory: getTargetDir(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
       apiDirectory: getTargetDir(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
       lambdaDirectory: getTargetDir(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
-    serverConfigFile,
-    internalPlugins: serverInternalPlugins,
     runMode
   });
   app.listen(port, async () => {

package/dist/esm-node/hooks.js

@@ -7,10 +7,15 @@ const hooks = {
   modifyAsyncEntry: createAsyncWaterfall(),
   modifyFileSystemRoutes: createAsyncWaterfall(),
   modifyServerRoutes: createAsyncWaterfall(),
+  /** add entry point info to entrypoints array */
+  modifyEntrypoints: createAsyncWaterfall(),
+  /** add entry type */
+  checkEntryPoint: createAsyncWaterfall(),
   htmlPartials: createAsyncWaterfall(),
   beforeGenerateRoutes: createAsyncWaterfall(),
   addDefineTypes: createAsyncWaterfall(),
   collectServerPlugins: createAsyncWaterfall(),
+  _internalServerPlugins: createAsyncWaterfall(),
   beforeDev: createAsyncWorkflow(),
   afterDev: createAsyncWorkflow(),
   beforeCreateCompiler: createAsyncWorkflow(),

package/dist/esm-node/index.js

@@ -1,64 +1,20 @@
 import path from "path";
 import { lintPlugin } from "@modern-js/plugin-lint";
-import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE, newAction, upgradeAction } from "@modern-js/utils";
-import { castArray } from "@modern-js/utils/lodash";
+import { cleanRequireCache, emptyDir, getCommand, getArgv, fs, NESTED_ROUTE_SPEC_FILE } from "@modern-js/utils";
 import { getLocaleLanguage } from "@modern-js/plugin-i18n/language-detector";
-import analyzePlugin from "./analyze";
-import initializePlugin from "./initialize";
-import { hooks } from "./hooks";
-import { i18n, localeKeys } from "./locale";
+import initializePlugin from "./plugins/initialize";
+import analyzePlugin from "./plugins/analyze";
 import serverBuildPlugin from "./plugins/serverBuild";
 import deployPlugin from "./plugins/deploy";
+import { hooks } from "./hooks";
+import { i18n } from "./locale";
 import { restart } from "./utils/restart";
 import { generateWatchFiles } from "./utils/generateWatchFiles";
+import { buildCommand, deployCommand, devCommand, inspectCommand, newCommand, serverCommand, upgradeCommand } from "./commands";
+import { dev } from "./commands/dev";
 import { mergeConfig } from "@modern-js/core";
-import { dev } from "./commands";
 export * from "./defineConfig";
 export * from "./types";
-const devCommand = async (program, api) => {
-  const runner = api.useHookRunners();
-  const devToolMetas = await runner.registerDev();
-  const devProgram = program.command("dev").alias("start").usage("[options]").description(i18n.t(localeKeys.command.dev.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-e --entry [entry...]", i18n.t(localeKeys.command.dev.entry)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("--web-only", i18n.t(localeKeys.command.dev.webOnly)).action(async (options) => {
-    const { dev: dev2 } = await import("./commands/dev");
-    await dev2(api, options);
-  });
-  for (const meta of devToolMetas) {
-    if (!meta.subCommands) {
-      continue;
-    }
-    for (const subCmd of meta.subCommands) {
-      devProgram.command(subCmd).action(async (options = {}) => {
-        const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeDevTask(meta);
-        await meta.action(options, {
-          isTsProject: isTypescript(appDirectory)
-        });
-      });
-    }
-  }
-};
-const buildCommand = async (program, api) => {
-  const runner = api.useHookRunners();
-  const platformBuilders = await runner.registerBuildPlatform();
-  const buildProgram = program.command("build").usage("[options]").description(i18n.t(localeKeys.command.build.describe)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("--analyze", i18n.t(localeKeys.command.shared.analyze)).action(async (options) => {
-    const { build } = await import("./commands/build");
-    await build(api, options);
-  });
-  for (const platformBuilder of platformBuilders) {
-    const platforms = castArray(platformBuilder.platform);
-    for (const platform of platforms) {
-      buildProgram.command(platform).action(async () => {
-        const { appDirectory } = api.useAppContext();
-        const { isTypescript } = await import("@modern-js/utils");
-        await runner.beforeBuildPlatform(platformBuilders);
-        await platformBuilder.build(platform, {
-          isTsProject: isTypescript(appDirectory)
-        });
-      });
-    }
-  }
-};
 const appTools = (options = {
   bundler: "webpack"
 }) => ({
@@ -111,32 +67,11 @@ const appTools = (options = {
       async commands({ program }) {
         await devCommand(program, api);
         await buildCommand(program, api);
-        program.command("serve").usage("[options]").description(i18n.t(localeKeys.command.serve.describe)).option("--api-only", i18n.t(localeKeys.command.dev.apiOnly)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async () => {
-          const { start } = await import("./commands/serve");
-          await start(api);
-        });
-        program.command("deploy").usage("[options]").option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).option("-s --skip-build", i18n.t(localeKeys.command.shared.skipBuild)).description(i18n.t(localeKeys.command.deploy.describe)).action(async (options2) => {
-          if (!options2.skipBuild) {
-            const { build } = await import("./commands/build");
-            await build(api);
-          }
-          const { deploy } = await import("./commands/deploy");
-          await deploy(api, options2);
-          process.exit(0);
-        });
-        program.command("new").usage("[options]").description(i18n.t(localeKeys.command.new.describe)).option("--config-file <configFile>", i18n.t(localeKeys.command.shared.config)).option("--lang <lang>", i18n.t(localeKeys.command.new.lang)).option("-c, --config <config>", i18n.t(localeKeys.command.new.config)).option("-d, --debug", i18n.t(localeKeys.command.new.debug), false).option("--dist-tag <tag>", i18n.t(localeKeys.command.new.distTag)).option("--registry", i18n.t(localeKeys.command.new.registry)).option("--no-need-install", i18n.t(localeKeys.command.shared.noNeedInstall)).action(async (options2) => {
-          await newAction({
-            ...options2,
-            locale: options2.lang || locale
-          }, "mwa");
-        });
-        program.command("inspect").description("inspect the internal configs").option(`--env <env>`, i18n.t(localeKeys.command.inspect.env), "development").option("--output <output>", i18n.t(localeKeys.command.inspect.output), "/").option("--verbose", i18n.t(localeKeys.command.inspect.verbose)).option("-c --config <config>", i18n.t(localeKeys.command.shared.config)).action(async (options2) => {
-          const { inspect } = await import("./commands/inspect");
-          inspect(api, options2);
-        });
-        program.command("upgrade").allowUnknownOption().option("-h --help", "Show help").action(async () => {
-          await upgradeAction();
-        });
+        serverCommand(program, api);
+        deployCommand(program, api);
+        newCommand(program, locale);
+        inspectCommand(program, api);
+        upgradeCommand(program);
       },
       async prepare() {
         const command = getCommand();
@@ -199,9 +134,7 @@ const appTools = (options = {
 var src_default = appTools;
 export {
   appTools,
-  buildCommand,
   src_default as default,
   dev,
-  devCommand,
   mergeConfig
 };

package/dist/esm-node/plugins/analyze/constants.js

@@ -0,0 +1,24 @@
+const INDEX_FILE_NAME = "index";
+const FILE_SYSTEM_ROUTES_FILE_NAME = "routes.js";
+const ENTRY_POINT_FILE_NAME = "index.jsx";
+const ENTRY_BOOTSTRAP_FILE_NAME = "bootstrap.jsx";
+const HTML_PARTIALS_FOLDER = "html";
+const HTML_PARTIALS_EXTENSIONS = [
+  ".htm",
+  ".html",
+  ".ejs"
+];
+const APP_CONFIG_NAME = "config";
+const APP_INIT_EXPORTED = "init";
+const APP_INIT_IMPORTED = "appInit";
+export {
+  APP_CONFIG_NAME,
+  APP_INIT_EXPORTED,
+  APP_INIT_IMPORTED,
+  ENTRY_BOOTSTRAP_FILE_NAME,
+  ENTRY_POINT_FILE_NAME,
+  FILE_SYSTEM_ROUTES_FILE_NAME,
+  HTML_PARTIALS_EXTENSIONS,
+  HTML_PARTIALS_FOLDER,
+  INDEX_FILE_NAME
+};

package/dist/esm-node/{analyze → plugins/analyze}/generateCode.js

@@ -1,10 +1,8 @@
 import path from "path";
-import { fs, getEntryOptions, isRouterV5, isSSGEntry, isUseSSRBundle, logger, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
+import { findExists, fs, getEntryOptions, JS_EXTENSIONS, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils";
 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, getServerCombinedModueFile } from "./utils";
-import { walk } from "./nestedRoutes";
+import { ENTRY_POINT_FILE_NAME, ENTRY_BOOTSTRAP_FILE_NAME } from "./constants";
+import { getDefaultImports } from "./utils";
 const createImportSpecifier = (specifiers) => {
   let defaults = "";
   const named = [];
@@ -50,92 +48,17 @@ ${initialize || ""}`);
 ${initialize || ""}`).join("\n");
 };
 const generateCode = async (appContext, config, entrypoints, api) => {
-  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, packageName } = appContext;
+  const { internalDirectory, srcDirectory, appDirectory, internalDirAlias, internalSrcAlias, runtimeConfigFile } = appContext;
   const hookRunners = api.useHookRunners();
-  const isV5 = isRouterV5(config);
-  const getRoutes = isV5 ? getClientRoutesLegacy : getClientRoutes;
+  const customRuntimeConfig = findExists(JS_EXTENSIONS.map((ext) => path.resolve(srcDirectory, `${runtimeConfigFile}${ext}`)));
   const importsStatemets = /* @__PURE__ */ new Map();
-  const oldVersion = typeof (config === null || config === void 0 ? void 0 : config.runtime.router) === "object" ? Boolean((config === null || config === void 0 ? void 0 : config.runtime.router).oldVersion) : false;
-  await Promise.all(entrypoints.map(generateEntryCode));
+  await Promise.all(entrypoints.map((entrypoint) => generateEntryCode(entrypoint, customRuntimeConfig)));
   return {
     importsStatemets
   };
-  async function generateEntryCode(entrypoint) {
-    const { entryName, isMainEntry, isAutoMount, fileSystemRoutes } = entrypoint;
+  async function generateEntryCode(entrypoint, customRuntimeConfig2) {
+    const { entryName, isAutoMount } = entrypoint;
     if (isAutoMount) {
-      if (fileSystemRoutes) {
-        var _config_output;
-        let initialRoutes = [];
-        let nestedRoutes = null;
-        if (entrypoint.entry) {
-          initialRoutes = getRoutes({
-            entrypoint,
-            srcDirectory,
-            srcAlias: internalSrcAlias,
-            internalDirectory,
-            internalDirAlias
-          });
-        }
-        if (!isV5 && entrypoint.nestedRoutesEntry) {
-          nestedRoutes = await walk(entrypoint.nestedRoutesEntry, entrypoint.nestedRoutesEntry, {
-            name: internalSrcAlias,
-            basename: srcDirectory
-          }, entrypoint.entryName, entrypoint.isMainEntry, oldVersion);
-          if (nestedRoutes) {
-            if (!Array.isArray(nestedRoutes)) {
-              nestedRoutes = [
-                nestedRoutes
-              ];
-            }
-            for (const route of nestedRoutes) {
-              initialRoutes.unshift(route);
-            }
-          }
-        }
-        const { routes } = await hookRunners.modifyFileSystemRoutes({
-          entrypoint,
-          routes: initialRoutes
-        });
-        const config2 = api.useResolvedConfigContext();
-        const ssr = getEntryOptions(entryName, isMainEntry, config2.server.ssr, config2.server.ssrByEntries, packageName);
-        const useSSG = isSSGEntry(config2, entryName, entrypoints);
-        let mode;
-        if (ssr) {
-          mode = typeof ssr === "object" ? ssr.mode || "string" : "string";
-        }
-        if (mode === "stream") {
-          const hasPageRoute = routes.some((route) => "type" in route && route.type === "page");
-          if (hasPageRoute) {
-            logger.error("Streaming ssr is not supported when pages dir exists");
-            process.exit(1);
-          }
-        }
-        const { code } = await hookRunners.beforeGenerateRoutes({
-          entrypoint,
-          code: await templates.fileSystemRoutes({
-            routes,
-            ssrMode: useSSG ? "string" : mode,
-            nestedRoutesEntry: entrypoint.nestedRoutesEntry,
-            entryName: entrypoint.entryName,
-            internalDirectory,
-            splitRouteChunks: config2 === null || config2 === void 0 ? void 0 : (_config_output = config2.output) === null || _config_output === void 0 ? void 0 : _config_output.splitRouteChunks
-          })
-        });
-        if (entrypoint.nestedRoutesEntry && isUseSSRBundle(config2)) {
-          const routesServerFile = getServerLoadersFile(internalDirectory, entryName);
-          const code2 = templates.routesForServer({
-            routes
-          });
-          await fs.ensureFile(routesServerFile);
-          await fs.writeFile(routesServerFile, code2);
-        }
-        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, `./${entryName}/${FILE_SYSTEM_ROUTES_FILE_NAME}`), code, "utf8");
-      }
       const { imports } = await hookRunners.modifyEntryImports({
         entrypoint,
         imports: getDefaultImports({
@@ -143,7 +66,9 @@ const generateCode = async (appContext, config, entrypoints, api) => {
           srcDirectory,
           appDirectory,
           internalSrcAlias,
-          internalDirAlias
+          internalDirAlias,
+          runtimeConfigFile,
+          customRuntimeConfig: customRuntimeConfig2
         })
       });
       importsStatemets.set(entryName, imports);
@@ -155,7 +80,8 @@ const generateCode = async (appContext, config, entrypoints, api) => {
 const generateIndexCode = async ({ appContext, api, entrypoints, config, importsStatemets, bundlerConfigs }) => {
   const hookRunners = api.useHookRunners();
   const { mountId } = config.html;
-  const { internalDirectory, packageName } = appContext;
+  const { internalDirectory, packageName, srcDirectory, runtimeConfigFile } = appContext;
+  const customRuntimeConfig = findExists(JS_EXTENSIONS.map((ext) => path.resolve(srcDirectory, `${runtimeConfigFile}${ext}`)));
   await Promise.all(entrypoints.map(async (entrypoint) => {
     const { entryName, isMainEntry, isAutoMount, customBootstrap, fileSystemRoutes } = entrypoint;
     if (isAutoMount) {
@@ -169,6 +95,7 @@ const generateIndexCode = async ({ appContext, api, entrypoints, config, imports
         code: templates.renderFunction({
           plugins,
           customBootstrap,
+          customRuntimeConfig,
           fileSystemRoutes
         })
       });

package/dist/esm-node/{analyze → plugins/analyze}/getBundleEntry.js

@@ -1,7 +1,6 @@
 import path from "path";
-import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, isRouterV5 } from "@modern-js/utils";
+import { ensureAbsolutePath, fs, findExists, MAIN_ENTRY_NAME, JS_EXTENSIONS } from "@modern-js/utils";
 import { getFileSystemEntry } from "./getFileSystemEntry";
-import { JS_EXTENSIONS } from "./constants";
 import { isSubDirOrEqual } from "./utils";
 const ensureExtensions = (file) => {
   if (!path.extname(file)) {
@@ -23,32 +22,24 @@ const ifAlreadyExists = (entrypoints, checked) => entrypoints.some((entrypoint)
   }
   return false;
 });
-const getBundleEntry = (appContext, config) => {
+const getBundleEntry = async (hookRunners, appContext, config) => {
   const { appDirectory, packageName } = appContext;
   const { disableDefaultEntries, entries, entriesDir, mainEntryName } = config.source;
-  const defaults = disableDefaultEntries ? [] : getFileSystemEntry(appContext, config);
+  const defaults = disableDefaultEntries ? [] : await getFileSystemEntry(hookRunners, appContext, config);
   if (entries) {
     Object.keys(entries).forEach((name) => {
       const value = entries[name];
-      const entrypoint = typeof value === "string" ? {
+      const entryName = typeof value === "string" ? value : value.entry;
+      const isAutoMount = typeof value === "string" ? true : !value.disableMount;
+      const entrypoint = {
         entryName: name,
         isMainEntry: false,
-        entry: ensureAbsolutePath(appDirectory, value),
-        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value)) ? ensureAbsolutePath(appDirectory, value) : path.dirname(ensureAbsolutePath(appDirectory, value)),
-        isAutoMount: true,
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value)).isDirectory() ? {} : void 0
-      } : {
-        entryName: name,
-        isMainEntry: false,
-        entry: ensureAbsolutePath(appDirectory, value.entry),
-        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, value.entry)) ? ensureAbsolutePath(appDirectory, value.entry) : path.dirname(ensureAbsolutePath(appDirectory, value.entry)),
-        isAutoMount: !value.disableMount,
-        customBootstrap: value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
-        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, value.entry)).isDirectory() ? {} : void 0
+        entry: ensureAbsolutePath(appDirectory, entryName),
+        absoluteEntryDir: isDirectory(ensureAbsolutePath(appDirectory, entryName)) ? ensureAbsolutePath(appDirectory, entryName) : path.dirname(ensureAbsolutePath(appDirectory, entryName)),
+        isAutoMount,
+        customBootstrap: typeof value === "string" ? false : value.customBootstrap && ensureAbsolutePath(appDirectory, value.customBootstrap),
+        fileSystemRoutes: fs.statSync(ensureAbsolutePath(appDirectory, entryName)).isDirectory() ? {} : void 0
       };
-      if (entrypoint.fileSystemRoutes && !isRouterV5(config)) {
-        entrypoint.nestedRoutesEntry = entrypoint.entry;
-      }
       if (!ifAlreadyExists(defaults, entrypoint)) {
         defaults.push(entrypoint);
       }