@modern-js/prod-server 2.21.1 → 2.22.1

package/CHANGELOG.md

@@ -1,5 +1,38 @@
 # @modern-js/prod-server
 
+## 2.22.1
+
+### Patch Changes
+
+- 1f02cd2: chore: fix some eslint issues
+
+  chore: 修复一些 eslint issues
+
+- Updated dependencies [e2848a2]
+- Updated dependencies [d4045ed]
+  - @modern-js/utils@2.22.1
+  - @modern-js/server-core@2.22.1
+  - @modern-js/plugin@2.22.1
+
+## 2.22.0
+
+### Minor Changes
+
+- 4991c8a: feat: support custom render html
+  feat: 支持自定义渲染 html.
+- cb9e1ec: feat: worker ssr support server hooks
+  feat: worker ssr 支持 server hooks
+
+### Patch Changes
+
+- ea961e7: fix: use path.resolve instead path.join for distPath
+  fix: 使用 path.resolve 代替 path.join 处理产物目录
+- Updated dependencies [3d48836]
+- Updated dependencies [5050e8e]
+  - @modern-js/utils@2.22.0
+  - @modern-js/server-core@2.22.0
+  - @modern-js/plugin@2.22.0
+
 ## 2.21.1
 
 ### Patch Changes

package/dist/cjs/constants.js

@@ -10,11 +10,21 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  ApiServerMode: () => ApiServerMode,
-  AGGRED_DIR: () => AGGRED_DIR,
-  ERROR_DIGEST: () => ERROR_DIGEST,
-  ERROR_PAGE_TEXT: () => ERROR_PAGE_TEXT,
-  RUN_MODE: () => RUN_MODE
+  ApiServerMode: function() {
+    return ApiServerMode;
+  },
+  AGGRED_DIR: function() {
+    return AGGRED_DIR;
+  },
+  ERROR_DIGEST: function() {
+    return ERROR_DIGEST;
+  },
+  ERROR_PAGE_TEXT: function() {
+    return ERROR_PAGE_TEXT;
+  },
+  RUN_MODE: function() {
+    return RUN_MODE;
+  }
 });
 const AGGRED_DIR = {
   mock: "config/mock",

package/dist/cjs/index.js

@@ -10,10 +10,18 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  Server: () => _server.Server,
-  ModernServer: () => _modernServer.ModernServer,
-  createProxyHandler: () => _proxy.createProxyHandler,
-  default: () => _default
+  Server: function() {
+    return _server.Server;
+  },
+  ModernServer: function() {
+    return _modernServer.ModernServer;
+  },
+  createProxyHandler: function() {
+    return _proxy.createProxyHandler;
+  },
+  default: function() {
+    return _default;
+  }
 });
 const _export_star = require("@swc/helpers/_/_export_star");
 const _server = require("./server");

package/dist/cjs/libs/context/context.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "ModernServerContext", {
   enumerable: true,
-  get: () => ModernServerContext
+  get: function() {
+    return ModernServerContext;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

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

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createContext: () => createContext,
-  ModernServerContext: () => _context.ModernServerContext
+  createContext: function() {
+    return createContext;
+  },
+  ModernServerContext: function() {
+    return _context.ModernServerContext;
+  }
 });
 const _context = require("./context");
 const createContext = (req, res, options) => new _context.ModernServerContext(req, res, options);

package/dist/cjs/libs/hook-api/base.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  BaseResponse: function() {
+    return BaseResponse;
+  },
+  BaseRequest: function() {
+    return BaseRequest;
+  }
+});
+const _define_property = require("@swc/helpers/_/_define_property");
+const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
+const _cookie = /* @__PURE__ */ _interop_require_default._(require("cookie"));
+class BaseResponse {
+  get(key) {
+    return this.res.getHeader(key);
+  }
+  set(key, value) {
+    return this.res.setHeader(key, value);
+  }
+  status(code) {
+    this.res.statusCode = code;
+  }
+  setCookie(key, value, options) {
+    const cookieValue = String(this.res.getHeader("set-cookie") || "");
+    const fmt = Array.isArray(cookieValue) ? cookieValue : [
+      cookieValue
+    ].filter(Boolean);
+    fmt.push(_cookie.default.serialize(key, value, options));
+    this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
+  }
+  clearCookie() {
+    this.res.removeHeader("set-cookie");
+  }
+  raw(body, options) {
+    const { status, headers = {} } = options || {};
+    Object.entries(headers).forEach(([key, value]) => {
+      this.res.setHeader(key, value);
+    });
+    if (status) {
+      this.res.statusCode = status;
+    }
+    this.res.end(body);
+  }
+  constructor(res) {
+    _define_property._(this, "cookies", void 0);
+    _define_property._(this, "res", void 0);
+    this.res = res;
+    this.cookies = {
+      set: this.setCookie.bind(this),
+      clear: this.clearCookie.bind(this)
+    };
+  }
+}
+class BaseRequest {
+  getCookie(key) {
+    return this._cookie[key];
+  }
+  constructor(request) {
+    _define_property._(this, "url", void 0);
+    _define_property._(this, "host", void 0);
+    _define_property._(this, "pathname", void 0);
+    _define_property._(this, "query", void 0);
+    _define_property._(this, "headers", void 0);
+    _define_property._(this, "cookie", void 0);
+    _define_property._(this, "cookies", void 0);
+    _define_property._(this, "_cookie", void 0);
+    this.url = request.url;
+    this.host = request.host;
+    this.pathname = request.path;
+    this.query = request.query;
+    this.headers = request.headers;
+    this.cookie = request.headers.cookie || "";
+    this._cookie = _cookie.default.parse(this.cookie);
+    this.cookies = {
+      get: this.getCookie.bind(this)
+    };
+  }
+}

package/dist/cjs/libs/hook-api/index.js

@@ -10,87 +10,27 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  base: () => base,
-  createAfterMatchContext: () => createAfterMatchContext,
-  createAfterRenderContext: () => createAfterRenderContext,
-  createMiddlewareContext: () => createMiddlewareContext
+  base: function() {
+    return base;
+  },
+  createAfterMatchContext: function() {
+    return createAfterMatchContext;
+  },
+  createAfterRenderContext: function() {
+    return createAfterRenderContext;
+  },
+  createMiddlewareContext: function() {
+    return createMiddlewareContext;
+  }
 });
-const _define_property = require("@swc/helpers/_/_define_property");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _cookie = /* @__PURE__ */ _interop_require_default._(require("cookie"));
 const _route = require("./route");
 const _template = require("./template");
-class Response {
-  get(key) {
-    return this.res.getHeader(key);
-  }
-  set(key, value) {
-    return this.res.setHeader(key, value);
-  }
-  status(code) {
-    this.res.statusCode = code;
-  }
-  setCookie(key, value, options) {
-    const cookieValue = this.res.getHeader("set-cookie");
-    const fmt = Array.isArray(cookieValue) ? cookieValue : [
-      cookieValue
-    ].filter(Boolean);
-    fmt.push(_cookie.default.serialize(key, value, options));
-    this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
-  }
-  clearCookie() {
-    this.res.removeHeader("set-cookie");
-  }
-  raw(body, options) {
-    const { status, headers = {} } = options || {};
-    Object.entries(headers).forEach(([key, value]) => {
-      this.res.setHeader(key, value);
-    });
-    if (status) {
-      this.res.statusCode = status;
-    }
-    this.res.end(body);
-  }
-  constructor(res) {
-    _define_property._(this, "cookies", void 0);
-    _define_property._(this, "res", void 0);
-    this.res = res;
-    this.cookies = {
-      set: this.setCookie.bind(this),
-      clear: this.clearCookie.bind(this)
-    };
-  }
-}
-class Request {
-  getCookie(key) {
-    return this._cookie[key];
-  }
-  constructor(ctx) {
-    _define_property._(this, "url", void 0);
-    _define_property._(this, "host", void 0);
-    _define_property._(this, "pathname", void 0);
-    _define_property._(this, "query", void 0);
-    _define_property._(this, "headers", void 0);
-    _define_property._(this, "cookie", void 0);
-    _define_property._(this, "cookies", void 0);
-    _define_property._(this, "_cookie", void 0);
-    this.url = ctx.url;
-    this.host = ctx.host;
-    this.pathname = ctx.path;
-    this.query = ctx.query;
-    this.headers = ctx.headers;
-    this.cookie = ctx.headers.cookie || "";
-    this._cookie = _cookie.default.parse(this.cookie);
-    this.cookies = {
-      get: this.getCookie.bind(this)
-    };
-  }
-}
+const _base = require("./base");
 const base = (context) => {
   const { res } = context;
   return {
-    response: new Response(res),
-    request: new Request(context),
+    response: new _base.BaseResponse(res),
+    request: new _base.BaseRequest(context),
     logger: context.logger,
     metrics: context.metrics
   };
@@ -111,12 +51,10 @@ const createAfterRenderContext = (context, content) => {
 };
 const createMiddlewareContext = (context) => {
   const baseContext = base(context);
+  baseContext.response.locals = context.res.locals || {};
   return {
     ...baseContext,
-    response: {
-      ...baseContext.response,
-      locals: context.res.locals || {}
-    },
+    response: baseContext.response,
     source: {
       req: context.req,
       res: context.res

package/dist/cjs/libs/hook-api/index.worker.js

@@ -0,0 +1,109 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+function _export(target, all) {
+  for (var name in all)
+    Object.defineProperty(target, name, {
+      enumerable: true,
+      get: all[name]
+    });
+}
+_export(exports, {
+  base: function() {
+    return base;
+  },
+  createAfterMatchContext: function() {
+    return createAfterMatchContext;
+  },
+  createAfterRenderContext: function() {
+    return createAfterRenderContext;
+  },
+  createMiddlewareContext: function() {
+    return createMiddlewareContext;
+  }
+});
+const _define_property = require("@swc/helpers/_/_define_property");
+const _base = require("./base");
+const _route = require("./route");
+const _template = require("./template");
+class ServerResponse {
+  set statusCode(code) {
+    this.res.status = code;
+  }
+  get statusCode() {
+    return this.res.status;
+  }
+  getHeader(key) {
+    var _this_res_headers_get;
+    return (_this_res_headers_get = this.res.headers.get(key)) !== null && _this_res_headers_get !== void 0 ? _this_res_headers_get : void 0;
+  }
+  setHeader(key, value) {
+    this.res.headers.set(key, value);
+  }
+  removeHeader(key) {
+    this.res.headers.delete(key);
+  }
+  end(body) {
+    this.res.body = body;
+    this.res.isSent = true;
+  }
+  constructor(res) {
+    _define_property._(this, "locals", void 0);
+    _define_property._(this, "res", void 0);
+    this.res = res;
+    this.locals = res.locals;
+  }
+}
+const base = (context) => {
+  const { req, res, logger, metrics } = context;
+  const serverResponse = new ServerResponse(res);
+  const { host, pathname, searchParams } = new URL(req.url);
+  const headers = {};
+  req.headers.forEach((value, key) => {
+    headers[key] = value;
+  });
+  return {
+    response: new _base.BaseResponse(serverResponse),
+    request: new _base.BaseRequest({
+      url: req.url,
+      host,
+      path: pathname,
+      headers,
+      // eslint-disable-next-line node/no-unsupported-features/es-builtins
+      query: Object.fromEntries(searchParams)
+    }),
+    logger,
+    metrics
+  };
+};
+const createAfterMatchContext = (context, entryName) => {
+  const baseContext = base(context);
+  return {
+    ...baseContext,
+    router: new _route.RouteAPI(entryName)
+  };
+};
+const createAfterRenderContext = (context, content) => {
+  const baseContext = base(context);
+  return {
+    ...baseContext,
+    template: new _template.TemplateAPI(content)
+  };
+};
+const createMiddlewareContext = (context) => {
+  const baseContext = base(context);
+  baseContext.response.locals = context.res.locals;
+  const { url, headers } = context.req;
+  const rawRequest = new Request(url, {
+    headers
+  });
+  return {
+    ...baseContext,
+    response: baseContext.response,
+    source: {
+      req: rawRequest,
+      res: baseContext.response
+    }
+  };
+};

package/dist/cjs/libs/hook-api/route.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "RouteAPI", {
   enumerable: true,
-  get: () => RouteAPI
+  get: function() {
+    return RouteAPI;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 class RouteAPI {

package/dist/cjs/libs/hook-api/template.js

@@ -10,11 +10,14 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  TemplateAPI: () => TemplateAPI,
-  templateInjectableStream: () => templateInjectableStream
+  RegList: function() {
+    return RegList;
+  },
+  TemplateAPI: function() {
+    return TemplateAPI;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
-const _stream = require("stream");
 const RegList = {
   before: {
     head: "<head>",
@@ -56,26 +59,3 @@ class TemplateAPI {
     this.content = content;
   }
 }
-const templateInjectableStream = ({ prependHead, appendHead, prependBody, appendBody }) => new _stream.Transform({
-  write(chunk, _, callback) {
-    let chunk_str = chunk.toString();
-    if (prependHead) {
-      const { head } = RegList.before;
-      chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
-    }
-    if (appendHead) {
-      const { head } = RegList.after;
-      chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
-    }
-    if (prependBody) {
-      const { body } = RegList.before;
-      chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
-    }
-    if (appendBody) {
-      const { body } = RegList.after;
-      chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
-    }
-    this.push(chunk_str);
-    callback();
-  }
-});

package/dist/cjs/libs/hook-api/templateForStream.js

@@ -0,0 +1,35 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+Object.defineProperty(exports, "templateInjectableStream", {
+  enumerable: true,
+  get: function() {
+    return templateInjectableStream;
+  }
+});
+const _stream = require("stream");
+const _template = require("./template");
+const templateInjectableStream = ({ prependHead, appendHead, prependBody, appendBody }) => new _stream.Transform({
+  write(chunk, _, callback) {
+    let chunk_str = chunk.toString();
+    if (prependHead) {
+      const { head } = _template.RegList.before;
+      chunk_str = chunk_str.replace(head, `${head}${prependHead}`);
+    }
+    if (appendHead) {
+      const { head } = _template.RegList.after;
+      chunk_str = chunk_str.replace(head, `${appendHead}${head}`);
+    }
+    if (prependBody) {
+      const { body } = _template.RegList.before;
+      chunk_str = chunk_str.replace(body, `${body}${prependBody}`);
+    }
+    if (appendBody) {
+      const { body } = _template.RegList.after;
+      chunk_str = chunk_str.replace(body, `${appendBody}${body}`);
+    }
+    this.push(chunk_str);
+    callback();
+  }
+});

package/dist/cjs/libs/loadConfig.js

@@ -10,9 +10,15 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  getServerConfigPath: () => getServerConfigPath,
-  requireConfig: () => requireConfig,
-  loadConfig: () => loadConfig
+  getServerConfigPath: function() {
+    return getServerConfigPath;
+  },
+  requireConfig: function() {
+    return requireConfig;
+  },
+  loadConfig: function() {
+    return loadConfig;
+  }
 });
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
 const _interop_require_wildcard = require("@swc/helpers/_/_interop_require_wildcard");

package/dist/cjs/libs/logger.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  Logger: () => Logger,
-  logger: () => logger
+  Logger: function() {
+    return Logger;
+  },
+  logger: function() {
+    return logger;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const LOG_LEVEL = {

package/dist/cjs/libs/metrics.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "metrics", {
   enumerable: true,
-  get: () => metrics
+  get: function() {
+    return metrics;
+  }
 });
 const metrics = {
   gauges() {

package/dist/cjs/libs/proxy.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  formatProxyOptions: () => formatProxyOptions,
-  createProxyHandler: () => createProxyHandler
+  formatProxyOptions: function() {
+    return formatProxyOptions;
+  },
+  createProxyHandler: function() {
+    return createProxyHandler;
+  }
 });
 const _httpproxymiddleware = require("http-proxy-middleware");
 const _utils = require("../utils");

package/dist/cjs/libs/render/cache/__tests__/cacheable.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "cacheabelAry", {
   enumerable: true,
-  get: () => cacheabelAry
+  get: function() {
+    return cacheabelAry;
+  }
 });
 const cacheabelAry = [
   {

package/dist/cjs/libs/render/cache/__tests__/error-configuration.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "errorConfiguration", {
   enumerable: true,
-  get: () => errorConfiguration
+  get: function() {
+    return errorConfiguration;
+  }
 });
 const errorConfiguration = [
   {

package/dist/cjs/libs/render/cache/__tests__/matched-cache.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "matchedCacheableAry", {
   enumerable: true,
-  get: () => matchedCacheableAry
+  get: function() {
+    return matchedCacheableAry;
+  }
 });
 const matchedCacheableAry = [
   [

package/dist/cjs/libs/render/cache/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "default", {
   enumerable: true,
-  get: () => _default
+  get: function() {
+    return _default;
+  }
 });
 const _stream = require("stream");
 const _constants = require("../../../constants");

package/dist/cjs/libs/render/cache/page-caches/index.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "createPageCaches", {
   enumerable: true,
-  get: () => createPageCaches
+  get: function() {
+    return createPageCaches;
+  }
 });
 const _lru = require("./lru");
 async function createPageCaches(max) {

package/dist/cjs/libs/render/cache/page-caches/lru.js

@@ -4,7 +4,9 @@ Object.defineProperty(exports, "__esModule", {
 });
 Object.defineProperty(exports, "LRUCaches", {
   enumerable: true,
-  get: () => LRUCaches
+  get: function() {
+    return LRUCaches;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");

package/dist/cjs/libs/render/cache/spr.js

@@ -10,8 +10,12 @@ function _export(target, all) {
     });
 }
 _export(exports, {
-  createCache: () => createCache,
-  destroyCache: () => destroyCache
+  createCache: function() {
+    return createCache;
+  },
+  destroyCache: function() {
+    return destroyCache;
+  }
 });
 const _define_property = require("@swc/helpers/_/_define_property");
 const _interop_require_default = require("@swc/helpers/_/_interop_require_default");