@modern-js/prod-server 2.35.0 → 2.36.0

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

@@ -17,8 +17,8 @@ var createCacheItem = function() {
       return [
         2,
         {
-          content: content,
-          mtime: mtime
+          content,
+          mtime
         }
       ];
     });
@@ -27,7 +27,7 @@ var createCacheItem = function() {
     return _ref.apply(this, arguments);
   };
 }();
-export var LruReader = /* @__PURE__ */ function() {
+var LruReader = /* @__PURE__ */ function() {
   "use strict";
   function LruReader2() {
     _class_call_check(this, LruReader2);
@@ -67,7 +67,7 @@ export var LruReader = /* @__PURE__ */ function() {
                   return [
                     2,
                     {
-                      content: content
+                      content
                     }
                   ];
                 }
@@ -155,9 +155,9 @@ export var LruReader = /* @__PURE__ */ function() {
   return LruReader2;
 }();
 var reader = new LruReader();
-export var readFile = function() {
+var readFile = function() {
   var _ref = _async_to_generator(function(filepath) {
-    var _file, file;
+    var file;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -169,7 +169,7 @@ export var readFile = function() {
           file = _state.sent();
           return [
             2,
-            (_file = file) === null || _file === void 0 ? void 0 : _file.content
+            file === null || file === void 0 ? void 0 : file.content
           ];
       }
     });
@@ -178,12 +178,19 @@ export var readFile = function() {
     return _ref.apply(this, arguments);
   };
 }();
-export var updateFile = function() {
+var updateFile = function() {
   reader.update();
 };
-export var init = function(fs) {
+var init = function(fs) {
   reader.init(fs);
 };
-export var close = function() {
+var close = function() {
   reader.close();
 };
+export {
+  LruReader,
+  close,
+  init,
+  readFile,
+  updateFile
+};

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

@@ -5,7 +5,7 @@ import { fs, mime, LOADABLE_STATS_FILE, ROUTE_MANIFEST_FILE, SERVER_RENDER_FUNCT
 import cache from "./cache";
 import { createLogger, createMetrics } from "./measure";
 import { injectServerDataStream, injectServerData } from "./utils";
-export var render = function() {
+var render = function() {
   var _ref = _async_to_generator(function(ctx, renderOptions, runner) {
     var _ctx_res, urlPath, bundle, distDir, template, entryName, staticGenerate, _renderOptions_enableUnsafeCtx, enableUnsafeCtx, nonce, bundleJS, loadableUri, loadableStats, routesManifestUri, routeManifest, context, bundleJSContent, serverRender, content, _context_redirection, url, _context_redirection_status, status;
     return _ts_generator(this, function(_state) {
@@ -37,19 +37,19 @@ export var render = function() {
               locals: ((_ctx_res = ctx.res) === null || _ctx_res === void 0 ? void 0 : _ctx_res.locals) || {}
             },
             redirection: {},
-            template: template,
-            loadableStats: loadableStats,
-            routeManifest: routeManifest,
-            entryName: entryName,
-            staticGenerate: staticGenerate,
+            template,
+            loadableStats,
+            routeManifest,
+            entryName,
+            staticGenerate,
             logger: void 0,
             metrics: void 0,
             reporter: ctx.reporter,
             serverTiming: ctx.serverTiming,
             req: ctx.req,
             res: ctx.res,
-            enableUnsafeCtx: enableUnsafeCtx,
-            nonce: nonce
+            enableUnsafeCtx,
+            nonce
           };
           context.logger = createLogger(context, ctx.logger);
           context.metrics = createMetrics(context, ctx.metrics);
@@ -107,3 +107,6 @@ export var render = function() {
     return _ref.apply(this, arguments);
   };
 }();
+export {
+  render
+};

package/dist/esm/libs/render/static.js

@@ -3,7 +3,7 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { mime } from "@modern-js/utils";
 import { readFile } from "./reader";
-export function handleDirectory(ctx, entryPath, urlPath) {
+function handleDirectory(ctx, entryPath, urlPath) {
   return _handleDirectory.apply(this, arguments);
 }
 function _handleDirectory() {
@@ -80,7 +80,7 @@ function _handleDirectory() {
           return [
             2,
             {
-              content: content,
+              content,
               contentType: contentType || ""
             }
           ];
@@ -95,3 +95,6 @@ var trimLeft = function(str, prefix) {
   }
   return str;
 };
+export {
+  handleDirectory
+};

package/dist/esm/libs/render/type.js

@@ -1,6 +1,9 @@
-export var RenderLevel;
+var RenderLevel;
 (function(RenderLevel2) {
   RenderLevel2[RenderLevel2["CLIENT_RENDER"] = 0] = "CLIENT_RENDER";
   RenderLevel2[RenderLevel2["SERVER_PREFETCH"] = 1] = "SERVER_PREFETCH";
   RenderLevel2[RenderLevel2["SERVER_RENDER"] = 2] = "SERVER_RENDER";
 })(RenderLevel || (RenderLevel = {}));
+export {
+  RenderLevel
+};

package/dist/esm/libs/render/utils.js

@@ -1,12 +1,16 @@
 import { TemplateAPI } from "../hook-api/template";
 import { templateInjectableStream } from "../hook-api/templateForStream";
-export var injectServerData = function(content, context) {
+var injectServerData = function(content, context) {
   var template = new TemplateAPI(content);
   template.prependHead('<script type="application/json" id="__MODERN_SERVER_DATA__">'.concat(JSON.stringify(context.serverData), "</script>"));
   return template.get();
 };
-export var injectServerDataStream = function(content, context) {
+var injectServerDataStream = function(content, context) {
   return content.pipe(templateInjectableStream({
     prependHead: '<script type="application/json" id="__MODERN_SERVER_DATA__">'.concat(JSON.stringify(context.serverData), "</script>")
   }));
 };
+export {
+  injectServerData,
+  injectServerDataStream
+};

package/dist/esm/libs/reporter.js

@@ -1,4 +1,4 @@
-export var defaultReporter = {
+var defaultReporter = {
   init: function init() {
   },
   reportError: function reportError() {
@@ -10,3 +10,6 @@ export var defaultReporter = {
   reportWarn: function reportWarn() {
   }
 };
+export {
+  defaultReporter
+};

package/dist/esm/libs/route/index.js

@@ -2,7 +2,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { RouteMatcher } from "./matcher";
-export var RouteMatchManager = /* @__PURE__ */ function() {
+var RouteMatchManager = /* @__PURE__ */ function() {
   "use strict";
   function RouteMatchManager2() {
     _class_call_check(this, RouteMatchManager2);
@@ -110,4 +110,7 @@ export var RouteMatchManager = /* @__PURE__ */ function() {
   ]);
   return RouteMatchManager2;
 }();
-export { RouteMatcher };
+export {
+  RouteMatchManager,
+  RouteMatcher
+};

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

@@ -19,7 +19,7 @@ var toPath = function(reg, params) {
   return fn(params);
 };
 var regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-export var RouteMatcher = /* @__PURE__ */ function() {
+var RouteMatcher = /* @__PURE__ */ function() {
   "use strict";
   function RouteMatcher2(spec) {
     _class_call_check(this, RouteMatcher2);
@@ -65,9 +65,9 @@ export var RouteMatcher = /* @__PURE__ */ function() {
           if (!this.urlReg) {
             return this.urlPath.length;
           } else {
-            var _result_, _result;
+            var _result_;
             var result = this.urlReg.exec(pathname);
-            return ((_result = result) === null || _result === void 0 ? void 0 : (_result_ = _result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
+            return (result === null || result === void 0 ? void 0 : (_result_ = result[0]) === null || _result_ === void 0 ? void 0 : _result_.length) || null;
           }
         }
       )
@@ -123,3 +123,6 @@ export var RouteMatcher = /* @__PURE__ */ function() {
   ]);
   return RouteMatcher2;
 }();
+export {
+  RouteMatcher
+};

package/dist/esm/libs/route/route.js

@@ -1,6 +1,6 @@
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-export var ModernRoute = function ModernRoute2(routeSpec) {
+var ModernRoute = function ModernRoute2(routeSpec) {
   "use strict";
   _class_call_check(this, ModernRoute2);
   _define_property(this, "entryName", void 0);
@@ -21,3 +21,6 @@ export var ModernRoute = function ModernRoute2(routeSpec) {
   this.bundle = routeSpec.bundle || "";
   this.responseHeaders = routeSpec.responseHeaders;
 };
+export {
+  ModernRoute
+};

package/dist/esm/libs/serveFile.js

@@ -14,7 +14,7 @@ var removedPrefix = function(req, prefix) {
     };
   }
 };
-export var faviconFallbackHandler = function(context, next) {
+var faviconFallbackHandler = function(context, next) {
   if (context.url === "/favicon.ico") {
     context.res.statusCode = 204;
     context.res.end();
@@ -22,7 +22,7 @@ export var faviconFallbackHandler = function(context, next) {
     next();
   }
 };
-export var createStaticFileHandler = function(rules) {
+var createStaticFileHandler = function(rules) {
   var assetPrefix = arguments.length > 1 && arguments[1] !== void 0 ? arguments[1] : "/";
   return function() {
     var _ref = (
@@ -62,3 +62,7 @@ export var createStaticFileHandler = function(rules) {
     };
   }();
 };
+export {
+  createStaticFileHandler,
+  faviconFallbackHandler
+};

package/dist/esm/libs/serverTiming.js

@@ -2,7 +2,7 @@ import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 var SERVER_TIMING = "Server-Timing";
-export var ServerTiming = /* @__PURE__ */ function() {
+var ServerTiming = /* @__PURE__ */ function() {
   "use strict";
   function ServerTiming2(res, meta) {
     _class_call_check(this, ServerTiming2);
@@ -25,3 +25,6 @@ export var ServerTiming = /* @__PURE__ */ function() {
   ]);
   return ServerTiming2;
 }();
+export {
+  ServerTiming
+};

package/dist/esm/renderHtml.js

@@ -1,3 +1,7 @@
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __commonJS = (cb, mod) => function __require() {
+  return mod || (0, cb[__getOwnPropNames(cb)[0]])((mod = { exports: {} }).exports, mod), mod.exports;
+};
 import { _ as _assert_this_initialized } from "@swc/helpers/_/_assert_this_initialized";
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
@@ -11,131 +15,136 @@ import { Readable } from "stream";
 import { Socket } from "net";
 import { Server } from "./server";
 import { isRedirect } from "./utils";
-var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
-  "use strict";
-  _inherits(IncomingMessageLike2, Readable2);
-  var _super = _create_super(IncomingMessageLike2);
-  function IncomingMessageLike2(param) {
-    var method = param.method, url = param.url, headers = param.headers;
-    _class_call_check(this, IncomingMessageLike2);
-    var _this;
-    _this = _super.call(this);
-    _define_property(_assert_this_initialized(_this), "headers", void 0);
-    _define_property(_assert_this_initialized(_this), "method", void 0);
-    _define_property(_assert_this_initialized(_this), "url", void 0);
-    _define_property(_assert_this_initialized(_this), "socket", void 0);
-    _this.socket = new Socket();
-    _this.headers = headers || {};
-    _this.headers.host = "localhost:8080";
-    _this.method = method || "get";
-    _this.url = url;
-    return _this;
-  }
-  return IncomingMessageLike2;
-}(Readable);
-var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
-  "use strict";
-  _inherits(ServerResponseLike2, OutgoingMessage2);
-  var _super = _create_super(ServerResponseLike2);
-  function ServerResponseLike2() {
-    _class_call_check(this, ServerResponseLike2);
-    var _this;
-    _this = _super.call(this);
-    _define_property(_assert_this_initialized(_this), "statusCode", void 0);
-    _define_property(_assert_this_initialized(_this), "data", void 0);
-    _this.statusCode = 200;
-    _this.data = [];
-    return _this;
-  }
-  _create_class(ServerResponseLike2, [
-    {
-      key: "end",
-      value: function end(chunk, _encoding, cb) {
-        this.data.push(chunk.toString());
-        cb && cb();
-        this.emit("finish");
-        return this;
+var require_renderHtml = __commonJS({
+  "src/renderHtml.ts"(exports, module) {
+    var IncomingMessageLike = /* @__PURE__ */ function(Readable2) {
+      "use strict";
+      _inherits(IncomingMessageLike2, Readable2);
+      var _super = _create_super(IncomingMessageLike2);
+      function IncomingMessageLike2(param) {
+        var method = param.method, url = param.url, headers = param.headers;
+        _class_call_check(this, IncomingMessageLike2);
+        var _this;
+        _this = _super.call(this);
+        _define_property(_assert_this_initialized(_this), "headers", void 0);
+        _define_property(_assert_this_initialized(_this), "method", void 0);
+        _define_property(_assert_this_initialized(_this), "url", void 0);
+        _define_property(_assert_this_initialized(_this), "socket", void 0);
+        _this.socket = new Socket();
+        _this.headers = headers || {};
+        _this.headers.host = "localhost:8080";
+        _this.method = method || "get";
+        _this.url = url;
+        return _this;
       }
-    }
-  ]);
-  return ServerResponseLike2;
-}(OutgoingMessage);
-var CustomServer = /* @__PURE__ */ function(Server2) {
-  "use strict";
-  _inherits(CustomServer2, Server2);
-  var _super = _create_super(CustomServer2);
-  function CustomServer2() {
-    _class_call_check(this, CustomServer2);
-    return _super.apply(this, arguments);
-  }
-  _create_class(CustomServer2, [
-    {
-      key: "render",
-      value: function render(req, res, _url) {
-        var _this = this;
-        return _async_to_generator(function() {
-          var handler;
-          return _ts_generator(this, function(_state) {
-            handler = _this.getRequestHandler();
-            handler(req, res);
-            return [
-              2,
-              null
-            ];
-          });
-        })();
+      return IncomingMessageLike2;
+    }(Readable);
+    var ServerResponseLike = /* @__PURE__ */ function(OutgoingMessage2) {
+      "use strict";
+      _inherits(ServerResponseLike2, OutgoingMessage2);
+      var _super = _create_super(ServerResponseLike2);
+      function ServerResponseLike2() {
+        _class_call_check(this, ServerResponseLike2);
+        var _this;
+        _this = _super.call(this);
+        _define_property(_assert_this_initialized(_this), "statusCode", void 0);
+        _define_property(_assert_this_initialized(_this), "data", void 0);
+        _this.statusCode = 200;
+        _this.data = [];
+        return _this;
       }
-    }
-  ]);
-  return CustomServer2;
-}(Server);
-function renderHtml(_) {
-  return _renderHtml.apply(this, arguments);
-}
-function _renderHtml() {
-  _renderHtml = _async_to_generator(function(param) {
-    var url, method, headers, body, serverOptions, req, res, customServer;
-    return _ts_generator(this, function(_state) {
-      switch (_state.label) {
-        case 0:
-          url = param.url, method = param.method, headers = param.headers, body = param.body, serverOptions = param.serverOptions;
-          req = new IncomingMessageLike({
-            method: method,
-            url: url,
-            headers: headers
-          });
-          if (body) {
-            req.push(body);
-            req.push(null);
+      _create_class(ServerResponseLike2, [
+        {
+          key: "end",
+          value: function end(chunk, _encoding, cb) {
+            this.data.push(chunk.toString());
+            cb && cb();
+            this.emit("finish");
+            return this;
           }
-          res = new ServerResponseLike();
-          customServer = new CustomServer(serverOptions);
-          return [
-            4,
-            customServer.init({
-              disableHttpServer: true
-            })
-          ];
-        case 1:
-          _state.sent();
-          customServer.render(req, res);
-          return [
-            2,
-            new Promise(function(resolve) {
-              res.addListener("finish", function() {
-                resolve({
-                  headers: res.getHeaders(),
-                  redirected: isRedirect(res.statusCode),
-                  status: res.statusCode,
-                  url: url,
-                  body: res.data.join()
-                });
-              });
-            })
-          ];
+        }
+      ]);
+      return ServerResponseLike2;
+    }(OutgoingMessage);
+    var CustomServer = /* @__PURE__ */ function(Server2) {
+      "use strict";
+      _inherits(CustomServer2, Server2);
+      var _super = _create_super(CustomServer2);
+      function CustomServer2() {
+        _class_call_check(this, CustomServer2);
+        return _super.apply(this, arguments);
       }
-    });
-  });
-  return _renderHtml.apply(this, arguments);
-}
-module.exports = renderHtml;
+      _create_class(CustomServer2, [
+        {
+          key: "render",
+          value: function render(req, res, _url) {
+            var _this = this;
+            return _async_to_generator(function() {
+              var handler;
+              return _ts_generator(this, function(_state) {
+                handler = _this.getRequestHandler();
+                handler(req, res);
+                return [
+                  2,
+                  null
+                ];
+              });
+            })();
+          }
+        }
+      ]);
+      return CustomServer2;
+    }(Server);
+    function renderHtml(_) {
+      return _renderHtml.apply(this, arguments);
+    }
+    function _renderHtml() {
+      _renderHtml = _async_to_generator(function(param) {
+        var url, method, headers, body, serverOptions, req, res, customServer;
+        return _ts_generator(this, function(_state) {
+          switch (_state.label) {
+            case 0:
+              url = param.url, method = param.method, headers = param.headers, body = param.body, serverOptions = param.serverOptions;
+              req = new IncomingMessageLike({
+                method,
+                url,
+                headers
+              });
+              if (body) {
+                req.push(body);
+                req.push(null);
+              }
+              res = new ServerResponseLike();
+              customServer = new CustomServer(serverOptions);
+              return [
+                4,
+                customServer.init({
+                  disableHttpServer: true
+                })
+              ];
+            case 1:
+              _state.sent();
+              customServer.render(req, res);
+              return [
+                2,
+                new Promise(function(resolve) {
+                  res.addListener("finish", function() {
+                    resolve({
+                      headers: res.getHeaders(),
+                      redirected: isRedirect(res.statusCode),
+                      status: res.statusCode,
+                      url,
+                      body: res.data.join()
+                    });
+                  });
+                })
+              ];
+          }
+        });
+      });
+      return _renderHtml.apply(this, arguments);
+    }
+    module.exports = renderHtml;
+  }
+});
+export default require_renderHtml();

package/dist/esm/server/index.js

@@ -7,13 +7,13 @@ import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS } from "@modern-js/utils";
+import { fs, createLogger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS, ensureAbsolutePath } from "@modern-js/utils";
 import { serverManager, AppContext, ConfigContext, loadPlugins } from "@modern-js/server-core";
 import { metrics as defaultMetrics } from "../libs/metrics";
 import { loadConfig, getServerConfigPath, requireConfig } from "../libs/loadConfig";
 import { debug } from "../utils";
 import { createProdServer } from "./modernServerSplit";
-export var Server = /* @__PURE__ */ function() {
+var Server = /* @__PURE__ */ function() {
   "use strict";
   function Server2(options) {
     _class_call_check(this, Server2);
@@ -23,7 +23,7 @@ export var Server = /* @__PURE__ */ function() {
     _define_property(this, "app", void 0);
     _define_property(this, "runner", void 0);
     _define_property(this, "serverConfig", void 0);
-    options.logger = options.logger || new Logger({
+    options.logger = options.logger || createLogger({
       level: "warn"
     });
     options.metrics = options.metrics || defaultMetrics;
@@ -198,11 +198,11 @@ export var Server = /* @__PURE__ */ function() {
               pwd = options.pwd, config = options.config;
               serverConfig = _this.serverConfig;
               finalServerConfig = _this.runConfigHook(runner, serverConfig);
-              resolvedConfigPath = path.join(pwd, config.output.path || "dist", OUTPUT_CONFIG_FILE);
+              resolvedConfigPath = ensureAbsolutePath(pwd, path.join(config.output.path || "dist", OUTPUT_CONFIG_FILE));
               options.config = loadConfig({
                 cliConfig: config,
                 serverConfig: finalServerConfig,
-                resolvedConfigPath: resolvedConfigPath
+                resolvedConfigPath
               });
               return [
                 2
@@ -230,8 +230,7 @@ export var Server = /* @__PURE__ */ function() {
       key: "listen",
       value: function listen(options, listener) {
         var callback = function() {
-          var _listener;
-          (_listener = listener) === null || _listener === void 0 ? void 0 : _listener();
+          listener === null || listener === void 0 ? void 0 : listener();
         };
         if (typeof options === "object") {
           if (process.env.PORT) {
@@ -283,7 +282,7 @@ export var Server = /* @__PURE__ */ function() {
                 _options_internalPlugins = options.internalPlugins, internalPlugins = _options_internalPlugins === void 0 ? INTERNAL_SERVER_PLUGINS : _options_internalPlugins, pwd = options.pwd, _options_plugins = options.plugins, plugins = _options_plugins === void 0 ? [] : _options_plugins;
                 serverPlugins = _this.serverConfig.plugins || [];
                 loadedPlugins = loadPlugins(pwd, _to_consumable_array(serverPlugins).concat(_to_consumable_array(plugins)), {
-                  internalPlugins: internalPlugins
+                  internalPlugins
                 });
                 debug("plugins", loadedPlugins);
                 loadedPlugins.forEach(function(p) {
@@ -327,7 +326,6 @@ 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) {
@@ -336,10 +334,10 @@ export var Server = /* @__PURE__ */ function() {
           };
         });
         return {
-          appDirectory: appDirectory,
-          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),
+          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),
           distDirectory: path.join(appDirectory, config.output.path || "dist"),
           plugins: serverPlugins
         };
@@ -413,3 +411,6 @@ export var Server = /* @__PURE__ */ function() {
   ]);
   return Server2;
 }();
+export {
+  Server
+};