@modern-js/prod-server 2.14.0 → 2.16.0

package/dist/esm-node/libs/render/measure.js

@@ -1,5 +1,5 @@
 import { headersWithoutCookie } from "../../utils";
-const createMetrics = (context, metrics) => {
+export const createMetrics = (context, metrics) => {
   const { entryName: entry, request } = context;
   const { pathname = "" } = request || {};
   const emitTimer = (name, cost, tags = {}) => {
@@ -16,9 +16,12 @@ const createMetrics = (context, metrics) => {
       entry
     });
   };
-  return { emitTimer, emitCounter };
+  return {
+    emitTimer,
+    emitCounter
+  };
 };
-const createLogger = (serverContext, logger) => {
+export const createLogger = (serverContext, logger) => {
   const request = serverContext.request || {};
   const { headers = {}, pathname = "" } = request;
   const debug = (message, ...args) => {
@@ -32,12 +35,7 @@ const createLogger = (serverContext, logger) => {
       e = message;
       message = "";
     }
-    logger.error(
-      `SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`,
-      e instanceof Error ? e.stack || e.message : e,
-      pathname,
-      headersWithoutCookie(headers)
-    );
+    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
   };
   return {
     error,
@@ -45,7 +43,3 @@ const createLogger = (serverContext, logger) => {
     debug
   };
 };
-export {
-  createLogger,
-  createMetrics
-};

package/dist/esm-node/libs/render/reader.js

@@ -1,3 +1,16 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import { fs } from "@modern-js/utils";
 import LRU from "lru-cache";
 const Byte = 1;
@@ -11,16 +24,7 @@ const createCacheItem = async (filepath, mtime) => {
     mtime
   };
 };
-class LruReader {
-  // private timer?: NodeJS.Timeout;
-  constructor() {
-    this.cache = new LRU({
-      max: 256 * MB,
-      length: getContentLength,
-      maxAge: 5 * 60 * 5e3
-      // 60s
-    });
-  }
+export class LruReader {
   init() {
   }
   close() {
@@ -28,7 +32,9 @@ class LruReader {
   async read(filepath) {
     if (this.cache.has(filepath)) {
       const { content } = this.cache.get(filepath);
-      return { content };
+      return {
+        content
+      };
     }
     if (!fs.existsSync(filepath)) {
       return null;
@@ -63,28 +69,27 @@ class LruReader {
       }
     }
   }
-  // private timeTask() {
-  // this.timer = setInterval(() => this.update, 5 * 60 * 1000).unref();
-  // }
+  // private timer?: NodeJS.Timeout;
+  constructor() {
+    _define_property(this, "cache", void 0);
+    this.cache = new LRU({
+      max: 256 * MB,
+      length: getContentLength,
+      maxAge: 5 * 60 * 5e3
+    });
+  }
 }
 const reader = new LruReader();
-const readFile = async (filepath) => {
+export const readFile = async (filepath) => {
   const file = await reader.read(filepath);
-  return file == null ? void 0 : file.content;
+  return file === null || file === void 0 ? void 0 : file.content;
 };
-const updateFile = () => {
+export const updateFile = () => {
   reader.update();
 };
-const init = () => {
+export const init = () => {
   reader.init();
 };
-const close = () => {
+export const close = () => {
   reader.close();
 };
-export {
-  LruReader,
-  close,
-  init,
-  readFile,
-  updateFile
-};

package/dist/esm-node/libs/render/ssr.js

@@ -1,24 +1,12 @@
 import path from "path";
 import { fs, mime } from "@modern-js/utils";
-import {
-  LOADABLE_STATS_FILE,
-  ROUTE_MANIFEST_FILE,
-  SERVER_RENDER_FUNCTION_NAME
-} from "@modern-js/utils/constants";
+import { LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from "@modern-js/utils/constants";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
-const render = async (ctx, renderOptions, runner) => {
-  var _a;
-  const {
-    urlPath,
-    bundle,
-    distDir,
-    template,
-    entryName,
-    staticGenerate,
-    enableUnsafeCtx = false
-  } = renderOptions;
+export const render = async (ctx, renderOptions, runner) => {
+  var _ctx_res;
+  const { urlPath, bundle, distDir, template, entryName, staticGenerate, enableUnsafeCtx = false } = renderOptions;
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
@@ -41,13 +29,12 @@ const render = async (ctx, renderOptions, runner) => {
       status: (code) => {
         ctx.res.statusCode = code;
       },
-      locals: ((_a = ctx.res) == null ? void 0 : _a.locals) || {}
+      locals: ((_ctx_res = ctx.res) === null || _ctx_res === void 0 ? void 0 : _ctx_res.locals) || {}
     },
     redirection: {},
     template,
     loadableStats,
     routeManifest,
-    // for streaming ssr
     entryName,
     staticGenerate,
     logger: void 0,
@@ -83,6 +70,3 @@ const render = async (ctx, renderOptions, runner) => {
     };
   }
 };
-export {
-  render
-};

package/dist/esm-node/libs/render/static.js

@@ -1,7 +1,7 @@
 import path from "path";
 import { mime } from "@modern-js/utils";
 import { readFile } from "./reader";
-async function handleDirectory(ctx, entryPath, urlPath) {
+export async function handleDirectory(ctx, entryPath, urlPath) {
   const { path: pathname } = ctx;
   const filepath = path.join(entryPath, trimLeft(pathname, urlPath));
   let content = await readFile(filepath);
@@ -33,6 +33,3 @@ const trimLeft = (str, prefix) => {
   }
   return str;
 };
-export {
-  handleDirectory
-};

package/dist/esm-node/libs/render/type.js

@@ -1,9 +1,6 @@
-var RenderLevel = /* @__PURE__ */ ((RenderLevel2) => {
+export var RenderLevel;
+(function(RenderLevel2) {
   RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
   RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-  return RenderLevel2;
-})(RenderLevel || {});
-export {
-  RenderLevel
-};
+})(RenderLevel || (RenderLevel = {}));

package/dist/esm-node/libs/render/utils.js

@@ -1,23 +1,11 @@
 import { TemplateAPI, templateInjectableStream } from "../hook-api/template";
-const injectServerData = (content, context) => {
+export const injectServerData = (content, context) => {
   const template = new TemplateAPI(content);
-  template.prependHead(
-    `<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(
-      context.serverData
-    )}</script>`
-  );
+  template.prependHead(`<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(context.serverData)}</script>`);
   return template.get();
 };
-const injectServerDataStream = (content, context) => {
-  return content.pipe(
-    templateInjectableStream({
-      prependHead: `<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(
-        context.serverData
-      )}</script>`
-    })
-  );
-};
-export {
-  injectServerData,
-  injectServerDataStream
+export const injectServerDataStream = (content, context) => {
+  return content.pipe(templateInjectableStream({
+    prependHead: `<script type="application/json" id="__MODERN_SERVER_DATA__">${JSON.stringify(context.serverData)}</script>`
+  }));
 };

package/dist/esm-node/libs/route/index.js

@@ -1,9 +1,18 @@
-import { RouteMatcher } from "./matcher";
-class RouteMatchManager {
-  constructor() {
-    this.specs = [];
-    this.matchers = [];
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
   }
+  return obj;
+}
+import { RouteMatcher } from "./matcher";
+export class RouteMatchManager {
   // get all routes matches pathname
   filter(pathname) {
     return this.matchers.reduce((matches, matcher) => {
@@ -51,8 +60,10 @@ class RouteMatchManager {
     const bundles = this.specs.filter((route) => route.isSSR).map((route) => route.bundle);
     return bundles;
   }
+  constructor() {
+    _define_property(this, "matchers", void 0);
+    _define_property(this, "specs", []);
+    this.matchers = [];
+  }
 }
-export {
-  RouteMatchManager,
-  RouteMatcher
-};
+export { RouteMatcher };

package/dist/esm-node/libs/route/matcher.js

@@ -1,8 +1,17 @@
-import {
-  match,
-  pathToRegexp,
-  compile
-} from "path-to-regexp";
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+import { match, pathToRegexp, compile } from "path-to-regexp";
 import { ModernRoute } from "./route";
 const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const removeHtmlSuffix = (url) => {
@@ -12,16 +21,13 @@ const removeHtmlSuffix = (url) => {
   return url;
 };
 const toPath = (reg, params) => {
-  const fn = compile(reg, { encode: encodeURIComponent });
+  const fn = compile(reg, {
+    encode: encodeURIComponent
+  });
   return fn(params);
 };
 const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-class RouteMatcher {
-  constructor(spec) {
-    this.urlPath = "";
-    this.spec = spec;
-    this.setupUrlPath();
-  }
+export class RouteMatcher {
   // generate modern route object
   generate(url) {
     const route = new ModernRoute(this.spec);
@@ -42,12 +48,12 @@ class RouteMatcher {
   }
   // get match url length
   matchLength(pathname) {
-    var _a;
     if (!this.urlReg) {
       return this.urlPath.length;
     } else {
+      var _result_;
       const result = this.urlReg.exec(pathname);
-      return ((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.length) || null;
+      return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
     }
   }
   // if match url path
@@ -85,7 +91,12 @@ class RouteMatcher {
       });
     }
   }
+  constructor(spec) {
+    _define_property(this, "spec", void 0);
+    _define_property(this, "urlPath", "");
+    _define_property(this, "urlMatcher", void 0);
+    _define_property(this, "urlReg", void 0);
+    this.spec = spec;
+    this.setupUrlPath();
+  }
 }
-export {
-  RouteMatcher
-};

package/dist/esm-node/libs/route/route.js

@@ -1,6 +1,27 @@
-class ModernRoute {
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
+export class ModernRoute {
   constructor(routeSpec) {
-    this.params = {};
+    _define_property(this, "entryName", void 0);
+    _define_property(this, "urlPath", void 0);
+    _define_property(this, "entryPath", void 0);
+    _define_property(this, "bundle", void 0);
+    _define_property(this, "isApi", void 0);
+    _define_property(this, "isSSR", void 0);
+    _define_property(this, "isSPA", void 0);
+    _define_property(this, "params", {});
+    _define_property(this, "responseHeaders", void 0);
     this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || "";
@@ -11,6 +32,3 @@ class ModernRoute {
     this.responseHeaders = routeSpec.responseHeaders;
   }
 }
-export {
-  ModernRoute
-};

package/dist/esm-node/libs/serveFile.js

@@ -12,7 +12,7 @@ const removedPrefix = (req, prefix) => {
     };
   }
 };
-const faviconFallbackHandler = (context, next) => {
+export const faviconFallbackHandler = (context, next) => {
   if (context.url === "/favicon.ico") {
     context.res.statusCode = 204;
     context.res.end();
@@ -20,7 +20,7 @@ const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-const createStaticFileHandler = (rules, assetPrefix = "/") => (
+export const createStaticFileHandler = (rules, assetPrefix = "/") => (
   // eslint-disable-next-line consistent-return
   async (context, next) => {
     const { url: requestUrl, req, res } = context;
@@ -43,7 +43,3 @@ const createStaticFileHandler = (rules, assetPrefix = "/") => (
     }
   }
 );
-export {
-  createStaticFileHandler,
-  faviconFallbackHandler
-};

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

@@ -1,51 +1,38 @@
+function _define_property(obj, key, value) {
+  if (key in obj) {
+    Object.defineProperty(obj, key, {
+      value,
+      enumerable: true,
+      configurable: true,
+      writable: true
+    });
+  } else {
+    obj[key] = value;
+  }
+  return obj;
+}
 import path from "path";
-import {
-  fs,
-  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 { fs, 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 "./modernServerSplit";
-class Server {
-  constructor(options) {
-    this.serverImpl = createProdServer;
-    options.logger = options.logger || new Logger({
-      level: "warn"
-    });
-    options.metrics = options.metrics || defaultMetrics;
-    this.options = options;
-    this.serverConfig = {};
-  }
+export class Server {
   /**
-   * 初始化顺序
-   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
-   * - 获取 server runtime config
-   * - 设置 context
-   * - 创建 hooksRunner
-   * - 合并插件，内置插件和 serverConfig 中配置的插件
-   * - 执行 config hook
-   * - 获取最终的配置
-   * - 设置配置到 context
-   * - 初始化 server
-   * - 执行 prepare hook
-   * - 执行 server init
-   */
+  * 初始化顺序
+  * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
+  * - 获取 server runtime config
+  * - 设置 context
+  * - 创建 hooksRunner
+  * - 合并插件，内置插件和 serverConfig 中配置的插件
+  * - 执行 config hook
+  * - 获取最终的配置
+  * - 设置配置到 context
+  * - 初始化 server
+  * - 执行 prepare hook
+  * - 执行 server init
+  */
   async init() {
     const { options } = this;
     await this.loadServerEnv(options);
@@ -61,10 +48,10 @@ class Server {
     return this;
   }
   /**
-   * Execute config hooks
-   * @param runner
-   * @param options
-   */
+  * Execute config hooks
+  * @param runner
+  * @param options
+  */
   runConfigHook(runner, serverConfig) {
     const newServerConfig = runner.config(serverConfig || {});
     return newServerConfig;
@@ -75,26 +62,19 @@ class Server {
   initServerConfig(options) {
     const { pwd, serverConfigFile } = options;
     const distDirectory = path.join(pwd, options.config.output.path || "dist");
-    const serverConfigPath = getServerConfigPath(
-      distDirectory,
-      serverConfigFile
-    );
+    const serverConfigPath = getServerConfigPath(distDirectory, serverConfigFile);
     const serverConfig = requireConfig(serverConfigPath);
     this.serverConfig = serverConfig;
   }
   /**
-   *
-   * merge cliConfig and 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
-    );
+    const resolvedConfigPath = path.join(pwd, config.output.path || "dist", OUTPUT_CONFIG_FILE);
     options.config = loadConfig({
       cliConfig: config,
       serverConfig: finalServerConfig,
@@ -106,11 +86,13 @@ class Server {
   }
   listen(options, listener) {
     const callback = () => {
-      listener == null ? void 0 : listener();
+      listener === null || listener === void 0 ? void 0 : listener();
     };
     if (typeof options === "object") {
       if (process.env.PORT) {
-        Object.assign(options, { port: process.env.PORT });
+        Object.assign(options, {
+          port: process.env.PORT
+        });
       }
       this.app.listen(options, callback);
     } else {
@@ -129,13 +111,12 @@ class Server {
   async createHookRunner() {
     serverManager.clear();
     const { options } = this;
-    const {
-      internalPlugins = INTERNAL_SERVER_PLUGINS,
-      pwd,
-      plugins = []
-    } = options;
+    const { internalPlugins = INTERNAL_SERVER_PLUGINS, pwd, plugins = [] } = options;
     const serverPlugins = this.serverConfig.plugins || [];
-    const loadedPlugins = loadPlugins(pwd, [...serverPlugins, ...plugins], {
+    const loadedPlugins = loadPlugins(pwd, [
+      ...serverPlugins,
+      ...plugins
+    ], {
       internalPlugins
     });
     debug("plugins", loadedPlugins);
@@ -162,9 +143,9 @@ class Server {
     }));
     return {
       appDirectory,
-      apiDirectory: appContext == null ? void 0 : appContext.apiDirectory,
-      lambdaDirectory: appContext == null ? void 0 : appContext.lambdaDirectory,
-      sharedDirectory: (appContext == null ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
+      apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
+      lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
+      sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
       distDirectory: path.join(appDirectory, config.output.path || "dist"),
       plugins: serverPlugins
     };
@@ -174,14 +155,30 @@ class Server {
     const serverEnv = process.env.MODERN_ENV;
     const defaultEnvPath = path.resolve(appDirectory, `.env`);
     const serverEnvPath = path.resolve(appDirectory, `.env.${serverEnv}`);
-    for (const envPath of [serverEnvPath, defaultEnvPath]) {
+    for (const envPath of [
+      serverEnvPath,
+      defaultEnvPath
+    ]) {
       if (await fs.pathExists(envPath) && !(await fs.stat(envPath)).isDirectory()) {
-        const envConfig = dotenv.config({ path: envPath });
+        const envConfig = dotenv.config({
+          path: envPath
+        });
         dotenvExpand(envConfig);
       }
     }
   }
+  constructor(options) {
+    _define_property(this, "options", void 0);
+    _define_property(this, "serverImpl", createProdServer);
+    _define_property(this, "server", void 0);
+    _define_property(this, "app", void 0);
+    _define_property(this, "runner", void 0);
+    _define_property(this, "serverConfig", void 0);
+    options.logger = options.logger || new Logger({
+      level: "warn"
+    });
+    options.metrics = options.metrics || defaultMetrics;
+    this.options = options;
+    this.serverConfig = {};
+  }
 }
-export {
-  Server
-};