@modern-js/server 1.4.4 → 1.4.7-canary.0

package/CHANGELOG.md

@@ -1,5 +1,19 @@
 # @modern-js/server
 
+## 1.4.6
+
+### Patch Changes
+
+- a78e32d8: remove server hook when api only
+- 59010b7a: rewrite server lifecycle, add unit test
+- Updated dependencies [a78e32d8]
+- Updated dependencies [e11eaafc]
+- Updated dependencies [cbba492b]
+- Updated dependencies [db43dce6]
+- Updated dependencies [59010b7a]
+  - @modern-js/prod-server@1.0.2
+  - @modern-js/utils@1.3.4
+
 ## 1.4.4
 
 ### Patch Changes

package/dist/js/modern/constants.js

@@ -0,0 +1,17 @@
+import { HMR_SOCK_PATH } from '@modern-js/utils';
+export const DEFAULT_DEV_OPTIONS = {
+  client: {
+    port: '8080',
+    overlay: false,
+    logging: 'none',
+    path: HMR_SOCK_PATH,
+    host: 'localhost'
+  },
+  https: false,
+  dev: {
+    writeToDisk: true
+  },
+  watch: true,
+  hot: true,
+  liveReload: true
+};

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

@@ -37,11 +37,7 @@ export const createMockHandler = ({
       return next();
     }
 
-    if (matched) {
-      res.setHeader('Access-Control-Allow-Origin', '*');
-      return matched.handler(context, next);
-    } else {
-      return next();
-    }
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    return matched.handler(context, next);
   };
 };

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

@@ -1,4 +1,5 @@
 import path from 'path';
+import { fs } from '@modern-js/utils';
 import chokidar from 'chokidar';
 import { DependencyTree } from "./dependency-tree";
 import { StatsCache } from "./stats-cache";
