@modern-js/prod-server 2.4.1-beta.0 → 2.5.0

package/CHANGELOG.md

@@ -1,16 +1,31 @@
 # @modern-js/prod-server
 
-## 2.4.1-beta.0
+## 2.5.0
 
 ### Patch Changes
 
+- 89ca6cc: refactor: merge build-config into scripts/build
+
+  refactor: 把 build-config 合并进 scripts/build
+
+- 6fca567: feat: support bff handle complete server, include page render
+  feat: 支持 bff 处理整个服务，包括页面渲染
+- 30614fa: chore: modify package.json entry fields and build config
+  chore: 更改 package.json entry 字段以及构建配置
 - 11c053b: feat: ssr support deploy worker
 
   feat: ssr 支持边缘部署
 
+- 169c58b: feat: support force csr config
+  feat: 支持强制 CSR 的配置
+- Updated dependencies [89ca6cc]
+- Updated dependencies [6fca567]
+- Updated dependencies [30614fa]
+- Updated dependencies [1b0ce87]
 - Updated dependencies [11c053b]
-  - @modern-js/server-core@2.4.1-beta.0
-  - @modern-js/utils@2.4.1-beta.0
+- Updated dependencies [169c58b]
+  - @modern-js/server-core@2.5.0
+  - @modern-js/utils@2.5.0
 
 ## 2.4.0
 

package/dist/{js/node → cjs}/libs/hook-api/index.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -133,27 +116,31 @@ const base = (context) => {
 };
 const createAfterMatchContext = (context, entryName) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     router: new import_route.RouteAPI(entryName)
-  });
+  };
 };
 const createAfterRenderContext = (context, content) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
