@modern-js/server 2.4.0 → 2.5.0

package/dist/{js/node → cjs}/server/dev-server.js

@@ -1,27 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
-var __propIsEnum = Object.prototype.propertyIsEnumerable;
-var __reflectGet = Reflect.get;
-var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
-var __spreadValues = (a, b) => {
-  for (var prop in b || (b = {}))
-    if (__hasOwnProp.call(b, prop))
-      __defNormalProp(a, prop, b[prop]);
-  if (__getOwnPropSymbols)
-    for (var prop of __getOwnPropSymbols(b)) {
-      if (__propIsEnum.call(b, prop))
-        __defNormalProp(a, prop, b[prop]);
-    }
-  return a;
-};
-var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -39,27 +21,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   mod
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __superGet = (cls, obj, key) => __reflectGet(__getProtoOf(cls), key, obj);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var dev_server_exports = {};
 __export(dev_server_exports, {
   ModernDevServer: () => ModernDevServer
@@ -91,9 +52,14 @@ class ModernDevServer extends import_prod_server.ModernServer {
   getDevOptions(options) {
     const devOptions = typeof options.dev === "boolean" ? {} : options.dev;
     const defaultOptions = (0, import_constants2.getDefaultDevOptions)();
-    return __spreadProps(__spreadValues(__spreadValues({}, defaultOptions), devOptions), {
-      client: __spreadValues(__spreadValues({}, defaultOptions.client), devOptions == null ? void 0 : devOptions.client)
-    });
+    return {
+      ...defaultOptions,
+      ...devOptions,
+      client: {
+        ...defaultOptions.client,
+        ...devOptions == null ? void 0 : devOptions.client
+      }
+    };
   }
   addMiddlewareHandler(handlers) {
     handlers.forEach((handler) => {
@@ -121,80 +87,76 @@ class ModernDevServer extends import_prod_server.ModernServer {
     });
     return { befores, afters };
   }
-  onInit(runner, app) {
-    return __async(this, null, function* () {
-      this.runner = runner;
-      const { dev } = this;
-      const { befores, afters } = this.applySetupMiddlewares();
-      const beforeHandlers = yield this.setupBeforeDevMiddleware();
-      this.addMiddlewareHandler([...beforeHandlers, ...befores]);
-      yield this.applyDefaultMiddlewares(app);
-      const afterHandlers = yield this.setupAfterDevMiddleware();
-      this.addMiddlewareHandler([...afters, ...afterHandlers]);
-      yield __superGet(ModernDevServer.prototype, this, "onInit").call(this, runner, app);
-      if (dev.watch) {
-        this.startWatcher();
-        app.on("close", () => __async(this, null, function* () {
-          var _a;
-          yield (_a = this.watcher) == null ? void 0 : _a.close();
-        }));
-      }
-    });
+  async onInit(runner, app) {
+    this.runner = runner;
+    const { dev } = this;
+    const { befores, afters } = this.applySetupMiddlewares();
+    const beforeHandlers = await this.setupBeforeDevMiddleware();
+    this.addMiddlewareHandler([...beforeHandlers, ...befores]);
+    await this.applyDefaultMiddlewares(app);
+    const afterHandlers = await this.setupAfterDevMiddleware();
+    this.addMiddlewareHandler([...afters, ...afterHandlers]);
+    await super.onInit(runner, app);
+    if (dev.watch) {
+      this.startWatcher();
+      app.on("close", async () => {
+        var _a;
+        await ((_a = this.watcher) == null ? void 0 : _a.close());
+      });
+    }
   }
-  applyDefaultMiddlewares(app) {
-    return __async(this, null, function* () {
-      const { pwd, dev, devMiddleware } = this;
-      this.addHandler((ctx, next) => {
-        ctx.res.setHeader("Access-Control-Allow-Origin", "*");
-        if (ctx.path.includes("hot-update")) {
-          ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
-        }
-        const confHeaders = dev.headers;
-        if (confHeaders) {
-          for (const [key, value] of Object.entries(confHeaders)) {
-            ctx.res.setHeader(key, value);
-          }
+  async applyDefaultMiddlewares(app) {
+    const { pwd, dev, devMiddleware } = this;
+    this.addHandler((ctx, next) => {
+      ctx.res.setHeader("Access-Control-Allow-Origin", "*");
+      if (ctx.path.includes("hot-update")) {
+        ctx.res.setHeader("Access-Control-Allow-Credentials", "false");
+      }
+      const confHeaders = dev.headers;
+      if (confHeaders) {
+        for (const [key, value] of Object.entries(confHeaders)) {
+          ctx.res.setHeader(key, value);
         }
+      }
+      next();
+    });
+    this.mockHandler = (0, import_mock.createMockHandler)({ pwd });
+    this.addHandler((ctx, next) => {
+      if (this.mockHandler) {
+        this.mockHandler(ctx, next);
+      } else {
         next();
-      });
-      this.mockHandler = (0, import_mock.createMockHandler)({ pwd });
-      this.addHandler((ctx, next) => {
-        if (this.mockHandler) {
-          this.mockHandler(ctx, next);
-        } else {
-          next();
-        }
-      });
-      const proxyHandlers = (0, import_prod_server.createProxyHandler)(dev.proxy);
-      if (proxyHandlers) {
-        proxyHandlers.forEach((handler) => {
-          this.addHandler(handler);
-        });
       }
-      devMiddleware.init(app);
-      devMiddleware.on("change", (stats) => {
-        if (stats.toJson({ all: false }).name === "client") {
-          this.onRepack({ routes: this.getRoutes() });
-        }
-      });
-      this.addHandler((ctx, next) => {
-        const { req, res } = ctx;
-        if (devMiddleware.middleware) {
-          devMiddleware.middleware(req, res, next);
-        } else {
-          next();
-        }
+    });
+    const proxyHandlers = (0, import_prod_server.createProxyHandler)(dev.proxy);
+    if (proxyHandlers) {
+      proxyHandlers.forEach((handler) => {
+        this.addHandler(handler);
       });
-      if (dev.historyApiFallback) {
-        const { default: connectHistoryApiFallback } = yield Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
-        const historyApiFallbackMiddleware = connectHistoryApiFallback(
-          typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
-        );
-        this.addHandler(
-          (ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next)
-        );
+    }
+    devMiddleware.init(app);
+    devMiddleware.on("change", (stats) => {
+      if (stats.toJson({ all: false }).name === "client") {
+        this.onRepack({ routes: this.getRoutes() });
       }
     });
+    this.addHandler((ctx, next) => {
+      const { req, res } = ctx;
+      if (devMiddleware.middleware) {
+        devMiddleware.middleware(req, res, next);
+      } else {
+        next();
+      }
+    });
+    if (dev.historyApiFallback) {
+      const { default: connectHistoryApiFallback } = await Promise.resolve().then(() => __toESM(require("connect-history-api-fallback")));
+      const historyApiFallbackMiddleware = connectHistoryApiFallback(
+        typeof dev.historyApiFallback === "boolean" ? {} : dev.historyApiFallback
+      );
+      this.addHandler(
+        (ctx, next) => historyApiFallbackMiddleware(ctx.req, ctx.res, next)
+      );
+    }
   }
   onRepack(options = {}) {
     if (Array.isArray(options.routes)) {
@@ -202,20 +164,19 @@ class ModernDevServer extends import_prod_server.ModernServer {
     }
     this.cleanSSRCache();
     this.reader.updateFile();
+    this.runner.repack();
     super.onRepack(options);
   }
-  createHTTPServer(handler) {
-    return __async(this, null, function* () {
-      const { dev } = this;
-      const devHttpsOption = typeof dev === "object" && dev.https;
-      if (devHttpsOption) {
-        const { genHttpsOptions } = require("../dev-tools/https");
-        const httpsOptions = yield genHttpsOptions(devHttpsOption, this.pwd);
-        return (0, import_https.createServer)(httpsOptions, handler);
-      } else {
-        return (0, import_http.createServer)(handler);
-      }
-    });
+  async createHTTPServer(handler) {
+    const { dev } = this;
+    const devHttpsOption = typeof dev === "object" && dev.https;
+    if (devHttpsOption) {
+      const { genHttpsOptions } = require("../dev-tools/https");
+      const httpsOptions = await genHttpsOptions(devHttpsOption, this.pwd);
+      return (0, import_https.createServer)(httpsOptions, handler);
+    } else {
+      return (0, import_http.createServer)(handler);
+    }
   }
   warmupSSRBundle() {
   }
@@ -245,21 +206,17 @@ class ModernDevServer extends import_prod_server.ModernServer {
   createContext(req, res) {
     return super.createContext(req, res, { etag: true });
   }
-  setupBeforeDevMiddleware() {
-    return __async(this, null, function* () {
-      const { runner, conf, dev } = this;
-      const setupMids = dev.before || [];
-      const pluginMids = yield runner.beforeDevServer(conf);
-      return [...setupMids, ...pluginMids].flat();
-    });
+  async setupBeforeDevMiddleware() {
+    const { runner, conf, dev } = this;
+    const setupMids = dev.before || [];
+    const pluginMids = await runner.beforeDevServer(conf);
+    return [...setupMids, ...pluginMids].flat();
   }
-  setupAfterDevMiddleware() {
-    return __async(this, null, function* () {
-      const { runner, conf, dev } = this;
-      const setupMids = dev.after || [];
-      const pluginMids = yield runner.afterDevServer(conf);
-      return [...pluginMids, ...setupMids].flat();
-    });
+  async setupAfterDevMiddleware() {
+    const { runner, conf, dev } = this;
+    const setupMids = dev.after || [];
+    const pluginMids = await runner.afterDevServer(conf);
+    return [...pluginMids, ...setupMids].flat();
   }
   cleanSSRCache() {
     const { distDir } = this;

package/dist/{js/treeshaking → esm}/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 → esm}/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 → esm}/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 → esm}/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 → esm}/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 → esm}/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 → esm}/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 → esm}/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);