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

package/CHANGELOG.md

@@ -1,5 +1,144 @@
 # @modern-js/prod-server
 
+## 2.0.0-beta.6
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 7879e8f711: refactor: remove enableModernMode config
+
+  refactor: 不再支持 enableModernMode 配置项
+
+- d032d49e09: export createHandle
+  导出 createHandle 函数
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 40ed5874c6: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 102d32e4ba: feat(server): add `req` and `res` to SSR context
+
+  feat(server): 添加 `req` 和 `res` 到 SSR context 中
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 73cd29dd9f: fix(server): add favicon fallback handler
+
+  fix(server): 添加 favicon 兜底处理逻辑
+
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- 18aaf42249: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [7879e8f711]
+- Updated dependencies [6aca875011]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12cf8f]
+- Updated dependencies [7efeed4]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06257]
+- Updated dependencies [bbe4c4ab64]
+- Updated dependencies [e4558a0bc4]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.6
+  - @modern-js/server-core@2.0.0-beta.6
+
+## 2.0.0-beta.4
+
+### Major Changes
+
+- dda38c9c3e: chore: v2
+
+### Minor Changes
+
+- c9e800d39a: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be9558e: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
+
+### Patch Changes
+
+- 7879e8f: refactor: remove enableModernMode config
+
+  refactor: 不再支持 enableModernMode 配置项
+
+- d032d49e09: export createHandle
+  导出 createHandle 函数
+- 15bf09d9c8: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- cc971eabfc: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 40ed5874c6: feat: inject css chunk into html for streaming ssr
+  feat: streaming ssr 返回的 html 注入 css chunk
+- 102d32e4ba: feat(server): add `req` and `res` to SSR context
+
+  feat(server): 添加 `req` 和 `res` 到 SSR context 中
+
+- 3bbea92b2a: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 73cd29dd9f: fix(server): add favicon fallback handler
+
+  fix(server): 添加 favicon 兜底处理逻辑
+
+- cce8ecee2d: fix: handle some `TODO` & `FIXME`, change some tests
+  fix: 处理一些 `TODO` 和 `FIXME`, 修改了一些 tests
+- 18aaf42249: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 14b712da84: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [7879e8f]
+- Updated dependencies [6aca875]
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [2e6031955e]
+- Updated dependencies [7b7d12c]
+- Updated dependencies [92f0eade39]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f2e9]
+- Updated dependencies [92004d1906]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9c3e]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [b710adb843]
+- Updated dependencies [ea7cf06]
+- Updated dependencies [bbe4c4a]
+- Updated dependencies [e4558a0]
+- Updated dependencies [abf3421a75]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712da84]
+  - @modern-js/utils@2.0.0-beta.4
+  - @modern-js/server-core@2.0.0-beta.4
+
 ## 2.0.0-beta.3
 
 ### Major Changes

package/dist/js/modern/constants.js