+  return {
+    ...baseContext,
     template: new import_template.TemplateAPI(content)
-  });
+  };
 };
 const createMiddlewareContext = (context) => {
   const baseContext = base(context);
-  return __spreadProps(__spreadValues({}, baseContext), {
-    response: __spreadProps(__spreadValues({}, baseContext.response), {
+  return {
+    ...baseContext,
+    response: {
+      ...baseContext.response,
       locals: context.res.locals || {}
-    }),
+    },
     source: {
       req: context.req,
       res: context.res
     }
-  });
+  };
 };
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {

package/dist/{js/node → cjs}/libs/loadConfig.js

@@ -1,26 +1,9 @@
 var __create = Object.create;
 var __defProp = Object.defineProperty;
-var __defProps = Object.defineProperties;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
-var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __getProtoOf = Object.getPrototypeOf;
 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));
 var __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -67,17 +50,19 @@ const loadConfig = ({
   if (process.env.NODE_ENV === "production") {
     const resolvedConfig = requireConfig(resolvedConfigPath);
     config = (0, import_merge_deep.default)(
-      __spreadProps(__spreadValues({}, resolvedConfig), {
+      {
+        ...resolvedConfig,
         plugins: []
-      }),
+      },
       serverConfig,
       cliConfig
     );
   } else {
     config = (0, import_merge_deep.default)(
-      __spreadProps(__spreadValues({}, cliConfig), {
+      {
+        ...cliConfig,
         plugins: []
-      }),
+      },
       serverConfig
     );
   }

package/dist/{js/node → cjs}/libs/logger.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -77,8 +63,11 @@ const DEFAULT_CONFIG = {
 class Logger {
   constructor(options = {}) {
     this.level = options.level || LOG_TYPES.log.level;
-    this.config = __spreadValues(__spreadValues({}, DEFAULT_CONFIG), options.config || {});
-    this.types = __spreadValues(__spreadValues({}, LOG_TYPES), options.types || {});
+    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);

package/dist/{js/node → cjs}/libs/proxy.js

@@ -1,21 +1,7 @@
 var __defProp = Object.defineProperty;
 var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
 var __getOwnPropNames = Object.getOwnPropertyNames;
-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 __export = (target, all) => {
   for (var name in all)
     __defProp(target, name, { get: all[name], enumerable: true });
@@ -29,26 +15,6 @@ var __copyProps = (to, from, except, desc) => {
   return to;
 };
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var proxy_exports = {};
 __export(proxy_exports, {
   createProxyHandler: () => createProxyHandler,
@@ -68,11 +34,12 @@ function formatProxyOptions(proxyOptions) {
         Object.keys(proxyOptions).reduce(
           (total, source) => {
             const option = proxyOptions[source];
-            total.push(__spreadValues({
+            total.push({
               context: source,
               changeOrigin: true,
-              logLevel: "warn"
-            }, typeof option === "string" ? { target: option } : option));
+              logLevel: "warn",
+              ...typeof option === "string" ? { target: option } : option
+            });
             return total;
           },
           []
@@ -92,7 +59,7 @@ const createProxyHandler = (proxyOptions) => {
   const formattedProxy = formatProxyOptions(proxyOptions);
   const middlewares = formattedProxy.map((option) => {
     const middleware = (0, import_http_proxy_middleware.createProxyMiddleware)(option.context, option);
-    return (ctx, next) => __async(void 0, null, function* () {
+    return async (ctx, next) => {
       const { req, res } = ctx;
       const bypassUrl = typeof option.bypass === "function" ? option.bypass(req, res, option) : null;
       if (typeof bypassUrl === "boolean") {
@@ -103,7 +70,7 @@ const createProxyHandler = (proxyOptions) => {
         return next();
       }
       middleware(req, res, next);
-    });
+    };
   });
   return middlewares;
 };

package/dist/{js/node → cjs}/libs/render/cache/__tests__/cache.fun.test.js

@@ -16,26 +16,6 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
   isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
   mod
 ));
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var import_url = __toESM(require("url"));
 var import_spr = require("../spr");
 var import_util = require("../util");
@@ -74,28 +54,26 @@ describe("test spr util functions", () => {
       `<head><meta name="x-moden-spr" content="${hash}"></head><div>123</div>`
     );
   });
-  it("should only invoke func one time", () => __async(exports, null, function* () {
+  it("should only invoke func one time", async () => {
     let index = 0;
     const fn = (0, import_util.withCoalescedInvoke)(
-      () => __async(exports, null, function* () {
-        return new Promise((resolve) => {
-          setTimeout(() => {
-            index += 1;
-            resolve(index);
-          }, 500);
-        });
+      async () => new Promise((resolve) => {
+        setTimeout(() => {
+          index += 1;
+          resolve(index);
+        }, 500);
       })
     );
     const key = "test";
-    const [res1, res2] = yield 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);
     expect(res2.value).toBe(1);
-  }));
-  it("should invoke sync or async", () => __async(exports, null, function* () {
+  });
+  it("should invoke sync or async", async () => {
     const foo = "";
-    const async = yield (0, import_util.maybeSync)(
+    const async = await (0, import_util.maybeSync)(
       () => new Promise((resolve) => {
         setTimeout(() => {
           resolve(foo);
@@ -103,7 +81,7 @@ describe("test spr util functions", () => {
       })
     )(false);
     expect(async).toBeUndefined();
-    const sync = yield (0, import_util.maybeSync)(
+    const sync = await (0, import_util.maybeSync)(
       () => new Promise((resolve) => {
         setTimeout(() => {
           resolve(foo);
@@ -111,5 +89,5 @@ describe("test spr util functions", () => {
       })
     )(true);
     expect(sync).toBe(foo);
-  }));
+  });
 });

package/dist/{js/node → cjs}/libs/render/cache/__tests__/cache.test.js

@@ -1,55 +1,20 @@
-var __defProp = Object.defineProperty;
-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 __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
 var import_spr = require("../spr");
 var import_error_configuration = require("./error-configuration");
 var import_cacheable = require("./cacheable");
 var import_matched_cache = require("./matched-cache");
-const createCacheConfig = (config = {}) => __spreadValues({
+const createCacheConfig = (config = {}) => ({
   excludes: null,
   includes: null,
   interval: 10,
   staleLimit: false,
   level: 0,
   fallback: false,
-  matches: null
-}, config);
+  matches: null,
+  ...config
+});
 jest.setTimeout(6e4);
 describe("cache", () => {
-  it("should cache correctly", () => __async(exports, null, function* () {
+  it("should cache correctly", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const context = {
@@ -60,12 +25,12 @@ describe("cache", () => {
     };
     const content = "hello";
     const cacheConfig = createCacheConfig();
-    yield cache.set(context, content, cacheConfig, true);
-    const cacheResult = yield cache.get(context);
+    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");
-  }));
-  it("should ignore cache set when cache config not exist", () => __async(exports, null, function* () {
+  });
+  it("should ignore cache set when cache config not exist", async () => {
     (0, import_spr.destroyCache)();
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
@@ -76,10 +41,10 @@ describe("cache", () => {
       headers: {}
     };
     const content = "hello";
-    const shouldCache = yield cache.set(context, content, null, true);
+    const shouldCache = await cache.set(context, content, null, true);
     expect(shouldCache).toBe(false);
-  }));
-  it("should calcual cache key error", () => __async(exports, null, function* () {
+  });
+  it("should calcual cache key error", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const content = "hello";
@@ -92,11 +57,11 @@ describe("cache", () => {
         query: {},
         headers: {}
       };
-      const shouldCache = yield cache.set(context, content, cacheConfig);
+      const shouldCache = await cache.set(context, content, cacheConfig);
       expect(shouldCache).toBe(false);
     }
-  }));
-  it("should get nothing for diff requestKey", () => __async(exports, null, function* () {
+  });
+  it("should get nothing for diff requestKey", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const context = {
@@ -110,17 +75,17 @@ describe("cache", () => {
       level: 1,
       includes: { query: ["name"] }
     });
-    yield cache.set(context, content, cacheConfig, true);
+    await cache.set(context, content, cacheConfig, true);
     const context_req = {
       entry: "",
       pathname: "/home",
       query: {},
       headers: {}
     };
-    const cacheResult = yield cache.get(context_req);
+    const cacheResult = await cache.get(context_req);
     expect(cacheResult).toBe(null);
-  }));
-  it("should get nothing for diff cacheHash", () => __async(exports, null, function* () {
+  });
+  it("should get nothing for diff cacheHash", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const context = {
@@ -134,17 +99,17 @@ describe("cache", () => {
       level: 1,
       includes: { query: ["name"] }
     });
-    yield cache.set(context, content, cacheConfig, true);
+    await cache.set(context, content, cacheConfig, true);
     const context_req = {
       entry: "",
       pathname: "",
       query: { name: "zll" },
       headers: {}
     };
-    const cacheResult = yield cache.get(context_req);
+    const cacheResult = await cache.get(context_req);
     expect(cacheResult).toBe(null);
-  }));
-  it("should get cache correctly", () => __async(exports, null, function* () {
+  });
+  it("should get cache correctly", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     for (const cacheable of import_cacheable.cacheabelAry) {
@@ -155,12 +120,12 @@ describe("cache", () => {
         headers: cacheable.requestOpt.headers || {}
       };
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
-      yield cache.set(context, cacheable.content, cacheConfig, true);
-      const cacheResult = yield cache.get(context);
+      await cache.set(context, cacheable.content, cacheConfig, true);
+      const cacheResult = await cache.get(context);
       expect(cacheResult == null ? void 0 : cacheResult.content).toBe(cacheable.content);
     }
-  }));
-  it("should match cache correctly", () => __async(exports, null, function* () {
+  });
+  it("should match cache correctly", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     for (const cacheable of import_matched_cache.matchedCacheableAry) {
@@ -172,14 +137,14 @@ describe("cache", () => {
         query: requestOpt.query,
         headers: requestOpt.headers
       };
-      yield cache.set(context, content, createCacheConfig(cacheConfig), true);
+      await cache.set(context, content, createCacheConfig(cacheConfig), true);
       const matchContext = {
         entry: "",
         pathname: matchOne.url,
         query: matchOne.query,
         headers: matchOne.headers
       };
-      const cacheResult = yield cache.get(matchContext);
+      const cacheResult = await cache.get(matchContext);
       expect(cacheResult == null ? void 0 : cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
@@ -188,12 +153,12 @@ describe("cache", () => {
           query: notMatch.query,
           headers: notMatch.headers
         };
-        const nothing = yield cache.get(notMatchContext);
+        const nothing = await cache.get(notMatchContext);
         expect(nothing).toBe(null);
       }
     }
-  }));
-  it("should stale cache correctly", () => __async(exports, null, function* () {
+  });
+  it("should stale cache correctly", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const context = {
@@ -204,19 +169,19 @@ describe("cache", () => {
     };
     const config = createCacheConfig({ interval: 5 });
     const content = "hello";
-    const shouldCache = yield cache.set(context, content, config, true);
+    const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
-    const freshResult = yield cache.get(context);
+    const freshResult = await cache.get(context);
     expect(freshResult == null ? void 0 : freshResult.isStale).toBe(false);
-    yield new Promise((resolve) => {
+    await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 6e3);
     });
-    const staleResult = yield cache.get(context);
+    const staleResult = await cache.get(context);
     expect(staleResult == null ? void 0 : staleResult.isStale).toBe(true);
-  }));
-  it("should garbage cache correctly", () => __async(exports, null, function* () {
+  });
+  it("should garbage cache correctly", async () => {
     (0, import_spr.destroyCache)();
     const cache = (0, import_spr.createCache)();
     const context = {
@@ -230,16 +195,16 @@ describe("cache", () => {
       staleLimit: 8
     });
     const content = "hello";
-    const shouldCache = yield cache.set(context, content, config, true);
+    const shouldCache = await cache.set(context, content, config, true);
     expect(shouldCache.value).toBe(true);
-    const freshResult = yield cache.get(context);
+    const freshResult = await cache.get(context);
     expect(freshResult == null ? void 0 : freshResult.isGarbage).toBe(false);
-    yield new Promise((resolve) => {
+    await new Promise((resolve) => {
       setTimeout(() => {
         resolve();
       }, 1e4);
     });
-    const staleResult = yield cache.get(context);
+    const staleResult = await cache.get(context);
     expect(staleResult == null ? void 0 : staleResult.isGarbage).toBe(true);
-  }));
+  });
 });