@modern-js/prod-server 2.0.0-beta.0 → 2.0.0-beta.1

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

@@ -1,13 +1,10 @@
 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';
 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);
   return {
@@ -15,28 +12,26 @@ const createCacheItem = async (filepath, mtime) => {
     mtime
   };
 };
-
 export class LruReader {
   // private timer?: NodeJS.Timeout;
+
   constructor() {
     _defineProperty(this, "cache", void 0);
-
     this.cache = new LRU({
       max: 256 * MB,
       length: getContentLength,
       maxAge: 5 * 60 * 5000 // 60s
-
     });
   }
 
-  init() {// this.timeTask();
+  init() {
+    // this.timeTask();
   }
-
-  close() {// if (this.timer) {
+  close() {
+    // if (this.timer) {
     //   clearInterval(this.timer);
     // }
   }
-
   async read(filepath) {
     if (this.cache.has(filepath)) {
       const {
@@ -46,45 +41,38 @@ export class LruReader {
         content
       };
     }
-
     if (!fs.existsSync(filepath)) {
       return null;
     }
-
     const stat = fs.statSync(filepath);
-
     if (stat.isDirectory()) {
       return null;
-    } // if file more than 20 MB
-
+    }
 
+    // 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;
   }
-
   update() {
     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
-
+        } = stat;
+        // file is modify
         if (item.mtime < mtime) {
           cache.del(filepath);
         }
@@ -93,12 +81,13 @@ export class LruReader {
         cache.del(filepath);
       }
     }
-  } // private timeTask() {
+  }
+
+  // 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);

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

@@ -1,11 +1,10 @@
 import path from 'path';