@@ -1,28 +1,35 @@
-export const AGGRED_DIR = {
-  mock: 'config/mock',
-  server: 'server',
-  api: 'api',
-  shared: 'shared',
-  lambda: 'lambda'
+const AGGRED_DIR = {
+  mock: "config/mock",
+  server: "server",
+  api: "api",
+  shared: "shared",
+  lambda: "lambda"
 };
-export let ApiServerMode;
-(function (ApiServerMode) {
-  ApiServerMode["func"] = "function";
-  ApiServerMode["frame"] = "framework";
-})(ApiServerMode || (ApiServerMode = {}));
-export const ERROR_DIGEST = {
-  INIT: 'Server init error',
-  ENOTF: 'Page could not be found',
-  WARMUP: 'SSR warmup failed',
-  EINTER: 'Internal server error',
-  ERENDER: 'SSR render failed',
-  EMICROINJ: 'Get micro-frontend info failed'
+var ApiServerMode = /* @__PURE__ */ ((ApiServerMode2) => {
+  ApiServerMode2["func"] = "function";
+  ApiServerMode2["frame"] = "framework";
+  return ApiServerMode2;
+})(ApiServerMode || {});
+const ERROR_DIGEST = {
+  INIT: "Server init error",
+  ENOTF: "Page could not be found",
+  WARMUP: "SSR warmup failed",
+  EINTER: "Internal server error",
+  ERENDER: "SSR render failed",
+  EMICROINJ: "Get micro-frontend info failed"
 };
-export const ERROR_PAGE_TEXT = {
-  404: 'This page could not be found.',
-  500: 'Internal Server Error.'
+const ERROR_PAGE_TEXT = {
+  404: "This page could not be found.",
+  500: "Internal Server Error."
+};
+const RUN_MODE = {
+  FULL: "full",
+  TYPE: "type"
+};
+export {
+  AGGRED_DIR,
+  ApiServerMode,
+  ERROR_DIGEST,
+  ERROR_PAGE_TEXT,
+  RUN_MODE
 };
-export const RUN_MODE = {
-  FULL: 'full',
-  TYPE: 'type'
-};

package/dist/js/modern/index.js

@@ -1,13 +1,18 @@
 import { Server } from "./server";
-export { Server };
-export { ModernServer } from "./server/modern-server";
-export { createProxyHandler } from "./libs/proxy";
+import { ModernServer } from "./server/modern-server";
+import { createProxyHandler } from "./libs/proxy";
 export * from "./type";
 export * from "./constants";
-export default (options => {
+var src_default = (options) => {
   if (options == null) {
-    throw new Error('can not start mserver without options');
+    throw new Error("can not start mserver without options");
   }
   const server = new Server(options);
   return server.init();
-});
+};
+export {
+  ModernServer,
+  Server,
+  createProxyHandler,
+  src_default as default
+};

package/dist/js/modern/libs/context/context.js

@@ -1,65 +1,42 @@
-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 { URL } from 'url';
-import qs from 'querystring';
-import { Buffer } from 'buffer';
-import createEtag from 'etag';
-import fresh from 'fresh';
+import { URL } from "url";
+import qs from "querystring";
+import { Buffer } from "buffer";
+import createEtag from "etag";
+import fresh from "fresh";
 import { headersWithoutCookie } from "../../utils";
-export class ModernServerContext {
-  /**
-   * http request
-   */
-
-  /**
-   * http response
-   */
-
-  /**
-   * url params
-   */
-
-  get logger() {
-    return this.req.logger;
-  }
-  get metrics() {
-    return this.req.metrics;
-  }
+class ModernServerContext {
   constructor(req, res, options) {
-    _defineProperty(this, "req", void 0);
-    _defineProperty(this, "res", void 0);
-    _defineProperty(this, "params", {});
-    _defineProperty(this, "serverData", void 0);
-    _defineProperty(this, "options", {});
+    this.params = {};
+    this.options = {};
     this.req = req;
     this.res = res;
     this.options = options || {};
     this.serverData = {};
     this.bind();
   }
+  get logger() {
+    return this.req.logger;
+  }
+  get metrics() {
+    return this.req.metrics;
+  }
   bind() {
-    const {
-      req,
-      res
-    } = this;
-    req.get = key => this.getReqHeader(key);
+    const { req, res } = this;
+    req.get = (key) => this.getReqHeader(key);
     res.set = (key, value) => this.res.setHeader(key, value);
-    res.send = body => {
+    res.send = (body) => {
       this.send(body);
     };
   }
-
-  // compat express res.send, only support etag now
   send(body) {
     try {
-      const generateETag = !this.res.getHeader('ETag') && this.options.etag;
-      if (body !== undefined && generateETag) {
-        const encoding = typeof body === 'string' ? 'utf-8' : undefined;
+      const generateETag = !this.res.getHeader("ETag") && this.options.etag;
+      if (body !== void 0 && generateETag) {
+        const encoding = typeof body === "string" ? "utf-8" : void 0;
         const buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
-        const etag = createEtag(buf, {
-          weak: true
-        });
+        const etag = createEtag(buf, { weak: true });
         if (etag) {
-          this.res.setHeader('ETag', etag);
+          this.res.setHeader("ETag", etag);
         }
       }
       if (this.fresh) {
@@ -77,39 +54,29 @@ export class ModernServerContext {
     this.serverData[key] = value;
   }
   getReqHeader(key) {
-    const {
-      req
-    } = this;
+    const { req } = this;
     const field = key.toLowerCase();
     switch (field) {
-      case 'referer':
-      case 'referrer':
-        return req.headers.referrer || req.headers.referer || '';
+      case "referer":
+      case "referrer":
+        return req.headers.referrer || req.headers.referer || "";
       default:
-        return req.headers[field] || '';
+        return req.headers[field] || "";
     }
   }
   get fresh() {
-    const {
-      status,
-      res,
-      method
-    } = this;
-
-    // GET or HEAD for weak freshness validation only
-    if ('GET' !== method && 'HEAD' !== method) {
+    const { status, res, method } = this;
+    if ("GET" !== method && "HEAD" !== method) {
       return false;
     }
     if (status >= 200 && status < 300 || 304 === status) {
       return fresh(this.headers, {
-        etag: res.getHeader('ETag'),
-        'last-modified': res.getHeader('Last-Modified')
+        etag: res.getHeader("ETag"),
+        "last-modified": res.getHeader("Last-Modified")
       });
     }
     return false;
   }
-
-  /* request property */
   get headers() {
     return this.req.headers;
   }
@@ -117,24 +84,24 @@ export class ModernServerContext {
     return this.req.method;
   }
   get url() {
-    return this.req.url || '';
+    return this.req.url || "";
   }
   set url(val) {
     this.req.url = val;
   }
   get host() {
-    let host = this.getReqHeader('X-Forwarded-Host');
+    let host = this.getReqHeader("X-Forwarded-Host");
     if (!host) {
-      host = this.getReqHeader('Host');
+      host = this.getReqHeader("Host");
     }
-    return host.split(/\s*,\s*/, 1)[0] || '';
+    return host.split(/\s*,\s*/, 1)[0] || "";
   }
   get protocol() {
     if (this.req.socket.encrypted) {
-      return 'https';
+      return "https";
     }
-    const proto = this.getReqHeader('X-Forwarded-Proto');
-    return proto ? proto.split(/\s*,\s*/, 1)[0] : 'http';
+    const proto = this.getReqHeader("X-Forwarded-Proto");
+    return proto ? proto.split(/\s*,\s*/, 1)[0] : "http";
   }
   get origin() {
     return `${this.protocol}://${this.host}`;
@@ -151,7 +118,6 @@ export class ModernServerContext {
   }
   set path(p) {
     const url = new URL(this.req.url, this.origin);
-    // this should never happened
     if (!url || !p) {
       return;
     }
@@ -163,30 +129,32 @@ export class ModernServerContext {
   }
   get querystring() {
     if (!this.req) {
-      return '';
+      return "";
     }
-    return this.parsedURL.search.replace(/^\?/, '') || '';
+    return this.parsedURL.search.replace(/^\?/, "") || "";
   }
   get query() {
     const str = this.querystring;
     return qs.parse(str);
   }
-
-  /* response property */
   get status() {
     return this.res.statusCode;
   }
   set status(statusCode) {
     this.res.statusCode = statusCode;
   }
-
-  /**
-   * 判断链接是否已经关闭
-   */
   resHasHandled() {
     return this.res.writableEnded;
   }
-  error(dig, e = '') {
-    this.logger.error(`Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, this.path, headersWithoutCookie(this.headers));
-  }
-}
+  error(dig, e = "") {
+    this.logger.error(
+      `Web Server Error - ${dig}, error = %s, req.url = %s, req.headers = %o`,
+      e instanceof Error ? e.stack || e.message : e,
+      this.path,
+      headersWithoutCookie(this.headers)
+    );
+  }
+}
+export {
+  ModernServerContext
+};

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

@@ -1,3 +1,6 @@
 import { ModernServerContext } from "./context";
-export const createContext = (req, res, options) => new ModernServerContext(req, res, options);
-export { ModernServerContext };
+const createContext = (req, res, options) => new ModernServerContext(req, res, options);
+export {
+  ModernServerContext,
+  createContext
+};

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

@@ -1,16 +1,29 @@
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-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 cookie from 'cookie';
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+import cookie from "cookie";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
 class Response {
   constructor(res) {
-    _defineProperty(this, "cookies", void 0);
-    _defineProperty(this, "res", void 0);
-    _defineProperty(this, "_cookie", void 0);
     this.res = res;
-    this._cookie = cookie.parse(res.getHeader('set-cookie') || '');
+    this._cookie = cookie.parse(res.getHeader("set-cookie") || "");
     this.cookies = {
       get: this.getCookie.bind(this),
       set: this.setCookie.bind(this),
@@ -45,17 +58,15 @@ class Response {
   applyCookie() {
     const str = Object.entries(this._cookie).map(([key, value]) => {
       return cookie.serialize(key, value);
-    }).join('; ');
+    }).join("; ");
     if (str) {
-      this.res.setHeader('set-cookie', str);
+      this.res.setHeader("set-cookie", str);
     } else {
-      this.res.removeHeader('set-cookie');
+      this.res.removeHeader("set-cookie");
     }
   }
-  raw(body, {
-    status,
-    headers
-  }) {
+  raw(body, options) {
+    const { status, headers = {} } = options || {};
     Object.entries(headers).forEach(([key, value]) => {
       this.res.setHeader(key, value);
     });
@@ -67,18 +78,12 @@ class Response {
 }
 class Request {
   constructor(ctx) {
-    _defineProperty(this, "host", void 0);
-    _defineProperty(this, "pathname", void 0);
-    _defineProperty(this, "query", void 0);
-    _defineProperty(this, "headers", void 0);
-    _defineProperty(this, "cookie", void 0);
-    _defineProperty(this, "cookies", void 0);
-    _defineProperty(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 = ctx.headers.cookie || "";
     this._cookie = cookie.parse(this.cookie);
     this.cookies = {
       get: this.getCookie.bind(this)
@@ -88,10 +93,8 @@ class Request {
     return this._cookie[key];
   }
 }
-export const base = context => {
-  const {
-    res
-  } = context;
+const base = (context) => {
+  const { res } = context;
   return {
     response: new Response(res),
     request: new Request(context),
@@ -99,22 +102,22 @@ export const base = context => {
     metrics: context.metrics
   };
 };
-export const createAfterMatchContext = (context, entryName) => {
+const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
-  return _objectSpread(_objectSpread({}, baseContext), {}, {
+  return __spreadProps(__spreadValues({}, baseContext), {
     router: new RouteAPI(entryName)
   });
 };
-export const createAfterRenderContext = (context, content) => {
+const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
-  return _objectSpread(_objectSpread({}, baseContext), {}, {
+  return __spreadProps(__spreadValues({}, baseContext), {
     template: new TemplateAPI(content)
   });
 };
-export const createMiddlewareContext = context => {
+const createMiddlewareContext = (context) => {
   const baseContext = base(context);
-  return _objectSpread(_objectSpread({}, baseContext), {}, {
-    response: _objectSpread(_objectSpread({}, baseContext.response), {}, {
+  return __spreadProps(__spreadValues({}, baseContext), {
+    response: __spreadProps(__spreadValues({}, baseContext.response), {
       locals: context.res.locals || {}
     }),
     source: {
@@ -122,4 +125,10 @@ export const createMiddlewareContext = context => {
       res: context.res
     }
   });
-};
+};
+export {
+  base,
+  createAfterMatchContext,
+  createAfterRenderContext,
+  createMiddlewareContext
+};

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

@@ -1,12 +1,8 @@
-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 RouteAPI {
+class RouteAPI {
   constructor(entryName) {
-    _defineProperty(this, "current", void 0);
-    _defineProperty(this, "status", void 0);
-    _defineProperty(this, "url", void 0);
     this.current = entryName;
     this.status = 200;
-    this.url = '';
+    this.url = "";
   }
   redirect(url, status = 302) {
     this.url = url;
@@ -18,4 +14,7 @@ export class RouteAPI {
   use(entryName) {
     this.rewrite(entryName);
   }
-}
+}
+export {
+  RouteAPI
+};