@modern-js/prod-server 2.14.0 → 2.16.0

package/dist/esm-node/libs/hook-api/index.js

@@ -1,14 +1,20 @@
+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;
+}
 import cookie from "cookie";
 import { RouteAPI } from "./route";
 import { TemplateAPI } from "./template";
 class Response {
-  constructor(res) {
-    this.res = res;
-    this.cookies = {
-      set: this.setCookie.bind(this),
-      clear: this.clearCookie.bind(this)
-    };
-  }
   get(key) {
     return this.res.getHeader(key);
   }
@@ -20,7 +26,9 @@ class Response {
   }
   setCookie(key, value, options) {
     const cookieValue = this.res.getHeader("set-cookie");
-    const fmt = Array.isArray(cookieValue) ? cookieValue : [cookieValue].filter(Boolean);
+    const fmt = Array.isArray(cookieValue) ? cookieValue : [
+      cookieValue
+    ].filter(Boolean);
     fmt.push(cookie.serialize(key, value, options));
     this.res.setHeader("set-cookie", fmt.length === 1 ? fmt[0] : fmt);
   }
@@ -37,9 +45,29 @@ class Response {
     }
     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;
@@ -51,11 +79,8 @@ class Request {
       get: this.getCookie.bind(this)
     };
   }
-  getCookie(key) {
-    return this._cookie[key];
-  }
 }
