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

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

@@ -4,21 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.updateFile = exports.readFile = exports.init = exports.close = exports.LruReader = void 0;
-
 var _utils = require("@modern-js/utils");
-
 var _lruCache = _interopRequireDefault(require("lru-cache"));
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 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; }
-
 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 _utils.fs.readFile(filepath);
   return {
@@ -26,28 +19,26 @@ const createCacheItem = async (filepath, mtime) => {
     mtime
   };
 };
-
 class LruReader {
   // private timer?: NodeJS.Timeout;
+
   constructor() {
     _defineProperty(this, "cache", void 0);
-
     this.cache = new _lruCache.default({
       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 {
@@ -57,47 +48,38 @@ class LruReader {
         content
       };
     }
-
     if (!_utils.fs.existsSync(filepath)) {
       return null;
     }
-
     const stat = _utils.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 (!_utils.fs.existsSync(filepath)) {
         cache.del(filepath);
       }
-
       try {
         const item = cache.get(filepath);
-
         const stat = _utils.fs.statSync(filepath);
-
         const {
           mtime
-        } = stat; // file is modify
-
+        } = stat;
+        // file is modify
         if (item.mtime < mtime) {
           cache.del(filepath);
         }
@@ -106,37 +88,28 @@ class LruReader {
         cache.del(filepath);
       }
     }
-  } // private timeTask() {
+  }
+
+  // private timeTask() {
   // this.timer = setInterval(() => this.update, 5 * 60 * 1000).unref();
   // }
-
-
 }
-
 exports.LruReader = LruReader;
 const reader = new LruReader();
-
 const readFile = async filepath => {
   const file = await reader.read(filepath);
   return file === null || file === void 0 ? void 0 : file.content;
 };
-
 exports.readFile = readFile;
-
 const updateFile = () => {
   reader.update();
 };
-
 exports.updateFile = updateFile;
-
 const init = () => {
   reader.init();
 };
-
 exports.init = init;
-
 const close = () => {
   reader.close();
 };
-
 exports.close = close;

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

@@ -4,22 +4,14 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.render = void 0;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _cookie = _interopRequireDefault(require("cookie"));
-
 var _cache = _interopRequireDefault(require("./cache"));
