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

package/dist/js/modern/libs/route/route.js

@@ -1,25 +1,16 @@
-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; }
-export class ModernRoute {
+class ModernRoute {
   constructor(routeSpec) {
-    var _routeSpec$enableMode;
-    _defineProperty(this, "entryName", void 0);
-    _defineProperty(this, "urlPath", void 0);
-    _defineProperty(this, "entryPath", void 0);
-    _defineProperty(this, "bundle", void 0);
-    _defineProperty(this, "isApi", void 0);
-    _defineProperty(this, "isSSR", void 0);
-    _defineProperty(this, "isSPA", void 0);
-    _defineProperty(this, "enableModernMode", void 0);
-    _defineProperty(this, "params", {});
-    _defineProperty(this, "responseHeaders", void 0);
-    this.entryName = routeSpec.entryName || '';
+    this.params = {};
+    this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
-    this.entryPath = routeSpec.entryPath || '';
+    this.entryPath = routeSpec.entryPath || "";
     this.isSSR = routeSpec.isSSR || false;
     this.isSPA = routeSpec.isSPA || false;
     this.isApi = routeSpec.isApi || false;
-    this.bundle = routeSpec.bundle || '';
-    this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.bundle = routeSpec.bundle || "";
     this.responseHeaders = routeSpec.responseHeaders;
   }
-}
+}
+export {
+  ModernRoute
+};

package/dist/js/modern/libs/serve-file.js

@@ -1,7 +1,25 @@
-// Todo 看看是不是能 fork 一份，即使命中也返回
-
-import serve from 'serve-static';
-import { isString, isRegExp } from '@modern-js/utils';
+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());
+  });
+};
+import serve from "serve-static";
+import { isString, isRegExp } from "@modern-js/utils";
 import { useLocalPrefix } from "../utils";
 const removedPrefix = (req, prefix) => {
   if (useLocalPrefix(prefix)) {
@@ -11,30 +29,21 @@ const removedPrefix = (req, prefix) => {
     };
   } else {
     return () => {
-      // emptyy
     };
   }
 };