-const base = (context) => {
+export const base = (context) => {
   const { res } = context;
   return {
     response: new Response(res),
@@ -64,21 +89,21 @@ const base = (context) => {
     metrics: context.metrics
   };
 };
-const createAfterMatchContext = (context, entryName) => {
+export const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
   return {
     ...baseContext,
     router: new RouteAPI(entryName)
   };
 };
-const createAfterRenderContext = (context, content) => {
+export const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
   return {
     ...baseContext,
     template: new TemplateAPI(content)
   };
 };
-const createMiddlewareContext = (context) => {
+export const createMiddlewareContext = (context) => {
   const baseContext = base(context);
   return {
     ...baseContext,
@@ -92,9 +117,3 @@ const createMiddlewareContext = (context) => {
     }
   };
 };
-export {
-  base,
-  createAfterMatchContext,
-  createAfterRenderContext,
-  createMiddlewareContext
-};

package/dist/esm-node/libs/hook-api/route.js

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

package/dist/esm-node/libs/hook-api/template.js

@@ -1,3 +1,16 @@
+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;
+}
 import { Transform } from "stream";
 const RegList = {
   before: {
@@ -9,10 +22,7 @@ const RegList = {
     body: "</body>"
   }
 };
-class TemplateAPI {
-  constructor(content) {
-    this.content = content;
-  }
+export class TemplateAPI {
   get() {
     return this.content;
   }
@@ -38,13 +48,12 @@ class TemplateAPI {
   replace(reg, text) {
     this.content = this.content.replace(reg, text);
   }
+  constructor(content) {
+    _define_property(this, "content", void 0);
+    this.content = content;
+  }
 }
-const templateInjectableStream = ({
-  prependHead,
-  appendHead,
-  prependBody,
-  appendBody
-}) => new Transform({
+export const templateInjectableStream = ({ prependHead, appendHead, prependBody, appendBody }) => new Transform({
   write(chunk, _, callback) {
     let chunk_str = chunk.toString();
     if (prependHead) {
@@ -67,7 +76,3 @@ const templateInjectableStream = ({
     callback();
   }
 });
-export {
-  TemplateAPI,
-  templateInjectableStream
-};

package/dist/esm-node/libs/loadConfig.js

@@ -1,46 +1,29 @@
 import * as path from "path";
 import { compatRequire, fs, DEFAULT_SERVER_CONFIG } from "@modern-js/utils";
 import mergeDeep from "merge-deep";
-const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
+export const getServerConfigPath = (distDirectory, serverConfigFile = DEFAULT_SERVER_CONFIG) => {
   const serverConfigPath = path.join(distDirectory, serverConfigFile);
   return `${serverConfigPath}.js`;
 };
-const requireConfig = (serverConfigPath) => {
+export const requireConfig = (serverConfigPath) => {
   if (fs.pathExistsSync(serverConfigPath)) {
     return compatRequire(serverConfigPath);
   }
   return {};
 };
-const loadConfig = ({
-  cliConfig,
-  serverConfig,
-  resolvedConfigPath
-}) => {
+export const loadConfig = ({ cliConfig, serverConfig, resolvedConfigPath }) => {
   let config = null;
   if (process.env.NODE_ENV === "production") {
     const resolvedConfig = requireConfig(resolvedConfigPath);
-    config = mergeDeep(
-      {
-        ...resolvedConfig,
-        plugins: []
-        // filter cli plugins
-      },
-      serverConfig,
-      cliConfig
-    );
+    config = mergeDeep({
+      ...resolvedConfig,
+      plugins: []
+    }, serverConfig, cliConfig);
   } else {
-    config = mergeDeep(
-      {
-        ...cliConfig,
-        plugins: []
-      },
-      serverConfig
-    );
+    config = mergeDeep({
+      ...cliConfig,
+      plugins: []
+    }, serverConfig);
   }
   return config;
 };
-export {
-  getServerConfigPath,
-  loadConfig,
-  requireConfig
-};

package/dist/esm-node/libs/logger.js

@@ -1,3 +1,16 @@
+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 LOG_LEVEL = {
   error: 0,
   warn: 1,
@@ -31,25 +44,15 @@ const LOG_TYPES = {
     label: "debug",
     level: "debug"
   },
-  log: { level: "log" }
+  log: {
+    level: "log"
+  }
 };
 const DEFAULT_CONFIG = {
   displayLabel: true,
   uppercaseLabel: false
 };
 class Logger {
-  constructor(options = {}) {
-    this.level = options.level || LOG_TYPES.log.level;
-    this.config = { ...DEFAULT_CONFIG, ...options.config || {} };
-    this.types = {
-      ...LOG_TYPES,
-      ...options.types || {}
-    };
-    this.longestLabel = this.getLongestLabel();
-    Object.keys(this.types).forEach((type) => {
-      this[type] = this._log.bind(this, type);
-    });
-  }
   _log(type, message, ...args) {
     if (message === void 0 || message === null) {
       console.log();
@@ -89,10 +92,27 @@ ${rest.join("\n")}`;
     });
     return longestLabel;
   }
+  constructor(options = {}) {
+    _define_property(this, "level", void 0);
+    _define_property(this, "config", void 0);
+    _define_property(this, "types", void 0);
+    _define_property(this, "longestLabel", void 0);
+    this.level = options.level || LOG_TYPES.log.level;
+    this.config = {
+      ...DEFAULT_CONFIG,
+      ...options.config || {}
+    };
+    this.types = {
+      ...LOG_TYPES,
+      ...options.types || {}
+    };
+    this.longestLabel = this.getLongestLabel();
+    Object.keys(this.types).forEach((type) => {
+      this[type] = this._log.bind(this, type);
+    });
+  }
 }
 const logger = new Logger();
 logger.Logger = Logger;
-export {
-  Logger,
-  logger
-};
+export { Logger };
+export { logger };

package/dist/esm-node/libs/metrics.js

@@ -6,6 +6,4 @@ const metrics = {
   emitTimer() {
   }
 };
-export {
-  metrics
-};
+export { metrics };

package/dist/esm-node/libs/proxy.js

@@ -1,34 +1,30 @@
 import { createProxyMiddleware } from "http-proxy-middleware";
 import { debug } from "../utils";
-function formatProxyOptions(proxyOptions) {
+export function formatProxyOptions(proxyOptions) {
   const formattedProxy = [];
   if (!Array.isArray(proxyOptions)) {
     if ("target" in proxyOptions) {
       formattedProxy.push(proxyOptions);
     } else {
-      Array.prototype.push.apply(
-        formattedProxy,
-        Object.keys(proxyOptions).reduce(
-          (total, source) => {
-            const option = proxyOptions[source];
-            total.push({
-              context: source,
-              changeOrigin: true,
-              logLevel: "warn",
-              ...typeof option === "string" ? { target: option } : option
-            });
-            return total;
-          },
-          []
-        )
-      );
+      Array.prototype.push.apply(formattedProxy, Object.keys(proxyOptions).reduce((total, source) => {
+        const option = proxyOptions[source];
+        total.push({
+          context: source,
+          changeOrigin: true,
+          logLevel: "warn",
+          ...typeof option === "string" ? {
+            target: option
+          } : option
+        });
+        return total;
+      }, []));
     }
   } else {
     formattedProxy.push(...proxyOptions);
   }
   return formattedProxy;
 }
-const createProxyHandler = (proxyOptions) => {
+export const createProxyHandler = (proxyOptions) => {
   debug("createProxyHandler", proxyOptions);
   if (!proxyOptions) {
     return null;
@@ -51,7 +47,3 @@ const createProxyHandler = (proxyOptions) => {
   });
   return middlewares;
 };
-export {
-  createProxyHandler,
-  formatProxyOptions
-};

package/dist/esm-node/libs/render/cache/__tests__/cache.fun.test.js

@@ -1,14 +1,6 @@
 import url from "url";
 import { createCache, destroyCache } from "../spr";
-import {
-  cacheAddition,
-  connectFactor,
-  fname,
-  maybeSync,
-  namespaceHash,
-  valueFactory,
-  withCoalescedInvoke
-} from "../util";
+import { cacheAddition, connectFactor, fname, maybeSync, namespaceHash, valueFactory, withCoalescedInvoke } from "../util";
 describe("test spr util functions", () => {
   it("should return value correctly", () => {
     expect(connectFactor("bar", "foo")).toBe("bar-foo");
@@ -29,7 +21,9 @@ describe("test spr util functions", () => {
     urlParams.set("name", "modern");
     const getParam = valueFactory(urlParams);
     expect(getParam("name")).toBe("modern");
-    const headers = { age: "12345" };
+    const headers = {
+      age: "12345"
+    };
     const getHeader = valueFactory(headers);
     expect(getHeader("age")).toBe("12345");
   });
@@ -40,22 +34,21 @@ describe("test spr util functions", () => {
     const contentWithHead = "<head></head><div>123</div>";
     const hash = Math.random().toString();
     const htmlWithHead = cacheAddition(contentWithHead, hash);
-    expect(htmlWithHead).toBe(
-      `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
-    );
+    expect(htmlWithHead).toBe(`<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`);
   });
   it("should only invoke func one time", async () => {
     let index = 0;
-    const fn = withCoalescedInvoke(
-      async () => new Promise((resolve) => {
-        setTimeout(() => {
-          index += 1;
-          resolve(index);
-        }, 500);
-      })
-    );
+    const fn = withCoalescedInvoke(async () => new Promise((resolve) => {
+      setTimeout(() => {
+        index += 1;
+        resolve(index);
+      }, 500);
+    }));
     const key = "test";
-    const [res1, res2] = await Promise.all([fn(key, []), fn(key, [])]);
+    const [res1, res2] = await Promise.all([
+      fn(key, []),
+      fn(key, [])
+    ]);
     expect(res1.isOrigin && res2.isOrigin).toBe(false);
     expect(res1.isOrigin || res2.isOrigin).toBe(true);
     expect(res1.value).toBe(1);
@@ -63,21 +56,17 @@ describe("test spr util functions", () => {
   });
   it("should invoke sync or async", async () => {
     const foo = "";
-    const async = await maybeSync(
-      () => new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(foo);
-        }, 100);
-      })
-    )(false);
+    const async = await maybeSync(() => new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(foo);
+      }, 100);
+    }))(false);
     expect(async).toBeUndefined();
-    const sync = await maybeSync(
-      () => new Promise((resolve) => {
-        setTimeout(() => {
-          resolve(foo);
-        }, 100);
-      })
-    )(true);
+    const sync = await maybeSync(() => new Promise((resolve) => {
+      setTimeout(() => {
+        resolve(foo);
+      }, 100);
+    }))(true);
     expect(sync).toBe(foo);
   });
 });

package/dist/esm-node/libs/render/cache/__tests__/cache.test.js

@@ -28,7 +28,7 @@ describe("cache", () => {
     await cache.set(context, content, cacheConfig, true);
     const cacheResult = await cache.get(context);
     expect(cacheResult).not.toBe(null);
-    expect(cacheResult == null ? void 0 : cacheResult.content).toBe("hello");
+    expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe("hello");
   });
   it("should ignore cache set when cache config not exist", async () => {
     destroyCache();
@@ -73,7 +73,11 @@ describe("cache", () => {
     const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     });
     await cache.set(context, content, cacheConfig, true);
     const context_req = {
@@ -97,13 +101,19 @@ describe("cache", () => {
     const content = "hello";
     const cacheConfig = createCacheConfig({
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     });
     await cache.set(context, content, cacheConfig, true);
     const context_req = {
       entry: "",
       pathname: "",
-      query: { name: "zll" },
+      query: {
+        name: "zll"
+      },
       headers: {}
     };
     const cacheResult = await cache.get(context_req);
@@ -122,7 +132,7 @@ describe("cache", () => {
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
       await cache.set(context, cacheable.content, cacheConfig, true);
       const cacheResult = await cache.get(context);
-      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(cacheable.content);
+      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
     }
   });
   it("should match cache correctly", async () => {
@@ -145,7 +155,7 @@ describe("cache", () => {
         headers: matchOne.headers
       };
       const cacheResult = await cache.get(matchContext);
-      expect(cacheResult == null ? void 0 : cacheResult.content).toBe(content);
+      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
           entry: "",
@@ -167,19 +177,21 @@ describe("cache", () => {
       query: {},
       headers: {}
     };
-    const config = createCacheConfig({ interval: 5 });
+    const config = createCacheConfig({
+      interval: 5
+    });
     const content = "hello";
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult == null ? void 0 : freshResult.isStale).toBe(false);
+    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 6e3);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult == null ? void 0 : staleResult.isStale).toBe(true);
+    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
   });
   it("should garbage cache correctly", async () => {
     destroyCache();
@@ -198,13 +210,13 @@ describe("cache", () => {
     const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
     const freshResult = await cache.get(context);
-    expect(freshResult == null ? void 0 : freshResult.isGarbage).toBe(false);
+    expect(freshResult === null || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
     await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 1e4);
     });
     const staleResult = await cache.get(context);
-    expect(staleResult == null ? void 0 : staleResult.isGarbage).toBe(true);
+    expect(staleResult === null || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
   });
 });

package/dist/esm-node/libs/render/cache/__tests__/cacheable.js

@@ -1,47 +1,66 @@
-const cacheabelAry = [
+export const cacheabelAry = [
   {
-    requestOpt: { url: "/" },
+    requestOpt: {
+      url: "/"
+    },
     cacheConfig: {},
     content: "level0"
   },
   {
     requestOpt: {
       url: "/level-one",
-      query: { name: "modern" }
+      query: {
+        name: "modern"
+      }
     },
     cacheConfig: {
       level: 1,
-      includes: { query: ["name"] }
+      includes: {
+        query: [
+          "name"
+        ]
+      }
     },
     content: "level1"
   },
   {
     requestOpt: {
       url: "/level-two",
-      headers: { age: "18" }
+      headers: {
+        age: "18"
+      }
     },
     cacheConfig: {
       level: 2,
-      includes: { header: ["age"] }
+      includes: {
+        header: [
+          "age"
+        ]
+      }
     },
     content: "level2"
   },
   {
     requestOpt: {
       url: "/level-three",
-      query: { name: "modern" },
-      headers: { age: "18" }
+      query: {
+        name: "modern"
+      },
+      headers: {
+        age: "18"
+      }
     },
     cacheConfig: {
       level: 3,
       includes: {
-        query: ["name"],
-        header: ["age"]
+        query: [
+          "name"
+        ],
+        header: [
+          "age"
+        ]
       }
     },
     content: "level3"
   }
 ];
-export {
-  cacheabelAry
-};