-
 var _measure = require("./measure");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 const render = async (ctx, renderOptions, runner) => {
   var _ctx$res;
-
   const {
     urlPath,
     bundle,
@@ -28,12 +20,11 @@ const render = async (ctx, renderOptions, runner) => {
     entryName,
     staticGenerate
   } = renderOptions;
-
   const bundleJS = _path.default.join(distDir, bundle);
-
   const loadableUri = _path.default.join(distDir, _utils.LOADABLE_STATS_FILE);
-
   const loadableStats = _utils.fs.existsSync(loadableUri) ? require(loadableUri) : '';
+  const routesManifestUri = _path.default.join(distDir, _utils.ROUTE_MINIFEST_FILE);
+  const routeManifest = _utils.fs.existsSync(routesManifestUri) ? require(routesManifestUri) : undefined;
   const context = {
     request: {
       baseUrl: urlPath,
@@ -57,6 +48,8 @@ const render = async (ctx, renderOptions, runner) => {
     redirection: {},
     template,
     loadableStats,
+    routeManifest,
+    // for streaming ssr
     entryName,
     staticGenerate,
     logger: undefined,
@@ -67,15 +60,12 @@ const render = async (ctx, renderOptions, runner) => {
   context.logger = (0, _measure.createLogger)(context, ctx.logger);
   context.metrics = (0, _measure.createMetrics)(context, ctx.metrics);
   runner.extendSSRContext(context);
-
   const serverRender = require(bundleJS)[_utils.SERVER_RENDER_FUNCTION_NAME];
-
   const content = await (0, _cache.default)(serverRender, ctx)(context);
   const {
     url,
     status = 302
   } = context.redirection;
-
   if (url) {
     return {
       content: url,
@@ -84,7 +74,6 @@ const render = async (ctx, renderOptions, runner) => {
       redirect: true
     };
   }
-
   if (typeof content === 'string') {
     return {
       content,
@@ -98,5 +87,4 @@ const render = async (ctx, renderOptions, runner) => {
     };
   }
 };
-
 exports.render = render;

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

@@ -4,59 +4,47 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.handleDirectory = handleDirectory;
-
 var _path = _interopRequireDefault(require("path"));
-
 var _utils = require("@modern-js/utils");
-
 var _reader = require("./reader");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 async function handleDirectory(ctx, entryPath, urlPath) {
   const {
     path: pathname
   } = ctx;
+  const filepath = _path.default.join(entryPath, trimLeft(pathname, urlPath));
 
-  const filepath = _path.default.join(entryPath, trimLeft(pathname, urlPath)); // If can match accurately, always return the one that matches accurately
-
-
+  // If can match accurately, always return the one that matches accurately
   let content = await (0, _reader.readFile)(filepath);
+  let contentType = _utils.mime.contentType(_path.default.extname(filepath) || '');
 
-  let contentType = _utils.mime.contentType(_path.default.extname(filepath) || ''); // automatic addressing
-
-
+  // automatic addressing
   if (!content) {
     if (pathname.endsWith('/')) {
       content = await (0, _reader.readFile)(`${filepath}index.html`);
     } else if (!pathname.includes('.')) {
       content = await (0, _reader.readFile)(`${filepath}.html`);
-
       if (!content) {
         content = await (0, _reader.readFile)(`${filepath}/index.html`);
       }
-    } // set content-type as html
-
+    }
 
+    // set content-type as html
     if (content) {
       contentType = _utils.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/node/libs/render/type.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.RenderLevel = void 0;
 let RenderLevel;
 exports.RenderLevel = RenderLevel;
-
 (function (RenderLevel) {
   RenderLevel[RenderLevel["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel[RenderLevel["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";

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

@@ -10,53 +10,43 @@ Object.defineProperty(exports, "RouteMatcher", {
     return _matcher.RouteMatcher;
   }
 });
-
 var _matcher = require("./matcher");
-
 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; }
-
 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) => {
@@ -64,24 +54,20 @@ 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;
   }
-
 }
-
 exports.RouteMatchManager = RouteMatchManager;

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

@@ -4,47 +4,40 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.RouteMatcher = void 0;
-
-var _utils = require("@modern-js/utils");
-
 var _pathToRegexp = require("path-to-regexp");
-
-var _utils2 = require("../../utils");
-
 var _route = require("./route");
-
 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; }
+// avoid import @modern-js/utils
+const removeTailSlash = s => s.replace(/\/+$/, '');
+const toPath = (reg, params) => {
+  const fn = (0, _pathToRegexp.compile)(reg, {
+    encode: encodeURIComponent
+  });
+  return fn(params);
+};
 
 // eslint-disable-next-line no-useless-escape
 const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-
 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 _route.ModernRoute(this.spec);
-
     if (this.urlPath) {
       const params = this.parseURLParams(url);
-      route.urlPath = (0, _utils2.toPath)(route.urlPath, params);
+      route.urlPath = toPath(route.urlPath, params);
       route.params = params;
     }
-
     return route;
   }
-
   parseURLParams(pathname) {
     if (!this.urlMatcher) {
       return {};
@@ -52,28 +45,25 @@ 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 {
@@ -82,26 +72,22 @@ 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 : (0, _utils.removeTailSlash)(urlPath);
+    this.urlPath = urlPath === '/' ? urlPath : removeTailSlash(urlPath);
     const useReg = regCharsDetector.test(urlPath);
-
     if (useReg) {
       this.urlMatcher = (0, _pathToRegexp.match)(urlPath, {
         end: false,
@@ -112,7 +98,5 @@ class RouteMatcher {
       });
     }
   }
-
 }
-
 exports.RouteMatcher = RouteMatcher;

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

@@ -4,33 +4,20 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.ModernRoute = void 0;
-
 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; }
-
 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 || '';
@@ -41,7 +28,5 @@ class ModernRoute {
     this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
     this.responseHeaders = routeSpec.responseHeaders;
   }
-
 }
-
 exports.ModernRoute = ModernRoute;

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

@@ -4,16 +4,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.faviconFallbackHandler = exports.createStaticFileHandler = void 0;
-
 var _serveStatic = _interopRequireDefault(require("serve-static"));
-
 var _utils = require("@modern-js/utils");
-
 var _utils2 = require("../utils");
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
-
 // Todo 看看是不是能 fork 一份，即使命中也返回
+
 const removedPrefix = (req, prefix) => {
   if ((0, _utils2.useLocalPrefix)(prefix)) {
     req.url = req.url.slice(prefix.length);
@@ -21,11 +17,11 @@ const removedPrefix = (req, prefix) => {
       req.url = prefix + req.url;
     };
   } else {
-    return () => {// emptyy
+    return () => {
+      // emptyy
     };
   }
 };
-
 const faviconFallbackHandler = (context, next) => {
   if (context.url === '/favicon.ico') {
     context.res.statusCode = 204;
@@ -34,10 +30,9 @@ const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-
 exports.faviconFallbackHandler = faviconFallbackHandler;
-
-const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
+const createStaticFileHandler = (rules, output = {}) =>
+// eslint-disable-next-line consistent-return
 async (context, next) => {
   const {
     url: requestUrl,
@@ -53,10 +48,8 @@ async (context, next) => {
     } else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
       return true;
     }
-
     return false;
   });
-
   if (hitRule) {
     const resume = removedPrefix(req, assetPrefix);
     (0, _serveStatic.default)(hitRule.target)(req, res, () => {
@@ -67,5 +60,4 @@ async (context, next) => {
     return next();
   }
 };
-
 exports.createStaticFileHandler = createStaticFileHandler;