@modern-js/server-core 2.58.3-alpha.1 → 2.58.3

package/dist/cjs/adapters/node/hono.js

@@ -25,15 +25,22 @@ module.exports = __toCommonJS(hono_exports);
 const httpCallBack2HonoMid = (handler) => {
   return async (context, next) => {
     const { req, res } = context.env.node;
+    const onPipe = () => {
+      res._modernBodyPiped = true;
+    };
+    res.once("pipe", onPipe);
     req.__honoRequest = context.req;
     req.__templates = context.get("templates") || {};
     req.__serverManifest = context.get("serverManifest") || {};
-    await handler(req, res);
-    await new Promise((resolve) => setTimeout(resolve, 0));
-    delete req.__honoRequest;
-    delete req.__templates;
-    delete req.__serverManifest;
-    if (res.headersSent) {
+    try {
+      await handler(req, res);
+    } finally {
+      delete req.__honoRequest;
+      delete req.__templates;
+      delete req.__serverManifest;
+      res.removeListener("pipe", onPipe);
+    }
+    if (res.headersSent || res._modernBodyPiped) {
       context.finalized = true;
     } else {
       await next();

package/dist/cjs/adapters/node/node.js

@@ -35,8 +35,8 @@ __export(node_exports, {
 });
 module.exports = __toCommonJS(node_exports);
 var import_node_http = require("node:http");
-var import_stream = require("./polyfills/stream");
 var import_install = require("./polyfills/install");
+var import_stream = require("./polyfills/stream");
 var import_polyfills = require("./polyfills");
 (0, import_install.installGlobals)();
 const createWebRequest = (req, res, body) => {
@@ -116,7 +116,7 @@ const getRequestListener = (handler) => {
           res
         }
       });
-      if (!res.headersSent && !response.res) {
+      if (!res.headersSent && !response.res && !res._modernBodyPiped) {
         await sendResponse(response, res);
       }
     } catch (error) {

package/dist/cjs/adapters/node/plugins/resource.js

@@ -86,7 +86,7 @@ async function getServerManifest(pwd, routes, logger) {
     const renderBundle = await loadBundle(renderBundlePath, logger);
     const loaderBundle = await loadBundle(loaderBundlePath, logger);
     renderBundle && (renderBundles[entryName] = renderBundle);
-    loaderBundle && (loaderBundles[entryName] = loaderBundle);
+    loaderBundle && (loaderBundles[entryName] = (loaderBundle === null || loaderBundle === void 0 ? void 0 : loaderBundle.loadModules) ? await (loaderBundle === null || loaderBundle === void 0 ? void 0 : loaderBundle.loadModules()) : loaderBundle);
   }));
   const loadableUri = import_path.default.join(pwd, import_utils.LOADABLE_STATS_FILE);
   const loadableStats = await (0, import_utils.compatibleRequire)(loadableUri).catch((_) => ({}));

package/dist/cjs/adapters/node/plugins/static.js

@@ -34,9 +34,9 @@ __export(static_exports, {
 });
 module.exports = __toCommonJS(static_exports);
 var import_path = __toESM(require("path"));
+var import_fileReader = require("@modern-js/runtime-utils/fileReader");
 var import_utils = require("@modern-js/utils");
 var import_mime = require("hono/utils/mime");
-var import_fileReader = require("@modern-js/runtime-utils/fileReader");
 var import_utils2 = require("../../../utils");
 const serverStaticPlugin = () => ({
   name: "@modern-js/plugin-server-static",

package/dist/cjs/adapters/node/polyfills/install.js

@@ -22,8 +22,8 @@ __export(install_exports, {
 });
 module.exports = __toCommonJS(install_exports);
 var import_fetch = require("@web-std/fetch");
-var import_stream = require("@web-std/stream");
 var import_file = require("@web-std/file");
+var import_stream = require("@web-std/stream");
 if (!Object.getOwnPropertyDescriptor(import_fetch.Headers.prototype, "getSetCookie")) {
   Object.defineProperty(import_fetch.Headers.prototype, "getSetCookie", {
     value: function getSetCookie() {

package/dist/cjs/plugins/customServer/base.js

@@ -39,7 +39,9 @@ function createBaseHookContext(c, resParams) {
 var _req = /* @__PURE__ */ new WeakMap(), _c = /* @__PURE__ */ new WeakMap(), _headersData = /* @__PURE__ */ new WeakMap(), _headers = /* @__PURE__ */ new WeakMap();
 class BaseHookRequest {
   get url() {
-    return (0, import_class_private_field_get._)(this, _req).path;
+    const query = (0, import_class_private_field_get._)(this, _c).req.query();
+    const q = Object.entries(query).map(([key, value]) => `${key}=${value}`).join("&");
+    return q ? `${(0, import_class_private_field_get._)(this, _c).req.path}?${q}` : (0, import_class_private_field_get._)(this, _c).req.path;
   }
   // TODO: remove next major version
   set url(_u) {

package/dist/cjs/plugins/customServer/context.js

@@ -24,9 +24,9 @@ __export(context_exports, {
   getAfterRenderCtx: () => getAfterRenderCtx
 });
 module.exports = __toCommonJS(context_exports);
+var import_base = require("./base");
 var import_routerApi = require("./routerApi");
 var import_template = require("./template");
-var import_base = require("./base");
 function getAfterMatchCtx(entryName, baseHookCtx) {
   const afterMatchCtx = baseHookCtx;
   afterMatchCtx.router = new import_routerApi.RouterAPI(entryName);

package/dist/cjs/plugins/customServer/index.js

@@ -33,11 +33,11 @@ __export(customServer_exports, {
 });
 module.exports = __toCommonJS(customServer_exports);
 var import_time = require("@modern-js/runtime-utils/time");
-var import_utils = require("../../utils");
-var import_helper = require("../../helper");
 var import_constants = require("../../constants");
-var import_context = require("./context");
+var import_helper = require("../../helper");
+var import_utils = require("../../utils");
 var import_base = require("./base");
+var import_context = require("./context");
 const noop = () => {
 };
 const isHtmlResponse = (response) => {
@@ -65,14 +65,7 @@ class CustomServer {
       if (current !== entryName) {
         const rewriteRoute = routes.find((route) => route.entryName === current);
         if (rewriteRoute) {
-          const { headers, method, signal } = c.req.raw;
-          const url2 = new URL(c.req.url);
-          const newUrl = new URL(rewriteRoute.urlPath, url2.origin);
-          return this.serverBase.request(newUrl, {
-            headers,
-            method,
-            signal
-          }, c.env);
+          c.set("matchPathname", rewriteRoute.urlPath);
         }
       }
       if (c.finalized) {

package/dist/cjs/plugins/default.js

@@ -21,10 +21,10 @@ __export(default_exports, {
   createDefaultPlugins: () => createDefaultPlugins
 });
 module.exports = __toCommonJS(default_exports);
-var import_render = require("./render");
+var import_log = require("./log");
 var import_monitors = require("./monitors");
 var import_processedBy = require("./processedBy");
-var import_log = require("./log");
+var import_render = require("./render");
 function createDefaultPlugins(options = {}) {
   const plugins = [
     (0, import_monitors.initMonitorsPlugin)(),

package/dist/cjs/plugins/render/index.js

@@ -23,10 +23,10 @@ __export(render_exports, {
 });
 module.exports = __toCommonJS(render_exports);
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_monitors = require("../monitors");
+var import_helper = require("../../helper");
 var import_utils = require("../../utils");
 var import_customServer = require("../customServer");
-var import_helper = require("../../helper");
+var import_monitors = require("../monitors");
 __reExport(render_exports, require("./inject"), module.exports);
 const renderPlugin = () => ({
   name: "@modern-js/plugin-render",
@@ -85,6 +85,7 @@ function createRenderHandler(render) {
     const serverManifest = c.get("serverManifest") || {};
     const locals = c.get("locals");
     const metrics = c.get("metrics");
+    const matchPathname = c.get("matchPathname");
     const loaderContext = (0, import_helper.getLoaderCtx)(c);
     const request = c.req.raw;
     const nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
@@ -97,7 +98,8 @@ function createRenderHandler(render) {
       metrics,
       serverManifest,
       loaderContext,
-      locals
+      locals,
+      matchPathname
     });
     const { body, status, headers } = res;
     const headersData = {};

package/dist/cjs/plugins/render/render.js

@@ -31,13 +31,13 @@ __export(render_exports, {
   createRender: () => createRender
 });
 module.exports = __toCommonJS(render_exports);
+var import_utils = require("@modern-js/utils");
 var import_universal = require("@modern-js/utils/universal");
 var import_trie_router = require("hono/router/trie-router");
-var import_utils = require("../../utils");
 var import_constants = require("../../constants");
+var import_utils2 = require("../../utils");
 var import_dataHandler = require("./dataHandler");
 var import_ssrRender = require("./ssrRender");
-var import_utils2 = require("@modern-js/utils");
 const DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
   const dynamicRoutes = [];
@@ -50,8 +50,8 @@ function getRouter(routes) {
     }
   });
   const finalRoutes = [
-    ...normalRoutes.sort(import_utils.sortRoutes),
-    ...dynamicRoutes.sort(import_utils.sortRoutes)
+    ...normalRoutes.sort(import_utils2.sortRoutes),
+    ...dynamicRoutes.sort(import_utils2.sortRoutes)
   ];
   const router = new import_trie_router.TrieRouter();
   for (const route of finalRoutes) {
@@ -61,8 +61,7 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, request) {
-  const pathname = (0, import_utils.getPathname)(request);
+function matchRoute(router, pathname) {
   const matched = router.match("*", pathname);
   const result = matched[0][0];
   return result || [];
@@ -77,8 +76,9 @@ function getHeadersWithoutCookie(headers) {
 }
 async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig, forceCSR, config, onFallback: onFallbackFn }) {
   const router = getRouter(routes);
-  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, loaderContext }) => {
-    const [routeInfo, params] = matchRoute(router, req);
+  return async (req, { logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext }) => {
+    const forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : (0, import_utils2.getPathname)(req);
+    const [routeInfo, params] = matchRoute(router, forMatchpathname);
     const onFallback = async (reason, error) => {
       return onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
         logger,
@@ -87,7 +87,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       }, error);
     };
     if (!routeInfo) {
-      return new Response((0, import_utils.createErrorHtml)(404), {
+      return new Response((0, import_utils2.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
@@ -96,7 +96,7 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
     }
     const html = templates[routeInfo.entryName];
     if (!html) {
-      return new Response((0, import_utils.createErrorHtml)(404), {
+      return new Response((0, import_utils2.createErrorHtml)(404), {
         status: 404,
         headers: {
           "content-type": "text/html; charset=UTF-8"
@@ -104,16 +104,16 @@ async function createRender({ routes, pwd, metaName, staticGenerate, cacheConfig
       });
     }
     const renderMode = await getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback);
-    const pathname = (0, import_utils.getPathname)(req);
-    const headerData = (0, import_utils.parseHeaders)(req);
+    const pathname = (0, import_utils2.getPathname)(req);
+    const headerData = (0, import_utils2.parseHeaders)(req);
     const onError = (e) => {
-      monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${e instanceof Error ? e.name : e}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, pathname, getHeadersWithoutCookie(headerData));
+      monitors === null || monitors === void 0 ? void 0 : monitors.error(`SSR Error - ${e instanceof Error ? e.name : e}, error = %s, req.url = %s, req.headers = %o`, e instanceof Error ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
     };
     const onTiming = (name, dur) => {
       monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
     };
     const onBoundError = async (e) => {
-      (0, import_utils.onError)(import_utils.ErrorDigest.ERENDER, e, monitors, req);
+      (0, import_utils2.onError)(import_utils2.ErrorDigest.ERENDER, e, monitors, req);
       await (onFallback === null || onFallback === void 0 ? void 0 : onFallback("error", e));
     };
     const renderOptions = {
@@ -165,7 +165,7 @@ async function renderHandler(request, options, mode, onError) {
     const { nestedRoutesJson } = serverManifest;
     const routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
     if (routes) {
-      const { matchRoutes } = await (0, import_utils2.compatibleRequire)(require.resolve("@modern-js/runtime-utils/remix-router"), false);
+      const { matchRoutes } = await (0, import_utils.compatibleRequire)(require.resolve("@modern-js/runtime-utils/remix-router"), false);
       const url = new URL(request.url);
       const matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
       if (!matchedRoutes) {
@@ -189,12 +189,7 @@ async function renderHandler(request, options, mode, onError) {
   } else {
     response = csrRender(options.html);
   }
-  let newRes;
-  if (!options.staticGenerate) {
-    newRes = (0, import_utils.transformResponse)(response, injectServerData(serverData));
-  } else {
-    newRes = response;
-  }
+  const newRes = (0, import_utils2.transformResponse)(response, injectServerData(serverData));
   const { routeInfo } = options;
   applyExtendHeaders(newRes, routeInfo);
   return newRes;
@@ -205,7 +200,7 @@ async function renderHandler(request, options, mode, onError) {
   }
 }
 async function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
-  const query = (0, import_utils.parseQuery)(req);
+  const query = (0, import_utils2.parseQuery)(req);
   const fallbackHeader = `x-${(0, import_universal.cutNameByHyphen)(framework)}-ssr-fallback`;
   if (isSSR) {
     if (query.__loader) {

package/dist/cjs/plugins/render/ssrRender.js

@@ -22,8 +22,8 @@ __export(ssrRender_exports, {
 });
 module.exports = __toCommonJS(ssrRender_exports);
 var import_constants = require("@modern-js/utils/universal/constants");
-var import_utils = require("../../utils");
 var import_constants2 = require("../../constants");
+var import_utils = require("../../utils");
 var import_ssrCache = require("./ssrCache");
 const SERVER_RUNTIME_ENTRY = "requestHandler";
 async function ssrRender(request, { routeInfo, html, config: userConfig, staticGenerate, nodeReq, serverManifest, locals, params, loaderContext, reporter, cacheConfig, logger, metrics, onError, onTiming }) {

package/dist/cjs/serverBase.js

@@ -24,8 +24,8 @@ __export(serverBase_exports, {
 module.exports = __toCommonJS(serverBase_exports);
 var import_class_private_method_get = require("@swc/helpers/_/_class_private_method_get");
 var import_class_private_method_init = require("@swc/helpers/_/_class_private_method_init");
-var import_hono = require("hono");
 var import_plugin = require("@modern-js/plugin");
+var import_hono = require("hono");
 var import_pluginManager = require("./pluginManager");
 var _getAppContext = /* @__PURE__ */ new WeakSet(), _applyMiddlewares = /* @__PURE__ */ new WeakSet();
 class ServerBase {

package/dist/esm/adapters/node/helper/loadConfig.js

@@ -1,7 +1,7 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
-import { fs, DEFAULT_SERVER_CONFIG, requireExistModule, ensureAbsolutePath, OUTPUT_CONFIG_FILE, lodash as _, compatibleRequire } from "@modern-js/utils";
+import { fs, DEFAULT_SERVER_CONFIG, OUTPUT_CONFIG_FILE, lodash as _, compatibleRequire, ensureAbsolutePath, requireExistModule } from "@modern-js/utils";
 import { parse } from "flatted";
 var requireConfig = function() {
   var _ref = _async_to_generator(function(serverConfigPath) {

package/dist/esm/adapters/node/hono.js

@@ -3,50 +3,64 @@ import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 var httpCallBack2HonoMid = function(handler) {
   return function() {
     var _ref = _async_to_generator(function(context, next) {
-      var _context_env_node, req, res;
+      var _context_env_node, req, res, onPipe;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
             _context_env_node = context.env.node, req = _context_env_node.req, res = _context_env_node.res;
+            onPipe = function() {
+              res._modernBodyPiped = true;
+            };
+            res.once("pipe", onPipe);
             req.__honoRequest = context.req;
             req.__templates = context.get("templates") || {};
             req.__serverManifest = context.get("serverManifest") || {};
+            _state.label = 1;
+          case 1:
+            _state.trys.push([
+              1,
+              ,
+              3,
+              4
+            ]);
             return [
               4,
               handler(req, res)
             ];
-          case 1:
+          case 2:
             _state.sent();
             return [
-              4,
-              new Promise(function(resolve) {
-                return setTimeout(resolve, 0);
-              })
+              3,
+              4
             ];
-          case 2:
-            _state.sent();
+          case 3:
             delete req.__honoRequest;
             delete req.__templates;
             delete req.__serverManifest;
-            if (!res.headersSent)
+            res.removeListener("pipe", onPipe);
+            return [
+              7
+            ];
+          case 4:
+            if (!(res.headersSent || res._modernBodyPiped))
               return [
                 3,
-                3
+                5
               ];
             context.finalized = true;
             return [
               3,
-              5
+              7
             ];
-          case 3:
+          case 5:
             return [
               4,
               next()
             ];
-          case 4:
+          case 6:
             _state.sent();
-            _state.label = 5;
-          case 5:
+            _state.label = 7;
+          case 7:
             return [
               2
             ];

package/dist/esm/adapters/node/node.js

@@ -3,8 +3,8 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { ServerResponse } from "node:http";
-import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { installGlobals } from "./polyfills/install";
+import { createReadableStreamFromReadable, writeReadableStreamToWritable } from "./polyfills/stream";
 import { writeReadableStreamToWritable as writeReadableStreamToWritable2 } from "./polyfills";
 installGlobals();
 var createWebRequest = function(req, res, body) {
@@ -145,7 +145,7 @@ var getRequestListener = function(handler) {
             ];
           case 1:
             response = _state.sent();
-            if (!(!res.headersSent && !response.res))
+            if (!(!res.headersSent && !response.res && !res._modernBodyPiped))
               return [
                 3,
                 3

package/dist/esm/adapters/node/plugins/resource.js

@@ -3,7 +3,7 @@ import { _ as _instanceof } from "@swc/helpers/_/_instanceof";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import path from "path";
 import { fileReader } from "@modern-js/runtime-utils/fileReader";
-import { LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, fs, compatibleRequire } from "@modern-js/utils";
+import { fs, LOADABLE_STATS_FILE, MAIN_ENTRY_NAME, NESTED_ROUTE_SPEC_FILE, ROUTE_MANIFEST_FILE, SERVER_BUNDLE_DIRECTORY, compatibleRequire } from "@modern-js/utils";
 function getHtmlTemplates(pwd, routes) {
   return _getHtmlTemplates.apply(this, arguments);
 }
@@ -180,7 +180,7 @@ function _getServerManifest() {
               return Boolean(route.bundle);
             }).map(function() {
               var _ref = _async_to_generator(function(route) {
-                var entryName, renderBundlePath, loaderBundlePath, renderBundle, loaderBundle;
+                var entryName, renderBundlePath, loaderBundlePath, renderBundle, loaderBundle, _tmp, _tmp1;
                 return _ts_generator(this, function(_state2) {
                   switch (_state2.label) {
                     case 0:
@@ -200,7 +200,35 @@ function _getServerManifest() {
                     case 2:
                       loaderBundle = _state2.sent();
                       renderBundle && (renderBundles[entryName] = renderBundle);
-                      loaderBundle && (loaderBundles[entryName] = loaderBundle);
+                      _tmp = loaderBundle;
+                      if (!_tmp)
+                        return [
+                          3,
+                          6
+                        ];
+                      if (!(loaderBundle === null || loaderBundle === void 0 ? void 0 : loaderBundle.loadModules))
+                        return [
+                          3,
+                          4
+                        ];
+                      return [
+                        4,
+                        loaderBundle === null || loaderBundle === void 0 ? void 0 : loaderBundle.loadModules()
+                      ];
+                    case 3:
+                      _tmp1 = _state2.sent();
+                      return [
+                        3,
+                        5
+                      ];
+                    case 4:
+                      _tmp1 = loaderBundle;
+                      _state2.label = 5;
+                    case 5:
+                      _tmp = loaderBundles[entryName] = _tmp1;
+                      _state2.label = 6;
+                    case 6:
+                      _tmp;
                       return [
                         2
                       ];

package/dist/esm/adapters/node/plugins/static.js

@@ -3,9 +3,9 @@ import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 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 { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { fs } from "@modern-js/utils";
 import { getMimeType } from "hono/utils/mime";
-import { fileReader } from "@modern-js/runtime-utils/fileReader";
 import { sortRoutes } from "../../../utils";
 var serverStaticPlugin = function() {
   return {

package/dist/esm/adapters/node/polyfills/install.js

@@ -1,6 +1,6 @@
-import { Request as NodeRequest, Response as NodeResponse, Headers as NodeHeaders, FormData as NodeFormData } from "@web-std/fetch";
-import { TransformStream as NodeTransformStream, ReadableStream as NodeReadableStream, WritableStream as NodeWritableStream } from "@web-std/stream";
-import { File as NodeFile, Blob as NodeBlob } from "@web-std/file";
+import { FormData as NodeFormData, Headers as NodeHeaders, Request as NodeRequest, Response as NodeResponse } from "@web-std/fetch";
+import { Blob as NodeBlob, File as NodeFile } from "@web-std/file";
+import { ReadableStream as NodeReadableStream, TransformStream as NodeTransformStream, WritableStream as NodeWritableStream } from "@web-std/stream";
 if (!Object.getOwnPropertyDescriptor(NodeHeaders.prototype, "getSetCookie")) {
   Object.defineProperty(NodeHeaders.prototype, "getSetCookie", {
     value: function getSetCookie() {

package/dist/esm/plugins/customServer/base.js

@@ -3,6 +3,7 @@ import { _ as _class_private_field_get } from "@swc/helpers/_/_class_private_fie
 import { _ as _class_private_field_init } from "@swc/helpers/_/_class_private_field_init";
 import { _ as _class_private_field_set } from "@swc/helpers/_/_class_private_field_set";
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
+import { _ as _sliced_to_array } from "@swc/helpers/_/_sliced_to_array";
 import { getCookie } from "hono/cookie";
 import { getHost } from "../../utils";
 function createBaseHookContext(c, resParams) {
@@ -59,7 +60,12 @@ var BaseHookRequest = /* @__PURE__ */ function() {
     {
       key: "url",
       get: function get() {
-        return _class_private_field_get(this, _req).path;
+        var query = _class_private_field_get(this, _c).req.query();
+        var q = Object.entries(query).map(function(param) {
+          var _param = _sliced_to_array(param, 2), key = _param[0], value = _param[1];
+          return "".concat(key, "=").concat(value);
+        }).join("&");
+        return q ? "".concat(_class_private_field_get(this, _c).req.path, "?").concat(q) : _class_private_field_get(this, _c).req.path;
       },
       set: (
         // TODO: remove next major version

package/dist/esm/plugins/customServer/context.js

@@ -2,9 +2,9 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _object_spread } from "@swc/helpers/_/_object_spread";
 import { _ as _object_spread_props } from "@swc/helpers/_/_object_spread_props";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
+import { createBaseHookContext } from "./base";
 import { RouterAPI } from "./routerApi";
 import { TemplateApi } from "./template";
-import { createBaseHookContext } from "./base";
 function getAfterMatchCtx(entryName, baseHookCtx) {
   var afterMatchCtx = baseHookCtx;
   afterMatchCtx.router = new RouterAPI(entryName);

package/dist/esm/plugins/customServer/index.js

@@ -2,11 +2,11 @@ import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _class_call_check } from "@swc/helpers/_/_class_call_check";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { time } from "@modern-js/runtime-utils/time";
-import { transformResponse } from "../../utils";
-import { getLoaderCtx } from "../../helper";
 import { ServerTimings } from "../../constants";
-import { getAfterMatchCtx, getAfterRenderCtx, createCustomMiddlewaresCtx, createAfterStreamingRenderContext } from "./context";
+import { getLoaderCtx } from "../../helper";
+import { transformResponse } from "../../utils";
 import { createBaseHookContext } from "./base";
+import { createAfterStreamingRenderContext, createCustomMiddlewaresCtx, getAfterMatchCtx, getAfterRenderCtx } from "./context";
 var noop = function() {
 };
 var isHtmlResponse = function(response) {
@@ -36,7 +36,7 @@ var CustomServer = /* @__PURE__ */ function() {
     var _this = this;
     return function() {
       var _ref = _async_to_generator(function(c, next) {
-        var routeInfo, monitors, baseHookCtx, afterMatchCtx, getCost, cost, _afterMatchCtx_router, url, status, current, rewriteRoute, _c_req_raw, headers, method, signal, url1, newUrl, afterStreamingRenderContext, afterRenderCtx, getCost1, cost1, newBody;
+        var routeInfo, monitors, baseHookCtx, afterMatchCtx, getCost, cost, _afterMatchCtx_router, url, status, current, rewriteRoute, afterStreamingRenderContext, afterRenderCtx, getCost1, cost1, newBody;
         return _ts_generator(this, function(_state) {
           switch (_state.label) {
             case 0:
@@ -70,17 +70,7 @@ var CustomServer = /* @__PURE__ */ function() {
                   return route.entryName === current;
                 });
                 if (rewriteRoute) {
-                  _c_req_raw = c.req.raw, headers = _c_req_raw.headers, method = _c_req_raw.method, signal = _c_req_raw.signal;
-                  url1 = new URL(c.req.url);
-                  newUrl = new URL(rewriteRoute.urlPath, url1.origin);
-                  return [
-                    2,
-                    _this.serverBase.request(newUrl, {
-                      headers,
-                      method,
-                      signal
-                    }, c.env)
-                  ];
+                  c.set("matchPathname", rewriteRoute.urlPath);
                 }
               }
               if (c.finalized) {

package/dist/esm/plugins/default.js

@@ -1,7 +1,7 @@
-import { injectRenderHandlerPlugin } from "./render";
-import { initMonitorsPlugin, injectloggerPluigin, injectServerTiming } from "./monitors";
-import { processedByPlugin } from "./processedBy";
 import { logPlugin } from "./log";
+import { initMonitorsPlugin, injectServerTiming, injectloggerPluigin } from "./monitors";
+import { processedByPlugin } from "./processedBy";
+import { injectRenderHandlerPlugin } from "./render";
 function createDefaultPlugins() {
   var options = arguments.length > 0 && arguments[0] !== void 0 ? arguments[0] : {};
   var plugins = [

package/dist/esm/plugins/render/index.js

@@ -1,10 +1,10 @@
 import { _ as _async_to_generator } from "@swc/helpers/_/_async_to_generator";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-import { initReporter } from "../monitors";
+import { getLoaderCtx } from "../../helper";
 import { sortRoutes } from "../../utils";
 import { CustomServer, getServerMidFromUnstableMid } from "../customServer";
-import { getLoaderCtx } from "../../helper";
+import { initReporter } from "../monitors";
 export * from "./inject";
 var renderPlugin = function() {
   return {
@@ -136,7 +136,7 @@ function getPageRoutes(routes) {
 function createRenderHandler(render) {
   return function() {
     var _ref = _async_to_generator(function(c, _) {
-      var _c_env_node, logger, reporter, monitors, templates, serverManifest, locals, metrics, loaderContext, request, nodeReq, res, body, status, headers, headersData;
+      var _c_env_node, logger, reporter, monitors, templates, serverManifest, locals, metrics, matchPathname, loaderContext, request, nodeReq, res, body, status, headers, headersData;
       return _ts_generator(this, function(_state) {
         switch (_state.label) {
           case 0:
@@ -147,6 +147,7 @@ function createRenderHandler(render) {
             serverManifest = c.get("serverManifest") || {};
             locals = c.get("locals");
             metrics = c.get("metrics");
+            matchPathname = c.get("matchPathname");
             loaderContext = getLoaderCtx(c);
             request = c.req.raw;
             nodeReq = (_c_env_node = c.env.node) === null || _c_env_node === void 0 ? void 0 : _c_env_node.req;
@@ -161,7 +162,8 @@ function createRenderHandler(render) {
                 metrics,
                 serverManifest,
                 loaderContext,
-                locals
+                locals,
+                matchPathname
               })
             ];
           case 1: