@modern-js/prod-server 2.19.1 → 2.21.0

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

@@ -13,20 +13,8 @@ _export(exports, {
   RouteMatchManager: () => RouteMatchManager,
   RouteMatcher: () => _matcher.RouteMatcher
 });
+const _define_property = require("@swc/helpers/_/_define_property");
 const _matcher = require("./matcher");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 class RouteMatchManager {
   // get all routes matches pathname
   filter(pathname) {
@@ -76,8 +64,8 @@ class RouteMatchManager {
     return bundles;
   }
   constructor() {
-    _define_property(this, "matchers", void 0);
-    _define_property(this, "specs", []);
+    _define_property._(this, "matchers", void 0);
+    _define_property._(this, "specs", []);
     this.matchers = [];
   }
 }

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

@@ -6,21 +6,9 @@ Object.defineProperty(exports, "RouteMatcher", {
   enumerable: true,
   get: () => RouteMatcher
 });
+const _define_property = require("@swc/helpers/_/_define_property");
 const _pathtoregexp = require("path-to-regexp");
 const _route = require("./route");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
 const removeTailSlash = (s) => s.replace(/\/+$/, "");
 const removeHtmlSuffix = (url) => {
   if (url.endsWith(".html")) {
@@ -100,10 +88,10 @@ class RouteMatcher {
     }
   }
   constructor(spec) {
-    _define_property(this, "spec", void 0);
-    _define_property(this, "urlPath", "");
-    _define_property(this, "urlMatcher", void 0);
-    _define_property(this, "urlReg", void 0);
+    _define_property._(this, "spec", void 0);
+    _define_property._(this, "urlPath", "");
+    _define_property._(this, "urlMatcher", void 0);
+    _define_property._(this, "urlReg", void 0);
     this.spec = spec;
     this.setupUrlPath();
   }

package/dist/cjs/libs/route/route.js

@@ -6,30 +6,18 @@ Object.defineProperty(exports, "ModernRoute", {
   enumerable: true,
   get: () => ModernRoute
 });
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
+const _define_property = require("@swc/helpers/_/_define_property");
 class ModernRoute {
   constructor(routeSpec) {
-    _define_property(this, "entryName", void 0);
-    _define_property(this, "urlPath", void 0);
-    _define_property(this, "entryPath", void 0);
-    _define_property(this, "bundle", void 0);
-    _define_property(this, "isApi", void 0);
-    _define_property(this, "isSSR", void 0);
-    _define_property(this, "isSPA", void 0);
-    _define_property(this, "params", {});
-    _define_property(this, "responseHeaders", void 0);
+    _define_property._(this, "entryName", void 0);
+    _define_property._(this, "urlPath", void 0);
+    _define_property._(this, "entryPath", void 0);
+    _define_property._(this, "bundle", void 0);
+    _define_property._(this, "isApi", void 0);
+    _define_property._(this, "isSSR", void 0);
+    _define_property._(this, "isSPA", void 0);
+    _define_property._(this, "params", {});
+    _define_property._(this, "responseHeaders", void 0);
     this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || "";

package/dist/cjs/libs/serveFile.js

@@ -13,13 +13,9 @@ _export(exports, {
   faviconFallbackHandler: () => faviconFallbackHandler,
   createStaticFileHandler: () => createStaticFileHandler
 });
-const _servestatic = /* @__PURE__ */ _interop_require_default(require("serve-static"));
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _servestatic = /* @__PURE__ */ _interop_require_default._(require("serve-static"));
 const _utils = require("@modern-js/utils");
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 const removedPrefix = (req, prefix) => {
   const useLocalPrefix = !prefix.includes(".");
   if (useLocalPrefix) {

package/dist/cjs/server/index.js

@@ -6,31 +6,15 @@ Object.defineProperty(exports, "Server", {
   enumerable: true,
   get: () => Server
 });
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _servercore = require("@modern-js/server-core");
 const _metrics = require("../libs/metrics");
 const _loadConfig = require("../libs/loadConfig");
 const _utils1 = require("../utils");
 const _modernServerSplit = require("./modernServerSplit");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
 class Server {
   /**
   * 初始化顺序
@@ -181,12 +165,12 @@ class Server {
     }
   }
   constructor(options) {
-    _define_property(this, "options", void 0);
-    _define_property(this, "serverImpl", _modernServerSplit.createProdServer);
-    _define_property(this, "server", void 0);
-    _define_property(this, "app", void 0);
-    _define_property(this, "runner", void 0);
-    _define_property(this, "serverConfig", void 0);
+    _define_property._(this, "options", void 0);
+    _define_property._(this, "serverImpl", _modernServerSplit.createProdServer);
+    _define_property._(this, "server", void 0);
+    _define_property._(this, "app", void 0);
+    _define_property._(this, "runner", void 0);
+    _define_property._(this, "serverConfig", void 0);
     options.logger = options.logger || new _utils.Logger({
       level: "warn"
     });

package/dist/cjs/server/modernServer.js

@@ -6,81 +6,26 @@ Object.defineProperty(exports, "ModernServer", {
   enumerable: true,
   get: () => ModernServer
 });
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");
 const _http = require("http");
-const _path = /* @__PURE__ */ _interop_require_default(require("path"));
+const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
 const _utils = require("@modern-js/utils");
 const _route = require("../libs/route");
 const _render = require("../libs/render");
 const _serveFile = require("../libs/serveFile");
 const _utils1 = require("../utils");
-const _reader = /* @__PURE__ */ _interop_require_wildcard(require("../libs/render/reader"));
+const _reader = /* @__PURE__ */ _interop_require_wildcard._(require("../libs/render/reader"));
 const _proxy = require("../libs/proxy");
 const _context = require("../libs/context");
 const _constants = require("../constants");
 const _hookapi = require("../libs/hook-api");
-function _define_property(obj, key, value) {
-  if (key in obj) {
-    Object.defineProperty(obj, key, {
-      value,
-      enumerable: true,
-      configurable: true,
-      writable: true
-    });
-  } else {
-    obj[key] = value;
-  }
-  return obj;
-}
-function _interop_require_default(obj) {
-  return obj && obj.__esModule ? obj : {
-    default: obj
-  };
-}
-function _getRequireWildcardCache(nodeInterop) {
-  if (typeof WeakMap !== "function")
-    return null;
-  var cacheBabelInterop = /* @__PURE__ */ new WeakMap();
-  var cacheNodeInterop = /* @__PURE__ */ new WeakMap();
-  return (_getRequireWildcardCache = function(nodeInterop2) {
-    return nodeInterop2 ? cacheNodeInterop : cacheBabelInterop;
-  })(nodeInterop);
-}
-function _interop_require_wildcard(obj, nodeInterop) {
-  if (!nodeInterop && obj && obj.__esModule) {
-    return obj;
-  }
-  if (obj === null || typeof obj !== "object" && typeof obj !== "function") {
-    return {
-      default: obj
-    };
-  }
-  var cache = _getRequireWildcardCache(nodeInterop);
-  if (cache && cache.has(obj)) {
-    return cache.get(obj);
-  }
-  var newObj = {};
-  var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor;
-  for (var key in obj) {
-    if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) {
-      var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null;
-      if (desc && (desc.get || desc.set)) {
-        Object.defineProperty(newObj, key, desc);
-      } else {
-        newObj[key] = obj[key];
-      }
-    }
-  }
-  newObj.default = obj;
-  if (cache) {
-    cache.set(obj, newObj);
-  }
-  return newObj;
-}
 const SERVER_DIR = "./server";
 class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _this_conf_output;
+    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
     this.runner = runner;
     const { distDir, staticGenerate, conf } = this;
     (0, _utils1.debug)("final server conf", this.conf);
@@ -104,7 +49,8 @@ class ModernServer {
     this.routeRenderHandler = (0, _render.createRenderHandler)({
       distDir,
       staticGenerate,
-      forceCSR
+      forceCSR,
+      nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce
     });
     await this.setupBeforeProdMiddleware();
     this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
@@ -494,26 +440,26 @@ class ModernServer {
     context.res.end((0, _utils1.createErrorDocument)(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget }) {
-    _define_property(this, "pwd", void 0);
-    _define_property(this, "distDir", void 0);
-    _define_property(this, "workDir", void 0);
-    _define_property(this, "router", void 0);
-    _define_property(this, "conf", void 0);
-    _define_property(this, "handlers", []);
-    _define_property(this, "presetRoutes", void 0);
-    _define_property(this, "runner", void 0);
-    _define_property(this, "logger", void 0);
-    _define_property(this, "metrics", void 0);
-    _define_property(this, "runMode", void 0);
-    _define_property(this, "reader", _reader);
-    _define_property(this, "proxyTarget", void 0);
-    _define_property(this, "routeRenderHandler", void 0);
-    _define_property(this, "loaderHandler", null);
-    _define_property(this, "frameWebHandler", null);
-    _define_property(this, "frameAPIHandler", null);
-    _define_property(this, "proxyHandler", null);
-    _define_property(this, "_handler", void 0);
-    _define_property(this, "staticGenerate", void 0);
+    _define_property._(this, "pwd", void 0);
+    _define_property._(this, "distDir", void 0);
+    _define_property._(this, "workDir", void 0);
+    _define_property._(this, "router", void 0);
+    _define_property._(this, "conf", void 0);
+    _define_property._(this, "handlers", []);
+    _define_property._(this, "presetRoutes", void 0);
+    _define_property._(this, "runner", void 0);
+    _define_property._(this, "logger", void 0);
+    _define_property._(this, "metrics", void 0);
+    _define_property._(this, "runMode", void 0);
+    _define_property._(this, "reader", _reader);
+    _define_property._(this, "proxyTarget", void 0);
+    _define_property._(this, "routeRenderHandler", void 0);
+    _define_property._(this, "loaderHandler", null);
+    _define_property._(this, "frameWebHandler", null);
+    _define_property._(this, "frameAPIHandler", null);
+    _define_property._(this, "proxyHandler", null);
+    _define_property._(this, "_handler", void 0);
+    _define_property._(this, "staticGenerate", void 0);
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = _path.default.join(pwd, config.output.path || "dist");

package/dist/cjs/workerServer.js

@@ -10,74 +10,129 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  handleUrl: () => handleUrl,
+  ReturnResponse: () => ReturnResponse,
   createHandler: () => createHandler
 });
+const _define_property = require("@swc/helpers/_/_define_property");
 const _logger = require("./libs/logger");
 const _route = require("./libs/route");
 const _metrics = require("./libs/metrics");
-const handleUrl = (url) => {
-  return url.replace(/^https?:\/\/.*?\//gi, "/");
-};
+class ReturnResponse {
+  /**
+  * Iterate a Object
+  * 1. adds the value if the key does not already exist.
+  * 2. append the value if the key does already exist.
+  *
+  * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/append
+  * @param headers
+  * @returns
+  */
+  appendHeaders(headers) {
+    Object.entries(headers).forEach(([key, value]) => {
+      this.headers.append(key, value.toString());
+    });
+    return this;
+  }
+  /**
+  * Iterate a Object
+  * 1. adds the value if the key does not already exist.
+  * 2. modify the value if the key does already exist.
+  *
+  * more detail follow: https://developer.mozilla.org/en-US/docs/Web/API/Headers/set
+  * @param headers
+  * @returns
+  */
+  setHeaders(headers) {
+    Object.entries(headers).forEach(([key, value]) => {
+      this.headers.set(key, value.toString());
+    });
+    return this;
+  }
+  constructor(body, status, headers = {}) {
+    _define_property._(this, "body", void 0);
+    _define_property._(this, "status", void 0);
+    _define_property._(this, "headers", void 0);
+    this.body = body;
+    this.status = status;
+    this.headers = new Headers(headers);
+    this.headers.set("content-type", "text/html;charset=UTF-8");
+  }
+}
+const RESPONSE_NOTFOUND = new ReturnResponse("404: Page not found", 404);
 const createHandler = (manifest) => {
   const routeMgr = new _route.RouteMatchManager();
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
-  return async (ctx) => {
-    var _ctx_request, _ctx_request1, _ctx_request2;
-    const pageMatch = routeMgr.match(ctx.url);
+  return async (options) => {
+    const { request, loadableStats, routeManifest } = options;
+    const url = new URL(request.url);
+    const pageMatch = routeMgr.match(url.pathname);
     if (!pageMatch) {
-      ctx.body = "404: Page not found";
-      ctx.status = 404;
-      return;
+      return RESPONSE_NOTFOUND;
     }
     const page = pages[pageMatch.spec.urlPath];
-    var _query;
-    (_query = (_ctx_request = ctx.request).query) !== null && _query !== void 0 ? _query : _ctx_request.query = ctx.query;
-    var _pathname;
-    (_pathname = (_ctx_request1 = ctx.request).pathname) !== null && _pathname !== void 0 ? _pathname : _ctx_request1.pathname = ctx.pathname;
-    var _params;
-    (_params = (_ctx_request2 = ctx.request).params) !== null && _params !== void 0 ? _params : _ctx_request2.params = ctx.params;
-    const params = pageMatch.parseURLParams(ctx.url);
     if (page.serverRender) {
       try {
-        ctx.body = await page.serverRender({
-          entryName: page.entryName,
+        const responseLike = {
+          headers: {},
+          statusCode: 200,
+          locals: {},
+          setHeader(key, value) {
+            this.headers[key] = value;
+          },
+          status(code) {
+            this.statusCode = code;
+          }
+        };
+        const params = pageMatch.parseURLParams(url.pathname) || {};
+        const serverRenderContext = {
+          request: createServerRequest(url, request, params),
+          response: responseLike,
+          loadableStats,
+          routeManifest,
+          redirection: {},
           template: page.template,
-          query: ctx.query,
-          request: ctx.request,
-          response: ctx.response,
-          pathname: ctx.pathname,
-          req: ctx.request,
-          res: ctx.response,
-          params: ctx.params || params || {},
-          logger: ctx.logger || new _logger.Logger({
+          entryName: page.entryName,
+          logger: new _logger.Logger({
             level: "warn"
           }),
-          metrics: ctx.metrics || _metrics.metrics,
-          loadableStats: ctx.loadableStats,
-          routeManifest: ctx.routeManifest
-        });
-        ctx.status = 200;
-        return;
+          metrics: _metrics.metrics,
+          // FIXME: pass correctly req & res
+          req: request,
+          res: responseLike
+        };
+        const body = await page.serverRender(serverRenderContext);
+        return new ReturnResponse(body, responseLike.statusCode, responseLike.headers);
       } catch (e) {
-        if (page.template) {
-          ctx.body = page.template;
-          ctx.status = 200;
-          return;
-        } else {
-          ctx.body = "404: not found";
-          ctx.status = 404;
-          return;
-        }
+        console.warn(`page(${pageMatch.spec.urlPath}) serverRender occur error: `);
+        console.warn(e);
+        return createResponse(page.template);
       }
     }
-    if (page.template) {
-      ctx.body = page.template;
-      ctx.status = 200;
-      return;
+    console.warn(`Can't not page(${pageMatch.spec.urlPath}) serverRender`);
+    return createResponse(page.template);
+    function createServerRequest(url2, request2, params) {
+      const { pathname, host, searchParams } = url2;
+      const { headers: rawHeaders } = request2;
+      const headers = {};
+      rawHeaders.forEach((value, key) => {
+        headers[key] = value;
+      });
+      const query = Object.fromEntries(searchParams);
+      return {
+        pathname,
+        host,
+        headers,
+        params,
+        query
+      };
     }
-    ctx.body = "404: not found";
-    ctx.status = 404;
   };
 };
+function createResponse(template) {
+  if (template) {
+    return new ReturnResponse(template, 200);
+  } else {
+    return RESPONSE_NOTFOUND;
+  }
+}

package/dist/esm/libs/context/context.js

@@ -1,45 +1,7 @@
-function _class_call_check(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 _create_class(Constructor, protoProps, staticProps) {
-  if (protoProps)
-    _defineProperties(Constructor.prototype, protoProps);
-  if (staticProps)
-    _defineProperties(Constructor, staticProps);
-  return Constructor;
-}
-function _define_property(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;
-}
-function _instanceof(left, right) {
-  if (right != null && typeof Symbol !== "undefined" && right[Symbol.hasInstance]) {
-    return !!right[Symbol.hasInstance](left);
-  } else {
-    return left instanceof right;
-  }
-}
+import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
+import { _ as _create_class } from "@swc/helpers/_/_create_class";
+import { _ as _define_property } from "@swc/helpers/_/_define_property";
+import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { URL } from "url";
 import qs from "querystring";
 import { Buffer } from "buffer";