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

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

@@ -1,50 +1,85 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  handleDirectory: () => handleDirectory
 });
-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));
-
-  // 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) || '');
-
-  // 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`);
+module.exports = __toCommonJS(stdin_exports);
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_reader = require("./reader");
+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());
+  });
+};
+function handleDirectory(ctx, entryPath, urlPath) {
+  return __async(this, null, function* () {
+    const { path: pathname } = ctx;
+    const filepath = import_path.default.join(entryPath, trimLeft(pathname, urlPath));
+    let content = yield (0, import_reader.readFile)(filepath);
+    let contentType = import_utils.mime.contentType(import_path.default.extname(filepath) || "");
+    if (!content) {
+      if (pathname.endsWith("/")) {
+        content = yield (0, import_reader.readFile)(`${filepath}index.html`);
+      } else if (!pathname.includes(".")) {
+        content = yield (0, import_reader.readFile)(`${filepath}.html`);
+        if (!content) {
+          content = yield (0, import_reader.readFile)(`${filepath}/index.html`);
+        }
+      }
+      if (content) {
+        contentType = import_utils.mime.contentType("html");
       }
     }
-
-    // set content-type as html
-    if (content) {
-      contentType = _utils.mime.contentType('html');
+    if (!content) {
+      return null;
     }
-  }
-  if (!content) {
-    return null;
-  }
-  return {
-    content,
-    contentType: contentType || ''
-  };
+    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

@@ -1,13 +1,28 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  RenderLevel: () => RenderLevel
 });
-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";
-  RenderLevel[RenderLevel["SERVER_RENDER"] = 2] = "SERVER_RENDER";
-})(RenderLevel || (exports.RenderLevel = RenderLevel = {}));
+module.exports = __toCommonJS(stdin_exports);
+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 || {});

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

@@ -1,25 +1,32 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.RouteMatchManager = void 0;
-Object.defineProperty(exports, "RouteMatcher", {
-  enumerable: true,
-  get: function () {
-    return _matcher.RouteMatcher;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  RouteMatchManager: () => RouteMatchManager,
+  RouteMatcher: () => import_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; }
+module.exports = __toCommonJS(stdin_exports);
+var import_matcher = require("./matcher");
 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)) {
@@ -28,8 +35,6 @@ class RouteMatchManager {
       return matches;
     }, []);
   }
-
-  // get best match from a set of matches
   best(pathname, matches) {
     let best;
     let matchedLen = 0;
@@ -45,29 +50,24 @@ class RouteMatchManager {
     }
     return best;
   }
-
-  // reset routes matcher
   reset(specs) {
     this.specs = specs;
     const matchers = specs.reduce((ms, spec) => {
-      ms.push(new _matcher.RouteMatcher(spec));
+      ms.push(new import_matcher.RouteMatcher(spec));
       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;
   }
 }
-exports.RouteMatchManager = RouteMatchManager;

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

@@ -1,36 +1,41 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  RouteMatcher: () => RouteMatcher
 });
-exports.RouteMatcher = void 0;
-var _pathToRegexp = require("path-to-regexp");
-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(/\/+$/, '');
+module.exports = __toCommonJS(stdin_exports);
+var import_path_to_regexp = require("path-to-regexp");
+var import_route = require("./route");
+const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const toPath = (reg, params) => {
-  const fn = (0, _pathToRegexp.compile)(reg, {
-    encode: encodeURIComponent
-  });
+  const fn = (0, import_path_to_regexp.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.urlPath = "";
     this.spec = spec;
     this.setupUrlPath();
   }
-
-  // generate modern route object
   generate(url) {
-    const route = new _route.ModernRoute(this.spec);
+    const route = new import_route.ModernRoute(this.spec);
     if (this.urlPath) {
       const params = this.parseURLParams(url);
       route.urlPath = toPath(route.urlPath, params);
@@ -46,30 +51,25 @@ class RouteMatcher {
       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;
@@ -80,23 +80,18 @@ class RouteMatcher {
   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 = (0, _pathToRegexp.match)(urlPath, {
+      this.urlMatcher = (0, import_path_to_regexp.match)(urlPath, {
         end: false,
         decode: decodeURIComponent
       });
-      this.urlReg = (0, _pathToRegexp.pathToRegexp)(urlPath, [], {
+      this.urlReg = (0, import_path_to_regexp.pathToRegexp)(urlPath, [], {
         end: false
       });
     }
   }
 }
-exports.RouteMatcher = RouteMatcher;

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

@@ -1,32 +1,35 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  ModernRoute: () => ModernRoute
 });
-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; }
+module.exports = __toCommonJS(stdin_exports);
 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;
   }
 }
-exports.ModernRoute = ModernRoute;

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

@@ -1,63 +1,92 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var stdin_exports = {};
+__export(stdin_exports, {
+  createStaticFileHandler: () => createStaticFileHandler,
+  faviconFallbackHandler: () => faviconFallbackHandler
 });
-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 一份，即使命中也返回
-
+module.exports = __toCommonJS(stdin_exports);
+var import_serve_static = __toESM(require("serve-static"));
+var import_utils = require("@modern-js/utils");
+var import_utils2 = require("../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());
+  });
+};
 const removedPrefix = (req, prefix) => {
-  if ((0, _utils2.useLocalPrefix)(prefix)) {
+  if ((0, import_utils2.useLocalPrefix)(prefix)) {
     req.url = req.url.slice(prefix.length);
     return () => {
       req.url = prefix + req.url;
     };
   } else {
     return () => {
-      // emptyy
     };
   }
 };
 const faviconFallbackHandler = (context, next) => {
-  if (context.url === '/favicon.ico') {
+  if (context.url === "/favicon.ico") {
     context.res.statusCode = 204;
     context.res.end();
   } else {
     next();
   }
 };
-exports.faviconFallbackHandler = faviconFallbackHandler;
-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 => {
-    if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
+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 ((0, import_utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
       return true;
-    } else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
+    } else if ((0, import_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, () => {
+    (0, import_serve_static.default)(hitRule.target)(req, res, () => {
       resume();
       next();
     });
   } else {
     return next();
   }
-};
-exports.createStaticFileHandler = createStaticFileHandler;
+});