@modern-js/prod-server 2.35.1 → 2.36.0

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

@@ -15,7 +15,7 @@ const toPath = (reg, params) => {
   return fn(params);
 };
 const regCharsDetector = /[^a-zA-Z\-_0-9\/\.]/;
-export class RouteMatcher {
+class RouteMatcher {
   // generate modern route object
   generate(url) {
     const route = new ModernRoute(this.spec);
@@ -88,3 +88,6 @@ export class RouteMatcher {
     this.setupUrlPath();
   }
 }
+export {
+  RouteMatcher
+};

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

@@ -1,5 +1,5 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
-export class ModernRoute {
+class ModernRoute {
   constructor(routeSpec) {
     _define_property(this, "entryName", void 0);
     _define_property(this, "urlPath", void 0);
@@ -20,3 +20,6 @@ export class ModernRoute {
     this.responseHeaders = routeSpec.responseHeaders;
   }
 }
+export {
+  ModernRoute
+};

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

@@ -12,7 +12,7 @@ const removedPrefix = (req, prefix) => {
     };
   }
 };
-export const faviconFallbackHandler = (context, next) => {
+const faviconFallbackHandler = (context, next) => {
   if (context.url === "/favicon.ico") {
     context.res.statusCode = 204;
     context.res.end();
@@ -20,7 +20,7 @@ export const faviconFallbackHandler = (context, next) => {
     next();
   }
 };
-export const createStaticFileHandler = (rules, assetPrefix = "/") => (
+const createStaticFileHandler = (rules, assetPrefix = "/") => (
   // eslint-disable-next-line consistent-return
   async (context, next) => {
     const { url: requestUrl, req, res } = context;
@@ -43,3 +43,7 @@ export const createStaticFileHandler = (rules, assetPrefix = "/") => (
     }
   }
 );
+export {
+  createStaticFileHandler,
+  faviconFallbackHandler
+};

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

@@ -1,6 +1,6 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 const SERVER_TIMING = "Server-Timing";
-export class ServerTiming {
+class ServerTiming {
   addServeTiming(name, dur, desc) {
     const _name = `bd-${this.meta}-${name}`;
     const serverTiming = this.res.getHeader(SERVER_TIMING) || this.res.getHeader(SERVER_TIMING.toLocaleLowerCase());
@@ -15,3 +15,6 @@ export class ServerTiming {
     this.res = res;
   }
 }
+export {
+  ServerTiming
+};

package/dist/esm-node/renderHtml.js

@@ -1,71 +1,80 @@
+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 _define_property } from "@swc/helpers/_/_define_property";
 import { OutgoingMessage } from "http";
 import { Readable } from "stream";
 import { Socket } from "net";
 import { Server } from "./server";
 import { isRedirect } from "./utils";
-class IncomingMessageLike extends 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 Socket();
-    this.headers = headers || {};
-    this.headers.host = "localhost:8080";
-    this.method = method || "get";
-    this.url = url;
-  }
-}
-class ServerResponseLike extends OutgoingMessage {
-  end(chunk, _encoding, cb) {
-    this.data.push(chunk.toString());
-    cb && cb();
-    this.emit("finish");
-    return this;
-  }
-  constructor() {
-    super();
-    _define_property(this, "statusCode", void 0);
-    _define_property(this, "data", void 0);
-    this.statusCode = 200;
-    this.data = [];
-  }
-}
-class CustomServer extends Server {
-  async render(req, res, _url) {
-    const handler = this.getRequestHandler();
-    handler(req, res);
-    return null;
-  }
-}
-async function renderHtml({ url, method, headers, body, serverOptions }) {
-  const req = new IncomingMessageLike({
-    method,
-    url,
-    headers
-  });
-  if (body) {
-    req.push(body);
-    req.push(null);
-  }
-  const res = new ServerResponseLike();
-  const customServer = new CustomServer(serverOptions);
-  await customServer.init({
-    disableHttpServer: true
-  });
-  customServer.render(req, res);
-  return new Promise((resolve) => {
-    res.addListener("finish", () => {
-      resolve({
-        headers: res.getHeaders(),
-        redirected: isRedirect(res.statusCode),
-        status: res.statusCode,
+var require_renderHtml = __commonJS({
+  "src/renderHtml.ts"(exports, module) {
+    class IncomingMessageLike extends 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 Socket();
+        this.headers = headers || {};
+        this.headers.host = "localhost:8080";
+        this.method = method || "get";
+        this.url = url;
+      }
+    }
+    class ServerResponseLike extends OutgoingMessage {
+      end(chunk, _encoding, cb) {
+        this.data.push(chunk.toString());
+        cb && cb();
+        this.emit("finish");
+        return this;
+      }
+      constructor() {
+        super();
+        _define_property(this, "statusCode", void 0);
+        _define_property(this, "data", void 0);
+        this.statusCode = 200;
+        this.data = [];
+      }
+    }
+    class CustomServer extends Server {
+      async render(req, res, _url) {
+        const handler = this.getRequestHandler();
+        handler(req, res);
+        return null;
+      }
+    }
+    async function renderHtml({ url, method, headers, body, serverOptions }) {
+      const req = new IncomingMessageLike({
+        method,
         url,
-        body: res.data.join()
+        headers
+      });
+      if (body) {
+        req.push(body);
+        req.push(null);
+      }
+      const res = new ServerResponseLike();
+      const customServer = new CustomServer(serverOptions);
+      await customServer.init({
+        disableHttpServer: true
       });
-    });
-  });
-}
-module.exports = renderHtml;
+      customServer.render(req, res);
+      return new Promise((resolve) => {
+        res.addListener("finish", () => {
+          resolve({
+            headers: res.getHeaders(),
+            redirected: isRedirect(res.statusCode),
+            status: res.statusCode,
+            url,
+            body: res.data.join()
+          });
+        });
+      });
+    }
+    module.exports = renderHtml;
+  }
+});
+export default require_renderHtml();

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

@@ -1,12 +1,12 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import path from "path";
-import { fs, Logger, SHARED_DIR, OUTPUT_CONFIG_FILE, dotenv, dotenvExpand, INTERNAL_SERVER_PLUGINS, ensureAbsolutePath } 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 class Server {
+class Server {
   /**
   * 初始化顺序
   * - 读取 .env.{process.env.MODERN_ENV} 文件，加载环境变量
@@ -180,7 +180,7 @@ export class Server {
     _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;
@@ -188,3 +188,6 @@ export class Server {
     this.serverConfig = {};
   }
 }
+export {
+  Server
+};

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

@@ -13,7 +13,7 @@ import { createContext } from "../libs/context";
 import { AGGRED_DIR, ERROR_DIGEST, ERROR_PAGE_TEXT, RUN_MODE, ServerReportTimings } from "../constants";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "../libs/hook-api";
 const SERVER_DIR = "./server";
-export class ModernServer {
+class ModernServer {
   // server prepare
   async onInit(runner, app) {
     var _conf_bff, _this_conf_output;
@@ -500,3 +500,6 @@ export class ModernServer {
     this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
   }
 }
+export {
+  ModernServer
+};

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

@@ -27,7 +27,7 @@ class ModernWebServer extends ModernServer {
     return super.handleWeb(context, route);
   }
 }
-export const createProdServer = (options) => {
+const createProdServer = (options) => {
   if (options.apiOnly) {
     return new ModernAPIServer(options);
   } else if (options.ssrOnly) {
@@ -38,3 +38,6 @@ export const createProdServer = (options) => {
     return new ModernServer(options);
   }
 };
+export {
+  createProdServer
+};

package/dist/esm-node/type.js

@@ -1 +0,0 @@
-export {};

package/dist/esm-node/utils.js

@@ -1,14 +1,14 @@
 import { createDebugger } from "@modern-js/utils";
-export const debug = createDebugger("prod-server");
-export const mergeExtension = (users) => {
+const debug = createDebugger("prod-server");
+const mergeExtension = (users) => {
   const output = [];
   return {
     middleware: output.concat(users)
   };
 };
-export const noop = () => {
+const noop = () => {
 };
-export const createErrorDocument = (status, text) => {
+const createErrorDocument = (status, text) => {
   const title = `${status}: ${text}`;
   return `<!DOCTYPE html>
   <html lang="en">
@@ -41,7 +41,7 @@ export const createErrorDocument = (status, text) => {
   </html>
   `;
 };
-export const createMiddlewareCollecter = () => {
+const createMiddlewareCollecter = () => {
   const webMiddlewares = [];
   const apiMiddlewares = [];
   const addWebMiddleware = (input) => {
@@ -60,7 +60,7 @@ export const createMiddlewareCollecter = () => {
     addAPIMiddleware
   };
 };
-export const getStaticReg = (output = {}, html = {}, prefix = "/") => {
+const getStaticReg = (output = {}, html = {}, prefix = "/") => {
   const { distPath: { css: cssPath, js: jsPath, media: mediaPath } = {} } = output;
   const { favicon, faviconByEntries } = html;
   const favicons = prepareFavicons(favicon, faviconByEntries);
@@ -86,7 +86,7 @@ export const getStaticReg = (output = {}, html = {}, prefix = "/") => {
   ].join("|")})`);
   return staticPathRegExp;
 };
-export const prepareFavicons = (favicon, faviconByEntries) => {
+const prepareFavicons = (favicon, faviconByEntries) => {
   const faviconNames = [];
   if (favicon) {
     faviconNames.push(favicon.substring(favicon.lastIndexOf("/") + 1));
@@ -101,7 +101,7 @@ export const prepareFavicons = (favicon, faviconByEntries) => {
   }
   return faviconNames;
 };
-export const headersWithoutCookie = (headers) => {
+const headersWithoutCookie = (headers) => {
   if (typeof headers.cookie !== "undefined") {
     const safeHeaders = {
       ...headers
@@ -111,7 +111,7 @@ export const headersWithoutCookie = (headers) => {
   }
   return headers;
 };
-export const isRedirect = (code) => {
+const isRedirect = (code) => {
   return [
     301,
     302,
@@ -119,3 +119,14 @@ export const isRedirect = (code) => {
     308
   ].includes(code);
 };
+export {
+  createErrorDocument,
+  createMiddlewareCollecter,
+  debug,
+  getStaticReg,
+  headersWithoutCookie,
+  isRedirect,
+  mergeExtension,
+  noop,
+  prepareFavicons
+};

package/dist/esm-node/workerServer.js

@@ -1,11 +1,11 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createAsyncPipeline } from "@modern-js/plugin";
-import { Logger } from "@modern-js/utils/logger";
+import { createLogger } from "@modern-js/utils/logger";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
 import { defaultReporter } from "./libs/reporter";
-export class ReturnResponse {
+class ReturnResponse {
   /**
   * Iterate a Object
   * 1. adds the value if the key does not already exist.
@@ -65,7 +65,7 @@ const checkIsSent = (context) => {
   return false;
 };
 const middlewarePipeline = createAsyncPipeline();
-export const createHandler = (manifest) => {
+const createHandler = (manifest) => {
   const routeMgr = new RouteMatchManager();
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
@@ -79,7 +79,7 @@ export const createHandler = (manifest) => {
     }
     const entryName = pageMatch.spec.urlPath;
     const page = pages[entryName];
-    const logger = new Logger({
+    const logger = createLogger({
       level: "warn"
     });
     const metrics = defaultMetrics;
@@ -209,3 +209,7 @@ function applyMiddlewares(ctx, middleware) {
     });
   }
 }
+export {
+  ReturnResponse,
+  createHandler
+};

package/dist/types/libs/context/context.d.ts

@@ -2,7 +2,7 @@
 /// <reference types="node" />
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/ZUvIIbCulxIv-S9jEs5YO/src/type" />
+/// <reference types=".dts-temp/7Y-G4jfBIn4nRmqrSkuxy/src/type" />
 import { IncomingMessage, ServerResponse } from 'http';
 import qs from 'querystring';
 import type { ModernServerContext as ModernServerContextInterface, Reporter as ModernServerReporter, ServerTiming as ModernServerTiming } from '@modern-js/types';

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/ZUvIIbCulxIv-S9jEs5YO/src/type" />
+/// <reference types=".dts-temp/7Y-G4jfBIn4nRmqrSkuxy/src/type" />
 import { IncomingMessage } from 'http';
 import type { OutputNormalizedConfig, HtmlNormalizedConfig } from '@modern-js/server-core';
 export declare const debug: any;

package/package.json

@@ -15,7 +15,7 @@
     "modern",
     "modern.js"
   ],
-  "version": "2.35.1",
+  "version": "2.36.0",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -74,10 +74,10 @@
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.35.1",
-    "@modern-js/server-core": "2.35.1",
-    "@modern-js/utils": "2.35.1",
-    "@modern-js/runtime-utils": "2.35.1"
+    "@modern-js/plugin": "2.36.0",
+    "@modern-js/server-core": "2.36.0",
+    "@modern-js/utils": "2.36.0",
+    "@modern-js/runtime-utils": "2.36.0"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -96,10 +96,10 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.35.1",
-    "@modern-js/types": "2.35.1",
-    "@scripts/build": "2.35.1",
-    "@scripts/jest-config": "2.35.1"
+    "@modern-js/server-core": "2.36.0",
+    "@modern-js/types": "2.36.0",
+    "@scripts/jest-config": "2.36.0",
+    "@scripts/build": "2.36.0"
   },
   "sideEffects": false,
   "publishConfig": {