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

package/dist/js/modern/libs/render/measure.js

@@ -1,40 +1,43 @@
-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; }
-/* eslint-disable no-param-reassign */
-
+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));
 import { headersWithoutCookie } from "../../utils";
-export const createMetrics = (context, metrics) => {
-  const {
-    entryName: entry,
-    request
-  } = context;
-  const {
-    pathname = ''
-  } = request || {};
+const createMetrics = (context, metrics) => {
+  const { entryName: entry, request } = context;
+  const { pathname = "" } = request || {};
   const emitTimer = (name, cost, tags = {}) => {
-    metrics.emitTimer(name, cost, _objectSpread(_objectSpread({}, tags), {}, {
+    metrics.emitTimer(name, cost, __spreadProps(__spreadValues({}, tags), {
       pathname,
       entry
     }));
   };
   const emitCounter = (name, counter, tags = {}) => {
-    metrics.emitCounter(name, counter, _objectSpread(_objectSpread({}, tags), {}, {
+    metrics.emitCounter(name, counter, __spreadProps(__spreadValues({}, tags), {
       pathname,
       entry
     }));
   };
-  return {
-    emitTimer,
-    emitCounter
-  };
+  return { emitTimer, emitCounter };
 };
-export const createLogger = (serverContext, logger) => {
+const createLogger = (serverContext, logger) => {
   const request = serverContext.request || {};
-  const {
-    headers = {},
-    pathname = ''
-  } = request;
+  const { headers = {}, pathname = "" } = request;
   const debug = (message, ...args) => {
     logger.debug(`SSR Debug - ${message}, req.url = %s`, ...args, pathname);
   };
@@ -44,9 +47,14 @@ export const createLogger = (serverContext, logger) => {
   const error = (message, e) => {
     if (!e) {
       e = message;
-      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,
@@ -54,4 +62,7 @@ export const createLogger = (serverContext, logger) => {
     debug
   };
 };
-/* eslint-enable no-param-reassign */
+export {
+  createLogger,
+  createMetrics
+};

package/dist/js/modern/libs/render/reader.js

@@ -1,66 +1,71 @@
-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 { fs } from '@modern-js/utils';
-import LRU from 'lru-cache';
+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 { fs } from "@modern-js/utils";
+import LRU from "lru-cache";
 const Byte = 1;
 const KB = 1024 * Byte;
 const MB = 1024 * KB;
-const getContentLength = cache => cache.content.length;
-const createCacheItem = async (filepath, mtime) => {
-  const content = await fs.readFile(filepath);
+const getContentLength = (cache) => cache.content.length;
+const createCacheItem = (filepath, mtime) => __async(void 0, null, function* () {
+  const content = yield fs.readFile(filepath);
   return {
     content,
     mtime
   };
-};
-export class LruReader {
-  // private timer?: NodeJS.Timeout;
-
+});
+class LruReader {
   constructor() {
-    _defineProperty(this, "cache", void 0);
     this.cache = new LRU({
       max: 256 * MB,
       length: getContentLength,
-      maxAge: 5 * 60 * 5000 // 60s
+      maxAge: 5 * 60 * 5e3
     });
   }
-
   init() {
-    // this.timeTask();
   }
   close() {
-    // if (this.timer) {
-    //   clearInterval(this.timer);
-    // }
   }
-  async read(filepath) {
-    if (this.cache.has(filepath)) {
-      const {
-        content
-      } = this.cache.get(filepath);
-      return {
-        content
-      };
-    }
-    if (!fs.existsSync(filepath)) {
-      return null;
-    }
-    const stat = fs.statSync(filepath);
-    if (stat.isDirectory()) {
-      return null;
-    }
-
-    // if file more than 20 MB
-    if (stat.size > 20 * MB) {
-      return null;
-    }
-    const item = await createCacheItem(filepath, stat.mtime);
-    this.cache.set(filepath, item);
-    return item;
+  read(filepath) {
+    return __async(this, null, function* () {
+      if (this.cache.has(filepath)) {
+        const { content } = this.cache.get(filepath);
+        return { content };
+      }
+      if (!fs.existsSync(filepath)) {
+        return null;
+      }
+      const stat = fs.statSync(filepath);
+      if (stat.isDirectory()) {
+        return null;
+      }
+      if (stat.size > 20 * MB) {
+        return null;
+      }
+      const item = yield createCacheItem(filepath, stat.mtime);
+      this.cache.set(filepath, item);
+      return item;
+    });
   }
   update() {
-    const {
-      cache
-    } = this;
+    const { cache } = this;
     const files = cache.keys();
     for (const filepath of files) {
       if (!fs.existsSync(filepath)) {
@@ -69,36 +74,34 @@ export class LruReader {
       try {
         const item = cache.get(filepath);
         const stat = fs.statSync(filepath);
-        const {
-          mtime
-        } = stat;
-        // file is modify
+        const { mtime } = stat;
         if (item.mtime < mtime) {
           cache.del(filepath);
         }
       } catch (e) {
-        // for safe
         cache.del(filepath);
       }
     }
   }
-
-  // private timeTask() {
-  // this.timer = setInterval(() => this.update, 5 * 60 * 1000).unref();
-  // }
 }
-
 const reader = new LruReader();
-export const readFile = async filepath => {
-  const file = await reader.read(filepath);
-  return file === null || file === void 0 ? void 0 : file.content;
-};
-export const updateFile = () => {
+const readFile = (filepath) => __async(void 0, null, function* () {
+  const file = yield reader.read(filepath);
+  return file == null ? void 0 : file.content;
+});
+const updateFile = () => {
   reader.update();
 };
-export const init = () => {
+const init = () => {
   reader.init();
 };
-export const close = () => {
+const close = () => {
   reader.close();
-};
+};
+export {
+  LruReader,
+  close,
+  init,
+  readFile,
+  updateFile
+};

package/dist/js/modern/libs/render/ssr.js

@@ -1,23 +1,42 @@
-import path from 'path';
-import { fs, LOADABLE_STATS_FILE, mime, ROUTE_MINIFEST_FILE, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
-import cookie from 'cookie';
+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,
+  LOADABLE_STATS_FILE,
+  mime,
+  ROUTE_MINIFEST_FILE,
+  SERVER_RENDER_FUNCTION_NAME
+} from "@modern-js/utils";
+import cookie from "cookie";
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
-export const render = async (ctx, renderOptions, runner) => {
-  var _ctx$res;
-  const {
-    urlPath,
-    bundle,
-    distDir,
-    template,
-    entryName,
-    staticGenerate
-  } = renderOptions;
+const render = (ctx, renderOptions, runner) => __async(void 0, null, function* () {
+  var _a;
+  const { urlPath, bundle, distDir, template, entryName, staticGenerate } = renderOptions;
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
-  const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : '';
+  const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : "";
   const routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
-  const routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : undefined;
+  const routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : void 0;
   const context = {
     request: {
       baseUrl: urlPath,
@@ -26,27 +45,26 @@ export const render = async (ctx, renderOptions, runner) => {
       host: ctx.host,
       query: ctx.query,
       url: ctx.href,
-      cookieMap: cookie.parse(ctx.headers.cookie || ''),
+      cookieMap: cookie.parse(ctx.headers.cookie || ""),
       headers: ctx.headers
     },
     response: {
       setHeader: (key, value) => {
         return ctx.res.setHeader(key, value);
       },
-      status: code => {
+      status: (code) => {
         ctx.res.statusCode = code;
       },
-      locals: ((_ctx$res = ctx.res) === null || _ctx$res === void 0 ? void 0 : _ctx$res.locals) || {}
+      locals: ((_a = ctx.res) == null ? void 0 : _a.locals) || {}
     },
     redirection: {},
     template,
     loadableStats,
     routeManifest,
-    // for streaming ssr
     entryName,
     staticGenerate,
-    logger: undefined,
-    metrics: undefined,
+    logger: void 0,
+    metrics: void 0,
     req: ctx.req,
     res: ctx.res
   };
@@ -54,29 +72,29 @@ export const render = async (ctx, renderOptions, runner) => {
   context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
-  const content = await cache(serverRender, ctx)(context);
-  const {
-    url,
-    status = 302
-  } = context.redirection;
+  const content = yield cache(serverRender, ctx)(context);
+  const { url, status = 302 } = context.redirection;
   if (url) {
     return {
       content: url,
-      contentType: '',
+      contentType: "",
       statusCode: status,
       redirect: true
     };
   }
-  if (typeof content === 'string') {
+  if (typeof content === "string") {
     return {
       content,
-      contentType: mime.contentType('html')
+      contentType: mime.contentType("html")
     };
   } else {
     return {
-      content: '',
+      content: "",
       contentStream: content,
-      contentType: mime.contentType('html')
+      contentType: mime.contentType("html")
     };
   }
-};
+});
+export {
+  render
+};

package/dist/js/modern/libs/render/static.js

@@ -1,43 +1,60 @@
-import path from 'path';
-import { mime } 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 path from "path";
+import { mime } from "@modern-js/utils";
 import { readFile } from "./reader";
-export async function handleDirectory(ctx, entryPath, urlPath) {
-  const {
-    path: pathname
-  } = ctx;
-  const filepath = path.join(entryPath, trimLeft(pathname, urlPath));
-
-  // If can match accurately, always return the one that matches accurately
-  let content = await readFile(filepath);
-  let contentType = mime.contentType(path.extname(filepath) || '');
-
-  // automatic addressing
-  if (!content) {
-    if (pathname.endsWith('/')) {
-      content = await readFile(`${filepath}index.html`);
-    } else if (!pathname.includes('.')) {
-      content = await readFile(`${filepath}.html`);
-      if (!content) {
-        content = await readFile(`${filepath}/index.html`);
+function handleDirectory(ctx, entryPath, urlPath) {
+  return __async(this, null, function* () {
+    const { path: pathname } = ctx;
+    const filepath = path.join(entryPath, trimLeft(pathname, urlPath));
+    let content = yield readFile(filepath);
+    let contentType = mime.contentType(path.extname(filepath) || "");
+    if (!content) {
+      if (pathname.endsWith("/")) {
+        content = yield readFile(`${filepath}index.html`);
+      } else if (!pathname.includes(".")) {
+        content = yield readFile(`${filepath}.html`);
+        if (!content) {
+          content = yield readFile(`${filepath}/index.html`);
+        }
+      }
+      if (content) {
+        contentType = mime.contentType("html");
       }
     }
-
-    // set content-type as html
-    if (content) {
-      contentType = mime.contentType('html');
+    if (!content) {
+      return null;
     }
-  }
-  if (!content) {
-    return null;
-  }
-  return {
-    content,
-    contentType: contentType || ''
-  };
+    return {
+      content,
+      contentType: contentType || ""
+    };
+  });
 }
 const trimLeft = (str, prefix) => {
   if (str.startsWith(prefix)) {
     return str.substring(prefix.length);
   }
   return str;
-};
+};
+export {
+  handleDirectory
+};

package/dist/js/modern/libs/render/type.js

@@ -1,6 +1,9 @@
-export let RenderLevel;
-(function (RenderLevel) {
-  RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
-  RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
-  RenderLevel[RenderLevel["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-})(RenderLevel || (RenderLevel = {}));
+var RenderLevel = /* @__PURE__ */ ((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
+};

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

@@ -1,13 +1,9 @@
-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 { RouteMatcher } from "./matcher";
-export class RouteMatchManager {
+class RouteMatchManager {
   constructor() {
-    _defineProperty(this, "matchers", void 0);
-    _defineProperty(this, "specs", []);
+    this.specs = [];
     this.matchers = [];
   }
-
-  // get all routes matches pathname
   filter(pathname) {
     return this.matchers.reduce((matches, matcher) => {
       if (matcher.matchUrlPath(pathname)) {
@@ -16,8 +12,6 @@ export class RouteMatchManager {
       return matches;
     }, []);
   }
-
-  // get best match from a set of matches
   best(pathname, matches) {
     let best;
     let matchedLen = 0;
@@ -33,8 +27,6 @@ export class RouteMatchManager {
     }
     return best;
   }
-
-  // reset routes matcher
   reset(specs) {
     this.specs = specs;
     const matchers = specs.reduce((ms, spec) => {
@@ -43,19 +35,20 @@ export class RouteMatchManager {
     }, []);
     this.matchers = matchers;
   }
-
-  // get best match from all matcher in manager
   match(pathname) {
     const matches = this.filter(pathname);
     const best = this.best(pathname, matches);
     return best;
   }
   matchEntry(entryname) {
-    return this.matchers.find(matcher => matcher.matchEntry(entryname));
+    return this.matchers.find((matcher) => matcher.matchEntry(entryname));
   }
   getBundles() {
-    const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
+    const bundles = this.specs.filter((route) => route.isSSR).map((route) => route.bundle);
     return bundles;
   }
 }
-export { RouteMatcher };
+export {
+  RouteMatchManager,
+  RouteMatcher
+};

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

@@ -1,29 +1,21 @@
-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 { match, pathToRegexp, compile } from 'path-to-regexp';
+import {
+  match,
+  pathToRegexp,
+  compile
+} from "path-to-regexp";
 import { ModernRoute } from "./route";
-
-// avoid import @modern-js/utils
-const removeTailSlash = s => s.replace(/\/+$/, '');
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const toPath = (reg, params) => {
-  const fn = compile(reg, {
-    encode: encodeURIComponent
-  });
+  const fn = compile(reg, { encode: encodeURIComponent });
   return fn(params);
 };
-
-// eslint-disable-next-line no-useless-escape
 const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-export class RouteMatcher {
+class RouteMatcher {
   constructor(spec) {
-    _defineProperty(this, "spec", void 0);
-    _defineProperty(this, "urlPath", '');
-    _defineProperty(this, "urlMatcher", void 0);
-    _defineProperty(this, "urlReg", void 0);
+    this.urlPath = "";
     this.spec = spec;
     this.setupUrlPath();
   }
-
-  // generate modern route object
   generate(url) {
     const route = new ModernRoute(this.spec);
     if (this.urlPath) {
@@ -41,30 +33,25 @@ export class RouteMatcher {
       return matchResult.params;
     }
   }
-
-  // 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 (result === null || result === void 0 ? void 0 : (_result$ = result[0]) === null || _result$ === void 0 ? void 0 : _result$.length) || null;
+      return ((_a = result == null ? void 0 : result[0]) == null ? void 0 : _a.length) || null;
     }
   }
-
-  // if match url path
   matchUrlPath(requestUrl) {
-    let urlWithoutSlash = requestUrl.endsWith('/') && requestUrl !== '/' ? requestUrl.slice(0, -1) : requestUrl;
-    if (urlWithoutSlash.endsWith('.html')) {
+    let urlWithoutSlash = requestUrl.endsWith("/") && requestUrl !== "/" ? requestUrl.slice(0, -1) : requestUrl;
+    if (urlWithoutSlash.endsWith(".html")) {
       urlWithoutSlash = urlWithoutSlash.slice(0, -5);
     }
     if (this.urlMatcher) {
       return Boolean(this.urlMatcher(urlWithoutSlash));
     } else {
       if (urlWithoutSlash.startsWith(this.urlPath)) {
-        // avoid /abcd match /a
-        if (this.urlPath !== '/' && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith(`${this.urlPath}/`)) {
+        if (this.urlPath !== "/" && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith(`${this.urlPath}/`)) {
           return false;
         }
         return true;
@@ -75,13 +62,9 @@ export class RouteMatcher {
   matchEntry(entryName) {
     return this.spec.entryName === entryName;
   }
-
-  // compiler urlPath to regexp if necessary
   setupUrlPath() {
-    const {
-      urlPath
-    } = this.spec;
-    this.urlPath = urlPath === '/' ? urlPath : removeTailSlash(urlPath);
+    const { urlPath } = this.spec;
+    this.urlPath = urlPath === "/" ? urlPath : removeTailSlash(urlPath);
     const useReg = regCharsDetector.test(urlPath);
     if (useReg) {
       this.urlMatcher = match(urlPath, {
@@ -93,4 +76,7 @@ export class RouteMatcher {
       });
     }
   }
-}
+}
+export {
+  RouteMatcher
+};