@modern-js/app-tools 2.48.5-alpha.0 → 2.48.5

package/dist/cjs/commands/dev.js

@@ -23,8 +23,6 @@ __export(dev_exports, {
 module.exports = __toCommonJS(dev_exports);
 var import_core = require("@modern-js/core");
 var import_utils = require("@modern-js/utils");
-var import_server = require("@modern-js/server");
-var import_prod_server = require("@modern-js/prod-server");
 var import_printInstructions = require("../utils/printInstructions");
 var import_createServer = require("../utils/createServer");
 var import_routes = require("../utils/routes");
@@ -43,7 +41,7 @@ const dev = async (api, options, devServerOptions = {}) => {
     cliOptions: options
   };
   import_core.ResolvedConfigContext.set(normalizedConfig);
-  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName } = appContext;
   await (0, import_config.buildServerConfig)({
     appDirectory,
     distDirectory,
@@ -57,7 +55,6 @@ const dev = async (api, options, devServerOptions = {}) => {
   await (0, import_routes.generateRoutes)(appContext);
   const serverInternalPlugins = await (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
   const serverOptions = {
-    metaName,
     dev: {
       port,
       https: normalizedConfig.dev.https,
@@ -65,32 +62,37 @@ const dev = async (api, options, devServerOptions = {}) => {
       ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
     },
     appContext: {
-      appDirectory,
+      metaName,
+      appDirectory: appContext.appDirectory,
+      sharedDirectory: appContext.sharedDirectory,
       apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory,
-      sharedDirectory: appContext.sharedDirectory
+      lambdaDirectory: appContext.lambdaDirectory
     },
-    routes: serverRoutes,
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: serverInternalPlugins,
+    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
     ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;
-    const app = await (0, import_server.createDevServer)(serverOptions, import_prod_server.initProdMiddlewares);
+    const app = await (0, import_createServer.createServer)({
+      ...serverOptions,
+      compiler: null
+    });
     const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || import_utils.DEFAULT_DEV_HOST;
     app.listen({
       port,
       host
-    }, () => {
+    }, async (err) => {
+      if (err) {
+        throw err;
+      }
       (0, import_printInstructions.printInstructions)(hookRunners, appContext, normalizedConfig);
     });
   } else {
     const { server } = await appContext.builder.startDevServer({
-      serverOptions,
-      initProdMiddlewares: import_prod_server.initProdMiddlewares
+      serverOptions
     });
     (0, import_createServer.setServer)(server);
   }

package/dist/cjs/commands/serve.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,6 +17,14 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var serve_exports = {};
 __export(serve_exports, {
@@ -22,25 +32,21 @@ __export(serve_exports, {
 });
 module.exports = __toCommonJS(serve_exports);
 var import_utils = require("@modern-js/utils");
-var import_prod_server = require("@modern-js/prod-server");
+var import_prod_server = __toESM(require("@modern-js/prod-server"));
 var import_printInstructions = require("../utils/printInstructions");
+var import_createServer = require("../utils/createServer");
 var import_getServerInternalPlugins = require("../utils/getServerInternalPlugins");
 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 { appDirectory, port, serverConfigFile, metaName } = appContext;
   import_utils.logger.info(`Starting production server...`);
   const apiOnly = await (0, import_utils.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 (0, import_getServerInternalPlugins.getServerInternalPlugins)(api);
-  const app = await (0, import_prod_server.createProdServer)({
-    metaName,
-    pwd: distDirectory,
+  const app = await (0, import_prod_server.default)({
+    pwd: appDirectory,
     config: {
       ...userConfig,
       dev: userConfig.dev,
@@ -49,18 +55,20 @@ const start = async (api) => {
         ...userConfig.output || {}
       }
     },
-    routes: serverRoutes,
     appContext: {
-      appDirectory,
+      metaName,
       sharedDirectory: (0, import_utils.getTargetDir)(appContext.sharedDirectory, appContext.appDirectory, appContext.distDirectory),
       apiDirectory: (0, import_utils.getTargetDir)(appContext.apiDirectory, appContext.appDirectory, appContext.distDirectory),
       lambdaDirectory: (0, import_utils.getTargetDir)(appContext.lambdaDirectory, appContext.appDirectory, appContext.distDirectory)
     },
     serverConfigFile,
-    internalPlugins: serverInternalPlugins,
-    runMode
+    internalPlugins: (0, import_createServer.injectDataLoaderPlugin)(serverInternalPlugins),
+    apiOnly
   });
-  app.listen(port, async () => {
+  app.listen(port, async (err) => {
+    if (err) {
+      throw err;
+    }
     await (0, import_printInstructions.printInstructions)(hookRunners, appContext, userConfig);
   });
 };

package/dist/cjs/utils/createServer.js

@@ -1,7 +1,9 @@
 "use strict";
+var __create = Object.create;
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __export = (target, all) => {
   for (var name in all)
@@ -15,17 +17,25 @@ var __copyProps = (to, from, except, desc) => {
   }
   return to;
 };
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 var createServer_exports = {};
 __export(createServer_exports, {
   closeServer: () => closeServer,
   createServer: () => createServer,
   getServer: () => getServer,
+  injectDataLoaderPlugin: () => injectDataLoaderPlugin,
   setServer: () => setServer
 });
 module.exports = __toCommonJS(createServer_exports);
 var import_server = require("@modern-js/server");
-var import_prod_server = require("@modern-js/prod-server");
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {
@@ -33,21 +43,33 @@ const setServer = (newServer) => {
 };
 const closeServer = async () => {
   if (server) {
-    server.close();
+    await server.close();
     server = null;
   }
 };
 const createServer = async (options) => {
   if (server) {
-    server.close();
+    await server.close();
   }
-  server = await (0, import_server.createDevServer)(options, import_prod_server.initProdMiddlewares);
-  return server;
+  server = new import_server.Server(options);
+  const app = await server.init();
+  return app;
+};
+const injectDataLoaderPlugin = (internalPlugins) => {
+  const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
+  return {
+    ...internalPlugins,
+    "@modern-js/plugin-data-loader": {
+      path: DataLoaderPlugin,
+      forced: true
+    }
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   closeServer,
   createServer,
   getServer,
+  injectDataLoaderPlugin,
   setServer
 });

package/dist/cjs/utils/env.js

@@ -21,10 +21,10 @@ __export(env_exports, {
   getAutoInjectEnv: () => getAutoInjectEnv
 });
 module.exports = __toCommonJS(env_exports);
-var import_universal = require("@modern-js/utils/universal");
+var import_utils = require("@modern-js/utils");
 function getAutoInjectEnv(appContext) {
   const { metaName } = appContext;
-  const prefix = `${(0, import_universal.cutNameByHyphen)(metaName)}_`.toUpperCase();
+  const prefix = `${(0, import_utils.cutNameByHyphen)(metaName)}_`.toUpperCase();
   const envReg = new RegExp(`^${prefix}`);
   return Object.keys(process.env).reduce((prev, key) => {
     const value = process.env[key];

package/dist/esm/commands/dev.js

@@ -4,16 +4,14 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ResolvedConfigContext } from "@modern-js/core";
 import { DEFAULT_DEV_HOST } from "@modern-js/utils";
-import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { setServer } from "../utils/createServer";
+import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var dev = function() {
   var _ref = _async_to_generator(function(api, options) {
-    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
+    var devServerOptions, _normalizedConfig_tools, normalizedConfig, appContext, hookRunners, appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverInternalPlugins, serverOptions, _normalizedConfig_dev, app, host, server;
     var _arguments = arguments;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
@@ -29,7 +27,7 @@ var dev = function() {
             cliOptions: options
           });
           ResolvedConfigContext.set(normalizedConfig);
-          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
+          appDirectory = appContext.appDirectory, distDirectory = appContext.distDirectory, port = appContext.port, apiOnly = appContext.apiOnly, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
           return [
             4,
             buildServerConfig({
@@ -63,23 +61,22 @@ var dev = function() {
         case 4:
           serverInternalPlugins = _state.sent();
           serverOptions = _object_spread({
-            metaName,
             dev: _object_spread({
               port,
               https: normalizedConfig.dev.https,
               host: normalizedConfig.dev.host
             }, (_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer),
             appContext: {
-              appDirectory,
+              metaName,
+              appDirectory: appContext.appDirectory,
+              sharedDirectory: appContext.sharedDirectory,
               apiDirectory: appContext.apiDirectory,
-              lambdaDirectory: appContext.lambdaDirectory,
-              sharedDirectory: appContext.sharedDirectory
+              lambdaDirectory: appContext.lambdaDirectory
             },
-            routes: serverRoutes,
             pwd: appDirectory,
             config: normalizedConfig,
             serverConfigFile,
-            internalPlugins: serverInternalPlugins
+            internalPlugins: injectDataLoaderPlugin(serverInternalPlugins)
           }, devServerOptions);
           if (!apiOnly)
             return [
@@ -88,7 +85,9 @@ var dev = function() {
             ];
           return [
             4,
-            createDevServer(serverOptions, initProdMiddlewares)
+            createServer(_object_spread_props(_object_spread({}, serverOptions), {
+              compiler: null
+            }))
           ];
         case 5:
           app = _state.sent();
@@ -97,8 +96,21 @@ var dev = function() {
             port,
             host
           }, function() {
-            printInstructions(hookRunners, appContext, normalizedConfig);
-          });
+            var _ref2 = _async_to_generator(function(err) {
+              return _ts_generator(this, function(_state2) {
+                if (err) {
+                  throw err;
+                }
+                printInstructions(hookRunners, appContext, normalizedConfig);
+                return [
+                  2
+                ];
+              });
+            });
+            return function(err) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
           return [
             3,
             8
@@ -107,8 +119,7 @@ var dev = function() {
           return [
             4,
             appContext.builder.startDevServer({
-              serverOptions,
-              initProdMiddlewares
+              serverOptions
             })
           ];
         case 7:

package/dist/esm/commands/serve.js

@@ -3,19 +3,20 @@ import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
-import { createProdServer } from "@modern-js/prod-server";
+import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 var start = function() {
   var _ref = _async_to_generator(function(api) {
-    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, distDirectory, appDirectory, port, serverConfigFile, metaName, serverRoutes, apiOnly, runMode, serverInternalPlugins, app;
+    var _userConfig_source, _userConfig_output_distPath, appContext, userConfig, hookRunners, appDirectory, port, serverConfigFile, metaName, apiOnly, serverInternalPlugins, app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           appContext = api.useAppContext();
           userConfig = api.useResolvedConfigContext();
           hookRunners = api.useHookRunners();
-          distDirectory = appContext.distDirectory, appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName, serverRoutes = appContext.serverRoutes;
+          appDirectory = appContext.appDirectory, port = appContext.port, serverConfigFile = appContext.serverConfigFile, metaName = appContext.metaName;
           logger.info("Starting production server...");
           return [
             4,
@@ -23,9 +24,6 @@ var start = function() {
           ];
         case 1:
           apiOnly = _state.sent();
-          if (apiOnly) {
-            runMode = "apiOnly";
-          }
           return [
             4,
             getServerInternalPlugins(api)
@@ -34,45 +32,51 @@ var start = function() {
           serverInternalPlugins = _state.sent();
           return [
             4,
-            createProdServer({
-              metaName,
-              pwd: distDirectory,
+            server({
+              pwd: appDirectory,
               config: _object_spread_props(_object_spread({}, userConfig), {
                 dev: userConfig.dev,
                 output: _object_spread({
                   path: (_userConfig_output_distPath = userConfig.output.distPath) === null || _userConfig_output_distPath === void 0 ? void 0 : _userConfig_output_distPath.root
                 }, userConfig.output || {})
               }),
-              routes: serverRoutes,
               appContext: {
-                appDirectory,
+                metaName,
                 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
+              internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
+              apiOnly
             })
           ];
         case 3:
           app = _state.sent();
-          app.listen(port, /* @__PURE__ */ _async_to_generator(function() {
-            return _ts_generator(this, function(_state2) {
-              switch (_state2.label) {
-                case 0:
-                  return [
-                    4,
-                    printInstructions(hookRunners, appContext, userConfig)
-                  ];
-                case 1:
-                  _state2.sent();
-                  return [
-                    2
-                  ];
-              }
+          app.listen(port, function() {
+            var _ref2 = _async_to_generator(function(err) {
+              return _ts_generator(this, function(_state2) {
+                switch (_state2.label) {
+                  case 0:
+                    if (err) {
+                      throw err;
+                    }
+                    return [
+                      4,
+                      printInstructions(hookRunners, appContext, userConfig)
+                    ];
+                  case 1:
+                    _state2.sent();
+                    return [
+                      2
+                    ];
+                }
+              });
             });
-          }));
+            return function(err) {
+              return _ref2.apply(this, arguments);
+            };
+          }());
           return [
             2
           ];

package/dist/esm/utils/createServer.js

@@ -1,7 +1,8 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
+import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-server";
+import { Server } from "@modern-js/server";
 var server = null;
 var getServer = function() {
   return server;
@@ -12,13 +13,26 @@ var setServer = function(newServer) {
 var closeServer = function() {
   var _ref = _async_to_generator(function() {
     return _ts_generator(this, function(_state) {
-      if (server) {
-        server.close();
-        server = null;
+      switch (_state.label) {
+        case 0:
+          if (!server)
+            return [
+              3,
+              2
+            ];
+          return [
+            4,
+            server.close()
+          ];
+        case 1:
+          _state.sent();
+          server = null;
+          _state.label = 2;
+        case 2:
+          return [
+            2
+          ];
       }
-      return [
-        2
-      ];
     });
   });
   return function closeServer2() {
@@ -27,21 +41,33 @@ var closeServer = function() {
 }();
 var createServer = function() {
   var _ref = _async_to_generator(function(options) {
+    var app;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          if (server) {
-            server.close();
-          }
+          if (!server)
+            return [
+              3,
+              2
+            ];
           return [
             4,
-            createDevServer(options, initProdMiddlewares)
+            server.close()
           ];
         case 1:
-          server = _state.sent();
+          _state.sent();
+          _state.label = 2;
+        case 2:
+          server = new Server(options);
+          return [
+            4,
+            server.init()
+          ];
+        case 3:
+          app = _state.sent();
           return [
             2,
-            server
+            app
           ];
       }
     });
@@ -50,9 +76,19 @@ var createServer = function() {
     return _ref.apply(this, arguments);
   };
 }();
+var injectDataLoaderPlugin = function(internalPlugins) {
+  var DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
+  return _object_spread_props(_object_spread({}, internalPlugins), {
+    "@modern-js/plugin-data-loader": {
+      path: DataLoaderPlugin,
+      forced: true
+    }
+  });
+};
 export {
   closeServer,
   createServer,
   getServer,
+  injectDataLoaderPlugin,
   setServer
 };

package/dist/esm/utils/env.js

@@ -1,4 +1,4 @@
-import { cutNameByHyphen } from "@modern-js/utils/universal";
+import { cutNameByHyphen } from "@modern-js/utils";
 function getAutoInjectEnv(appContext) {
   var metaName = appContext.metaName;
   var prefix = "".concat(cutNameByHyphen(metaName), "_").toUpperCase();

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

@@ -1,9 +1,7 @@
 import { ResolvedConfigContext } from "@modern-js/core";
 import { DEFAULT_DEV_HOST } from "@modern-js/utils";
-import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
-import { setServer } from "../utils/createServer";
+import { setServer, createServer, injectDataLoaderPlugin } from "../utils/createServer";
 import { generateRoutes } from "../utils/routes";
 import { buildServerConfig } from "../utils/config";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
@@ -20,7 +18,7 @@ const dev = async (api, options, devServerOptions = {}) => {
     cliOptions: options
   };
   ResolvedConfigContext.set(normalizedConfig);
-  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName, serverRoutes } = appContext;
+  const { appDirectory, distDirectory, port, apiOnly, serverConfigFile, metaName } = appContext;
   await buildServerConfig({
     appDirectory,
     distDirectory,
@@ -34,7 +32,6 @@ const dev = async (api, options, devServerOptions = {}) => {
   await generateRoutes(appContext);
   const serverInternalPlugins = await getServerInternalPlugins(api);
   const serverOptions = {
-    metaName,
     dev: {
       port,
       https: normalizedConfig.dev.https,
@@ -42,32 +39,37 @@ const dev = async (api, options, devServerOptions = {}) => {
       ...(_normalizedConfig_tools = normalizedConfig.tools) === null || _normalizedConfig_tools === void 0 ? void 0 : _normalizedConfig_tools.devServer
     },
     appContext: {
-      appDirectory,
+      metaName,
+      appDirectory: appContext.appDirectory,
+      sharedDirectory: appContext.sharedDirectory,
       apiDirectory: appContext.apiDirectory,
-      lambdaDirectory: appContext.lambdaDirectory,
-      sharedDirectory: appContext.sharedDirectory
+      lambdaDirectory: appContext.lambdaDirectory
     },
-    routes: serverRoutes,
     pwd: appDirectory,
     config: normalizedConfig,
     serverConfigFile,
-    internalPlugins: serverInternalPlugins,
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
     ...devServerOptions
   };
   if (apiOnly) {
     var _normalizedConfig_dev;
-    const app = await createDevServer(serverOptions, initProdMiddlewares);
+    const app = await createServer({
+      ...serverOptions,
+      compiler: null
+    });
     const host = ((_normalizedConfig_dev = normalizedConfig.dev) === null || _normalizedConfig_dev === void 0 ? void 0 : _normalizedConfig_dev.host) || DEFAULT_DEV_HOST;
     app.listen({
       port,
       host
-    }, () => {
+    }, async (err) => {
+      if (err) {
+        throw err;
+      }
       printInstructions(hookRunners, appContext, normalizedConfig);
     });
   } else {
     const { server } = await appContext.builder.startDevServer({
-      serverOptions,
-      initProdMiddlewares
+      serverOptions
     });
     setServer(server);
   }

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

@@ -1,23 +1,19 @@
 import { logger, isApiOnly, getTargetDir } from "@modern-js/utils";
-import { createProdServer } from "@modern-js/prod-server";
+import server from "@modern-js/prod-server";
 import { printInstructions } from "../utils/printInstructions";
+import { injectDataLoaderPlugin } from "../utils/createServer";
 import { getServerInternalPlugins } from "../utils/getServerInternalPlugins";
 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 { appDirectory, port, serverConfigFile, metaName } = 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 app = await createProdServer({
-    metaName,
-    pwd: distDirectory,
+  const app = await server({
+    pwd: appDirectory,
     config: {
       ...userConfig,
       dev: userConfig.dev,
@@ -26,18 +22,20 @@ const start = async (api) => {
         ...userConfig.output || {}
       }
     },
-    routes: serverRoutes,
     appContext: {
-      appDirectory,
+      metaName,
       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
+    internalPlugins: injectDataLoaderPlugin(serverInternalPlugins),
+    apiOnly
   });
-  app.listen(port, async () => {
+  app.listen(port, async (err) => {
+    if (err) {
+      throw err;
+    }
     await printInstructions(hookRunners, appContext, userConfig);
   });
 };

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

@@ -1,5 +1,4 @@
-import { createDevServer } from "@modern-js/server";
-import { initProdMiddlewares } from "@modern-js/prod-server";
+import { Server } from "@modern-js/server";
 let server = null;
 const getServer = () => server;
 const setServer = (newServer) => {
@@ -7,20 +6,32 @@ const setServer = (newServer) => {
 };
 const closeServer = async () => {
   if (server) {
-    server.close();
+    await server.close();
     server = null;
   }
 };
 const createServer = async (options) => {
   if (server) {
-    server.close();
+    await server.close();
   }
-  server = await createDevServer(options, initProdMiddlewares);
-  return server;
+  server = new Server(options);
+  const app = await server.init();
+  return app;
+};
+const injectDataLoaderPlugin = (internalPlugins) => {
+  const DataLoaderPlugin = require.resolve("@modern-js/plugin-data-loader/server");
+  return {
+    ...internalPlugins,
+    "@modern-js/plugin-data-loader": {
+      path: DataLoaderPlugin,
+      forced: true
+    }
+  };
 };
 export {
   closeServer,
   createServer,
   getServer,
+  injectDataLoaderPlugin,
   setServer
 };

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

@@ -1,4 +1,4 @@
-import { cutNameByHyphen } from "@modern-js/utils/universal";
+import { cutNameByHyphen } from "@modern-js/utils";
 function getAutoInjectEnv(appContext) {
   const { metaName } = appContext;
   const prefix = `${cutNameByHyphen(metaName)}_`.toUpperCase();

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

@@ -1,10 +1,12 @@
-/// <reference types="node" />
-/// <reference types="node/http" />
-/// <reference types="@modern-js/server-core/dist/types/core/server" />
-/// <reference types="@modern-js/server-core/src/core/server" />
-import type { Server } from 'node:http';
-import { ModernDevServerOptions } from '@modern-js/server';
-export declare const getServer: () => Server<typeof import("http").IncomingMessage, typeof import("http").ServerResponse> | null;
+import { Server, ModernDevServerOptions } from '@modern-js/server';
+import type { InternalPlugins } from '@modern-js/types';
+export declare const getServer: () => Server | null;
 export declare const setServer: (newServer: Server) => void;
 export declare const closeServer: () => Promise<void>;
 export declare const createServer: (options: ModernDevServerOptions) => Promise<Server>;
+export declare const injectDataLoaderPlugin: (internalPlugins: InternalPlugins) => {
+    '@modern-js/plugin-data-loader': {
+        path: string;
+        forced: boolean;
+    };
+};

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.48.5-alpha.0",
+  "version": "2.48.5",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -76,19 +76,19 @@
     "es-module-lexer": "^1.1.0",
     "esbuild": "0.17.19",
     "@swc/helpers": "0.5.3",
-    "@modern-js/uni-builder": "2.48.4",
-    "@modern-js/plugin": "2.48.4",
-    "@modern-js/core": "2.48.4",
-    "@modern-js/plugin-i18n": "2.48.4",
-    "@modern-js/node-bundle-require": "2.48.4",
-    "@modern-js/plugin-lint": "2.48.4",
-    "@modern-js/prod-server": "2.48.4",
-    "@modern-js/server": "2.48.4",
-    "@modern-js/types": "2.48.4",
-    "@modern-js/utils": "2.48.4",
-    "@modern-js/plugin-data-loader": "2.48.4",
-    "@modern-js/server-utils": "2.48.5-alpha.0",
-    "@modern-js/server-core": "2.48.5-alpha.1"
+    "@modern-js/uni-builder": "2.48.5",
+    "@modern-js/node-bundle-require": "2.48.5",
+    "@modern-js/core": "2.48.5",
+    "@modern-js/plugin-data-loader": "2.48.5",
+    "@modern-js/plugin": "2.48.5",
+    "@modern-js/plugin-lint": "2.48.5",
+    "@modern-js/plugin-i18n": "2.48.5",
+    "@modern-js/prod-server": "2.48.5",
+    "@modern-js/server-utils": "2.48.5",
+    "@modern-js/server": "2.48.5",
+    "@modern-js/types": "2.48.5",
+    "@modern-js/utils": "2.48.5",
+    "@modern-js/server-core": "2.48.5"
   },
   "devDependencies": {
     "@rsbuild/plugin-swc": "0.5.4",
@@ -98,8 +98,8 @@
     "jest": "^29",
     "typescript": "^5",
     "webpack": "^5.91.0",
-    "@scripts/build": "2.48.4",
-    "@scripts/jest-config": "2.48.4"
+    "@scripts/jest-config": "2.48.5",
+    "@scripts/build": "2.48.5"
   },
   "sideEffects": false,
   "publishConfig": {