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

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

@@ -1,48 +1,32 @@
-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)) {
         matches.push(matcher);
       }
-
       return 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(specs) {
     this.specs = specs;
     const matchers = specs.reduce((ms, spec) => {
@@ -50,23 +34,21 @@ export class RouteMatchManager {
       return ms;
     }, []);
     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,38 +1,30 @@
-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";
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
+const toPath = (reg, params) => {
+  const fn = compile(reg, { encode: encodeURIComponent });
+  return fn(params);
+};
 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) {
       const params = this.parseURLParams(url);
       route.urlPath = toPath(route.urlPath, params);
       route.params = params;
     }
-
     return route;
   }
-
   parseURLParams(pathname) {
     if (!this.urlMatcher) {
       return {};
@@ -40,56 +32,40 @@ export class RouteMatcher {
       const matchResult = this.urlMatcher(pathname);
       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;
       }
-
       return false;
     }
   }
-
   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, {
         end: false,
@@ -100,5 +76,7 @@ export class RouteMatcher {
       });
     }
   }
-
-}
+}
+export {
+  RouteMatcher
+};

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

@@ -1,38 +1,16 @@
-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 {
+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.params = {};
+    this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
-    this.entryPath = routeSpec.entryPath || '';
+    this.entryPath = routeSpec.entryPath || "";
     this.isSSR = routeSpec.isSSR || false;
     this.isSPA = routeSpec.isSPA || false;
     this.isApi = routeSpec.isApi || false;
-    this.bundle = routeSpec.bundle || '';
-    this.enableModernMode = (_routeSpec$enableMode = routeSpec.enableModernMode) !== null && _routeSpec$enableMode !== void 0 ? _routeSpec$enableMode : false;
+    this.bundle = routeSpec.bundle || "";
     this.responseHeaders = routeSpec.responseHeaders;
   }
-
-}
+}
+export {
+  ModernRoute
+};

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

@@ -1,8 +1,26 @@
-// Todo 看看是不是能 fork 一份，即使命中也返回
-import serve from 'serve-static';
-import { isString, isRegExp } 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 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,31 +28,29 @@ const removedPrefix = (req, prefix) => {
       req.url = prefix + req.url;
     };
   } else {
-    return () => {// emptyy
+    return () => {
     };
   }
 };
-
-export const createStaticFileHandler = (rules, output = {}) => // eslint-disable-next-line consistent-return
-async (context, next) => {
-  const {
-    url: requestUrl,
-    req,
-    res
-  } = context;
-  const {
-    assetPrefix = '/'
-  } = output;
-  const hitRule = rules.find(item => {
+const faviconFallbackHandler = (context, next) => {
+  if (context.url === "/favicon.ico") {
+    context.res.statusCode = 204;
+    context.res.end();
+  } else {
+    next();
+  }
+};
+const createStaticFileHandler = (rules, output = {}) => (context, next) => __async(void 0, null, function* () {
+  const { url: requestUrl, req, res } = context;
+  const { assetPrefix = "/" } = output;
+  const hitRule = rules.find((item) => {
     if (isString(item.path) && requestUrl.startsWith(item.path)) {
       return true;
     } 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, () => {
@@ -44,4 +60,8 @@ async (context, next) => {
   } else {
     return next();
   }
-};
+});
+export {
+  createStaticFileHandler,
+  faviconFallbackHandler
+};