@modern-js/prod-server 2.0.0-beta.0 → 2.0.0-beta.2

package/dist/js/modern/server/index.js

@@ -1,9 +1,6 @@
 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; }
-
 import path from 'path';
 import fs from 'fs';
 import { Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from '@modern-js/utils';
@@ -15,17 +12,11 @@ import { createProdServer } from "./modern-server-split";
 export class Server {
   constructor(options) {
     _defineProperty(this, "options", void 0);
-
     _defineProperty(this, "serverImpl", createProdServer);
-
     _defineProperty(this, "server", void 0);
-
     _defineProperty(this, "app", void 0);
-
     _defineProperty(this, "runner", void 0);
-
     _defineProperty(this, "serverConfig", void 0);
-
     options.logger = options.logger || new Logger({
       level: 'warn'
     });
@@ -33,6 +24,7 @@ export class Server {
     this.options = options;
     this.serverConfig = {};
   }
+
   /**
    * 初始化顺序
    * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
@@ -47,66 +39,61 @@ export class Server {
    * - 执行 prepare hook
    * - 执行 server init
    */
-
-
   async init() {
     const {
       options
     } = this;
     this.loadServerEnv(options);
     this.initServerConfig(options);
-    await this.injectContext(this.runner, options); // initialize server runner
+    await this.injectContext(this.runner, options);
 
-    this.runner = await this.createHookRunner(); // init config and execute config hook
+    // initialize server runner
+    this.runner = await this.createHookRunner();
 
+    // init config and execute config hook
     await this.initConfig(this.runner, options);
-    await this.injectContext(this.runner, options); // initialize server
+    await this.injectContext(this.runner, options);
 
+    // initialize server
     this.server = this.serverImpl(options);
-    await this.runPrepareHook(this.runner); // create http-server
+    await this.runPrepareHook(this.runner);
 
-    this.app = await this.server.createHTTPServer(this.getRequestHandler()); // runner can only be used after server init
+    // create http-server
+    this.app = await this.server.createHTTPServer(this.getRequestHandler());
 
+    // runner can only be used after server init
     await this.server.onInit(this.runner, this.app);
     return this;
   }
+
   /**
    * Execute config hooks
    * @param runner
    * @param options
    */
-
-
   runConfigHook(runner, serverConfig) {
     const newServerConfig = runner.config(serverConfig || {});
     return newServerConfig;
   }
-
   async runPrepareHook(runner) {
     runner.prepare();
   }
-
   initServerConfig(options) {
-    var _options$config$outpu;
-
     const {
       pwd,
       serverConfigFile
     } = options;
-    const distDirectory = path.join(pwd, ((_options$config$outpu = options.config.output) === null || _options$config$outpu === void 0 ? void 0 : _options$config$outpu.path) || 'dist');
+    const distDirectory = path.join(pwd, options.config.output.path || 'dist');
     const serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
     const serverConfig = requireConfig(serverConfigPath);
     this.serverConfig = serverConfig;
   }
+
   /**
    *
    * merge cliConfig and serverConfig
    */
-
-
   async initConfig(runner, options) {
-    var _config$output;
-
     const {
       pwd,
       config
@@ -115,70 +102,62 @@ export class Server {
       serverConfig
     } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = path.join(pwd, (config === null || config === void 0 ? void 0 : (_config$output = config.output) === null || _config$output === void 0 ? void 0 : _config$output.path) || 'dist', OUTPUT_CONFIG_FILE);
+    const resolvedConfigPath = path.join(pwd, config.output.path || 'dist', OUTPUT_CONFIG_FILE);
     options.config = loadConfig({
       cliConfig: config,
       serverConfig: finalServerConfig,
       resolvedConfigPath
     });
   }
-
   async close() {
     this.app.close();
   }
-
   listen(options, listener) {
     const callback = () => {
       listener === null || listener === void 0 ? void 0 : listener();
     };
-
     if (typeof options === 'object') {
       this.app.listen(options, callback);
     } else {
       this.app.listen(process.env.PORT || options || 8080, callback);
     }
   }
-
   getRequestHandler() {
     return (req, res, next) => {
       const requestHandler = this.server.getRequestHandler();
       return requestHandler(req, res, next);
     };
   }
-
   async render(req, res, url) {
     return this.server.render(req, res, url);
   }
-
   async createHookRunner() {
     // clear server manager every create time
     serverManager.clear();
     const {
       options
-    } = this; // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
-
+    } = this;
+    // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
     const {
       internalPlugins = INTERNAL_SERVER_PLUGINS,
-      pwd,
-      config
+      pwd
     } = options;
-    const serverPlugins = this.serverConfig.plugins || []; // server app context for serve plugin
+    const serverPlugins = this.serverConfig.plugins || [];
 
+    // server app context for serve plugin
     const loadedPlugins = loadPlugins(pwd, serverPlugins, {
       internalPlugins
     });
-    debug('plugins', config.plugins, loadedPlugins);
+    debug('plugins', loadedPlugins);
     loadedPlugins.forEach(p => {
       serverManager.usePlugin(p);
-    }); // create runner
+    });
 
+    // create runner
     const hooksRunner = await serverManager.init();
     return hooksRunner;
   }
-
   async injectContext(runner, options) {
-    var _config$output2;
-
     const appContext = this.initAppContext();
     const {
       config,
@@ -186,13 +165,10 @@ export class Server {
     } = options;
     ConfigContext.set(config);
     AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-      distDirectory: path.join(pwd, ((_config$output2 = config.output) === null || _config$output2 === void 0 ? void 0 : _config$output2.path) || 'dist')
+      distDirectory: path.join(pwd, config.output.path || 'dist')
     }));
   }
-
   initAppContext() {
-    var _config$output3;
-
     const {
       options
     } = this;
@@ -206,19 +182,17 @@ export class Server {
     }));
     return {
       appDirectory,
-      distDirectory: path.join(appDirectory, ((_config$output3 = config.output) === null || _config$output3 === void 0 ? void 0 : _config$output3.path) || 'dist'),
+      distDirectory: path.join(appDirectory, config.output.path || 'dist'),
       sharedDirectory: path.resolve(appDirectory, SHARED_DIR),
       plugins: serverPlugins
     };
   }
-
   loadServerEnv(options) {
     const {
       pwd: appDirectory
     } = options;
     const serverEnv = process.env.MODERN_ENV;
     const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
-
     if (serverEnv && fs.existsSync(serverEnvPath) && !fs.statSync(serverEnvPath).isDirectory()) {
       const envConfig = dotenv.config({
         path: serverEnvPath
@@ -226,5 +200,4 @@ export class Server {
       dotenvExpand(envConfig);
     }
   }
-
 }

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

@@ -1,43 +1,32 @@
 import { ModernServer } from "./modern-server";
-
 class ModernSSRServer extends ModernServer {
   prepareAPIHandler(_) {
     return null;
   }
-
   async handleAPI(context) {
     return this.render404(context);
   }
-
 }
-
 class ModernAPIServer extends ModernServer {
   prepareWebHandler(_) {
     return null;
   }
-
   filterRoutes(routes) {
     return routes.filter(route => route.isApi);
   }
-
 }
-
 class ModernWebServer extends ModernServer {
   async warmupSSRBundle() {
     return null;
   }
-
   async handleAPI(context) {
     return this.render404(context);
   }
-
   async handleWeb(context, route) {
     route.isSSR = false;
     return super.handleWeb(context, route);
   }
-
 }
-
 export const createProdServer = options => {
   if (options.apiOnly) {
     return new ModernAPIServer(options);