@modern-js/server 2.53.0 → 2.54.1

package/dist/cjs/createDevServer.js

@@ -32,31 +32,23 @@ __export(createDevServer_exports, {
 });
 module.exports = __toCommonJS(createDevServer_exports);
 var import_node_path = __toESM(require("node:path"));
-var import_base = require("@modern-js/server-core/base");
-var import_node = require("@modern-js/server-core/base/node");
-var import_utils = require("@modern-js/utils");
+var import_server_core = require("@modern-js/server-core");
+var import_node = require("@modern-js/server-core/node");
 var import_helpers = require("./helpers");
-const createDevServer = async (options, initProdMiddlewares) => {
-  const { config, pwd, routes = [], getMiddlewares, rsbuild, appContext } = options;
+var import_dev = require("./dev");
+const createDevServer = async (options, applyPlugins) => {
+  const { config, pwd, serverConfigFile, serverConfigPath } = options;
   const dev = (0, import_helpers.getDevOptions)(options);
   const distDir = import_node_path.default.resolve(pwd, config.output.path || "dist");
-  const apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || import_utils.API_DIR;
-  const sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || import_utils.SHARED_DIR;
+  const serverConfig = (0, import_node.loadServerConfig)(distDir, serverConfigFile, serverConfigPath);
   const prodServerOptions = {
     ...options,
     pwd: distDir
   };
-  const server = (0, import_base.createServerBase)(prodServerOptions);
-  const closeCb = [];
-  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
-  close && closeCb.push(close);
-  rsbuildMiddlewares && server.all("*", (0, import_node.connectMid2HonoMid)(rsbuildMiddlewares));
-  await (0, import_node.registerMockHandlers)({
-    pwd,
-    server
-  });
-  server.use("*", (0, import_helpers.initFileReader)());
-  await server.init();
+  if (serverConfig) {
+    prodServerOptions.serverConfig = serverConfig;
+  }
+  const server = (0, import_server_core.createServerBase)(prodServerOptions);
   const devHttpsOption = typeof dev === "object" && dev.https;
   let nodeServer;
   if (devHttpsOption) {
@@ -66,35 +58,11 @@ const createDevServer = async (options, initProdMiddlewares) => {
   } else {
     nodeServer = await (0, import_node.createNodeServer)(server.handle.bind(server));
   }
-  rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
-    if (stats.toJson({
-      all: false
-    }).name !== "server") {
-      (0, import_helpers.onRepack)(distDir, server.runner, routes);
-    }
-  });
-  onHTTPUpgrade && nodeServer.on("upgrade", onHTTPUpgrade);
-  await server.runner.beforeServerInit({
-    app: nodeServer
-  });
-  await initProdMiddlewares(server, prodServerOptions);
-  if (dev.watch) {
-    const { watchOptions } = config.server;
-    const watcher = (0, import_helpers.startWatcher)({
-      pwd,
-      distDir,
-      apiDir,
-      sharedDir,
-      watchOptions,
-      server
-    });
-    closeCb.push(watcher.close.bind(watcher));
-  }
-  closeCb.length > 0 && nodeServer.on("close", () => {
-    closeCb.forEach((cb) => {
-      cb();
-    });
-  });
+  server.addPlugins([
+    (0, import_dev.devPlugin)(options)
+  ]);
+  await applyPlugins(server, prodServerOptions, nodeServer);
+  await server.init();
   return nodeServer;
 };
 // Annotate the CommonJS export names for ESM import in node:

package/dist/cjs/dev.js

@@ -0,0 +1,85 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var dev_exports = {};
+__export(dev_exports, {
+  devPlugin: () => devPlugin
+});
+module.exports = __toCommonJS(dev_exports);
+var import_node = require("@modern-js/server-core/node");
+var import_utils = require("@modern-js/utils");
+var import_helpers = require("./helpers");
+const devPlugin = (options) => ({
+  name: "@modern-js/plugin-dev",
+  setup(api) {
+    const { getMiddlewares, rsbuild, config, pwd } = options;
+    const closeCb = [];
+    const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
+    close && closeCb.push(close);
+    const dev = (0, import_helpers.getDevOptions)(options);
+    return {
+      async prepare() {
+        const { middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
+        onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+        const runner = api.useHookRunners();
+        rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
+          if (stats.toJson({
+            all: false
+          }).name !== "server") {
+            (0, import_helpers.onRepack)(distDirectory, runner, routes || []);
+          }
+        });
+        if (dev.watch) {
+          const { watchOptions } = config.server;
+          const watcher = (0, import_helpers.startWatcher)({
+            pwd,
+            distDir: distDirectory,
+            apiDir: apiDirectory || import_utils.API_DIR,
+            sharedDir: sharedDirectory || import_utils.SHARED_DIR,
+            watchOptions,
+            server: serverBase
+          });
+          closeCb.push(watcher.close.bind(watcher));
+        }
+        closeCb.length > 0 && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("close", () => {
+          closeCb.forEach((cb) => {
+            cb();
+          });
+        }));
+        if (rsbuildMiddlewares) {
+          middlewares.push({
+            name: "rsbuild-dev",
+            handler: (0, import_node.connectMid2HonoMid)(rsbuildMiddlewares)
+          });
+        }
+        await (0, import_helpers.registerMockHandlers)({
+          pwd,
+          server: serverBase
+        });
+        middlewares.push({
+          name: "init-file-reader",
+          handler: (0, import_helpers.initFileReader)()
+        });
+      }
+    };
+  }
+});
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  devPlugin
+});

