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

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

@@ -1,94 +1,130 @@
-import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { RouteMatcher } from "./matcher";
-export var RouteMatchManager = /*#__PURE__*/function () {
-  function RouteMatchManager() {
-    _classCallCheck(this, RouteMatchManager);
-    _defineProperty(this, "matchers", void 0);
-    _defineProperty(this, "specs", []);
-    this.matchers = [];
-  }
-
-  // get all routes matches pathname
-  _createClass(RouteMatchManager, [{
-    key: "filter",
-    value: function filter(pathname) {
-      return this.matchers.reduce(function (matches, matcher) {
-        if (matcher.matchUrlPath(pathname)) {
-          matches.push(matcher);
-        }
-        return matches;
-      }, []);
-    }
-
-    // get best match from a set of matches
-  }, {
-    key: "best",
-    value: function best(pathname, matches) {
-      var best;
-      var matchedLen = 0;
-      var _iterator = _createForOfIteratorHelper(matches),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var match = _step.value;
-          var len = match.matchLength(pathname);
-          if (len === null) {
-            continue;
-          }
-          if (len > matchedLen) {
-            best = match;
-            matchedLen = len;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      return best;
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
     }
-
-    // reset routes matcher
-  }, {
-    key: "reset",
-    value: function reset(specs) {
-      this.specs = specs;
-      var matchers = specs.reduce(function (ms, spec) {
-        ms.push(new RouteMatcher(spec));
-        return ms;
-      }, []);
-      this.matchers = matchers;
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
     }
-
-    // get best match from all matcher in manager
-  }, {
-    key: "match",
-    value: function match(pathname) {
-      var matches = this.filter(pathname);
-      var best = this.best(pathname, matches);
-      return best;
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+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;
     }
-  }, {
-    key: "matchEntry",
-    value: function matchEntry(entryname) {
-      return this.matchers.find(function (matcher) {
-        return matcher.matchEntry(entryname);
-      });
-    }
-  }, {
-    key: "getBundles",
-    value: function getBundles() {
-      var bundles = this.specs.filter(function (route) {
-        return route.isSSR;
-      }).map(function (route) {
-        return route.bundle;
-      });
-      return bundles;
+    return obj;
+}
+import { RouteMatcher } from "./matcher";
+var RouteMatchManager = /*#__PURE__*/ function() {
+    "use strict";
+    function RouteMatchManager() {
+        _classCallCheck(this, RouteMatchManager);
+        _defineProperty(this, "matchers", void 0);
+        _defineProperty(this, "specs", []);
+        this.matchers = [];
     }
-  }]);
-  return RouteMatchManager;
+    _createClass(RouteMatchManager, [
+        {
+            key: "filter",
+            value: function filter(pathname) {
+                return this.matchers.reduce(function(matches, matcher) {
+                    if (matcher.matchUrlPath(pathname)) {
+                        matches.push(matcher);
+                    }
+                    return matches;
+                }, []);
+            }
+        },
+        {
+            key: "best",
+            value: function best(pathname, matches) {
+                var best;
+                var matchedLen = 0;
+                var _iteratorNormalCompletion = true, _didIteratorError = false, _iteratorError = undefined;
+                try {
+                    for(var _iterator = matches[Symbol.iterator](), _step; !(_iteratorNormalCompletion = (_step = _iterator.next()).done); _iteratorNormalCompletion = true){
+                        var match = _step.value;
+                        var len = match.matchLength(pathname);
+                        if (len === null) {
+                            continue;
+                        }
+                        if (len > matchedLen) {
+                            best = match;
+                            matchedLen = len;
+                        }
+                    }
+                } catch (err) {
+                    _didIteratorError = true;
+                    _iteratorError = err;
+                } finally{
+                    try {
+                        if (!_iteratorNormalCompletion && _iterator.return != null) {
+                            _iterator.return();
+                        }
+                    } finally{
+                        if (_didIteratorError) {
+                            throw _iteratorError;
+                        }
+                    }
+                }
+                return best;
+            }
+        },
+        {
+            key: "reset",
+            value: function reset(specs) {
+                this.specs = specs;
+                var matchers = specs.reduce(function(ms, spec) {
+                    ms.push(new RouteMatcher(spec));
+                    return ms;
+                }, []);
+                this.matchers = matchers;
+            }
+        },
+        {
+            key: "match",
+            value: function match(pathname) {
+                var matches = this.filter(pathname);
+                var best = this.best(pathname, matches);
+                return best;
+            }
+        },
+        {
+            key: "matchEntry",
+            value: function matchEntry(entryname) {
+                return this.matchers.find(function(matcher) {
+                    return matcher.matchEntry(entryname);
+                });
+            }
+        },
+        {
+            key: "getBundles",
+            value: function getBundles() {
+                var bundles = this.specs.filter(function(route) {
+                    return route.isSSR;
+                }).map(function(route) {
+                    return route.bundle;
+                });
+                return bundles;
+            }
+        }
+    ]);
+    return RouteMatchManager;
 }();
-export { RouteMatcher };
+export { RouteMatchManager, RouteMatcher };

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

@@ -1,113 +1,138 @@
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import { match, pathToRegexp, compile } from 'path-to-regexp';
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+function _defineProperties(target, props) {
+    for(var i = 0; i < props.length; i++){
+        var descriptor = props[i];
+        descriptor.enumerable = descriptor.enumerable || false;
+        descriptor.configurable = true;
+        if ("value" in descriptor) descriptor.writable = true;
+        Object.defineProperty(target, descriptor.key, descriptor);
+    }
+}
+function _createClass(Constructor, protoProps, staticProps) {
+    if (protoProps) _defineProperties(Constructor.prototype, protoProps);
+    if (staticProps) _defineProperties(Constructor, staticProps);
+    return Constructor;
+}
+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 { ModernRoute } from "./route";
-
-// avoid import @modern-js/utils
-var removeTailSlash = function removeTailSlash(s) {
-  return s.replace(/\/+$/, '');
+var removeTailSlash = function(s) {
+    return s.replace(/\/+$/, "");
 };
-var toPath = function toPath(reg, params) {
-  var fn = compile(reg, {
-    encode: encodeURIComponent
-  });
-  return fn(params);
+var toPath = function(reg, params) {
+    var fn = compile(reg, {
+        encode: encodeURIComponent
+    });
+    return fn(params);
 };
-
-// eslint-disable-next-line no-useless-escape
 var regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-export var RouteMatcher = /*#__PURE__*/function () {
-  function RouteMatcher(spec) {
-    _classCallCheck(this, RouteMatcher);
-    _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
-  _createClass(RouteMatcher, [{
-    key: "generate",
-    value: function generate(url) {
-      var route = new ModernRoute(this.spec);
-      if (this.urlPath) {
-        var params = this.parseURLParams(url);
-        route.urlPath = toPath(route.urlPath, params);
-        route.params = params;
-      }
-      return route;
-    }
-  }, {
-    key: "parseURLParams",
-    value: function parseURLParams(pathname) {
-      if (!this.urlMatcher) {
-        return {};
-      } else {
-        var matchResult = this.urlMatcher(pathname);
-        return matchResult.params;
-      }
-    }
-
-    // get match url length
-  }, {
-    key: "matchLength",
-    value: function matchLength(pathname) {
-      if (!this.urlReg) {
-        return this.urlPath.length;
-      } else {
-        var _result$;
-        var 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;
-      }
+var RouteMatcher = /*#__PURE__*/ function() {
+    "use strict";
+    function RouteMatcher(spec) {
+        _classCallCheck(this, RouteMatcher);
+        _defineProperty(this, "spec", void 0);
+        _defineProperty(this, "urlPath", "");
+        _defineProperty(this, "urlMatcher", void 0);
+        _defineProperty(this, "urlReg", void 0);
+        this.spec = spec;
+        this.setupUrlPath();
     }
-
-    // if match url path
-  }, {
-    key: "matchUrlPath",
-    value: function matchUrlPath(requestUrl) {
-      var 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("".concat(this.urlPath, "/"))) {
-            return false;
-          }
-          return true;
+    _createClass(RouteMatcher, [
+        {
+            key: "generate",
+            value: function generate(url) {
+                var route = new ModernRoute(this.spec);
+                if (this.urlPath) {
+                    var params = this.parseURLParams(url);
+                    route.urlPath = toPath(route.urlPath, params);
+                    route.params = params;
+                }
+                return route;
+            }
+        },
+        {
+            key: "parseURLParams",
+            value: function parseURLParams(pathname) {
+                if (!this.urlMatcher) {
+                    return {};
+                } else {
+                    var matchResult = this.urlMatcher(pathname);
+                    return matchResult.params;
+                }
+            }
+        },
+        {
+            key: "matchLength",
+            value: function matchLength(pathname) {
+                if (!this.urlReg) {
+                    return this.urlPath.length;
+                } else {
+                    var ref;
+                    var result = this.urlReg.exec(pathname);
+                    return (result === null || result === void 0 ? void 0 : (ref = result[0]) === null || ref === void 0 ? void 0 : ref.length) || null;
+                }
+            }
+        },
+        {
+            key: "matchUrlPath",
+            value: function matchUrlPath(requestUrl) {
+                var 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)) {
+                        if (this.urlPath !== "/" && urlWithoutSlash.length > this.urlPath.length && !urlWithoutSlash.startsWith("".concat(this.urlPath, "/"))) {
+                            return false;
+                        }
+                        return true;
+                    }
+                    return false;
+                }
+            }
+        },
+        {
+            key: "matchEntry",
+            value: function matchEntry(entryName) {
+                return this.spec.entryName === entryName;
+            }
+        },
+        {
+            key: "setupUrlPath",
+            value: function setupUrlPath() {
+                var urlPath = this.spec.urlPath;
+                this.urlPath = urlPath === "/" ? urlPath : removeTailSlash(urlPath);
+                var useReg = regCharsDetector.test(urlPath);
+                if (useReg) {
+                    this.urlMatcher = match(urlPath, {
+                        end: false,
+                        decode: decodeURIComponent
+                    });
+                    this.urlReg = pathToRegexp(urlPath, [], {
+                        end: false
+                    });
+                }
+            }
         }
-        return false;
-      }
-    }
-  }, {
-    key: "matchEntry",
-    value: function matchEntry(entryName) {
-      return this.spec.entryName === entryName;
-    }
-
-    // compiler urlPath to regexp if necessary
-  }, {
-    key: "setupUrlPath",
-    value: function setupUrlPath() {
-      var urlPath = this.spec.urlPath;
-      this.urlPath = urlPath === '/' ? urlPath : removeTailSlash(urlPath);
-      var useReg = regCharsDetector.test(urlPath);
-      if (useReg) {
-        this.urlMatcher = match(urlPath, {
-          end: false,
-          decode: decodeURIComponent
-        });
-        this.urlReg = pathToRegexp(urlPath, [], {
-          end: false
-        });
-      }
-    }
-  }]);
-  return RouteMatcher;
-}();
+    ]);
+    return RouteMatcher;
+}();
+export { RouteMatcher };

package/dist/js/treeshaking/libs/route/route.js

@@ -1,26 +1,40 @@
-import _createClass from "@babel/runtime/helpers/esm/createClass";
-import _classCallCheck from "@babel/runtime/helpers/esm/classCallCheck";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-export var ModernRoute = /*#__PURE__*/_createClass(function ModernRoute(routeSpec) {
-  var _routeSpec$enableMode;
-  _classCallCheck(this, ModernRoute);
-  _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 || '';
-  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.responseHeaders = routeSpec.responseHeaders;
-});
+function _classCallCheck(instance, Constructor) {
+    if (!(instance instanceof Constructor)) {
+        throw new TypeError("Cannot call a class as a function");
+    }
+}
+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 ModernRoute = function ModernRoute(routeSpec) {
+    "use strict";
+    _classCallCheck(this, ModernRoute);
+    _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, "params", {});
+    _defineProperty(this, "responseHeaders", void 0);
+    this.entryName = routeSpec.entryName || "";
+    this.urlPath = routeSpec.urlPath;
+    this.entryPath = routeSpec.entryPath || "";
+    this.isSSR = routeSpec.isSSR || false;
+    this.isSPA = routeSpec.isSPA || false;
+    this.isApi = routeSpec.isApi || false;
+    this.bundle = routeSpec.bundle || "";
+    this.responseHeaders = routeSpec.responseHeaders;
+};
+export { ModernRoute };