@modern-js/prod-server 2.0.0-beta.3 → 2.0.0-beta.4

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

@@ -1,129 +1,150 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  Server: () => Server
 });
-exports.Server = void 0;
-var _path = _interopRequireDefault(require("path"));
-var _fs = _interopRequireDefault(require("fs"));
-var _utils = require("@modern-js/utils");
-var _serverCore = require("@modern-js/server-core");
-var _metrics = require("../libs/metrics");
-var _loadConfig = require("../libs/loadConfig");
-var _utils2 = require("../utils");
-var _modernServerSplit = require("./modern-server-split");
-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; }
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_fs = __toESM(require("fs"));
+var import_utils = require("@modern-js/utils");
+var import_server_core = require("@modern-js/server-core");
+var import_metrics = require("../libs/metrics");
+var import_loadConfig = require("../libs/loadConfig");
+var import_utils2 = require("../utils");
+var import_modern_server_split = require("./modern-server-split");
+var __defProp2 = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp2 = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp2(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp2.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 __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());
+  });
+};
 class Server {
   constructor(options) {
-    _defineProperty(this, "options", void 0);
-    _defineProperty(this, "serverImpl", _modernServerSplit.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 _utils.Logger({
-      level: 'warn'
+    this.serverImpl = import_modern_server_split.createProdServer;
+    options.logger = options.logger || new import_utils.Logger({
+      level: "warn"
     });
-    options.metrics = options.metrics || _metrics.metrics;
+    options.metrics = options.metrics || import_metrics.metrics;
     this.options = options;
     this.serverConfig = {};
   }
-
-  /**
-   * 初始化顺序
-   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
-   * - 获取 server runtime config
-   * - 设置 context
-   * - 创建 hooksRunner
-   * - 合并插件，内置插件和 serverConfig 中配置的插件
-   * - 执行 config hook
-   * - 获取最终的配置
-   * - 设置配置到 context
-   * - 初始化 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
-    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
-    this.server = this.serverImpl(options);
-    await this.runPrepareHook(this.runner);
-
-    // 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;
+  init() {
+    return __async(this, null, function* () {
+      const { options } = this;
+      this.loadServerEnv(options);
+      this.initServerConfig(options);
+      yield this.injectContext(this.runner, options);
+      this.runner = yield this.createHookRunner();
+      yield this.initConfig(this.runner, options);
+      yield this.injectContext(this.runner, options);
+      this.server = this.serverImpl(options);
+      yield this.runPrepareHook(this.runner);
+      this.app = yield this.server.createHTTPServer(this.getRequestHandler());
+      yield 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();
+  runPrepareHook(runner) {
+    return __async(this, null, function* () {
+      runner.prepare();
+    });
   }
   initServerConfig(options) {
-    const {
-      pwd,
+    const { pwd, serverConfigFile } = options;
+    const distDirectory = import_path.default.join(pwd, options.config.output.path || "dist");
+    const serverConfigPath = (0, import_loadConfig.getServerConfigPath)(
+      distDirectory,
       serverConfigFile
-    } = options;
-    const distDirectory = _path.default.join(pwd, options.config.output.path || 'dist');
-    const serverConfigPath = (0, _loadConfig.getServerConfigPath)(distDirectory, serverConfigFile);
-    const serverConfig = (0, _loadConfig.requireConfig)(serverConfigPath);
+    );
+    const serverConfig = (0, import_loadConfig.requireConfig)(serverConfigPath);
     this.serverConfig = serverConfig;
   }
-
-  /**
-   *
-   * merge cliConfig and serverConfig
-   */
-  async initConfig(runner, options) {
-    const {
-      pwd,
-      config
-    } = options;
-    const {
-      serverConfig
-    } = this;
-    const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = _path.default.join(pwd, config.output.path || 'dist', _utils.OUTPUT_CONFIG_FILE);
-    options.config = (0, _loadConfig.loadConfig)({
-      cliConfig: config,
-      serverConfig: finalServerConfig,
-      resolvedConfigPath
+  initConfig(runner, options) {
+    return __async(this, null, function* () {
+      const { pwd, config } = options;
+      const { serverConfig } = this;
+      const finalServerConfig = this.runConfigHook(runner, serverConfig);
+      const resolvedConfigPath = import_path.default.join(
+        pwd,
+        config.output.path || "dist",
+        import_utils.OUTPUT_CONFIG_FILE
+      );
+      options.config = (0, import_loadConfig.loadConfig)({
+        cliConfig: config,
+        serverConfig: finalServerConfig,
+        resolvedConfigPath
+      });
     });
   }
-  async close() {
-    this.app.close();
+  close() {
+    return __async(this, null, function* () {
+      this.app.close();
+    });
   }
   listen(options, listener) {
     const callback = () => {
-      listener === null || listener === void 0 ? void 0 : listener();
+      listener == null ? void 0 : listener();
     };
-    if (typeof options === 'object') {
+    if (typeof options === "object") {
       this.app.listen(options, callback);
     } else {
       this.app.listen(process.env.PORT || options || 8080, callback);
@@ -135,77 +156,56 @@ class Server {
       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
-    _serverCore.serverManager.clear();
-    const {
-      options
-    } = this;
-    // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
-    const {
-      internalPlugins = _utils.INTERNAL_SERVER_PLUGINS,
-      pwd
-    } = options;
-    const serverPlugins = this.serverConfig.plugins || [];
-
-    // server app context for serve plugin
-    const loadedPlugins = (0, _serverCore.loadPlugins)(pwd, serverPlugins, {
-      internalPlugins
+  render(req, res, url) {
+    return __async(this, null, function* () {
+      return this.server.render(req, res, url);
     });
-    (0, _utils2.debug)('plugins', loadedPlugins);
-    loadedPlugins.forEach(p => {
-      _serverCore.serverManager.usePlugin(p);
+  }
+  createHookRunner() {
+    return __async(this, null, function* () {
+      import_server_core.serverManager.clear();
+      const { options } = this;
+      const { internalPlugins = import_utils.INTERNAL_SERVER_PLUGINS, pwd } = options;
+      const serverPlugins = this.serverConfig.plugins || [];
+      const loadedPlugins = (0, import_server_core.loadPlugins)(pwd, serverPlugins, { internalPlugins });
+      (0, import_utils2.debug)("plugins", loadedPlugins);
+      loadedPlugins.forEach((p) => {
+        import_server_core.serverManager.usePlugin(p);
+      });
+      const hooksRunner = yield import_server_core.serverManager.init();
+      return hooksRunner;
     });
-
-    // create runner
-    const hooksRunner = await _serverCore.serverManager.init();
-    return hooksRunner;
   }
-  async injectContext(runner, options) {
-    const appContext = this.initAppContext();
-    const {
-      config,
-      pwd
-    } = options;
-    _serverCore.ConfigContext.set(config);
-    _serverCore.AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-      distDirectory: _path.default.join(pwd, config.output.path || 'dist')
-    }));
+  injectContext(runner, options) {
+    return __async(this, null, function* () {
+      const appContext = this.initAppContext();
+      const { config, pwd } = options;
+      import_server_core.ConfigContext.set(config);
+      import_server_core.AppContext.set(__spreadProps(__spreadValues({}, appContext), {
+        distDirectory: import_path.default.join(pwd, config.output.path || "dist")
+      }));
+    });
   }
   initAppContext() {
-    const {
-      options
-    } = this;
-    const {
-      pwd: appDirectory,
-      plugins = [],
-      config
-    } = options;
-    const serverPlugins = plugins.map(p => ({
+    const { options } = this;
+    const { pwd: appDirectory, plugins = [], config } = options;
+    const serverPlugins = plugins.map((p) => ({
       server: p
     }));
     return {
       appDirectory,
-      distDirectory: _path.default.join(appDirectory, config.output.path || 'dist'),
-      sharedDirectory: _path.default.resolve(appDirectory, _utils.SHARED_DIR),
+      distDirectory: import_path.default.join(appDirectory, config.output.path || "dist"),
+      sharedDirectory: import_path.default.resolve(appDirectory, import_utils.SHARED_DIR),
       plugins: serverPlugins
     };
   }
   loadServerEnv(options) {
-    const {
-      pwd: appDirectory
-    } = options;
+    const { pwd: appDirectory } = options;
     const serverEnv = process.env.MODERN_ENV;
-    const serverEnvPath = _path.default.resolve(appDirectory, `.env.${serverEnv}`);
-    if (serverEnv && _fs.default.existsSync(serverEnvPath) && !_fs.default.statSync(serverEnvPath).isDirectory()) {
-      const envConfig = _utils.dotenv.config({
-        path: serverEnvPath
-      });
-      (0, _utils.dotenvExpand)(envConfig);
+    const serverEnvPath = import_path.default.resolve(appDirectory, `.env.${serverEnv}`);
+    if (serverEnv && import_fs.default.existsSync(serverEnvPath) && !import_fs.default.statSync(serverEnvPath).isDirectory()) {
+      const envConfig = import_utils.dotenv.config({ path: serverEnvPath });
+      (0, import_utils.dotenvExpand)(envConfig);
     }
   }
 }
-exports.Server = Server;

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

@@ -1,39 +1,86 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createProdServer: () => createProdServer
 });
-exports.createProdServer = void 0;
-var _modernServer = require("./modern-server");
-class ModernSSRServer extends _modernServer.ModernServer {
+module.exports = __toCommonJS(stdin_exports);
+var import_modern_server = require("./modern-server");
+var __getProtoOf = Object.getPrototypeOf;
+var __reflectGet = Reflect.get;
+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());
+  });
+};
+class ModernSSRServer extends import_modern_server.ModernServer {
   prepareAPIHandler(_) {
     return null;
   }
-  async handleAPI(context) {
-    return this.render404(context);
+  handleAPI(context) {
+    return __async(this, null, function* () {
+      return this.render404(context);
+    });
   }
 }
-class ModernAPIServer extends _modernServer.ModernServer {
+class ModernAPIServer extends import_modern_server.ModernServer {
   prepareWebHandler(_) {
     return null;
   }
   filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
+    return routes.filter((route) => route.isApi);
   }
 }
-class ModernWebServer extends _modernServer.ModernServer {
-  async warmupSSRBundle() {
-    return null;
+class ModernWebServer extends import_modern_server.ModernServer {
+  warmupSSRBundle() {
+    return __async(this, null, function* () {
+      return null;
+    });
   }
-  async handleAPI(context) {
-    return this.render404(context);
+  handleAPI(context) {
+    return __async(this, null, function* () {
+      return this.render404(context);
+    });
   }
-  async handleWeb(context, route) {
-    route.isSSR = false;
-    return super.handleWeb(context, route);
+  handleWeb(context, route) {
+    return __async(this, null, function* () {
+      route.isSSR = false;
+      return __superGet(ModernWebServer.prototype, this, "handleWeb").call(this, context, route);
+    });
   }
 }
-const createProdServer = options => {
+const createProdServer = (options) => {
   if (options.apiOnly) {
     return new ModernAPIServer(options);
   } else if (options.ssrOnly) {
@@ -41,7 +88,6 @@ const createProdServer = options => {
   } else if (options.webOnly) {
     return new ModernWebServer(options);
   } else {
-    return new _modernServer.ModernServer(options);
+    return new import_modern_server.ModernServer(options);
   }
 };
-exports.createProdServer = createProdServer;