@modern-js/prod-server 1.21.5 → 2.0.0-beta.1

package/CHANGELOG.md

@@ -1,25 +1,106 @@
 # @modern-js/prod-server
 
-## 1.21.5
+## 2.0.0-beta.1
 
-### Patch Changes
+### Major Changes
+
+- dda38c9: chore: v2
 
-- @modern-js/server-core@1.21.5
-- @modern-js/utils@1.21.5
+### Minor Changes
 
-## 1.21.4
+- 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
 
-- @modern-js/server-core@1.21.4
-- @modern-js/utils@1.21.4
+- d032d49: 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 插件加载逻辑
+- 40ed587: 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 兜底处理逻辑
+
+- 18aaf42: fix: fix server loader redirects
+  fix: 修复 server loader 重定向错误
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [15bf09d9c8]
+- Updated dependencies [92f0ead]
+- Updated dependencies [edd1cfb1af]
+- Updated dependencies [cc971eabfc]
+- Updated dependencies [5b9049f]
+- Updated dependencies [92004d1]
+- Updated dependencies [b8bbe036c7]
+- Updated dependencies [d5a31df781]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2a]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be9558e]
+- Updated dependencies [14b712d]
+  - @modern-js/server-core@2.0.0-beta.1
+  - @modern-js/utils@2.0.0-beta.1
+
+## 2.0.0-beta.0
 
-## 1.21.3
+### Major Changes
+
+- dda38c9: chore: v2
+
+### Minor Changes
+
+- c9e800d39: feat: support React18 streaming SSR
+  feat: 支持 React18 流式 SSR
+- 543be95: feat: compile server loader and support handle loader request
+  feat: 编译 server loader 并支持处理 loader 的请求
 
 ### Patch Changes
 
-- @modern-js/server-core@1.21.3
-- @modern-js/utils@1.21.3
+- 15bf09d9c: feat: support completely custom server, export render() api for render single page
+  feat: 支持完全自定义 Server，导出 render() 方法用来渲染单个页面
+- cc971eabf: refactor: move server plugin load logic in `@modern-js/core`
+  refactor：移除在 `@modern-js/core` 中的 server 插件加载逻辑
+- 102d32e4b: feat(server): add `req` and `res` to SSR context
+
+  feat(server): 添加 `req` 和 `res` 到 SSR context 中
+
+- 3bbea92b2: feat: support Hook、Middleware new API
+  feat: 支持 Hook、Middleware 的新 API
+- 73cd29dd9: fix(server): add favicon fallback handler
+
+  fix(server): 添加 favicon 兜底处理逻辑
+
+- 14b712d: fix: use consistent alias type and default value across packages
+
+  fix: 在各个包中使用一致的 alias 类型定义和默认值
+
+- Updated dependencies [15bf09d9c]
+- Updated dependencies [edd1cfb1a]
+- Updated dependencies [cc971eabf]
+- Updated dependencies [5b9049f]
+- Updated dependencies [b8bbe036c]
+- Updated dependencies [d5a31df78]
+- Updated dependencies [dda38c9]
+- Updated dependencies [3bbea92b2]
+- Updated dependencies [abf3421]
+- Updated dependencies [543be95]
+- Updated dependencies [14b712d]
+  - @modern-js/server-core@2.0.0-beta.0
+  - @modern-js/utils@2.0.0-beta.0
 
 ## 1.21.2
 

package/dist/js/modern/constants.js

@@ -6,12 +6,10 @@ export const AGGRED_DIR = {
   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',

package/dist/js/modern/index.js

@@ -8,7 +8,6 @@ export default (options => {
   if (options == null) {
     throw new Error('can not start mserver without options');
   }
-
   const server = new Server(options);
   return server.init();
 });

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

@@ -1,5 +1,4 @@
 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';
@@ -18,221 +17,176 @@ export class ModernServerContext {
   /**
    * url params
    */
+
   get logger() {
     return this.req.logger;
   }
-
   get metrics() {
     return this.req.metrics;
   }
-
   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.req = req;
     this.res = res;
     this.options = options || {};
     this.serverData = {};
     this.bind();
   }
-
   bind() {
     const {
       req,
       res
     } = this;
-
     req.get = key => this.getReqHeader(key);
-
     res.set = (key, value) => this.res.setHeader(key, value);
-
     res.send = body => {
       this.send(body);
     };
-  } // compat express res.send, only support etag now
-
+  }
 
