@modern-js/server 1.4.22-beta.0 → 1.4.22-beta.1

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

@@ -138,10 +138,10 @@ export class ModernDevServer extends ModernServer {
   }
 
   async onClose() {
-    var _this$watcher, _this$socketServer;
+    var _this$socketServer;
 
     await super.onClose();
-    await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
+    await this.watcher.close();
     await new Promise(resolve => {
       if (this.devMiddleware) {
         this.devMiddleware.close(() => {
@@ -349,15 +349,23 @@ export class ModernDevServer extends ModernServer {
       mock
     } = AGGRED_DIR;
     const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`];
+    const defaultWatchOptions = {
+      // 初始化的时候不触发 add、addDir 事件
+      ignoreInitial: true,
+      ignored: /api\/typings\/.*/
+    };
+    const {
+      watchOptions
+    } = this.conf.server;
+
+    const finalWatchOptions = _objectSpread(_objectSpread({}, defaultWatchOptions), watchOptions);
+
     const defaultWatchedPaths = defaultWatched.map(p => path.normalize(path.join(pwd, p)));
+    console.log('finalWatchOptions', finalWatchOptions);
     const watcher = new Watcher();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
-    watcher.listen(defaultWatchedPaths, {
-      // 初始化的时候不触发 add、addDir 事件
-      ignoreInitial: true,
-      ignored: /api\/typings\/.*/
-    }, filepath => {
+    watcher.listen(defaultWatchedPaths, finalWatchOptions, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
       this.onServerChange({

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

@@ -159,10 +159,10 @@ class ModernDevServer extends _prodServer.ModernServer {
   }
 
   async onClose() {
-    var _this$watcher, _this$socketServer;
+    var _this$socketServer;
 
     await super.onClose();
-    await ((_this$watcher = this.watcher) === null || _this$watcher === void 0 ? void 0 : _this$watcher.close());
+    await this.watcher.close();
     await new Promise(resolve => {
       if (this.devMiddleware) {
         this.devMiddleware.close(() => {
@@ -372,15 +372,23 @@ class ModernDevServer extends _prodServer.ModernServer {
       mock
     } = _prodServer.AGGRED_DIR;
     const defaultWatched = [`${mock}/**/*`, `${_utils.SERVER_DIR}/**/*`, `${_utils.API_DIR}/**`, `${_utils.SHARED_DIR}/**/*`];
+    const defaultWatchOptions = {
+      // 初始化的时候不触发 add、addDir 事件
+      ignoreInitial: true,
+      ignored: /api\/typings\/.*/
+    };
+    const {
+      watchOptions
+    } = this.conf.server;
+
+    const finalWatchOptions = _objectSpread(_objectSpread({}, defaultWatchOptions), watchOptions);
+
     const defaultWatchedPaths = defaultWatched.map(p => _path.default.normalize(_path.default.join(pwd, p)));
+    console.log('finalWatchOptions', finalWatchOptions);
     const watcher = new _watcher.default();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
-    watcher.listen(defaultWatchedPaths, {
-      // 初始化的时候不触发 add、addDir 事件
-      ignoreInitial: true,
-      ignored: /api\/typings\/.*/
-    }, filepath => {
+    watcher.listen(defaultWatchedPaths, finalWatchOptions, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
       this.onServerChange({

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

@@ -8,7 +8,7 @@ export declare class ModernDevServer extends ModernServer {
   private readonly dev;
   private readonly compiler?;
   private socketServer;
-  private watcher?;
+  private watcher;
   private devMiddleware;
   constructor(options: ModernDevServerOptions);
   private getDevOptions;

package/package.json

@@ -11,7 +11,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "1.4.22-beta.0",
+  "version": "1.4.22-beta.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/js/node/index.js",
@@ -41,7 +41,7 @@
     "ws": "^8.2.0"
   },
   "devDependencies": {
-    "@modern-js/core": "1.12.1",
+    "@modern-js/core": "1.12.2-beta.0",
     "@modern-js/server-core": "1.3.5",
     "@modern-js/types": "1.5.4",
     "@scripts/build": "0.0.0",