@modern-js/prod-server 2.35.1 → 2.36.0

package/dist/cjs/libs/route/route.js

@@ -1,25 +1,38 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ModernRoute", {
-  enumerable: true,
-  get: function() {
-    return ModernRoute;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var route_exports = {};
+__export(route_exports, {
+  ModernRoute: () => ModernRoute
 });
-const _define_property = require("@swc/helpers/_/_define_property");
+module.exports = __toCommonJS(route_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
 class ModernRoute {
   constructor(routeSpec) {
-    _define_property._(this, "entryName", void 0);
-    _define_property._(this, "urlPath", void 0);
-    _define_property._(this, "entryPath", void 0);
-    _define_property._(this, "bundle", void 0);
-    _define_property._(this, "isApi", void 0);
-    _define_property._(this, "isSSR", void 0);
-    _define_property._(this, "isSPA", void 0);
-    _define_property._(this, "params", {});
-    _define_property._(this, "responseHeaders", void 0);
+    (0, import_define_property._)(this, "entryName", void 0);
+    (0, import_define_property._)(this, "urlPath", void 0);
+    (0, import_define_property._)(this, "entryPath", void 0);
+    (0, import_define_property._)(this, "bundle", void 0);
+    (0, import_define_property._)(this, "isApi", void 0);
+    (0, import_define_property._)(this, "isSSR", void 0);
+    (0, import_define_property._)(this, "isSPA", void 0);
+    (0, import_define_property._)(this, "params", {});
+    (0, import_define_property._)(this, "responseHeaders", void 0);
     this.entryName = routeSpec.entryName || "";
     this.urlPath = routeSpec.urlPath;
     this.entryPath = routeSpec.entryPath || "";
@@ -30,3 +43,7 @@ class ModernRoute {
     this.responseHeaders = routeSpec.responseHeaders;
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ModernRoute
+});

package/dist/cjs/libs/serveFile.js

@@ -1,25 +1,39 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
   for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  faviconFallbackHandler: function() {
-    return faviconFallbackHandler;
-  },
-  createStaticFileHandler: function() {
-    return createStaticFileHandler;
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serveFile_exports = {};
+__export(serveFile_exports, {
+  createStaticFileHandler: () => createStaticFileHandler,
+  faviconFallbackHandler: () => faviconFallbackHandler
 });
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _servestatic = /* @__PURE__ */ _interop_require_default._(require("serve-static"));
-const _utils = require("@modern-js/utils");
+module.exports = __toCommonJS(serveFile_exports);
+var import_serve_static = __toESM(require("serve-static"));
+var import_utils = require("@modern-js/utils");
 const removedPrefix = (req, prefix) => {
   const useLocalPrefix = !prefix.includes(".");
   if (useLocalPrefix) {
@@ -45,16 +59,16 @@ const createStaticFileHandler = (rules, assetPrefix = "/") => (
   async (context, next) => {
     const { url: requestUrl, req, res } = context;
     const hitRule = rules.find((item) => {
-      if ((0, _utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
+      if ((0, import_utils.isString)(item.path) && requestUrl.startsWith(item.path)) {
         return true;
-      } else if ((0, _utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
+      } else if ((0, import_utils.isRegExp)(item.path) && item.path.test(requestUrl)) {
         return true;
       }
       return false;
     });
     if (hitRule) {
       const resume = removedPrefix(req, assetPrefix);
-      (0, _servestatic.default)(hitRule.target)(req, res, () => {
+      (0, import_serve_static.default)(hitRule.target)(req, res, () => {
         resume();
         next();
       });
@@ -63,3 +77,8 @@ const createStaticFileHandler = (rules, assetPrefix = "/") => (
     }
   }
 );
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  createStaticFileHandler,
+  faviconFallbackHandler
+});

package/dist/cjs/libs/serverTiming.js

@@ -1,14 +1,27 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "ServerTiming", {
-  enumerable: true,
-  get: function() {
-    return ServerTiming;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var serverTiming_exports = {};
+__export(serverTiming_exports, {
+  ServerTiming: () => ServerTiming
 });
-const _define_property = require("@swc/helpers/_/_define_property");
+module.exports = __toCommonJS(serverTiming_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
 const SERVER_TIMING = "Server-Timing";
 class ServerTiming {
   addServeTiming(name, dur, desc) {
@@ -19,9 +32,13 @@ class ServerTiming {
     return this;
   }
   constructor(res, meta) {
-    _define_property._(this, "meta", void 0);
-    _define_property._(this, "res", void 0);
+    (0, import_define_property._)(this, "meta", void 0);
+    (0, import_define_property._)(this, "res", void 0);
     this.meta = meta;
     this.res = res;
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  ServerTiming
+});

package/dist/cjs/renderHtml.js

@@ -1,28 +1,25 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-const _define_property = require("@swc/helpers/_/_define_property");
-const _http = require("http");
-const _stream = require("stream");
-const _net = require("net");
-const _server = require("./server");
-const _utils = require("./utils");
-class IncomingMessageLike extends _stream.Readable {
+var import_define_property = require("@swc/helpers/_/_define_property");
+var import_http = require("http");
+var import_stream = require("stream");
+var import_net = require("net");
+var import_server = require("./server");
+var import_utils = require("./utils");
+class IncomingMessageLike extends import_stream.Readable {
   constructor({ method, url, headers }) {
     super();
-    _define_property._(this, "headers", void 0);
-    _define_property._(this, "method", void 0);
-    _define_property._(this, "url", void 0);
-    _define_property._(this, "socket", void 0);
-    this.socket = new _net.Socket();
+    (0, import_define_property._)(this, "headers", void 0);
+    (0, import_define_property._)(this, "method", void 0);
+    (0, import_define_property._)(this, "url", void 0);
+    (0, import_define_property._)(this, "socket", void 0);
+    this.socket = new import_net.Socket();
     this.headers = headers || {};
     this.headers.host = "localhost:8080";
     this.method = method || "get";
     this.url = url;
   }
 }
-class ServerResponseLike extends _http.OutgoingMessage {
+class ServerResponseLike extends import_http.OutgoingMessage {
   end(chunk, _encoding, cb) {
     this.data.push(chunk.toString());
     cb && cb();
@@ -31,13 +28,13 @@ class ServerResponseLike extends _http.OutgoingMessage {
   }
   constructor() {
     super();
-    _define_property._(this, "statusCode", void 0);
-    _define_property._(this, "data", void 0);
+    (0, import_define_property._)(this, "statusCode", void 0);
+    (0, import_define_property._)(this, "data", void 0);
     this.statusCode = 200;
     this.data = [];
   }
 }
-class CustomServer extends _server.Server {
+class CustomServer extends import_server.Server {
   async render(req, res, _url) {
     const handler = this.getRequestHandler();
     handler(req, res);
@@ -64,7 +61,7 @@ async function renderHtml({ url, method, headers, body, serverOptions }) {
     res.addListener("finish", () => {
       resolve({
         headers: res.getHeaders(),
-        redirected: (0, _utils.isRedirect)(res.statusCode),
+        redirected: (0, import_utils.isRedirect)(res.statusCode),
         status: res.statusCode,
         url,
         body: res.data.join()

package/dist/cjs/server/index.js

@@ -1,22 +1,44 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-Object.defineProperty(exports, "Server", {
-  enumerable: true,
-  get: function() {
-    return Server;
+var __create = Object.create;
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __getProtoOf = Object.getPrototypeOf;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
   }
+  return to;
+};
+var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__getProtoOf(mod)) : {}, __copyProps(
+  // If the importer is in node compatibility mode or this is not an ESM
+  // file that has been converted to a CommonJS file using a Babel-
+  // compatible transform (i.e. "__esModule" has not been set), then set
+  // "default" to the CommonJS "module.exports" for node compatibility.
+  isNodeMode || !mod || !mod.__esModule ? __defProp(target, "default", { value: mod, enumerable: true }) : target,
+  mod
+));
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+var server_exports = {};
+__export(server_exports, {
+  Server: () => Server
 });
-const _define_property = require("@swc/helpers/_/_define_property");
-const _interop_require_default = require("@swc/helpers/_/_interop_require_default");
-const _path = /* @__PURE__ */ _interop_require_default._(require("path"));
-const _utils = require("@modern-js/utils");
-const _servercore = require("@modern-js/server-core");
-const _metrics = require("../libs/metrics");
-const _loadConfig = require("../libs/loadConfig");
-const _utils1 = require("../utils");
-const _modernServerSplit = require("./modernServerSplit");
+module.exports = __toCommonJS(server_exports);
+var import_define_property = require("@swc/helpers/_/_define_property");
+var import_path = __toESM(require("path"));
+var import_utils = require("@modern-js/utils");
+var import_server_core = require("@modern-js/server-core");
+var import_metrics = require("../libs/metrics");
+var import_loadConfig = require("../libs/loadConfig");
+var import_utils2 = require("../utils");
+var import_modernServerSplit = require("./modernServerSplit");
 class Server {
   /**
   * 初始化顺序
@@ -78,9 +100,9 @@ class Server {
   }
   initServerConfig(options) {
     const { pwd, serverConfigFile } = options;
-    const distDirectory = _path.default.join(pwd, options.config.output.path || "dist");
-    const serverConfigPath = (0, _loadConfig.getServerConfigPath)(distDirectory, serverConfigFile);
-    const serverConfig = (0, _loadConfig.requireConfig)(serverConfigPath);
+    const distDirectory = import_path.default.join(pwd, options.config.output.path || "dist");
+    const serverConfigPath = (0, import_loadConfig.getServerConfigPath)(distDirectory, serverConfigFile);
+    const serverConfig = (0, import_loadConfig.requireConfig)(serverConfigPath);
     this.serverConfig = serverConfig;
   }
   /**
@@ -91,8 +113,8 @@ class Server {
     const { pwd, config } = options;
     const { serverConfig } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = (0, _utils.ensureAbsolutePath)(pwd, _path.default.join(config.output.path || "dist", _utils.OUTPUT_CONFIG_FILE));
-    options.config = (0, _loadConfig.loadConfig)({
+    const resolvedConfigPath = (0, import_utils.ensureAbsolutePath)(pwd, import_path.default.join(config.output.path || "dist", import_utils.OUTPUT_CONFIG_FILE));
+    options.config = (0, import_loadConfig.loadConfig)({
       cliConfig: config,
       serverConfig: finalServerConfig,
       resolvedConfigPath
@@ -126,30 +148,30 @@ class Server {
     return this.server.render(req, res, url);
   }
   async createHookRunner() {
-    _servercore.serverManager.clear();
+    import_server_core.serverManager.clear();
     const { options } = this;
-    const { internalPlugins = _utils.INTERNAL_SERVER_PLUGINS, pwd, plugins = [] } = options;
+    const { internalPlugins = import_utils.INTERNAL_SERVER_PLUGINS, pwd, plugins = [] } = options;
     const serverPlugins = this.serverConfig.plugins || [];
-    const loadedPlugins = (0, _servercore.loadPlugins)(pwd, [
+    const loadedPlugins = (0, import_server_core.loadPlugins)(pwd, [
       ...serverPlugins,
       ...plugins
     ], {
       internalPlugins
     });
-    (0, _utils1.debug)("plugins", loadedPlugins);
+    (0, import_utils2.debug)("plugins", loadedPlugins);
     loadedPlugins.forEach((p) => {
-      _servercore.serverManager.usePlugin(p);
+      import_server_core.serverManager.usePlugin(p);
     });
-    const hooksRunner = await _servercore.serverManager.init();
+    const hooksRunner = await import_server_core.serverManager.init();
     return hooksRunner;
   }
   async injectContext(runner, options) {
     const appContext = this.initAppContext();
     const { config, pwd } = options;
-    _servercore.ConfigContext.set(config);
-    _servercore.AppContext.set({
+    import_server_core.ConfigContext.set(config);
+    import_server_core.AppContext.set({
       ...appContext,
-      distDirectory: _path.default.join(pwd, config.output.path || "dist")
+      distDirectory: import_path.default.join(pwd, config.output.path || "dist")
     });
   }
   initAppContext() {
@@ -162,40 +184,44 @@ class Server {
       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.default.resolve(appDirectory, _utils.SHARED_DIR),
-      distDirectory: _path.default.join(appDirectory, config.output.path || "dist"),
+      sharedDirectory: (appContext === null || appContext === void 0 ? void 0 : appContext.sharedDirectory) || import_path.default.resolve(appDirectory, import_utils.SHARED_DIR),
+      distDirectory: import_path.default.join(appDirectory, config.output.path || "dist"),
       plugins: serverPlugins
     };
   }
   async loadServerEnv(options) {
     const { pwd: appDirectory } = options;
     const serverEnv = process.env.MODERN_ENV;
-    const defaultEnvPath = _path.default.resolve(appDirectory, `.env`);
-    const serverEnvPath = _path.default.resolve(appDirectory, `.env.${serverEnv}`);
+    const defaultEnvPath = import_path.default.resolve(appDirectory, `.env`);
+    const serverEnvPath = import_path.default.resolve(appDirectory, `.env.${serverEnv}`);
     for (const envPath of [
       serverEnvPath,
       defaultEnvPath
     ]) {
-      if (await _utils.fs.pathExists(envPath) && !(await _utils.fs.stat(envPath)).isDirectory()) {
-        const envConfig = _utils.dotenv.config({
+      if (await import_utils.fs.pathExists(envPath) && !(await import_utils.fs.stat(envPath)).isDirectory()) {
+        const envConfig = import_utils.dotenv.config({
           path: envPath
         });
-        (0, _utils.dotenvExpand)(envConfig);
+        (0, import_utils.dotenvExpand)(envConfig);
       }
     }
   }
   constructor(options) {
-    _define_property._(this, "options", void 0);
-    _define_property._(this, "serverImpl", _modernServerSplit.createProdServer);
-    _define_property._(this, "server", void 0);
-    _define_property._(this, "app", void 0);
-    _define_property._(this, "runner", void 0);
-    _define_property._(this, "serverConfig", void 0);
-    options.logger = options.logger || new _utils.Logger({
+    (0, import_define_property._)(this, "options", void 0);
+    (0, import_define_property._)(this, "serverImpl", import_modernServerSplit.createProdServer);
+    (0, import_define_property._)(this, "server", void 0);
+    (0, import_define_property._)(this, "app", void 0);
+    (0, import_define_property._)(this, "runner", void 0);
+    (0, import_define_property._)(this, "serverConfig", void 0);
+    options.logger = options.logger || (0, import_utils.createLogger)({
       level: "warn"
     });
-    options.metrics = options.metrics || _metrics.metrics;
+    options.metrics = options.metrics || import_metrics.metrics;
     this.options = options;
     this.serverConfig = {};
   }
 }
+// Annotate the CommonJS export names for ESM import in node:
+0 && (module.exports = {
+  Server
+});