@modern-js/server 1.1.2 → 1.1.4-rc.0

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

@@ -5,31 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.ModernDevServer = void 0;
 
+var _http = require("http");
+
 var _path = _interopRequireDefault(require("path"));
 
+var _https = require("https");
+
 var _utils = require("@modern-js/utils");
 
 var _webpackDevMiddleware = _interopRequireDefault(require("webpack-dev-middleware"));
 
-var _mock = require("../dev-tools/mock");
+var _modernServer = require("../modern-server");
 
-var _proxy = require("../libs/proxy");
+var _mock = require("../../dev-tools/mock");
 
-var _socketServer = _interopRequireDefault(require("../dev-tools/socket-server"));
+var _proxy = require("../../libs/proxy");
 
-var _devServerPlugin = _interopRequireDefault(require("../dev-tools/dev-server-plugin"));
+var _socketServer = _interopRequireDefault(require("../../dev-tools/socket-server"));
 
-var _launchEditor = require("../dev-tools/launch-editor");
+var _devServerPlugin = _interopRequireDefault(require("../../dev-tools/dev-server-plugin"));
 
-var _register = require("../dev-tools/babel/register");
+var _launchEditor = require("../../dev-tools/launch-editor");
 
-var reader = _interopRequireWildcard(require("../libs/render/reader"));
+var _register = require("../../dev-tools/babel/register");
 
-var _watcher = _interopRequireDefault(require("../dev-tools/watcher"));
+var reader = _interopRequireWildcard(require("../../libs/render/reader"));
 
-var _modernServer = require("./modern-server");
+var _watcher = _interopRequireDefault(require("../../dev-tools/watcher"));
 
-var _constants = require("../constants");
+var _constants = require("../../constants");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function (nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 
@@ -54,8 +58,8 @@ const DEFAULT_DEV_OPTIONS = {
 };
 
 class ModernDevServer extends _modernServer.ModernServer {
-  constructor(options, runner) {
-    super(options, runner); // set webpack compiler
+  constructor(options) {
+    super(options); // set webpack compiler
 
     this.devProxyHandler = null;
     this.mockHandler = null;
@@ -67,18 +71,18 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.compiler = options.compiler; // set dev server options, like webpack-dev-server
 
     this.dev = typeof options.dev === 'boolean' ? DEFAULT_DEV_OPTIONS : options.dev;
+    (0, _register.enableRegister)(this.pwd, this.conf);
   } // Complete the preparation of services
 
 
-  async init() {
+  async init(runner) {
     var _conf$tools, _conf$tools$devServer;
 
     const {
       conf,
       pwd,
       compiler
-    } = this;
-    (0, _register.enableRegister)(pwd, conf); // mock handler
+    } = this; // mock handler
 
     this.mockHandler = (0, _mock.createMockHandler)({
       pwd
@@ -113,7 +117,7 @@ class ModernDevServer extends _modernServer.ModernServer {
       this.addHandler(devMiddlewareHandler);
     }
 
-    await super.init(); // watch mock/ server/ api/ dir file change
+    await super.init(runner); // watch mock/ server/ api/ dir file change
 
     this.startWatcher();
   }
@@ -124,6 +128,7 @@ class ModernDevServer extends _modernServer.ModernServer {
     this.cleanSSRCache(); // reset static file
 
     reader.updateFile();
+    this.runner.reset();
   }
 
   onListening(app) {
@@ -140,6 +145,24 @@ class ModernDevServer extends _modernServer.ModernServer {
         resolve();
       });
     });
+  }
+
+  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);
+      return (0, _https.createServer)(httpsOptions, handler);
+    } else {
+      return (0, _http.createServer)(handler);
+    }
   } // set up plugin to each compiler
   // register hooks for each compilation, update socket stats if recompiled
   // start dev middleware
@@ -234,18 +257,16 @@ class ModernDevServer extends _modernServer.ModernServer {
       pwd
     } = this;
     const {
-      mock,
-      server,
-      api,
-      shared
+      mock
     } = _constants.AGGRED_DIR;