+  // 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 buf = !Buffer.isBuffer(body) ? Buffer.from(body, encoding) : body;
         const etag = createEtag(buf, {
           weak: true
         });
-
         if (etag) {
           this.res.setHeader('ETag', etag);
         }
       }
-
       if (this.fresh) {
         this.status = 304;
       }
     } catch (e) {
       this.logger.error(e.message);
     }
-
     this.res.end(body);
   }
-
   setParams(params) {
     this.params = params;
   }
-
   setServerData(key, value) {
     this.serverData[key] = value;
   }
-
   getReqHeader(key) {
     const {
       req
     } = this;
     const field = key.toLowerCase();
-
     switch (field) {
       case 'referer':
       case 'referrer':
         return req.headers.referrer || req.headers.referer || '';
-
       default:
         return req.headers[field] || '';
     }
   }
-
   get fresh() {
     const {
       status,
       res,
       method
-    } = this; // GET or HEAD for weak freshness validation only
+    } = this;
 
+    // GET or HEAD for weak freshness validation only
     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')
       });
     }
-
     return false;
   }
-  /* request property */
-
 
+  /* request property */
   get headers() {
     return this.req.headers;
   }
-
   get method() {
     return this.req.method;
   }
-
   get url() {
     return this.req.url || '';
   }
-
   set url(val) {
     this.req.url = val;
   }
-
   get host() {
     let host = this.getReqHeader('X-Forwarded-Host');
-
     if (!host) {
       host = this.getReqHeader('Host');
     }
-
     return host.split(/\s*,\s*/, 1)[0] || '';
   }
-
   get protocol() {
     if (this.req.socket.encrypted) {
       return 'https';
     }
-
     const proto = this.getReqHeader('X-Forwarded-Proto');
     return proto ? proto.split(/\s*,\s*/, 1)[0] : 'http';
   }
-
   get origin() {
     return `${this.protocol}://${this.host}`;
   }
-
   get href() {
     return this.origin + this.url;
   }
-
   get parsedURL() {
     const url = new URL(this.req.url, this.origin);
     return url;
   }
-
   get path() {
     return this.parsedURL.pathname;
   }
-
   set path(p) {
-    const url = new URL(this.req.url, this.origin); // this should never happened
-
+    const url = new URL(this.req.url, this.origin);
+    // this should never happened
     if (!url || !p) {
       return;
     }
-
     if (url.pathname === p) {
       return;
     }
-
     url.pathname = p;
     this.url = url.toString();
   }
-
   get querystring() {
     if (!this.req) {
       return '';
     }
-
     return this.parsedURL.search.replace(/^\?/, '') || '';
   }
-
   get query() {
     const str = this.querystring;
     return qs.parse(str);
   }
-  /* response property */
-
 
