@modern-js/prod-server 1.22.1 → 2.0.0-alpha.0

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

@@ -1,69 +1,84 @@
-import path from 'path';
-import { fs, 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 { fs, mime } from "@modern-js/utils";
 import { ERROR_DIGEST } from "../../constants";
 import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
-import { supportModern, getModernEntry } from "./modern";
-export const createRenderHandler = ({
+const createRenderHandler = ({
   distDir,
   staticGenerate
-}) => async function render({
-  ctx,
-  route,
-  runner
-}) {
-  if (ctx.resHasHandled()) {
-    return null;
-  }
-
-  const {
-    entryPath,
-    urlPath
-  } = route;
-  const entry = path.join(distDir, entryPath);
-
-  if (!route.isSPA) {
-    const result = await handleDirectory(ctx, entry, urlPath);
-    return result;
-  } // only spa can use es6-html
-
-
-  const modernEntry = getModernEntry(entry);
-  const useModern = // route.enableModernMode &&
-  supportModern(ctx) && fs.existsSync(modernEntry);
-  const templatePath = useModern ? modernEntry : entry;
-
-  if (!fs.existsSync(templatePath)) {
-    throw new Error(`Could not find template file: ${templatePath}`);
-  }
-
-  const content = await readFile(templatePath);
-
-  if (!content) {
-    return null;
-  } // handles ssr first
-
-
-  if (route.isSSR) {
-    try {
-      const result = await ssr.render(ctx, {
-        distDir,
-        entryName: route.entryName,
-        urlPath: route.urlPath,
-        bundle: route.bundle,
-        template: content.toString(),
-        staticGenerate
-      }, runner);
+}) => function render(_0) {
+  return __async(this, arguments, function* ({
+    ctx,
+    route,
+    runner
+  }) {
+    if (ctx.resHasHandled()) {
+      return null;
+    }
+    const { entryPath, urlPath } = route;
+    const entry = path.join(distDir, entryPath);
+    if (!route.isSPA) {
+      const result = yield handleDirectory(ctx, entry, urlPath);
       return result;
-    } catch (err) {
-      ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);
-      ctx.res.setHeader('x-modern-ssr-fallback', '1');
     }
-  }
-
-  return {
-    content,
-    contentType: mime.contentType(path.extname(templatePath))
-  };
-};
+    const templatePath = entry;
+    if (!fs.existsSync(templatePath)) {
+      throw new Error(`Could not find template file: ${templatePath}`);
+    }
+    const content = yield readFile(templatePath);
+    if (!content) {
+      return null;
+    }
+    if (route.isSSR) {
+      try {
+        const result = yield ssr.render(
+          ctx,
+          {
+            distDir,
+            entryName: route.entryName,
+            urlPath: route.urlPath,
+            bundle: route.bundle,
+            template: content.toString(),
+            staticGenerate
+          },
+          runner
+        );
+        return result;
+      } catch (err) {
+        ctx.error(
+          ERROR_DIGEST.ERENDER,
+          err.stack || err.message
+        );
+        ctx.res.setHeader("x-modern-ssr-fallback", "1");
+      }
+    }
+    return {
+      content,
+      contentType: mime.contentType(path.extname(templatePath))
+    };
+  });
+};
+export {
+  createRenderHandler
+};

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

@@ -1,60 +1,68 @@
-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; }
-
+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);
   };
-
   const info = (message, ...args) => {
     logger.info(`SSR Info - ${message}, req.url = %s`, ...args, pathname);
   };
-
   const error = (message, e) => {
-    logger.error(`SSR Error - ${message}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, headersWithoutCookie(headers));
+    if (!e) {
+      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)
+    );
   };
-
   return {
     error,
     info,
     debug
   };
-};
+};
+export {
+  createLogger,
+  createMetrics
+};

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

@@ -1,115 +1,107 @@
-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();
+  init() {
   }
-
-  close() {// if (this.timer) {
-    //   clearInterval(this.timer);
-    // }
+  close() {
   }
-
-  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)) {
         cache.del(filepath);
       }
-
       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,20 +1,42 @@
-import path from 'path';
-import { fs, LOADABLE_STATS_FILE, mime, 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) => {
-  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) : void 0;
   const context = {
     request: {
       baseUrl: urlPath,
@@ -23,48 +45,56 @@ 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: ((_a = ctx.res) == null ? void 0 : _a.locals) || {}
     },
     redirection: {},
     template,
     loadableStats,
+    routeManifest,
     entryName,
     staticGenerate,
-    logger: undefined,
-    metrics: undefined
+    logger: void 0,
+    metrics: void 0,
+    req: ctx.req,
+    res: ctx.res
   };
   context.logger = createLogger(context, ctx.logger);
   context.metrics = createMetrics(context, ctx.metrics);
   runner.extendSSRContext(context);
-
   const serverRender = require(bundleJS)[SERVER_RENDER_FUNCTION_NAME];
-
-  const html = 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
     };
   }
-
-  return {
-    content: html,
-    contentType: mime.contentType('html')
-  };
-};
+  if (typeof content === "string") {
+    return {
+      content,
+      contentType: mime.contentType("html")
+    };
+  } else {
+    return {
+      content: "",
+      contentStream: content,
+      contentType: mime.contentType("html")
+    };
+  }
+});
+export {
+  render
+};

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

@@ -1,46 +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;
-  }
-
-  return {
-    content,
-    contentType: contentType || ''
-  };
+    if (!content) {
+      return null;
+    }
+    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,7 +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
+};