@modern-js/prod-server 2.27.0 → 2.28.0

package/dist/esm/renderHtml.js

@@ -11,9 +11,9 @@ import { Readable } from "stream";
 import { Socket } from "net";
 import { Server } from "./server";
 import { isRedirect } from "./utils";
-var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
+var IncomingMessageLike = /* @__PURE__ */ function(Readable1) {
   "use strict";
-  _inherits(IncomingMessageLike2, Readable2);
+  _inherits(IncomingMessageLike2, Readable1);
   var _super = _create_super(IncomingMessageLike2);
   function IncomingMessageLike2(param) {
     var method = param.method, url = param.url, headers = param.headers;
@@ -33,9 +33,9 @@ var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
   }
   return IncomingMessageLike2;
 }(Readable);
-var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
+var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage1) {
   "use strict";
-  _inherits(ServerResponseLike2, OutgoingMessage2);
+  _inherits(ServerResponseLike2, OutgoingMessage1);
   var _super = _create_super(ServerResponseLike2);
   function ServerResponseLike2() {
     _class_call_check(this, ServerResponseLike2);
@@ -60,9 +60,9 @@ var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
   ]);
   return ServerResponseLike2;
 }(OutgoingMessage);
-var CustomServer = /* @__PURE__ */ function(Server2) {
+var CustomServer = /* @__PURE__ */ function(Server1) {
   "use strict";
-  _inherits(CustomServer2, Server2);
+  _inherits(CustomServer2, Server1);
   var _super = _create_super(CustomServer2);
   function CustomServer2() {
     _class_call_check(this, CustomServer2);

package/dist/esm/server/index.js

@@ -210,7 +210,8 @@ export var Server = /* @__PURE__ */ function() {
       key: "listen",
       value: function listen(options, listener) {
         var callback = function() {
-          listener === null || listener === void 0 ? void 0 : listener();
+          var _listener;
+          (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
         };
         if (typeof options === "object") {
           if (process.env.PORT) {
@@ -306,6 +307,7 @@ export var Server = /* @__PURE__ */ function() {
     {
       key: "initAppContext",
       value: function initAppContext() {
+        var _appContext, _appContext1, _appContext2;
         var options = this.options;
         var appDirectory = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins, config = options.config, appContext = options.appContext;
         var serverPlugins = plugins.map(function(p) {
@@ -315,9 +317,9 @@ export var Server = /* @__PURE__ */ function() {
         });
         return {
           appDirectory: appDirectory,
-          apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
-          lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
-          sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
+          apiDirectory: (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory,
+          lambdaDirectory: (_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.lambdaDirectory,
+          sharedDirectory: ((_appContext2 = appContext) === null || _appContext2 === void 0 ? void 0 : _appContext2.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
           distDirectory: path.join(appDirectory, config.output.path || "dist"),
           plugins: serverPlugins
         };

package/dist/esm/server/modernServer.js

@@ -23,6 +23,7 @@ export var ModernServer = /* @__PURE__ */ function() {
   function ModernServer2(param) {
     var pwd = param.pwd, config = param.config, routes = param.routes, staticGenerate = param.staticGenerate, logger = param.logger, metrics = param.metrics, runMode = param.runMode, proxyTarget = param.proxyTarget, appContext = param.appContext;
     _class_call_check(this, ModernServer2);
+    var _appContext;
     _define_property(this, "pwd", void 0);
     _define_property(this, "distDir", void 0);
     _define_property(this, "workDir", void 0);
@@ -37,13 +38,13 @@ export var ModernServer = /* @__PURE__ */ function() {
     _define_property(this, "reader", reader);
     _define_property(this, "proxyTarget", void 0);
     _define_property(this, "routeRenderHandler", void 0);
+    _define_property(this, "staticGenerate", void 0);
+    _define_property(this, "metaName", void 0);
     _define_property(this, "loaderHandler", null);
     _define_property(this, "frameWebHandler", null);
     _define_property(this, "frameAPIHandler", null);
     _define_property(this, "proxyHandler", null);
     _define_property(this, "_handler", void 0);
-    _define_property(this, "staticGenerate", void 0);
-    _define_property(this, "metaName", void 0);
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = path.resolve(pwd, config.output.path || "dist");
@@ -57,7 +58,7 @@ export var ModernServer = /* @__PURE__ */ function() {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || RUN_MODE.FULL;
-    this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
+    this.metaName = (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.metaName;
   }
   _create_class(ModernServer2, [
     {
@@ -67,12 +68,12 @@ export var ModernServer = /* @__PURE__ */ function() {
         function onInit(runner, app) {
           var _this = this;
           return _async_to_generator(function() {
-            var _conf_bff, _this_conf_server, _conf_security, _this_conf_output, distDir, staticGenerate, conf, metaName, usageRoutes, ssrConfig, forceCSR;
+            var _conf_bff, _app, _this_conf_output, distDir, conf, usageRoutes;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   _this.runner = runner;
-                  distDir = _this.distDir, staticGenerate = _this.staticGenerate, conf = _this.conf, metaName = _this.metaName;
+                  distDir = _this.distDir, conf = _this.conf;
                   _this.initReader();
                   debug("final server conf", _this.conf);
                   _this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
@@ -81,7 +82,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                       _this.addHandler(handler);
                     });
                   }
-                  app === null || app === void 0 ? void 0 : app.on("close", function() {
+                  (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", function() {
                     _this.reader.close();
                   });
                   usageRoutes = _this.filterRoutes(_this.getRoutes());
@@ -99,15 +100,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                   ];
                 case 2:
                   _state.sent();
-                  ssrConfig = (_this_conf_server = _this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
-                  forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-                  _this.routeRenderHandler = createRenderHandler({
-                    distDir: distDir,
-                    staticGenerate: staticGenerate,
-                    forceCSR: forceCSR,
-                    nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
-                    metaName: metaName
-                  });
+                  _this.routeRenderHandler = _this.getRenderHandler();
                   return [
                     4,
                     _this.setupBeforeProdMiddleware()
@@ -127,6 +120,22 @@ export var ModernServer = /* @__PURE__ */ function() {
         }
       )
     },
+    {
+      key: "getRenderHandler",
+      value: function getRenderHandler() {
+        var _this_conf_server, _conf_security;
+        var _this = this, distDir = _this.distDir, staticGenerate = _this.staticGenerate, conf = _this.conf, metaName = _this.metaName;
+        var ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
+        var forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
+        return createRenderHandler({
+          distDir: distDir,
+          staticGenerate: staticGenerate,
+          forceCSR: forceCSR,
+          nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
+          metaName: metaName
+        });
+      }
+    },
     {
       key: "onRepack",
       value: (
@@ -418,13 +427,13 @@ export var ModernServer = /* @__PURE__ */ function() {
       value: function prepareAPIHandler(extension) {
         var _this = this;
         return _async_to_generator(function() {
-          var workDir, runner, conf, bff, prefix, webOnly;
+          var _bff, _bff1, workDir, runner, conf, bff, prefix, webOnly;
           return _ts_generator(this, function(_state) {
             switch (_state.label) {
               case 0:
                 workDir = _this.workDir, runner = _this.runner, conf = _this.conf;
                 bff = conf.bff;
-                prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
+                prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
                 return [
                   4,
                   isWebOnly()
@@ -446,7 +455,7 @@ export var ModernServer = /* @__PURE__ */ function() {
                     pwd: workDir,
                     config: extension,
                     prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-                    httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
+                    httpMethodDecider: (_bff1 = bff) === null || _bff1 === void 0 ? void 0 : _bff1.httpMethodDecider,
                     render: _this.render.bind(_this)
                   }, {
                     onLast: function() {

package/dist/esm/server/modernServerSplit.js

@@ -7,9 +7,9 @@ import { _ as _inherits } from "@swc/helpers/_/_inherits";
 import { _ as _create_super } from "@swc/helpers/_/_create_super";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ModernServer } from "./modernServer";
-var ModernSSRServer = /* @__PURE__ */ function(ModernServer2) {
+var ModernSSRServer = /* @__PURE__ */ function(ModernServer1) {
   "use strict";
-  _inherits(ModernSSRServer2, ModernServer2);
+  _inherits(ModernSSRServer2, ModernServer1);
   var _super = _create_super(ModernSSRServer2);
   function ModernSSRServer2() {
     _class_call_check(this, ModernSSRServer2);
@@ -39,9 +39,9 @@ var ModernSSRServer = /* @__PURE__ */ function(ModernServer2) {
   ]);
   return ModernSSRServer2;
 }(ModernServer);
-var ModernAPIServer = /* @__PURE__ */ function(ModernServer2) {
+var ModernAPIServer = /* @__PURE__ */ function(ModernServer1) {
   "use strict";
-  _inherits(ModernAPIServer2, ModernServer2);
+  _inherits(ModernAPIServer2, ModernServer1);
   var _super = _create_super(ModernAPIServer2);
   function ModernAPIServer2() {
     _class_call_check(this, ModernAPIServer2);
@@ -65,9 +65,9 @@ var ModernAPIServer = /* @__PURE__ */ function(ModernServer2) {
   ]);
   return ModernAPIServer2;
 }(ModernServer);
-var ModernWebServer = /* @__PURE__ */ function(ModernServer2) {
+var ModernWebServer = /* @__PURE__ */ function(ModernServer1) {
   "use strict";
-  _inherits(ModernWebServer2, ModernServer2);
+  _inherits(ModernWebServer2, ModernServer1);
   var _super = _create_super(ModernWebServer2);
   function ModernWebServer2() {
     _class_call_check(this, ModernWebServer2);

package/dist/esm/workerServer.js

@@ -91,7 +91,7 @@ export var createHandler = function(manifest) {
   routeMgr.reset(routes);
   return function() {
     var _ref = _async_to_generator(function(options) {
-      var _page_serverHooks, _page_serverHooks_afterMatch, request, loadableStats, routeManifest, url, pageMatch, entryName, page, logger, metrics, hookContext, afterMatchHookContext, _page_serverHooks1, _page_serverHooks2, _page_serverHooks_afterRender, middlewarsHookContext, responseLike, params, baseUrl, serverRenderContext, body, afterRenderHookContext, e;
+      var _page_serverHooks_afterMatch, _page_serverHooks, _page, request, loadableStats, routeManifest, url, pageMatch, entryName, page, logger, metrics, hookContext, afterMatchHookContext, _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2, middlewarsHookContext, responseLike, params, baseUrl, serverRenderContext, body, afterRenderHookContext, e;
       function createServerRequest(url2, baseUrl2, request2, params2) {
         var pathname = url2.pathname, host = url2.host, searchParams = url2.searchParams;
         var rawHeaders = request2.headers;
@@ -130,7 +130,7 @@ export var createHandler = function(manifest) {
             metrics = defaultMetrics;
             hookContext = createWorkerHookContext(request.url, logger, metrics);
             afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
-            page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, function() {
+            (_page = page) === null || _page === void 0 ? void 0 : (_page_serverHooks = _page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, function() {
               return void 0;
             });
             if (checkIsSent(hookContext)) {

package/dist/esm-node/index.js

@@ -4,6 +4,7 @@ export { ModernServer } from "./server/modernServer";
 export { createProxyHandler } from "./libs/proxy";
 export * from "./type";
 export * from "./constants";
+export { createRenderHandler } from "./libs/render";
 export default (options) => {
   if (options == null) {
     throw new Error("can not start mserver without options");

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

@@ -15,6 +15,7 @@ const createCacheConfig = (config = {}) => ({
 jest.setTimeout(6e4);
 describe("cache", () => {
   it("should cache correctly", async () => {
+    var _cacheResult;
     destroyCache();
     const cache = createCache();
     const context = {
@@ -28,7 +29,7 @@ describe("cache", () => {
     await cache.set(context, content, cacheConfig, true);
     const cacheResult = await cache.get(context);
     expect(cacheResult).not.toBe(null);
-    expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe("hello");
+    expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe("hello");
   });
   it("should ignore cache set when cache config not exist", async () => {
     destroyCache();
@@ -123,6 +124,7 @@ describe("cache", () => {
     destroyCache();
     const cache = createCache();
     for (const cacheable of cacheabelAry) {
+      var _cacheResult;
       const context = {
         entry: "",
         pathname: cacheable.requestOpt.url,
@@ -132,13 +134,14 @@ describe("cache", () => {
       const cacheConfig = createCacheConfig(cacheable.cacheConfig || {});
       await cache.set(context, cacheable.content, cacheConfig, true);
       const cacheResult = await cache.get(context);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(cacheable.content);
+      expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(cacheable.content);
     }
   });
   it("should match cache correctly", async () => {
     destroyCache();
     const cache = createCache();
     for (const cacheable of matchedCacheableAry) {
+      var _cacheResult;
       const [baseCacheable, matchOne, ...other] = cacheable;
       const { requestOpt = {}, cacheConfig, content } = baseCacheable;
       const context = {
@@ -155,7 +158,7 @@ describe("cache", () => {
         headers: matchOne.headers
       };
       const cacheResult = await cache.get(matchContext);
-      expect(cacheResult === null || cacheResult === void 0 ? void 0 : cacheResult.content).toBe(content);
+      expect((_cacheResult = cacheResult) === null || _cacheResult === void 0 ? void 0 : _cacheResult.content).toBe(content);
       for (const notMatch of other) {
         const notMatchContext = {
           entry: "",
@@ -169,6 +172,7 @@ describe("cache", () => {
     }
   });
   it("should stale cache correctly", async () => {
+    var _freshResult, _staleResult;
     destroyCache();
     const cache = createCache();
     const context = {
@@ -184,16 +188,17 @@ 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 || freshResult === void 0 ? void 0 : freshResult.isStale).toBe(false);
+    expect((_freshResult = 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 || staleResult === void 0 ? void 0 : staleResult.isStale).toBe(true);
+    expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isStale).toBe(true);
   });
   it("should garbage cache correctly", async () => {
+    var _freshResult, _staleResult;
     destroyCache();
     const cache = createCache();
     const context = {
@@ -210,13 +215,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 || freshResult === void 0 ? void 0 : freshResult.isGarbage).toBe(false);
+    expect((_freshResult = 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 || staleResult === void 0 ? void 0 : staleResult.isGarbage).toBe(true);
+    expect((_staleResult = staleResult) === null || _staleResult === void 0 ? void 0 : _staleResult.isGarbage).toBe(true);
   });
 });

package/dist/esm-node/libs/render/cache/index.js

@@ -5,6 +5,7 @@ import { namespaceHash, withCoalescedInvoke } from "./util";
 export default (renderFn, ctx) => {
   const sprCache = createCache();
   const doRender = async (context) => {
+    var _cacheFile;
     const cacheContext = {
       entry: context.entryName,
       ...context.request
@@ -40,7 +41,7 @@ export default (renderFn, ctx) => {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);
     }
-    const cacheHash = cacheFile === null || cacheFile === void 0 ? void 0 : cacheFile.hash;
+    const cacheHash = (_cacheFile = cacheFile) === null || _cacheFile === void 0 ? void 0 : _cacheFile.hash;
     if (cacheFile.isGarbage) {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);

package/dist/esm-node/libs/render/cache/spr.js

@@ -141,9 +141,10 @@ class CacheManager {
     return maybeSync(doCache)(sync);
   }
   async del(context, cacheHash) {
+    var _data;
     const cacheKey = this.generateRequestKey(context);
     const data = this.cache.get(cacheKey);
-    data === null || data === void 0 ? void 0 : data.caches.del(cacheHash);
+    (_data = data) === null || _data === void 0 ? void 0 : _data.caches.del(cacheHash);
   }
   constructor(cacheOptions) {
     _define_property(this, "cache", void 0);

package/dist/esm-node/libs/render/index.js

@@ -5,7 +5,7 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
-export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
+export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce, ssrRender, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
   }
@@ -23,7 +23,7 @@ export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce,
   const useCSR = forceCSR && (ctx.query.csr || ctx.headers[`x-${cutNameByHyphen(metaName)}-ssr-fallback`]);
   if (route.isSSR && !useCSR) {
     try {
-      const result = await ssr.render(ctx, {
+      const ssrRenderOptions = {
         distDir,
         entryName: route.entryName,
         urlPath: route.urlPath,
@@ -31,7 +31,16 @@ export const createRenderHandler = ({ distDir, staticGenerate, forceCSR, nonce,
         template: content.toString(),
         staticGenerate,
         nonce
-      }, runner);
+      };
+      const result = await (ssrRender ? ssrRender(ctx, ssrRenderOptions, runner) : ssr.render(ctx, {
+        distDir,
+        entryName: route.entryName,
+        urlPath: route.urlPath,
+        bundle: route.bundle,
+        template: content.toString(),
+        staticGenerate,
+        nonce
+      }, runner));
       return result;
     } catch (err) {
       ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);

package/dist/esm-node/libs/render/reader.js

@@ -72,8 +72,9 @@ export class LruReader {
 }
 const reader = new LruReader();
 export const readFile = async (filepath) => {
+  var _file;
   const file = await reader.read(filepath);
-  return file === null || file === void 0 ? void 0 : file.content;
+  return (_file = file) === null || _file === void 0 ? void 0 : _file.content;
 };
 export const updateFile = () => {
   reader.update();

package/dist/esm-node/libs/render/ssr.js

@@ -73,21 +73,20 @@ export const render = async (ctx, renderOptions, runner) => {
     };
   }
 };
-const getRequestBody = (req) => {
-  return new Promise((resolve, reject) => {
-    if ((req === null || req === void 0 ? void 0 : req.method) && req.method.toLowerCase() !== "get") {
-      let body = "";
-      req.on("data", (chunk) => {
-        body += chunk.toString();
-      });
-      req.on("end", () => {
-        resolve(body);
-      });
-      req.on("error", (err) => {
-        reject(err);
-      });
-    } else {
-      resolve(void 0);
-    }
-  });
-};
+const getRequestBody = (req) => new Promise((resolve, reject) => {
+  var _req;
+  if (((_req = req) === null || _req === void 0 ? void 0 : _req.method) && req.method.toLowerCase() !== "get") {
+    let body = "";
+    req.on("data", (chunk) => {
+      body += chunk.toString();
+    });
+    req.on("end", () => {
+      resolve(body);
+    });
+    req.on("error", (err) => {
+      reject(err);
+    });
+  } else {
+    resolve(void 0);
+  }
+});

package/dist/esm-node/libs/route/matcher.js

@@ -39,9 +39,9 @@ export class RouteMatcher {
     if (!this.urlReg) {
       return this.urlPath.length;
     } else {
-      var _result_;
+      var _result_, _result;
       const result = this.urlReg.exec(pathname);
-      return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
+      return ((_result = result) === null || _result === void 0 ? void 0 : (_result_ = _result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
     }
   }
   // if match url path

package/dist/esm-node/server/index.js

@@ -78,7 +78,8 @@ export class Server {
   }
   listen(options, listener) {
     const callback = () => {
-      listener === null || listener === void 0 ? void 0 : listener();
+      var _listener;
+      (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
     };
     if (typeof options === "object") {
       if (process.env.PORT) {
@@ -128,6 +129,7 @@ export class Server {
     });
   }
   initAppContext() {
+    var _appContext, _appContext1, _appContext2;
     const { options } = this;
     const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
@@ -135,9 +137,9 @@ export class Server {
     }));
     return {
       appDirectory,
-      apiDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.apiDirectory,
-      lambdaDirectory: appContext === null || appContext === void 0 ? void 0 : appContext.lambdaDirectory,
-      sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
+      apiDirectory: (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.apiDirectory,
+      lambdaDirectory: (_appContext1 = appContext) === null || _appContext1 === void 0 ? void 0 : _appContext1.lambdaDirectory,
+      sharedDirectory: ((_appContext2 = appContext) === null || _appContext2 === void 0 ? void 0 : _appContext2.sharedDirectory) || path.resolve(appDirectory, SHARED_DIR),
       distDirectory: path.join(appDirectory, config.output.path || "dist"),
       plugins: serverPlugins
     };

package/dist/esm-node/server/modernServer.js

@@ -15,9 +15,9 @@ const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _this_conf_server, _conf_security, _this_conf_output;
+    var _conf_bff, _app, _this_conf_output;
     this.runner = runner;
-    const { distDir, staticGenerate, conf, metaName } = this;
+    const { distDir, conf } = this;
     this.initReader();
     debug("final server conf", this.conf);
     this.proxyHandler = createProxyHandler((_conf_bff = conf.bff) === null || _conf_bff === void 0 ? void 0 : _conf_bff.proxy);
@@ -26,7 +26,7 @@ export class ModernServer {
         this.addHandler(handler);
       });
     }
-    app === null || app === void 0 ? void 0 : app.on("close", () => {
+    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -34,20 +34,25 @@ export class ModernServer {
     this.warmupSSRBundle();
     await this.prepareFrameHandler();
     await this.prepareLoaderHandler(usageRoutes, distDir);
+    this.routeRenderHandler = this.getRenderHandler();
+    await this.setupBeforeProdMiddleware();
+    this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
+    this.addHandler(faviconFallbackHandler);
+    this.addHandler(this.routeHandler.bind(this));
+    this.compose();
+  }
+  getRenderHandler() {
+    var _this_conf_server, _conf_security;
+    const { distDir, staticGenerate, conf, metaName } = this;
     const ssrConfig = (_this_conf_server = this.conf.server) === null || _this_conf_server === void 0 ? void 0 : _this_conf_server.ssr;
     const forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
-    this.routeRenderHandler = createRenderHandler({
+    return createRenderHandler({
       distDir,
       staticGenerate,
       forceCSR,
       nonce: (_conf_security = conf.security) === null || _conf_security === void 0 ? void 0 : _conf_security.nonce,
       metaName
     });
-    await this.setupBeforeProdMiddleware();
-    this.addHandler(this.setupStaticMiddleware((_this_conf_output = this.conf.output) === null || _this_conf_output === void 0 ? void 0 : _this_conf_output.assetPrefix));
-    this.addHandler(faviconFallbackHandler);
-    this.addHandler(this.routeHandler.bind(this));
-    this.compose();
   }
   // server ready
   onRepack(_) {
@@ -153,9 +158,10 @@ export class ModernServer {
     return handler;
   }
   async prepareAPIHandler(extension) {
+    var _bff, _bff1;
     const { workDir, runner, conf } = this;
     const { bff } = conf;
-    const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
+    const prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
     const webOnly = await isWebOnly();
     if (webOnly && process.env.NODE_ENV === "development") {
       return (req, res) => {
@@ -167,7 +173,7 @@ export class ModernServer {
       pwd: workDir,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-      httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
+      httpMethodDecider: (_bff1 = bff) === null || _bff1 === void 0 ? void 0 : _bff1.httpMethodDecider,
       render: this.render.bind(this)
     }, {
       onLast: () => null
@@ -434,6 +440,7 @@ export class ModernServer {
     context.res.end(createErrorDocument(status, text));
   }
   constructor({ pwd, config, routes, staticGenerate, logger, metrics, runMode, proxyTarget, appContext }) {
+    var _appContext;
     _define_property(this, "pwd", void 0);
     _define_property(this, "distDir", void 0);
     _define_property(this, "workDir", void 0);
@@ -448,13 +455,13 @@ export class ModernServer {
     _define_property(this, "reader", reader);
     _define_property(this, "proxyTarget", void 0);
     _define_property(this, "routeRenderHandler", void 0);
+    _define_property(this, "staticGenerate", void 0);
+    _define_property(this, "metaName", void 0);
     _define_property(this, "loaderHandler", null);
     _define_property(this, "frameWebHandler", null);
     _define_property(this, "frameAPIHandler", null);
     _define_property(this, "proxyHandler", null);
     _define_property(this, "_handler", void 0);
-    _define_property(this, "staticGenerate", void 0);
-    _define_property(this, "metaName", void 0);
     require("ignore-styles");
     this.pwd = pwd;
     this.distDir = path.resolve(pwd, config.output.path || "dist");
@@ -468,6 +475,6 @@ export class ModernServer {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || RUN_MODE.FULL;
-    this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
+    this.metaName = (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.metaName;
   }
 }

package/dist/esm-node/workerServer.js

@@ -69,7 +69,7 @@ export const createHandler = (manifest) => {
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
   return async (options) => {
-    var _page_serverHooks, _page_serverHooks_afterMatch;
+    var _page_serverHooks_afterMatch, _page_serverHooks, _page;
     const { request, loadableStats, routeManifest } = options;
     const url = new URL(request.url);
     const pageMatch = routeMgr.match(url.pathname);
@@ -84,13 +84,13 @@ export const createHandler = (manifest) => {
     const metrics = defaultMetrics;
     const hookContext = createWorkerHookContext(request.url, logger, metrics);
     const afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
-    page === null || page === void 0 ? void 0 : (_page_serverHooks = page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
+    (_page = page) === null || _page === void 0 ? void 0 : (_page_serverHooks = _page.serverHooks) === null || _page_serverHooks === void 0 ? void 0 : (_page_serverHooks_afterMatch = _page_serverHooks.afterMatch) === null || _page_serverHooks_afterMatch === void 0 ? void 0 : _page_serverHooks_afterMatch.call(_page_serverHooks, afterMatchHookContext, () => void 0);
     if (checkIsSent(hookContext)) {
       return new ReturnResponse(hookContext.res.body || "Unkown body", hookContext.res.status, hookContext.res.headers);
     }
     if (page.serverRender) {
       try {
-        var _page_serverHooks1, _page_serverHooks2, _page_serverHooks_afterRender;
+        var _page_serverHooks1, _page_serverHooks_afterRender, _page_serverHooks2;
         const middlewarsHookContext = createMiddlewareContext(hookContext);
         applyMiddlewares(middlewarsHookContext, (_page_serverHooks1 = page.serverHooks) === null || _page_serverHooks1 === void 0 ? void 0 : _page_serverHooks1.middleware);
         if (checkIsSent(hookContext)) {

package/dist/types/index.d.ts

@@ -6,5 +6,6 @@ export { ModernServer } from './server/modernServer';
 export { createProxyHandler } from './libs/proxy';
 export * from './type';
 export * from './constants';
+export { createRenderHandler } from './libs/render';
 declare const _default: (options: ModernServerOptions) => Promise<Server>;
 export default _default;