package/dist/cjs/helpers/index.js

@@ -34,32 +34,38 @@ __export(helpers_exports, {
 module.exports = __toCommonJS(helpers_exports);
 var import_path = __toESM(require("path"));
 var import_utils = require("@modern-js/utils");
-var import_base = require("@modern-js/server-core/base");
-var import_node = require("@modern-js/server-core/base/node");
+var import_server_core = require("@modern-js/server-core");
 var import_watcher = __toESM(require("../dev-tools/watcher"));
 var import_utils2 = require("./utils");
+var import_mock = require("./mock");
 __reExport(helpers_exports, require("./repack"), module.exports);
 __reExport(helpers_exports, require("./devOptions"), module.exports);
 __reExport(helpers_exports, require("./fileReader"), module.exports);
+__reExport(helpers_exports, require("./mock"), module.exports);
 async function onServerChange({ pwd, filepath, event, server }) {
-  const { mock } = import_base.AGGRED_DIR;
+  const { mock } = import_server_core.AGGRED_DIR;
   const mockPath = import_path.default.normalize(import_path.default.join(pwd, mock));
   const { runner } = server;
-  runner.reset();
   if (filepath.startsWith(mockPath)) {
-    await (0, import_node.registerMockHandlers)({
+    await (0, import_mock.registerMockHandlers)({
       pwd,
       server
     });
     import_utils.logger.info("Finish registering the mock handlers");
   } else {
     try {
-      await runner.onApiChange([
-        {
-          filename: filepath,
-          event
-        }
-      ]);
+      const fileChangeEvent = {
+        type: "file-change",
+        payload: [
+          {
+            filename: filepath,
+            event
+          }
+        ]
+      };
+      await runner.reset({
+        event: fileChangeEvent
+      });
       (0, import_utils2.debug)(`Finish reload server, trigger by ${filepath} ${event}`);
     } catch (e) {
       import_utils.logger.error(e);
@@ -67,7 +73,7 @@ async function onServerChange({ pwd, filepath, event, server }) {
   }
 }
 function startWatcher({ pwd, distDir, apiDir, sharedDir, watchOptions, server }) {
-  const { mock } = import_base.AGGRED_DIR;
+  const { mock } = import_server_core.AGGRED_DIR;
   const defaultWatched = [
     `${mock}/**/*`,
     `${import_utils.SERVER_DIR}/**/*`,
@@ -103,5 +109,6 @@ function startWatcher({ pwd, distDir, apiDir, sharedDir, watchOptions, server })
   startWatcher,
   ...require("./repack"),
   ...require("./devOptions"),
-  ...require("./fileReader")
+  ...require("./fileReader"),
+  ...require("./mock")
 });

package/dist/cjs/helpers/mock.js

@@ -0,0 +1,113 @@
+"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)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  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 mock_exports = {};
+__export(mock_exports, {
+  registerMockHandlers: () => registerMockHandlers
+});
+module.exports = __toCommonJS(mock_exports);
+var import_node_path = __toESM(require("node:path"));
+var import_utils = require("@modern-js/utils");
+var import_server_core = require("@modern-js/server-core");
+var import_node = require("@modern-js/server-core/node");
+const parseKey = (key) => {
+  const _blank = " ";
+  const splitted = key.split(_blank).filter(Boolean);
+  if (splitted.length > 1) {
+    const [method, pathname] = splitted;
+    return {
+      method: method.toLowerCase(),
+      path: pathname
+    };
+  }
+  return {
+    method: "get",
+    path: key
+  };
+};
+const mockHandlerRegistry = /* @__PURE__ */ new Map();
+const registerMockHandlers = async ({ pwd, server }) => {
+  const exts = [
+    ".ts",
+    ".js"
+  ];
+  let mockFilePath = "";
+  for (const ext of exts) {
+    const maybeMatch = import_node_path.default.join(pwd, `${import_server_core.AGGRED_DIR.mock}/index${ext}`);
+    if (await import_utils.fs.pathExists(maybeMatch)) {
+      mockFilePath = maybeMatch;
+      break;
+    }
+  }
+  if (!mockFilePath) {
+    return null;
+  }
+  const { default: mockModule, config } = await Promise.resolve().then(() => __toESM(require(mockFilePath)));
+  const enable = config === null || config === void 0 ? void 0 : config.enable;
+  if (enable === false) {
+    return;
+  }
+  if (!mockModule) {
+    throw new Error(`Mock file ${mockFilePath} parsed failed!`);
+  }
+  Object.entries(mockModule).forEach(([key, handler]) => {
+    const { method, path: path2 } = parseKey(key);
+    const methodName = method.toLowerCase();
+    const handlerId = `${methodName}-${path2}`;
+    mockHandlerRegistry.set(handlerId, {
+      handler,
+      isRegistered: false
+    });
+    if (typeof server[methodName] === "function") {
+      const mockHandler = async (c, next) => {
+        var _mockHandlerRegistry_get;
+        if (typeof enable === "function") {
+          const isEnabled = enable(c.env.node.req, c.env.node.res);
+          if (!isEnabled) {
+            return next();
+          }
+        }
+        const handler2 = (_mockHandlerRegistry_get = mockHandlerRegistry.get(handlerId)) === null || _mockHandlerRegistry_get === void 0 ? void 0 : _mockHandlerRegistry_get.handler;
+        if (typeof handler2 === "function") {
+          await (0, import_node.connectMid2HonoMid)(handler2)(c, next);
+        } else {
+          return c.json(handler2);
+        }
+      };
+      const handlerInfo = mockHandlerRegistry.get(handlerId);
+      if (handlerInfo && !(handlerInfo === null || handlerInfo === void 0 ? void 0 : handlerInfo.isRegistered)) {
+        server[methodName](path2, mockHandler);
+        handlerInfo.isRegistered = true;
+      }
+    }
+  });
+};
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  registerMockHandlers
+});

package/dist/cjs/helpers/repack.js

@@ -53,7 +53,11 @@ const cleanSSRCache = (distDir, routes) => {
 const onRepack = (distDir, runner, routes) => {
   cleanSSRCache(distDir, routes);
   import_fileReader.fileReader.reset();
-  runner.repack();
+  runner.reset({
+    event: {
+      type: "repack"
+    }
+  });
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/esm/createDevServer.js

@@ -3,122 +3,79 @@ 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 path from "node:path";
-import { createServerBase } from "@modern-js/server-core/base";
-import { registerMockHandlers, createNodeServer, connectMid2HonoMid } from "@modern-js/server-core/base/node";
-import { API_DIR, SHARED_DIR } from "@modern-js/utils";
-import { startWatcher, onRepack, getDevOptions, initFileReader } from "./helpers";
+import { createServerBase } from "@modern-js/server-core";
+import { createNodeServer, loadServerConfig } from "@modern-js/server-core/node";
+import { getDevOptions } from "./helpers";
+import { devPlugin } from "./dev";
 var createDevServer = function() {
-  var _ref = _async_to_generator(function(options, initProdMiddlewares) {
-    var config, pwd, _options_routes, routes, getMiddlewares, rsbuild, appContext, dev, distDir, apiDir, sharedDir, prodServerOptions, server, closeCb, _ref2, rsbuildMiddlewares, close, onHTTPUpgrade, devHttpsOption, nodeServer, genHttpsOptions, httpsOptions, watchOptions, watcher;
+  var _ref = _async_to_generator(function(options, applyPlugins) {
+    var config, pwd, serverConfigFile, serverConfigPath, dev, distDir, serverConfig, prodServerOptions, server, devHttpsOption, nodeServer, genHttpsOptions, httpsOptions;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
-          config = options.config, pwd = options.pwd, _options_routes = options.routes, routes = _options_routes === void 0 ? [] : _options_routes, getMiddlewares = options.getMiddlewares, rsbuild = options.rsbuild, appContext = options.appContext;
+          config = options.config, pwd = options.pwd, serverConfigFile = options.serverConfigFile, serverConfigPath = options.serverConfigPath;
           dev = getDevOptions(options);
           distDir = path.resolve(pwd, config.output.path || "dist");
-          apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
-          sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
+          serverConfig = loadServerConfig(distDir, serverConfigFile, serverConfigPath);
           prodServerOptions = _object_spread_props(_object_spread({}, options), {
             pwd: distDir
           });
+          if (serverConfig) {
+            prodServerOptions.serverConfig = serverConfig;
+          }
           server = createServerBase(prodServerOptions);
-          closeCb = [];
-          _ref2 = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {}, rsbuildMiddlewares = _ref2.middlewares, close = _ref2.close, onHTTPUpgrade = _ref2.onHTTPUpgrade;
-          close && closeCb.push(close);
-          rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
-          return [
-            4,
-            registerMockHandlers({
-              pwd,
-              server
-            })
-          ];
-        case 1:
-          _state.sent();
-          server.use("*", initFileReader());
-          return [
-            4,
-            server.init()
-          ];
-        case 2:
-          _state.sent();
           devHttpsOption = typeof dev === "object" && dev.https;
           if (!devHttpsOption)
             return [
               3,
-              6
+              4
             ];
           return [
             4,
             import("./dev-tools/https")
           ];
-        case 3:
+        case 1:
           genHttpsOptions = _state.sent().genHttpsOptions;
           return [
             4,
             genHttpsOptions(devHttpsOption, pwd)
           ];
-        case 4:
+        case 2:
           httpsOptions = _state.sent();
           return [
             4,
             createNodeServer(server.handle.bind(server), httpsOptions)
           ];
-        case 5:
+        case 3:
           nodeServer = _state.sent();
           return [
             3,
-            8
+            6
           ];
-        case 6:
+        case 4:
           return [
             4,
             createNodeServer(server.handle.bind(server))
           ];
-        case 7:
+        case 5:
           nodeServer = _state.sent();
-          _state.label = 8;
-        case 8:
-          rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(function(param) {
-            var stats = param.stats;
-            if (stats.toJson({
-              all: false
-            }).name !== "server") {
-              onRepack(distDir, server.runner, routes);
-            }
-          });
-          onHTTPUpgrade && nodeServer.on("upgrade", onHTTPUpgrade);
+          _state.label = 6;
+        case 6:
+          server.addPlugins([
+            devPlugin(options)
+          ]);
           return [
             4,
-            server.runner.beforeServerInit({
-              app: nodeServer
-            })
+            applyPlugins(server, prodServerOptions, nodeServer)
           ];
-        case 9:
+        case 7:
           _state.sent();
           return [
             4,
-            initProdMiddlewares(server, prodServerOptions)
+            server.init()
           ];
-        case 10:
+        case 8:
           _state.sent();
-          if (dev.watch) {
-            watchOptions = config.server.watchOptions;
-            watcher = startWatcher({
-              pwd,
-              distDir,
-              apiDir,
-              sharedDir,
-              watchOptions,
-              server
-            });
-            closeCb.push(watcher.close.bind(watcher));
-          }
-          closeCb.length > 0 && nodeServer.on("close", function() {
-            closeCb.forEach(function(cb) {
-              cb();
-            });
-          });
           return [
             2,
             nodeServer
@@ -126,7 +83,7 @@ var createDevServer = function() {
       }
     });
   });
-  return function createDevServer2(options, initProdMiddlewares) {
+  return function createDevServer2(options, applyPlugins) {
     return _ref.apply(this, arguments);
   };
 }();

package/dist/esm/dev.js

@@ -0,0 +1,82 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { connectMid2HonoMid } from "@modern-js/server-core/node";
+import { API_DIR, SHARED_DIR } from "@modern-js/utils";
+import { startWatcher, onRepack, getDevOptions, initFileReader, registerMockHandlers } from "./helpers";
+var devPlugin = function(options) {
+  return {
+    name: "@modern-js/plugin-dev",
+    setup: function setup(api) {
+      var getMiddlewares = options.getMiddlewares, rsbuild = options.rsbuild, config = options.config, pwd = options.pwd;
+      var closeCb = [];
+      var _ref = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {}, rsbuildMiddlewares = _ref.middlewares, close = _ref.close, onHTTPUpgrade = _ref.onHTTPUpgrade;
+      close && closeCb.push(close);
+      var dev = getDevOptions(options);
+      return {
+        prepare: function prepare() {
+          return _async_to_generator(function() {
+            var _api_useAppContext, middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase, runner, watchOptions, watcher;
+            return _ts_generator(this, function(_state) {
+              switch (_state.label) {
+                case 0:
+                  _api_useAppContext = api.useAppContext(), middlewares = _api_useAppContext.middlewares, distDirectory = _api_useAppContext.distDirectory, routes = _api_useAppContext.routes, nodeServer = _api_useAppContext.nodeServer, apiDirectory = _api_useAppContext.apiDirectory, sharedDirectory = _api_useAppContext.sharedDirectory, serverBase = _api_useAppContext.serverBase;
+                  onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+                  runner = api.useHookRunners();
+                  rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(function(param) {
+                    var stats = param.stats;
+                    if (stats.toJson({
+                      all: false
+                    }).name !== "server") {
+                      onRepack(distDirectory, runner, routes || []);
+                    }
+                  });
+                  if (dev.watch) {
+                    watchOptions = config.server.watchOptions;
+                    watcher = startWatcher({
+                      pwd,
+                      distDir: distDirectory,
+                      apiDir: apiDirectory || API_DIR,
+                      sharedDir: sharedDirectory || SHARED_DIR,
+                      watchOptions,
+                      server: serverBase
+                    });
+                    closeCb.push(watcher.close.bind(watcher));
+                  }
+                  closeCb.length > 0 && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("close", function() {
+                    closeCb.forEach(function(cb) {
+                      cb();
+                    });
+                  }));
+                  if (rsbuildMiddlewares) {
+                    middlewares.push({
+                      name: "rsbuild-dev",
+                      handler: connectMid2HonoMid(rsbuildMiddlewares)
+                    });
+                  }
+                  return [
+                    4,
+                    registerMockHandlers({
+                      pwd,
+                      server: serverBase
+                    })
+                  ];
+                case 1:
+                  _state.sent();
+                  middlewares.push({
+                    name: "init-file-reader",
+                    handler: initFileReader()
+                  });
+                  return [
+                    2
+                  ];
+              }
+            });
+          })();
+        }
+      };
+    }
+  };
+};
+export {
+  devPlugin
+};

package/dist/esm/helpers/index.js

@@ -2,19 +2,20 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
-import { AGGRED_DIR } from "@modern-js/server-core/base";
-import { registerMockHandlers } from "@modern-js/server-core/base/node";
+import { AGGRED_DIR } from "@modern-js/server-core";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import { debug } from "./utils";
+import { registerMockHandlers } from "./mock";
 export * from "./repack";
 export * from "./devOptions";
 export * from "./fileReader";
+export * from "./mock";
 function onServerChange(_) {
   return _onServerChange.apply(this, arguments);
 }
 function _onServerChange() {
   _onServerChange = _async_to_generator(function(param) {
-    var pwd, filepath, event, server, mock, mockPath, runner, e;
+    var pwd, filepath, event, server, mock, mockPath, runner, fileChangeEvent, e;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -22,7 +23,6 @@ function _onServerChange() {
           mock = AGGRED_DIR.mock;
           mockPath = path.normalize(path.join(pwd, mock));
           runner = server.runner;
-          runner.reset();
           if (!filepath.startsWith(mockPath))
             return [
               3,
@@ -49,14 +49,20 @@ function _onServerChange() {
             ,
             5
           ]);
-          return [
-            4,
-            runner.onApiChange([
+          fileChangeEvent = {
+            type: "file-change",
+            payload: [
               {
                 filename: filepath,
                 event
               }
-            ])
+            ]
+          };
+          return [
+            4,
+            runner.reset({
+              event: fileChangeEvent
+            })
           ];
         case 3:
           _state.sent();

package/dist/esm/helpers/mock.js

@@ -0,0 +1,198 @@
+import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
+import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import path from "node:path";
+import { fs } from "@modern-js/utils";
+import { AGGRED_DIR } from "@modern-js/server-core";
+import { connectMid2HonoMid } from "@modern-js/server-core/node";
+var parseKey = function(key) {
+  var _blank = " ";
+  var splitted = key.split(_blank).filter(Boolean);
+  if (splitted.length > 1) {
+    var _splitted = _sliced_to_array(splitted, 2), method = _splitted[0], pathname = _splitted[1];
+    return {
+      method: method.toLowerCase(),
+      path: pathname
+    };
+  }
+  return {
+    method: "get",
+    path: key
+  };
+};
+var mockHandlerRegistry = /* @__PURE__ */ new Map();
+var registerMockHandlers = function() {
+  var _ref = _async_to_generator(function(param) {
+    var pwd, server, exts, mockFilePath, _iteratorNormalCompletion, _didIteratorError, _iteratorError, _iterator, _step, ext, maybeMatch, err, _ref2, mockModule, config, enable;
+    return _ts_generator(this, function(_state) {
+      switch (_state.label) {
+        case 0:
+          pwd = param.pwd, server = param.server;
+          exts = [
+            ".ts",
+            ".js"
+          ];
+          mockFilePath = "";
+          _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = void 0;
+          _state.label = 1;
+        case 1:
+          _state.trys.push([
+            1,
+            6,
+            7,
+            8
+          ]);
+          _iterator = exts[Symbol.iterator]();
+          _state.label = 2;
+        case 2:
+          if (!!(_iteratorNormalCompletion = (_step = _iterator.next()).done))
+            return [
+              3,
+              5
+            ];
+          ext = _step.value;
+          maybeMatch = path.join(pwd, "".concat(AGGRED_DIR.mock, "/index").concat(ext));
+          return [
+            4,
+            fs.pathExists(maybeMatch)
+          ];
+        case 3:
+          if (_state.sent()) {
+            mockFilePath = maybeMatch;
+            return [
+              3,
+              5
+            ];
+          }
+          _state.label = 4;
+        case 4:
+          _iteratorNormalCompletion = true;
+          return [
+            3,
+            2
+          ];
+        case 5:
+          return [
+            3,
+            8
+          ];
+        case 6:
+          err = _state.sent();
+          _didIteratorError = true;
+          _iteratorError = err;
+          return [
+            3,
+            8
+          ];
+        case 7:
+          try {
+            if (!_iteratorNormalCompletion && _iterator.return != null) {
+              _iterator.return();
+            }
+          } finally {
+            if (_didIteratorError) {
+              throw _iteratorError;
+            }
+          }
+          return [
+            7
+          ];
+        case 8:
+          if (!mockFilePath) {
+            return [
+              2,
+              null
+            ];
+          }
+          return [
+            4,
+            import(mockFilePath)
+          ];
+        case 9:
+          _ref2 = _state.sent(), mockModule = _ref2.default, config = _ref2.config;
+          enable = config === null || config === void 0 ? void 0 : config.enable;
+          if (enable === false) {
+            return [
+              2
+            ];
+          }
+          if (!mockModule) {
+            throw new Error("Mock file ".concat(mockFilePath, " parsed failed!"));
+          }
+          Object.entries(mockModule).forEach(function(param2) {
+            var _param = _sliced_to_array(param2, 2), key = _param[0], handler = _param[1];
+            var _parseKey = parseKey(key), method = _parseKey.method, _$path = _parseKey.path;
+            var methodName = method.toLowerCase();
+            var handlerId = "".concat(methodName, "-").concat(_$path);
+            mockHandlerRegistry.set(handlerId, {
+              handler,
+              isRegistered: false
+            });
+            if (typeof server[methodName] === "function") {
+              var mockHandler = function() {
+                var _ref3 = _async_to_generator(function(c, next) {
+                  var _mockHandlerRegistry_get, isEnabled, handler2;
+                  return _ts_generator(this, function(_state2) {
+                    switch (_state2.label) {
+                      case 0:
+                        if (typeof enable === "function") {
+                          isEnabled = enable(c.env.node.req, c.env.node.res);
+                          if (!isEnabled) {
+                            return [
+                              2,
+                              next()
+                            ];
+                          }
+                        }
+                        handler2 = (_mockHandlerRegistry_get = mockHandlerRegistry.get(handlerId)) === null || _mockHandlerRegistry_get === void 0 ? void 0 : _mockHandlerRegistry_get.handler;
+                        if (!(typeof handler2 === "function"))
+                          return [
+                            3,
+                            2
+                          ];
+                        return [
+                          4,
+                          connectMid2HonoMid(handler2)(c, next)
+                        ];
+                      case 1:
+                        _state2.sent();
+                        return [
+                          3,
+                          3
+                        ];
+                      case 2:
+                        return [
+                          2,
+                          c.json(handler2)
+                        ];
+                      case 3:
+                        return [
+                          2
+                        ];
+                    }
+                  });
+                });
+                return function mockHandler2(c, next) {
+                  return _ref3.apply(this, arguments);
+                };
+              }();
+              var handlerInfo = mockHandlerRegistry.get(handlerId);
+              if (handlerInfo && !(handlerInfo === null || handlerInfo === void 0 ? void 0 : handlerInfo.isRegistered)) {
+                server[methodName](_$path, mockHandler);
+                handlerInfo.isRegistered = true;
+              }
+            }
+          });
+          return [
+            2
+          ];
+      }
+    });
+  });
+  return function registerMockHandlers2(_) {
+    return _ref.apply(this, arguments);
+  };
+}();
+export {
+  registerMockHandlers
+};

package/dist/esm/helpers/repack.js

@@ -24,7 +24,11 @@ var cleanSSRCache = function(distDir, routes) {
 var onRepack = function(distDir, runner, routes) {
   cleanSSRCache(distDir, routes);
   fileReader.reset();
-  runner.repack();
+  runner.reset({
+    event: {
+      type: "repack"
+    }
+  });
 };
 export {
   onRepack

package/dist/esm-node/createDevServer.js

@@ -1,29 +1,21 @@
 import path from "node:path";
-import { createServerBase } from "@modern-js/server-core/base";
-import { registerMockHandlers, createNodeServer, connectMid2HonoMid } from "@modern-js/server-core/base/node";
-import { API_DIR, SHARED_DIR } from "@modern-js/utils";
-import { startWatcher, onRepack, getDevOptions, initFileReader } from "./helpers";
-const createDevServer = async (options, initProdMiddlewares) => {
-  const { config, pwd, routes = [], getMiddlewares, rsbuild, appContext } = options;
+import { createServerBase } from "@modern-js/server-core";
+import { createNodeServer, loadServerConfig } from "@modern-js/server-core/node";
+import { getDevOptions } from "./helpers";
+import { devPlugin } from "./dev";
+const createDevServer = async (options, applyPlugins) => {
+  const { config, pwd, serverConfigFile, serverConfigPath } = options;
   const dev = getDevOptions(options);
   const distDir = path.resolve(pwd, config.output.path || "dist");
-  const apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
-  const sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
+  const serverConfig = loadServerConfig(distDir, serverConfigFile, serverConfigPath);
   const prodServerOptions = {
     ...options,
     pwd: distDir
   };
+  if (serverConfig) {
+    prodServerOptions.serverConfig = serverConfig;
+  }
   const server = createServerBase(prodServerOptions);
-  const closeCb = [];
-  const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
-  close && closeCb.push(close);
-  rsbuildMiddlewares && server.all("*", connectMid2HonoMid(rsbuildMiddlewares));
-  await registerMockHandlers({
-    pwd,
-    server
-  });
-  server.use("*", initFileReader());
-  await server.init();
   const devHttpsOption = typeof dev === "object" && dev.https;
   let nodeServer;
   if (devHttpsOption) {
@@ -33,35 +25,11 @@ const createDevServer = async (options, initProdMiddlewares) => {
   } else {
     nodeServer = await createNodeServer(server.handle.bind(server));
   }
-  rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
-    if (stats.toJson({
-      all: false
-    }).name !== "server") {
-      onRepack(distDir, server.runner, routes);
-    }
-  });
-  onHTTPUpgrade && nodeServer.on("upgrade", onHTTPUpgrade);
-  await server.runner.beforeServerInit({
-    app: nodeServer
-  });
-  await initProdMiddlewares(server, prodServerOptions);
-  if (dev.watch) {
-    const { watchOptions } = config.server;
-    const watcher = startWatcher({
-      pwd,
-      distDir,
-      apiDir,
-      sharedDir,
-      watchOptions,
-      server
-    });
-    closeCb.push(watcher.close.bind(watcher));
-  }
-  closeCb.length > 0 && nodeServer.on("close", () => {
-    closeCb.forEach((cb) => {
-      cb();
-    });
-  });
+  server.addPlugins([
+    devPlugin(options)
+  ]);
+  await applyPlugins(server, prodServerOptions, nodeServer);
+  await server.init();
   return nodeServer;
 };
 export {

package/dist/esm-node/dev.js

@@ -0,0 +1,61 @@
+import { connectMid2HonoMid } from "@modern-js/server-core/node";
+import { API_DIR, SHARED_DIR } from "@modern-js/utils";
+import { startWatcher, onRepack, getDevOptions, initFileReader, registerMockHandlers } from "./helpers";
+const devPlugin = (options) => ({
+  name: "@modern-js/plugin-dev",
+  setup(api) {
+    const { getMiddlewares, rsbuild, config, pwd } = options;
+    const closeCb = [];
+    const { middlewares: rsbuildMiddlewares, close, onHTTPUpgrade } = (getMiddlewares === null || getMiddlewares === void 0 ? void 0 : getMiddlewares()) || {};
+    close && closeCb.push(close);
+    const dev = getDevOptions(options);
+    return {
+      async prepare() {
+        const { middlewares, distDirectory, routes, nodeServer, apiDirectory, sharedDirectory, serverBase } = api.useAppContext();
+        onHTTPUpgrade && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("upgrade", onHTTPUpgrade));
+        const runner = api.useHookRunners();
+        rsbuild === null || rsbuild === void 0 ? void 0 : rsbuild.onDevCompileDone(({ stats }) => {
+          if (stats.toJson({
+            all: false
+          }).name !== "server") {
+            onRepack(distDirectory, runner, routes || []);
+          }
+        });
+        if (dev.watch) {
+          const { watchOptions } = config.server;
+          const watcher = startWatcher({
+            pwd,
+            distDir: distDirectory,
+            apiDir: apiDirectory || API_DIR,
+            sharedDir: sharedDirectory || SHARED_DIR,
+            watchOptions,
+            server: serverBase
+          });
+          closeCb.push(watcher.close.bind(watcher));
+        }
+        closeCb.length > 0 && (nodeServer === null || nodeServer === void 0 ? void 0 : nodeServer.on("close", () => {
+          closeCb.forEach((cb) => {
+            cb();
+          });
+        }));
+        if (rsbuildMiddlewares) {
+          middlewares.push({
+            name: "rsbuild-dev",
+            handler: connectMid2HonoMid(rsbuildMiddlewares)
+          });
+        }
+        await registerMockHandlers({
+          pwd,
+          server: serverBase
+        });
+        middlewares.push({
+          name: "init-file-reader",
+          handler: initFileReader()
+        });
+      }
+    };
+  }
+});
+export {
+  devPlugin
+};

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

@@ -1,17 +1,17 @@
 import path from "path";
 import { SERVER_BUNDLE_DIRECTORY, SERVER_DIR, logger } from "@modern-js/utils";
-import { AGGRED_DIR } from "@modern-js/server-core/base";
-import { registerMockHandlers } from "@modern-js/server-core/base/node";
+import { AGGRED_DIR } from "@modern-js/server-core";
 import Watcher, { mergeWatchOptions } from "../dev-tools/watcher";
 import { debug } from "./utils";
+import { registerMockHandlers } from "./mock";
 export * from "./repack";
 export * from "./devOptions";
 export * from "./fileReader";
+export * from "./mock";
 async function onServerChange({ pwd, filepath, event, server }) {
   const { mock } = AGGRED_DIR;
   const mockPath = path.normalize(path.join(pwd, mock));
   const { runner } = server;
-  runner.reset();
   if (filepath.startsWith(mockPath)) {
     await registerMockHandlers({
       pwd,
@@ -20,12 +20,18 @@ async function onServerChange({ pwd, filepath, event, server }) {
     logger.info("Finish registering the mock handlers");
   } else {
     try {
-      await runner.onApiChange([
-        {
-          filename: filepath,
-          event
-        }
-      ]);
+      const fileChangeEvent = {
+        type: "file-change",
+        payload: [
+          {
+            filename: filepath,
+            event
+          }
+        ]
+      };
+      await runner.reset({
+        event: fileChangeEvent
+      });
       debug(`Finish reload server, trigger by ${filepath} ${event}`);
     } catch (e) {
       logger.error(e);

package/dist/esm-node/helpers/mock.js

@@ -0,0 +1,79 @@
+import path from "node:path";
+import { fs } from "@modern-js/utils";
+import { AGGRED_DIR } from "@modern-js/server-core";
+import { connectMid2HonoMid } from "@modern-js/server-core/node";
+const parseKey = (key) => {
+  const _blank = " ";
+  const splitted = key.split(_blank).filter(Boolean);
+  if (splitted.length > 1) {
+    const [method, pathname] = splitted;
+    return {
+      method: method.toLowerCase(),
+      path: pathname
+    };
+  }
+  return {
+    method: "get",
+    path: key
+  };
+};
+const mockHandlerRegistry = /* @__PURE__ */ new Map();
+const registerMockHandlers = async ({ pwd, server }) => {
+  const exts = [
+    ".ts",
+    ".js"
+  ];
+  let mockFilePath = "";
+  for (const ext of exts) {
+    const maybeMatch = path.join(pwd, `${AGGRED_DIR.mock}/index${ext}`);
+    if (await fs.pathExists(maybeMatch)) {
+      mockFilePath = maybeMatch;
+      break;
+    }
+  }
+  if (!mockFilePath) {
+    return null;
+  }
+  const { default: mockModule, config } = await import(mockFilePath);
+  const enable = config === null || config === void 0 ? void 0 : config.enable;
+  if (enable === false) {
+    return;
+  }
+  if (!mockModule) {
+    throw new Error(`Mock file ${mockFilePath} parsed failed!`);
+  }
+  Object.entries(mockModule).forEach(([key, handler]) => {
+    const { method, path: path2 } = parseKey(key);
+    const methodName = method.toLowerCase();
+    const handlerId = `${methodName}-${path2}`;
+    mockHandlerRegistry.set(handlerId, {
+      handler,
+      isRegistered: false
+    });
+    if (typeof server[methodName] === "function") {
+      const mockHandler = async (c, next) => {
+        var _mockHandlerRegistry_get;
+        if (typeof enable === "function") {
+          const isEnabled = enable(c.env.node.req, c.env.node.res);
+          if (!isEnabled) {
+            return next();
+          }
+        }
+        const handler2 = (_mockHandlerRegistry_get = mockHandlerRegistry.get(handlerId)) === null || _mockHandlerRegistry_get === void 0 ? void 0 : _mockHandlerRegistry_get.handler;
+        if (typeof handler2 === "function") {
+          await connectMid2HonoMid(handler2)(c, next);
+        } else {
+          return c.json(handler2);
+        }
+      };
+      const handlerInfo = mockHandlerRegistry.get(handlerId);
+      if (handlerInfo && !(handlerInfo === null || handlerInfo === void 0 ? void 0 : handlerInfo.isRegistered)) {
+        server[methodName](path2, mockHandler);
+        handlerInfo.isRegistered = true;
+      }
+    }
+  });
+};
+export {
+  registerMockHandlers
+};

package/dist/esm-node/helpers/repack.js

@@ -20,7 +20,11 @@ const cleanSSRCache = (distDir, routes) => {
 const onRepack = (distDir, runner, routes) => {
   cleanSSRCache(distDir, routes);
   fileReader.reset();
-  runner.repack();
+  runner.reset({
+    event: {
+      type: "repack"
+    }
+  });
 };
 export {
   onRepack

package/dist/types/createDevServer.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 import { Server as NodeServer } from 'node:http';
-import { ServerBaseOptions } from '@modern-js/server-core/base';
-import { InitProdMiddlewares, ModernDevServerOptions } from './types';
-export type { ModernDevServerOptions, InitProdMiddlewares } from './types';
-export declare const createDevServer: <O extends ServerBaseOptions>(options: ModernDevServerOptions<O>, initProdMiddlewares: InitProdMiddlewares<O>) => Promise<NodeServer>;
+import { ServerBaseOptions } from '@modern-js/server-core';
+import { ApplyPlugins, ModernDevServerOptions } from './types';
+export type { ModernDevServerOptions } from './types';
+export declare const createDevServer: <O extends ServerBaseOptions>(options: ModernDevServerOptions<O>, applyPlugins: ApplyPlugins<O>) => Promise<NodeServer>;

package/dist/types/dev.d.ts

@@ -0,0 +1,3 @@
+import { ServerPlugin, ServerBaseOptions } from '@modern-js/server-core';
+import { ModernDevServerOptions } from './types';
+export declare const devPlugin: <O extends ServerBaseOptions>(options: ModernDevServerOptions<O>) => ServerPlugin;

package/dist/types/helpers/fileReader.d.ts

@@ -1,2 +1,2 @@
-import { Middleware } from '@modern-js/server-core/base';
+import { Middleware } from '@modern-js/server-core';
 export declare const initFileReader: () => Middleware;

package/dist/types/helpers/index.d.ts

@@ -1,9 +1,10 @@
 import { WatchOptions } from '@modern-js/utils';
-import { ServerBase } from '@modern-js/server-core/base';
+import { ServerBase } from '@modern-js/server-core';
 import Watcher from '../dev-tools/watcher';
 export * from './repack';
 export * from './devOptions';
 export * from './fileReader';
+export * from './mock';
 export declare function startWatcher({ pwd, distDir, apiDir, sharedDir, watchOptions, server, }: {
     pwd: string;
     distDir: string;

package/dist/types/helpers/mock.d.ts

@@ -0,0 +1,5 @@
+import { type ServerBase } from '@modern-js/server-core';
+export declare const registerMockHandlers: ({ pwd, server, }: {
+    pwd: string;
+    server: ServerBase;
+}) => Promise<null | undefined>;

package/dist/types/index.d.ts

@@ -1,2 +1,2 @@
 export { createDevServer } from './createDevServer';
-export type { ModernDevServerOptions, InitProdMiddlewares, } from './createDevServer';
+export type { ModernDevServerOptions } from './createDevServer';

package/dist/types/types.d.ts

@@ -4,7 +4,7 @@ import type { IncomingMessage, ServerResponse } from 'http';
 import type { Socket } from 'net';
 import type { DevServerOptions, DevServerHttpsOptions, NextFunction } from '@modern-js/types';
 import type { RsbuildInstance } from '@rsbuild/core';
-import { ServerBase, ServerBaseOptions } from '@modern-js/server-core/base';
+import { NodeServer, ServerBase, ServerBaseOptions } from '@modern-js/server-core';
 export type { DevServerOptions, DevServerHttpsOptions };
 type Middleware = (req: IncomingMessage, res: ServerResponse, next: NextFunction) => Promise<void>;
 export type DevMiddlewareAPI = Middleware & {
@@ -37,6 +37,9 @@ export type ExtraOptions = {
     dev: Pick<DevServerOptions, 'watch' | 'https'> & {
         writeToDisk?: boolean | ((filename: string) => boolean);
     };
+    /** compat, the default value is modern.server-runtime.config.ts  */
+    serverConfigFile?: string;
+    serverConfigPath?: string;
     useSSRWorker?: boolean;
     rsbuild: RsbuildInstance;
     getMiddlewares?: () => {
@@ -46,4 +49,4 @@ export type ExtraOptions = {
     };
 };
 export type ModernDevServerOptions<O extends ServerBaseOptions = ServerBaseOptions> = O & ExtraOptions;
-export type InitProdMiddlewares<O extends ServerBaseOptions = ServerBaseOptions> = (server: ServerBase, options: O) => Promise<ServerBase>;
+export type ApplyPlugins<O extends ServerBaseOptions = ServerBaseOptions> = (server: ServerBase, options: O, nodeServer?: NodeServer) => Promise<void>;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.53.0",
+  "version": "2.54.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -48,14 +48,14 @@
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.13.0",
-    "@modern-js/runtime-utils": "2.53.0",
-    "@modern-js/utils": "2.53.0",
-    "@modern-js/types": "2.53.0",
-    "@modern-js/server-core": "2.53.0",
-    "@modern-js/server-utils": "2.53.0"
+    "@modern-js/runtime-utils": "2.54.1",
+    "@modern-js/server-utils": "2.54.1",
+    "@modern-js/utils": "2.54.1",
+    "@modern-js/server-core": "2.54.1",
+    "@modern-js/types": "2.54.1"
   },
   "devDependencies": {
-    "@rsbuild/core": "0.7.3",
+    "@rsbuild/core": "0.7.9",
     "@types/connect-history-api-fallback": "^1.3.5",
     "@types/jest": "^29",
     "@types/minimatch": "^3.0.5",
@@ -66,10 +66,10 @@
     "ts-node": "^10.9.1",
     "tsconfig-paths": "4.1.1",
     "typescript": "^5",
-    "webpack": "^5.91.0",
+    "webpack": "^5.92.0",
     "websocket": "^1",
-    "@scripts/build": "2.53.0",
-    "@scripts/jest-config": "2.53.0"
+    "@scripts/jest-config": "2.54.1",
+    "@scripts/build": "2.54.1"
   },
   "peerDependencies": {
     "devcert": "^1.2.2",