-import { fs, LOADABLE_STATS_FILE, mime, SERVER_RENDER_FUNCTION_NAME } from '@modern-js/utils';
+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,
@@ -17,6 +16,8 @@ export const render = async (ctx, renderOptions, runner) => {
   const bundleJS = path.join(distDir, bundle);
   const loadableUri = path.join(distDir, LOADABLE_STATS_FILE);
   const loadableStats = fs.existsSync(loadableUri) ? require(loadableUri) : '';
+  const routesManifestUri = path.join(distDir, ROUTE_MINIFEST_FILE);
+  const routeManifest = fs.existsSync(routesManifestUri) ? require(routesManifestUri) : undefined;
   const context = {
     request: {
       baseUrl: urlPath,
@@ -40,6 +41,8 @@ export const render = async (ctx, renderOptions, runner) => {
     redirection: {},
     template,
     loadableStats,
+    routeManifest,
+    // for streaming ssr
     entryName,
     staticGenerate,
     logger: undefined,
@@ -50,15 +53,12 @@ export const render = async (ctx, renderOptions, runner) => {
   context.logger = createLogger(context, ctx.logger);
   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;
-
   if (url) {
     return {
       content: url,
@@ -67,7 +67,6 @@ export const render = async (ctx, renderOptions, runner) => {
       redirect: true
     };
   }
-
   if (typeof content === 'string') {
     return {
       content,

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

@@ -5,42 +5,39 @@ 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
+  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
+  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`);
       }
-    } // set content-type as html
-
+    }
 
+    // set content-type as html
     if (content) {
       contentType = mime.contentType('html');
     }
   }
-
   if (!content) {
     return null;
   }
-
   return {
     content,
     contentType: contentType || ''
   };
 }
-
 const trimLeft = (str, prefix) => {
   if (str.startsWith(prefix)) {
     return str.substring(prefix.length);
   }
-
   return str;
 };

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

@@ -1,5 +1,4 @@
 export let RenderLevel;
-
 (function (RenderLevel) {
   RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";

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

@@ -1,48 +1,40 @@
 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 {
   constructor() {
     _defineProperty(this, "matchers", void 0);
-
     _defineProperty(this, "specs", []);
-
     this.matchers = [];
-  } // get all routes matches pathname
-
+  }
 
+  // get all routes matches pathname
   filter(pathname) {
     return this.matchers.reduce((matches, matcher) => {
       if (matcher.matchUrlPath(pathname)) {
         matches.push(matcher);
       }
-
       return matches;
     }, []);
-  } // get best match from a set of matches
-
+  }
 
+  // get best match from a set of matches
   best(pathname, matches) {
     let best;
     let matchedLen = 0;
-
     for (const match of matches) {
       const len = match.matchLength(pathname);
-
       if (len === null) {
         continue;
       }
-
       if (len > matchedLen) {
         best = match;
         matchedLen = len;
       }
     }
-
     return best;
-  } // reset routes matcher
-
+  }
 
+  // reset routes matcher
   reset(specs) {
     this.specs = specs;
     const matchers = specs.reduce((ms, spec) => {
@@ -50,23 +42,20 @@ export class RouteMatchManager {
       return ms;
     }, []);
     this.matchers = matchers;
-  } // get best match from all matcher in manager
-
+  }
 
+  // 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));
   }
-
   getBundles() {
     const bundles = this.specs.filter(route => route.isSSR).map(route => route.bundle);
     return bundles;
   }
-
 }
 export { RouteMatcher };

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

@@ -1,38 +1,38 @@
 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 { removeTailSlash } from '@modern-js/utils';
-import { match, pathToRegexp } from 'path-to-regexp';
-import { toPath } from "../../utils";
-import { ModernRoute } from "./route"; // eslint-disable-next-line no-useless-escape
-
+import { match, pathToRegexp, compile } from 'path-to-regexp';
+import { ModernRoute } from "./route";
+
+// avoid import @modern-js/utils
+const removeTailSlash = s => s.replace(/\/+$/, '');
+const toPath = (reg, params) => {
+  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 {
   constructor(spec) {
     _defineProperty(this, "spec", void 0);
-
     _defineProperty(this, "urlPath", '');
-
     _defineProperty(this, "urlMatcher", void 0);
-
     _defineProperty(this, "urlReg", void 0);
-
     this.spec = spec;
     this.setupUrlPath();
-  } // generate modern route object
-
+  }
 
+  // generate modern route object
   generate(url) {
     const route = new ModernRoute(this.spec);
-
     if (this.urlPath) {
       const params = this.parseURLParams(url);
       route.urlPath = toPath(route.urlPath, params);
       route.params = params;
     }
-
     return route;
   }
-
   parseURLParams(pathname) {
     if (!this.urlMatcher) {
       return {};
@@ -40,28 +40,25 @@ export class RouteMatcher {
       const matchResult = this.urlMatcher(pathname);
       return matchResult.params;
     }
-  } // get match url length
-
+  }
 
+  // get match url length
   matchLength(pathname) {
     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;
     }
-  } // if match url path
-
+  }
 
+  // if match url path
   matchUrlPath(requestUrl) {
     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 {
@@ -70,26 +67,22 @@ export class RouteMatcher {
         if (this.urlPath !== '/' && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith(`${this.urlPath}/`)) {
           return false;
         }
-
         return true;
       }
-
       return false;
     }
   }
-
   matchEntry(entryName) {
     return this.spec.entryName === entryName;
-  } // compiler urlPath to regexp if necessary
-
+  }
 
+  // compiler urlPath to regexp if necessary
   setupUrlPath() {
     const {
       urlPath
     } = this.spec;
     this.urlPath = urlPath === '/' ? urlPath : removeTailSlash(urlPath);
     const useReg = regCharsDetector.test(urlPath);
-
     if (useReg) {
       this.urlMatcher = match(urlPath, {
         end: false,
@@ -100,5 +93,4 @@ export class RouteMatcher {
       });
     }
   }
-
 }

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

@@ -1,29 +1,17 @@
 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 {
   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.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || '';
@@ -34,5 +22,4 @@ export class ModernRoute {
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
     this.responseHeaders = routeSpec.responseHeaders;
   }
-
 }

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

@@ -1,8 +1,8 @@
 // Todo 看看是不是能 fork 一份，即使命中也返回
+
 import serve from 'serve-static';
 import { isString, isRegExp } from '@modern-js/utils';
 import { useLocalPrefix } from "../utils";
-
 const removedPrefix = (req, prefix) => {
   if (useLocalPrefix(prefix)) {
     req.url = req.url.slice(prefix.length);
@@ -10,11 +10,11 @@ const removedPrefix = (req, prefix) => {
       req.url = prefix + req.url;
     };
   } else {
-    return () => {// emptyy
+    return () => {
+      // emptyy
     };
   }
 };
-
 export const faviconFallbackHandler = (context, next) => {
   if (context.url === '/favicon.ico') {
     context.res.statusCode = 204;
@@ -23,7 +23,8 @@ export const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-export const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
+export const createStaticFileHandler = (rules, output = {}) =>
+// eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
@@ -39,10 +40,8 @@ async (context, next) => {
     } else if (isRegExp(item.path) && item.path.test(requestUrl)) {
       return true;
     }
-
     return false;
   });
-
   if (hitRule) {
     const resume = removedPrefix(req, assetPrefix);
     serve(hitRule.target)(req, res, () => {