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

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) {
@@ -288,7 +278,7 @@ function createMiddlewareContextFromHono(c) {
 }
 function _createMiddlewareContextFromHono() {
   _createMiddlewareContextFromHono = _async_to_generator(function(c) {
-    var loaderContext, rawRequest, method, createReadableStreamFromReadable, init;
+    var loaderContext, rawRequest, method, streamModulePath, createReadableStreamFromReadable, init;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
@@ -303,9 +293,10 @@ function _createMiddlewareContextFromHono() {
               3,
               2
             ];
+          streamModulePath = "../../adapters/node/polyfills/stream.js";
           return [
             4,
-            import("../../adapters/node/polyfills/stream.js")
+            import(streamModulePath)
           ];
         case 1:
           createReadableStreamFromReadable = _state.sent().createReadableStreamFromReadable;

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:

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

@@ -11,24 +11,51 @@ var injectRenderHandlerPlugin = function(param) {
       return {
         prepare: function prepare() {
           return _async_to_generator(function() {
-            var _config_render, _api_useAppContext, pwd, routes, metaName, config, getRenderHandlerOptions, render;
+            var _config_render, _api_useAppContext, pwd, routes, metaName, config, hookRunner, onFallback, getRenderHandlerOptions, render;
             return _ts_generator(this, function(_state) {
               switch (_state.label) {
                 case 0:
                   _api_useAppContext = api.useAppContext(), pwd = _api_useAppContext.distDirectory, routes = _api_useAppContext.routes, metaName = _api_useAppContext.metaName;
                   config = api.useConfigContext();
+                  hookRunner = api.useHookRunners();
                   if (!routes) {
                     return [
                       2
                     ];
                   }
+                  onFallback = function() {
+                    var _ref = _async_to_generator(function(reason, utils, error) {
+                      return _ts_generator(this, function(_state2) {
+                        switch (_state2.label) {
+                          case 0:
+                            return [
+                              4,
+                              hookRunner.fallback(_object_spread_props(_object_spread({
+                                reason
+                              }, utils), {
+                                error
+                              }))
+                            ];
+                          case 1:
+                            _state2.sent();
+                            return [
+                              2
+                            ];
+                        }
+                      });
+                    });
+                    return function onFallback2(reason, utils, error) {
+                      return _ref.apply(this, arguments);
+                    };
+                  }();
                   getRenderHandlerOptions = {
                     pwd,
                     routes,
                     config,
                     metaName,
                     cacheConfig: ((_config_render = config.render) === null || _config_render === void 0 ? void 0 : _config_render.cache) || cacheConfig,
-                    staticGenerate
+                    staticGenerate,
+                    onFallback
                   };
                   return [
                     4,
@@ -56,9 +83,9 @@ function getRenderHandler(_) {
 }
 function _getRenderHandler() {
   _getRenderHandler = _async_to_generator(function(param) {
-    var pwd, routes, config, cacheConfig, metaName, staticGenerate, _config_server, _config_security, ssrConfig, forceCSR, render;
+    var pwd, routes, config, cacheConfig, metaName, staticGenerate, onFallback, _config_server, _config_security, ssrConfig, forceCSR, render;
     return _ts_generator(this, function(_state) {
-      pwd = param.pwd, routes = param.routes, config = param.config, cacheConfig = param.cacheConfig, metaName = param.metaName, staticGenerate = param.staticGenerate;
+      pwd = param.pwd, routes = param.routes, config = param.config, cacheConfig = param.cacheConfig, metaName = param.metaName, staticGenerate = param.staticGenerate, onFallback = param.onFallback;
       ssrConfig = (_config_server = config.server) === null || _config_server === void 0 ? void 0 : _config_server.ssr;
       forceCSR = typeof ssrConfig === "object" ? ssrConfig.forceCSR : false;
       render = createRender({
@@ -69,7 +96,8 @@ function _getRenderHandler() {
         cacheConfig,
         forceCSR,
         nonce: (_config_security = config.security) === null || _config_security === void 0 ? void 0 : _config_security.nonce,
-        metaName: metaName || "modern-js"
+        metaName: metaName || "modern-js",
+        onFallback
       });
       return [
         2,

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

@@ -8,11 +8,10 @@ import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
 import { cutNameByHyphen } from "@modern-js/utils/universal";
 import { TrieRouter } from "hono/router/trie-router";
-import { parseQuery, getPathname, createErrorHtml, sortRoutes, transformResponse, onError as onErrorFn, ErrorDigest, parseHeaders } from "../../utils";
 import { REPLACE_REG, X_MODERNJS_RENDER } from "../../constants";
+import { ErrorDigest, createErrorHtml, getPathname, getRuntimeEnv, onError as onErrorFn, parseHeaders, parseQuery, sortRoutes, transformResponse } from "../../utils";
 import { dataHandler } from "./dataHandler";
 import { ssrRender } from "./ssrRender";
-import { compatibleRequire } from "@modern-js/utils";
 var DYNAMIC_ROUTE_REG = /\/:./;
 function getRouter(routes) {
   var dynamicRoutes = [];
@@ -50,8 +49,7 @@ function getRouter(routes) {
   }
   return router;
 }
-function matchRoute(router, request) {
-  var pathname = getPathname(request);
+function matchRoute(router, pathname) {
   var matched = router.match("*", pathname);
   var result = matched[0][0];
   return result || [];
@@ -76,15 +74,20 @@ function _createRender() {
         2,
         function() {
           var _ref = _async_to_generator(function(req, param2) {
-            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, loaderContext, _matchRoute, routeInfo, params, onFallback, html, renderMode, pathname, headerData, onError, onTiming, onBoundError, renderOptions, response, _tmp;
+            var logger, reporter, metrics, monitors, nodeReq, templates, serverManifest, locals, matchPathname, loaderContext, forMatchpathname, _matchRoute, routeInfo, params, framework, fallbackHeader, fallbackReason, onFallback, html, renderMode, headerData, onError, onTiming, onBoundError, renderOptions, response, _tmp;
             return _ts_generator(this, function(_state2) {
               switch (_state2.label) {
                 case 0:
-                  logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, loaderContext = param2.loaderContext;
-                  _matchRoute = _sliced_to_array(matchRoute(router, req), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
+                  logger = param2.logger, reporter = param2.reporter, metrics = param2.metrics, monitors = param2.monitors, nodeReq = param2.nodeReq, templates = param2.templates, serverManifest = param2.serverManifest, locals = param2.locals, matchPathname = param2.matchPathname, loaderContext = param2.loaderContext;
+                  forMatchpathname = matchPathname !== null && matchPathname !== void 0 ? matchPathname : getPathname(req);
+                  _matchRoute = _sliced_to_array(matchRoute(router, forMatchpathname), 2), routeInfo = _matchRoute[0], params = _matchRoute[1];
+                  framework = metaName || "modern-js";
+                  fallbackHeader = "x-".concat(cutNameByHyphen(framework), "-ssr-fallback");
+                  fallbackReason = null;
                   onFallback = function() {
                     var _ref2 = _async_to_generator(function(reason, error) {
                       return _ts_generator(this, function(_state3) {
+                        fallbackReason = reason;
                         return [
                           2,
                           onFallbackFn === null || onFallbackFn === void 0 ? void 0 : onFallbackFn(reason, {
@@ -124,14 +127,13 @@ function _createRender() {
                   }
                   return [
                     4,
-                    getRenderMode(req, metaName || "modern-js", routeInfo.isSSR, forceCSR, nodeReq, onFallback)
+                    getRenderMode(req, fallbackHeader, routeInfo.isSSR, forceCSR, nodeReq, onFallback)
                   ];
                 case 1:
                   renderMode = _state2.sent();
-                  pathname = getPathname(req);
                   headerData = parseHeaders(req);
                   onError = function(e) {
-                    monitors === null || monitors === void 0 ? void 0 : monitors.error("SSR Error - ".concat(_instanceof(e, Error) ? e.name : e, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, pathname, getHeadersWithoutCookie(headerData));
+                    monitors === null || monitors === void 0 ? void 0 : monitors.error("SSR Error - ".concat(_instanceof(e, Error) ? e.name : e, ", error = %s, req.url = %s, req.headers = %o"), _instanceof(e, Error) ? e.stack || e.message : e, forMatchpathname, getHeadersWithoutCookie(headerData));
                   };
                   onTiming = function(name, dur) {
                     monitors === null || monitors === void 0 ? void 0 : monitors.timing(name, dur, "SSR");
@@ -237,6 +239,9 @@ function _createRender() {
                 case 8:
                   throw new Error("Unknown render mode: ".concat(renderMode));
                 case 9:
+                  if (fallbackReason) {
+                    response.headers.set(fallbackHeader, "1;reason=".concat(fallbackReason));
+                  }
                   return [
                     2,
                     response
@@ -258,7 +263,7 @@ function renderHandler(request, options, mode, onError) {
 }
 function _renderHandler() {
   _renderHandler = _async_to_generator(function(request, options, mode, onError) {
-    var _options_config_server, serverData, response, serverManifest, ssrByRouteIds, nestedRoutesJson, routes, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, newRes, routeInfo;
+    var _options_config_server, serverData, response, serverManifest, ssrByRouteIds, runtimeEnv, nestedRoutesJson, routes, urlPath, pathToFileURL, matchRoutes, url, matchedRoutes, _lastMatch_route, lastMatch, e, newRes, routeInfo;
     function applyExtendHeaders(r, route) {
       Object.entries(route.responseHeaders || {}).forEach(function(param) {
         var _param = _sliced_to_array(param, 2), k = _param[0], v = _param[1];
@@ -277,23 +282,31 @@ function _renderHandler() {
           response = null;
           serverManifest = options.serverManifest;
           ssrByRouteIds = (_options_config_server = options.config.server) === null || _options_config_server === void 0 ? void 0 : _options_config_server.ssrByRouteIds;
-          if (!(serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0))
+          runtimeEnv = getRuntimeEnv();
+          if (!(serverManifest.nestedRoutesJson && ssrByRouteIds && (ssrByRouteIds === null || ssrByRouteIds === void 0 ? void 0 : ssrByRouteIds.length) > 0 && runtimeEnv === "node"))
             return [
               3,
-              2
+              3
             ];
           nestedRoutesJson = serverManifest.nestedRoutesJson;
           routes = nestedRoutesJson === null || nestedRoutesJson === void 0 ? void 0 : nestedRoutesJson[options.routeInfo.entryName];
           if (!routes)
             return [
               3,
-              2
+              3
             ];
+          urlPath = "node:url";
           return [
             4,
-            compatibleRequire(require.resolve("@modern-js/runtime-utils/remix-router"), false)
+            import(urlPath)
           ];
         case 1:
+          pathToFileURL = _state.sent().pathToFileURL;
+          return [
+            4,
+            import(pathToFileURL(require.resolve("@modern-js/runtime-utils/remix-router")).href)
+          ];
+        case 2:
           matchRoutes = _state.sent().matchRoutes;
           url = new URL(request.url);
           matchedRoutes = matchRoutes(routes, url.pathname, options.routeInfo.urlPath);
@@ -306,58 +319,54 @@ function _renderHandler() {
               response = csrRender(options.html);
             }
           }
-          _state.label = 2;
-        case 2:
+          _state.label = 3;
+        case 3:
           if (!(mode === "ssr" && !response))
             return [
               3,
-              8
+              9
             ];
-          _state.label = 3;
-        case 3:
+          _state.label = 4;
+        case 4:
           _state.trys.push([
-            3,
-            5,
+            4,
+            6,
             ,
-            7
+            8
           ]);
           return [
             4,
             ssrRender(request, options)
           ];
-        case 4:
+        case 5:
           response = _state.sent();
           return [
             3,
-            7
+            8
           ];
-        case 5:
+        case 6:
           e = _state.sent();
           return [
             4,
             onError(e)
           ];
-        case 6:
+        case 7:
           _state.sent();
           response = csrRender(options.html);
           return [
             3,
-            7
+            8
           ];
-        case 7:
+        case 8:
           return [
             3,
-            9
+            10
           ];
-        case 8:
-          response = csrRender(options.html);
-          _state.label = 9;
         case 9:
-          if (!options.staticGenerate) {
-            newRes = transformResponse(response, injectServerData(serverData));
-          } else {
-            newRes = response;
-          }
+          response = csrRender(options.html);
+          _state.label = 10;
+        case 10:
+          newRes = transformResponse(response, injectServerData(serverData));
           routeInfo = options.routeInfo;
           applyExtendHeaders(newRes, routeInfo);
           return [
@@ -369,17 +378,16 @@ function _renderHandler() {
   });
   return _renderHandler.apply(this, arguments);
 }
-function getRenderMode(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
+function getRenderMode(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
   return _getRenderMode.apply(this, arguments);
 }
 function _getRenderMode() {
-  _getRenderMode = _async_to_generator(function(req, framework, isSSR, forceCSR, nodeReq, onFallback) {
-    var query, fallbackHeader;
+  _getRenderMode = _async_to_generator(function(req, fallbackHeader, isSSR, forceCSR, nodeReq, onFallback) {
+    var query;
     return _ts_generator(this, function(_state) {
       switch (_state.label) {
         case 0:
           query = parseQuery(req);
-          fallbackHeader = "x-".concat(cutNameByHyphen(framework), "-ssr-fallback");
           if (!isSSR)
             return [
               3,

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

@@ -2,9 +2,9 @@ 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 { MAIN_ENTRY_NAME } from "@modern-js/utils/universal/constants";
-import { parseHeaders, getPathname } from "../../utils";
 import { X_MODERNJS_RENDER } from "../../constants";
-import { matchCacheControl, getCacheResult } from "./ssrCache";
+import { getPathname, parseHeaders } from "../../utils";
+import { getCacheResult, matchCacheControl } from "./ssrCache";
 var SERVER_RUNTIME_ENTRY = "requestHandler";
 function ssrRender(request, _) {
   return _ssrRender.apply(this, arguments);

package/dist/esm/serverBase.js

@@ -5,8 +5,8 @@ import { _ as _class_private_method_init } from "@swc/helpers/_/_class_private_m
 import { _ as _create_class } from "@swc/helpers/_/_create_class";
 import { _ as _to_consumable_array } from "@swc/helpers/_/_to_consumable_array";
 import { _ as _ts_generator } from "@swc/helpers/_/_ts_generator";
-import { Hono } from "hono";
 import { createContext } from "@modern-js/plugin";
+import { Hono } from "hono";
 import { PluginManager } from "./pluginManager";
 var _getAppContext = /* @__PURE__ */ new WeakSet(), _applyMiddlewares = /* @__PURE__ */ new WeakSet();
 var ServerBase = /* @__PURE__ */ function() {
@@ -136,6 +136,7 @@ function getAppContext() {
     middlewares: [],
     appDirectory: (context === null || context === void 0 ? void 0 : context.appDirectory) || "",
     apiDirectory: context === null || context === void 0 ? void 0 : context.apiDirectory,
+    internalDirectory: (context === null || context === void 0 ? void 0 : context.internalDirectory) || "",
     lambdaDirectory: context === null || context === void 0 ? void 0 : context.lambdaDirectory,
     sharedDirectory: (context === null || context === void 0 ? void 0 : context.sharedDirectory) || "",
     distDirectory: pwd,

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

@@ -1,5 +1,5 @@
 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";
 const requireConfig = async (serverConfigPath) => {
   if (fs.pathExistsSync(serverConfigPath)) {

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

@@ -1,15 +1,22 @@
 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/esm-node/adapters/node/node.js

@@ -1,6 +1,6 @@
 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();
 const createWebRequest = (req, res, body) => {
@@ -80,7 +80,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/esm-node/adapters/node/plugins/resource.js

@@ -1,6 +1,6 @@
 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";
 async function getHtmlTemplates(pwd, routes) {
   const htmls = await Promise.all(routes.map(async (route) => {
     let html;
@@ -49,7 +49,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 = path.join(pwd, LOADABLE_STATS_FILE);
   const loadableStats = await compatibleRequire(loadableUri).catch((_) => ({}));

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

@@ -1,7 +1,7 @@
 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";
 const serverStaticPlugin = () => ({
   name: "@modern-js/plugin-server-static",

package/dist/esm-node/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-node/plugins/customServer/base.js

@@ -16,7 +16,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 _class_private_field_get(this, _req).path;
+    const query = _class_private_field_get(this, _c).req.query();
+    const q = Object.entries(query).map(([key, value]) => `${key}=${value}`).join("&");
+    return q ? `${_class_private_field_get(this, _c).req.path}?${q}` : _class_private_field_get(this, _c).req.path;
   }
   // TODO: remove next major version
   set url(_u) {

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

@@ -1,6 +1,6 @@
+import { createBaseHookContext } from "./base";
 import { RouterAPI } from "./routerApi";
 import { TemplateApi } from "./template";
-import { createBaseHookContext } from "./base";
 function getAfterMatchCtx(entryName, baseHookCtx) {
   const afterMatchCtx = baseHookCtx;
   afterMatchCtx.router = new RouterAPI(entryName);

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

@@ -1,9 +1,9 @@
 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";
 const noop = () => {
 };
 const isHtmlResponse = (response) => {
@@ -31,14 +31,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) {
@@ -148,7 +141,8 @@ async function createMiddlewareContextFromHono(c) {
     "GET",
     "HEAD"
   ].includes(method) && !rawRequest.body && c.env.node.req) {
-    const { createReadableStreamFromReadable } = await import("../../adapters/node/polyfills/stream.js");
+    const streamModulePath = "../../adapters/node/polyfills/stream.js";
+    const { createReadableStreamFromReadable } = await import(streamModulePath);
     const init = {
       body: createReadableStreamFromReadable(c.env.node.req),
       headers: rawRequest.headers,

package/dist/esm-node/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(options = {}) {
   const plugins = [
     initMonitorsPlugin(),

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

@@ -1,8 +1,8 @@
 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";
 const renderPlugin = () => ({
   name: "@modern-js/plugin-render",
@@ -61,6 +61,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 = 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;
@@ -73,7 +74,8 @@ function createRenderHandler(render) {
       metrics,
       serverManifest,
       loaderContext,
-      locals
+      locals,
+      matchPathname
     });
     const { body, status, headers } = res;
     const headersData = {};