@modern-js/app-tools 2.64.1 → 2.64.2

package/dist/cjs/builder/generator/createBuilderProviderConfig.js

@@ -52,6 +52,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
       ...resolveConfig.dev,
       port: appContext.port
     },
+    server: resolveConfig.server,
     html: htmlConfig,
     output: {
       ...resolveConfig.output,

package/dist/cjs/builder/generator/getBuilderEnvironments.js

@@ -59,7 +59,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
     environments.web.output.copy = tempBuilderConfig.output.copy;
     delete tempBuilderConfig.output.copy;
   }
-  const useNodeTarget = (0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig);
+  const useNodeTarget = (0, import_utils.isUseRsc)(normalizedConfig) || ((0, import_utils.isProd)() ? (0, import_utils.isUseSSRBundle)(normalizedConfig) : (0, import_utils.isSSR)(normalizedConfig));
   if (useNodeTarget) {
     environments.node = {
       output: {

package/dist/cjs/builder/generator/index.js

@@ -43,6 +43,8 @@ async function generateBuilder(options, bundlerType) {
   builderConfig.environments = builderConfig.environments ? (0, import_core.mergeRsbuildConfig)(environments, builderConfig.environments) : environments;
   const builder = await (0, import_uni_builder.createUniBuilder)({
     cwd: appContext.appDirectory,
+    rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
+    rscServerRuntimePath: `@${appContext.metaName}/runtime/rsc/server`,
     frameworkConfigPath: appContext.configFile || void 0,
     bundlerType,
     config: builderConfig

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

@@ -150,7 +150,7 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
   }
   const { ssr, ssrByEntries } = serverConfig || {};
   entryNames.forEach((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]))) {
+    if (!(serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.rsc) && !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/cjs/commands/dev.js

@@ -80,13 +80,22 @@ const dev = async (api, options, devServerOptions) => {
   }
   await (0, import_routes.generateRoutes)(appContext);
   const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory, metaName);
+  const toolsDevServerConfig = (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer;
+  var _normalizedConfig_dev_host, _normalizedConfig_dev_https, _normalizedConfig_dev_hmr, _normalizedConfig_dev_setupMiddlewares;
   const serverOptions = {
     metaName,
     dev: {
+      // [`normalizedConfig.tools.devServer`](https://modernjs.dev/en/configure/app/tools/dev-server.html) already deprecated, we should using `normalizedConfig.dev` instead firstly.
+      // Oterwise, the `normalizedConfig.dev` can't be apply correctly.
+      ...toolsDevServerConfig,
+      devMiddleware: {
+        writeToDisk: normalizedConfig.dev.writeToDisk
+      },
       port,
-      https: normalizedConfig.dev.https,
-      host: normalizedConfig.dev.host,
-      ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
+      host: (_normalizedConfig_dev_host = normalizedConfig.dev.host) !== null && _normalizedConfig_dev_host !== void 0 ? _normalizedConfig_dev_host : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.host,
+      https: (_normalizedConfig_dev_https = normalizedConfig.dev.https) !== null && _normalizedConfig_dev_https !== void 0 ? _normalizedConfig_dev_https : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.https,
+      hot: (_normalizedConfig_dev_hmr = normalizedConfig.dev.hmr) !== null && _normalizedConfig_dev_hmr !== void 0 ? _normalizedConfig_dev_hmr : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.hot,
+      setupMiddlewares: (_normalizedConfig_dev_setupMiddlewares = normalizedConfig.dev.setupMiddlewares) !== null && _normalizedConfig_dev_setupMiddlewares !== void 0 ? _normalizedConfig_dev_setupMiddlewares : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.setupMiddlewares
     },
     appContext: {
       appDirectory,

package/dist/cjs/commands/index.js

@@ -84,8 +84,8 @@ const buildCommand = async (program, api) => {
 };
 const serverCommand = (program, api) => {
   program.command("serve").usage("[options]").description(import_locale.i18n.t(import_locale.localeKeys.command.serve.describe)).option("--api-only", import_locale.i18n.t(import_locale.localeKeys.command.dev.apiOnly)).option("-c --config <config>", import_locale.i18n.t(import_locale.localeKeys.command.shared.config)).action(async () => {
-    const { start } = await import("./serve.js");
-    await start(api);
+    const { serve } = await import("./serve.js");
+    await serve(api);
   });
 };
 const deployCommand = (program, api) => {

package/dist/cjs/commands/serve.js

@@ -28,7 +28,7 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serve_exports = {};
 __export(serve_exports, {
-  start: () => start
+  serve: () => serve
 });
 module.exports = __toCommonJS(serve_exports);
 var import_path = __toESM(require("path"));
@@ -36,7 +36,7 @@ var import_prod_server = require("@modern-js/prod-server");
 var import_utils = require("@modern-js/utils");
 var import_loadPlugins = require("../utils/loadPlugins");
 var import_printInstructions = require("../utils/printInstructions");
-const start = async (api) => {
+const serve = async (api, serverOptions) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.getAppContext();
   const userConfig = api.getNormalizedConfig();
@@ -52,7 +52,7 @@ const start = async (api) => {
   const meta = (0, import_utils.getMeta)(metaName);
   const serverConfigPath = import_path.default.resolve(distDirectory, import_utils.SERVER_DIR, `${meta}.server`);
   const pluginInstances = await (0, import_loadPlugins.loadServerPlugins)(api, appDirectory, metaName);
-  const app = await (0, import_prod_server.createProdServer)({
+  const app = await ((serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.launcher) || import_prod_server.createProdServer)({
     metaName,
     pwd: distDirectory,
     config: {
@@ -83,5 +83,5 @@ const start = async (api) => {
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  start
+  serve
 });

package/dist/cjs/index.js

@@ -36,7 +36,8 @@ __export(src_exports, {
   dev: () => import_dev.dev,
   generateWatchFiles: () => import_generateWatchFiles2.generateWatchFiles,
   initAppContext: () => import_initAppContext.initAppContext,
-  mergeConfig: () => import_core.mergeConfig
+  mergeConfig: () => import_core.mergeConfig,
+  serve: () => import_serve.serve
 });
 module.exports = __toCommonJS(src_exports);
 var import_path = __toESM(require("path"));
@@ -59,6 +60,7 @@ __reExport(src_exports, require("./defineConfig"), module.exports);
 var import_defineConfig = require("./defineConfig");
 var import_core = require("@modern-js/core");
 var import_dev = require("./commands/dev");
+var import_serve = require("./commands/serve");
 var import_generateWatchFiles2 = require("./utils/generateWatchFiles");
 __reExport(src_exports, require("./types"), module.exports);
 const appTools = (options = {
@@ -99,7 +101,6 @@ const appTools = (options = {
     checkEntryPoint: (0, import_plugin_v2.createAsyncHook)(),
     modifyEntrypoints: (0, import_plugin_v2.createAsyncHook)(),
     modifyFileSystemRoutes: (0, import_plugin_v2.createAsyncHook)(),
-    modifyServerRoutes: (0, import_plugin_v2.createAsyncHook)(),
     generateEntryCode: (0, import_plugin_v2.createAsyncHook)(),
     onBeforeGenerateRoutes: (0, import_plugin_v2.createAsyncHook)(),
     onBeforePrintInstructions: (0, import_plugin_v2.createAsyncHook)(),
@@ -195,6 +196,7 @@ var src_default = appTools;
   generateWatchFiles,
   initAppContext,
   mergeConfig,
+  serve,
   ...require("./defineConfig"),
   ...require("./types")
 });

package/dist/cjs/plugins/analyze/getFileSystemEntry.js

@@ -79,7 +79,7 @@ const scanDir = async (hooks, dirs, enableCustomEntry) => {
         entryName,
         isMainEntry: false,
         entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
-        customServerEntry,
+        customServerEntry: enableCustomEntry ? customServerEntry : false,
         absoluteEntryDir: import_path.default.resolve(dir),
         isAutoMount: true,
         customBootstrap,
@@ -91,7 +91,7 @@ const scanDir = async (hooks, dirs, enableCustomEntry) => {
         entryName,
         isMainEntry: false,
         entry: customEntryFile,
-        customServerEntry,
+        customServerEntry: enableCustomEntry ? customServerEntry : false,
         absoluteEntryDir: import_path.default.resolve(dir),
         isAutoMount: false,
         customEntry: Boolean(customEntryFile)

package/dist/cjs/plugins/analyze/getServerRoutes.js

@@ -103,7 +103,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -113,16 +113,18 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
+    const isRSC = !!rsc;
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
       entryPath: (0, import_utils.removeLeadingSlash)(import_path.default.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,
-      isStream,
+      isStream: isStream || isRSC,
       isSSR,
+      isRSC,
       responseHeaders: resHeaders,
       worker: isWorker ? `${import_utils.SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
-      bundle: isSSR ? `${import_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
+      bundle: isSSR || isRSC ? `${import_utils.SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
     };
     if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
       const routeOptions = (0, import_utils.isPlainObject)(routes[entryName]) ? routes[entryName] : {

package/dist/esm/builder/generator/createBuilderProviderConfig.js

@@ -23,6 +23,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
     dev: _object_spread_props(_object_spread({}, resolveConfig.dev), {
       port: appContext.port
     }),
+    server: resolveConfig.server,
     html: htmlConfig,
     output: _object_spread_props(_object_spread({}, resolveConfig.output), {
       // We need to do this in the app-tools prepare hook because some files will be generated into the dist directory in the analyze process

package/dist/esm/builder/generator/getBuilderEnvironments.js

@@ -1,5 +1,5 @@
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
-import { isProd, isSSR, isServiceWorker, isUseSSRBundle } from "@modern-js/utils";
+import { isProd, isSSR, isServiceWorker, isUseRsc, isUseSSRBundle } from "@modern-js/utils";
 function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
   var _tempBuilderConfig_output;
   var entries = {};
@@ -57,7 +57,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
     environments.web.output.copy = tempBuilderConfig.output.copy;
     delete tempBuilderConfig.output.copy;
   }
-  var useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+  var useNodeTarget = isUseRsc(normalizedConfig) || (isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig));
   if (useNodeTarget) {
     environments.node = {
       output: {

package/dist/esm/builder/generator/index.js

@@ -22,6 +22,8 @@ function _generateBuilder() {
             4,
             createUniBuilder({
               cwd: appContext.appDirectory,
+              rscClientRuntimePath: "@".concat(appContext.metaName, "/runtime/rsc/client"),
+              rscServerRuntimePath: "@".concat(appContext.metaName, "/runtime/rsc/server"),
               frameworkConfigPath: appContext.configFile || void 0,
               bundlerType,
               config: builderConfig

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

@@ -170,7 +170,7 @@ function applyFilterEntriesBySSRConfig(param) {
   }
   var _ref = serverConfig || {}, ssr = _ref.ssr, ssrByEntries = _ref.ssrByEntries;
   entryNames.forEach(function(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]))) {
+    if (!(serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.rsc) && !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/commands/dev.js

@@ -14,7 +14,7 @@ import { registerCompiler } from "../utils/register";
 import { generateRoutes } from "../utils/routes";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options, devServerOptions) {
-    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hooks, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, serverOptions, host, server, _ref2, server1, afterListen;
+    var _normalizedConfig_source, _normalizedConfig_tools, _normalizedConfig_dev, normalizedConfig, appContext, hooks, _normalizedConfig_source1, registerEsm, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, meta, serverConfigPath, pluginInstances, toolsDevServerConfig, _normalizedConfig_dev_host, _normalizedConfig_dev_https, _normalizedConfig_dev_hmr, _normalizedConfig_dev_setupMiddlewares, serverOptions, host, server, _ref2, server1, afterListen;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -93,13 +93,19 @@ var dev = function() {
           ];
         case 8:
           pluginInstances = _state.sent();
+          toolsDevServerConfig = (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer;
           serverOptions = _object_spread({
             metaName,
-            dev: _object_spread({
+            dev: _object_spread_props(_object_spread({}, toolsDevServerConfig), {
+              devMiddleware: {
+                writeToDisk: normalizedConfig.dev.writeToDisk
+              },
               port,
-              https: normalizedConfig.dev.https,
-              host: normalizedConfig.dev.host
-            }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
+              host: (_normalizedConfig_dev_host = normalizedConfig.dev.host) !== null && _normalizedConfig_dev_host !== void 0 ? _normalizedConfig_dev_host : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.host,
+              https: (_normalizedConfig_dev_https = normalizedConfig.dev.https) !== null && _normalizedConfig_dev_https !== void 0 ? _normalizedConfig_dev_https : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.https,
+              hot: (_normalizedConfig_dev_hmr = normalizedConfig.dev.hmr) !== null && _normalizedConfig_dev_hmr !== void 0 ? _normalizedConfig_dev_hmr : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.hot,
+              setupMiddlewares: (_normalizedConfig_dev_setupMiddlewares = normalizedConfig.dev.setupMiddlewares) !== null && _normalizedConfig_dev_setupMiddlewares !== void 0 ? _normalizedConfig_dev_setupMiddlewares : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.setupMiddlewares
+            }),
             appContext: {
               appDirectory,
               internalDirectory: appContext.internalDirectory,

package/dist/esm/commands/index.js

@@ -249,7 +249,7 @@ var buildCommand = function() {
 }();
 var serverCommand = function(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(/* @__PURE__ */ _async_to_generator(function() {
-    var start;
+    var serve;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -258,10 +258,10 @@ var serverCommand = function(program, api) {
             import("./serve.js")
           ];
         case 1:
-          start = _state.sent().start;
+          serve = _state.sent().serve;
           return [
             4,
-            start(api)
+            serve(api)
           ];
         case 2:
           _state.sent();

package/dist/esm/commands/serve.js

@@ -7,8 +7,8 @@ import { createProdServer } from "@modern-js/prod-server";
 import { SERVER_DIR, getMeta, getTargetDir, isApiOnly, logger } from "@modern-js/utils";
 import { loadServerPlugins } from "../utils/loadPlugins";
 import { printInstructions } from "../utils/printInstructions";
-var start = function() {
-  var _ref = _async_to_generator(function(api) {
+var serve = function() {
+  var _ref = _async_to_generator(function(api, serverOptions) {
     var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hooks, distDirectory, appDirectory, internalDirectory, port, metaName, serverRoutes, serverConfigFile, isCrossProjectServer, apiOnly, runMode, meta, serverConfigPath, pluginInstances, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -38,7 +38,7 @@ var start = function() {
           pluginInstances = _state.sent();
           return [
             4,
-            createProdServer({
+            ((serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.launcher) || createProdServer)({
               metaName,
               pwd: distDirectory,
               config: _object_spread_props(_object_spread({}, userConfig), {
@@ -86,10 +86,10 @@ var start = function() {
       }
     });
   });
-  return function start2(api) {
+  return function serve2(api, serverOptions) {
     return _ref.apply(this, arguments);
   };
 }();
 export {
-  start
+  serve
 };

package/dist/esm/index.js

@@ -58,7 +58,6 @@ var appTools = function() {
       checkEntryPoint: createAsyncHook(),
       modifyEntrypoints: createAsyncHook(),
       modifyFileSystemRoutes: createAsyncHook(),
-      modifyServerRoutes: createAsyncHook(),
       generateEntryCode: createAsyncHook(),
       onBeforeGenerateRoutes: createAsyncHook(),
       onBeforePrintInstructions: createAsyncHook(),
@@ -247,6 +246,7 @@ var appTools = function() {
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
 import { dev } from "./commands/dev";
+import { serve } from "./commands/serve";
 import { generateWatchFiles as generateWatchFiles2 } from "./utils/generateWatchFiles";
 export * from "./types";
 var src_default = appTools;
@@ -258,5 +258,6 @@ export {
   dev,
   generateWatchFiles2 as generateWatchFiles,
   initAppContext,
-  mergeConfig
+  mergeConfig,
+  serve
 };

package/dist/esm/plugins/analyze/getFileSystemEntry.js

@@ -107,7 +107,7 @@ var scanDir = function() {
                             entryName,
                             isMainEntry: false,
                             entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
-                            customServerEntry,
+                            customServerEntry: enableCustomEntry ? customServerEntry : false,
                             absoluteEntryDir: path.resolve(dir),
                             isAutoMount: true,
                             customBootstrap,
@@ -122,7 +122,7 @@ var scanDir = function() {
                             entryName,
                             isMainEntry: false,
                             entry: customEntryFile,
-                            customServerEntry,
+                            customServerEntry: enableCustomEntry ? customServerEntry : false,
                             absoluteEntryDir: path.resolve(dir),
                             isAutoMount: false,
                             customEntry: Boolean(customEntryFile)

package/dist/esm/plugins/analyze/getServerRoutes.js

@@ -70,7 +70,7 @@ var applyRouteOptions = function(original, routeOptions) {
 };
 var collectHtmlRoutes = function(entrypoints, appContext, config) {
   var _deploy_worker;
-  var mainEntryName = config.source.mainEntryName, disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, deploy = config.deploy;
+  var mainEntryName = config.source.mainEntryName, disableHtmlFolder = config.html.disableHtmlFolder, _config_output = config.output, tmp = _config_output.distPath, _ref = tmp === void 0 ? {} : tmp, htmlPath = _ref.html, _config_server = config.server, baseUrl = _config_server.baseUrl, routes = _config_server.routes, ssr = _config_server.ssr, ssrByEntries = _config_server.ssrByEntries, rsc = _config_server.rsc, deploy = config.deploy;
   var packageName = appContext.packageName;
   var workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   var htmlRoutes = entrypoints.reduce(function(previous, param) {
@@ -81,16 +81,18 @@ var collectHtmlRoutes = function(entrypoints, appContext, config) {
     var isWorker = Boolean(workerSSR);
     var isStream = (typeof entryOptions === "undefined" ? "undefined" : _type_of(entryOptions)) === "object" && entryOptions.mode === "stream";
     var resHeaders = ((routes === null || routes === void 0 ? void 0 : routes[entryName]) || {}).resHeaders;
+    var isRSC = !!rsc;
     var route = {
       urlPath: "/".concat(isMain ? "" : entryName),
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize("".concat(htmlPath, "/").concat(entryName).concat(disableHtmlFolder ? ".html" : "/index.html"))),
       isSPA: true,
-      isStream,
+      isStream: isStream || isRSC,
       isSSR,
+      isRSC,
       responseHeaders: resHeaders,
       worker: isWorker ? "".concat(SERVER_WORKER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0,
-      bundle: isSSR ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
+      bundle: isSSR || isRSC ? "".concat(SERVER_BUNDLE_DIRECTORY, "/").concat(entryName, ".js") : void 0
     };
     if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
       var routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {

package/dist/esm-node/builder/generator/createBuilderProviderConfig.js

@@ -29,6 +29,7 @@ function createBuilderProviderConfig(resolveConfig, appContext) {
       ...resolveConfig.dev,
       port: appContext.port
     },
+    server: resolveConfig.server,
     html: htmlConfig,
     output: {
       ...resolveConfig.output,

package/dist/esm-node/builder/generator/getBuilderEnvironments.js

@@ -1,5 +1,5 @@
 import { SERVICE_WORKER_ENVIRONMENT_NAME } from "@modern-js/uni-builder";
-import { isProd, isSSR, isServiceWorker, isUseSSRBundle } from "@modern-js/utils";
+import { isProd, isSSR, isServiceWorker, isUseRsc, isUseSSRBundle } from "@modern-js/utils";
 function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig) {
   var _tempBuilderConfig_output;
   const entries = {};
@@ -36,7 +36,7 @@ function getBuilderEnvironments(normalizedConfig, appContext, tempBuilderConfig)
     environments.web.output.copy = tempBuilderConfig.output.copy;
     delete tempBuilderConfig.output.copy;
   }
-  const useNodeTarget = isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig);
+  const useNodeTarget = isUseRsc(normalizedConfig) || (isProd() ? isUseSSRBundle(normalizedConfig) : isSSR(normalizedConfig));
   if (useNodeTarget) {
     environments.node = {
       output: {

package/dist/esm-node/builder/generator/index.js

@@ -10,6 +10,8 @@ async function generateBuilder(options, bundlerType) {
   builderConfig.environments = builderConfig.environments ? mergeRsbuildConfig(environments, builderConfig.environments) : environments;
   const builder = await createUniBuilder({
     cwd: appContext.appDirectory,
+    rscClientRuntimePath: `@${appContext.metaName}/runtime/rsc/client`,
+    rscServerRuntimePath: `@${appContext.metaName}/runtime/rsc/server`,
     frameworkConfigPath: appContext.configFile || void 0,
     bundlerType,
     config: builderConfig

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

@@ -117,7 +117,7 @@ function applyFilterEntriesBySSRConfig({ isProd, chain, appNormalizedConfig }) {
   }
   const { ssr, ssrByEntries } = serverConfig || {};
   entryNames.forEach((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]))) {
+    if (!(serverConfig === null || serverConfig === void 0 ? void 0 : serverConfig.rsc) && !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/dev.js

@@ -47,13 +47,22 @@ const dev = async (api, options, devServerOptions) => {
   }
   await generateRoutes(appContext);
   const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
+  const toolsDevServerConfig = (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer;
+  var _normalizedConfig_dev_host, _normalizedConfig_dev_https, _normalizedConfig_dev_hmr, _normalizedConfig_dev_setupMiddlewares;
   const serverOptions = {
     metaName,
     dev: {
+      // [`normalizedConfig.tools.devServer`](https://modernjs.dev/en/configure/app/tools/dev-server.html) already deprecated, we should using `normalizedConfig.dev` instead firstly.
+      // Oterwise, the `normalizedConfig.dev` can't be apply correctly.
+      ...toolsDevServerConfig,
+      devMiddleware: {
+        writeToDisk: normalizedConfig.dev.writeToDisk
+      },
       port,
-      https: normalizedConfig.dev.https,
-      host: normalizedConfig.dev.host,
-      ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
+      host: (_normalizedConfig_dev_host = normalizedConfig.dev.host) !== null && _normalizedConfig_dev_host !== void 0 ? _normalizedConfig_dev_host : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.host,
+      https: (_normalizedConfig_dev_https = normalizedConfig.dev.https) !== null && _normalizedConfig_dev_https !== void 0 ? _normalizedConfig_dev_https : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.https,
+      hot: (_normalizedConfig_dev_hmr = normalizedConfig.dev.hmr) !== null && _normalizedConfig_dev_hmr !== void 0 ? _normalizedConfig_dev_hmr : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.hot,
+      setupMiddlewares: (_normalizedConfig_dev_setupMiddlewares = normalizedConfig.dev.setupMiddlewares) !== null && _normalizedConfig_dev_setupMiddlewares !== void 0 ? _normalizedConfig_dev_setupMiddlewares : toolsDevServerConfig === null || toolsDevServerConfig === void 0 ? void 0 : toolsDevServerConfig.setupMiddlewares
     },
     appContext: {
       appDirectory,

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

@@ -45,8 +45,8 @@ const buildCommand = async (program, api) => {
 };
 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.js");
-    await start(api);
+    const { serve } = await import("./serve.js");
+    await serve(api);
   });
 };
 const deployCommand = (program, api) => {

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

@@ -3,7 +3,7 @@ import { createProdServer } from "@modern-js/prod-server";
 import { SERVER_DIR, getMeta, getTargetDir, isApiOnly, logger } from "@modern-js/utils";
 import { loadServerPlugins } from "../utils/loadPlugins";
 import { printInstructions } from "../utils/printInstructions";
-const start = async (api) => {
+const serve = async (api, serverOptions) => {
   var _userConfig_source, _userConfig_output_distPath;
   const appContext = api.getAppContext();
   const userConfig = api.getNormalizedConfig();
@@ -19,7 +19,7 @@ const start = async (api) => {
   const meta = getMeta(metaName);
   const serverConfigPath = path.resolve(distDirectory, SERVER_DIR, `${meta}.server`);
   const pluginInstances = await loadServerPlugins(api, appDirectory, metaName);
-  const app = await createProdServer({
+  const app = await ((serverOptions === null || serverOptions === void 0 ? void 0 : serverOptions.launcher) || createProdServer)({
     metaName,
     pwd: distDirectory,
     config: {
@@ -49,5 +49,5 @@ const start = async (api) => {
   });
 };
 export {
-  start
+  serve
 };

package/dist/esm-node/index.js

@@ -53,7 +53,6 @@ const appTools = (options = {
     checkEntryPoint: createAsyncHook(),
     modifyEntrypoints: createAsyncHook(),
     modifyFileSystemRoutes: createAsyncHook(),
-    modifyServerRoutes: createAsyncHook(),
     generateEntryCode: createAsyncHook(),
     onBeforeGenerateRoutes: createAsyncHook(),
     onBeforePrintInstructions: createAsyncHook(),
@@ -142,6 +141,7 @@ const appTools = (options = {
 import { defineConfig, defineLegacyConfig } from "./defineConfig";
 import { mergeConfig } from "@modern-js/core";
 import { dev } from "./commands/dev";
+import { serve } from "./commands/serve";
 import { generateWatchFiles as generateWatchFiles2 } from "./utils/generateWatchFiles";
 export * from "./types";
 var src_default = appTools;
@@ -153,5 +153,6 @@ export {
   dev,
   generateWatchFiles2 as generateWatchFiles,
   initAppContext,
-  mergeConfig
+  mergeConfig,
+  serve
 };

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

@@ -46,7 +46,7 @@ const scanDir = async (hooks, dirs, enableCustomEntry) => {
         entryName,
         isMainEntry: false,
         entry: enableCustomEntry ? customEntryFile || entryFile : entryFile,
-        customServerEntry,
+        customServerEntry: enableCustomEntry ? customServerEntry : false,
         absoluteEntryDir: path.resolve(dir),
         isAutoMount: true,
         customBootstrap,
@@ -58,7 +58,7 @@ const scanDir = async (hooks, dirs, enableCustomEntry) => {
         entryName,
         isMainEntry: false,
         entry: customEntryFile,
-        customServerEntry,
+        customServerEntry: enableCustomEntry ? customServerEntry : false,
         absoluteEntryDir: path.resolve(dir),
         isAutoMount: false,
         customEntry: Boolean(customEntryFile)

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

@@ -69,7 +69,7 @@ const applyRouteOptions = (original, routeOptions) => {
 };
 const collectHtmlRoutes = (entrypoints, appContext, config) => {
   var _deploy_worker;
-  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries }, deploy } = config;
+  const { source: { mainEntryName }, html: { disableHtmlFolder }, output: { distPath: { html: htmlPath } = {} }, server: { baseUrl, routes, ssr, ssrByEntries, rsc }, deploy } = config;
   const { packageName } = appContext;
   const workerSSR = deploy === null || deploy === void 0 ? void 0 : (_deploy_worker = deploy.worker) === null || _deploy_worker === void 0 ? void 0 : _deploy_worker.ssr;
   let htmlRoutes = entrypoints.reduce((previous, { entryName }) => {
@@ -79,16 +79,18 @@ const collectHtmlRoutes = (entrypoints, appContext, config) => {
     const isWorker = Boolean(workerSSR);
     const isStream = typeof entryOptions === "object" && entryOptions.mode === "stream";
     const { resHeaders } = (routes === null || routes === void 0 ? void 0 : routes[entryName]) || {};
+    const isRSC = !!rsc;
     let route = {
       urlPath: `/${isMain ? "" : entryName}`,
       entryName,
       entryPath: removeLeadingSlash(path.posix.normalize(`${htmlPath}/${entryName}${disableHtmlFolder ? ".html" : "/index.html"}`)),
       isSPA: true,
-      isStream,
+      isStream: isStream || isRSC,
       isSSR,
+      isRSC,
       responseHeaders: resHeaders,
       worker: isWorker ? `${SERVER_WORKER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0,
-      bundle: isSSR ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
+      bundle: isSSR || isRSC ? `${SERVER_BUNDLE_DIRECTORY}/${entryName}.js` : void 0
     };
     if (routes === null || routes === void 0 ? void 0 : routes.hasOwnProperty(entryName)) {
       const routeOptions = isPlainObject(routes[entryName]) ? routes[entryName] : {

package/dist/types/commands/dev.d.ts

@@ -2,7 +2,8 @@ import type { CLIPluginAPI } from '@modern-js/plugin-v2';
 import { type ApplyPlugins } from '@modern-js/server';
 import type { AppTools } from '../types';
 import type { DevOptions } from '../utils/types';
-export interface ExtraServerOptions {
+interface ExtraServerOptions {
     applyPlugins?: ApplyPlugins;
 }
 export declare const dev: (api: CLIPluginAPI<AppTools<'shared'>>, options: DevOptions, devServerOptions?: ExtraServerOptions) => Promise<void>;
+export {};

package/dist/types/commands/serve.d.ts

@@ -1,3 +1,8 @@
 import type { CLIPluginAPI } from '@modern-js/plugin-v2';
+import { createProdServer } from '@modern-js/prod-server';
 import type { AppTools } from '../types';
-export declare const start: (api: CLIPluginAPI<AppTools<'shared'>>) => Promise<void>;
+type ExtraServerOptions = {
+    launcher?: typeof createProdServer;
+};
+export declare const serve: (api: CLIPluginAPI<AppTools<'shared'>>, serverOptions?: ExtraServerOptions) => Promise<void>;
+export {};

package/dist/types/index.d.ts

@@ -6,6 +6,7 @@ export { defineConfig, defineLegacyConfig } from './defineConfig';
 export { mergeConfig } from '@modern-js/core';
 export type { RuntimeUserConfig } from './types/config';
 export { dev } from './commands/dev';
+export { serve } from './commands/serve';
 export type { DevOptions } from './utils/types';
 export { generateWatchFiles } from './utils/generateWatchFiles';
 export * from './types';

package/dist/types/types/new.d.ts

@@ -18,9 +18,6 @@ export type ModifyFileSystemRoutesFn = TransformFunction<{
     entrypoint: Entrypoint;
     routes: RouteLegacy[] | (NestedRouteForCli | PageRoute)[];
 }>;
-export type ModifyServerRoutesFn = TransformFunction<{
-    routes: ServerRoute[];
-}>;
 export type DeplpoyFn = () => Promise<void> | void;
 export type GenerateEntryCodeFn = (params: {
     entrypoints: Entrypoint[];
@@ -41,7 +38,6 @@ export interface AppToolsExtendAPI<B extends Bundler = 'webpack'> {
     checkEntryPoint: PluginHookTap<CheckEntryPointFn>;
     modifyEntrypoints: PluginHookTap<ModifyEntrypointsFn>;
     modifyFileSystemRoutes: PluginHookTap<ModifyFileSystemRoutesFn>;
-    modifyServerRoutes: PluginHookTap<ModifyServerRoutesFn>;
     generateEntryCode: PluginHookTap<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: PluginHookTap<BeforeGenerateRoutesFn>;
     /**
@@ -83,7 +79,6 @@ export interface AppToolsExtendHooks extends Record<string, PluginHook<(...args:
     checkEntryPoint: AsyncHook<CheckEntryPointFn>;
     modifyEntrypoints: AsyncHook<ModifyEntrypointsFn>;
     modifyFileSystemRoutes: AsyncHook<ModifyFileSystemRoutesFn>;
-    modifyServerRoutes: AsyncHook<ModifyServerRoutesFn>;
     generateEntryCode: AsyncHook<GenerateEntryCodeFn>;
     onBeforeGenerateRoutes: AsyncHook<BeforeGenerateRoutesFn>;
     /**

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.64.1",
+  "version": "2.64.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -80,32 +80,31 @@
     "@babel/parser": "^7.22.15",
     "@babel/traverse": "^7.23.2",
     "@babel/types": "^7.26.0",
-    "@rsbuild/core": "1.1.13",
-    "@rsbuild/plugin-node-polyfill": "1.2.0",
+    "@rsbuild/core": "1.2.7",
+    "@rsbuild/plugin-node-polyfill": "1.3.0",
     "@swc/helpers": "0.5.13",
-    "@vercel/nft": "^0.29.0",
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "esbuild-register": "^3.5.0",
     "flatted": "^3.2.9",
     "mlly": "^1.6.1",
-    "pkg-types": "^1.1.0",
     "ndepe": "0.1.5",
+    "pkg-types": "^1.1.0",
     "std-env": "^3.7.0",
-    "@modern-js/node-bundle-require": "2.64.1",
-    "@modern-js/core": "2.64.1",
-    "@modern-js/plugin": "2.64.1",
-    "@modern-js/plugin-data-loader": "2.64.1",
-    "@modern-js/plugin-v2": "2.64.1",
-    "@modern-js/plugin-i18n": "2.64.1",
-    "@modern-js/rsbuild-plugin-esbuild": "2.64.1",
-    "@modern-js/prod-server": "2.64.1",
-    "@modern-js/server": "2.64.1",
-    "@modern-js/server-core": "2.64.1",
-    "@modern-js/server-utils": "2.64.1",
-    "@modern-js/types": "2.64.1",
-    "@modern-js/uni-builder": "2.64.1",
-    "@modern-js/utils": "2.64.1"
+    "@modern-js/core": "2.64.2",
+    "@modern-js/node-bundle-require": "2.64.2",
+    "@modern-js/plugin-data-loader": "2.64.2",
+    "@modern-js/plugin": "2.64.2",
+    "@modern-js/plugin-i18n": "2.64.2",
+    "@modern-js/plugin-v2": "2.64.2",
+    "@modern-js/rsbuild-plugin-esbuild": "2.64.2",
+    "@modern-js/prod-server": "2.64.2",
+    "@modern-js/server": "2.64.2",
+    "@modern-js/server-core": "2.64.2",
+    "@modern-js/server-utils": "2.64.2",
+    "@modern-js/types": "2.64.2",
+    "@modern-js/uni-builder": "2.64.2",
+    "@modern-js/utils": "2.64.2"
   },
   "devDependencies": {
     "@rsbuild/plugin-webpack-swc": "1.0.9",
@@ -117,8 +116,8 @@
     "tsconfig-paths": "^4.2.0",
     "typescript": "^5",
     "webpack": "^5.97.1",
-    "@scripts/build": "2.64.1",
-    "@scripts/jest-config": "2.64.1"
+    "@scripts/build": "2.64.2",
+    "@scripts/jest-config": "2.64.2"
   },
   "peerDependencies": {
     "ts-node": "^10.7.0",