-    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${server}/**/*`, `${pwd}/${api}/**/*`, `${pwd}/${shared}/**/*`];
+    const defaultWatched = [`${pwd}/${mock}/**/*`, `${pwd}/${_utils.SERVER_DIR}/**/*`, `${pwd}/${_utils.API_DIR}/!(typings)/**`, `${pwd}/${_utils.SHARED_DIR}/**/*`];
     const watcher = new _watcher.default();
     watcher.createDepTree(); // 监听文件变动，如果有变动则给 client，也就是 start 启动的插件发消息
 
     watcher.listen(defaultWatched, filepath => {
       watcher.updateDepTree();
       watcher.cleanDepCache(filepath);
+      this.runner.reset();
 
       if (filepath.startsWith(`${pwd}/${mock}`)) {
         this.mockHandler = (0, _mock.createMockHandler)({

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

@@ -0,0 +1,27 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "ModernAPIDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServerSplit.ModernAPIDevServer;
+  }
+});
+Object.defineProperty(exports, "ModernDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServer.ModernDevServer;
+  }
+});
+Object.defineProperty(exports, "ModernSSRDevServer", {
+  enumerable: true,
+  get: function () {
+    return _devServerSplit.ModernSSRDevServer;
+  }
+});
+
+var _devServerSplit = require("./dev-server-split");
+
+var _devServer = require("./dev-server");

package/dist/js/node/server/index.js

@@ -5,30 +5,35 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.Server = void 0;
 
-var _http = require("http");
-
-var _https = require("https");
+var _path = _interopRequireDefault(require("path"));
 
 var _serverPlugin = require("@modern-js/server-plugin");
 
 var _utils = require("@modern-js/utils");
 
+var _core = require("@modern-js/core");
+
 var _modernServer = require("./modern-server");
 
+var _modernServerSplit = require("./modern-server-split");
+
 var _measure = require("../libs/measure");
 
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
+
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
+
+function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+
 class Server {
   constructor(options) {
-    var _options$plugins;
-
     this.options = void 0;
     this.server = void 0;
     this.app = void 0;
     this.runner = void 0;
     this.options = options;
-    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
-      _serverPlugin.serverManager.usePlugin(p);
-    });
   }
 
   getRequestHandler() {
@@ -46,40 +51,20 @@ class Server {
     const {
       options
     } = this;
-    this.runner = await _serverPlugin.serverManager.init({});
-    const {
-      logger,
-      measure
-    } = await this.runner.create({
-      loggerOptions: options.logger,
-      measureOptions: options.measure
-    }, {
-      onLast: () => ({})
-    });
-    options.logger = options.logger || logger || _utils.logger;
-    options.measure = options.measure || measure || _measure.measure;
+    options.logger = options.logger || _utils.logger;
+    options.measure = options.measure || _measure.measure; // initialize server
 
     if (options.dev) {
-      this.server = this.createDevServer(); // check if https is configured when start dev server
-
-      const devHttpsOption = typeof options.dev === 'object' && options.dev.https;
-
-      if (devHttpsOption) {
-        const {
-          genHttpsOptions
-        } = require("../dev-tools/https");
-
-        const httpsOptions = await genHttpsOptions(devHttpsOption);
-        this.app = (0, _https.createServer)(httpsOptions, this.getRequestHandler());
-      } else {
-        this.app = (0, _http.createServer)(this.getRequestHandler());
-      }
+      this.server = this.createDevServer();
     } else {
       this.server = this.createProdServer();
-      this.app = (0, _http.createServer)(this.getRequestHandler());
-    }
+    } // check if https is configured when start dev server
+
+
+    this.app = await this.server.createHTTPServer(this.getRequestHandler());
+    this.runner = await this.createHookRunner(); // runner can only be used after server init
 
-    await this.server.init();
+    await this.server.init(this.runner);
     return this;
   }
 
@@ -110,19 +95,13 @@ class Server {
     } = this;
 
     if (options.apiOnly) {
-      const {
-        APIModernServer
-      } = require("./api-server");
-
-      return new APIModernServer(options, this.runner);
+      return new _modernServerSplit.ModernAPIServer(options);
+    } else if (options.ssrOnly) {
+      return new _modernServerSplit.ModernSSRServer(options);
     } else if (options.webOnly) {
-      const {
-        WebModernServer
-      } = require("./web-server");
-
-      return new WebModernServer(options, this.runner);
+      return new _modernServerSplit.ModernWebServer(options);
     } else {
-      return new _modernServer.ModernServer(options, this.runner);
+      return new _modernServer.ModernServer(options);
     }
   }
 
@@ -131,25 +110,54 @@ class Server {
       options
     } = this;
 
+    const {
+      ModernAPIDevServer,
+      ModernSSRDevServer,
+      ModernDevServer
+    } = require("./dev-server");
+
     if (options.apiOnly) {
-      const {
-        APIModernDevServer
-      } = require("./api-server");
+      return new ModernAPIDevServer(options);
+    } else if (options.ssrOnly) {
+      return new ModernSSRDevServer(options);
+    } else {
+      return new ModernDevServer(options);
+    }
+  }
 
-      return new APIModernDevServer(options, this.runner);
-    } else if (options.webOnly) {
-      const {
-        WebModernDevServer
-      } = require("./web-server");
+  async createHookRunner() {
+    var _options$plugins;
 
-      return new WebModernDevServer(options, this.runner);
-    } else {
-      const {
-        ModernDevServer
-      } = require("./dev-server");
+    const {
+      options
+    } = this;
+    (_options$plugins = options.plugins) === null || _options$plugins === void 0 ? void 0 : _options$plugins.forEach(p => {
+      _serverPlugin.serverManager.usePlugin(p);
+    });
+    const appContext = await this.initAppContext();
 
-      return new ModernDevServer(options, this.runner);
-    }
+    _serverPlugin.serverManager.run(() => {
+      _core.ConfigContext.set(this.options.config);
+
+      _core.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
+        distDirectory: _path.default.join(options.pwd, options.config.output.path || 'dist')
+      }));
+    });
+
+    return _serverPlugin.serverManager.init({});
+  }
+
+  async initAppContext() {
+    var _this$options$plugins;
+
+    const appDirectory = await (0, _core.initAppDir)();
+    const loaded = await (0, _core.loadUserConfig)(appDirectory);
+    const plugins = (_this$options$plugins = this.options.plugins) === null || _this$options$plugins === void 0 ? void 0 : _this$options$plugins.map(p => ({
+      server: p,
+      cli: undefined
+    }));
+    const appContext = (0, _core.initAppContext)(appDirectory, plugins || [], loaded.filePath);
+    return appContext;
   }
 
 }

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

@@ -0,0 +1,97 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.ModernWebServer = exports.ModernSSRServer = exports.ModernAPIServer = void 0;
+
+var _modernServer = require("./modern-server");
+
+class ModernSSRServer extends _modernServer.ModernServer {
+  // Todo should not invoke any route hook in modernSSRServer
+  async warmupSSRBundle() {// empty
+  }
+
+  verifyMatch(context, matched) {
+    if (matched.generate().isApi) {
+      this.render404(context);
+    }
+  }
+
+  prepareAPIHandler(_m, _) {
+    return null;
+  }
+
+  async prepareWebHandler(extension) {
+    return super.prepareWebHandler(extension);
+  } // protected filterRoutes(routes: ModernRouteInterface[]) {
+  //   return routes.filter(route => route.entryName);
+  // }
+
+
+  async preServerInit() {// empty
+  }
+
+}
+
+exports.ModernSSRServer = ModernSSRServer;
+
+class ModernAPIServer extends _modernServer.ModernServer {
+  async emitRouteHook(_, _input) {// empty
+  }
+
+  async warmupSSRBundle() {// empty
+  }
+
+  prepareWebHandler(_) {
+    return null;
+  }
+
+  async prepareAPIHandler(mode, extension) {
+    return super.prepareAPIHandler(mode, extension);
+  }
+
+  filterRoutes(routes) {
+    return routes.filter(route => route.isApi);
+  }
+
+  async preServerInit() {// empty
+  }
+
+}
+
+exports.ModernAPIServer = ModernAPIServer;
+
+class ModernWebServer extends _modernServer.ModernServer {
+  async warmupSSRBundle() {// empty
+  }
+
+  async handleAPI(context) {
+    const {
+      proxyTarget
+    } = this;
+
+    if (!(proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.api)) {
+      this.proxy();
+    } else {
+      this.render404(context);
+    }
+  }
+
+  async handleWeb(context, route) {
+    const {
+      proxyTarget
+    } = this;
+
+    if (route.isSSR && proxyTarget !== null && proxyTarget !== void 0 && proxyTarget.ssr) {
+      return this.proxy();
+    } else {
+      // if no proxyTarget but access web server, degradation to csr
+      route.isSSR = false;
+      return super.handleWeb(context, route);
+    }
+  }
+
+}
+
+exports.ModernWebServer = ModernWebServer;