@modern-js/prod-server 2.35.0 → 2.35.1

package/dist/esm-node/libs/preload/parseLinks.js

@@ -1,8 +1,8 @@
 import path from "path";
 import { NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, ROUTE_SPEC_FILE, fs } from "@modern-js/utils";
 import { parse as htmlParse } from "node-html-parser";
-import { matchRoutes } from "@modern-js/utils/runtime/remix-router";
-import { matchEntry } from "@modern-js/utils/runtime-node";
+import { matchRoutes } from "@modern-js/runtime-utils/remix-router";
+import { matchEntry } from "@modern-js/runtime-utils/node";
 export async function parseLinks({ pathname, distDir, template }) {
   const links = await parseLinksFromRoutes(pathname, distDir);
   return links.concat(parseLinksFromHtml(template));
@@ -48,7 +48,7 @@ async function parseLinksFromRoutes(pathname, distDir) {
   const serverRoutes = routesJson.routes;
   const entry = matchEntry(pathname, serverRoutes);
   if (entry) {
-    var _routeAssets_entryName, _matches, _assets_filter, _assets, _assets_filter1, _assets1;
+    var _routeAssets_entryName, _assets_filter, _assets_filter1;
     const routes = await import(nestedRoutesSpec);
     const { entryName } = entry;
     if (!entryName) {
@@ -62,23 +62,22 @@ async function parseLinksFromRoutes(pathname, distDir) {
     const { routeAssets } = routesManifest;
     const matches = matchRoutes(entryRoutes, pathname, entry.urlPath);
     const entryAssets = (_routeAssets_entryName = routeAssets[entryName]) === null || _routeAssets_entryName === void 0 ? void 0 : _routeAssets_entryName.assets;
-    const assets = (_matches = matches) === null || _matches === void 0 ? void 0 : _matches.reduce((acc, match) => {
+    const assets = matches === null || matches === void 0 ? void 0 : matches.reduce((acc, match) => {
       const routeId = match.route.id;
       if (routeId) {
-        var _matchedManifest;
         const matchedManifest = routeAssets[routeId];
-        const assets2 = (_matchedManifest = matchedManifest) === null || _matchedManifest === void 0 ? void 0 : _matchedManifest.assets;
+        const assets2 = matchedManifest === null || matchedManifest === void 0 ? void 0 : matchedManifest.assets;
         if (Array.isArray(assets2)) {
           acc.push(...assets2);
         }
       }
       return acc;
     }, []).concat(entryAssets || []);
-    const cssLinks = (_assets = assets) === null || _assets === void 0 ? void 0 : (_assets_filter = _assets.filter((asset) => asset.endsWith(".css"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((uri) => ({
+    const cssLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter = assets.filter((asset) => asset.endsWith(".css"))) === null || _assets_filter === void 0 ? void 0 : _assets_filter.map((uri) => ({
       uri,
       as: "style"
     }));
-    const scriptLinks = (_assets1 = assets) === null || _assets1 === void 0 ? void 0 : (_assets_filter1 = _assets1.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter1 === void 0 ? void 0 : _assets_filter1.map((uri) => ({
+    const scriptLinks = assets === null || assets === void 0 ? void 0 : (_assets_filter1 = assets.filter((asset) => asset.endsWith(".js"))) === null || _assets_filter1 === void 0 ? void 0 : _assets_filter1.map((uri) => ({
       uri,
       as: "script"
     }));

package/dist/esm-node/libs/preload/transformLinks2String.js

@@ -8,7 +8,6 @@ export function transformLinks2String(links, preload) {
   return resolveLinks;
 }
 function addInclude(links, include) {
-  var _include;
   const images = [
     "gif",
     "jpg",
@@ -34,7 +33,7 @@ function addInclude(links, include) {
     "ttf",
     "otf"
   ];
-  const includes = ((_include = include) === null || _include === void 0 ? void 0 : _include.map((item) => {
+  const includes = (include === null || include === void 0 ? void 0 : include.map((item) => {
     if (typeof item === "string") {
       const type = (() => {
         if (item.endsWith(".js")) {

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

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

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

@@ -5,7 +5,6 @@ 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
@@ -41,7 +40,7 @@ export default (renderFn, ctx) => {
       const renderResult = await renderFn(context);
       return afterRender(renderResult, saveHtmlIntoCache);
     }
-    const cacheHash = (_cacheFile = cacheFile) === null || _cacheFile === void 0 ? void 0 : _cacheFile.hash;
+    const cacheHash = 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,10 +141,9 @@ class CacheManager {
     return maybeSync(doCache)(sync);
   }
   async del(context, cacheHash) {
-    var _data;
     const cacheKey = this.generateRequestKey(context);
     const data = this.cache.get(cacheKey);
-    (_data = data) === null || _data === void 0 ? void 0 : _data.caches.del(cacheHash);
+    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

@@ -6,6 +6,7 @@ import { handleDirectory } from "./static";
 import { readFile } from "./reader";
 import * as ssr from "./ssr";
 import { injectServerData } from "./utils";
+const calcFallback = (metaName) => `x-${cutNameByHyphen(metaName)}-ssr-fallback`;
 export const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, nonce, ssrRender, metaName = "modern-js" }) => async function render({ ctx, route, runner }) {
   if (ctx.resHasHandled()) {
     return null;
@@ -21,7 +22,7 @@ export const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, n
   if (!content) {
     return null;
   }
-  const useCSR = forceCSR && (ctx.query.csr || ctx.headers[`x-${cutNameByHyphen(metaName)}-ssr-fallback`]);
+  const useCSR = forceCSR && (ctx.query.csr || ctx.headers[calcFallback(metaName)]);
   if (route.isSSR && !useCSR) {
     try {
       const userAgent = ctx.getReqHeader("User-Agent");
@@ -59,7 +60,7 @@ export const createRenderHandler = ({ distDir, staticGenerate, conf, forceCSR, n
       return result;
     } catch (err) {
       ctx.error(ERROR_DIGEST.ERENDER, err.stack || err.message);
-      ctx.res.set("x-modern-ssr-fallback", "1");
+      ctx.res.set(calcFallback(metaName), "1");
     }
   }
   return {

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

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

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_, _result;
+      var _result_;
       const 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;
     }
   }
   // if match url path

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

@@ -1,6 +1,6 @@
 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 } from "@modern-js/utils";
+import { fs, Logger, 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";
@@ -80,7 +80,7 @@ export class Server {
     const { pwd, config } = options;
     const { serverConfig } = this;
     const finalServerConfig = this.runConfigHook(runner, serverConfig);
-    const resolvedConfigPath = path.join(pwd, config.output.path || "dist", OUTPUT_CONFIG_FILE);
+    const resolvedConfigPath = ensureAbsolutePath(pwd, path.join(config.output.path || "dist", OUTPUT_CONFIG_FILE));
     options.config = loadConfig({
       cliConfig: config,
       serverConfig: finalServerConfig,
@@ -92,8 +92,7 @@ export class Server {
   }
   listen(options, listener) {
     const callback = () => {
-      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) {
@@ -143,7 +142,6 @@ export class Server {
     });
   }
   initAppContext() {
-    var _appContext, _appContext1, _appContext2;
     const { options } = this;
     const { pwd: appDirectory, plugins = [], config, appContext } = options;
     const serverPlugins = plugins.map((p) => ({
@@ -151,9 +149,9 @@ export class Server {
     }));
     return {
       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),
+      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
     };

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

@@ -2,7 +2,7 @@ import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createServer } from "http";
 import path from "path";
 import { fs, isPromise, isWebOnly, mime, ROUTE_SPEC_FILE } from "@modern-js/utils";
-import { time } from "@modern-js/utils/universal/time";
+import { time } from "@modern-js/runtime-utils/time";
 import { RouteMatchManager } from "../libs/route";
 import { createRenderHandler } from "../libs/render";
 import { createStaticFileHandler, faviconFallbackHandler } from "../libs/serveFile";
@@ -16,7 +16,7 @@ const SERVER_DIR = "./server";
 export class ModernServer {
   // server prepare
   async onInit(runner, app) {
-    var _conf_bff, _app, _this_conf_output;
+    var _conf_bff, _this_conf_output;
     this.runner = runner;
     const { distDir, conf } = this;
     this.initReader();
@@ -28,7 +28,7 @@ export class ModernServer {
         this.addHandler(handler);
       });
     }
-    (_app = app) === null || _app === void 0 ? void 0 : _app.on("close", () => {
+    app === null || app === void 0 ? void 0 : app.on("close", () => {
       this.reader.close();
     });
     const usageRoutes = this.filterRoutes(this.getRoutes());
@@ -164,10 +164,9 @@ export class ModernServer {
     return handler;
   }
   async prepareAPIHandler(extension) {
-    var _bff, _bff1;
     const { workDir, runner, conf } = this;
     const { bff } = conf;
-    const prefix = ((_bff = bff) === null || _bff === void 0 ? void 0 : _bff.prefix) || "/api";
+    const prefix = (bff === null || bff === void 0 ? void 0 : bff.prefix) || "/api";
     const webOnly = await isWebOnly();
     if (webOnly && process.env.NODE_ENV === "development") {
       return (req, res) => {
@@ -179,7 +178,7 @@ export class ModernServer {
       pwd: workDir,
       config: extension,
       prefix: Array.isArray(prefix) ? prefix[0] : prefix,
-      httpMethodDecider: (_bff1 = bff) === null || _bff1 === void 0 ? void 0 : _bff1.httpMethodDecider,
+      httpMethodDecider: bff === null || bff === void 0 ? void 0 : bff.httpMethodDecider,
       render: this.render.bind(this)
     }, {
       onLast: () => null
@@ -290,16 +289,14 @@ export class ModernServer {
       await this.handleAPI(context);
       return;
     }
-    if (route.entryName) {
+    if (route.entryName && this.runMode === RUN_MODE.FULL) {
       const afterMatchContext = createAfterMatchContext(context, route.entryName);
-      if (this.runMode === RUN_MODE.FULL) {
-        const end2 = time();
-        await this.runner.afterMatch(afterMatchContext, {
-          onLast: noop
-        });
-        const cost = end2();
-        cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
-      }
+      const end2 = time();
+      await this.runner.afterMatch(afterMatchContext, {
+        onLast: noop
+      });
+      const cost = end2();
+      cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_MATCH, cost);
       if (this.isSend(res)) {
         return;
       }
@@ -342,16 +339,14 @@ export class ModernServer {
       responseStream.pipe(res);
       return;
     }
-    if (route.entryName) {
+    if (route.entryName && this.runMode === RUN_MODE.FULL) {
       const afterRenderContext = createAfterRenderContext(context, response.toString());
-      if (this.runMode === RUN_MODE.FULL) {
-        const end2 = time();
-        await this.runner.afterRender(afterRenderContext, {
-          onLast: noop
-        });
-        const cost = end2();
-        cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost);
-      }
+      const end2 = time();
+      await this.runner.afterRender(afterRenderContext, {
+        onLast: noop
+      });
+      const cost = end2();
+      cost && reporter.reportTiming(ServerReportTimings.SERVER_HOOK_AFTER_RENDER, cost);
       if (this.isSend(res)) {
         return;
       }
@@ -360,7 +355,11 @@ export class ModernServer {
     res.end(response);
   }
   isSend(res) {
-    if (res.writableEnded) {
+    if (res.modernFlushedHeaders) {
+      if (res.writableFinished) {
+        return true;
+      }
+    } else if (res.headersSent) {
       return true;
     }
     if (res.getHeader("Location") && isRedirect(res.statusCode)) {
@@ -465,7 +464,6 @@ 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);
@@ -499,6 +497,6 @@ export class ModernServer {
     this.proxyTarget = proxyTarget;
     this.staticGenerate = staticGenerate || false;
     this.runMode = runMode || RUN_MODE.FULL;
-    this.metaName = (_appContext = appContext) === null || _appContext === void 0 ? void 0 : _appContext.metaName;
+    this.metaName = appContext === null || appContext === void 0 ? void 0 : appContext.metaName;
   }
 }

package/dist/esm-node/workerServer.js

@@ -1,7 +1,7 @@
 import { _ as _define_property } from "@swc/helpers/_/_define_property";
 import { createAsyncPipeline } from "@modern-js/plugin";
+import { Logger } from "@modern-js/utils/logger";
 import { createAfterMatchContext, createAfterRenderContext, createMiddlewareContext } from "./libs/hook-api/index.worker";
-import { Logger } from "./libs/logger";
 import { RouteMatchManager } from "./libs/route";
 import { metrics as defaultMetrics } from "./libs/metrics";
 import { defaultReporter } from "./libs/reporter";
@@ -70,7 +70,7 @@ export const createHandler = (manifest) => {
   const { pages, routes } = manifest;
   routeMgr.reset(routes);
   return async (options) => {
-    var _page_serverHooks_afterMatch, _page_serverHooks, _page;
+    var _page_serverHooks_afterMatch, _page_serverHooks;
     const { request, loadableStats, routeManifest } = options;
     const url = new URL(request.url);
     const pageMatch = routeMgr.match(url.pathname);
@@ -86,7 +86,7 @@ export const createHandler = (manifest) => {
     const reporter = defaultReporter;
     const hookContext = createWorkerHookContext(request.url, logger, metrics, reporter);
     const afterMatchHookContext = createAfterMatchContext(hookContext, entryName);
-    (_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);
+    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);
     }
@@ -122,14 +122,13 @@ export const createHandler = (manifest) => {
           logger,
           reporter: defaultReporter,
           metrics,
-          // FIXME: pass correctly req & res
           req: request,
+          res: responseLike,
           serverTiming: {
             addServeTiming() {
               return this;
             }
-          },
-          res: responseLike
+          }
         };
         const body = await page.serverRender(serverRenderContext);
         const afterRenderHookContext = createAfterRenderContext(hookContext, body);

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/bmyOg3OGCKlzOU69708oM/src/type" />
+/// <reference types=".dts-temp/ZUvIIbCulxIv-S9jEs5YO/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';
@@ -12,6 +12,7 @@ export type ContextOptions = {
 };
 type ResponseBody = string | Buffer;
 export declare class ModernServerContext implements ModernServerContextInterface {
+  #private;
   /**
    * http request
    */

package/dist/types/type.d.ts

@@ -15,6 +15,7 @@ declare module 'http' {
   }
   interface OutgoingMessage {
     set: (key: string, value: any) => this;
+    modernFlushedHeaders?: boolean;
   }
 }
 export type ModernServerOptions = {

package/dist/types/utils.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="node" />
 /// <reference types="node/http" />
-/// <reference types=".dts-temp/bmyOg3OGCKlzOU69708oM/src/type" />
+/// <reference types=".dts-temp/ZUvIIbCulxIv-S9jEs5YO/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.0",
+  "version": "2.35.1",
   "jsnext:source": "./src/index.ts",
   "types": "./dist/types/index.d.ts",
   "main": "./dist/cjs/index.js",
@@ -74,9 +74,10 @@
     "node-html-parser": "^6.1.5",
     "path-to-regexp": "^6.2.0",
     "serve-static": "^1.14.1",
-    "@modern-js/plugin": "2.35.0",
-    "@modern-js/utils": "2.35.0",
-    "@modern-js/server-core": "2.35.0"
+    "@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"
   },
   "devDependencies": {
     "@types/cookie": "^0.4.1",
@@ -95,10 +96,10 @@
     "portfinder": "^1.0.28",
     "typescript": "^5",
     "ws": "^8.13.0",
-    "@modern-js/server-core": "2.35.0",
-    "@modern-js/types": "2.35.0",
-    "@scripts/build": "2.35.0",
-    "@scripts/jest-config": "2.35.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"
   },
   "sideEffects": false,
   "publishConfig": {

package/dist/cjs/libs/logger.js

@@ -1,123 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-function _export(target, all) {
-  for (var name in all)
-    Object.defineProperty(target, name, {
-      enumerable: true,
-      get: all[name]
-    });
-}
-_export(exports, {
-  Logger: function() {
-    return Logger;
-  },
-  logger: function() {
-    return logger;
-  }
-});
-const _define_property = require("@swc/helpers/_/_define_property");
-const LOG_LEVEL = {
-  error: 0,
-  warn: 1,
-  info: 2,
-  debug: 3,
-  log: 4
-};
-const LOG_TYPES = {
-  error: {
-    color: "red",
-    label: "error",
-    level: "error"
-  },
-  info: {
-    color: "cyan",
-    label: "info",
-    level: "info"
-  },
-  success: {
-    color: "green",
-    label: "Success",
-    level: "info"
-  },
-  warn: {
-    color: "yellow",
-    label: "warn",
-    level: "warn"
-  },
-  debug: {
-    color: "red",
-    label: "debug",
-    level: "debug"
-  },
-  log: {
-    level: "log"
-  }
-};
-const DEFAULT_CONFIG = {
-  displayLabel: true,
-  uppercaseLabel: false
-};
-class Logger {
-  _log(type, message, ...args) {
-    if (message === void 0 || message === null) {
-      console.log();
-      return;
-    }
-    if (LOG_LEVEL[type] > LOG_LEVEL[this.level]) {
-      return;
-    }
-    let label = "";
-    let text = "";
-    const logType = this.types[type];
-    if (this.config.displayLabel && logType.label) {
-      label = this.config.uppercaseLabel ? logType.label.toUpperCase() : logType.label;
-      label = label.padEnd(this.longestLabel.length);
-    }
-    if (message instanceof Error) {
-      if (message.stack) {
-        const [name, ...rest] = message.stack.split("\n");
-        text = `${name}
-${rest.join("\n")}`;
-      } else {
-        text = message.message;
-      }
-    } else {
-      text = `${message}`;
-    }
-    const log = label.length > 0 ? `${label} ${text}` : text;
-    console.log(log, ...args);
-  }
-  getLongestLabel() {
-    let longestLabel = "";
-    Object.keys(this.types).forEach((type) => {
-      const { label = "" } = this.types[type];
-      if (label.length > longestLabel.length) {
-        longestLabel = label;
-      }
-    });
-    return longestLabel;
-  }
-  constructor(options = {}) {
-    _define_property._(this, "level", void 0);
-    _define_property._(this, "config", void 0);
-    _define_property._(this, "types", void 0);
-    _define_property._(this, "longestLabel", void 0);
-    this.level = options.level || LOG_TYPES.log.level;
-    this.config = {
-      ...DEFAULT_CONFIG,
-      ...options.config || {}
-    };
-    this.types = {
-      ...LOG_TYPES,
-      ...options.types || {}
-    };
-    this.longestLabel = this.getLongestLabel();
-    Object.keys(this.types).forEach((type) => {
-      this[type] = this._log.bind(this, type);
-    });
-  }
-}
-const logger = new Logger();
-logger.Logger = Logger;