-export const faviconFallbackHandler = (context, next) => {
-  if (context.url === '/favicon.ico') {
+const faviconFallbackHandler = (context, next) => {
+  if (context.url === "/favicon.ico") {
     context.res.statusCode = 204;
     context.res.end();
   } else {
     next();
   }
 };
-export const createStaticFileHandler = (rules, output = {}) =>
-// eslint-disable-next-line consistent-return
-async (context, next) => {
-  const {
-    url: requestUrl,
-    req,
-    res
-  } = context;
-  const {
-    assetPrefix = '/'
-  } = output;
-  const hitRule = rules.find(item => {
+const createStaticFileHandler = (rules, output = {}) => (context, next) => __async(void 0, null, function* () {
+  const { url: requestUrl, req, res } = context;
+  const { assetPrefix = "/" } = output;
+  const hitRule = rules.find((item) => {
     if (isString(item.path) && requestUrl.startsWith(item.path)) {
       return true;
     } else if (isRegExp(item.path) && item.path.test(requestUrl)) {
@@ -51,4 +60,8 @@ async (context, next) => {
   } else {
     return next();
   }
-};
+});
+export {
+  createStaticFileHandler,
+  faviconFallbackHandler
+};

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

@@ -1,122 +1,138 @@
-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';
-import { serverManager, AppContext, ConfigContext, loadPlugins } from '@modern-js/server-core';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.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());
+  });
+};
+import path from "path";
+import fs from "fs";
+import {
+  Logger,
+  SHARED_DIR,
+  OUTPUT_CONFIG_FILE,
+  dotenv,
+  dotenvExpand,
+  INTERNAL_SERVER_PLUGINS
+} from "@modern-js/utils";
+import {
+  serverManager,
+  AppContext,
+  ConfigContext,
+  loadPlugins
+} from "@modern-js/server-core";
 import { metrics as defaultMetrics } from "../libs/metrics";
-import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
+import {
+  loadConfig,
+  getServerConfigPath,
+  requireConfig
+} from "../libs/loadConfig";
 import { debug } from "../utils";
 import { createProdServer } from "./modern-server-split";
-export class Server {
+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);
+    this.serverImpl = createProdServer;
     options.logger = options.logger || new Logger({
-      level: 'warn'
+      level: "warn"
     });
     options.metrics = options.metrics || defaultMetrics;
     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 = path.join(pwd, options.config.output.path || "dist");
+    const serverConfigPath = getServerConfigPath(
+      distDirectory,
       serverConfigFile
-    } = options;
-    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) {
-    const {
-      pwd,
-      config
-    } = options;
-    const {
-      serverConfig
-    } = this;
-    const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = path.join(pwd, config.output.path || 'dist', OUTPUT_CONFIG_FILE);
-    options.config = 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 = path.join(
+        pwd,
+        config.output.path || "dist",
+        OUTPUT_CONFIG_FILE
+      );
+      options.config = 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);
@@ -128,76 +144,65 @@ export 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
-    serverManager.clear();
-    const {
-      options
-    } = this;
-    // TODO: 确认下这里是不是可以不从 options 中取插件，而是从 config 中取和过滤
-    const {
-      internalPlugins = INTERNAL_SERVER_PLUGINS,
-      pwd
-    } = options;
-    const serverPlugins = this.serverConfig.plugins || [];
-
-    // server app context for serve plugin
-    const loadedPlugins = loadPlugins(pwd, serverPlugins, {
-      internalPlugins
+  render(req, res, url) {
+    return __async(this, null, function* () {
+      return this.server.render(req, res, url);
     });
-    debug('plugins', loadedPlugins);
-    loadedPlugins.forEach(p => {
-      serverManager.usePlugin(p);
+  }
+  createHookRunner() {
+    return __async(this, null, function* () {
+      serverManager.clear();
+      const { options } = this;
+      const {
+        internalPlugins = INTERNAL_SERVER_PLUGINS,
+        pwd,
+        plugins = []
+      } = options;
+      const serverPlugins = this.serverConfig.plugins || [];
+      const loadedPlugins = loadPlugins(pwd, [...serverPlugins, ...plugins], {
+        internalPlugins
+      });
+      debug("plugins", loadedPlugins);
+      loadedPlugins.forEach((p) => {
+        serverManager.usePlugin(p);
+      });
+      const hooksRunner = yield serverManager.init();
+      return hooksRunner;
     });
-
-    // create runner
-    const hooksRunner = await serverManager.init();
-    return hooksRunner;
   }
-  async injectContext(runner, options) {
-    const appContext = this.initAppContext();
-    const {
-      config,
-      pwd
-    } = options;
-    ConfigContext.set(config);
-    AppContext.set(_objectSpread(_objectSpread({}, appContext), {}, {
-      distDirectory: path.join(pwd, config.output.path || 'dist')
-    }));
+  injectContext(runner, options) {
+    return __async(this, null, function* () {
+      const appContext = this.initAppContext();
+      const { config, pwd } = options;
+      ConfigContext.set(config);
+      AppContext.set(__spreadProps(__spreadValues({}, appContext), {
+        distDirectory: path.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.join(appDirectory, config.output.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 { 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
-      });
+      const envConfig = dotenv.config({ path: serverEnvPath });
       dotenvExpand(envConfig);
     }
   }
-}
+}
+export {
+  Server
+};

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

@@ -1,10 +1,35 @@
+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());
+  });
+};
 import { ModernServer } from "./modern-server";
 class ModernSSRServer extends 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 {
@@ -12,22 +37,28 @@ class ModernAPIServer extends ModernServer {
     return null;
   }
   filterRoutes(routes) {
-    return routes.filter(route => route.isApi);
+    return routes.filter((route) => route.isApi);
   }
 }
 class ModernWebServer extends ModernServer {
-  async warmupSSRBundle() {
-    return null;
+  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);
+    });
   }
 }
-export const createProdServer = options => {
+const createProdServer = (options) => {
   if (options.apiOnly) {
     return new ModernAPIServer(options);
   } else if (options.ssrOnly) {
@@ -37,4 +68,7 @@ export const createProdServer = options => {
   } else {
     return new ModernServer(options);
   }
-};
+};
+export {
+  createProdServer
+};