+  /* 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));
   }
-
 }

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

@@ -0,0 +1,125 @@
+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';
+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.cookies = {
+      get: this.getCookie.bind(this),
+      set: this.setCookie.bind(this),
+      delete: this.deleteCookie.bind(this),
+      clear: this.clearCookie.bind(this),
+      apply: this.applyCookie.bind(this)
+    };
+  }
+  get(key) {
+    return this.res.getHeader(key);
+  }
+  set(key, value) {
+    return this.res.setHeader(key, value);
+  }
+  status(code) {
+    this.res.statusCode = code;
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+  setCookie(key, value) {
+    this._cookie[key] = value;
+  }
+  deleteCookie(key) {
+    if (this._cookie[key]) {
+      delete this._cookie[key];
+    }
+  }
+  clearCookie() {
+    this._cookie = {};
+  }
+  applyCookie() {
+    const str = Object.entries(this._cookie).map(([key, value]) => {
+      return cookie.serialize(key, value);
+    }).join('; ');
+    if (str) {
+      this.res.setHeader('set-cookie', str);
+    } else {
+      this.res.removeHeader('set-cookie');
+    }
+  }
+  raw(body, {
+    status,
+    headers
+  }) {
+    Object.entries(headers).forEach(([key, value]) => {
+      this.res.setHeader(key, value);
+    });
+    if (status) {
+      this.res.statusCode = status;
+    }
+    this.res.end(body);
+  }
+}
+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.host = ctx.host;
+    this.pathname = ctx.path;
+    this.query = ctx.query;
+    this.headers = ctx.headers;
+    this.cookie = ctx.headers.cookie || '';
+    this._cookie = cookie.parse(this.cookie);
+    this.cookies = {
+      get: this.getCookie.bind(this)
+    };
+  }
+  getCookie(key) {
+    return this._cookie[key];
+  }
+}
+export const base = context => {
+  const {
+    res
+  } = context;
+  return {
+    response: new Response(res),
+    request: new Request(context),
+    logger: context.logger,
+    metrics: context.metrics
+  };
+};
+export const createAfterMatchContext = (context, entryName) => {
+  const baseContext = base(context);
+  return _objectSpread(_objectSpread({}, baseContext), {}, {
+    router: new RouteAPI(entryName)
+  });
+};
+export const createAfterRenderContext = (context, content) => {
+  const baseContext = base(context);
+  return _objectSpread(_objectSpread({}, baseContext), {}, {
+    template: new TemplateAPI(content)
+  });
+};
+export const createMiddlewareContext = context => {
+  const baseContext = base(context);
+  return _objectSpread(_objectSpread({}, baseContext), {}, {
+    response: _objectSpread(_objectSpread({}, baseContext.response), {}, {
+      locals: context.res.locals || {}
+    }),
+    source: {
+      req: context.req,
+      res: context.res
+    }
+  });
+};

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

@@ -1,44 +1,21 @@
 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; }
-
-class RouteAPI {
-  constructor(matched, router, url) {
-    _defineProperty(this, "router", void 0);
-
+export class RouteAPI {
+  constructor(entryName) {
     _defineProperty(this, "current", void 0);
-
+    _defineProperty(this, "status", void 0);
     _defineProperty(this, "url", void 0);
-
-    this.current = matched;
-    this.router = router;
-    this.url = url;
+    this.current = entryName;
+    this.status = 200;
+    this.url = '';
   }
-
-  cur() {
-    return this.current.generate(this.url);
+  redirect(url, status = 302) {
+    this.url = url;
+    this.status = status;
   }
-
-  get(entryName) {
-    const {
-      router
-    } = this;
-    const matched = router.matchEntry(entryName);
-    return matched ? matched.generate(this.url) : null;
+  rewrite(entryName) {
+    this.current = entryName;
   }
-
   use(entryName) {
-    const {
-      router
-    } = this;
-    const matched = router.matchEntry(entryName);
-
-    if (matched) {
-      this.current = matched;
-      return true;
-    } else {
-      return false;
-    }
+    this.rewrite(entryName);
   }
-
-}
-
-export const createRouteAPI = (matched, router, url) => new RouteAPI(matched, router, url);
+}

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

@@ -1,5 +1,5 @@
 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 { Transform } from 'stream';
 const RegList = {
   before: {
     head: '<head>',
@@ -10,55 +10,78 @@ const RegList = {
     body: '</body>'
   }
 };
-
-class TemplateAPI {
+export class TemplateAPI {
   constructor(content) {
     _defineProperty(this, "content", void 0);
-
     this.content = content;
   }
-
   get() {
     return this.content;
   }
-
   set(content) {
     this.content = content;
   }
-
   prependHead(fragment) {
     const {
       head
     } = RegList.before;
     return this.replace(head, `${head}${fragment}`);
   }
-
   appendHead(fragment) {
     const {
       head
     } = RegList.after;
     return this.replace(head, `${fragment}${head}`);
   }
-
   prependBody(fragment) {
     const {
       body
     } = RegList.before;
     return this.replace(body, `${body}${fragment}`);
   }
-
   appendBody(fragment) {
     const {
       body
     } = RegList.after;
     return this.replace(body, `${fragment}${body}`);
   }
-
   replace(reg, text) {
     this.content = this.content.replace(reg, text);
-    return this;
   }
-
 }
-
-export const createTemplateAPI = content => new TemplateAPI(content);
+export const templateInjectableStream = ({
+  prependHead,
+  appendHead,
+  prependBody,
+  appendBody
+}) => new 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();
+  }
+});