@modern-js/server 2.5.1-alpha.0 → 2.5.1-alpha.2

package/dist/cjs/server/dev-server.js

@@ -41,6 +41,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
   constructor(options) {
     super(options);
     this.mockHandler = null;
+    this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new import_dev_middleware.default({
@@ -234,13 +235,15 @@ class ModernDevServer extends import_prod_server.ModernServer {
   }
   startWatcher() {
     var _a;
-    const { pwd, distDir } = this;
+    const { pwd, distDir, appContext } = this;
     const { mock } = import_prod_server.AGGRED_DIR;
+    const apiDir = (appContext == null ? void 0 : appContext.apiDirectory) || import_utils.API_DIR;
+    const sharedDir = (appContext == null ? void 0 : appContext.sharedDirectory) || import_utils.SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
       `${import_utils.SERVER_DIR}/**/*`,
-      `${import_utils.API_DIR}/**`,
-      `${import_utils.SHARED_DIR}/**/*`,
+      `${apiDir}/**`,
+      `${sharedDir}/**/*`,
       `${distDir}/${import_utils.SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
     const watchOptions = (0, import_watcher.mergeWatchOptions)((_a = this.conf.server) == null ? void 0 : _a.watchOptions);

package/dist/esm/server/dev-server.js

@@ -361,8 +361,10 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
         _this = _super.call(this, options);
         _defineProperty(_assertThisInitialized(_this), "mockHandler", null);
         _defineProperty(_assertThisInitialized(_this), "dev", void 0);
+        _defineProperty(_assertThisInitialized(_this), "appContext", void 0);
         _defineProperty(_assertThisInitialized(_this), "devMiddleware", void 0);
         _defineProperty(_assertThisInitialized(_this), "watcher", void 0);
+        _this.appContext = options.appContext;
         _this.workDir = _this.pwd;
         _this.dev = _this.getDevOptions(options);
         _this.devMiddleware = new DevMiddleware({
@@ -767,13 +769,15 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function startWatcher() {
                 var _this = this;
                 var _this_conf_server;
-                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir;
+                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir, appContext = _this1.appContext;
                 var mock = AGGRED_DIR.mock;
+                var apiDir = (appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory) || API_DIR;
+                var sharedDir = (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
                 var defaultWatched = [
                     "".concat(mock, "/**/*"),
                     "".concat(SERVER_DIR, "/**/*"),
-                    "".concat(API_DIR, "/**"),
-                    "".concat(SHARED_DIR, "/**/*"),
+                    "".concat(apiDir, "/**"),
+                    "".concat(sharedDir, "/**/*"),
                     "".concat(distDir, "/").concat(SERVER_BUNDLE_DIRECTORY, "/*-server-loaders.js")
                 ];
                 var watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);

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

@@ -22,6 +22,7 @@ class ModernDevServer extends ModernServer {
   constructor(options) {
     super(options);
     this.mockHandler = null;
+    this.appContext = options.appContext;
     this.workDir = this.pwd;
     this.dev = this.getDevOptions(options);
     this.devMiddleware = new DevMiddleware({
@@ -215,13 +216,15 @@ class ModernDevServer extends ModernServer {
   }
   startWatcher() {
     var _a;
-    const { pwd, distDir } = this;
+    const { pwd, distDir, appContext } = this;
     const { mock } = AGGRED_DIR;
+    const apiDir = (appContext == null ? void 0 : appContext.apiDirectory) || API_DIR;
+    const sharedDir = (appContext == null ? void 0 : appContext.sharedDirectory) || SHARED_DIR;
     const defaultWatched = [
       `${mock}/**/*`,
       `${SERVER_DIR}/**/*`,
-      `${API_DIR}/**`,
-      `${SHARED_DIR}/**/*`,
+      `${apiDir}/**`,
+      `${sharedDir}/**/*`,
       `${distDir}/${SERVER_BUNDLE_DIRECTORY}/*-server-loaders.js`
     ];
     const watchOptions = mergeWatchOptions((_a = this.conf.server) == null ? void 0 : _a.watchOptions);

package/dist/js/modern/dev-tools/dev-middleware/hmr-client/index.js

@@ -10,11 +10,14 @@ var require_hmr_client = __commonJS({
     const hadRuntimeError = false;
     const socketUrl = createSocketUrl(__resourceQuery);
     const connection = new WebSocket(socketUrl);
+    connection.onopen = function() {
+      if (typeof console !== "undefined" && typeof console.debug === "function") {
+        console.debug("[HMR] connected.");
+      }
+    };
     connection.onclose = function() {
       if (typeof console !== "undefined" && typeof console.info === "function") {
-        console.info(
-          "The development server has disconnected.\nRefresh the page if necessary."
-        );
+        console.debug("[HMR] disconnected. Refresh the page if necessary.");
       }
     };
     let isFirstCompilation = true;

package/dist/js/modern/dev-tools/mock/getMockData.js

@@ -37,7 +37,6 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import { compatRequire } from "@modern-js/utils";
 import { match } from "path-to-regexp";
 const VALID_METHODS = ["get", "post", "put", "delete", "patch"];
 const BODY_PARSED_METHODS = ["post", "put", "delete", "patch"];
@@ -51,7 +50,7 @@ const createStaticDataHandler = (method, handler) => (context) => {
   res.end(JSON.stringify(handler));
 };
 const allowTypes = ["object", "function"];
-const normalizeConfig = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
+var getMockData_default = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
   if (!allowTypes.includes(type)) {
@@ -86,14 +85,6 @@ const parseKey = (key) => {
     path: key
   };
 };
-var getMockData_default = (filepath) => {
-  const mockModule = compatRequire(filepath);
-  if (!mockModule) {
-    throw new Error(`Mock file ${filepath} parsed failed!`);
-  }
-  const data = normalizeConfig(mockModule);
-  return data;
-};
 const getMatched = (context, mockApiList) => {
   const { path: targetPathname, method: targetMethod } = context;
   const matched = mockApiList.find((mockApi) => {

package/dist/js/modern/dev-tools/mock/index.js

@@ -19,7 +19,7 @@ var __async = (__this, __arguments, generator) => {
   });
 };
 import path from "path";
-import { fs } from "@modern-js/utils";
+import { compatRequire, fs } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/prod-server";
 import getMockData, { getMatched } from "./getMockData";
 const createMockHandler = ({ pwd }) => {
@@ -35,11 +35,27 @@ const createMockHandler = ({ pwd }) => {
   if (!filepath) {
     return null;
   }
-  const apiList = getMockData(filepath);
+  const {
+    default: mockModule,
+    config
+  } = compatRequire(filepath, false);
+  if ((config == null ? void 0 : config.enable) === false) {
+    return null;
+  }
+  if (!mockModule) {
+    throw new Error(`Mock file ${filepath} parsed failed!`);
+  }
+  const apiList = getMockData(mockModule);
   if (!apiList || apiList.length === 0) {
     return null;
   }
   return (context, next) => __async(void 0, null, function* () {
+    if (typeof (config == null ? void 0 : config.enable) === "function") {
+      const enableMock = config.enable(context.req, context.res);
+      if (!enableMock) {
+        return next();
+      }
+    }
     const { res } = context;
     const matched = getMatched(context, apiList);
     if (!matched) {

package/dist/js/modern/dev-tools/register/index.js

@@ -68,6 +68,7 @@ const enableRegister = (projectRoot, config) => {
     });
     tsNode.register({
       project: tsconfigPath,
+      scope: true,
       files: true,
       transpileOnly: true,
       ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]

package/dist/js/modern/server/dev-server.js

@@ -186,6 +186,7 @@ class ModernDevServer extends ModernServer {
     }
     this.cleanSSRCache();
     this.reader.updateFile();
+    this.runner.repack();
     super.onRepack(options);
   }
   createHTTPServer(handler) {

package/dist/js/node/dev-tools/dev-middleware/hmr-client/index.js

@@ -22,11 +22,14 @@ var import_createSocketUrl = require("./createSocketUrl");
 const hadRuntimeError = false;
 const socketUrl = (0, import_createSocketUrl.createSocketUrl)(__resourceQuery);
 const connection = new WebSocket(socketUrl);
+connection.onopen = function() {
+  if (typeof console !== "undefined" && typeof console.debug === "function") {
+    console.debug("[HMR] connected.");
+  }
+};
 connection.onclose = function() {
   if (typeof console !== "undefined" && typeof console.info === "function") {
-    console.info(
-      "The development server has disconnected.\nRefresh the page if necessary."
-    );
+    console.debug("[HMR] disconnected. Refresh the page if necessary.");
   }
 };
 let isFirstCompilation = true;

package/dist/js/node/dev-tools/mock/getMockData.js

@@ -58,7 +58,6 @@ __export(getMockData_exports, {
   getMatched: () => getMatched
 });
 module.exports = __toCommonJS(getMockData_exports);
-var import_utils = require("@modern-js/utils");
 var import_path_to_regexp = require("path-to-regexp");
 const VALID_METHODS = ["get", "post", "put", "delete", "patch"];
 const BODY_PARSED_METHODS = ["post", "put", "delete", "patch"];
@@ -72,7 +71,7 @@ const createStaticDataHandler = (method, handler) => (context) => {
   res.end(JSON.stringify(handler));
 };
 const allowTypes = ["object", "function"];
-const normalizeConfig = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
+var getMockData_default = (mockConfig) => Object.keys(mockConfig).reduce((acc, key) => {
   const handler = mockConfig[key];
   const type = typeof handler;
   if (!allowTypes.includes(type)) {
@@ -107,14 +106,6 @@ const parseKey = (key) => {
     path: key
   };
 };
-var getMockData_default = (filepath) => {
-  const mockModule = (0, import_utils.compatRequire)(filepath);
-  if (!mockModule) {
-    throw new Error(`Mock file ${filepath} parsed failed!`);
-  }
-  const data = normalizeConfig(mockModule);
-  return data;
-};
 const getMatched = (context, mockApiList) => {
   const { path: targetPathname, method: targetMethod } = context;
   const matched = mockApiList.find((mockApi) => {

package/dist/js/node/dev-tools/mock/index.js

@@ -63,11 +63,27 @@ const createMockHandler = ({ pwd }) => {
   if (!filepath) {
     return null;
   }
-  const apiList = (0, import_getMockData.default)(filepath);
+  const {
+    default: mockModule,
+    config
+  } = (0, import_utils.compatRequire)(filepath, false);
+  if ((config == null ? void 0 : config.enable) === false) {
+    return null;
+  }
+  if (!mockModule) {
+    throw new Error(`Mock file ${filepath} parsed failed!`);
+  }
+  const apiList = (0, import_getMockData.default)(mockModule);
   if (!apiList || apiList.length === 0) {
     return null;
   }
   return (context, next) => __async(void 0, null, function* () {
+    if (typeof (config == null ? void 0 : config.enable) === "function") {
+      const enableMock = config.enable(context.req, context.res);
+      if (!enableMock) {
+        return next();
+      }
+    }
     const { res } = context;
     const matched = (0, import_getMockData.getMatched)(context, apiList);
     if (!matched) {

package/dist/js/node/dev-tools/register/index.js

@@ -94,6 +94,7 @@ const enableRegister = (projectRoot, config) => {
     });
     tsNode.register({
       project: tsconfigPath,
+      scope: true,
       files: true,
       transpileOnly: true,
       ignore: ["(?:^|/)node_modules/", `(?:^|/)${distPath}/`]

package/dist/js/node/server/dev-server.js

@@ -202,6 +202,7 @@ class ModernDevServer extends import_prod_server.ModernServer {
     }
     this.cleanSSRCache();
     this.reader.updateFile();
+    this.runner.repack();
     super.onRepack(options);
   }
   createHTTPServer(handler) {

package/dist/js/treeshaking/dev-tools/dev-middleware/hmr-client/index.js

@@ -95,9 +95,14 @@ var require_hmr_client = __commonJS({
         var hadRuntimeError = false;
         var socketUrl = createSocketUrl(__resourceQuery);
         var connection = new WebSocket(socketUrl);
+        connection.onopen = function() {
+            if (typeof console !== "undefined" && typeof console.debug === "function") {
+                console.debug("[HMR] connected.");
+            }
+        };
         connection.onclose = function() {
             if (typeof console !== "undefined" && typeof console.info === "function") {
-                console.info("The development server has disconnected.\nRefresh the page if necessary.");
+                console.debug("[HMR] disconnected. Refresh the page if necessary.");
             }
         };
         var isFirstCompilation = true;

package/dist/js/treeshaking/dev-tools/dev-middleware/index.js

@@ -275,9 +275,9 @@ var DevMiddleware = /*#__PURE__*/ function(EventEmitter) {
                 });
                 var _this1 = this;
                 app.on("close", /*#__PURE__*/ _asyncToGenerator(function() {
-                    var ref;
+                    var _this_middleware;
                     return __generator(this, function(_state) {
-                        (ref = _this1.middleware) === null || ref === void 0 ? void 0 : ref.close(noop);
+                        (_this_middleware = _this1.middleware) === null || _this_middleware === void 0 ? void 0 : _this_middleware.close(noop);
                         _this1.socketServer.close();
                         return [
                             2

package/dist/js/treeshaking/dev-tools/dev-middleware/socket-server.js

@@ -49,11 +49,11 @@ var SocketServer = /*#__PURE__*/ function() {
             key: "prepare",
             value: function prepare(app) {
                 var _this = this;
-                var ref;
+                var _this_options_client;
                 this.app = app;
                 this.wsServer = new ws.Server({
                     noServer: true,
-                    path: (ref = this.options.client) === null || ref === void 0 ? void 0 : ref.path
+                    path: (_this_options_client = this.options.client) === null || _this_options_client === void 0 ? void 0 : _this_options_client.path
                 });
                 this.app.on("upgrade", function(req, sock, head) {
                     if (!_this.wsServer.shouldHandle(req)) {

package/dist/js/treeshaking/dev-tools/mock/getMockData.js

@@ -224,7 +224,6 @@ var __generator = this && this.__generator || function(thisArg, body) {
         };
     }
 };
-import { compatRequire } from "@modern-js/utils";
 import { match } from "path-to-regexp";
 var VALID_METHODS = [
     "get",
@@ -267,7 +266,7 @@ var allowTypes = [
     "object",
     "function"
 ];
-var normalizeConfig = function(mockConfig) {
+var getMockData_default = function(mockConfig) {
     return Object.keys(mockConfig).reduce(function(acc, key) {
         var handler = mockConfig[key];
         var type = typeof handler === "undefined" ? "undefined" : _typeof(handler);
@@ -302,14 +301,6 @@ var parseKey = function(key) {
         path: key
     };
 };
-var getMockData_default = function(filepath) {
-    var mockModule = compatRequire(filepath);
-    if (!mockModule) {
-        throw new Error("Mock file ".concat(filepath, " parsed failed!"));
-    }
-    var data = normalizeConfig(mockModule);
-    return data;
-};
 var getMatched = function(context, mockApiList) {
     var targetPathname = context.path, targetMethod = context.method;
     var matched = mockApiList.find(function(mockApi) {

package/dist/js/treeshaking/dev-tools/mock/index.js

@@ -123,7 +123,7 @@ var __generator = this && this.__generator || function(thisArg, body) {
     }
 };
 import path from "path";
-import { fs } from "@modern-js/utils";
+import { compatRequire, fs } from "@modern-js/utils";
 import { AGGRED_DIR } from "@modern-js/prod-server";
 import getMockData, { getMatched } from "./getMockData";
 var createMockHandler = function(param) {
@@ -160,14 +160,30 @@ var createMockHandler = function(param) {
     if (!filepath) {
         return null;
     }
-    var apiList = getMockData(filepath);
+    var _compatRequire = compatRequire(filepath, false), mockModule = _compatRequire.default, config = _compatRequire.config;
+    if ((config === null || config === void 0 ? void 0 : config.enable) === false) {
+        return null;
+    }
+    if (!mockModule) {
+        throw new Error("Mock file ".concat(filepath, " parsed failed!"));
+    }
+    var apiList = getMockData(mockModule);
     if (!apiList || apiList.length === 0) {
         return null;
     }
     return function() {
         var _ref = _asyncToGenerator(function(context, next) {
-            var res, matched;
+            var enableMock, res, matched;
             return __generator(this, function(_state) {
+                if (typeof (config === null || config === void 0 ? void 0 : config.enable) === "function") {
+                    enableMock = config.enable(context.req, context.res);
+                    if (!enableMock) {
+                        return [
+                            2,
+                            next()
+                        ];
+                    }
+                }
                 res = context.res;
                 matched = getMatched(context, apiList);
                 if (!matched) {

package/dist/js/treeshaking/dev-tools/register/index.js

@@ -80,9 +80,9 @@ var enableRegister = function(projectRoot, config) {
         projectRoot
     ]);
     if (isTsProject && existTsNode && existTsConfigPaths) {
-        var ref;
+        var _config_output_distPath;
         debug("use ts-node");
-        var distPath = ((ref = config.output.distPath) === null || ref === void 0 ? void 0 : ref.root) || "dist";
+        var distPath = ((_config_output_distPath = config.output.distPath) === null || _config_output_distPath === void 0 ? void 0 : _config_output_distPath.root) || "dist";
         var tsNode = require("ts-node");
         var tsConfigPaths = require("tsconfig-paths");
         var alias = config.source.alias;
@@ -90,7 +90,7 @@ var enableRegister = function(projectRoot, config) {
             appDirectory: projectRoot,
             tsconfigPath: tsconfigPath
         });
-        var _paths = aliasConfig.paths, paths = _paths === void 0 ? {} : _paths, _absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _absoluteBaseUrl === void 0 ? "./" : _absoluteBaseUrl;
+        var _aliasConfig_paths = aliasConfig.paths, paths = _aliasConfig_paths === void 0 ? {} : _aliasConfig_paths, _aliasConfig_absoluteBaseUrl = aliasConfig.absoluteBaseUrl, absoluteBaseUrl = _aliasConfig_absoluteBaseUrl === void 0 ? "./" : _aliasConfig_absoluteBaseUrl;
         var tsPaths = Object.keys(paths).reduce(function(o, key) {
             var tsPath = paths[key];
             if (typeof tsPath === "string" && path.isAbsolute(tsPath)) {
@@ -109,6 +109,7 @@ var enableRegister = function(projectRoot, config) {
         });
         tsNode.register({
             project: tsconfigPath,
+            scope: true,
             files: true,
             transpileOnly: true,
             ignore: [
@@ -117,12 +118,12 @@ var enableRegister = function(projectRoot, config) {
             ]
         });
     } else {
-        var ref1, ref2;
+        var _config_tools, _config_server;
         debug("use @babel/register");
         var babelConfig = resolveBabelConfig(projectRoot, _objectSpreadProps(_objectSpread({}, config.source), {
-            babelConfig: (ref1 = config.tools) === null || ref1 === void 0 ? void 0 : ref1.babel,
+            babelConfig: (_config_tools = config.tools) === null || _config_tools === void 0 ? void 0 : _config_tools.babel,
             server: {
-                compiler: (ref2 = config.server) === null || ref2 === void 0 ? void 0 : ref2.compiler
+                compiler: (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.compiler
             }
         }), {
             tsconfigPath: tsconfigPath,

package/dist/js/treeshaking/dev-tools/watcher/index.js

@@ -154,15 +154,15 @@ var Watcher = /*#__PURE__*/ function() {
         {
             key: "updateDepTree",
             value: function updateDepTree() {
-                var ref;
-                (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.update(require.cache);
+                var _this_dependencyTree;
+                (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.update(require.cache);
             }
         },
         {
             key: "cleanDepCache",
             value: function cleanDepCache(filepath) {
-                var ref;
-                var node = (ref = this.dependencyTree) === null || ref === void 0 ? void 0 : ref.getNode(filepath);
+                var _this_dependencyTree;
+                var node = (_this_dependencyTree = this.dependencyTree) === null || _this_dependencyTree === void 0 ? void 0 : _this_dependencyTree.getNode(filepath);
                 if (node && require.cache[filepath]) {
                     delete require.cache[filepath];
                     var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;

package/dist/js/treeshaking/dev-tools/watcher/stats-cache.js

@@ -43,7 +43,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "add",
             value: function add(files) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                 try {
                     for(var _iterator = files[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
@@ -75,7 +75,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "refresh",
             value: function refresh(filename) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 if (fs.existsSync(filename)) {
                     var stats = fs.statSync(filename);
                     if (stats.isFile()) {
@@ -97,7 +97,7 @@ var StatsCache = /*#__PURE__*/ function() {
         {
             key: "isDiff",
             value: function isDiff(filename) {
-                var ref = this, cachedHash = ref.cachedHash, cachedSize = ref.cachedSize;
+                var _this = this, cachedHash = _this.cachedHash, cachedSize = _this.cachedSize;
                 var stats = fs.statSync(filename);
                 var hash = cachedHash[filename];
                 var size = cachedSize[filename];

package/dist/js/treeshaking/server/dev-server.js

@@ -438,13 +438,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     return _get(_getPrototypeOf(ModernDevServer.prototype), "onInit", _this);
                 };
                 return _asyncToGenerator(function() {
-                    var dev, ref, befores, afters, beforeHandlers, afterHandlers;
+                    var dev, _this_applySetupMiddlewares, befores, afters, beforeHandlers, afterHandlers;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
                                 _this1.runner = runner;
                                 dev = _this1.dev;
-                                ref = _this1.applySetupMiddlewares(), befores = ref.befores, afters = ref.afters;
+                                _this_applySetupMiddlewares = _this1.applySetupMiddlewares(), befores = _this_applySetupMiddlewares.befores, afters = _this_applySetupMiddlewares.afters;
                                 return [
                                     4,
                                     _this1.setupBeforeDevMiddleware()
@@ -474,13 +474,13 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                 if (dev.watch) {
                                     _this1.startWatcher();
                                     app.on("close", /*#__PURE__*/ _asyncToGenerator(function() {
-                                        var ref;
+                                        var _this_watcher;
                                         return __generator(this, function(_state) {
                                             switch(_state.label){
                                                 case 0:
                                                     return [
                                                         4,
-                                                        (ref = _this1.watcher) === null || ref === void 0 ? void 0 : ref.close()
+                                                        (_this_watcher = _this1.watcher) === null || _this_watcher === void 0 ? void 0 : _this_watcher.close()
                                                     ];
                                                 case 1:
                                                     _state.sent();
@@ -504,7 +504,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             value: function applyDefaultMiddlewares(app) {
                 var _this = this;
                 return _asyncToGenerator(function() {
-                    var pwd, dev, devMiddleware, proxyHandlers, ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
+                    var pwd, dev, devMiddleware, proxyHandlers, _ref, connectHistoryApiFallback, historyApiFallbackMiddleware;
                     return __generator(this, function(_state) {
                         switch(_state.label){
                             case 0:
@@ -519,7 +519,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                         var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
                                         try {
                                             for(var _iterator = Object.entries(confHeaders)[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
-                                                var _value = _slicedToArray(_step.value, 2), key = _value[0], value = _value[1];
+                                                var _step_value = _slicedToArray(_step.value, 2), key = _step_value[0], value = _step_value[1];
                                                 ctx.res.setHeader(key, value);
                                             }
                                         } catch (err) {
@@ -582,7 +582,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                                     import("connect-history-api-fallback")
                                 ];
                             case 1:
-                                ref = _state.sent(), connectHistoryApiFallback = ref.default;
+                                _ref = _state.sent(), connectHistoryApiFallback = _ref.default;
                                 historyApiFallbackMiddleware = connectHistoryApiFallback(typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback);
                                 _this.addHandler(function(ctx, next) {
                                     return historyApiFallbackMiddleware(ctx.req, ctx.res, next);
@@ -606,6 +606,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                 }
                 this.cleanSSRCache();
                 this.reader.updateFile();
+                this.runner.repack();
                 _get(_getPrototypeOf(ModernDevServer.prototype), "onRepack", this).call(this, options);
             }
         },
@@ -765,8 +766,8 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
             key: "startWatcher",
             value: function startWatcher() {
                 var _this = this;
-                var ref;
-                var ref1 = this, pwd = ref1.pwd, distDir = ref1.distDir;
+                var _this_conf_server;
+                var _this1 = this, pwd = _this1.pwd, distDir = _this1.distDir;
                 var mock = AGGRED_DIR.mock;
                 var defaultWatched = [
                     "".concat(mock, "/**/*"),
@@ -775,7 +776,7 @@ var ModernDevServer = /*#__PURE__*/ function(ModernServer) {
                     "".concat(SHARED_DIR, "/**/*"),
                     "".concat(distDir, "/").concat(SERVER_BUNDLE_DIRECTORY, "/*-server-loaders.js")
                 ];
-                var watchOptions = mergeWatchOptions((ref = this.conf.server) === null || ref === void 0 ? void 0 : ref.watchOptions);
+                var watchOptions = mergeWatchOptions((_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.watchOptions);
                 var defaultWatchedPaths = defaultWatched.map(function(p) {
                     var finalPath = path.isAbsolute(p) ? p : path.join(pwd, p);
                     return path.normalize(finalPath);

package/dist/types/server/dev-server.d.ts

@@ -7,6 +7,7 @@ import type { ModernDevServerOptions } from '../types';
 export declare class ModernDevServer extends ModernServer {
   private mockHandler;
   private readonly dev;
+  private readonly appContext;
   private readonly devMiddleware;
   private watcher?;
   constructor(options: ModernDevServerOptions);

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.5.1-alpha.0",
+  "version": "2.5.1-alpha.2",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -29,17 +29,17 @@
   "dependencies": {
     "@babel/core": "^7.18.0",
     "@babel/register": "^7.17.7",
-    "@modern-js/prod-server": "2.5.0",
-    "@modern-js/server-utils": "2.5.0",
-    "@modern-js/types": "2.5.0",
-    "@modern-js/utils": "2.5.0",
+    "@modern-js/prod-server": "2.5.1-alpha.3",
+    "@modern-js/server-utils": "2.5.1-alpha.0",
+    "@modern-js/types": "2.5.1-alpha.0",
+    "@modern-js/utils": "2.5.1-alpha.2",
     "connect-history-api-fallback": "^2.0.0",
     "minimatch": "^3.0.4",
     "path-to-regexp": "^6.2.0",
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/server-core": "2.5.0",
+    "@modern-js/server-core": "2.5.1-alpha.0",
     "@scripts/build": "2.5.0",
     "@scripts/jest-config": "2.5.0",
     "@types/connect-history-api-fallback": "^1.3.5",