@@ -27,7 +28,7 @@ export default class Watcher {
       cache.add(getWatchedFiles(watcher));
     });
     watcher.on('change', changed => {
-      if (cache.isDiff(changed)) {
+      if (!fs.existsSync(changed) || cache.isDiff(changed)) {
         cache.refresh(changed);
         callback(changed);
       }

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

@@ -1,28 +1,43 @@
+import { RUN_MODE } from '@modern-js/prod-server';
 import { ModernDevServer } from "./dev-server";
 export class ModernSSRDevServer extends ModernDevServer {
   prepareAPIHandler(_m, _) {
     return null;
   }
 
-  async prepareWebHandler(extension) {
-    return super.prepareWebHandler(extension);
+  filterRoutes(routes) {
+    return routes.filter(route => route.isSSR);
   }
 
-  filterRoutes(routes) {
-    return routes.filter(route => route.entryName);
+  async preServerInit() {
+    if (this.runMode === RUN_MODE.FULL) {
+      await super.preServerInit();
+    }
+  }
+
+  async emitRouteHook(_, _input) {
+    if (this.runMode === RUN_MODE.FULL) {
+      await super.emitRouteHook(_, _input);
+    }
   }
 
 }
 export class ModernAPIDevServer extends ModernDevServer {
-  async prepareAPIHandler(mode, extension) {
-    return super.prepareAPIHandler(mode, extension);
+  prepareWebHandler(_) {
+    return null;
   }
 
   filterRoutes(routes) {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {// noop
+  async preServerInit() {
+    if (this.runMode === RUN_MODE.FULL) {
+      await super.preServerInit();
+    }
+  }
+
+  async emitRouteHook(_, _input) {// empty
   }
 
 }

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

@@ -7,35 +7,20 @@ function _defineProperty(obj, key, value) { if (key in obj) { Object.definePrope
 import { createServer } from 'http';
 import path from 'path';
 import { createServer as createHttpsServer } from 'https';
-import { API_DIR, HMR_SOCK_PATH, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
+import { API_DIR, SERVER_DIR, SHARED_DIR } from '@modern-js/utils';
 import webpackDevMiddleware from 'webpack-dev-middleware';
 import { createProxyHandler, ModernServer, AGGRED_DIR } from '@modern-js/prod-server';
+import { DEFAULT_DEV_OPTIONS } from "../constants";
 import { createMockHandler } from "../dev-tools/mock";
 import SocketServer from "../dev-tools/socket-server";
 import DevServerPlugin from "../dev-tools/dev-server-plugin";
 import { createLaunchEditorHandler } from "../dev-tools/launch-editor";
 import { enableRegister } from "../dev-tools/babel/register";
 import Watcher from "../dev-tools/watcher";
-const DEFAULT_DEV_OPTIONS = {
-  client: {
-    port: '8080',
-    overlay: false,
-    logging: 'none',
-    path: HMR_SOCK_PATH,
-    host: 'localhost'
-  },
-  https: false,
-  dev: {
-    writeToDisk: true
-  },
-  watch: true,
-  hot: true,
-  liveReload: true
-};
 export class ModernDevServer extends ModernServer {
   constructor(options) {
-    super(options);
-    this.devProxyHandler = null;
+    super(options); // dev server should work in pwd
+
     this.mockHandler = null;
     this.dev = void 0;
     this.compiler = void 0;
@@ -46,27 +31,25 @@ export class ModernDevServer extends ModernServer {
 
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
-    this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), options.dev);
+    this.dev = _objectSpread(_objectSpread({}, DEFAULT_DEV_OPTIONS), typeof options.dev === 'boolean' ? {} : options.dev);
     enableRegister(this.pwd, this.conf);
   } // Complete the preparation of services
 
 
-  async init(runner) {
+  async onInit(runner) {
     var _conf$tools, _conf$tools$devServer;
 
     const {
       conf,
       pwd,
-      compiler
+      compiler,
+      dev
     } = this; // mock handler
 
     this.mockHandler = createMockHandler({
       pwd
     });
     this.addHandler((ctx, next) => {
-      ctx.res.setHeader('Access-Control-Allow-Origin', '*');
-      ctx.res.setHeader('Access-Control-Allow-Credentials', 'false');
-
       if (this.mockHandler) {
         this.mockHandler(ctx, next);
       } else {
@@ -74,10 +57,10 @@ export class ModernDevServer extends ModernServer {
       }
     }); // dev proxy handler, each proxy has own handler
 
-    this.devProxyHandler = createProxyHandler((_conf$tools = conf.tools) === null || _conf$tools === void 0 ? void 0 : (_conf$tools$devServer = _conf$tools.devServer) === null || _conf$tools$devServer === void 0 ? void 0 : _conf$tools$devServer.proxy);
+    const proxyHandlers = createProxyHandler((_conf$tools = conf.tools) === null || _conf$tools === void 0 ? void 0 : (_conf$tools$devServer = _conf$tools.devServer) === null || _conf$tools$devServer === void 0 ? void 0 : _conf$tools$devServer.proxy);
 
-    if (this.devProxyHandler) {
-      this.devProxyHandler.forEach(handler => {
+    if (proxyHandlers) {
+      proxyHandlers.forEach(handler => {
         this.addHandler(handler);
       });
     } // do webpack build / plugin apply / socket server when pass compiler instance
@@ -85,7 +68,7 @@ export class ModernDevServer extends ModernServer {
 
     if (compiler) {
       // init socket server
-      this.socketServer = new SocketServer(this.dev); // open file in edtor.
+      this.socketServer = new SocketServer(dev); // open file in edtor.
 
       this.addHandler(createLaunchEditorHandler()); // setup compiler in server, also add dev-middleware to handler static file in memory
 
@@ -93,32 +76,17 @@ export class ModernDevServer extends ModernServer {
       this.addHandler(devMiddlewareHandler);
     }
 
-    await super.init(runner); // watch mock/ server/ api/ dir file change
+    await super.onInit(runner); // watch mock/ server/ api/ dir file change
 
-    if (this.dev.watch) {
+    if (dev.watch) {
       this.startWatcher();
     }
   }
 
-  ready(options = {}) {
-    // reset the routing management instance every times the service starts
-    this.router.reset(this.filterRoutes(options.routes || this.presetRoutes || []));
-    this.cleanSSRCache(); // reset static file
-
-    this.reader.updateFile();
-    this.runner.reset();
-  }
-
-  onListening(app) {
+  async onClose() {
     var _this$socketServer;
 
-    (_this$socketServer = this.socketServer) === null || _this$socketServer === void 0 ? void 0 : _this$socketServer.prepare(app);
-  }
-
-  async close() {
-    var _this$socketServer2;
-
-    super.close();
+    await super.onClose();
     await this.watcher.close();
     await new Promise(resolve => {
       if (this.devMiddleware) {
@@ -129,7 +97,28 @@ export class ModernDevServer extends ModernServer {
         resolve();
       }
     });
-    (_this$socketServer2 = this.socketServer) === null || _this$socketServer2 === void 0 ? void 0 : _this$socketServer2.close();
+    (_this$socketServer = this.socketServer) === null || _this$socketServer === void 0 ? void 0 : _this$socketServer.close();
+  }
+
+  onRepack(options = {}) {
+    // reset the routing management instance every times the service starts
+    if (Array.isArray(options.routes)) {
+      this.router.reset(this.filterRoutes(options.routes));
+    } // clean ssr bundle cache
+
+
+    this.cleanSSRCache(); // reset static file
+
+    this.reader.updateFile(); // emit reset hook
+
+    this.runner.reset();
+    super.onRepack(options);
+  }
+
+  onListening(app) {
+    var _this$socketServer2;
+
+    (_this$socketServer2 = this.socketServer) === null || _this$socketServer2 === void 0 ? void 0 : _this$socketServer2.prepare(app);
   }
 
   async createHTTPServer(handler) {
@@ -150,7 +139,34 @@ export class ModernDevServer extends ModernServer {
     }
   }
 
-  warmupSSRBundle() {// empty
+  warmupSSRBundle() {// not warmup ssr bundle on development
+  }
+
+  onServerChange({
+    filepath
+  }) {
+    const {
+      pwd
+    } = this;
+    const {
+      mock
+    } = AGGRED_DIR;
+    const mockPath = path.normalize(path.join(pwd, mock));
+    this.runner.reset();
+
+    if (filepath.startsWith(mockPath)) {
+      this.mockHandler = createMockHandler({
+        pwd
+      });
+    } else {
+      try {
+        super.onServerChange({
+          filepath
+        });
+      } catch (e) {
+        this.logger.error(e);
+      }
+    }
   } // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -201,8 +217,8 @@ export class ModernDevServer extends ModernServer {
         if (stats.toJson({
           all: false
         }).name === 'client') {
-          this.ready({
-            routes: this.readRouteSpec()
+          this.onRepack({
+            routes: this.getRoutes()
           });
         }
       });
@@ -253,7 +269,6 @@ export class ModernDevServer extends ModernServer {
     } = AGGRED_DIR;
     const defaultWatched = [`${mock}/**/*`, `${SERVER_DIR}/**/*`, `${API_DIR}/**`, `${SHARED_DIR}/**/*`];
     const defaultWatchedPaths = defaultWatched.map(p => path.normalize(path.join(pwd, p)));
-    const mockPath = path.normalize(path.join(pwd, mock));
     const watcher = new Watcher();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
@@ -264,19 +279,9 @@ export class ModernDevServer extends ModernServer {
     }, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
-      this.runner.reset();
-
-      if (filepath.startsWith(mockPath)) {
-        this.mockHandler = createMockHandler({
-          pwd
-        });
-      } else {
-        try {
-          this.prepareFrameHandler();
-        } catch (e) {
-          this.logger.error(e);
-        }
-      }
+      this.onServerChange({
+        filepath
+      });
     });
     this.watcher = watcher;
   }

package/dist/js/node/constants.js

@@ -0,0 +1,26 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.DEFAULT_DEV_OPTIONS = void 0;
+
+var _utils = require("@modern-js/utils");
+
+const DEFAULT_DEV_OPTIONS = {
+  client: {
+    port: '8080',
+    overlay: false,
+    logging: 'none',
+    path: _utils.HMR_SOCK_PATH,
+    host: 'localhost'
+  },
+  https: false,
+  dev: {
+    writeToDisk: true
+  },
+  watch: true,
+  hot: true,
+  liveReload: true
+};
+exports.DEFAULT_DEV_OPTIONS = DEFAULT_DEV_OPTIONS;

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

@@ -54,12 +54,8 @@ const createMockHandler = ({
       return next();
     }
 
-    if (matched) {
-      res.setHeader('Access-Control-Allow-Origin', '*');
-      return matched.handler(context, next);
-    } else {
-      return next();
-    }
+    res.setHeader('Access-Control-Allow-Origin', '*');
+    return matched.handler(context, next);
   };
 };
 

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

@@ -7,6 +7,8 @@ exports.getWatchedFiles = exports.default = void 0;
 
 var _path = _interopRequireDefault(require("path"));
 
+var _utils = require("@modern-js/utils");
+
 var _chokidar = _interopRequireDefault(require("chokidar"));
 
 var _dependencyTree = require("./dependency-tree");
@@ -45,7 +47,7 @@ class Watcher {
       cache.add(getWatchedFiles(watcher));
     });
     watcher.on('change', changed => {
-      if (cache.isDiff(changed)) {
+      if (!_utils.fs.existsSync(changed) || cache.isDiff(changed)) {
         cache.refresh(changed);
         callback(changed);
       }

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

@@ -5,6 +5,8 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernSSRDevServer = exports.ModernAPIDevServer = void 0;
 
+var _prodServer = require("@modern-js/prod-server");
+
 var _devServer = require("./dev-server");
 
 class ModernSSRDevServer extends _devServer.ModernDevServer {
@@ -12,12 +14,20 @@ class ModernSSRDevServer extends _devServer.ModernDevServer {
     return null;
   }
 
-  async prepareWebHandler(extension) {
-    return super.prepareWebHandler(extension);
+  filterRoutes(routes) {
+    return routes.filter(route => route.isSSR);
   }
 
-  filterRoutes(routes) {
-    return routes.filter(route => route.entryName);
+  async preServerInit() {
+    if (this.runMode === _prodServer.RUN_MODE.FULL) {
+      await super.preServerInit();
+    }
+  }
+
+  async emitRouteHook(_, _input) {
+    if (this.runMode === _prodServer.RUN_MODE.FULL) {
+      await super.emitRouteHook(_, _input);
+    }
   }
 
 }
@@ -25,15 +35,21 @@ class ModernSSRDevServer extends _devServer.ModernDevServer {
 exports.ModernSSRDevServer = ModernSSRDevServer;
 
 class ModernAPIDevServer extends _devServer.ModernDevServer {
-  async prepareAPIHandler(mode, extension) {
-    return super.prepareAPIHandler(mode, extension);
+  prepareWebHandler(_) {
+    return null;
   }
 
   filterRoutes(routes) {
     return routes.filter(route => route.isApi);
   }
 
-  async preServerInit() {// noop
+  async preServerInit() {
+    if (this.runMode === _prodServer.RUN_MODE.FULL) {
+      await super.preServerInit();
+    }
+  }
+
+  async emitRouteHook(_, _input) {// empty
   }
 
 }